diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index a4f667ac46..68bd149419 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -11,3 +11,8 @@
 # refactor: Run lintfix (no-changelog) (#7537)
 
 62c096710fab2f7e886518abdbded34b55e93f62
+
+# refactor: Move test files alongside tested files (#11504)
+
+7e58fc4fec468aca0b45d5bfe6150e1af632acbc
+f32b13c6ed078be042a735bc8621f27e00dc3116
diff --git a/.github/docker-compose.yml b/.github/docker-compose.yml
index 84a1b9c961..d4c8dc2ba8 100644
--- a/.github/docker-compose.yml
+++ b/.github/docker-compose.yml
@@ -1,18 +1,14 @@
-version: '3.9'
-
 services:
-  mysql:
-    image: mysql:5.7
+  mariadb:
+    image: mariadb:10.9
     environment:
-      - MYSQL_DATABASE=n8n
-      - MYSQL_ROOT_PASSWORD=password
+      - MARIADB_DATABASE=n8n
+      - MARIADB_ROOT_PASSWORD=password
+      - MARIADB_MYSQL_LOCALHOST_USER=true
     ports:
       - 3306:3306
-    ulimits:
-      nproc: 65535
-      nofile:
-        soft: 26677
-        hard: 46677
+    tmpfs:
+      - /var/lib/mysql
 
   postgres:
     image: postgres:16
@@ -23,3 +19,5 @@ services:
       - POSTGRES_PASSWORD=password
     ports:
       - 5432:5432
+    tmpfs:
+      - /var/lib/postgresql/data
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 0df76d2700..0788c7c480 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -11,6 +11,8 @@ Photos and videos are recommended.
 Include links to **Linear ticket** or Github issue or Community forum post.
 Important in order to close *automatically* and provide context to reviewers.
 -->
+<!-- Use "closes #<issue-number>", "fixes #<issue-number>", or "resolves #<issue-number>" to automatically close issues when the PR is merged. -->
+
 
 ## Review / Merge checklist
 
diff --git a/.github/scripts/check-tests.mjs b/.github/scripts/check-tests.mjs
deleted file mode 100644
index 1e2e38e05b..0000000000
--- a/.github/scripts/check-tests.mjs
+++ /dev/null
@@ -1,103 +0,0 @@
-import { readFile } from 'fs/promises';
-import path from 'path';
-import util from 'util';
-import { exec } from 'child_process';
-import { glob } from 'glob';
-import ts from 'typescript';
-
-const execAsync = util.promisify(exec);
-
-const filterAsync = async (asyncPredicate, arr) => {
-	const filterResults = await Promise.all(
-		arr.map(async (item) => ({
-			item,
-			shouldKeep: await asyncPredicate(item),
-		})),
-	);
-
-	return filterResults.filter(({ shouldKeep }) => shouldKeep).map(({ item }) => item);
-};
-
-const isAbstractClass = (node) => {
-	if (ts.isClassDeclaration(node)) {
-		return (
-			node.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.AbstractKeyword) || false
-		);
-	}
-	return false;
-};
-
-const isAbstractMethod = (node) => {
-	return (
-		ts.isMethodDeclaration(node) &&
-		Boolean(node.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AbstractKeyword))
-	);
-};
-
-// Function to check if a file has a function declaration, function expression, object method or class
-const hasFunctionOrClass = async (filePath) => {
-	const fileContent = await readFile(filePath, 'utf-8');
-	const sourceFile = ts.createSourceFile(filePath, fileContent, ts.ScriptTarget.Latest, true);
-
-	let hasFunctionOrClass = false;
-	const visit = (node) => {
-		if (
-			ts.isFunctionDeclaration(node) ||
-			ts.isFunctionExpression(node) ||
-			ts.isArrowFunction(node) ||
-			(ts.isMethodDeclaration(node) && !isAbstractMethod(node)) ||
-			(ts.isClassDeclaration(node) && !isAbstractClass(node))
-		) {
-			hasFunctionOrClass = true;
-		}
-		node.forEachChild(visit);
-	};
-
-	visit(sourceFile);
-
-	return hasFunctionOrClass;
-};
-
-const main = async () => {
-	// Run a git command to get a list of all changed files in the branch (branch has to be up to date with master)
-	const changedFiles = await execAsync(
-		'git diff --name-only --diff-filter=d origin/master..HEAD',
-	).then(({ stdout }) => stdout.trim().split('\n').filter(Boolean));
-
-	// Get all .spec.ts and .test.ts files from the packages
-	const specAndTestTsFiles = await glob('packages/*/**/{test,__tests__}/**/*.{spec,test}.ts');
-	const specAndTestTsFilesNames = specAndTestTsFiles.map((file) =>
-		path.parse(file).name.replace(/\.(test|spec)/, ''),
-	);
-
-	// Filter out the .ts and .vue files from the changed files
-	const changedVueFiles = changedFiles.filter((file) => file.endsWith('.vue'));
-	// .ts files with any kind of function declaration or class and not in any of the test folders
-	const changedTsFilesWithFunction = await filterAsync(
-		async (filePath) =>
-			filePath.endsWith('.ts') &&
-			!(await glob('packages/*/**/{test,__tests__}/*.ts')).includes(filePath) &&
-			(await hasFunctionOrClass(filePath)),
-		changedFiles,
-	);
-
-	// For each .ts or .vue file, check if there's a corresponding .test.ts or .spec.ts file in the repository
-	const missingTests = changedVueFiles
-		.concat(changedTsFilesWithFunction)
-		.reduce((filesList, nextFile) => {
-			const fileName = path.parse(nextFile).name;
-
-			if (!specAndTestTsFilesNames.includes(fileName)) {
-				filesList.push(nextFile);
-			}
-
-			return filesList;
-		}, []);
-
-	if (missingTests.length) {
-		console.error(`Missing tests for:\n${missingTests.join('\n')}`);
-		process.exit(1);
-	}
-};
-
-main();
diff --git a/.github/scripts/package.json b/.github/scripts/package.json
index 80bf0baf11..7640790f2d 100644
--- a/.github/scripts/package.json
+++ b/.github/scripts/package.json
@@ -7,7 +7,6 @@
     "p-limit": "3.1.0",
     "picocolors": "1.0.1",
     "semver": "7.5.4",
-    "tempfile": "5.0.0",
-    "typescript": "*"
+    "tempfile": "5.0.0"
   }
 }
diff --git a/.github/workflows/check-tests.yml b/.github/workflows/check-tests.yml
deleted file mode 100644
index 97f380974a..0000000000
--- a/.github/workflows/check-tests.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: Check Test Files
-
-on:
-  pull_request:
-    branches:
-      - '**'
-      - '!release/*'
-  pull_request_target:
-    branches:
-      - master
-
-jobs:
-  check-tests:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4.1.1
-        with:
-          fetch-depth: 0
-
-      - name: Use Node.js
-        uses: actions/setup-node@v4.0.2
-        with:
-          node-version: 20.x
-
-      - run: npm install --prefix=.github/scripts --no-package-lock
-
-      - name: Check for test files
-        run: node .github/scripts/check-tests.mjs
diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml
index 7c5682076a..4e77fbd580 100644
--- a/.github/workflows/chromatic.yml
+++ b/.github/workflows/chromatic.yml
@@ -1,6 +1,8 @@
 name: Chromatic
 
 on:
+  schedule:
+    - cron: '0 0 * * *'
   workflow_dispatch:
   pull_request_review:
     types: [submitted]
@@ -65,11 +67,12 @@ jobs:
         continue-on-error: true
         with:
           workingDir: packages/design-system
+          onlyChanged: true
           projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
           exitZeroOnChanges: false
 
       - name: Success comment
-        if: steps.chromatic_tests.outcome == 'success'
+        if: steps.chromatic_tests.outcome == 'success' && github.ref != 'refs/heads/master'
         uses: peter-evans/create-or-update-comment@v4.0.0
         with:
           issue-number: ${{ github.event.pull_request.number }}
@@ -79,7 +82,7 @@ jobs:
             :white_check_mark: No visual regressions found.
 
       - name: Fail comment
-        if: steps.chromatic_tests.outcome != 'success'
+        if: steps.chromatic_tests.outcome != 'success' && github.ref != 'refs/heads/master'
         uses: peter-evans/create-or-update-comment@v4.0.0
         with:
           issue-number: ${{ github.event.pull_request.number }}
diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index 5e828a7022..b6972e1932 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -47,6 +47,7 @@ jobs:
       nodeVersion: ${{ matrix.node-version }}
       cacheKey: ${{ github.sha }}-base:build
       collectCoverage: ${{ matrix.node-version == '20.x' }}
+      ignoreTurboCache: ${{ matrix.node-version == '20.x' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
diff --git a/.github/workflows/ci-postgres-mysql.yml b/.github/workflows/ci-postgres-mysql.yml
index 23088633b5..f6e5e773cb 100644
--- a/.github/workflows/ci-postgres-mysql.yml
+++ b/.github/workflows/ci-postgres-mysql.yml
@@ -8,6 +8,7 @@ on:
     paths:
       - packages/cli/src/databases/**
       - .github/workflows/ci-postgres-mysql.yml
+      - .github/docker-compose.yml
   pull_request_review:
     types: [submitted]
 
@@ -71,8 +72,8 @@ jobs:
         working-directory: packages/cli
         run: pnpm jest
 
-  mysql:
-    name: MySQL
+  mariadb:
+    name: MariaDB
     runs-on: ubuntu-latest
     needs: build
     timeout-minutes: 20
@@ -96,16 +97,16 @@ jobs:
           path: ./packages/**/dist
           key: ${{ github.sha }}:db-tests
 
-      - name: Start MySQL
+      - name: Start MariaDB
         uses: isbang/compose-action@v2.0.0
         with:
           compose-file: ./.github/docker-compose.yml
           services: |
-            mysql
+            mariadb
 
-      - name: Test MySQL
+      - name: Test MariaDB
         working-directory: packages/cli
-        run: pnpm test:mysql --testTimeout 20000
+        run: pnpm test:mariadb --testTimeout 30000
 
   postgres:
     name: Postgres
@@ -147,7 +148,7 @@ jobs:
   notify-on-failure:
     name: Notify Slack on failure
     runs-on: ubuntu-latest
-    needs: [mysql, postgres]
+    needs: [mariadb, postgres]
     steps:
       - name: Notify Slack on failure
         uses: act10ns/slack@v2.0.0
@@ -156,4 +157,4 @@ jobs:
           status: ${{ job.status }}
           channel: '#alerts-build'
           webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
-          message: Postgres or MySQL tests failed (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
+          message: Postgres or MariaDB tests failed (${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
index 48a34c5eab..1ce7427098 100644
--- a/.github/workflows/ci-pull-requests.yml
+++ b/.github/workflows/ci-pull-requests.yml
@@ -49,6 +49,9 @@ jobs:
     with:
       ref: refs/pull/${{ github.event.pull_request.number }}/merge
       cacheKey: ${{ github.sha }}-base:build
+      collectCoverage: true
+    secrets:
+      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   lint:
     name: Lint
diff --git a/.github/workflows/docker-base-image.yml b/.github/workflows/docker-base-image.yml
index c32160e763..c2b5c9b6e6 100644
--- a/.github/workflows/docker-base-image.yml
+++ b/.github/workflows/docker-base-image.yml
@@ -20,26 +20,28 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: .
           file: ./docker/images/n8n-base/Dockerfile
diff --git a/.github/workflows/docker-images-benchmark.yml b/.github/workflows/docker-images-benchmark.yml
index b0aa6e997d..d4bf2f98a0 100644
--- a/.github/workflows/docker-images-benchmark.yml
+++ b/.github/workflows/docker-images-benchmark.yml
@@ -19,20 +19,22 @@ jobs:
       - uses: actions/checkout@v4.1.1
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: .
           file: ./packages/@n8n/benchmark/Dockerfile
diff --git a/.github/workflows/docker-images-custom.yml b/.github/workflows/docker-images-custom.yml
new file mode 100644
index 0000000000..dfc9d77a03
--- /dev/null
+++ b/.github/workflows/docker-images-custom.yml
@@ -0,0 +1,83 @@
+name: Docker Custom Image CI
+run-name: Build ${{ inputs.branch }} - ${{ inputs.user }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: 'GitHub branch to create image off.'
+        required: true
+      tag:
+        description: 'Name of the docker tag to create.'
+        required: true
+      merge-master:
+        description: 'Merge with master.'
+        type: boolean
+        required: true
+        default: false
+      user:
+        description: ''
+        required: false
+        default: 'none'
+      start-url:
+        description: 'URL to call after workflow is kicked off.'
+        required: false
+        default: ''
+      success-url:
+        description: 'URL to call after Docker Image got built successfully.'
+        required: false
+        default: ''
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Call Start URL - optionally
+        if: ${{ github.event.inputs.start-url != '' }}
+        run: curl -v -X POST -d 'url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' ${{github.event.inputs.start-url}} || echo ""
+        shell: bash
+
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+        with:
+          ref: ${{ github.event.inputs.branch }}
+
+      - name: Merge Master - optionally
+        if: github.event.inputs.merge-master
+        run: git remote add upstream https://github.com/n8n-io/n8n.git -f; git merge upstream/master --allow-unrelated-histories || echo ""
+        shell: bash
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.3.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.8.0
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push image to GHCR
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
+        with:
+          context: .
+          file: ./docker/images/n8n-custom/Dockerfile
+          build-args: |
+            N8N_RELEASE_TYPE=development
+          platforms: linux/amd64
+          provenance: false
+          push: true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          tags: ghcr.io/${{ github.repository_owner }}/n8n:${{ inputs.tag }}
+
+      - name: Call Success URL - optionally
+        if: ${{ github.event.inputs.success-url != '' }}
+        run: curl -v ${{github.event.inputs.success-url}} || echo ""
+        shell: bash
diff --git a/.github/workflows/docker-images-nightly.yml b/.github/workflows/docker-images-nightly.yml
index b6831b6399..c924f8b2c1 100644
--- a/.github/workflows/docker-images-nightly.yml
+++ b/.github/workflows/docker-images-nightly.yml
@@ -1,74 +1,42 @@
 name: Docker Nightly Image CI
-run-name: Build ${{ inputs.branch }} - ${{ inputs.user }}
 
 on:
   schedule:
-    - cron: '0 1 * * *'
+    - cron: '0 0 * * *'
   workflow_dispatch:
-    inputs:
-      branch:
-        description: 'GitHub branch to create image off.'
-        required: true
-        default: 'master'
-      tag:
-        description: 'Name of the docker tag to create.'
-        required: true
-        default: 'nightly'
-      merge-master:
-        description: 'Merge with master.'
-        type: boolean
-        required: true
-        default: false
-      user:
-        description: ''
-        required: false
-        default: 'schedule'
-      start-url:
-        description: 'URL to call after workflow is kicked off.'
-        required: false
-        default: ''
-      success-url:
-        description: 'URL to call after Docker Image got built successfully.'
-        required: false
-        default: ''
-
-env:
-  N8N_TAG: ${{ inputs.tag || 'nightly' }}
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
     steps:
-      - name: Call Start URL - optionally
-        run: |
-          [[ "${{github.event.inputs.start-url}}" != "" ]] && curl -v -X POST -d 'url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' ${{github.event.inputs.start-url}} || echo ""
-        shell: bash
-
       - name: Checkout
         uses: actions/checkout@v4.1.1
         with:
-          ref: ${{ github.event.inputs.branch || 'master' }}
+          ref: master
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.8.0
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3.3.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      - name: Merge Master - optionally
-        run: |
-          [[ "${{github.event.inputs.merge-master}}" == "true" ]] && git remote add upstream https://github.com/n8n-io/n8n.git -f; git merge upstream/master --allow-unrelated-histories || echo ""
-        shell: bash
-
-      - name: Build and push to DockerHub
-        uses: docker/build-push-action@v5.1.0
+      - name: Build and push image to GHCR and DockerHub
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: .
           file: ./docker/images/n8n-custom/Dockerfile
@@ -79,24 +47,6 @@ jobs:
           push: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          tags: ${{ secrets.DOCKER_USERNAME }}/n8n:${{ env.N8N_TAG }}
-
-      - name: Login to GitHub Container Registry
-        if: env.N8N_TAG == 'nightly'
-        uses: docker/login-action@v3.0.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Push image to GHCR
-        if: env.N8N_TAG == 'nightly'
-        run: |
-          docker buildx imagetools create \
-            --tag ghcr.io/${{ github.repository_owner }}/n8n:nightly \
+          tags: |
+            ghcr.io/${{ github.repository_owner }}/n8n:nightly
             ${{ secrets.DOCKER_USERNAME }}/n8n:nightly
-
-      - name: Call Success URL - optionally
-        run: |
-          [[ "${{github.event.inputs.success-url}}" != "" ]] && curl -v ${{github.event.inputs.success-url}} || echo ""
-        shell: bash
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index c3548a0cda..b95350a577 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -38,6 +38,12 @@ jobs:
       - name: Build
         run: pnpm build
 
+      - name: Cache build artifacts
+        uses: actions/cache/save@v4.0.0
+        with:
+          path: ./packages/**/dist
+          key: ${{ github.sha }}-release:build
+
       - name: Dry-run publishing
         run: pnpm publish -r --no-git-checks --dry-run
 
@@ -67,26 +73,28 @@ jobs:
           fetch-depth: 0
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.0.0
+        uses: docker/setup-qemu-action@v3.3.0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3.0.0
+        uses: docker/setup-buildx-action@v3.8.0
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build
-        uses: docker/build-push-action@v5.1.0
+        uses: docker/build-push-action@v6.11.0
+        env:
+          DOCKER_BUILD_SUMMARY: false
         with:
           context: ./docker/images/n8n
           build-args: |
@@ -119,6 +127,40 @@ jobs:
           makeLatest: false
           body: ${{github.event.pull_request.body}}
 
+  create-sentry-release:
+    name: Create a Sentry Release
+    needs: [publish-to-npm, publish-to-docker-hub]
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged == true
+    timeout-minutes: 5
+    env:
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - name: Restore cached build artifacts
+        uses: actions/cache/restore@v4.0.0
+        with:
+          path: ./packages/**/dist
+          key: ${{ github.sha }}-release:build
+
+      - name: Create a frontend release
+        uses: getsentry/action-release@v1.7.0
+        continue-on-error: true
+        with:
+          projects: ${{ secrets.SENTRY_FRONTEND_PROJECT }}
+          version: ${{ needs.publish-to-npm.outputs.release }}
+          sourcemaps: packages/editor-ui/dist
+
+      - name: Create a backend release
+        uses: getsentry/action-release@v1.7.0
+        continue-on-error: true
+        with:
+          projects: ${{ secrets.SENTRY_BACKEND_PROJECT }}
+          version: ${{ needs.publish-to-npm.outputs.release }}
+          sourcemaps: packages/cli/dist packages/core/dist packages/nodes-base/dist packages/@n8n/n8n-nodes-langchain/dist
+
   trigger-release-note:
     name: Trigger a release note
     needs: [publish-to-npm, create-github-release]
diff --git a/.github/workflows/release-push-to-channel.yml b/.github/workflows/release-push-to-channel.yml
index 3eda6d4ebb..9cb3a99b63 100644
--- a/.github/workflows/release-push-to-channel.yml
+++ b/.github/workflows/release-push-to-channel.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: docker/login-action@v3.0.0
+      - uses: docker/login-action@v3.3.0
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
-      - uses: docker/login-action@v3.0.0
+      - uses: docker/login-action@v3.3.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 2bb91dd065..2df829f7c6 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -4,18 +4,72 @@ on:
   schedule:
     - cron: '0 2 * * *'
   workflow_dispatch:
+  pull_request:
+    paths:
+      - packages/core/package.json
+      - packages/nodes-base/package.json
+      - packages/@n8n/nodes-langchain/package.json
+      - .github/workflows/test-workflows.yml
+  pull_request_review:
+    types: [submitted]
 
 jobs:
-  run-test-workflows:
+  build:
+    name: Install & Build
     runs-on: ubuntu-latest
-
-    timeout-minutes: 30
-
+    if: |
+      (github.event_name != 'pull_request_review' || startsWith(github.event.pull_request.base.ref, 'release/')) &&
+      !contains(github.event.pull_request.labels.*.name, 'community')
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v4.1.1
+      - run: corepack enable
+      - uses: actions/setup-node@v4.0.2
         with:
-          path: n8n
+          node-version: 20.x
+          cache: 'pnpm'
+      - run: pnpm install --frozen-lockfile
+
+      - name: Setup build cache
+        uses: rharkor/caching-for-turbo@v1.5
+
+      - name: Build Backend
+        run: pnpm build:backend
+
+      - name: Cache build artifacts
+        uses: actions/cache/save@v4.0.0
+        with:
+          path: ./packages/**/dist
+          key: ${{ github.sha }}:workflow-tests
+
+  run-test-workflows:
+    name: Workflow Tests
+    runs-on: ubuntu-latest
+    needs: build
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v4.1.1
+      - run: corepack enable
+      - uses: actions/setup-node@v4.0.2
+        with:
+          node-version: 20.x
+          cache: 'pnpm'
+      - run: pnpm install --frozen-lockfile
+
+      - name: Setup build cache
+        uses: rharkor/caching-for-turbo@v1.5
+
+      - name: Restore cached build artifacts
+        uses: actions/cache/restore@v4.0.0
+        with:
+          path: ./packages/**/dist
+          key: ${{ github.sha }}:workflow-tests
+
+      - name: Install OS dependencies
+        run: |
+          sudo apt update -y
+          echo 'tzdata tzdata/Areas select Europe' | sudo debconf-set-selections
+          echo 'tzdata tzdata/Zones/Europe select Paris' | sudo debconf-set-selections
+          DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y graphicsmagick
 
       - name: Checkout workflows repo
         uses: actions/checkout@v4.1.1
@@ -23,77 +77,34 @@ jobs:
           repository: n8n-io/test-workflows
           path: test-workflows
 
-      - run: corepack enable
-        working-directory: n8n
-
-      - uses: actions/setup-node@v4.0.2
-        with:
-          node-version: 20.x
-          cache: 'pnpm'
-          cache-dependency-path: 'n8n/pnpm-lock.yaml'
-
-      - name: Install dependencies
-        run: |
-          sudo apt update -y
-          echo 'tzdata tzdata/Areas select Europe' | sudo debconf-set-selections
-          echo 'tzdata tzdata/Zones/Europe select Paris' | sudo debconf-set-selections
-          DEBIAN_FRONTEND="noninteractive" sudo apt-get install -y graphicsmagick
-        shell: bash
-
-      - name: pnpm install and build
-        working-directory: n8n
-        run: |
-          pnpm install --frozen-lockfile
-          pnpm build:backend
-        shell: bash
-
       - name: Import credentials
-        run: n8n/packages/cli/bin/n8n import:credentials --input=test-workflows/credentials.json
-        shell: bash
+        run: packages/cli/bin/n8n import:credentials --input=test-workflows/credentials.json
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
 
       - name: Import workflows
-        run: n8n/packages/cli/bin/n8n import:workflow --separate --input=test-workflows/workflows
-        shell: bash
+        run: packages/cli/bin/n8n import:workflow --separate --input=test-workflows/workflows
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
 
       - name: Copy static assets
         run: |
-          cp n8n/assets/n8n-logo.png /tmp/n8n-logo.png
-          cp n8n/assets/n8n-screenshot.png /tmp/n8n-screenshot.png
+          cp assets/n8n-logo.png /tmp/n8n-logo.png
+          cp assets/n8n-screenshot.png /tmp/n8n-screenshot.png
           cp test-workflows/testData/pdfs/*.pdf /tmp/
-        shell: bash
 
       - name: Run tests
-        run: n8n/packages/cli/bin/n8n executeBatch --shallow --skipList=test-workflows/skipList.txt --githubWorkflow --shortOutput --concurrency=16 --compare=test-workflows/snapshots
-        shell: bash
+        run: packages/cli/bin/n8n executeBatch --shallow --skipList=test-workflows/skipList.txt --githubWorkflow --shortOutput --concurrency=16 --compare=test-workflows/snapshots
         id: tests
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
           SKIP_STATISTICS_EVENTS: true
           DB_SQLITE_POOL_SIZE: 4
-      # -
-      #   name: Export credentials
-      #   if: always()
-      #   run: n8n/packages/cli/bin/n8n export:credentials --output=test-workflows/credentials.json --all --pretty
-      #   shell: bash
-      #   env:
-      #     N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
-      # -
-      #   name: Commit and push credential changes
-      #   if: always()
-      #   run: |
-      #     cd test-workflows
-      #     git config --global user.name 'n8n test bot'
-      #     git config --global user.email 'n8n-test-bot@users.noreply.github.com'
-      #     git commit -am "Automated credential update"
-      #     git push --force --quiet "https://janober:${{ secrets.TOKEN }}@github.com/n8n-io/test-workflows.git" main:main
+          N8N_SENTRY_DSN: ${{secrets.CI_SENTRY_DSN}}
 
       - 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/.github/workflows/units-tests-reusable.yml b/.github/workflows/units-tests-reusable.yml
index 60bf593e82..62eca74b15 100644
--- a/.github/workflows/units-tests-reusable.yml
+++ b/.github/workflows/units-tests-reusable.yml
@@ -22,6 +22,10 @@ on:
         required: false
         default: false
         type: boolean
+      ignoreTurboCache:
+        required: false
+        default: false
+        type: boolean
     secrets:
       CODECOV_TOKEN:
         description: 'Codecov upload token.'
@@ -32,6 +36,7 @@ jobs:
     name: Unit tests
     runs-on: ubuntu-latest
     env:
+      TURBO_FORCE: ${{ inputs.ignoreTurboCache }}
       COVERAGE_ENABLED: ${{ inputs.collectCoverage }}
     steps:
       - uses: actions/checkout@v4.1.1
@@ -49,7 +54,6 @@ jobs:
         run: pnpm install --frozen-lockfile
 
       - name: Setup build cache
-        if: inputs.collectCoverage != true
         uses: rharkor/caching-for-turbo@v1.5
 
       - name: Build
@@ -74,6 +78,6 @@ jobs:
 
       - name: Upload coverage to Codecov
         if: inputs.collectCoverage
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v5.1.2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 681de6c024..0c5abcba47 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -7,6 +7,7 @@
 		"EditorConfig.EditorConfig",
 		"esbenp.prettier-vscode",
 		"mjmlio.vscode-mjml",
-		"Vue.volar"
+		"Vue.volar",
+		"vitest.explorer"
 	]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 448d745236..5501fe4439 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -47,9 +47,7 @@
 			"request": "launch",
 			"skipFiles": ["<node_internals>/**"],
 			"type": "node",
-			"env": {
-				// "N8N_PORT": "5679",
-			},
+			"envFile": "${workspaceFolder}/.env",
 			"outputCapture": "std",
 			"killBehavior": "polite"
 		},
diff --git a/CHANGELOG.md b/CHANGELOG.md
index baa7b95b7c..1629f7ec29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,476 @@
+# [1.75.0](https://github.com/n8n-io/n8n/compare/n8n@1.74.0...n8n@1.75.0) (2025-01-15)
+
+
+### Bug Fixes
+
+* **core:** AugmentObject should check for own propeties correctly ([#12534](https://github.com/n8n-io/n8n/issues/12534)) ([0cdf393](https://github.com/n8n-io/n8n/commit/0cdf39374305e6bbcedb047db7d3756168e6e89e))
+* **core:** Disallow code generation in task runner ([#12522](https://github.com/n8n-io/n8n/issues/12522)) ([35b6180](https://github.com/n8n-io/n8n/commit/35b618098b7d23e272bf77b55c172dbe531c821f))
+* **core:** Fix node exclusion on the frontend types ([#12544](https://github.com/n8n-io/n8n/issues/12544)) ([b2cbed9](https://github.com/n8n-io/n8n/commit/b2cbed9865888f6f3bc528984d4091d86a88f0d6))
+* **core:** Fix orchestration flow with expired license ([#12444](https://github.com/n8n-io/n8n/issues/12444)) ([ecff3b7](https://github.com/n8n-io/n8n/commit/ecff3b732a028d7225bfbed4ffc65dc20c4ed608))
+* **core:** Fix Sentry error reporting on task runners ([#12495](https://github.com/n8n-io/n8n/issues/12495)) ([88c0838](https://github.com/n8n-io/n8n/commit/88c0838dd72f11646bdb3586223d6c16631cccab))
+* **core:** Improve cyclic dependency check in the DI container ([#12600](https://github.com/n8n-io/n8n/issues/12600)) ([c3c4a20](https://github.com/n8n-io/n8n/commit/c3c4a200024fb08afb9380357d1490c6707c5ec3))
+* **core:** Only show personal credentials in the personal space ([#12433](https://github.com/n8n-io/n8n/issues/12433)) ([8a42d55](https://github.com/n8n-io/n8n/commit/8a42d55d91f4a37fff5669d52d52428b3a4ddd44))
+* **core:** Prefix package name in `supportedNodes` on generated types as well ([#12514](https://github.com/n8n-io/n8n/issues/12514)) ([4a1a999](https://github.com/n8n-io/n8n/commit/4a1a9993624c92dd81f5418f9268cb93878069ab))
+* **core:** Prevent prototype pollution in task runner ([#12588](https://github.com/n8n-io/n8n/issues/12588)) ([bdf266c](https://github.com/n8n-io/n8n/commit/bdf266cf55032d05641b20dce8804412dc93b6d5))
+* **core:** Prevent prototype pollution of internal classes in task runner ([#12610](https://github.com/n8n-io/n8n/issues/12610)) ([eceee7f](https://github.com/n8n-io/n8n/commit/eceee7f3f8899d200b1c5720087cc494eec22e6a))
+* **core:** Use timing safe function to compare runner auth tokens ([#12485](https://github.com/n8n-io/n8n/issues/12485)) ([8fab98f](https://github.com/n8n-io/n8n/commit/8fab98f3f1f767d05825d24cbf155d56375fdb3e))
+* **core:** Validate values which are intentionally 0 ([#12382](https://github.com/n8n-io/n8n/issues/12382)) ([562506e](https://github.com/n8n-io/n8n/commit/562506e92aeb26423145801bff80037e5ce2ac46))
+* Don't break oauth credentials when updating them and allow fixing broken oauth credentials by repeating the authorization flow ([#12563](https://github.com/n8n-io/n8n/issues/12563)) ([73897c7](https://github.com/n8n-io/n8n/commit/73897c7662a432834eb6f9d0f9ace8d986c1acb5))
+* **editor:** Don't show toolsUnused notice if run had errors ([#12529](https://github.com/n8n-io/n8n/issues/12529)) ([3ec5b28](https://github.com/n8n-io/n8n/commit/3ec5b2850c47057032e61c2acdbdfc1dcdd931f7))
+* **editor:** Ensure proper "AI Template" URL construction in node creator ([#12566](https://github.com/n8n-io/n8n/issues/12566)) ([13bf69f](https://github.com/n8n-io/n8n/commit/13bf69f75c67bc37a37013e776525768676a4b88))
+* **editor:** Fix NDV resize handle and scrollbar overlapping ([#12509](https://github.com/n8n-io/n8n/issues/12509)) ([c28f302](https://github.com/n8n-io/n8n/commit/c28f302c2f863bd7aa73ad52e5d040f927e33220))
+* **editor:** Fix parameter input validation ([#12532](https://github.com/n8n-io/n8n/issues/12532)) ([6711cbc](https://github.com/n8n-io/n8n/commit/6711cbcc641a2fc70f5c15a7e2dcc640a3f98b66))
+* **editor:** Fix selection rectangle context menu on new canvas ([#12584](https://github.com/n8n-io/n8n/issues/12584)) ([c8e3c53](https://github.com/n8n-io/n8n/commit/c8e3c5399efde93486c1dd5c373cb2c5ff8a0691))
+* **editor:** Fix the `openselectivenodecreator` custom action on new canvas ([#12580](https://github.com/n8n-io/n8n/issues/12580)) ([2110e9a](https://github.com/n8n-io/n8n/commit/2110e9a0513b8c36beb85302e0d38a2658ea5d6e))
+* **editor:** Fix workflow initilisation for test definition routes & add unit tests ([#12507](https://github.com/n8n-io/n8n/issues/12507)) ([2775f61](https://github.com/n8n-io/n8n/commit/2775f617ae5c267c0a1ce7a54d05d4077cdbc0f7))
+* **editor:** Make clicking item in RLC work the first time on small screens ([#12585](https://github.com/n8n-io/n8n/issues/12585)) ([479933f](https://github.com/n8n-io/n8n/commit/479933fbd5c88e783827960e018abb979de8a039))
+* **editor:** Make sure code editors work correctly in fullscreen ([#12597](https://github.com/n8n-io/n8n/issues/12597)) ([aa1f3a7](https://github.com/n8n-io/n8n/commit/aa1f3a7d989883d55df3777775b8d7d336f6e3b7))
+* **editor:** Override selected nodes on single click without Meta/Ctrl key ([#12549](https://github.com/n8n-io/n8n/issues/12549)) ([02c2d5e](https://github.com/n8n-io/n8n/commit/02c2d5e71d15b9292fddd585f47bd8334da468c5))
+* **editor:** Show NDV errors when opening existing nodes with errors ([#12567](https://github.com/n8n-io/n8n/issues/12567)) ([bee7267](https://github.com/n8n-io/n8n/commit/bee7267fe38ab12a79fa4ec0e775f45d98d48aa5))
+* **editor:** Swap Activate/Deactivate texts in FloatingToolbar ([#12526](https://github.com/n8n-io/n8n/issues/12526)) ([44679b4](https://github.com/n8n-io/n8n/commit/44679b42aa1e14bc7069bee47d0a91ca84b1dba4))
+* **editor:** Update filter and feedback for source control ([#12504](https://github.com/n8n-io/n8n/issues/12504)) ([865fc21](https://github.com/n8n-io/n8n/commit/865fc21276727e8d88ccee0355147904b81c4421))
+* **editor:** Update selected node when navigating via flowing nodes ([#12581](https://github.com/n8n-io/n8n/issues/12581)) ([88659d8](https://github.com/n8n-io/n8n/commit/88659d8a2901786c894902e19466f395bcdaab8e))
+* **Google Calendar Node:** Updates and fixes ([#10715](https://github.com/n8n-io/n8n/issues/10715)) ([7227a29](https://github.com/n8n-io/n8n/commit/7227a29845fd178ced4d281597c62e7a03245456))
+* **Spotify Node:** Fix issue with null values breaking the response ([#12080](https://github.com/n8n-io/n8n/issues/12080)) ([a56a462](https://github.com/n8n-io/n8n/commit/a56a46259d257003c813103578260d625b3f17dd))
+
+
+### Features
+
+* **editor:** Make node credential select searchable ([#12497](https://github.com/n8n-io/n8n/issues/12497)) ([91277c4](https://github.com/n8n-io/n8n/commit/91277c44f1cf3f334b3b50d47d7dcc79b11c7c63))
+* **editor:** Persist sidebar collapsed status preference ([#12505](https://github.com/n8n-io/n8n/issues/12505)) ([dba7d46](https://github.com/n8n-io/n8n/commit/dba7d46f3ec91d26a597a50dede7b6ca292c728f))
+
+
+
+# [1.74.0](https://github.com/n8n-io/n8n/compare/n8n@1.73.0...n8n@1.74.0) (2025-01-08)
+
+
+### Bug Fixes
+
+* **core:** Align concurrency and timeout defaults between instance and runner ([#12503](https://github.com/n8n-io/n8n/issues/12503)) ([9953477](https://github.com/n8n-io/n8n/commit/9953477450c28ec2d211e55aadb825dbae2ee4d6))
+* **core:** Allow `index` as top-level item key for Code node ([#12469](https://github.com/n8n-io/n8n/issues/12469)) ([1b91000](https://github.com/n8n-io/n8n/commit/1b9100032fc9f8c33e263c8299e04054105da384))
+* **core:** Don't fail task runner task if logging fails ([#12401](https://github.com/n8n-io/n8n/issues/12401)) ([0860fbe](https://github.com/n8n-io/n8n/commit/0860fbe97108edc21bc01dec3b6ef13e60e728d4))
+* **core:** Ensure tasks timeout even if they don't receive settings ([#12431](https://github.com/n8n-io/n8n/issues/12431)) ([b194026](https://github.com/n8n-io/n8n/commit/b1940268e6110ed3d8949318a5252ac6563d624f))
+* **core:** Fix execution cancellation issues in scaling mode ([#12343](https://github.com/n8n-io/n8n/issues/12343)) ([e26b406](https://github.com/n8n-io/n8n/commit/e26b406665e20761279c4e315d04501350427de5))
+* **core:** Fix manually running a pinned trigger with offloading enabled ([#12491](https://github.com/n8n-io/n8n/issues/12491)) ([be2dcff](https://github.com/n8n-io/n8n/commit/be2dcffc9487973d3e287dd4f6956dbba03757e3))
+* **core:** Fix task runner sending too many offers ([#12415](https://github.com/n8n-io/n8n/issues/12415)) ([4498e35](https://github.com/n8n-io/n8n/commit/4498e3519276020d3eb01752b5ce0d8ecfbf5fa4))
+* **core:** Increase default concurrency and timeout in task runners ([#12496](https://github.com/n8n-io/n8n/issues/12496)) ([4182095](https://github.com/n8n-io/n8n/commit/4182095af1c02832af2523f31e9cb85d9a345e60))
+* **core:** Prevent `__default__` jobs in scaling mode ([#12402](https://github.com/n8n-io/n8n/issues/12402)) ([072664b](https://github.com/n8n-io/n8n/commit/072664b40e06943e0b8ff44287730f2ca569646f))
+* **core:** Register workflows as active only after all of the triggers and pollers setup successfully ([#12244](https://github.com/n8n-io/n8n/issues/12244)) ([f924f2a](https://github.com/n8n-io/n8n/commit/f924f2a6d736e33ab5fc12cbac6cba27340839db))
+* **core:** Return unredacted credentials from `GET credentials/:id` ([#12447](https://github.com/n8n-io/n8n/issues/12447)) ([ecabe34](https://github.com/n8n-io/n8n/commit/ecabe34705bbbba07613ba14760449ef38e1b31f))
+* **core:** Use rate limiter for task runner endpoints ([#12486](https://github.com/n8n-io/n8n/issues/12486)) ([491cb60](https://github.com/n8n-io/n8n/commit/491cb605e3c93d7a261bb0cef0d38f2ddc3affe8))
+* **editor:** Allow zooming when panning keycode is pressed on new canvas ([#12327](https://github.com/n8n-io/n8n/issues/12327)) ([983e87a](https://github.com/n8n-io/n8n/commit/983e87a9b0c83d35354ce4df34096f47173d0ea7))
+* **editor:** Consistent protected environment styling and messaging ([#12374](https://github.com/n8n-io/n8n/issues/12374)) ([6891cef](https://github.com/n8n-io/n8n/commit/6891cefa6d0359f85a596829b6055a13529fb1fb))
+* **editor:** First project button tweaks border and copy ([#12376](https://github.com/n8n-io/n8n/issues/12376)) ([e234756](https://github.com/n8n-io/n8n/commit/e234756457d3c3526531ced4471bf9e69a79fa55))
+* **editor:** Fix Multi option parameter expression when the value is an array ([#12430](https://github.com/n8n-io/n8n/issues/12430)) ([452a7bf](https://github.com/n8n-io/n8n/commit/452a7bfe2c1e786c46a3ed99de007b0cf3f28d15))
+* **editor:** Improve configurable nodes design on new canvas ([#12317](https://github.com/n8n-io/n8n/issues/12317)) ([0ecce10](https://github.com/n8n-io/n8n/commit/0ecce10faf60ae44d11007d45e87766b678d3a84))
+* **editor:** Minor styling improvements in project settings page ([#12405](https://github.com/n8n-io/n8n/issues/12405)) ([09ddce0](https://github.com/n8n-io/n8n/commit/09ddce05800f426d33489ae28c416bb6aab2fd91))
+* **editor:** Never show Pinned Data Callout for Input Panel ([#12446](https://github.com/n8n-io/n8n/issues/12446)) ([1d5c9bd](https://github.com/n8n-io/n8n/commit/1d5c9bd466becf8aa245a1e8d0b799616d18914a))
+* **editor:** Nodes' icon color in dark mode ([#12279](https://github.com/n8n-io/n8n/issues/12279)) ([01b781a](https://github.com/n8n-io/n8n/commit/01b781a10828ca2c4cf32762373ad40904c02d2c))
+* **editor:** Only ignore managed credentials in the HTTP node ([#12417](https://github.com/n8n-io/n8n/issues/12417)) ([6b46657](https://github.com/n8n-io/n8n/commit/6b46657412a1efff35be5083f0ff4c00f9b3e7f9))
+* **editor:** Remove primary highlight color from edge being executed on new canvas ([#12307](https://github.com/n8n-io/n8n/issues/12307)) ([50913de](https://github.com/n8n-io/n8n/commit/50913de2651450e18307a833ada57656d8959493))
+* **editor:** Render empty string instead of [empty] ([#12448](https://github.com/n8n-io/n8n/issues/12448)) ([2c72047](https://github.com/n8n-io/n8n/commit/2c72047d0b260db5a4b1fd0d7448ab19378e908f))
+* **editor:** Show all workflows in the error workflow dropdown in the workflow settings ([#12413](https://github.com/n8n-io/n8n/issues/12413)) ([ccda7f9](https://github.com/n8n-io/n8n/commit/ccda7f9c62e2ba04dbd8a86cfeb5016b56f19c7a))
+* **editor:** Unify disabled parameters background color ([#12306](https://github.com/n8n-io/n8n/issues/12306)) ([8c63599](https://github.com/n8n-io/n8n/commit/8c635993bd65c84707938d9564d54c1ae17f1c1f))
+* **HTTP Request Node:** Fix typo in hint ([#12439](https://github.com/n8n-io/n8n/issues/12439)) ([b6230b6](https://github.com/n8n-io/n8n/commit/b6230b63f2ed8c7531b53c896f8b033c599e156e))
+* **OpenAI Node:** Add quotes to default base URL ([#12312](https://github.com/n8n-io/n8n/issues/12312)) ([2e90eba](https://github.com/n8n-io/n8n/commit/2e90eba47eff81f8b17a305cbc1656f929d622f8))
+* **OpenAI Node:** Update node to account for URL in credentials ([#12356](https://github.com/n8n-io/n8n/issues/12356)) ([f78cceb](https://github.com/n8n-io/n8n/commit/f78ccebe514819dca03f5c220274b94fd6d1c73b))
+* **Postgres Node:** Account for JSON expressions ([#12012](https://github.com/n8n-io/n8n/issues/12012)) ([06b86af](https://github.com/n8n-io/n8n/commit/06b86af7356b3be0af146c49f9720b24157b9e61))
+* **Postgres Node:** Allow passing in arrays to JSON columns for insert ([#12452](https://github.com/n8n-io/n8n/issues/12452)) ([9dd0686](https://github.com/n8n-io/n8n/commit/9dd068632b1542126831baa83cf638ce369b0947))
+* **Postgres Node:** Re-use connection pool across executions ([#12346](https://github.com/n8n-io/n8n/issues/12346)) ([2ca37f5](https://github.com/n8n-io/n8n/commit/2ca37f5f7f7f80c50dbc8c87146b8bff510f01c8))
+* Run workflow if active and single webhook service has pin data ([#12425](https://github.com/n8n-io/n8n/issues/12425)) ([8053a4a](https://github.com/n8n-io/n8n/commit/8053a4a1763d143da80b9e4e00dcef9b716ce6b2))
+* Set correct default for added Resource Mapper boolean fields ([#12344](https://github.com/n8n-io/n8n/issues/12344)) ([b4c77f2](https://github.com/n8n-io/n8n/commit/b4c77f27b66275ddb58138e8d2fe1509265e9652))
+* **Supabase Node:** Allow for filtering on the same field multiple times ([#12429](https://github.com/n8n-io/n8n/issues/12429)) ([d7cc789](https://github.com/n8n-io/n8n/commit/d7cc789d79477aff40ff4eca0175c7578aef338a))
+* **Zep Vector Store Node:** Cloud vector store integration ([#12353](https://github.com/n8n-io/n8n/issues/12353)) ([2433d6b](https://github.com/n8n-io/n8n/commit/2433d6b7d3dede2595dd5b637ca8bbc1103272b3))
+
+
+### Features
+
+* (Execute Workflow Node): Inputs for Sub-workflows ([#11830](https://github.com/n8n-io/n8n/issues/11830)) ([#11837](https://github.com/n8n-io/n8n/issues/11837)) ([d411663](https://github.com/n8n-io/n8n/commit/d4116630a638195c7d87e01e2b5c151941636056))
+* Add load options to new tool mode for vector stores ([#12462](https://github.com/n8n-io/n8n/issues/12462)) ([3109de6](https://github.com/n8n-io/n8n/commit/3109de6073b237ee3dcc93afb69345586f3b836d))
+* Add migration to add `managed` column to credentials table ([#12275](https://github.com/n8n-io/n8n/issues/12275)) ([3cb7081](https://github.com/n8n-io/n8n/commit/3cb70814465e8fa504e909ef36b21b79d4b70b28))
+* Allow using Vector Stores directly as Tools ([#12311](https://github.com/n8n-io/n8n/issues/12311)) ([76dded4](https://github.com/n8n-io/n8n/commit/76dded4bea9d26ad84fdbde74d577d244eb4e223))
+* **core:** Add endpoint to create free AI credits ([#12362](https://github.com/n8n-io/n8n/issues/12362)) ([ac4e042](https://github.com/n8n-io/n8n/commit/ac4e0422316a4dcd19151dd7d504e2b3cccbc038))
+* **core:** Add includeData parameter to `GET /credentials` ([#12220](https://github.com/n8n-io/n8n/issues/12220)) ([f56ad8c](https://github.com/n8n-io/n8n/commit/f56ad8cf49f7cf0665035d2e43bb7ff5b8fd75f3))
+* **core:** Comply with `NO_COLOR` in logs ([#12347](https://github.com/n8n-io/n8n/issues/12347)) ([1e60bbc](https://github.com/n8n-io/n8n/commit/1e60bbcf169e8624a97ddde543cdd1d406e5c7ca))
+* **core:** Offload manual executions to workers ([#11284](https://github.com/n8n-io/n8n/issues/11284)) ([9432aa0](https://github.com/n8n-io/n8n/commit/9432aa0b00e74faf4651ac673f18e16b7e56e145))
+* **editor:** Add free AI credits CTA ([#12365](https://github.com/n8n-io/n8n/issues/12365)) ([f873196](https://github.com/n8n-io/n8n/commit/f8731963f6754386f15c8417c0cc32dba87c481a))
+* **editor:** Add support for project icons ([#12349](https://github.com/n8n-io/n8n/issues/12349)) ([9117718](https://github.com/n8n-io/n8n/commit/9117718cc960e2bad5a5db07b10e9e7b561ec5e4))
+* **editor:** Easy AI workflow improvements ([#12400](https://github.com/n8n-io/n8n/issues/12400)) ([8dc691d](https://github.com/n8n-io/n8n/commit/8dc691dc62692f8af143c84032391397adeb790d))
+* **editor:** Make workflows, credentials, executions and new canvas usable on mobile and touch devices ([#12372](https://github.com/n8n-io/n8n/issues/12372)) ([06c9473](https://github.com/n8n-io/n8n/commit/06c94732103687705d71c5a1c5bfa993e3df3427))
+* **editor:** New Code editor based on the TypeScript language service ([#12285](https://github.com/n8n-io/n8n/issues/12285)) ([52ae02a](https://github.com/n8n-io/n8n/commit/52ae02abaa92e5bbfda58843c8eccc845506fa4b))
+* **editor:** Update Sub-Workflow Debugging Copy ([#12483](https://github.com/n8n-io/n8n/issues/12483)) ([04e2928](https://github.com/n8n-io/n8n/commit/04e2928d345f83c202c762e4673cf878b4762f33))
+* **Google Vertex Chat Model Node:** Add an option to specify GCP region ([#12300](https://github.com/n8n-io/n8n/issues/12300)) ([30f9c03](https://github.com/n8n-io/n8n/commit/30f9c033db28112e1f97bb55d41b5bfce265cb51))
+* **HighLevel Node:** Add support for calendar items ([#10820](https://github.com/n8n-io/n8n/issues/10820)) ([6e189fd](https://github.com/n8n-io/n8n/commit/6e189fda776051e09e90b3d86ecd0d1e80dcc0c6))
+* **Microsoft Entra ID Node:** New node ([#11779](https://github.com/n8n-io/n8n/issues/11779)) ([3006ccf](https://github.com/n8n-io/n8n/commit/3006ccf41bb911ba72f087a1479889fbf308c17d))
+
+
+
+# [1.73.0](https://github.com/n8n-io/n8n/compare/n8n@1.72.0...n8n@1.73.0) (2024-12-19)
+
+
+### Bug Fixes
+
+* **core:** Ensure runners do not throw on unsupported console methods ([#12167](https://github.com/n8n-io/n8n/issues/12167)) ([57c6a61](https://github.com/n8n-io/n8n/commit/57c6a6167dd2b30f0082a416daefce994ecad33a))
+* **core:** Fix `$getWorkflowStaticData` on task runners ([#12153](https://github.com/n8n-io/n8n/issues/12153)) ([b479f14](https://github.com/n8n-io/n8n/commit/b479f14ef5012551b823bea5d2ffbddedfd50a77))
+* **core:** Fix binary data helpers (like `prepareBinaryData`) with task runner ([#12259](https://github.com/n8n-io/n8n/issues/12259)) ([0f1461f](https://github.com/n8n-io/n8n/commit/0f1461f2d5d7ec34236ed7fcec3e2f9ee7eb73c4))
+* **core:** Fix race condition in AI tool invocation with multiple items from the parent ([#12169](https://github.com/n8n-io/n8n/issues/12169)) ([dce0c58](https://github.com/n8n-io/n8n/commit/dce0c58f8605c33fc50ec8aa422f0fb5eee07637))
+* **core:** Fix serialization of circular json with task runner ([#12288](https://github.com/n8n-io/n8n/issues/12288)) ([a99d726](https://github.com/n8n-io/n8n/commit/a99d726f42d027b64f94eda0d385b597c5d5be2e))
+* **core:** Upgrade nanoid to address CVE-2024-55565 ([#12171](https://github.com/n8n-io/n8n/issues/12171)) ([8c0bd02](https://github.com/n8n-io/n8n/commit/8c0bd0200c386b122f495c453ccc97a001e4729c))
+* **editor:** Add new create first project CTA ([#12189](https://github.com/n8n-io/n8n/issues/12189)) ([878b419](https://github.com/n8n-io/n8n/commit/878b41904d76eda3ee230f850127b4d56993de24))
+* **editor:** Fix canvas ready opacity transition on new canvas ([#12264](https://github.com/n8n-io/n8n/issues/12264)) ([5d33a6b](https://github.com/n8n-io/n8n/commit/5d33a6ba8a2bccea097402fd04c0e2b00e423e76))
+* **editor:** Fix rendering of code-blocks in sticky notes ([#12227](https://github.com/n8n-io/n8n/issues/12227)) ([9b59035](https://github.com/n8n-io/n8n/commit/9b5903524b95bd21d5915908780942790cf88d27))
+* **editor:** Fix sticky color picker getting covered by nodes on new canvas ([#12263](https://github.com/n8n-io/n8n/issues/12263)) ([27bd3c8](https://github.com/n8n-io/n8n/commit/27bd3c85b3a4ddcf763a543b232069bb108130cf))
+* **editor:** Improve commit modal user facing messaging ([#12161](https://github.com/n8n-io/n8n/issues/12161)) ([ad39243](https://github.com/n8n-io/n8n/commit/ad392439826b17bd0b84f981e0958d88f09e7fe9))
+* **editor:** Prevent connection line from showing when clicking the plus button of a node ([#12265](https://github.com/n8n-io/n8n/issues/12265)) ([9180b46](https://github.com/n8n-io/n8n/commit/9180b46b52302b203eecf3bb81c3f2132527a1e6))
+* **editor:** Prevent stickies from being edited in preview mode in the new canvas ([#12222](https://github.com/n8n-io/n8n/issues/12222)) ([6706dcd](https://github.com/n8n-io/n8n/commit/6706dcdf72d54f33c1cf4956602c3a64a1578826))
+* **editor:** Reduce cases for Auto-Add of ChatTrigger for AI Agents ([#12154](https://github.com/n8n-io/n8n/issues/12154)) ([365e82d](https://github.com/n8n-io/n8n/commit/365e82d2008dff2f9c91664ee04d7a78363a8b30))
+* **editor:** Remove invalid connections after node handles change ([#12247](https://github.com/n8n-io/n8n/issues/12247)) ([6330bec](https://github.com/n8n-io/n8n/commit/6330bec4db0175b558f2747837323fdbb25b634a))
+* **editor:** Set dangerouslyUseHTMLString in composable ([#12280](https://github.com/n8n-io/n8n/issues/12280)) ([6ba91b5](https://github.com/n8n-io/n8n/commit/6ba91b5e1ed197c67146347a6f6e663ecdf3de48))
+* **editor:** Set RunData outputIndex based on incoming data ([#12182](https://github.com/n8n-io/n8n/issues/12182)) ([dc4261a](https://github.com/n8n-io/n8n/commit/dc4261ae7eca6cf277404cd514c90fad42f14ae0))
+* **editor:** Update the universal create button interaction ([#12105](https://github.com/n8n-io/n8n/issues/12105)) ([5300e0a](https://github.com/n8n-io/n8n/commit/5300e0ac45bf832b3d2957198a49a1c687f3fe1f))
+* **Elasticsearch Node:** Fix issue stopping search queries being sent ([#11464](https://github.com/n8n-io/n8n/issues/11464)) ([388a83d](https://github.com/n8n-io/n8n/commit/388a83dfbdc6ac301e4df704666df9f09fb7d0b3))
+* **Extract from File Node:** Detect file encoding  ([#12081](https://github.com/n8n-io/n8n/issues/12081)) ([92af245](https://github.com/n8n-io/n8n/commit/92af245d1aab5bfad8618fda69b2405f5206875d))
+* **Github Node:** Fix fetch of file names with ? character ([#12206](https://github.com/n8n-io/n8n/issues/12206)) ([39462ab](https://github.com/n8n-io/n8n/commit/39462abe1fde7e82b5e5b8f3ceebfcadbfd7c925))
+* **Invoice Ninja Node:** Fix actions for bank transactions ([#11511](https://github.com/n8n-io/n8n/issues/11511)) ([80eea49](https://github.com/n8n-io/n8n/commit/80eea49cf0bf9db438eb85af7cd22aeb11fbfed2))
+* **Linear Node:** Fix issue with error handling ([#12191](https://github.com/n8n-io/n8n/issues/12191)) ([b8eae5f](https://github.com/n8n-io/n8n/commit/b8eae5f28a7d523195f4715cd8da77b3a884ae4c))
+* **MongoDB Node:** Fix checks on projection feature call ([#10563](https://github.com/n8n-io/n8n/issues/10563)) ([58bab46](https://github.com/n8n-io/n8n/commit/58bab461c4c5026b2ca5ea143cbcf98bf3a4ced8))
+* **Postgres Node:** Allow users to wrap strings with $$  ([#12034](https://github.com/n8n-io/n8n/issues/12034)) ([0c15e30](https://github.com/n8n-io/n8n/commit/0c15e30778cc5cb10ed368df144d6fbb2504ec70))
+* **Redis Node:** Add support for username auth ([#12274](https://github.com/n8n-io/n8n/issues/12274)) ([64c0414](https://github.com/n8n-io/n8n/commit/64c0414ef28acf0f7ec42b4b0bb21cbf2921ebe7))
+
+
+### Features
+
+* Add solarwinds ipam credentials ([#12005](https://github.com/n8n-io/n8n/issues/12005)) ([882484e](https://github.com/n8n-io/n8n/commit/882484e8ee7d1841d5d600414ca48e9915abcfa8))
+* Add SolarWinds Observability node credentials ([#11805](https://github.com/n8n-io/n8n/issues/11805)) ([e8a5db5](https://github.com/n8n-io/n8n/commit/e8a5db5beb572edbb61dd9100b70827ccc4cca58))
+* **AI Agent Node:** Update descriptions and titles for Chat Trigger options in AI Agents and Memory ([#12155](https://github.com/n8n-io/n8n/issues/12155)) ([07a6ae1](https://github.com/n8n-io/n8n/commit/07a6ae11b3291c1805553d55ba089fe8dd919fd8))
+* **API:** Exclude pinned data from workflows ([#12261](https://github.com/n8n-io/n8n/issues/12261)) ([e0dc385](https://github.com/n8n-io/n8n/commit/e0dc385f8bc8ee13fbc5bbf35e07654e52b193e9))
+* **editor:** Params pane collection improvements ([#11607](https://github.com/n8n-io/n8n/issues/11607)) ([6e44c71](https://github.com/n8n-io/n8n/commit/6e44c71c9ca82cce20eb55bb9003930bbf66a16c))
+* **editor:** Support adding nodes via drag and drop from node creator on new canvas ([#12197](https://github.com/n8n-io/n8n/issues/12197)) ([1bfd9c0](https://github.com/n8n-io/n8n/commit/1bfd9c0e913f3eefc4593f6c344db1ae1f6e4df4))
+* **Facebook Graph API Node:** Update node to support API v21.0 ([#12116](https://github.com/n8n-io/n8n/issues/12116)) ([14c33f6](https://github.com/n8n-io/n8n/commit/14c33f666fe92f7173e4f471fb478e629e775c62))
+* **Linear Trigger Node:** Add support for admin scope ([#12211](https://github.com/n8n-io/n8n/issues/12211)) ([410ea9a](https://github.com/n8n-io/n8n/commit/410ea9a2ef2e14b5e8e4493e5db66cfc2290d8f6))
+* **MailerLite Node:** Update node to support new api ([#11933](https://github.com/n8n-io/n8n/issues/11933)) ([d6b8e65](https://github.com/n8n-io/n8n/commit/d6b8e65abeb411f86538c1630dcce832ee0846a9))
+* Send and wait operation - freeText and customForm response types ([#12106](https://github.com/n8n-io/n8n/issues/12106)) ([e98c7f1](https://github.com/n8n-io/n8n/commit/e98c7f160b018243dc88490d46fb1047a4d7fcdc))
+
+
+### Performance Improvements
+
+* **editor:** SchemaView performance improvement by ≈90% 🚀  ([#12180](https://github.com/n8n-io/n8n/issues/12180)) ([6a58309](https://github.com/n8n-io/n8n/commit/6a5830959f5fb493a4119869b8298d8ed702c84a))
+
+
+
+# [1.72.0](https://github.com/n8n-io/n8n/compare/n8n@1.71.0...n8n@1.72.0) (2024-12-11)
+
+
+### Bug Fixes
+
+* Allow disabling MFA with recovery codes ([#12014](https://github.com/n8n-io/n8n/issues/12014)) ([95d56fe](https://github.com/n8n-io/n8n/commit/95d56fee8d0168b75fca6dcf41702d2f10c930a8))
+* Chat triggers don't work with the new partial execution flow ([#11952](https://github.com/n8n-io/n8n/issues/11952)) ([2b6a72f](https://github.com/n8n-io/n8n/commit/2b6a72f1289c01145edf2b88e5027d2b9b2ed624))
+* **core:** Execute nodes after loops correctly with the new partial execution flow ([#11978](https://github.com/n8n-io/n8n/issues/11978)) ([891dd7f](https://github.com/n8n-io/n8n/commit/891dd7f995c78a2355a049b7ced981a5f6b1c40c))
+* **core:** Fix support for multiple invocation of AI tools ([#12141](https://github.com/n8n-io/n8n/issues/12141)) ([c572c06](https://github.com/n8n-io/n8n/commit/c572c0648ca5b644b222157b3cabac9c05704a84))
+* **core:** Make sure task runner exits ([#12123](https://github.com/n8n-io/n8n/issues/12123)) ([c5effca](https://github.com/n8n-io/n8n/commit/c5effca7d47a713f157eea21d7892002e9ab7283))
+* **core:** Remove run data of nodes unrelated to the current partial execution ([#12099](https://github.com/n8n-io/n8n/issues/12099)) ([c4e4d37](https://github.com/n8n-io/n8n/commit/c4e4d37a8785d1a4bcd376cb1c49b82a80aa4391))
+* **core:** Return homeProject when filtering workflows by project id ([#12077](https://github.com/n8n-io/n8n/issues/12077)) ([efafeed](https://github.com/n8n-io/n8n/commit/efafeed33482100a23fa0163a53b9ce93cd6b2c3))
+* **editor:** Don't reset all Parameter Inputs when switched to read-only  ([#12063](https://github.com/n8n-io/n8n/issues/12063)) ([706702d](https://github.com/n8n-io/n8n/commit/706702dff8da3c2e949e2c98dd5b34b299a1f17c))
+* **editor:** Fix canvas panning using `Control` + `Left Mouse Button` on Windows ([#12104](https://github.com/n8n-io/n8n/issues/12104)) ([43009b6](https://github.com/n8n-io/n8n/commit/43009b6aa820f24b9e6f519e7a45592aa21db03e))
+* **editor:** Fix Nodeview.v2 reinitialise based on route changes ([#12062](https://github.com/n8n-io/n8n/issues/12062)) ([b1f8663](https://github.com/n8n-io/n8n/commit/b1f866326574974eb2936e6b02771346e83e7137))
+* **editor:** Fix svg background pattern rendering on safari ([#12079](https://github.com/n8n-io/n8n/issues/12079)) ([596f221](https://github.com/n8n-io/n8n/commit/596f22103c01e14063ebb2388c4dabf4714d37c6))
+* **editor:** Fix switching from v2 to v1 ([#12050](https://github.com/n8n-io/n8n/issues/12050)) ([5c76de3](https://github.com/n8n-io/n8n/commit/5c76de324c2e25b0d8b74cdab79f04aa616d8c4f))
+* **editor:** Improvements to the commit modal ([#12031](https://github.com/n8n-io/n8n/issues/12031)) ([4fe1952](https://github.com/n8n-io/n8n/commit/4fe1952e2fb3379d95da42a7bb531851af6d0094))
+* **editor:** Load node types in demo and preview modes ([#12048](https://github.com/n8n-io/n8n/issues/12048)) ([4ac5f95](https://github.com/n8n-io/n8n/commit/4ac5f9527bbec382a65ed3f1d9c41d6948c154e3))
+* **editor:** Polyfill crypto.randomUUID ([#12052](https://github.com/n8n-io/n8n/issues/12052)) ([0537524](https://github.com/n8n-io/n8n/commit/0537524c3e45d7633415c7a9175a3857ad52cd58))
+* **editor:** Redirect Settings to the proper sub page depending on the instance type (cloud or not) ([#12053](https://github.com/n8n-io/n8n/issues/12053)) ([a16d006](https://github.com/n8n-io/n8n/commit/a16d006f893cac927d674fa447b08c1205b67c54))
+* **editor:** Render sanitized HTML content in toast messages ([#12139](https://github.com/n8n-io/n8n/issues/12139)) ([0468945](https://github.com/n8n-io/n8n/commit/0468945c99f083577c4cc71f671b4b950f6aeb86))
+* **editor:** Universal button snags ([#11974](https://github.com/n8n-io/n8n/issues/11974)) ([956b11a](https://github.com/n8n-io/n8n/commit/956b11a560528336a74be40f722fa05bf3cca94d))
+* **editor:** Update concurrency UI considering different types of instances ([#12068](https://github.com/n8n-io/n8n/issues/12068)) ([fa572bb](https://github.com/n8n-io/n8n/commit/fa572bbca4397b1cc42668530497444630ed17eb))
+* **FTP Node:** Fix issue with creating folders on rename ([#9340](https://github.com/n8n-io/n8n/issues/9340)) ([eb7d593](https://github.com/n8n-io/n8n/commit/eb7d5934ef8bc6e999d6de4c0b8025ce175df5dd))
+* **n8n Form Node:** Completion page display if EXECUTIONS_DATA_SAVE_ON_SUCCESS=none ([#11869](https://github.com/n8n-io/n8n/issues/11869)) ([f4c2523](https://github.com/n8n-io/n8n/commit/f4c252341985fe03927a2fd5d60ba846ec3dfc77))
+* **OpenAI Node:** Allow updating assistant files ([#12042](https://github.com/n8n-io/n8n/issues/12042)) ([7b20f8a](https://github.com/n8n-io/n8n/commit/7b20f8aaa8befd19dbad0af3bf1b881342c1fca5))
+
+
+### Features
+
+* **AI Transform Node:** Reduce payload size ([#11965](https://github.com/n8n-io/n8n/issues/11965)) ([d8ca8de](https://github.com/n8n-io/n8n/commit/d8ca8de13a4cbb856696873bdb56c66b12a5b027))
+* **core:** Add option to filter for empty variables ([#12112](https://github.com/n8n-io/n8n/issues/12112)) ([a63f0e8](https://github.com/n8n-io/n8n/commit/a63f0e878e21da9924451e2679939209b34b6583))
+* **core:** Cancel runner task on timeout in external mode ([#12101](https://github.com/n8n-io/n8n/issues/12101)) ([addb4fa](https://github.com/n8n-io/n8n/commit/addb4fa352c88d856e463bb2b7001173c4fd6a7d))
+* **core:** Parent workflows should wait for sub-workflows to finish ([#11985](https://github.com/n8n-io/n8n/issues/11985)) ([60b3dcc](https://github.com/n8n-io/n8n/commit/60b3dccf9317da6f3013be35a78ce21d0416ad80))
+* **editor:** Implementing the `Easy AI Workflow` experiment ([#12043](https://github.com/n8n-io/n8n/issues/12043)) ([67ed1d2](https://github.com/n8n-io/n8n/commit/67ed1d2c3c2e69d5a96daf7de2795c02f5d8f15b))
+* **Redis Node:** Add support for continue on fail / error output branch ([#11714](https://github.com/n8n-io/n8n/issues/11714)) ([ed35958](https://github.com/n8n-io/n8n/commit/ed359586c88a7662f4d94d58c5a87cf91d027ab9))
+
+
+
+# [1.71.0](https://github.com/n8n-io/n8n/compare/n8n@1.70.0...n8n@1.71.0) (2024-12-04)
+
+
+### Bug Fixes
+
+* **core:** Fix push for waiting executions ([#11984](https://github.com/n8n-io/n8n/issues/11984)) ([8d71307](https://github.com/n8n-io/n8n/commit/8d71307da0398e7e39bf53e8e1cfa21ac1ceaf69))
+* **core:** Improve header parameter parsing on http client responses ([#11953](https://github.com/n8n-io/n8n/issues/11953)) ([41e9e39](https://github.com/n8n-io/n8n/commit/41e9e39b5b53ecd9d8d1b385df65a26ecb9bccd8))
+* **core:** Opt-out from optimizations if `$item` is used ([#12036](https://github.com/n8n-io/n8n/issues/12036)) ([872535a](https://github.com/n8n-io/n8n/commit/872535a40c85dcfad3a4b27c57c026ae003f562f))
+* **core:** Use the configured timezone in task runner ([#12032](https://github.com/n8n-io/n8n/issues/12032)) ([2e6845a](https://github.com/n8n-io/n8n/commit/2e6845afcbc30dff73c3f3f15f21278cab397387))
+* **core:** Validate node name when creating `NodeOperationErrror` ([#11999](https://github.com/n8n-io/n8n/issues/11999)) ([e68c9da](https://github.com/n8n-io/n8n/commit/e68c9da30c31cd5f994cb01ce759192562bfbd40))
+* **editor:** Add execution concurrency info and paywall ([#11847](https://github.com/n8n-io/n8n/issues/11847)) ([57d3269](https://github.com/n8n-io/n8n/commit/57d3269e400ee4e7e3636614870ebdfdb0aa8c1d))
+* **editor:** Fix bug causing connection lines to disappear when hovering stickies  ([#11950](https://github.com/n8n-io/n8n/issues/11950)) ([439a1cc](https://github.com/n8n-io/n8n/commit/439a1cc4f39243e91715b21a84b8e7266ce872cd))
+* **editor:** Fix canvas keybindings using splitter keys such as zooming using `+` key ([#12022](https://github.com/n8n-io/n8n/issues/12022)) ([6af9c82](https://github.com/n8n-io/n8n/commit/6af9c82af6020e99d61e442ee9c2d40761baf027))
+* **editor:** Fix community check ([#11979](https://github.com/n8n-io/n8n/issues/11979)) ([af0398a](https://github.com/n8n-io/n8n/commit/af0398a5e3a8987c01c7112e6f689b35e1ef92fe))
+* **editor:** Fix copy/paste keyboard events in canvas chat ([#12004](https://github.com/n8n-io/n8n/issues/12004)) ([967340a](https://github.com/n8n-io/n8n/commit/967340a2938a79c89319121bf57a8d654f88e06c))
+* **editor:** Fix node showing as successful if errors exists on subsequent runs ([#12019](https://github.com/n8n-io/n8n/issues/12019)) ([8616b17](https://github.com/n8n-io/n8n/commit/8616b17cc6c305da69bbb54fd56ab7cb34213f7c))
+* **editor:** Fix pin data showing up in production executions on new canvas ([#11951](https://github.com/n8n-io/n8n/issues/11951)) ([5f6f8a1](https://github.com/n8n-io/n8n/commit/5f6f8a1bddfd76b586c08da821e8b59070f449fc))
+* **editor:** Handle source control initialization to prevent UI form crashing ([#11776](https://github.com/n8n-io/n8n/issues/11776)) ([6be8e86](https://github.com/n8n-io/n8n/commit/6be8e86c45bd64d000bc95d2ef2d68220e930c02))
+* **editor:** Implement dirty nodes  for partial executions ([#11739](https://github.com/n8n-io/n8n/issues/11739)) ([b8da4ff](https://github.com/n8n-io/n8n/commit/b8da4ff9edb0fbb0093c4c41fe11f8e67b696ca3))
+* **editor:** Resolve going back from Settings ([#11958](https://github.com/n8n-io/n8n/issues/11958)) ([d74423c](https://github.com/n8n-io/n8n/commit/d74423c75198d38d0d99a1879051b5e964ecae74))
+* **editor:** Unify executions card label color ([#11949](https://github.com/n8n-io/n8n/issues/11949)) ([fc79718](https://github.com/n8n-io/n8n/commit/fc797188d63e87df34b3a153eb4a0d0b7361b3f5))
+* **editor:** Use optional chaining for all members in execution data when using the debug feature ([#12024](https://github.com/n8n-io/n8n/issues/12024)) ([67aa0c9](https://github.com/n8n-io/n8n/commit/67aa0c9107bda16b1cb6d273e17c3cde77035f51))
+* **GraphQL Node:** Throw error if GraphQL variables are not objects or strings ([#11904](https://github.com/n8n-io/n8n/issues/11904)) ([85f30b2](https://github.com/n8n-io/n8n/commit/85f30b27ae282da58a25186d13ff17196dcd7d9c))
+* **HTTP Request Node:** Use iconv-lite to decode http responses, to support more encoding types ([#11930](https://github.com/n8n-io/n8n/issues/11930)) ([461b39c](https://github.com/n8n-io/n8n/commit/461b39c5df5dd446cb8ceef469b204c7c5111229))
+* Load workflows with unconnected Switch outputs ([#12020](https://github.com/n8n-io/n8n/issues/12020)) ([abc851c](https://github.com/n8n-io/n8n/commit/abc851c0cff298607a0dc2f2882aa17136898f45))
+* **n8n Form Node:** Use https to load google fonts ([#11948](https://github.com/n8n-io/n8n/issues/11948)) ([eccd924](https://github.com/n8n-io/n8n/commit/eccd924f5e8dbe59e37099d1a6fbe8866fef55bf))
+* **Telegram Trigger Node:** Fix header secret check ([#12018](https://github.com/n8n-io/n8n/issues/12018)) ([f16de4d](https://github.com/n8n-io/n8n/commit/f16de4db01c0496205635a3203a44098e7908453))
+* **Webflow Node:** Fix issue with pagination in v2 node ([#11934](https://github.com/n8n-io/n8n/issues/11934)) ([1eb94bc](https://github.com/n8n-io/n8n/commit/1eb94bcaf54d9e581856ce0b87253e1c28fa68e2))
+* **Webflow Node:** Fix issue with publishing items ([#11982](https://github.com/n8n-io/n8n/issues/11982)) ([0a8a57e](https://github.com/n8n-io/n8n/commit/0a8a57e4ec8081ab1a53f36d686b3d5dcaae2476))
+
+
+### Features
+
+* **AI Transform Node:** Node Prompt improvements ([#11611](https://github.com/n8n-io/n8n/issues/11611)) ([40a7445](https://github.com/n8n-io/n8n/commit/40a7445f0873af2cdbd10b12bd691c07a43e27cc))
+* **Code Node:** Warning if pairedItem absent or could not be auto mapped ([#11737](https://github.com/n8n-io/n8n/issues/11737)) ([3a5bd12](https://github.com/n8n-io/n8n/commit/3a5bd129459272cbac960ae2754db3028943f87e))
+* **editor:** Canvas chat UI & UX improvements ([#11924](https://github.com/n8n-io/n8n/issues/11924)) ([1e25774](https://github.com/n8n-io/n8n/commit/1e25774541461c86da5c4af8efec792e2814eeb1))
+* **editor:** Persist user's preferred display modes on localStorage ([#11929](https://github.com/n8n-io/n8n/issues/11929)) ([bd69316](https://github.com/n8n-io/n8n/commit/bd693162b86a21c90880bab2c2e67aab733095ff))
+
+
+### Performance Improvements
+
+* **editor:** Virtualize SchemaView ([#11694](https://github.com/n8n-io/n8n/issues/11694)) ([9c6def9](https://github.com/n8n-io/n8n/commit/9c6def91975764522fa52cdf21e9cb5bdb4d721d))
+
+
+
+# [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)
+
+
+### Bug Fixes
+
+* **AI Agent Node:** Throw better errors for non-tool agents when using structured tools ([#11582](https://github.com/n8n-io/n8n/issues/11582)) ([9b6123d](https://github.com/n8n-io/n8n/commit/9b6123dfb2648f880c7829211fa07666611ad0ea))
+* **Auto-fixing Output Parser Node:** Only run retry chain on parsing errors ([#11569](https://github.com/n8n-io/n8n/issues/11569)) ([21b31e4](https://github.com/n8n-io/n8n/commit/21b31e488ff6ab0bcf3c79edcd17b9e37d4c64a4))
+* **core:** Continue with error output reverse items in success branch ([#11684](https://github.com/n8n-io/n8n/issues/11684)) ([6d5ee83](https://github.com/n8n-io/n8n/commit/6d5ee832966fab96043b0d65697c059ced61d334))
+* **core:** Ensure task runner server closes websocket connection correctly ([#11633](https://github.com/n8n-io/n8n/issues/11633)) ([b496bf3](https://github.com/n8n-io/n8n/commit/b496bf3147d2cd873d24371be02cb7ea5dbd8621))
+* **core:** Handle websocket connection error more gracefully in task runners ([#11635](https://github.com/n8n-io/n8n/issues/11635)) ([af7d6e6](https://github.com/n8n-io/n8n/commit/af7d6e68d0436ff8a3d4e8410dc8ee4f3a035c44))
+* **core:** Improve model sub-nodes error handling ([#11418](https://github.com/n8n-io/n8n/issues/11418)) ([57467d0](https://github.com/n8n-io/n8n/commit/57467d0285d67509322630c4c01130022f274a41))
+* **core:** Make push work for waiting webhooks ([#11678](https://github.com/n8n-io/n8n/issues/11678)) ([600479b](https://github.com/n8n-io/n8n/commit/600479bf36ba8870d4aecacad19a2dc5f2d97959))
+* **core:** Revert all the context helpers changes ([#11616](https://github.com/n8n-io/n8n/issues/11616)) ([20fd38f](https://github.com/n8n-io/n8n/commit/20fd38f3517f7ef35604ba16abb4d951270b4d50))
+* **core:** Set the authentication methad to `email` during startup if the SAML configuration in the database has been corrupted ([#11600](https://github.com/n8n-io/n8n/issues/11600)) ([6439291](https://github.com/n8n-io/n8n/commit/6439291738dec16261979d6d835acbc63743d51a))
+* **core:** Use cached value in retrieval of personal project owner ([#11533](https://github.com/n8n-io/n8n/issues/11533)) ([04029d8](https://github.com/n8n-io/n8n/commit/04029d82a11b52990890380ba7094055b18e7c1f))
+* Credentials save button is hidden unless you make changes to the ([#11492](https://github.com/n8n-io/n8n/issues/11492)) ([835fbfe](https://github.com/n8n-io/n8n/commit/835fbfe337dd8dc0d0b0318c7227e174484e1328))
+* **editor:** Add stickies to node insert position conflict check allowlist ([#11624](https://github.com/n8n-io/n8n/issues/11624)) ([fc39e3c](https://github.com/n8n-io/n8n/commit/fc39e3ca16231c176957e2504d55df6b416874fe))
+* **editor:** Adjust Scrollbar Width of RunData Header Row ([#11561](https://github.com/n8n-io/n8n/issues/11561)) ([d17d76a](https://github.com/n8n-io/n8n/commit/d17d76a85d5425bc091d29fc84605ffbccbca984))
+* **editor:** Cap NDV Output View Tab Index to prevent rare edge case ([#11614](https://github.com/n8n-io/n8n/issues/11614)) ([a6c8ee4](https://github.com/n8n-io/n8n/commit/a6c8ee4a82e6055766dc1307f79c774c17bb5f4d))
+* **editor:** Do not show hover tooltip when autocomplete is active ([#11653](https://github.com/n8n-io/n8n/issues/11653)) ([23caf43](https://github.com/n8n-io/n8n/commit/23caf43e30342a21d45c825f438aa1e6193601d1))
+* **editor:** Enable pinning main output with error and always allow unpinning ([#11452](https://github.com/n8n-io/n8n/issues/11452)) ([40c8882](https://github.com/n8n-io/n8n/commit/40c88822acdcda6401bd92b9cf89d013c44b8453))
+* **editor:** Fix collapsing nested items in expression modal schema view ([#11645](https://github.com/n8n-io/n8n/issues/11645)) ([41dea52](https://github.com/n8n-io/n8n/commit/41dea522fbfb1c9acee51f47f384973914454b5f))
+* **editor:** Fix default workflow settings ([#11632](https://github.com/n8n-io/n8n/issues/11632)) ([658568e](https://github.com/n8n-io/n8n/commit/658568e2700bfd5b61da53f3052403d0098c2d90))
+* **editor:** Fix duplicate chat trigger ([#11693](https://github.com/n8n-io/n8n/issues/11693)) ([a025848](https://github.com/n8n-io/n8n/commit/a025848ec4be96f74d4de2ab104256b6d89bb837))
+* **editor:** Fix hiding SQL query output when trying to select ([#11649](https://github.com/n8n-io/n8n/issues/11649)) ([4dbf2f4](https://github.com/n8n-io/n8n/commit/4dbf2f4256111985b367030020f1494b8a8b95af))
+* **editor:** Fix scrolling in code edit modal ([#11647](https://github.com/n8n-io/n8n/issues/11647)) ([8f695f3](https://github.com/n8n-io/n8n/commit/8f695f3417820e7b9bb04b78972f6abbd61abbe8))
+* **editor:** Prevent error being thrown in RLC while loading ([#11676](https://github.com/n8n-io/n8n/issues/11676)) ([ca8cb45](https://github.com/n8n-io/n8n/commit/ca8cb455ba59831295c238afb11aeab6ad18428e))
+* **editor:** Prevent NodeCreator from swallowing AskAssistant enter event ([#11532](https://github.com/n8n-io/n8n/issues/11532)) ([db94f16](https://github.com/n8n-io/n8n/commit/db94f169fcd03983fc78a3b4c5e11543610825bf))
+* **editor:** Show node executing status shortly before switching to success on new canvas ([#11675](https://github.com/n8n-io/n8n/issues/11675)) ([b0ba24c](https://github.com/n8n-io/n8n/commit/b0ba24cbbc55cebc26e9f62ead7396c4c8fbd062))
+* **editor:** Show only error title and 'Open errored node' button; hide 'Ask Assistant' in root for sub-node errors ([#11573](https://github.com/n8n-io/n8n/issues/11573)) ([8cba100](https://github.com/n8n-io/n8n/commit/8cba1004888f60ca653ee069501c13b3cadcc561))
+* **Facebook Lead Ads Trigger Node:** Fix issue with optional fields ([#11692](https://github.com/n8n-io/n8n/issues/11692)) ([70d315b](https://github.com/n8n-io/n8n/commit/70d315b3d5b8f5f3e0f39527bba11e254a52028e))
+* **Google BigQuery Node:** Add item index to insert error ([#11702](https://github.com/n8n-io/n8n/issues/11702)) ([145d092](https://github.com/n8n-io/n8n/commit/145d0921b217bbd4b625beaacfa14429560bf51b))
+* **Google Drive Node:** Fix file upload for streams ([#11698](https://github.com/n8n-io/n8n/issues/11698)) ([770230f](https://github.com/n8n-io/n8n/commit/770230fbfe0b9e86527254e201c4602fbced94ff))
+* **In-Memory Vector Store Node:** Fix displaying execution data of connected embedding nodes ([#11701](https://github.com/n8n-io/n8n/issues/11701)) ([40ade15](https://github.com/n8n-io/n8n/commit/40ade151724f4af28a6ed959fd9363450ea711fd))
+* **Item List Output Parser Node:** Fix number of items parameter issue ([#11696](https://github.com/n8n-io/n8n/issues/11696)) ([01ebe9d](https://github.com/n8n-io/n8n/commit/01ebe9dd38629afbab954fb489f3ef2bb7ab5b34))
+* **n8n Form Node:** Find completion page ([#11674](https://github.com/n8n-io/n8n/issues/11674)) ([ed3ad6d](https://github.com/n8n-io/n8n/commit/ed3ad6d684597f7c4b7419dfa81d476e66f10eba))
+* **n8n Form Node:** Open form page if form trigger has pin data ([#11673](https://github.com/n8n-io/n8n/issues/11673)) ([f0492bd](https://github.com/n8n-io/n8n/commit/f0492bd3bb0d94802a2707fb1cf861313b6ea808))
+* **n8n Form Node:** Trigger page stack in waiting if error in workflow ([#11671](https://github.com/n8n-io/n8n/issues/11671)) ([94b5873](https://github.com/n8n-io/n8n/commit/94b5873248212a5500f02cf3c0d74df6f9d8fb26))
+* **n8n Form Trigger Node:** Checkboxes different sizes ([#11677](https://github.com/n8n-io/n8n/issues/11677)) ([c08d23c](https://github.com/n8n-io/n8n/commit/c08d23c00f01bb6fcb3b75f02e0338af375f9b32))
+* NDV search bugs ([#11613](https://github.com/n8n-io/n8n/issues/11613)) ([c32cf64](https://github.com/n8n-io/n8n/commit/c32cf644a6b8c21558e802449329877845de70b1))
+* **Notion Node:** Extract page url ([#11643](https://github.com/n8n-io/n8n/issues/11643)) ([cbdd535](https://github.com/n8n-io/n8n/commit/cbdd535fe0cb4e032ea82f008dcf35cc5f2264c2))
+* **Redis Chat Memory Node:** Respect the SSL flag from the credential ([#11689](https://github.com/n8n-io/n8n/issues/11689)) ([b5cbf75](https://github.com/n8n-io/n8n/commit/b5cbf7566d351d8a8e9972f13ff5867ff1c8d7d0))
+* **Supabase Node:** Reset query parameters in get many operation ([#11630](https://github.com/n8n-io/n8n/issues/11630)) ([7458229](https://github.com/n8n-io/n8n/commit/74582290c04d2dd32300b1a6c7715862ae837d34))
+* **Switch Node:** Maintain output connections ([#11162](https://github.com/n8n-io/n8n/issues/11162)) ([9bd79fc](https://github.com/n8n-io/n8n/commit/9bd79fceebc4453d0fe40ae5f628d5e31ff2b326))
+
+
+### Features
+
+* **AI Transform Node:** Show warning for binary data ([#11560](https://github.com/n8n-io/n8n/issues/11560)) ([ddbb263](https://github.com/n8n-io/n8n/commit/ddbb263dce0fc458abc95d850217251bb49d2b83))
+* **core:** Make all http requests made with `httpRequestWithAuthentication` abortable ([#11704](https://github.com/n8n-io/n8n/issues/11704)) ([0d8aada](https://github.com/n8n-io/n8n/commit/0d8aada49005d6a6078e8460003a0de61a8f423c))
+* **editor:** Improve how we show default Agent prompt and Memory session parameters ([#11491](https://github.com/n8n-io/n8n/issues/11491)) ([565f8cd](https://github.com/n8n-io/n8n/commit/565f8cd8c78b534a50e272997d659d162fa86625))
+* **editor:** Improve workflow loading performance on new canvas ([#11629](https://github.com/n8n-io/n8n/issues/11629)) ([f1e2df7](https://github.com/n8n-io/n8n/commit/f1e2df7d0753aa0f33cf299100a063bf89cc8b35))
+* **editor:** Redesign Canvas Chat ([#11634](https://github.com/n8n-io/n8n/issues/11634)) ([a412ab7](https://github.com/n8n-io/n8n/commit/a412ab7ebfcd6aa9051a8ca36e34f1067102c998))
+* **editor:** Restrict when a ChatTrigger Node is added automatically ([#11523](https://github.com/n8n-io/n8n/issues/11523)) ([93a6f85](https://github.com/n8n-io/n8n/commit/93a6f858fa3eb53f8b48b2a3d6b7377279dd6ed1))
+* Github star button in-app ([#11695](https://github.com/n8n-io/n8n/issues/11695)) ([0fd684d](https://github.com/n8n-io/n8n/commit/0fd684d90c830f8b0aab12b7f78a1fa5619c62c9))
+* **Oura Node:** Update node for v2 api ([#11604](https://github.com/n8n-io/n8n/issues/11604)) ([3348fbb](https://github.com/n8n-io/n8n/commit/3348fbb1547c430ff8707b298640e3461d3f6536))
+
+
+### Performance Improvements
+
+* **editor:** Add lint rules for optimization-friendly syntax ([#11681](https://github.com/n8n-io/n8n/issues/11681)) ([88295c7](https://github.com/n8n-io/n8n/commit/88295c70495ae3d017674d5745972a346fcbaf12))
+
+
+
+# [1.67.0](https://github.com/n8n-io/n8n/compare/n8n@1.66.0...n8n@1.67.0) (2024-11-06)
+
+
+### Bug Fixes
+
+* Bring back nodes panel telemetry events ([#11456](https://github.com/n8n-io/n8n/issues/11456)) ([130c942](https://github.com/n8n-io/n8n/commit/130c942f633788d1b2f937d6fea342d4450c6e3d))
+* **core:** Account for double quotes in instance base URL ([#11495](https://github.com/n8n-io/n8n/issues/11495)) ([c5191e6](https://github.com/n8n-io/n8n/commit/c5191e697a9a9ebfa2b67587cd01b5835ebf6ea8))
+* **core:** Do not delete waiting executions when saving of successful executions is disabled ([#11458](https://github.com/n8n-io/n8n/issues/11458)) ([e8757e5](https://github.com/n8n-io/n8n/commit/e8757e58f69e091ac3d2a2f8e8c8e33ac57c1e47))
+* **core:** Don't send a `executionFinished` event to the browser with no run data if the execution has already been cleaned up ([#11502](https://github.com/n8n-io/n8n/issues/11502)) ([d1153f5](https://github.com/n8n-io/n8n/commit/d1153f51e80911cbc8f34ba5f038f349b75295c3))
+* **core:** Include `projectId` in range query middleware ([#11590](https://github.com/n8n-io/n8n/issues/11590)) ([a6070af](https://github.com/n8n-io/n8n/commit/a6070afdda29631fd36e5213f52bf815268bcda4))
+* **core:** Save exeution progress for waiting executions, even when progress saving is disabled ([#11535](https://github.com/n8n-io/n8n/issues/11535)) ([6b9353c](https://github.com/n8n-io/n8n/commit/6b9353c80f61ab36945fff434d98242dc1cab7b3))
+* **core:** Use the correct docs URL for regular nodes when used as tools ([#11529](https://github.com/n8n-io/n8n/issues/11529)) ([a092b8e](https://github.com/n8n-io/n8n/commit/a092b8e972e1253d92df416f19096a045858e7c1))
+* **Edit Image Node:** Fix Text operation by setting Arial as default font ([#11125](https://github.com/n8n-io/n8n/issues/11125)) ([60c1ace](https://github.com/n8n-io/n8n/commit/60c1ace64be29d651ce7b777fbb576598e38b9d7))
+* **editor:** Auto focus first fields on SignIn, SignUp and ForgotMyPassword views ([#11445](https://github.com/n8n-io/n8n/issues/11445)) ([5b5bd72](https://github.com/n8n-io/n8n/commit/5b5bd7291dde17880b7699f7e6832938599ffd8f))
+* **editor:** Do not overwrite the webhookId in the new canvas ([#11562](https://github.com/n8n-io/n8n/issues/11562)) ([dfd785b](https://github.com/n8n-io/n8n/commit/dfd785bc0894257eb6e62b0dd8f71248c27aae53))
+* **editor:** Ensure Enter key on Cancel button correctly cancels node rename ([#11563](https://github.com/n8n-io/n8n/issues/11563)) ([be05ae3](https://github.com/n8n-io/n8n/commit/be05ae36e7790156cb48b317fc254ae46a3b2d8c))
+* **editor:** Fix emitting `n8nReady` notification via `postmessage` on new canvas ([#11558](https://github.com/n8n-io/n8n/issues/11558)) ([463d101](https://github.com/n8n-io/n8n/commit/463d101f3592e6df4afd66c4d0fde0cb4aec34cc))
+* **editor:** Fix run index input for RunData view in sub-nodes ([#11538](https://github.com/n8n-io/n8n/issues/11538)) ([434d31c](https://github.com/n8n-io/n8n/commit/434d31ce928342d52b6ab8b78639afd7829216d4))
+* **editor:** Fix selected credential being overwritten in NDV ([#11496](https://github.com/n8n-io/n8n/issues/11496)) ([a26c0e2](https://github.com/n8n-io/n8n/commit/a26c0e2c3c7da87bfaba9737a967aa0070810d85))
+* **editor:** Keep workflow pristine after load on new canvas ([#11579](https://github.com/n8n-io/n8n/issues/11579)) ([7254359](https://github.com/n8n-io/n8n/commit/7254359855b89769613cd5cc24dbb4f45a7cc76f))
+* Show Pinned data in demo mode ([#11490](https://github.com/n8n-io/n8n/issues/11490)) ([ca2a583](https://github.com/n8n-io/n8n/commit/ca2a583b5cbb0cba3ecb694261806de16547aa91))
+* Toast not aligned to the bottom when AI assistant disable ([#11549](https://github.com/n8n-io/n8n/issues/11549)) ([e80f7e0](https://github.com/n8n-io/n8n/commit/e80f7e0a02a972379f73af6a44de11768081086e))
+
+
+### Features
+
+* Add Rapid7 InsightVm credentials ([#11462](https://github.com/n8n-io/n8n/issues/11462)) ([46eceab](https://github.com/n8n-io/n8n/commit/46eceabc27ac219b11b85c16c533a2cff848c5dd))
+* **AI Transform Node:** UX improvements ([#11280](https://github.com/n8n-io/n8n/issues/11280)) ([8a48407](https://github.com/n8n-io/n8n/commit/8a484077af3d3e1fe2d1b90b1ea9edf4ba41fcb6))
+* **Anthropic Chat Model Node:** Add support for Haiku 3.5 ([#11551](https://github.com/n8n-io/n8n/issues/11551)) ([8b39825](https://github.com/n8n-io/n8n/commit/8b398256a81594a52f20f8eb8adf8ff205209bc1))
+* **Convert to File Node:** Add delimiter convert to csv ([#11556](https://github.com/n8n-io/n8n/issues/11556)) ([63d454b](https://github.com/n8n-io/n8n/commit/63d454b776c092ff8c6c521a7e083774adb8f649))
+* **editor:** Update panning and selection keybindings on new canvas ([#11534](https://github.com/n8n-io/n8n/issues/11534)) ([5e2e205](https://github.com/n8n-io/n8n/commit/5e2e205394adf76faf02aee2d4f21df71848e1d4))
+* **Gmail Trigger Node:** Add filter option to include drafts ([#11441](https://github.com/n8n-io/n8n/issues/11441)) ([7a2be77](https://github.com/n8n-io/n8n/commit/7a2be77f384a32ede3acad8fe24fb89227c058bf))
+* **Intercom Node:** Update credential to new style ([#11485](https://github.com/n8n-io/n8n/issues/11485)) ([b137e13](https://github.com/n8n-io/n8n/commit/b137e13845f0714ebf7421c837f5ab104b66709b))
+
+
+
+# [1.66.0](https://github.com/n8n-io/n8n/compare/n8n@1.65.0...n8n@1.66.0) (2024-10-31)
+
+
+### Bug Fixes
+
+* **Asana Node:** Fix issue with pagination ([#11415](https://github.com/n8n-io/n8n/issues/11415)) ([04c075a](https://github.com/n8n-io/n8n/commit/04c075a46bcc7b1964397f0244b0fde99476212d))
+* **core:** Add 'user_id' to `license-community-plus-registered` telemetry event ([#11430](https://github.com/n8n-io/n8n/issues/11430)) ([7a8dafe](https://github.com/n8n-io/n8n/commit/7a8dafe9902fbc0d5001c50579c34959b95211ab))
+* **core:** Add safeguard for command publishing ([#11337](https://github.com/n8n-io/n8n/issues/11337)) ([656439e](https://github.com/n8n-io/n8n/commit/656439e87138f9f96dea5a683cfdac3f661ffefb))
+* **core:** Ensure `LoggerProxy` is not scoped ([#11379](https://github.com/n8n-io/n8n/issues/11379)) ([f4ea943](https://github.com/n8n-io/n8n/commit/f4ea943c9cb2321e41705de6c5c27535a0f5eae0))
+* **core:** Ensure `remove-triggers-and-pollers` command is not debounced ([#11486](https://github.com/n8n-io/n8n/issues/11486)) ([529d4fc](https://github.com/n8n-io/n8n/commit/529d4fc3ef5206bd1b02d27634342cc50b45997e))
+* **core:** Ensure job processor does not reprocess amended executions ([#11438](https://github.com/n8n-io/n8n/issues/11438)) ([c152a3a](https://github.com/n8n-io/n8n/commit/c152a3ac56f140a39eea4771a94f5a3082118df7))
+* **core:** Fix Message Event Bus Metrics not counting up for labeled metrics ([#11396](https://github.com/n8n-io/n8n/issues/11396)) ([7fc3b25](https://github.com/n8n-io/n8n/commit/7fc3b25d21c6c4f1802f34b1ae065a65cac3001b))
+* **core:** Fix resolving of $fromAI expression via `evaluateExpression` ([#11397](https://github.com/n8n-io/n8n/issues/11397)) ([2e64464](https://github.com/n8n-io/n8n/commit/2e6446454defbd3e5a47b66e6fd46d4f1b9fbd0f))
+* **core:** Make execution and its data creation atomic ([#11392](https://github.com/n8n-io/n8n/issues/11392)) ([ed30d43](https://github.com/n8n-io/n8n/commit/ed30d43236bf3c6b657022636a02a41be01aa152))
+* **core:** On unhandled rejections, extract the original exception correctly ([#11389](https://github.com/n8n-io/n8n/issues/11389)) ([8608bae](https://github.com/n8n-io/n8n/commit/8608baeb7ec302daddc8adca6e39778dcf7b2eda))
+* **editor:**  Fix TypeError: Cannot read properties of undefined (reading '0') ([#11399](https://github.com/n8n-io/n8n/issues/11399)) ([ae37c52](https://github.com/n8n-io/n8n/commit/ae37c520a91c75e353e818944b36a3619c0d8b4a))
+* **editor:** Add Retry button for AI Assistant errors ([#11345](https://github.com/n8n-io/n8n/issues/11345)) ([7699240](https://github.com/n8n-io/n8n/commit/7699240073122cdef31cf109fd37fa66961f588a))
+* **editor:** Change tooltip for workflow with execute workflow trigger ([#11374](https://github.com/n8n-io/n8n/issues/11374)) ([dcd6038](https://github.com/n8n-io/n8n/commit/dcd6038c3085135803cdaa546a239359a6d449eb))
+* **editor:** Ensure toasts show above modal overlays ([#11410](https://github.com/n8n-io/n8n/issues/11410)) ([351134f](https://github.com/n8n-io/n8n/commit/351134f786af933f5f310bf8d9897269387635a0))
+* **editor:** Fit view consistently after nodes are initialized on new canvas ([#11457](https://github.com/n8n-io/n8n/issues/11457)) ([497d637](https://github.com/n8n-io/n8n/commit/497d637fc5308b9c4a06bc764152fde1f1a9c130))
+* **editor:** Fix adding connections when initializing workspace in templates view on new canvas ([#11451](https://github.com/n8n-io/n8n/issues/11451)) ([ea47b02](https://github.com/n8n-io/n8n/commit/ea47b025fb16c967d4fc73dcacc6e260d2aecd61))
+* **editor:** Fix rendering of AI logs ([#11450](https://github.com/n8n-io/n8n/issues/11450)) ([73b0a80](https://github.com/n8n-io/n8n/commit/73b0a80ac92b4f4b5a300d0ec1c833b4395a222a))
+* **editor:** Hide data mapping tooltip in credential edit modal ([#11356](https://github.com/n8n-io/n8n/issues/11356)) ([ff14dcb](https://github.com/n8n-io/n8n/commit/ff14dcb3a1ddaea4eca7c1ecd2e92c0abb0c413c))
+* **editor:** Prevent running workflow that has issues if listening to webhook ([#11402](https://github.com/n8n-io/n8n/issues/11402)) ([8b0a48f](https://github.com/n8n-io/n8n/commit/8b0a48f53010378e497e4cc362fda75a958cf363))
+* **editor:** Run external hooks after settings have been initialized ([#11423](https://github.com/n8n-io/n8n/issues/11423)) ([0ab24c8](https://github.com/n8n-io/n8n/commit/0ab24c814abd1787268750ba808993ab2735ac52))
+* **editor:** Support middle click to scroll when using a mouse on new canvas ([#11384](https://github.com/n8n-io/n8n/issues/11384)) ([46f3b4a](https://github.com/n8n-io/n8n/commit/46f3b4a258f89f02e0d2bd1eef25a22e3a721167))
+* **HTTP Request Tool Node:** Fix HTML response optimization issue ([#11439](https://github.com/n8n-io/n8n/issues/11439)) ([cf37e94](https://github.com/n8n-io/n8n/commit/cf37e94dd875e9f6ab1f189146fb34e7296af93c))
+* **n8n Form Node:** Form Trigger does not wait in multi-form mode ([#11404](https://github.com/n8n-io/n8n/issues/11404)) ([151f4dd](https://github.com/n8n-io/n8n/commit/151f4dd7b8f800af424f8ae64cb8238975fb3cb8))
+* Update required node js version in CONTRIBUTING.md ([#11437](https://github.com/n8n-io/n8n/issues/11437)) ([4f511aa](https://github.com/n8n-io/n8n/commit/4f511aab68651caa8fe47f70cd7cdb88bb06a3e2))
+
+
+### Features
+
+* **Anthropic Chat Model Node:** Add model claude-3-5-sonnet-20241022 ([#11465](https://github.com/n8n-io/n8n/issues/11465)) ([f6c8890](https://github.com/n8n-io/n8n/commit/f6c8890a8069de221b9b96e735418ecc9624cf7b))
+* **core:** Handle nodes with multiple inputs and connections during partial executions ([#11376](https://github.com/n8n-io/n8n/issues/11376)) ([cb7c4d2](https://github.com/n8n-io/n8n/commit/cb7c4d29a6f042b590822e5b9c67fff0a8f0863d))
+* **editor:** Add descriptive header to projects /workflow ([#11203](https://github.com/n8n-io/n8n/issues/11203)) ([5d19e8f](https://github.com/n8n-io/n8n/commit/5d19e8f2b45dc1abc5a8253f9e3a0fdacb1ebd91))
+* **editor:** Improve placeholder for vector store tool ([#11483](https://github.com/n8n-io/n8n/issues/11483)) ([629e092](https://github.com/n8n-io/n8n/commit/629e09240785bc648ff6575f97910fbb4e77cdab))
+* **editor:** Remove edge execution animation on new canvas ([#11446](https://github.com/n8n-io/n8n/issues/11446)) ([a701d87](https://github.com/n8n-io/n8n/commit/a701d87f5ba94ffc811e424b60e188b26ac6c1c5))
+* **editor:** Update ownership pills ([#11155](https://github.com/n8n-io/n8n/issues/11155)) ([8147038](https://github.com/n8n-io/n8n/commit/8147038cf87dca657602e617e49698065bf1a63f))
+
+
+
 # [1.65.0](https://github.com/n8n-io/n8n/compare/n8n@1.64.0...n8n@1.65.0) (2024-10-24)
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 4a67bf00ac..9ed101af7d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -19,6 +19,7 @@ Great that you are here and you want to contribute to n8n
 		- [Actual n8n setup](#actual-n8n-setup)
 		- [Start](#start)
 	- [Development cycle](#development-cycle)
+		-	[Community PR Guidelines](#community-pr-guidelines)
 		- [Test suite](#test-suite)
 			- [Unit tests](#unit-tests)
 			- [E2E tests](#e2e-tests)
@@ -68,7 +69,7 @@ If you already have VS Code and Docker installed, you can click [here](https://v
 
 #### Node.js
 
-[Node.js](https://nodejs.org/en/) version 18.10 or newer is required for development purposes.
+[Node.js](https://nodejs.org/en/) version 20.15 or newer is required for development purposes.
 
 #### pnpm
 
@@ -191,6 +192,51 @@ automatically build your code, restart the backend and refresh the frontend
    ```
 1. Commit code and [create a pull request](https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
 
+---
+
+### Community PR Guidelines
+
+#### **1. Change Request/Comment**
+
+Please address the requested changes or provide feedback within 14 days. If there is no response or updates to the pull request during this time, it will be automatically closed. The PR can be reopened once the requested changes are applied.
+
+#### **2. General Requirements**
+
+- **Follow the Style Guide:**
+  - Ensure your code adheres to n8n's coding standards and conventions (e.g., formatting, naming, indentation). Use linting tools where applicable.
+- **TypeScript Compliance:**
+  - Do not use `ts-ignore` .
+  - Ensure code adheres to TypeScript rules.
+- **Avoid Repetitive Code:**
+  - Reuse existing components, parameters, and logic wherever possible instead of redefining or duplicating them.
+  - For nodes: Use the same parameter across multiple operations rather than defining a new parameter for each operation (if applicable).
+- **Testing Requirements:**
+  - PRs **must include tests**:
+    - Unit tests
+    - Workflow tests for nodes (example [here](https://github.com/n8n-io/n8n/tree/master/packages/nodes-base/nodes/Switch/V3/test))
+    - UI tests (if applicable)
+- **Typos:**
+  - Use a spell-checking tool, such as [**Code Spell Checker**](https://marketplace.visualstudio.com/items?itemName=streetsidesoftware.code-spell-checker), to avoid typos.
+
+#### **3. PR Specific Requirements**
+
+- **Small PRs Only:**
+  - Focus on a single feature or fix per PR.
+- **Naming Convention:**
+  - Follow [n8n's PR Title Conventions](https://github.com/n8n-io/n8n/blob/master/.github/pull_request_title_conventions.md#L36).
+- **New Nodes:**
+  - PRs that introduce new nodes will be **auto-closed** unless they are explicitly requested by the n8n team and aligned with an agreed project scope. However, you can still explore [building your own nodes](https://docs.n8n.io/integrations/creating-nodes/) , as n8n offers the flexibility to create your own custom nodes.
+- **Typo-Only PRs:**
+  - Typos are not sufficient justification for a PR and will be rejected.
+
+#### **4. Workflow Summary for Non-Compliant PRs**
+
+- **No Tests:** If tests are not provided, the PR will be auto-closed after **14 days**.
+- **Non-Small PRs:** Large or multifaceted PRs will be returned for segmentation.
+- **New Nodes/Typo PRs:** Automatically rejected if not aligned with project scope or guidelines.
+
+---
+
 ### Test suite
 
 #### Unit tests
diff --git a/LICENSE.md b/LICENSE.md
index aab68b6d93..f85f59baa9 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -3,9 +3,11 @@
 Portions of this software are licensed as follows:
 
 - Content of branches other than the main branch (i.e. "master") are not licensed.
-- Source code files that contain ".ee." in their filename are NOT licensed under the Sustainable Use License.
-  To use source code files that contain ".ee." in their filename you must hold a valid n8n Enterprise License
-  specifically allowing you access to such source code files and as defined in "LICENSE_EE.md".
+- Source code files that contain ".ee." in their filename or ".ee" in their dirname are NOT licensed under
+  the Sustainable Use License.
+  To use source code files that contain ".ee." in their filename or ".ee" in their dirname you must hold a
+	valid n8n Enterprise License specifically allowing you access to such source code files and as defined
+	in "LICENSE_EE.md".
 - All third party components incorporated into the n8n Software are licensed under the original license
   provided by the owner of the applicable component.
 - Content outside of the above mentioned files or restrictions is available under the "Sustainable Use
diff --git a/README.md b/README.md
index d51ac596ca..8d01e943d3 100644
--- a/README.md
+++ b/README.md
@@ -1,104 +1,72 @@
-![n8n.io - Workflow Automation](https://user-images.githubusercontent.com/65276001/173571060-9f2f6d7b-bac0-43b6-bdb2-001da9694058.png)
+![Banner image](https://user-images.githubusercontent.com/10284570/173569848-c624317f-42b1-45a6-ab09-f0ea3c247648.png)
 
-# n8n - Workflow automation tool
+# n8n - Secure Workflow Automation for Technical Teams
 
-n8n is an extendable workflow automation tool. With a [fair-code](https://faircode.io) distribution model, n8n
-will always have visible source code, be available to self-host, and allow you to add your own custom
-functions, logic and apps. n8n's node-based approach makes it highly versatile, enabling you to connect
-anything to everything.
+n8n is a workflow automation platform that gives technical teams the flexibility of code with the speed of no-code. With 400+ integrations, native AI capabilities, and a fair-code license, n8n lets you build powerful automations while maintaining full control over your data and deployments.
 
-![n8n.io - Screenshot](https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot.png)
+![n8n.io - Screenshot](https://raw.githubusercontent.com/n8n-io/n8n/master/assets/n8n-screenshot-readme.png)
 
-## Demo
+## Key Capabilities
 
-[:tv: A short video (< 5 min)](https://www.youtube.com/watch?v=1MwSoB0gnM4) that goes over key concepts of
-creating workflows in n8n.
+- **Code When You Need It**: Write JavaScript/Python, add npm packages, or use the visual interface
+- **AI-Native Platform**: Build AI agent workflows based on LangChain with your own data and models
+- **Full Control**: Self-host with our fair-code license or use our [cloud offering](https://app.n8n.cloud/login)
+- **Enterprise-Ready**: Advanced permissions, SSO, and air-gapped deployments
+- **Active Community**: 400+ integrations and 900+ ready-to-use [templates](https://n8n.io/workflows)
 
-## Available integrations
+## Quick Start
 
-n8n has 200+ different nodes to automate workflows. The list can be found on:
-[https://n8n.io/integrations](https://n8n.io/integrations)
+Try n8n instantly with [npx](https://docs.n8n.io/hosting/installation/npm/) (requires [Node.js](https://nodejs.org/en/)):
 
-## Documentation
+```
+npx n8n
+```
 
-The official n8n documentation can be found on our [documentation website](https://docs.n8n.io)
+Or deploy with [Docker](https://docs.n8n.io/hosting/installation/docker/):
 
-Additional information and example workflows on the [n8n.io website](https://n8n.io)
+```
+docker volume create n8n_data
+docker run -it --rm --name n8n -p 5678:5678 -v n8n_data:/home/node/.n8n docker.n8n.io/n8nio/n8n
+```
 
-The release notes can be found [here](https://docs.n8n.io/release-notes/) and the list of breaking
-changes [here](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-CHANGES.md).
+Access the editor at http://localhost:5678
 
-## Usage
+## Resources
 
-- :books: Learn
-  [how to **use** it from the command line](https://docs.n8n.io/reference/cli-commands/)
-- :whale: Learn
-  [how to run n8n in **Docker**](https://docs.n8n.io/hosting/installation/docker/)
-
-## Start
-
-You can try n8n without installing it using npx. You must have [Node.js](https://nodejs.org/en/) installed.
-From the terminal, run:
-
-`npx n8n`
-
-This command will download everything that is needed to start n8n. You can then access n8n and start building workflows by opening [http://localhost:5678](http://localhost:5678).
-
-## n8n cloud
-
-Sign-up for an [n8n cloud](https://www.n8n.io/cloud/) account.
-
-While n8n cloud and n8n are the same in terms of features, n8n cloud provides certain conveniences such as:
-
-- Not having to set up and maintain your n8n instance
-- Managed OAuth for authentication
-- Easily upgrading to the newer n8n versions
-
-## Build with LangChain and AI in n8n (beta)
-
-With n8n's LangChain nodes you can build AI-powered functionality within your workflows. The LangChain nodes are configurable, meaning you can choose your preferred agent, LLM, memory, and so on. Alongside the LangChain nodes, you can connect any n8n node as normal: this means you can integrate your LangChain logic with other data sources and services.
-
-Learn more in the [documentation](https://docs.n8n.io/langchain/).
-
-- [LangChain nodes package](https://www.npmjs.com/package/@n8n/n8n-nodes-langchain)
-- [Chatbot package](https://www.npmjs.com/package/@n8n/chat)
+- 📚 [Documentation](https://docs.n8n.io)
+- 🔧 [400+ Integrations](https://n8n.io/integrations)
+- 💡 [Example Workflows](https://n8n.io/workflows)
+- 🤖 [AI & LangChain Guide](https://docs.n8n.io/langchain/)
+- 👥 [Community Forum](https://community.n8n.io)
+- 📖 [Community Tutorials](https://community.n8n.io/c/tutorials/28)
 
 ## Support
 
-If you have problems or questions go to our forum, we will then try to help you asap:
-
-[https://community.n8n.io](https://community.n8n.io)
-
-## Jobs
-
-If you are interested in working for n8n and so shape the future of the project check out our
-[job posts](https://apply.workable.com/n8n/)
-
-## What does n8n mean and how do you pronounce it?
-
-**Short answer:** It means "nodemation" and it is pronounced as n-eight-n.
-
-**Long answer:** "I get that question quite often (more often than I expected) so I decided it is probably
-best to answer it here. While looking for a good name for the project with a free domain I realized very
-quickly that all the good ones I could think of were already taken. So, in the end, I chose nodemation.
-'node-' in the sense that it uses a Node-View and that it uses Node.js and '-mation' for 'automation' which is
-what the project is supposed to help with. However, I did not like how long the name was and I could not
-imagine writing something that long every time in the CLI. That is when I then ended up on 'n8n'." - **Jan
-Oberhauser, Founder and CEO, n8n.io**
-
-## Development setup
-
-Have you found a bug :bug: ? Or maybe you have a nice feature :sparkles: to contribute ? The
-[CONTRIBUTING guide](https://github.com/n8n-io/n8n/blob/master/CONTRIBUTING.md) will help you get your
-development environment ready in minutes.
+Need help? Our community forum is the place to get support and connect with other users:
+[community.n8n.io](https://community.n8n.io)
 
 ## License
 
-n8n is [fair-code](https://faircode.io) distributed under the
-[**Sustainable Use License**](https://github.com/n8n-io/n8n/blob/master/LICENSE.md) and the
-[**n8n Enterprise License**](https://github.com/n8n-io/n8n/blob/master/LICENSE_EE.md).
+n8n is [fair-code](https://faircode.io) distributed under the [Sustainable Use License](https://github.com/n8n-io/n8n/blob/master/LICENSE.md) and [n8n Enterprise License](https://github.com/n8n-io/n8n/blob/master/LICENSE_EE.md).
 
-Proprietary licenses are available for enterprise customers. [Get in touch](mailto:license@n8n.io)
+- **Source Available**: Always visible source code
+- **Self-Hostable**: Deploy anywhere
+- **Extensible**: Add your own nodes and functionality
 
-Additional information about the license model can be found in the
-[docs](https://docs.n8n.io/reference/license/).
+[Enterprise licenses](mailto:license@n8n.io) available for additional features and support.
+
+Additional information about the license model can be found in the [docs](https://docs.n8n.io/reference/license/).
+
+## Contributing
+
+Found a bug 🐛 or have a feature idea ✨? Check our [Contributing Guide](https://github.com/n8n-io/n8n/blob/master/CONTRIBUTING.md) to get started.
+
+## Join the Team
+
+Want to shape the future of automation? Check out our [job posts](https://n8n.io/careers) and join our team!
+
+## What does n8n mean?
+
+**Short answer:** It means "nodemation" and is pronounced as n-eight-n.
+
+**Long answer:** "I get that question quite often (more often than I expected) so I decided it is probably best to answer it here. While looking for a good name for the project with a free domain I realized very quickly that all the good ones I could think of were already taken. So, in the end, I chose nodemation. 'node-' in the sense that it uses a Node-View and that it uses Node.js and '-mation' for 'automation' which is what the project is supposed to help with. However, I did not like how long the name was and I could not imagine writing something that long every time in the CLI. That is when I then ended up on 'n8n'." - **Jan Oberhauser, Founder and CEO, n8n.io**
diff --git a/assets/n8n-screenshot-readme.png b/assets/n8n-screenshot-readme.png
new file mode 100644
index 0000000000..d6b5faef71
Binary files /dev/null and b/assets/n8n-screenshot-readme.png differ
diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 0000000000..362ebcb760
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,60 @@
+codecov:
+  max_report_age: off
+  require_ci_to_pass: true
+
+coverage:
+  status:
+    patch: false
+    project:
+      default:
+        threshold: 0.5%
+
+github_checks:
+  annotations: false
+
+flags:
+  tests:
+    paths:
+      - "**"
+    carryforward: true
+
+component_management:
+  default_rules:
+    statuses:
+      - type: project
+        target: auto
+        branches:
+          - "!master"
+  individual_components:
+    - component_id: backend_packages
+      name: Backend
+      paths:
+        - packages/@n8n/api-types/**
+        - packages/@n8n/config/**
+        - packages/@n8n/client-oauth2/**
+        - packages/@n8n/di/**
+        - packages/@n8n/imap/**
+        - packages/@n8n/permissions/**
+        - packages/@n8n/task-runner/**
+        - packages/workflow/**
+        - packages/core/**
+        - packages/cli/**
+    - component_id: frontend_packages
+      name: Frontend
+      paths:
+        - packages/@n8n/chat/**
+        - packages/@n8n/codemirror-lang/**
+        - packages/design-system/**
+        - packages/editor-ui/**
+    - component_id: nodes_packages
+      name: Nodes
+      paths:
+        - packages/node-dev/**
+        - packages/nodes-base/**
+        - packages/@n8n/json-schema-to-zod/**
+        - packages/@n8n/nodes-langchain/**
+
+ignore:
+  - (?s:.*/[^\/]*\.spec\.ts.*)\Z
+  - (?s:.*/[^\/]*\.test\.ts.*)\Z
+  - (?s:.*/[^\/]*e2e[^\/]*\.ts.*)\Z
diff --git a/cypress/composables/executions.ts b/cypress/composables/executions.ts
new file mode 100644
index 0000000000..cd07eb7e6a
--- /dev/null
+++ b/cypress/composables/executions.ts
@@ -0,0 +1,29 @@
+/**
+ * Getters
+ */
+
+export const getExecutionsSidebar = () => cy.getByTestId('executions-sidebar');
+
+export const getWorkflowExecutionPreviewIframe = () => cy.getByTestId('workflow-preview-iframe');
+
+export const getExecutionPreviewBody = () =>
+	getWorkflowExecutionPreviewIframe()
+		.its('0.contentDocument.body')
+		.then((el) => cy.wrap(el));
+
+export const getExecutionPreviewBodyNodes = () =>
+	getExecutionPreviewBody().findChildByTestId('canvas-node');
+
+export const getExecutionPreviewBodyNodesByName = (name: string) =>
+	getExecutionPreviewBody().findChildByTestId('canvas-node').filter(`[data-name="${name}"]`).eq(0);
+
+export function getExecutionPreviewOutputPanelRelatedExecutionLink() {
+	return getExecutionPreviewBody().findChildByTestId('related-execution-link');
+}
+
+/**
+ * Actions
+ */
+
+export const openExecutionPreviewNode = (name: string) =>
+	getExecutionPreviewBodyNodesByName(name).dblclick();
diff --git a/cypress/composables/modals/chat-modal.ts b/cypress/composables/modals/chat-modal.ts
index 254d811a18..220c363dd1 100644
--- a/cypress/composables/modals/chat-modal.ts
+++ b/cypress/composables/modals/chat-modal.ts
@@ -3,7 +3,7 @@
  */
 
 export function getManualChatModal() {
-	return cy.getByTestId('lmChat-modal');
+	return cy.getByTestId('canvas-chat');
 }
 
 export function getManualChatInput() {
@@ -19,11 +19,11 @@ export function getManualChatMessages() {
 }
 
 export function getManualChatModalCloseButton() {
-	return getManualChatModal().get('.el-dialog__close');
+	return cy.getByTestId('workflow-chat-button');
 }
 
 export function getManualChatModalLogs() {
-	return getManualChatModal().getByTestId('lm-chat-logs');
+	return cy.getByTestId('canvas-chat-logs');
 }
 export function getManualChatDialog() {
 	return getManualChatModal().getByTestId('workflow-lm-chat-dialog');
diff --git a/cypress/composables/modals/credential-modal.ts b/cypress/composables/modals/credential-modal.ts
index 8ce6a86049..4e6533300a 100644
--- a/cypress/composables/modals/credential-modal.ts
+++ b/cypress/composables/modals/credential-modal.ts
@@ -2,6 +2,8 @@
  * Getters
  */
 
+import { clearNotifications } from '../../pages/notifications';
+
 export function getCredentialConnectionParameterInputs() {
 	return cy.getByTestId('credential-connection-parameter');
 }
@@ -35,7 +37,12 @@ export function setCredentialConnectionParameterInputByName(name: string, value:
 }
 
 export function saveCredential() {
-	getCredentialSaveButton().click({ force: true });
+	getCredentialSaveButton()
+		.click({ force: true })
+		.within(() => {
+			cy.get('button').should('not.exist');
+		});
+	getCredentialSaveButton().should('have.text', 'Saved');
 }
 
 export function closeCredentialModal() {
@@ -50,5 +57,6 @@ export function setCredentialValues(values: Record<string, string>, save = true)
 	if (save) {
 		saveCredential();
 		closeCredentialModal();
+		clearNotifications();
 	}
 }
diff --git a/cypress/composables/ndv.ts b/cypress/composables/ndv.ts
index 5b3690e6a6..9ec6f3ba19 100644
--- a/cypress/composables/ndv.ts
+++ b/cypress/composables/ndv.ts
@@ -2,7 +2,7 @@
  * Getters
  */
 
-import { getVisibleSelect } from '../utils';
+import { getVisiblePopper, getVisibleSelect } from '../utils/popper';
 
 export function getCredentialSelect(eq = 0) {
 	return cy.getByTestId('node-credentials-select').eq(eq);
@@ -36,14 +36,90 @@ export function getOutputPanel() {
 	return cy.getByTestId('output-panel');
 }
 
+export function getFixedCollection(collectionName: string) {
+	return cy.getByTestId(`fixed-collection-${collectionName}`);
+}
+
+export function getResourceLocator(paramName: string) {
+	return cy.getByTestId(`resource-locator-${paramName}`);
+}
+
+export function getResourceLocatorInput(paramName: string) {
+	return getResourceLocator(paramName).find('[data-test-id="rlc-input-container"]');
+}
+
 export function getOutputPanelDataContainer() {
 	return getOutputPanel().getByTestId('ndv-data-container');
 }
 
+export function getOutputTableRows() {
+	return getOutputPanelDataContainer().find('table tr');
+}
+
+export function getOutputTableRow(row: number) {
+	return getOutputTableRows().eq(row);
+}
+
+export function getOutputTableHeaders() {
+	return getOutputPanelDataContainer().find('table thead th');
+}
+
+export function getOutputTableHeaderByText(text: string) {
+	return getOutputTableHeaders().contains(text);
+}
+
+export function getOutputTbodyCell(row: number, col: number) {
+	return getOutputTableRows().eq(row).find('td').eq(col);
+}
+
+export function getOutputRunSelector() {
+	return getOutputPanel().findChildByTestId('run-selector');
+}
+
+export function getOutputRunSelectorInput() {
+	return getOutputRunSelector().find('input');
+}
+
 export function getOutputPanelTable() {
 	return getOutputPanelDataContainer().get('table');
 }
 
+export function getRunDataInfoCallout() {
+	return cy.getByTestId('run-data-callout');
+}
+
+export function getOutputPanelItemsCount() {
+	return getOutputPanel().getByTestId('ndv-items-count');
+}
+
+export function getOutputPanelRelatedExecutionLink() {
+	return getOutputPanel().getByTestId('related-execution-link');
+}
+
+export function getNodeOutputHint() {
+	return cy.getByTestId('ndv-output-run-node-hint');
+}
+
+export function getWorkflowCards() {
+	return cy.getByTestId('resources-list-item');
+}
+
+export function getWorkflowCard(workflowName: string) {
+	return getWorkflowCards().contains(workflowName).parents('[data-test-id="resources-list-item"]');
+}
+
+export function getWorkflowCardContent(workflowName: string) {
+	return getWorkflowCard(workflowName).findChildByTestId('card-content');
+}
+
+export function getNodeRunInfoStale() {
+	return cy.getByTestId('node-run-info-stale');
+}
+
+export function getNodeOutputErrorMessage() {
+	return getOutputPanel().findChildByTestId('node-error-message');
+}
+
 /**
  * Actions
  */
@@ -70,15 +146,111 @@ export function clickExecuteNode() {
 	getExecuteNodeButton().click();
 }
 
+export function clickResourceLocatorInput(paramName: string) {
+	getResourceLocatorInput(paramName).click();
+}
+
 export function setParameterInputByName(name: string, value: string) {
 	getParameterInputByName(name).clear().type(value);
 }
 
-export function toggleParameterCheckboxInputByName(name: string) {
-	getParameterInputByName(name).find('input[type="checkbox"]').realClick();
+export function checkParameterCheckboxInputByName(name: string) {
+	getParameterInputByName(name).find('input[type="checkbox"]').check({ force: true });
+}
+
+export function uncheckParameterCheckboxInputByName(name: string) {
+	getParameterInputByName(name).find('input[type="checkbox"]').uncheck({ force: true });
 }
 
 export function setParameterSelectByContent(name: string, content: string) {
 	getParameterInputByName(name).realClick();
 	getVisibleSelect().find('.option-headline').contains(content).click();
 }
+
+export function changeOutputRunSelector(runName: string) {
+	getOutputRunSelector().click();
+	getVisibleSelect().find('.el-select-dropdown__item').contains(runName).click();
+}
+
+export function addItemToFixedCollection(collectionName: string) {
+	getFixedCollection(collectionName).getByTestId('fixed-collection-add').click();
+}
+
+export function typeIntoFixedCollectionItem(collectionName: string, index: number, value: string) {
+	getFixedCollection(collectionName).within(() =>
+		cy.getByTestId('parameter-input').eq(index).type(value),
+	);
+}
+
+export function selectResourceLocatorItem(
+	resourceLocator: string,
+	index: number,
+	expectedText: string,
+) {
+	clickResourceLocatorInput(resourceLocator);
+
+	getVisiblePopper().findChildByTestId('rlc-item').eq(0).should('exist');
+	getVisiblePopper()
+		.findChildByTestId('rlc-item')
+		.eq(index)
+		.find('span')
+		.should('contain.text', expectedText)
+		.click();
+}
+
+export function clickWorkflowCardContent(workflowName: string) {
+	getWorkflowCardContent(workflowName).click();
+}
+
+export function assertNodeOutputHintExists() {
+	getNodeOutputHint().should('exist');
+}
+
+export function assertNodeOutputErrorMessageExists() {
+	return getNodeOutputErrorMessage().should('exist');
+}
+
+// Note that this only validates the expectedContent is *included* in the output table
+export function assertOutputTableContent(expectedContent: unknown[][]) {
+	for (const [i, row] of expectedContent.entries()) {
+		for (const [j, value] of row.entries()) {
+			// + 1 to skip header
+			getOutputTbodyCell(1 + i, j).should('have.text', value);
+		}
+	}
+}
+
+export function populateMapperFields(fields: ReadonlyArray<[string, string]>) {
+	for (const [name, value] of fields) {
+		getParameterInputByName(name).type(value);
+
+		// Click on a parent to dismiss the pop up which hides the field below.
+		getParameterInputByName(name).parent().parent().parent().click('topLeft');
+	}
+}
+
+/**
+ * Populate multiValue fixedCollections. Only supports fixedCollections for which all fields can be defined via keyboard typing
+ *
+ * @param items - 2D array of items to populate, i.e. [["myField1", "String"], ["myField2", "Number"]]
+ * @param collectionName - name of the fixedCollection to populate
+ * @param offset - amount of 'parameter-input's before start, e.g. from a controlling dropdown that makes the fields appear
+ * @returns
+ */
+export function populateFixedCollection<T extends readonly string[]>(
+	items: readonly T[],
+	collectionName: string,
+	offset: number = 0,
+) {
+	if (items.length === 0) return;
+	const n = items[0].length;
+	for (const [i, params] of items.entries()) {
+		addItemToFixedCollection(collectionName);
+		for (const [j, param] of params.entries()) {
+			getFixedCollection(collectionName)
+				.getByTestId('parameter-input')
+				.eq(offset + i * n + j)
+				.type(`${param}{downArrow}{enter}`);
+		}
+	}
+}
diff --git a/cypress/composables/projects.ts b/cypress/composables/projects.ts
index da9c6fcc65..09d7a341ce 100644
--- a/cypress/composables/projects.ts
+++ b/cypress/composables/projects.ts
@@ -6,11 +6,40 @@ const credentialsModal = new CredentialsModal();
 
 export const getHomeButton = () => cy.getByTestId('project-home-menu-item');
 export const getMenuItems = () => cy.getByTestId('project-menu-item');
-export const getAddProjectButton = () =>
-	cy.getByTestId('add-project-menu-item').should('contain', 'Add project').should('be.visible');
+export const getAddProjectButton = () => {
+	cy.getByTestId('universal-add').should('be.visible').click();
+	cy.getByTestId('universal-add')
+		.find('.el-sub-menu__title')
+		.as('menuitem')
+		.should('have.attr', 'aria-describedby');
+
+	cy.get('@menuitem')
+		.invoke('attr', 'aria-describedby')
+		.then((el) => cy.get(`[id="${el}"]`))
+		.as('submenu');
+
+	cy.get('@submenu').within((submenu) =>
+		cy
+			.wrap(submenu)
+			.getByTestId('navigation-menu-item')
+			.should('be.visible')
+			.filter(':contains("Project")')
+			.as('button'),
+	);
+
+	return cy.get('@button');
+};
+export const getAddFirstProjectButton = () => cy.getByTestId('add-first-project-button');
+export const getIconPickerButton = () => cy.getByTestId('icon-picker-button');
+export const getIconPickerTab = (tab: string) => cy.getByTestId('icon-picker-tabs').contains(tab);
+export const getIconPickerIcons = () => cy.getByTestId('icon-picker-icon');
+export const getIconPickerEmojis = () => cy.getByTestId('icon-picker-emoji');
+// export const getAddProjectButton = () =>
+// 	cy.getByTestId('universal-add').should('contain', 'Add project').should('be.visible');
 export const getProjectTabs = () => cy.getByTestId('project-tabs').find('a');
 export const getProjectTabWorkflows = () => getProjectTabs().filter('a[href$="/workflows"]');
 export const getProjectTabCredentials = () => getProjectTabs().filter('a[href$="/credentials"]');
+export const getProjectTabExecutions = () => getProjectTabs().filter('a[href$="/executions"]');
 export const getProjectTabSettings = () => getProjectTabs().filter('a[href$="/settings"]');
 export const getProjectSettingsNameInput = () =>
 	cy.getByTestId('project-settings-name-input').find('input');
diff --git a/cypress/composables/workflow.ts b/cypress/composables/workflow.ts
index 394a35af18..66782f02cf 100644
--- a/cypress/composables/workflow.ts
+++ b/cypress/composables/workflow.ts
@@ -1,4 +1,5 @@
 import { getManualChatModal } from './modals/chat-modal';
+import { clickGetBackToCanvas, getParameterInputByName } from './ndv';
 import { ROUTES } from '../constants';
 
 /**
@@ -6,6 +7,7 @@ import { ROUTES } from '../constants';
  */
 
 export type EndpointType =
+	| 'main'
 	| 'ai_chain'
 	| 'ai_document'
 	| 'ai_embedding'
@@ -23,8 +25,15 @@ export type EndpointType =
  */
 
 export function getAddInputEndpointByType(nodeName: string, endpointType: EndpointType) {
-	return cy.get(
-		`.add-input-endpoint[data-jtk-scope-${endpointType}][data-endpoint-name="${nodeName}"]`,
+	return cy.ifCanvasVersion(
+		() =>
+			cy.get(
+				`.add-input-endpoint[data-jtk-scope-${endpointType}][data-endpoint-name="${nodeName}"]`,
+			),
+		() =>
+			cy.get(
+				`[data-test-id="canvas-node-input-handle"][data-connection-type="${endpointType}"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"]`,
+			),
 	);
 }
 
@@ -45,7 +54,14 @@ export function getNodes() {
 }
 
 export function getNodeByName(name: string) {
-	return cy.getByTestId('canvas-node').filter(`[data-name="${name}"]`).eq(0);
+	return cy.ifCanvasVersion(
+		() => cy.getByTestId('canvas-node').filter(`[data-name="${name}"]`).eq(0),
+		() => cy.getByTestId('canvas-node').filter(`[data-node-name="${name}"]`).eq(0),
+	);
+}
+
+export function getWorkflowHistoryCloseButton() {
+	return cy.getByTestId('workflow-history-close-button');
 }
 
 export function disableNode(name: string) {
@@ -55,10 +71,18 @@ export function disableNode(name: string) {
 }
 
 export function getConnectionBySourceAndTarget(source: string, target: string) {
-	return cy
-		.get('.jtk-connector')
-		.filter(`[data-source-node="${source}"][data-target-node="${target}"]`)
-		.eq(0);
+	return cy.ifCanvasVersion(
+		() =>
+			cy
+				.get('.jtk-connector')
+				.filter(`[data-source-node="${source}"][data-target-node="${target}"]`)
+				.eq(0),
+		() =>
+			cy
+				.getByTestId('edge')
+				.filter(`[data-source-node-name="${source}"][data-target-node-name="${target}"]`)
+				.eq(0),
+	);
 }
 
 export function getNodeCreatorSearchBar() {
@@ -69,6 +93,25 @@ export function getNodeCreatorPlusButton() {
 	return cy.getByTestId('node-creator-plus-button');
 }
 
+export function getCanvasNodes() {
+	return cy.ifCanvasVersion(
+		() => cy.getByTestId('canvas-node'),
+		() => cy.getByTestId('canvas-node').not('[data-node-type="n8n-nodes-internal.addNodes"]'),
+	);
+}
+
+export function getCanvasNodeByName(nodeName: string) {
+	return getCanvasNodes().filter(`:contains(${nodeName})`);
+}
+
+export function getSaveButton() {
+	return cy.getByTestId('workflow-save-button');
+}
+
+export function getZoomToFitButton() {
+	return cy.getByTestId('zoom-to-fit');
+}
+
 /**
  * Actions
  */
@@ -108,7 +151,7 @@ export function navigateToNewWorkflowPage(preventNodeViewUnload = true) {
 	});
 }
 
-export function addSupplementalNodeToParent(
+function connectNodeToParent(
 	nodeName: string,
 	endpointType: EndpointType,
 	parentNodeName: string,
@@ -122,7 +165,28 @@ export function addSupplementalNodeToParent(
 	} else {
 		getNodeCreatorItems().contains(nodeName).click();
 	}
-	getConnectionBySourceAndTarget(parentNodeName, nodeName).should('exist');
+}
+
+export function addSupplementalNodeToParent(
+	nodeName: string,
+	endpointType: EndpointType,
+	parentNodeName: string,
+	exactMatch = false,
+) {
+	connectNodeToParent(nodeName, endpointType, parentNodeName, exactMatch);
+
+	cy.ifCanvasVersion(
+		() => {
+			getConnectionBySourceAndTarget(parentNodeName, nodeName).should('exist');
+		},
+		() => {
+			if (endpointType === 'main') {
+				getConnectionBySourceAndTarget(parentNodeName, nodeName).should('exist');
+			} else {
+				getConnectionBySourceAndTarget(nodeName, parentNodeName).should('exist');
+			}
+		},
+	);
 }
 
 export function addLanguageModelNodeToParent(
@@ -141,6 +205,15 @@ export function addToolNodeToParent(nodeName: string, parentNodeName: string) {
 	addSupplementalNodeToParent(nodeName, 'ai_tool', parentNodeName);
 }
 
+export function addVectorStoreToolToParent(nodeName: string, parentNodeName: string) {
+	connectNodeToParent(nodeName, 'ai_tool', parentNodeName, false);
+	getParameterInputByName('mode')
+		.find('input')
+		.should('have.value', 'Retrieve Documents (As Tool for AI Agent)');
+	clickGetBackToCanvas();
+	getConnectionBySourceAndTarget(nodeName, parentNodeName).should('exist');
+}
+
 export function addOutputParserNodeToParent(nodeName: string, parentNodeName: string) {
 	addSupplementalNodeToParent(nodeName, 'ai_outputParser', parentNodeName);
 }
@@ -163,3 +236,24 @@ export function clickManualChatButton() {
 export function openNode(nodeName: string) {
 	getNodeByName(nodeName).dblclick();
 }
+
+export function saveWorkflowOnButtonClick() {
+	cy.intercept('POST', '/rest/workflows').as('createWorkflow');
+	getSaveButton().should('contain', 'Save');
+	getSaveButton().click();
+	getSaveButton().should('contain', 'Saved');
+	cy.url().should('not.have.string', '/new');
+}
+
+export function pasteWorkflow(workflow: object) {
+	cy.get('body').paste(JSON.stringify(workflow));
+}
+
+export function clickZoomToFit() {
+	getZoomToFitButton().click();
+}
+
+export function deleteNode(name: string) {
+	getCanvasNodeByName(name).first().click();
+	cy.get('body').type('{del}');
+}
diff --git a/cypress/composables/workflowsPage.ts b/cypress/composables/workflowsPage.ts
new file mode 100644
index 0000000000..c7bcf39888
--- /dev/null
+++ b/cypress/composables/workflowsPage.ts
@@ -0,0 +1,15 @@
+/**
+ * Getters
+ */
+
+export function getWorkflowsPageUrl() {
+	return '/home/workflows';
+}
+
+/**
+ * Actions
+ */
+
+export function visitWorkflowsPage() {
+	cy.visit(getWorkflowsPageUrl());
+}
diff --git a/cypress/e2e/11-inline-expression-editor.cy.ts b/cypress/e2e/11-inline-expression-editor.cy.ts
index 945c62821b..a762135a65 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -129,7 +129,7 @@ describe('Inline expression editor', () => {
 
 			// Run workflow
 			ndv.actions.close();
-			WorkflowPage.actions.executeNode('No Operation');
+			WorkflowPage.actions.executeNode('No Operation', { anchor: 'topLeft' });
 			WorkflowPage.actions.openNode('Hacker News');
 			WorkflowPage.actions.openInlineExpressionEditor();
 
diff --git a/cypress/e2e/13-pinning.cy.ts b/cypress/e2e/13-pinning.cy.ts
index 4f48fa4529..2d3351f8aa 100644
--- a/cypress/e2e/13-pinning.cy.ts
+++ b/cypress/e2e/13-pinning.cy.ts
@@ -112,7 +112,7 @@ describe('Data pinning', () => {
 	it('Should be able to pin data from canvas (context menu or shortcut)', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
 		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME);
-		workflowPage.actions.openContextMenu(EDIT_FIELDS_SET_NODE_NAME, 'overflow-button');
+		workflowPage.actions.openContextMenu(EDIT_FIELDS_SET_NODE_NAME, { method: 'overflow-button' });
 		workflowPage.getters
 			.contextMenuAction('toggle_pin')
 			.parent()
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 3bbbd0b293..4ebce02d9d 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -41,7 +41,9 @@ describe('Data mapping', () => {
 		ndv.actions.mapDataFromHeader(1, 'value');
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.timestamp }}');
 		ndv.getters.inlineExpressionEditorInput().type('{esc}');
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '2024');
+		ndv.getters
+			.parameterExpressionPreview('value')
+			.should('include.text', new Date().getFullYear());
 
 		ndv.actions.mapDataFromHeader(2, 'value');
 		ndv.getters
@@ -113,6 +115,8 @@ describe('Data mapping', () => {
 	});
 
 	it('maps expressions from json view', () => {
+		// ADO-3063 - followup to make this viewport global
+		cy.viewport('macbook-16');
 		cy.fixture('Test_workflow_3.json').then((data) => {
 			cy.get('body').paste(JSON.stringify(data));
 		});
@@ -121,17 +125,17 @@ describe('Data mapping', () => {
 		workflowPage.actions.openNode('Set');
 		ndv.actions.switchInputMode('JSON');
 
+		ndv.getters.inputDataContainer().should('exist');
+
 		ndv.getters
 			.inputDataContainer()
-			.should('exist')
 			.find('.json-data')
 			.should(
 				'have.text',
 				'[{"input": [{"count": 0,"with space": "!!","with.dot": "!!","with"quotes": "!!"}]},{"input": [{"count": 1}]}]',
-			)
-			.find('span')
-			.contains('"count"')
-			.realMouseDown();
+			);
+
+		ndv.getters.inputDataContainer().find('span').contains('"count"').realMouseDown();
 
 		ndv.actions.mapToParameter('value');
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
@@ -185,7 +189,6 @@ describe('Data mapping', () => {
 		workflowPage.actions.openNode('Set1');
 
 		ndv.actions.executePrevious();
-		ndv.actions.expandSchemaViewNode(SCHEDULE_TRIGGER_NODE_NAME);
 
 		const dataPill = ndv.getters
 			.inputDataContainer()
diff --git a/cypress/e2e/16-form-trigger-node.cy.ts b/cypress/e2e/16-form-trigger-node.cy.ts
index 60fbd7c419..ed901107ea 100644
--- a/cypress/e2e/16-form-trigger-node.cy.ts
+++ b/cypress/e2e/16-form-trigger-node.cy.ts
@@ -44,8 +44,7 @@ describe('n8n Form Trigger', () => {
 			':nth-child(3) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(1) > .parameter-item',
 		)
 			.find('input[placeholder*="e.g. What is your name?"]')
-			.type('Test Field 3')
-			.blur();
+			.type('Test Field 3');
 		cy.get(
 			':nth-child(3) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(2) > .parameter-item',
 		).click();
@@ -56,27 +55,24 @@ describe('n8n Form Trigger', () => {
 			':nth-child(4) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(1) > .parameter-item',
 		)
 			.find('input[placeholder*="e.g. What is your name?"]')
-			.type('Test Field 4')
-			.blur();
+			.type('Test Field 4');
 		cy.get(
 			':nth-child(4) > .border-top-dashed > .parameter-input-list-wrapper > :nth-child(2) > .parameter-item',
 		).click();
 		getVisibleSelect().contains('Dropdown').click();
-		cy.get(
-			'.border-top-dashed > :nth-child(2) > :nth-child(3) > .multi-parameter > .fixed-collection-parameter > :nth-child(2) > .button',
-		).click();
-		cy.get(
-			':nth-child(4) > :nth-child(1) > :nth-child(2) > :nth-child(3) > .multi-parameter > .fixed-collection-parameter > .fixed-collection-parameter-property > :nth-child(1) > :nth-child(1)',
-		)
-			.find('input')
-			.type('Option 1')
-			.blur();
-		cy.get(
-			':nth-child(4) > :nth-child(1) > :nth-child(2) > :nth-child(3) > .multi-parameter > .fixed-collection-parameter > .fixed-collection-parameter-property > :nth-child(1) > :nth-child(2)',
-		)
-			.find('input')
-			.type('Option 2')
-			.blur();
+		cy.contains('button', 'Add Field Option').click();
+		cy.contains('label', 'Field Options')
+			.parent()
+			.nextAll()
+			.find('[data-test-id="parameter-input-field"]')
+			.eq(0)
+			.type('Option 1');
+		cy.contains('label', 'Field Options')
+			.parent()
+			.nextAll()
+			.find('[data-test-id="parameter-input-field"]')
+			.eq(1)
+			.type('Option 2');
 
 		//add optional submitted message
 		cy.get('.param-options').click();
@@ -94,7 +90,6 @@ describe('n8n Form Trigger', () => {
 			.children()
 			.children()
 			.first()
-			.clear()
 			.type('Your test form was successfully submitted');
 
 		ndv.getters.backToCanvas().click();
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 3d6c1049a2..193ada0bcc 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -250,7 +250,7 @@ describe('Webhook Trigger node', () => {
 		});
 		// add credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.actions.fillCredentialsForm();
 
@@ -293,7 +293,7 @@ describe('Webhook Trigger node', () => {
 		});
 		// add credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.actions.fillCredentialsForm();
 
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index 51b4a674d3..60eb474b07 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -1,3 +1,4 @@
+import { saveCredential } from '../composables/modals/credential-modal';
 import * as projects from '../composables/projects';
 import { INSTANCE_MEMBERS, INSTANCE_OWNER, INSTANCE_ADMIN, NOTION_NODE_NAME } from '../constants';
 import {
@@ -88,7 +89,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 +105,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 +134,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 +145,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();
 	});
 
@@ -225,8 +226,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 			.filter(':contains("Development")')
 			.should('have.length', 1)
 			.click();
-		credentialsModal.getters.saveButton().click();
-		credentialsModal.getters.saveButton().should('have.text', 'Saved');
+		saveCredential();
 		credentialsModal.actions.close();
 
 		projects.getProjectTabWorkflows().click();
@@ -252,8 +252,7 @@ describe('Sharing', { disableAutoLogin: true }, () => {
 		credentialsModal.actions.changeTab('Sharing');
 		credentialsModal.getters.usersSelect().click();
 		getVisibleSelect().find('li').should('have.length', 4).first().click();
-		credentialsModal.getters.saveButton().click();
-		credentialsModal.getters.saveButton().should('have.text', 'Saved');
+		saveCredential();
 		credentialsModal.actions.close();
 
 		credentialsPage.getters
@@ -298,10 +297,9 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		workflowsPage.actions.createWorkflowFromCard();
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 
-		// Only the credential in this project (+ the 'Create new' option) should
-		// be in the dropdown
+		// Only the credential in this project should be in the dropdown
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length', 2);
+		getVisibleSelect().find('li').should('have.length', 1);
 	});
 
 	it('should only show credentials in their personal project for members', () => {
@@ -326,10 +324,9 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 		workflowsPage.actions.createWorkflowFromCard();
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 
-		// Only the own credential the shared one (+ the 'Create new' option)
-		// should be in the dropdown
+		// Only the own credential the shared one should be in the dropdown
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length', 3);
+		getVisibleSelect().find('li').should('have.length', 2);
 	});
 
 	it('should only show credentials in their personal project for members if the workflow was shared with them', () => {
@@ -353,13 +350,12 @@ 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)
-		// should be in the dropdown
+		// Only the own credential the shared one should be in the dropdown
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length', 2);
+		getVisibleSelect().find('li').should('have.length', 1);
 	});
 
 	it("should show all credentials from all personal projects the workflow's been shared into for the global owner", () => {
@@ -398,13 +394,12 @@ 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
-		// should show up.
+		// Only the personal credentials of the workflow owner and the global owner should show up.
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length', 4);
+		getVisibleSelect().find('li').should('have.length', 3);
 	});
 
 	it('should show all personal credentials if the global owner owns the workflow', () => {
@@ -422,6 +417,6 @@ describe('Credential Usage in Cross Shared Workflows', () => {
 
 		// Show all personal credentials
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.have.length', 2);
+		getVisibleSelect().find('li').should('have.have.length', 1);
 	});
 });
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index fe91a72935..d4eb5841cf 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -148,24 +148,9 @@ describe('User Management', { disableAutoLogin: true }, () => {
 
 		personalSettingsPage.actions.changeTheme('Dark');
 		cy.get('body').should('have.attr', 'data-theme', 'dark');
-		settingsSidebar.actions.back();
-		mainSidebar.getters
-			.logo()
-			.should('have.attr', 'src')
-			.then((src) => {
-				expect(src).to.include('/static/logo/channel/dev-dark.svg');
-			});
 
-		cy.visit(personalSettingsPage.url);
 		personalSettingsPage.actions.changeTheme('Light');
 		cy.get('body').should('have.attr', 'data-theme', 'light');
-		settingsSidebar.actions.back();
-		mainSidebar.getters
-			.logo()
-			.should('have.attr', 'src')
-			.then((src) => {
-				expect(src).to.include('/static/logo/channel/dev.svg');
-			});
 	});
 
 	it('should delete user and their data', () => {
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 8ce3bc4080..260d5f63a0 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -1,5 +1,6 @@
 import { type ICredentialType } from 'n8n-workflow';
 
+import { getCredentialSaveButton, saveCredential } from '../composables/modals/credential-modal';
 import {
 	AGENT_NODE_NAME,
 	AI_TOOL_HTTP_NODE_NAME,
@@ -26,6 +27,22 @@ const nodeDetailsView = new NDV();
 const NEW_CREDENTIAL_NAME = 'Something else';
 const NEW_CREDENTIAL_NAME2 = 'Something else entirely';
 
+function createNotionCredential() {
+	workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME);
+	workflowPage.actions.openNode(NOTION_NODE_NAME);
+	workflowPage.getters.nodeCredentialsSelect().click();
+	workflowPage.getters.nodeCredentialsCreateOption().click();
+	credentialsModal.actions.fillCredentialsForm();
+	cy.get('body').type('{esc}');
+	workflowPage.actions.deleteNode(NOTION_NODE_NAME);
+}
+
+function deleteSelectedCredential() {
+	workflowPage.getters.nodeCredentialsEditButton().click();
+	credentialsModal.getters.deleteButton().click();
+	cy.get('.el-message-box').find('button').contains('Yes').click();
+}
+
 describe('Credentials', () => {
 	beforeEach(() => {
 		cy.visit(credentialsPage.url);
@@ -62,7 +79,7 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
@@ -82,7 +99,7 @@ describe('Credentials', () => {
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add oAuth credentials
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
@@ -90,14 +107,13 @@ describe('Credentials', () => {
 		cy.get('.el-message-box').find('button').contains('Close').click();
 		workflowPage.getters.nodeCredentialsSelect().click();
 		// Add Service account credentials
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		credentialsModal.getters.credentialAuthTypeRadioButtons().last().click();
 		credentialsModal.actions.fillCredentialsForm();
-		// Both (+ the 'Create new' option) should be in the dropdown
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').should('have.length.greaterThan', 2);
+		getVisibleSelect().find('li').should('have.length', 3);
 	});
 
 	it('should correctly render required and optional credentials', () => {
@@ -113,13 +129,13 @@ describe('Credentials', () => {
 		workflowPage.getters.nodeCredentialsSelect().should('have.length', 2);
 
 		workflowPage.getters.nodeCredentialsSelect().first().click();
-		getVisibleSelect().find('li').contains('Create New Credential').click();
+		workflowPage.getters.nodeCredentialsCreateOption().first().click();
 		// This one should show auth type selector
 		credentialsModal.getters.credentialAuthTypeRadioButtons().should('have.length', 2);
 		cy.get('body').type('{esc}');
 
 		workflowPage.getters.nodeCredentialsSelect().last().click();
-		getVisibleSelect().find('li').contains('Create New Credential').click();
+		workflowPage.getters.nodeCredentialsCreateOption().last().click();
 		// This one should not show auth type selector
 		credentialsModal.getters.credentialsAuthTypeSelector().should('not.exist');
 	});
@@ -131,7 +147,7 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialsAuthTypeSelector().should('not.exist');
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters
@@ -147,7 +163,7 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters
 			.nodeCredentialsSelect()
@@ -172,13 +188,13 @@ describe('Credentials', () => {
 		workflowPage.getters.canvasNodes().last().click();
 		cy.get('body').type('{enter}');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters.nodeCredentialsEditButton().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.name().click();
 		credentialsModal.actions.renameCredential(NEW_CREDENTIAL_NAME);
-		credentialsModal.getters.saveButton().click();
+		saveCredential();
 		credentialsModal.getters.closeButton().click();
 		workflowPage.getters
 			.nodeCredentialsSelect()
@@ -196,7 +212,7 @@ describe('Credentials', () => {
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.name().click();
 		credentialsModal.actions.renameCredential(NEW_CREDENTIAL_NAME2);
-		credentialsModal.getters.saveButton().click();
+		saveCredential();
 		credentialsModal.getters.closeButton().click();
 		workflowPage.getters
 			.nodeCredentialsSelect()
@@ -215,13 +231,13 @@ describe('Credentials', () => {
 		cy.getByTestId('credential-select').click();
 		cy.contains('Adalo API').click();
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters.nodeCredentialsEditButton().click();
 		credentialsModal.getters.credentialsEditModal().should('be.visible');
 		credentialsModal.getters.name().click();
 		credentialsModal.actions.renameCredential(NEW_CREDENTIAL_NAME);
-		credentialsModal.getters.saveButton().click();
+		saveCredential();
 		credentialsModal.getters.closeButton().click();
 		workflowPage.getters
 			.nodeCredentialsSelect()
@@ -229,6 +245,40 @@ describe('Credentials', () => {
 			.should('have.value', NEW_CREDENTIAL_NAME);
 	});
 
+	it('should set a default credential when adding nodes', () => {
+		workflowPage.actions.visit();
+
+		createNotionCredential();
+
+		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_NOTION_ACCOUNT_NAME);
+
+		deleteSelectedCredential();
+	});
+
+	it('should set a default credential when editing a node', () => {
+		workflowPage.actions.visit();
+
+		createNotionCredential();
+
+		workflowPage.actions.addNodeToCanvas(HTTP_REQUEST_NODE_NAME, true, true);
+		nodeDetailsView.getters.parameterInput('authentication').click();
+		getVisibleSelect().find('li').contains('Predefined').click();
+
+		nodeDetailsView.getters.parameterInput('nodeCredentialType').click();
+		getVisibleSelect().find('li').contains('Notion API').click();
+
+		workflowPage.getters
+			.nodeCredentialsSelect()
+			.find('input')
+			.should('have.value', NEW_NOTION_ACCOUNT_NAME);
+
+		deleteSelectedCredential();
+	});
+
 	it('should setup generic authentication for HTTP node', () => {
 		workflowPage.actions.visit();
 		workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
@@ -245,7 +295,7 @@ describe('Credentials', () => {
 
 		workflowPage.getters.nodeCredentialsSelect().should('exist');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters
 			.nodeCredentialsSelect()
@@ -274,7 +324,7 @@ describe('Credentials', () => {
 		workflowPage.actions.addNodeToCanvas('Slack', true, true, 'Get a channel');
 		workflowPage.getters.nodeCredentialsSelect().should('exist');
 		workflowPage.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
 		nodeDetailsView.getters.copyInput().should('not.exist');
 	});
@@ -292,7 +342,8 @@ describe('Credentials', () => {
 		credentialsModal.getters.connectionParameter('Internal Integration Secret').type('1234567890');
 
 		credentialsModal.actions.setName('My awesome Notion account');
-		credentialsModal.getters.saveButton().click({ force: true });
+		getCredentialSaveButton().click();
+
 		errorToast().should('have.length', 1);
 		errorToast().should('be.visible');
 
diff --git a/cypress/e2e/21-community-nodes.cy.ts b/cypress/e2e/21-community-nodes.cy.ts
index 17f82ec573..283c08d557 100644
--- a/cypress/e2e/21-community-nodes.cy.ts
+++ b/cypress/e2e/21-community-nodes.cy.ts
@@ -89,7 +89,7 @@ describe('Community and custom nodes in canvas', () => {
 		workflowPage.actions.addNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('E2E Node with native n8n credential', true, true);
 		workflowPage.getters.nodeCredentialsLabel().click();
-		cy.contains('Create New Credential').click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.editCredentialModal().should('be.visible');
 		credentialsModal.getters.editCredentialModal().should('contain.text', 'Notion API');
 	});
@@ -98,7 +98,7 @@ describe('Community and custom nodes in canvas', () => {
 		workflowPage.actions.addNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('E2E Node with custom credential', true, true);
 		workflowPage.getters.nodeCredentialsLabel().click();
-		cy.contains('Create New Credential').click();
+		workflowPage.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.editCredentialModal().should('be.visible');
 		credentialsModal.getters.editCredentialModal().should('contain.text', 'Custom E2E Credential');
 	});
diff --git a/cypress/e2e/2270-ADO-opening-webhook-ndv-marks-workflow-as-unsaved.cy.ts b/cypress/e2e/2270-ADO-opening-webhook-ndv-marks-workflow-as-unsaved.cy.ts
new file mode 100644
index 0000000000..eede668e1e
--- /dev/null
+++ b/cypress/e2e/2270-ADO-opening-webhook-ndv-marks-workflow-as-unsaved.cy.ts
@@ -0,0 +1,21 @@
+import { WEBHOOK_NODE_NAME } from '../constants';
+import { NDV, WorkflowPage } from '../pages';
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+
+describe('ADO-2270 Save button resets on webhook node open', () => {
+	it('should not reset the save button if webhook node is opened and closed', () => {
+		workflowPage.actions.visit();
+		workflowPage.actions.addInitialNodeToCanvas(WEBHOOK_NODE_NAME);
+		workflowPage.getters.saveButton().click();
+		workflowPage.actions.openNode(WEBHOOK_NODE_NAME);
+
+		ndv.actions.close();
+
+		cy.ifCanvasVersion(
+			() => cy.getByTestId('workflow-save-button').should('not.contain', 'Saved'),
+			() => cy.getByTestId('workflow-save-button').should('contain', 'Saved'),
+		);
+	});
+});
diff --git a/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts b/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
index eca3af81fb..79f33b841c 100644
--- a/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
+++ b/cypress/e2e/233-AI-switch-to-logs-on-error.cy.ts
@@ -90,6 +90,14 @@ function createRunDataWithError(inputMessage: string) {
 					routine: 'InitPostgres',
 				} as unknown as Error,
 			} as ExecutionError,
+			metadata: {
+				subRun: [
+					{
+						node: 'Postgres Chat Memory',
+						runIndex: 0,
+					},
+				],
+			},
 		}),
 		createMockNodeExecutionData(AGENT_NODE_NAME, {
 			executionStatus: 'error',
@@ -124,14 +132,6 @@ function createRunDataWithError(inputMessage: string) {
 				description: 'Internal error',
 				message: 'Internal error',
 			} as unknown as ExecutionError,
-			metadata: {
-				subRun: [
-					{
-						node: 'Postgres Chat Memory',
-						runIndex: 0,
-					},
-				],
-			},
 		}),
 	];
 }
diff --git a/cypress/e2e/24-ndv-paired-item.cy.ts b/cypress/e2e/24-ndv-paired-item.cy.ts
index 1261a0fcd1..49257a8a12 100644
--- a/cypress/e2e/24-ndv-paired-item.cy.ts
+++ b/cypress/e2e/24-ndv-paired-item.cy.ts
@@ -31,29 +31,31 @@ describe('NDV', () => {
 
 		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.inputTableRow(1).realHover();
+		ndv.actions.dragMainPanelToRight();
+		ndv.getters.inputTableRow(1).realMouseMove(10, 1);
 		ndv.getters.outputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.inputTableRow(2).realHover();
+		ndv.getters.inputTableRow(2).realMouseMove(10, 1);
 		ndv.getters.outputTableRow(2).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.inputTableRow(3).realHover();
+		ndv.getters.inputTableRow(3).realMouseMove(10, 1);
 		ndv.getters.outputTableRow(6).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
 		// output to input
-		ndv.getters.outputTableRow(1).realHover();
+		ndv.actions.dragMainPanelToLeft();
+		ndv.getters.outputTableRow(1).realMouseMove(10, 1);
 		ndv.getters.inputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(4).realHover();
+		ndv.getters.outputTableRow(4).realMouseMove(10, 1);
 		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(2).realHover();
+		ndv.getters.outputTableRow(2).realMouseMove(10, 1);
 		ndv.getters.inputTableRow(2).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(6).realHover();
+		ndv.getters.outputTableRow(6).realMouseMove(10, 1);
 		ndv.getters.inputTableRow(3).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.outputTableRow(1).realHover();
+		ndv.getters.outputTableRow(1).realMouseMove(10, 1);
 		ndv.getters.inputTableRow(4).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 	});
 
@@ -75,31 +77,32 @@ describe('NDV', () => {
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.switchOutputMode('Table');
 
-		ndv.getters.backToCanvas().realHover(); // reset to default hover
+		ndv.getters.backToCanvas().realMouseMove(10, 1); // reset to default hover
 		ndv.getters.outputHoveringItem().should('not.exist');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1111');
 
 		ndv.actions.selectInputNode('Set1');
-		ndv.getters.backToCanvas().realHover(); // reset to default hover
+		ndv.getters.backToCanvas().realMouseMove(10, 1); // reset to default hover
 
 		ndv.getters.inputTableRow(1).should('have.text', '1000');
 
 		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
-		ndv.getters.inputTableRow(1).realHover();
-		cy.wait(50);
+		ndv.actions.dragMainPanelToRight();
+		ndv.getters.inputTbodyCell(1, 0).realMouseMove(10, 1);
 		ndv.getters.outputHoveringItem().should('have.text', '1000');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1000');
 
 		ndv.actions.selectInputNode('Sort');
+		ndv.actions.dragMainPanelToLeft();
 		ndv.actions.changeOutputRunSelector('1 of 2 (6 items)');
-		ndv.getters.backToCanvas().realHover(); // reset to default hover
+		ndv.getters.backToCanvas().realMouseMove(10, 1); // reset to default hover
 
 		ndv.getters.inputTableRow(1).should('have.text', '1111');
 
 		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
-		ndv.getters.inputTableRow(1).realHover();
-		cy.wait(50);
+		ndv.actions.dragMainPanelToRight();
+		ndv.getters.inputTbodyCell(1, 0).realMouseMove(10, 1);
 		ndv.getters.outputHoveringItem().should('have.text', '1111');
 		ndv.getters.parameterExpressionPreview('value').should('include.text', '1111');
 	});
@@ -132,20 +135,22 @@ describe('NDV', () => {
 
 		ndv.getters.inputTableRow(1).should('have.text', '1111');
 		ndv.getters.inputTableRow(1).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
+
+		ndv.actions.dragMainPanelToLeft();
 		ndv.getters.outputTableRow(1).should('have.text', '1111');
-		ndv.getters.outputTableRow(1).realHover();
+		ndv.getters.outputTableRow(1).realMouseMove(10, 1);
 
 		ndv.getters.outputTableRow(3).should('have.text', '4444');
-		ndv.getters.outputTableRow(3).realHover();
+		ndv.getters.outputTableRow(3).realMouseMove(10, 1);
 
 		ndv.getters.inputTableRow(3).should('have.text', '4444');
 		ndv.getters.inputTableRow(3).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
 		ndv.actions.changeOutputRunSelector('2 of 2 (6 items)');
-		cy.wait(50);
 
 		ndv.getters.inputTableRow(1).should('have.text', '1000');
-		ndv.getters.inputTableRow(1).realHover();
+		ndv.actions.dragMainPanelToRight();
+		ndv.getters.inputTableRow(1).realMouseMove(10, 1);
 
 		ndv.getters.outputTableRow(1).should('have.text', '1000');
 		ndv.getters
@@ -155,7 +160,8 @@ describe('NDV', () => {
 			.should('equal', 'hovering-item');
 
 		ndv.getters.outputTableRow(3).should('have.text', '2000');
-		ndv.getters.outputTableRow(3).realHover();
+		ndv.actions.dragMainPanelToLeft();
+		ndv.getters.outputTableRow(3).realMouseMove(10, 1);
 
 		ndv.getters.inputTableRow(3).should('have.text', '2000');
 
@@ -175,14 +181,15 @@ describe('NDV', () => {
 
 		ndv.actions.switchOutputBranch('False Branch (2 items)');
 		ndv.getters.outputTableRow(1).should('have.text', '8888');
-		ndv.getters.outputTableRow(1).realHover();
+		ndv.actions.dragMainPanelToLeft();
+		ndv.getters.outputTableRow(1).realMouseMove(10, 1);
 
 		ndv.getters.inputTableRow(5).should('have.text', '8888');
 
 		ndv.getters.inputTableRow(5).invoke('attr', 'data-test-id').should('equal', 'hovering-item');
 
 		ndv.getters.outputTableRow(2).should('have.text', '9999');
-		ndv.getters.outputTableRow(2).realHover();
+		ndv.getters.outputTableRow(2).realMouseMove(10, 1);
 
 		ndv.getters.inputTableRow(6).should('have.text', '9999');
 
@@ -192,29 +199,35 @@ describe('NDV', () => {
 
 		workflowPage.actions.openNode('Set5');
 
+		ndv.actions.dragMainPanelToRight();
 		ndv.actions.switchInputBranch('True Branch');
+
+		ndv.actions.dragMainPanelToLeft();
 		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
 		ndv.getters.outputTableRow(1).should('have.text', '8888');
-		ndv.getters.outputTableRow(1).realHover();
-		cy.wait(100);
+		ndv.getters.outputTableRow(1).realMouseMove(10, 1);
 		ndv.getters.inputHoveringItem().should('not.exist');
 
 		ndv.getters.inputTableRow(1).should('have.text', '1111');
-		ndv.getters.inputTableRow(1).realHover();
-		cy.wait(100);
+
+		ndv.actions.dragMainPanelToRight();
+		ndv.getters.inputTableRow(1).realMouseMove(10, 1);
 		ndv.getters.outputHoveringItem().should('not.exist');
 
 		ndv.actions.switchInputBranch('False Branch');
 		ndv.getters.inputTableRow(1).should('have.text', '8888');
-		ndv.getters.inputTableRow(1).realHover();
+		ndv.actions.dragMainPanelToRight();
+		ndv.getters.inputTableRow(1).realMouseMove(10, 1);
 
+		ndv.actions.dragMainPanelToLeft();
 		ndv.actions.changeOutputRunSelector('2 of 2 (4 items)');
 		ndv.getters.outputTableRow(1).should('have.text', '1111');
-		ndv.getters.outputTableRow(1).realHover();
+		ndv.getters.outputTableRow(1).realMouseMove(10, 1);
 
 		ndv.actions.changeOutputRunSelector('1 of 2 (2 items)');
 		ndv.getters.inputTableRow(1).should('have.text', '8888');
-		ndv.getters.inputTableRow(1).realHover();
+		ndv.actions.dragMainPanelToRight();
+		ndv.getters.inputTableRow(1).realMouseMove(10, 1);
 		ndv.getters.outputHoveringItem().should('have.text', '8888');
 		// todo there's a bug here need to fix ADO-534
 		// ndv.getters.outputHoveringItem().should('not.exist');
diff --git a/cypress/e2e/27-cloud.cy.ts b/cypress/e2e/27-cloud.cy.ts
index e9b814597d..bcf9750ecb 100644
--- a/cypress/e2e/27-cloud.cy.ts
+++ b/cypress/e2e/27-cloud.cy.ts
@@ -1,15 +1,17 @@
 import planData from '../fixtures/Plan_data_opt_in_trial.json';
 import {
-	BannerStack,
 	MainSidebar,
 	WorkflowPage,
 	visitPublicApiPage,
 	getPublicApiUpgradeCTA,
+	WorkflowsPage,
 } from '../pages';
 
+const NUMBER_OF_AI_CREDITS = 100;
+
 const mainSidebar = new MainSidebar();
-const bannerStack = new BannerStack();
 const workflowPage = new WorkflowPage();
+const workflowsPage = new WorkflowsPage();
 
 describe('Cloud', () => {
 	before(() => {
@@ -22,6 +24,10 @@ describe('Cloud', () => {
 		cy.overrideSettings({
 			deployment: { type: 'cloud' },
 			n8nMetadata: { userId: '1' },
+			aiCredits: {
+				enabled: true,
+				credits: NUMBER_OF_AI_CREDITS,
+			},
 		});
 		cy.intercept('GET', '/rest/admin/cloud-plan', planData).as('getPlanData');
 		cy.intercept('GET', '/rest/cloud/proxy/user/me', {}).as('getCloudUserInfo');
@@ -40,11 +46,11 @@ describe('Cloud', () => {
 		it('should render trial banner for opt-in cloud user', () => {
 			visitWorkflowPage();
 
-			bannerStack.getters.banner().should('be.visible');
+			cy.getByTestId('banner-stack').should('be.visible');
 
 			mainSidebar.actions.signout();
 
-			bannerStack.getters.banner().should('not.be.visible');
+			cy.getByTestId('banner-stack').should('not.be.visible');
 		});
 	});
 
@@ -64,4 +70,66 @@ describe('Cloud', () => {
 			getPublicApiUpgradeCTA().should('be.visible');
 		});
 	});
+
+	describe('Easy AI workflow experiment', () => {
+		it('should not show option to take you to the easy AI workflow if experiment is control', () => {
+			window.localStorage.setItem(
+				'N8N_EXPERIMENT_OVERRIDES',
+				JSON.stringify({ '026_easy_ai_workflow': 'control' }),
+			);
+
+			cy.visit(workflowsPage.url);
+
+			cy.getByTestId('easy-ai-workflow-card').should('not.exist');
+		});
+
+		it('should show option to take you to the easy AI workflow if experiment is variant', () => {
+			window.localStorage.setItem(
+				'N8N_EXPERIMENT_OVERRIDES',
+				JSON.stringify({ '026_easy_ai_workflow': 'variant' }),
+			);
+
+			cy.visit(workflowsPage.url);
+
+			cy.getByTestId('easy-ai-workflow-card').should('to.exist');
+		});
+
+		it('should show default instructions if free AI credits experiment is control', () => {
+			window.localStorage.setItem(
+				'N8N_EXPERIMENT_OVERRIDES',
+				JSON.stringify({ '027_free_openai_calls': 'control', '026_easy_ai_workflow': 'variant' }),
+			);
+
+			cy.visit(workflowsPage.url);
+
+			cy.getByTestId('easy-ai-workflow-card').click();
+
+			workflowPage.getters
+				.stickies()
+				.eq(0)
+				.should(($el) => {
+					expect($el).contains.text('Set up your OpenAI credentials in the OpenAI Model node');
+				});
+		});
+
+		it('should show updated instructions if free AI credits experiment is variant', () => {
+			window.localStorage.setItem(
+				'N8N_EXPERIMENT_OVERRIDES',
+				JSON.stringify({ '027_free_openai_calls': 'variant', '026_easy_ai_workflow': 'variant' }),
+			);
+
+			cy.visit(workflowsPage.url);
+
+			cy.getByTestId('easy-ai-workflow-card').click();
+
+			workflowPage.getters
+				.stickies()
+				.eq(0)
+				.should(($el) => {
+					expect($el).contains.text(
+						`Claim your free ${NUMBER_OF_AI_CREDITS} OpenAI calls in the OpenAI model node`,
+					);
+				});
+		});
+	});
 });
diff --git a/cypress/e2e/27-two-factor-authentication.cy.ts b/cypress/e2e/27-two-factor-authentication.cy.ts
index dc62a0c58c..05949a188c 100644
--- a/cypress/e2e/27-two-factor-authentication.cy.ts
+++ b/cypress/e2e/27-two-factor-authentication.cy.ts
@@ -49,33 +49,47 @@ describe('Two-factor authentication', { disableAutoLogin: true }, () => {
 		cy.intercept('GET', '/rest/mfa/qr').as('getMfaQrCode');
 	});
 
-	it('Should be able to login with MFA token', () => {
+	it('Should be able to login with MFA code', () => {
 		const { email, password } = user;
 		signinPage.actions.loginWithEmailAndPassword(email, password);
 		personalSettingsPage.actions.enableMfa();
 		mainSidebar.actions.signout();
-		const token = generateOTPToken(user.mfaSecret);
-		mfaLoginPage.actions.loginWithMfaToken(email, password, token);
+		const mfaCode = generateOTPToken(user.mfaSecret);
+		mfaLoginPage.actions.loginWithMfaCode(email, password, mfaCode);
 		mainSidebar.actions.signout();
 	});
 
-	it('Should be able to login with recovery code', () => {
+	it('Should be able to login with MFA recovery code', () => {
 		const { email, password } = user;
 		signinPage.actions.loginWithEmailAndPassword(email, password);
 		personalSettingsPage.actions.enableMfa();
 		mainSidebar.actions.signout();
-		mfaLoginPage.actions.loginWithRecoveryCode(email, password, user.mfaRecoveryCodes[0]);
+		mfaLoginPage.actions.loginWithMfaRecoveryCode(email, password, user.mfaRecoveryCodes[0]);
 		mainSidebar.actions.signout();
 	});
 
-	it('Should be able to disable MFA in account', () => {
+	it('Should be able to disable MFA in account with MFA code', () => {
 		const { email, password } = user;
 		signinPage.actions.loginWithEmailAndPassword(email, password);
 		personalSettingsPage.actions.enableMfa();
 		mainSidebar.actions.signout();
-		const token = generateOTPToken(user.mfaSecret);
-		mfaLoginPage.actions.loginWithMfaToken(email, password, token);
-		personalSettingsPage.actions.disableMfa();
+		const mfaCode = generateOTPToken(user.mfaSecret);
+		mfaLoginPage.actions.loginWithMfaCode(email, password, mfaCode);
+		const disableToken = generateOTPToken(user.mfaSecret);
+		personalSettingsPage.actions.disableMfa(disableToken);
+		personalSettingsPage.getters.enableMfaButton().should('exist');
+		mainSidebar.actions.signout();
+	});
+
+	it('Should be able to disable MFA in account with recovery code', () => {
+		const { email, password } = user;
+		signinPage.actions.loginWithEmailAndPassword(email, password);
+		personalSettingsPage.actions.enableMfa();
+		mainSidebar.actions.signout();
+		const mfaCode = generateOTPToken(user.mfaSecret);
+		mfaLoginPage.actions.loginWithMfaCode(email, password, mfaCode);
+		personalSettingsPage.actions.disableMfa(user.mfaRecoveryCodes[0]);
+		personalSettingsPage.getters.enableMfaButton().should('exist');
 		mainSidebar.actions.signout();
 	});
 });
diff --git a/cypress/e2e/28-debug.cy.ts b/cypress/e2e/28-debug.cy.ts
index b5159951a7..9149e2e478 100644
--- a/cypress/e2e/28-debug.cy.ts
+++ b/cypress/e2e/28-debug.cy.ts
@@ -87,11 +87,28 @@ describe('Debug', () => {
 		confirmDialog.get('.btn--confirm').click();
 		cy.url().should('include', '/debug');
 
-		workflowPage.getters.canvasNodes().first().should('have.descendants', '.node-pin-data-icon');
-		workflowPage.getters
-			.canvasNodes()
-			.not(':first')
-			.should('not.have.descendants', '.node-pin-data-icon');
+		cy.ifCanvasVersion(
+			() => {
+				workflowPage.getters
+					.canvasNodes()
+					.first()
+					.should('have.descendants', '.node-pin-data-icon');
+				workflowPage.getters
+					.canvasNodes()
+					.not(':first')
+					.should('not.have.descendants', '.node-pin-data-icon');
+			},
+			() => {
+				workflowPage.getters
+					.canvasNodes()
+					.first()
+					.should('have.descendants', '[data-test-id="canvas-node-status-pinned"]');
+				workflowPage.getters
+					.canvasNodes()
+					.not(':first')
+					.should('not.have.descendants', '[data-test-id="canvas-node-status-pinned"]');
+			},
+		);
 
 		cy.reload(true);
 		cy.wait(['@getExecution']);
@@ -114,7 +131,18 @@ describe('Debug', () => {
 		confirmDialog.get('.btn--confirm').click();
 		cy.url().should('include', '/debug');
 
-		workflowPage.getters.canvasNodes().last().find('.node-info-icon').should('be.empty');
+		cy.ifCanvasVersion(
+			() => {
+				workflowPage.getters.canvasNodes().last().find('.node-info-icon').should('be.empty');
+			},
+			() => {
+				workflowPage.getters
+					.canvasNodes()
+					.last()
+					.find('[class*="statusIcons"]')
+					.should('not.exist');
+			},
+		);
 
 		workflowPage.getters.canvasNodes().first().dblclick();
 		ndv.actions.unPinData();
diff --git a/cypress/e2e/29-templates.cy.ts b/cypress/e2e/29-templates.cy.ts
index 5b52889c94..727b0cbe3f 100644
--- a/cypress/e2e/29-templates.cy.ts
+++ b/cypress/e2e/29-templates.cy.ts
@@ -129,7 +129,6 @@ describe('Workflow templates', () => {
 			workflowPage.actions.shouldHaveWorkflowName('Demo: ' + OnboardingWorkflow.name);
 			workflowPage.getters.canvasNodes().should('have.length', 4);
 			workflowPage.getters.stickies().should('have.length', 1);
-			workflowPage.getters.canvasNodes().first().should('have.descendants', '.node-pin-data-icon');
 		});
 
 		it('can import template', () => {
@@ -142,6 +141,7 @@ describe('Workflow templates', () => {
 		});
 
 		it('should save template id with the workflow', () => {
+			cy.intercept('POST', '/rest/workflows').as('saveWorkflow');
 			templatesPage.actions.importTemplate();
 
 			cy.visit(templatesPage.url);
@@ -159,10 +159,8 @@ describe('Workflow templates', () => {
 			workflowPage.actions.hitSelectAll();
 			workflowPage.actions.hitCopy();
 
-			cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
-			// Check workflow JSON by copying it to clipboard
-			cy.readClipboard().then((workflowJSON) => {
-				expect(workflowJSON).to.contain('"templateId": "1"');
+			cy.wait('@saveWorkflow').then((interception) => {
+				expect(interception.request.body.meta.templateId).to.equal('1');
 			});
 		});
 
diff --git a/cypress/e2e/2929-ado-can-load-old-switch-node-workflows.cy.ts b/cypress/e2e/2929-ado-can-load-old-switch-node-workflows.cy.ts
new file mode 100644
index 0000000000..39edc54163
--- /dev/null
+++ b/cypress/e2e/2929-ado-can-load-old-switch-node-workflows.cy.ts
@@ -0,0 +1,17 @@
+import {
+	deleteNode,
+	getCanvasNodes,
+	navigateToNewWorkflowPage,
+	pasteWorkflow,
+} from '../composables/workflow';
+import Workflow from '../fixtures/Switch_node_with_null_connection.json';
+
+describe('ADO-2929 can load Switch nodes', () => {
+	it('can load workflows with Switch nodes with null at connection index', () => {
+		navigateToNewWorkflowPage();
+		pasteWorkflow(Workflow);
+		getCanvasNodes().should('have.length', 3);
+		deleteNode('Switch');
+		getCanvasNodes().should('have.length', 2);
+	});
+});
diff --git a/cypress/e2e/30-editor-after-route-changes.cy.ts b/cypress/e2e/30-editor-after-route-changes.cy.ts
index f0381a32a2..307c4a9537 100644
--- a/cypress/e2e/30-editor-after-route-changes.cy.ts
+++ b/cypress/e2e/30-editor-after-route-changes.cy.ts
@@ -1,18 +1,14 @@
+import { getWorkflowHistoryCloseButton } from '../composables/workflow';
 import {
 	CODE_NODE_NAME,
 	EDIT_FIELDS_SET_NODE_NAME,
 	IF_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
 } from '../constants';
-import {
-	WorkflowExecutionsTab,
-	WorkflowPage as WorkflowPageClass,
-	WorkflowHistoryPage,
-} from '../pages';
+import { WorkflowExecutionsTab, WorkflowPage as WorkflowPageClass } from '../pages';
 
 const workflowPage = new WorkflowPageClass();
 const executionsTab = new WorkflowExecutionsTab();
-const workflowHistoryPage = new WorkflowHistoryPage();
 
 const createNewWorkflowAndActivate = () => {
 	workflowPage.actions.visit();
@@ -92,7 +88,7 @@ const switchBetweenEditorAndHistory = () => {
 	cy.wait(['@getVersion']);
 
 	cy.intercept('GET', '/rest/workflows/*').as('workflowGet');
-	workflowHistoryPage.getters.workflowHistoryCloseButton().click();
+	getWorkflowHistoryCloseButton().click();
 	cy.wait(['@workflowGet']);
 	cy.wait(1000);
 
@@ -168,7 +164,7 @@ describe('Editor actions should work', () => {
 		cy.wait(['@getVersion']);
 
 		cy.intercept('GET', '/rest/workflows/*').as('workflowGet');
-		workflowHistoryPage.getters.workflowHistoryCloseButton().click();
+		getWorkflowHistoryCloseButton().click();
 		cy.wait(['@workflowGet']);
 		cy.wait(1000);
 
diff --git a/cypress/e2e/30-langchain.cy.ts b/cypress/e2e/30-langchain.cy.ts
index 0deec76e9f..b6f1b56eed 100644
--- a/cypress/e2e/30-langchain.cy.ts
+++ b/cypress/e2e/30-langchain.cy.ts
@@ -14,7 +14,6 @@ import {
 } from './../constants';
 import {
 	closeManualChatModal,
-	getManualChatDialog,
 	getManualChatMessages,
 	getManualChatModal,
 	getManualChatModalLogs,
@@ -27,7 +26,9 @@ import {
 	clickCreateNewCredential,
 	clickExecuteNode,
 	clickGetBackToCanvas,
-	toggleParameterCheckboxInputByName,
+	getRunDataInfoCallout,
+	getOutputPanelTable,
+	checkParameterCheckboxInputByName,
 } from '../composables/ndv';
 import {
 	addLanguageModelNodeToParent,
@@ -44,6 +45,7 @@ import {
 	openNode,
 	getConnectionBySourceAndTarget,
 } from '../composables/workflow';
+import { NDV, WorkflowPage } from '../pages';
 import { createMockNodeExecutionData, runMockWorkflowExecution } from '../utils';
 
 describe('Langchain Integration', () => {
@@ -95,7 +97,7 @@ describe('Langchain Integration', () => {
 	it('should add nodes to all Agent node input types', () => {
 		addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME, true);
 		addNodeToCanvas(AGENT_NODE_NAME, true, true);
-		toggleParameterCheckboxInputByName('hasOutputParser');
+		checkParameterCheckboxInputByName('hasOutputParser');
 		clickGetBackToCanvas();
 
 		addLanguageModelNodeToParent(
@@ -167,7 +169,7 @@ describe('Langchain Integration', () => {
 			lastNodeExecuted: BASIC_LLM_CHAIN_NODE_NAME,
 		});
 
-		getManualChatDialog().should('contain', outputMessage);
+		getManualChatMessages().should('contain', outputMessage);
 	});
 
 	it('should be able to open and execute Agent node', () => {
@@ -207,7 +209,7 @@ describe('Langchain Integration', () => {
 			lastNodeExecuted: AGENT_NODE_NAME,
 		});
 
-		getManualChatDialog().should('contain', outputMessage);
+		getManualChatMessages().should('contain', outputMessage);
 	});
 
 	it('should add and use Manual Chat Trigger node together with Agent node', () => {
@@ -228,99 +230,98 @@ describe('Langchain Integration', () => {
 
 		clickManualChatButton();
 
-		getManualChatModalLogs().should('not.exist');
-
 		const inputMessage = 'Hello!';
 		const outputMessage = 'Hi there! How can I assist you today?';
+		const runData = [
+			createMockNodeExecutionData(MANUAL_CHAT_TRIGGER_NODE_NAME, {
+				jsonData: {
+					main: { input: inputMessage },
+				},
+			}),
+			createMockNodeExecutionData(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, {
+				jsonData: {
+					ai_languageModel: {
+						response: {
+							generations: [
+								{
+									text: `{
+	"action": "Final Answer",
+	"action_input": "${outputMessage}"
+}`,
+									message: {
+										lc: 1,
+										type: 'constructor',
+										id: ['langchain', 'schema', 'AIMessage'],
+										kwargs: {
+											content: `{
+	"action": "Final Answer",
+	"action_input": "${outputMessage}"
+}`,
+											additional_kwargs: {},
+										},
+									},
+									generationInfo: { finish_reason: 'stop' },
+								},
+							],
+							llmOutput: {
+								tokenUsage: {
+									completionTokens: 26,
+									promptTokens: 519,
+									totalTokens: 545,
+								},
+							},
+						},
+					},
+				},
+				metadata: {
+					subRun: [{ node: AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, runIndex: 0 }],
+				},
+				inputOverride: {
+					ai_languageModel: [
+						[
+							{
+								json: {
+									messages: [
+										{
+											lc: 1,
+											type: 'constructor',
+											id: ['langchain', 'schema', 'SystemMessage'],
+											kwargs: {
+												content:
+													'Assistant is a large language model trained by OpenAI.\n\nAssistant is designed to be able to assist with a wide range of tasks, from answering simple questions to providing in-depth explanations and discussions on a wide range of topics. As a language model, Assistant is able to generate human-like text based on the input it receives, allowing it to engage in natural-sounding conversations and provide responses that are coherent and relevant to the topic at hand.\n\nAssistant is constantly learning and improving, and its capabilities are constantly evolving. It is able to process and understand large amounts of text, and can use this knowledge to provide accurate and informative responses to a wide range of questions. Additionally, Assistant is able to generate its own text based on the input it receives, allowing it to engage in discussions and provide explanations and descriptions on a wide range of topics.\n\nOverall, Assistant is a powerful system that can help with a wide range of tasks and provide valuable insights and information on a wide range of topics. Whether you need help with a specific question or just want to have a conversation about a particular topic, Assistant is here to assist. However, above all else, all responses must adhere to the format of RESPONSE FORMAT INSTRUCTIONS.',
+												additional_kwargs: {},
+											},
+										},
+										{
+											lc: 1,
+											type: 'constructor',
+											id: ['langchain', 'schema', 'HumanMessage'],
+											kwargs: {
+												content:
+													'TOOLS\n------\nAssistant can ask the user to use tools to look up information that may be helpful in answering the users original question. The tools the human can use are:\n\n\n\nRESPONSE FORMAT INSTRUCTIONS\n----------------------------\n\nOutput a JSON markdown code snippet containing a valid JSON object in one of two formats:\n\n**Option 1:**\nUse this if you want the human to use a tool.\nMarkdown code snippet formatted in the following schema:\n\n```json\n{\n    "action": string, // The action to take. Must be one of []\n    "action_input": string // The input to the action. May be a stringified object.\n}\n```\n\n**Option #2:**\nUse this if you want to respond directly and conversationally to the human. Markdown code snippet formatted in the following schema:\n\n```json\n{\n    "action": "Final Answer",\n    "action_input": string // You should put what you want to return to use here and make sure to use valid json newline characters.\n}\n```\n\nFor both options, remember to always include the surrounding markdown code snippet delimiters (begin with "```json" and end with "```")!\n\n\nUSER\'S INPUT\n--------------------\nHere is the user\'s input (remember to respond with a markdown code snippet of a json blob with a single action, and NOTHING else):\n\nHello!',
+												additional_kwargs: {},
+											},
+										},
+									],
+									options: { stop: ['Observation:'], promptIndex: 0 },
+								},
+							},
+						],
+					],
+				},
+			}),
+			createMockNodeExecutionData(AGENT_NODE_NAME, {
+				jsonData: {
+					main: { output: 'Hi there! How can I assist you today?' },
+				},
+			}),
+		];
 
 		runMockWorkflowExecution({
 			trigger: () => {
 				sendManualChatMessage(inputMessage);
 			},
-			runData: [
-				createMockNodeExecutionData(MANUAL_CHAT_TRIGGER_NODE_NAME, {
-					jsonData: {
-						main: { input: inputMessage },
-					},
-				}),
-				createMockNodeExecutionData(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, {
-					jsonData: {
-						ai_languageModel: {
-							response: {
-								generations: [
-									{
-										text: `{
-    "action": "Final Answer",
-    "action_input": "${outputMessage}"
-}`,
-										message: {
-											lc: 1,
-											type: 'constructor',
-											id: ['langchain', 'schema', 'AIMessage'],
-											kwargs: {
-												content: `{
-    "action": "Final Answer",
-    "action_input": "${outputMessage}"
-}`,
-												additional_kwargs: {},
-											},
-										},
-										generationInfo: { finish_reason: 'stop' },
-									},
-								],
-								llmOutput: {
-									tokenUsage: {
-										completionTokens: 26,
-										promptTokens: 519,
-										totalTokens: 545,
-									},
-								},
-							},
-						},
-					},
-					inputOverride: {
-						ai_languageModel: [
-							[
-								{
-									json: {
-										messages: [
-											{
-												lc: 1,
-												type: 'constructor',
-												id: ['langchain', 'schema', 'SystemMessage'],
-												kwargs: {
-													content:
-														'Assistant is a large language model trained by OpenAI.\n\nAssistant is designed to be able to assist with a wide range of tasks, from answering simple questions to providing in-depth explanations and discussions on a wide range of topics. As a language model, Assistant is able to generate human-like text based on the input it receives, allowing it to engage in natural-sounding conversations and provide responses that are coherent and relevant to the topic at hand.\n\nAssistant is constantly learning and improving, and its capabilities are constantly evolving. It is able to process and understand large amounts of text, and can use this knowledge to provide accurate and informative responses to a wide range of questions. Additionally, Assistant is able to generate its own text based on the input it receives, allowing it to engage in discussions and provide explanations and descriptions on a wide range of topics.\n\nOverall, Assistant is a powerful system that can help with a wide range of tasks and provide valuable insights and information on a wide range of topics. Whether you need help with a specific question or just want to have a conversation about a particular topic, Assistant is here to assist. However, above all else, all responses must adhere to the format of RESPONSE FORMAT INSTRUCTIONS.',
-													additional_kwargs: {},
-												},
-											},
-											{
-												lc: 1,
-												type: 'constructor',
-												id: ['langchain', 'schema', 'HumanMessage'],
-												kwargs: {
-													content:
-														'TOOLS\n------\nAssistant can ask the user to use tools to look up information that may be helpful in answering the users original question. The tools the human can use are:\n\n\n\nRESPONSE FORMAT INSTRUCTIONS\n----------------------------\n\nOutput a JSON markdown code snippet containing a valid JSON object in one of two formats:\n\n**Option 1:**\nUse this if you want the human to use a tool.\nMarkdown code snippet formatted in the following schema:\n\n```json\n{\n    "action": string, // The action to take. Must be one of []\n    "action_input": string // The input to the action. May be a stringified object.\n}\n```\n\n**Option #2:**\nUse this if you want to respond directly and conversationally to the human. Markdown code snippet formatted in the following schema:\n\n```json\n{\n    "action": "Final Answer",\n    "action_input": string // You should put what you want to return to use here and make sure to use valid json newline characters.\n}\n```\n\nFor both options, remember to always include the surrounding markdown code snippet delimiters (begin with "```json" and end with "```")!\n\n\nUSER\'S INPUT\n--------------------\nHere is the user\'s input (remember to respond with a markdown code snippet of a json blob with a single action, and NOTHING else):\n\nHello!',
-													additional_kwargs: {},
-												},
-											},
-										],
-										options: { stop: ['Observation:'], promptIndex: 0 },
-									},
-								},
-							],
-						],
-					},
-				}),
-				createMockNodeExecutionData(AGENT_NODE_NAME, {
-					jsonData: {
-						main: { output: 'Hi there! How can I assist you today?' },
-					},
-					metadata: {
-						subRun: [{ node: AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, runIndex: 0 }],
-					},
-				}),
-			],
+			runData,
 			lastNodeExecuted: AGENT_NODE_NAME,
 		});
 
@@ -333,6 +334,8 @@ describe('Langchain Integration', () => {
 		getManualChatModalLogsEntries().should('have.length', 1);
 
 		closeManualChatModal();
+		getManualChatModalLogs().should('not.exist');
+		getManualChatModal().should('not.exist');
 	});
 
 	it('should auto-add chat trigger and basic LLM chain when adding LLM node', () => {
@@ -357,4 +360,162 @@ describe('Langchain Integration', () => {
 		getConnectionBySourceAndTarget(CHAT_TRIGGER_NODE_DISPLAY_NAME, AGENT_NODE_NAME).should('exist');
 		getNodes().should('have.length', 3);
 	});
+	it('should not auto-add nodes if ChatTrigger is already present', () => {
+		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true);
+
+		addNodeToCanvas(AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, true);
+		getConnectionBySourceAndTarget(CHAT_TRIGGER_NODE_DISPLAY_NAME, AGENT_NODE_NAME).should('exist');
+		getNodes().should('have.length', 3);
+	});
+	it('should render runItems for sub-nodes and allow switching between them', () => {
+		const workflowPage = new WorkflowPage();
+		const ndv = new NDV();
+
+		cy.visit(workflowPage.url);
+		cy.createFixtureWorkflow('In_memory_vector_store_fake_embeddings.json');
+		workflowPage.actions.zoomToFit();
+
+		workflowPage.actions.executeNode('Populate VS');
+		cy.get('[data-label="25 items"]').should('exist');
+
+		const assertInputOutputText = (text: string, assertion: 'exist' | 'not.exist') => {
+			ndv.getters.outputPanel().contains(text).should(assertion);
+			ndv.getters.inputPanel().contains(text).should(assertion);
+		};
+
+		workflowPage.actions.openNode('Character Text Splitter');
+		ndv.getters.outputRunSelector().should('exist');
+		ndv.getters.inputRunSelector().should('exist');
+		ndv.getters.inputRunSelector().find('input').should('include.value', '3 of 3');
+		ndv.getters.outputRunSelector().find('input').should('include.value', '3 of 3');
+		assertInputOutputText('Kyiv', 'exist');
+		assertInputOutputText('Berlin', 'not.exist');
+		assertInputOutputText('Prague', 'not.exist');
+
+		ndv.actions.changeOutputRunSelector('2 of 3');
+		assertInputOutputText('Berlin', 'exist');
+		assertInputOutputText('Kyiv', 'not.exist');
+		assertInputOutputText('Prague', 'not.exist');
+
+		ndv.actions.changeOutputRunSelector('1 of 3');
+		assertInputOutputText('Prague', 'exist');
+		assertInputOutputText('Berlin', 'not.exist');
+		assertInputOutputText('Kyiv', 'not.exist');
+
+		ndv.actions.toggleInputRunLinking();
+		ndv.actions.changeOutputRunSelector('2 of 3');
+		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 3');
+		ndv.getters.outputRunSelector().find('input').should('include.value', '2 of 3');
+		ndv.getters.inputPanel().contains('Prague').should('exist');
+		ndv.getters.inputPanel().contains('Berlin').should('not.exist');
+
+		ndv.getters.outputPanel().contains('Berlin').should('exist');
+		ndv.getters.outputPanel().contains('Prague').should('not.exist');
+
+		ndv.actions.toggleInputRunLinking();
+		ndv.getters.inputRunSelector().find('input').should('include.value', '1 of 3');
+		ndv.getters.outputRunSelector().find('input').should('include.value', '1 of 3');
+		assertInputOutputText('Prague', 'exist');
+		assertInputOutputText('Berlin', 'not.exist');
+		assertInputOutputText('Kyiv', 'not.exist');
+	});
+
+	it('should show tool info notice if no existing tools were used during execution', () => {
+		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true);
+
+		addLanguageModelNodeToParent(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			AGENT_NODE_NAME,
+			true,
+		);
+
+		clickCreateNewCredential();
+		setCredentialValues({
+			apiKey: 'sk_test_123',
+		});
+		clickGetBackToCanvas();
+
+		addToolNodeToParent(AI_TOOL_CALCULATOR_NODE_NAME, AGENT_NODE_NAME);
+		clickGetBackToCanvas();
+		openNode(AGENT_NODE_NAME);
+
+		const inputMessage = 'Hello!';
+		const outputMessage = 'Hi there! How can I assist you today?';
+
+		clickExecuteNode();
+
+		runMockWorkflowExecution({
+			trigger: () => sendManualChatMessage(inputMessage),
+			runData: [
+				createMockNodeExecutionData(AGENT_NODE_NAME, {
+					jsonData: {
+						main: { output: outputMessage },
+					},
+					metadata: {
+						subRun: [{ node: AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, runIndex: 0 }],
+					},
+				}),
+			],
+			lastNodeExecuted: AGENT_NODE_NAME,
+		});
+		closeManualChatModal();
+		openNode(AGENT_NODE_NAME);
+
+		getRunDataInfoCallout().should('exist');
+	});
+
+	it('should not show tool info notice if tools were used during execution', () => {
+		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true, true);
+		getRunDataInfoCallout().should('not.exist');
+		clickGetBackToCanvas();
+
+		addLanguageModelNodeToParent(
+			AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME,
+			AGENT_NODE_NAME,
+			true,
+		);
+
+		clickCreateNewCredential();
+		setCredentialValues({
+			apiKey: 'sk_test_123',
+		});
+		clickGetBackToCanvas();
+
+		addToolNodeToParent(AI_TOOL_CALCULATOR_NODE_NAME, AGENT_NODE_NAME);
+		clickGetBackToCanvas();
+		openNode(AGENT_NODE_NAME);
+
+		getRunDataInfoCallout().should('not.exist');
+
+		const inputMessage = 'Hello!';
+		const outputMessage = 'Hi there! How can I assist you today?';
+
+		clickExecuteNode();
+
+		runMockWorkflowExecution({
+			trigger: () => sendManualChatMessage(inputMessage),
+			runData: [
+				createMockNodeExecutionData(AGENT_NODE_NAME, {
+					jsonData: {
+						main: { output: outputMessage },
+					},
+					metadata: {
+						subRun: [{ node: AI_LANGUAGE_MODEL_OPENAI_CHAT_MODEL_NODE_NAME, runIndex: 0 }],
+					},
+				}),
+				createMockNodeExecutionData(AI_TOOL_CALCULATOR_NODE_NAME, {}),
+			],
+			lastNodeExecuted: AGENT_NODE_NAME,
+		});
+
+		closeManualChatModal();
+		openNode(AGENT_NODE_NAME);
+		// This waits to ensure the output panel is rendered
+		getOutputPanelTable();
+
+		getRunDataInfoCallout().should('not.exist');
+	});
 });
diff --git a/cypress/e2e/31-demo.cy.ts b/cypress/e2e/31-demo.cy.ts
index 32307361fd..7f13d1659a 100644
--- a/cypress/e2e/31-demo.cy.ts
+++ b/cypress/e2e/31-demo.cy.ts
@@ -1,21 +1,29 @@
-import workflow from '../fixtures/Manual_wait_set.json';
+import { getOutputTableRow } from '../composables/ndv';
+import { getCanvasNodes, openNode } from '../composables/workflow';
+import SIMPLE_WORKFLOW from '../fixtures/Manual_wait_set.json';
+import WORKFLOW_WITH_PINNED from '../fixtures/Webhook_set_pinned.json';
 import { importWorkflow, visitDemoPage } from '../pages/demo';
 import { errorToast } from '../pages/notifications';
-import { WorkflowPage } from '../pages/workflow';
-
-const workflowPage = new WorkflowPage();
 
 describe('Demo', () => {
 	beforeEach(() => {
 		cy.overrideSettings({ previewMode: true });
-		cy.signout();
 	});
 
 	it('can import template', () => {
 		visitDemoPage();
 		errorToast().should('not.exist');
-		importWorkflow(workflow);
-		workflowPage.getters.canvasNodes().should('have.length', 3);
+		importWorkflow(SIMPLE_WORKFLOW);
+		getCanvasNodes().should('have.length', 3);
+	});
+
+	it('can import workflow with pin data', () => {
+		visitDemoPage();
+		importWorkflow(WORKFLOW_WITH_PINNED);
+		getCanvasNodes().should('have.length', 2);
+		openNode('Webhook');
+		getOutputTableRow(0).should('include.text', 'headers');
+		getOutputTableRow(1).should('include.text', 'dragons');
 	});
 
 	it('can override theme to dark', () => {
diff --git a/cypress/e2e/34-template-credentials-setup.cy.ts b/cypress/e2e/34-template-credentials-setup.cy.ts
index 815f4b1ceb..8d372acac0 100644
--- a/cypress/e2e/34-template-credentials-setup.cy.ts
+++ b/cypress/e2e/34-template-credentials-setup.cy.ts
@@ -3,6 +3,7 @@ import * as formStep from '../composables/setup-template-form-step';
 import { getSetupWorkflowCredentialsButton } from '../composables/setup-workflow-credentials-button';
 import TestTemplate1 from '../fixtures/Test_Template_1.json';
 import TestTemplate2 from '../fixtures/Test_Template_2.json';
+import { clearNotifications } from '../pages/notifications';
 import {
 	clickUseWorkflowButtonByTitle,
 	visitTemplateCollectionPage,
@@ -56,10 +57,10 @@ describe('Template credentials setup', () => {
 	it('can be opened from template collection page', () => {
 		visitTemplateCollectionPage(testData.ecommerceStarterPack);
 		templateCredentialsSetupPage.enableTemplateCredentialSetupFeatureFlag();
-		clickUseWorkflowButtonByTitle('Promote new Shopify products on Twitter and Telegram');
+		clickUseWorkflowButtonByTitle('Promote new Shopify products');
 
 		templateCredentialsSetupPage.getters
-			.title("Set up 'Promote new Shopify products on Twitter and Telegram' template")
+			.title("Set up 'Promote new Shopify products' template")
 			.should('be.visible');
 	});
 
@@ -67,7 +68,7 @@ describe('Template credentials setup', () => {
 		templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
 
 		templateCredentialsSetupPage.getters
-			.title("Set up 'Promote new Shopify products on Twitter and Telegram' template")
+			.title("Set up 'Promote new Shopify products' template")
 			.should('be.visible');
 
 		templateCredentialsSetupPage.getters
@@ -111,16 +112,19 @@ describe('Template credentials setup', () => {
 		templateCredentialsSetupPage.fillInDummyCredentialsForAppWithConfirm('X (Formerly Twitter)');
 		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Telegram');
 
+		clearNotifications();
+
 		templateCredentialsSetupPage.finishCredentialSetup();
 
 		workflowPage.getters.canvasNodes().should('have.length', 3);
 
+		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
+
 		// Focus the canvas so the copy to clipboard works
 		workflowPage.getters.canvasNodes().eq(0).realClick();
 		workflowPage.actions.hitSelectAll();
 		workflowPage.actions.hitCopy();
 
-		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
 		// Check workflow JSON by copying it to clipboard
 		cy.readClipboard().then((workflowJSON) => {
 			const workflow = JSON.parse(workflowJSON);
@@ -154,6 +158,8 @@ describe('Template credentials setup', () => {
 		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Email (IMAP)');
 		templateCredentialsSetupPage.fillInDummyCredentialsForApp('Nextcloud');
 
+		clearNotifications();
+
 		templateCredentialsSetupPage.finishCredentialSetup();
 
 		workflowPage.getters.canvasNodes().should('have.length', 3);
@@ -176,6 +182,8 @@ describe('Template credentials setup', () => {
 			templateCredentialsSetupPage.visitTemplateCredentialSetupPage(testTemplate.id);
 			templateCredentialsSetupPage.fillInDummyCredentialsForApp('Shopify');
 
+			clearNotifications();
+
 			templateCredentialsSetupPage.finishCredentialSetup();
 
 			getSetupWorkflowCredentialsButton().should('be.visible');
@@ -192,6 +200,8 @@ describe('Template credentials setup', () => {
 			templateCredentialsSetupPage.fillInDummyCredentialsForAppWithConfirm('X (Formerly Twitter)');
 			templateCredentialsSetupPage.fillInDummyCredentialsForApp('Telegram');
 
+			clearNotifications();
+
 			setupCredsModal.closeModalFromContinueButton();
 			setupCredsModal.getWorkflowCredentialsModal().should('not.exist');
 
diff --git a/cypress/e2e/35-admin-user-smoke-test.cy.ts b/cypress/e2e/35-admin-user-smoke-test.cy.ts
index c8585118e7..6bb31ae1c2 100644
--- a/cypress/e2e/35-admin-user-smoke-test.cy.ts
+++ b/cypress/e2e/35-admin-user-smoke-test.cy.ts
@@ -1,22 +1,20 @@
-import { SettingsPage } from '../pages/settings';
-
-const settingsPage = new SettingsPage();
+const url = '/settings';
 
 describe('Admin user', { disableAutoLogin: true }, () => {
 	it('should see same Settings sub menu items as instance owner', () => {
 		cy.signinAsOwner();
-		cy.visit(settingsPage.url);
+		cy.visit(url);
 
 		let ownerMenuItems = 0;
 
-		settingsPage.getters.menuItems().then(($el) => {
+		cy.getByTestId('menu-item').then(($el) => {
 			ownerMenuItems = $el.length;
 		});
 
 		cy.signout();
 		cy.signinAsAdmin();
-		cy.visit(settingsPage.url);
+		cy.visit(url);
 
-		settingsPage.getters.menuItems().should('have.length', ownerMenuItems);
+		cy.getByTestId('menu-item').should('have.length', ownerMenuItems);
 	});
 });
diff --git a/cypress/e2e/39-projects.cy.ts b/cypress/e2e/39-projects.cy.ts
index 138f67838a..197d585256 100644
--- a/cypress/e2e/39-projects.cy.ts
+++ b/cypress/e2e/39-projects.cy.ts
@@ -15,7 +15,7 @@ import {
 	NDV,
 	MainSidebar,
 } from '../pages';
-import { clearNotifications } from '../pages/notifications';
+import { clearNotifications, successToast } from '../pages/notifications';
 import { getVisibleDropdown, getVisibleModalOverlay, getVisibleSelect } from '../utils';
 
 const workflowsPage = new WorkflowsPage();
@@ -51,7 +51,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		});
 
 		projects.getHomeButton().click();
-		projects.getProjectTabs().should('have.length', 2);
+		projects.getProjectTabs().should('have.length', 3);
 
 		projects.getProjectTabCredentials().click();
 		credentialsPage.getters.credentialCards().should('not.have.length');
@@ -101,7 +101,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 
 		projects.getMenuItems().first().click();
 		workflowsPage.getters.workflowCards().should('not.have.length');
-		projects.getProjectTabs().should('have.length', 3);
+		projects.getProjectTabs().should('have.length', 4);
 
 		workflowsPage.getters.newWorkflowButtonCard().click();
 
@@ -176,7 +176,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		let menuItems = cy.getByTestId('menu-item');
 
 		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Home")[class*=active_]').should('exist');
+		menuItems.filter(':contains("Overview")[class*=active_]').should('exist');
 
 		projects.getMenuItems().first().click();
 
@@ -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');
@@ -222,7 +222,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		menuItems = cy.getByTestId('menu-item');
 
 		menuItems.filter('[class*=active_]').should('have.length', 1);
-		menuItems.filter(':contains("Home")[class*=active_]').should('exist');
+		menuItems.filter(':contains("Overview")[class*=active_]').should('exist');
 
 		workflowsPage.getters.workflowCards().should('have.length', 2).first().click();
 
@@ -230,7 +230,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 		cy.getByTestId('execute-workflow-button').should('be.visible');
 
 		menuItems = cy.getByTestId('menu-item');
-		menuItems.filter(':contains("Home")[class*=active_]').should('not.exist');
+		menuItems.filter(':contains("Overview")[class*=active_]').should('not.exist');
 
 		menuItems = cy.getByTestId('menu-item');
 		menuItems.filter('[class*=active_]').should('have.length', 1);
@@ -367,7 +367,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account project 1');
 			ndv.getters.backToCanvas().click();
@@ -382,7 +382,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account project 1');
 			ndv.getters.backToCanvas().click();
@@ -396,7 +396,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account project 2');
 			ndv.getters.backToCanvas().click();
@@ -407,7 +407,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account project 2');
 			ndv.getters.backToCanvas().click();
@@ -425,7 +425,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account personal project');
 			ndv.getters.backToCanvas().click();
@@ -436,7 +436,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			workflowPage.getters.nodeCredentialsSelect().first().click();
 			getVisibleSelect()
 				.find('li')
-				.should('have.length', 2)
+				.should('have.length', 1)
 				.first()
 				.should('contain.text', 'Notion account personal project');
 		});
@@ -498,7 +498,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -506,7 +506,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(':contains("Project 1")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 			clearNotifications();
 
 			workflowsPage.getters
@@ -524,7 +524,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -532,7 +532,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(':contains("Project 2")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 
 			// Move the workflow from Project 2 to a member user
 			projects.getMenuItems().last().click();
@@ -544,7 +544,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -553,7 +553,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.filter(`:contains("${INSTANCE_MEMBERS[0].email}")`)
 				.click();
 
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 			workflowsPage.getters.workflowCards().should('have.length', 1);
 
 			// Move the workflow from member user back to Home
@@ -569,7 +569,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -578,7 +578,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.filter(`:contains("${INSTANCE_OWNER.email}")`)
 				.click();
 
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 			clearNotifications();
 			workflowsPage.getters
 				.workflowCards()
@@ -596,7 +596,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move credential")')
+				.contains('button', 'Move credential')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -604,7 +604,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(':contains("Project 2")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			projects.getResourceMoveModal().contains('button', 'Move credential').click();
 			clearNotifications();
 			credentialsPage.getters.credentialCards().should('not.have.length');
 
@@ -619,7 +619,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move credential")')
+				.contains('button', 'Move credential')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -627,7 +627,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(`:contains("${INSTANCE_ADMIN.email}")`)
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			projects.getResourceMoveModal().contains('button', 'Move credential').click();
 			credentialsPage.getters.credentialCards().should('have.length', 1);
 
 			// Move the credential from admin user back to instance owner
@@ -641,7 +641,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move credential")')
+				.contains('button', 'Move credential')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -649,7 +649,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(`:contains("${INSTANCE_OWNER.email}")`)
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			projects.getResourceMoveModal().contains('button', 'Move credential').click();
 
 			clearNotifications();
 
@@ -666,7 +666,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move credential")')
+				.contains('button', 'Move credential')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -674,7 +674,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 5)
 				.filter(':contains("Project 1")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move credential")').click();
+			projects.getResourceMoveModal().contains('button', 'Move credential').click();
 
 			projects.getMenuItems().first().click();
 			projects.getProjectTabCredentials().click();
@@ -697,9 +697,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects.getHomeButton().click();
 			workflowsPage.getters.workflowCards().should('not.have.length');
 			workflowsPage.getters.newWorkflowButtonCard().click();
-			workflowsPage.getters.workflowCards().should('not.have.length');
 
-			workflowsPage.getters.newWorkflowButtonCard().click();
 			workflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 			workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME, true, true);
 			ndv.getters.backToCanvas().click();
@@ -723,7 +721,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			projects
 				.getResourceMoveModal()
 				.should('be.visible')
-				.find('button:contains("Move workflow")')
+				.contains('button', 'Move workflow')
 				.should('be.disabled');
 			projects.getProjectMoveSelect().click();
 			getVisibleSelect()
@@ -731,7 +729,7 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('have.length', 4)
 				.filter(':contains("Project 1")')
 				.click();
-			projects.getResourceMoveModal().find('button:contains("Move workflow")').click();
+			projects.getResourceMoveModal().contains('button', 'Move workflow').click();
 
 			workflowsPage.getters
 				.workflowCards()
@@ -749,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();
@@ -785,7 +783,8 @@ describe('Projects', { disableAutoLogin: true }, () => {
 			cy.get('input[name="password"]').type(INSTANCE_MEMBERS[0].password);
 			cy.getByTestId('form-submit-button').click();
 
-			mainSidebar.getters.executions().click();
+			projects.getMenuItems().last().click();
+			projects.getProjectTabExecutions().click();
 			cy.getByTestId('global-execution-list-item').first().find('td:last button').click();
 			getVisibleDropdown()
 				.find('li')
@@ -831,4 +830,23 @@ describe('Projects', { disableAutoLogin: true }, () => {
 				.should('not.have.length');
 		});
 	});
+
+	it('should set and update project icon', () => {
+		const DEFAULT_ICON = 'fa-layer-group';
+		const NEW_PROJECT_NAME = 'Test Project';
+
+		cy.signinAsAdmin();
+		cy.visit(workflowsPage.url);
+		projects.createProject(NEW_PROJECT_NAME);
+		// New project should have default icon
+		projects.getIconPickerButton().find('svg').should('have.class', DEFAULT_ICON);
+		// Choose another icon
+		projects.getIconPickerButton().click();
+		projects.getIconPickerTab('Emojis').click();
+		projects.getIconPickerEmojis().first().click();
+		// Project should be updated with new icon
+		successToast().contains('Project icon updated successfully');
+		projects.getIconPickerButton().should('contain', '😀');
+		projects.getMenuItems().contains(NEW_PROJECT_NAME).should('contain', '😀');
+	});
 });
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index a2cd5968d1..b70e121fd0 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,10 +1,12 @@
+import { clickGetBackToCanvas } from '../composables/ndv';
 import {
 	addNodeToCanvas,
 	addRetrieverNodeToParent,
 	addVectorStoreNodeToParent,
+	addVectorStoreToolToParent,
 	getNodeCreatorItems,
 } from '../composables/workflow';
-import { IF_NODE_NAME } from '../constants';
+import { AGENT_NODE_NAME, IF_NODE_NAME, MANUAL_CHAT_TRIGGER_NODE_NAME } from '../constants';
 import { NodeCreator } from '../pages/features/node-creator';
 import { NDV } from '../pages/ndv';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
@@ -74,11 +76,21 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.canvasAddButton().click();
 		WorkflowPage.actions.addNodeToCanvas('Manual', false);
 
-		nodeCreatorFeature.getters.canvasAddButton().should('not.be.visible');
-		nodeCreatorFeature.getters.nodeCreator().should('not.exist');
+		cy.ifCanvasVersion(
+			() => {
+				nodeCreatorFeature.getters.canvasAddButton().should('not.be.visible');
+				nodeCreatorFeature.getters.nodeCreator().should('not.exist');
+				// TODO: Replace once we have canvas feature utils
+				cy.get('div').contains('Add first step').should('be.hidden');
+			},
+			() => {
+				nodeCreatorFeature.getters.canvasAddButton().should('not.exist');
+				nodeCreatorFeature.getters.nodeCreator().should('not.exist');
+				// TODO: Replace once we have canvas feature utils
+				cy.get('div').contains('Add first step').should('not.exist');
+			},
+		);
 
-		// TODO: Replace once we have canvas feature utils
-		cy.get('div').contains('Add first step').should('be.hidden');
 		nodeCreatorFeature.actions.openNodeCreator();
 		nodeCreatorFeature.getters.nodeCreator().contains('What happens next?').should('be.visible');
 
@@ -344,7 +356,15 @@ describe('Node Creator', () => {
 
 	it('should correctly append a No Op node when Loop Over Items node is added (from connection)', () => {
 		WorkflowPage.actions.addNodeToCanvas('Manual');
-		cy.get('.plus-endpoint').should('be.visible').click();
+
+		cy.ifCanvasVersion(
+			() => {
+				cy.get('.plus-endpoint').click();
+			},
+			() => {
+				cy.getByTestId('canvas-handle-plus').click();
+			},
+		);
 
 		nodeCreatorFeature.getters.searchBar().find('input').type('Loop Over Items');
 		nodeCreatorFeature.getters.getCreatorItem('Loop Over Items').click();
@@ -515,7 +535,7 @@ describe('Node Creator', () => {
 		const actions = [
 			'Get ranked documents from vector store',
 			'Add documents to vector store',
-			'Retrieve documents for AI processing',
+			'Retrieve documents for Chain/Tool as Vector Store',
 		];
 
 		nodeCreatorFeature.actions.openNodeCreator();
@@ -529,14 +549,14 @@ describe('Node Creator', () => {
 			vectorStores.each((_i, vectorStore) => {
 				nodeCreatorFeature.getters.getCreatorItem(vectorStore).click();
 				actions.forEach((action) => {
-					nodeCreatorFeature.getters.getCreatorItem(action).should('be.visible');
+					nodeCreatorFeature.getters.getCreatorItem(action).should('be.visible').realHover();
 				});
 				cy.realPress('ArrowLeft');
 			});
 		});
 	});
 
-	it('should add node directly for sub-connection', () => {
+	it('should add node directly for sub-connection as vector store', () => {
 		addNodeToCanvas('Question and Answer Chain', true);
 		addRetrieverNodeToParent('Vector Store Retriever', 'Question and Answer Chain');
 		cy.realPress('Escape');
@@ -544,4 +564,12 @@ describe('Node Creator', () => {
 		cy.realPress('Escape');
 		WorkflowPage.getters.canvasNodes().should('have.length', 4);
 	});
+
+	it('should add node directly for sub-connection as tool', () => {
+		addNodeToCanvas(MANUAL_CHAT_TRIGGER_NODE_NAME, true);
+		addNodeToCanvas(AGENT_NODE_NAME, true, true);
+		clickGetBackToCanvas();
+
+		addVectorStoreToolToParent('In-Memory Vector Store', AGENT_NODE_NAME);
+	});
 });
diff --git a/cypress/e2e/42-nps-survey.cy.ts b/cypress/e2e/42-nps-survey.cy.ts
index e06fe43ba8..11e5ebb88e 100644
--- a/cypress/e2e/42-nps-survey.cy.ts
+++ b/cypress/e2e/42-nps-survey.cy.ts
@@ -10,7 +10,7 @@ import { WorkflowPage } from '../pages/workflow';
 
 const workflowPage = new WorkflowPage();
 
-const NOW = 1717771477012;
+const NOW = Date.now();
 const ONE_DAY = 24 * 60 * 60 * 1000;
 const THREE_DAYS = ONE_DAY * 3;
 const SEVEN_DAYS = ONE_DAY * 7;
diff --git a/cypress/e2e/43-oauth-flow.cy.ts b/cypress/e2e/43-oauth-flow.cy.ts
index 300a202540..d91315627b 100644
--- a/cypress/e2e/43-oauth-flow.cy.ts
+++ b/cypress/e2e/43-oauth-flow.cy.ts
@@ -1,3 +1,4 @@
+import { getCredentialSaveButton } from '../composables/modals/credential-modal';
 import { CredentialsPage, CredentialsModal } from '../pages';
 
 const credentialsPage = new CredentialsPage();
@@ -40,7 +41,7 @@ describe('Credentials', () => {
 		});
 
 		// Check that the credential was saved and connected successfully
-		credentialsModal.getters.saveButton().should('contain.text', 'Saved');
+		getCredentialSaveButton().should('contain.text', 'Saved');
 		credentialsModal.getters.oauthConnectSuccessBanner().should('be.visible');
 	});
 });
diff --git a/cypress/e2e/45-ai-assistant.cy.ts b/cypress/e2e/45-ai-assistant.cy.ts
index 3b4f61f660..157c656b46 100644
--- a/cypress/e2e/45-ai-assistant.cy.ts
+++ b/cypress/e2e/45-ai-assistant.cy.ts
@@ -4,13 +4,14 @@ import { clickCreateNewCredential, openCredentialSelect } from '../composables/n
 import { GMAIL_NODE_NAME, SCHEDULE_TRIGGER_NODE_NAME } from '../constants';
 import { CredentialsModal, CredentialsPage, NDV, WorkflowPage } from '../pages';
 import { AIAssistant } from '../pages/features/ai-assistant';
-import { getVisibleSelect } from '../utils';
+import { NodeCreator } from '../pages/features/node-creator';
 
 const wf = new WorkflowPage();
 const ndv = new NDV();
 const aiAssistant = new AIAssistant();
 const credentialsPage = new CredentialsPage();
 const credentialsModal = new CredentialsModal();
+const nodeCreatorFeature = new NodeCreator();
 
 describe('AI Assistant::disabled', () => {
 	beforeEach(() => {
@@ -222,6 +223,54 @@ describe('AI Assistant::enabled', () => {
 			.should('contain.text', 'item.json.myNewField = 1');
 	});
 
+	it('Should ignore node execution success and error messages after the node run successfully once', () => {
+		const getParameter = () => ndv.getters.parameterInput('jsCode').should('be.visible');
+
+		const getEditor = () => getParameter().find('.cm-content').should('exist');
+
+		cy.intercept('POST', '/rest/ai/chat', {
+			statusCode: 200,
+			fixture: 'aiAssistant/responses/code_diff_suggestion_response.json',
+		}).as('chatRequest');
+
+		cy.createFixtureWorkflow('aiAssistant/workflows/test_workflow.json');
+		wf.actions.openNode('Code');
+		ndv.getters.nodeExecuteButton().click();
+		aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true });
+		cy.wait('@chatRequest');
+
+		cy.intercept('POST', '/rest/ai/chat', {
+			statusCode: 200,
+			fixture: 'aiAssistant/responses/node_execution_succeeded_response.json',
+		}).as('chatRequest2');
+
+		getEditor()
+			.type('{selectall}')
+			.paste(
+				'for (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();',
+			);
+
+		ndv.getters.nodeExecuteButton().click();
+
+		getEditor()
+			.type('{selectall}')
+			.paste(
+				'for (const item of $input.all()) {\n  item.json.myNewField = 1aaaa!;\n}\n\nreturn $input.all();',
+			);
+
+		ndv.getters.nodeExecuteButton().click();
+
+		aiAssistant.getters.chatMessagesAssistant().should('have.length', 3);
+
+		aiAssistant.getters
+			.chatMessagesAssistant()
+			.eq(2)
+			.should(
+				'contain.text',
+				'Code node ran successfully, did my solution help resolve your issue?\nQuick reply 👇Yes, thanksNo, I am still stuck',
+			);
+	});
+
 	it('should end chat session when `end_session` event is received', () => {
 		cy.intercept('POST', '/rest/ai/chat', {
 			statusCode: 200,
@@ -280,6 +329,20 @@ describe('AI Assistant::enabled', () => {
 		wf.getters.isWorkflowSaved();
 		aiAssistant.getters.placeholderMessage().should('not.exist');
 	});
+
+	it('should send message via enter even with global NodeCreator panel opened', () => {
+		cy.intercept('POST', '/rest/ai/chat', {
+			statusCode: 200,
+			fixture: 'aiAssistant/responses/simple_message_response.json',
+		}).as('chatRequest');
+
+		wf.actions.addInitialNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
+		aiAssistant.actions.openChat();
+		nodeCreatorFeature.actions.openNodeCreator();
+		aiAssistant.getters.chatInput().type('Hello{Enter}');
+
+		aiAssistant.getters.placeholderMessage().should('not.exist');
+	});
 });
 
 describe('AI Assistant Credential Help', () => {
@@ -370,7 +433,7 @@ describe('AI Assistant Credential Help', () => {
 		wf.actions.addNodeToCanvas('Slack', true, true, 'Get a channel');
 		wf.getters.nodeCredentialsSelect().should('exist');
 		wf.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		wf.getters.nodeCredentialsCreateOption().click();
 		credentialsModal.getters.credentialAuthTypeRadioButtons().first().click();
 		ndv.getters.copyInput().should('not.exist');
 		credentialsModal.getters.oauthConnectButton().should('have.length', 1);
@@ -403,7 +466,7 @@ describe('AI Assistant Credential Help', () => {
 		wf.actions.addNodeToCanvas('Microsoft Outlook', true, true, 'Get a calendar');
 		wf.getters.nodeCredentialsSelect().should('exist');
 		wf.getters.nodeCredentialsSelect().click();
-		getVisibleSelect().find('li').last().click();
+		wf.getters.nodeCredentialsCreateOption().click();
 		ndv.getters.copyInput().should('not.exist');
 		credentialsModal.getters.oauthConnectButton().should('have.length', 1);
 		credentialsModal.getters.credentialInputs().should('have.length', 1);
@@ -493,6 +556,8 @@ describe('General help', () => {
 		}).as('chatRequest');
 
 		aiAssistant.getters.askAssistantFloatingButton().click();
+		wf.getters.zoomToFitButton().click();
+
 		aiAssistant.actions.sendMessage('What is wrong with this workflow?');
 		cy.wait('@chatRequest');
 
diff --git a/cypress/e2e/45-workflow-selector-parameter.cy.ts b/cypress/e2e/45-workflow-selector-parameter.cy.ts
index a6dc23e6c2..38de780490 100644
--- a/cypress/e2e/45-workflow-selector-parameter.cy.ts
+++ b/cypress/e2e/45-workflow-selector-parameter.cy.ts
@@ -27,7 +27,7 @@ describe('Workflow Selector Parameter', () => {
 		getVisiblePopper()
 			.should('have.length', 1)
 			.findChildByTestId('rlc-item')
-			.should('have.length', 2);
+			.should('have.length', 3);
 	});
 
 	it('should show required parameter warning', () => {
@@ -44,7 +44,8 @@ describe('Workflow Selector Parameter', () => {
 		getVisiblePopper()
 			.should('have.length', 1)
 			.findChildByTestId('rlc-item')
-			.should('have.length', 1)
+			.should('have.length', 2)
+			.eq(1)
 			.click();
 
 		ndv.getters
@@ -57,7 +58,7 @@ describe('Workflow Selector Parameter', () => {
 		ndv.getters.resourceLocator('workflowId').should('be.visible');
 		ndv.getters.resourceLocatorInput('workflowId').click();
 
-		getVisiblePopper().findChildByTestId('rlc-item').first().click();
+		getVisiblePopper().findChildByTestId('rlc-item').eq(1).click();
 
 		ndv.getters.resourceLocatorInput('workflowId').find('a').should('exist');
 		cy.getByTestId('radio-button-expression').eq(1).click();
@@ -68,7 +69,7 @@ describe('Workflow Selector Parameter', () => {
 		ndv.getters.resourceLocator('workflowId').should('be.visible');
 		ndv.getters.resourceLocatorInput('workflowId').click();
 
-		getVisiblePopper().findChildByTestId('rlc-item').first().click();
+		getVisiblePopper().findChildByTestId('rlc-item').eq(1).click();
 		ndv.getters
 			.resourceLocatorModeSelector('workflowId')
 			.find('input')
@@ -79,4 +80,28 @@ describe('Workflow Selector Parameter', () => {
 			.find('input')
 			.should('have.value', 'By ID');
 	});
+
+	it('should render add resource option and redirect to the correct route when clicked', () => {
+		cy.window().then((win) => {
+			cy.stub(win, 'open').as('windowOpen');
+		});
+
+		ndv.getters.resourceLocator('workflowId').should('be.visible');
+		ndv.getters.resourceLocatorInput('workflowId').click();
+
+		getVisiblePopper().findChildByTestId('rlc-item').eq(0).should('exist');
+		getVisiblePopper()
+			.findChildByTestId('rlc-item')
+			.eq(0)
+			.find('span')
+			.should('contain.text', 'Create a'); // Due to some inconsistency we're sometimes in a project and sometimes not, this covers both cases
+
+		getVisiblePopper().findChildByTestId('rlc-item').eq(0).click();
+
+		const SAMPLE_SUBWORKFLOW_TEMPLATE_ID = 'VMiAxXa3lCAizGB5f7dVZQSFfg3FtHkdTKvLuupqBls=';
+		cy.get('@windowOpen').should(
+			'be.calledWith',
+			`/workflows/onboarding/${SAMPLE_SUBWORKFLOW_TEMPLATE_ID}?sampleSubWorkflows=0`,
+		);
+	});
 });
diff --git a/cypress/e2e/47-subworkflow-debugging.cy.ts b/cypress/e2e/47-subworkflow-debugging.cy.ts
new file mode 100644
index 0000000000..725b6b32c4
--- /dev/null
+++ b/cypress/e2e/47-subworkflow-debugging.cy.ts
@@ -0,0 +1,140 @@
+import {
+	getExecutionPreviewOutputPanelRelatedExecutionLink,
+	getExecutionsSidebar,
+	getWorkflowExecutionPreviewIframe,
+	openExecutionPreviewNode,
+} from '../composables/executions';
+import {
+	changeOutputRunSelector,
+	getOutputPanelItemsCount,
+	getOutputPanelRelatedExecutionLink,
+	getOutputRunSelectorInput,
+	getOutputTableHeaders,
+	getOutputTableRows,
+	getOutputTbodyCell,
+} from '../composables/ndv';
+import {
+	clickExecuteWorkflowButton,
+	clickZoomToFit,
+	getCanvasNodes,
+	navigateToNewWorkflowPage,
+	openNode,
+	pasteWorkflow,
+	saveWorkflowOnButtonClick,
+} from '../composables/workflow';
+import SUBWORKFLOW_DEBUGGING_EXAMPLE from '../fixtures/Subworkflow-debugging-execute-workflow.json';
+
+describe('Subworkflow debugging', () => {
+	beforeEach(() => {
+		navigateToNewWorkflowPage();
+		pasteWorkflow(SUBWORKFLOW_DEBUGGING_EXAMPLE);
+		saveWorkflowOnButtonClick();
+		getCanvasNodes().should('have.length', 11);
+		clickZoomToFit();
+
+		clickExecuteWorkflowButton();
+	});
+
+	describe('can inspect sub executed workflow', () => {
+		it('(Run once with all items/ Wait for Sub-workflow completion) (default behavior)', () => {
+			openNode('Execute Workflow with param');
+
+			getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution');
+			getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
+			getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
+
+			// ensure workflow executed and waited on output
+			getOutputTableHeaders().should('have.length', 2);
+			getOutputTbodyCell(1, 0).should('have.text', 'world Natalie Moore');
+		});
+
+		it('(Run once for each item/ Wait for Sub-workflow completion)', () => {
+			openNode('Execute Workflow with param1');
+
+			getOutputPanelItemsCount().should('contain.text', '2 items, 2 sub-execution');
+			getOutputPanelRelatedExecutionLink().should('not.exist');
+
+			// ensure workflow executed and waited on output
+			getOutputTableHeaders().should('have.length', 3);
+			getOutputTbodyCell(1, 0).find('a').should('have.attr', 'href');
+			getOutputTbodyCell(1, 1).should('have.text', 'world Natalie Moore');
+		});
+
+		it('(Run once with all items/ Wait for Sub-workflow completion)', () => {
+			openNode('Execute Workflow with param2');
+
+			getOutputPanelItemsCount().should('not.exist');
+			getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
+			getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
+
+			// ensure workflow executed but returned same data as input
+			getOutputRunSelectorInput().should('have.value', '2 of 2 (3 items, 1 sub-execution)');
+			getOutputTableHeaders().should('have.length', 6);
+			getOutputTableHeaders().eq(0).should('have.text', 'uid');
+			getOutputTableRows().should('have.length', 4);
+			getOutputTbodyCell(1, 1).should('include.text', 'Jon_Ebert@yahoo.com');
+
+			changeOutputRunSelector('1 of 2 (2 items, 1 sub-execution)');
+			getOutputRunSelectorInput().should('have.value', '1 of 2 (2 items, 1 sub-execution)');
+			getOutputTableHeaders().should('have.length', 6);
+			getOutputTableHeaders().eq(0).should('have.text', 'uid');
+			getOutputTableRows().should('have.length', 3);
+			getOutputTbodyCell(1, 1).should('include.text', 'Terry.Dach@hotmail.com');
+		});
+
+		it('(Run once for each item/ Wait for Sub-workflow completion)', () => {
+			openNode('Execute Workflow with param3');
+
+			// ensure workflow executed but returned same data as input
+			getOutputRunSelectorInput().should('have.value', '2 of 2 (3 items, 3 sub-executions)');
+			getOutputTableHeaders().should('have.length', 7);
+			getOutputTableHeaders().eq(1).should('have.text', 'uid');
+			getOutputTableRows().should('have.length', 4);
+			getOutputTbodyCell(1, 0).find('a').should('have.attr', 'href');
+			getOutputTbodyCell(1, 2).should('include.text', 'Jon_Ebert@yahoo.com');
+
+			changeOutputRunSelector('1 of 2 (2 items, 2 sub-executions)');
+			getOutputRunSelectorInput().should('have.value', '1 of 2 (2 items, 2 sub-executions)');
+			getOutputTableHeaders().should('have.length', 7);
+			getOutputTableHeaders().eq(1).should('have.text', 'uid');
+			getOutputTableRows().should('have.length', 3);
+
+			getOutputTbodyCell(1, 0).find('a').should('have.attr', 'href');
+			getOutputTbodyCell(1, 2).should('include.text', 'Terry.Dach@hotmail.com');
+		});
+	});
+
+	it('can inspect parent executions', () => {
+		cy.url().then((workflowUrl) => {
+			openNode('Execute Workflow with param');
+
+			getOutputPanelItemsCount().should('contain.text', '2 items, 1 sub-execution');
+			getOutputPanelRelatedExecutionLink().should('contain.text', 'View sub-execution');
+			getOutputPanelRelatedExecutionLink().should('have.attr', 'href');
+
+			// ensure workflow executed and waited on output
+			getOutputTableHeaders().should('have.length', 2);
+			getOutputTbodyCell(1, 0).should('have.text', 'world Natalie Moore');
+
+			// cypress cannot handle new tabs so removing it
+			getOutputPanelRelatedExecutionLink().invoke('removeAttr', 'target').click();
+
+			getExecutionsSidebar().should('be.visible');
+			getWorkflowExecutionPreviewIframe().should('be.visible');
+			openExecutionPreviewNode('Execute Workflow Trigger');
+
+			getExecutionPreviewOutputPanelRelatedExecutionLink().should(
+				'include.text',
+				'View parent execution',
+			);
+
+			getExecutionPreviewOutputPanelRelatedExecutionLink()
+				.invoke('removeAttr', 'target')
+				.click({ force: true });
+
+			cy.url().then((currentUrl) => {
+				expect(currentUrl === workflowUrl);
+			});
+		});
+	});
+});
diff --git a/cypress/e2e/48-subworkflow-inputs.cy.ts b/cypress/e2e/48-subworkflow-inputs.cy.ts
new file mode 100644
index 0000000000..aababf4cb6
--- /dev/null
+++ b/cypress/e2e/48-subworkflow-inputs.cy.ts
@@ -0,0 +1,242 @@
+import {
+	addItemToFixedCollection,
+	assertNodeOutputHintExists,
+	clickExecuteNode,
+	clickGetBackToCanvas,
+	getExecuteNodeButton,
+	getOutputTableHeaders,
+	getParameterInputByName,
+	populateFixedCollection,
+	selectResourceLocatorItem,
+	typeIntoFixedCollectionItem,
+	clickWorkflowCardContent,
+	assertOutputTableContent,
+	populateMapperFields,
+	getNodeRunInfoStale,
+	assertNodeOutputErrorMessageExists,
+	checkParameterCheckboxInputByName,
+	uncheckParameterCheckboxInputByName,
+} from '../composables/ndv';
+import {
+	clickExecuteWorkflowButton,
+	clickZoomToFit,
+	navigateToNewWorkflowPage,
+	openNode,
+	pasteWorkflow,
+	saveWorkflowOnButtonClick,
+} from '../composables/workflow';
+import { visitWorkflowsPage } from '../composables/workflowsPage';
+import SUB_WORKFLOW_INPUTS from '../fixtures/Test_Subworkflow-Inputs.json';
+import { errorToast, successToast } from '../pages/notifications';
+import { getVisiblePopper } from '../utils';
+
+const DEFAULT_WORKFLOW_NAME = 'My workflow';
+const DEFAULT_SUBWORKFLOW_NAME_1 = 'My Sub-Workflow 1';
+const DEFAULT_SUBWORKFLOW_NAME_2 = 'My Sub-Workflow 2';
+
+const EXAMPLE_FIELDS = [
+	['aNumber', 'Number'],
+	['aString', 'String'],
+	['aArray', 'Array'],
+	['aObject', 'Object'],
+	['aAny', 'Allow Any Type'],
+	// bool last because it's a switch instead of a normal inputField so we'll skip it for some cases
+	['aBool', 'Boolean'],
+] as const;
+
+type TypeField = 'Allow Any Type' | 'String' | 'Number' | 'Boolean' | 'Array' | 'Object';
+
+describe('Sub-workflow creation and typed usage', () => {
+	beforeEach(() => {
+		navigateToNewWorkflowPage();
+		pasteWorkflow(SUB_WORKFLOW_INPUTS);
+		saveWorkflowOnButtonClick();
+		clickZoomToFit();
+
+		openNode('Execute Workflow');
+
+		// Prevent sub-workflow from opening in new window
+		cy.window().then((win) => {
+			cy.stub(win, 'open').callsFake((url) => {
+				cy.visit(url);
+			});
+		});
+		selectResourceLocatorItem('workflowId', 0, 'Create a');
+		// **************************
+		// NAVIGATE TO CHILD WORKFLOW
+		// **************************
+
+		openNode('Workflow Input Trigger');
+	});
+
+	it('works with type-checked values', () => {
+		populateFixedCollection(EXAMPLE_FIELDS, 'workflowInputs', 1);
+
+		validateAndReturnToParent(
+			DEFAULT_SUBWORKFLOW_NAME_1,
+			1,
+			EXAMPLE_FIELDS.map((f) => f[0]),
+		);
+
+		const values = [
+			'-1', // number fields don't support `=` switch to expression, so let's test the Fixed case with it
+			...EXAMPLE_FIELDS.slice(1).map((x) => `={{}{{} $json.a${x[0]}`), // the `}}` at the end are added automatically
+		];
+
+		// this matches with the pinned data provided in the fixture
+		populateMapperFields(values.map((x, i) => [EXAMPLE_FIELDS[i][0], x]));
+
+		clickExecuteNode();
+
+		const expected = [
+			['-1', 'A String', '0:11:true2:3', 'aKey:-1', '[empty object]', 'false'],
+			['-1', 'Another String', '[empty array]', 'aDifferentKey:-1', '[empty array]', 'false'],
+		];
+		assertOutputTableContent(expected);
+
+		// Test the type-checking options
+		populateMapperFields([['aString', '{selectAll}{backspace}{{}{{} 5']]);
+
+		getNodeRunInfoStale().should('exist');
+		clickExecuteNode();
+
+		assertNodeOutputErrorMessageExists();
+
+		// attemptToConvertTypes enabled
+		checkParameterCheckboxInputByName('attemptToConvertTypes');
+
+		getNodeRunInfoStale().should('exist');
+		clickExecuteNode();
+
+		const expected2 = [
+			['-1', '5', '0:11:true2:3', 'aKey:-1', '[empty object]', 'false'],
+			['-1', '5', '[empty array]', 'aDifferentKey:-1', '[empty array]', 'false'],
+		];
+
+		assertOutputTableContent(expected2);
+
+		// disabled again
+		uncheckParameterCheckboxInputByName('attemptToConvertTypes');
+
+		getNodeRunInfoStale().should('exist');
+		clickExecuteNode();
+
+		assertNodeOutputErrorMessageExists();
+	});
+
+	it('works with Fields input source, and can then be changed to JSON input source', () => {
+		assertNodeOutputHintExists();
+
+		populateFixedCollection(EXAMPLE_FIELDS, 'workflowInputs', 1);
+
+		validateAndReturnToParent(
+			DEFAULT_SUBWORKFLOW_NAME_1,
+			1,
+			EXAMPLE_FIELDS.map((f) => f[0]),
+		);
+
+		cy.window().then((win) => {
+			cy.stub(win, 'open').callsFake((url) => {
+				cy.visit(url);
+			});
+		});
+		selectResourceLocatorItem('workflowId', 0, 'Create a');
+
+		openNode('Workflow Input Trigger');
+
+		getParameterInputByName('inputSource').click();
+
+		getVisiblePopper()
+			.getByTestId('parameter-input')
+			.eq(0)
+			.type('Using JSON Example{downArrow}{enter}');
+
+		const exampleJson =
+			'{{}' + EXAMPLE_FIELDS.map((x) => `"${x[0]}": ${makeExample(x[1])}`).join(',') + '}';
+		getParameterInputByName('jsonExample')
+			.find('.cm-line')
+			.eq(0)
+			.type(`{selectAll}{backspace}${exampleJson}{enter}`);
+
+		// first one doesn't work for some reason, might need to wait for something?
+		clickExecuteNode();
+
+		validateAndReturnToParent(
+			DEFAULT_SUBWORKFLOW_NAME_2,
+			2,
+			EXAMPLE_FIELDS.map((f) => f[0]),
+		);
+
+		assertOutputTableContent([
+			['[null]', '[null]', '[null]', '[null]', '[null]', 'false'],
+			['[null]', '[null]', '[null]', '[null]', '[null]', 'false'],
+		]);
+
+		clickExecuteNode();
+	});
+
+	it('should show node issue when no fields are defined in manual mode', () => {
+		getExecuteNodeButton().should('be.disabled');
+		clickGetBackToCanvas();
+		// Executing the workflow should show an error toast
+		clickExecuteWorkflowButton();
+		errorToast().should('contain', 'The workflow has issues');
+		openNode('Workflow Input Trigger');
+		// Add a field to the workflowInputs fixedCollection
+		addItemToFixedCollection('workflowInputs');
+		typeIntoFixedCollectionItem('workflowInputs', 0, 'test');
+		// Executing the workflow should not show error now
+		clickGetBackToCanvas();
+		clickExecuteWorkflowButton();
+		successToast().should('contain', 'Workflow executed successfully');
+	});
+});
+
+// This function starts off in the Child Workflow Input Trigger, assuming we just defined the input fields
+// It then navigates back to the parent and validates the outputPanel matches our changes
+function validateAndReturnToParent(targetChild: string, offset: number, fields: string[]) {
+	clickExecuteNode();
+
+	// + 1 to account for formatting-only column
+	getOutputTableHeaders().should('have.length', fields.length + 1);
+	for (const [i, name] of fields.entries()) {
+		getOutputTableHeaders().eq(i).should('have.text', name);
+	}
+
+	clickGetBackToCanvas();
+	saveWorkflowOnButtonClick();
+
+	visitWorkflowsPage();
+
+	clickWorkflowCardContent(DEFAULT_WORKFLOW_NAME);
+
+	openNode('Execute Workflow');
+
+	// Note that outside of e2e tests this will be pre-selected correctly.
+	// Due to our workaround to remain in the same tab we need to select the correct tab manually
+	selectResourceLocatorItem('workflowId', offset, targetChild);
+
+	clickExecuteNode();
+
+	getOutputTableHeaders().should('have.length', fields.length + 1);
+	for (const [i, name] of fields.entries()) {
+		getOutputTableHeaders().eq(i).should('have.text', name);
+	}
+}
+
+function makeExample(type: TypeField) {
+	switch (type) {
+		case 'String':
+			return '"example"';
+		case 'Number':
+			return '42';
+		case 'Boolean':
+			return 'true';
+		case 'Array':
+			return '["example", 123, null]';
+		case 'Object':
+			return '{{}"example": [123]}';
+		case 'Allow Any Type':
+			return 'null';
+	}
+}
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index f2ccccb6ab..d9b7ecf2d1 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -1,6 +1,10 @@
 import { setCredentialValues } from '../composables/modals/credential-modal';
-import { clickCreateNewCredential } from '../composables/ndv';
-import { MANUAL_TRIGGER_NODE_DISPLAY_NAME, NOTION_NODE_NAME } from '../constants';
+import { clickCreateNewCredential, setParameterSelectByContent } from '../composables/ndv';
+import {
+	EDIT_FIELDS_SET_NODE_NAME,
+	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
+	NOTION_NODE_NAME,
+} from '../constants';
 import { NDV, WorkflowPage } from '../pages';
 import { NodeCreator } from '../pages/features/node-creator';
 
@@ -65,26 +69,6 @@ describe('NDV', () => {
 		cy.shouldNotHaveConsoleErrors();
 	});
 
-	it('should disconect Switch outputs if rules order was changed', () => {
-		cy.createFixtureWorkflow('NDV-test-switch_reorder.json', 'NDV test switch reorder');
-		workflowPage.actions.zoomToFit();
-
-		workflowPage.actions.executeWorkflow();
-		workflowPage.actions.openNode('Merge');
-		ndv.getters.outputPanel().contains('2 items').should('exist');
-		cy.contains('span', 'first').should('exist');
-		ndv.getters.backToCanvas().click();
-
-		workflowPage.actions.openNode('Switch');
-		cy.get('.cm-line').realMouseMove(100, 100);
-		cy.get('.fa-angle-down').click();
-		ndv.getters.backToCanvas().click();
-		workflowPage.actions.executeWorkflow();
-		workflowPage.actions.openNode('Merge');
-		ndv.getters.outputPanel().contains('1 item').should('exist');
-		cy.contains('span', 'zero').should('exist');
-	});
-
 	it('should show correct validation state for resource locator params', () => {
 		workflowPage.actions.addNodeToCanvas('Typeform', true, true);
 		ndv.getters.container().should('be.visible');
@@ -111,6 +95,7 @@ describe('NDV', () => {
 		cy.get('[class*=hasIssues]').should('have.length', 1);
 	});
 
+	// Correctly failing in V2 - node issues are only shows after execution
 	it('should show all validation errors when opening pasted node', () => {
 		cy.createFixtureWorkflow('Test_workflow_ndv_errors.json', 'Validation errors');
 		workflowPage.getters.canvasNodes().should('have.have.length', 1);
@@ -125,7 +110,10 @@ describe('NDV', () => {
 		ndv.actions.execute();
 		ndv.getters
 			.nodeRunErrorMessage()
-			.should('have.text', 'Info for expression missing from previous node');
+			.should(
+				'have.text',
+				"Using the item method doesn't work with pinned data in this scenario. Please unpin 'Break pairedItem chain' and try again.",
+			);
 		ndv.getters
 			.nodeRunErrorDescription()
 			.should(
@@ -204,7 +192,7 @@ describe('NDV', () => {
 					.contains(key)
 					.should('be.visible');
 			});
-			getObjectValueItem().find('label').click({ force: true });
+			getObjectValueItem().find('.toggle').click({ force: true });
 			expandedObjectProps.forEach((key) => {
 				ndv.getters
 					.outputPanel()
@@ -213,9 +201,11 @@ describe('NDV', () => {
 					.should('not.be.visible');
 			});
 		});
+
 		it('should not display pagination for schema', () => {
 			setupSchemaWorkflow();
 			ndv.getters.backToCanvas().click();
+			workflowPage.actions.deselectAll();
 			workflowPage.getters.canvasNodeByName('Set').click();
 			workflowPage.actions.addNodeToCanvas(
 				'Customer Datastore (n8n training)',
@@ -245,8 +235,8 @@ describe('NDV', () => {
 			ndv.getters.outputPanel().find('[class*=_pagination]').should('not.exist');
 			ndv.getters
 				.outputPanel()
-				.find('[data-test-id=run-data-schema-item] [data-test-id=run-data-schema-item]')
-				.should('have.length', 20);
+				.find('[data-test-id=run-data-schema-item]')
+				.should('have.length.above', 10);
 		});
 	});
 
@@ -376,15 +366,71 @@ describe('NDV', () => {
 		ndv.getters.nodeExecuteButton().should('be.visible');
 	});
 
-	it('should allow editing code in fullscreen in the Code node', () => {
+	it('should allow editing code in fullscreen in the code editors', () => {
+		// Code (JavaScript)
 		workflowPage.actions.addInitialNodeToCanvas('Code', { keepNdvOpen: true });
 		ndv.actions.openCodeEditorFullscreen();
 
 		ndv.getters.codeEditorFullscreen().type('{selectall}').type('{backspace}').type('foo()');
 		ndv.getters.codeEditorFullscreen().should('contain.text', 'foo()');
-		cy.wait(200);
+		cy.wait(200); // allow change to emit before closing modal
 		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
 		ndv.getters.parameterInput('jsCode').get('.cm-content').should('contain.text', 'foo()');
+		ndv.actions.close();
+
+		// SQL
+		workflowPage.actions.addNodeToCanvas('Postgres', true, true, 'Execute a SQL query');
+		ndv.actions.openCodeEditorFullscreen();
+
+		ndv.getters
+			.codeEditorFullscreen()
+			.type('{selectall}')
+			.type('{backspace}')
+			.type('SELECT * FROM workflows');
+		ndv.getters.codeEditorFullscreen().should('contain.text', 'SELECT * FROM workflows');
+		cy.wait(200);
+		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
+		ndv.getters
+			.parameterInput('query')
+			.get('.cm-content')
+			.should('contain.text', 'SELECT * FROM workflows');
+		ndv.actions.close();
+
+		// HTML
+		workflowPage.actions.addNodeToCanvas('HTML', true, true, 'Generate HTML template');
+		ndv.actions.openCodeEditorFullscreen();
+
+		ndv.getters
+			.codeEditorFullscreen()
+			.type('{selectall}')
+			.type('{backspace}')
+			.type('<div>Hello World');
+		ndv.getters.codeEditorFullscreen().should('contain.text', '<div>Hello World</div>');
+		cy.wait(200);
+
+		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
+		ndv.getters
+			.parameterInput('html')
+			.get('.cm-content')
+			.should('contain.text', '<div>Hello World</div>');
+		ndv.actions.close();
+
+		// JSON
+		workflowPage.actions.addNodeToCanvas(EDIT_FIELDS_SET_NODE_NAME, true, true);
+		setParameterSelectByContent('mode', 'JSON');
+		ndv.actions.openCodeEditorFullscreen();
+		ndv.getters
+			.codeEditorFullscreen()
+			.type('{selectall}')
+			.type('{backspace}')
+			.type('{ "key": "value" }', { parseSpecialCharSequences: false });
+		ndv.getters.codeEditorFullscreen().should('contain.text', '{ "key": "value" }');
+		cy.wait(200);
+		ndv.getters.codeEditorDialog().find('.el-dialog__close').click();
+		ndv.getters
+			.parameterInput('jsonOutput')
+			.get('.cm-content')
+			.should('contain.text', '{ "key": "value" }');
 	});
 
 	it('should not retrieve remote options when a parameter value changes', () => {
@@ -407,8 +453,18 @@ describe('NDV', () => {
 			return cy.get(`[data-node-placement=${position}]`);
 		}
 
+		// Correctly failing in V2 - due to floating navigation not updating the selected node
 		it('should traverse floating nodes with mouse', () => {
 			cy.createFixtureWorkflow('Floating_Nodes.json', 'Floating Nodes');
+
+			cy.ifCanvasVersion(
+				() => {},
+				() => {
+					// Needed in V2 as all nodes remain selected when clicking on a selected node
+					workflowPage.actions.deselectAll();
+				},
+			);
+
 			workflowPage.getters.canvasNodes().first().dblclick();
 			getFloatingNodeByPosition('inputMain').should('not.exist');
 			getFloatingNodeByPosition('outputMain').should('exist');
@@ -419,6 +475,7 @@ describe('NDV', () => {
 				getFloatingNodeByPosition('inputMain').should('exist');
 				getFloatingNodeByPosition('outputMain').should('exist');
 				ndv.actions.close();
+				// These two lines are broken in V2
 				workflowPage.getters.selectedNodes().should('have.length', 1);
 				workflowPage.getters
 					.selectedNodes()
@@ -426,10 +483,8 @@ describe('NDV', () => {
 					.should('contain', `Node ${i + 1}`);
 				workflowPage.getters.selectedNodes().first().dblclick();
 			});
-
 			getFloatingNodeByPosition('outputMain').click({ force: true });
 			ndv.getters.nodeNameContainer().should('contain', 'Chain');
-
 			// Traverse 4 connected node backwards
 			Array.from(Array(4).keys()).forEach((i) => {
 				getFloatingNodeByPosition('inputMain').click({ force: true });
@@ -453,8 +508,17 @@ describe('NDV', () => {
 				.should('contain', MANUAL_TRIGGER_NODE_DISPLAY_NAME);
 		});
 
+		// Correctly failing in V2 - due to floating navigation not updating the selected node
 		it('should traverse floating nodes with keyboard', () => {
 			cy.createFixtureWorkflow('Floating_Nodes.json', 'Floating Nodes');
+			cy.ifCanvasVersion(
+				() => {},
+				() => {
+					// Needed in V2 as all nodes remain selected when clicking on a selected node
+					workflowPage.actions.deselectAll();
+				},
+			);
+
 			workflowPage.getters.canvasNodes().first().dblclick();
 			getFloatingNodeByPosition('inputMain').should('not.exist');
 			getFloatingNodeByPosition('outputMain').should('exist');
@@ -465,6 +529,7 @@ describe('NDV', () => {
 				getFloatingNodeByPosition('inputMain').should('exist');
 				getFloatingNodeByPosition('outputMain').should('exist');
 				ndv.actions.close();
+				// These two lines are broken in V2
 				workflowPage.getters.selectedNodes().should('have.length', 1);
 				workflowPage.getters
 					.selectedNodes()
@@ -492,6 +557,7 @@ describe('NDV', () => {
 			getFloatingNodeByPosition('inputSub').should('not.exist');
 			getFloatingNodeByPosition('outputSub').should('not.exist');
 			ndv.actions.close();
+			// These two lines are broken in V2
 			workflowPage.getters.selectedNodes().should('have.length', 1);
 			workflowPage.getters
 				.selectedNodes()
@@ -717,6 +783,7 @@ describe('NDV', () => {
 			.should('have.value', 'Error fetching options from Notion');
 	});
 
+	// Correctly failing in V2 - NodeCreator is not opened after clicking on the link
 	it('Should open appropriate node creator after clicking on connection hint link', () => {
 		const nodeCreator = new NodeCreator();
 		const hintMapper = {
@@ -734,6 +801,7 @@ describe('NDV', () => {
 
 		Object.entries(hintMapper).forEach(([node, group]) => {
 			workflowPage.actions.openNode(node);
+			// This fails to open the NodeCreator
 			cy.get('[data-action=openSelectiveNodeCreator]').contains('Insert one').click();
 			nodeCreator.getters.activeSubcategory().should('contain', group);
 			cy.realPress('Escape');
@@ -795,4 +863,60 @@ describe('NDV', () => {
 			.find('[data-test-id=run-data-schema-item]')
 			.should('contain.text', 'onlyOnItem3');
 	});
+
+	it('should keep search expanded after Test step node run', () => {
+		cy.createFixtureWorkflow('Test_ndv_search.json');
+		workflowPage.actions.zoomToFit();
+		workflowPage.actions.executeWorkflow();
+		workflowPage.actions.openNode('Edit Fields');
+		ndv.getters.outputPanel().should('be.visible');
+		ndv.getters.outputPanel().findChildByTestId('ndv-search').click().type('US');
+		ndv.getters.outputTableRow(1).find('mark').should('have.text', 'US');
+
+		ndv.actions.execute();
+		ndv.getters
+			.outputPanel()
+			.findChildByTestId('ndv-search')
+			.should('be.visible')
+			.should('have.value', 'US');
+	});
+
+	it('should not show items count when seaching in schema view', () => {
+		cy.createFixtureWorkflow('Test_ndv_search.json');
+		workflowPage.actions.zoomToFit();
+		workflowPage.actions.openNode('Edit Fields');
+		ndv.getters.outputPanel().should('be.visible');
+		ndv.actions.execute();
+		ndv.actions.switchOutputMode('Schema');
+		ndv.getters.outputPanel().find('[data-test-id=ndv-search]').click().type('US');
+		ndv.getters.outputPanel().find('[data-test-id=ndv-items-count]').should('not.exist');
+	});
+
+	it('should show additional tooltip when seaching in schema view if no matches', () => {
+		cy.createFixtureWorkflow('Test_ndv_search.json');
+		workflowPage.actions.zoomToFit();
+		workflowPage.actions.openNode('Edit Fields');
+		ndv.getters.outputPanel().should('be.visible');
+		ndv.actions.execute();
+		ndv.actions.switchOutputMode('Schema');
+		ndv.getters.outputPanel().find('[data-test-id=ndv-search]').click().type('foo');
+		ndv.getters
+			.outputPanel()
+			.contains('To search field contents rather than just names, use Table or JSON view')
+			.should('exist');
+	});
+
+	it('ADO-2931 - should handle multiple branches of the same input with the first branch empty correctly', () => {
+		cy.createFixtureWorkflow('Test_ndv_two_branches_of_same_parent_false_populated.json');
+		workflowPage.actions.zoomToFit();
+		workflowPage.actions.openNode('DebugHelper');
+		ndv.getters.inputPanel().should('be.visible');
+		ndv.getters.outputPanel().should('be.visible');
+		ndv.actions.execute();
+		// This ensures we rendered the inputPanel
+		ndv.getters
+			.inputPanel()
+			.find('[data-test-id=run-data-schema-item]')
+			.should('contain.text', 'a1');
+	});
 });
diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 5bc7d05ee2..674d91af18 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -57,7 +57,7 @@ for (const item of $input.all()) {
 
 return
 `);
-			getParameter().get('.cm-lint-marker-error').should('have.length', 6);
+			getParameter().get('.cm-lintRange-error').should('have.length', 6);
 			getParameter().contains('itemMatching').realHover();
 			cy.get('.cm-tooltip-lint').should(
 				'have.text',
@@ -81,7 +81,7 @@ $input.item()
 return []
 `);
 
-			getParameter().get('.cm-lint-marker-error').should('have.length', 5);
+			getParameter().get('.cm-lintRange-error').should('have.length', 5);
 			getParameter().contains('all').realHover();
 			cy.get('.cm-tooltip-lint').should(
 				'have.text',
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index 8571b174d9..f0f3ae019a 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -171,9 +171,16 @@ describe('Workflow Actions', () => {
 		cy.get('#node-creator').should('not.exist');
 
 		WorkflowPage.actions.hitSelectAll();
-		cy.get('.jtk-drag-selected').should('have.length', 2);
 		WorkflowPage.actions.hitCopy();
 		successToast().should('exist');
+		// Both nodes should be copied
+		cy.window()
+			.its('navigator.clipboard')
+			.then((clip) => clip.readText())
+			.then((text) => {
+				const copiedWorkflow = JSON.parse(text);
+				expect(copiedWorkflow.nodes).to.have.length(2);
+			});
 	});
 
 	it('should paste nodes (both current and old node versions)', () => {
@@ -345,7 +352,15 @@ describe('Workflow Actions', () => {
 		WorkflowPage.actions.hitDeleteAllNodes();
 		WorkflowPage.getters.canvasNodes().should('have.length', 0);
 		// Button should be disabled
-		WorkflowPage.getters.executeWorkflowButton().should('be.disabled');
+		cy.ifCanvasVersion(
+			() => {
+				WorkflowPage.getters.executeWorkflowButton().should('be.disabled');
+			},
+			() => {
+				// In new canvas, button does not exist when there are no nodes
+				WorkflowPage.getters.executeWorkflowButton().should('not.exist');
+			},
+		);
 		// Keyboard shortcut should not work
 		WorkflowPage.actions.hitExecuteWorkflow();
 		successToast().should('not.exist');
diff --git a/cypress/fixtures/Ecommerce_starter_pack_template_collection.json b/cypress/fixtures/Ecommerce_starter_pack_template_collection.json
index 1f908c587b..d6235b358c 100644
--- a/cypress/fixtures/Ecommerce_starter_pack_template_collection.json
+++ b/cypress/fixtures/Ecommerce_starter_pack_template_collection.json
@@ -1 +1,1555 @@
-{"collection":{"id":1,"name":"eCommerce Starter Pack","description":"eCommerce operations are complex — but there are many things that you can automate to make your life easier. This collection provides a few ideas to get started.\n\nReduce manual work and the risk of human error by automating processes such as social media promotion of products, updating customer databases, and get notifications for important events.","totalViews":0,"createdAt":"2022-02-17T12:40:50.498Z","nodes":[{"id":20,"name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"displayName":"IF","icon":"fa:map-signs","iconData":{"icon":"map-signs","type":"icon"},"typeVersion":1,"categories":[{"id":9,"name":"Core Nodes"}]},{"id":49,"name":"n8n-nodes-base.telegram","defaults":{"name":"Telegram"},"displayName":"Telegram","icon":"file:telegram.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="},"typeVersion":1,"categories":[{"id":6,"name":"Communication"}]},{"id":107,"name":"n8n-nodes-base.shopifyTrigger","defaults":{"name":"Shopify Trigger"},"displayName":"Shopify Trigger","icon":"file:shopify.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTggNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTQ5LjI1NSAxMi40ODRhLjYzMy42MzMgMCAwMC0uNTY0LS41MjdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdjLS4zNC0uMzc2LTEuMDkyLS4yNjYtMS4zNzYtLjE4OC0uMDM3IDAtLjc1Mi4yMjUtMS45MjIuNjA1LTEuMTM3LTMuMy0zLjE1LTYuMzA2LTYuNjk2LTYuMzA2aC0uMzAzQzI4LjQzOC42MDUgMjcuMTk0IDAgMjYuMTQ0IDBjLTguMjU2LjAzNy0xMi4yIDEwLjMzMy0xMy40MzQgMTUuNTk0bC01Ljc3IDEuNzdjLTEuNzcuNTY0LTEuODM1LjYwNS0yLjA3MyAyLjI5M0wwIDU3LjE3NSAzNi40NjggNjRsMTkuNzYzLTQuMjZjMC0uMDM3LTYuOTQtNDYuODk3LTYuOTc2LTQ3LjI1NXpNMzQuNDMxIDguODZjLS45MTcuMzAzLTEuOTYzLjYwNS0zLjEuOTQ1di0uNjhhMTUuMDMgMTUuMDMgMCAwMC0uNzUyLTQuOTk5YzEuODQ4LjI4NCAzLjEgMi4zNTcgMy44NDMgNC43MzN6bS02LjA2OC00LjI5OGMuNjAzIDEuNzc4Ljg4MyAzLjY1LjgyNiA1LjUyN3YuMzRsLTYuMzc1IDEuOTYzYzEuMjQ4LTQuNjYgMy41NS02Ljk2MiA1LjU1LTcuODN6bS0yLjQ1LTIuMjkzYTEuOTQgMS45NCAwIDAxMS4wNTUuMzM5Yy0yLjY2IDEuMjM4LTUuNDcyIDQuMzY2LTYuNjc4IDEwLjYyN2wtNS4wNDUgMS41NDZDMTYuNjY4IDEwLjAzIDE5Ljk4OCAyLjI2IDI1LjkxIDIuMjZ6IiBmaWxsPSIjOTViZjQ3Ii8+PHBhdGggZD0iTTQ4LjY5MSAxMS45NTdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdhLjc1My43NTMgMCAwMC0uNTI3LS4yMjVMMzYuNDcyIDY0bDE5Ljc2My00LjI2LTYuOTgtNDcuMjE4YS42OC42OCAwIDAwLS41NjQtLjU2NHoiIGZpbGw9IiM1ZThlM2UiLz48cGF0aCBkPSJNMjkuNzU4IDIyLjlsLTIuNDU0IDcuMjQyYTExLjM2IDExLjM2IDAgMDAtNC43NTItMS4xMzNjLTMuODQ4IDAtNC4wMzYgMi40MTItNC4wMzYgMy4wMTggMCAzLjI5OCA4LjYzNiA0LjU2NCA4LjYzNiAxMi4zMzMgMCA2LjEtMy44ODUgMTAuMDMtOS4xIDEwLjAzLTYuMjYgMC05LjQ2Ny0zLjg4NS05LjQ2Ny0zLjg4NWwxLjY2NS01LjU1czMuMjggMi44MyA2LjA3MyAyLjgzYTIuNDcgMi40NyAwIDAwMi41NjQtMi40OWMwLTQuMzQtNy4xLTQuNTI3LTcuMS0xMS42MTggMC01Ljk2MiA0LjI5OC0xMS43NyAxMi45MzQtMTEuNzcgMy4zOTQuMDUgNS4wMTggMSA1LjAxOCAxeiIvPjwvZz48L3N5bWJvbD48L3N2Zz4="},"typeVersion":1,"categories":[{"id":2,"name":"Sales"}]},{"id":126,"name":"n8n-nodes-base.mautic","defaults":{"name":"Mautic"},"displayName":"Mautic","icon":"file:mautic.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMzQ5Ljc3OXB4IiBoZWlnaHQ9IjM0OS43NzlweCIgdmlld0JveD0iMCAwIDM0OS43NzkgMzQ5Ljc3OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzQ5Ljc3OSAzNDkuNzc5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0xNzQuODksMzQ5Ljc3OUM3OC42MTIsMzQ5Ljc3OSwwLDI3MS40NjIsMCwxNzQuODlTNzguNjEyLDAsMTc0Ljg5LDBjMjMuMjYsMCw0NS45MzEsNC40MTcsNjcuMTI5LDEzLjU0Mw0KCWM1Ljg4OSwyLjY1LDguODMzLDkuNDIyLDYuNDc4LDE1LjYwNWMtMi42NDksNS44ODgtOS40MjEsOC44MzMtMTUuNjA0LDYuNDc3Yy0xOC41NDktNy42NTUtMzcuOTgtMTEuNDgyLTU4LjAwMi0xMS40ODINCgljLTgzLjMyMywwLTE1MS4wNDEsNjcuNzE4LTE1MS4wNDEsMTUxLjA0MVM5MS41NjcsMzI2LjIyNSwxNzQuODksMzI2LjIyNWM4My4zMjMsMCwxNTEuMDQxLTY3LjcxOCwxNTEuMDQxLTE1MS4wNDENCgljMC0xNy45Ni0yLjk0NC0zNS4zMzItOS4xMjctNTEuODE5Yy0yLjM1NS02LjE4MywwLjg4My0xMi45NTUsNy4wNjYtMTUuMzFjNi4xODMtMi4zNTUsMTIuOTU0LDAuODgzLDE1LjMxLDcuMDY2DQoJYzcuMDY2LDE5LjEzOCwxMC42LDM5LjQ1MywxMC42LDYwLjA2M0MzNDkuNzc5LDI3MS4xNjcsMjcxLjQ2MiwzNDkuNzc5LDE3NC44OSwzNDkuNzc5Ii8+DQo8Zz4NCgk8cG9seWdvbiBmaWxsPSIjRkRCOTMzIiBwb2ludHM9IjI1MS40NCwxNTYuOTMgMjI0LjM1NCwxODUuMTk0IDIzOS4zNjksMjQ4LjQ5NiAyNzMuNTIyLDI0OC40OTYgCSIvPg0KPC9nPg0KPHBvbHlnb24gZmlsbD0iI0ZEQjkzMyIgcG9pbnRzPSIyNDAuMjUzLDczLjMxMiAyNDkuNjc0LDgyLjczNCAxNzQuODksMTYxLjkzNSAxMTAuOTk5LDk2LjI3NyA3NC4xOTYsMjQ4LjQ5NiAxMDguMzUsMjQ4LjQ5NiANCgkxMjguNjY1LDE2My45OTYgMTc0Ljg5LDIxNC4zNDMgMjczLjgxNywxMDYuNTgzIDI4My4yMzksMTE2LjI5OSAyOTIuNjYsNjMuMDA3ICIvPg0KPC9zdmc+DQo="},"typeVersion":1,"categories":[{"id":1,"name":"Marketing & Content"},{"id":6,"name":"Communication"}]},{"id":235,"name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"displayName":"WooCommerce Trigger","icon":"file:wooCommerce.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"typeVersion":1,"categories":[{"id":2,"name":"Sales"}]},{"id":325,"name":"n8n-nodes-base.twitter","defaults":{"name":"X"},"displayName":"X (Formerly Twitter)","icon":"file:x.svg","iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"},"typeVersion":2,"categories":[{"id":1,"name":"Marketing & Content"}]}],"categories":[{"id":2,"name":"Sales"}],"workflows":[{"id":1205,"name":"Promote new Shopify products on Twitter and Telegram","views":485,"recentViews":9850,"totalViews":485,"createdAt":"2021-08-24T10:40:50.007Z","description":"This workflow automatically promotes your new Shopify products on Twitter and Telegram. This workflow is also featured in the blog post [*6 e-commerce workflows to power up your Shopify store*](https://n8n.io/blog/no-code-ecommerce-workflow-automations/#promote-your-new-products-on-social-media).\n\n## Prerequisites\n\n- A Shopify account and [credentials](https://docs.n8n.io/integrations/credentials/shopify/)\n- A Twitter account and [credentials](https://docs.n8n.io/integrations/credentials/twitter/)\n- A Telegram account and [credentials](https://docs.n8n.io/integrations/credentials/telegram/) for the channel you want to send messages to.\n\n## Nodes\n\n- [Shopify Trigger node](https://docs.n8n.io/integrations/trigger-nodes/n8n-nodes-base.shopifytrigger/) triggers the workflow when you create a new product in Shopify.\n- [Twitter node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.twitter/) posts a tweet with the text \"Hey there, my design is now on a new product! Visit my {shop name} to get this cool {product title} (and check out more {product type})\".\n- [Telegram node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.telegram/) posts a message with the same text as above in a Telegram channel.","workflow":{"nodes":[{"name":"Twitter","type":"n8n-nodes-base.twitter","position":[720,-220],"parameters":{"text":"=Hey there, my design is now on a new product ✨\nVisit my {{$json[\"vendor\"]}} shop to get this cool{{$json[\"title\"]}} (and check out more {{$json[\"product_type\"]}}) 🛍️","additionalFields":{}},"credentials":{"twitterOAuth1Api":"twitter"},"typeVersion":1},{"name":"Telegram","type":"n8n-nodes-base.telegram","position":[720,-20],"parameters":{"text":"=Hey there, my design is now on a new product!\nVisit my {{$json[\"vendor\"]}} shop to get this cool{{$json[\"title\"]}} (and check out more {{$json[\"product_type\"]}})","chatId":"123456","additionalFields":{}},"credentials":{"telegramApi":"telegram_habot"},"typeVersion":1},{"name":"product created","type":"n8n-nodes-base.shopifyTrigger","position":[540,-110],"webhookId":"2a7e0e50-8f09-4a2b-bf54-a849a6ac4fe0","parameters":{"topic":"products/create"},"credentials":{"shopifyApi":"shopify_nodeqa"},"typeVersion":1}],"connections":{"product created":{"main":[[{"node":"Twitter","type":"main","index":0},{"node":"Telegram","type":"main","index":0}]]}}},"workflowInfo":{"nodeCount":3,"nodeTypes":{"n8n-nodes-base.twitter":{"count":1},"n8n-nodes-base.telegram":{"count":1},"n8n-nodes-base.shopifyTrigger":{"count":1}}},"user":{"username":"lorenanda"},"nodes":[{"id":49,"icon":"file:telegram.svg","name":"n8n-nodes-base.telegram","defaults":{"name":"Telegram"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="},"categories":[{"id":6,"name":"Communication"}],"displayName":"Telegram","typeVersion":1},{"id":107,"icon":"file:shopify.svg","name":"n8n-nodes-base.shopifyTrigger","defaults":{"name":"Shopify Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTggNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTQ5LjI1NSAxMi40ODRhLjYzMy42MzMgMCAwMC0uNTY0LS41MjdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdjLS4zNC0uMzc2LTEuMDkyLS4yNjYtMS4zNzYtLjE4OC0uMDM3IDAtLjc1Mi4yMjUtMS45MjIuNjA1LTEuMTM3LTMuMy0zLjE1LTYuMzA2LTYuNjk2LTYuMzA2aC0uMzAzQzI4LjQzOC42MDUgMjcuMTk0IDAgMjYuMTQ0IDBjLTguMjU2LjAzNy0xMi4yIDEwLjMzMy0xMy40MzQgMTUuNTk0bC01Ljc3IDEuNzdjLTEuNzcuNTY0LTEuODM1LjYwNS0yLjA3MyAyLjI5M0wwIDU3LjE3NSAzNi40NjggNjRsMTkuNzYzLTQuMjZjMC0uMDM3LTYuOTQtNDYuODk3LTYuOTc2LTQ3LjI1NXpNMzQuNDMxIDguODZjLS45MTcuMzAzLTEuOTYzLjYwNS0zLjEuOTQ1di0uNjhhMTUuMDMgMTUuMDMgMCAwMC0uNzUyLTQuOTk5YzEuODQ4LjI4NCAzLjEgMi4zNTcgMy44NDMgNC43MzN6bS02LjA2OC00LjI5OGMuNjAzIDEuNzc4Ljg4MyAzLjY1LjgyNiA1LjUyN3YuMzRsLTYuMzc1IDEuOTYzYzEuMjQ4LTQuNjYgMy41NS02Ljk2MiA1LjU1LTcuODN6bS0yLjQ1LTIuMjkzYTEuOTQgMS45NCAwIDAxMS4wNTUuMzM5Yy0yLjY2IDEuMjM4LTUuNDcyIDQuMzY2LTYuNjc4IDEwLjYyN2wtNS4wNDUgMS41NDZDMTYuNjY4IDEwLjAzIDE5Ljk4OCAyLjI2IDI1LjkxIDIuMjZ6IiBmaWxsPSIjOTViZjQ3Ii8+PHBhdGggZD0iTTQ4LjY5MSAxMS45NTdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdhLjc1My43NTMgMCAwMC0uNTI3LS4yMjVMMzYuNDcyIDY0bDE5Ljc2My00LjI2LTYuOTgtNDcuMjE4YS42OC42OCAwIDAwLS41NjQtLjU2NHoiIGZpbGw9IiM1ZThlM2UiLz48cGF0aCBkPSJNMjkuNzU4IDIyLjlsLTIuNDU0IDcuMjQyYTExLjM2IDExLjM2IDAgMDAtNC43NTItMS4xMzNjLTMuODQ4IDAtNC4wMzYgMi40MTItNC4wMzYgMy4wMTggMCAzLjI5OCA4LjYzNiA0LjU2NCA4LjYzNiAxMi4zMzMgMCA2LjEtMy44ODUgMTAuMDMtOS4xIDEwLjAzLTYuMjYgMC05LjQ2Ny0zLjg4NS05LjQ2Ny0zLjg4NWwxLjY2NS01LjU1czMuMjggMi44MyA2LjA3MyAyLjgzYTIuNDcgMi40NyAwIDAwMi41NjQtMi40OWMwLTQuMzQtNy4xLTQuNTI3LTcuMS0xMS42MTggMC01Ljk2MiA0LjI5OC0xMS43NyAxMi45MzQtMTEuNzcgMy4zOTQuMDUgNS4wMTggMSA1LjAxOCAxeiIvPjwvZz48L3N5bWJvbD48L3N2Zz4="},"categories":[{"id":2,"name":"Sales"}],"displayName":"Shopify Trigger","typeVersion":1},{"id":325,"icon":"file:x.svg","name":"n8n-nodes-base.twitter","defaults":{"name":"X"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"},"categories":[{"id":1,"name":"Marketing & Content"}],"displayName":"X (Formerly Twitter)","typeVersion":2}],"categories":[{"id":2,"name":"Sales"},{"id":19,"name":"Marketing & Growth"}],"image":[{"id":527,"url":"https://n8niostorageaccount.blob.core.windows.net/n8nio-strapi-blobs-prod/assets/89a078b208fe4c6181902608b1cd1332.png"}]},{"id":1456,"name":"Add new customers from WooCommerce to Mautic","views":333,"recentViews":9833,"totalViews":333,"createdAt":"2022-02-17T15:00:40.748Z","description":"This workflow uses a WooCommerce trigger that will run when a new customer has been added, It will then add the customer to Mautic.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Mautic nodes.","workflow":{"id":83,"name":"New WooCommerce Customer to Mautic","nodes":[{"name":"Check for Existing","type":"n8n-nodes-base.mautic","position":[280,480],"parameters":{"options":{"search":"={{$json[\"email\"]}}"},"operation":"getAll","authentication":"oAuth2"},"credentials":{"mauticOAuth2Api":{"id":"54","name":"Mautic account"}},"typeVersion":1,"alwaysOutputData":true},{"name":"If New","type":"n8n-nodes-base.if","position":[460,480],"parameters":{"conditions":{"string":[{"value1":"={{$json[\"id\"]}}","operation":"isEmpty"}]}},"typeVersion":1},{"name":"Create Contact","type":"n8n-nodes-base.mautic","position":[680,320],"parameters":{"email":"={{$node[\"Customer Created\"].json[\"email\"]}}","company":"={{$node[\"Customer Created\"].json[\"billing\"][\"company\"]}}","options":{},"lastName":"={{$node[\"Customer Created\"].json[\"last_name\"]}}","firstName":"={{$node[\"Customer Created\"].json[\"first_name\"]}}","authentication":"oAuth2","additionalFields":{}},"credentials":{"mauticOAuth2Api":{"id":"54","name":"Mautic account"}},"typeVersion":1},{"name":"Update Contact","type":"n8n-nodes-base.mautic","position":[680,580],"parameters":{"options":{},"contactId":"={{$json[\"id\"]}}","operation":"update","updateFields":{"lastName":"={{$node[\"Customer Created or Updated\"].json[\"last_name\"]}}","firstName":"={{$node[\"Customer Created or Updated\"].json[\"first_name\"]}}"},"authentication":"oAuth2"},"credentials":{"mauticOAuth2Api":{"id":"54","name":"Mautic account"}},"typeVersion":1},{"name":"Customer Created or Updated","type":"n8n-nodes-base.wooCommerceTrigger","position":[100,480],"webhookId":"5d89e322-a5e0-4cce-9eab-185e8375175b","parameters":{"event":"customer.updated"},"credentials":{"wooCommerceApi":{"id":"48","name":"WooCommerce account"}},"typeVersion":1}],"active":false,"settings":{"saveManualExecutions":true,"saveExecutionProgress":true,"saveDataSuccessExecution":"all"},"connections":{"If New":{"main":[[{"node":"Create Contact","type":"main","index":0}],[{"node":"Update Contact","type":"main","index":0}]]},"Check for Existing":{"main":[[{"node":"If New","type":"main","index":0}]]},"Customer Created or Updated":{"main":[[{"node":"Check for Existing","type":"main","index":0}]]}}},"workflowInfo":{"nodeCount":6,"nodeTypes":{"n8n-nodes-base.if":{"count":1},"n8n-nodes-base.mautic":{"count":3},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"jon-n8n"},"nodes":[{"id":20,"icon":"fa:map-signs","name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"iconData":{"icon":"map-signs","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"IF","typeVersion":1},{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":126,"icon":"file:mautic.svg","name":"n8n-nodes-base.mautic","defaults":{"name":"Mautic"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMzQ5Ljc3OXB4IiBoZWlnaHQ9IjM0OS43NzlweCIgdmlld0JveD0iMCAwIDM0OS43NzkgMzQ5Ljc3OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzQ5Ljc3OSAzNDkuNzc5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0xNzQuODksMzQ5Ljc3OUM3OC42MTIsMzQ5Ljc3OSwwLDI3MS40NjIsMCwxNzQuODlTNzguNjEyLDAsMTc0Ljg5LDBjMjMuMjYsMCw0NS45MzEsNC40MTcsNjcuMTI5LDEzLjU0Mw0KCWM1Ljg4OSwyLjY1LDguODMzLDkuNDIyLDYuNDc4LDE1LjYwNWMtMi42NDksNS44ODgtOS40MjEsOC44MzMtMTUuNjA0LDYuNDc3Yy0xOC41NDktNy42NTUtMzcuOTgtMTEuNDgyLTU4LjAwMi0xMS40ODINCgljLTgzLjMyMywwLTE1MS4wNDEsNjcuNzE4LTE1MS4wNDEsMTUxLjA0MVM5MS41NjcsMzI2LjIyNSwxNzQuODksMzI2LjIyNWM4My4zMjMsMCwxNTEuMDQxLTY3LjcxOCwxNTEuMDQxLTE1MS4wNDENCgljMC0xNy45Ni0yLjk0NC0zNS4zMzItOS4xMjctNTEuODE5Yy0yLjM1NS02LjE4MywwLjg4My0xMi45NTUsNy4wNjYtMTUuMzFjNi4xODMtMi4zNTUsMTIuOTU0LDAuODgzLDE1LjMxLDcuMDY2DQoJYzcuMDY2LDE5LjEzOCwxMC42LDM5LjQ1MywxMC42LDYwLjA2M0MzNDkuNzc5LDI3MS4xNjcsMjcxLjQ2MiwzNDkuNzc5LDE3NC44OSwzNDkuNzc5Ii8+DQo8Zz4NCgk8cG9seWdvbiBmaWxsPSIjRkRCOTMzIiBwb2ludHM9IjI1MS40NCwxNTYuOTMgMjI0LjM1NCwxODUuMTk0IDIzOS4zNjksMjQ4LjQ5NiAyNzMuNTIyLDI0OC40OTYgCSIvPg0KPC9nPg0KPHBvbHlnb24gZmlsbD0iI0ZEQjkzMyIgcG9pbnRzPSIyNDAuMjUzLDczLjMxMiAyNDkuNjc0LDgyLjczNCAxNzQuODksMTYxLjkzNSAxMTAuOTk5LDk2LjI3NyA3NC4xOTYsMjQ4LjQ5NiAxMDguMzUsMjQ4LjQ5NiANCgkxMjguNjY1LDE2My45OTYgMTc0Ljg5LDIxNC4zNDMgMjczLjgxNywxMDYuNTgzIDI4My4yMzksMTE2LjI5OSAyOTIuNjYsNjMuMDA3ICIvPg0KPC9zdmc+DQo="},"categories":[{"id":1,"name":"Marketing & Content"},{"id":6,"name":"Communication"}],"displayName":"Mautic","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1}],"categories":[{"id":2,"name":"Sales"}],"image":[]},{"id":1459,"name":"Notify on Telegram and Twitter when new order is added in WooCommerce","views":620,"recentViews":9823,"totalViews":620,"createdAt":"2022-02-17T15:02:14.961Z","description":"This workflow uses a WooCommerce trigger that will run a new product has been added, It will then post the product to Telegram and Twitter.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce, Twitter and Telegram nodes.","workflow":{"id":85,"name":"New WooCommerce Product to Twitter and Telegram","nodes":[{"name":"Twitter","type":"n8n-nodes-base.twitter","position":[720,300],"parameters":{"text":"=✨ New Product Announcement ✨\nWe have just added {{$json[\"name\"]}}, Head to {{$json[\"permalink\"]}} to find out more.","additionalFields":{}},"credentials":{"twitterOAuth1Api":{"id":"37","name":"joffcom"}},"typeVersion":1},{"name":"Telegram","type":"n8n-nodes-base.telegram","position":[720,500],"parameters":{"text":"=✨ New Product Announcement ✨\nWe have just added {{$json[\"name\"]}}, Head to {{$json[\"permalink\"]}} to find out more.","chatId":"123456","additionalFields":{}},"credentials":{"telegramApi":{"id":"56","name":"Telegram account"}},"typeVersion":1},{"name":"WooCommerce Trigger","type":"n8n-nodes-base.wooCommerceTrigger","position":[540,400],"webhookId":"ab7b134b-9b2d-4e0d-b496-1aee30db0808","parameters":{"event":"product.created"},"credentials":{"wooCommerceApi":{"id":"48","name":"WooCommerce account"}},"typeVersion":1}],"active":false,"settings":{},"connections":{"WooCommerce Trigger":{"main":[[{"node":"Twitter","type":"main","index":0},{"node":"Telegram","type":"main","index":0}]]}}},"workflowInfo":{"nodeCount":4,"nodeTypes":{"n8n-nodes-base.twitter":{"count":1},"n8n-nodes-base.telegram":{"count":1},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"jon-n8n"},"nodes":[{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":49,"icon":"file:telegram.svg","name":"n8n-nodes-base.telegram","defaults":{"name":"Telegram"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="},"categories":[{"id":6,"name":"Communication"}],"displayName":"Telegram","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1},{"id":325,"icon":"file:x.svg","name":"n8n-nodes-base.twitter","defaults":{"name":"X"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"},"categories":[{"id":1,"name":"Marketing & Content"}],"displayName":"X (Formerly Twitter)","typeVersion":2}],"categories":[{"id":2,"name":"Sales"},{"id":19,"name":"Marketing & Growth"}],"image":[]},{"id":1457,"name":"Notify on Slack when new order is registered in WooCommerce","views":178,"recentViews":9787,"totalViews":178,"createdAt":"2022-02-17T15:01:13.489Z","description":"This workflow uses a WooCommerce trigger that will run when an order has been placed.\n\nIf the value of this is over 100 it will post it to a Slack channel.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Slack nodes, You will also need to pick a channel to post the message to.","workflow":{"id":81,"name":"New WooCommerce order to Slack","nodes":[{"name":"Order Created","type":"n8n-nodes-base.wooCommerceTrigger","position":[340,500],"webhookId":"287b4bf4-67ec-4c97-85d9-c0d3e6f59e6b","parameters":{"event":"order.created"},"credentials":{"wooCommerceApi":{"id":"48","name":"WooCommerce account"}},"typeVersion":1},{"name":"Send to Slack","type":"n8n-nodes-base.slack","position":[780,480],"parameters":{"text":":sparkles: There is a new order :sparkles:","channel":"woo-commerce","blocksUi":{"blocksValues":[]},"attachments":[{"color":"#66FF00","fields":{"item":[{"short":true,"title":"Order ID","value":"={{$json[\"id\"]}}"},{"short":true,"title":"Status","value":"={{$json[\"status\"]}}"},{"short":true,"title":"Total","value":"={{$json[\"currency_symbol\"]}}{{$json[\"total\"]}}"},{"short":false,"title":"Link","value":"={{$node[\"Order Created\"].json[\"_links\"][\"self\"][0][\"href\"]}}"}]},"footer":"=*Ordered:* {{$json[\"date_created\"]}} | *Transaction ID:* {{$json[\"transaction_id\"]}}"}],"otherOptions":{}},"credentials":{"slackApi":{"id":"53","name":"Slack Access Token"}},"typeVersion":1},{"name":"Price over 100","type":"n8n-nodes-base.if","position":[540,500],"parameters":{"conditions":{"number":[{"value1":"={{$json[\"total\"]}}","value2":100,"operation":"largerEqual"}]}},"typeVersion":1}],"active":false,"settings":{"saveManualExecutions":true,"saveExecutionProgress":true,"saveDataSuccessExecution":"all"},"connections":{"Order Created":{"main":[[{"node":"Price over 100","type":"main","index":0}]]},"Price over 100":{"main":[[{"node":"Send to Slack","type":"main","index":0}],[]]}}},"workflowInfo":{"nodeCount":4,"nodeTypes":{"n8n-nodes-base.if":{"count":1},"n8n-nodes-base.slack":{"count":1},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"jon-n8n"},"nodes":[{"id":20,"icon":"fa:map-signs","name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"iconData":{"icon":"map-signs","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"IF","typeVersion":1},{"id":40,"icon":"file:slack.svg","name":"n8n-nodes-base.slack","defaults":{"name":"Slack"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"},"categories":[{"id":6,"name":"Communication"}],"displayName":"Slack","typeVersion":2},{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1}],"categories":[{"id":2,"name":"Sales"}],"image":[]},{"id":1765,"name":"Get Slack notifications when new product published on WooCommerce","views":79,"recentViews":9577,"totalViews":79,"createdAt":"2022-08-12T12:36:53.409Z","description":"This workflow let's a bot in Slack notify a specific channel when a new product in WooCommerce is published and live on the site. \n\n## Prerequisites\n\n[WooCommerce](https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.woocommercetrigger/) account\n[Slack](https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.slack/) and a [Slack bot](https://slack.com/help/articles/115005265703-Create-a-bot-for-your-workspace)\n\n## How it works\n\n1. Listen for WooCommerce product creation\n2. If permalink starts with https://[your-url-here].com/product/\n3. Slack bot notifies channel that a new product has been added. \n\nPlease note, you must update the URL in the IF node to match your url. If your WooCommerce doesn't use the slug /product/, that will need to be updated too. \n","workflow":{"id":1016,"name":"Woocommerce to slack: notify new product created","tags":[{"id":"5","name":"FVF","createdAt":"2022-07-30T07:43:44.795Z","updatedAt":"2022-07-30T07:43:44.795Z"}],"nodes":[{"name":"If URL has /product/","type":"n8n-nodes-base.if","position":[640,300],"parameters":{"conditions":{"string":[{"value1":"={{$json[\"permalink\"]}}","value2":"https://[add-your-url-here]/product/","operation":"startsWith"}]}},"typeVersion":1},{"name":"Send message to slack","type":"n8n-nodes-base.slack","position":[920,260],"parameters":{"text":":new: A new product has been added! :new:","channel":"newproducts","blocksUi":{"blocksValues":[]},"attachments":[{"color":"#66FF00","fields":{"item":[{"short":false,"title":"Name","value":"={{$json[\"name\"]}}"},{"short":true,"title":"Price","value":"={{$json[\"regular_price\"]}}"},{"short":true,"title":"Sale Price","value":"={{$json[\"sale_price\"]}}"},{"short":false,"title":"Link","value":"={{$json[\"permalink\"]}}"}]},"footer":"=Added: {{$json[\"date_created\"]}}"}],"otherOptions":{}},"credentials":{"slackApi":{"id":"21","name":"FVF bot"}},"typeVersion":1},{"name":"On product creation","type":"n8n-nodes-base.wooCommerceTrigger","position":[460,300],"webhookId":"267c4855-6227-4d33-867e-74600097473e","parameters":{"event":"product.created"},"credentials":{"wooCommerceApi":{"id":"20","name":"WooCommerce account FVF"}},"typeVersion":1}],"active":true,"settings":{},"connections":{"On product creation":{"main":[[{"node":"If URL has /product/","type":"main","index":0}]]},"If URL has /product/":{"main":[[{"node":"Send message to slack","type":"main","index":0}]]}}},"workflowInfo":{"nodeCount":4,"nodeTypes":{"n8n-nodes-base.if":{"count":1},"n8n-nodes-base.slack":{"count":1},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"n8n-team"},"nodes":[{"id":20,"icon":"fa:map-signs","name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"iconData":{"icon":"map-signs","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"IF","typeVersion":1},{"id":40,"icon":"file:slack.svg","name":"n8n-nodes-base.slack","defaults":{"name":"Slack"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"},"categories":[{"id":6,"name":"Communication"}],"displayName":"Slack","typeVersion":2},{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1}],"categories":[{"id":2,"name":"Sales"}],"image":[]},{"id":1460,"name":"Notify on Slack when refund is registered in WooCommerce","views":85,"recentViews":9541,"totalViews":85,"createdAt":"2022-02-17T15:02:58.662Z","description":"This workflow uses a WooCommerce trigger that will run when an order has been updated and the status is refunded.\n\nIf the value of this is over 100 it will post it to a Slack channel.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Slack nodes, You will also need to pick a channel to post the message to.","workflow":{"id":82,"name":"New WooCommerce refund to Slack","nodes":[{"name":"Order Updated","type":"n8n-nodes-base.wooCommerceTrigger","position":[320,500],"webhookId":"f7736be3-e978-4a17-b936-7ce9f8ccdb72","parameters":{"event":"order.updated"},"credentials":{"wooCommerceApi":{"id":"48","name":"WooCommerce account"}},"typeVersion":1},{"name":"If Refund and Over 100","type":"n8n-nodes-base.if","position":[540,500],"parameters":{"conditions":{"number":[{"value1":"={{$json[\"total\"]}}","value2":100,"operation":"largerEqual"}],"string":[{"value1":"={{$json[\"status\"]}}","value2":"refunded"}]}},"typeVersion":1},{"name":"Send to Slack","type":"n8n-nodes-base.slack","position":[780,480],"parameters":{"text":":x: A refund has been issued :x:","channel":"woo-commerce","blocksUi":{"blocksValues":[]},"attachments":[{"color":"#FF0000","fields":{"item":[{"short":true,"title":"Order ID","value":"={{$json[\"id\"]}}"},{"short":true,"title":"Status","value":"={{$json[\"status\"]}}"},{"short":true,"title":"Total","value":"={{$json[\"currency_symbol\"]}}{{$json[\"total\"]}}"}]},"footer":"=*Order updated:* {{$json[\"date_modified\"]}}"}],"otherOptions":{}},"credentials":{"slackApi":{"id":"53","name":"Slack Access Token"}},"typeVersion":1}],"active":false,"settings":{"saveManualExecutions":true,"saveExecutionProgress":true,"saveDataSuccessExecution":"all"},"connections":{"Order Updated":{"main":[[{"node":"If Refund and Over 100","type":"main","index":0}]]},"If Refund and Over 100":{"main":[[{"node":"Send to Slack","type":"main","index":0}],[]]}}},"workflowInfo":{"nodeCount":4,"nodeTypes":{"n8n-nodes-base.if":{"count":1},"n8n-nodes-base.slack":{"count":1},"n8n-nodes-base.wooCommerceTrigger":{"count":1}}},"user":{"username":"jon-n8n"},"nodes":[{"id":20,"icon":"fa:map-signs","name":"n8n-nodes-base.if","defaults":{"name":"IF","color":"#408000"},"iconData":{"icon":"map-signs","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"IF","typeVersion":1},{"id":40,"icon":"file:slack.svg","name":"n8n-nodes-base.slack","defaults":{"name":"Slack"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"},"categories":[{"id":6,"name":"Communication"}],"displayName":"Slack","typeVersion":2},{"id":42,"icon":"fa:play","name":"n8n-nodes-base.start","defaults":{"name":"Start","color":"#00e000"},"iconData":{"icon":"play","type":"icon"},"categories":[{"id":9,"name":"Core Nodes"}],"displayName":"Start","typeVersion":1},{"id":235,"icon":"file:wooCommerce.svg","name":"n8n-nodes-base.wooCommerceTrigger","defaults":{"name":"WooCommerce Trigger"},"iconData":{"type":"file","fileBuffer":"data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="},"categories":[{"id":2,"name":"Sales"}],"displayName":"WooCommerce Trigger","typeVersion":1}],"categories":[{"id":2,"name":"Sales"},{"id":8,"name":"Finance & Accounting"}],"image":[]}],"image":[]}}
+{
+	"collection": {
+		"id": 1,
+		"name": "eCommerce Starter Pack",
+		"description": "eCommerce operations are complex — but there are many things that you can automate to make your life easier. This collection provides a few ideas to get started.\n\nReduce manual work and the risk of human error by automating processes such as social media promotion of products, updating customer databases, and get notifications for important events.",
+		"totalViews": 0,
+		"createdAt": "2022-02-17T12:40:50.498Z",
+		"nodes": [
+			{
+				"id": 20,
+				"name": "n8n-nodes-base.if",
+				"defaults": {
+					"name": "IF",
+					"color": "#408000"
+				},
+				"displayName": "IF",
+				"icon": "fa:map-signs",
+				"iconData": {
+					"icon": "map-signs",
+					"type": "icon"
+				},
+				"typeVersion": 1,
+				"categories": [
+					{
+						"id": 9,
+						"name": "Core Nodes"
+					}
+				]
+			},
+			{
+				"id": 49,
+				"name": "n8n-nodes-base.telegram",
+				"defaults": {
+					"name": "Telegram"
+				},
+				"displayName": "Telegram",
+				"icon": "file:telegram.svg",
+				"iconData": {
+					"type": "file",
+					"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="
+				},
+				"typeVersion": 1,
+				"categories": [
+					{
+						"id": 6,
+						"name": "Communication"
+					}
+				]
+			},
+			{
+				"id": 107,
+				"name": "n8n-nodes-base.shopifyTrigger",
+				"defaults": {
+					"name": "Shopify Trigger"
+				},
+				"displayName": "Shopify Trigger",
+				"icon": "file:shopify.svg",
+				"iconData": {
+					"type": "file",
+					"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTggNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTQ5LjI1NSAxMi40ODRhLjYzMy42MzMgMCAwMC0uNTY0LS41MjdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdjLS4zNC0uMzc2LTEuMDkyLS4yNjYtMS4zNzYtLjE4OC0uMDM3IDAtLjc1Mi4yMjUtMS45MjIuNjA1LTEuMTM3LTMuMy0zLjE1LTYuMzA2LTYuNjk2LTYuMzA2aC0uMzAzQzI4LjQzOC42MDUgMjcuMTk0IDAgMjYuMTQ0IDBjLTguMjU2LjAzNy0xMi4yIDEwLjMzMy0xMy40MzQgMTUuNTk0bC01Ljc3IDEuNzdjLTEuNzcuNTY0LTEuODM1LjYwNS0yLjA3MyAyLjI5M0wwIDU3LjE3NSAzNi40NjggNjRsMTkuNzYzLTQuMjZjMC0uMDM3LTYuOTQtNDYuODk3LTYuOTc2LTQ3LjI1NXpNMzQuNDMxIDguODZjLS45MTcuMzAzLTEuOTYzLjYwNS0zLjEuOTQ1di0uNjhhMTUuMDMgMTUuMDMgMCAwMC0uNzUyLTQuOTk5YzEuODQ4LjI4NCAzLjEgMi4zNTcgMy44NDMgNC43MzN6bS02LjA2OC00LjI5OGMuNjAzIDEuNzc4Ljg4MyAzLjY1LjgyNiA1LjUyN3YuMzRsLTYuMzc1IDEuOTYzYzEuMjQ4LTQuNjYgMy41NS02Ljk2MiA1LjU1LTcuODN6bS0yLjQ1LTIuMjkzYTEuOTQgMS45NCAwIDAxMS4wNTUuMzM5Yy0yLjY2IDEuMjM4LTUuNDcyIDQuMzY2LTYuNjc4IDEwLjYyN2wtNS4wNDUgMS41NDZDMTYuNjY4IDEwLjAzIDE5Ljk4OCAyLjI2IDI1LjkxIDIuMjZ6IiBmaWxsPSIjOTViZjQ3Ii8+PHBhdGggZD0iTTQ4LjY5MSAxMS45NTdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdhLjc1My43NTMgMCAwMC0uNTI3LS4yMjVMMzYuNDcyIDY0bDE5Ljc2My00LjI2LTYuOTgtNDcuMjE4YS42OC42OCAwIDAwLS41NjQtLjU2NHoiIGZpbGw9IiM1ZThlM2UiLz48cGF0aCBkPSJNMjkuNzU4IDIyLjlsLTIuNDU0IDcuMjQyYTExLjM2IDExLjM2IDAgMDAtNC43NTItMS4xMzNjLTMuODQ4IDAtNC4wMzYgMi40MTItNC4wMzYgMy4wMTggMCAzLjI5OCA4LjYzNiA0LjU2NCA4LjYzNiAxMi4zMzMgMCA2LjEtMy44ODUgMTAuMDMtOS4xIDEwLjAzLTYuMjYgMC05LjQ2Ny0zLjg4NS05LjQ2Ny0zLjg4NWwxLjY2NS01LjU1czMuMjggMi44MyA2LjA3MyAyLjgzYTIuNDcgMi40NyAwIDAwMi41NjQtMi40OWMwLTQuMzQtNy4xLTQuNTI3LTcuMS0xMS42MTggMC01Ljk2MiA0LjI5OC0xMS43NyAxMi45MzQtMTEuNzcgMy4zOTQuMDUgNS4wMTggMSA1LjAxOCAxeiIvPjwvZz48L3N5bWJvbD48L3N2Zz4="
+				},
+				"typeVersion": 1,
+				"categories": [
+					{
+						"id": 2,
+						"name": "Sales"
+					}
+				]
+			},
+			{
+				"id": 126,
+				"name": "n8n-nodes-base.mautic",
+				"defaults": {
+					"name": "Mautic"
+				},
+				"displayName": "Mautic",
+				"icon": "file:mautic.svg",
+				"iconData": {
+					"type": "file",
+					"fileBuffer": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMzQ5Ljc3OXB4IiBoZWlnaHQ9IjM0OS43NzlweCIgdmlld0JveD0iMCAwIDM0OS43NzkgMzQ5Ljc3OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzQ5Ljc3OSAzNDkuNzc5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0xNzQuODksMzQ5Ljc3OUM3OC42MTIsMzQ5Ljc3OSwwLDI3MS40NjIsMCwxNzQuODlTNzguNjEyLDAsMTc0Ljg5LDBjMjMuMjYsMCw0NS45MzEsNC40MTcsNjcuMTI5LDEzLjU0Mw0KCWM1Ljg4OSwyLjY1LDguODMzLDkuNDIyLDYuNDc4LDE1LjYwNWMtMi42NDksNS44ODgtOS40MjEsOC44MzMtMTUuNjA0LDYuNDc3Yy0xOC41NDktNy42NTUtMzcuOTgtMTEuNDgyLTU4LjAwMi0xMS40ODINCgljLTgzLjMyMywwLTE1MS4wNDEsNjcuNzE4LTE1MS4wNDEsMTUxLjA0MVM5MS41NjcsMzI2LjIyNSwxNzQuODksMzI2LjIyNWM4My4zMjMsMCwxNTEuMDQxLTY3LjcxOCwxNTEuMDQxLTE1MS4wNDENCgljMC0xNy45Ni0yLjk0NC0zNS4zMzItOS4xMjctNTEuODE5Yy0yLjM1NS02LjE4MywwLjg4My0xMi45NTUsNy4wNjYtMTUuMzFjNi4xODMtMi4zNTUsMTIuOTU0LDAuODgzLDE1LjMxLDcuMDY2DQoJYzcuMDY2LDE5LjEzOCwxMC42LDM5LjQ1MywxMC42LDYwLjA2M0MzNDkuNzc5LDI3MS4xNjcsMjcxLjQ2MiwzNDkuNzc5LDE3NC44OSwzNDkuNzc5Ii8+DQo8Zz4NCgk8cG9seWdvbiBmaWxsPSIjRkRCOTMzIiBwb2ludHM9IjI1MS40NCwxNTYuOTMgMjI0LjM1NCwxODUuMTk0IDIzOS4zNjksMjQ4LjQ5NiAyNzMuNTIyLDI0OC40OTYgCSIvPg0KPC9nPg0KPHBvbHlnb24gZmlsbD0iI0ZEQjkzMyIgcG9pbnRzPSIyNDAuMjUzLDczLjMxMiAyNDkuNjc0LDgyLjczNCAxNzQuODksMTYxLjkzNSAxMTAuOTk5LDk2LjI3NyA3NC4xOTYsMjQ4LjQ5NiAxMDguMzUsMjQ4LjQ5NiANCgkxMjguNjY1LDE2My45OTYgMTc0Ljg5LDIxNC4zNDMgMjczLjgxNywxMDYuNTgzIDI4My4yMzksMTE2LjI5OSAyOTIuNjYsNjMuMDA3ICIvPg0KPC9zdmc+DQo="
+				},
+				"typeVersion": 1,
+				"categories": [
+					{
+						"id": 1,
+						"name": "Marketing & Content"
+					},
+					{
+						"id": 6,
+						"name": "Communication"
+					}
+				]
+			},
+			{
+				"id": 235,
+				"name": "n8n-nodes-base.wooCommerceTrigger",
+				"defaults": {
+					"name": "WooCommerce Trigger"
+				},
+				"displayName": "WooCommerce Trigger",
+				"icon": "file:wooCommerce.svg",
+				"iconData": {
+					"type": "file",
+					"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="
+				},
+				"typeVersion": 1,
+				"categories": [
+					{
+						"id": 2,
+						"name": "Sales"
+					}
+				]
+			},
+			{
+				"id": 325,
+				"name": "n8n-nodes-base.twitter",
+				"defaults": {
+					"name": "X"
+				},
+				"displayName": "X (Formerly Twitter)",
+				"icon": "file:x.svg",
+				"iconData": {
+					"type": "file",
+					"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"
+				},
+				"typeVersion": 2,
+				"categories": [
+					{
+						"id": 1,
+						"name": "Marketing & Content"
+					}
+				]
+			}
+		],
+		"categories": [
+			{
+				"id": 2,
+				"name": "Sales"
+			}
+		],
+		"workflows": [
+			{
+				"id": 1205,
+				"name": "Promote new Shopify products",
+				"views": 485,
+				"recentViews": 9850,
+				"totalViews": 485,
+				"createdAt": "2021-08-24T10:40:50.007Z",
+				"description": "This workflow automatically promotes your new Shopify products on Twitter and Telegram. This workflow is also featured in the blog post [*6 e-commerce workflows to power up your Shopify store*](https://n8n.io/blog/no-code-ecommerce-workflow-automations/#promote-your-new-products-on-social-media).\n\n## Prerequisites\n\n- A Shopify account and [credentials](https://docs.n8n.io/integrations/credentials/shopify/)\n- A Twitter account and [credentials](https://docs.n8n.io/integrations/credentials/twitter/)\n- A Telegram account and [credentials](https://docs.n8n.io/integrations/credentials/telegram/) for the channel you want to send messages to.\n\n## Nodes\n\n- [Shopify Trigger node](https://docs.n8n.io/integrations/trigger-nodes/n8n-nodes-base.shopifytrigger/) triggers the workflow when you create a new product in Shopify.\n- [Twitter node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.twitter/) posts a tweet with the text \"Hey there, my design is now on a new product! Visit my {shop name} to get this cool {product title} (and check out more {product type})\".\n- [Telegram node](https://docs.n8n.io/integrations/nodes/n8n-nodes-base.telegram/) posts a message with the same text as above in a Telegram channel.",
+				"workflow": {
+					"nodes": [
+						{
+							"name": "Twitter",
+							"type": "n8n-nodes-base.twitter",
+							"position": [
+								720,
+								-220
+							],
+							"parameters": {
+								"text": "=Hey there, my design is now on a new product ✨\nVisit my {{$json[\"vendor\"]}} shop to get this cool{{$json[\"title\"]}} (and check out more {{$json[\"product_type\"]}}) 🛍️",
+								"additionalFields": {}
+							},
+							"credentials": {
+								"twitterOAuth1Api": "twitter"
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Telegram",
+							"type": "n8n-nodes-base.telegram",
+							"position": [
+								720,
+								-20
+							],
+							"parameters": {
+								"text": "=Hey there, my design is now on a new product!\nVisit my {{$json[\"vendor\"]}} shop to get this cool{{$json[\"title\"]}} (and check out more {{$json[\"product_type\"]}})",
+								"chatId": "123456",
+								"additionalFields": {}
+							},
+							"credentials": {
+								"telegramApi": "telegram_habot"
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "product created",
+							"type": "n8n-nodes-base.shopifyTrigger",
+							"position": [
+								540,
+								-110
+							],
+							"webhookId": "2a7e0e50-8f09-4a2b-bf54-a849a6ac4fe0",
+							"parameters": {
+								"topic": "products/create"
+							},
+							"credentials": {
+								"shopifyApi": "shopify_nodeqa"
+							},
+							"typeVersion": 1
+						}
+					],
+					"connections": {
+						"product created": {
+							"main": [
+								[
+									{
+										"node": "Twitter",
+										"type": "main",
+										"index": 0
+									},
+									{
+										"node": "Telegram",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						}
+					}
+				},
+				"workflowInfo": {
+					"nodeCount": 3,
+					"nodeTypes": {
+						"n8n-nodes-base.twitter": {
+							"count": 1
+						},
+						"n8n-nodes-base.telegram": {
+							"count": 1
+						},
+						"n8n-nodes-base.shopifyTrigger": {
+							"count": 1
+						}
+					}
+				},
+				"user": {
+					"username": "lorenanda"
+				},
+				"nodes": [
+					{
+						"id": 49,
+						"icon": "file:telegram.svg",
+						"name": "n8n-nodes-base.telegram",
+						"defaults": {
+							"name": "Telegram"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="
+						},
+						"categories": [
+							{
+								"id": 6,
+								"name": "Communication"
+							}
+						],
+						"displayName": "Telegram",
+						"typeVersion": 1
+					},
+					{
+						"id": 107,
+						"icon": "file:shopify.svg",
+						"name": "n8n-nodes-base.shopifyTrigger",
+						"defaults": {
+							"name": "Shopify Trigger"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNTggNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTQ5LjI1NSAxMi40ODRhLjYzMy42MzMgMCAwMC0uNTY0LS41MjdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdjLS4zNC0uMzc2LTEuMDkyLS4yNjYtMS4zNzYtLjE4OC0uMDM3IDAtLjc1Mi4yMjUtMS45MjIuNjA1LTEuMTM3LTMuMy0zLjE1LTYuMzA2LTYuNjk2LTYuMzA2aC0uMzAzQzI4LjQzOC42MDUgMjcuMTk0IDAgMjYuMTQ0IDBjLTguMjU2LjAzNy0xMi4yIDEwLjMzMy0xMy40MzQgMTUuNTk0bC01Ljc3IDEuNzdjLTEuNzcuNTY0LTEuODM1LjYwNS0yLjA3MyAyLjI5M0wwIDU3LjE3NSAzNi40NjggNjRsMTkuNzYzLTQuMjZjMC0uMDM3LTYuOTQtNDYuODk3LTYuOTc2LTQ3LjI1NXpNMzQuNDMxIDguODZjLS45MTcuMzAzLTEuOTYzLjYwNS0zLjEuOTQ1di0uNjhhMTUuMDMgMTUuMDMgMCAwMC0uNzUyLTQuOTk5YzEuODQ4LjI4NCAzLjEgMi4zNTcgMy44NDMgNC43MzN6bS02LjA2OC00LjI5OGMuNjAzIDEuNzc4Ljg4MyAzLjY1LjgyNiA1LjUyN3YuMzRsLTYuMzc1IDEuOTYzYzEuMjQ4LTQuNjYgMy41NS02Ljk2MiA1LjU1LTcuODN6bS0yLjQ1LTIuMjkzYTEuOTQgMS45NCAwIDAxMS4wNTUuMzM5Yy0yLjY2IDEuMjM4LTUuNDcyIDQuMzY2LTYuNjc4IDEwLjYyN2wtNS4wNDUgMS41NDZDMTYuNjY4IDEwLjAzIDE5Ljk4OCAyLjI2IDI1LjkxIDIuMjZ6IiBmaWxsPSIjOTViZjQ3Ii8+PHBhdGggZD0iTTQ4LjY5MSAxMS45NTdjLS4yMjUtLjAzNy01LjE3LS4zNzYtNS4xNy0uMzc2bC0zLjc3LTMuNzdhLjc1My43NTMgMCAwMC0uNTI3LS4yMjVMMzYuNDcyIDY0bDE5Ljc2My00LjI2LTYuOTgtNDcuMjE4YS42OC42OCAwIDAwLS41NjQtLjU2NHoiIGZpbGw9IiM1ZThlM2UiLz48cGF0aCBkPSJNMjkuNzU4IDIyLjlsLTIuNDU0IDcuMjQyYTExLjM2IDExLjM2IDAgMDAtNC43NTItMS4xMzNjLTMuODQ4IDAtNC4wMzYgMi40MTItNC4wMzYgMy4wMTggMCAzLjI5OCA4LjYzNiA0LjU2NCA4LjYzNiAxMi4zMzMgMCA2LjEtMy44ODUgMTAuMDMtOS4xIDEwLjAzLTYuMjYgMC05LjQ2Ny0zLjg4NS05LjQ2Ny0zLjg4NWwxLjY2NS01LjU1czMuMjggMi44MyA2LjA3MyAyLjgzYTIuNDcgMi40NyAwIDAwMi41NjQtMi40OWMwLTQuMzQtNy4xLTQuNTI3LTcuMS0xMS42MTggMC01Ljk2MiA0LjI5OC0xMS43NyAxMi45MzQtMTEuNzcgMy4zOTQuMDUgNS4wMTggMSA1LjAxOCAxeiIvPjwvZz48L3N5bWJvbD48L3N2Zz4="
+						},
+						"categories": [
+							{
+								"id": 2,
+								"name": "Sales"
+							}
+						],
+						"displayName": "Shopify Trigger",
+						"typeVersion": 1
+					},
+					{
+						"id": 325,
+						"icon": "file:x.svg",
+						"name": "n8n-nodes-base.twitter",
+						"defaults": {
+							"name": "X"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"
+						},
+						"categories": [
+							{
+								"id": 1,
+								"name": "Marketing & Content"
+							}
+						],
+						"displayName": "X (Formerly Twitter)",
+						"typeVersion": 2
+					}
+				],
+				"categories": [
+					{
+						"id": 2,
+						"name": "Sales"
+					},
+					{
+						"id": 19,
+						"name": "Marketing & Growth"
+					}
+				],
+				"image": [
+					{
+						"id": 527,
+						"url": "https://n8niostorageaccount.blob.core.windows.net/n8nio-strapi-blobs-prod/assets/89a078b208fe4c6181902608b1cd1332.png"
+					}
+				]
+			},
+			{
+				"id": 1456,
+				"name": "Add new customers from WooCommerce to Mautic",
+				"views": 333,
+				"recentViews": 9833,
+				"totalViews": 333,
+				"createdAt": "2022-02-17T15:00:40.748Z",
+				"description": "This workflow uses a WooCommerce trigger that will run when a new customer has been added, It will then add the customer to Mautic.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Mautic nodes.",
+				"workflow": {
+					"id": 83,
+					"name": "New WooCommerce Customer to Mautic",
+					"nodes": [
+						{
+							"name": "Check for Existing",
+							"type": "n8n-nodes-base.mautic",
+							"position": [
+								280,
+								480
+							],
+							"parameters": {
+								"options": {
+									"search": "={{$json[\"email\"]}}"
+								},
+								"operation": "getAll",
+								"authentication": "oAuth2"
+							},
+							"credentials": {
+								"mauticOAuth2Api": {
+									"id": "54",
+									"name": "Mautic account"
+								}
+							},
+							"typeVersion": 1,
+							"alwaysOutputData": true
+						},
+						{
+							"name": "If New",
+							"type": "n8n-nodes-base.if",
+							"position": [
+								460,
+								480
+							],
+							"parameters": {
+								"conditions": {
+									"string": [
+										{
+											"value1": "={{$json[\"id\"]}}",
+											"operation": "isEmpty"
+										}
+									]
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Create Contact",
+							"type": "n8n-nodes-base.mautic",
+							"position": [
+								680,
+								320
+							],
+							"parameters": {
+								"email": "={{$node[\"Customer Created\"].json[\"email\"]}}",
+								"company": "={{$node[\"Customer Created\"].json[\"billing\"][\"company\"]}}",
+								"options": {},
+								"lastName": "={{$node[\"Customer Created\"].json[\"last_name\"]}}",
+								"firstName": "={{$node[\"Customer Created\"].json[\"first_name\"]}}",
+								"authentication": "oAuth2",
+								"additionalFields": {}
+							},
+							"credentials": {
+								"mauticOAuth2Api": {
+									"id": "54",
+									"name": "Mautic account"
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Update Contact",
+							"type": "n8n-nodes-base.mautic",
+							"position": [
+								680,
+								580
+							],
+							"parameters": {
+								"options": {},
+								"contactId": "={{$json[\"id\"]}}",
+								"operation": "update",
+								"updateFields": {
+									"lastName": "={{$node[\"Customer Created or Updated\"].json[\"last_name\"]}}",
+									"firstName": "={{$node[\"Customer Created or Updated\"].json[\"first_name\"]}}"
+								},
+								"authentication": "oAuth2"
+							},
+							"credentials": {
+								"mauticOAuth2Api": {
+									"id": "54",
+									"name": "Mautic account"
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Customer Created or Updated",
+							"type": "n8n-nodes-base.wooCommerceTrigger",
+							"position": [
+								100,
+								480
+							],
+							"webhookId": "5d89e322-a5e0-4cce-9eab-185e8375175b",
+							"parameters": {
+								"event": "customer.updated"
+							},
+							"credentials": {
+								"wooCommerceApi": {
+									"id": "48",
+									"name": "WooCommerce account"
+								}
+							},
+							"typeVersion": 1
+						}
+					],
+					"active": false,
+					"settings": {
+						"saveManualExecutions": true,
+						"saveExecutionProgress": true,
+						"saveDataSuccessExecution": "all"
+					},
+					"connections": {
+						"If New": {
+							"main": [
+								[
+									{
+										"node": "Create Contact",
+										"type": "main",
+										"index": 0
+									}
+								],
+								[
+									{
+										"node": "Update Contact",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						},
+						"Check for Existing": {
+							"main": [
+								[
+									{
+										"node": "If New",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						},
+						"Customer Created or Updated": {
+							"main": [
+								[
+									{
+										"node": "Check for Existing",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						}
+					}
+				},
+				"workflowInfo": {
+					"nodeCount": 6,
+					"nodeTypes": {
+						"n8n-nodes-base.if": {
+							"count": 1
+						},
+						"n8n-nodes-base.mautic": {
+							"count": 3
+						},
+						"n8n-nodes-base.wooCommerceTrigger": {
+							"count": 1
+						}
+					}
+				},
+				"user": {
+					"username": "jon-n8n"
+				},
+				"nodes": [
+					{
+						"id": 20,
+						"icon": "fa:map-signs",
+						"name": "n8n-nodes-base.if",
+						"defaults": {
+							"name": "IF",
+							"color": "#408000"
+						},
+						"iconData": {
+							"icon": "map-signs",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "IF",
+						"typeVersion": 1
+					},
+					{
+						"id": 42,
+						"icon": "fa:play",
+						"name": "n8n-nodes-base.start",
+						"defaults": {
+							"name": "Start",
+							"color": "#00e000"
+						},
+						"iconData": {
+							"icon": "play",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "Start",
+						"typeVersion": 1
+					},
+					{
+						"id": 126,
+						"icon": "file:mautic.svg",
+						"name": "n8n-nodes-base.mautic",
+						"defaults": {
+							"name": "Mautic"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iMzQ5Ljc3OXB4IiBoZWlnaHQ9IjM0OS43NzlweCIgdmlld0JveD0iMCAwIDM0OS43NzkgMzQ5Ljc3OSIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgMzQ5Ljc3OSAzNDkuNzc5Ig0KCSB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0xNzQuODksMzQ5Ljc3OUM3OC42MTIsMzQ5Ljc3OSwwLDI3MS40NjIsMCwxNzQuODlTNzguNjEyLDAsMTc0Ljg5LDBjMjMuMjYsMCw0NS45MzEsNC40MTcsNjcuMTI5LDEzLjU0Mw0KCWM1Ljg4OSwyLjY1LDguODMzLDkuNDIyLDYuNDc4LDE1LjYwNWMtMi42NDksNS44ODgtOS40MjEsOC44MzMtMTUuNjA0LDYuNDc3Yy0xOC41NDktNy42NTUtMzcuOTgtMTEuNDgyLTU4LjAwMi0xMS40ODINCgljLTgzLjMyMywwLTE1MS4wNDEsNjcuNzE4LTE1MS4wNDEsMTUxLjA0MVM5MS41NjcsMzI2LjIyNSwxNzQuODksMzI2LjIyNWM4My4zMjMsMCwxNTEuMDQxLTY3LjcxOCwxNTEuMDQxLTE1MS4wNDENCgljMC0xNy45Ni0yLjk0NC0zNS4zMzItOS4xMjctNTEuODE5Yy0yLjM1NS02LjE4MywwLjg4My0xMi45NTUsNy4wNjYtMTUuMzFjNi4xODMtMi4zNTUsMTIuOTU0LDAuODgzLDE1LjMxLDcuMDY2DQoJYzcuMDY2LDE5LjEzOCwxMC42LDM5LjQ1MywxMC42LDYwLjA2M0MzNDkuNzc5LDI3MS4xNjcsMjcxLjQ2MiwzNDkuNzc5LDE3NC44OSwzNDkuNzc5Ii8+DQo8Zz4NCgk8cG9seWdvbiBmaWxsPSIjRkRCOTMzIiBwb2ludHM9IjI1MS40NCwxNTYuOTMgMjI0LjM1NCwxODUuMTk0IDIzOS4zNjksMjQ4LjQ5NiAyNzMuNTIyLDI0OC40OTYgCSIvPg0KPC9nPg0KPHBvbHlnb24gZmlsbD0iI0ZEQjkzMyIgcG9pbnRzPSIyNDAuMjUzLDczLjMxMiAyNDkuNjc0LDgyLjczNCAxNzQuODksMTYxLjkzNSAxMTAuOTk5LDk2LjI3NyA3NC4xOTYsMjQ4LjQ5NiAxMDguMzUsMjQ4LjQ5NiANCgkxMjguNjY1LDE2My45OTYgMTc0Ljg5LDIxNC4zNDMgMjczLjgxNywxMDYuNTgzIDI4My4yMzksMTE2LjI5OSAyOTIuNjYsNjMuMDA3ICIvPg0KPC9zdmc+DQo="
+						},
+						"categories": [
+							{
+								"id": 1,
+								"name": "Marketing & Content"
+							},
+							{
+								"id": 6,
+								"name": "Communication"
+							}
+						],
+						"displayName": "Mautic",
+						"typeVersion": 1
+					},
+					{
+						"id": 235,
+						"icon": "file:wooCommerce.svg",
+						"name": "n8n-nodes-base.wooCommerceTrigger",
+						"defaults": {
+							"name": "WooCommerce Trigger"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="
+						},
+						"categories": [
+							{
+								"id": 2,
+								"name": "Sales"
+							}
+						],
+						"displayName": "WooCommerce Trigger",
+						"typeVersion": 1
+					}
+				],
+				"categories": [
+					{
+						"id": 2,
+						"name": "Sales"
+					}
+				],
+				"image": []
+			},
+			{
+				"id": 1459,
+				"name": "Notify on Telegram and Twitter when new order is added in WooCommerce",
+				"views": 620,
+				"recentViews": 9823,
+				"totalViews": 620,
+				"createdAt": "2022-02-17T15:02:14.961Z",
+				"description": "This workflow uses a WooCommerce trigger that will run a new product has been added, It will then post the product to Telegram and Twitter.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce, Twitter and Telegram nodes.",
+				"workflow": {
+					"id": 85,
+					"name": "New WooCommerce Product to Twitter and Telegram",
+					"nodes": [
+						{
+							"name": "Twitter",
+							"type": "n8n-nodes-base.twitter",
+							"position": [
+								720,
+								300
+							],
+							"parameters": {
+								"text": "=✨ New Product Announcement ✨\nWe have just added {{$json[\"name\"]}}, Head to {{$json[\"permalink\"]}} to find out more.",
+								"additionalFields": {}
+							},
+							"credentials": {
+								"twitterOAuth1Api": {
+									"id": "37",
+									"name": "joffcom"
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Telegram",
+							"type": "n8n-nodes-base.telegram",
+							"position": [
+								720,
+								500
+							],
+							"parameters": {
+								"text": "=✨ New Product Announcement ✨\nWe have just added {{$json[\"name\"]}}, Head to {{$json[\"permalink\"]}} to find out more.",
+								"chatId": "123456",
+								"additionalFields": {}
+							},
+							"credentials": {
+								"telegramApi": {
+									"id": "56",
+									"name": "Telegram account"
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "WooCommerce Trigger",
+							"type": "n8n-nodes-base.wooCommerceTrigger",
+							"position": [
+								540,
+								400
+							],
+							"webhookId": "ab7b134b-9b2d-4e0d-b496-1aee30db0808",
+							"parameters": {
+								"event": "product.created"
+							},
+							"credentials": {
+								"wooCommerceApi": {
+									"id": "48",
+									"name": "WooCommerce account"
+								}
+							},
+							"typeVersion": 1
+						}
+					],
+					"active": false,
+					"settings": {},
+					"connections": {
+						"WooCommerce Trigger": {
+							"main": [
+								[
+									{
+										"node": "Twitter",
+										"type": "main",
+										"index": 0
+									},
+									{
+										"node": "Telegram",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						}
+					}
+				},
+				"workflowInfo": {
+					"nodeCount": 4,
+					"nodeTypes": {
+						"n8n-nodes-base.twitter": {
+							"count": 1
+						},
+						"n8n-nodes-base.telegram": {
+							"count": 1
+						},
+						"n8n-nodes-base.wooCommerceTrigger": {
+							"count": 1
+						}
+					}
+				},
+				"user": {
+					"username": "jon-n8n"
+				},
+				"nodes": [
+					{
+						"id": 42,
+						"icon": "fa:play",
+						"name": "n8n-nodes-base.start",
+						"defaults": {
+							"name": "Start",
+							"color": "#00e000"
+						},
+						"iconData": {
+							"icon": "play",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "Start",
+						"typeVersion": 1
+					},
+					{
+						"id": 49,
+						"icon": "file:telegram.svg",
+						"name": "n8n-nodes-base.telegram",
+						"defaults": {
+							"name": "Telegram"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgNjYgNjYiIGZpbGw9IiNmZmYiIGZpbGwtcnVsZT0iZXZlbm9kZCIgc3Ryb2tlPSIjMDAwIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiPjx1c2UgeGxpbms6aHJlZj0iI2EiIHg9Ii41IiB5PSIuNSIvPjxzeW1ib2wgaWQ9ImEiIG92ZXJmbG93PSJ2aXNpYmxlIj48ZyBzdHJva2U9Im5vbmUiIGZpbGwtcnVsZT0ibm9uemVybyI+PHBhdGggZD0iTTAgMzJjMCAxNy42NzMgMTQuMzI3IDMyIDMyIDMyczMyLTE0LjMyNyAzMi0zMlM0OS42NzMgMCAzMiAwIDAgMTQuMzI3IDAgMzIiIGZpbGw9IiMzN2FlZTIiLz48cGF0aCBkPSJNMjEuNjYxIDM0LjMzOGwzLjc5NyAxMC41MDhzLjQ3NS45ODMuOTgzLjk4MyA4LjA2OC03Ljg2NCA4LjA2OC03Ljg2NGw4LjQwNy0xNi4yMzctMjEuMTE5IDkuODk4eiIgZmlsbD0iI2M4ZGFlYSIvPjxwYXRoIGQ9Ik0yNi42OTUgMzcuMDM0bC0uNzI5IDcuNzQ2cy0uMzA1IDIuMzczIDIuMDY4IDBsNC42NDQtNC4yMDMiIGZpbGw9IiNhOWM2ZDgiLz48cGF0aCBkPSJNMjEuNzMgMzQuNzEybC03LjgwOS0yLjU0NXMtLjkzMi0uMzc4LS42MzMtMS4yMzdjLjA2Mi0uMTc3LjE4Ni0uMzI4LjU1OS0uNTg4IDEuNzMxLTEuMjA2IDMyLjAyOC0xMi4wOTYgMzIuMDI4LTEyLjA5NnMuODU2LS4yODggMS4zNjEtLjA5N2MuMjMxLjA4OC4zNzguMTg3LjUwMy41NDguMDQ1LjEzMi4wNzEuNDExLjA2OC42ODktLjAwMy4yMDEtLjAyNy4zODYtLjA0NS42NzgtLjE4NCAyLjk3OC01LjcwNiAyNS4xOTgtNS43MDYgMjUuMTk4cy0uMzMgMS4zLTEuNTE0IDEuMzQ1Yy0uNDMyLjAxNi0uOTU2LS4wNzEtMS41ODItLjYxLTIuMzIzLTEuOTk4LTEwLjM1Mi03LjM5NC0xMi4xMjYtOC41OGEuMzQuMzQgMCAwMS0uMTQ2LS4yMzljLS4wMjUtLjEyNS4xMDgtLjI4LjEwOC0uMjhzMTMuOTgtMTIuNDI3IDE0LjM1Mi0xMy43MzFjLjAyOS0uMTAxLS4wNzktLjE1MS0uMjI2LS4xMDctLjkyOS4zNDItMTcuMDI1IDEwLjUwNi0xOC44MDEgMTEuNjI5LS4xMDQuMDY2LS4zOTUuMDIzLS4zOTUuMDIzIi8+PC9nPjwvc3ltYm9sPjwvc3ZnPg=="
+						},
+						"categories": [
+							{
+								"id": 6,
+								"name": "Communication"
+							}
+						],
+						"displayName": "Telegram",
+						"typeVersion": 1
+					},
+					{
+						"id": 235,
+						"icon": "file:wooCommerce.svg",
+						"name": "n8n-nodes-base.wooCommerceTrigger",
+						"defaults": {
+							"name": "WooCommerce Trigger"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="
+						},
+						"categories": [
+							{
+								"id": 2,
+								"name": "Sales"
+							}
+						],
+						"displayName": "WooCommerce Trigger",
+						"typeVersion": 1
+					},
+					{
+						"id": 325,
+						"icon": "file:x.svg",
+						"name": "n8n-nodes-base.twitter",
+						"defaults": {
+							"name": "X"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgMjQgMjQiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PHBhdGggZD0iTTE4LjI0NCAyLjI1aDMuMzA4bC03LjIyNyA4LjI2IDguNTAyIDExLjI0SDE2LjE3bC01LjIxNC02LjgxN0w0Ljk5IDIxLjc1SDEuNjhsNy43My04LjgzNUwxLjI1NCAyLjI1SDguMDhsNC43MTMgNi4yMzF6bS0xLjE2MSAxNy41MmgxLjgzM0w3LjA4NCA0LjEyNkg1LjExN3oiPjwvcGF0aD48L3N2Zz4K"
+						},
+						"categories": [
+							{
+								"id": 1,
+								"name": "Marketing & Content"
+							}
+						],
+						"displayName": "X (Formerly Twitter)",
+						"typeVersion": 2
+					}
+				],
+				"categories": [
+					{
+						"id": 2,
+						"name": "Sales"
+					},
+					{
+						"id": 19,
+						"name": "Marketing & Growth"
+					}
+				],
+				"image": []
+			},
+			{
+				"id": 1457,
+				"name": "Notify on Slack when new order is registered in WooCommerce",
+				"views": 178,
+				"recentViews": 9787,
+				"totalViews": 178,
+				"createdAt": "2022-02-17T15:01:13.489Z",
+				"description": "This workflow uses a WooCommerce trigger that will run when an order has been placed.\n\nIf the value of this is over 100 it will post it to a Slack channel.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Slack nodes, You will also need to pick a channel to post the message to.",
+				"workflow": {
+					"id": 81,
+					"name": "New WooCommerce order to Slack",
+					"nodes": [
+						{
+							"name": "Order Created",
+							"type": "n8n-nodes-base.wooCommerceTrigger",
+							"position": [
+								340,
+								500
+							],
+							"webhookId": "287b4bf4-67ec-4c97-85d9-c0d3e6f59e6b",
+							"parameters": {
+								"event": "order.created"
+							},
+							"credentials": {
+								"wooCommerceApi": {
+									"id": "48",
+									"name": "WooCommerce account"
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Send to Slack",
+							"type": "n8n-nodes-base.slack",
+							"position": [
+								780,
+								480
+							],
+							"parameters": {
+								"text": ":sparkles: There is a new order :sparkles:",
+								"channel": "woo-commerce",
+								"blocksUi": {
+									"blocksValues": []
+								},
+								"attachments": [
+									{
+										"color": "#66FF00",
+										"fields": {
+											"item": [
+												{
+													"short": true,
+													"title": "Order ID",
+													"value": "={{$json[\"id\"]}}"
+												},
+												{
+													"short": true,
+													"title": "Status",
+													"value": "={{$json[\"status\"]}}"
+												},
+												{
+													"short": true,
+													"title": "Total",
+													"value": "={{$json[\"currency_symbol\"]}}{{$json[\"total\"]}}"
+												},
+												{
+													"short": false,
+													"title": "Link",
+													"value": "={{$node[\"Order Created\"].json[\"_links\"][\"self\"][0][\"href\"]}}"
+												}
+											]
+										},
+										"footer": "=*Ordered:* {{$json[\"date_created\"]}} | *Transaction ID:* {{$json[\"transaction_id\"]}}"
+									}
+								],
+								"otherOptions": {}
+							},
+							"credentials": {
+								"slackApi": {
+									"id": "53",
+									"name": "Slack Access Token"
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Price over 100",
+							"type": "n8n-nodes-base.if",
+							"position": [
+								540,
+								500
+							],
+							"parameters": {
+								"conditions": {
+									"number": [
+										{
+											"value1": "={{$json[\"total\"]}}",
+											"value2": 100,
+											"operation": "largerEqual"
+										}
+									]
+								}
+							},
+							"typeVersion": 1
+						}
+					],
+					"active": false,
+					"settings": {
+						"saveManualExecutions": true,
+						"saveExecutionProgress": true,
+						"saveDataSuccessExecution": "all"
+					},
+					"connections": {
+						"Order Created": {
+							"main": [
+								[
+									{
+										"node": "Price over 100",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						},
+						"Price over 100": {
+							"main": [
+								[
+									{
+										"node": "Send to Slack",
+										"type": "main",
+										"index": 0
+									}
+								],
+								[]
+							]
+						}
+					}
+				},
+				"workflowInfo": {
+					"nodeCount": 4,
+					"nodeTypes": {
+						"n8n-nodes-base.if": {
+							"count": 1
+						},
+						"n8n-nodes-base.slack": {
+							"count": 1
+						},
+						"n8n-nodes-base.wooCommerceTrigger": {
+							"count": 1
+						}
+					}
+				},
+				"user": {
+					"username": "jon-n8n"
+				},
+				"nodes": [
+					{
+						"id": 20,
+						"icon": "fa:map-signs",
+						"name": "n8n-nodes-base.if",
+						"defaults": {
+							"name": "IF",
+							"color": "#408000"
+						},
+						"iconData": {
+							"icon": "map-signs",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "IF",
+						"typeVersion": 1
+					},
+					{
+						"id": 40,
+						"icon": "file:slack.svg",
+						"name": "n8n-nodes-base.slack",
+						"defaults": {
+							"name": "Slack"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"
+						},
+						"categories": [
+							{
+								"id": 6,
+								"name": "Communication"
+							}
+						],
+						"displayName": "Slack",
+						"typeVersion": 2
+					},
+					{
+						"id": 42,
+						"icon": "fa:play",
+						"name": "n8n-nodes-base.start",
+						"defaults": {
+							"name": "Start",
+							"color": "#00e000"
+						},
+						"iconData": {
+							"icon": "play",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "Start",
+						"typeVersion": 1
+					},
+					{
+						"id": 235,
+						"icon": "file:wooCommerce.svg",
+						"name": "n8n-nodes-base.wooCommerceTrigger",
+						"defaults": {
+							"name": "WooCommerce Trigger"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="
+						},
+						"categories": [
+							{
+								"id": 2,
+								"name": "Sales"
+							}
+						],
+						"displayName": "WooCommerce Trigger",
+						"typeVersion": 1
+					}
+				],
+				"categories": [
+					{
+						"id": 2,
+						"name": "Sales"
+					}
+				],
+				"image": []
+			},
+			{
+				"id": 1765,
+				"name": "Get Slack notifications when new product published on WooCommerce",
+				"views": 79,
+				"recentViews": 9577,
+				"totalViews": 79,
+				"createdAt": "2022-08-12T12:36:53.409Z",
+				"description": "This workflow let's a bot in Slack notify a specific channel when a new product in WooCommerce is published and live on the site. \n\n## Prerequisites\n\n[WooCommerce](https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.woocommercetrigger/) account\n[Slack](https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.slack/) and a [Slack bot](https://slack.com/help/articles/115005265703-Create-a-bot-for-your-workspace)\n\n## How it works\n\n1. Listen for WooCommerce product creation\n2. If permalink starts with https://[your-url-here].com/product/\n3. Slack bot notifies channel that a new product has been added. \n\nPlease note, you must update the URL in the IF node to match your url. If your WooCommerce doesn't use the slug /product/, that will need to be updated too. \n",
+				"workflow": {
+					"id": 1016,
+					"name": "Woocommerce to slack: notify new product created",
+					"tags": [
+						{
+							"id": "5",
+							"name": "FVF",
+							"createdAt": "2022-07-30T07:43:44.795Z",
+							"updatedAt": "2022-07-30T07:43:44.795Z"
+						}
+					],
+					"nodes": [
+						{
+							"name": "If URL has /product/",
+							"type": "n8n-nodes-base.if",
+							"position": [
+								640,
+								300
+							],
+							"parameters": {
+								"conditions": {
+									"string": [
+										{
+											"value1": "={{$json[\"permalink\"]}}",
+											"value2": "https://[add-your-url-here]/product/",
+											"operation": "startsWith"
+										}
+									]
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Send message to slack",
+							"type": "n8n-nodes-base.slack",
+							"position": [
+								920,
+								260
+							],
+							"parameters": {
+								"text": ":new: A new product has been added! :new:",
+								"channel": "newproducts",
+								"blocksUi": {
+									"blocksValues": []
+								},
+								"attachments": [
+									{
+										"color": "#66FF00",
+										"fields": {
+											"item": [
+												{
+													"short": false,
+													"title": "Name",
+													"value": "={{$json[\"name\"]}}"
+												},
+												{
+													"short": true,
+													"title": "Price",
+													"value": "={{$json[\"regular_price\"]}}"
+												},
+												{
+													"short": true,
+													"title": "Sale Price",
+													"value": "={{$json[\"sale_price\"]}}"
+												},
+												{
+													"short": false,
+													"title": "Link",
+													"value": "={{$json[\"permalink\"]}}"
+												}
+											]
+										},
+										"footer": "=Added: {{$json[\"date_created\"]}}"
+									}
+								],
+								"otherOptions": {}
+							},
+							"credentials": {
+								"slackApi": {
+									"id": "21",
+									"name": "FVF bot"
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "On product creation",
+							"type": "n8n-nodes-base.wooCommerceTrigger",
+							"position": [
+								460,
+								300
+							],
+							"webhookId": "267c4855-6227-4d33-867e-74600097473e",
+							"parameters": {
+								"event": "product.created"
+							},
+							"credentials": {
+								"wooCommerceApi": {
+									"id": "20",
+									"name": "WooCommerce account FVF"
+								}
+							},
+							"typeVersion": 1
+						}
+					],
+					"active": true,
+					"settings": {},
+					"connections": {
+						"On product creation": {
+							"main": [
+								[
+									{
+										"node": "If URL has /product/",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						},
+						"If URL has /product/": {
+							"main": [
+								[
+									{
+										"node": "Send message to slack",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						}
+					}
+				},
+				"workflowInfo": {
+					"nodeCount": 4,
+					"nodeTypes": {
+						"n8n-nodes-base.if": {
+							"count": 1
+						},
+						"n8n-nodes-base.slack": {
+							"count": 1
+						},
+						"n8n-nodes-base.wooCommerceTrigger": {
+							"count": 1
+						}
+					}
+				},
+				"user": {
+					"username": "n8n-team"
+				},
+				"nodes": [
+					{
+						"id": 20,
+						"icon": "fa:map-signs",
+						"name": "n8n-nodes-base.if",
+						"defaults": {
+							"name": "IF",
+							"color": "#408000"
+						},
+						"iconData": {
+							"icon": "map-signs",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "IF",
+						"typeVersion": 1
+					},
+					{
+						"id": 40,
+						"icon": "file:slack.svg",
+						"name": "n8n-nodes-base.slack",
+						"defaults": {
+							"name": "Slack"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"
+						},
+						"categories": [
+							{
+								"id": 6,
+								"name": "Communication"
+							}
+						],
+						"displayName": "Slack",
+						"typeVersion": 2
+					},
+					{
+						"id": 42,
+						"icon": "fa:play",
+						"name": "n8n-nodes-base.start",
+						"defaults": {
+							"name": "Start",
+							"color": "#00e000"
+						},
+						"iconData": {
+							"icon": "play",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "Start",
+						"typeVersion": 1
+					},
+					{
+						"id": 235,
+						"icon": "file:wooCommerce.svg",
+						"name": "n8n-nodes-base.wooCommerceTrigger",
+						"defaults": {
+							"name": "WooCommerce Trigger"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="
+						},
+						"categories": [
+							{
+								"id": 2,
+								"name": "Sales"
+							}
+						],
+						"displayName": "WooCommerce Trigger",
+						"typeVersion": 1
+					}
+				],
+				"categories": [
+					{
+						"id": 2,
+						"name": "Sales"
+					}
+				],
+				"image": []
+			},
+			{
+				"id": 1460,
+				"name": "Notify on Slack when refund is registered in WooCommerce",
+				"views": 85,
+				"recentViews": 9541,
+				"totalViews": 85,
+				"createdAt": "2022-02-17T15:02:58.662Z",
+				"description": "This workflow uses a WooCommerce trigger that will run when an order has been updated and the status is refunded.\n\nIf the value of this is over 100 it will post it to a Slack channel.\n\nTo use this workflow you will need to set the credentials to use for the WooCommerce and Slack nodes, You will also need to pick a channel to post the message to.",
+				"workflow": {
+					"id": 82,
+					"name": "New WooCommerce refund to Slack",
+					"nodes": [
+						{
+							"name": "Order Updated",
+							"type": "n8n-nodes-base.wooCommerceTrigger",
+							"position": [
+								320,
+								500
+							],
+							"webhookId": "f7736be3-e978-4a17-b936-7ce9f8ccdb72",
+							"parameters": {
+								"event": "order.updated"
+							},
+							"credentials": {
+								"wooCommerceApi": {
+									"id": "48",
+									"name": "WooCommerce account"
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "If Refund and Over 100",
+							"type": "n8n-nodes-base.if",
+							"position": [
+								540,
+								500
+							],
+							"parameters": {
+								"conditions": {
+									"number": [
+										{
+											"value1": "={{$json[\"total\"]}}",
+											"value2": 100,
+											"operation": "largerEqual"
+										}
+									],
+									"string": [
+										{
+											"value1": "={{$json[\"status\"]}}",
+											"value2": "refunded"
+										}
+									]
+								}
+							},
+							"typeVersion": 1
+						},
+						{
+							"name": "Send to Slack",
+							"type": "n8n-nodes-base.slack",
+							"position": [
+								780,
+								480
+							],
+							"parameters": {
+								"text": ":x: A refund has been issued :x:",
+								"channel": "woo-commerce",
+								"blocksUi": {
+									"blocksValues": []
+								},
+								"attachments": [
+									{
+										"color": "#FF0000",
+										"fields": {
+											"item": [
+												{
+													"short": true,
+													"title": "Order ID",
+													"value": "={{$json[\"id\"]}}"
+												},
+												{
+													"short": true,
+													"title": "Status",
+													"value": "={{$json[\"status\"]}}"
+												},
+												{
+													"short": true,
+													"title": "Total",
+													"value": "={{$json[\"currency_symbol\"]}}{{$json[\"total\"]}}"
+												}
+											]
+										},
+										"footer": "=*Order updated:* {{$json[\"date_modified\"]}}"
+									}
+								],
+								"otherOptions": {}
+							},
+							"credentials": {
+								"slackApi": {
+									"id": "53",
+									"name": "Slack Access Token"
+								}
+							},
+							"typeVersion": 1
+						}
+					],
+					"active": false,
+					"settings": {
+						"saveManualExecutions": true,
+						"saveExecutionProgress": true,
+						"saveDataSuccessExecution": "all"
+					},
+					"connections": {
+						"Order Updated": {
+							"main": [
+								[
+									{
+										"node": "If Refund and Over 100",
+										"type": "main",
+										"index": 0
+									}
+								]
+							]
+						},
+						"If Refund and Over 100": {
+							"main": [
+								[
+									{
+										"node": "Send to Slack",
+										"type": "main",
+										"index": 0
+									}
+								],
+								[]
+							]
+						}
+					}
+				},
+				"workflowInfo": {
+					"nodeCount": 4,
+					"nodeTypes": {
+						"n8n-nodes-base.if": {
+							"count": 1
+						},
+						"n8n-nodes-base.slack": {
+							"count": 1
+						},
+						"n8n-nodes-base.wooCommerceTrigger": {
+							"count": 1
+						}
+					}
+				},
+				"user": {
+					"username": "jon-n8n"
+				},
+				"nodes": [
+					{
+						"id": 20,
+						"icon": "fa:map-signs",
+						"name": "n8n-nodes-base.if",
+						"defaults": {
+							"name": "IF",
+							"color": "#408000"
+						},
+						"iconData": {
+							"icon": "map-signs",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "IF",
+						"typeVersion": 1
+					},
+					{
+						"id": 40,
+						"icon": "file:slack.svg",
+						"name": "n8n-nodes-base.slack",
+						"defaults": {
+							"name": "Slack"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMTUwLjg1MiAxNTAuODUyIiBmaWxsPSIjZmZmIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzAwMCIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIj48dXNlIHhsaW5rOmhyZWY9IiNhIiB4PSIuOTI2IiB5PSIuOTI2Ii8+PHN5bWJvbCBpZD0iYSIgb3ZlcmZsb3c9InZpc2libGUiPjxnIHN0cm9rZS13aWR0aD0iMS44NTIiPjxwYXRoIGQ9Ik00MC43NDEgOTMuNTVjMC04LjczNSA2LjYwNy0xNS43NzIgMTQuODE1LTE1Ljc3MnMxNC44MTUgNy4wMzcgMTQuODE1IDE1Ljc3MnYzOC44MjRjMCA4LjczNy02LjYwNyAxNS43NzQtMTQuODE1IDE1Ljc3NHMtMTQuODE1LTcuMDM3LTE0LjgxNS0xNS43NzJ6IiBmaWxsPSIjZTAxZTVhIiBzdHJva2U9IiNlMDFlNWEiLz48cGF0aCBkPSJNOTMuNTUgMTA3LjQwOGMtOC43MzUgMC0xNS43NzItNi42MDctMTUuNzcyLTE0LjgxNXM3LjAzNy0xNC44MTUgMTUuNzcyLTE0LjgxNWgzOC44MjZjOC43MzUgMCAxNS43NzIgNi42MDcgMTUuNzcyIDE0LjgxNXMtNy4wMzcgMTQuODE1LTE1Ljc3MiAxNC44MTV6IiBmaWxsPSIjZWNiMjJkIiBzdHJva2U9IiNlY2IyMmQiLz48cGF0aCBkPSJNNzcuNzc4IDE1Ljc3MkM3Ny43NzggNy4wMzcgODQuMzg1IDAgOTIuNTkzIDBzMTQuODE1IDcuMDM3IDE0LjgxNSAxNS43NzJ2MzguODI2YzAgOC43MzUtNi42MDcgMTUuNzcyLTE0LjgxNSAxNS43NzJzLTE0LjgxNS03LjAzNy0xNC44MTUtMTUuNzcyeiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE1Ljc3MiA3MC4zNzFDNy4wMzcgNzAuMzcxIDAgNjMuNzYzIDAgNTUuNTU2czcuMDM3LTE0LjgxNSAxNS43NzItMTQuODE1aDM4LjgyNmM4LjczNSAwIDE1Ljc3MiA2LjYwNyAxNS43NzIgMTQuODE1cy03LjAzNyAxNC44MTUtMTUuNzcyIDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjxnIHN0cm9rZS1saW5lam9pbj0ibWl0ZXIiPjxwYXRoIGQ9Ik03Ny43NzggMTMzLjMzM2MwIDguMjA4IDYuNjA3IDE0LjgxNSAxNC44MTUgMTQuODE1czE0LjgxNS02LjYwNyAxNC44MTUtMTQuODE1LTYuNjA3LTE0LjgxNS0xNC44MTUtMTQuODE1SDc3Ljc3OHoiIGZpbGw9IiNlY2IyMmQiIHN0cm9rZT0iI2VjYjIyZCIvPjxwYXRoIGQ9Ik0xMzMuMzM0IDcwLjM3MWgtMTQuODE1VjU1LjU1NmMwLTguMjA3IDYuNjA3LTE0LjgxNSAxNC44MTUtMTQuODE1czE0LjgxNSA2LjYwNyAxNC44MTUgMTQuODE1LTYuNjA3IDE0LjgxNS0xNC44MTUgMTQuODE1eiIgZmlsbD0iIzJmYjY3YyIgc3Ryb2tlPSIjMmZiNjdjIi8+PHBhdGggZD0iTTE0LjgxNSA3Ny43NzhIMjkuNjN2MTQuODE1YzAgOC4yMDctNi42MDcgMTQuODE1LTE0LjgxNSAxNC44MTVTMCAxMDAuOCAwIDkyLjU5M3M2LjYwNy0xNC44MTUgMTQuODE1LTE0LjgxNXoiIGZpbGw9IiNlMDFlNWEiIHN0cm9rZT0iI2UwMWU1YSIvPjxwYXRoIGQ9Ik03MC4zNzEgMTQuODE1VjI5LjYzSDU1LjU1NmMtOC4yMDcgMC0xNC44MTUtNi42MDctMTQuODE1LTE0LjgxNVM0Ny4zNDggMCA1NS41NTYgMHMxNC44MTUgNi42MDcgMTQuODE1IDE0LjgxNXoiIGZpbGw9IiMzNmM1ZjEiIHN0cm9rZT0iIzM2YzVmMSIvPjwvZz48L2c+PC9zeW1ib2w+PC9zdmc+"
+						},
+						"categories": [
+							{
+								"id": 6,
+								"name": "Communication"
+							}
+						],
+						"displayName": "Slack",
+						"typeVersion": 2
+					},
+					{
+						"id": 42,
+						"icon": "fa:play",
+						"name": "n8n-nodes-base.start",
+						"defaults": {
+							"name": "Start",
+							"color": "#00e000"
+						},
+						"iconData": {
+							"icon": "play",
+							"type": "icon"
+						},
+						"categories": [
+							{
+								"id": 9,
+								"name": "Core Nodes"
+							}
+						],
+						"displayName": "Start",
+						"typeVersion": 1
+					},
+					{
+						"id": 235,
+						"icon": "file:wooCommerce.svg",
+						"name": "n8n-nodes-base.wooCommerceTrigger",
+						"defaults": {
+							"name": "WooCommerce Trigger"
+						},
+						"iconData": {
+							"type": "file",
+							"fileBuffer": "data:image/svg+xml;base64,PHN2ZyBwcmVzZXJ2ZUFzcGVjdFJhdGlvPSJ4TWlkWU1pZCIgdmVyc2lvbj0iMS4xIiB2aWV3Qm94PSIwIC01MCAyNTYgMjUzIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOmRjPSJodHRwOi8vcHVybC5vcmcvZGMvZWxlbWVudHMvMS4xLyIgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KPHRpdGxlPldvb0NvbW1lcmNlIExvZ288L3RpdGxlPgo8bWV0YWRhdGE+CjxyZGY6UkRGPgo8Y2M6V29yayByZGY6YWJvdXQ9IiI+CjxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0Pgo8ZGM6dHlwZSByZGY6cmVzb3VyY2U9Imh0dHA6Ly9wdXJsLm9yZy9kYy9kY21pdHlwZS9TdGlsbEltYWdlIi8+CjxkYzp0aXRsZS8+CjwvY2M6V29yaz4KPC9yZGY6UkRGPgo8L21ldGFkYXRhPgo8cGF0aCBkPSJtMjMuNzU5IDBoMjA4LjM4YzEzLjE4NyAwIDIzLjg2MyAxMC42NzUgMjMuODYzIDIzLjg2M3Y3OS41NDJjMCAxMy4xODctMTAuNjc1IDIzLjg2My0yMy44NjMgMjMuODYzaC03NC43MjdsMTAuMjU3IDI1LjExOC00NS4xMDktMjUuMTE4aC05OC42OTVjLTEzLjE4NyAwLTIzLjg2My0xMC42NzUtMjMuODYzLTIzLjg2M3YtNzkuNTQyYy0wLjEwNDY2LTEzLjA4MyAxMC41NzEtMjMuODYzIDIzLjc1OC0yMy44NjN6IiBmaWxsPSIjN2Y1NGIzIi8+CjxwYXRoIGQ9Im0xNC41NzggMjEuNzVjMS40NTY5LTEuOTc3MiAzLjY0MjMtMy4wMTc5IDYuNTU2MS0zLjIyNiA1LjMwNzMtMC40MTYyNiA4LjMyNTIgMi4wODEzIDkuMDUzNyA3LjQ5MjcgMy4yMjYgMjEuNzUgNi43NjQyIDQwLjE2OSAxMC41MTEgNTUuMjU5bDIyLjc5LTQzLjM5NWMyLjA4MTMtMy45NTQ1IDQuNjgyOS02LjAzNTggNy44MDQ5LTYuMjQzOSA0LjU3ODktMC4zMTIyIDcuMzg4NiAyLjYwMTYgOC41MzMzIDguNzQxNSAyLjYwMTYgMTMuODQxIDUuOTMxNyAyNS42IDkuODg2MiAzNS41OSAyLjcwNTctMjYuNDMzIDcuMjg0Ni00NS40NzYgMTMuNzM3LTU3LjIzNiAxLjU2MS0yLjkxMzggMy44NTA0LTQuMzcwNyA2Ljg2ODMtNC41Nzg5IDIuMzkzNS0wLjIwODEzIDQuNTc4OSAwLjUyMDMzIDYuNTU2MSAyLjA4MTMgMS45NzcyIDEuNTYxIDMuMDE3OSAzLjUzODIgMy4yMjYgNS45MzE3IDAuMTA0MDYgMS44NzMyLTAuMjA4MTMgMy40MzQxLTEuMDQwNyA0Ljk5NTEtNC4wNTg1IDcuNDkyNy03LjM4ODYgMjAuMDg1LTEwLjA5NCAzNy41NjctMi42MDE2IDE2Ljk2My0zLjUzODIgMzAuMTc5LTIuOTEzOCAzOS42NDkgMC4yMDgxMyAyLjYwMTYtMC4yMDgxMyA0Ljg5MTEtMS4yNDg4IDYuODY4My0xLjI0ODggMi4yODk0LTMuMTIyIDMuNTM4Mi01LjUxNTQgMy43NDYzLTIuNzA1NyAwLjIwODEzLTUuNTE1NC0xLjA0MDYtOC4yMjExLTMuODUwNC05LjY3OC05Ljg4NjItMTcuMzc5LTI0LjY2My0yMi45OTgtNDQuMzMyLTYuNzY0MiAxMy4zMi0xMS43NTkgMjMuMzExLTE0Ljk4NSAyOS45NzEtNi4xMzk4IDExLjc1OS0xMS4zNDMgMTcuNzk1LTE1LjcxNCAxOC4xMDctMi44MDk4IDAuMjA4MTMtNS4yMDMzLTIuMTg1NC03LjI4NDYtNy4xODA1LTUuMzA3My0xMy42MzMtMTEuMDMxLTM5Ljk2MS0xNy4xNzEtNzguOTg1LTAuNDE2MjYtMi43MDU3IDAuMjA4MTMtNS4wOTkyIDEuNjY1LTYuOTcyNHptMjIzLjY0IDE2LjMzOGMtMy43NDYzLTYuNTU2MS05LjI2MTgtMTAuNTExLTE2LjY1LTEyLjA3Mi0xLjk3NzItMC40MTYyNi0zLjg1MDQtMC42MjQzOS01LjYxOTUtMC42MjQzOS05Ljk5MDIgMC0xOC4xMDcgNS4yMDMzLTI0LjQ1NSAxNS42MS01LjQxMTQgOC44NDU1LTguMTE3MSAxOC42MjgtOC4xMTcxIDI5LjM0NiAwIDguMDEzIDEuNjY1IDE0Ljg4MSA0Ljk5NTEgMjAuNjA1IDMuNzQ2MyA2LjU1NjEgOS4yNjE4IDEwLjUxMSAxNi42NSAxMi4wNzIgMS45NzcyIDAuNDE2MjYgMy44NTA0IDAuNjI0MzkgNS42MTk1IDAuNjI0MzkgMTAuMDk0IDAgMTguMjExLTUuMjAzMyAyNC40NTUtMTUuNjEgNS40MTE0LTguOTQ5NiA4LjExNzEtMTguNzMyIDguMTE3MS0yOS40NSAwLjEwNDA2LTguMTE3MS0xLjY2NS0xNC44ODEtNC45OTUxLTIwLjUwMXptLTEzLjExMiAyOC44MjZjLTEuNDU2OSA2Ljg2ODMtNC4wNTg1IDExLjk2Ny03LjkwODkgMTUuNDAyLTMuMDE3OSAyLjcwNTctNS44Mjc2IDMuODUwNC04LjQyOTMgMy4zMzAxLTIuNDk3Ni0wLjUyMDMzLTQuNTc4OS0yLjcwNTctNi4xMzk4LTYuNzY0Mi0xLjI0ODgtMy4yMjYtMS44NzMyLTYuNDUyLTEuODczMi05LjQ2OTkgMC0yLjYwMTYgMC4yMDgxMy01LjIwMzMgMC43Mjg0Ni03LjU5NjcgMC45MzY1OS00LjI2NjcgMi43MDU3LTguNDI5MyA1LjUxNTQtMTIuMzg0IDMuNDM0MS01LjA5OTIgNy4wNzY0LTcuMTgwNSAxMC44MjMtNi40NTIgMi40OTc2IDAuNTIwMzMgNC41Nzg5IDIuNzA1NyA2LjEzOTggNi43NjQyIDEuMjQ4OCAzLjIyNiAxLjg3MzIgNi40NTIgMS44NzMyIDkuNDY5OSAwIDIuNzA1Ny0wLjIwODEzIDUuMzA3My0wLjcyODQ2IDcuNzAwOHptLTUyLjAzMy0yOC44MjZjLTMuNzQ2My02LjU1NjEtOS4zNjU5LTEwLjUxMS0xNi42NS0xMi4wNzItMS45NzcyLTAuNDE2MjYtMy44NTA0LTAuNjI0MzktNS42MTk1LTAuNjI0MzktOS45OTAyIDAtMTguMTA3IDUuMjAzMy0yNC40NTUgMTUuNjEtNS40MTE0IDguODQ1NS04LjExNzEgMTguNjI4LTguMTE3MSAyOS4zNDYgMCA4LjAxMyAxLjY2NSAxNC44ODEgNC45OTUxIDIwLjYwNSAzLjc0NjMgNi41NTYxIDkuMjYxOCAxMC41MTEgMTYuNjUgMTIuMDcyIDEuOTc3MiAwLjQxNjI2IDMuODUwNCAwLjYyNDM5IDUuNjE5NSAwLjYyNDM5IDEwLjA5NCAwIDE4LjIxMS01LjIwMzMgMjQuNDU1LTE1LjYxIDUuNDExNC04Ljk0OTYgOC4xMTcxLTE4LjczMiA4LjExNzEtMjkuNDUgMC04LjExNzEtMS42NjUtMTQuODgxLTQuOTk1MS0yMC41MDF6bS0xMy4yMTYgMjguODI2Yy0xLjQ1NjkgNi44NjgzLTQuMDU4NSAxMS45NjctNy45MDg5IDE1LjQwMi0zLjAxNzkgMi43MDU3LTUuODI3NiAzLjg1MDQtOC40MjkzIDMuMzMwMS0yLjQ5NzYtMC41MjAzMy00LjU3ODktMi43MDU3LTYuMTM5OC02Ljc2NDItMS4yNDg4LTMuMjI2LTEuODczMi02LjQ1Mi0xLjg3MzItOS40Njk5IDAtMi42MDE2IDAuMjA4MTMtNS4yMDMzIDAuNzI4NDYtNy41OTY3IDAuOTM2NTgtNC4yNjY3IDIuNzA1Ny04LjQyOTMgNS41MTU0LTEyLjM4NCAzLjQzNDEtNS4wOTkyIDcuMDc2NC03LjE4MDUgMTAuODIzLTYuNDUyIDIuNDk3NiAwLjUyMDMzIDQuNTc4OSAyLjcwNTcgNi4xMzk4IDYuNzY0MiAxLjI0ODggMy4yMjYgMS44NzMyIDYuNDUyIDEuODczMiA5LjQ2OTkgMC4xMDQwNiAyLjcwNTctMC4yMDgxMyA1LjMwNzMtMC43Mjg0NiA3LjcwMDh6IiBmaWxsPSIjZmZmIi8+Cjwvc3ZnPgo="
+						},
+						"categories": [
+							{
+								"id": 2,
+								"name": "Sales"
+							}
+						],
+						"displayName": "WooCommerce Trigger",
+						"typeVersion": 1
+					}
+				],
+				"categories": [
+					{
+						"id": 2,
+						"name": "Sales"
+					},
+					{
+						"id": 8,
+						"name": "Finance & Accounting"
+					}
+				],
+				"image": []
+			}
+		],
+		"image": []
+	}
+}
diff --git a/cypress/fixtures/In_memory_vector_store_fake_embeddings.json b/cypress/fixtures/In_memory_vector_store_fake_embeddings.json
new file mode 100644
index 0000000000..1f804bedb3
--- /dev/null
+++ b/cypress/fixtures/In_memory_vector_store_fake_embeddings.json
@@ -0,0 +1,347 @@
+{
+  "name": "fake_embeddings",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "de3c1210-3be7-49a6-86ef-9435e661f23f",
+      "name": "When clicking ‘Test workflow’",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        480,
+        760
+      ]
+    },
+    {
+      "parameters": {
+        "jsonMode": "expressionData",
+        "jsonData": "={{ $('Code').item.json.city }}",
+        "options": {}
+      },
+      "id": "de3cb132-14ef-426b-ad33-8365a93dd11f",
+      "name": "Default Data Loader",
+      "type": "@n8n/n8n-nodes-langchain.documentDefaultDataLoader",
+      "typeVersion": 1,
+      "position": [
+        1100,
+        900
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "const kyiv = `Kyiv (also Kiev)[a] is the capital and most populous city of Ukraine. It is in north-central Ukraine along the Dnieper River. As of 1 January 2022, its population was 2,952,301,[2] making Kyiv the seventh-most populous city in Europe.[11] Kyiv is an important industrial, scientific, educational, and cultural center in Eastern Europe. It is home to many high-tech industries, higher education institutions, and historical landmarks. The city has an extensive system of public transport and infrastructure, including the Kyiv Metro.\n\nThe city's name is said to derive from the name of Kyi, one of its four legendary founders. During its history, Kyiv, one of the oldest cities in Eastern Europe, passed through several stages of prominence and obscurity. The city probably existed as a commercial center as early as the 5th century. A Slavic settlement on the great trade route between Scandinavia and Constantinople, Kyiv was a tributary of the Khazars,[12] until its capture by the Varangians (Vikings) in the mid-9th century. Under Varangian rule, the city became a capital of Kievan Rus', the first East Slavic state. Completely destroyed during the Mongol invasions in 1240, the city lost most of its influence for the centuries to come. Coming under Lithuania, then Poland and then Russia, the city would grow from a frontier market into an important centre of Orthodox learning in the sixteenth century, and later of industry, commerce, and administration by the nineteenth.[1]\n\nThe city prospered again during the Russian Empire's Industrial Revolution in the late 19th century. In 1918, when the Ukrainian People's Republic declared independence from the Russian Republic after the October Revolution there, Kyiv became its capital. From the end of the Ukrainian-Soviet and Polish-Soviet wars in 1921, Kyiv was a city of the Ukrainian SSR, and made its capital in 1934. The city suffered significant destruction during World War II but quickly recovered in the postwar years, remaining the Soviet Union's third-largest city.\n\nFollowing the collapse of the Soviet Union and Ukrainian independence in 1991, Kyiv remained Ukraine's capital and experienced a steady influx of ethnic Ukrainian migrants from other regions of the country.[13] During the country's transformation to a market economy and electoral democracy, Kyiv has continued to be Ukraine's largest and wealthiest city. Its armament-dependent industrial output fell after the Soviet collapse, adversely affecting science and technology, but new sectors of the economy such as services and finance facilitated Kyiv's growth in salaries and investment, as well as providing continuous funding for the development of housing and urban infrastructure. Kyiv emerged as the most pro-Western region of Ukraine; parties advocating tighter integration with the European Union dominate during elections.`\n\nconst berlin = `Berlin[a] is the capital and largest city of Germany, both by area and by population.[11] Its more than 3.85 million inhabitants[12] make it the European Union's most populous city, as measured by population within city limits.[13] The city is also one of the states of Germany, and is the third smallest state in the country in terms of area. Berlin is surrounded by the state of Brandenburg, and Brandenburg's capital Potsdam is nearby. The urban area of Berlin has a population of over 4.5 million and is therefore the most populous urban area in Germany.[5][14] The Berlin-Brandenburg capital region has around 6.2 million inhabitants and is Germany's second-largest metropolitan region after the Rhine-Ruhr region, and the sixth-biggest metropolitan region by GDP in the European Union.[15]\n\nBerlin was built along the banks of the Spree river, which flows into the Havel in the western borough of Spandau. The city incorporates lakes in the western and southeastern boroughs, the largest of which is Müggelsee. About one-third of the city's area is composed of forests, parks and gardens, rivers, canals, and lakes.[16]\n\nFirst documented in the 13th century[10] and at the crossing of two important historic trade routes,[17] Berlin was designated the capital of the Margraviate of Brandenburg (1417–1701), Kingdom of Prussia (1701–1918), German Empire (1871–1918), Weimar Republic (1919–1933), and Nazi Germany (1933–1945). Berlin has served as a scientific, artistic, and philosophical hub during the Age of Enlightenment, Neoclassicism, and the German revolutions of 1848–1849. During the Gründerzeit, an industrialization-induced economic boom triggered a rapid population increase in Berlin. 1920s Berlin was the third-largest city in the world by population.[18]\n\nAfter World War II and following Berlin's occupation, the city was split into West Berlin and East Berlin, divided by the Berlin Wall.[19] East Berlin was declared the capital of East Germany, while Bonn became the West German capital. Following German reunification in 1990, Berlin once again became the capital of all of Germany. Due to its geographic location and history, Berlin has been called \"the heart of Europe\".[20][21][22]`\n\nconst prague = `Prague (/ˈprɑːɡ/ PRAHG; Czech: Praha [ˈpraɦa] ⓘ)[a] is the capital and largest city of the Czech Republic[9] and the historical capital of Bohemia. Situated on the Vltava river, Prague is home to about 1.4 million people.\n\nPrague is a political, cultural, and economic hub of Central Europe, with a rich history and Romanesque, Gothic, Renaissance and Baroque architectures. It was the capital of the Kingdom of Bohemia and residence of several Holy Roman Emperors, most notably Charles IV (r. 1346–1378) and Rudolf II (r. 1575–1611).[9] It was an important city to the Habsburg monarchy and Austria-Hungary. The city played major roles in the Bohemian and the Protestant Reformations, the Thirty Years' War and in 20th-century history as the capital of Czechoslovakia between the World Wars and the post-war Communist era.[10]\n\nPrague is home to a number of cultural attractions including Prague Castle, Charles Bridge, Old Town Square with the Prague astronomical clock, the Jewish Quarter, Petřín hill and Vyšehrad. Since 1992, the historic center of Prague has been included in the UNESCO list of World Heritage Sites.\n\nThe city has more than ten major museums, along with numerous theatres, galleries, cinemas, and other historical exhibits. An extensive modern public transportation system connects the city. It is home to a wide range of public and private schools, including Charles University in Prague, the oldest university in Central Europe.\n\nPrague is classified as an \"Alpha-\" global city according to GaWC studies.[11] In 2019, the city was ranked as 69th most livable city in the world by Mercer.[12] In the same year, the PICSA Index ranked the city as 13th most livable city in the world.[13] Its rich history makes it a popular tourist destination and as of 2017, the city receives more than 8.5 million international visitors annually. In 2017, Prague was listed as the fifth most visited European city after London, Paris, Rome, and Istanbul.[14]`\n\nreturn [prague, berlin, kyiv].map(i => ({ city: i}))"
+      },
+      "id": "ce9d517e-2dd9-45e4-a566-79bd79cd809b",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        740,
+        760
+      ]
+    },
+    {
+      "parameters": {
+        "chunkSize": 300
+      },
+      "id": "ebe5f3a5-4d90-4a33-bf48-f160f0e83967",
+      "name": "Character Text Splitter",
+      "type": "@n8n/n8n-nodes-langchain.textSplitterCharacterTextSplitter",
+      "typeVersion": 1,
+      "position": [
+        1100,
+        1060
+      ]
+    },
+    {
+      "parameters": {
+        "code": {
+          "supplyData": {
+            "code": "const { FakeEmbeddings } = require('@langchain/core/utils/testing');\n\nreturn new FakeEmbeddings();"
+          }
+        },
+        "outputs": {
+          "output": [
+            {
+              "type": "ai_embedding"
+            }
+          ]
+        }
+      },
+      "id": "0eac6c5b-89a9-48a4-bd21-19f2b20c3424",
+      "name": "Fake Embeddings 3",
+      "type": "@n8n/n8n-nodes-langchain.code",
+      "typeVersion": 1,
+      "position": [
+        660,
+        1220
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "load",
+        "prompt": "Tester",
+        "topK": 3
+      },
+      "id": "8c9b39bf-59d6-4769-98e1-54988d9d6b53",
+      "name": "Get All VS",
+      "type": "@n8n/n8n-nodes-langchain.vectorStoreInMemory",
+      "typeVersion": 1,
+      "position": [
+        680,
+        1080
+      ]
+    },
+    {
+      "parameters": {
+        "code": {
+          "supplyData": {
+            "code": "const { FakeEmbeddings } = require('@langchain/core/utils/testing');\n\nreturn new FakeEmbeddings();"
+          }
+        },
+        "outputs": {
+          "output": [
+            {
+              "type": "ai_embedding"
+            }
+          ]
+        }
+      },
+      "id": "e46004ec-baf6-425c-9897-3faec9e29676",
+      "name": "Fake Embeddings",
+      "type": "@n8n/n8n-nodes-langchain.code",
+      "typeVersion": 1,
+      "position": [
+        920,
+        900
+      ]
+    },
+    {
+      "parameters": {
+        "promptType": "define",
+        "text": "Just testing",
+        "options": {}
+      },
+      "id": "b132b323-a813-469c-859b-f1b3ede743a3",
+      "name": "Question and Answer Chain",
+      "type": "@n8n/n8n-nodes-langchain.chainRetrievalQa",
+      "typeVersion": 1.3,
+      "position": [
+        1680,
+        780
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "b9c412e5-d739-4c82-9a2e-6c0af0cae8f9",
+      "name": "Vector Store Retriever",
+      "type": "@n8n/n8n-nodes-langchain.retrieverVectorStore",
+      "typeVersion": 1,
+      "position": [
+        1760,
+        920
+      ]
+    },
+    {
+      "parameters": {
+        "code": {
+          "supplyData": {
+            "code": "const { FakeChatModel } = require('@langchain/core/utils/testing');\n\nreturn new FakeChatModel({});"
+          }
+        },
+        "outputs": {
+          "output": [
+            {
+              "type": "ai_languageModel"
+            }
+          ]
+        }
+      },
+      "id": "962b4b87-ffd6-4ab8-8776-6e9c0920930a",
+      "name": "Fake Language Model",
+      "type": "@n8n/n8n-nodes-langchain.code",
+      "typeVersion": 1,
+      "position": [
+        1620,
+        920
+      ]
+    },
+    {
+      "parameters": {
+        "code": {
+          "supplyData": {
+            "code": "const { FakeEmbeddings } = require('@langchain/core/utils/testing');\n\nreturn new FakeEmbeddings();"
+          }
+        },
+        "outputs": {
+          "output": [
+            {
+              "type": "ai_embedding"
+            }
+          ]
+        }
+      },
+      "id": "c78be34f-6459-4414-86bd-f2670ece129d",
+      "name": "Fake Embeddings 2",
+      "type": "@n8n/n8n-nodes-langchain.code",
+      "typeVersion": 1,
+      "position": [
+        1700,
+        1200
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "3cee9727-6b97-477c-8277-e8883a98786d",
+      "name": "Retriever VS",
+      "type": "@n8n/n8n-nodes-langchain.vectorStoreInMemory",
+      "typeVersion": 1,
+      "position": [
+        1700,
+        1060
+      ]
+    },
+    {
+      "parameters": {
+        "mode": "insert"
+      },
+      "id": "5793ec6b-ac00-4a5d-a79c-ff557143e46b",
+      "name": "Populate VS",
+      "type": "@n8n/n8n-nodes-langchain.vectorStoreInMemory",
+      "typeVersion": 1,
+      "position": [
+        980,
+        760
+      ]
+    }
+  ],
+  "pinData": {},
+  "connections": {
+    "When clicking ‘Test workflow’": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Get All VS",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Default Data Loader": {
+      "ai_document": [
+        [
+          {
+            "node": "Populate VS",
+            "type": "ai_document",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Code": {
+      "main": [
+        [
+          {
+            "node": "Populate VS",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Character Text Splitter": {
+      "ai_textSplitter": [
+        [
+          {
+            "node": "Default Data Loader",
+            "type": "ai_textSplitter",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Fake Embeddings 3": {
+      "ai_embedding": [
+        [
+          {
+            "node": "Get All VS",
+            "type": "ai_embedding",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Fake Embeddings": {
+      "ai_embedding": [
+        [
+          {
+            "node": "Populate VS",
+            "type": "ai_embedding",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Vector Store Retriever": {
+      "ai_retriever": [
+        [
+          {
+            "node": "Question and Answer Chain",
+            "type": "ai_retriever",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Fake Language Model": {
+      "ai_languageModel": [
+        [
+          {
+            "node": "Question and Answer Chain",
+            "type": "ai_languageModel",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Fake Embeddings 2": {
+      "ai_embedding": [
+        [
+          {
+            "node": "Retriever VS",
+            "type": "ai_embedding",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Retriever VS": {
+      "ai_vectorStore": [
+        [
+          {
+            "node": "Vector Store Retriever",
+            "type": "ai_vectorStore",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "4ad44cc6-d5f7-48af-8455-c3957baba04c",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+  },
+  "id": "ZjxsuN0rMHRVCb2c",
+  "tags": []
+}
diff --git a/cypress/fixtures/Subworkflow-debugging-execute-workflow.json b/cypress/fixtures/Subworkflow-debugging-execute-workflow.json
new file mode 100644
index 0000000000..c336a80b41
--- /dev/null
+++ b/cypress/fixtures/Subworkflow-debugging-execute-workflow.json
@@ -0,0 +1,354 @@
+{
+	"meta": {
+		"instanceId": "08ce71ad998aeaade0abedb8dd96153d8eaa03fcb84cfccc1530095bf9ee478e"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4535ce3e-280e-49b0-8854-373472ec86d1",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [80, 860]
+		},
+		{
+			"parameters": {
+				"category": "randomData",
+				"randomDataSeed": "0",
+				"randomDataCount": 2
+			},
+			"id": "d7fba18a-d51f-4509-af45-68cd9425ac6b",
+			"name": "DebugHelper1",
+			"type": "n8n-nodes-base.debugHelper",
+			"typeVersion": 1,
+			"position": [280, 860]
+		},
+		{
+			"parameters": {
+				"source": "parameter",
+				"workflowJson": "{\n  \"meta\": {\n    \"instanceId\": \"a786b722078489c1fa382391a9f3476c2784761624deb2dfb4634827256d51a0\"\n  },\n  \"nodes\": [\n    {\n      \"parameters\": {},\n      \"type\": \"n8n-nodes-base.executeWorkflowTrigger\",\n      \"typeVersion\": 1,\n      \"position\": [\n        0,\n        0\n      ],\n      \"id\": \"00600a51-e63a-4b6e-93f5-f01d50a21e0c\",\n      \"name\": \"Execute Workflow Trigger\"\n    },\n    {\n      \"parameters\": {\n        \"assignments\": {\n          \"assignments\": [\n            {\n              \"id\": \"87ff01af-2e28-48da-ae6c-304040200b15\",\n              \"name\": \"hello\",\n              \"value\": \"=world {{ $json.firstname }} {{ $json.lastname }}\",\n              \"type\": \"string\"\n            }\n          ]\n        },\n        \"includeOtherFields\": false,\n        \"options\": {}\n      },\n      \"type\": \"n8n-nodes-base.set\",\n      \"typeVersion\": 3.4,\n      \"position\": [\n        280,\n        0\n      ],\n      \"id\": \"642219a1-d655-4a30-af5c-fcccbb690322\",\n      \"name\": \"Edit Fields\"\n    }\n  ],\n  \"connections\": {\n    \"Execute Workflow Trigger\": {\n      \"main\": [\n        [\n          {\n            \"node\": \"Edit Fields\",\n            \"type\": \"main\",\n            \"index\": 0\n          }\n        ]\n      ]\n    }\n  },\n  \"pinData\": {}\n}",
+				"mode": "each",
+				"options": {
+					"waitForSubWorkflow": false
+				}
+			},
+			"type": "n8n-nodes-base.executeWorkflow",
+			"typeVersion": 1.1,
+			"position": [680, 1540],
+			"id": "f90a25da-dd89-4bf8-8f5b-bf8ee1de0b70",
+			"name": "Execute Workflow with param3"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "c93f26bd-3489-467b-909e-6462e1463707",
+							"name": "uid",
+							"value": "={{ $json.uid }}",
+							"type": "string"
+						},
+						{
+							"id": "3dd706ce-d925-4219-8531-ad12369972fe",
+							"name": "email",
+							"value": "={{ $json.email }}",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [900, 1540],
+			"id": "3be57648-3be8-4b0f-abfa-8fdcafee804d",
+			"name": "Edit Fields8"
+		},
+		{
+			"parameters": {
+				"source": "parameter",
+				"workflowJson": "{\n  \"meta\": {\n    \"instanceId\": \"a786b722078489c1fa382391a9f3476c2784761624deb2dfb4634827256d51a0\"\n  },\n  \"nodes\": [\n    {\n      \"parameters\": {},\n      \"type\": \"n8n-nodes-base.executeWorkflowTrigger\",\n      \"typeVersion\": 1,\n      \"position\": [\n        0,\n        0\n      ],\n      \"id\": \"00600a51-e63a-4b6e-93f5-f01d50a21e0c\",\n      \"name\": \"Execute Workflow Trigger\"\n    },\n    {\n      \"parameters\": {\n        \"assignments\": {\n          \"assignments\": [\n            {\n              \"id\": \"87ff01af-2e28-48da-ae6c-304040200b15\",\n              \"name\": \"hello\",\n              \"value\": \"=world {{ $json.firstname }} {{ $json.lastname }}\",\n              \"type\": \"string\"\n            }\n          ]\n        },\n        \"includeOtherFields\": false,\n        \"options\": {}\n      },\n      \"type\": \"n8n-nodes-base.set\",\n      \"typeVersion\": 3.4,\n      \"position\": [\n        280,\n        0\n      ],\n      \"id\": \"642219a1-d655-4a30-af5c-fcccbb690322\",\n      \"name\": \"Edit Fields\"\n    }\n  ],\n  \"connections\": {\n    \"Execute Workflow Trigger\": {\n      \"main\": [\n        [\n          {\n            \"node\": \"Edit Fields\",\n            \"type\": \"main\",\n            \"index\": 0\n          }\n        ]\n      ]\n    }\n  },\n  \"pinData\": {}\n}",
+				"options": {
+					"waitForSubWorkflow": false
+				}
+			},
+			"type": "n8n-nodes-base.executeWorkflow",
+			"typeVersion": 1.1,
+			"position": [620, 1220],
+			"id": "dabc2356-3660-4d17-b305-936a002029ba",
+			"name": "Execute Workflow with param2"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "c93f26bd-3489-467b-909e-6462e1463707",
+							"name": "uid",
+							"value": "={{ $json.uid }}",
+							"type": "string"
+						},
+						{
+							"id": "3dd706ce-d925-4219-8531-ad12369972fe",
+							"name": "email",
+							"value": "={{ $json.email }}",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [840, 1220],
+			"id": "9d2a9dda-e2a1-43e8-a66f-a8a555692e5f",
+			"name": "Edit Fields7"
+		},
+		{
+			"parameters": {
+				"source": "parameter",
+				"workflowJson": "{\n  \"meta\": {\n    \"instanceId\": \"a786b722078489c1fa382391a9f3476c2784761624deb2dfb4634827256d51a0\"\n  },\n  \"nodes\": [\n    {\n      \"parameters\": {},\n      \"type\": \"n8n-nodes-base.executeWorkflowTrigger\",\n      \"typeVersion\": 1,\n      \"position\": [\n        0,\n        0\n      ],\n      \"id\": \"00600a51-e63a-4b6e-93f5-f01d50a21e0c\",\n      \"name\": \"Execute Workflow Trigger\"\n    },\n    {\n      \"parameters\": {\n        \"assignments\": {\n          \"assignments\": [\n            {\n              \"id\": \"87ff01af-2e28-48da-ae6c-304040200b15\",\n              \"name\": \"hello\",\n              \"value\": \"=world {{ $json.firstname }} {{ $json.lastname }}\",\n              \"type\": \"string\"\n            }\n          ]\n        },\n        \"includeOtherFields\": false,\n        \"options\": {}\n      },\n      \"type\": \"n8n-nodes-base.set\",\n      \"typeVersion\": 3.4,\n      \"position\": [\n        280,\n        0\n      ],\n      \"id\": \"642219a1-d655-4a30-af5c-fcccbb690322\",\n      \"name\": \"Edit Fields\"\n    }\n  ],\n  \"connections\": {\n    \"Execute Workflow Trigger\": {\n      \"main\": [\n        [\n          {\n            \"node\": \"Edit Fields\",\n            \"type\": \"main\",\n            \"index\": 0\n          }\n        ]\n      ]\n    }\n  },\n  \"pinData\": {}\n}",
+				"mode": "each",
+				"options": {
+					"waitForSubWorkflow": true
+				}
+			},
+			"type": "n8n-nodes-base.executeWorkflow",
+			"typeVersion": 1.1,
+			"position": [560, 900],
+			"id": "07e47f60-622a-484c-ab24-35f6f2280595",
+			"name": "Execute Workflow with param1"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "c93f26bd-3489-467b-909e-6462e1463707",
+							"name": "uid",
+							"value": "={{ $json.uid }}",
+							"type": "string"
+						},
+						{
+							"id": "3dd706ce-d925-4219-8531-ad12369972fe",
+							"name": "email",
+							"value": "={{ $json.email }}",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [760, 900],
+			"id": "80563d0a-0bab-444f-a04c-4041a505d78b",
+			"name": "Edit Fields6"
+		},
+		{
+			"parameters": {
+				"source": "parameter",
+				"workflowJson": "{\n  \"meta\": {\n    \"instanceId\": \"a786b722078489c1fa382391a9f3476c2784761624deb2dfb4634827256d51a0\"\n  },\n  \"nodes\": [\n    {\n      \"parameters\": {},\n      \"type\": \"n8n-nodes-base.executeWorkflowTrigger\",\n      \"typeVersion\": 1,\n      \"position\": [\n        0,\n        0\n      ],\n      \"id\": \"00600a51-e63a-4b6e-93f5-f01d50a21e0c\",\n      \"name\": \"Execute Workflow Trigger\"\n    },\n    {\n      \"parameters\": {\n        \"assignments\": {\n          \"assignments\": [\n            {\n              \"id\": \"87ff01af-2e28-48da-ae6c-304040200b15\",\n              \"name\": \"hello\",\n              \"value\": \"=world {{ $json.firstname }} {{ $json.lastname }}\",\n              \"type\": \"string\"\n            }\n          ]\n        },\n        \"includeOtherFields\": false,\n        \"options\": {}\n      },\n      \"type\": \"n8n-nodes-base.set\",\n      \"typeVersion\": 3.4,\n      \"position\": [\n        280,\n        0\n      ],\n      \"id\": \"642219a1-d655-4a30-af5c-fcccbb690322\",\n      \"name\": \"Edit Fields\"\n    }\n  ],\n  \"connections\": {\n    \"Execute Workflow Trigger\": {\n      \"main\": [\n        [\n          {\n            \"node\": \"Edit Fields\",\n            \"type\": \"main\",\n            \"index\": 0\n          }\n        ]\n      ]\n    }\n  },\n  \"pinData\": {}\n}",
+				"options": {
+					"waitForSubWorkflow": true
+				}
+			},
+			"type": "n8n-nodes-base.executeWorkflow",
+			"typeVersion": 1.1,
+			"position": [560, 580],
+			"id": "f04af481-f4d9-4d91-a60a-a377580e8393",
+			"name": "Execute Workflow with param"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "c93f26bd-3489-467b-909e-6462e1463707",
+							"name": "uid",
+							"value": "={{ $json.uid }}",
+							"type": "string"
+						},
+						{
+							"id": "3dd706ce-d925-4219-8531-ad12369972fe",
+							"name": "email",
+							"value": "={{ $json.email }}",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [760, 580],
+			"id": "80c10607-a0ac-4090-86a1-890da0a2aa52",
+			"name": "Edit Fields2"
+		},
+		{
+			"parameters": {
+				"content": "## Execute Workflow (Run once with all items/ DONT Wait for Sub-workflow completion)",
+				"height": 254.84308966329985,
+				"width": 457.58120569815793
+			},
+			"id": "534ef523-3453-4a16-9ff0-8ac9f025d47d",
+			"name": "Sticky Note5",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [500, 1080]
+		},
+		{
+			"parameters": {
+				"content": "## Execute Workflow (Run once with for each item/ DONT Wait for Sub-workflow completion) ",
+				"height": 284.59778445962905,
+				"width": 457.58120569815793
+			},
+			"id": "838f0fa3-5ee4-4d1a-afb8-42e009f1aa9e",
+			"name": "Sticky Note4",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [580, 1400]
+		},
+		{
+			"parameters": {
+				"category": "randomData",
+				"randomDataSeed": "1",
+				"randomDataCount": 3
+			},
+			"id": "86699a49-2aa7-488e-8ea9-828404c98f08",
+			"name": "DebugHelper",
+			"type": "n8n-nodes-base.debugHelper",
+			"typeVersion": 1,
+			"position": [320, 1120]
+		},
+		{
+			"parameters": {
+				"content": "## Execute Workflow (Run once with for each item/ Wait for Sub-workflow completion) ",
+				"height": 284.59778445962905,
+				"width": 457.58120569815793
+			},
+			"id": "885d35f0-8ae6-45ec-821b-a82c27e7577a",
+			"name": "Sticky Note3",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [480, 760]
+		},
+		{
+			"parameters": {
+				"content": "## Execute Workflow (Run once with all items/ Wait for Sub-workflow completion) (default behavior)",
+				"height": 254.84308966329985,
+				"width": 457.58120569815793
+			},
+			"id": "505bd7f2-767e-41b8-9325-77300aed5883",
+			"name": "Sticky Note2",
+			"type": "n8n-nodes-base.stickyNote",
+			"typeVersion": 1,
+			"position": [460, 460]
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "DebugHelper1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "DebugHelper",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"DebugHelper1": {
+			"main": [
+				[
+					{
+						"node": "Execute Workflow with param3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Execute Workflow with param2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Execute Workflow with param1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Execute Workflow with param",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Execute Workflow with param3": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields8",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Execute Workflow with param2": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields7",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Execute Workflow with param1": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields6",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Execute Workflow with param": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"DebugHelper": {
+			"main": [
+				[
+					{
+						"node": "Execute Workflow with param2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Execute Workflow with param3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/cypress/fixtures/Switch_node_with_null_connection.json b/cypress/fixtures/Switch_node_with_null_connection.json
new file mode 100644
index 0000000000..325e097bd0
--- /dev/null
+++ b/cypress/fixtures/Switch_node_with_null_connection.json
@@ -0,0 +1,85 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "418350b8-b402-4d3b-93ba-3794d36c1ad5",
+			"name": "When clicking \"Test workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [440, 380]
+		},
+		{
+			"parameters": {
+				"rules": {
+					"values": [
+						{
+							"conditions": {
+								"options": {
+									"caseSensitive": true,
+									"leftValue": "",
+									"typeValidation": "strict"
+								},
+								"conditions": [
+									{
+										"leftValue": "",
+										"rightValue": "",
+										"operator": {
+											"type": "string",
+											"operation": "equals"
+										}
+									}
+								],
+								"combinator": "and"
+							}
+						},
+						{},
+						{}
+					]
+				},
+				"options": {}
+			},
+			"id": "b67ad46f-6b0d-4ff4-b2d2-dfbde44e287c",
+			"name": "Switch",
+			"type": "n8n-nodes-base.switch",
+			"typeVersion": 3,
+			"position": [660, 380]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "24731c11-e2a4-4854-81a6-277ce72e8a93",
+			"name": "Edit Fields",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.3,
+			"position": [840, 480]
+		}
+	],
+	"connections": {
+		"When clicking \"Test workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Switch",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Switch": {
+			"main": [
+				null,
+				null,
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/cypress/fixtures/Test_Subworkflow-Inputs.json b/cypress/fixtures/Test_Subworkflow-Inputs.json
new file mode 100644
index 0000000000..ee2b34513e
--- /dev/null
+++ b/cypress/fixtures/Test_Subworkflow-Inputs.json
@@ -0,0 +1,69 @@
+{
+	"meta": {
+		"instanceId": "4d0676b62208d810ef035130bbfc9fd3afdc78d963ea8ccb9514dc89066efc94"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "bb7f8bb3-840a-464c-a7de-d3a80538c2be",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0]
+		},
+		{
+			"parameters": {
+				"workflowId": {},
+				"workflowInputs": {
+					"mappingMode": "defineBelow",
+					"value": {},
+					"matchingColumns": [],
+					"schema": [],
+					"attemptToConvertTypes": false,
+					"convertFieldsToString": true
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.executeWorkflow",
+			"typeVersion": 1.2,
+			"position": [500, 240],
+			"id": "6b6e2e34-c6ab-4083-b8e3-6b0d56be5453",
+			"name": "Execute Workflow"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Execute Workflow",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"When clicking ‘Test workflow’": [
+			{
+				"aaString": "A String",
+				"aaNumber": 1,
+				"aaArray": [1, true, "3"],
+				"aaObject": {
+					"aKey": -1
+				},
+				"aaAny": {}
+			},
+			{
+				"aaString": "Another String",
+				"aaNumber": 2,
+				"aaArray": [],
+				"aaObject": {
+					"aDifferentKey": -1
+				},
+				"aaAny": []
+			}
+		]
+	}
+}
diff --git a/cypress/fixtures/Test_Template_1.json b/cypress/fixtures/Test_Template_1.json
index f15970677e..1995beca52 100644
--- a/cypress/fixtures/Test_Template_1.json
+++ b/cypress/fixtures/Test_Template_1.json
@@ -1,7 +1,7 @@
 {
 	"workflow": {
 			"id": 1205,
-			"name": "Promote new Shopify products on Twitter and Telegram",
+			"name": "Promote new Shopify products",
 			"views": 478,
 			"recentViews": 9880,
 			"totalViews": 478,
diff --git a/cypress/fixtures/Test_ndv_search.json b/cypress/fixtures/Test_ndv_search.json
new file mode 100644
index 0000000000..996b558e5a
--- /dev/null
+++ b/cypress/fixtures/Test_ndv_search.json
@@ -0,0 +1,135 @@
+{
+  "name": "NDV search bugs (introduced by schema view?)",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "55635c7b-92ee-4d2d-a0c0-baff9ab071da",
+      "name": "When clicking ‘Test workflow’",
+      "type": "n8n-nodes-base.manualTrigger",
+      "position": [
+        800,
+        380
+      ],
+      "typeVersion": 1
+    },
+    {
+      "parameters": {
+        "operation": "getAllPeople"
+      },
+      "id": "4737af43-e49b-4c92-b76f-32605c047114",
+      "name": "Customer Datastore (n8n training)",
+      "type": "n8n-nodes-base.n8nTrainingCustomerDatastore",
+      "typeVersion": 1,
+      "position": [
+        1020,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "assignments": {
+          "assignments": []
+        },
+        "includeOtherFields": true,
+        "options": {}
+      },
+      "id": "8cc9b374-1856-4f3f-9315-08e6e27840d8",
+      "name": "Edit Fields",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 3.4,
+      "position": [
+        1240,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "Customer Datastore (n8n training)": [
+      {
+        "json": {
+          "id": "23423532",
+          "name": "Jay Gatsby",
+          "email": "gatsby@west-egg.com",
+          "notes": "Keeps asking about a green light??",
+          "country": "US",
+          "created": "1925-04-10"
+        }
+      },
+      {
+        "json": {
+          "id": "23423533",
+          "name": "José Arcadio Buendía",
+          "email": "jab@macondo.co",
+          "notes": "Lots of people named after him. Very confusing",
+          "country": "CO",
+          "created": "1967-05-05"
+        }
+      },
+      {
+        "json": {
+          "id": "23423534",
+          "name": "Max Sendak",
+          "email": "info@in-and-out-of-weeks.org",
+          "notes": "Keeps rolling his terrible eyes",
+          "country": "US",
+          "created": "1963-04-09"
+        }
+      },
+      {
+        "json": {
+          "id": "23423535",
+          "name": "Zaphod Beeblebrox",
+          "email": "captain@heartofgold.com",
+          "notes": "Felt like I was talking to more than one person",
+          "country": null,
+          "created": "1979-10-12"
+        }
+      },
+      {
+        "json": {
+          "id": "23423536",
+          "name": "Edmund Pevensie",
+          "email": "edmund@narnia.gov",
+          "notes": "Passionate sailor",
+          "country": "UK",
+          "created": "1950-10-16"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking ‘Test workflow’": {
+      "main": [
+        [
+          {
+            "node": "Customer Datastore (n8n training)",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Customer Datastore (n8n training)": {
+      "main": [
+        [
+          {
+            "node": "Edit Fields",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "executionOrder": "v1"
+  },
+  "versionId": "20178044-fb64-4443-88dd-e941517520d0",
+  "meta": {
+    "templateCredsSetupCompleted": true,
+    "instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+  },
+  "id": "aBVnTRON9Y2cSmse",
+  "tags": []
+}
\ No newline at end of file
diff --git a/cypress/fixtures/Test_ndv_two_branches_of_same_parent_false_populated.json b/cypress/fixtures/Test_ndv_two_branches_of_same_parent_false_populated.json
new file mode 100644
index 0000000000..056a35a786
--- /dev/null
+++ b/cypress/fixtures/Test_ndv_two_branches_of_same_parent_false_populated.json
@@ -0,0 +1,94 @@
+{
+	"nodes": [
+		{
+			"parameters": {
+				"conditions": {
+					"options": {
+						"caseSensitive": true,
+						"leftValue": "",
+						"typeValidation": "strict",
+						"version": 2
+					},
+					"conditions": [
+						{
+							"id": "6f0cf983-824b-4339-a5de-6b374a23b4b0",
+							"leftValue": "={{ $json.a }}",
+							"rightValue": 3,
+							"operator": {
+								"type": "number",
+								"operation": "equals"
+							}
+						}
+					],
+					"combinator": "and"
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 2.2,
+			"position": [220, 0],
+			"id": "1755282a-ec4a-4d02-a833-0316ca413cc4",
+			"name": "If"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "de1e7acf-12d8-4e56-ba42-709ffb397db2",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"category": "randomData"
+			},
+			"type": "n8n-nodes-base.debugHelper",
+			"typeVersion": 1,
+			"position": [580, 0],
+			"id": "86440d33-f833-453c-bcaa-fff7e0083501",
+			"name": "DebugHelper",
+			"alwaysOutputData": true
+		}
+	],
+	"connections": {
+		"If": {
+			"main": [
+				[
+					{
+						"node": "DebugHelper",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "DebugHelper",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "If",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"When clicking ‘Test workflow’": [
+			{
+				"a": 1
+			},
+			{
+				"a": 2
+			}
+		]
+	}
+}
diff --git a/cypress/fixtures/aiAssistant/responses/node_execution_succeeded_response.json b/cypress/fixtures/aiAssistant/responses/node_execution_succeeded_response.json
new file mode 100644
index 0000000000..62caf2a6b5
--- /dev/null
+++ b/cypress/fixtures/aiAssistant/responses/node_execution_succeeded_response.json
@@ -0,0 +1,22 @@
+{
+	"sessionId": "1",
+	"messages": [
+		{
+			"role": "assistant",
+			"type": "message",
+			"text": "**Code** node ran successfully, did my solution help resolve your issue?",
+			"quickReplies": [
+				{
+					"text": "Yes, thanks",
+					"type": "all-good",
+					"isFeedback": true
+				},
+				{
+					"text": "No, I am still stuck",
+					"type": "still-stuck",
+					"isFeedback": true
+				}
+			]
+		}
+	]
+}
diff --git a/cypress/fixtures/templates_search/sales_templates_search_response.json b/cypress/fixtures/templates_search/sales_templates_search_response.json
index 4efbb3585b..d4f90991b3 100644
--- a/cypress/fixtures/templates_search/sales_templates_search_response.json
+++ b/cypress/fixtures/templates_search/sales_templates_search_response.json
@@ -1202,7 +1202,7 @@
         },
         {
             "id": 1205,
-            "name": "Promote New Shopify Products on Social Media (Twitter and Telegram)",
+            "name": "Promote New Shopify Products",
             "totalViews": 219,
             "recentViews": 0,
             "user": {
diff --git a/cypress/package.json b/cypress/package.json
index 02e2a74c03..6725c46bc6 100644
--- a/cypress/package.json
+++ b/cypress/package.json
@@ -6,12 +6,13 @@
     "cypress:install": "cypress install",
     "test:e2e:ui": "scripts/run-e2e.js ui",
     "test:e2e:dev": "scripts/run-e2e.js dev",
+    "test:e2e:dev:v2": "scripts/run-e2e.js dev:v2",
     "test:e2e:all": "scripts/run-e2e.js all",
     "format": "biome format --write .",
     "format:check": "biome ci .",
     "lint": "eslint . --quiet",
     "lintfix": "eslint . --fix",
-    "develop": "cd ..; pnpm dev",
+    "develop": "cd ..; pnpm dev:e2e:server",
     "start": "cd ..; pnpm start"
   },
   "devDependencies": {
@@ -26,6 +27,7 @@
     "cypress": "^13.14.2",
     "cypress-otp": "^1.0.3",
     "cypress-real-events": "^1.13.0",
+    "flatted": "catalog:",
     "lodash": "catalog:",
     "nanoid": "catalog:",
     "start-server-and-test": "^2.0.8"
diff --git a/cypress/pages/bannerStack.ts b/cypress/pages/bannerStack.ts
deleted file mode 100644
index c4936891ae..0000000000
--- a/cypress/pages/bannerStack.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BasePage } from './base';
-
-export class BannerStack extends BasePage {
-	getters = {
-		banner: () => cy.getByTestId('banner-stack'),
-	};
-
-	actions = {};
-}
diff --git a/cypress/pages/base.ts b/cypress/pages/base.ts
index abd7a210a8..dbcb65e5bd 100644
--- a/cypress/pages/base.ts
+++ b/cypress/pages/base.ts
@@ -1,5 +1,13 @@
 import type { IE2ETestPage } from '../types';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class BasePage implements IE2ETestPage {
 	getters = {};
 
diff --git a/cypress/pages/credentials.ts b/cypress/pages/credentials.ts
index 9b20b48ec4..b7b68504f9 100644
--- a/cypress/pages/credentials.ts
+++ b/cypress/pages/credentials.ts
@@ -1,11 +1,23 @@
 import { BasePage } from './base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class CredentialsPage extends BasePage {
 	url = '/home/credentials';
 
 	getters = {
 		emptyListCreateCredentialButton: () => cy.getByTestId('empty-resources-list').find('button'),
-		createCredentialButton: () => cy.getByTestId('resources-list-add'),
+		createCredentialButton: () => {
+			cy.getByTestId('add-resource').should('be.visible').click();
+			cy.getByTestId('add-resource').getByTestId('action-credential').should('be.visible');
+			return cy.getByTestId('add-resource').getByTestId('action-credential');
+		},
 		searchInput: () => cy.getByTestId('resources-list-search'),
 		emptyList: () => cy.getByTestId('resources-list-empty'),
 		credentialCards: () => cy.getByTestId('resources-list-item'),
diff --git a/cypress/pages/features/ai-assistant.ts b/cypress/pages/features/ai-assistant.ts
index 6ff48851f3..f2e747817b 100644
--- a/cypress/pages/features/ai-assistant.ts
+++ b/cypress/pages/features/ai-assistant.ts
@@ -8,6 +8,14 @@ const AI_ASSISTANT_FEATURE = {
 	disabledFor: 'control',
 };
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class AIAssistant extends BasePage {
 	url = '/workflows/new';
 
diff --git a/cypress/pages/features/node-creator.ts b/cypress/pages/features/node-creator.ts
index a0d3995160..38c932468f 100644
--- a/cypress/pages/features/node-creator.ts
+++ b/cypress/pages/features/node-creator.ts
@@ -1,5 +1,13 @@
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class NodeCreator extends BasePage {
 	url = '/workflow/new';
 
diff --git a/cypress/pages/index.ts b/cypress/pages/index.ts
index 39c9be3b56..93dd165621 100644
--- a/cypress/pages/index.ts
+++ b/cypress/pages/index.ts
@@ -7,9 +7,7 @@ export * from './settings-users';
 export * from './settings-log-streaming';
 export * from './sidebar';
 export * from './ndv';
-export * from './bannerStack';
 export * from './workflow-executions-tab';
 export * from './signin';
-export * from './workflow-history';
 export * from './workerView';
 export * from './settings-public-api';
diff --git a/cypress/pages/mfa-login.ts b/cypress/pages/mfa-login.ts
index 66fc197e3f..884be7d75d 100644
--- a/cypress/pages/mfa-login.ts
+++ b/cypress/pages/mfa-login.ts
@@ -3,23 +3,31 @@ import { SigninPage } from './signin';
 import { WorkflowsPage } from './workflows';
 import { N8N_AUTH_COOKIE } from '../constants';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class MfaLoginPage extends BasePage {
 	url = '/mfa';
 
 	getters = {
 		form: () => cy.getByTestId('mfa-login-form'),
-		token: () => cy.getByTestId('token'),
-		recoveryCode: () => cy.getByTestId('recoveryCode'),
+		mfaCode: () => cy.getByTestId('mfaCode'),
+		mfaRecoveryCode: () => cy.getByTestId('mfaRecoveryCode'),
 		enterRecoveryCodeButton: () => cy.getByTestId('mfa-enter-recovery-code-button'),
 	};
 
 	actions = {
-		loginWithMfaToken: (email: string, password: string, mfaToken: string) => {
+		loginWithMfaCode: (email: string, password: string, mfaCode: string) => {
 			const signinPage = new SigninPage();
 			const workflowsPage = new WorkflowsPage();
 
 			cy.session(
-				[mfaToken],
+				[mfaCode],
 				() => {
 					cy.visit(signinPage.url);
 
@@ -30,7 +38,7 @@ export class MfaLoginPage extends BasePage {
 					});
 
 					this.getters.form().within(() => {
-						this.getters.token().type(mfaToken);
+						this.getters.mfaCode().type(mfaCode);
 					});
 
 					// we should be redirected to /workflows
@@ -43,12 +51,12 @@ export class MfaLoginPage extends BasePage {
 				},
 			);
 		},
-		loginWithRecoveryCode: (email: string, password: string, recoveryCode: string) => {
+		loginWithMfaRecoveryCode: (email: string, password: string, mfaRecoveryCode: string) => {
 			const signinPage = new SigninPage();
 			const workflowsPage = new WorkflowsPage();
 
 			cy.session(
-				[recoveryCode],
+				[mfaRecoveryCode],
 				() => {
 					cy.visit(signinPage.url);
 
@@ -61,7 +69,7 @@ export class MfaLoginPage extends BasePage {
 					this.getters.enterRecoveryCodeButton().click();
 
 					this.getters.form().within(() => {
-						this.getters.recoveryCode().type(recoveryCode);
+						this.getters.mfaRecoveryCode().type(mfaRecoveryCode);
 					});
 
 					// we should be redirected to /workflows
diff --git a/cypress/pages/modals/change-password-modal.ts b/cypress/pages/modals/change-password-modal.ts
index 3e9ebc8697..28c4d01d86 100644
--- a/cypress/pages/modals/change-password-modal.ts
+++ b/cypress/pages/modals/change-password-modal.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class ChangePasswordModal extends BasePage {
 	getters = {
 		modalContainer: () => cy.getByTestId('changePassword-modal').last(),
diff --git a/cypress/pages/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index cd3ded63f8..592a396161 100644
--- a/cypress/pages/modals/credentials-modal.ts
+++ b/cypress/pages/modals/credentials-modal.ts
@@ -1,6 +1,15 @@
+import { getCredentialSaveButton, saveCredential } from '../../composables/modals/credential-modal';
 import { getVisibleSelect } from '../../utils';
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class CredentialsModal extends BasePage {
 	getters = {
 		newCredentialModal: () => cy.getByTestId('selectCredential-modal', { timeout: 5000 }),
@@ -13,8 +22,6 @@ export class CredentialsModal extends BasePage {
 			this.getters.credentialInputs().find(`:contains('${fieldName}') .n8n-input input`),
 		name: () => cy.getByTestId('credential-name'),
 		nameInput: () => cy.getByTestId('credential-name').find('input'),
-		// Saving of the credentials takes a while on the CI so we need to increase the timeout
-		saveButton: () => cy.getByTestId('credential-save-button', { timeout: 5000 }),
 		deleteButton: () => cy.getByTestId('credential-delete-button'),
 		closeButton: () => this.getters.editCredentialModal().find('.el-dialog__close').first(),
 		oauthConnectButton: () => cy.getByTestId('oauth-connect-button'),
@@ -41,17 +48,17 @@ export class CredentialsModal extends BasePage {
 		},
 		save: (test = false) => {
 			cy.intercept('POST', '/rest/credentials').as('saveCredential');
-			this.getters.saveButton().click({ force: true });
+			saveCredential();
 
 			cy.wait('@saveCredential');
 			if (test) cy.wait('@testCredential');
-			this.getters.saveButton().should('contain.text', 'Saved');
+			getCredentialSaveButton().should('contain.text', 'Saved');
 		},
 		saveSharing: () => {
 			cy.intercept('PUT', '/rest/credentials/*/share').as('shareCredential');
-			this.getters.saveButton().click({ force: true });
+			saveCredential();
 			cy.wait('@shareCredential');
-			this.getters.saveButton().should('contain.text', 'Saved');
+			getCredentialSaveButton().should('contain.text', 'Saved');
 		},
 		close: () => {
 			this.getters.closeButton().click();
@@ -62,10 +69,11 @@ export class CredentialsModal extends BasePage {
 			this.getters
 				.credentialInputs()
 				.find('input[type=text], input[type=password]')
+				.filter(':not([readonly])')
 				.each(($el) => {
 					cy.wrap($el).type('test');
 				});
-			this.getters.saveButton().click();
+			saveCredential();
 			if (closeModal) {
 				this.getters.closeButton().click();
 			}
diff --git a/cypress/pages/modals/message-box.ts b/cypress/pages/modals/message-box.ts
index a40c2d1a88..42f83d9a15 100644
--- a/cypress/pages/modals/message-box.ts
+++ b/cypress/pages/modals/message-box.ts
@@ -1,5 +1,13 @@
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class MessageBox extends BasePage {
 	getters = {
 		modal: () => cy.get('.el-message-box', { withinSubject: null }),
diff --git a/cypress/pages/modals/mfa-setup-modal.ts b/cypress/pages/modals/mfa-setup-modal.ts
index d127731be2..baa37f5f3a 100644
--- a/cypress/pages/modals/mfa-setup-modal.ts
+++ b/cypress/pages/modals/mfa-setup-modal.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class MfaSetupModal extends BasePage {
 	getters = {
 		modalContainer: () => cy.getByTestId('changePassword-modal').last(),
diff --git a/cypress/pages/modals/workflow-sharing-modal.ts b/cypress/pages/modals/workflow-sharing-modal.ts
index 02e183fc81..176cd84a7b 100644
--- a/cypress/pages/modals/workflow-sharing-modal.ts
+++ b/cypress/pages/modals/workflow-sharing-modal.ts
@@ -1,5 +1,13 @@
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkflowSharingModal extends BasePage {
 	getters = {
 		modal: () => cy.getByTestId('workflowShare-modal', { timeout: 5000 }),
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 4504552e26..91ece23122 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -1,6 +1,14 @@
 import { BasePage } from './base';
 import { getVisiblePopper, getVisibleSelect } from '../utils';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class NDV extends BasePage {
 	getters = {
 		container: () => cy.getByTestId('ndv'),
@@ -227,9 +235,6 @@ export class NDV extends BasePage {
 			this.getters.inputSelect().find('.el-select').click();
 			this.getters.inputOption().contains(nodeName).click();
 		},
-		expandSchemaViewNode: (nodeName: string) => {
-			this.getters.schemaViewNodeName().contains(nodeName).click();
-		},
 		addDefaultPinnedData: () => {
 			this.actions.editPinnedData();
 			this.actions.savePinnedData();
@@ -323,6 +328,17 @@ export class NDV extends BasePage {
 		addItemToFixedCollection: (paramName: string) => {
 			this.getters.fixedCollectionParameter(paramName).getByTestId('fixed-collection-add').click();
 		},
+		typeIntoFixedCollectionItem: (fixedCollectionName: string, index: number, content: string) => {
+			this.getters.fixedCollectionParameter(fixedCollectionName).within(() => {
+				cy.getByTestId('parameter-input').eq(index).type(content);
+			});
+		},
+		dragMainPanelToLeft: () => {
+			cy.drag('[data-test-id=panel-drag-button]', [-1000, 0], { moveTwice: true });
+		},
+		dragMainPanelToRight: () => {
+			cy.drag('[data-test-id=panel-drag-button]', [1000, 0], { moveTwice: true });
+		},
 	};
 }
 
diff --git a/cypress/pages/notifications.ts b/cypress/pages/notifications.ts
index 162c536007..af2a51e369 100644
--- a/cypress/pages/notifications.ts
+++ b/cypress/pages/notifications.ts
@@ -13,5 +13,10 @@ export const infoToast = () => cy.get('.el-notification:has(.el-notification--in
  * Actions
  */
 export const clearNotifications = () => {
-	successToast().find('.el-notification__closeBtn').click({ multiple: true });
+	const buttons = successToast().find('.el-notification__closeBtn');
+	buttons.then(($buttons) => {
+		if ($buttons.length) {
+			buttons.click({ multiple: true });
+		}
+	});
 };
diff --git a/cypress/pages/settings-log-streaming.ts b/cypress/pages/settings-log-streaming.ts
index 9063b8dc41..959b18bce5 100644
--- a/cypress/pages/settings-log-streaming.ts
+++ b/cypress/pages/settings-log-streaming.ts
@@ -1,6 +1,14 @@
 import { BasePage } from './base';
 import { getVisibleSelect } from '../utils';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class SettingsLogStreamingPage extends BasePage {
 	url = '/settings/log-streaming';
 
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
index 4574f95691..49c7de1283 100644
--- a/cypress/pages/settings-personal.ts
+++ b/cypress/pages/settings-personal.ts
@@ -7,6 +7,14 @@ import { MfaSetupModal } from './modals/mfa-setup-modal';
 const changePasswordModal = new ChangePasswordModal();
 const mfaSetupModal = new MfaSetupModal();
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class PersonalSettingsPage extends BasePage {
 	url = '/settings/personal';
 
@@ -22,6 +30,8 @@ export class PersonalSettingsPage extends BasePage {
 		saveSettingsButton: () => cy.getByTestId('save-settings-button'),
 		enableMfaButton: () => cy.getByTestId('enable-mfa-button'),
 		disableMfaButton: () => cy.getByTestId('disable-mfa-button'),
+		mfaCodeOrMfaRecoveryCodeInput: () => cy.getByTestId('mfa-code-or-recovery-code-input'),
+		mfaSaveButton: () => cy.getByTestId('mfa-save-button'),
 		themeSelector: () => cy.getByTestId('theme-select'),
 		selectOptionsVisible: () => cy.get('.el-select-dropdown:visible .el-select-dropdown__item'),
 	};
@@ -83,9 +93,11 @@ export class PersonalSettingsPage extends BasePage {
 				mfaSetupModal.getters.saveButton().click();
 			});
 		},
-		disableMfa: () => {
+		disableMfa: (mfaCodeOrRecoveryCode: string) => {
 			cy.visit(this.url);
 			this.getters.disableMfaButton().click();
+			this.getters.mfaCodeOrMfaRecoveryCodeInput().type(mfaCodeOrRecoveryCode);
+			this.getters.mfaSaveButton().click();
 		},
 	};
 }
diff --git a/cypress/pages/settings-usage.ts b/cypress/pages/settings-usage.ts
deleted file mode 100644
index 85300fe05f..0000000000
--- a/cypress/pages/settings-usage.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BasePage } from './base';
-
-export class SettingsUsagePage extends BasePage {
-	url = '/settings/usage';
-
-	getters = {};
-
-	actions = {};
-}
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index 1eaebc911a..f442377fad 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -9,6 +9,14 @@ const workflowsPage = new WorkflowsPage();
 const mainSidebar = new MainSidebar();
 const settingsSidebar = new SettingsSidebar();
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class SettingsUsersPage extends BasePage {
 	url = '/settings/users';
 
diff --git a/cypress/pages/settings.ts b/cypress/pages/settings.ts
deleted file mode 100644
index 74c3b0fe76..0000000000
--- a/cypress/pages/settings.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { BasePage } from './base';
-
-export class SettingsPage extends BasePage {
-	url = '/settings';
-
-	getters = {
-		menuItems: () => cy.getByTestId('menu-item'),
-	};
-
-	actions = {};
-}
diff --git a/cypress/pages/sidebar/main-sidebar.ts b/cypress/pages/sidebar/main-sidebar.ts
index 4266b93688..7824a6bebb 100644
--- a/cypress/pages/sidebar/main-sidebar.ts
+++ b/cypress/pages/sidebar/main-sidebar.ts
@@ -1,6 +1,14 @@
 import { BasePage } from '../base';
 import { WorkflowsPage } from '../workflows';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class MainSidebar extends BasePage {
 	getters = {
 		menuItem: (id: string) => cy.getByTestId('menu-item').get('#' + id),
diff --git a/cypress/pages/sidebar/settings-sidebar.ts b/cypress/pages/sidebar/settings-sidebar.ts
index 17d43b65e7..17bf5d10b7 100644
--- a/cypress/pages/sidebar/settings-sidebar.ts
+++ b/cypress/pages/sidebar/settings-sidebar.ts
@@ -1,5 +1,13 @@
 import { BasePage } from '../base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class SettingsSidebar extends BasePage {
 	getters = {
 		menuItem: (id: string) => cy.getByTestId('menu-item').get('#' + id),
diff --git a/cypress/pages/signin.ts b/cypress/pages/signin.ts
index a97fe4888e..bc0d7196a3 100644
--- a/cypress/pages/signin.ts
+++ b/cypress/pages/signin.ts
@@ -2,6 +2,14 @@ import { BasePage } from './base';
 import { WorkflowsPage } from './workflows';
 import { N8N_AUTH_COOKIE } from '../constants';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class SigninPage extends BasePage {
 	url = '/signin';
 
diff --git a/cypress/pages/templates.ts b/cypress/pages/templates.ts
index a17da87ba2..8d8fdc15c5 100644
--- a/cypress/pages/templates.ts
+++ b/cypress/pages/templates.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class TemplatesPage extends BasePage {
 	url = '/templates';
 
diff --git a/cypress/pages/variables.ts b/cypress/pages/variables.ts
index 6ac9a939b2..5fb0a64d9a 100644
--- a/cypress/pages/variables.ts
+++ b/cypress/pages/variables.ts
@@ -2,6 +2,14 @@ import { BasePage } from './base';
 
 import Chainable = Cypress.Chainable;
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class VariablesPage extends BasePage {
 	url = '/variables';
 
diff --git a/cypress/pages/workerView.ts b/cypress/pages/workerView.ts
index f442468c52..ff56ab1ec5 100644
--- a/cypress/pages/workerView.ts
+++ b/cypress/pages/workerView.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkerViewPage extends BasePage {
 	url = '/settings/workers';
 
diff --git a/cypress/pages/workflow-executions-tab.ts b/cypress/pages/workflow-executions-tab.ts
index 5e8c36c055..da91e99a98 100644
--- a/cypress/pages/workflow-executions-tab.ts
+++ b/cypress/pages/workflow-executions-tab.ts
@@ -3,6 +3,14 @@ import { WorkflowPage } from './workflow';
 
 const workflowPage = new WorkflowPage();
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkflowExecutionsTab extends BasePage {
 	getters = {
 		executionsTabButton: () => cy.getByTestId('radio-button-executions'),
@@ -30,6 +38,12 @@ export class WorkflowExecutionsTab extends BasePage {
 
 	actions = {
 		toggleNodeEnabled: (nodeName: string) => {
+			cy.ifCanvasVersion(
+				() => {},
+				() => {
+					cy.get('body').click(); // Cancel selection if it exists
+				},
+			);
 			workflowPage.getters.canvasNodeByName(nodeName).click();
 			cy.get('body').type('d', { force: true });
 		},
diff --git a/cypress/pages/workflow-history.ts b/cypress/pages/workflow-history.ts
deleted file mode 100644
index 1b9d7328b1..0000000000
--- a/cypress/pages/workflow-history.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { BasePage } from './base';
-
-export class WorkflowHistoryPage extends BasePage {
-	getters = {
-		workflowHistoryCloseButton: () => cy.getByTestId('workflow-history-close-button'),
-	};
-}
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index cd1e7d9462..69a1becc02 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -1,10 +1,20 @@
 import { BasePage } from './base';
 import { NodeCreator } from './features/node-creator';
 import { META_KEY } from '../constants';
+import type { OpenContextMenuOptions } from '../types';
 import { getVisibleSelect } from '../utils';
 import { getUniqueWorkflowName, isCanvasV2 } from '../utils/workflowUtils';
 
 const nodeCreator = new NodeCreator();
+
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkflowPage extends BasePage {
 	url = '/workflow/new';
 
@@ -17,7 +27,8 @@ export class WorkflowPage extends BasePage {
 		workflowTagsContainer: () => cy.getByTestId('workflow-tags-container'),
 		workflowTagsInput: () =>
 			this.getters.workflowTagsContainer().then(($el) => cy.wrap($el.find('input').first())),
-		tagPills: () => cy.get('[data-test-id="workflow-tags-container"] span.el-tag'),
+		tagPills: () =>
+			cy.get('[data-test-id="workflow-tags-container"] span.el-tag:not(.count-container)'),
 		nthTagPill: (n: number) =>
 			cy.get(`[data-test-id="workflow-tags-container"] span.el-tag:nth-child(${n})`),
 		tagsDropdown: () => cy.getByTestId('workflow-tags-dropdown'),
@@ -30,7 +41,11 @@ export class WorkflowPage extends BasePage {
 		canvasNodes: () =>
 			cy.ifCanvasVersion(
 				() => cy.getByTestId('canvas-node'),
-				() => cy.getByTestId('canvas-node').not('[data-node-type="n8n-nodes-internal.addNodes"]'),
+				() =>
+					cy
+						.getByTestId('canvas-node')
+						.not('[data-node-type="n8n-nodes-internal.addNodes"]')
+						.not('[data-node-type="n8n-nodes-base.stickyNote"]'),
 			),
 		canvasNodeByName: (nodeName: string) =>
 			this.getters.canvasNodes().filter(`:contains(${nodeName})`),
@@ -43,13 +58,13 @@ export class WorkflowPage extends BasePage {
 		getEndpointSelector: (type: 'input' | 'output' | 'plus', nodeName: string, index = 0) => {
 			if (isCanvasV2()) {
 				if (type === 'input') {
-					return `[data-test-id="canvas-node-input-handle"][data-node-name="${nodeName}"][data-handle-index="${index}"]`;
+					return `[data-test-id="canvas-node-input-handle"][data-node-name="${nodeName}"][data-index="${index}"]`;
 				}
 				if (type === 'output') {
-					return `[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"][data-handle-index="${index}"]`;
+					return `[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"][data-index="${index}"]`;
 				}
 				if (type === 'plus') {
-					return `[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"][data-handle-index="${index}"] [data-test-id="canvas-handle-plus"] .clickable`;
+					return `[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"][data-index="${index}"] [data-test-id="canvas-handle-plus"]`;
 				}
 			}
 			return `[data-endpoint-name='${nodeName}'][data-endpoint-type='${type}'][data-input-index='${index}']`;
@@ -66,7 +81,7 @@ export class WorkflowPage extends BasePage {
 				() =>
 					cy
 						.get(
-							`[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"] .clickable`,
+							`[data-test-id="canvas-node-output-handle"][data-node-name="${nodeName}"] [data-test-id="canvas-handle-plus"]`,
 						)
 						.eq(index),
 			);
@@ -88,14 +103,14 @@ export class WorkflowPage extends BasePage {
 		nodeConnections: () =>
 			cy.ifCanvasVersion(
 				() => cy.get('.jtk-connector'),
-				() => cy.getByTestId('edge-label-wrapper'),
+				() => cy.getByTestId('edge-label'),
 			),
 		zoomToFitButton: () => cy.getByTestId('zoom-to-fit'),
 		nodeEndpoints: () => cy.get('.jtk-endpoint-connected'),
 		disabledNodes: () =>
 			cy.ifCanvasVersion(
 				() => cy.get('.node-box.disabled'),
-				() => cy.get('[data-test-id="canvas-trigger-node"][class*="disabled"]'),
+				() => cy.get('[data-test-id*="node"][class*="disabled"]'),
 			),
 		selectedNodes: () =>
 			cy.ifCanvasVersion(
@@ -174,7 +189,7 @@ export class WorkflowPage extends BasePage {
 					),
 				() =>
 					cy.get(
-						`[data-test-id="edge-label-wrapper"][data-source-node-name="${sourceNodeName}"][data-target-node-name="${targetNodeName}"]`,
+						`[data-test-id="edge-label"][data-source-node-name="${sourceNodeName}"][data-target-node-name="${targetNodeName}"]`,
 					),
 			),
 		getConnectionActionsBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
@@ -185,7 +200,7 @@ export class WorkflowPage extends BasePage {
 					),
 				() =>
 					cy.get(
-						`[data-test-id="edge-label-wrapper"][data-source-node-name="${sourceNodeName}"][data-target-node-name="${targetNodeName}"] [data-test-id="canvas-edge-toolbar"]`,
+						`[data-test-id="edge-label"][data-source-node-name="${sourceNodeName}"][data-target-node-name="${targetNodeName}"] [data-test-id="canvas-edge-toolbar"]`,
 					),
 			),
 		addStickyButton: () => cy.getByTestId('add-sticky-button'),
@@ -271,14 +286,14 @@ export class WorkflowPage extends BasePage {
 		},
 		openContextMenu: (
 			nodeTypeName?: string,
-			method: 'right-click' | 'overflow-button' = 'right-click',
+			{ method = 'right-click', anchor = 'center' }: OpenContextMenuOptions = {},
 		) => {
 			const target = nodeTypeName
 				? this.getters.canvasNodeByName(nodeTypeName)
 				: this.getters.nodeViewBackground();
 
 			if (method === 'right-click') {
-				target.rightclick(nodeTypeName ? 'center' : 'topLeft', { force: true });
+				target.rightclick(nodeTypeName ? anchor : 'topLeft', { force: true });
 			} else {
 				target.realHover();
 				target.find('[data-test-id="overflow-node-button"]').click({ force: true });
@@ -295,8 +310,8 @@ export class WorkflowPage extends BasePage {
 			this.actions.openContextMenu(nodeTypeName);
 			this.actions.contextMenuAction('delete');
 		},
-		executeNode: (nodeTypeName: string) => {
-			this.actions.openContextMenu(nodeTypeName);
+		executeNode: (nodeTypeName: string, options?: OpenContextMenuOptions) => {
+			this.actions.openContextMenu(nodeTypeName, options);
 			this.actions.contextMenuAction('execute');
 		},
 		addStickyFromContextMenu: () => {
@@ -323,7 +338,7 @@ export class WorkflowPage extends BasePage {
 			this.actions.contextMenuAction('toggle_pin');
 		},
 		openNodeFromContextMenu: (nodeTypeName: string) => {
-			this.actions.openContextMenu(nodeTypeName, 'overflow-button');
+			this.actions.openContextMenu(nodeTypeName, { method: 'overflow-button' });
 			this.actions.contextMenuAction('open');
 		},
 		selectAllFromContextMenu: () => {
@@ -331,8 +346,14 @@ export class WorkflowPage extends BasePage {
 			this.actions.contextMenuAction('select_all');
 		},
 		deselectAll: () => {
-			this.actions.openContextMenu();
-			this.actions.contextMenuAction('deselect_all');
+			cy.ifCanvasVersion(
+				() => {
+					this.actions.openContextMenu();
+					this.actions.contextMenuAction('deselect_all');
+				},
+				// rightclick doesn't work with vueFlow canvas
+				() => this.getters.nodeViewBackground().click('topLeft'),
+			);
 		},
 		openExpressionEditorModal: () => {
 			cy.contains('Expression').invoke('show').click();
diff --git a/cypress/pages/workflows.ts b/cypress/pages/workflows.ts
index 5829ecb863..7441bfa256 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -1,5 +1,13 @@
 import { BasePage } from './base';
 
+/**
+ * @deprecated Use functional composables from @composables instead.
+ * If a composable doesn't exist for your use case, please create a new one in:
+ * cypress/composables
+ *
+ * This class-based approach is being phased out in favor of more modular functional composables.
+ * Each getter and action in this class should be moved to individual composable functions.
+ */
 export class WorkflowsPage extends BasePage {
 	url = '/home/workflows';
 
@@ -7,7 +15,10 @@ export class WorkflowsPage extends BasePage {
 		newWorkflowButtonCard: () => cy.getByTestId('new-workflow-card'),
 		newWorkflowTemplateCard: () => cy.getByTestId('new-workflow-template-card'),
 		searchBar: () => cy.getByTestId('resources-list-search'),
-		createWorkflowButton: () => cy.getByTestId('resources-list-add'),
+		createWorkflowButton: () => {
+			cy.getByTestId('add-resource-workflow').should('be.visible');
+			return cy.getByTestId('add-resource-workflow');
+		},
 		workflowCards: () => cy.getByTestId('resources-list-item'),
 		workflowCard: (workflowName: string) =>
 			this.getters
@@ -16,6 +27,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/scripts/run-e2e.js b/cypress/scripts/run-e2e.js
index 8096a70caf..6819d6c824 100755
--- a/cypress/scripts/run-e2e.js
+++ b/cypress/scripts/run-e2e.js
@@ -57,6 +57,17 @@ switch (scenario) {
 			},
 		});
 		break;
+	case 'dev:v2':
+		runTests({
+			startCommand: 'develop',
+			url: 'http://localhost:8080/favicon.ico',
+			testCommand: 'cypress open',
+			customEnv: {
+				CYPRESS_NODE_VIEW_VERSION: 2,
+				CYPRESS_BASE_URL: 'http://localhost:8080',
+			},
+		});
+		break;
 	case 'all':
 		const specSuiteFilter = process.argv[3];
 		const specParam = specSuiteFilter ? ` --spec **/*${specSuiteFilter}*` : '';
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 6cad68b34f..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');
 				});
 			});
 	});
@@ -177,6 +182,16 @@ Cypress.Commands.add('drag', (selector, pos, options) => {
 				pageY: newPosition.y,
 				force: true,
 			});
+			if (options?.moveTwice) {
+				// first move like hover to trigger object to be visible
+				// like in main panel in ndv
+				element.trigger('mousemove', {
+					which: 1,
+					pageX: newPosition.x,
+					pageY: newPosition.y,
+					force: true,
+				});
+			}
 			if (options?.clickToFinish) {
 				// Click to finish the drag
 				// For some reason, mouseup isn't working when moving nodes
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/support/index.ts b/cypress/support/index.ts
index 2fd1faeb22..864e64f1c4 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -1,7 +1,7 @@
 // Load type definitions that come with Cypress module
 /// <reference types="cypress" />
 
-import type { FrontendSettings } from '@n8n/api-types';
+import type { FrontendSettings, PushPayload, PushType } from '@n8n/api-types';
 
 Cypress.Keyboard.defaults({
 	keystrokeDelay: 0,
@@ -59,14 +59,20 @@ declare global {
 			drag(
 				selector: string | Chainable<JQuery<HTMLElement>>,
 				target: [number, number],
-				options?: { abs?: boolean; index?: number; realMouse?: boolean; clickToFinish?: boolean },
+				options?: {
+					abs?: boolean;
+					index?: number;
+					realMouse?: boolean;
+					clickToFinish?: boolean;
+					moveTwice?: boolean;
+				},
 			): void;
 			draganddrop(
 				draggableSelector: string,
 				droppableSelector: string,
 				options?: Partial<DragAndDropOptions>,
 			): void;
-			push(type: string, data: unknown): void;
+			push<Type extends PushType>(type: Type, data: PushPayload<Type>): void;
 			shouldNotHaveConsoleErrors(): void;
 			window(): Chainable<
 				AUTWindow & {
diff --git a/cypress/types.ts b/cypress/types.ts
index 6186c4201d..63f2ddb99e 100644
--- a/cypress/types.ts
+++ b/cypress/types.ts
@@ -22,3 +22,8 @@ export interface ExecutionResponse {
 		results: Execution[];
 	};
 }
+
+export type OpenContextMenuOptions = {
+	method?: 'right-click' | 'overflow-button';
+	anchor?: 'topRight' | 'topLeft' | 'center' | 'bottomRight' | 'bottomLeft';
+};
diff --git a/cypress/utils/executions.ts b/cypress/utils/executions.ts
index 0b4814fdc9..11eb5bba2c 100644
--- a/cypress/utils/executions.ts
+++ b/cypress/utils/executions.ts
@@ -1,4 +1,5 @@
-import type { IDataObject, IPinData, ITaskData, ITaskDataConnections } from 'n8n-workflow';
+import { stringify } from 'flatted';
+import type { IDataObject, ITaskData, ITaskDataConnections } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
 import { clickExecuteWorkflowButton } from '../composables/workflow';
@@ -16,7 +17,7 @@ export function createMockNodeExecutionData(
 	return {
 		[name]: {
 			startTime: new Date().getTime(),
-			executionTime: 0,
+			executionTime: 1,
 			executionStatus,
 			data: jsonData
 				? Object.keys(jsonData).reduce((acc, key) => {
@@ -33,61 +34,23 @@ export function createMockNodeExecutionData(
 					}, {} as ITaskDataConnections)
 				: data,
 			source: [null],
+			inputOverride,
 			...rest,
 		},
 	};
 }
 
-export function createMockWorkflowExecutionData({
-	executionId,
-	runData,
-	pinData = {},
-	lastNodeExecuted,
-}: {
-	executionId: string;
-	runData: Record<string, ITaskData | ITaskData[]>;
-	pinData?: IPinData;
-	lastNodeExecuted: string;
-}) {
-	return {
-		executionId,
-		data: {
-			data: {
-				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,
 	runData,
-	workflowExecutionData,
 }: {
 	trigger?: () => void;
 	lastNodeExecuted: string;
 	runData: Array<ReturnType<typeof createMockNodeExecutionData>>;
-	workflowExecutionData?: ReturnType<typeof createMockWorkflowExecutionData>;
 }) {
-	const executionId = nanoid(8);
+	const workflowId = nanoid();
+	const executionId = Math.floor(Math.random() * 1_000_000).toString();
 
 	cy.intercept('POST', '/rest/workflows/**/run?**', {
 		statusCode: 201,
@@ -124,13 +87,24 @@ export function runMockWorkflowExecution({
 		resolvedRunData[nodeName] = nodeExecution[nodeName];
 	});
 
-	cy.push(
-		'executionFinished',
-		createMockWorkflowExecutionData({
-			executionId,
-			lastNodeExecuted,
-			runData: resolvedRunData,
-			...workflowExecutionData,
+	cy.push('executionFinished', {
+		executionId,
+		workflowId,
+		status: 'success',
+		rawData: stringify({
+			startData: {},
+			resultData: {
+				runData,
+				pinData: {},
+				lastNodeExecuted,
+			},
+			executionData: {
+				contextData: {},
+				nodeExecutionStack: [],
+				metadata: {},
+				waitingExecution: {},
+				waitingExecutionSource: {},
+			},
 		}),
-	);
+	});
 }
diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
index 78eedaa2c3..13592140a4 100644
--- a/docker/images/n8n-custom/Dockerfile
+++ b/docker/images/n8n-custom/Dockerfile
@@ -33,27 +33,22 @@ COPY docker/images/n8n/docker-entrypoint.sh /
 
 # Setup the Task Runner Launcher
 ARG TARGETPLATFORM
-ARG LAUNCHER_VERSION=0.1.1
-ENV N8N_RUNNERS_MODE=internal_launcher \
-    N8N_RUNNERS_LAUNCHER_PATH=/usr/local/bin/task-runner-launcher
+ARG LAUNCHER_VERSION=1.1.0
 COPY docker/images/n8n/n8n-task-runners.json /etc/n8n-task-runners.json
-# First, download, verify, then extract the launcher binary
-# Second, chmod with 4555 to allow the use of setuid
-# Third, create a new user and group to execute the Task Runners under
+# Download, verify, then extract the launcher binary
 RUN \
-	if [[ "$TARGETPLATFORM" = "linux/amd64" ]]; then export ARCH_NAME="x86_64"; \
-	elif [[ "$TARGETPLATFORM" = "linux/arm64" ]]; then export ARCH_NAME="aarch64"; fi; \
+	if [[ "$TARGETPLATFORM" = "linux/amd64" ]]; then export ARCH_NAME="amd64"; \
+	elif [[ "$TARGETPLATFORM" = "linux/arm64" ]]; then export ARCH_NAME="arm64"; fi; \
 	mkdir /launcher-temp && \
 	cd /launcher-temp && \
-	wget https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-$ARCH_NAME-unknown-linux-musl.zip && \
-	wget https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-$ARCH_NAME-unknown-linux-musl.sha256 && \
-	sha256sum -c task-runner-launcher-$ARCH_NAME-unknown-linux-musl.sha256 && \
-	unzip -d $(dirname ${N8N_RUNNERS_LAUNCHER_PATH}) task-runner-launcher-$ARCH_NAME-unknown-linux-musl.zip task-runner-launcher && \
+	wget https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz && \
+	wget https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz.sha256 && \
+	# The .sha256 does not contain the filename --> Form the correct checksum file
+	echo "$(cat task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz.sha256) task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz" > checksum.sha256 && \
+	sha256sum -c checksum.sha256 && \
+	tar xvf task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz --directory=/usr/local/bin && \
 	cd - && \
-	rm -r /launcher-temp && \
-	chmod 4555 ${N8N_RUNNERS_LAUNCHER_PATH} && \
-	addgroup -g 2000 task-runner && \
-	adduser -D -u 2000 -g "Task Runner User" -G task-runner task-runner
+	rm -r /launcher-temp
 
 RUN \
 	cd /usr/local/lib/node_modules/n8n && \
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index 8a94d0c9ec..10720c63f2 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -24,27 +24,22 @@ RUN set -eux; \
 
 # Setup the Task Runner Launcher
 ARG TARGETPLATFORM
-ARG LAUNCHER_VERSION=0.1.1
-ENV N8N_RUNNERS_MODE=internal_launcher \
-    N8N_RUNNERS_LAUNCHER_PATH=/usr/local/bin/task-runner-launcher
+ARG LAUNCHER_VERSION=1.1.0
 COPY n8n-task-runners.json /etc/n8n-task-runners.json
-# First, download, verify, then extract the launcher binary
-# Second, chmod with 4555 to allow the use of setuid
-# Third, create a new user and group to execute the Task Runners under
+# Download, verify, then extract the launcher binary
 RUN \
-	if [[ "$TARGETPLATFORM" = "linux/amd64" ]]; then export ARCH_NAME="x86_64"; \
-	elif [[ "$TARGETPLATFORM" = "linux/arm64" ]]; then export ARCH_NAME="aarch64"; fi; \
+	if [[ "$TARGETPLATFORM" = "linux/amd64" ]]; then export ARCH_NAME="amd64"; \
+	elif [[ "$TARGETPLATFORM" = "linux/arm64" ]]; then export ARCH_NAME="arm64"; fi; \
 	mkdir /launcher-temp && \
 	cd /launcher-temp && \
-	wget https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-$ARCH_NAME-unknown-linux-musl.zip && \
-	wget https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-$ARCH_NAME-unknown-linux-musl.sha256 && \
-	sha256sum -c task-runner-launcher-$ARCH_NAME-unknown-linux-musl.sha256 && \
-	unzip -d $(dirname ${N8N_RUNNERS_LAUNCHER_PATH}) task-runner-launcher-$ARCH_NAME-unknown-linux-musl.zip task-runner-launcher && \
+	wget https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz && \
+	wget https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz.sha256 && \
+	# The .sha256 does not contain the filename --> Form the correct checksum file
+	echo "$(cat task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz.sha256) task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz" > checksum.sha256 && \
+	sha256sum -c checksum.sha256 && \
+	tar xvf task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz --directory=/usr/local/bin && \
 	cd - && \
-	rm -r /launcher-temp && \
-	chmod 4555 ${N8N_RUNNERS_LAUNCHER_PATH} && \
-	addgroup -g 2000 task-runner && \
-	adduser -D -u 2000 -g "Task Runner User" -G task-runner task-runner
+	rm -r /launcher-temp
 
 COPY docker-entrypoint.sh /
 
diff --git a/docker/images/n8n/README.md b/docker/images/n8n/README.md
index f7b45f9467..73dbb7557b 100644
--- a/docker/images/n8n/README.md
+++ b/docker/images/n8n/README.md
@@ -73,7 +73,7 @@ docker run -it --rm \
  -p 5678:5678 \
  -v ~/.n8n:/home/node/.n8n \
  docker.n8n.io/n8nio/n8n \
- n8n start --tunnel
+ start --tunnel
 ```
 
 ## Persist data
diff --git a/docker/images/n8n/n8n-task-runners.json b/docker/images/n8n/n8n-task-runners.json
index 56a48b2d09..a26053e5e2 100644
--- a/docker/images/n8n/n8n-task-runners.json
+++ b/docker/images/n8n/n8n-task-runners.json
@@ -2,19 +2,32 @@
 	"task-runners": [
 		{
 			"runner-type": "javascript",
-			"workdir": "/home/task-runner",
+			"workdir": "/home/node",
 			"command": "/usr/local/bin/node",
-			"args": ["/usr/local/lib/node_modules/n8n/node_modules/@n8n/task-runner/dist/start.js"],
+			"args": [
+				"--disallow-code-generation-from-strings",
+				"--disable-proto=delete",
+				"/usr/local/lib/node_modules/n8n/node_modules/@n8n/task-runner/dist/start.js"
+			],
 			"allowed-env": [
 				"PATH",
+				"GENERIC_TIMEZONE",
 				"N8N_RUNNERS_GRANT_TOKEN",
-				"N8N_RUNNERS_N8N_URI",
+				"N8N_RUNNERS_TASK_BROKER_URI",
 				"N8N_RUNNERS_MAX_PAYLOAD",
+				"N8N_RUNNERS_MAX_CONCURRENCY",
+				"N8N_RUNNERS_TASK_TIMEOUT",
+				"N8N_RUNNERS_HEALTH_CHECK_SERVER_ENABLED",
+				"N8N_RUNNERS_HEALTH_CHECK_SERVER_HOST",
+				"N8N_RUNNERS_HEALTH_CHECK_SERVER_PORT",
 				"NODE_FUNCTION_ALLOW_BUILTIN",
-				"NODE_FUNCTION_ALLOW_EXTERNAL"
-			],
-			"uid": 2000,
-			"gid": 2000
+				"NODE_FUNCTION_ALLOW_EXTERNAL",
+				"NODE_OPTIONS",
+				"N8N_SENTRY_DSN",
+				"N8N_VERSION",
+				"ENVIRONMENT",
+				"DEPLOYMENT_NAME"
+			]
 		}
 	]
 }
diff --git a/package.json b/package.json
index 09c576a8c3..3e05dba4c0 100644
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
   "name": "n8n-monorepo",
-  "version": "1.65.0",
+  "version": "1.75.0",
   "private": true,
   "engines": {
     "node": ">=20.15",
-    "pnpm": ">=9.5"
+    "pnpm": ">=9.15"
   },
-  "packageManager": "pnpm@9.6.0",
+  "packageManager": "pnpm@9.15.1",
   "scripts": {
     "prepare": "node scripts/prepare.mjs",
     "preinstall": "node scripts/block-npm-install.js",
@@ -16,7 +16,13 @@
     "build:nodes": "turbo run build:nodes",
     "typecheck": "turbo typecheck",
     "dev": "turbo run dev --parallel --env-mode=loose --filter=!n8n-design-system --filter=!@n8n/chat --filter=!@n8n/task-runner",
+    "dev:be": "turbo run dev --parallel --env-mode=loose --filter=!n8n-design-system --filter=!@n8n/chat --filter=!@n8n/task-runner --filter=!n8n-editor-ui",
     "dev:ai": "turbo run dev --parallel --env-mode=loose --filter=@n8n/nodes-langchain --filter=n8n --filter=n8n-core",
+    "dev:fe": "run-p start \"dev:fe:editor --filter=n8n-design-system\"",
+    "dev:fe:editor": "turbo run dev --parallel --env-mode=loose --filter=n8n-editor-ui",
+    "dev:e2e": "cd cypress && pnpm run test:e2e:dev",
+    "dev:e2e:v2": "cd cypress && pnpm run test:e2e:dev:v2",
+    "dev:e2e:server": "run-p start dev:fe:editor",
     "clean": "turbo run clean --parallel",
     "reset": "node scripts/ensure-zx.mjs && zx scripts/reset.mjs",
     "format": "turbo run format && node scripts/format.mjs",
@@ -45,6 +51,7 @@
     "@types/jest": "^29.5.3",
     "@types/node": "*",
     "@types/supertest": "^6.0.2",
+    "cross-env": "^7.0.3",
     "jest": "^29.6.2",
     "jest-environment-jsdom": "^29.6.2",
     "jest-expect-message": "^1.1.3",
@@ -53,6 +60,7 @@
     "lefthook": "^1.7.15",
     "nock": "^13.3.2",
     "nodemon": "^3.0.1",
+    "npm-run-all2": "^7.0.2",
     "p-limit": "^3.1.0",
     "rimraf": "^5.0.1",
     "run-script-os": "^1.0.7",
@@ -60,7 +68,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"
   },
@@ -77,19 +85,18 @@
       "semver": "^7.5.4",
       "tslib": "^2.6.2",
       "tsconfig-paths": "^4.2.0",
-      "typescript": "^5.6.2",
-      "vue-tsc": "^2.1.6",
+      "typescript": "^5.7.2",
+      "vue-tsc": "^2.1.10",
       "ws": ">=8.17.1"
     },
     "patchedDependencies": {
-      "typedi@0.10.0": "patches/typedi@0.10.0.patch",
-      "@sentry/cli@2.36.2": "patches/@sentry__cli@2.36.2.patch",
+      "bull@4.12.1": "patches/bull@4.12.1.patch",
       "pkce-challenge@3.0.0": "patches/pkce-challenge@3.0.0.patch",
       "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",
-      "@langchain/core@0.3.3": "patches/@langchain__core@0.3.3.patch"
+      "vue-tsc@2.1.10": "patches/vue-tsc@2.1.10.patch"
     }
   }
 }
diff --git a/packages/@n8n/api-types/package.json b/packages/@n8n/api-types/package.json
index 0c4440eb6b..1255320c5a 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.5.0",
+  "version": "0.13.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
@@ -21,11 +21,12 @@
     "dist/**/*"
   ],
   "devDependencies": {
+    "@n8n/config": "workspace:*",
     "n8n-workflow": "workspace:*"
   },
   "dependencies": {
     "xss": "catalog:",
     "zod": "catalog:",
-    "zod-class": "0.0.15"
+    "zod-class": "0.0.16"
   }
 }
diff --git a/packages/@n8n/api-types/src/dto/ai/__tests__/ai-apply-suggestion-request.dto.test.ts b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-apply-suggestion-request.dto.test.ts
new file mode 100644
index 0000000000..568900e409
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-apply-suggestion-request.dto.test.ts
@@ -0,0 +1,36 @@
+import { AiApplySuggestionRequestDto } from '../ai-apply-suggestion-request.dto';
+
+describe('AiApplySuggestionRequestDto', () => {
+	it('should validate a valid suggestion application request', () => {
+		const validRequest = {
+			sessionId: 'session-123',
+			suggestionId: 'suggestion-456',
+		};
+
+		const result = AiApplySuggestionRequestDto.safeParse(validRequest);
+
+		expect(result.success).toBe(true);
+	});
+
+	it('should fail if sessionId is missing', () => {
+		const invalidRequest = {
+			suggestionId: 'suggestion-456',
+		};
+
+		const result = AiApplySuggestionRequestDto.safeParse(invalidRequest);
+
+		expect(result.success).toBe(false);
+		expect(result.error?.issues[0].path).toEqual(['sessionId']);
+	});
+
+	it('should fail if suggestionId is missing', () => {
+		const invalidRequest = {
+			sessionId: 'session-123',
+		};
+
+		const result = AiApplySuggestionRequestDto.safeParse(invalidRequest);
+
+		expect(result.success).toBe(false);
+		expect(result.error?.issues[0].path).toEqual(['suggestionId']);
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/ai/__tests__/ai-ask-request.dto.test.ts b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-ask-request.dto.test.ts
new file mode 100644
index 0000000000..a87eb5f3a4
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-ask-request.dto.test.ts
@@ -0,0 +1,252 @@
+import { AiAskRequestDto } from '../ai-ask-request.dto';
+
+describe('AiAskRequestDto', () => {
+	const validRequest = {
+		question: 'How can I improve this workflow?',
+		context: {
+			schema: [
+				{
+					nodeName: 'TestNode',
+					schema: {
+						type: 'string',
+						key: 'testKey',
+						value: 'testValue',
+						path: '/test/path',
+					},
+				},
+			],
+			inputSchema: {
+				nodeName: 'InputNode',
+				schema: {
+					type: 'object',
+					key: 'inputKey',
+					value: [
+						{
+							type: 'string',
+							key: 'nestedKey',
+							value: 'nestedValue',
+							path: '/nested/path',
+						},
+					],
+					path: '/input/path',
+				},
+			},
+			pushRef: 'push-123',
+			ndvPushRef: 'ndv-push-456',
+		},
+		forNode: 'TestWorkflowNode',
+	};
+
+	it('should validate a valid AI ask request', () => {
+		const result = AiAskRequestDto.safeParse(validRequest);
+
+		expect(result.success).toBe(true);
+	});
+
+	it('should fail if question is missing', () => {
+		const invalidRequest = {
+			...validRequest,
+			question: undefined,
+		};
+
+		const result = AiAskRequestDto.safeParse(invalidRequest);
+
+		expect(result.success).toBe(false);
+		expect(result.error?.issues[0].path).toEqual(['question']);
+	});
+
+	it('should fail if context is invalid', () => {
+		const invalidRequest = {
+			...validRequest,
+			context: {
+				...validRequest.context,
+				schema: [
+					{
+						nodeName: 'TestNode',
+						schema: {
+							type: 'invalid-type', // Invalid type
+							value: 'testValue',
+							path: '/test/path',
+						},
+					},
+				],
+			},
+		};
+
+		const result = AiAskRequestDto.safeParse(invalidRequest);
+
+		expect(result.success).toBe(false);
+	});
+
+	it('should fail if forNode is missing', () => {
+		const invalidRequest = {
+			...validRequest,
+			forNode: undefined,
+		};
+
+		const result = AiAskRequestDto.safeParse(invalidRequest);
+
+		expect(result.success).toBe(false);
+		expect(result.error?.issues[0].path).toEqual(['forNode']);
+	});
+
+	it('should validate all possible schema types', () => {
+		const allTypesRequest = {
+			question: 'Test all possible types',
+			context: {
+				schema: [
+					{
+						nodeName: 'AllTypesNode',
+						schema: {
+							type: 'object',
+							key: 'typesRoot',
+							value: [
+								{ type: 'string', key: 'stringType', value: 'string', path: '/types/string' },
+								{ type: 'number', key: 'numberType', value: 'number', path: '/types/number' },
+								{ type: 'boolean', key: 'booleanType', value: 'boolean', path: '/types/boolean' },
+								{ type: 'bigint', key: 'bigintType', value: 'bigint', path: '/types/bigint' },
+								{ type: 'symbol', key: 'symbolType', value: 'symbol', path: '/types/symbol' },
+								{ type: 'array', key: 'arrayType', value: [], path: '/types/array' },
+								{ type: 'object', key: 'objectType', value: [], path: '/types/object' },
+								{
+									type: 'function',
+									key: 'functionType',
+									value: 'function',
+									path: '/types/function',
+								},
+								{ type: 'null', key: 'nullType', value: 'null', path: '/types/null' },
+								{
+									type: 'undefined',
+									key: 'undefinedType',
+									value: 'undefined',
+									path: '/types/undefined',
+								},
+							],
+							path: '/types/root',
+						},
+					},
+				],
+				inputSchema: {
+					nodeName: 'InputNode',
+					schema: {
+						type: 'object',
+						key: 'simpleInput',
+						value: [
+							{
+								type: 'string',
+								key: 'simpleKey',
+								value: 'simpleValue',
+								path: '/simple/path',
+							},
+						],
+						path: '/simple/input/path',
+					},
+				},
+				pushRef: 'push-types-123',
+				ndvPushRef: 'ndv-push-types-456',
+			},
+			forNode: 'TypeCheckNode',
+		};
+
+		const result = AiAskRequestDto.safeParse(allTypesRequest);
+		expect(result.success).toBe(true);
+	});
+
+	it('should fail with invalid type', () => {
+		const invalidTypeRequest = {
+			question: 'Test invalid type',
+			context: {
+				schema: [
+					{
+						nodeName: 'InvalidTypeNode',
+						schema: {
+							type: 'invalid-type', // This should fail
+							key: 'invalidKey',
+							value: 'invalidValue',
+							path: '/invalid/path',
+						},
+					},
+				],
+				inputSchema: {
+					nodeName: 'InputNode',
+					schema: {
+						type: 'object',
+						key: 'simpleInput',
+						value: [
+							{
+								type: 'string',
+								key: 'simpleKey',
+								value: 'simpleValue',
+								path: '/simple/path',
+							},
+						],
+						path: '/simple/input/path',
+					},
+				},
+				pushRef: 'push-invalid-123',
+				ndvPushRef: 'ndv-push-invalid-456',
+			},
+			forNode: 'InvalidTypeNode',
+		};
+
+		const result = AiAskRequestDto.safeParse(invalidTypeRequest);
+		expect(result.success).toBe(false);
+	});
+
+	it('should validate multiple schema entries', () => {
+		const multiSchemaRequest = {
+			question: 'Multiple schema test',
+			context: {
+				schema: [
+					{
+						nodeName: 'FirstNode',
+						schema: {
+							type: 'string',
+							key: 'firstKey',
+							value: 'firstValue',
+							path: '/first/path',
+						},
+					},
+					{
+						nodeName: 'SecondNode',
+						schema: {
+							type: 'object',
+							key: 'secondKey',
+							value: [
+								{
+									type: 'number',
+									key: 'nestedKey',
+									value: 'nestedValue',
+									path: '/second/nested/path',
+								},
+							],
+							path: '/second/path',
+						},
+					},
+				],
+				inputSchema: {
+					nodeName: 'InputNode',
+					schema: {
+						type: 'object',
+						key: 'simpleInput',
+						value: [
+							{
+								type: 'string',
+								key: 'simpleKey',
+								value: 'simpleValue',
+								path: '/simple/path',
+							},
+						],
+						path: '/simple/input/path',
+					},
+				},
+				pushRef: 'push-multi-123',
+				ndvPushRef: 'ndv-push-multi-456',
+			},
+			forNode: 'MultiSchemaNode',
+		};
+
+		const result = AiAskRequestDto.safeParse(multiSchemaRequest);
+		expect(result.success).toBe(true);
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/ai/__tests__/ai-chat-request.dto.test.ts b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-chat-request.dto.test.ts
new file mode 100644
index 0000000000..ce1ccffac5
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-chat-request.dto.test.ts
@@ -0,0 +1,34 @@
+import { AiChatRequestDto } from '../ai-chat-request.dto';
+
+describe('AiChatRequestDto', () => {
+	it('should validate a request with a payload and session ID', () => {
+		const validRequest = {
+			payload: { someKey: 'someValue' },
+			sessionId: 'session-123',
+		};
+
+		const result = AiChatRequestDto.safeParse(validRequest);
+
+		expect(result.success).toBe(true);
+	});
+
+	it('should validate a request with only a payload', () => {
+		const validRequest = {
+			payload: { complexObject: { nested: 'value' } },
+		};
+
+		const result = AiChatRequestDto.safeParse(validRequest);
+
+		expect(result.success).toBe(true);
+	});
+
+	it('should fail if payload is missing', () => {
+		const invalidRequest = {
+			sessionId: 'session-123',
+		};
+
+		const result = AiChatRequestDto.safeParse(invalidRequest);
+
+		expect(result.success).toBe(false);
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/ai/__tests__/ai-free-credits-request.dto.test.ts b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-free-credits-request.dto.test.ts
new file mode 100644
index 0000000000..2b61eeaee9
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/ai/__tests__/ai-free-credits-request.dto.test.ts
@@ -0,0 +1,32 @@
+import { nanoId } from 'minifaker';
+
+import { AiFreeCreditsRequestDto } from '../ai-free-credits-request.dto';
+import 'minifaker/locales/en';
+
+describe('AiChatRequestDto', () => {
+	it('should succeed if projectId is a valid nanoid', () => {
+		const validRequest = {
+			projectId: nanoId.nanoid(),
+		};
+
+		const result = AiFreeCreditsRequestDto.safeParse(validRequest);
+
+		expect(result.success).toBe(true);
+	});
+
+	it('should succeed if no projectId is sent', () => {
+		const result = AiFreeCreditsRequestDto.safeParse({});
+
+		expect(result.success).toBe(true);
+	});
+
+	it('should fail is projectId invalid value', () => {
+		const validRequest = {
+			projectId: '',
+		};
+
+		const result = AiFreeCreditsRequestDto.safeParse(validRequest);
+
+		expect(result.success).toBe(false);
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/ai/ai-apply-suggestion-request.dto.ts b/packages/@n8n/api-types/src/dto/ai/ai-apply-suggestion-request.dto.ts
new file mode 100644
index 0000000000..cc808dfd24
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/ai/ai-apply-suggestion-request.dto.ts
@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class AiApplySuggestionRequestDto extends Z.class({
+	sessionId: z.string(),
+	suggestionId: z.string(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/ai/ai-ask-request.dto.ts b/packages/@n8n/api-types/src/dto/ai/ai-ask-request.dto.ts
new file mode 100644
index 0000000000..9039243e05
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/ai/ai-ask-request.dto.ts
@@ -0,0 +1,53 @@
+import type { AiAssistantSDK, SchemaType } from '@n8n_io/ai-assistant-sdk';
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+// Note: This is copied from the sdk, since this type is not exported
+type Schema = {
+	type: SchemaType;
+	key?: string;
+	value: string | Schema[];
+	path: string;
+};
+
+// Create a lazy validator to handle the recursive type
+const schemaValidator: z.ZodType<Schema> = z.lazy(() =>
+	z.object({
+		type: z.enum([
+			'string',
+			'number',
+			'boolean',
+			'bigint',
+			'symbol',
+			'array',
+			'object',
+			'function',
+			'null',
+			'undefined',
+		]),
+		key: z.string().optional(),
+		value: z.union([z.string(), z.lazy(() => schemaValidator.array())]),
+		path: z.string(),
+	}),
+);
+
+export class AiAskRequestDto
+	extends Z.class({
+		question: z.string(),
+		context: z.object({
+			schema: z.array(
+				z.object({
+					nodeName: z.string(),
+					schema: schemaValidator,
+				}),
+			),
+			inputSchema: z.object({
+				nodeName: z.string(),
+				schema: schemaValidator,
+			}),
+			pushRef: z.string(),
+			ndvPushRef: z.string(),
+		}),
+		forNode: z.string(),
+	})
+	implements AiAssistantSDK.AskAiRequestPayload {}
diff --git a/packages/@n8n/api-types/src/dto/ai/ai-chat-request.dto.ts b/packages/@n8n/api-types/src/dto/ai/ai-chat-request.dto.ts
new file mode 100644
index 0000000000..59e7a26aa3
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/ai/ai-chat-request.dto.ts
@@ -0,0 +1,10 @@
+import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class AiChatRequestDto
+	extends Z.class({
+		payload: z.object({}).passthrough(), // Allow any object shape
+		sessionId: z.string().optional(),
+	})
+	implements AiAssistantSDK.ChatRequestPayload {}
diff --git a/packages/@n8n/api-types/src/dto/ai/ai-free-credits-request.dto.ts b/packages/@n8n/api-types/src/dto/ai/ai-free-credits-request.dto.ts
new file mode 100644
index 0000000000..9f9120d417
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/ai/ai-free-credits-request.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class AiFreeCreditsRequestDto extends Z.class({
+	projectId: z.string().min(1).optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/auth/__tests__/login-request.dto.test.ts b/packages/@n8n/api-types/src/dto/auth/__tests__/login-request.dto.test.ts
new file mode 100644
index 0000000000..f222f1d93e
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/auth/__tests__/login-request.dto.test.ts
@@ -0,0 +1,93 @@
+import { LoginRequestDto } from '../login-request.dto';
+
+describe('LoginRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'complete valid login request',
+				request: {
+					email: 'test@example.com',
+					password: 'securePassword123',
+					mfaCode: '123456',
+				},
+			},
+			{
+				name: 'login request without optional MFA',
+				request: {
+					email: 'test@example.com',
+					password: 'securePassword123',
+				},
+			},
+			{
+				name: 'login request with both mfaCode and mfaRecoveryCode',
+				request: {
+					email: 'test@example.com',
+					password: 'securePassword123',
+					mfaCode: '123456',
+					mfaRecoveryCode: 'recovery-code-123',
+				},
+			},
+			{
+				name: 'login request with only mfaRecoveryCode',
+				request: {
+					email: 'test@example.com',
+					password: 'securePassword123',
+					mfaRecoveryCode: 'recovery-code-123',
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = LoginRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid email',
+				request: {
+					email: 'invalid-email',
+					password: 'securePassword123',
+				},
+				expectedErrorPath: ['email'],
+			},
+			{
+				name: 'empty password',
+				request: {
+					email: 'test@example.com',
+					password: '',
+				},
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'missing email',
+				request: {
+					password: 'securePassword123',
+				},
+				expectedErrorPath: ['email'],
+			},
+			{
+				name: 'missing password',
+				request: {
+					email: 'test@example.com',
+				},
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'whitespace in email and password',
+				request: {
+					email: '  test@example.com  ',
+					password: '  securePassword123  ',
+				},
+				expectedErrorPath: ['email'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = LoginRequestDto.safeParse(request);
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/auth/__tests__/resolve-signup-token-query.dto.test.ts b/packages/@n8n/api-types/src/dto/auth/__tests__/resolve-signup-token-query.dto.test.ts
new file mode 100644
index 0000000000..218fe9107a
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/auth/__tests__/resolve-signup-token-query.dto.test.ts
@@ -0,0 +1,87 @@
+import { ResolveSignupTokenQueryDto } from '../resolve-signup-token-query.dto';
+
+describe('ResolveSignupTokenQueryDto', () => {
+	const validUuid = '123e4567-e89b-12d3-a456-426614174000';
+
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'standard UUID',
+				request: {
+					inviterId: validUuid,
+					inviteeId: validUuid,
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = ResolveSignupTokenQueryDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid inviterId UUID',
+				request: {
+					inviterId: 'not-a-valid-uuid',
+					inviteeId: validUuid,
+				},
+				expectedErrorPath: ['inviterId'],
+			},
+			{
+				name: 'invalid inviteeId UUID',
+				request: {
+					inviterId: validUuid,
+					inviteeId: 'not-a-valid-uuid',
+				},
+				expectedErrorPath: ['inviteeId'],
+			},
+			{
+				name: 'missing inviterId',
+				request: {
+					inviteeId: validUuid,
+				},
+				expectedErrorPath: ['inviterId'],
+			},
+			{
+				name: 'missing inviteeId',
+				request: {
+					inviterId: validUuid,
+				},
+				expectedErrorPath: ['inviteeId'],
+			},
+			{
+				name: 'UUID with invalid characters',
+				request: {
+					inviterId: '123e4567-e89b-12d3-a456-42661417400G',
+					inviteeId: validUuid,
+				},
+				expectedErrorPath: ['inviterId'],
+			},
+			{
+				name: 'UUID too long',
+				request: {
+					inviterId: '123e4567-e89b-12d3-a456-426614174001234',
+					inviteeId: validUuid,
+				},
+				expectedErrorPath: ['inviterId'],
+			},
+			{
+				name: 'UUID too short',
+				request: {
+					inviterId: '123e4567-e89b-12d3-a456',
+					inviteeId: validUuid,
+				},
+				expectedErrorPath: ['inviterId'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = ResolveSignupTokenQueryDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/auth/login-request.dto.ts b/packages/@n8n/api-types/src/dto/auth/login-request.dto.ts
new file mode 100644
index 0000000000..894263992c
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/auth/login-request.dto.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class LoginRequestDto extends Z.class({
+	email: z.string().email(),
+	password: z.string().min(1),
+	mfaCode: z.string().optional(),
+	mfaRecoveryCode: z.string().optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/auth/resolve-signup-token-query.dto.ts b/packages/@n8n/api-types/src/dto/auth/resolve-signup-token-query.dto.ts
new file mode 100644
index 0000000000..768202ff04
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/auth/resolve-signup-token-query.dto.ts
@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class ResolveSignupTokenQueryDto extends Z.class({
+	inviterId: z.string().uuid(),
+	inviteeId: z.string().uuid(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/credentials/__tests__/credentials-get-many-request.dto.test.ts b/packages/@n8n/api-types/src/dto/credentials/__tests__/credentials-get-many-request.dto.test.ts
new file mode 100644
index 0000000000..0fa074b97d
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/credentials/__tests__/credentials-get-many-request.dto.test.ts
@@ -0,0 +1,55 @@
+import { CredentialsGetManyRequestQuery } from '../credentials-get-many-request.dto';
+
+describe('CredentialsGetManyRequestQuery', () => {
+	describe('should pass validation', () => {
+		it('with empty object', () => {
+			const data = {};
+
+			const result = CredentialsGetManyRequestQuery.safeParse(data);
+
+			expect(result.success).toBe(true);
+		});
+
+		test.each([
+			{ field: 'includeScopes', value: 'true' },
+			{ field: 'includeScopes', value: 'false' },
+			{ field: 'includeData', value: 'true' },
+			{ field: 'includeData', value: 'false' },
+		])('with $field set to $value', ({ field, value }) => {
+			const data = { [field]: value };
+
+			const result = CredentialsGetManyRequestQuery.safeParse(data);
+
+			expect(result.success).toBe(true);
+		});
+
+		it('with both parameters set', () => {
+			const data = {
+				includeScopes: 'true',
+				includeData: 'true',
+			};
+
+			const result = CredentialsGetManyRequestQuery.safeParse(data);
+
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('should fail validation', () => {
+		test.each([
+			{ field: 'includeScopes', value: true },
+			{ field: 'includeScopes', value: false },
+			{ field: 'includeScopes', value: 'invalid' },
+			{ field: 'includeData', value: true },
+			{ field: 'includeData', value: false },
+			{ field: 'includeData', value: 'invalid' },
+		])('with invalid value $value for $field', ({ field, value }) => {
+			const data = { [field]: value };
+
+			const result = CredentialsGetManyRequestQuery.safeParse(data);
+
+			expect(result.success).toBe(false);
+			expect(result.error?.issues[0].path[0]).toBe(field);
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/credentials/__tests__/credentials-get-one-request.dto.test.ts b/packages/@n8n/api-types/src/dto/credentials/__tests__/credentials-get-one-request.dto.test.ts
new file mode 100644
index 0000000000..274b00b759
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/credentials/__tests__/credentials-get-one-request.dto.test.ts
@@ -0,0 +1,52 @@
+import { CredentialsGetOneRequestQuery } from '../credentials-get-one-request.dto';
+
+describe('CredentialsGetManyRequestQuery', () => {
+	describe('should pass validation', () => {
+		it('with empty object', () => {
+			const data = {};
+
+			const result = CredentialsGetOneRequestQuery.safeParse(data);
+
+			expect(result.success).toBe(true);
+			// defaults to false
+			expect(result.data?.includeData).toBe(false);
+		});
+
+		test.each([
+			{ field: 'includeData', value: 'true' },
+			{ field: 'includeData', value: 'false' },
+		])('with $field set to $value', ({ field, value }) => {
+			const data = { [field]: value };
+
+			const result = CredentialsGetOneRequestQuery.safeParse(data);
+
+			expect(result.success).toBe(true);
+		});
+
+		it('with both parameters set', () => {
+			const data = {
+				includeScopes: 'true',
+				includeData: 'true',
+			};
+
+			const result = CredentialsGetOneRequestQuery.safeParse(data);
+
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('should fail validation', () => {
+		test.each([
+			{ field: 'includeData', value: true },
+			{ field: 'includeData', value: false },
+			{ field: 'includeData', value: 'invalid' },
+		])('with invalid value $value for $field', ({ field, value }) => {
+			const data = { [field]: value };
+
+			const result = CredentialsGetOneRequestQuery.safeParse(data);
+
+			expect(result.success).toBe(false);
+			expect(result.error?.issues[0].path[0]).toBe(field);
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/credentials/credentials-get-many-request.dto.ts b/packages/@n8n/api-types/src/dto/credentials/credentials-get-many-request.dto.ts
new file mode 100644
index 0000000000..47332ca7f9
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/credentials/credentials-get-many-request.dto.ts
@@ -0,0 +1,22 @@
+import { Z } from 'zod-class';
+
+import { booleanFromString } from '../../schemas/booleanFromString';
+
+export class CredentialsGetManyRequestQuery extends Z.class({
+	/**
+	 * Adds the `scopes` field to each credential which includes all scopes the
+	 * requesting user has in relation to the credential, e.g.
+	 *     ['credential:read', 'credential:update']
+	 */
+	includeScopes: booleanFromString.optional(),
+
+	/**
+	 * Adds the decrypted `data` field to each credential.
+	 *
+	 * It only does this for credentials for which the user has the
+	 * `credential:update` scope.
+	 *
+	 * This switches `includeScopes` to true to be able to check for the scopes
+	 */
+	includeData: booleanFromString.optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/credentials/credentials-get-one-request.dto.ts b/packages/@n8n/api-types/src/dto/credentials/credentials-get-one-request.dto.ts
new file mode 100644
index 0000000000..ad790014e8
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/credentials/credentials-get-one-request.dto.ts
@@ -0,0 +1,13 @@
+import { Z } from 'zod-class';
+
+import { booleanFromString } from '../../schemas/booleanFromString';
+
+export class CredentialsGetOneRequestQuery extends Z.class({
+	/**
+	 * Adds the decrypted `data` field to each credential.
+	 *
+	 * It only does this for credentials for which the user has the
+	 * `credential:update` scope.
+	 */
+	includeData: booleanFromString.optional().default('false'),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/action-result-request.dto.test.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/action-result-request.dto.test.ts
new file mode 100644
index 0000000000..eb451e5b09
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/action-result-request.dto.test.ts
@@ -0,0 +1,81 @@
+import { ActionResultRequestDto } from '../action-result-request.dto';
+
+describe('ActionResultRequestDto', () => {
+	const baseValidRequest = {
+		path: '/test/path',
+		nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+		handler: 'testHandler',
+		currentNodeParameters: {},
+	};
+
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'minimal valid request',
+				request: baseValidRequest,
+			},
+			{
+				name: 'request with payload',
+				request: {
+					...baseValidRequest,
+					payload: { key: 'value' },
+				},
+			},
+			{
+				name: 'request with credentials',
+				request: {
+					...baseValidRequest,
+					credentials: { testCredential: { id: 'cred1', name: 'Test Cred' } },
+				},
+			},
+			{
+				name: 'request with current node parameters',
+				request: {
+					...baseValidRequest,
+					currentNodeParameters: { param1: 'value1' },
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = ActionResultRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing path',
+				request: {
+					nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+					handler: 'testHandler',
+				},
+				expectedErrorPath: ['path'],
+			},
+			{
+				name: 'missing handler',
+				request: {
+					path: '/test/path',
+					currentNodeParameters: {},
+					nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+				},
+				expectedErrorPath: ['handler'],
+			},
+			{
+				name: 'invalid node version',
+				request: {
+					...baseValidRequest,
+					nodeTypeAndVersion: { name: 'TestNode', version: 0 },
+				},
+				expectedErrorPath: ['nodeTypeAndVersion', 'version'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = ActionResultRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/options-request.dto.test.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/options-request.dto.test.ts
new file mode 100644
index 0000000000..28c5534cc7
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/options-request.dto.test.ts
@@ -0,0 +1,90 @@
+import { OptionsRequestDto } from '../options-request.dto';
+
+describe('OptionsRequestDto', () => {
+	const baseValidRequest = {
+		path: '/test/path',
+		nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+		currentNodeParameters: {},
+	};
+
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'minimal valid request',
+				request: baseValidRequest,
+			},
+			{
+				name: 'request with method name',
+				request: {
+					...baseValidRequest,
+					methodName: 'testMethod',
+				},
+			},
+			{
+				name: 'request with load options',
+				request: {
+					...baseValidRequest,
+					loadOptions: {
+						routing: {
+							operations: { someOperation: 'test' },
+							output: { someOutput: 'test' },
+							request: { someRequest: 'test' },
+						},
+					},
+				},
+			},
+			{
+				name: 'request with credentials',
+				request: {
+					...baseValidRequest,
+					credentials: { testCredential: { id: 'cred1', name: 'Test Cred' } },
+				},
+			},
+			{
+				name: 'request with current node parameters',
+				request: {
+					...baseValidRequest,
+					currentNodeParameters: { param1: 'value1' },
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = OptionsRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing path',
+				request: {
+					nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+				},
+				expectedErrorPath: ['path'],
+			},
+			{
+				name: 'missing node type and version',
+				request: {
+					path: '/test/path',
+				},
+				expectedErrorPath: ['nodeTypeAndVersion'],
+			},
+			{
+				name: 'invalid node version',
+				request: {
+					...baseValidRequest,
+					nodeTypeAndVersion: { name: 'TestNode', version: 0 },
+				},
+				expectedErrorPath: ['nodeTypeAndVersion', 'version'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = OptionsRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/resource-locator-request.dto.test.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/resource-locator-request.dto.test.ts
new file mode 100644
index 0000000000..d64f31dec2
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/resource-locator-request.dto.test.ts
@@ -0,0 +1,95 @@
+import { ResourceLocatorRequestDto } from '../resource-locator-request.dto';
+
+describe('ResourceLocatorRequestDto', () => {
+	const baseValidRequest = {
+		path: '/test/path',
+		nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+		methodName: 'testMethod',
+		currentNodeParameters: {},
+	};
+
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'minimal valid request',
+				request: baseValidRequest,
+			},
+			{
+				name: 'request with filter',
+				request: {
+					...baseValidRequest,
+					filter: 'testFilter',
+				},
+			},
+			{
+				name: 'request with pagination token',
+				request: {
+					...baseValidRequest,
+					paginationToken: 'token123',
+				},
+			},
+			{
+				name: 'request with credentials',
+				request: {
+					...baseValidRequest,
+					credentials: { testCredential: { id: 'cred1', name: 'Test Cred' } },
+				},
+			},
+			{
+				name: 'request with current node parameters',
+				request: {
+					...baseValidRequest,
+					currentNodeParameters: { param1: 'value1' },
+				},
+			},
+			{
+				name: 'request with a semver node version',
+				request: {
+					...baseValidRequest,
+					nodeTypeAndVersion: { name: 'TestNode', version: 1.1 },
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = ResourceLocatorRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing path',
+				request: {
+					nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+					methodName: 'testMethod',
+				},
+				expectedErrorPath: ['path'],
+			},
+			{
+				name: 'missing method name',
+				request: {
+					path: '/test/path',
+					nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+					currentNodeParameters: {},
+				},
+				expectedErrorPath: ['methodName'],
+			},
+			{
+				name: 'invalid node version',
+				request: {
+					...baseValidRequest,
+					nodeTypeAndVersion: { name: 'TestNode', version: 0 },
+				},
+				expectedErrorPath: ['nodeTypeAndVersion', 'version'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = ResourceLocatorRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/resource-mapper-fields-request.dto.test.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/resource-mapper-fields-request.dto.test.ts
new file mode 100644
index 0000000000..2370177ab0
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/__tests__/resource-mapper-fields-request.dto.test.ts
@@ -0,0 +1,74 @@
+import { ResourceMapperFieldsRequestDto } from '../resource-mapper-fields-request.dto';
+
+describe('ResourceMapperFieldsRequestDto', () => {
+	const baseValidRequest = {
+		path: '/test/path',
+		nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+		methodName: 'testMethod',
+		currentNodeParameters: {},
+	};
+
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'minimal valid request',
+				request: baseValidRequest,
+			},
+			{
+				name: 'request with credentials',
+				request: {
+					...baseValidRequest,
+					credentials: { testCredential: { id: 'cred1', name: 'Test Cred' } },
+				},
+			},
+			{
+				name: 'request with current node parameters',
+				request: {
+					...baseValidRequest,
+					currentNodeParameters: { param1: 'value1' },
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = ResourceMapperFieldsRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing path',
+				request: {
+					nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+					methodName: 'testMethod',
+				},
+				expectedErrorPath: ['path'],
+			},
+			{
+				name: 'missing method name',
+				request: {
+					path: '/test/path',
+					nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+					currentNodeParameters: {},
+				},
+				expectedErrorPath: ['methodName'],
+			},
+			{
+				name: 'invalid node version',
+				request: {
+					...baseValidRequest,
+					nodeTypeAndVersion: { name: 'TestNode', version: 0 },
+				},
+				expectedErrorPath: ['nodeTypeAndVersion', 'version'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = ResourceMapperFieldsRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/action-result-request.dto.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/action-result-request.dto.ts
new file mode 100644
index 0000000000..d6f867af6d
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/action-result-request.dto.ts
@@ -0,0 +1,11 @@
+import type { IDataObject } from 'n8n-workflow';
+import { z } from 'zod';
+
+import { BaseDynamicParametersRequestDto } from './base-dynamic-parameters-request.dto';
+
+export class ActionResultRequestDto extends BaseDynamicParametersRequestDto.extend({
+	handler: z.string(),
+	payload: z
+		.union([z.object({}).catchall(z.any()) satisfies z.ZodType<IDataObject>, z.string()])
+		.optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/base-dynamic-parameters-request.dto.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/base-dynamic-parameters-request.dto.ts
new file mode 100644
index 0000000000..66b9cd7629
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/base-dynamic-parameters-request.dto.ts
@@ -0,0 +1,18 @@
+import type { INodeCredentials, INodeParameters, INodeTypeNameVersion } from 'n8n-workflow';
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+import { nodeVersionSchema } from '../../schemas/nodeVersion.schema';
+
+export class BaseDynamicParametersRequestDto extends Z.class({
+	path: z.string(),
+	nodeTypeAndVersion: z.object({
+		name: z.string(),
+		version: nodeVersionSchema,
+	}) satisfies z.ZodType<INodeTypeNameVersion>,
+	currentNodeParameters: z.record(z.string(), z.any()) satisfies z.ZodType<INodeParameters>,
+	methodName: z.string().optional(),
+	credentials: z.record(z.string(), z.any()).optional() satisfies z.ZodType<
+		INodeCredentials | undefined
+	>,
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/options-request.dto.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/options-request.dto.ts
new file mode 100644
index 0000000000..b9d34ef75d
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/options-request.dto.ts
@@ -0,0 +1,18 @@
+import type { ILoadOptions } from 'n8n-workflow';
+import { z } from 'zod';
+
+import { BaseDynamicParametersRequestDto } from './base-dynamic-parameters-request.dto';
+
+export class OptionsRequestDto extends BaseDynamicParametersRequestDto.extend({
+	loadOptions: z
+		.object({
+			routing: z
+				.object({
+					operations: z.any().optional(),
+					output: z.any().optional(),
+					request: z.any().optional(),
+				})
+				.optional(),
+		})
+		.optional() as z.ZodType<ILoadOptions | undefined>,
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/resource-locator-request.dto.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/resource-locator-request.dto.ts
new file mode 100644
index 0000000000..ac8e8df274
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/resource-locator-request.dto.ts
@@ -0,0 +1,9 @@
+import { z } from 'zod';
+
+import { BaseDynamicParametersRequestDto } from './base-dynamic-parameters-request.dto';
+
+export class ResourceLocatorRequestDto extends BaseDynamicParametersRequestDto.extend({
+	methodName: z.string(),
+	filter: z.string().optional(),
+	paginationToken: z.string().optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/dynamic-node-parameters/resource-mapper-fields-request.dto.ts b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/resource-mapper-fields-request.dto.ts
new file mode 100644
index 0000000000..3c6d00eb3c
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/dynamic-node-parameters/resource-mapper-fields-request.dto.ts
@@ -0,0 +1,7 @@
+import { z } from 'zod';
+
+import { BaseDynamicParametersRequestDto } from './base-dynamic-parameters-request.dto';
+
+export class ResourceMapperFieldsRequestDto extends BaseDynamicParametersRequestDto.extend({
+	methodName: z.string(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/index.ts b/packages/@n8n/api-types/src/dto/index.ts
index 41a55f050a..9be09c02f3 100644
--- a/packages/@n8n/api-types/src/dto/index.ts
+++ b/packages/@n8n/api-types/src/dto/index.ts
@@ -1,5 +1,49 @@
+export { AiAskRequestDto } from './ai/ai-ask-request.dto';
+export { AiChatRequestDto } from './ai/ai-chat-request.dto';
+export { AiApplySuggestionRequestDto } from './ai/ai-apply-suggestion-request.dto';
+export { AiFreeCreditsRequestDto } from './ai/ai-free-credits-request.dto';
+
+export { LoginRequestDto } from './auth/login-request.dto';
+export { ResolveSignupTokenQueryDto } from './auth/resolve-signup-token-query.dto';
+
+export { OptionsRequestDto } from './dynamic-node-parameters/options-request.dto';
+export { ResourceLocatorRequestDto } from './dynamic-node-parameters/resource-locator-request.dto';
+export { ResourceMapperFieldsRequestDto } from './dynamic-node-parameters/resource-mapper-fields-request.dto';
+export { ActionResultRequestDto } from './dynamic-node-parameters/action-result-request.dto';
+
+export { InviteUsersRequestDto } from './invitation/invite-users-request.dto';
+export { AcceptInvitationRequestDto } from './invitation/accept-invitation-request.dto';
+
+export { OwnerSetupRequestDto } from './owner/owner-setup-request.dto';
+export { DismissBannerRequestDto } from './owner/dismiss-banner-request.dto';
+
+export { ForgotPasswordRequestDto } from './password-reset/forgot-password-request.dto';
+export { ResolvePasswordTokenQueryDto } from './password-reset/resolve-password-token-query.dto';
+export { ChangePasswordRequestDto } from './password-reset/change-password-request.dto';
+
+export { CreateProjectDto } from './project/create-project.dto';
+export { UpdateProjectDto } from './project/update-project.dto';
+export { DeleteProjectDto } from './project/delete-project.dto';
+
+export { SamlAcsDto } from './saml/saml-acs.dto';
+export { SamlPreferences } from './saml/saml-preferences.dto';
+export { SamlToggleDto } from './saml/saml-toggle.dto';
+
 export { PasswordUpdateRequestDto } from './user/password-update-request.dto';
 export { RoleChangeRequestDto } from './user/role-change-request.dto';
 export { SettingsUpdateRequestDto } from './user/settings-update-request.dto';
 export { UserUpdateRequestDto } from './user/user-update-request.dto';
+
 export { CommunityRegisteredRequestDto } from './license/community-registered-request.dto';
+
+export { PullWorkFolderRequestDto } from './source-control/pull-work-folder-request.dto';
+export { PushWorkFolderRequestDto } from './source-control/push-work-folder-request.dto';
+
+export { VariableListRequestDto } from './variables/variables-list-request.dto';
+export { CredentialsGetOneRequestQuery } from './credentials/credentials-get-one-request.dto';
+export { CredentialsGetManyRequestQuery } from './credentials/credentials-get-many-request.dto';
+
+export { ImportWorkflowFromUrlDto } from './workflows/import-workflow-from-url.dto';
+
+export { CreateOrUpdateTagRequestDto } from './tag/create-or-update-tag-request.dto';
+export { RetrieveTagQueryDto } from './tag/retrieve-tag-query.dto';
diff --git a/packages/@n8n/api-types/src/dto/invitation/__tests__/accept-invitation-request.dto.test.ts b/packages/@n8n/api-types/src/dto/invitation/__tests__/accept-invitation-request.dto.test.ts
new file mode 100644
index 0000000000..f78de8ab6d
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/invitation/__tests__/accept-invitation-request.dto.test.ts
@@ -0,0 +1,94 @@
+import { AcceptInvitationRequestDto } from '../accept-invitation-request.dto';
+
+describe('AcceptInvitationRequestDto', () => {
+	const validUuid = '123e4567-e89b-12d3-a456-426614174000';
+
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'complete valid invitation acceptance',
+				request: {
+					inviterId: validUuid,
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'SecurePassword123',
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = AcceptInvitationRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing inviterId',
+				request: {
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'SecurePassword123',
+				},
+				expectedErrorPath: ['inviterId'],
+			},
+			{
+				name: 'invalid inviterId',
+				request: {
+					inviterId: 'not-a-valid-uuid',
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'SecurePassword123',
+				},
+				expectedErrorPath: ['inviterId'],
+			},
+			{
+				name: 'missing first name',
+				request: {
+					inviterId: validUuid,
+					firstName: '',
+					lastName: 'Doe',
+					password: 'SecurePassword123',
+				},
+				expectedErrorPath: ['firstName'],
+			},
+			{
+				name: 'missing last name',
+				request: {
+					inviterId: validUuid,
+					firstName: 'John',
+					lastName: '',
+					password: 'SecurePassword123',
+				},
+				expectedErrorPath: ['lastName'],
+			},
+			{
+				name: 'password too short',
+				request: {
+					inviterId: validUuid,
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'short',
+				},
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'password without number',
+				request: {
+					inviterId: validUuid,
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'NoNumberPassword',
+				},
+				expectedErrorPath: ['password'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = AcceptInvitationRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/invitation/__tests__/invite-users-request.dto.test.ts b/packages/@n8n/api-types/src/dto/invitation/__tests__/invite-users-request.dto.test.ts
new file mode 100644
index 0000000000..f47a138ed5
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/invitation/__tests__/invite-users-request.dto.test.ts
@@ -0,0 +1,60 @@
+import { InviteUsersRequestDto } from '../invite-users-request.dto';
+
+describe('InviteUsersRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'empty array',
+				request: [],
+			},
+			{
+				name: 'single user invitation with default role',
+				request: [{ email: 'user@example.com' }],
+			},
+			{
+				name: 'multiple user invitations with different roles',
+				request: [
+					{ email: 'user1@example.com', role: 'global:member' },
+					{ email: 'user2@example.com', role: 'global:admin' },
+				],
+			},
+		])('should validate $name', ({ request }) => {
+			const result = InviteUsersRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+
+		it('should default role to global:member', () => {
+			const result = InviteUsersRequestDto.safeParse([{ email: 'user@example.com' }]);
+			expect(result.success).toBe(true);
+			expect(result.data?.[0].role).toBe('global:member');
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid email',
+				request: [{ email: 'invalid-email' }],
+				expectedErrorPath: [0, 'email'],
+			},
+			{
+				name: 'invalid role',
+				request: [
+					{
+						email: 'user@example.com',
+						role: 'invalid-role',
+					},
+				],
+				expectedErrorPath: [0, 'role'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = InviteUsersRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/invitation/accept-invitation-request.dto.ts b/packages/@n8n/api-types/src/dto/invitation/accept-invitation-request.dto.ts
new file mode 100644
index 0000000000..7c93e708ba
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/invitation/accept-invitation-request.dto.ts
@@ -0,0 +1,11 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+import { passwordSchema } from '../../schemas/password.schema';
+
+export class AcceptInvitationRequestDto extends Z.class({
+	inviterId: z.string().uuid(),
+	firstName: z.string().min(1, 'First name is required'),
+	lastName: z.string().min(1, 'Last name is required'),
+	password: passwordSchema,
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/invitation/invite-users-request.dto.ts b/packages/@n8n/api-types/src/dto/invitation/invite-users-request.dto.ts
new file mode 100644
index 0000000000..9693234c64
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/invitation/invite-users-request.dto.ts
@@ -0,0 +1,16 @@
+import { z } from 'zod';
+
+const roleSchema = z.enum(['global:member', 'global:admin']);
+
+const invitedUserSchema = z.object({
+	email: z.string().email(),
+	role: roleSchema.default('global:member'),
+});
+
+const invitationsSchema = z.array(invitedUserSchema);
+
+export class InviteUsersRequestDto extends Array<z.infer<typeof invitedUserSchema>> {
+	static safeParse(data: unknown) {
+		return invitationsSchema.safeParse(data);
+	}
+}
diff --git a/packages/@n8n/api-types/src/dto/owner/__tests__/dismiss-banner-request.dto.test.ts b/packages/@n8n/api-types/src/dto/owner/__tests__/dismiss-banner-request.dto.test.ts
new file mode 100644
index 0000000000..97371de16a
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/owner/__tests__/dismiss-banner-request.dto.test.ts
@@ -0,0 +1,64 @@
+import { bannerNameSchema } from '../../../schemas/bannerName.schema';
+import { DismissBannerRequestDto } from '../dismiss-banner-request.dto';
+
+describe('DismissBannerRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each(
+			bannerNameSchema.options.map((banner) => ({
+				name: `valid banner: ${banner}`,
+				request: { banner },
+			})),
+		)('should validate $name', ({ request }) => {
+			const result = DismissBannerRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid banner string',
+				request: {
+					banner: 'not-a-valid-banner',
+				},
+				expectedErrorPath: ['banner'],
+			},
+			{
+				name: 'non-string banner',
+				request: {
+					banner: 123,
+				},
+				expectedErrorPath: ['banner'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = DismissBannerRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+
+	describe('Optional banner', () => {
+		test('should validate empty request', () => {
+			const result = DismissBannerRequestDto.safeParse({});
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Exhaustive banner name check', () => {
+		test('should have all banner names defined', () => {
+			const expectedBanners = [
+				'V1',
+				'TRIAL_OVER',
+				'TRIAL',
+				'NON_PRODUCTION_LICENSE',
+				'EMAIL_CONFIRMATION',
+			];
+
+			expect(bannerNameSchema.options).toEqual(expectedBanners);
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/owner/__tests__/owner-setup-request.dto.test.ts b/packages/@n8n/api-types/src/dto/owner/__tests__/owner-setup-request.dto.test.ts
new file mode 100644
index 0000000000..facf808ec3
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/owner/__tests__/owner-setup-request.dto.test.ts
@@ -0,0 +1,93 @@
+import { OwnerSetupRequestDto } from '../owner-setup-request.dto';
+
+describe('OwnerSetupRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'complete valid setup request',
+				request: {
+					email: 'owner@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'SecurePassword123',
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = OwnerSetupRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid email',
+				request: {
+					email: 'invalid-email',
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'SecurePassword123',
+				},
+				expectedErrorPath: ['email'],
+			},
+			{
+				name: 'missing first name',
+				request: {
+					email: 'owner@example.com',
+					firstName: '',
+					lastName: 'Doe',
+					password: 'SecurePassword123',
+				},
+				expectedErrorPath: ['firstName'],
+			},
+			{
+				name: 'missing last name',
+				request: {
+					email: 'owner@example.com',
+					firstName: 'John',
+					lastName: '',
+					password: 'SecurePassword123',
+				},
+				expectedErrorPath: ['lastName'],
+			},
+			{
+				name: 'password too short',
+				request: {
+					email: 'owner@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'short',
+				},
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'password without number',
+				request: {
+					email: 'owner@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'NoNumberPassword',
+				},
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'password without uppercase letter',
+				request: {
+					email: 'owner@example.com',
+					firstName: 'John',
+					lastName: 'Doe',
+					password: 'nouppercasepassword123',
+				},
+				expectedErrorPath: ['password'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = OwnerSetupRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/owner/dismiss-banner-request.dto.ts b/packages/@n8n/api-types/src/dto/owner/dismiss-banner-request.dto.ts
new file mode 100644
index 0000000000..1f42381e7a
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/owner/dismiss-banner-request.dto.ts
@@ -0,0 +1,7 @@
+import { Z } from 'zod-class';
+
+import { bannerNameSchema } from '../../schemas/bannerName.schema';
+
+export class DismissBannerRequestDto extends Z.class({
+	banner: bannerNameSchema.optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/owner/owner-setup-request.dto.ts b/packages/@n8n/api-types/src/dto/owner/owner-setup-request.dto.ts
new file mode 100644
index 0000000000..ccaa06b18e
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/owner/owner-setup-request.dto.ts
@@ -0,0 +1,11 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+import { passwordSchema } from '../../schemas/password.schema';
+
+export class OwnerSetupRequestDto extends Z.class({
+	email: z.string().email(),
+	firstName: z.string().min(1, 'First name is required'),
+	lastName: z.string().min(1, 'Last name is required'),
+	password: passwordSchema,
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/password-reset/__tests__/change-password-request.dto.test.ts b/packages/@n8n/api-types/src/dto/password-reset/__tests__/change-password-request.dto.test.ts
new file mode 100644
index 0000000000..86b230ba5a
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/password-reset/__tests__/change-password-request.dto.test.ts
@@ -0,0 +1,114 @@
+import { ChangePasswordRequestDto } from '../change-password-request.dto';
+
+describe('ChangePasswordRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'valid password reset with token',
+				request: {
+					token: 'valid-reset-token-with-sufficient-length',
+					password: 'newSecurePassword123',
+				},
+			},
+			{
+				name: 'valid password reset with MFA code',
+				request: {
+					token: 'another-valid-reset-token',
+					password: 'newSecurePassword123',
+					mfaCode: '123456',
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = ChangePasswordRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing token',
+				request: { password: 'newSecurePassword123' },
+				expectedErrorPath: ['token'],
+			},
+			{
+				name: 'empty token',
+				request: { token: '', password: 'newSecurePassword123' },
+				expectedErrorPath: ['token'],
+			},
+			{
+				name: 'short token',
+				request: { token: 'short', password: 'newSecurePassword123' },
+				expectedErrorPath: ['token'],
+			},
+			{
+				name: 'missing password',
+				request: { token: 'valid-reset-token' },
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'password too short',
+				request: {
+					token: 'valid-reset-token',
+					password: 'short',
+				},
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'password too long',
+				request: {
+					token: 'valid-reset-token',
+					password: 'a'.repeat(65),
+				},
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'password without number',
+				request: {
+					token: 'valid-reset-token',
+					password: 'NoNumberPassword',
+				},
+				expectedErrorPath: ['password'],
+			},
+			{
+				name: 'password without uppercase letter',
+				request: {
+					token: 'valid-reset-token',
+					password: 'nouppercasepassword123',
+				},
+				expectedErrorPath: ['password'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = ChangePasswordRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+
+		describe('Edge cases', () => {
+			test('should handle optional MFA code correctly', () => {
+				const validRequest = {
+					token: 'valid-reset-token',
+					password: 'newSecurePassword123',
+					mfaCode: undefined,
+				};
+
+				const result = ChangePasswordRequestDto.safeParse(validRequest);
+				expect(result.success).toBe(true);
+			});
+
+			test('should handle token with special characters', () => {
+				const validRequest = {
+					token: 'valid-reset-token-with-special-!@#$%^&*()_+',
+					password: 'newSecurePassword123',
+				};
+
+				const result = ChangePasswordRequestDto.safeParse(validRequest);
+				expect(result.success).toBe(true);
+			});
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/password-reset/__tests__/forgot-password-request.dto.test.ts b/packages/@n8n/api-types/src/dto/password-reset/__tests__/forgot-password-request.dto.test.ts
new file mode 100644
index 0000000000..891d52fdad
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/password-reset/__tests__/forgot-password-request.dto.test.ts
@@ -0,0 +1,47 @@
+import { ForgotPasswordRequestDto } from '../forgot-password-request.dto';
+
+describe('ForgotPasswordRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'valid email',
+				request: { email: 'test@example.com' },
+			},
+			{
+				name: 'email with subdomain',
+				request: { email: 'user@sub.example.com' },
+			},
+		])('should validate $name', ({ request }) => {
+			const result = ForgotPasswordRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid email format',
+				request: { email: 'invalid-email' },
+				expectedErrorPath: ['email'],
+			},
+			{
+				name: 'missing email',
+				request: {},
+				expectedErrorPath: ['email'],
+			},
+			{
+				name: 'empty email',
+				request: { email: '' },
+				expectedErrorPath: ['email'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = ForgotPasswordRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/password-reset/__tests__/resolve-password-token-query.dto.test.ts b/packages/@n8n/api-types/src/dto/password-reset/__tests__/resolve-password-token-query.dto.test.ts
new file mode 100644
index 0000000000..a2f5881ac8
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/password-reset/__tests__/resolve-password-token-query.dto.test.ts
@@ -0,0 +1,42 @@
+import { ResolvePasswordTokenQueryDto } from '../resolve-password-token-query.dto';
+
+describe('ResolvePasswordTokenQueryDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'valid token',
+				request: { token: 'valid-reset-token' },
+			},
+			{
+				name: 'long token',
+				request: { token: 'x'.repeat(50) },
+			},
+		])('should validate $name', ({ request }) => {
+			const result = ResolvePasswordTokenQueryDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing token',
+				request: {},
+				expectedErrorPath: ['token'],
+			},
+			{
+				name: 'empty token',
+				request: { token: '' },
+				expectedErrorPath: ['token'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = ResolvePasswordTokenQueryDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/password-reset/change-password-request.dto.ts b/packages/@n8n/api-types/src/dto/password-reset/change-password-request.dto.ts
new file mode 100644
index 0000000000..33ef47b3f1
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/password-reset/change-password-request.dto.ts
@@ -0,0 +1,11 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+import { passwordSchema } from '../../schemas/password.schema';
+import { passwordResetTokenSchema } from '../../schemas/passwordResetToken.schema';
+
+export class ChangePasswordRequestDto extends Z.class({
+	token: passwordResetTokenSchema,
+	password: passwordSchema,
+	mfaCode: z.string().optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/password-reset/forgot-password-request.dto.ts b/packages/@n8n/api-types/src/dto/password-reset/forgot-password-request.dto.ts
new file mode 100644
index 0000000000..f6ab3cfac5
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/password-reset/forgot-password-request.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class ForgotPasswordRequestDto extends Z.class({
+	email: z.string().email(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/password-reset/resolve-password-token-query.dto.ts b/packages/@n8n/api-types/src/dto/password-reset/resolve-password-token-query.dto.ts
new file mode 100644
index 0000000000..88385df244
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/password-reset/resolve-password-token-query.dto.ts
@@ -0,0 +1,7 @@
+import { Z } from 'zod-class';
+
+import { passwordResetTokenSchema } from '../../schemas/passwordResetToken.schema';
+
+export class ResolvePasswordTokenQueryDto extends Z.class({
+	token: passwordResetTokenSchema,
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/project/__tests__/create-project.dto.test.ts b/packages/@n8n/api-types/src/dto/project/__tests__/create-project.dto.test.ts
new file mode 100644
index 0000000000..42eb553030
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/__tests__/create-project.dto.test.ts
@@ -0,0 +1,75 @@
+import { CreateProjectDto } from '../create-project.dto';
+
+describe('CreateProjectDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'with just the name',
+				request: {
+					name: 'My Awesome Project',
+				},
+			},
+			{
+				name: 'with name and emoji icon',
+				request: {
+					name: 'My Awesome Project',
+					icon: {
+						type: 'emoji',
+						value: '🚀',
+					},
+				},
+			},
+			{
+				name: 'with name and regular icon',
+				request: {
+					name: 'My Awesome Project',
+					icon: {
+						type: 'icon',
+						value: 'blah',
+					},
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = CreateProjectDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing name',
+				request: { icon: { type: 'emoji', value: '🚀' } },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'empty name',
+				request: { name: '', icon: { type: 'emoji', value: '🚀' } },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'name too long',
+				request: { name: 'a'.repeat(256), icon: { type: 'emoji', value: '🚀' } },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'invalid icon type',
+				request: { name: 'My Awesome Project', icon: { type: 'invalid', value: '🚀' } },
+				expectedErrorPath: ['icon', 'type'],
+			},
+			{
+				name: 'invalid icon value',
+				request: { name: 'My Awesome Project', icon: { type: 'emoji', value: '' } },
+				expectedErrorPath: ['icon', 'value'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = CreateProjectDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/project/__tests__/update-project.dto.test.ts b/packages/@n8n/api-types/src/dto/project/__tests__/update-project.dto.test.ts
new file mode 100644
index 0000000000..86a8630026
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/__tests__/update-project.dto.test.ts
@@ -0,0 +1,121 @@
+import { UpdateProjectDto } from '../update-project.dto';
+
+describe('UpdateProjectDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'with just the name',
+				request: {
+					name: 'My Updated Project',
+				},
+			},
+			{
+				name: 'with name and emoji icon',
+				request: {
+					name: 'My Updated Project',
+					icon: {
+						type: 'emoji',
+						value: '🚀',
+					},
+				},
+			},
+			{
+				name: 'with name and regular icon',
+				request: {
+					name: 'My Updated Project',
+					icon: {
+						type: 'icon',
+						value: 'blah',
+					},
+				},
+			},
+			{
+				name: 'with relations',
+				request: {
+					relations: [
+						{
+							userId: 'user-123',
+							role: 'project:admin',
+						},
+					],
+				},
+			},
+			{
+				name: 'with all fields',
+				request: {
+					name: 'My Updated Project',
+					icon: {
+						type: 'emoji',
+						value: '🚀',
+					},
+					relations: [
+						{
+							userId: 'user-123',
+							role: 'project:admin',
+						},
+					],
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = UpdateProjectDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid name type',
+				request: { name: 123 },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'name too long',
+				request: { name: 'a'.repeat(256) },
+				expectedErrorPath: ['name'],
+			},
+			{
+				name: 'invalid icon type',
+				request: { icon: { type: 'invalid', value: '🚀' } },
+				expectedErrorPath: ['icon', 'type'],
+			},
+			{
+				name: 'invalid icon value',
+				request: { icon: { type: 'emoji', value: '' } },
+				expectedErrorPath: ['icon', 'value'],
+			},
+			{
+				name: 'invalid relations userId',
+				request: {
+					relations: [
+						{
+							userId: 123,
+							role: 'project:admin',
+						},
+					],
+				},
+				expectedErrorPath: ['relations', 0, 'userId'],
+			},
+			{
+				name: 'invalid relations role',
+				request: {
+					relations: [
+						{
+							userId: 'user-123',
+							role: 'invalid-role',
+						},
+					],
+				},
+				expectedErrorPath: ['relations', 0, 'role'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = UpdateProjectDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/project/create-project.dto.ts b/packages/@n8n/api-types/src/dto/project/create-project.dto.ts
new file mode 100644
index 0000000000..cf748f5e13
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/create-project.dto.ts
@@ -0,0 +1,8 @@
+import { Z } from 'zod-class';
+
+import { projectIconSchema, projectNameSchema } from '../../schemas/project.schema';
+
+export class CreateProjectDto extends Z.class({
+	name: projectNameSchema,
+	icon: projectIconSchema.optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/project/delete-project.dto.ts b/packages/@n8n/api-types/src/dto/project/delete-project.dto.ts
new file mode 100644
index 0000000000..cc8d8c2679
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/delete-project.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class DeleteProjectDto extends Z.class({
+	transferId: z.string().optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/project/update-project.dto.ts b/packages/@n8n/api-types/src/dto/project/update-project.dto.ts
new file mode 100644
index 0000000000..b167ed88d3
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/project/update-project.dto.ts
@@ -0,0 +1,14 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+import {
+	projectIconSchema,
+	projectNameSchema,
+	projectRelationSchema,
+} from '../../schemas/project.schema';
+
+export class UpdateProjectDto extends Z.class({
+	name: projectNameSchema.optional(),
+	icon: projectIconSchema.optional(),
+	relations: z.array(projectRelationSchema).optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/saml/__tests__/saml-preferences.dto.test.ts b/packages/@n8n/api-types/src/dto/saml/__tests__/saml-preferences.dto.test.ts
new file mode 100644
index 0000000000..6d11483347
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/saml/__tests__/saml-preferences.dto.test.ts
@@ -0,0 +1,155 @@
+import { SamlPreferences } from '../saml-preferences.dto';
+
+describe('SamlPreferences', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'valid minimal configuration',
+				request: {
+					mapping: {
+						email: 'user@example.com',
+						firstName: 'John',
+						lastName: 'Doe',
+						userPrincipalName: 'johndoe',
+					},
+					metadata: '<xml>metadata</xml>',
+					metadataUrl: 'https://example.com/metadata',
+					loginEnabled: true,
+					loginLabel: 'Login with SAML',
+				},
+			},
+			{
+				name: 'valid full configuration',
+				request: {
+					mapping: {
+						email: 'user@example.com',
+						firstName: 'John',
+						lastName: 'Doe',
+						userPrincipalName: 'johndoe',
+					},
+					metadata: '<xml>metadata</xml>',
+					metadataUrl: 'https://example.com/metadata',
+					ignoreSSL: true,
+					loginBinding: 'post',
+					loginEnabled: true,
+					loginLabel: 'Login with SAML',
+					authnRequestsSigned: true,
+					wantAssertionsSigned: true,
+					wantMessageSigned: true,
+					acsBinding: 'redirect',
+					signatureConfig: {
+						prefix: 'ds',
+						location: {
+							reference: '/samlp:Response/saml:Issuer',
+							action: 'after',
+						},
+					},
+					relayState: 'https://example.com/relay',
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = SamlPreferences.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid loginBinding',
+				request: {
+					loginBinding: 'invalid',
+				},
+				expectedErrorPath: ['loginBinding'],
+			},
+			{
+				name: 'invalid acsBinding',
+				request: {
+					acsBinding: 'invalid',
+				},
+				expectedErrorPath: ['acsBinding'],
+			},
+			{
+				name: 'invalid signatureConfig location action',
+				request: {
+					signatureConfig: {
+						prefix: 'ds',
+						location: {
+							reference: '/samlp:Response/saml:Issuer',
+							action: 'invalid',
+						},
+					},
+				},
+				expectedErrorPath: ['signatureConfig', 'location', 'action'],
+			},
+			{
+				name: 'missing signatureConfig location reference',
+				request: {
+					signatureConfig: {
+						prefix: 'ds',
+						location: {
+							action: 'after',
+						},
+					},
+				},
+				expectedErrorPath: ['signatureConfig', 'location', 'reference'],
+			},
+			{
+				name: 'invalid mapping email',
+				request: {
+					mapping: {
+						email: 123,
+						firstName: 'John',
+						lastName: 'Doe',
+						userPrincipalName: 'johndoe',
+					},
+				},
+				expectedErrorPath: ['mapping', 'email'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = SamlPreferences.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+
+		describe('Edge cases', () => {
+			test('should handle optional fields correctly', () => {
+				const validRequest = {
+					mapping: undefined,
+					metadata: undefined,
+					metadataUrl: undefined,
+					loginEnabled: undefined,
+					loginLabel: undefined,
+				};
+
+				const result = SamlPreferences.safeParse(validRequest);
+				expect(result.success).toBe(true);
+			});
+
+			test('should handle default values correctly', () => {
+				const validRequest = {};
+
+				const result = SamlPreferences.safeParse(validRequest);
+				expect(result.success).toBe(true);
+				expect(result.data?.ignoreSSL).toBe(false);
+				expect(result.data?.loginBinding).toBe('redirect');
+				expect(result.data?.authnRequestsSigned).toBe(false);
+				expect(result.data?.wantAssertionsSigned).toBe(true);
+				expect(result.data?.wantMessageSigned).toBe(true);
+				expect(result.data?.acsBinding).toBe('post');
+				expect(result.data?.signatureConfig).toEqual({
+					prefix: 'ds',
+					location: {
+						reference: '/samlp:Response/saml:Issuer',
+						action: 'after',
+					},
+				});
+				expect(result.data?.relayState).toBe('');
+			});
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/saml/saml-acs.dto.ts b/packages/@n8n/api-types/src/dto/saml/saml-acs.dto.ts
new file mode 100644
index 0000000000..2bfbece7d6
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/saml/saml-acs.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class SamlAcsDto extends Z.class({
+	RelayState: z.string().optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/saml/saml-preferences.dto.ts b/packages/@n8n/api-types/src/dto/saml/saml-preferences.dto.ts
new file mode 100644
index 0000000000..e07504c1b3
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/saml/saml-preferences.dto.ts
@@ -0,0 +1,50 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+const SamlLoginBindingSchema = z.enum(['redirect', 'post']);
+
+/** Schema for configuring the signature in SAML requests/responses. */
+const SignatureConfigSchema = z.object({
+	prefix: z.string().default('ds'),
+	location: z.object({
+		reference: z.string(),
+		action: z.enum(['before', 'after', 'prepend', 'append']),
+	}),
+});
+
+export class SamlPreferences extends Z.class({
+	/** Mapping of SAML attributes to user fields. */
+	mapping: z
+		.object({
+			email: z.string(),
+			firstName: z.string(),
+			lastName: z.string(),
+			userPrincipalName: z.string(),
+		})
+		.optional(),
+	/** SAML metadata in XML format. */
+	metadata: z.string().optional(),
+	metadataUrl: z.string().optional(),
+
+	ignoreSSL: z.boolean().default(false),
+	loginBinding: SamlLoginBindingSchema.default('redirect'),
+	/** Whether SAML login is enabled. */
+	loginEnabled: z.boolean().optional(),
+	/** Label for the SAML login button. on the Auth screen */
+	loginLabel: z.string().optional(),
+
+	authnRequestsSigned: z.boolean().default(false),
+	wantAssertionsSigned: z.boolean().default(true),
+	wantMessageSigned: z.boolean().default(true),
+
+	acsBinding: SamlLoginBindingSchema.default('post'),
+	signatureConfig: SignatureConfigSchema.default({
+		prefix: 'ds',
+		location: {
+			reference: '/samlp:Response/saml:Issuer',
+			action: 'after',
+		},
+	}),
+
+	relayState: z.string().default(''),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/saml/saml-toggle.dto.ts b/packages/@n8n/api-types/src/dto/saml/saml-toggle.dto.ts
new file mode 100644
index 0000000000..be07933d06
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/saml/saml-toggle.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class SamlToggleDto extends Z.class({
+	loginEnabled: z.boolean(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/source-control/__tests__/pull-work-folder-request.dto.test.ts b/packages/@n8n/api-types/src/dto/source-control/__tests__/pull-work-folder-request.dto.test.ts
new file mode 100644
index 0000000000..0e47a223b9
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/source-control/__tests__/pull-work-folder-request.dto.test.ts
@@ -0,0 +1,38 @@
+import { PullWorkFolderRequestDto } from '../pull-work-folder-request.dto';
+
+describe('PullWorkFolderRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'with force',
+				request: { force: true },
+			},
+			{
+				name: 'without force',
+				request: {},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = PullWorkFolderRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid force type',
+				request: {
+					force: 'true', // Should be boolean
+				},
+				expectedErrorPath: ['force'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = PullWorkFolderRequestDto.safeParse(request);
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/source-control/__tests__/push-work-folder-request.dto.test.ts b/packages/@n8n/api-types/src/dto/source-control/__tests__/push-work-folder-request.dto.test.ts
new file mode 100644
index 0000000000..b3bbd984e1
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/source-control/__tests__/push-work-folder-request.dto.test.ts
@@ -0,0 +1,112 @@
+import { PushWorkFolderRequestDto } from '../push-work-folder-request.dto';
+
+describe('PushWorkFolderRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'complete valid push request with all fields',
+				request: {
+					force: true,
+					fileNames: [
+						{
+							file: 'file1.json',
+							id: '1',
+							name: 'File 1',
+							type: 'workflow',
+							status: 'modified',
+							location: 'local',
+							conflict: false,
+							updatedAt: '2023-10-01T12:00:00Z',
+							pushed: true,
+						},
+					],
+					message: 'Initial commit',
+				},
+			},
+			{
+				name: 'push request with only required fields',
+				request: {
+					fileNames: [
+						{
+							file: 'file2.json',
+							id: '2',
+							name: 'File 2',
+							type: 'credential',
+							status: 'new',
+							location: 'remote',
+							conflict: true,
+							updatedAt: '2023-10-02T12:00:00Z',
+						},
+					],
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = PushWorkFolderRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'missing required fileNames field',
+				request: {
+					force: true,
+					message: 'Initial commit',
+				},
+				expectedErrorPath: ['fileNames'],
+			},
+			{
+				name: 'invalid fileNames type',
+				request: {
+					fileNames: 'not-an-array', // Should be an array
+				},
+				expectedErrorPath: ['fileNames'],
+			},
+			{
+				name: 'invalid fileNames array element',
+				request: {
+					fileNames: [
+						{
+							file: 'file4.json',
+							id: '4',
+							name: 'File 4',
+							type: 'invalid-type', // Invalid type
+							status: 'modified',
+							location: 'local',
+							conflict: false,
+							updatedAt: '2023-10-04T12:00:00Z',
+						},
+					],
+				},
+				expectedErrorPath: ['fileNames', 0, 'type'],
+			},
+			{
+				name: 'invalid force type',
+				request: {
+					force: 'true', // Should be boolean
+					fileNames: [
+						{
+							file: 'file5.json',
+							id: '5',
+							name: 'File 5',
+							type: 'workflow',
+							status: 'modified',
+							location: 'local',
+							conflict: false,
+							updatedAt: '2023-10-05T12:00:00Z',
+						},
+					],
+				},
+				expectedErrorPath: ['force'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = PushWorkFolderRequestDto.safeParse(request);
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/source-control/pull-work-folder-request.dto.ts b/packages/@n8n/api-types/src/dto/source-control/pull-work-folder-request.dto.ts
new file mode 100644
index 0000000000..2773e0bb59
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/source-control/pull-work-folder-request.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class PullWorkFolderRequestDto extends Z.class({
+	force: z.boolean().optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/source-control/push-work-folder-request.dto.ts b/packages/@n8n/api-types/src/dto/source-control/push-work-folder-request.dto.ts
new file mode 100644
index 0000000000..be305ee7b3
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/source-control/push-work-folder-request.dto.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+import { SourceControlledFileSchema } from '../../schemas/source-controlled-file.schema';
+
+export class PushWorkFolderRequestDto extends Z.class({
+	force: z.boolean().optional(),
+	commitMessage: z.string().optional(),
+	fileNames: z.array(SourceControlledFileSchema),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/tag/__tests__/create-or-update-tag-request.dto.test.ts b/packages/@n8n/api-types/src/dto/tag/__tests__/create-or-update-tag-request.dto.test.ts
new file mode 100644
index 0000000000..0af3ec6b5c
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/tag/__tests__/create-or-update-tag-request.dto.test.ts
@@ -0,0 +1,37 @@
+import { CreateOrUpdateTagRequestDto } from '../create-or-update-tag-request.dto';
+
+describe('CreateOrUpdateTagRequestDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'valid name',
+				request: {
+					name: 'tag-name',
+				},
+			},
+		])('should validate $name', ({ request }) => {
+			const result = CreateOrUpdateTagRequestDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'empty tag name',
+				request: {
+					name: '',
+				},
+				expectedErrorPath: ['name'],
+			},
+		])('should fail validation for $name', ({ request, expectedErrorPath }) => {
+			const result = CreateOrUpdateTagRequestDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/tag/__tests__/retrieve-tag-query.dto.test.ts b/packages/@n8n/api-types/src/dto/tag/__tests__/retrieve-tag-query.dto.test.ts
new file mode 100644
index 0000000000..902bc62764
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/tag/__tests__/retrieve-tag-query.dto.test.ts
@@ -0,0 +1,64 @@
+import { RetrieveTagQueryDto } from '../retrieve-tag-query.dto';
+
+describe('RetrieveTagQueryDto', () => {
+	describe('Valid requests', () => {
+		test.each([
+			{
+				name: 'with "true"',
+				request: {
+					withUsageCount: 'true',
+				},
+			},
+			{
+				name: 'with "false"',
+				request: {
+					withUsageCount: 'false',
+				},
+			},
+		])('should pass validation for withUsageCount $name', ({ request }) => {
+			const result = RetrieveTagQueryDto.safeParse(request);
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'with number',
+				request: {
+					withUsageCount: 1,
+				},
+				expectedErrorPath: ['withUsageCount'],
+			},
+			{
+				name: 'with boolean (true) ',
+				request: {
+					withUsageCount: true,
+				},
+				expectedErrorPath: ['withUsageCount'],
+			},
+			{
+				name: 'with boolean (false)',
+				request: {
+					withUsageCount: false,
+				},
+				expectedErrorPath: ['withUsageCount'],
+			},
+			{
+				name: 'with invalid string',
+				request: {
+					withUsageCount: 'invalid',
+				},
+				expectedErrorPath: ['withUsageCount'],
+			},
+		])('should fail validation for withUsageCount $name', ({ request, expectedErrorPath }) => {
+			const result = RetrieveTagQueryDto.safeParse(request);
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/tag/create-or-update-tag-request.dto.ts b/packages/@n8n/api-types/src/dto/tag/create-or-update-tag-request.dto.ts
new file mode 100644
index 0000000000..f916e1665f
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/tag/create-or-update-tag-request.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class CreateOrUpdateTagRequestDto extends Z.class({
+	name: z.string().trim().min(1),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/tag/retrieve-tag-query.dto.ts b/packages/@n8n/api-types/src/dto/tag/retrieve-tag-query.dto.ts
new file mode 100644
index 0000000000..b7b53a0d6f
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/tag/retrieve-tag-query.dto.ts
@@ -0,0 +1,7 @@
+import { Z } from 'zod-class';
+
+import { booleanFromString } from '../../schemas/booleanFromString';
+
+export class RetrieveTagQueryDto extends Z.class({
+	withUsageCount: booleanFromString.optional().default('false'),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/user/settings-update-request.dto.ts b/packages/@n8n/api-types/src/dto/user/settings-update-request.dto.ts
index f4c0eb0af3..247b830d91 100644
--- a/packages/@n8n/api-types/src/dto/user/settings-update-request.dto.ts
+++ b/packages/@n8n/api-types/src/dto/user/settings-update-request.dto.ts
@@ -4,4 +4,5 @@ import { Z } from 'zod-class';
 export class SettingsUpdateRequestDto extends Z.class({
 	userActivated: z.boolean().optional(),
 	allowSSOManualLogin: z.boolean().optional(),
+	easyAIWorkflowOnboarded: z.boolean().optional(),
 }) {}
diff --git a/packages/@n8n/api-types/src/dto/variables/variables-list-request.dto.ts b/packages/@n8n/api-types/src/dto/variables/variables-list-request.dto.ts
new file mode 100644
index 0000000000..804bcb2786
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/variables/variables-list-request.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class VariableListRequestDto extends Z.class({
+	state: z.literal('empty').optional(),
+}) {}
diff --git a/packages/@n8n/api-types/src/dto/workflows/__tests__/import-workflow-from-url.dto.test.ts b/packages/@n8n/api-types/src/dto/workflows/__tests__/import-workflow-from-url.dto.test.ts
new file mode 100644
index 0000000000..3c17e873e0
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/workflows/__tests__/import-workflow-from-url.dto.test.ts
@@ -0,0 +1,63 @@
+import { ImportWorkflowFromUrlDto } from '../import-workflow-from-url.dto';
+
+describe('ImportWorkflowFromUrlDto', () => {
+	describe('Valid requests', () => {
+		test('should validate $name', () => {
+			const result = ImportWorkflowFromUrlDto.safeParse({
+				url: 'https://example.com/workflow.json',
+			});
+			expect(result.success).toBe(true);
+		});
+	});
+
+	describe('Invalid requests', () => {
+		test.each([
+			{
+				name: 'invalid URL (not ending with .json)',
+				url: 'https://example.com/workflow',
+				expectedErrorPath: ['url'],
+			},
+			{
+				name: 'invalid URL (missing protocol)',
+				url: 'example.com/workflow.json',
+				expectedErrorPath: ['url'],
+			},
+			{
+				name: 'invalid URL (not a URL)',
+				url: 'not-a-url',
+				expectedErrorPath: ['url'],
+			},
+			{
+				name: 'missing URL',
+				url: undefined,
+				expectedErrorPath: ['url'],
+			},
+			{
+				name: 'null URL',
+				url: null,
+				expectedErrorPath: ['url'],
+			},
+			{
+				name: 'invalid URL (ends with .json but not a valid URL)',
+				url: 'not-a-url.json',
+				expectedErrorPath: ['url'],
+			},
+			{
+				name: 'valid URL with query parameters',
+				url: 'https://example.com/workflow.json?param=value',
+			},
+			{
+				name: 'valid URL with fragments',
+				url: 'https://example.com/workflow.json#section',
+			},
+		])('should fail validation for $name', ({ url, expectedErrorPath }) => {
+			const result = ImportWorkflowFromUrlDto.safeParse({ url });
+
+			expect(result.success).toBe(false);
+
+			if (expectedErrorPath) {
+				expect(result.error?.issues[0].path).toEqual(expectedErrorPath);
+			}
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/dto/workflows/import-workflow-from-url.dto.ts b/packages/@n8n/api-types/src/dto/workflows/import-workflow-from-url.dto.ts
new file mode 100644
index 0000000000..310e620fde
--- /dev/null
+++ b/packages/@n8n/api-types/src/dto/workflows/import-workflow-from-url.dto.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { Z } from 'zod-class';
+
+export class ImportWorkflowFromUrlDto extends Z.class({
+	url: z.string().url().endsWith('.json'),
+}) {}
diff --git a/packages/@n8n/api-types/src/frontend-settings.ts b/packages/@n8n/api-types/src/frontend-settings.ts
index 5084344aeb..3ce856d6ad 100644
--- a/packages/@n8n/api-types/src/frontend-settings.ts
+++ b/packages/@n8n/api-types/src/frontend-settings.ts
@@ -1,3 +1,4 @@
+import type { FrontendBetaFeatures } from '@n8n/config';
 import type { ExpressionEvaluatorType, LogLevel, WorkflowSettings } from 'n8n-workflow';
 
 export interface IVersionNotificationSettings {
@@ -26,7 +27,8 @@ export interface IUserManagementSettings {
 }
 
 export interface FrontendSettings {
-	isDocker?: boolean;
+	inE2ETests: boolean;
+	isDocker: boolean;
 	databaseType: 'sqlite' | 'mariadb' | 'mysqldb' | 'postgresdb';
 	endpointForm: string;
 	endpointFormTest: string;
@@ -161,7 +163,11 @@ export interface FrontendSettings {
 		pruneTime: number;
 		licensePruneTime: number;
 	};
-	pruning: {
+	aiCredits: {
+		enabled: boolean;
+		credits: number;
+	};
+	pruning?: {
 		isEnabled: boolean;
 		maxAge: number;
 		maxCount: number;
@@ -169,4 +175,6 @@ export interface FrontendSettings {
 	security: {
 		blockFileAccessToN8nFiles: boolean;
 	};
+	betaFeatures: FrontendBetaFeatures[];
+	easyAIWorkflowOnboarded: boolean;
 }
diff --git a/packages/@n8n/api-types/src/index.ts b/packages/@n8n/api-types/src/index.ts
index d0067f7fff..5620689af0 100644
--- a/packages/@n8n/api-types/src/index.ts
+++ b/packages/@n8n/api-types/src/index.ts
@@ -7,3 +7,20 @@ export type * from './user';
 
 export type { Collaborator } from './push/collaboration';
 export type { SendWorkerStatusMessage } from './push/worker';
+
+export type { BannerName } from './schemas/bannerName.schema';
+export { passwordSchema } from './schemas/password.schema';
+
+export type {
+	ProjectType,
+	ProjectIcon,
+	ProjectRole,
+	ProjectRelation,
+} from './schemas/project.schema';
+
+export {
+	type SourceControlledFile,
+	SOURCE_CONTROL_FILE_LOCATION,
+	SOURCE_CONTROL_FILE_STATUS,
+	SOURCE_CONTROL_FILE_TYPE,
+} from './schemas/source-controlled-file.schema';
diff --git a/packages/@n8n/api-types/src/push/execution.ts b/packages/@n8n/api-types/src/push/execution.ts
index 78c0b34a36..b87bb67d0f 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 { IRun, ITaskData, WorkflowExecuteMode } from 'n8n-workflow';
+import type { ExecutionStatus, ITaskData, WorkflowExecuteMode } from 'n8n-workflow';
 
 type ExecutionStarted = {
 	type: 'executionStarted';
@@ -9,6 +9,14 @@ type ExecutionStarted = {
 		workflowId: string;
 		workflowName?: string;
 		retryOf?: string;
+		flattedRunData: string;
+	};
+};
+
+type ExecutionWaiting = {
+	type: 'executionWaiting';
+	data: {
+		executionId: string;
 	};
 };
 
@@ -16,8 +24,10 @@ type ExecutionFinished = {
 	type: 'executionFinished';
 	data: {
 		executionId: string;
-		data: IRun;
-		retryOf?: 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;
 	};
 };
 
@@ -42,11 +52,23 @@ type NodeExecuteAfter = {
 		executionId: string;
 		nodeName: string;
 		data: ITaskData;
+
+		/**
+		 * When a worker relays updates about a manual execution to main, if the
+		 * payload size is above a limit, we send only a placeholder to the client.
+		 * Later we fetch the entire execution data and fill in any placeholders.
+		 *
+		 * When sending a placheolder, we also send the number of output items, so
+		 * the client knows ahead of time how many items are there, to prevent the
+		 * items count from jumping up when the execution finishes.
+		 */
+		itemCount?: number;
 	};
 };
 
 export type ExecutionPushMessage =
 	| ExecutionStarted
+	| ExecutionWaiting
 	| ExecutionFinished
 	| ExecutionRecovered
 	| NodeExecuteBefore
diff --git a/packages/@n8n/api-types/src/schemas/__tests__/nodeVersion.schema.test.ts b/packages/@n8n/api-types/src/schemas/__tests__/nodeVersion.schema.test.ts
new file mode 100644
index 0000000000..098db82096
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/__tests__/nodeVersion.schema.test.ts
@@ -0,0 +1,28 @@
+import { nodeVersionSchema } from '../nodeVersion.schema';
+
+describe('nodeVersionSchema', () => {
+	describe('valid versions', () => {
+		test.each([
+			[1, 'single digit'],
+			[2, 'single digit'],
+			[1.0, 'major.minor with zero minor'],
+			[1.2, 'major.minor'],
+			[10.5, 'major.minor with double digits'],
+		])('should accept %s as a valid version (%s)', (version) => {
+			const validated = nodeVersionSchema.parse(version);
+			expect(validated).toBe(version);
+		});
+	});
+
+	describe('invalid versions', () => {
+		test.each([
+			['not-a-number', 'non-number input'],
+			['1.2.3', 'more than two parts'],
+			['1.a', 'non-numeric characters'],
+			['1.2.3', 'more than two parts as string'],
+		])('should reject %s as an invalid version (%s)', (version) => {
+			const check = () => nodeVersionSchema.parse(version);
+			expect(check).toThrowError();
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/schemas/__tests__/paswword.schema.test.ts b/packages/@n8n/api-types/src/schemas/__tests__/paswword.schema.test.ts
new file mode 100644
index 0000000000..c3bcd5f4c8
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/__tests__/paswword.schema.test.ts
@@ -0,0 +1,54 @@
+import { passwordSchema } from '../password.schema';
+
+describe('passwordSchema', () => {
+	test('should throw on empty password', () => {
+		const check = () => passwordSchema.parse('');
+
+		expect(check).toThrowError('Password must be 8 to 64 characters long');
+	});
+
+	test('should return same password if valid', () => {
+		const validPassword = 'abcd1234X';
+
+		const validated = passwordSchema.parse(validPassword);
+
+		expect(validated).toBe(validPassword);
+	});
+
+	test('should require at least one uppercase letter', () => {
+		const invalidPassword = 'abcd1234';
+
+		const failingCheck = () => passwordSchema.parse(invalidPassword);
+
+		expect(failingCheck).toThrowError('Password must contain at least 1 uppercase letter.');
+	});
+
+	test('should require at least one number', () => {
+		const validPassword = 'abcd1234X';
+		const invalidPassword = 'abcdEFGH';
+
+		const validated = passwordSchema.parse(validPassword);
+
+		expect(validated).toBe(validPassword);
+
+		const check = () => passwordSchema.parse(invalidPassword);
+
+		expect(check).toThrowError('Password must contain at least 1 number.');
+	});
+
+	test('should require a minimum length of 8 characters', () => {
+		const invalidPassword = 'a'.repeat(7);
+
+		const check = () => passwordSchema.parse(invalidPassword);
+
+		expect(check).toThrowError('Password must be 8 to 64 characters long.');
+	});
+
+	test('should require a maximum length of 64 characters', () => {
+		const invalidPassword = 'a'.repeat(65);
+
+		const check = () => passwordSchema.parse(invalidPassword);
+
+		expect(check).toThrowError('Password must be 8 to 64 characters long.');
+	});
+});
diff --git a/packages/@n8n/api-types/src/schemas/__tests__/project.schema.test.ts b/packages/@n8n/api-types/src/schemas/__tests__/project.schema.test.ts
new file mode 100644
index 0000000000..9a1cf47414
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/__tests__/project.schema.test.ts
@@ -0,0 +1,105 @@
+import {
+	projectNameSchema,
+	projectTypeSchema,
+	projectIconSchema,
+	projectRoleSchema,
+	projectRelationSchema,
+} from '../project.schema';
+
+describe('project.schema', () => {
+	describe('projectNameSchema', () => {
+		test.each([
+			{ name: 'valid name', value: 'My Project', expected: true },
+			{ name: 'empty name', value: '', expected: false },
+			{ name: 'name too long', value: 'a'.repeat(256), expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectNameSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('projectTypeSchema', () => {
+		test.each([
+			{ name: 'valid type: personal', value: 'personal', expected: true },
+			{ name: 'valid type: team', value: 'team', expected: true },
+			{ name: 'invalid type', value: 'invalid', expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectTypeSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('projectIconSchema', () => {
+		test.each([
+			{
+				name: 'valid emoji icon',
+				value: { type: 'emoji', value: '🚀' },
+				expected: true,
+			},
+			{
+				name: 'valid icon',
+				value: { type: 'icon', value: 'blah' },
+				expected: true,
+			},
+			{
+				name: 'invalid icon type',
+				value: { type: 'invalid', value: '🚀' },
+				expected: false,
+			},
+			{
+				name: 'empty icon value',
+				value: { type: 'emoji', value: '' },
+				expected: false,
+			},
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectIconSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('projectRoleSchema', () => {
+		test.each([
+			{ name: 'valid role: project:personalOwner', value: 'project:personalOwner', expected: true },
+			{ name: 'valid role: project:admin', value: 'project:admin', expected: true },
+			{ name: 'valid role: project:editor', value: 'project:editor', expected: true },
+			{ name: 'valid role: project:viewer', value: 'project:viewer', expected: true },
+			{ name: 'invalid role', value: 'invalid-role', expected: false },
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectRoleSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+
+	describe('projectRelationSchema', () => {
+		test.each([
+			{
+				name: 'valid relation',
+				value: { userId: 'user-123', role: 'project:admin' },
+				expected: true,
+			},
+			{
+				name: 'invalid userId type',
+				value: { userId: 123, role: 'project:admin' },
+				expected: false,
+			},
+			{
+				name: 'invalid role',
+				value: { userId: 'user-123', role: 'invalid-role' },
+				expected: false,
+			},
+			{
+				name: 'missing userId',
+				value: { role: 'project:admin' },
+				expected: false,
+			},
+			{
+				name: 'missing role',
+				value: { userId: 'user-123' },
+				expected: false,
+			},
+		])('should validate $name', ({ value, expected }) => {
+			const result = projectRelationSchema.safeParse(value);
+			expect(result.success).toBe(expected);
+		});
+	});
+});
diff --git a/packages/@n8n/api-types/src/schemas/bannerName.schema.ts b/packages/@n8n/api-types/src/schemas/bannerName.schema.ts
new file mode 100644
index 0000000000..445bc31d1a
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/bannerName.schema.ts
@@ -0,0 +1,11 @@
+import { z } from 'zod';
+
+export const bannerNameSchema = z.enum([
+	'V1',
+	'TRIAL_OVER',
+	'TRIAL',
+	'NON_PRODUCTION_LICENSE',
+	'EMAIL_CONFIRMATION',
+]);
+
+export type BannerName = z.infer<typeof bannerNameSchema>;
diff --git a/packages/@n8n/api-types/src/schemas/booleanFromString.ts b/packages/@n8n/api-types/src/schemas/booleanFromString.ts
new file mode 100644
index 0000000000..bcc9e8133c
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/booleanFromString.ts
@@ -0,0 +1,3 @@
+import { z } from 'zod';
+
+export const booleanFromString = z.enum(['true', 'false']).transform((value) => value === 'true');
diff --git a/packages/@n8n/api-types/src/schemas/nodeVersion.schema.ts b/packages/@n8n/api-types/src/schemas/nodeVersion.schema.ts
new file mode 100644
index 0000000000..3edb8cc5fe
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/nodeVersion.schema.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod';
+
+export const nodeVersionSchema = z
+	.number()
+	.min(1)
+	.refine(
+		(val) => {
+			const parts = String(val).split('.');
+			return (
+				(parts.length === 1 && !isNaN(Number(parts[0]))) ||
+				(parts.length === 2 && !isNaN(Number(parts[0])) && !isNaN(Number(parts[1])))
+			);
+		},
+		{
+			message: 'Invalid node version. Must be in format: major.minor',
+		},
+	);
diff --git a/packages/@n8n/api-types/src/schemas/password.schema.ts b/packages/@n8n/api-types/src/schemas/password.schema.ts
new file mode 100644
index 0000000000..3c60470af7
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/password.schema.ts
@@ -0,0 +1,16 @@
+import { z } from 'zod';
+
+// TODO: Delete these from `cli` after all password-validation code starts using this schema
+const minLength = 8;
+const maxLength = 64;
+
+export const passwordSchema = z
+	.string()
+	.min(minLength, `Password must be ${minLength} to ${maxLength} characters long.`)
+	.max(maxLength, `Password must be ${minLength} to ${maxLength} characters long.`)
+	.refine((password) => /\d/.test(password), {
+		message: 'Password must contain at least 1 number.',
+	})
+	.refine((password) => /[A-Z]/.test(password), {
+		message: 'Password must contain at least 1 uppercase letter.',
+	});
diff --git a/packages/@n8n/api-types/src/schemas/passwordResetToken.schema.ts b/packages/@n8n/api-types/src/schemas/passwordResetToken.schema.ts
new file mode 100644
index 0000000000..b7c55bb886
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/passwordResetToken.schema.ts
@@ -0,0 +1,3 @@
+import { z } from 'zod';
+
+export const passwordResetTokenSchema = z.string().min(10, 'Token too short');
diff --git a/packages/@n8n/api-types/src/schemas/project.schema.ts b/packages/@n8n/api-types/src/schemas/project.schema.ts
new file mode 100644
index 0000000000..11c6cc2b37
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/project.schema.ts
@@ -0,0 +1,26 @@
+import { z } from 'zod';
+
+export const projectNameSchema = z.string().min(1).max(255);
+
+export const projectTypeSchema = z.enum(['personal', 'team']);
+export type ProjectType = z.infer<typeof projectTypeSchema>;
+
+export const projectIconSchema = z.object({
+	type: z.enum(['emoji', 'icon']),
+	value: z.string().min(1),
+});
+export type ProjectIcon = z.infer<typeof projectIconSchema>;
+
+export const projectRoleSchema = z.enum([
+	'project:personalOwner', // personalOwner is only used for personal projects
+	'project:admin',
+	'project:editor',
+	'project:viewer',
+]);
+export type ProjectRole = z.infer<typeof projectRoleSchema>;
+
+export const projectRelationSchema = z.object({
+	userId: z.string(),
+	role: projectRoleSchema,
+});
+export type ProjectRelation = z.infer<typeof projectRelationSchema>;
diff --git a/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts b/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts
new file mode 100644
index 0000000000..31f2db8f92
--- /dev/null
+++ b/packages/@n8n/api-types/src/schemas/source-controlled-file.schema.ts
@@ -0,0 +1,34 @@
+import { z } from 'zod';
+
+const FileTypeSchema = z.enum(['credential', 'workflow', 'tags', 'variables', 'file']);
+export const SOURCE_CONTROL_FILE_TYPE = FileTypeSchema.Values;
+
+const FileStatusSchema = z.enum([
+	'new',
+	'modified',
+	'deleted',
+	'created',
+	'renamed',
+	'conflicted',
+	'ignored',
+	'staged',
+	'unknown',
+]);
+export const SOURCE_CONTROL_FILE_STATUS = FileStatusSchema.Values;
+
+const FileLocationSchema = z.enum(['local', 'remote']);
+export const SOURCE_CONTROL_FILE_LOCATION = FileLocationSchema.Values;
+
+export const SourceControlledFileSchema = z.object({
+	file: z.string(),
+	id: z.string(),
+	name: z.string(),
+	type: FileTypeSchema,
+	status: FileStatusSchema,
+	location: FileLocationSchema,
+	conflict: z.boolean(),
+	updatedAt: z.string(),
+	pushed: z.boolean().optional(),
+});
+
+export type SourceControlledFile = z.infer<typeof SourceControlledFileSchema>;
diff --git a/packages/@n8n/benchmark/package.json b/packages/@n8n/benchmark/package.json
index abb8514c3d..f42bd7c508 100644
--- a/packages/@n8n/benchmark/package.json
+++ b/packages/@n8n/benchmark/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/n8n-benchmark",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "description": "Cli for running benchmark tests for n8n",
   "main": "dist/index",
   "scripts": {
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
index 3cc08227c1..5241971325 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
@@ -32,6 +32,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     ports:
       - 5678:5678
     volumes:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
index c686f581b3..723c10f00e 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
@@ -50,6 +50,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker1:/n8n
@@ -82,6 +85,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker2:/n8n
@@ -117,6 +123,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     volumes:
       - ${RUN_DIR}/n8n-main2:/n8n
     depends_on:
@@ -154,7 +163,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
-
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     volumes:
       - ${RUN_DIR}/n8n-main1:/n8n
     depends_on:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
index fe9e3a26c0..ecefddf5b0 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
@@ -48,6 +48,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker1:/n8n
@@ -78,6 +81,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker2:/n8n
@@ -109,6 +115,9 @@ services:
       - DB_TYPE=postgresdb
       - DB_POSTGRESDB_HOST=postgres
       - DB_POSTGRESDB_PASSWORD=password
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     ports:
       - 5678:5678
     volumes:
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
index 20ec0067fa..37e1424cfd 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
@@ -14,6 +14,9 @@ services:
       - N8N_USER_FOLDER=/n8n
       - DB_SQLITE_POOL_SIZE=3
       - DB_SQLITE_ENABLE_WAL=true
+      # Task Runner config
+      - N8N_RUNNERS_ENABLED=true
+      - N8N_RUNNERS_MODE=internal
     ports:
       - 5678:5678
     volumes:
diff --git a/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.ts b/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.ts
index dd81fa9cfb..aa3ce82a96 100644
--- a/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.ts
+++ b/packages/@n8n/benchmark/src/n8n-api-client/n8n-api-client.ts
@@ -2,7 +2,7 @@ import type { AxiosError, AxiosRequestConfig } from 'axios';
 import axios from 'axios';
 
 export class N8nApiClient {
-	constructor(public readonly apiBaseUrl: string) {}
+	constructor(readonly apiBaseUrl: string) {}
 
 	async waitForInstanceToBecomeOnline(): Promise<void> {
 		const HEALTH_ENDPOINT = 'healthz';
diff --git a/packages/@n8n/chat/package.json b/packages/@n8n/chat/package.json
index 5dc5881181..1db1c50f9a 100644
--- a/packages/@n8n/chat/package.json
+++ b/packages/@n8n/chat/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@n8n/chat",
-  "version": "0.29.0",
+  "version": "0.33.0",
   "scripts": {
     "dev": "pnpm run storybook",
     "build": "pnpm build:vite && pnpm build:bundle",
-    "build:vite": "vite build",
-    "build:bundle": "INCLUDE_VUE=true vite build",
+    "build:vite": "cross-env vite build",
+    "build:bundle": "cross-env INCLUDE_VUE=true vite build",
     "preview": "vite preview",
     "test:dev": "vitest",
     "test": "vitest run",
@@ -46,11 +46,12 @@
   "devDependencies": {
     "@iconify-json/mdi": "^1.1.54",
     "@n8n/storybook": "workspace:*",
+    "@vitejs/plugin-vue": "catalog:frontend",
     "@vitest/coverage-v8": "catalog:frontend",
     "unplugin-icons": "^0.19.0",
     "vite": "catalog:frontend",
     "vitest": "catalog:frontend",
-    "vite-plugin-dts": "^4.2.3",
+    "vite-plugin-dts": "^4.3.0",
     "vue-tsc": "catalog:frontend"
   },
   "files": [
diff --git a/packages/@n8n/chat/src/__tests__/setup.ts b/packages/@n8n/chat/src/__tests__/setup.ts
index 7b0828bfa8..33e89fb68b 100644
--- a/packages/@n8n/chat/src/__tests__/setup.ts
+++ b/packages/@n8n/chat/src/__tests__/setup.ts
@@ -1 +1,13 @@
 import '@testing-library/jest-dom';
+import '@testing-library/jest-dom';
+import { configure } from '@testing-library/vue';
+
+configure({ testIdAttribute: 'data-test-id' });
+
+window.ResizeObserver =
+	window.ResizeObserver ||
+	vi.fn().mockImplementation(() => ({
+		disconnect: vi.fn(),
+		observe: vi.fn(),
+		unobserve: vi.fn(),
+	}));
diff --git a/packages/@n8n/chat/src/components/ChatFile.vue b/packages/@n8n/chat/src/components/ChatFile.vue
index d3c3c2db7d..52b4acf789 100644
--- a/packages/@n8n/chat/src/components/ChatFile.vue
+++ b/packages/@n8n/chat/src/components/ChatFile.vue
@@ -30,22 +30,23 @@ const TypeIcon = computed(() => {
 });
 
 function onClick() {
-	if (props.isRemovable) {
-		emit('remove', props.file);
-	}
-
 	if (props.isPreviewable) {
 		window.open(URL.createObjectURL(props.file));
 	}
 }
+function onDelete() {
+	emit('remove', props.file);
+}
 </script>
 
 <template>
 	<div class="chat-file" @click="onClick">
 		<TypeIcon />
 		<p class="chat-file-name">{{ file.name }}</p>
-		<IconDelete v-if="isRemovable" class="chat-file-delete" />
-		<IconPreview v-if="isPreviewable" class="chat-file-preview" />
+		<span v-if="isRemovable" class="chat-file-delete" @click.stop="onDelete">
+			<IconDelete />
+		</span>
+		<IconPreview v-else-if="isPreviewable" class="chat-file-preview" />
 	</div>
 </template>
 
@@ -80,12 +81,25 @@ function onClick() {
 .chat-file-preview {
 	background: none;
 	border: none;
-	display: none;
+	display: block;
 	cursor: pointer;
 	flex-shrink: 0;
+}
 
-	.chat-file:hover & {
-		display: block;
+.chat-file-delete {
+	position: relative;
+	&:hover {
+		color: red;
+	}
+
+	/* Increase hit area for better clickability */
+	&:before {
+		content: '';
+		position: absolute;
+		top: -10px;
+		right: -10px;
+		bottom: -10px;
+		left: -10px;
 	}
 }
 </style>
diff --git a/packages/@n8n/chat/src/components/Input.vue b/packages/@n8n/chat/src/components/Input.vue
index 3e823917e0..1b9e0b9608 100644
--- a/packages/@n8n/chat/src/components/Input.vue
+++ b/packages/@n8n/chat/src/components/Input.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useFileDialog } from '@vueuse/core';
-import IconFilePlus from 'virtual:icons/mdi/filePlus';
+import IconPaperclip from 'virtual:icons/mdi/paperclip';
 import IconSend from 'virtual:icons/mdi/send';
 import { computed, onMounted, onUnmounted, ref, unref } from 'vue';
 
@@ -9,10 +9,20 @@ import { chatEventBus } from '@n8n/chat/event-buses';
 
 import ChatFile from './ChatFile.vue';
 
+export interface ChatInputProps {
+	placeholder?: string;
+}
+
+const props = withDefaults(defineProps<ChatInputProps>(), {
+	placeholder: 'inputPlaceholder',
+});
+
 export interface ArrowKeyDownPayload {
 	key: 'ArrowUp' | 'ArrowDown';
 	currentInputValue: string;
 }
+
+const { t } = useI18n();
 const emit = defineEmits<{
 	arrowKeyDown: [value: ArrowKeyDownPayload];
 }>();
@@ -20,20 +30,20 @@ const emit = defineEmits<{
 const { options } = useOptions();
 const chatStore = useChat();
 const { waitingForResponse } = chatStore;
-const { t } = useI18n();
 
 const files = ref<FileList | null>(null);
 const chatTextArea = ref<HTMLTextAreaElement | null>(null);
 const input = ref('');
 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));
@@ -74,12 +84,30 @@ onMounted(() => {
 	chatEventBus.on('focusInput', focusChatInput);
 	chatEventBus.on('blurInput', blurChatInput);
 	chatEventBus.on('setInputValue', setInputValue);
+
+	if (chatTextArea.value) {
+		resizeObserver.value = new ResizeObserver((entries) => {
+			for (const entry of entries) {
+				if (entry.target === chatTextArea.value) {
+					adjustHeight({ target: chatTextArea.value } as unknown as Event);
+				}
+			}
+		});
+
+		// Start observing the textarea
+		resizeObserver.value.observe(chatTextArea.value);
+	}
 });
 
 onUnmounted(() => {
 	chatEventBus.off('focusInput', focusChatInput);
 	chatEventBus.off('blurInput', blurChatInput);
 	chatEventBus.off('setInputValue', setInputValue);
+
+	if (resizeObserver.value) {
+		resizeObserver.value.disconnect();
+		resizeObserver.value = null;
+	}
 });
 
 function blurChatInput() {
@@ -121,6 +149,7 @@ async function onSubmitKeydown(event: KeyboardEvent) {
 	}
 
 	await onSubmit(event);
+	adjustHeight({ target: chatTextArea.value } as unknown as Event);
 }
 
 function onFileRemove(file: File) {
@@ -151,27 +180,44 @@ function onOpenFileDialog() {
 	if (isFileUploadDisabled.value) return;
 	openFileDialog({ accept: unref(allowedFileTypes) });
 }
+
+function adjustHeight(event: Event) {
+	const textarea = event.target as HTMLTextAreaElement;
+	// Set to content minimum to get the right scrollHeight
+	textarea.style.height = 'var(--chat--textarea--height)';
+	// Get the new height, with a small buffer for padding
+	const newHeight = Math.min(textarea.scrollHeight, 480); // 30rem
+	textarea.style.height = `${newHeight}px`;
+}
 </script>
 
 <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"
 				v-model="input"
+				data-test-id="chat-input"
 				:disabled="isInputDisabled"
-				:placeholder="t('inputPlaceholder')"
+				:placeholder="t(props.placeholder)"
 				@keydown.enter="onSubmitKeydown"
+				@input="adjustHeight"
+				@mousedown="adjustHeight"
+				@focus="adjustHeight"
 			/>
 
 			<div class="chat-inputs-controls">
 				<button
 					v-if="isFileUploadAllowed"
 					:disabled="isFileUploadDisabled"
-					class="chat-input-send-button"
+					class="chat-input-file-button"
+					data-test-id="chat-attach-file-button"
 					@click="onOpenFileDialog"
 				>
-					<IconFilePlus height="24" width="24" />
+					<IconPaperclip height="24" width="24" />
 				</button>
 				<button :disabled="isSubmitDisabled" class="chat-input-send-button" @click="onSubmit">
 					<IconSend height="24" width="24" />
@@ -184,6 +230,7 @@ function onOpenFileDialog() {
 				:key="file.name"
 				:file="file"
 				:is-removable="true"
+				:is-previewable="true"
 				@remove="onFileRemove"
 			/>
 		</div>
@@ -207,7 +254,7 @@ function onOpenFileDialog() {
 	width: 100%;
 	display: flex;
 	justify-content: center;
-	align-items: center;
+	align-items: flex-end;
 
 	textarea {
 		font-family: inherit;
@@ -215,16 +262,20 @@ function onOpenFileDialog() {
 		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)));
-		min-height: var(--chat--textarea--height);
-		max-height: var(--chat--textarea--max-height, var(--chat--textarea--height));
-		height: 100%;
+		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
+		resize: none;
+		overflow-y: auto;
 		background: var(--chat--input--background, white);
-		resize: var(--chat--textarea--resize, none);
 		color: var(--chat--input--text-color, initial);
 		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);
@@ -233,10 +284,9 @@ function onOpenFileDialog() {
 }
 .chat-inputs-controls {
 	display: flex;
-	position: absolute;
-	right: 0.5rem;
 }
-.chat-input-send-button {
+.chat-input-send-button,
+.chat-input-file-button {
 	height: var(--chat--textarea--height);
 	width: var(--chat--textarea--height);
 	background: var(--chat--input--send--button--background, white);
@@ -253,19 +303,33 @@ function onOpenFileDialog() {
 		min-width: fit-content;
 	}
 
-	&:hover,
-	&:focus {
-		background: var(
-			--chat--input--send--button--background-hover,
-			var(--chat--input--send--button--background)
-		);
-		color: var(--chat--input--send--button--color-hover, var(--chat--color-secondary-shade-50));
-	}
-
 	&[disabled] {
 		cursor: no-drop;
 		color: var(--chat--color-disabled);
 	}
+
+	.chat-input-send-button {
+		&:hover,
+		&:focus {
+			background: var(
+				--chat--input--send--button--background-hover,
+				var(--chat--input--send--button--background)
+			);
+			color: var(--chat--input--send--button--color-hover, var(--chat--color-secondary-shade-50));
+		}
+	}
+}
+.chat-input-file-button {
+	background: var(--chat--input--file--button--background, white);
+	color: var(--chat--input--file--button--color, var(--chat--color-secondary));
+
+	&:hover {
+		background: var(
+			--chat--input--file--button--background-hover,
+			var(--chat--input--file--button--background)
+		);
+		color: var(--chat--input--file--button--color-hover, var(--chat--color-secondary-shade-50));
+	}
 }
 
 .chat-files {
@@ -275,7 +339,12 @@ function onOpenFileDialog() {
 	width: 100%;
 	flex-direction: row;
 	flex-wrap: wrap;
-	gap: 0.25rem;
+	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 f584516332..4ee4514632 100644
--- a/packages/@n8n/chat/src/components/Message.vue
+++ b/packages/@n8n/chat/src/components/Message.vue
@@ -60,7 +60,7 @@ const linksNewTabPlugin = (vueMarkdownItInstance: MarkdownIt) => {
 const scrollToView = () => {
 	if (messageContainer.value?.scrollIntoView) {
 		messageContainer.value.scrollIntoView({
-			block: 'center',
+			block: 'start',
 		});
 	}
 };
@@ -132,14 +132,15 @@ onMounted(async () => {
 .chat-message {
 	display: block;
 	position: relative;
-	max-width: 80%;
+	max-width: fit-content;
 	font-size: var(--chat--message--font-size, 1rem);
 	padding: var(--chat--message--padding, var(--chat--spacing));
 	border-radius: var(--chat--message--border-radius, var(--chat--border-radius));
+	scroll-margin: 3rem;
 
 	.chat-message-actions {
 		position: absolute;
-		bottom: 100%;
+		bottom: calc(100% - 0.5rem);
 		left: 0;
 		opacity: 0;
 		transform: translateY(-0.25rem);
@@ -159,7 +160,7 @@ onMounted(async () => {
 	}
 
 	p {
-		line-height: var(--chat--message-line-height, 1.8);
+		line-height: var(--chat--message-line-height, 1.5);
 		word-wrap: break-word;
 	}
 
diff --git a/packages/@n8n/chat/src/components/MessageTyping.vue b/packages/@n8n/chat/src/components/MessageTyping.vue
index 328ba6566e..e8dd3cf508 100644
--- a/packages/@n8n/chat/src/components/MessageTyping.vue
+++ b/packages/@n8n/chat/src/components/MessageTyping.vue
@@ -34,7 +34,12 @@ onMounted(() => {
 });
 </script>
 <template>
-	<Message ref="messageContainer" :class="classes" :message="message">
+	<Message
+		ref="messageContainer"
+		:class="classes"
+		:message="message"
+		data-test-id="chat-message-typing"
+	>
 		<div class="chat-message-typing-body">
 			<span class="chat-message-typing-circle"></span>
 			<span class="chat-message-typing-circle"></span>
diff --git a/packages/@n8n/chat/src/css/markdown.scss b/packages/@n8n/chat/src/css/markdown.scss
index 070e6d6a5f..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: 125%; /* 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;
 	}
 
 	/*
@@ -596,7 +595,7 @@ body {
 
 	pre code {
 		display: block;
-		padding: 0.3em 0.7em;
+		padding: 0 0 0.5rem 0.5rem;
 		word-break: normal;
 		overflow-x: auto;
 	}
@@ -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 ad583c1108..31e618dc32 100644
--- a/packages/@n8n/config/package.json
+++ b/packages/@n8n/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/config",
-  "version": "1.15.0",
+  "version": "1.25.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
@@ -21,7 +21,7 @@
     "dist/**/*"
   ],
   "dependencies": {
-    "reflect-metadata": "0.2.2",
-    "typedi": "catalog:"
+    "@n8n/di": "workspace:*",
+    "reflect-metadata": "catalog:"
   }
 }
diff --git a/packages/@n8n/config/src/configs/aiAssistant.config.ts b/packages/@n8n/config/src/configs/aiAssistant.config.ts
new file mode 100644
index 0000000000..ff8a3986f2
--- /dev/null
+++ b/packages/@n8n/config/src/configs/aiAssistant.config.ts
@@ -0,0 +1,8 @@
+import { Config, Env } from '../decorators';
+
+@Config
+export class AiAssistantConfig {
+	/** Base URL of the AI assistant service */
+	@Env('N8N_AI_ASSISTANT_BASE_URL')
+	baseUrl: string = '';
+}
diff --git a/packages/@n8n/config/src/configs/diagnostics.config.ts b/packages/@n8n/config/src/configs/diagnostics.config.ts
new file mode 100644
index 0000000000..5ff6abf837
--- /dev/null
+++ b/packages/@n8n/config/src/configs/diagnostics.config.ts
@@ -0,0 +1,30 @@
+import { Config, Env, Nested } from '../decorators';
+
+@Config
+class PostHogConfig {
+	/** API key for PostHog. */
+	@Env('N8N_DIAGNOSTICS_POSTHOG_API_KEY')
+	apiKey: string = 'phc_4URIAm1uYfJO7j8kWSe0J8lc8IqnstRLS7Jx8NcakHo';
+
+	/** API host for PostHog. */
+	@Env('N8N_DIAGNOSTICS_POSTHOG_API_HOST')
+	apiHost: string = 'https://ph.n8n.io';
+}
+
+@Config
+export class DiagnosticsConfig {
+	/** Whether diagnostics are enabled. */
+	@Env('N8N_DIAGNOSTICS_ENABLED')
+	enabled: boolean = true;
+
+	/** Diagnostics config for frontend. */
+	@Env('N8N_DIAGNOSTICS_CONFIG_FRONTEND')
+	frontendConfig: string = '1zPn9bgWPzlQc0p8Gj1uiK6DOTn;https://telemetry.n8n.io';
+
+	/** Diagnostics config for backend. */
+	@Env('N8N_DIAGNOSTICS_CONFIG_BACKEND')
+	backendConfig: string = '1zPn7YoGC3ZXE9zLeTKLuQCB4F6;https://telemetry.n8n.io';
+
+	@Nested
+	posthogConfig: PostHogConfig;
+}
diff --git a/packages/@n8n/config/src/configs/executions.config.ts b/packages/@n8n/config/src/configs/executions.config.ts
new file mode 100644
index 0000000000..977d539920
--- /dev/null
+++ b/packages/@n8n/config/src/configs/executions.config.ts
@@ -0,0 +1,41 @@
+import { Config, Env, Nested } from '../decorators';
+
+@Config
+class PruningIntervalsConfig {
+	/** How often (minutes) execution data should be hard-deleted. */
+	@Env('EXECUTIONS_DATA_PRUNE_HARD_DELETE_INTERVAL')
+	hardDelete: number = 15;
+
+	/** How often (minutes) execution data should be soft-deleted. */
+	@Env('EXECUTIONS_DATA_PRUNE_SOFT_DELETE_INTERVAL')
+	softDelete: number = 60;
+}
+
+@Config
+export class ExecutionsConfig {
+	/** Whether to delete past executions on a rolling basis. */
+	@Env('EXECUTIONS_DATA_PRUNE')
+	pruneData: boolean = true;
+
+	/** How old (hours) a finished execution must be to qualify for soft-deletion. */
+	@Env('EXECUTIONS_DATA_MAX_AGE')
+	pruneDataMaxAge: number = 336;
+
+	/**
+	 * Max number of finished executions to keep in database. Does not necessarily
+	 * prune to the exact max number. `0` for unlimited.
+	 */
+	@Env('EXECUTIONS_DATA_PRUNE_MAX_COUNT')
+	pruneDataMaxCount: number = 10_000;
+
+	/**
+	 * How old (hours) a finished execution must be to qualify for hard-deletion.
+	 * This buffer by default excludes recent executions as the user may need
+	 * them while building a workflow.
+	 */
+	@Env('EXECUTIONS_DATA_HARD_DELETE_BUFFER')
+	pruneDataHardDeleteBuffer: number = 1;
+
+	@Nested
+	pruneDataIntervals: PruningIntervalsConfig;
+}
diff --git a/packages/@n8n/config/src/configs/frontend.config.ts b/packages/@n8n/config/src/configs/frontend.config.ts
new file mode 100644
index 0000000000..62fa004dd5
--- /dev/null
+++ b/packages/@n8n/config/src/configs/frontend.config.ts
@@ -0,0 +1,11 @@
+import { Config, Env } from '../decorators';
+import { StringArray } from '../utils';
+
+export type FrontendBetaFeatures = 'canvas_v2';
+
+@Config
+export class FrontendConfig {
+	/** Which UI experiments to enable. Separate multiple values with a comma `,` */
+	@Env('N8N_UI_BETA_FEATURES')
+	betaFeatures: StringArray<FrontendBetaFeatures> = ['canvas_v2'];
+}
diff --git a/packages/@n8n/config/src/configs/logging.config.ts b/packages/@n8n/config/src/configs/logging.config.ts
index 0568eaf791..733278c3e3 100644
--- a/packages/@n8n/config/src/configs/logging.config.ts
+++ b/packages/@n8n/config/src/configs/logging.config.ts
@@ -7,10 +7,13 @@ export const LOG_SCOPES = [
 	'external-secrets',
 	'license',
 	'multi-main-setup',
+	'pruning',
 	'pubsub',
+	'push',
 	'redis',
 	'scaling',
 	'waiting-executions',
+	'task-runner',
 ] as const;
 
 export type LogScope = (typeof LOG_SCOPES)[number];
@@ -68,10 +71,13 @@ export class LoggingConfig {
 	 * - `external-secrets`
 	 * - `license`
 	 * - `multi-main-setup`
+	 * - `pruning`
 	 * - `pubsub`
+	 * - `push`
 	 * - `redis`
 	 * - `scaling`
 	 * - `waiting-executions`
+	 * - `task-runner`
 	 *
 	 * @example
 	 * `N8N_LOG_SCOPES=license`
diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
index 648959e3f4..02ebdf5df9 100644
--- a/packages/@n8n/config/src/configs/runners.config.ts
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -2,22 +2,21 @@ import { Config, Env } from '../decorators';
 
 /**
  * Whether to enable task runners and how to run them
- * - internal_childprocess: Task runners are run as a child process and launched by n8n
- * - internal_launcher: Task runners are run as a child process and launched by n8n using a separate launch program
+ * - internal: Task runners are run as a child process and launched by n8n
  * - external: Task runners are run as a separate program not launched by n8n
  */
-export type TaskRunnerMode = 'internal_childprocess' | 'internal_launcher' | 'external';
+export type TaskRunnerMode = 'internal' | 'external';
 
 @Config
 export class TaskRunnersConfig {
-	// Defaults to true for now
-	@Env('N8N_RUNNERS_DISABLED')
-	disabled: boolean = true;
+	@Env('N8N_RUNNERS_ENABLED')
+	enabled: boolean = false;
 
 	// Defaults to true for now
 	@Env('N8N_RUNNERS_MODE')
-	mode: TaskRunnerMode = 'internal_childprocess';
+	mode: TaskRunnerMode = 'internal';
 
+	/** Endpoint which task runners connect to */
 	@Env('N8N_RUNNERS_PATH')
 	path: string = '/runners';
 
@@ -25,7 +24,7 @@ export class TaskRunnersConfig {
 	authToken: string = '';
 
 	/** IP address task runners server should listen on */
-	@Env('N8N_RUNNERS_SERVER_PORT')
+	@Env('N8N_RUNNERS_HEALTH_CHECK_SERVER_PORT')
 	port: number = 5679;
 
 	/** IP address task runners server should listen on */
@@ -36,10 +35,29 @@ export class TaskRunnersConfig {
 	@Env('N8N_RUNNERS_MAX_PAYLOAD')
 	maxPayload: number = 1024 * 1024 * 1024;
 
-	@Env('N8N_RUNNERS_LAUNCHER_PATH')
-	launcherPath: string = '';
+	/** The --max-old-space-size option to use for the runner (in MB). Default means node.js will determine it based on the available memory. */
+	@Env('N8N_RUNNERS_MAX_OLD_SPACE_SIZE')
+	maxOldSpaceSize: string = '';
 
-	/** Which task runner to launch from the config */
-	@Env('N8N_RUNNERS_LAUNCHER_RUNNER')
-	launcherRunner: string = 'javascript';
+	/**
+	 * How many concurrent tasks can a runner execute at a time
+	 *
+	 * Kept high for backwards compatibility - n8n v2 will reduce this to `5`
+	 */
+	@Env('N8N_RUNNERS_MAX_CONCURRENCY')
+	maxConcurrency: number = 10;
+
+	/**
+	 * How long (in seconds) a task is allowed to take for completion, else the
+	 * task will be aborted. (In internal mode, the runner will also be
+	 * restarted.) Must be greater than 0.
+	 *
+	 * Kept high for backwards compatibility - n8n v2 will reduce this to `60`
+	 */
+	@Env('N8N_RUNNERS_TASK_TIMEOUT')
+	taskTimeout: number = 300; // 5 minutes
+
+	/** How often (in seconds) the runner must send a heartbeat to the broker, else the task will be aborted. (In internal mode, the runner will also  be restarted.) Must be greater than 0. */
+	@Env('N8N_RUNNERS_HEARTBEAT_INTERVAL')
+	heartbeatInterval: number = 30;
 }
diff --git a/packages/@n8n/config/src/configs/security.config.ts b/packages/@n8n/config/src/configs/security.config.ts
new file mode 100644
index 0000000000..329e84cc43
--- /dev/null
+++ b/packages/@n8n/config/src/configs/security.config.ts
@@ -0,0 +1,27 @@
+import { Config, Env } from '../decorators';
+
+@Config
+export class SecurityConfig {
+	/**
+	 * Which directories to limit n8n's access to. Separate multiple dirs with semicolon `;`.
+	 *
+	 * @example N8N_RESTRICT_FILE_ACCESS_TO=/home/user/.n8n;/home/user/n8n-data
+	 */
+	@Env('N8N_RESTRICT_FILE_ACCESS_TO')
+	restrictFileAccessTo: string = '';
+
+	/**
+	 * Whether to block access to all files at:
+	 * - the ".n8n" directory,
+	 * - the static cache dir at ~/.cache/n8n/public, and
+	 * - user-defined config files.
+	 */
+	@Env('N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES')
+	blockFileAccessToN8nFiles: boolean = true;
+
+	/**
+	 * In a [security audit](https://docs.n8n.io/hosting/securing/security-audit/), how many days for a workflow to be considered abandoned if not executed.
+	 */
+	@Env('N8N_SECURITY_AUDIT_DAYS_ABANDONED_WORKFLOW')
+	daysAbandonedWorkflow: number = 90;
+}
diff --git a/packages/@n8n/config/src/configs/sentry.config.ts b/packages/@n8n/config/src/configs/sentry.config.ts
index d1067f9984..97e34edeea 100644
--- a/packages/@n8n/config/src/configs/sentry.config.ts
+++ b/packages/@n8n/config/src/configs/sentry.config.ts
@@ -2,11 +2,35 @@ import { Config, Env } from '../decorators';
 
 @Config
 export class SentryConfig {
-	/** Sentry DSN for the backend. */
+	/** Sentry DSN (data source name) for the backend. */
 	@Env('N8N_SENTRY_DSN')
 	backendDsn: string = '';
 
-	/** Sentry DSN for the frontend . */
+	/** Sentry DSN (data source name) for the frontend. */
 	@Env('N8N_FRONTEND_SENTRY_DSN')
 	frontendDsn: string = '';
+
+	/**
+	 * Version of the n8n instance
+	 *
+	 * @example '1.73.0'
+	 */
+	@Env('N8N_VERSION')
+	n8nVersion: string = '';
+
+	/**
+	 * Environment of the n8n instance.
+	 *
+	 * @example 'production'
+	 */
+	@Env('ENVIRONMENT')
+	environment: string = '';
+
+	/**
+	 * Name of the deployment, e.g. cloud account name.
+	 *
+	 * @example 'janober'
+	 */
+	@Env('DEPLOYMENT_NAME')
+	deploymentName: string = '';
 }
diff --git a/packages/@n8n/config/src/configs/tags.config.ts b/packages/@n8n/config/src/configs/tags.config.ts
new file mode 100644
index 0000000000..1c6db71809
--- /dev/null
+++ b/packages/@n8n/config/src/configs/tags.config.ts
@@ -0,0 +1,10 @@
+import { Config, Env } from '../decorators';
+
+@Config
+export class TagsConfig {
+	/*
+		Disable workflow tags
+	*/
+	@Env('N8N_WORKFLOW_TAGS_DISABLED')
+	disabled: boolean = false;
+}
diff --git a/packages/@n8n/config/src/configs/workflows.config.ts b/packages/@n8n/config/src/configs/workflows.config.ts
index 3d6eaad12f..c5b88775c8 100644
--- a/packages/@n8n/config/src/configs/workflows.config.ts
+++ b/packages/@n8n/config/src/configs/workflows.config.ts
@@ -6,10 +6,6 @@ export class WorkflowsConfig {
 	@Env('WORKFLOWS_DEFAULT_NAME')
 	defaultName: string = 'My workflow';
 
-	/** Show onboarding flow in new workflow */
-	@Env('N8N_ONBOARDING_FLOW_DISABLED')
-	onboardingFlowDisabled: boolean = false;
-
 	/** Default option for which workflows may call the current workflow */
 	@Env('N8N_WORKFLOW_CALLER_POLICY_DEFAULT_OPTION')
 	callerPolicyDefaultOption: 'any' | 'none' | 'workflowsFromAList' | 'workflowsFromSameOwner' =
diff --git a/packages/@n8n/config/src/decorators.ts b/packages/@n8n/config/src/decorators.ts
index cafdf3fcd4..57eb1500e2 100644
--- a/packages/@n8n/config/src/decorators.ts
+++ b/packages/@n8n/config/src/decorators.ts
@@ -1,6 +1,6 @@
 import 'reflect-metadata';
+import { Container, Service } from '@n8n/di';
 import { readFileSync } from 'fs';
-import { Container, Service } from 'typedi';
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 type Class = Function;
@@ -35,7 +35,7 @@ export const Config: ClassDecorator = (ConfigClass: Class) => {
 
 		for (const [key, { type, envName }] of classMetadata) {
 			if (typeof type === 'function' && globalMetadata.has(type)) {
-				config[key] = Container.get(type);
+				config[key] = Container.get(type as Constructable);
 			} else if (envName) {
 				const value = readEnv(envName);
 				if (value === undefined) continue;
diff --git a/packages/@n8n/config/src/index.ts b/packages/@n8n/config/src/index.ts
index 9ebfb12465..f462ef9424 100644
--- a/packages/@n8n/config/src/index.ts
+++ b/packages/@n8n/config/src/index.ts
@@ -1,8 +1,11 @@
+import { AiAssistantConfig } from './configs/aiAssistant.config';
 import { CacheConfig } from './configs/cache.config';
 import { CredentialsConfig } from './configs/credentials.config';
 import { DatabaseConfig } from './configs/database.config';
+import { DiagnosticsConfig } from './configs/diagnostics.config';
 import { EndpointsConfig } from './configs/endpoints.config';
 import { EventBusConfig } from './configs/event-bus.config';
+import { ExecutionsConfig } from './configs/executions.config';
 import { ExternalSecretsConfig } from './configs/external-secrets.config';
 import { ExternalStorageConfig } from './configs/external-storage.config';
 import { GenericConfig } from './configs/generic.config';
@@ -13,7 +16,9 @@ import { NodesConfig } from './configs/nodes.config';
 import { PublicApiConfig } from './configs/public-api.config';
 import { TaskRunnersConfig } from './configs/runners.config';
 import { ScalingModeConfig } from './configs/scaling-mode.config';
+import { SecurityConfig } from './configs/security.config';
 import { SentryConfig } from './configs/sentry.config';
+import { TagsConfig } from './configs/tags.config';
 import { TemplatesConfig } from './configs/templates.config';
 import { UserManagementConfig } from './configs/user-management.config';
 import { VersionNotificationsConfig } from './configs/version-notifications.config';
@@ -22,6 +27,9 @@ import { Config, Env, Nested } from './decorators';
 
 export { Config, Env, Nested } from './decorators';
 export { TaskRunnersConfig } from './configs/runners.config';
+export { SecurityConfig } from './configs/security.config';
+export { ExecutionsConfig } from './configs/executions.config';
+export { FrontendBetaFeatures, FrontendConfig } from './configs/frontend.config';
 export { LOG_SCOPES } from './configs/logging.config';
 export type { LogScope } from './configs/logging.config';
 
@@ -106,4 +114,19 @@ export class GlobalConfig {
 
 	@Nested
 	license: LicenseConfig;
+
+	@Nested
+	security: SecurityConfig;
+
+	@Nested
+	executions: ExecutionsConfig;
+
+	@Nested
+	diagnostics: DiagnosticsConfig;
+
+	@Nested
+	aiAssistant: AiAssistantConfig;
+
+	@Nested
+	tags: TagsConfig;
 }
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index f605006067..d9499d7849 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -1,6 +1,6 @@
+import { Container } from '@n8n/di';
 import fs from 'fs';
 import { mock } from 'jest-mock-extended';
-import { Container } from 'typedi';
 
 import { GlobalConfig } from '../src/index';
 
@@ -150,7 +150,6 @@ describe('GlobalConfig', () => {
 		},
 		workflows: {
 			defaultName: 'My workflow',
-			onboardingFlowDisabled: false,
 			callerPolicyDefaultOption: 'workflowsFromSameOwner',
 		},
 		endpoints: {
@@ -222,19 +221,24 @@ describe('GlobalConfig', () => {
 			},
 		},
 		taskRunners: {
-			disabled: true,
-			mode: 'internal_childprocess',
+			enabled: false,
+			mode: 'internal',
 			path: '/runners',
 			authToken: '',
 			listenAddress: '127.0.0.1',
 			maxPayload: 1024 * 1024 * 1024,
 			port: 5679,
-			launcherPath: '',
-			launcherRunner: 'javascript',
+			maxOldSpaceSize: '',
+			maxConcurrency: 10,
+			taskTimeout: 300,
+			heartbeatInterval: 30,
 		},
 		sentry: {
 			backendDsn: '',
 			frontendDsn: '',
+			n8nVersion: '',
+			environment: '',
+			deploymentName: '',
 		},
 		logging: {
 			level: 'info',
@@ -264,6 +268,36 @@ describe('GlobalConfig', () => {
 			tenantId: 1,
 			cert: '',
 		},
+		security: {
+			restrictFileAccessTo: '',
+			blockFileAccessToN8nFiles: true,
+			daysAbandonedWorkflow: 90,
+		},
+		executions: {
+			pruneData: true,
+			pruneDataMaxAge: 336,
+			pruneDataMaxCount: 10_000,
+			pruneDataHardDeleteBuffer: 1,
+			pruneDataIntervals: {
+				hardDelete: 15,
+				softDelete: 60,
+			},
+		},
+		diagnostics: {
+			enabled: true,
+			frontendConfig: '1zPn9bgWPzlQc0p8Gj1uiK6DOTn;https://telemetry.n8n.io',
+			backendConfig: '1zPn7YoGC3ZXE9zLeTKLuQCB4F6;https://telemetry.n8n.io',
+			posthogConfig: {
+				apiKey: 'phc_4URIAm1uYfJO7j8kWSe0J8lc8IqnstRLS7Jx8NcakHo',
+				apiHost: 'https://ph.n8n.io',
+			},
+		},
+		aiAssistant: {
+			baseUrl: '',
+		},
+		tags: {
+			disabled: false,
+		},
 	};
 
 	it('should use all default values when no env variables are defined', () => {
diff --git a/packages/@n8n/config/test/decorators.test.ts b/packages/@n8n/config/test/decorators.test.ts
index c5c90b70a0..a346b442e0 100644
--- a/packages/@n8n/config/test/decorators.test.ts
+++ b/packages/@n8n/config/test/decorators.test.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import { Config, Env } from '../src/decorators';
 
diff --git a/packages/@n8n/config/tsconfig.json b/packages/@n8n/config/tsconfig.json
index 15e134d6b4..f26ea23c24 100644
--- a/packages/@n8n/config/tsconfig.json
+++ b/packages/@n8n/config/tsconfig.json
@@ -9,5 +9,6 @@
 		"baseUrl": "src",
 		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo"
 	},
-	"include": ["src/**/*.ts", "test/**/*.ts"]
+	"include": ["src/**/*.ts", "test/**/*.ts"],
+	"references": [{ "path": "../di/tsconfig.build.json" }]
 }
diff --git a/packages/@n8n/di/.eslintrc.js b/packages/@n8n/di/.eslintrc.js
new file mode 100644
index 0000000000..1c42fddcdc
--- /dev/null
+++ b/packages/@n8n/di/.eslintrc.js
@@ -0,0 +1,7 @@
+const sharedOptions = require('@n8n_io/eslint-config/shared');
+
+/** @type {import('@types/eslint').ESLint.ConfigData} */
+module.exports = {
+	extends: ['@n8n_io/eslint-config/base'],
+	...sharedOptions(__dirname),
+};
diff --git a/packages/@n8n/di/README.md b/packages/@n8n/di/README.md
new file mode 100644
index 0000000000..0f6999f225
--- /dev/null
+++ b/packages/@n8n/di/README.md
@@ -0,0 +1,52 @@
+## @n8n/di
+
+`@n8n/di` is a dependency injection (DI) container library, based on [`typedi`](https://github.com/typestack/typedi).
+
+n8n no longer uses `typedi` because:
+
+- `typedi` is no longer officially maintained
+- Need for future-proofing, e.g. stage-3 decorators
+- Small enough that it is worth the maintenance burden
+- Easier to customize, e.g. to simplify unit tests
+
+### Usage
+
+```typescript
+// from https://github.com/typestack/typedi/blob/develop/README.md
+import { Container, Service } from 'typedi';
+
+@Service()
+class ExampleInjectedService {
+  printMessage() {
+    console.log('I am alive!');
+  }
+}
+
+@Service()
+class ExampleService {
+  constructor(
+    // because we annotated ExampleInjectedService with the @Service()
+    // decorator TypeDI will automatically inject an instance of
+    // ExampleInjectedService here when the ExampleService class is requested
+    // from TypeDI.
+    public injectedService: ExampleInjectedService
+  ) {}
+}
+
+const serviceInstance = Container.get(ExampleService);
+// we request an instance of ExampleService from TypeDI
+
+serviceInstance.injectedService.printMessage();
+// logs "I am alive!" to the console
+```
+
+Requires enabling these flags in `tsconfig.json`:
+
+```json
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true
+  }
+}
+```
diff --git a/packages/@n8n/di/jest.config.js b/packages/@n8n/di/jest.config.js
new file mode 100644
index 0000000000..d14f2d60c6
--- /dev/null
+++ b/packages/@n8n/di/jest.config.js
@@ -0,0 +1,7 @@
+/** @type {import('jest').Config} */
+module.exports = {
+	...require('../../../jest.config'),
+	transform: {
+		'^.+\\.ts$': ['ts-jest', { isolatedModules: false }],
+	},
+};
diff --git a/packages/@n8n/di/package.json b/packages/@n8n/di/package.json
new file mode 100644
index 0000000000..88774017d3
--- /dev/null
+++ b/packages/@n8n/di/package.json
@@ -0,0 +1,26 @@
+{
+  "name": "@n8n/di",
+  "version": "0.3.0",
+  "scripts": {
+    "clean": "rimraf dist .turbo",
+    "dev": "pnpm watch",
+    "typecheck": "tsc --noEmit",
+    "build": "tsc -p tsconfig.build.json",
+    "format": "biome format --write .",
+    "format:check": "biome ci .",
+    "lint": "eslint .",
+    "lintfix": "eslint . --fix",
+    "watch": "tsc -p tsconfig.build.json --watch",
+    "test": "jest",
+    "test:dev": "jest --watch"
+  },
+  "main": "dist/di.js",
+  "module": "src/di.ts",
+  "types": "dist/di.d.ts",
+  "files": [
+    "dist/**/*"
+  ],
+  "dependencies": {
+    "reflect-metadata": "catalog:"
+  }
+}
diff --git a/packages/@n8n/di/src/__tests__/circular-depedency.test.ts b/packages/@n8n/di/src/__tests__/circular-depedency.test.ts
new file mode 100644
index 0000000000..66bce38f7b
--- /dev/null
+++ b/packages/@n8n/di/src/__tests__/circular-depedency.test.ts
@@ -0,0 +1,17 @@
+import { ServiceA } from './fixtures/ServiceA';
+import { ServiceB } from './fixtures/ServiceB';
+import { Container } from '../di';
+
+describe('DI Container', () => {
+	describe('circular dependency', () => {
+		it('should detect multilevel circular dependencies', () => {
+			expect(() => Container.get(ServiceA)).toThrow(
+				'[DI] Circular dependency detected in ServiceB at index 0.\nServiceA -> ServiceB',
+			);
+
+			expect(() => Container.get(ServiceB)).toThrow(
+				'[DI] Circular dependency detected in ServiceB at index 0.\nServiceB',
+			);
+		});
+	});
+});
diff --git a/packages/@n8n/di/src/__tests__/di.test.ts b/packages/@n8n/di/src/__tests__/di.test.ts
new file mode 100644
index 0000000000..736ff06152
--- /dev/null
+++ b/packages/@n8n/di/src/__tests__/di.test.ts
@@ -0,0 +1,287 @@
+import { Container, Service } from '../di';
+
+@Service()
+class SimpleService {
+	getValue() {
+		return 'simple';
+	}
+}
+
+@Service()
+class DependentService {
+	constructor(readonly simple: SimpleService) {}
+
+	getValue() {
+		return this.simple.getValue() + '-dependent';
+	}
+}
+
+class CustomFactory {
+	getValue() {
+		return 'factory-made';
+	}
+}
+
+@Service({ factory: () => new CustomFactory() })
+class FactoryService {
+	getValue() {
+		return 'should-not-be-called';
+	}
+}
+
+abstract class AbstractService {
+	abstract getValue(): string;
+}
+
+@Service()
+class ConcreteService extends AbstractService {
+	getValue(): string {
+		return 'concrete';
+	}
+}
+
+describe('DI Container', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+		Container.reset();
+	});
+
+	describe('basic functionality', () => {
+		it('should create a simple instance', () => {
+			const instance = Container.get(SimpleService);
+			expect(instance).toBeInstanceOf(SimpleService);
+			expect(instance.getValue()).toBe('simple');
+		});
+
+		it('should return same instance on multiple gets', () => {
+			const instance1 = Container.get(SimpleService);
+			const instance2 = Container.get(SimpleService);
+			expect(instance1).toBe(instance2);
+		});
+
+		it('should handle classes with no dependencies (empty constructor)', () => {
+			@Service()
+			class EmptyConstructorService {}
+
+			const instance = Container.get(EmptyConstructorService);
+			expect(instance).toBeInstanceOf(EmptyConstructorService);
+		});
+
+		it('should throw when trying to resolve an undecorated class', () => {
+			class UnDecoratedService {}
+
+			expect(() => Container.get(UnDecoratedService)).toThrow();
+		});
+	});
+
+	describe('dependency injection', () => {
+		it('should inject dependencies correctly', () => {
+			const dependent = Container.get(DependentService);
+			expect(dependent).toBeInstanceOf(DependentService);
+			expect(dependent.getValue()).toBe('simple-dependent');
+			expect(dependent.simple).toBeInstanceOf(SimpleService);
+		});
+
+		it('should handle deep dependency chains', () => {
+			@Service()
+			class ServiceC {
+				getValue() {
+					return 'C';
+				}
+			}
+
+			@Service()
+			class ServiceB {
+				constructor(private c: ServiceC) {}
+
+				getValue() {
+					return this.c.getValue() + 'B';
+				}
+			}
+
+			@Service()
+			class ServiceA {
+				constructor(private b: ServiceB) {}
+
+				getValue() {
+					return this.b.getValue() + 'A';
+				}
+			}
+
+			const instance = Container.get(ServiceA);
+			expect(instance.getValue()).toBe('CBA');
+		});
+
+		it('should return undefined for non-decorated dependencies in resolution chain', () => {
+			class NonDecoratedDep {}
+
+			@Service()
+			class ServiceWithNonDecoratedDep {
+				constructor(readonly dep: NonDecoratedDep) {}
+			}
+
+			const instance = Container.get(ServiceWithNonDecoratedDep);
+			expect(instance).toBeInstanceOf(ServiceWithNonDecoratedDep);
+			expect(instance.dep).toBeUndefined();
+		});
+	});
+
+	describe('factory handling', () => {
+		it('should use factory when provided', () => {
+			const instance = Container.get(FactoryService);
+			expect(instance).toBeInstanceOf(CustomFactory);
+			expect(instance.getValue()).toBe('factory-made');
+		});
+
+		it('should preserve factory metadata when setting instance', () => {
+			const customInstance = new CustomFactory();
+			Container.set(FactoryService, customInstance);
+			const instance = Container.get(FactoryService);
+			expect(instance).toBe(customInstance);
+		});
+
+		it('should preserve factory when resetting container', () => {
+			const factoryInstance1 = Container.get(FactoryService);
+			Container.reset();
+			const factoryInstance2 = Container.get(FactoryService);
+
+			expect(factoryInstance1).not.toBe(factoryInstance2);
+			expect(factoryInstance2.getValue()).toBe('factory-made');
+		});
+
+		it('should throw error when factory throws', () => {
+			@Service({
+				factory: () => {
+					throw new Error('Factory error');
+				},
+			})
+			class ErrorFactoryService {}
+
+			expect(() => Container.get(ErrorFactoryService)).toThrow('Factory error');
+		});
+	});
+
+	describe('instance management', () => {
+		it('should allow manual instance setting', () => {
+			const customInstance = new SimpleService();
+			Container.set(SimpleService, customInstance);
+			const instance = Container.get(SimpleService);
+			expect(instance).toBe(customInstance);
+		});
+	});
+
+	describe('abstract classes', () => {
+		it('should throw when trying to instantiate an abstract class directly', () => {
+			@Service()
+			abstract class TestAbstractClass {
+				abstract doSomething(): void;
+
+				// Add a concrete method to make the class truly abstract at runtime
+				constructor() {
+					if (this.constructor === TestAbstractClass) {
+						throw new TypeError('Abstract class "TestAbstractClass" cannot be instantiated');
+					}
+				}
+			}
+
+			expect(() => Container.get(TestAbstractClass)).toThrow(
+				'[DI] TestAbstractClass is an abstract class, and cannot be instantiated',
+			);
+		});
+
+		it('should allow setting an implementation for an abstract class', () => {
+			const concrete = new ConcreteService();
+			Container.set(AbstractService, concrete);
+
+			const instance = Container.get(AbstractService);
+			expect(instance).toBe(concrete);
+			expect(instance.getValue()).toBe('concrete');
+		});
+
+		it('should allow factory for abstract class', () => {
+			@Service({ factory: () => new ConcreteService() })
+			abstract class FactoryAbstractService {
+				abstract getValue(): string;
+			}
+
+			const instance = Container.get(FactoryAbstractService);
+			expect(instance).toBeInstanceOf(ConcreteService);
+			expect(instance.getValue()).toBe('concrete');
+		});
+	});
+
+	describe('inheritance', () => {
+		it('should handle inheritance in injectable classes', () => {
+			@Service()
+			class BaseService {
+				getValue() {
+					return 'base';
+				}
+			}
+
+			@Service()
+			class DerivedService extends BaseService {
+				getValue() {
+					return 'derived-' + super.getValue();
+				}
+			}
+
+			const instance = Container.get(DerivedService);
+			expect(instance.getValue()).toBe('derived-base');
+		});
+
+		it('should maintain separate instances for base and derived classes', () => {
+			@Service()
+			class BaseService {
+				getValue() {
+					return 'base';
+				}
+			}
+
+			@Service()
+			class DerivedService extends BaseService {}
+
+			const baseInstance = Container.get(BaseService);
+			const derivedInstance = Container.get(DerivedService);
+
+			expect(baseInstance).not.toBe(derivedInstance);
+			expect(baseInstance).toBeInstanceOf(BaseService);
+			expect(derivedInstance).toBeInstanceOf(DerivedService);
+		});
+	});
+
+	describe('type registration checking', () => {
+		it('should return true for registered classes', () => {
+			expect(Container.has(SimpleService)).toBe(true);
+		});
+
+		it('should return false for unregistered classes', () => {
+			class UnregisteredService {}
+			expect(Container.has(UnregisteredService)).toBe(false);
+		});
+
+		it('should return true for abstract classes with implementations', () => {
+			const concrete = new ConcreteService();
+			Container.set(AbstractService, concrete);
+			expect(Container.has(AbstractService)).toBe(true);
+		});
+
+		it('should return true for factory-provided services before instantiation', () => {
+			expect(Container.has(FactoryService)).toBe(true);
+		});
+
+		it('should maintain registration after reset', () => {
+			expect(Container.has(SimpleService)).toBe(true);
+			Container.reset();
+			expect(Container.has(SimpleService)).toBe(true);
+		});
+
+		it('should return true after manual instance setting', () => {
+			class ManualService {}
+			expect(Container.has(ManualService)).toBe(false);
+
+			Container.set(ManualService, new ManualService());
+			expect(Container.has(ManualService)).toBe(true);
+		});
+	});
+});
diff --git a/packages/@n8n/di/src/__tests__/fixtures/ServiceA.ts b/packages/@n8n/di/src/__tests__/fixtures/ServiceA.ts
new file mode 100644
index 0000000000..83f4c90430
--- /dev/null
+++ b/packages/@n8n/di/src/__tests__/fixtures/ServiceA.ts
@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/no-cycle
+import { ServiceB } from './ServiceB';
+import { Service } from '../../di';
+
+@Service()
+export class ServiceA {
+	constructor(readonly b: ServiceB) {}
+}
diff --git a/packages/@n8n/di/src/__tests__/fixtures/ServiceB.ts b/packages/@n8n/di/src/__tests__/fixtures/ServiceB.ts
new file mode 100644
index 0000000000..a0dbd1908a
--- /dev/null
+++ b/packages/@n8n/di/src/__tests__/fixtures/ServiceB.ts
@@ -0,0 +1,8 @@
+// eslint-disable-next-line import/no-cycle
+import { ServiceA } from './ServiceA';
+import { Service } from '../../di';
+
+@Service()
+export class ServiceB {
+	constructor(readonly a: ServiceA) {}
+}
diff --git a/packages/@n8n/di/src/di.ts b/packages/@n8n/di/src/di.ts
new file mode 100644
index 0000000000..08d86eae07
--- /dev/null
+++ b/packages/@n8n/di/src/di.ts
@@ -0,0 +1,141 @@
+import 'reflect-metadata';
+
+/**
+ * Represents a class constructor type that can be instantiated with 'new'
+ * @template T The type of instance the constructor creates
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type Constructable<T = unknown> = new (...args: any[]) => T;
+
+type AbstractConstructable<T = unknown> = abstract new (...args: unknown[]) => T;
+
+type ServiceIdentifier<T = unknown> = Constructable<T> | AbstractConstructable<T>;
+
+interface Metadata<T = unknown> {
+	instance?: T;
+	factory?: () => T;
+}
+
+interface Options<T> {
+	factory?: () => T;
+}
+
+const instances = new Map<ServiceIdentifier, Metadata>();
+
+/**
+ * Decorator that marks a class as available for dependency injection.
+ * @param options Configuration options for the injectable class
+ * @param options.factory Optional factory function to create instances of this class
+ * @returns A class decorator to be applied to the target class
+ */
+// eslint-disable-next-line @typescript-eslint/ban-types
+export function Service<T = unknown>(): Function;
+// eslint-disable-next-line @typescript-eslint/ban-types
+export function Service<T = unknown>(options: Options<T>): Function;
+export function Service<T>({ factory }: Options<T> = {}) {
+	return function (target: Constructable<T>) {
+		instances.set(target, { factory });
+		return target;
+	};
+}
+
+class DIError extends Error {
+	constructor(message: string) {
+		super(`[DI] ${message}`);
+	}
+}
+
+class ContainerClass {
+	/** Stack to track types being resolved to detect circular dependencies */
+	private readonly resolutionStack: ServiceIdentifier[] = [];
+
+	/**
+	 * Checks if a type is registered in the container
+	 * @template T The type to check for
+	 * @param type The constructor of the type to check
+	 * @returns True if the type is registered (has metadata), false otherwise
+	 */
+	has<T>(type: ServiceIdentifier<T>): boolean {
+		return instances.has(type);
+	}
+
+	/**
+	 * Retrieves or creates an instance of the specified type from the container
+	 * @template T The type of instance to retrieve
+	 * @param type The constructor of the type to retrieve
+	 * @returns An instance of the specified type with all dependencies injected
+	 * @throws {DIError} If circular dependencies are detected or if the type is not injectable
+	 */
+	get<T>(type: ServiceIdentifier<T>): T {
+		const { resolutionStack } = this;
+		const metadata = instances.get(type) as Metadata<T>;
+		if (!metadata) {
+			// Special case: Allow undefined returns for non-decorated constructor params
+			// when resolving a dependency chain (i.e., resolutionStack not empty)
+			if (resolutionStack.length) return undefined as T;
+			throw new DIError(`${type.name} is not decorated with ${Service.name}`);
+		}
+
+		if (metadata?.instance) return metadata.instance as T;
+
+		// Add current type to resolution stack before resolving dependencies
+		resolutionStack.push(type);
+
+		try {
+			let instance: T;
+
+			if (metadata?.factory) {
+				instance = metadata.factory();
+			} else {
+				const paramTypes = (Reflect.getMetadata('design:paramtypes', type) ??
+					[]) as Constructable[];
+
+				const dependencies = paramTypes.map(<P>(paramType: Constructable<P>, index: number) => {
+					if (paramType === undefined) {
+						throw new DIError(
+							`Circular dependency detected in ${type.name} at index ${index}.\n${resolutionStack.map((t) => t.name).join(' -> ')}\n`,
+						);
+					}
+					return this.get(paramType);
+				});
+				// Create new instance with resolved dependencies
+				instance = new (type as Constructable)(...dependencies) as T;
+			}
+
+			instances.set(type, { ...metadata, instance });
+			return instance;
+		} catch (error) {
+			if (error instanceof TypeError && error.message.toLowerCase().includes('abstract')) {
+				throw new DIError(`${type.name} is an abstract class, and cannot be instantiated`);
+			}
+			throw error;
+		} finally {
+			resolutionStack.pop();
+		}
+	}
+
+	/**
+	 * Manually sets an instance for a specific type in the container
+	 * @template T The type of instance being set
+	 * @param type The constructor of the type to set. This can also be an abstract class
+	 * @param instance The instance to store in the container
+	 */
+	set<T>(type: ServiceIdentifier<T>, instance: T): void {
+		// Preserve any existing metadata (like factory) when setting new instance
+		const metadata = instances.get(type) ?? {};
+		instances.set(type, { ...metadata, instance });
+	}
+
+	/** Clears all instantiated instances from the container while preserving type registrations */
+	reset(): void {
+		for (const metadata of instances.values()) {
+			delete metadata.instance;
+		}
+	}
+}
+
+/**
+ * Global dependency injection container instance
+ * Used to retrieve and manage class instances and their dependencies
+ */
+export const Container = new ContainerClass();
diff --git a/packages/@n8n/di/tsconfig.build.json b/packages/@n8n/di/tsconfig.build.json
new file mode 100644
index 0000000000..59065a1e2b
--- /dev/null
+++ b/packages/@n8n/di/tsconfig.build.json
@@ -0,0 +1,11 @@
+{
+	"extends": ["./tsconfig.json", "../../../tsconfig.build.json"],
+	"compilerOptions": {
+		"composite": true,
+		"rootDir": "src",
+		"outDir": "dist",
+		"tsBuildInfoFile": "dist/build.tsbuildinfo"
+	},
+	"include": ["src/**/*.ts"],
+	"exclude": ["src/**/__tests__/**"]
+}
diff --git a/packages/@n8n/di/tsconfig.json b/packages/@n8n/di/tsconfig.json
new file mode 100644
index 0000000000..efe662ed2a
--- /dev/null
+++ b/packages/@n8n/di/tsconfig.json
@@ -0,0 +1,12 @@
+{
+	"extends": "../../../tsconfig.json",
+	"compilerOptions": {
+		"rootDir": ".",
+		"types": ["node", "jest"],
+		"baseUrl": "src",
+		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
+		"experimentalDecorators": true,
+		"emitDecoratorMetadata": true
+	},
+	"include": ["src/**/*.ts"]
+}
diff --git a/packages/@n8n/imap/package.json b/packages/@n8n/imap/package.json
index 81643869a0..6dec611010 100644
--- a/packages/@n8n/imap/package.json
+++ b/packages/@n8n/imap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/imap",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
@@ -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/json-schema-to-zod/package.json b/packages/@n8n/json-schema-to-zod/package.json
index e1ae6beaa9..136d07a345 100644
--- a/packages/@n8n/json-schema-to-zod/package.json
+++ b/packages/@n8n/json-schema-to-zod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/json-schema-to-zod",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Converts JSON schema objects into Zod schemas",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
diff --git a/packages/@n8n/json-schema-to-zod/src/index.ts b/packages/@n8n/json-schema-to-zod/src/index.ts
index 10dae97784..8de0516a2f 100644
--- a/packages/@n8n/json-schema-to-zod/src/index.ts
+++ b/packages/@n8n/json-schema-to-zod/src/index.ts
@@ -1,2 +1,2 @@
 export type * from './types';
-export { jsonSchemaToZod } from './json-schema-to-zod.js';
+export { jsonSchemaToZod } from './json-schema-to-zod';
diff --git a/packages/@n8n/nodes-langchain/.eslintrc.js b/packages/@n8n/nodes-langchain/.eslintrc.js
index 7ea76b12a9..510b970755 100644
--- a/packages/@n8n/nodes-langchain/.eslintrc.js
+++ b/packages/@n8n/nodes-langchain/.eslintrc.js
@@ -15,7 +15,6 @@ module.exports = {
 		eqeqeq: 'warn',
 		'id-denylist': 'warn',
 		'import/extensions': 'warn',
-		'import/order': 'warn',
 		'prefer-spread': 'warn',
 
 		'@typescript-eslint/naming-convention': ['error', { selector: 'memberLike', format: null }],
diff --git a/packages/@n8n/nodes-langchain/credentials/AnthropicApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/AnthropicApi.credentials.ts
index 2ee2aa94dc..80bea68713 100644
--- a/packages/@n8n/nodes-langchain/credentials/AnthropicApi.credentials.ts
+++ b/packages/@n8n/nodes-langchain/credentials/AnthropicApi.credentials.ts
@@ -35,15 +35,15 @@ export class AnthropicApi implements ICredentialType {
 	test: ICredentialTestRequest = {
 		request: {
 			baseURL: 'https://api.anthropic.com',
-			url: '/v1/complete',
+			url: '/v1/messages',
 			method: 'POST',
 			headers: {
 				'anthropic-version': '2023-06-01',
 			},
 			body: {
-				model: 'claude-2',
-				prompt: '\n\nHuman: Hello, world!\n\nAssistant:',
-				max_tokens_to_sample: 256,
+				model: 'claude-3-haiku-20240307',
+				messages: [{ role: 'user', content: 'Hey' }],
+				max_tokens: 1,
 			},
 		},
 	};
diff --git a/packages/@n8n/nodes-langchain/credentials/AzureOpenAiApi.credentials.ts b/packages/@n8n/nodes-langchain/credentials/AzureOpenAiApi.credentials.ts
index 28608524c8..1dbc62b4ed 100644
--- a/packages/@n8n/nodes-langchain/credentials/AzureOpenAiApi.credentials.ts
+++ b/packages/@n8n/nodes-langchain/credentials/AzureOpenAiApi.credentials.ts
@@ -30,6 +30,13 @@ export class AzureOpenAiApi implements ICredentialType {
 			required: true,
 			default: '2023-07-01-preview',
 		},
+		{
+			displayName: 'Endpoint',
+			name: 'endpoint',
+			type: 'string',
+			default: undefined,
+			placeholder: 'https://westeurope.api.cognitive.microsoft.com',
+		},
 	];
 
 	authenticate: IAuthenticateGeneric = {
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
index 0b27456db6..230a6ddc6e 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/Agent.node.ts
@@ -9,6 +9,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { promptTypeOptions, textFromPreviousNode, textInput } from '@utils/descriptions';
+
 import { conversationalAgentProperties } from './agents/ConversationalAgent/description';
 import { conversationalAgentExecute } from './agents/ConversationalAgent/execute';
 import { openAiFunctionsAgentProperties } from './agents/OpenAiFunctionsAgent/description';
@@ -21,7 +23,6 @@ import { sqlAgentAgentProperties } from './agents/SqlAgent/description';
 import { sqlAgentAgentExecute } from './agents/SqlAgent/execute';
 import { toolsAgentProperties } from './agents/ToolsAgent/description';
 import { toolsAgentExecute } from './agents/ToolsAgent/execute';
-import { promptTypeOptions, textInput } from '../../../utils/descriptions';
 
 // Function used in the inputs expression to figure out which inputs to
 // display based on the agent type
@@ -341,6 +342,17 @@ export class Agent implements INodeType {
 					},
 				},
 			},
+			{
+				...textFromPreviousNode,
+				displayOptions: {
+					show: { promptType: ['auto'], '@version': [{ _cnd: { gte: 1.7 } }] },
+					// SQL Agent has data source and credentials parameters so we need to include this input there manually
+					// to preserve the order
+					hide: {
+						agent: ['sqlAgent'],
+					},
+				},
+			},
 			{
 				...textInput,
 				displayOptions: {
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts
index c3507b328c..0a65f4919c 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { SYSTEM_MESSAGE, HUMAN_MESSAGE } from './prompt';
 
 export const conversationalAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts
index 365fce3bf0..04a565971c 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ConversationalAgent/execute.ts
@@ -6,15 +6,12 @@ import { CombiningOutputParser } from 'langchain/output_parsers';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import {
-	isChatInstance,
-	getPromptInputByType,
-	getConnectedTools,
-} from '../../../../../utils/helpers';
-import { getOptionalOutputParsers } from '../../../../../utils/output_parsers/N8nOutputParser';
-import { throwIfToolSchema } from '../../../../../utils/schemaParsing';
-import { getTracingConfig } from '../../../../../utils/tracing';
-import { extractParsedOutput } from '../utils';
+import { isChatInstance, getPromptInputByType, getConnectedTools } from '@utils/helpers';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { throwIfToolSchema } from '@utils/schemaParsing';
+import { getTracingConfig } from '@utils/tracing';
+
+import { checkForStructuredTools, extractParsedOutput } from '../utils';
 
 export async function conversationalAgentExecute(
 	this: IExecuteFunctions,
@@ -31,9 +28,11 @@ export async function conversationalAgentExecute(
 		| BaseChatMemory
 		| undefined;
 
-	const tools = await getConnectedTools(this, nodeVersion >= 1.5);
+	const tools = await getConnectedTools(this, nodeVersion >= 1.5, true, true);
 	const outputParsers = await getOptionalOutputParsers(this);
 
+	await checkForStructuredTools(tools, this.getNode(), 'Conversational Agent');
+
 	// TODO: Make it possible in the future to use values for other items than just 0
 	const options = this.getNodeParameter('options', 0, {}) as {
 		systemMessage?: string;
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts
index 40f9ad1945..0a0f6ac55e 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { SYSTEM_MESSAGE } from './prompt';
 
 export const openAiFunctionsAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
index a9b324678c..17a2d43590 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/OpenAiFunctionsAgent/execute.ts
@@ -12,9 +12,10 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { getConnectedTools, getPromptInputByType } from '../../../../../utils/helpers';
-import { getOptionalOutputParsers } from '../../../../../utils/output_parsers/N8nOutputParser';
-import { getTracingConfig } from '../../../../../utils/tracing';
+import { getConnectedTools, getPromptInputByType } from '@utils/helpers';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { getTracingConfig } from '@utils/tracing';
+
 import { extractParsedOutput } from '../utils';
 
 export async function openAiFunctionsAgentExecute(
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts
index 608f9e9def..8dcb8f8385 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { DEFAULT_STEP_EXECUTOR_HUMAN_CHAT_MESSAGE_TEMPLATE } from './prompt';
 
 export const planAndExecuteAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts
index 9425caaf84..379475f923 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/PlanAndExecuteAgent/execute.ts
@@ -10,11 +10,12 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { getConnectedTools, getPromptInputByType } from '../../../../../utils/helpers';
-import { getOptionalOutputParsers } from '../../../../../utils/output_parsers/N8nOutputParser';
-import { throwIfToolSchema } from '../../../../../utils/schemaParsing';
-import { getTracingConfig } from '../../../../../utils/tracing';
-import { extractParsedOutput } from '../utils';
+import { getConnectedTools, getPromptInputByType } from '@utils/helpers';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { throwIfToolSchema } from '@utils/schemaParsing';
+import { getTracingConfig } from '@utils/tracing';
+
+import { checkForStructuredTools, extractParsedOutput } from '../utils';
 
 export async function planAndExecuteAgentExecute(
 	this: IExecuteFunctions,
@@ -26,8 +27,9 @@ export async function planAndExecuteAgentExecute(
 		0,
 	)) as BaseChatModel;
 
-	const tools = await getConnectedTools(this, nodeVersion >= 1.5);
+	const tools = await getConnectedTools(this, nodeVersion >= 1.5, true, true);
 
+	await checkForStructuredTools(tools, this.getNode(), 'Plan & Execute Agent');
 	const outputParsers = await getOptionalOutputParsers(this);
 
 	const options = this.getNodeParameter('options', 0, {}) as {
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
index f95026f7a4..890d83dc4a 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { HUMAN_MESSAGE_TEMPLATE, PREFIX, SUFFIX, SUFFIX_CHAT } from './prompt';
 
 export const reActAgentAgentProperties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
index 429adfad21..4db35634d6 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ReActAgent/execute.ts
@@ -11,15 +11,12 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import {
-	getConnectedTools,
-	getPromptInputByType,
-	isChatInstance,
-} from '../../../../../utils/helpers';
-import { getOptionalOutputParsers } from '../../../../../utils/output_parsers/N8nOutputParser';
-import { throwIfToolSchema } from '../../../../../utils/schemaParsing';
-import { getTracingConfig } from '../../../../../utils/tracing';
-import { extractParsedOutput } from '../utils';
+import { getConnectedTools, getPromptInputByType, isChatInstance } from '@utils/helpers';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { throwIfToolSchema } from '@utils/schemaParsing';
+import { getTracingConfig } from '@utils/tracing';
+
+import { checkForStructuredTools, extractParsedOutput } from '../utils';
 
 export async function reActAgentAgentExecute(
 	this: IExecuteFunctions,
@@ -31,7 +28,9 @@ export async function reActAgentAgentExecute(
 		| BaseLanguageModel
 		| BaseChatModel;
 
-	const tools = await getConnectedTools(this, nodeVersion >= 1.5);
+	const tools = await getConnectedTools(this, nodeVersion >= 1.5, true, true);
+
+	await checkForStructuredTools(tools, this.getNode(), 'ReAct Agent');
 
 	const outputParsers = await getOptionalOutputParsers(this);
 
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
index c7f888a334..919f501d17 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/description.ts
@@ -1,5 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { promptTypeOptions, textInput } from '../../../../../utils/descriptions';
+
+import { promptTypeOptions, textFromPreviousNode, textInput } from '@utils/descriptions';
+
 import { SQL_PREFIX, SQL_SUFFIX } from './other/prompts';
 
 const dataSourceOptions: INodeProperties = {
@@ -114,6 +116,12 @@ export const sqlAgentAgentProperties: INodeProperties[] = [
 			},
 		},
 	},
+	{
+		...textFromPreviousNode,
+		displayOptions: {
+			show: { promptType: ['auto'], '@version': [{ _cnd: { gte: 1.7 } }], agent: ['sqlAgent'] },
+		},
+	},
 	{
 		...textInput,
 		displayOptions: {
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts
index 4b31491120..369ca109af 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/execute.ts
@@ -1,3 +1,9 @@
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { DataSource } from '@n8n/typeorm';
+import type { SqlCreatePromptArgs } from 'langchain/agents/toolkits/sql';
+import { SqlToolkit, createSqlAgent } from 'langchain/agents/toolkits/sql';
+import { SqlDatabase } from 'langchain/sql_db';
 import {
 	type IExecuteFunctions,
 	type INodeExecutionData,
@@ -6,19 +12,13 @@ import {
 	type IDataObject,
 } from 'n8n-workflow';
 
-import { SqlDatabase } from 'langchain/sql_db';
-import type { SqlCreatePromptArgs } from 'langchain/agents/toolkits/sql';
-import { SqlToolkit, createSqlAgent } from 'langchain/agents/toolkits/sql';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
-import type { DataSource } from '@n8n/typeorm';
+import { getPromptInputByType, serializeChatHistory } from '@utils/helpers';
+import { getTracingConfig } from '@utils/tracing';
 
-import { getPromptInputByType, serializeChatHistory } from '../../../../../utils/helpers';
-import { getTracingConfig } from '../../../../../utils/tracing';
-import { getSqliteDataSource } from './other/handlers/sqlite';
-import { getPostgresDataSource } from './other/handlers/postgres';
-import { SQL_PREFIX, SQL_SUFFIX } from './other/prompts';
 import { getMysqlDataSource } from './other/handlers/mysql';
+import { getPostgresDataSource } from './other/handlers/postgres';
+import { getSqliteDataSource } from './other/handlers/sqlite';
+import { SQL_PREFIX, SQL_SUFFIX } from './other/prompts';
 
 const parseTablesString = (tablesString: string) =>
 	tablesString
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts
index ea1b360f04..dd56f93d6c 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/mysql.ts
@@ -1,5 +1,5 @@
-import { type IExecuteFunctions } from 'n8n-workflow';
 import { DataSource } from '@n8n/typeorm';
+import { type IExecuteFunctions } from 'n8n-workflow';
 
 export async function getMysqlDataSource(this: IExecuteFunctions): Promise<DataSource> {
 	const credentials = await this.getCredentials('mySql');
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
index 6971d9119f..31dda9ed72 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/postgres.ts
@@ -1,5 +1,5 @@
-import { type IExecuteFunctions } from 'n8n-workflow';
 import { DataSource } from '@n8n/typeorm';
+import { type IExecuteFunctions } from 'n8n-workflow';
 
 export async function getPostgresDataSource(this: IExecuteFunctions): Promise<DataSource> {
 	const credentials = await this.getCredentials('postgres');
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts
index 9240feb280..31db7b0dca 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/SqlAgent/other/handlers/sqlite.ts
@@ -1,9 +1,9 @@
+import { DataSource } from '@n8n/typeorm';
 import * as fs from 'fs';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
-import * as temp from 'temp';
 import * as sqlite3 from 'sqlite3';
-import { DataSource } from '@n8n/typeorm';
+import * as temp from 'temp';
 
 export async function getSqliteDataSource(
 	this: IExecuteFunctions,
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/description.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/description.ts
index cb33560cc6..06b64a91de 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/description.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/ToolsAgent/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { SYSTEM_MESSAGE } from './prompt';
 
 export const toolsAgentProperties: INodeProperties[] = [
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 84d775d0f5..b0e36d0d8b 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
@@ -14,16 +14,13 @@ import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import type { ZodObject } from 'zod';
 import { z } from 'zod';
 
-import { SYSTEM_MESSAGE } from './prompt';
-import {
-	isChatInstance,
-	getPromptInputByType,
-	getConnectedTools,
-} from '../../../../../utils/helpers';
+import { isChatInstance, getPromptInputByType, getConnectedTools } from '@utils/helpers';
 import {
 	getOptionalOutputParsers,
 	type N8nOutputParser,
-} from '../../../../../utils/output_parsers/N8nOutputParser';
+} from '@utils/output_parsers/N8nOutputParser';
+
+import { SYSTEM_MESSAGE } from './prompt';
 
 function getOutputParserSchema(outputParser: N8nOutputParser): ZodObject<any, any, any, any> {
 	const schema =
@@ -33,7 +30,7 @@ function getOutputParserSchema(outputParser: N8nOutputParser): ZodObject<any, an
 }
 
 async function extractBinaryMessages(ctx: IExecuteFunctions) {
-	const binaryData = ctx.getInputData(0, 'main')?.[0]?.binary ?? {};
+	const binaryData = ctx.getInputData()?.[0]?.binary ?? {};
 	const binaryMessages = await Promise.all(
 		Object.values(binaryData)
 			.filter((data) => data.mimeType.startsWith('image/'))
@@ -206,10 +203,28 @@ export async function toolsAgentExecute(this: IExecuteFunctions): Promise<INodeE
 		// If the steps are an AgentFinish and the outputParser is defined it must mean that the LLM didn't use `format_final_response` tool so we will try to parse the output manually
 		if (outputParser && typeof steps === 'object' && (steps as AgentFinish).returnValues) {
 			const finalResponse = (steps as AgentFinish).returnValues;
-			const returnValues = (await outputParser.parse(finalResponse as unknown as string)) as Record<
-				string,
-				unknown
-			>;
+			let parserInput: string;
+
+			if (finalResponse instanceof Object) {
+				if ('output' in finalResponse) {
+					try {
+						// If the output is an object, we will try to parse it as JSON
+						// this is because parser expects stringified JSON object like { "output": { .... } }
+						// so we try to parse the output before wrapping it and then stringify it
+						parserInput = JSON.stringify({ output: jsonParse(finalResponse.output) });
+					} catch (error) {
+						// If parsing of the output fails, we will use the raw output
+						parserInput = finalResponse.output;
+					}
+				} else {
+					// If the output is not an object, we will stringify it as it is
+					parserInput = JSON.stringify(finalResponse);
+				}
+			} else {
+				parserInput = finalResponse;
+			}
+
+			const returnValues = (await outputParser.parse(parserInput)) as Record<string, unknown>;
 			return handleParsedStepOutput(returnValues);
 		}
 		return handleAgentFinishOutput(steps);
@@ -240,14 +255,16 @@ 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;
+	const hasBinaryData = this.getInputData()?.[0]?.binary !== undefined;
 	if (hasBinaryData && passthroughBinaryImages) {
 		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/agents/Agent/agents/utils.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/utils.ts
index da2f666248..991b5895a7 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/agents/utils.ts
@@ -1,5 +1,9 @@
 import type { BaseOutputParser } from '@langchain/core/output_parsers';
-import type { IExecuteFunctions } from 'n8n-workflow';
+import type { DynamicStructuredTool, Tool } from 'langchain/tools';
+import { NodeOperationError, type IExecuteFunctions, type INode } from 'n8n-workflow';
+import type { z } from 'zod';
+
+type ZodObjectAny = z.ZodObject<any, any, any, any>;
 
 export async function extractParsedOutput(
 	ctx: IExecuteFunctions,
@@ -17,3 +21,24 @@ export async function extractParsedOutput(
 	// with fallback to the original output if it's not present
 	return parsedOutput?.output ?? parsedOutput;
 }
+
+export async function checkForStructuredTools(
+	tools: Array<Tool | DynamicStructuredTool<ZodObjectAny>>,
+	node: INode,
+	currentAgentType: string,
+) {
+	const dynamicStructuredTools = tools.filter(
+		(tool) => tool.constructor.name === 'DynamicStructuredTool',
+	);
+	if (dynamicStructuredTools.length > 0) {
+		const getToolName = (tool: Tool | DynamicStructuredTool) => `"${tool.name}"`;
+		throw new NodeOperationError(
+			node,
+			`The selected tools are not supported by "${currentAgentType}", please use "Tools Agent" instead`,
+			{
+				itemIndex: 0,
+				description: `Incompatible connected tools: ${dynamicStructuredTools.map(getToolName).join(', ')}`,
+			},
+		);
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/Agent/test/utils.test.ts b/packages/@n8n/nodes-langchain/nodes/agents/Agent/test/utils.test.ts
new file mode 100644
index 0000000000..dc54ca4d45
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/agents/Agent/test/utils.test.ts
@@ -0,0 +1,106 @@
+import type { Tool } from 'langchain/tools';
+import { DynamicStructuredTool } from 'langchain/tools';
+import { NodeOperationError } from 'n8n-workflow';
+import type { INode } from 'n8n-workflow';
+import { z } from 'zod';
+
+import { checkForStructuredTools } from '../agents/utils';
+
+describe('checkForStructuredTools', () => {
+	let mockNode: INode;
+
+	beforeEach(() => {
+		mockNode = {
+			id: 'test-node',
+			name: 'Test Node',
+			type: 'test',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {},
+		};
+	});
+
+	it('should not throw error when no DynamicStructuredTools are present', async () => {
+		const tools = [
+			{
+				name: 'regular-tool',
+				constructor: { name: 'Tool' },
+			} as Tool,
+		];
+
+		await expect(
+			checkForStructuredTools(tools, mockNode, 'Conversation Agent'),
+		).resolves.not.toThrow();
+	});
+
+	it('should throw NodeOperationError when DynamicStructuredTools are present', async () => {
+		const dynamicTool = new DynamicStructuredTool({
+			name: 'dynamic-tool',
+			description: 'test tool',
+			schema: z.object({}),
+			func: async () => 'result',
+		});
+
+		const tools: Array<Tool | DynamicStructuredTool> = [dynamicTool];
+
+		await expect(checkForStructuredTools(tools, mockNode, 'Conversation Agent')).rejects.toThrow(
+			NodeOperationError,
+		);
+
+		await expect(
+			checkForStructuredTools(tools, mockNode, 'Conversation Agent'),
+		).rejects.toMatchObject({
+			message:
+				'The selected tools are not supported by "Conversation Agent", please use "Tools Agent" instead',
+			description: 'Incompatible connected tools: "dynamic-tool"',
+		});
+	});
+
+	it('should list multiple dynamic tools in error message', async () => {
+		const dynamicTool1 = new DynamicStructuredTool({
+			name: 'dynamic-tool-1',
+			description: 'test tool 1',
+			schema: z.object({}),
+			func: async () => 'result',
+		});
+
+		const dynamicTool2 = new DynamicStructuredTool({
+			name: 'dynamic-tool-2',
+			description: 'test tool 2',
+			schema: z.object({}),
+			func: async () => 'result',
+		});
+
+		const tools = [dynamicTool1, dynamicTool2];
+
+		await expect(
+			checkForStructuredTools(tools, mockNode, 'Conversation Agent'),
+		).rejects.toMatchObject({
+			description: 'Incompatible connected tools: "dynamic-tool-1", "dynamic-tool-2"',
+		});
+	});
+
+	it('should throw error with mixed tool types and list only dynamic tools in error message', async () => {
+		const regularTool = {
+			name: 'regular-tool',
+			constructor: { name: 'Tool' },
+		} as Tool;
+
+		const dynamicTool = new DynamicStructuredTool({
+			name: 'dynamic-tool',
+			description: 'test tool',
+			schema: z.object({}),
+			func: async () => 'result',
+		});
+
+		const tools = [regularTool, dynamicTool];
+
+		await expect(
+			checkForStructuredTools(tools, mockNode, 'Conversation Agent'),
+		).rejects.toMatchObject({
+			message:
+				'The selected tools are not supported by "Conversation Agent", please use "Tools Agent" instead',
+			description: 'Incompatible connected tools: "dynamic-tool"',
+		});
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
index d8e6f8a775..e44ad8f9d2 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/OpenAiAssistant.node.ts
@@ -1,5 +1,5 @@
 import { AgentExecutor } from 'langchain/agents';
-import { OpenAI as OpenAIClient } from 'openai';
+import type { OpenAIToolType } from 'langchain/dist/experimental/openai_assistant/schema';
 import { OpenAIAssistantRunnable } from 'langchain/experimental/openai_assistant';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
@@ -8,9 +8,11 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import type { OpenAIToolType } from 'langchain/dist/experimental/openai_assistant/schema';
-import { getConnectedTools } from '../../../utils/helpers';
-import { getTracingConfig } from '../../../utils/tracing';
+import { OpenAI as OpenAIClient } from 'openai';
+
+import { getConnectedTools } from '@utils/helpers';
+import { getTracingConfig } from '@utils/tracing';
+
 import { formatToOpenAIAssistantTool } from './utils';
 
 export class OpenAiAssistant implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
index 294fc47847..d0db590bc3 100644
--- a/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/agents/OpenAiAssistant/utils.ts
@@ -1,6 +1,6 @@
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import type { OpenAIClient } from '@langchain/openai';
 import type { StructuredTool } from '@langchain/core/tools';
+import type { OpenAIClient } from '@langchain/openai';
+import { zodToJsonSchema } from 'zod-to-json-schema';
 
 // Copied from langchain(`langchain/src/tools/convert_to_openai.ts`)
 // since these functions are not exported
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
index a080862c0f..4b2ddf5db9 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainLLM/ChainLlm.node.ts
@@ -27,11 +27,13 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { getPromptInputByType, isChatInstance } from '../../../utils/helpers';
-import type { N8nOutputParser } from '../../../utils/output_parsers/N8nOutputParser';
-import { getOptionalOutputParsers } from '../../../utils/output_parsers/N8nOutputParser';
-import { getTemplateNoticeField } from '../../../utils/sharedFields';
-import { getTracingConfig } from '../../../utils/tracing';
+import { promptTypeOptions, textFromPreviousNode } from '@utils/descriptions';
+import { getPromptInputByType, isChatInstance } from '@utils/helpers';
+import type { N8nOutputParser } from '@utils/output_parsers/N8nOutputParser';
+import { getOptionalOutputParsers } from '@utils/output_parsers/N8nOutputParser';
+import { getTemplateNoticeField } from '@utils/sharedFields';
+import { getTracingConfig } from '@utils/tracing';
+
 import {
 	getCustomErrorMessage as getCustomOpenAiErrorMessage,
 	isOpenAiError,
@@ -252,8 +254,9 @@ export class ChainLlm implements INodeType {
 		displayName: 'Basic LLM Chain',
 		name: 'chainLlm',
 		icon: 'fa:link',
+		iconColor: 'black',
 		group: ['transform'],
-		version: [1, 1.1, 1.2, 1.3, 1.4],
+		version: [1, 1.1, 1.2, 1.3, 1.4, 1.5],
 		description: 'A simple chain to prompt a large language model',
 		defaults: {
 			name: 'Basic LLM Chain',
@@ -315,30 +318,16 @@ export class ChainLlm implements INodeType {
 				},
 			},
 			{
-				displayName: 'Prompt',
-				name: 'promptType',
-				type: 'options',
-				options: [
-					{
-						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-						name: 'Take from previous node automatically',
-						value: 'auto',
-						description: 'Looks for an input field called chatInput',
-					},
-					{
-						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-						name: 'Define below',
-						value: 'define',
-						description:
-							'Use an expression to reference data in previous nodes or enter static text',
-					},
-				],
+				...promptTypeOptions,
 				displayOptions: {
 					hide: {
 						'@version': [1, 1.1, 1.2, 1.3],
 					},
 				},
-				default: 'auto',
+			},
+			{
+				...textFromPreviousNode,
+				displayOptions: { show: { promptType: ['auto'], '@version': [{ _cnd: { gte: 1.5 } }] } },
 			},
 			{
 				displayName: 'Text',
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
index dfbdb3e9d1..7829bc7813 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainRetrievalQA/ChainRetrievalQa.node.ts
@@ -1,3 +1,12 @@
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import {
+	ChatPromptTemplate,
+	SystemMessagePromptTemplate,
+	HumanMessagePromptTemplate,
+	PromptTemplate,
+} from '@langchain/core/prompts';
+import type { BaseRetriever } from '@langchain/core/retrievers';
+import { RetrievalQAChain } from 'langchain/chains';
 import {
 	NodeConnectionType,
 	type IExecuteFunctions,
@@ -7,20 +16,12 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import { RetrievalQAChain } from 'langchain/chains';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { BaseRetriever } from '@langchain/core/retrievers';
-import {
-	ChatPromptTemplate,
-	SystemMessagePromptTemplate,
-	HumanMessagePromptTemplate,
-	PromptTemplate,
-} from '@langchain/core/prompts';
-import { getTemplateNoticeField } from '../../../utils/sharedFields';
-import { getPromptInputByType, isChatInstance } from '../../../utils/helpers';
-import { getTracingConfig } from '../../../utils/tracing';
+import { promptTypeOptions, textFromPreviousNode } from '@utils/descriptions';
+import { getPromptInputByType, isChatInstance } from '@utils/helpers';
+import { getTemplateNoticeField } from '@utils/sharedFields';
+import { getTracingConfig } from '@utils/tracing';
 
-const SYSTEM_PROMPT_TEMPLATE = `Use the following pieces of context to answer the users question. 
+const SYSTEM_PROMPT_TEMPLATE = `Use the following pieces of context to answer the users question.
 If you don't know the answer, just say that you don't know, don't try to make up an answer.
 ----------------
 {context}`;
@@ -30,8 +31,9 @@ export class ChainRetrievalQa implements INodeType {
 		displayName: 'Question and Answer Chain',
 		name: 'chainRetrievalQa',
 		icon: 'fa:link',
+		iconColor: 'black',
 		group: ['transform'],
-		version: [1, 1.1, 1.2, 1.3],
+		version: [1, 1.1, 1.2, 1.3, 1.4],
 		description: 'Answer questions about retrieved documents',
 		defaults: {
 			name: 'Question and Answer Chain',
@@ -108,30 +110,16 @@ export class ChainRetrievalQa implements INodeType {
 				},
 			},
 			{
-				displayName: 'Prompt',
-				name: 'promptType',
-				type: 'options',
-				options: [
-					{
-						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-						name: 'Take from previous node automatically',
-						value: 'auto',
-						description: 'Looks for an input field called chatInput',
-					},
-					{
-						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-						name: 'Define below',
-						value: 'define',
-						description:
-							'Use an expression to reference data in previous nodes or enter static text',
-					},
-				],
+				...promptTypeOptions,
 				displayOptions: {
 					hide: {
 						'@version': [{ _cnd: { lte: 1.2 } }],
 					},
 				},
-				default: 'auto',
+			},
+			{
+				...textFromPreviousNode,
+				displayOptions: { show: { promptType: ['auto'], '@version': [{ _cnd: { gte: 1.4 } }] } },
 			},
 			{
 				displayName: 'Text',
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts
index cd47eb6a15..9c97190952 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/ChainSummarization.node.ts
@@ -10,6 +10,7 @@ export class ChainSummarization extends VersionedNodeType {
 			displayName: 'Summarization Chain',
 			name: 'chainSummarization',
 			icon: 'fa:link',
+			iconColor: 'black',
 			group: ['transform'],
 			description: 'Transforms text into a concise summary',
 			codex: {
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts
index 3e7b6997d6..fedf979082 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V1/ChainSummarizationV1.node.ts
@@ -1,3 +1,8 @@
+import type { Document } from '@langchain/core/documents';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import { PromptTemplate } from '@langchain/core/prompts';
+import type { SummarizationChainParams } from 'langchain/chains';
+import { loadSummarizationChain } from 'langchain/chains';
 import {
 	NodeConnectionType,
 	type INodeTypeBaseDescription,
@@ -7,14 +12,10 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import type { SummarizationChainParams } from 'langchain/chains';
-import { loadSummarizationChain } from 'langchain/chains';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { Document } from '@langchain/core/documents';
-import { PromptTemplate } from '@langchain/core/prompts';
-import { N8nJsonLoader } from '../../../../utils/N8nJsonLoader';
-import { N8nBinaryLoader } from '../../../../utils/N8nBinaryLoader';
-import { getTemplateNoticeField } from '../../../../utils/sharedFields';
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { getTemplateNoticeField } from '@utils/sharedFields';
+
 import { REFINE_PROMPT_TEMPLATE, DEFAULT_PROMPT_TEMPLATE } from '../prompt';
 
 export class ChainSummarizationV1 implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts
index 76964e99f1..ff6dadde59 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/V2/ChainSummarizationV2.node.ts
@@ -1,4 +1,8 @@
-import { NodeConnectionType } from 'n8n-workflow';
+import type { Document } from '@langchain/core/documents';
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { TextSplitter } from '@langchain/textsplitters';
+import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
+import { loadSummarizationChain } from 'langchain/chains';
 import type {
 	INodeTypeBaseDescription,
 	IExecuteFunctions,
@@ -7,18 +11,15 @@ import type {
 	INodeTypeDescription,
 	IDataObject,
 } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { getTemplateNoticeField } from '@utils/sharedFields';
+import { getTracingConfig } from '@utils/tracing';
 
-import { loadSummarizationChain } from 'langchain/chains';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { Document } from '@langchain/core/documents';
-import type { TextSplitter } from '@langchain/textsplitters';
-import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
-import { N8nJsonLoader } from '../../../../utils/N8nJsonLoader';
-import { N8nBinaryLoader } from '../../../../utils/N8nBinaryLoader';
-import { getTemplateNoticeField } from '../../../../utils/sharedFields';
-import { REFINE_PROMPT_TEMPLATE, DEFAULT_PROMPT_TEMPLATE } from '../prompt';
 import { getChainPromptsArgs } from '../helpers';
-import { getTracingConfig } from '../../../../utils/tracing';
+import { REFINE_PROMPT_TEMPLATE, DEFAULT_PROMPT_TEMPLATE } from '../prompt';
 
 function getInputs(parameters: IDataObject) {
 	const chunkingMode = parameters?.chunkingMode;
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
index 2a00d836e8..2da507ed00 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/ChainSummarization/helpers.ts
@@ -1,5 +1,5 @@
-import type { SummarizationChainParams } from 'langchain/chains';
 import { PromptTemplate } from '@langchain/core/prompts';
+import type { SummarizationChainParams } from 'langchain/chains';
 interface ChainTypeOptions {
 	combineMapPrompt?: string;
 	prompt?: string;
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
index ab6cd8f201..365a35ddd3 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/InformationExtractor.node.ts
@@ -13,15 +13,12 @@ import type {
 } from 'n8n-workflow';
 import type { z } from 'zod';
 
+import { inputSchemaField, jsonSchemaExampleField, schemaTypeField } from '@utils/descriptions';
+import { convertJsonSchemaToZod, generateSchema } from '@utils/schemaParsing';
+import { getTracingConfig } from '@utils/tracing';
+
 import { makeZodSchemaFromAttributes } from './helpers';
 import type { AttributeDefinition } from './types';
-import {
-	inputSchemaField,
-	jsonSchemaExampleField,
-	schemaTypeField,
-} from '../../../utils/descriptions';
-import { convertJsonSchemaToZod, generateSchema } from '../../../utils/schemaParsing';
-import { getTracingConfig } from '../../../utils/tracing';
 
 const SYSTEM_PROMPT_TEMPLATE = `You are an expert extraction algorithm.
 Only extract relevant information from the text.
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/helpers.ts b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/helpers.ts
index acde52765e..22f39f25a9 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/helpers.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/helpers.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod';
+
 import type { AttributeDefinition } from './types';
 
 function makeAttributeSchema(attributeDefinition: AttributeDefinition, required: boolean = true) {
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/test/InformationExtraction.node.test.ts b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/test/InformationExtraction.node.test.ts
index b4e4672dac..725af39a60 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/test/InformationExtraction.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/InformationExtractor/test/InformationExtraction.node.test.ts
@@ -1,10 +1,10 @@
-import type { IDataObject, IExecuteFunctions } from 'n8n-workflow/src';
-import get from 'lodash/get';
-
-import { FakeLLM, FakeListChatModel } from '@langchain/core/utils/testing';
 import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import { InformationExtractor } from '../InformationExtractor.node';
+import { FakeLLM, FakeListChatModel } from '@langchain/core/utils/testing';
+import get from 'lodash/get';
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow/src';
+
 import { makeZodSchemaFromAttributes } from '../helpers';
+import { InformationExtractor } from '../InformationExtractor.node';
 import type { AttributeDefinition } from '../types';
 
 const mockPersonAttributes: AttributeDefinition[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
index 5f5c6f19db..e810b0f98a 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/SentimentAnalysis/SentimentAnalysis.node.ts
@@ -1,3 +1,8 @@
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import { HumanMessage } from '@langchain/core/messages';
+import { SystemMessagePromptTemplate, ChatPromptTemplate } from '@langchain/core/prompts';
+import { OutputFixingParser, StructuredOutputParser } from 'langchain/output_parsers';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -6,15 +11,9 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import { HumanMessage } from '@langchain/core/messages';
-import { SystemMessagePromptTemplate, ChatPromptTemplate } from '@langchain/core/prompts';
-import { OutputFixingParser, StructuredOutputParser } from 'langchain/output_parsers';
 import { z } from 'zod';
-import { getTracingConfig } from '../../../utils/tracing';
+
+import { getTracingConfig } from '@utils/tracing';
 
 const DEFAULT_SYSTEM_PROMPT_TEMPLATE =
 	'You are highly intelligent and accurate sentiment analyzer. Analyze the sentiment of the provided text. Categorize it into one of the following: {categories}. Use the provided formatting instructions. Only output the JSON.';
diff --git a/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts b/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
index 7afc317c37..298c41572d 100644
--- a/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/chains/TextClassifier/TextClassifier.node.ts
@@ -13,7 +13,7 @@ import type {
 } from 'n8n-workflow';
 import { z } from 'zod';
 
-import { getTracingConfig } from '../../../utils/tracing';
+import { getTracingConfig } from '@utils/tracing';
 
 const SYSTEM_PROMPT_TEMPLATE =
 	"Please classify the text provided by the user into one of the following categories: {categories}, and use the provided formatting instructions below. Don't explain, and only output the json.";
diff --git a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
index 8708e0c7ea..dda3f24414 100644
--- a/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/code/Code.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { Tool } from '@langchain/core/tools';
+import { makeResolverFromLegacyOptions } from '@n8n/vm2';
+import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
+import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
+import { standardizeOutput } from 'n8n-nodes-base/dist/nodes/Code/utils';
 import { NodeOperationError, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
@@ -12,12 +17,7 @@ import type {
 
 // TODO: Add support for execute function. Got already started but got commented out
 
-import { getSandboxContext } from 'n8n-nodes-base/dist/nodes/Code/Sandbox';
-import { JavaScriptSandbox } from 'n8n-nodes-base/dist/nodes/Code/JavaScriptSandbox';
-import { standardizeOutput } from 'n8n-nodes-base/dist/nodes/Code/utils';
-import type { Tool } from '@langchain/core/tools';
-import { makeResolverFromLegacyOptions } from '@n8n/vm2';
-import { logWrapper } from '../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
 
 const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } =
 	process.env;
@@ -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/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts
index 2e68db4e69..5c9ebf08b0 100644
--- a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentBinaryInputLoader/DocumentBinaryInputLoader.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { TextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,11 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { TextSplitter } from '@langchain/textsplitters';
-
-import { logWrapper } from '../../../utils/logWrapper';
-import { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
-import { getConnectionHintNoticeField, metadataFilterField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { getConnectionHintNoticeField, metadataFilterField } from '@utils/sharedFields';
 
 // Dependencies needed underneath the hood for the loaders. We add them
 // here only to track where what dependency is sued
diff --git a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts
index 5e6457951e..46e4120764 100644
--- a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentDefaultDataLoader/DocumentDefaultDataLoader.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { TextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +8,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { TextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
-import { metadataFilterField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { metadataFilterField } from '@utils/sharedFields';
 
 // Dependencies needed underneath the hood for the loaders. We add them
 // here only to track where what dependency is sued
@@ -18,7 +19,6 @@ import { metadataFilterField } from '../../../utils/sharedFields';
 import 'mammoth'; // for docx
 import 'epub2'; // for epub
 import 'pdf-parse'; // for pdf
-import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
 
 export class DocumentDefaultDataLoader implements INodeType {
 	description: INodeTypeDescription = {
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..7d63e32f0b 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
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { GithubRepoLoader } from '@langchain/community/document_loaders/web/github';
+import type { CharacterTextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,10 +8,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { GithubRepoLoader } from '@langchain/community/document_loaders/web/github';
-import type { CharacterTextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class DocumentGithubLoader implements INodeType {
 	description: INodeTypeDescription = {
@@ -94,7 +95,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/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts
index 2e8cb95a11..9c295ba144 100644
--- a/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/document_loaders/DocumentJSONInputLoader/DocumentJsonInputLoader.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { TextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { TextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { getConnectionHintNoticeField, metadataFilterField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { getConnectionHintNoticeField, metadataFilterField } from '@utils/sharedFields';
 
 export class DocumentJsonInputLoader implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
index 6e0782f1c1..fdb2da5ce0 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAwsBedrock/EmbeddingsAwsBedrock.node.ts
@@ -8,8 +8,8 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsAwsBedrock implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts
index a75a93c9f4..65f493d578 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsAzureOpenAi/EmbeddingsAzureOpenAi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { OpenAIEmbeddings } from '@langchain/openai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,9 +8,8 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { OpenAIEmbeddings } from '@langchain/openai';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsAzureOpenAi implements INodeType {
 	description: INodeTypeDescription = {
@@ -87,6 +87,36 @@ export class EmbeddingsAzureOpenAi implements INodeType {
 							'Maximum amount of time a request is allowed to take in seconds. Set to -1 for no timeout.',
 						type: 'number',
 					},
+					{
+						displayName: 'Dimensions',
+						name: 'dimensions',
+						default: undefined,
+						description:
+							'The number of dimensions the resulting output embeddings should have. Only supported in text-embedding-3 and later models.',
+						type: 'options',
+						options: [
+							{
+								name: '256',
+								value: 256,
+							},
+							{
+								name: '512',
+								value: 512,
+							},
+							{
+								name: '1024',
+								value: 1024,
+							},
+							{
+								name: '1536',
+								value: 1536,
+							},
+							{
+								name: '3072',
+								value: 3072,
+							},
+						],
+					},
 				],
 			},
 		],
@@ -98,6 +128,7 @@ export class EmbeddingsAzureOpenAi implements INodeType {
 			apiKey: string;
 			resourceName: string;
 			apiVersion: string;
+			endpoint?: string;
 		}>('azureOpenAiApi');
 		const modelName = this.getNodeParameter('model', itemIndex) as string;
 
@@ -105,6 +136,7 @@ export class EmbeddingsAzureOpenAi implements INodeType {
 			batchSize?: number;
 			stripNewLines?: boolean;
 			timeout?: number;
+			dimensions?: number | undefined;
 		};
 
 		if (options.timeout === -1) {
@@ -113,9 +145,15 @@ export class EmbeddingsAzureOpenAi implements INodeType {
 
 		const embeddings = new OpenAIEmbeddings({
 			azureOpenAIApiDeploymentName: modelName,
-			azureOpenAIApiInstanceName: credentials.resourceName,
+			// instance name only needed to set base url
+			azureOpenAIApiInstanceName: !credentials.endpoint ? credentials.resourceName : undefined,
 			azureOpenAIApiKey: credentials.apiKey,
 			azureOpenAIApiVersion: credentials.apiVersion,
+			// azureOpenAIEndpoint and configuration.baseURL are both ignored here
+			// only setting azureOpenAIBasePath worked
+			azureOpenAIBasePath: credentials.endpoint
+				? `${credentials.endpoint}/openai/deployments`
+				: undefined,
 			...options,
 		});
 
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
index 26e5d39b70..ebab22ec55 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsCohere/EmbeddingsCohere.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { CohereEmbeddings } from '@langchain/cohere';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { CohereEmbeddings } from '@langchain/cohere';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsCohere implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts
index 2a455e4574..949d6ee24e 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsGoogleGemini/EmbeddingsGoogleGemini.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,10 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { GoogleGenerativeAIEmbeddings } from '@langchain/google-genai';
 
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsGoogleGemini implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts
index c8317630c3..c8023354ef 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsHuggingFaceInference/EmbeddingsHuggingFaceInference.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { HuggingFaceInferenceEmbeddings } from '@langchain/community/embeddings/hf';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { HuggingFaceInferenceEmbeddings } from '@langchain/community/embeddings/hf';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsHuggingFaceInference implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts
index dbfb93b82e..553abfa406 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsMistralCloud/EmbeddingsMistralCloud.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { MistralAIEmbeddingsParams } from '@langchain/mistralai';
+import { MistralAIEmbeddings } from '@langchain/mistralai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,10 +8,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { MistralAIEmbeddingsParams } from '@langchain/mistralai';
-import { MistralAIEmbeddings } from '@langchain/mistralai';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class EmbeddingsMistralCloud implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts
index d84aa537ec..08feb90309 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOllama/EmbeddingsOllama.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { OllamaEmbeddings } from '@langchain/ollama';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,10 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { OllamaEmbeddings } from '@langchain/ollama';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { ollamaDescription, ollamaModel } from '../../llms/LMOllama/description';
 
 export class EmbeddingsOllama implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
index 167581ed2e..58d90ff90b 100644
--- a/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/embeddings/EmbeddingsOpenAI/EmbeddingsOpenAi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { OpenAIEmbeddings } from '@langchain/openai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,11 +8,10 @@ import {
 	type ISupplyDataFunctions,
 	type INodeProperties,
 } from 'n8n-workflow';
-
 import type { ClientOptions } from 'openai';
-import { OpenAIEmbeddings } from '@langchain/openai';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 const modelParameter: INodeProperties = {
 	displayName: 'Model',
@@ -24,7 +24,7 @@ const modelParameter: INodeProperties = {
 			routing: {
 				request: {
 					method: 'GET',
-					url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || "v1"  }}/models',
+					url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || $credentials?.url?.split("/").slice(-1).pop() || "v1" }}/models',
 				},
 				output: {
 					postReceive: [
@@ -79,7 +79,7 @@ export class EmbeddingsOpenAi implements INodeType {
 			},
 		],
 		group: ['transform'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2],
 		description: 'Use Embeddings OpenAI',
 		defaults: {
 			name: 'Embeddings OpenAI',
@@ -106,7 +106,7 @@ export class EmbeddingsOpenAi implements INodeType {
 		requestDefaults: {
 			ignoreHttpStatusErrors: true,
 			baseURL:
-				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
+				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || $credentials.url?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
 		},
 		properties: [
 			getConnectionHintNoticeField([NodeConnectionType.AiVectorStore]),
@@ -135,12 +135,47 @@ export class EmbeddingsOpenAi implements INodeType {
 				type: 'collection',
 				default: {},
 				options: [
+					{
+						displayName: 'Dimensions',
+						name: 'dimensions',
+						default: undefined,
+						description:
+							'The number of dimensions the resulting output embeddings should have. Only supported in text-embedding-3 and later models.',
+						type: 'options',
+						options: [
+							{
+								name: '256',
+								value: 256,
+							},
+							{
+								name: '512',
+								value: 512,
+							},
+							{
+								name: '1024',
+								value: 1024,
+							},
+							{
+								name: '1536',
+								value: 1536,
+							},
+							{
+								name: '3072',
+								value: 3072,
+							},
+						],
+					},
 					{
 						displayName: 'Base URL',
 						name: 'baseURL',
 						default: 'https://api.openai.com/v1',
 						description: 'Override the default base URL for the API',
 						type: 'string',
+						displayOptions: {
+							hide: {
+								'@version': [{ _cnd: { gte: 1.2 } }],
+							},
+						},
 					},
 					{
 						displayName: 'Batch Size',
@@ -179,6 +214,7 @@ export class EmbeddingsOpenAi implements INodeType {
 			batchSize?: number;
 			stripNewLines?: boolean;
 			timeout?: number;
+			dimensions?: number | undefined;
 		};
 
 		if (options.timeout === -1) {
@@ -188,6 +224,8 @@ export class EmbeddingsOpenAi implements INodeType {
 		const configuration: ClientOptions = {};
 		if (options.baseURL) {
 			configuration.baseURL = options.baseURL;
+		} else if (credentials.url) {
+			configuration.baseURL = credentials.url as string;
 		}
 
 		const embeddings = new OpenAIEmbeddings(
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
index 416a28b655..3a38ce3a31 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatAnthropic/LmChatAnthropic.node.ts
@@ -1,4 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import { ChatAnthropic } from '@langchain/anthropic';
+import type { LLMResult } from '@langchain/core/outputs';
 import {
 	NodeConnectionType,
 	type INodePropertyOptions,
@@ -9,9 +12,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { ChatAnthropic } from '@langchain/anthropic';
-import type { LLMResult } from '@langchain/core/outputs';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 const modelField: INodeProperties = {
@@ -20,6 +23,10 @@ const modelField: INodeProperties = {
 	type: 'options',
 	// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
 	options: [
+		{
+			name: 'Claude 3.5 Sonnet(20241022)',
+			value: 'claude-3-5-sonnet-20241022',
+		},
 		{
 			name: 'Claude 3 Opus(20240229)',
 			value: 'claude-3-opus-20240229',
@@ -32,6 +39,10 @@ const modelField: INodeProperties = {
 			name: 'Claude 3 Sonnet(20240229)',
 			value: 'claude-3-sonnet-20240229',
 		},
+		{
+			name: 'Claude 3.5 Haiku(20241022)',
+			value: 'claude-3-5-haiku-20241022',
+		},
 		{
 			name: 'Claude 3 Haiku(20240307)',
 			value: 'claude-3-haiku-20240307',
@@ -205,6 +216,7 @@ export class LmChatAnthropic implements INodeType {
 			topK: options.topK,
 			topP: options.topP,
 			callbacks: [new N8nLlmTracing(this, { tokensUsageParser })],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
index dc2f716b2b..d4685fa802 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOllama/LmChatOllama.node.ts
@@ -1,4 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import type { ChatOllamaInput } from '@langchain/ollama';
+import { ChatOllama } from '@langchain/ollama';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +10,10 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { ChatOllamaInput } from '@langchain/ollama';
-import { ChatOllama } from '@langchain/ollama';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { ollamaModel, ollamaOptions, ollamaDescription } from '../LMOllama/description';
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatOllama implements INodeType {
@@ -64,6 +67,7 @@ export class LmChatOllama implements INodeType {
 			model: modelName,
 			format: options.format === 'default' ? undefined : options.format,
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
index 2e724bf3a7..be057f9a5a 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/LmChatOpenAi.node.ts
@@ -1,28 +1,35 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import { ChatOpenAI, type ClientOptions } from '@langchain/openai';
 import {
 	NodeConnectionType,
 	type INodeType,
 	type INodeTypeDescription,
 	type ISupplyDataFunctions,
 	type SupplyData,
-	type JsonObject,
-	NodeApiError,
 } from 'n8n-workflow';
 
-import { ChatOpenAI, type ClientOptions } from '@langchain/openai';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { searchModels } from './methods/loadModels';
+import { openAiFailedAttemptHandler } from '../../vendors/OpenAi/helpers/error-handling';
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
-import { RateLimitError } from 'openai';
-import { getCustomErrorMessage } from '../../vendors/OpenAi/helpers/error-handling';
 
 export class LmChatOpenAi implements INodeType {
+	methods = {
+		listSearch: {
+			searchModels,
+		},
+	};
+
 	description: INodeTypeDescription = {
 		displayName: 'OpenAI Chat Model',
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-name-miscased
 		name: 'lmChatOpenAi',
 		icon: { light: 'file:openAiLight.svg', dark: 'file:openAiLight.dark.svg' },
 		group: ['transform'],
-		version: 1,
+		version: [1, 1.1, 1.2],
 		description: 'For advanced usage with an AI chain',
 		defaults: {
 			name: 'OpenAI Chat Model',
@@ -55,7 +62,7 @@ export class LmChatOpenAi implements INodeType {
 		requestDefaults: {
 			ignoreHttpStatusErrors: true,
 			baseURL:
-				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
+				'={{ $parameter.options?.baseURL?.split("/").slice(0,-1).join("/") || $credentials?.url?.split("/").slice(0,-1).join("/") || "https://api.openai.com" }}',
 		},
 		properties: [
 			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
@@ -82,7 +89,7 @@ export class LmChatOpenAi implements INodeType {
 						routing: {
 							request: {
 								method: 'GET',
-								url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || "v1"  }}/models',
+								url: '={{ $parameter.options?.baseURL?.split("/").slice(-1).pop() || $credentials?.url?.split("/").slice(-1).pop() || "v1" }}/models',
 							},
 							output: {
 								postReceive: [
@@ -98,6 +105,7 @@ export class LmChatOpenAi implements INodeType {
 											// If the baseURL is not set or is set to api.openai.com, include only chat models
 											pass: `={{
 												($parameter.options?.baseURL && !$parameter.options?.baseURL?.includes('api.openai.com')) ||
+												($credentials?.url && !$credentials.url.includes('api.openai.com')) ||
 												$responseItem.id.startsWith('ft:') ||
 												$responseItem.id.startsWith('o1') ||
 												($responseItem.id.startsWith('gpt-') && !$responseItem.id.includes('instruct'))
@@ -129,6 +137,42 @@ export class LmChatOpenAi implements INodeType {
 					},
 				},
 				default: 'gpt-4o-mini',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+				},
+			},
+			{
+				displayName: 'Model',
+				name: 'model',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
+				required: true,
+				modes: [
+					{
+						displayName: 'From List',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select a model...',
+						typeOptions: {
+							searchListMethod: 'searchModels',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+						placeholder: '2302163813',
+					},
+				],
+				description: 'The model. Choose from the list, or specify an ID.',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { lte: 1.1 } }],
+					},
+				},
 			},
 			{
 				displayName:
@@ -156,6 +200,11 @@ export class LmChatOpenAi implements INodeType {
 						default: 'https://api.openai.com/v1',
 						description: 'Override the default base URL for the API',
 						type: 'string',
+						displayOptions: {
+							hide: {
+								'@version': [{ _cnd: { gte: 1.1 } }],
+							},
+						},
 					},
 					{
 						displayName: 'Frequency Penalty',
@@ -245,7 +294,12 @@ export class LmChatOpenAi implements INodeType {
 	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
 		const credentials = await this.getCredentials('openAiApi');
 
-		const modelName = this.getNodeParameter('model', itemIndex) as string;
+		const version = this.getNode().typeVersion;
+		const modelName =
+			version >= 1.2
+				? (this.getNodeParameter('model.value', itemIndex) as string)
+				: (this.getNodeParameter('model', itemIndex) as string);
+
 		const options = this.getNodeParameter('options', itemIndex, {}) as {
 			baseURL?: string;
 			frequencyPenalty?: number;
@@ -261,6 +315,8 @@ export class LmChatOpenAi implements INodeType {
 		const configuration: ClientOptions = {};
 		if (options.baseURL) {
 			configuration.baseURL = options.baseURL;
+		} else if (credentials.url) {
+			configuration.baseURL = credentials.url as string;
 		}
 
 		const model = new ChatOpenAI({
@@ -276,25 +332,7 @@ export class LmChatOpenAi implements INodeType {
 						response_format: { type: options.responseFormat },
 					}
 				: undefined,
-			onFailedAttempt: (error: any) => {
-				// If the error is a rate limit error, we want to handle it differently
-				// because OpenAI has multiple different rate limit errors
-				if (error instanceof RateLimitError) {
-					const errorCode = error?.code;
-					if (errorCode) {
-						const customErrorMessage = getCustomErrorMessage(errorCode);
-
-						const apiError = new NodeApiError(this.getNode(), error as unknown as JsonObject);
-						if (customErrorMessage) {
-							apiError.message = customErrorMessage;
-						}
-
-						throw apiError;
-					}
-				}
-
-				throw error;
-			},
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this, openAiFailedAttemptHandler),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/__tests__/loadModels.test.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/__tests__/loadModels.test.ts
new file mode 100644
index 0000000000..b2f728678f
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/__tests__/loadModels.test.ts
@@ -0,0 +1,112 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+import OpenAI from 'openai';
+
+import { searchModels } from '../loadModels';
+
+jest.mock('openai');
+
+describe('searchModels', () => {
+	let mockContext: jest.Mocked<ILoadOptionsFunctions>;
+	let mockOpenAI: jest.Mocked<typeof OpenAI>;
+
+	beforeEach(() => {
+		mockContext = {
+			getCredentials: jest.fn().mockResolvedValue({
+				apiKey: 'test-api-key',
+			}),
+			getNodeParameter: jest.fn().mockReturnValue(''),
+		} as unknown as jest.Mocked<ILoadOptionsFunctions>;
+
+		// Setup OpenAI mock with required properties
+		const mockOpenAIInstance = {
+			apiKey: 'test-api-key',
+			organization: null,
+			project: null,
+			_options: {},
+			models: {
+				list: jest.fn().mockResolvedValue({
+					data: [
+						{ id: 'gpt-4' },
+						{ id: 'gpt-3.5-turbo' },
+						{ id: 'gpt-3.5-turbo-instruct' },
+						{ id: 'ft:gpt-3.5-turbo' },
+						{ id: 'o1-model' },
+						{ id: 'other-model' },
+					],
+				}),
+			},
+		} as unknown as OpenAI;
+
+		(OpenAI as jest.MockedClass<typeof OpenAI>).mockImplementation(() => mockOpenAIInstance);
+
+		mockOpenAI = OpenAI as jest.Mocked<typeof OpenAI>;
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should return filtered models if custom API endpoint is not provided', async () => {
+		const result = await searchModels.call(mockContext);
+
+		expect(mockOpenAI).toHaveBeenCalledWith({
+			baseURL: 'https://api.openai.com/v1',
+			apiKey: 'test-api-key',
+		});
+		expect(result.results).toHaveLength(4);
+	});
+
+	it('should initialize OpenAI with correct credentials', async () => {
+		mockContext.getCredentials.mockResolvedValueOnce({
+			apiKey: 'test-api-key',
+			url: 'https://test-url.com',
+		});
+		await searchModels.call(mockContext);
+
+		expect(mockOpenAI).toHaveBeenCalledWith({
+			baseURL: 'https://test-url.com',
+			apiKey: 'test-api-key',
+		});
+	});
+
+	it('should use default OpenAI URL if no custom URL provided', async () => {
+		mockContext.getCredentials = jest.fn().mockResolvedValue({
+			apiKey: 'test-api-key',
+		});
+
+		await searchModels.call(mockContext);
+
+		expect(mockOpenAI).toHaveBeenCalledWith({
+			baseURL: 'https://api.openai.com/v1',
+			apiKey: 'test-api-key',
+		});
+	});
+
+	it('should include all models for custom API endpoints', async () => {
+		mockContext.getNodeParameter = jest.fn().mockReturnValue('https://custom-api.com');
+
+		const result = await searchModels.call(mockContext);
+
+		expect(result.results).toHaveLength(6);
+	});
+
+	it('should filter models based on search term', async () => {
+		const result = await searchModels.call(mockContext, 'gpt');
+
+		expect(result.results).toEqual([
+			{ name: 'gpt-4', value: 'gpt-4' },
+			{ name: 'gpt-3.5-turbo', value: 'gpt-3.5-turbo' },
+			{ name: 'ft:gpt-3.5-turbo', value: 'ft:gpt-3.5-turbo' },
+		]);
+	});
+
+	it('should handle case-insensitive search', async () => {
+		const result = await searchModels.call(mockContext, 'GPT');
+
+		expect(result.results).toEqual([
+			{ name: 'gpt-4', value: 'gpt-4' },
+			{ name: 'gpt-3.5-turbo', value: 'gpt-3.5-turbo' },
+			{ name: 'ft:gpt-3.5-turbo', value: 'ft:gpt-3.5-turbo' },
+		]);
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/loadModels.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/loadModels.ts
new file mode 100644
index 0000000000..966be4f940
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMChatOpenAi/methods/loadModels.ts
@@ -0,0 +1,37 @@
+import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+import OpenAI from 'openai';
+
+export async function searchModels(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+): Promise<INodeListSearchResult> {
+	const credentials = await this.getCredentials('openAiApi');
+	const baseURL =
+		(this.getNodeParameter('options.baseURL', '') as string) ||
+		(credentials.url as string) ||
+		'https://api.openai.com/v1';
+
+	const openai = new OpenAI({ baseURL, apiKey: credentials.apiKey as string });
+	const { data: models = [] } = await openai.models.list();
+
+	const filteredModels = models.filter((model: { id: string }) => {
+		const isValidModel =
+			(baseURL && !baseURL.includes('api.openai.com')) ||
+			model.id.startsWith('ft:') ||
+			model.id.startsWith('o1') ||
+			(model.id.startsWith('gpt-') && !model.id.includes('instruct'));
+
+		if (!filter) return isValidModel;
+
+		return isValidModel && model.id.toLowerCase().includes(filter.toLowerCase());
+	});
+
+	const results = {
+		results: filteredModels.map((model: { id: string }) => ({
+			name: model.id,
+			value: model.id,
+		})),
+	};
+
+	return results;
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
index 6957cd9d9a..6b9559104b 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMCohere/LmCohere.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { Cohere } from '@langchain/cohere';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,8 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { Cohere } from '@langchain/cohere';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmCohere implements INodeType {
@@ -99,6 +101,7 @@ export class LmCohere implements INodeType {
 			apiKey: credentials.apiKey as string,
 			...options,
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
index f71708cbca..21a7a0c50f 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOllama/LmOllama.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import { Ollama } from '@langchain/community/llms/ollama';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,10 +9,11 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { Ollama } from '@langchain/community/llms/ollama';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { ollamaDescription, ollamaModel, ollamaOptions } from './description';
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmOllama implements INodeType {
 	description: INodeTypeDescription = {
@@ -62,6 +65,7 @@ export class LmOllama implements INodeType {
 			model: modelName,
 			...options,
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
index 5fb9be937e..1a64f07cca 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenAi/LmOpenAi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { OpenAI, type ClientOptions } from '@langchain/openai';
 import { NodeConnectionType } from 'n8n-workflow';
 import type {
 	INodeType,
@@ -8,7 +9,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-workflow';
 
-import { OpenAI, type ClientOptions } from '@langchain/openai';
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 type LmOpenAiOptions = {
@@ -260,6 +261,7 @@ export class LmOpenAi implements INodeType {
 			timeout: options.timeout ?? 60000,
 			maxRetries: options.maxRetries ?? 2,
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
index ddf8065bf6..e393d86f8a 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LMOpenHuggingFaceInference/LmOpenHuggingFaceInference.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { HuggingFaceInference } from '@langchain/community/llms/hf';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,8 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { HuggingFaceInference } from '@langchain/community/llms/hf';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmOpenHuggingFaceInference implements INodeType {
@@ -143,6 +145,7 @@ export class LmOpenHuggingFaceInference implements INodeType {
 			apiKey: credentials.apiKey as string,
 			...options,
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
index b4eafde76e..ef15a531cf 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAwsBedrock/LmChatAwsBedrock.node.ts
@@ -8,7 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatAwsBedrock implements INodeType {
@@ -151,6 +153,7 @@ export class LmChatAwsBedrock implements INodeType {
 				sessionToken: credentials.sessionToken as string,
 			},
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
index 55a5afb7ce..5fc562153d 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatAzureOpenAi/LmChatAzureOpenAi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { ChatOpenAI } from '@langchain/openai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,8 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { ChatOpenAI } from '@langchain/openai';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatAzureOpenAi implements INodeType {
@@ -167,6 +169,7 @@ export class LmChatAzureOpenAi implements INodeType {
 			apiKey: string;
 			resourceName: string;
 			apiVersion: string;
+			endpoint?: string;
 		}>('azureOpenAiApi');
 
 		const modelName = this.getNodeParameter('model', itemIndex) as string;
@@ -183,9 +186,11 @@ export class LmChatAzureOpenAi implements INodeType {
 
 		const model = new ChatOpenAI({
 			azureOpenAIApiDeploymentName: modelName,
-			azureOpenAIApiInstanceName: credentials.resourceName,
+			// instance name only needed to set base url
+			azureOpenAIApiInstanceName: !credentials.endpoint ? credentials.resourceName : undefined,
 			azureOpenAIApiKey: credentials.apiKey,
 			azureOpenAIApiVersion: credentials.apiVersion,
+			azureOpenAIEndpoint: credentials.endpoint,
 			...options,
 			timeout: options.timeout ?? 60000,
 			maxRetries: options.maxRetries ?? 2,
@@ -195,6 +200,7 @@ export class LmChatAzureOpenAi implements INodeType {
 						response_format: { type: options.responseFormat },
 					}
 				: undefined,
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
index 44691a47ef..05c2475556 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleGemini/LmChatGoogleGemini.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { SafetySetting } from '@google/generative-ai';
+import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,11 +8,12 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { ChatGoogleGenerativeAI } from '@langchain/google-genai';
-import type { SafetySetting } from '@google/generative-ai';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
+
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { additionalOptions } from '../gemini-common/additional-options';
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatGoogleGemini implements INodeType {
 	description: INodeTypeDescription = {
@@ -137,6 +140,7 @@ export class LmChatGoogleGemini implements INodeType {
 
 		const model = new ChatGoogleGenerativeAI({
 			apiKey: credentials.apiKey as string,
+			baseUrl: credentials.host as string,
 			modelName,
 			topK: options.topK,
 			topP: options.topP,
@@ -144,6 +148,7 @@ export class LmChatGoogleGemini implements INodeType {
 			maxOutputTokens: options.maxOutputTokens,
 			safetySettings,
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
index a9a01ebf1b..ab3320c2ba 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGoogleVertex/LmChatGoogleVertex.node.ts
@@ -1,4 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { SafetySetting } from '@google/generative-ai';
+import { ProjectsClient } from '@google-cloud/resource-manager';
+import { ChatVertexAI } from '@langchain/google-vertexai';
+import { formatPrivateKey } from 'n8n-nodes-base/dist/utils/utilities';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -9,14 +13,13 @@ import {
 	type JsonObject,
 	NodeOperationError,
 } from 'n8n-workflow';
-import { ChatVertexAI } from '@langchain/google-vertexai';
-import type { SafetySetting } from '@google/generative-ai';
-import { ProjectsClient } from '@google-cloud/resource-manager';
-import { formatPrivateKey } from 'n8n-nodes-base/dist/utils/utilities';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { N8nLlmTracing } from '../N8nLlmTracing';
-import { additionalOptions } from '../gemini-common/additional-options';
+
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { makeErrorFromStatus } from './error-handling';
+import { additionalOptions } from '../gemini-common/additional-options';
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
+import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatGoogleVertex implements INodeType {
 	description: INodeTypeDescription = {
@@ -128,6 +131,7 @@ export class LmChatGoogleVertex implements INodeType {
 		const credentials = await this.getCredentials('googleApi');
 		const privateKey = formatPrivateKey(credentials.privateKey as string);
 		const email = (credentials.email as string).trim();
+		const region = credentials.region as string;
 
 		const modelName = this.getNodeParameter('modelName', itemIndex) as string;
 
@@ -162,6 +166,7 @@ export class LmChatGoogleVertex implements INodeType {
 						private_key: privateKey,
 					},
 				},
+				location: region,
 				model: modelName,
 				topK: options.topK,
 				topP: options.topP,
@@ -170,7 +175,8 @@ export class LmChatGoogleVertex implements INodeType {
 				safetySettings,
 				callbacks: [new N8nLlmTracing(this)],
 				// Handle ChatVertexAI invocation errors to provide better error messages
-				onFailedAttempt: (error: any) => {
+				onFailedAttempt: makeN8nLlmFailedAttemptHandler(this, (error: any) => {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 					const customError = makeErrorFromStatus(Number(error?.response?.status), {
 						modelName,
 					});
@@ -180,7 +186,7 @@ export class LmChatGoogleVertex implements INodeType {
 					}
 
 					throw error;
-				},
+				}),
 			});
 
 			return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
index 3588cf0cc3..fb859e3fce 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatGroq/LmChatGroq.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { ChatGroq } from '@langchain/groq';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,8 +8,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { ChatGroq } from '@langchain/groq';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatGroq implements INodeType {
@@ -144,6 +146,7 @@ export class LmChatGroq implements INodeType {
 			maxTokens: options.maxTokensToSample,
 			temperature: options.temperature,
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
index 5ff28bd30d..a23c2d4e9f 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/LmChatMistralCloud/LmChatMistralCloud.node.ts
@@ -1,4 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import type { ChatMistralAIInput } from '@langchain/mistralai';
+import { ChatMistralAI } from '@langchain/mistralai';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,9 +10,9 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import type { ChatMistralAIInput } from '@langchain/mistralai';
-import { ChatMistralAI } from '@langchain/mistralai';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { makeN8nLlmFailedAttemptHandler } from '../n8nLlmFailedAttemptHandler';
 import { N8nLlmTracing } from '../N8nLlmTracing';
 
 export class LmChatMistralCloud implements INodeType {
@@ -190,6 +193,7 @@ export class LmChatMistralCloud implements INodeType {
 			modelName,
 			...options,
 			callbacks: [new N8nLlmTracing(this)],
+			onFailedAttempt: makeN8nLlmFailedAttemptHandler(this),
 		});
 
 		return {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts b/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
index 660bf3b0a9..3d426309b7 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/N8nLlmTracing.ts
@@ -1,18 +1,19 @@
 import { BaseCallbackHandler } from '@langchain/core/callbacks/base';
+import type { SerializedFields } from '@langchain/core/dist/load/map_keys';
 import { getModelNameForTiktoken } from '@langchain/core/language_models/base';
-import { encodingForModel } from '@langchain/core/utils/tiktoken';
 import type {
 	Serialized,
 	SerializedNotImplemented,
 	SerializedSecret,
 } from '@langchain/core/load/serializable';
-import type { LLMResult } from '@langchain/core/outputs';
-import type { IDataObject, ISupplyDataFunctions } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-import { pick } from 'lodash';
 import type { BaseMessage } from '@langchain/core/messages';
-import type { SerializedFields } from '@langchain/core/dist/load/map_keys';
-import { logAiEvent } from '../../utils/helpers';
+import type { LLMResult } from '@langchain/core/outputs';
+import { encodingForModel } from '@langchain/core/utils/tiktoken';
+import { pick } from 'lodash';
+import type { IDataObject, ISupplyDataFunctions, JsonObject } from 'n8n-workflow';
+import { NodeConnectionType, NodeError, NodeOperationError } from 'n8n-workflow';
+
+import { logAiEvent } from '@utils/helpers';
 
 type TokensUsageParser = (llmOutput: LLMResult['llmOutput']) => {
 	completionTokens: number;
@@ -30,6 +31,10 @@ const TIKTOKEN_ESTIMATE_MODEL = 'gpt-4o';
 export class N8nLlmTracing extends BaseCallbackHandler {
 	name = 'N8nLlmTracing';
 
+	// This flag makes sure that LangChain will wait for the handlers to finish before continuing
+	// This is crucial for the handleLLMError handler to work correctly (it should be called before the error is propagated to the root node)
+	awaitHandlers = true;
+
 	connectionType = NodeConnectionType.AiLanguageModel;
 
 	promptTokensEstimate = 0;
@@ -135,6 +140,7 @@ export class N8nLlmTracing extends BaseCallbackHandler {
 		this.executionFunctions.addOutputData(this.connectionType, runDetails.index, [
 			[{ json: { ...response } }],
 		]);
+
 		logAiEvent(this.executionFunctions, 'ai-llm-generated-output', {
 			messages: parsedMessages,
 			options: runDetails.options,
@@ -172,6 +178,8 @@ export class N8nLlmTracing extends BaseCallbackHandler {
 		runId: string,
 		parentRunId?: string | undefined,
 	) {
+		const runDetails = this.runsMap[runId] ?? { index: Object.keys(this.runsMap).length };
+
 		// Filter out non-x- headers to avoid leaking sensitive information in logs
 		if (typeof error === 'object' && error?.hasOwnProperty('headers')) {
 			const errorWithHeaders = error as { headers: Record<string, unknown> };
@@ -183,6 +191,19 @@ export class N8nLlmTracing extends BaseCallbackHandler {
 			});
 		}
 
+		if (error instanceof NodeError) {
+			this.executionFunctions.addOutputData(this.connectionType, runDetails.index, error);
+		} else {
+			// If the error is not a NodeError, we wrap it in a NodeOperationError
+			this.executionFunctions.addOutputData(
+				this.connectionType,
+				runDetails.index,
+				new NodeOperationError(this.executionFunctions.getNode(), error as JsonObject, {
+					functionality: 'configuration-node',
+				}),
+			);
+		}
+
 		logAiEvent(this.executionFunctions, 'ai-llm-errored', {
 			error: Object.keys(error).length === 0 ? error.toString() : error,
 			runId,
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/gemini-common/additional-options.ts b/packages/@n8n/nodes-langchain/nodes/llms/gemini-common/additional-options.ts
index 3fc1900b8a..f154b676c5 100644
--- a/packages/@n8n/nodes-langchain/nodes/llms/gemini-common/additional-options.ts
+++ b/packages/@n8n/nodes-langchain/nodes/llms/gemini-common/additional-options.ts
@@ -1,5 +1,6 @@
 import type { HarmBlockThreshold, HarmCategory } from '@google/generative-ai';
 import type { INodeProperties } from 'n8n-workflow';
+
 import { harmCategories, harmThresholds } from './safety-options';
 
 export const additionalOptions: INodeProperties = {
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/n8nDefaultFailedAttemptHandler.test.ts b/packages/@n8n/nodes-langchain/nodes/llms/n8nDefaultFailedAttemptHandler.test.ts
new file mode 100644
index 0000000000..6f81cc1368
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/n8nDefaultFailedAttemptHandler.test.ts
@@ -0,0 +1,66 @@
+import { n8nDefaultFailedAttemptHandler } from './n8nDefaultFailedAttemptHandler';
+
+class MockHttpError extends Error {
+	response: { status: number };
+
+	constructor(message: string, code: number) {
+		super(message);
+		this.response = { status: code };
+	}
+}
+
+describe('n8nDefaultFailedAttemptHandler', () => {
+	it('should throw error if message starts with "Cancel"', () => {
+		const error = new Error('Cancel operation');
+		expect(() => n8nDefaultFailedAttemptHandler(error)).toThrow(error);
+	});
+
+	it('should throw error if message starts with "AbortError"', () => {
+		const error = new Error('AbortError occurred');
+		expect(() => n8nDefaultFailedAttemptHandler(error)).toThrow(error);
+	});
+
+	it('should throw error if name is "AbortError"', () => {
+		class MockAbortError extends Error {
+			constructor() {
+				super('Some error');
+				this.name = 'AbortError';
+			}
+		}
+
+		const error = new MockAbortError();
+
+		expect(() => n8nDefaultFailedAttemptHandler(error)).toThrow(error);
+	});
+
+	it('should throw error if code is "ECONNABORTED"', () => {
+		class MockAbortError extends Error {
+			code: string;
+
+			constructor() {
+				super('Some error');
+				this.code = 'ECONNABORTED';
+			}
+		}
+
+		const error = new MockAbortError();
+		expect(() => n8nDefaultFailedAttemptHandler(error)).toThrow(error);
+	});
+
+	it('should throw error if status is in STATUS_NO_RETRY', () => {
+		const error = new MockHttpError('Some error', 400);
+		expect(() => n8nDefaultFailedAttemptHandler(error)).toThrow(error);
+	});
+
+	it('should not throw error if status is not in STATUS_NO_RETRY', () => {
+		const error = new MockHttpError('Some error', 500);
+		error.response = { status: 500 };
+
+		expect(() => n8nDefaultFailedAttemptHandler(error)).not.toThrow();
+	});
+
+	it('should not throw error if no conditions are met', () => {
+		const error = new Error('Some random error');
+		expect(() => n8nDefaultFailedAttemptHandler(error)).not.toThrow();
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/n8nDefaultFailedAttemptHandler.ts b/packages/@n8n/nodes-langchain/nodes/llms/n8nDefaultFailedAttemptHandler.ts
new file mode 100644
index 0000000000..11bbc5c87e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/n8nDefaultFailedAttemptHandler.ts
@@ -0,0 +1,41 @@
+const STATUS_NO_RETRY = [
+	400, // Bad Request
+	401, // Unauthorized
+	402, // Payment Required
+	403, // Forbidden
+	404, // Not Found
+	405, // Method Not Allowed
+	406, // Not Acceptable
+	407, // Proxy Authentication Required
+	409, // Conflict
+];
+
+/**
+ * This function is used as a default handler for failed attempts in all LLMs.
+ * It is based on a default handler from the langchain core package.
+ * It throws an error when it encounters a known error that should not be retried.
+ * @param error
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const n8nDefaultFailedAttemptHandler = (error: any) => {
+	if (
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-call
+		error?.message?.startsWith?.('Cancel') ||
+		error?.message?.startsWith?.('AbortError') ||
+		error?.name === 'AbortError'
+	) {
+		throw error;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-member-access
+	if (error?.code === 'ECONNABORTED') {
+		throw error;
+	}
+
+	const status =
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-member-access
+		error?.response?.status ?? error?.status;
+	if (status && STATUS_NO_RETRY.includes(+status)) {
+		throw error;
+	}
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/n8nLlmFailedAttemptHandler.test.ts b/packages/@n8n/nodes-langchain/nodes/llms/n8nLlmFailedAttemptHandler.test.ts
new file mode 100644
index 0000000000..20c664c3c8
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/n8nLlmFailedAttemptHandler.test.ts
@@ -0,0 +1,65 @@
+import { mock } from 'jest-mock-extended';
+import type { ISupplyDataFunctions } from 'n8n-workflow';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
+
+import { makeN8nLlmFailedAttemptHandler } from './n8nLlmFailedAttemptHandler';
+
+describe('makeN8nLlmFailedAttemptHandler', () => {
+	const ctx = mock<ISupplyDataFunctions>({
+		getNode: jest.fn(),
+	});
+
+	it('should throw a wrapped error, when NO custom handler is provided', () => {
+		const handler = makeN8nLlmFailedAttemptHandler(ctx);
+
+		expect(() => handler(new Error('Test error'))).toThrow(NodeApiError);
+	});
+
+	it('should wrapped error when custom handler is provided', () => {
+		const customHandler = jest.fn();
+		const handler = makeN8nLlmFailedAttemptHandler(ctx, customHandler);
+
+		expect(() => handler(new Error('Test error'))).toThrow(NodeApiError);
+		expect(customHandler).toHaveBeenCalled();
+	});
+
+	it('should throw wrapped exception from custom handler', () => {
+		const customHandler = jest.fn(() => {
+			throw new ApplicationError('Custom handler error');
+		});
+		const handler = makeN8nLlmFailedAttemptHandler(ctx, customHandler);
+
+		expect(() => handler(new Error('Test error'))).toThrow('Custom handler error');
+		expect(customHandler).toHaveBeenCalled();
+	});
+
+	it('should not throw if retries are left', () => {
+		const customHandler = jest.fn();
+		const handler = makeN8nLlmFailedAttemptHandler(ctx, customHandler);
+
+		const error = new Error('Test error');
+		(error as any).retriesLeft = 1;
+
+		expect(() => handler(error)).not.toThrow();
+	});
+
+	it('should throw NodeApiError if no retries are left', () => {
+		const handler = makeN8nLlmFailedAttemptHandler(ctx);
+
+		const error = new Error('Test error');
+		(error as any).retriesLeft = 0;
+
+		expect(() => handler(error)).toThrow(NodeApiError);
+	});
+
+	it('should throw NodeApiError if no retries are left with custom handler', () => {
+		const customHandler = jest.fn();
+		const handler = makeN8nLlmFailedAttemptHandler(ctx, customHandler);
+
+		const error = new Error('Test error');
+		(error as any).retriesLeft = 0;
+
+		expect(() => handler(error)).toThrow(NodeApiError);
+		expect(customHandler).toHaveBeenCalled();
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/llms/n8nLlmFailedAttemptHandler.ts b/packages/@n8n/nodes-langchain/nodes/llms/n8nLlmFailedAttemptHandler.ts
new file mode 100644
index 0000000000..61e8d16581
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/llms/n8nLlmFailedAttemptHandler.ts
@@ -0,0 +1,46 @@
+import type { FailedAttemptHandler } from '@langchain/core/dist/utils/async_caller';
+import type { ISupplyDataFunctions, JsonObject } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import { n8nDefaultFailedAttemptHandler } from './n8nDefaultFailedAttemptHandler';
+
+/**
+ * This function returns a custom failed attempt handler for using with LangChain models.
+ * It first tries to use a custom handler passed as an argument, and if that doesn't throw an error, it uses the default handler.
+ * It always wraps the error in a NodeApiError.
+ * It throws an error ONLY if there are no retries left.
+ */
+export const makeN8nLlmFailedAttemptHandler = (
+	ctx: ISupplyDataFunctions,
+	handler?: FailedAttemptHandler,
+): FailedAttemptHandler => {
+	return (error: any) => {
+		try {
+			// Try custom error handler first
+			handler?.(error);
+
+			// If it didn't throw an error, use the default handler
+			n8nDefaultFailedAttemptHandler(error);
+		} catch (e) {
+			// Wrap the error in a NodeApiError
+			const apiError = new NodeApiError(ctx.getNode(), e as unknown as JsonObject, {
+				functionality: 'configuration-node',
+			});
+
+			throw apiError;
+		}
+
+		// If no error was thrown, check if it is the last retry
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		if (error?.retriesLeft > 0) {
+			return;
+		}
+
+		// If there are no retries left, throw the error wrapped in a NodeApiError
+		const apiError = new NodeApiError(ctx.getNode(), error as unknown as JsonObject, {
+			functionality: 'configuration-node',
+		});
+
+		throw apiError;
+	};
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
index fae6927c25..ab02339816 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryBufferWindow/MemoryBufferWindow.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { BufferWindowMemoryInput } from 'langchain/memory';
+import { BufferWindowMemory } from 'langchain/memory';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,12 +8,17 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { BufferWindowMemoryInput } from 'langchain/memory';
-import { BufferWindowMemory } from 'langchain/memory';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty, contextWindowLengthProperty } from '../descriptions';
-import { getSessionId } from '../../../utils/helpers';
+
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import {
+	sessionIdOption,
+	sessionKeyProperty,
+	contextWindowLengthProperty,
+	expressionSessionKeyProperty,
+} from '../descriptions';
 
 class MemoryChatBufferSingleton {
 	private static instance: MemoryChatBufferSingleton;
@@ -25,14 +32,14 @@ class MemoryChatBufferSingleton {
 		this.memoryBuffer = new Map();
 	}
 
-	public static getInstance(): MemoryChatBufferSingleton {
+	static getInstance(): MemoryChatBufferSingleton {
 		if (!MemoryChatBufferSingleton.instance) {
 			MemoryChatBufferSingleton.instance = new MemoryChatBufferSingleton();
 		}
 		return MemoryChatBufferSingleton.instance;
 	}
 
-	public async getMemory(
+	async getMemory(
 		sessionKey: string,
 		memoryParams: BufferWindowMemoryInput,
 	): Promise<BufferWindowMemory> {
@@ -71,8 +78,9 @@ export class MemoryBufferWindow implements INodeType {
 		displayName: 'Window Buffer Memory (easiest)',
 		name: 'memoryBufferWindow',
 		icon: 'fa:database',
+		iconColor: 'black',
 		group: ['transform'],
-		version: [1, 1.1, 1.2],
+		version: [1, 1.1, 1.2, 1.3],
 		description: 'Stores in n8n memory, so no credentials required',
 		defaults: {
 			name: 'Window Buffer Memory',
@@ -129,6 +137,7 @@ export class MemoryBufferWindow implements INodeType {
 					},
 				},
 			},
+			expressionSessionKeyProperty(1.3),
 			sessionKeyProperty,
 			contextWindowLengthProperty,
 		],
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts
index f2bb0f43b0..82fcba22a6 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryChatRetriever/MemoryChatRetriever.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import type { BaseMessage } from '@langchain/core/messages';
 import {
 	NodeConnectionType,
 	type IDataObject,
@@ -7,8 +9,6 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
-import type { BaseMessage } from '@langchain/core/messages';
 
 function simplifyMessages(messages: BaseMessage[]) {
 	const chunkedMessages = [];
@@ -38,6 +38,7 @@ export class MemoryChatRetriever implements INodeType {
 		displayName: 'Chat Messages Retriever',
 		name: 'memoryChatRetriever',
 		icon: 'fa:database',
+		iconColor: 'black',
 		group: ['transform'],
 		hidden: true,
 		version: 1,
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
index 04d6035e7f..964da65475 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryManager/MemoryManager.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
+import { AIMessage, SystemMessage, HumanMessage, type BaseMessage } from '@langchain/core/messages';
 import { NodeConnectionType } from 'n8n-workflow';
 import type {
 	IDataObject,
@@ -7,8 +9,6 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
-import { AIMessage, SystemMessage, HumanMessage, type BaseMessage } from '@langchain/core/messages';
 
 type MessageRole = 'ai' | 'system' | 'user';
 interface MessageRecord {
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
index 7f8d88fbaf..06fa387ee6 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryMotorhead/MemoryMotorhead.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { MotorheadMemory } from '@langchain/community/memory/motorhead_memory';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,19 +8,20 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { MotorheadMemory } from '@langchain/community/memory/motorhead_memory';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty } from '../descriptions';
-import { getSessionId } from '../../../utils/helpers';
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { expressionSessionKeyProperty, sessionIdOption, sessionKeyProperty } from '../descriptions';
 
 export class MemoryMotorhead implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Motorhead',
 		name: 'memoryMotorhead',
 		icon: 'fa:file-export',
+		iconColor: 'black',
 		group: ['transform'],
-		version: [1, 1.1, 1.2],
+		version: [1, 1.1, 1.2, 1.3],
 		description: 'Use Motorhead Memory',
 		defaults: {
 			name: 'Motorhead',
@@ -82,6 +84,7 @@ export class MemoryMotorhead implements INodeType {
 					},
 				},
 			},
+			expressionSessionKeyProperty(1.3),
 			sessionKeyProperty,
 		],
 	};
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
index f51b76fb18..81be577f79 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryPostgresChat/MemoryPostgresChat.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { PostgresChatMessageHistory } from '@langchain/community/stores/message/postgres';
+import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
+import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/transport';
+import type { PostgresNodeCredentials } from 'n8n-nodes-base/dist/nodes/Postgres/v2/helpers/interfaces';
+import { postgresConnectionTest } from 'n8n-nodes-base/dist/nodes/Postgres/v2/methods/credentialTest';
 import type {
 	ISupplyDataFunctions,
 	INodeType,
@@ -6,16 +11,18 @@ import type {
 	SupplyData,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
-import { PostgresChatMessageHistory } from '@langchain/community/stores/message/postgres';
 import type pg from 'pg';
-import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/v2/transport';
-import type { PostgresNodeCredentials } from 'n8n-nodes-base/dist/nodes/Postgres/v2/helpers/interfaces';
-import { postgresConnectionTest } from 'n8n-nodes-base/dist/nodes/Postgres/v2/methods/credentialTest';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty, contextWindowLengthProperty } from '../descriptions';
-import { getSessionId } from '../../../utils/helpers';
+
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import {
+	sessionIdOption,
+	sessionKeyProperty,
+	contextWindowLengthProperty,
+	expressionSessionKeyProperty,
+} from '../descriptions';
 
 export class MemoryPostgresChat implements INodeType {
 	description: INodeTypeDescription = {
@@ -23,7 +30,7 @@ export class MemoryPostgresChat implements INodeType {
 		name: 'memoryPostgresChat',
 		icon: 'file:postgres.svg',
 		group: ['transform'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2, 1.3],
 		description: 'Stores the chat history in Postgres table.',
 		defaults: {
 			name: 'Postgres Chat Memory',
@@ -56,6 +63,7 @@ export class MemoryPostgresChat implements INodeType {
 		properties: [
 			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
 			sessionIdOption,
+			expressionSessionKeyProperty(1.2),
 			sessionKeyProperty,
 			{
 				displayName: 'Table Name',
@@ -107,12 +115,7 @@ export class MemoryPostgresChat implements INodeType {
 			...kOptions,
 		});
 
-		async function closeFunction() {
-			void pool.end();
-		}
-
 		return {
-			closeFunction,
 			response: logWrapper(memory, this),
 		};
 	}
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
index 01a31458de..ab7d02e2c4 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryRedisChat/MemoryRedisChat.node.ts
@@ -1,4 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { RedisChatMessageHistoryInput } from '@langchain/redis';
+import { RedisChatMessageHistory } from '@langchain/redis';
+import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
 import {
 	NodeOperationError,
 	type INodeType,
@@ -7,15 +10,19 @@ import {
 	type SupplyData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
-import type { RedisChatMessageHistoryInput } from '@langchain/redis';
-import { RedisChatMessageHistory } from '@langchain/redis';
 import type { RedisClientOptions } from 'redis';
 import { createClient } from 'redis';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty, contextWindowLengthProperty } from '../descriptions';
-import { getSessionId } from '../../../utils/helpers';
+
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import {
+	sessionIdOption,
+	sessionKeyProperty,
+	contextWindowLengthProperty,
+	expressionSessionKeyProperty,
+} from '../descriptions';
 
 export class MemoryRedisChat implements INodeType {
 	description: INodeTypeDescription = {
@@ -23,7 +30,7 @@ export class MemoryRedisChat implements INodeType {
 		name: 'memoryRedisChat',
 		icon: 'file:redis.svg',
 		group: ['transform'],
-		version: [1, 1.1, 1.2, 1.3],
+		version: [1, 1.1, 1.2, 1.3, 1.4],
 		description: 'Stores the chat history in Redis.',
 		defaults: {
 			name: 'Redis Chat Memory',
@@ -86,6 +93,7 @@ export class MemoryRedisChat implements INodeType {
 					},
 				},
 			},
+			expressionSessionKeyProperty(1.4),
 			sessionKeyProperty,
 			{
 				displayName: 'Session Time To Live',
@@ -120,6 +128,7 @@ export class MemoryRedisChat implements INodeType {
 			socket: {
 				host: credentials.host as string,
 				port: credentials.port as number,
+				tls: credentials.ssl === true,
 			},
 			database: credentials.database as number,
 		};
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
index be431b9b3c..c1ad7b9539 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryXata/MemoryXata.node.ts
@@ -1,4 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { XataChatMessageHistory } from '@langchain/community/stores/message/xata';
+import { BaseClient } from '@xata.io/client';
+import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	ISupplyDataFunctions,
@@ -6,13 +9,17 @@ import type {
 	INodeTypeDescription,
 	SupplyData,
 } from 'n8n-workflow';
-import { XataChatMessageHistory } from '@langchain/community/stores/message/xata';
-import { BufferMemory, BufferWindowMemory } from 'langchain/memory';
-import { BaseClient } from '@xata.io/client';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty, contextWindowLengthProperty } from '../descriptions';
-import { getSessionId } from '../../../utils/helpers';
+
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import {
+	sessionIdOption,
+	sessionKeyProperty,
+	contextWindowLengthProperty,
+	expressionSessionKeyProperty,
+} from '../descriptions';
 
 export class MemoryXata implements INodeType {
 	description: INodeTypeDescription = {
@@ -20,7 +27,7 @@ export class MemoryXata implements INodeType {
 		name: 'memoryXata',
 		icon: 'file:xata.svg',
 		group: ['transform'],
-		version: [1, 1.1, 1.2, 1.3],
+		version: [1, 1.1, 1.2, 1.3, 1.4],
 		description: 'Use Xata Memory',
 		defaults: {
 			name: 'Xata',
@@ -86,6 +93,7 @@ export class MemoryXata implements INodeType {
 				},
 			},
 			sessionKeyProperty,
+			expressionSessionKeyProperty(1.4),
 			{
 				...contextWindowLengthProperty,
 				displayOptions: { hide: { '@version': [{ _cnd: { lt: 1.3 } }] } },
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
index 20e70fd920..1943f41c03 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/MemoryZep/MemoryZep.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { BaseChatMemory } from '@langchain/community/dist/memory/chat_memory';
+import { ZepMemory } from '@langchain/community/memory/zep';
+import { ZepCloudMemory } from '@langchain/community/memory/zep_cloud';
+import type { InputValues, MemoryVariables } from '@langchain/core/memory';
+import type { BaseMessage } from '@langchain/core/messages';
 import {
 	NodeConnectionType,
 	type ISupplyDataFunctions,
@@ -7,16 +12,12 @@ import {
 	type SupplyData,
 	NodeOperationError,
 } from 'n8n-workflow';
-import { ZepMemory } from '@langchain/community/memory/zep';
-import { ZepCloudMemory } from '@langchain/community/memory/zep_cloud';
 
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { sessionIdOption, sessionKeyProperty } from '../descriptions';
-import { getSessionId } from '../../../utils/helpers';
-import type { BaseChatMemory } from '@langchain/community/dist/memory/chat_memory';
-import type { InputValues, MemoryVariables } from '@langchain/core/memory';
-import type { BaseMessage } from '@langchain/core/messages';
+import { getSessionId } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { expressionSessionKeyProperty, sessionIdOption, sessionKeyProperty } from '../descriptions';
 
 // Extend ZepCloudMemory to trim white space in messages.
 class WhiteSpaceTrimmedZepCloudMemory extends ZepCloudMemory {
@@ -36,7 +37,7 @@ export class MemoryZep implements INodeType {
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
 		icon: 'file:zep.png',
 		group: ['transform'],
-		version: [1, 1.1, 1.2],
+		version: [1, 1.1, 1.2, 1.3],
 		description: 'Use Zep Memory',
 		defaults: {
 			name: 'Zep',
@@ -67,6 +68,12 @@ export class MemoryZep implements INodeType {
 		],
 		properties: [
 			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Only works with Zep Cloud and Community edition <= v0.27.2',
+				name: 'supportedVersions',
+				type: 'notice',
+				default: '',
+			},
 			{
 				displayName: 'Session ID',
 				name: 'sessionId',
@@ -99,6 +106,7 @@ export class MemoryZep implements INodeType {
 					},
 				},
 			},
+			expressionSessionKeyProperty(1.3),
 			sessionKeyProperty,
 		],
 	};
diff --git a/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts b/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
index 354d134fb7..fd0a022015 100644
--- a/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
+++ b/packages/@n8n/nodes-langchain/nodes/memory/descriptions.ts
@@ -6,10 +6,10 @@ export const sessionIdOption: INodeProperties = {
 	type: 'options',
 	options: [
 		{
-			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-			name: 'Take from previous node automatically',
+			name: 'Connected Chat Trigger Node',
 			value: 'fromInput',
-			description: 'Looks for an input field called sessionId',
+			description:
+				"Looks for an input field called 'sessionId' that is coming from a directly connected Chat Trigger",
 		},
 		{
 			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
@@ -21,6 +21,20 @@ export const sessionIdOption: INodeProperties = {
 	default: 'fromInput',
 };
 
+export const expressionSessionKeyProperty = (fromVersion: number): INodeProperties => ({
+	displayName: 'Session Key From Previous Node',
+	name: 'sessionKey',
+	type: 'string',
+	default: '={{ $json.sessionId }}',
+	disabledOptions: { show: { sessionIdType: ['fromInput'] } },
+	displayOptions: {
+		show: {
+			sessionIdType: ['fromInput'],
+			'@version': [{ _cnd: { gte: fromVersion } }],
+		},
+	},
+});
+
 export const sessionKeyProperty: INodeProperties = {
 	displayName: 'Key',
 	name: 'sessionKey',
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts
index d4743fb043..f9e6cd2968 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/OutputParserAutofixing.node.ts
@@ -1,5 +1,6 @@
 import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import { NodeConnectionType } from 'n8n-workflow';
+import { PromptTemplate } from '@langchain/core/prompts';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	ISupplyDataFunctions,
 	INodeType,
@@ -10,14 +11,17 @@ import type {
 import {
 	N8nOutputFixingParser,
 	type N8nStructuredOutputParser,
-} from '../../../utils/output_parsers/N8nOutputParser';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+} from '@utils/output_parsers/N8nOutputParser';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
+import { NAIVE_FIX_PROMPT } from './prompt';
 
 export class OutputParserAutofixing implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Auto-fixing Output Parser',
 		name: 'outputParserAutofixing',
 		icon: 'fa:tools',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Automatically fix the output if it is not in the correct format',
@@ -65,6 +69,27 @@ export class OutputParserAutofixing implements INodeType {
 				default: '',
 			},
 			getConnectionHintNoticeField([NodeConnectionType.AiChain, NodeConnectionType.AiAgent]),
+			{
+				displayName: 'Options',
+				name: 'options',
+				type: 'collection',
+				placeholder: 'Add Option',
+				default: {},
+				options: [
+					{
+						displayName: 'Retry Prompt',
+						name: 'prompt',
+						type: 'string',
+						default: NAIVE_FIX_PROMPT,
+						typeOptions: {
+							rows: 10,
+						},
+						hint: 'Should include "{error}", "{instructions}", and "{completion}" placeholders',
+						description:
+							'Prompt template used for fixing the output. Uses placeholders: "{instructions}" for parsing rules, "{completion}" for the failed attempt, and "{error}" for the validation error message.',
+					},
+				],
+			},
 		],
 	};
 
@@ -77,8 +102,20 @@ export class OutputParserAutofixing implements INodeType {
 			NodeConnectionType.AiOutputParser,
 			itemIndex,
 		)) as N8nStructuredOutputParser;
+		const prompt = this.getNodeParameter('options.prompt', itemIndex, NAIVE_FIX_PROMPT) as string;
 
-		const parser = new N8nOutputFixingParser(this, model, outputParser);
+		if (prompt.length === 0 || !prompt.includes('{error}')) {
+			throw new NodeOperationError(
+				this.getNode(),
+				'Auto-fixing parser prompt has to contain {error} placeholder',
+			);
+		}
+		const parser = new N8nOutputFixingParser(
+			this,
+			model,
+			outputParser,
+			PromptTemplate.fromTemplate(prompt),
+		);
 
 		return {
 			response: parser,
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/prompt.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/prompt.ts
new file mode 100644
index 0000000000..9e4431a68c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/prompt.ts
@@ -0,0 +1,16 @@
+export const NAIVE_FIX_PROMPT = `Instructions:
+--------------
+{instructions}
+--------------
+Completion:
+--------------
+{completion}
+--------------
+
+Above, the Completion did not satisfy the constraints given in the Instructions.
+Error:
+--------------
+{error}
+--------------
+
+Please try again. Please only respond with an answer that satisfies the constraints laid out in the Instructions:`;
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
index 32d25d4f73..45f054a34b 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserAutofixing/test/OutputParserAutofixing.node.test.ts
@@ -1,15 +1,20 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import { OutputParserException } from '@langchain/core/output_parsers';
 import type { MockProxy } from 'jest-mock-extended';
 import { mock } from 'jest-mock-extended';
 import { normalizeItems } from 'n8n-core';
 import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
-import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
+import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+import type {
+	N8nOutputFixingParser,
+	N8nStructuredOutputParser,
+} from '@utils/output_parsers/N8nOutputParser';
 
-import { N8nOutputFixingParser } from '../../../../utils/output_parsers/N8nOutputParser';
-import type { N8nStructuredOutputParser } from '../../../../utils/output_parsers/N8nOutputParser';
 import { OutputParserAutofixing } from '../OutputParserAutofixing.node';
+import { NAIVE_FIX_PROMPT } from '../prompt';
 
 describe('OutputParserAutofixing', () => {
 	let outputParser: OutputParserAutofixing;
@@ -34,6 +39,13 @@ describe('OutputParserAutofixing', () => {
 
 			throw new ApplicationError('Unexpected connection type');
 		});
+		thisArg.getNodeParameter.mockReset();
+		thisArg.getNodeParameter.mockImplementation((parameterName) => {
+			if (parameterName === 'options.prompt') {
+				return NAIVE_FIX_PROMPT;
+			}
+			throw new ApplicationError('Not implemented');
+		});
 	});
 
 	afterEach(() => {
@@ -48,73 +60,132 @@ describe('OutputParserAutofixing', () => {
 		});
 	}
 
-	it('should successfully parse valid output without needing to fix it', async () => {
-		const validOutput = { name: 'Alice', age: 25 };
+	describe('Configuration', () => {
+		it('should throw error when prompt template does not contain {error} placeholder', async () => {
+			thisArg.getNodeParameter.mockImplementation((parameterName) => {
+				if (parameterName === 'options.prompt') {
+					return 'Invalid prompt without error placeholder';
+				}
+				throw new ApplicationError('Not implemented');
+			});
 
-		mockStructuredOutputParser.parse.mockResolvedValueOnce(validOutput);
+			await expect(outputParser.supplyData.call(thisArg, 0)).rejects.toThrow(
+				new NodeOperationError(
+					thisArg.getNode(),
+					'Auto-fixing parser prompt has to contain {error} placeholder',
+				),
+			);
+		});
 
-		const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
-			response: N8nOutputFixingParser;
-		};
+		it('should throw error when prompt template is empty', async () => {
+			thisArg.getNodeParameter.mockImplementation((parameterName) => {
+				if (parameterName === 'options.prompt') {
+					return '';
+				}
+				throw new ApplicationError('Not implemented');
+			});
 
-		// Ensure the response contains the output-fixing parser
-		expect(response).toBeDefined();
-		expect(response).toBeInstanceOf(N8nOutputFixingParser);
+			await expect(outputParser.supplyData.call(thisArg, 0)).rejects.toThrow(
+				new NodeOperationError(
+					thisArg.getNode(),
+					'Auto-fixing parser prompt has to contain {error} placeholder',
+				),
+			);
+		});
 
-		const result = await response.parse('{"name": "Alice", "age": 25}');
+		it('should use default prompt when none specified', async () => {
+			thisArg.getNodeParameter.mockImplementation((parameterName) => {
+				if (parameterName === 'options.prompt') {
+					return NAIVE_FIX_PROMPT;
+				}
+				throw new ApplicationError('Not implemented');
+			});
 
-		// Validate that the parser succeeds without retry
-		expect(result).toEqual(validOutput);
-		expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(1); // Only one call to parse
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: N8nOutputFixingParser;
+			};
+
+			expect(response).toBeDefined();
+		});
 	});
 
-	it('should throw an error when both structured parser and fixing parser fail', async () => {
-		mockStructuredOutputParser.parse
-			.mockRejectedValueOnce(new Error('Invalid JSON')) // First attempt fails
-			.mockRejectedValueOnce(new Error('Fixing attempt failed')); // Second attempt fails
+	describe('Parsing', () => {
+		it('should successfully parse valid output without needing to fix it', async () => {
+			const validOutput = { name: 'Alice', age: 25 };
 
-		const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
-			response: N8nOutputFixingParser;
-		};
+			mockStructuredOutputParser.parse.mockResolvedValueOnce(validOutput);
 
-		response.getRetryChain = getMockedRetryChain('{}');
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: N8nOutputFixingParser;
+			};
 
-		await expect(response.parse('Invalid JSON string')).rejects.toThrow('Fixing attempt failed');
-		expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(2);
-	});
+			const result = await response.parse('{"name": "Alice", "age": 25}');
 
-	it('should reject on the first attempt and succeed on retry with the parsed content', async () => {
-		const validOutput = { name: 'Bob', age: 28 };
+			expect(result).toEqual(validOutput);
+			expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(1);
+		});
 
-		mockStructuredOutputParser.parse.mockRejectedValueOnce(new Error('Invalid JSON'));
+		it('should not retry on non-OutputParserException errors', async () => {
+			const error = new Error('Some other error');
+			mockStructuredOutputParser.parse.mockRejectedValueOnce(error);
 
-		const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
-			response: N8nOutputFixingParser;
-		};
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: N8nOutputFixingParser;
+			};
 
-		response.getRetryChain = getMockedRetryChain(JSON.stringify(validOutput));
+			await expect(response.parse('Invalid JSON string')).rejects.toThrow(error);
+			expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(1);
+		});
 
-		mockStructuredOutputParser.parse.mockResolvedValueOnce(validOutput);
+		it('should retry on OutputParserException and succeed', async () => {
+			const validOutput = { name: 'Bob', age: 28 };
 
-		const result = await response.parse('Invalid JSON string');
+			mockStructuredOutputParser.parse
+				.mockRejectedValueOnce(new OutputParserException('Invalid JSON'))
+				.mockResolvedValueOnce(validOutput);
 
-		expect(result).toEqual(validOutput);
-		expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(2); // First fails, second succeeds
-	});
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: N8nOutputFixingParser;
+			};
 
-	it('should handle non-JSON formatted response from fixing parser', async () => {
-		mockStructuredOutputParser.parse.mockRejectedValueOnce(new Error('Invalid JSON'));
+			response.getRetryChain = getMockedRetryChain(JSON.stringify(validOutput));
 
-		const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
-			response: N8nOutputFixingParser;
-		};
+			const result = await response.parse('Invalid JSON string');
 
-		response.getRetryChain = getMockedRetryChain('This is not JSON');
+			expect(result).toEqual(validOutput);
+			expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(2);
+		});
 
-		mockStructuredOutputParser.parse.mockRejectedValueOnce(new Error('Unexpected token'));
+		it('should handle failed retry attempt', async () => {
+			mockStructuredOutputParser.parse
+				.mockRejectedValueOnce(new OutputParserException('Invalid JSON'))
+				.mockRejectedValueOnce(new Error('Still invalid JSON'));
 
-		// Expect the structured parser to throw an error on invalid JSON from retry
-		await expect(response.parse('Invalid JSON string')).rejects.toThrow('Unexpected token');
-		expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(2); // First fails, second tries and fails
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: N8nOutputFixingParser;
+			};
+
+			response.getRetryChain = getMockedRetryChain('Still not valid JSON');
+
+			await expect(response.parse('Invalid JSON string')).rejects.toThrow('Still invalid JSON');
+			expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(2);
+		});
+
+		it('should throw non-OutputParserException errors immediately without retry', async () => {
+			const customError = new Error('Database connection error');
+			const retryChainSpy = jest.fn();
+
+			mockStructuredOutputParser.parse.mockRejectedValueOnce(customError);
+
+			const { response } = (await outputParser.supplyData.call(thisArg, 0)) as {
+				response: N8nOutputFixingParser;
+			};
+
+			response.getRetryChain = retryChainSpy;
+
+			await expect(response.parse('Some input')).rejects.toThrow('Database connection error');
+			expect(mockStructuredOutputParser.parse).toHaveBeenCalledTimes(1);
+			expect(retryChainSpy).not.toHaveBeenCalled();
+		});
 	});
 });
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts
index b613c14775..b94b82fada 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/OutputParserItemList.node.ts
@@ -7,14 +7,15 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { N8nItemListOutputParser } from '../../../utils/output_parsers/N8nItemListOutputParser';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { N8nItemListOutputParser } from '@utils/output_parsers/N8nItemListOutputParser';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class OutputParserItemList implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Item List Output Parser',
 		name: 'outputParserItemList',
 		icon: 'fa:bars',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Return the results as separate items',
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
index 31e96077c4..ae31e88353 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserItemList/test/OutputParserItemList.node.test.ts
@@ -6,7 +6,8 @@ import {
 	type IWorkflowDataProxyData,
 } from 'n8n-workflow';
 
-import { N8nItemListOutputParser } from '../../../../utils/output_parsers/N8nItemListOutputParser';
+import { N8nItemListOutputParser } from '@utils/output_parsers/N8nItemListOutputParser';
+
 import { OutputParserItemList } from '../OutputParserItemList.node';
 
 describe('OutputParserItemList', () => {
@@ -35,6 +36,7 @@ describe('OutputParserItemList', () => {
 
 			const { response } = await outputParser.supplyData.call(thisArg, 0);
 			expect(response).toBeInstanceOf(N8nItemListOutputParser);
+			expect((response as any).numberOfItems).toBe(3);
 		});
 
 		it('should create a parser with custom number of items', async () => {
@@ -50,6 +52,20 @@ describe('OutputParserItemList', () => {
 			expect((response as any).numberOfItems).toBe(5);
 		});
 
+		it('should create a parser with unlimited number of items', async () => {
+			thisArg.getNodeParameter.mockImplementation((parameterName) => {
+				if (parameterName === 'options') {
+					return { numberOfItems: -1 };
+				}
+
+				throw new ApplicationError('Not implemented');
+			});
+
+			const { response } = await outputParser.supplyData.call(thisArg, 0);
+			expect(response).toBeInstanceOf(N8nItemListOutputParser);
+			expect((response as any).numberOfItems).toBeUndefined();
+		});
+
 		it('should create a parser with custom separator', async () => {
 			thisArg.getNodeParameter.mockImplementation((parameterName) => {
 				if (parameterName === 'options') {
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
index c35cb1d145..0869020997 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/OutputParserStructured.node.ts
@@ -10,20 +10,17 @@ import {
 } from 'n8n-workflow';
 import type { z } from 'zod';
 
-import {
-	inputSchemaField,
-	jsonSchemaExampleField,
-	schemaTypeField,
-} from '../../../utils/descriptions';
-import { N8nStructuredOutputParser } from '../../../utils/output_parsers/N8nOutputParser';
-import { convertJsonSchemaToZod, generateSchema } from '../../../utils/schemaParsing';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { inputSchemaField, jsonSchemaExampleField, schemaTypeField } from '@utils/descriptions';
+import { N8nStructuredOutputParser } from '@utils/output_parsers/N8nOutputParser';
+import { convertJsonSchemaToZod, generateSchema } from '@utils/schemaParsing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class OutputParserStructured implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Structured Output Parser',
 		name: 'outputParserStructured',
 		icon: 'fa:code',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1, 1.2],
 		defaultVersion: 1.2,
diff --git a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
index af72c49d7e..e07b012ec6 100644
--- a/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/output_parser/OutputParserStructured/test/OutputParserStructured.node.test.ts
@@ -7,7 +7,8 @@ import {
 	type IWorkflowDataProxyData,
 } from 'n8n-workflow';
 
-import type { N8nStructuredOutputParser } from '../../../../utils/output_parsers/N8nStructuredOutputParser';
+import type { N8nStructuredOutputParser } from '@utils/output_parsers/N8nStructuredOutputParser';
+
 import { OutputParserStructured } from '../OutputParserStructured.node';
 
 describe('OutputParserStructured', () => {
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts
index 8017caa1ad..feb70ecb43 100644
--- a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverContextualCompression/RetrieverContextualCompression.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { BaseRetriever } from '@langchain/core/retrievers';
+import { ContextualCompressionRetriever } from 'langchain/retrievers/contextual_compression';
+import { LLMChainExtractor } from 'langchain/retrievers/document_compressors/chain_extract';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,18 +12,14 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { ContextualCompressionRetriever } from 'langchain/retrievers/contextual_compression';
-import { LLMChainExtractor } from 'langchain/retrievers/document_compressors/chain_extract';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { BaseRetriever } from '@langchain/core/retrievers';
-
-import { logWrapper } from '../../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
 
 export class RetrieverContextualCompression implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Contextual Compression Retriever',
 		name: 'retrieverContextualCompression',
 		icon: 'fa:box-open',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Enhances document similarity search by contextual compression.',
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts
index f814ba875e..4bbc45f6d1 100644
--- a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverMultiQuery/RetrieverMultiQuery.node.ts
@@ -1,4 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { BaseRetriever } from '@langchain/core/retrievers';
+import { MultiQueryRetriever } from 'langchain/retrievers/multi_query';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -7,17 +11,14 @@ import {
 	type SupplyData,
 } from 'n8n-workflow';
 
-import { MultiQueryRetriever } from 'langchain/retrievers/multi_query';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import type { BaseRetriever } from '@langchain/core/retrievers';
-
-import { logWrapper } from '../../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
 
 export class RetrieverMultiQuery implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'MultiQuery Retriever',
 		name: 'retrieverMultiQuery',
 		icon: 'fa:box-open',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description:
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts
index 5e79a6a754..915d9766dc 100644
--- a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverVectorStore/RetrieverVectorStore.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { VectorStore } from '@langchain/core/vectorstores';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,14 +7,15 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { VectorStore } from '@langchain/core/vectorstores';
-import { logWrapper } from '../../../utils/logWrapper';
+
+import { logWrapper } from '@utils/logWrapper';
 
 export class RetrieverVectorStore implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Vector Store Retriever',
 		name: 'retrieverVectorStore',
 		icon: 'fa:box-open',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Use a Vector Store as Retriever',
diff --git a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
index 0aafabf1d4..1291b92252 100644
--- a/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/retrievers/RetrieverWorkflow/RetrieverWorkflow.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { CallbackManagerForRetrieverRun } from '@langchain/core/callbacks/manager';
+import { Document } from '@langchain/core/documents';
+import { BaseRetriever, type BaseRetrieverInput } from '@langchain/core/retrievers';
+import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
+import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IDataObject,
@@ -10,15 +15,10 @@ import type {
 	INodeTypeDescription,
 	SupplyData,
 	INodeParameterResourceLocator,
+	ExecuteWorkflowData,
 } from 'n8n-workflow';
 
-import { BaseRetriever, type BaseRetrieverInput } from '@langchain/core/retrievers';
-import { Document } from '@langchain/core/documents';
-
-import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
-import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
-import type { CallbackManagerForRetrieverRun } from '@langchain/core/callbacks/manager';
-import { logWrapper } from '../../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
 
 function objectToString(obj: Record<string, string> | IDataObject, level = 0) {
 	let result = '';
@@ -41,6 +41,7 @@ export class RetrieverWorkflow implements INodeType {
 		displayName: 'Workflow Retriever',
 		name: 'retrieverWorkflow',
 		icon: 'fa:box-open',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1],
 		description: 'Use an n8n Workflow as Retriever',
@@ -293,6 +294,8 @@ export class RetrieverWorkflow implements INodeType {
 	};
 
 	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
+		const workflowProxy = this.getWorkflowDataProxy(0);
+
 		class WorkflowRetriever extends BaseRetriever {
 			lc_namespace = ['n8n-nodes-langchain', 'retrievers', 'workflow'];
 
@@ -349,6 +352,9 @@ export class RetrieverWorkflow implements INodeType {
 							},
 						);
 					}
+
+					// same as current workflow
+					baseMetadata.workflowId = workflowProxy.$workflow.id;
 				}
 
 				const rawData: IDataObject = { query };
@@ -384,21 +390,29 @@ export class RetrieverWorkflow implements INodeType {
 
 				const items = [newItem] as INodeExecutionData[];
 
-				let receivedItems: INodeExecutionData[][];
+				let receivedData: ExecuteWorkflowData;
 				try {
-					receivedItems = (await this.executeFunctions.executeWorkflow(
+					receivedData = await this.executeFunctions.executeWorkflow(
 						workflowInfo,
 						items,
 						config?.getChild(),
-					)) as INodeExecutionData[][];
+						{
+							parentExecution: {
+								executionId: workflowProxy.$execution.id,
+								workflowId: workflowProxy.$workflow.id,
+							},
+						},
+					);
 				} catch (error) {
 					// Make sure a valid error gets returned that can by json-serialized else it will
 					// not show up in the frontend
 					throw new NodeOperationError(this.executeFunctions.getNode(), error as Error);
 				}
 
+				const receivedItems = receivedData.data?.[0] ?? [];
+
 				const returnData: Document[] = [];
-				for (const [index, itemData] of receivedItems[0].entries()) {
+				for (const [index, itemData] of receivedItems.entries()) {
 					const pageContent = objectToString(itemData.json);
 					returnData.push(
 						new Document({
@@ -406,6 +420,7 @@ export class RetrieverWorkflow implements INodeType {
 							metadata: {
 								...baseMetadata,
 								itemIndex: index,
+								executionId: receivedData.executionId,
 							},
 						}),
 					);
diff --git a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts
index f62e8f01f1..962af5bde2 100644
--- a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterCharacterTextSplitter/TextSplitterCharacterTextSplitter.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { CharacterTextSplitterParams } from '@langchain/textsplitters';
+import { CharacterTextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,16 +8,16 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { CharacterTextSplitterParams } from '@langchain/textsplitters';
-import { CharacterTextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class TextSplitterCharacterTextSplitter implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Character Text Splitter',
 		name: 'textSplitterCharacterTextSplitter',
 		icon: 'fa:grip-lines-vertical',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Split text into chunks by characters',
diff --git a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts
index 21a0520766..4e376c39a3 100644
--- a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterRecursiveCharacterTextSplitter/TextSplitterRecursiveCharacterTextSplitter.node.ts
@@ -1,4 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type {
+	RecursiveCharacterTextSplitterParams,
+	SupportedTextSplitterLanguage,
+} from '@langchain/textsplitters';
+import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,13 +11,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type {
-	RecursiveCharacterTextSplitterParams,
-	SupportedTextSplitterLanguage,
-} from '@langchain/textsplitters';
-import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 const supportedLanguages: SupportedTextSplitterLanguage[] = [
 	'cpp',
@@ -36,6 +37,7 @@ export class TextSplitterRecursiveCharacterTextSplitter implements INodeType {
 		displayName: 'Recursive Character Text Splitter',
 		name: 'textSplitterRecursiveCharacterTextSplitter',
 		icon: 'fa:grip-lines-vertical',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Split text into chunks by characters recursively, recommended for most use cases',
diff --git a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts
index 247d142fa8..b5dade396d 100644
--- a/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/text_splitters/TextSplitterTokenSplitter/TextSplitterTokenSplitter.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { TokenTextSplitter } from '@langchain/textsplitters';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,15 +7,16 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { TokenTextSplitter } from '@langchain/textsplitters';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class TextSplitterTokenSplitter implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Token Splitter',
 		name: 'textSplitterTokenSplitter',
 		icon: 'fa:grip-lines-vertical',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Split text into chunks by tokens',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts
index f50a6216c0..6d67a04555 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCalculator/ToolCalculator.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { Calculator } from '@langchain/community/tools/calculator';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,15 +7,16 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { Calculator } from '@langchain/community/tools/calculator';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolCalculator implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Calculator',
 		name: 'toolCalculator',
 		icon: 'fa:calculator',
+		iconColor: 'black',
 		group: ['transform'],
 		version: 1,
 		description: 'Make it easier for AI agents to perform arithmetic',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
index 1491662e61..029bce48f6 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolCode/ToolCode.node.ts
@@ -15,20 +15,18 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { inputSchemaField, jsonSchemaExampleField, schemaTypeField } from '@utils/descriptions';
+import { convertJsonSchemaToZod, generateSchema } from '@utils/schemaParsing';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import type { DynamicZodObject } from '../../../types/zod.types';
-import {
-	inputSchemaField,
-	jsonSchemaExampleField,
-	schemaTypeField,
-} from '../../../utils/descriptions';
-import { convertJsonSchemaToZod, generateSchema } from '../../../utils/schemaParsing';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
 
 export class ToolCode implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Code Tool',
 		name: 'toolCode',
 		icon: 'fa:code',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1, 1.1],
 		description: 'Write a tool in JS or Python',
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
index f279c1e751..bfdd3e7ace 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/ToolHttpRequest.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { DynamicTool } from '@langchain/core/tools';
 import type {
 	INodeType,
 	INodeTypeDescription,
@@ -9,19 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError, tryToParseAlphanumericString } from 'n8n-workflow';
 
-import { DynamicTool } from '@langchain/core/tools';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-
-import { N8nTool } from '../../../utils/N8nTool';
-import {
-	configureHttpRequestFunction,
-	configureResponseOptimizer,
-	extractParametersFromText,
-	prepareToolDescription,
-	configureToolFunction,
-	updateParametersAndOptions,
-	makeToolInputSchema,
-} from './utils';
+import { N8nTool } from '@utils/N8nTool';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 import {
 	authenticationProperties,
@@ -31,8 +21,16 @@ import {
 	placeholderDefinitionsCollection,
 	specifyBySelector,
 } from './descriptions';
-
 import type { PlaceholderDefinition, ToolParameter } from './interfaces';
+import {
+	configureHttpRequestFunction,
+	configureResponseOptimizer,
+	extractParametersFromText,
+	prepareToolDescription,
+	configureToolFunction,
+	updateParametersAndOptions,
+	makeToolInputSchema,
+} from './utils';
 
 export class ToolHttpRequest implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
index f18a2437e3..05ed1e619c 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/test/ToolHttpRequest.node.test.ts
@@ -2,7 +2,8 @@ import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions, INode } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
-import type { N8nTool } from '../../../../utils/N8nTool';
+import type { N8nTool } from '@utils/N8nTool';
+
 import { ToolHttpRequest } from '../ToolHttpRequest.node';
 
 describe('ToolHttpRequest', () => {
@@ -10,19 +11,19 @@ describe('ToolHttpRequest', () => {
 	const helpers = mock<IExecuteFunctions['helpers']>();
 	const executeFunctions = mock<IExecuteFunctions>({ helpers });
 
-	describe('Binary response', () => {
-		beforeEach(() => {
-			jest.resetAllMocks();
-			executeFunctions.getNode.mockReturnValue(
-				mock<INode>({
-					type: 'n8n-nodes-base.httpRequest',
-					name: 'HTTP Request',
-					typeVersion: 1.1,
-				}),
-			);
-			executeFunctions.addInputData.mockReturnValue({ index: 0 });
-		});
+	beforeEach(() => {
+		jest.resetAllMocks();
+		executeFunctions.getNode.mockReturnValue(
+			mock<INode>({
+				type: 'n8n-nodes-base.httpRequest',
+				name: 'HTTP Request',
+				typeVersion: 1.1,
+			}),
+		);
+		executeFunctions.addInputData.mockReturnValue({ index: 0 });
+	});
 
+	describe('Binary response', () => {
 		it('should return the error when receiving a binary response', async () => {
 			helpers.httpRequest.mockResolvedValue({
 				body: Buffer.from(''),
@@ -237,4 +238,62 @@ describe('ToolHttpRequest', () => {
 			);
 		});
 	});
+
+	describe('Optimize response', () => {
+		it('should extract body from the response HTML', async () => {
+			helpers.httpRequest.mockResolvedValue({
+				body: `<!DOCTYPE html>
+<html>
+  <head>
+  </head>
+  <body>
+      <h1>Test</h1>
+
+      <div>
+        <p>
+          Test content
+        </p>
+      </div>
+  </body>
+</html>`,
+				headers: {
+					'content-type': 'text/html',
+				},
+			});
+
+			executeFunctions.getNodeParameter.mockImplementation(
+				(paramName: string, _: any, fallback: any) => {
+					switch (paramName) {
+						case 'method':
+							return 'GET';
+						case 'url':
+							return '{url}';
+						case 'options':
+							return {};
+						case 'placeholderDefinitions.values':
+							return [];
+						case 'optimizeResponse':
+							return true;
+						case 'responseType':
+							return 'html';
+						case 'cssSelector':
+							return 'body';
+						default:
+							return fallback;
+					}
+				},
+			);
+
+			const { response } = await httpTool.supplyData.call(executeFunctions, 0);
+
+			const res = await (response as N8nTool).invoke({
+				url: 'https://httpbin.org/html',
+			});
+
+			expect(helpers.httpRequest).toHaveBeenCalled();
+			expect(res).toEqual(
+				JSON.stringify(['<h1>Test</h1> <div> <p> Test content </p> </div>'], null, 2),
+			);
+		});
+	});
 });
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
index 74f40f0a02..f1d6dfd150 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolHttpRequest/utils.ts
@@ -1,5 +1,5 @@
 import { Readability } from '@mozilla/readability';
-import cheerio from 'cheerio';
+import * as cheerio from 'cheerio';
 import { convert } from 'html-to-text';
 import { JSDOM } from 'jsdom';
 import get from 'lodash/get';
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts
index 709b06b7ac..7a7a09b933 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolSerpApi/ToolSerpApi.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { SerpAPI } from '@langchain/community/tools/serpapi';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { SerpAPI } from '@langchain/community/tools/serpapi';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolSerpApi implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolVectorStore/ToolVectorStore.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolVectorStore/ToolVectorStore.node.ts
index b4016f06ca..97113643f3 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolVectorStore/ToolVectorStore.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolVectorStore/ToolVectorStore.node.ts
@@ -1,3 +1,7 @@
+import type { BaseLanguageModel } from '@langchain/core/language_models/base';
+import type { VectorStore } from '@langchain/core/vectorstores';
+import { VectorDBQAChain } from 'langchain/chains';
+import { VectorStoreQATool } from 'langchain/tools';
 import type {
 	INodeType,
 	INodeTypeDescription,
@@ -6,23 +10,20 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { VectorStoreQATool } from 'langchain/tools';
-import type { VectorStore } from '@langchain/core/vectorstores';
-import type { BaseLanguageModel } from '@langchain/core/language_models/base';
-import { VectorDBQAChain } from 'langchain/chains';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
-import { logWrapper } from '../../../utils/logWrapper';
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolVectorStore implements INodeType {
 	description: INodeTypeDescription = {
-		displayName: 'Vector Store Tool',
+		displayName: 'Vector Store Question Answer Tool',
 		name: 'toolVectorStore',
 		icon: 'fa:database',
+		iconColor: 'black',
 		group: ['transform'],
 		version: [1],
-		description: 'Retrieve context from vector store',
+		description: 'Answer questions with a vector store',
 		defaults: {
-			name: 'Vector Store Tool',
+			name: 'Answer questions with a vector store',
 		},
 		codex: {
 			categories: ['AI'],
@@ -59,20 +60,23 @@ export class ToolVectorStore implements INodeType {
 		properties: [
 			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
 			{
-				displayName: 'Name',
+				displayName: 'Data Name',
 				name: 'name',
 				type: 'string',
 				default: '',
-				placeholder: 'e.g. state_of_union_address',
+				placeholder: 'e.g. users_info',
 				validateType: 'string-alphanumeric',
-				description: 'Name of the vector store',
+				description:
+					'Name of the data in vector store. This will be used to fill this tool description: Useful for when you need to answer questions about [name]. Whenever you need information about [data description], you should ALWAYS use this. Input should be a fully formed question.',
 			},
 			{
-				displayName: 'Description',
+				displayName: 'Description of Data',
 				name: 'description',
 				type: 'string',
 				default: '',
-				placeholder: 'The most recent state of the Union address',
+				placeholder: "[Describe your data here, e.g. a user's name, email, etc.]",
+				description:
+					'Describe the data in vector store. This will be used to fill this tool description: Useful for when you need to answer questions about [name]. Whenever you need information about [data description], you should ALWAYS use this. Input should be a fully formed question.',
 				typeOptions: {
 					rows: 3,
 				},
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts
index e462e38feb..4eef3a1b45 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWikipedia/ToolWikipedia.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { WikipediaQueryRun } from '@langchain/community/tools/wikipedia_query_run';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { WikipediaQueryRun } from '@langchain/community/tools/wikipedia_query_run';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolWikipedia implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts
index 93290e63ad..162b78ba8e 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWolframAlpha/ToolWolframAlpha.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { WolframAlphaTool } from '@langchain/community/tools/wolframalpha';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,9 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import { WolframAlphaTool } from '@langchain/community/tools/wolframalpha';
-import { logWrapper } from '../../../utils/logWrapper';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+
+import { logWrapper } from '@utils/logWrapper';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
 
 export class ToolWolframAlpha implements INodeType {
 	description: INodeTypeDescription = {
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 f912e162d9..de7abf6a8b 100644
--- a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/ToolWorkflow.node.ts
@@ -1,553 +1,42 @@
-import type { CallbackManagerForToolRun } from '@langchain/core/callbacks/manager';
-import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
-import type { JSONSchema7 } from 'json-schema';
-import get from 'lodash/get';
-import isObject from 'lodash/isObject';
-import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
-import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
-import type {
-	IExecuteWorkflowInfo,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-	IWorkflowBase,
-	ISupplyDataFunctions,
-	SupplyData,
-	ExecutionError,
-	IDataObject,
-	INodeParameterResourceLocator,
-} from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError, jsonParse } from 'n8n-workflow';
+import type { IVersionedNodeType, INodeTypeBaseDescription } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
 
-import type { DynamicZodObject } from '../../../types/zod.types';
-import {
-	jsonSchemaExampleField,
-	schemaTypeField,
-	inputSchemaField,
-} from '../../../utils/descriptions';
-import { convertJsonSchemaToZod, generateSchema } from '../../../utils/schemaParsing';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
+import { ToolWorkflowV1 } from './v1/ToolWorkflowV1.node';
+import { ToolWorkflowV2 } from './v2/ToolWorkflowV2.node';
 
-export class ToolWorkflow implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Call n8n Workflow Tool',
-		name: 'toolWorkflow',
-		icon: 'fa:network-wired',
-		group: ['transform'],
-		version: [1, 1.1, 1.2],
-		description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
-		defaults: {
-			name: 'Call n8n Workflow Tool',
-		},
-		codex: {
-			categories: ['AI'],
-			subcategories: {
-				AI: ['Tools'],
-				Tools: ['Recommended Tools'],
-			},
-			resources: {
-				primaryDocumentation: [
-					{
-						url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolworkflow/',
-					},
-				],
-			},
-		},
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
-		inputs: [],
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
-		outputs: [NodeConnectionType.AiTool],
-		outputNames: ['Tool'],
-		properties: [
-			getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
-			{
-				displayName:
-					'See an example of a workflow to suggest meeting slots using AI <a href="/templates/1953" target="_blank">here</a>.',
-				name: 'noticeTemplateExample',
-				type: 'notice',
-				default: '',
-			},
-			{
-				displayName: 'Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-				placeholder: 'My_Color_Tool',
-				displayOptions: {
-					show: {
-						'@version': [1],
-					},
+export class ToolWorkflow extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Call n8n Sub-Workflow Tool',
+			name: 'toolWorkflow',
+			icon: 'fa:network-wired',
+			group: ['transform'],
+			description:
+				'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
+			codex: {
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Tools'],
+					Tools: ['Recommended Tools'],
 				},
-			},
-			{
-				displayName: 'Name',
-				name: 'name',
-				type: 'string',
-				default: '',
-				placeholder: 'e.g. My_Color_Tool',
-				validateType: 'string-alphanumeric',
-				description:
-					'The name of the function to be called, could contain letters, numbers, and underscores only',
-				displayOptions: {
-					show: {
-						'@version': [{ _cnd: { gte: 1.1 } }],
-					},
-				},
-			},
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-				placeholder:
-					'Call this tool to get a random color. The input should be a string with comma separted names of colors to exclude.',
-				typeOptions: {
-					rows: 3,
-				},
-			},
-
-			{
-				displayName:
-					'This tool will call the workflow you define below, and look in the last node for the response. The workflow needs to start with an Execute Workflow trigger',
-				name: 'executeNotice',
-				type: 'notice',
-				default: '',
-			},
-
-			{
-				displayName: 'Source',
-				name: 'source',
-				type: 'options',
-				options: [
-					{
-						name: 'Database',
-						value: 'database',
-						description: 'Load the workflow from the database by ID',
-					},
-					{
-						name: 'Define Below',
-						value: 'parameter',
-						description: 'Pass the JSON code of a workflow',
-					},
-				],
-				default: 'database',
-				description: 'Where to get the workflow to execute from',
-			},
-
-			// ----------------------------------
-			//         source:database
-			// ----------------------------------
-			{
-				displayName: 'Workflow ID',
-				name: 'workflowId',
-				type: 'string',
-				displayOptions: {
-					show: {
-						source: ['database'],
-						'@version': [{ _cnd: { lte: 1.1 } }],
-					},
-				},
-				default: '',
-				required: true,
-				description: 'The workflow to execute',
-				hint: 'Can be found in the URL of the workflow',
-			},
-
-			{
-				displayName: 'Workflow',
-				name: 'workflowId',
-				type: 'workflowSelector',
-				displayOptions: {
-					show: {
-						source: ['database'],
-						'@version': [{ _cnd: { gte: 1.2 } }],
-					},
-				},
-				default: '',
-				required: true,
-			},
-
-			// ----------------------------------
-			//         source:parameter
-			// ----------------------------------
-			{
-				displayName: 'Workflow JSON',
-				name: 'workflowJson',
-				type: 'json',
-				typeOptions: {
-					rows: 10,
-				},
-				displayOptions: {
-					show: {
-						source: ['parameter'],
-					},
-				},
-				default: '\n\n\n\n\n\n\n\n\n',
-				required: true,
-				description: 'The workflow JSON code to execute',
-			},
-			// ----------------------------------
-			//         For all
-			// ----------------------------------
-			{
-				displayName: 'Field to Return',
-				name: 'responsePropertyName',
-				type: 'string',
-				default: 'response',
-				required: true,
-				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.',
-			},
-			{
-				displayName: 'Extra Workflow Inputs',
-				name: 'fields',
-				placeholder: 'Add Value',
-				type: 'fixedCollection',
-				description:
-					"These will be output by the 'execute workflow' trigger of the workflow being called",
-				typeOptions: {
-					multipleValues: true,
-					sortable: true,
-				},
-				default: {},
-				options: [
-					{
-						name: 'values',
-						displayName: 'Values',
-						values: [
-							{
-								displayName: 'Name',
-								name: 'name',
-								type: 'string',
-								default: '',
-								placeholder: 'e.g. fieldName',
-								description:
-									'Name of the field to set the value of. Supports dot-notation. Example: data.person[0].name.',
-								requiresDataPath: 'single',
-							},
-							{
-								displayName: 'Type',
-								name: 'type',
-								type: 'options',
-								description: 'The field value type',
-								// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
-								options: [
-									{
-										name: 'String',
-										value: 'stringValue',
-									},
-									{
-										name: 'Number',
-										value: 'numberValue',
-									},
-									{
-										name: 'Boolean',
-										value: 'booleanValue',
-									},
-									{
-										name: 'Array',
-										value: 'arrayValue',
-									},
-									{
-										name: 'Object',
-										value: 'objectValue',
-									},
-								],
-								default: 'stringValue',
-							},
-							{
-								displayName: 'Value',
-								name: 'stringValue',
-								type: 'string',
-								default: '',
-								displayOptions: {
-									show: {
-										type: ['stringValue'],
-									},
-								},
-								validateType: 'string',
-								ignoreValidationDuringExecution: true,
-							},
-							{
-								displayName: 'Value',
-								name: 'numberValue',
-								type: 'string',
-								default: '',
-								displayOptions: {
-									show: {
-										type: ['numberValue'],
-									},
-								},
-								validateType: 'number',
-								ignoreValidationDuringExecution: true,
-							},
-							{
-								displayName: 'Value',
-								name: 'booleanValue',
-								type: 'options',
-								default: 'true',
-								options: [
-									{
-										name: 'True',
-										value: 'true',
-									},
-									{
-										name: 'False',
-										value: 'false',
-									},
-								],
-								displayOptions: {
-									show: {
-										type: ['booleanValue'],
-									},
-								},
-								validateType: 'boolean',
-								ignoreValidationDuringExecution: true,
-							},
-							{
-								displayName: 'Value',
-								name: 'arrayValue',
-								type: 'string',
-								default: '',
-								placeholder: 'e.g. [ arrayItem1, arrayItem2, arrayItem3 ]',
-								displayOptions: {
-									show: {
-										type: ['arrayValue'],
-									},
-								},
-								validateType: 'array',
-								ignoreValidationDuringExecution: true,
-							},
-							{
-								displayName: 'Value',
-								name: 'objectValue',
-								type: 'json',
-								default: '={}',
-								typeOptions: {
-									rows: 2,
-								},
-								displayOptions: {
-									show: {
-										type: ['objectValue'],
-									},
-								},
-								validateType: 'object',
-								ignoreValidationDuringExecution: true,
-							},
-						],
-					},
-				],
-			},
-			// ----------------------------------
-			//         Output Parsing
-			// ----------------------------------
-			{
-				displayName: 'Specify Input Schema',
-				name: 'specifyInputSchema',
-				type: 'boolean',
-				description:
-					'Whether to specify the schema for the function. This would require the LLM to provide the input in the correct format and would validate it against the schema.',
-				noDataExpression: true,
-				default: false,
-			},
-			{ ...schemaTypeField, displayOptions: { show: { specifyInputSchema: [true] } } },
-			jsonSchemaExampleField,
-			inputSchemaField,
-		],
-	};
-
-	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
-		const name = this.getNodeParameter('name', itemIndex) as string;
-		const description = this.getNodeParameter('description', itemIndex) as string;
-
-		const useSchema = this.getNodeParameter('specifyInputSchema', itemIndex) as boolean;
-		let tool: DynamicTool | DynamicStructuredTool | undefined = undefined;
-
-		const runFunction = async (
-			query: string | IDataObject,
-			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
-				const nodeVersion = this.getNode().typeVersion;
-				if (nodeVersion <= 1.1) {
-					workflowInfo.id = this.getNodeParameter('workflowId', itemIndex) as string;
-				} else {
-					const { value } = this.getNodeParameter(
-						'workflowId',
-						itemIndex,
-						{},
-					) as INodeParameterResourceLocator;
-					workflowInfo.id = value as string;
-				}
-			} else if (source === 'parameter') {
-				// Read workflow from parameter
-				const workflowJson = this.getNodeParameter('workflowJson', itemIndex) as string;
-				try {
-					workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
-				} catch (error) {
-					throw new NodeOperationError(
-						this.getNode(),
-						`The provided workflow is not valid JSON: "${(error as Error).message}"`,
+				resources: {
+					primaryDocumentation: [
 						{
-							itemIndex,
+							url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolworkflow/',
 						},
-					);
-				}
-			}
-
-			const rawData: IDataObject = { query };
-
-			const workflowFieldsJson = this.getNodeParameter('fields.values', itemIndex, [], {
-				rawExpressions: true,
-			}) as SetField[];
-
-			// Copied from Set Node v2
-			for (const entry of workflowFieldsJson) {
-				if (entry.type === 'objectValue' && (entry.objectValue as string).startsWith('=')) {
-					rawData[entry.name] = (entry.objectValue as string).replace(/^=+/, '');
-				}
-			}
-
-			const options: SetNodeOptions = {
-				include: 'all',
-			};
-
-			const newItem = await manual.execute.call(
-				this,
-				{ json: { query } },
-				itemIndex,
-				options,
-				rawData,
-				this.getNode(),
-			);
-
-			const items = [newItem] as INodeExecutionData[];
-
-			let receivedData: INodeExecutionData;
-			try {
-				receivedData = (await this.executeWorkflow(
-					workflowInfo,
-					items,
-					runManager?.getChild(),
-				)) as INodeExecutionData;
-			} catch (error) {
-				// Make sure a valid error gets returned that can by json-serialized else it will
-				// not show up in the frontend
-				throw new NodeOperationError(this.getNode(), error as Error);
-			}
-
-			const response: string | undefined = get(receivedData, [
-				0,
-				0,
-				'json',
-				responsePropertyName,
-			]) 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}'"`,
-				);
-			}
-
-			return response;
+					],
+				},
+			},
+			defaultVersion: 2,
 		};
 
-		const toolHandler = async (
-			query: string | IDataObject,
-			runManager?: CallbackManagerForToolRun,
-		): Promise<string> => {
-			const { index } = this.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
-
-			let response: string = '';
-			let executionError: ExecutionError | undefined;
-			try {
-				response = await runFunction(query, runManager);
-			} catch (error) {
-				// TODO: Do some more testing. Issues here should actually fail the workflow
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				executionError = error;
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				response = `There was an error: "${error.message}"`;
-			}
-
-			if (typeof response === 'number') {
-				response = (response as number).toString();
-			}
-
-			if (isObject(response)) {
-				response = JSON.stringify(response, null, 2);
-			}
-
-			if (typeof response !== 'string') {
-				// TODO: Do some more testing. Issues here should actually fail the workflow
-				executionError = new NodeOperationError(this.getNode(), 'Wrong output type returned', {
-					description: `The response property should be a string, but it is an ${typeof response}`,
-				});
-				response = `There was an error: "${executionError.message}"`;
-			}
-
-			if (executionError) {
-				void this.addOutputData(NodeConnectionType.AiTool, index, executionError);
-			} else {
-				void this.addOutputData(NodeConnectionType.AiTool, index, [[{ json: { response } }]]);
-			}
-			return response;
-		};
-
-		const functionBase = {
-			name,
-			description,
-			func: toolHandler,
-		};
-
-		if (useSchema) {
-			try {
-				// We initialize these even though one of them will always be empty
-				// it makes it easier to navigate the ternary operator
-				const jsonExample = this.getNodeParameter('jsonSchemaExample', itemIndex, '') as string;
-				const inputSchema = this.getNodeParameter('inputSchema', itemIndex, '') as string;
-
-				const schemaType = this.getNodeParameter('schemaType', itemIndex) as 'fromJson' | 'manual';
-				const jsonSchema =
-					schemaType === 'fromJson'
-						? generateSchema(jsonExample)
-						: jsonParse<JSONSchema7>(inputSchema);
-
-				const zodSchema = convertJsonSchemaToZod<DynamicZodObject>(jsonSchema);
-
-				tool = new DynamicStructuredTool({
-					schema: zodSchema,
-					...functionBase,
-				});
-			} catch (error) {
-				throw new NodeOperationError(
-					this.getNode(),
-					'Error during parsing of JSON Schema. \n ' + error,
-				);
-			}
-		} else {
-			tool = new DynamicTool(functionBase);
-		}
-
-		return {
-			response: tool,
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new ToolWorkflowV1(baseDescription),
+			1.1: new ToolWorkflowV1(baseDescription),
+			1.2: new ToolWorkflowV1(baseDescription),
+			1.3: new ToolWorkflowV1(baseDescription),
+			2: new ToolWorkflowV2(baseDescription),
 		};
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/ToolWorkflowV1.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/ToolWorkflowV1.node.ts
new file mode 100644
index 0000000000..4c33c86b4e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/ToolWorkflowV1.node.ts
@@ -0,0 +1,241 @@
+import type { CallbackManagerForToolRun } from '@langchain/core/callbacks/manager';
+import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import type { JSONSchema7 } from 'json-schema';
+import get from 'lodash/get';
+import isObject from 'lodash/isObject';
+import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
+import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
+import type {
+	IExecuteWorkflowInfo,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	IWorkflowBase,
+	ISupplyDataFunctions,
+	SupplyData,
+	ExecutionError,
+	ExecuteWorkflowData,
+	IDataObject,
+	INodeParameterResourceLocator,
+	ITaskMetadata,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError, jsonParse } from 'n8n-workflow';
+
+import { versionDescription } from './versionDescription';
+import type { DynamicZodObject } from '../../../../types/zod.types';
+import { convertJsonSchemaToZod, generateSchema } from '../../../../utils/schemaParsing';
+
+export class ToolWorkflowV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
+		const workflowProxy = this.getWorkflowDataProxy(0);
+
+		const name = this.getNodeParameter('name', itemIndex) as string;
+		const description = this.getNodeParameter('description', itemIndex) as string;
+
+		let subExecutionId: string | undefined;
+		let subWorkflowId: string | undefined;
+
+		const useSchema = this.getNodeParameter('specifyInputSchema', itemIndex) as boolean;
+		let tool: DynamicTool | DynamicStructuredTool | undefined = undefined;
+
+		const runFunction = async (
+			query: string | IDataObject,
+			runManager?: CallbackManagerForToolRun,
+		): Promise<string> => {
+			const source = this.getNodeParameter('source', itemIndex) as string;
+			const workflowInfo: IExecuteWorkflowInfo = {};
+			if (source === 'database') {
+				// Read workflow from database
+				const nodeVersion = this.getNode().typeVersion;
+				if (nodeVersion <= 1.1) {
+					workflowInfo.id = this.getNodeParameter('workflowId', itemIndex) as string;
+				} else {
+					const { value } = this.getNodeParameter(
+						'workflowId',
+						itemIndex,
+						{},
+					) as INodeParameterResourceLocator;
+					workflowInfo.id = value as string;
+				}
+
+				subWorkflowId = workflowInfo.id;
+			} else if (source === 'parameter') {
+				// Read workflow from parameter
+				const workflowJson = this.getNodeParameter('workflowJson', itemIndex) as string;
+				try {
+					workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
+
+					// subworkflow is same as parent workflow
+					subWorkflowId = workflowProxy.$workflow.id;
+				} catch (error) {
+					throw new NodeOperationError(
+						this.getNode(),
+						`The provided workflow is not valid JSON: "${(error as Error).message}"`,
+						{
+							itemIndex,
+						},
+					);
+				}
+			}
+
+			const rawData: IDataObject = { query };
+
+			const workflowFieldsJson = this.getNodeParameter('fields.values', itemIndex, [], {
+				rawExpressions: true,
+			}) as SetField[];
+
+			// Copied from Set Node v2
+			for (const entry of workflowFieldsJson) {
+				if (entry.type === 'objectValue' && (entry.objectValue as string).startsWith('=')) {
+					rawData[entry.name] = (entry.objectValue as string).replace(/^=+/, '');
+				}
+			}
+
+			const options: SetNodeOptions = {
+				include: 'all',
+			};
+
+			const newItem = await manual.execute.call(
+				this,
+				{ json: { query } },
+				itemIndex,
+				options,
+				rawData,
+				this.getNode(),
+			);
+
+			const items = [newItem] as INodeExecutionData[];
+
+			let receivedData: ExecuteWorkflowData;
+			try {
+				receivedData = await this.executeWorkflow(workflowInfo, items, runManager?.getChild(), {
+					parentExecution: {
+						executionId: workflowProxy.$execution.id,
+						workflowId: workflowProxy.$workflow.id,
+					},
+				});
+				subExecutionId = receivedData.executionId;
+			} catch (error) {
+				// Make sure a valid error gets returned that can by json-serialized else it will
+				// not show up in the frontend
+				throw new NodeOperationError(this.getNode(), error as Error);
+			}
+
+			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 a response"',
+				);
+			}
+
+			return response;
+		};
+
+		const toolHandler = async (
+			query: string | IDataObject,
+			runManager?: CallbackManagerForToolRun,
+		): Promise<string> => {
+			const { index } = this.addInputData(NodeConnectionType.AiTool, [[{ json: { query } }]]);
+
+			let response: string = '';
+			let executionError: ExecutionError | undefined;
+			try {
+				response = await runFunction(query, runManager);
+			} catch (error) {
+				// TODO: Do some more testing. Issues here should actually fail the workflow
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				executionError = error;
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				response = `There was an error: "${error.message}"`;
+			}
+
+			if (typeof response === 'number') {
+				response = (response as number).toString();
+			}
+
+			if (isObject(response)) {
+				response = JSON.stringify(response, null, 2);
+			}
+
+			if (typeof response !== 'string') {
+				// TODO: Do some more testing. Issues here should actually fail the workflow
+				executionError = new NodeOperationError(this.getNode(), 'Wrong output type returned', {
+					description: `The response property should be a string, but it is an ${typeof response}`,
+				});
+				response = `There was an error: "${executionError.message}"`;
+			}
+
+			let metadata: ITaskMetadata | undefined;
+			if (subExecutionId && subWorkflowId) {
+				metadata = {
+					subExecution: {
+						executionId: subExecutionId,
+						workflowId: subWorkflowId,
+					},
+				};
+			}
+
+			if (executionError) {
+				void this.addOutputData(NodeConnectionType.AiTool, index, executionError, metadata);
+			} else {
+				// 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;
+		};
+
+		const functionBase = {
+			name,
+			description,
+			func: toolHandler,
+		};
+
+		if (useSchema) {
+			try {
+				// We initialize these even though one of them will always be empty
+				// it makes it easier to navigate the ternary operator
+				const jsonExample = this.getNodeParameter('jsonSchemaExample', itemIndex, '') as string;
+				const inputSchema = this.getNodeParameter('inputSchema', itemIndex, '') as string;
+
+				const schemaType = this.getNodeParameter('schemaType', itemIndex) as 'fromJson' | 'manual';
+				const jsonSchema =
+					schemaType === 'fromJson'
+						? generateSchema(jsonExample)
+						: jsonParse<JSONSchema7>(inputSchema);
+
+				const zodSchema = convertJsonSchemaToZod<DynamicZodObject>(jsonSchema);
+
+				tool = new DynamicStructuredTool({
+					schema: zodSchema,
+					...functionBase,
+				});
+			} catch (error) {
+				throw new NodeOperationError(
+					this.getNode(),
+					'Error during parsing of JSON Schema. \n ' + error,
+				);
+			}
+		} else {
+			tool = new DynamicTool(functionBase);
+		}
+
+		return {
+			response: tool,
+		};
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts
new file mode 100644
index 0000000000..da7a0e9815
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v1/versionDescription.ts
@@ -0,0 +1,345 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import {
+	inputSchemaField,
+	jsonSchemaExampleField,
+	schemaTypeField,
+} from '../../../../utils/descriptions';
+import { getConnectionHintNoticeField } from '../../../../utils/sharedFields';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Call n8n Workflow Tool',
+	name: 'toolWorkflow',
+	icon: 'fa:network-wired',
+	iconColor: 'black',
+	group: ['transform'],
+	version: [1, 1.1, 1.2, 1.3],
+	description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
+	defaults: {
+		name: 'Call n8n Workflow Tool',
+	},
+	codex: {
+		categories: ['AI'],
+		subcategories: {
+			AI: ['Tools'],
+			Tools: ['Recommended Tools'],
+		},
+		resources: {
+			primaryDocumentation: [
+				{
+					url: 'https://docs.n8n.io/integrations/builtin/cluster-nodes/sub-nodes/n8n-nodes-langchain.toolworkflow/',
+				},
+			],
+		},
+	},
+	// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
+	inputs: [],
+	// eslint-disable-next-line n8n-nodes-base/node-class-description-outputs-wrong
+	outputs: [NodeConnectionType.AiTool],
+	outputNames: ['Tool'],
+	properties: [
+		getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+		{
+			displayName:
+				'See an example of a workflow to suggest meeting slots using AI <a href="/templates/1953" target="_blank">here</a>.',
+			name: 'noticeTemplateExample',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Name',
+			name: 'name',
+			type: 'string',
+			default: '',
+			placeholder: 'My_Color_Tool',
+			displayOptions: {
+				show: {
+					'@version': [1],
+				},
+			},
+		},
+		{
+			displayName: 'Name',
+			name: 'name',
+			type: 'string',
+			default: '',
+			placeholder: 'e.g. My_Color_Tool',
+			validateType: 'string-alphanumeric',
+			description:
+				'The name of the function to be called, could contain letters, numbers, and underscores only',
+			displayOptions: {
+				show: {
+					'@version': [{ _cnd: { gte: 1.1 } }],
+				},
+			},
+		},
+		{
+			displayName: 'Description',
+			name: 'description',
+			type: 'string',
+			default: '',
+			placeholder:
+				'Call this tool to get a random color. The input should be a string with comma separted names of colors to exclude.',
+			typeOptions: {
+				rows: 3,
+			},
+		},
+
+		{
+			displayName:
+				'This tool will call the workflow you define below, and look in the last node for the response. The workflow needs to start with an Execute Workflow trigger',
+			name: 'executeNotice',
+			type: 'notice',
+			default: '',
+		},
+
+		{
+			displayName: 'Source',
+			name: 'source',
+			type: 'options',
+			options: [
+				{
+					name: 'Database',
+					value: 'database',
+					description: 'Load the workflow from the database by ID',
+				},
+				{
+					name: 'Define Below',
+					value: 'parameter',
+					description: 'Pass the JSON code of a workflow',
+				},
+			],
+			default: 'database',
+			description: 'Where to get the workflow to execute from',
+		},
+
+		// ----------------------------------
+		//         source:database
+		// ----------------------------------
+		{
+			displayName: 'Workflow ID',
+			name: 'workflowId',
+			type: 'string',
+			displayOptions: {
+				show: {
+					source: ['database'],
+					'@version': [{ _cnd: { lte: 1.1 } }],
+				},
+			},
+			default: '',
+			required: true,
+			description: 'The workflow to execute',
+			hint: 'Can be found in the URL of the workflow',
+		},
+
+		{
+			displayName: 'Workflow',
+			name: 'workflowId',
+			type: 'workflowSelector',
+			displayOptions: {
+				show: {
+					source: ['database'],
+					'@version': [{ _cnd: { gte: 1.2 } }],
+				},
+			},
+			default: '',
+			required: true,
+		},
+
+		// ----------------------------------
+		//         source:parameter
+		// ----------------------------------
+		{
+			displayName: 'Workflow JSON',
+			name: 'workflowJson',
+			type: 'json',
+			typeOptions: {
+				rows: 10,
+			},
+			displayOptions: {
+				show: {
+					source: ['parameter'],
+				},
+			},
+			default: '\n\n\n\n\n\n\n\n\n',
+			required: true,
+			description: 'The workflow JSON code to execute',
+		},
+		// ----------------------------------
+		//         For all
+		// ----------------------------------
+		{
+			displayName: 'Field to Return',
+			name: 'responsePropertyName',
+			type: 'string',
+			default: 'response',
+			required: true,
+			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',
+			name: 'fields',
+			placeholder: 'Add Value',
+			type: 'fixedCollection',
+			description:
+				"These will be output by the 'execute workflow' trigger of the workflow being called",
+			typeOptions: {
+				multipleValues: true,
+				sortable: true,
+			},
+			default: {},
+			options: [
+				{
+					name: 'values',
+					displayName: 'Values',
+					values: [
+						{
+							displayName: 'Name',
+							name: 'name',
+							type: 'string',
+							default: '',
+							placeholder: 'e.g. fieldName',
+							description:
+								'Name of the field to set the value of. Supports dot-notation. Example: data.person[0].name.',
+							requiresDataPath: 'single',
+						},
+						{
+							displayName: 'Type',
+							name: 'type',
+							type: 'options',
+							description: 'The field value type',
+							// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+							options: [
+								{
+									name: 'String',
+									value: 'stringValue',
+								},
+								{
+									name: 'Number',
+									value: 'numberValue',
+								},
+								{
+									name: 'Boolean',
+									value: 'booleanValue',
+								},
+								{
+									name: 'Array',
+									value: 'arrayValue',
+								},
+								{
+									name: 'Object',
+									value: 'objectValue',
+								},
+							],
+							default: 'stringValue',
+						},
+						{
+							displayName: 'Value',
+							name: 'stringValue',
+							type: 'string',
+							default: '',
+							displayOptions: {
+								show: {
+									type: ['stringValue'],
+								},
+							},
+							validateType: 'string',
+							ignoreValidationDuringExecution: true,
+						},
+						{
+							displayName: 'Value',
+							name: 'numberValue',
+							type: 'string',
+							default: '',
+							displayOptions: {
+								show: {
+									type: ['numberValue'],
+								},
+							},
+							validateType: 'number',
+							ignoreValidationDuringExecution: true,
+						},
+						{
+							displayName: 'Value',
+							name: 'booleanValue',
+							type: 'options',
+							default: 'true',
+							options: [
+								{
+									name: 'True',
+									value: 'true',
+								},
+								{
+									name: 'False',
+									value: 'false',
+								},
+							],
+							displayOptions: {
+								show: {
+									type: ['booleanValue'],
+								},
+							},
+							validateType: 'boolean',
+							ignoreValidationDuringExecution: true,
+						},
+						{
+							displayName: 'Value',
+							name: 'arrayValue',
+							type: 'string',
+							default: '',
+							placeholder: 'e.g. [ arrayItem1, arrayItem2, arrayItem3 ]',
+							displayOptions: {
+								show: {
+									type: ['arrayValue'],
+								},
+							},
+							validateType: 'array',
+							ignoreValidationDuringExecution: true,
+						},
+						{
+							displayName: 'Value',
+							name: 'objectValue',
+							type: 'json',
+							default: '={}',
+							typeOptions: {
+								rows: 2,
+							},
+							displayOptions: {
+								show: {
+									type: ['objectValue'],
+								},
+							},
+							validateType: 'object',
+							ignoreValidationDuringExecution: true,
+						},
+					],
+				},
+			],
+		},
+		// ----------------------------------
+		//         Output Parsing
+		// ----------------------------------
+		{
+			displayName: 'Specify Input Schema',
+			name: 'specifyInputSchema',
+			type: 'boolean',
+			description:
+				'Whether to specify the schema for the function. This would require the LLM to provide the input in the correct format and would validate it against the schema.',
+			noDataExpression: true,
+			default: false,
+		},
+		{ ...schemaTypeField, displayOptions: { show: { specifyInputSchema: [true] } } },
+		jsonSchemaExampleField,
+		inputSchemaField,
+	],
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
new file mode 100644
index 0000000000..22ca31e4da
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.node.ts
@@ -0,0 +1,42 @@
+import { loadWorkflowInputMappings } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
+import type {
+	INodeTypeBaseDescription,
+	ISupplyDataFunctions,
+	SupplyData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+
+import { WorkflowToolService } from './utils/WorkflowToolService';
+import { versionDescription } from './versionDescription';
+
+export class ToolWorkflowV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			...versionDescription,
+		};
+	}
+
+	methods = {
+		localResourceMapping: {
+			loadWorkflowInputMappings,
+		},
+	};
+
+	async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
+		const workflowToolService = new WorkflowToolService(this);
+		const name = this.getNodeParameter('name', itemIndex) as string;
+		const description = this.getNodeParameter('description', itemIndex) as string;
+
+		const tool = await workflowToolService.createTool({
+			name,
+			description,
+			itemIndex,
+		});
+
+		return { response: tool };
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
new file mode 100644
index 0000000000..73aa24c6b7
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/ToolWorkflowV2.test.ts
@@ -0,0 +1,235 @@
+/* eslint-disable @typescript-eslint/dot-notation */ // Disabled to allow access to private methods
+import { DynamicTool } from '@langchain/core/tools';
+import { NodeOperationError } from 'n8n-workflow';
+import type {
+	ISupplyDataFunctions,
+	INodeExecutionData,
+	IWorkflowDataProxyData,
+	ExecuteWorkflowData,
+	INode,
+} from 'n8n-workflow';
+
+import { WorkflowToolService } from './utils/WorkflowToolService';
+
+// Mock ISupplyDataFunctions interface
+function createMockContext(overrides?: Partial<ISupplyDataFunctions>): ISupplyDataFunctions {
+	return {
+		getNodeParameter: jest.fn(),
+		getWorkflowDataProxy: jest.fn(),
+		getNode: jest.fn(),
+		executeWorkflow: jest.fn(),
+		addInputData: jest.fn(),
+		addOutputData: jest.fn(),
+		getCredentials: jest.fn(),
+		getCredentialsProperties: jest.fn(),
+		getInputData: jest.fn(),
+		getMode: jest.fn(),
+		getRestApiUrl: jest.fn(),
+		getTimezone: jest.fn(),
+		getWorkflow: jest.fn(),
+		getWorkflowStaticData: jest.fn(),
+		logger: {
+			debug: jest.fn(),
+			error: jest.fn(),
+			info: jest.fn(),
+			warn: jest.fn(),
+		},
+		...overrides,
+	} as ISupplyDataFunctions;
+}
+
+describe('WorkflowTool::WorkflowToolService', () => {
+	let context: ISupplyDataFunctions;
+	let service: WorkflowToolService;
+
+	beforeEach(() => {
+		// Prepare essential mocks
+		context = createMockContext();
+		jest.spyOn(context, 'getNode').mockReturnValue({
+			parameters: { workflowInputs: { schema: [] } },
+		} as unknown as INode);
+		service = new WorkflowToolService(context);
+	});
+
+	describe('createTool', () => {
+		it('should create a basic dynamic tool when schema is not used', async () => {
+			const toolParams = {
+				name: 'TestTool',
+				description: 'Test Description',
+				itemIndex: 0,
+			};
+
+			const result = await service.createTool(toolParams);
+
+			expect(result).toBeInstanceOf(DynamicTool);
+			expect(result).toHaveProperty('name', 'TestTool');
+			expect(result).toHaveProperty('description', 'Test Description');
+		});
+
+		it('should create a tool that can handle successful execution', async () => {
+			const toolParams = {
+				name: 'TestTool',
+				description: 'Test Description',
+				itemIndex: 0,
+			};
+
+			const TEST_RESPONSE = { msg: 'test response' };
+
+			const mockExecuteWorkflowResponse: ExecuteWorkflowData = {
+				data: [[{ json: TEST_RESPONSE }]],
+				executionId: 'test-execution',
+			};
+
+			jest.spyOn(context, 'executeWorkflow').mockResolvedValueOnce(mockExecuteWorkflowResponse);
+			jest.spyOn(context, 'addInputData').mockReturnValue({ index: 0 });
+			jest.spyOn(context, 'getNodeParameter').mockReturnValue('database');
+			jest.spyOn(context, 'getWorkflowDataProxy').mockReturnValue({
+				$execution: { id: 'exec-id' },
+				$workflow: { id: 'workflow-id' },
+			} as unknown as IWorkflowDataProxyData);
+
+			const tool = await service.createTool(toolParams);
+			const result = await tool.func('test query');
+
+			expect(result).toBe(JSON.stringify(TEST_RESPONSE, null, 2));
+			expect(context.addOutputData).toHaveBeenCalled();
+		});
+
+		it('should handle errors during tool execution', async () => {
+			const toolParams = {
+				name: 'TestTool',
+				description: 'Test Description',
+				itemIndex: 0,
+			};
+
+			jest
+				.spyOn(context, 'executeWorkflow')
+				.mockRejectedValueOnce(new Error('Workflow execution failed'));
+			jest.spyOn(context, 'addInputData').mockReturnValue({ index: 0 });
+			jest.spyOn(context, 'getNodeParameter').mockReturnValue('database');
+
+			const tool = await service.createTool(toolParams);
+			const result = await tool.func('test query');
+
+			expect(result).toContain('There was an error');
+			expect(context.addOutputData).toHaveBeenCalled();
+		});
+	});
+
+	describe('handleToolResponse', () => {
+		it('should handle number response', () => {
+			const result = service['handleToolResponse'](42);
+
+			expect(result).toBe('42');
+		});
+
+		it('should handle object response', () => {
+			const obj = { test: 'value' };
+
+			const result = service['handleToolResponse'](obj);
+
+			expect(result).toBe(JSON.stringify(obj, null, 2));
+		});
+
+		it('should handle string response', () => {
+			const result = service['handleToolResponse']('test response');
+
+			expect(result).toBe('test response');
+		});
+
+		it('should throw error for invalid response type', () => {
+			expect(() => service['handleToolResponse'](undefined)).toThrow(NodeOperationError);
+		});
+	});
+
+	describe('executeSubWorkflow', () => {
+		it('should successfully execute workflow and return response', async () => {
+			const workflowInfo = { id: 'test-workflow' };
+			const items: INodeExecutionData[] = [];
+			const workflowProxyMock = {
+				$execution: { id: 'exec-id' },
+				$workflow: { id: 'workflow-id' },
+			} as unknown as IWorkflowDataProxyData;
+
+			const TEST_RESPONSE = { msg: 'test response' };
+
+			const mockResponse: ExecuteWorkflowData = {
+				data: [[{ json: TEST_RESPONSE }]],
+				executionId: 'test-execution',
+			};
+
+			jest.spyOn(context, 'executeWorkflow').mockResolvedValueOnce(mockResponse);
+
+			const result = await service['executeSubWorkflow'](workflowInfo, items, workflowProxyMock);
+
+			expect(result.response).toBe(TEST_RESPONSE);
+			expect(result.subExecutionId).toBe('test-execution');
+		});
+
+		it('should throw error when workflow execution fails', async () => {
+			jest.spyOn(context, 'executeWorkflow').mockRejectedValueOnce(new Error('Execution failed'));
+
+			await expect(service['executeSubWorkflow']({}, [], {} as never)).rejects.toThrow(
+				NodeOperationError,
+			);
+		});
+
+		it('should throw error when workflow returns no response', async () => {
+			const mockResponse: ExecuteWorkflowData = {
+				data: [],
+				executionId: 'test-execution',
+			};
+
+			jest.spyOn(context, 'executeWorkflow').mockResolvedValueOnce(mockResponse);
+
+			await expect(service['executeSubWorkflow']({}, [], {} as never)).rejects.toThrow();
+		});
+	});
+
+	describe('getSubWorkflowInfo', () => {
+		it('should handle database source correctly', async () => {
+			const source = 'database';
+			const itemIndex = 0;
+			const workflowProxyMock = {
+				$workflow: { id: 'proxy-id' },
+			} as unknown as IWorkflowDataProxyData;
+
+			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce({ value: 'workflow-id' });
+
+			const result = await service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock);
+
+			expect(result.workflowInfo).toHaveProperty('id', 'workflow-id');
+			expect(result.subWorkflowId).toBe('workflow-id');
+		});
+
+		it('should handle parameter source correctly', async () => {
+			const source = 'parameter';
+			const itemIndex = 0;
+			const workflowProxyMock = {
+				$workflow: { id: 'proxy-id' },
+			} as unknown as IWorkflowDataProxyData;
+			const mockWorkflow = { id: 'test-workflow' };
+
+			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce(JSON.stringify(mockWorkflow));
+
+			const result = await service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock);
+
+			expect(result.workflowInfo.code).toEqual(mockWorkflow);
+			expect(result.subWorkflowId).toBe('proxy-id');
+		});
+
+		it('should throw error for invalid JSON in parameter source', async () => {
+			const source = 'parameter';
+			const itemIndex = 0;
+			const workflowProxyMock = {
+				$workflow: { id: 'proxy-id' },
+			} as unknown as IWorkflowDataProxyData;
+
+			jest.spyOn(context, 'getNodeParameter').mockReturnValueOnce('invalid json');
+
+			await expect(
+				service['getSubWorkflowInfo'](source, itemIndex, workflowProxyMock),
+			).rejects.toThrow(NodeOperationError);
+		});
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts
new file mode 100644
index 0000000000..4b9b6ed58e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts
@@ -0,0 +1,284 @@
+import type { ISupplyDataFunctions } from 'n8n-workflow';
+import { jsonParse, NodeOperationError } from 'n8n-workflow';
+import { z } from 'zod';
+
+type AllowedTypes = 'string' | 'number' | 'boolean' | 'json';
+export interface FromAIArgument {
+	key: string;
+	description?: string;
+	type?: AllowedTypes;
+	defaultValue?: string | number | boolean | Record<string, unknown>;
+}
+
+// TODO: We copied this class from the core package, once the new nodes context work is merged, this should be available in root node context and this file can be removed.
+// Please apply any changes to both files
+
+/**
+ * AIParametersParser
+ *
+ * This class encapsulates the logic for parsing node parameters, extracting $fromAI calls,
+ * generating Zod schemas, and creating LangChain tools.
+ */
+export class AIParametersParser {
+	private ctx: ISupplyDataFunctions;
+
+	/**
+	 * Constructs an instance of AIParametersParser.
+	 * @param ctx The execution context.
+	 */
+	constructor(ctx: ISupplyDataFunctions) {
+		this.ctx = ctx;
+	}
+
+	/**
+	 * Generates a Zod schema based on the provided FromAIArgument placeholder.
+	 * @param placeholder The FromAIArgument object containing key, type, description, and defaultValue.
+	 * @returns A Zod schema corresponding to the placeholder's type and constraints.
+	 */
+	generateZodSchema(placeholder: FromAIArgument): z.ZodTypeAny {
+		let schema: z.ZodTypeAny;
+
+		switch (placeholder.type?.toLowerCase()) {
+			case 'string':
+				schema = z.string();
+				break;
+			case 'number':
+				schema = z.number();
+				break;
+			case 'boolean':
+				schema = z.boolean();
+				break;
+			case 'json':
+				schema = z.record(z.any());
+				break;
+			default:
+				schema = z.string();
+		}
+
+		if (placeholder.description) {
+			schema = schema.describe(`${schema.description ?? ''} ${placeholder.description}`.trim());
+		}
+
+		if (placeholder.defaultValue !== undefined) {
+			schema = schema.default(placeholder.defaultValue);
+		}
+
+		return schema;
+	}
+
+	/**
+	 * Recursively traverses the nodeParameters object to find all $fromAI calls.
+	 * @param payload The current object or value being traversed.
+	 * @param collectedArgs The array collecting FromAIArgument objects.
+	 */
+	traverseNodeParameters(payload: unknown, collectedArgs: FromAIArgument[]) {
+		if (typeof payload === 'string') {
+			const fromAICalls = this.extractFromAICalls(payload);
+			fromAICalls.forEach((call) => collectedArgs.push(call));
+		} else if (Array.isArray(payload)) {
+			payload.forEach((item: unknown) => this.traverseNodeParameters(item, collectedArgs));
+		} else if (typeof payload === 'object' && payload !== null) {
+			Object.values(payload).forEach((value) => this.traverseNodeParameters(value, collectedArgs));
+		}
+	}
+
+	/**
+	 * Extracts all $fromAI calls from a given string
+	 * @param str The string to search for $fromAI calls.
+	 * @returns An array of FromAIArgument objects.
+	 *
+	 * This method uses a regular expression to find the start of each $fromAI function call
+	 * in the input string. It then employs a character-by-character parsing approach to
+	 * accurately extract the arguments of each call, handling nested parentheses and quoted strings.
+	 *
+	 * The parsing process:
+	 * 1. Finds the starting position of a $fromAI call using regex.
+	 * 2. Iterates through characters, keeping track of parentheses depth and quote status.
+	 * 3. Handles escaped characters within quotes to avoid premature quote closing.
+	 * 4. Builds the argument string until the matching closing parenthesis is found.
+	 * 5. Parses the extracted argument string into a FromAIArgument object.
+	 * 6. Repeats the process for all $fromAI calls in the input string.
+	 *
+	 */
+	extractFromAICalls(str: string): FromAIArgument[] {
+		const args: FromAIArgument[] = [];
+		// Regular expression to match the start of a $fromAI function call
+		const pattern = /\$fromAI\s*\(\s*/gi;
+		let match: RegExpExecArray | null;
+
+		while ((match = pattern.exec(str)) !== null) {
+			const startIndex = match.index + match[0].length;
+			let current = startIndex;
+			let inQuotes = false;
+			let quoteChar = '';
+			let parenthesesCount = 1;
+			let argsString = '';
+
+			// Parse the arguments string, handling nested parentheses and quotes
+			while (current < str.length && parenthesesCount > 0) {
+				const char = str[current];
+
+				if (inQuotes) {
+					// Handle characters inside quotes, including escaped characters
+					if (char === '\\' && current + 1 < str.length) {
+						argsString += char + str[current + 1];
+						current += 2;
+						continue;
+					}
+
+					if (char === quoteChar) {
+						inQuotes = false;
+						quoteChar = '';
+					}
+					argsString += char;
+				} else {
+					// Handle characters outside quotes
+					if (['"', "'", '`'].includes(char)) {
+						inQuotes = true;
+						quoteChar = char;
+					} else if (char === '(') {
+						parenthesesCount++;
+					} else if (char === ')') {
+						parenthesesCount--;
+					}
+
+					// Only add characters if we're still inside the main parentheses
+					if (parenthesesCount > 0 || char !== ')') {
+						argsString += char;
+					}
+				}
+
+				current++;
+			}
+
+			// If parentheses are balanced, parse the arguments
+			if (parenthesesCount === 0) {
+				try {
+					const parsedArgs = this.parseArguments(argsString);
+					args.push(parsedArgs);
+				} catch (error) {
+					// If parsing fails, throw an ApplicationError with details
+					throw new NodeOperationError(
+						this.ctx.getNode(),
+						`Failed to parse $fromAI arguments: ${argsString}: ${error}`,
+					);
+				}
+			} else {
+				// Log an error if parentheses are unbalanced
+				throw new NodeOperationError(
+					this.ctx.getNode(),
+					`Unbalanced parentheses while parsing $fromAI call: ${str.slice(startIndex)}`,
+				);
+			}
+		}
+
+		return args;
+	}
+
+	/**
+	 * Parses the arguments of a single $fromAI function call.
+	 * @param argsString The string containing the function arguments.
+	 * @returns A FromAIArgument object.
+	 */
+	parseArguments(argsString: string): FromAIArgument {
+		// Split arguments by commas not inside quotes
+		const args: string[] = [];
+		let currentArg = '';
+		let inQuotes = false;
+		let quoteChar = '';
+		let escapeNext = false;
+
+		for (let i = 0; i < argsString.length; i++) {
+			const char = argsString[i];
+
+			if (escapeNext) {
+				currentArg += char;
+				escapeNext = false;
+				continue;
+			}
+
+			if (char === '\\') {
+				escapeNext = true;
+				continue;
+			}
+
+			if (['"', "'", '`'].includes(char)) {
+				if (!inQuotes) {
+					inQuotes = true;
+					quoteChar = char;
+					currentArg += char;
+				} else if (char === quoteChar) {
+					inQuotes = false;
+					quoteChar = '';
+					currentArg += char;
+				} else {
+					currentArg += char;
+				}
+				continue;
+			}
+
+			if (char === ',' && !inQuotes) {
+				args.push(currentArg.trim());
+				currentArg = '';
+				continue;
+			}
+
+			currentArg += char;
+		}
+
+		if (currentArg) {
+			args.push(currentArg.trim());
+		}
+
+		// Remove surrounding quotes if present
+		const cleanArgs = args.map((arg) => {
+			const trimmed = arg.trim();
+			if (
+				(trimmed.startsWith("'") && trimmed.endsWith("'")) ||
+				(trimmed.startsWith('`') && trimmed.endsWith('`')) ||
+				(trimmed.startsWith('"') && trimmed.endsWith('"'))
+			) {
+				return trimmed
+					.slice(1, -1)
+					.replace(/\\'/g, "'")
+					.replace(/\\`/g, '`')
+					.replace(/\\"/g, '"')
+					.replace(/\\\\/g, '\\');
+			}
+			return trimmed;
+		});
+
+		const type = cleanArgs?.[2] || 'string';
+
+		if (!['string', 'number', 'boolean', 'json'].includes(type.toLowerCase())) {
+			throw new NodeOperationError(this.ctx.getNode(), `Invalid type: ${type}`);
+		}
+
+		return {
+			key: cleanArgs[0] || '',
+			description: cleanArgs[1],
+			type: (cleanArgs?.[2] ?? 'string') as AllowedTypes,
+			defaultValue: this.parseDefaultValue(cleanArgs[3]),
+		};
+	}
+
+	/**
+	 * Parses the default value, preserving its original type.
+	 * @param value The default value as a string.
+	 * @returns The parsed default value in its appropriate type.
+	 */
+	parseDefaultValue(
+		value: string | undefined,
+	): string | number | boolean | Record<string, unknown> | undefined {
+		if (value === undefined || value === '') return undefined;
+		const lowerValue = value.toLowerCase();
+		if (lowerValue === 'true') return true;
+		if (lowerValue === 'false') return false;
+		if (!isNaN(Number(value))) return Number(value);
+		try {
+			return jsonParse(value);
+		} catch {
+			return value;
+		}
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
new file mode 100644
index 0000000000..2ce3c43556
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/WorkflowToolService.ts
@@ -0,0 +1,313 @@
+import type { CallbackManagerForToolRun } from '@langchain/core/callbacks/manager';
+import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import get from 'lodash/get';
+import isObject from 'lodash/isObject';
+import type { SetField, SetNodeOptions } from 'n8n-nodes-base/dist/nodes/Set/v2/helpers/interfaces';
+import * as manual from 'n8n-nodes-base/dist/nodes/Set/v2/manual.mode';
+import { getCurrentWorkflowInputData } from 'n8n-nodes-base/dist/utils/workflowInputsResourceMapping/GenericFunctions';
+import type {
+	ExecuteWorkflowData,
+	ExecutionError,
+	IDataObject,
+	IExecuteWorkflowInfo,
+	INodeExecutionData,
+	INodeParameterResourceLocator,
+	ISupplyDataFunctions,
+	ITaskMetadata,
+	IWorkflowBase,
+	IWorkflowDataProxyData,
+	ResourceMapperValue,
+} from 'n8n-workflow';
+import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { z } from 'zod';
+
+import type { FromAIArgument } from './FromAIParser';
+import { AIParametersParser } from './FromAIParser';
+
+/**
+	Main class for creating the Workflow tool
+	Processes the node parameters and creates AI Agent tool capable of executing n8n workflows
+*/
+export class WorkflowToolService {
+	// Determines if we should use input schema when creating the tool
+	private useSchema: boolean;
+
+	// Sub-workflow id, pulled from referenced sub-workflow
+	private subWorkflowId: string | undefined;
+
+	// Sub-workflow execution id, will be set after the sub-workflow is executed
+	private subExecutionId: string | undefined;
+
+	constructor(private context: ISupplyDataFunctions) {
+		const subWorkflowInputs = this.context.getNode().parameters
+			.workflowInputs as ResourceMapperValue;
+		this.useSchema = (subWorkflowInputs?.schema ?? []).length > 0;
+	}
+
+	// Creates the tool based on the provided parameters
+	async createTool({
+		name,
+		description,
+		itemIndex,
+	}: {
+		name: string;
+		description: string;
+		itemIndex: number;
+	}): Promise<DynamicTool | DynamicStructuredTool> {
+		// Handler for the tool execution, will be called when the tool is executed
+		// This function will execute the sub-workflow and return the response
+		const toolHandler = async (
+			query: string | IDataObject,
+			runManager?: CallbackManagerForToolRun,
+		): Promise<string> => {
+			const { index } = this.context.addInputData(NodeConnectionType.AiTool, [
+				[{ json: { query } }],
+			]);
+
+			try {
+				const response = await this.runFunction(query, itemIndex, runManager);
+				const processedResponse = this.handleToolResponse(response);
+
+				// Once the sub-workflow is executed, add the output data to the context
+				// This will be used to link the sub-workflow execution in the parent workflow
+				let metadata: ITaskMetadata | undefined;
+				if (this.subExecutionId && this.subWorkflowId) {
+					metadata = {
+						subExecution: {
+							executionId: this.subExecutionId,
+							workflowId: this.subWorkflowId,
+						},
+					};
+				}
+				const json = jsonParse<IDataObject>(processedResponse, {
+					fallbackValue: { response: processedResponse },
+				});
+				void this.context.addOutputData(NodeConnectionType.AiTool, index, [[{ json }]], metadata);
+
+				return processedResponse;
+			} catch (error) {
+				const executionError = error as ExecutionError;
+				const errorResponse = `There was an error: "${executionError.message}"`;
+				void this.context.addOutputData(NodeConnectionType.AiTool, index, executionError);
+				return errorResponse;
+			}
+		};
+
+		// Create structured tool if input schema is provided
+		return this.useSchema
+			? await this.createStructuredTool(name, description, toolHandler)
+			: new DynamicTool({ name, description, func: toolHandler });
+	}
+
+	private handleToolResponse(response: unknown): string {
+		if (typeof response === 'number') {
+			return response.toString();
+		}
+
+		if (isObject(response)) {
+			return JSON.stringify(response, null, 2);
+		}
+
+		if (typeof response !== 'string') {
+			throw new NodeOperationError(this.context.getNode(), 'Wrong output type returned', {
+				description: `The response property should be a string, but it is an ${typeof response}`,
+			});
+		}
+
+		return response;
+	}
+
+	/**
+	 * Executes specified sub-workflow with provided inputs
+	 */
+	private async executeSubWorkflow(
+		workflowInfo: IExecuteWorkflowInfo,
+		items: INodeExecutionData[],
+		workflowProxy: IWorkflowDataProxyData,
+		runManager?: CallbackManagerForToolRun,
+	): Promise<{ response: string; subExecutionId: string }> {
+		let receivedData: ExecuteWorkflowData;
+		try {
+			receivedData = await this.context.executeWorkflow(
+				workflowInfo,
+				items,
+				runManager?.getChild(),
+				{
+					parentExecution: {
+						executionId: workflowProxy.$execution.id,
+						workflowId: workflowProxy.$workflow.id,
+					},
+				},
+			);
+			// Set sub-workflow execution id so it can be used in other places
+			this.subExecutionId = receivedData.executionId;
+		} catch (error) {
+			throw new NodeOperationError(this.context.getNode(), error as Error);
+		}
+
+		const response: string | undefined = get(receivedData, 'data[0][0].json') as string | undefined;
+		if (response === undefined) {
+			throw new NodeOperationError(
+				this.context.getNode(),
+				'There was an error: "The workflow did not return a response"',
+			);
+		}
+
+		return { response, subExecutionId: receivedData.executionId };
+	}
+
+	/**
+	 * Gets the sub-workflow info based on the source and executes it.
+	 * This function will be called as part of the tool execution (from the toolHandler)
+	 */
+	private async runFunction(
+		query: string | IDataObject,
+		itemIndex: number,
+		runManager?: CallbackManagerForToolRun,
+	): Promise<string> {
+		const source = this.context.getNodeParameter('source', itemIndex) as string;
+		const workflowProxy = this.context.getWorkflowDataProxy(0);
+
+		const { workflowInfo } = await this.getSubWorkflowInfo(source, itemIndex, workflowProxy);
+		const rawData = this.prepareRawData(query, itemIndex);
+		const items = await this.prepareWorkflowItems(query, itemIndex, rawData);
+
+		this.subWorkflowId = workflowInfo.id;
+
+		const { response } = await this.executeSubWorkflow(
+			workflowInfo,
+			items,
+			workflowProxy,
+			runManager,
+		);
+		return response;
+	}
+
+	/**
+	 * Gets the sub-workflow info based on the source (database or parameter)
+	 */
+	private async getSubWorkflowInfo(
+		source: string,
+		itemIndex: number,
+		workflowProxy: IWorkflowDataProxyData,
+	): Promise<{
+		workflowInfo: IExecuteWorkflowInfo;
+		subWorkflowId: string;
+	}> {
+		const workflowInfo: IExecuteWorkflowInfo = {};
+		let subWorkflowId: string;
+
+		if (source === 'database') {
+			const { value } = this.context.getNodeParameter(
+				'workflowId',
+				itemIndex,
+				{},
+			) as INodeParameterResourceLocator;
+			workflowInfo.id = value as string;
+			subWorkflowId = workflowInfo.id;
+		} else if (source === 'parameter') {
+			const workflowJson = this.context.getNodeParameter('workflowJson', itemIndex) as string;
+			try {
+				workflowInfo.code = JSON.parse(workflowJson) as IWorkflowBase;
+				// subworkflow is same as parent workflow
+				subWorkflowId = workflowProxy.$workflow.id;
+			} catch (error) {
+				throw new NodeOperationError(
+					this.context.getNode(),
+					`The provided workflow is not valid JSON: "${(error as Error).message}"`,
+					{ itemIndex },
+				);
+			}
+		}
+
+		return { workflowInfo, subWorkflowId: subWorkflowId! };
+	}
+
+	private prepareRawData(query: string | IDataObject, itemIndex: number): IDataObject {
+		const rawData: IDataObject = { query };
+		const workflowFieldsJson = this.context.getNodeParameter('fields.values', itemIndex, [], {
+			rawExpressions: true,
+		}) as SetField[];
+
+		// Copied from Set Node v2
+		for (const entry of workflowFieldsJson) {
+			if (entry.type === 'objectValue' && (entry.objectValue as string).startsWith('=')) {
+				rawData[entry.name] = (entry.objectValue as string).replace(/^=+/, '');
+			}
+		}
+
+		return rawData;
+	}
+
+	/**
+	 * Prepares the sub-workflow items for execution
+	 */
+	private async prepareWorkflowItems(
+		query: string | IDataObject,
+		itemIndex: number,
+		rawData: IDataObject,
+	): Promise<INodeExecutionData[]> {
+		const options: SetNodeOptions = { include: 'all' };
+		let jsonData = typeof query === 'object' ? query : { query };
+
+		if (this.useSchema) {
+			const currentWorkflowInputs = getCurrentWorkflowInputData.call(this.context);
+			jsonData = currentWorkflowInputs[itemIndex].json;
+		}
+
+		const newItem = await manual.execute.call(
+			this.context,
+			{ json: jsonData },
+			itemIndex,
+			options,
+			rawData,
+			this.context.getNode(),
+		);
+
+		return [newItem] as INodeExecutionData[];
+	}
+
+	/**
+	 *  Create structured tool by parsing the sub-workflow input schema
+	 */
+	private async createStructuredTool(
+		name: string,
+		description: string,
+		func: (query: string | IDataObject, runManager?: CallbackManagerForToolRun) => Promise<string>,
+	): Promise<DynamicStructuredTool | DynamicTool> {
+		const fromAIParser = new AIParametersParser(this.context);
+		const collectedArguments = await this.extractFromAIParameters(fromAIParser);
+
+		// If there are no `fromAI` arguments, fallback to creating a simple tool
+		if (collectedArguments.length === 0) {
+			return new DynamicTool({ name, description, func });
+		}
+
+		// Otherwise, prepare Zod schema  and create a structured tool
+		const schema = this.createZodSchema(collectedArguments, fromAIParser);
+		return new DynamicStructuredTool({ schema, name, description, func });
+	}
+
+	private async extractFromAIParameters(
+		fromAIParser: AIParametersParser,
+	): Promise<FromAIArgument[]> {
+		const collectedArguments: FromAIArgument[] = [];
+		fromAIParser.traverseNodeParameters(this.context.getNode().parameters, collectedArguments);
+
+		const uniqueArgsMap = new Map<string, FromAIArgument>();
+		for (const arg of collectedArguments) {
+			uniqueArgsMap.set(arg.key, arg);
+		}
+
+		return Array.from(uniqueArgsMap.values());
+	}
+
+	private createZodSchema(args: FromAIArgument[], parser: AIParametersParser): z.ZodObject<any> {
+		const schemaObj = args.reduce((acc: Record<string, z.ZodTypeAny>, placeholder) => {
+			acc[placeholder.key] = parser.generateZodSchema(placeholder);
+			return acc;
+		}, {});
+
+		return z.object(schemaObj).required();
+	}
+}
diff --git a/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
new file mode 100644
index 0000000000..469a7d6d4c
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/versionDescription.ts
@@ -0,0 +1,151 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+/* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
+
+import { getConnectionHintNoticeField } from '../../../../utils/sharedFields';
+
+export const versionDescription: INodeTypeDescription = {
+	displayName: 'Call n8n Workflow Tool',
+	name: 'toolWorkflow',
+	icon: 'fa:network-wired',
+	group: ['transform'],
+	description: 'Uses another n8n workflow as a tool. Allows packaging any n8n node(s) as a tool.',
+	defaults: {
+		name: 'Call n8n Workflow Tool',
+	},
+	version: [2],
+	inputs: [],
+	outputs: [NodeConnectionType.AiTool],
+	outputNames: ['Tool'],
+	properties: [
+		getConnectionHintNoticeField([NodeConnectionType.AiAgent]),
+		{
+			displayName:
+				'See an example of a workflow to suggest meeting slots using AI <a href="/templates/1953" target="_blank">here</a>.',
+			name: 'noticeTemplateExample',
+			type: 'notice',
+			default: '',
+		},
+		{
+			displayName: 'Name',
+			name: 'name',
+			type: 'string',
+			default: '',
+			placeholder: 'e.g. My_Color_Tool',
+			validateType: 'string-alphanumeric',
+			description:
+				'The name of the function to be called, could contain letters, numbers, and underscores only',
+		},
+		{
+			displayName: 'Description',
+			name: 'description',
+			type: 'string',
+			default: '',
+			placeholder:
+				'Call this tool to get a random color. The input should be a string with comma separated names of colors to exclude.',
+			typeOptions: {
+				rows: 3,
+			},
+		},
+
+		{
+			displayName:
+				'This tool will call the workflow you define below, and look in the last node for the response. The workflow needs to start with an Execute Workflow trigger',
+			name: 'executeNotice',
+			type: 'notice',
+			default: '',
+		},
+
+		{
+			displayName: 'Source',
+			name: 'source',
+			type: 'options',
+			options: [
+				{
+					name: 'Database',
+					value: 'database',
+					description: 'Load the workflow from the database by ID',
+				},
+				{
+					name: 'Define Below',
+					value: 'parameter',
+					description: 'Pass the JSON code of a workflow',
+				},
+			],
+			default: 'database',
+			description: 'Where to get the workflow to execute from',
+		},
+
+		// ----------------------------------
+		//         source:database
+		// ----------------------------------
+		{
+			displayName: 'Workflow',
+			name: 'workflowId',
+			type: 'workflowSelector',
+			displayOptions: {
+				show: {
+					source: ['database'],
+				},
+			},
+			default: '',
+			required: true,
+		},
+		// -----------------------------------------------
+		//         Resource mapper for workflow inputs
+		// -----------------------------------------------
+		{
+			displayName: 'Workflow Inputs',
+			name: 'workflowInputs',
+			type: 'resourceMapper',
+			noDataExpression: true,
+			default: {
+				mappingMode: 'defineBelow',
+				value: null,
+			},
+			required: true,
+			typeOptions: {
+				loadOptionsDependsOn: ['workflowId.value'],
+				resourceMapper: {
+					localResourceMapperMethod: 'loadWorkflowInputMappings',
+					valuesLabel: 'Workflow Inputs',
+					mode: 'map',
+					fieldWords: {
+						singular: 'workflow input',
+						plural: 'workflow inputs',
+					},
+					addAllFields: true,
+					multiKeyMatch: false,
+					supportAutoMap: false,
+				},
+			},
+			displayOptions: {
+				show: {
+					source: ['database'],
+				},
+				hide: {
+					workflowId: [''],
+				},
+			},
+		},
+		// ----------------------------------
+		//         source:parameter
+		// ----------------------------------
+		{
+			displayName: 'Workflow JSON',
+			name: 'workflowJson',
+			type: 'json',
+			typeOptions: {
+				rows: 10,
+			},
+			displayOptions: {
+				show: {
+					source: ['parameter'],
+				},
+			},
+			default: '\n\n\n\n\n\n\n\n\n',
+			required: true,
+			description: 'The workflow JSON code to execute',
+		},
+	],
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
index 489b4fe28b..27fb1bcd35 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/ChatTrigger.node.ts
@@ -1,6 +1,6 @@
 import type { BaseChatMemory } from '@langchain/community/memory/chat_memory';
 import { pick } from 'lodash';
-import { Node, NodeConnectionType, commonCORSParameters } from 'n8n-workflow';
+import { Node, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IWebhookFunctions,
@@ -241,14 +241,19 @@ export class ChatTrigger extends Node {
 				default: {},
 				options: [
 					// CORS parameters are only valid for when chat is used in hosted or webhook mode
-					...commonCORSParameters.map((p) => ({
-						...p,
+					{
+						displayName: 'Allowed Origins (CORS)',
+						name: 'allowedOrigins',
+						type: 'string',
+						default: '*',
+						description:
+							'Comma-separated list of URLs allowed for cross-origin non-preflight requests. Use * (default) to allow all origins.',
 						displayOptions: {
 							show: {
 								'/mode': ['hostedChat', 'webhook'],
 							},
 						},
-					})),
+					},
 					{
 						...allowFileUploadsOption,
 						displayOptions: {
diff --git a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts
index 02620ab797..c065569eb2 100644
--- a/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts
+++ b/packages/@n8n/nodes-langchain/nodes/trigger/ChatTrigger/GenericFunctions.ts
@@ -1,5 +1,6 @@
-import type { ICredentialDataDecryptedObject, IWebhookFunctions } from 'n8n-workflow';
 import basicAuth from 'basic-auth';
+import type { ICredentialDataDecryptedObject, IWebhookFunctions } from 'n8n-workflow';
+
 import { ChatTriggerAuthorizationError } from './error';
 import type { AuthenticationChatOption } from './types';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
index cbd2cef75a..0323478ee8 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemory/VectorStoreInMemory.node.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
 import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
 
@@ -25,6 +26,7 @@ export class VectorStoreInMemory extends createVectorStoreNode({
 		name: 'vectorStoreInMemory',
 		description: 'Work with your data in In-Memory Vector Store',
 		icon: 'fa:database',
+		iconColor: 'black',
 		docsUrl:
 			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstoreinmemory/',
 	},
@@ -54,6 +56,6 @@ export class VectorStoreInMemory extends createVectorStoreNode({
 		const workflowId = context.getWorkflow().id;
 		const vectorStoreInstance = MemoryVectorStoreManager.getInstance(embeddings);
 
-		void vectorStoreInstance.addDocuments(`${workflowId}__${memoryKey}`, documents, clearStore);
+		await vectorStoreInstance.addDocuments(`${workflowId}__${memoryKey}`, documents, clearStore);
 	},
 }) {}
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts
index 225201a5e1..34d4815034 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryInsert/VectorStoreInMemoryInsert.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { Embeddings } from '@langchain/core/embeddings';
+import type { Document } from 'langchain/document';
 import {
 	NodeConnectionType,
 	type INodeExecutionData,
@@ -6,11 +8,11 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-import type { Document } from 'langchain/document';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { processDocuments } from '../shared/processDocuments';
+
+import type { N8nJsonLoader } from '@utils/N8nJsonLoader';
+
 import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
+import { processDocuments } from '../shared/processDocuments';
 
 // This node is deprecated. Use VectorStoreInMemory instead.
 export class VectorStoreInMemoryInsert implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts
index 7bf48c3d8c..dd2def31e3 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreInMemoryLoad/VectorStoreInMemoryLoad.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-dirname-against-convention */
+import type { Embeddings } from '@langchain/core/embeddings';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -6,9 +7,10 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { Embeddings } from '@langchain/core/embeddings';
+
+import { logWrapper } from '@utils/logWrapper';
+
 import { MemoryVectorStoreManager } from '../shared/MemoryVectorStoreManager';
-import { logWrapper } from '../../../utils/logWrapper';
 
 // This node is deprecated. Use VectorStoreInMemory instead.
 export class VectorStoreInMemoryLoad implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
index 8336958cc5..852453b622 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePGVector/VectorStorePGVector.node.ts
@@ -4,12 +4,13 @@ import {
 	type PGVectorStoreArgs,
 } from '@langchain/community/vectorstores/pgvector';
 import type { EmbeddingsInterface } from '@langchain/core/embeddings';
+import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/transport';
 import type { PostgresNodeCredentials } from 'n8n-nodes-base/dist/nodes/Postgres/v2/helpers/interfaces';
-import { configurePostgres } from 'n8n-nodes-base/dist/nodes/Postgres/v2/transport';
 import type { INodeProperties } from 'n8n-workflow';
 import type pg from 'pg';
 
-import { metadataFilterField } from '../../../utils/sharedFields';
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
 
 type CollectionOptions = {
@@ -227,7 +228,7 @@ export class VectorStorePGVector extends createVectorStoreNode({
 				testedBy: 'postgresConnectionTest',
 			},
 		],
-		operationModes: ['load', 'insert', 'retrieve'],
+		operationModes: ['load', 'insert', 'retrieve', 'retrieve-as-tool'],
 	},
 	sharedFields,
 	insertFields,
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
index d153979ef4..5a11acea24 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/VectorStorePinecone.node.ts
@@ -1,9 +1,11 @@
-import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
 import type { PineconeStoreParams } from '@langchain/pinecone';
 import { PineconeStore } from '@langchain/pinecone';
 import { Pinecone } from '@pinecone-database/pinecone';
+import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
+
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
-import { metadataFilterField } from '../../../utils/sharedFields';
 import { pineconeIndexRLC } from '../shared/descriptions';
 import { pineconeIndexSearch } from '../shared/methods/listSearch';
 
@@ -54,7 +56,7 @@ export class VectorStorePinecone extends createVectorStoreNode({
 		displayName: 'Pinecone Vector Store',
 		name: 'vectorStorePinecone',
 		description: 'Work with your data in Pinecone Vector Store',
-		icon: 'file:pinecone.svg',
+		icon: { light: 'file:pinecone.svg', dark: 'file:pinecone.dark.svg' },
 		docsUrl:
 			'https://docs.n8n.io/integrations/builtin/cluster-nodes/root-nodes/n8n-nodes-langchain.vectorstorepinecone/',
 		credentials: [
@@ -63,7 +65,7 @@ export class VectorStorePinecone extends createVectorStoreNode({
 				required: true,
 			},
 		],
-		operationModes: ['load', 'insert', 'retrieve', 'update'],
+		operationModes: ['load', 'insert', 'retrieve', 'update', 'retrieve-as-tool'],
 	},
 	methods: { listSearch: { pineconeIndexSearch } },
 	retrieveFields,
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.dark.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.dark.svg
new file mode 100644
index 0000000000..4d163c6784
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.dark.svg
@@ -0,0 +1,21 @@
+<svg width="32" height="35" viewBox="0 0 32 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.8555 34.2962C14.9325 34.2962 15.8055 33.4451 15.8055 32.3954C15.8055 31.3456 14.9325 30.4946 13.8555 30.4946C12.7786 30.4946 11.9055 31.3456 11.9055 32.3954C11.9055 33.4451 12.7786 34.2962 13.8555 34.2962Z" fill="white"/>
+<path d="M18.4138 7.19675L19.2512 2.66005" stroke="white" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M22.2656 5.5855L19.3466 2.11099L15.3748 4.37292" stroke="white" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M14.9202 26.5528L15.7337 22.0169" stroke="white" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M18.7729 24.9304L15.83 21.4671L11.8701 23.741" stroke="white" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M16.6077 17.1996L17.4212 12.6633" stroke="white" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M20.4587 15.58L17.5277 12.128L13.5679 14.3904" stroke="white" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M8.32871 26.1554L4.75171 28.5815" stroke="white" stroke-width="2.01017" stroke-linecap="square"/>
+<path d="M8.54383 30.0865L4.3208 28.8738L4.63185 24.5944" stroke="white" stroke-width="2.01017" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M21.3213 28.4299L23.8096 31.9282" stroke="white" stroke-width="2.01017" stroke-linecap="square"/>
+<path d="M19.718 32.045L24.1085 32.3365L25.3527 28.2438" stroke="white" stroke-width="2.01017" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M25.3999 21.3291L29.7784 22.0996" stroke="white" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M26.9072 25.072L30.3048 22.1919L28.1634 18.3557" stroke="white" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M24.1196 12.8615L28.0197 10.763" stroke="white" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M24.3357 8.83965L28.4869 10.5188L27.7093 14.8216" stroke="white" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M6.91639 18.1572L2.52588 17.4101" stroke="white" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M4.17731 21.1645L2 17.328L5.36167 14.436" stroke="white" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M11.0799 10.6129L8.14893 7.34769" stroke="white" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M12.2897 6.77496L7.80349 6.96156L7.01392 11.2649" stroke="white" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg
index b94b8b3af6..e9884a4249 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePinecone/pinecone.svg
@@ -1 +1,21 @@
-<svg xmlns="http://www.w3.org/2000/svg" class="w-full -translate-y-0.5" viewBox="1 1 30 29"><g fill="none" fill-rule="evenodd" transform="translate(0 1)"><path stroke="currentColor" stroke-linecap="square" stroke-width="1.77" d="m14.58 5.24.7-3.89"/><path stroke="#7D7D87" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.77" d="M17.8 3.86 15.36.88l-3.32 1.94"/><path stroke="currentColor" stroke-linecap="square" stroke-width="1.77" d="m11.66 21.84.68-3.89"/><path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.77" d="m14.88 20.45-2.46-2.97-3.31 1.95"/><path stroke="currentColor" stroke-linecap="square" stroke-width="1.77" d="m13.07 13.82.68-3.89"/><path stroke="currentColor" stroke-linecap="square" stroke-linejoin="round" stroke-width="1.77" d="m16.29 12.43-2.45-2.96-3.31 1.94"/><circle cx="10.77" cy="26.85" r="1.63" fill="currentColor" fill-rule="nonzero"/><g stroke="currentColor" stroke-linecap="square"><path stroke-width="1.68" d="m6.15 21.5-2.99 2.08"/><path stroke-linejoin="round" stroke-width="1.68" d="M6.33 24.87 2.8 23.83l.26-3.67"/><path stroke-width="1.68" d="m17.01 23.45 2.08 3"/><path stroke-linejoin="round" stroke-width="1.68" d="m15.67 26.55 3.67.25 1.04-3.51"/><path stroke-width="1.72" d="m20.42 17.36 3.66.66"/><path stroke-linejoin="round" stroke-width="1.72" d="m21.68 20.57 2.84-2.47-1.79-3.29"/><path stroke-width="1.72" d="m19.35 10.1 3.26-1.8"/><path stroke-linejoin="round" stroke-width="1.72" d="M19.53 6.65 23 8.09l-.65 3.69"/><path stroke-width="1.72" d="M4.97 14.64 1.3 14"/><path stroke-linejoin="round" stroke-width="1.72" d="M2.68 17.22.86 13.93l2.81-2.48"/><path stroke-width="1.72" d="M8.45 8.17 6 5.37"/><path stroke-linejoin="round" stroke-width="1.72" d="m9.46 4.88-3.75.16-.66 3.69"/></g></g></svg>
\ No newline at end of file
+<svg width="32" height="35" viewBox="0 0 32 35" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.8555 34.2962C14.9325 34.2962 15.8055 33.4451 15.8055 32.3954C15.8055 31.3456 14.9325 30.4946 13.8555 30.4946C12.7786 30.4946 11.9055 31.3456 11.9055 32.3954C11.9055 33.4451 12.7786 34.2962 13.8555 34.2962Z" fill="black"/>
+<path d="M18.4138 7.19675L19.2512 2.66005" stroke="black" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M22.2656 5.5855L19.3466 2.11099L15.3748 4.37292" stroke="black" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M14.9202 26.5528L15.7337 22.0169" stroke="black" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M18.7729 24.9304L15.83 21.4671L11.8701 23.741" stroke="black" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M16.6077 17.1996L17.4212 12.6633" stroke="black" stroke-width="2.11786" stroke-linecap="square"/>
+<path d="M20.4587 15.58L17.5277 12.128L13.5679 14.3904" stroke="black" stroke-width="2.11786" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M8.32871 26.1554L4.75171 28.5815" stroke="black" stroke-width="2.01017" stroke-linecap="square"/>
+<path d="M8.54383 30.0865L4.3208 28.8738L4.63185 24.5944" stroke="black" stroke-width="2.01017" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M21.3213 28.4299L23.8096 31.9282" stroke="black" stroke-width="2.01017" stroke-linecap="square"/>
+<path d="M19.718 32.045L24.1085 32.3365L25.3527 28.2438" stroke="black" stroke-width="2.01017" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M25.3999 21.3291L29.7784 22.0996" stroke="black" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M26.9072 25.072L30.3048 22.1919L28.1634 18.3557" stroke="black" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M24.1196 12.8615L28.0197 10.763" stroke="black" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M24.3357 8.83965L28.4869 10.5188L27.7093 14.8216" stroke="black" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M6.91639 18.1572L2.52588 17.4101" stroke="black" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M4.17731 21.1645L2 17.328L5.36167 14.436" stroke="black" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+<path d="M11.0799 10.6129L8.14893 7.34769" stroke="black" stroke-width="2.05804" stroke-linecap="square"/>
+<path d="M12.2897 6.77496L7.80349 6.96156L7.01392 11.2649" stroke="black" stroke-width="2.05804" stroke-linecap="square" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts
index 023b65be84..6c10ff1427 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeInsert/VectorStorePineconeInsert.node.ts
@@ -1,3 +1,7 @@
+import type { Document } from '@langchain/core/documents';
+import type { Embeddings } from '@langchain/core/embeddings';
+import { PineconeStore } from '@langchain/pinecone';
+import { Pinecone } from '@pinecone-database/pinecone';
 import {
 	type IExecuteFunctions,
 	type INodeType,
@@ -5,15 +9,12 @@ import {
 	type INodeExecutionData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { Document } from '@langchain/core/documents';
 
-import { PineconeStore } from '@langchain/pinecone';
-import { Pinecone } from '@pinecone-database/pinecone';
-import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { processDocuments } from '../shared/processDocuments';
+import type { N8nJsonLoader } from '@utils/N8nJsonLoader';
+
 import { pineconeIndexRLC } from '../shared/descriptions';
 import { pineconeIndexSearch } from '../shared/methods/listSearch';
+import { processDocuments } from '../shared/processDocuments';
 
 // This node is deprecated. Use VectorStorePinecone instead.
 export class VectorStorePineconeInsert implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts
index d46bccd9f7..54eea2e902 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStorePineconeLoad/VectorStorePineconeLoad.node.ts
@@ -1,3 +1,7 @@
+import type { Embeddings } from '@langchain/core/embeddings';
+import type { PineconeStoreParams } from '@langchain/pinecone';
+import { PineconeStore } from '@langchain/pinecone';
+import { Pinecone } from '@pinecone-database/pinecone';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -5,14 +9,11 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { PineconeStoreParams } from '@langchain/pinecone';
-import { PineconeStore } from '@langchain/pinecone';
-import { Pinecone } from '@pinecone-database/pinecone';
 
-import type { Embeddings } from '@langchain/core/embeddings';
-import { logWrapper } from '../../../utils/logWrapper';
-import { metadataFilterField } from '../../../utils/sharedFields';
-import { getMetadataFiltersValues } from '../../../utils/helpers';
+import { getMetadataFiltersValues } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { pineconeIndexRLC } from '../shared/descriptions';
 import { pineconeIndexSearch } from '../shared/methods/listSearch';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
index 0b5859e0bc..988f607ad7 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreQdrant/VectorStoreQdrant.node.ts
@@ -1,12 +1,13 @@
-import type { IDataObject, INodeProperties } from 'n8n-workflow';
+import type { Callbacks } from '@langchain/core/callbacks/manager';
+import type { Embeddings } from '@langchain/core/embeddings';
 import type { QdrantLibArgs } from '@langchain/qdrant';
 import { QdrantVectorStore } from '@langchain/qdrant';
 import type { Schemas as QdrantSchemas } from '@qdrant/js-client-rest';
+import type { IDataObject, INodeProperties } from 'n8n-workflow';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
 import { qdrantCollectionRLC } from '../shared/descriptions';
 import { qdrantCollectionsSearch } from '../shared/methods/listSearch';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { Callbacks } from '@langchain/core/callbacks/manager';
 
 class ExtendedQdrantVectorStore extends QdrantVectorStore {
 	private static defaultFilter: IDataObject = {};
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
index 549fcd5e7f..a462ff8cf6 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabase/VectorStoreSupabase.node.ts
@@ -1,8 +1,10 @@
-import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
-import { createClient } from '@supabase/supabase-js';
 import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
+import { createClient } from '@supabase/supabase-js';
+import { NodeOperationError, type INodeProperties } from 'n8n-workflow';
+
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
-import { metadataFilterField } from '../../../utils/sharedFields';
 import { supabaseTableNameRLC } from '../shared/descriptions';
 import { supabaseTableNameSearch } from '../shared/methods/listSearch';
 
@@ -53,7 +55,7 @@ export class VectorStoreSupabase extends createVectorStoreNode({
 				required: true,
 			},
 		],
-		operationModes: ['load', 'insert', 'retrieve', 'update'],
+		operationModes: ['load', 'insert', 'retrieve', 'update', 'retrieve-as-tool'],
 	},
 	methods: {
 		listSearch: { supabaseTableNameSearch },
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts
index 44b3a6a397..332f534fe6 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseInsert/VectorStoreSupabaseInsert.node.ts
@@ -1,3 +1,7 @@
+import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
+import type { Document } from '@langchain/core/documents';
+import type { Embeddings } from '@langchain/core/embeddings';
+import { createClient } from '@supabase/supabase-js';
 import {
 	type IExecuteFunctions,
 	type INodeType,
@@ -5,15 +9,12 @@ import {
 	type INodeExecutionData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { Document } from '@langchain/core/documents';
-import { createClient } from '@supabase/supabase-js';
-import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
 
-import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { processDocuments } from '../shared/processDocuments';
+import type { N8nJsonLoader } from '@utils/N8nJsonLoader';
+
 import { supabaseTableNameRLC } from '../shared/descriptions';
 import { supabaseTableNameSearch } from '../shared/methods/listSearch';
+import { processDocuments } from '../shared/processDocuments';
 
 // This node is deprecated. Use VectorStoreSupabase instead.
 export class VectorStoreSupabaseInsert implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts
index f4bdc49e44..eae056adb9 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreSupabaseLoad/VectorStoreSupabaseLoad.node.ts
@@ -1,3 +1,7 @@
+import type { SupabaseLibArgs } from '@langchain/community/vectorstores/supabase';
+import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
+import type { Embeddings } from '@langchain/core/embeddings';
+import { createClient } from '@supabase/supabase-js';
 import {
 	type INodeType,
 	type INodeTypeDescription,
@@ -5,13 +9,11 @@ import {
 	type SupplyData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import type { Embeddings } from '@langchain/core/embeddings';
-import { createClient } from '@supabase/supabase-js';
-import type { SupabaseLibArgs } from '@langchain/community/vectorstores/supabase';
-import { SupabaseVectorStore } from '@langchain/community/vectorstores/supabase';
-import { logWrapper } from '../../../utils/logWrapper';
-import { metadataFilterField } from '../../../utils/sharedFields';
-import { getMetadataFiltersValues } from '../../../utils/helpers';
+
+import { getMetadataFiltersValues } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { supabaseTableNameRLC } from '../shared/descriptions';
 import { supabaseTableNameSearch } from '../shared/methods/listSearch';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.test.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.test.ts
new file mode 100644
index 0000000000..e5694ce096
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.test.ts
@@ -0,0 +1,73 @@
+import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
+import { ZepCloudVectorStore } from '@langchain/community/vectorstores/zep_cloud';
+import { mock } from 'jest-mock-extended';
+import type { ISupplyDataFunctions } from 'n8n-workflow';
+
+import { VectorStoreZep } from './VectorStoreZep.node';
+
+describe('VectorStoreZep', () => {
+	const vectorStore = new VectorStoreZep();
+	const helpers = mock<ISupplyDataFunctions['helpers']>();
+	const executeFunctions = mock<ISupplyDataFunctions>({ helpers });
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+
+		executeFunctions.addInputData.mockReturnValue({ index: 0 });
+	});
+
+	it('should get vector store cloud client', async () => {
+		executeFunctions.getNodeParameter.mockImplementation((paramName: string) => {
+			switch (paramName) {
+				case 'mode':
+					return 'retrieve';
+				case 'collectionName':
+					return 'test-collection';
+				case 'options':
+					return {};
+				default:
+					return undefined;
+			}
+		});
+
+		executeFunctions.getCredentials.mockResolvedValue(
+			mock({
+				apiKey: 'some-key',
+				cloud: true,
+			}),
+		);
+
+		const { response } = await vectorStore.supplyData.call(executeFunctions, 0);
+
+		expect(response).toBeDefined();
+		expect(response).toBeInstanceOf(ZepCloudVectorStore);
+	});
+
+	it('should get vector store self-hosted client', async () => {
+		executeFunctions.getNodeParameter.mockImplementation((paramName: string) => {
+			switch (paramName) {
+				case 'mode':
+					return 'retrieve';
+				case 'collectionName':
+					return 'test-collection';
+				case 'options':
+					return {};
+				default:
+					return undefined;
+			}
+		});
+
+		executeFunctions.getCredentials.mockResolvedValue(
+			mock({
+				apiKey: 'some-key',
+				apiUrl: 'https://example.com',
+				cloud: false,
+			}),
+		);
+
+		const { response } = await vectorStore.supplyData.call(executeFunctions, 0);
+
+		expect(response).toBeDefined();
+		expect(response).toBeInstanceOf(ZepVectorStore);
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
index 184b720d31..1372d54f6e 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZep/VectorStoreZep.node.ts
@@ -1,9 +1,11 @@
+import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
+import { ZepCloudVectorStore } from '@langchain/community/vectorstores/zep_cloud';
 import type { IDataObject, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { IZepConfig } from '@langchain/community/vectorstores/zep';
-import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
+
+import { metadataFilterField } from '@utils/sharedFields';
+
 import { createVectorStoreNode } from '../shared/createVectorStoreNode';
-import { metadataFilterField } from '../../../utils/sharedFields';
 
 const embeddingDimensions: INodeProperties = {
 	displayName: 'Embedding Dimensions',
@@ -82,17 +84,21 @@ export class VectorStoreZep extends createVectorStoreNode({
 		const credentials = await context.getCredentials<{
 			apiKey?: string;
 			apiUrl: string;
+			cloud: boolean;
 		}>('zepApi');
 
-		const zepConfig: IZepConfig = {
-			apiUrl: credentials.apiUrl,
+		const zepConfig = {
 			apiKey: credentials.apiKey,
 			collectionName,
 			embeddingDimensions: options.embeddingDimensions ?? 1536,
 			metadata: filter,
 		};
 
-		return new ZepVectorStore(embeddings, zepConfig);
+		if (credentials.cloud) {
+			return new ZepCloudVectorStore(embeddings, zepConfig);
+		} else {
+			return new ZepVectorStore(embeddings, { ...zepConfig, apiUrl: credentials.apiUrl });
+		}
 	},
 	async populateVectorStore(context, embeddings, documents, itemIndex) {
 		const collectionName = context.getNodeParameter('collectionName', itemIndex) as string;
@@ -105,10 +111,10 @@ export class VectorStoreZep extends createVectorStoreNode({
 		const credentials = await context.getCredentials<{
 			apiKey?: string;
 			apiUrl: string;
+			cloud: boolean;
 		}>('zepApi');
 
 		const zepConfig = {
-			apiUrl: credentials.apiUrl,
 			apiKey: credentials.apiKey,
 			collectionName,
 			embeddingDimensions: options.embeddingDimensions ?? 1536,
@@ -116,7 +122,14 @@ export class VectorStoreZep extends createVectorStoreNode({
 		};
 
 		try {
-			await ZepVectorStore.fromDocuments(documents, embeddings, zepConfig);
+			if (credentials.cloud) {
+				await ZepCloudVectorStore.fromDocuments(documents, embeddings, zepConfig);
+			} else {
+				await ZepVectorStore.fromDocuments(documents, embeddings, {
+					...zepConfig,
+					apiUrl: credentials.apiUrl,
+				});
+			}
 		} catch (error) {
 			const errorCode = (error as IDataObject).code as number;
 			const responseData = (error as IDataObject).responseData as string;
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts
index 3b40e07d65..4892d8ad85 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepInsert/VectorStoreZepInsert.node.ts
@@ -1,3 +1,6 @@
+import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
+import type { Document } from '@langchain/core/documents';
+import type { Embeddings } from '@langchain/core/embeddings';
 import {
 	type IExecuteFunctions,
 	type INodeType,
@@ -5,10 +8,9 @@ import {
 	type INodeExecutionData,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
-import type { Embeddings } from '@langchain/core/embeddings';
-import type { Document } from '@langchain/core/documents';
-import type { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
+
+import type { N8nJsonLoader } from '@utils/N8nJsonLoader';
+
 import { processDocuments } from '../shared/processDocuments';
 
 // This node is deprecated. Use VectorStoreZep instead.
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts
index dd30a0808e..040b845e57 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/VectorStoreZepLoad/VectorStoreZepLoad.node.ts
@@ -1,3 +1,6 @@
+import type { IZepConfig } from '@langchain/community/vectorstores/zep';
+import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
+import type { Embeddings } from '@langchain/core/embeddings';
 import {
 	NodeConnectionType,
 	type INodeType,
@@ -5,12 +8,10 @@ import {
 	type ISupplyDataFunctions,
 	type SupplyData,
 } from 'n8n-workflow';
-import type { IZepConfig } from '@langchain/community/vectorstores/zep';
-import { ZepVectorStore } from '@langchain/community/vectorstores/zep';
-import type { Embeddings } from '@langchain/core/embeddings';
-import { metadataFilterField } from '../../../utils/sharedFields';
-import { getMetadataFiltersValues } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
+
+import { getMetadataFiltersValues } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import { metadataFilterField } from '@utils/sharedFields';
 
 // This node is deprecated. Use VectorStoreZep instead.
 export class VectorStoreZepLoad implements INodeType {
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.test.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.test.ts
new file mode 100644
index 0000000000..1088505a0a
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.test.ts
@@ -0,0 +1,44 @@
+import type { OpenAIEmbeddings } from '@langchain/openai';
+import { mock } from 'jest-mock-extended';
+
+import { MemoryVectorStoreManager } from './MemoryVectorStoreManager';
+
+describe('MemoryVectorStoreManager', () => {
+	it('should create an instance of MemoryVectorStoreManager', () => {
+		const embeddings = mock<OpenAIEmbeddings>();
+
+		const instance = MemoryVectorStoreManager.getInstance(embeddings);
+		expect(instance).toBeInstanceOf(MemoryVectorStoreManager);
+	});
+
+	it('should return existing instance', () => {
+		const embeddings = mock<OpenAIEmbeddings>();
+
+		const instance1 = MemoryVectorStoreManager.getInstance(embeddings);
+		const instance2 = MemoryVectorStoreManager.getInstance(embeddings);
+		expect(instance1).toBe(instance2);
+	});
+
+	it('should update embeddings in existing instance', () => {
+		const embeddings1 = mock<OpenAIEmbeddings>();
+		const embeddings2 = mock<OpenAIEmbeddings>();
+
+		const instance = MemoryVectorStoreManager.getInstance(embeddings1);
+		MemoryVectorStoreManager.getInstance(embeddings2);
+
+		expect((instance as any).embeddings).toBe(embeddings2);
+	});
+
+	it('should update embeddings in existing vector store instances', async () => {
+		const embeddings1 = mock<OpenAIEmbeddings>();
+		const embeddings2 = mock<OpenAIEmbeddings>();
+
+		const instance1 = MemoryVectorStoreManager.getInstance(embeddings1);
+		await instance1.getVectorStore('test');
+
+		const instance2 = MemoryVectorStoreManager.getInstance(embeddings2);
+		const vectorStoreInstance2 = await instance2.getVectorStore('test');
+
+		expect((vectorStoreInstance2 as any).embeddings).toBe(embeddings2);
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
index 1076fb93ba..f92c8abd41 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/MemoryVectorStoreManager.ts
@@ -11,14 +11,23 @@ export class MemoryVectorStoreManager {
 		this.vectorStoreBuffer = new Map();
 	}
 
-	public static getInstance(embeddings: Embeddings): MemoryVectorStoreManager {
+	static getInstance(embeddings: Embeddings): MemoryVectorStoreManager {
 		if (!MemoryVectorStoreManager.instance) {
 			MemoryVectorStoreManager.instance = new MemoryVectorStoreManager(embeddings);
+		} else {
+			// We need to update the embeddings in the existing instance.
+			// This is important as embeddings instance is wrapped in a logWrapper,
+			// which relies on supplyDataFunctions context which changes on each workflow run
+			MemoryVectorStoreManager.instance.embeddings = embeddings;
+			MemoryVectorStoreManager.instance.vectorStoreBuffer.forEach((vectorStoreInstance) => {
+				vectorStoreInstance.embeddings = embeddings;
+			});
 		}
+
 		return MemoryVectorStoreManager.instance;
 	}
 
-	public async getVectorStore(memoryKey: string): Promise<MemoryVectorStore> {
+	async getVectorStore(memoryKey: string): Promise<MemoryVectorStore> {
 		let vectorStoreInstance = this.vectorStoreBuffer.get(memoryKey);
 
 		if (!vectorStoreInstance) {
@@ -29,7 +38,7 @@ export class MemoryVectorStoreManager {
 		return vectorStoreInstance;
 	}
 
-	public async addDocuments(
+	async addDocuments(
 		memoryKey: string,
 		documents: Document[],
 		clearStore?: boolean,
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/__snapshots__/createVectorStoreNode.test.ts.snap b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/__snapshots__/createVectorStoreNode.test.ts.snap
new file mode 100644
index 0000000000..2eff69800b
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/__snapshots__/createVectorStoreNode.test.ts.snap
@@ -0,0 +1,234 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`createVectorStoreNode retrieve mode supplies vector store as data 1`] = `
+{
+  "codex": {
+    "categories": [
+      "AI",
+    ],
+    "resources": {
+      "primaryDocumentation": [
+        {
+          "url": undefined,
+        },
+      ],
+    },
+    "subcategories": {
+      "AI": [
+        "Vector Stores",
+        "Tools",
+        "Root Nodes",
+      ],
+      "Tools": [
+        "Other Tools",
+      ],
+    },
+  },
+  "credentials": undefined,
+  "defaults": {
+    "name": undefined,
+  },
+  "description": undefined,
+  "displayName": undefined,
+  "group": [
+    "transform",
+  ],
+  "icon": undefined,
+  "iconColor": undefined,
+  "inputs": "={{
+			((parameters) => {
+				const mode = parameters?.mode;
+				const inputs = [{ displayName: "Embedding", type: "ai_embedding", required: true, maxConnections: 1}]
+
+				if (mode === 'retrieve-as-tool') {
+					return inputs;
+				}
+
+				if (['insert', 'load', 'update'].includes(mode)) {
+					inputs.push({ displayName: "", type: "main"})
+				}
+
+				if (['insert'].includes(mode)) {
+					inputs.push({ displayName: "Document", type: "ai_document", required: true, maxConnections: 1})
+				}
+				return inputs
+			})($parameter)
+		}}",
+  "name": "mockConstructor",
+  "outputs": "={{
+			((parameters) => {
+				const mode = parameters?.mode ?? 'retrieve';
+
+				if (mode === 'retrieve-as-tool') {
+					return [{ displayName: "Tool", type: "ai_tool"}]
+				}
+
+				if (mode === 'retrieve') {
+					return [{ displayName: "Vector Store", type: "ai_vectorStore"}]
+				}
+				return [{ displayName: "", type: "main"}]
+			})($parameter)
+		}}",
+  "properties": [
+    {
+      "default": "retrieve",
+      "displayName": "Operation Mode",
+      "name": "mode",
+      "noDataExpression": true,
+      "options": [
+        {
+          "action": "Get ranked documents from vector store",
+          "description": "Get many ranked documents from vector store for query",
+          "name": "Get Many",
+          "value": "load",
+        },
+        {
+          "action": "Add documents to vector store",
+          "description": "Insert documents into vector store",
+          "name": "Insert Documents",
+          "value": "insert",
+        },
+        {
+          "action": "Retrieve documents for Chain/Tool as Vector Store",
+          "description": "Retrieve documents from vector store to be used as vector store with AI nodes",
+          "name": "Retrieve Documents (As Vector Store for Chain/Tool)",
+          "outputConnectionType": "ai_vectorStore",
+          "value": "retrieve",
+        },
+        {
+          "action": "Retrieve documents for AI Agent as Tool",
+          "description": "Retrieve documents from vector store to be used as tool with AI nodes",
+          "name": "Retrieve Documents (As Tool for AI Agent)",
+          "outputConnectionType": "ai_tool",
+          "value": "retrieve-as-tool",
+        },
+      ],
+      "type": "options",
+    },
+    {
+      "default": "",
+      "displayName": "This node must be connected to a vector store retriever. <a data-action='openSelectiveNodeCreator' data-action-parameter-connectiontype='ai_retriever'>Insert one</a>",
+      "displayOptions": {
+        "show": {
+          "mode": [
+            "retrieve",
+          ],
+        },
+      },
+      "name": "notice",
+      "type": "notice",
+      "typeOptions": {
+        "containerClass": "ndv-connection-hint-notice",
+      },
+    },
+    {
+      "default": "",
+      "description": "Name of the vector store",
+      "displayName": "Name",
+      "displayOptions": {
+        "show": {
+          "mode": [
+            "retrieve-as-tool",
+          ],
+        },
+      },
+      "name": "toolName",
+      "placeholder": "e.g. company_knowledge_base",
+      "required": true,
+      "type": "string",
+      "validateType": "string-alphanumeric",
+    },
+    {
+      "default": "",
+      "description": "Explain to the LLM what this tool does, a good, specific description would allow LLMs to produce expected results much more often",
+      "displayName": "Description",
+      "displayOptions": {
+        "show": {
+          "mode": [
+            "retrieve-as-tool",
+          ],
+        },
+      },
+      "name": "toolDescription",
+      "placeholder": "e.g. undefined",
+      "required": true,
+      "type": "string",
+      "typeOptions": {
+        "rows": 2,
+      },
+    },
+    {
+      "default": "",
+      "description": "Search prompt to retrieve matching documents from the vector store using similarity-based ranking",
+      "displayName": "Prompt",
+      "displayOptions": {
+        "show": {
+          "mode": [
+            "load",
+          ],
+        },
+      },
+      "name": "prompt",
+      "required": true,
+      "type": "string",
+    },
+    {
+      "default": 4,
+      "description": "Number of top results to fetch from vector store",
+      "displayName": "Limit",
+      "displayOptions": {
+        "show": {
+          "mode": [
+            "load",
+            "retrieve-as-tool",
+          ],
+        },
+      },
+      "name": "topK",
+      "type": "number",
+    },
+    {
+      "default": true,
+      "description": "Whether or not to include document metadata",
+      "displayName": "Include Metadata",
+      "displayOptions": {
+        "show": {
+          "mode": [
+            "load",
+            "retrieve-as-tool",
+          ],
+        },
+      },
+      "name": "includeDocumentMetadata",
+      "type": "boolean",
+    },
+    {
+      "default": "",
+      "description": "ID of an embedding entry",
+      "displayName": "ID",
+      "displayOptions": {
+        "show": {
+          "mode": [
+            "update",
+          ],
+        },
+      },
+      "name": "id",
+      "required": true,
+      "type": "string",
+    },
+    {
+      "displayOptions": {
+        "show": {
+          "mode": [
+            "load",
+            "retrieve-as-tool",
+          ],
+        },
+      },
+      "name": "loadField",
+    },
+  ],
+  "version": 1,
+}
+`;
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.test.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.test.ts
new file mode 100644
index 0000000000..28d15def1e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.test.ts
@@ -0,0 +1,166 @@
+import type { DocumentInterface } from '@langchain/core/documents';
+import type { Embeddings } from '@langchain/core/embeddings';
+import type { VectorStore } from '@langchain/core/vectorstores';
+import { mock } from 'jest-mock-extended';
+import type { DynamicTool } from 'langchain/tools';
+import type { ISupplyDataFunctions, NodeParameterValueType } from 'n8n-workflow';
+
+import type { VectorStoreNodeConstructorArgs } from './createVectorStoreNode';
+import { createVectorStoreNode } from './createVectorStoreNode';
+
+jest.mock('@utils/logWrapper', () => ({
+	logWrapper: jest.fn().mockImplementation((val: DynamicTool) => ({ logWrapped: val })),
+}));
+
+const DEFAULT_PARAMETERS = {
+	options: {},
+	topK: 1,
+};
+
+const MOCK_DOCUMENTS: Array<[DocumentInterface, number]> = [
+	[
+		{
+			pageContent: 'first page',
+			metadata: {
+				id: 123,
+			},
+		},
+		0,
+	],
+	[
+		{
+			pageContent: 'second page',
+			metadata: {
+				id: 567,
+			},
+		},
+		0,
+	],
+];
+
+const MOCK_SEARCH_VALUE = 'search value';
+const MOCK_EMBEDDED_SEARCH_VALUE = [1, 2, 3];
+
+describe('createVectorStoreNode', () => {
+	const vectorStore = mock<VectorStore>({
+		similaritySearchVectorWithScore: jest.fn().mockResolvedValue(MOCK_DOCUMENTS),
+	});
+
+	const vectorStoreNodeArgs = mock<VectorStoreNodeConstructorArgs>({
+		sharedFields: [],
+		insertFields: [],
+		loadFields: [
+			{
+				name: 'loadField',
+			},
+		],
+		retrieveFields: [],
+		updateFields: [],
+		getVectorStoreClient: jest.fn().mockReturnValue(vectorStore),
+	});
+
+	const embeddings = mock<Embeddings>({
+		embedQuery: jest.fn().mockResolvedValue(MOCK_EMBEDDED_SEARCH_VALUE),
+	});
+
+	const context = mock<ISupplyDataFunctions>({
+		getNodeParameter: jest.fn(),
+		getInputConnectionData: jest.fn().mockReturnValue(embeddings),
+	});
+
+	describe('retrieve mode', () => {
+		it('supplies vector store as data', async () => {
+			// ARRANGE
+			const parameters: Record<string, NodeParameterValueType | object> = {
+				...DEFAULT_PARAMETERS,
+				mode: 'retrieve',
+			};
+			context.getNodeParameter.mockImplementation(
+				(parameterName: string): NodeParameterValueType | object => parameters[parameterName],
+			);
+
+			// ACT
+			const VectorStoreNodeType = createVectorStoreNode(vectorStoreNodeArgs);
+			const nodeType = new VectorStoreNodeType();
+			const data = await nodeType.supplyData.call(context, 1);
+			const wrappedVectorStore = (data.response as { logWrapped: VectorStore }).logWrapped;
+
+			// ASSERT
+			expect(nodeType.description).toMatchSnapshot();
+			expect(wrappedVectorStore).toEqual(vectorStore);
+			expect(vectorStoreNodeArgs.getVectorStoreClient).toHaveBeenCalled();
+		});
+	});
+
+	describe('retrieve-as-tool mode', () => {
+		it('supplies DynamicTool that queries vector store and returns documents with metadata', async () => {
+			// ARRANGE
+			const parameters: Record<string, NodeParameterValueType | object> = {
+				...DEFAULT_PARAMETERS,
+				mode: 'retrieve-as-tool',
+				description: 'tool description',
+				toolName: 'tool name',
+				includeDocumentMetadata: true,
+			};
+			context.getNodeParameter.mockImplementation(
+				(parameterName: string): NodeParameterValueType | object => parameters[parameterName],
+			);
+
+			// ACT
+			const VectorStoreNodeType = createVectorStoreNode(vectorStoreNodeArgs);
+			const nodeType = new VectorStoreNodeType();
+			const data = await nodeType.supplyData.call(context, 1);
+			const tool = (data.response as { logWrapped: DynamicTool }).logWrapped;
+			const output = await tool?.func(MOCK_SEARCH_VALUE);
+
+			// ASSERT
+			expect(tool?.getName()).toEqual(parameters.toolName);
+			expect(tool?.description).toEqual(parameters.toolDescription);
+			expect(embeddings.embedQuery).toHaveBeenCalledWith(MOCK_SEARCH_VALUE);
+			expect(vectorStore.similaritySearchVectorWithScore).toHaveBeenCalledWith(
+				MOCK_EMBEDDED_SEARCH_VALUE,
+				parameters.topK,
+				parameters.filter,
+			);
+			expect(output).toEqual([
+				{ type: 'text', text: JSON.stringify(MOCK_DOCUMENTS[0][0]) },
+				{ type: 'text', text: JSON.stringify(MOCK_DOCUMENTS[1][0]) },
+			]);
+		});
+
+		it('supplies DynamicTool that queries vector store and returns documents without metadata', async () => {
+			// ARRANGE
+			const parameters: Record<string, NodeParameterValueType | object> = {
+				...DEFAULT_PARAMETERS,
+				mode: 'retrieve-as-tool',
+				description: 'tool description',
+				toolName: 'tool name',
+				includeDocumentMetadata: false,
+			};
+			context.getNodeParameter.mockImplementation(
+				(parameterName: string): NodeParameterValueType | object => parameters[parameterName],
+			);
+
+			// ACT
+			const VectorStoreNodeType = createVectorStoreNode(vectorStoreNodeArgs);
+			const nodeType = new VectorStoreNodeType();
+			const data = await nodeType.supplyData.call(context, 1);
+			const tool = (data.response as { logWrapped: DynamicTool }).logWrapped;
+			const output = await tool?.func(MOCK_SEARCH_VALUE);
+
+			// ASSERT
+			expect(tool?.getName()).toEqual(parameters.toolName);
+			expect(tool?.description).toEqual(parameters.toolDescription);
+			expect(embeddings.embedQuery).toHaveBeenCalledWith(MOCK_SEARCH_VALUE);
+			expect(vectorStore.similaritySearchVectorWithScore).toHaveBeenCalledWith(
+				MOCK_EMBEDDED_SEARCH_VALUE,
+				parameters.topK,
+				parameters.filter,
+			);
+			expect(output).toEqual([
+				{ type: 'text', text: JSON.stringify({ pageContent: MOCK_DOCUMENTS[0][0].pageContent }) },
+				{ type: 'text', text: JSON.stringify({ pageContent: MOCK_DOCUMENTS[1][0].pageContent }) },
+			]);
+		});
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
index 2de9304fc5..441126c985 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/createVectorStoreNode.ts
@@ -3,6 +3,7 @@
 import type { Document } from '@langchain/core/documents';
 import type { Embeddings } from '@langchain/core/embeddings';
 import type { VectorStore } from '@langchain/core/vectorstores';
+import { DynamicTool } from 'langchain/tools';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
@@ -17,18 +18,25 @@ import type {
 	INodeListSearchResult,
 	Icon,
 	INodePropertyOptions,
+	ThemeIconColor,
 } from 'n8n-workflow';
 
+import { getMetadataFiltersValues, logAiEvent } from '@utils/helpers';
+import { logWrapper } from '@utils/logWrapper';
+import type { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
+import { getConnectionHintNoticeField } from '@utils/sharedFields';
+
 import { processDocument } from './processDocuments';
-import { getMetadataFiltersValues, logAiEvent } from '../../../utils/helpers';
-import { logWrapper } from '../../../utils/logWrapper';
-import type { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
-import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { getConnectionHintNoticeField } from '../../../utils/sharedFields';
 
-type NodeOperationMode = 'insert' | 'load' | 'retrieve' | 'update';
+type NodeOperationMode = 'insert' | 'load' | 'retrieve' | 'update' | 'retrieve-as-tool';
 
-const DEFAULT_OPERATION_MODES: NodeOperationMode[] = ['load', 'insert', 'retrieve'];
+const DEFAULT_OPERATION_MODES: NodeOperationMode[] = [
+	'load',
+	'insert',
+	'retrieve',
+	'retrieve-as-tool',
+];
 
 interface NodeMeta {
 	displayName: string;
@@ -36,11 +44,12 @@ interface NodeMeta {
 	description: string;
 	docsUrl: string;
 	icon: Icon;
+	iconColor?: ThemeIconColor;
 	credentials?: INodeCredentialDescription[];
 	operationModes?: NodeOperationMode[];
 }
 
-interface VectorStoreNodeConstructorArgs {
+export interface VectorStoreNodeConstructorArgs {
 	meta: NodeMeta;
 	methods?: {
 		listSearch?: {
@@ -71,10 +80,13 @@ interface VectorStoreNodeConstructorArgs {
 	) => Promise<VectorStore>;
 }
 
-function transformDescriptionForOperationMode(fields: INodeProperties[], mode: NodeOperationMode) {
+function transformDescriptionForOperationMode(
+	fields: INodeProperties[],
+	mode: NodeOperationMode | NodeOperationMode[],
+) {
 	return fields.map((field) => ({
 		...field,
-		displayOptions: { show: { mode: [mode] } },
+		displayOptions: { show: { mode: Array.isArray(mode) ? mode : [mode] } },
 	}));
 }
 
@@ -99,10 +111,18 @@ function getOperationModeOptions(args: VectorStoreNodeConstructorArgs): INodePro
 			action: 'Add documents to vector store',
 		},
 		{
-			name: 'Retrieve Documents (For Agent/Chain)',
+			name: 'Retrieve Documents (As Vector Store for Chain/Tool)',
 			value: 'retrieve',
-			description: 'Retrieve documents from vector store to be used with AI nodes',
-			action: 'Retrieve documents for AI processing',
+			description: 'Retrieve documents from vector store to be used as vector store with AI nodes',
+			action: 'Retrieve documents for Chain/Tool as Vector Store',
+			outputConnectionType: NodeConnectionType.AiVectorStore,
+		},
+		{
+			name: 'Retrieve Documents (As Tool for AI Agent)',
+			value: 'retrieve-as-tool',
+			description: 'Retrieve documents from vector store to be used as tool with AI nodes',
+			action: 'Retrieve documents for AI Agent as Tool',
+			outputConnectionType: NodeConnectionType.AiTool,
 		},
 		{
 			name: 'Update Documents',
@@ -124,6 +144,7 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 			name: args.meta.name,
 			description: args.meta.description,
 			icon: args.meta.icon,
+			iconColor: args.meta.iconColor,
 			group: ['transform'],
 			version: 1,
 			defaults: {
@@ -132,7 +153,8 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 			codex: {
 				categories: ['AI'],
 				subcategories: {
-					AI: ['Vector Stores', 'Root Nodes'],
+					AI: ['Vector Stores', 'Tools', 'Root Nodes'],
+					Tools: ['Other Tools'],
 				},
 				resources: {
 					primaryDocumentation: [
@@ -149,6 +171,10 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 				const mode = parameters?.mode;
 				const inputs = [{ displayName: "Embedding", type: "${NodeConnectionType.AiEmbedding}", required: true, maxConnections: 1}]
 
+				if (mode === 'retrieve-as-tool') {
+					return inputs;
+				}
+
 				if (['insert', 'load', 'update'].includes(mode)) {
 					inputs.push({ displayName: "", type: "${NodeConnectionType.Main}"})
 				}
@@ -162,6 +188,11 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 			outputs: `={{
 			((parameters) => {
 				const mode = parameters?.mode ?? 'retrieve';
+
+				if (mode === 'retrieve-as-tool') {
+					return [{ displayName: "Tool", type: "${NodeConnectionType.AiTool}"}]
+				}
+
 				if (mode === 'retrieve') {
 					return [{ displayName: "Vector Store", type: "${NodeConnectionType.AiVectorStore}"}]
 				}
@@ -185,6 +216,37 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 						},
 					},
 				},
+				{
+					displayName: 'Name',
+					name: 'toolName',
+					type: 'string',
+					default: '',
+					required: true,
+					description: 'Name of the vector store',
+					placeholder: 'e.g. company_knowledge_base',
+					validateType: 'string-alphanumeric',
+					displayOptions: {
+						show: {
+							mode: ['retrieve-as-tool'],
+						},
+					},
+				},
+				{
+					displayName: 'Description',
+					name: 'toolDescription',
+					type: 'string',
+					default: '',
+					required: true,
+					typeOptions: { rows: 2 },
+					description:
+						'Explain to the LLM what this tool does, a good, specific description would allow LLMs to produce expected results much more often',
+					placeholder: `e.g. ${args.meta.description}`,
+					displayOptions: {
+						show: {
+							mode: ['retrieve-as-tool'],
+						},
+					},
+				},
 				...args.sharedFields,
 				...transformDescriptionForOperationMode(args.insertFields ?? [], 'insert'),
 				// Prompt and topK are always used for the load operation
@@ -210,7 +272,19 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 					description: 'Number of top results to fetch from vector store',
 					displayOptions: {
 						show: {
-							mode: ['load'],
+							mode: ['load', 'retrieve-as-tool'],
+						},
+					},
+				},
+				{
+					displayName: 'Include Metadata',
+					name: 'includeDocumentMetadata',
+					type: 'boolean',
+					default: true,
+					description: 'Whether or not to include document metadata',
+					displayOptions: {
+						show: {
+							mode: ['load', 'retrieve-as-tool'],
 						},
 					},
 				},
@@ -228,7 +302,10 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 						},
 					},
 				},
-				...transformDescriptionForOperationMode(args.loadFields ?? [], 'load'),
+				...transformDescriptionForOperationMode(args.loadFields ?? [], [
+					'load',
+					'retrieve-as-tool',
+				]),
 				...transformDescriptionForOperationMode(args.retrieveFields ?? [], 'retrieve'),
 				...transformDescriptionForOperationMode(args.updateFields ?? [], 'update'),
 			],
@@ -267,10 +344,16 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 						filter,
 					);
 
+					const includeDocumentMetadata = this.getNodeParameter(
+						'includeDocumentMetadata',
+						itemIndex,
+						true,
+					) as boolean;
+
 					const serializedDocs = docs.map(([doc, score]) => {
 						const document = {
-							metadata: doc.metadata,
 							pageContent: doc.pageContent,
+							...(includeDocumentMetadata ? { metadata: doc.metadata } : {}),
 						};
 
 						return {
@@ -377,12 +460,12 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 
 			throw new NodeOperationError(
 				this.getNode(),
-				'Only the "load" and "insert" operation modes are supported with execute',
+				'Only the "load", "update" and "insert" operation modes are supported with execute',
 			);
 		}
 
 		async supplyData(this: ISupplyDataFunctions, itemIndex: number): Promise<SupplyData> {
-			const mode = this.getNodeParameter('mode', 0) as 'load' | 'insert' | 'retrieve';
+			const mode = this.getNodeParameter('mode', 0) as NodeOperationMode;
 			const filter = getMetadataFiltersValues(this, itemIndex);
 			const embeddings = (await this.getInputConnectionData(
 				NodeConnectionType.AiEmbedding,
@@ -396,9 +479,54 @@ export const createVectorStoreNode = (args: VectorStoreNodeConstructorArgs) =>
 				};
 			}
 
+			if (mode === 'retrieve-as-tool') {
+				const toolDescription = this.getNodeParameter('toolDescription', itemIndex) as string;
+				const toolName = this.getNodeParameter('toolName', itemIndex) as string;
+				const topK = this.getNodeParameter('topK', itemIndex, 4) as number;
+				const includeDocumentMetadata = this.getNodeParameter(
+					'includeDocumentMetadata',
+					itemIndex,
+					true,
+				) as boolean;
+
+				const vectorStoreTool = new DynamicTool({
+					name: toolName,
+					description: toolDescription,
+					func: async (input) => {
+						const vectorStore = await args.getVectorStoreClient(
+							this,
+							filter,
+							embeddings,
+							itemIndex,
+						);
+						const embeddedPrompt = await embeddings.embedQuery(input);
+						const documents = await vectorStore.similaritySearchVectorWithScore(
+							embeddedPrompt,
+							topK,
+							filter,
+						);
+						return documents
+							.map((document) => {
+								if (includeDocumentMetadata) {
+									return { type: 'text', text: JSON.stringify(document[0]) };
+								}
+								return {
+									type: 'text',
+									text: JSON.stringify({ pageContent: document[0].pageContent }),
+								};
+							})
+							.filter((document) => !!document);
+					},
+				});
+
+				return {
+					response: logWrapper(vectorStoreTool, this),
+				};
+			}
+
 			throw new NodeOperationError(
 				this.getNode(),
-				'Only the "retrieve" operation mode is supported to supply data',
+				'Only the "retrieve" and "retrieve-as-tool" operation mode is supported to supply data',
 			);
 		}
 	};
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts
index f12ff5d5cf..278d879f90 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/methods/listSearch.ts
@@ -1,6 +1,6 @@
-import { ApplicationError, type IDataObject, type ILoadOptionsFunctions } from 'n8n-workflow';
 import { Pinecone } from '@pinecone-database/pinecone';
 import { QdrantClient } from '@qdrant/js-client-rest';
+import { ApplicationError, type IDataObject, type ILoadOptionsFunctions } from 'n8n-workflow';
 
 export async function pineconeIndexSearch(this: ILoadOptionsFunctions) {
 	const credentials = await this.getCredentials('pineconeApi');
diff --git a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
index 5a3847d691..0c28d8db25 100644
--- a/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vector_store/shared/processDocuments.ts
@@ -1,7 +1,8 @@
 import type { Document } from '@langchain/core/documents';
 import type { INodeExecutionData } from 'n8n-workflow';
-import { N8nJsonLoader } from '../../../utils/N8nJsonLoader';
-import { N8nBinaryLoader } from '../../../utils/N8nBinaryLoader';
+
+import { N8nBinaryLoader } from '@utils/N8nBinaryLoader';
+import { N8nJsonLoader } from '@utils/N8nJsonLoader';
 
 export async function processDocuments(
 	documentInput: N8nJsonLoader | N8nBinaryLoader | Array<Document<Record<string, unknown>>>,
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts
index 1743c69618..251618c01e 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/OpenAi.node.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, INodeType } from 'n8n-workflow';
+
 import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { listSearch, loadOptions } from './methods';
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts
index b9a0dee535..3ac5e45352 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/create.operation.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { NodeOperationError, updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 import { modelRLC } from '../descriptions';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts
index 099e5fd3e6..7287d8ebfd 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/deleteAssistant.operation.ts
@@ -1,5 +1,6 @@
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 import { assistantRLC } from '../descriptions';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts
index 3f869ffcc8..5973319492 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/index.ts
@@ -2,8 +2,8 @@ import type { INodeProperties } from 'n8n-workflow';
 
 import * as create from './create.operation';
 import * as deleteAssistant from './deleteAssistant.operation';
-import * as message from './message.operation';
 import * as list from './list.operation';
+import * as message from './message.operation';
 import * as update from './update.operation';
 
 export { create, deleteAssistant, message, list, update };
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts
index c029af4d48..ec75be1cfd 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/list.operation.ts
@@ -1,5 +1,6 @@
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
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 cf770e4057..bc22ac948f 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,32 +18,18 @@ import {
 } from 'n8n-workflow';
 import { OpenAI as OpenAIClient } from 'openai';
 
-import { getConnectedTools } from '../../../../../utils/helpers';
-import { getTracingConfig } from '../../../../../utils/tracing';
+import { promptTypeOptions } from '@utils/descriptions';
+import { getConnectedTools } from '@utils/helpers';
+import { getTracingConfig } from '@utils/tracing';
+
 import { formatToOpenAIAssistantTool } from '../../helpers/utils';
 import { assistantRLC } from '../descriptions';
 
 const properties: INodeProperties[] = [
 	assistantRLC,
 	{
-		displayName: 'Prompt',
+		...promptTypeOptions,
 		name: 'prompt',
-		type: 'options',
-		options: [
-			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-				name: 'Take from previous node automatically',
-				value: 'auto',
-				description: 'Looks for an input field called chatInput',
-			},
-			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-				name: 'Define below',
-				value: 'define',
-				description: 'Use an expression to reference data in previous nodes or enter static text',
-			},
-		],
-		default: 'auto',
 	},
 	{
 		displayName: 'Text',
@@ -120,6 +106,11 @@ const properties: INodeProperties[] = [
 				default: 'https://api.openai.com/v1',
 				description: 'Override the default base URL for the API',
 				type: 'string',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.8 } }],
+					},
+				},
 			},
 			{
 				displayName: 'Max Retries',
@@ -196,11 +187,13 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 		preserveOriginalTools?: boolean;
 	};
 
+	const baseURL = (options.baseURL ?? credentials.url) as string;
+
 	const client = new OpenAIClient({
 		apiKey: credentials.apiKey as string,
 		maxRetries: options.maxRetries ?? 2,
 		timeout: options.timeout ?? 10000,
-		baseURL: options.baseURL,
+		baseURL,
 	});
 
 	const agent = new OpenAIAssistantRunnable({ assistantId, client, asAgent: true });
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts
index 8a997aa99d..f197ace5ec 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/assistant/update.operation.ts
@@ -4,7 +4,8 @@ import type {
 	INodeExecutionData,
 	IDataObject,
 } from 'n8n-workflow';
-import { NodeOperationError, updateDisplayOptions } from 'n8n-workflow';
+import { ApplicationError, NodeOperationError, updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 import { assistantRLC, modelRLC } from '../descriptions';
 
@@ -116,6 +117,18 @@ const displayOptions = {
 
 export const description = updateDisplayOptions(displayOptions, properties);
 
+function getFileIds(file_ids: unknown): string[] {
+	if (Array.isArray(file_ids)) {
+		return file_ids;
+	}
+
+	if (typeof file_ids === 'string') {
+		return file_ids.split(',').map((file_id) => file_id.trim());
+	}
+
+	throw new ApplicationError('Invalid file_ids type');
+}
+
 export async function execute(this: IExecuteFunctions, i: number): Promise<INodeExecutionData[]> {
 	const assistantId = this.getNodeParameter('assistantId', i, '', { extractValue: true }) as string;
 	const options = this.getNodeParameter('options', i, {});
@@ -137,11 +150,8 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 	const body: IDataObject = {};
 
 	if (file_ids) {
-		let files = file_ids;
-		if (typeof files === 'string') {
-			files = files.split(',').map((file_id) => file_id.trim());
-		}
-		if ((file_ids as IDataObject[]).length > 20) {
+		const files = getFileIds(file_ids);
+		if (files.length > 20) {
 			throw new NodeOperationError(
 				this.getNode(),
 				'The maximum number of files that can be attached to the assistant is 20',
@@ -152,15 +162,12 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 		body.tool_resources = {
 			...((body.tool_resources as object) ?? {}),
 			code_interpreter: {
-				file_ids,
-			},
-			file_search: {
-				vector_stores: [
-					{
-						file_ids,
-					},
-				],
+				file_ids: files,
 			},
+			// updating file_ids for file_search directly is not supported by OpenAI API
+			// only updating vector_store_ids for file_search is supported
+			// support for this to be added as part of ADO-2968
+			// https://platform.openai.com/docs/api-reference/assistants/modifyAssistant
 		};
 	}
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts
index 2a1c59090d..4058a3bcf7 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/generate.operation.ts
@@ -5,6 +5,7 @@ import type {
 	INodeExecutionData,
 } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts
index 1f419066ad..ddbc1f09ae 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/transcribe.operation.ts
@@ -1,7 +1,7 @@
+import FormData from 'form-data';
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
 
-import FormData from 'form-data';
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts
index 3ba7e53c64..911da72296 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/audio/translate.operation.ts
@@ -1,6 +1,7 @@
+import FormData from 'form-data';
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
-import FormData from 'form-data';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts
index 809c1ec947..248d01fc27 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/index.ts
@@ -1,8 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import * as upload from './upload.operation';
 import * as deleteFile from './deleteFile.operation';
 import * as list from './list.operation';
+import * as upload from './upload.operation';
 
 export { upload, deleteFile, list };
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts
index 9776c0f385..38bcd1e824 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/file/upload.operation.ts
@@ -1,6 +1,7 @@
+import FormData from 'form-data';
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions, NodeOperationError } from 'n8n-workflow';
-import FormData from 'form-data';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts
index 07a91ab82d..a46e77a494 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/analyze.operation.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { updateDisplayOptions, NodeOperationError } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 import { modelRLC } from '../descriptions';
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts
index 48a03158b5..0c443bb6c7 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/generate.operation.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts
index 0516ae3ce4..3ad3648273 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/image/index.ts
@@ -1,7 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import * as generate from './generate.operation';
 import * as analyze from './analyze.operation';
+import * as generate from './generate.operation';
 
 export { generate, analyze };
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts
index 634923a5e6..2b64993e2d 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/router.ts
@@ -9,9 +9,8 @@ import * as assistant from './assistant';
 import * as audio from './audio';
 import * as file from './file';
 import * as image from './image';
-import * as text from './text';
-
 import type { OpenAiType } from './node.type';
+import * as text from './text';
 import { getCustomErrorMessage } from '../helpers/error-handling';
 
 export async function router(this: IExecuteFunctions) {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts
index 338d4ade1e..dfc9a5f38a 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/classify.operation.ts
@@ -1,5 +1,6 @@
 import type { INodeProperties, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { updateDisplayOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
index 231fdb4b77..2da3163099 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/text/message.operation.ts
@@ -1,3 +1,5 @@
+import type { Tool } from '@langchain/core/tools';
+import _omit from 'lodash/omit';
 import type {
 	INodeProperties,
 	IExecuteFunctions,
@@ -5,14 +7,15 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { jsonParse, updateDisplayOptions } from 'n8n-workflow';
-import type { Tool } from '@langchain/core/tools';
-import _omit from 'lodash/omit';
-import { apiRequest } from '../../transport';
+
+import { getConnectedTools } from '@utils/helpers';
+
+import { MODELS_NOT_SUPPORT_FUNCTION_CALLS } from '../../helpers/constants';
 import type { ChatCompletion } from '../../helpers/interfaces';
 import { formatToOpenAIAssistantTool } from '../../helpers/utils';
+import { apiRequest } from '../../transport';
 import { modelRLC } from '../descriptions';
-import { getConnectedTools } from '../../../../../utils/helpers';
-import { MODELS_NOT_SUPPORT_FUNCTION_CALLS } from '../../helpers/constants';
+
 const properties: INodeProperties[] = [
 	modelRLC('modelSearch'),
 	{
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
index 20d7bd471e..1ebd986f12 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/actions/versionDescription.ts
@@ -77,7 +77,7 @@ export const versionDescription: INodeTypeDescription = {
 	name: 'openAi',
 	icon: { light: 'file:openAi.svg', dark: 'file:openAi.dark.svg' },
 	group: ['transform'],
-	version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6],
+	version: [1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8],
 	subtitle: `={{(${prettifyOperation})($parameter.resource, $parameter.operation)}}`,
 	description: 'Message an assistant or GPT, analyze images, generate audio, etc.',
 	defaults: {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/error-handling.test.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/error-handling.test.ts
new file mode 100644
index 0000000000..97aee1d943
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/error-handling.test.ts
@@ -0,0 +1,55 @@
+import { RateLimitError } from 'openai';
+import { OpenAIError } from 'openai/error';
+
+import { openAiFailedAttemptHandler, getCustomErrorMessage, isOpenAiError } from './error-handling';
+
+describe('error-handling', () => {
+	describe('getCustomErrorMessage', () => {
+		it('should return the correct custom error message for known error codes', () => {
+			expect(getCustomErrorMessage('insufficient_quota')).toBe(
+				'Insufficient quota detected. <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-langchain.openai/common-issues/#insufficient-quota" target="_blank">Learn more</a> about resolving this issue',
+			);
+			expect(getCustomErrorMessage('rate_limit_exceeded')).toBe('OpenAI: Rate limit reached');
+		});
+
+		it('should return undefined for unknown error codes', () => {
+			expect(getCustomErrorMessage('unknown_error_code')).toBeUndefined();
+		});
+	});
+
+	describe('isOpenAiError', () => {
+		it('should return true if the error is an instance of OpenAIError', () => {
+			const error = new OpenAIError('Test error');
+			expect(isOpenAiError(error)).toBe(true);
+		});
+
+		it('should return false if the error is not an instance of OpenAIError', () => {
+			const error = new Error('Test error');
+			expect(isOpenAiError(error)).toBe(false);
+		});
+	});
+
+	describe('openAiFailedAttemptHandler', () => {
+		it('should handle RateLimitError and modify the error message', () => {
+			const error = new RateLimitError(
+				429,
+				{ code: 'rate_limit_exceeded' },
+				'Rate limit exceeded',
+				{},
+			);
+
+			try {
+				openAiFailedAttemptHandler(error);
+			} catch (e) {
+				expect(e).toBe(error);
+				expect(e.message).toBe('OpenAI: Rate limit reached');
+			}
+		});
+
+		it('should throw the error if it is not a RateLimitError', () => {
+			const error = new Error('Test error');
+
+			expect(() => openAiFailedAttemptHandler(error)).not.toThrow();
+		});
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/error-handling.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/error-handling.ts
index 8db54a1b86..4fbb140def 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/error-handling.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/error-handling.ts
@@ -1,7 +1,9 @@
+import { RateLimitError } from 'openai';
 import { OpenAIError } from 'openai/error';
 
 const errorMap: Record<string, string> = {
-	insufficient_quota: 'OpenAI: Insufficient quota',
+	insufficient_quota:
+		'Insufficient quota detected. <a href="https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-langchain.openai/common-issues/#insufficient-quota" target="_blank">Learn more</a> about resolving this issue',
 	rate_limit_exceeded: 'OpenAI: Rate limit reached',
 };
 
@@ -12,3 +14,23 @@ export function getCustomErrorMessage(errorCode: string): string | undefined {
 export function isOpenAiError(error: any): error is OpenAIError {
 	return error instanceof OpenAIError;
 }
+
+export const openAiFailedAttemptHandler = (error: any) => {
+	if (error instanceof RateLimitError) {
+		// If the error is a rate limit error, we want to handle it differently
+		// because OpenAI has multiple different rate limit errors
+		const errorCode = error?.code;
+		if (errorCode) {
+			const customErrorMessage = getCustomErrorMessage(errorCode);
+
+			if (customErrorMessage) {
+				if (error.error) {
+					(error.error as { message: string }).message = customErrorMessage;
+					error.message = customErrorMessage;
+				}
+			}
+		}
+
+		throw error;
+	}
+};
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts
index 294fc47847..d0db590bc3 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/helpers/utils.ts
@@ -1,6 +1,6 @@
-import { zodToJsonSchema } from 'zod-to-json-schema';
-import type { OpenAIClient } from '@langchain/openai';
 import type { StructuredTool } from '@langchain/core/tools';
+import type { OpenAIClient } from '@langchain/openai';
+import { zodToJsonSchema } from 'zod-to-json-schema';
 
 // Copied from langchain(`langchain/src/tools/convert_to_openai.ts`)
 // since these functions are not exported
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
index 4475029481..919a11c078 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/listSearch.ts
@@ -4,9 +4,9 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
-
-import type { Model } from 'openai/resources/models';
 import type { Assistant } from 'openai/resources/beta/assistants';
+import type { Model } from 'openai/resources/models';
+
 import { apiRequest } from '../transport';
 
 export async function fileSearch(
@@ -76,9 +76,15 @@ export async function modelSearch(
 	this: ILoadOptionsFunctions,
 	filter?: string,
 ): Promise<INodeListSearchResult> {
+	const credentials = await this.getCredentials<{ url: string }>('openAiApi');
+	const isCustomAPI = credentials.url && !credentials.url.includes('api.openai.com');
+
 	return await getModelSearch(
 		(model) =>
-			model.id.startsWith('gpt-') || model.id.startsWith('ft:') || model.id.startsWith('o1'),
+			isCustomAPI ||
+			model.id.startsWith('gpt-') ||
+			model.id.startsWith('ft:') ||
+			model.id.startsWith('o1'),
 	)(this, filter);
 }
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts
index a25f24c698..9f53ca1f86 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { apiRequest } from '../transport';
 
 export async function getFiles(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts
index 211b99166c..b8a32c45bf 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/test/OpenAi.node.test.ts
@@ -1,11 +1,11 @@
-import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 import get from 'lodash/get';
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
+
 import * as assistant from '../actions/assistant';
 import * as audio from '../actions/audio';
 import * as file from '../actions/file';
 import * as image from '../actions/image';
 import * as text from '../actions/text';
-
 import * as transport from '../transport';
 
 const createExecuteFunctionsMock = (parameters: IDataObject) => {
@@ -210,12 +210,89 @@ describe('OpenAi, Assistant resource', () => {
 					code_interpreter: {
 						file_ids: [],
 					},
-					file_search: {
-						vector_stores: [
-							{
-								file_ids: [],
-							},
-						],
+				},
+				tools: [{ type: 'existing_tool' }, { type: 'code_interpreter' }, { type: 'file_search' }],
+			},
+			headers: { 'OpenAI-Beta': 'assistants=v2' },
+		});
+	});
+
+	it('update => should call apiRequest with file_ids as an array for search', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({
+			tools: [{ type: 'existing_tool' }],
+		});
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({});
+
+		await assistant.update.execute.call(
+			createExecuteFunctionsMock({
+				assistantId: 'assistant-id',
+				options: {
+					modelId: 'gpt-model',
+					name: 'name',
+					instructions: 'some instructions',
+					codeInterpreter: true,
+					knowledgeRetrieval: true,
+					file_ids: ['1234'],
+					removeCustomTools: false,
+				},
+			}),
+			0,
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', '/assistants/assistant-id', {
+			headers: { 'OpenAI-Beta': 'assistants=v2' },
+		});
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/assistants/assistant-id', {
+			body: {
+				instructions: 'some instructions',
+				model: 'gpt-model',
+				name: 'name',
+				tool_resources: {
+					code_interpreter: {
+						file_ids: ['1234'],
+					},
+				},
+				tools: [{ type: 'existing_tool' }, { type: 'code_interpreter' }, { type: 'file_search' }],
+			},
+			headers: { 'OpenAI-Beta': 'assistants=v2' },
+		});
+	});
+
+	it('update => should call apiRequest with file_ids as strings for search', async () => {
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({
+			tools: [{ type: 'existing_tool' }],
+		});
+		(transport.apiRequest as jest.Mock).mockResolvedValueOnce({});
+
+		await assistant.update.execute.call(
+			createExecuteFunctionsMock({
+				assistantId: 'assistant-id',
+				options: {
+					modelId: 'gpt-model',
+					name: 'name',
+					instructions: 'some instructions',
+					codeInterpreter: true,
+					knowledgeRetrieval: true,
+					file_ids: '1234, 5678, 90',
+					removeCustomTools: false,
+				},
+			}),
+			0,
+		);
+
+		expect(transport.apiRequest).toHaveBeenCalledTimes(2);
+		expect(transport.apiRequest).toHaveBeenCalledWith('GET', '/assistants/assistant-id', {
+			headers: { 'OpenAI-Beta': 'assistants=v2' },
+		});
+		expect(transport.apiRequest).toHaveBeenCalledWith('POST', '/assistants/assistant-id', {
+			body: {
+				instructions: 'some instructions',
+				model: 'gpt-model',
+				name: 'name',
+				tool_resources: {
+					code_interpreter: {
+						file_ids: ['1234', '5678', '90'],
 					},
 				},
 				tools: [{ type: 'existing_tool' }, { type: 'code_interpreter' }, { type: 'file_search' }],
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/index.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/index.ts
index 36a5773245..619869bf9d 100644
--- a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/index.ts
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/index.ts
@@ -18,14 +18,22 @@ export async function apiRequest(
 	endpoint: string,
 	parameters?: RequestParameters,
 ) {
-	const { body, qs, uri, option, headers } = parameters ?? {};
+	const { body, qs, option, headers } = parameters ?? {};
+
+	const credentials = await this.getCredentials('openAiApi');
+
+	let uri = `https://api.openai.com/v1${endpoint}`;
+
+	if (credentials.url) {
+		uri = `${credentials?.url}${endpoint}`;
+	}
 
 	const options = {
 		headers,
 		method,
 		body,
 		qs,
-		uri: uri ?? `https://api.openai.com/v1${endpoint}`,
+		uri,
 		json: true,
 	};
 
diff --git a/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/test/transport.test.ts b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/test/transport.test.ts
new file mode 100644
index 0000000000..399dad8562
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/nodes/vendors/OpenAi/transport/test/transport.test.ts
@@ -0,0 +1,62 @@
+import type { IExecuteFunctions } from 'n8n-workflow';
+
+import { apiRequest } from '../index';
+
+const mockedExecutionContext = {
+	getCredentials: jest.fn(),
+	helpers: {
+		requestWithAuthentication: jest.fn(),
+	},
+};
+
+describe('apiRequest', () => {
+	beforeEach(() => {
+		jest.resetAllMocks();
+	});
+
+	it('should call requestWithAuthentication with credentials URL if one is provided', async () => {
+		mockedExecutionContext.getCredentials.mockResolvedValue({
+			url: 'http://www.test/url/v1',
+		});
+
+		// Act
+		await apiRequest.call(mockedExecutionContext as unknown as IExecuteFunctions, 'GET', '/test', {
+			headers: { 'Content-Type': 'application/json' },
+		});
+
+		// Assert
+
+		expect(mockedExecutionContext.getCredentials).toHaveBeenCalledWith('openAiApi');
+		expect(mockedExecutionContext.helpers.requestWithAuthentication).toHaveBeenCalledWith(
+			'openAiApi',
+			{
+				headers: { 'Content-Type': 'application/json' },
+				method: 'GET',
+				uri: 'http://www.test/url/v1/test',
+				json: true,
+			},
+		);
+	});
+
+	it('should call requestWithAuthentication with default URL if credentials URL is not provided', async () => {
+		mockedExecutionContext.getCredentials.mockResolvedValue({});
+
+		// Act
+		await apiRequest.call(mockedExecutionContext as unknown as IExecuteFunctions, 'GET', '/test', {
+			headers: { 'Content-Type': 'application/json' },
+		});
+
+		// Assert
+
+		expect(mockedExecutionContext.getCredentials).toHaveBeenCalledWith('openAiApi');
+		expect(mockedExecutionContext.helpers.requestWithAuthentication).toHaveBeenCalledWith(
+			'openAiApi',
+			{
+				headers: { 'Content-Type': 'application/json' },
+				method: 'GET',
+				uri: 'https://api.openai.com/v1/test',
+				json: true,
+			},
+		);
+	});
+});
diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json
index 3672f73464..4b741c173b 100644
--- a/packages/@n8n/nodes-langchain/package.json
+++ b/packages/@n8n/nodes-langchain/package.json
@@ -1,19 +1,18 @@
 {
   "name": "@n8n/n8n-nodes-langchain",
-  "version": "1.65.0",
+  "version": "1.75.0",
   "description": "",
   "main": "index.js",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm run watch",
     "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm build:metadata",
-    "build:metadata": "pnpm n8n-generate-known && pnpm n8n-generate-ui-types",
+    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm n8n-generate-metadata",
     "format": "biome format --write .",
     "format:check": "biome ci .",
-    "lint": "eslint nodes credentials --quiet",
-    "lintfix": "eslint nodes credentials --fix",
-    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\" --onSuccess \"pnpm n8n-generate-ui-types\"",
+    "lint": "eslint nodes credentials utils --quiet",
+    "lintfix": "eslint nodes credentials utils --fix",
+    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\" --onSuccess \"pnpm n8n-generate-metadata\"",
     "test": "jest",
     "test:dev": "jest --watch"
   },
@@ -135,47 +134,47 @@
     "@getzep/zep-js": "0.9.0",
     "@google-ai/generativelanguage": "2.6.0",
     "@google-cloud/resource-manager": "5.3.0",
-    "@google/generative-ai": "0.19.0",
+    "@google/generative-ai": "0.21.0",
     "@huggingface/inference": "2.8.0",
-    "@langchain/anthropic": "0.3.1",
-    "@langchain/aws": "0.1.0",
-    "@langchain/cohere": "0.3.0",
-    "@langchain/community": "0.3.2",
+    "@langchain/anthropic": "0.3.11",
+    "@langchain/aws": "0.1.3",
+    "@langchain/cohere": "0.3.2",
+    "@langchain/community": "0.3.24",
     "@langchain/core": "catalog:",
-    "@langchain/google-genai": "0.1.0",
-    "@langchain/google-vertexai": "0.1.0",
-    "@langchain/groq": "0.1.2",
-    "@langchain/mistralai": "0.1.1",
-    "@langchain/ollama": "0.1.0",
-    "@langchain/openai": "0.3.0",
-    "@langchain/pinecone": "0.1.0",
-    "@langchain/qdrant": "0.1.0",
+    "@langchain/google-genai": "0.1.6",
+    "@langchain/google-vertexai": "0.1.8",
+    "@langchain/groq": "0.1.3",
+    "@langchain/mistralai": "0.2.0",
+    "@langchain/ollama": "0.1.4",
+    "@langchain/openai": "0.3.17",
+    "@langchain/pinecone": "0.1.3",
+    "@langchain/qdrant": "0.1.1",
     "@langchain/redis": "0.1.0",
     "@langchain/textsplitters": "0.1.0",
     "@mozilla/readability": "0.5.0",
+    "@n8n/json-schema-to-zod": "workspace:*",
     "@n8n/typeorm": "0.3.20-12",
     "@n8n/vm2": "3.9.25",
-    "@pinecone-database/pinecone": "3.0.3",
+    "@pinecone-database/pinecone": "4.0.0",
     "@qdrant/js-client-rest": "1.11.0",
     "@supabase/supabase-js": "2.45.4",
     "@xata.io/client": "0.28.4",
     "basic-auth": "catalog:",
     "cheerio": "1.0.0",
-    "cohere-ai": "7.13.2",
+    "cohere-ai": "7.14.0",
     "d3-dsv": "2.0.0",
     "epub2": "3.0.2",
     "form-data": "catalog:",
     "generate-schema": "2.6.0",
     "html-to-text": "9.0.5",
     "jsdom": "23.0.1",
-    "@n8n/json-schema-to-zod": "workspace:*",
-    "langchain": "0.3.2",
+    "langchain": "0.3.11",
     "lodash": "catalog:",
     "mammoth": "1.7.2",
     "mime-types": "2.1.35",
     "n8n-nodes-base": "workspace:*",
     "n8n-workflow": "workspace:*",
-    "openai": "4.63.0",
+    "openai": "4.78.1",
     "pdf-parse": "1.1.1",
     "pg": "8.12.0",
     "redis": "4.6.12",
diff --git a/packages/@n8n/nodes-langchain/tsconfig.json b/packages/@n8n/nodes-langchain/tsconfig.json
index a0bd21149f..d72fd76a4a 100644
--- a/packages/@n8n/nodes-langchain/tsconfig.json
+++ b/packages/@n8n/nodes-langchain/tsconfig.json
@@ -1,6 +1,9 @@
 {
 	"extends": ["../../../tsconfig.json", "../../../tsconfig.backend.json"],
 	"compilerOptions": {
+		"paths": {
+			"@utils/*": ["./utils/*"]
+		},
 		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
 		// TODO: remove all options below this line
 		"useUnknownInCatchVariables": false
diff --git a/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts b/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
index 53f4f95a74..cca2244793 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nBinaryLoader.ts
@@ -1,5 +1,12 @@
-import { pipeline } from 'stream/promises';
+import { CSVLoader } from '@langchain/community/document_loaders/fs/csv';
+import { DocxLoader } from '@langchain/community/document_loaders/fs/docx';
+import { EPubLoader } from '@langchain/community/document_loaders/fs/epub';
+import { PDFLoader } from '@langchain/community/document_loaders/fs/pdf';
+import type { Document } from '@langchain/core/documents';
+import type { TextSplitter } from '@langchain/textsplitters';
 import { createWriteStream } from 'fs';
+import { JSONLoader } from 'langchain/document_loaders/fs/json';
+import { TextLoader } from 'langchain/document_loaders/fs/text';
 import type {
 	IBinaryData,
 	IExecuteFunctions,
@@ -7,15 +14,7 @@ import type {
 	ISupplyDataFunctions,
 } from 'n8n-workflow';
 import { NodeOperationError, BINARY_ENCODING } from 'n8n-workflow';
-
-import type { TextSplitter } from '@langchain/textsplitters';
-import type { Document } from '@langchain/core/documents';
-import { CSVLoader } from '@langchain/community/document_loaders/fs/csv';
-import { DocxLoader } from '@langchain/community/document_loaders/fs/docx';
-import { JSONLoader } from 'langchain/document_loaders/fs/json';
-import { PDFLoader } from '@langchain/community/document_loaders/fs/pdf';
-import { TextLoader } from 'langchain/document_loaders/fs/text';
-import { EPubLoader } from '@langchain/community/document_loaders/fs/epub';
+import { pipeline } from 'stream/promises';
 import { file as tmpFile, type DirectoryResult } from 'tmp-promise';
 
 import { getMetadataFiltersValues } from './helpers';
diff --git a/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts b/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
index 7c44d8a8f9..de5add3e26 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nJsonLoader.ts
@@ -1,3 +1,7 @@
+import type { Document } from '@langchain/core/documents';
+import type { TextSplitter } from '@langchain/textsplitters';
+import { JSONLoader } from 'langchain/document_loaders/fs/json';
+import { TextLoader } from 'langchain/document_loaders/fs/text';
 import {
 	type IExecuteFunctions,
 	type INodeExecutionData,
@@ -5,10 +9,6 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import type { TextSplitter } from '@langchain/textsplitters';
-import type { Document } from '@langchain/core/documents';
-import { JSONLoader } from 'langchain/document_loaders/fs/json';
-import { TextLoader } from 'langchain/document_loaders/fs/text';
 import { getMetadataFiltersValues } from './helpers';
 
 export class N8nJsonLoader {
diff --git a/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts b/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
index 6f12b18079..40a1ca70d3 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nTool.test.ts
@@ -1,8 +1,9 @@
-import { N8nTool } from './N8nTool';
-import { createMockExecuteFunction } from 'n8n-nodes-base/test/nodes/Helpers';
-import { z } from 'zod';
-import type { INode } from 'n8n-workflow';
 import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import { createMockExecuteFunction } from 'n8n-nodes-base/test/nodes/Helpers';
+import type { INode } from 'n8n-workflow';
+import { z } from 'zod';
+
+import { N8nTool } from './N8nTool';
 
 const mockNode: INode = {
 	id: '1',
diff --git a/packages/@n8n/nodes-langchain/utils/N8nTool.ts b/packages/@n8n/nodes-langchain/utils/N8nTool.ts
index 2cb89630f0..f568955beb 100644
--- a/packages/@n8n/nodes-langchain/utils/N8nTool.ts
+++ b/packages/@n8n/nodes-langchain/utils/N8nTool.ts
@@ -1,8 +1,8 @@
 import type { DynamicStructuredToolInput } from '@langchain/core/tools';
 import { DynamicStructuredTool, DynamicTool } from '@langchain/core/tools';
+import { StructuredOutputParser } from 'langchain/output_parsers';
 import type { ISupplyDataFunctions, IDataObject } from 'n8n-workflow';
 import { NodeConnectionType, jsonParse, NodeOperationError } from 'n8n-workflow';
-import { StructuredOutputParser } from 'langchain/output_parsers';
 import type { ZodTypeAny } from 'zod';
 import { ZodBoolean, ZodNullable, ZodNumber, ZodObject, ZodOptional } from 'zod';
 
diff --git a/packages/@n8n/nodes-langchain/utils/descriptions.ts b/packages/@n8n/nodes-langchain/utils/descriptions.ts
index b779df1be4..a90b27bb6c 100644
--- a/packages/@n8n/nodes-langchain/utils/descriptions.ts
+++ b/packages/@n8n/nodes-langchain/utils/descriptions.ts
@@ -66,18 +66,17 @@ export const inputSchemaField: INodeProperties = {
 };
 
 export const promptTypeOptions: INodeProperties = {
-	displayName: 'Prompt',
+	displayName: 'Source for Prompt (User Message)',
 	name: 'promptType',
 	type: 'options',
 	options: [
 		{
-			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
-			name: 'Take from previous node automatically',
+			name: 'Connected Chat Trigger Node',
 			value: 'auto',
-			description: 'Looks for an input field called chatInput',
+			description:
+				"Looks for an input field called 'chatInput' that is coming from a directly connected Chat Trigger",
 		},
 		{
-			// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
 			name: 'Define below',
 			value: 'define',
 			description: 'Use an expression to reference data in previous nodes or enter static text',
@@ -97,3 +96,15 @@ export const textInput: INodeProperties = {
 		rows: 2,
 	},
 };
+
+export const textFromPreviousNode: INodeProperties = {
+	displayName: 'Prompt (User Message)',
+	name: 'text',
+	type: 'string',
+	required: true,
+	default: '={{ $json.chatInput }}',
+	typeOptions: {
+		rows: 2,
+	},
+	disabledOptions: { show: { promptType: ['auto'] } },
+};
diff --git a/packages/@n8n/nodes-langchain/utils/helpers.ts b/packages/@n8n/nodes-langchain/utils/helpers.ts
index f1e02e9c9f..6b5816e7b8 100644
--- a/packages/@n8n/nodes-langchain/utils/helpers.ts
+++ b/packages/@n8n/nodes-langchain/utils/helpers.ts
@@ -130,7 +130,7 @@ export function getSessionId(
 		if (sessionId === '' || sessionId === undefined) {
 			throw new NodeOperationError(ctx.getNode(), 'Key parameter is empty', {
 				description:
-					"Provide a key to use as session ID in the 'Key' parameter or use the 'Take from previous node automatically' option to use the session ID from the previous node, e.t. chat trigger node",
+					"Provide a key to use as session ID in the 'Key' parameter or use the 'Connected Chat Trigger Node' option to use the session ID from your Chat Trigger",
 				itemIndex,
 			});
 		}
@@ -165,10 +165,29 @@ export function serializeChatHistory(chatHistory: BaseMessage[]): string {
 		.join('\n');
 }
 
+export function escapeSingleCurlyBrackets(text?: string): string | undefined {
+	if (text === undefined) return undefined;
+
+	let result = text;
+
+	result = result
+		// First handle triple brackets to avoid interference with double brackets
+		.replace(/(?<!{){{{(?!{)/g, '{{{{')
+		.replace(/(?<!})}}}(?!})/g, '}}}}')
+		// Then handle single brackets, but only if they're not part of double brackets
+		// Convert single { to {{ if it's not already part of {{ or {{{
+		.replace(/(?<!{){(?!{)/g, '{{')
+		// Convert single } to }} if it's not already part of }} or }}}
+		.replace(/(?<!})}(?!})/g, '}}');
+
+	return result;
+}
+
 export const getConnectedTools = async (
 	ctx: IExecuteFunctions,
 	enforceUniqueNames: boolean,
 	convertStructuredTool: boolean = true,
+	escapeCurlyBrackets: boolean = false,
 ) => {
 	const connectedTools =
 		((await ctx.getInputConnectionData(NodeConnectionType.AiTool, 0)) as Tool[]) || [];
@@ -189,6 +208,10 @@ export const getConnectedTools = async (
 		}
 		seenNames.add(name);
 
+		if (escapeCurlyBrackets) {
+			tool.description = escapeSingleCurlyBrackets(tool.description) ?? tool.description;
+		}
+
 		if (convertStructuredTool && tool instanceof N8nTool) {
 			finalTools.push(tool.asDynamicTool());
 		} else {
diff --git a/packages/@n8n/nodes-langchain/utils/logWrapper.ts b/packages/@n8n/nodes-langchain/utils/logWrapper.ts
index eca1431a4b..073b005162 100644
--- a/packages/@n8n/nodes-langchain/utils/logWrapper.ts
+++ b/packages/@n8n/nodes-langchain/utils/logWrapper.ts
@@ -10,20 +10,18 @@ import type { Tool } from '@langchain/core/tools';
 import { VectorStore } from '@langchain/core/vectorstores';
 import { TextSplitter } from '@langchain/textsplitters';
 import type { BaseDocumentLoader } from 'langchain/dist/document_loaders/base';
-import type { IExecuteFunctions, INodeExecutionData, ISupplyDataFunctions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	ISupplyDataFunctions,
+	ITaskMetadata,
+} from 'n8n-workflow';
 import { NodeOperationError, NodeConnectionType } from 'n8n-workflow';
 
 import { logAiEvent, isToolsInstance, isBaseChatMemory, isBaseChatMessageHistory } from './helpers';
 import { N8nBinaryLoader } from './N8nBinaryLoader';
 import { N8nJsonLoader } from './N8nJsonLoader';
 
-const errorsMap: { [key: string]: { message: string; description: string } } = {
-	'You exceeded your current quota, please check your plan and billing details.': {
-		message: 'OpenAI quota exceeded',
-		description: 'You exceeded your current quota, please check your plan and billing details.',
-	},
-};
-
 export async function callMethodAsync<T>(
 	this: T,
 	parameters: {
@@ -37,30 +35,25 @@ export async function callMethodAsync<T>(
 	try {
 		return await parameters.method.call(this, ...parameters.arguments);
 	} catch (e) {
-		// Propagate errors from sub-nodes
-		if (e.functionality === 'configuration-node') throw e;
 		const connectedNode = parameters.executeFunctions.getNode();
 
 		const error = new NodeOperationError(connectedNode, e, {
 			functionality: 'configuration-node',
 		});
 
-		if (errorsMap[error.message]) {
-			error.description = errorsMap[error.message].description;
-			error.message = errorsMap[error.message].message;
-		}
-
 		parameters.executeFunctions.addOutputData(
 			parameters.connectionType,
 			parameters.currentNodeRunIndex,
 			error,
 		);
+
 		if (error.message) {
 			if (!error.description) {
 				error.description = error.message;
 			}
 			throw error;
 		}
+
 		throw new NodeOperationError(
 			connectedNode,
 			`Error on node "${connectedNode.name}" which is connected via input "${parameters.connectionType}"`,
@@ -82,8 +75,6 @@ export function callMethodSync<T>(
 	try {
 		return parameters.method.call(this, ...parameters.arguments);
 	} catch (e) {
-		// Propagate errors from sub-nodes
-		if (e.functionality === 'configuration-node') throw e;
 		const connectedNode = parameters.executeFunctions.getNode();
 		const error = new NodeOperationError(connectedNode, e);
 		parameters.executeFunctions.addOutputData(
@@ -91,6 +82,7 @@ export function callMethodSync<T>(
 			parameters.currentNodeRunIndex,
 			error,
 		);
+
 		throw new NodeOperationError(
 			connectedNode,
 			`Error on node "${connectedNode.name}" which is connected via input "${parameters.connectionType}"`,
@@ -233,8 +225,24 @@ export function logWrapper(
 							arguments: [query, config],
 						})) as Array<Document<Record<string, any>>>;
 
+						const executionId: string | undefined = response[0]?.metadata?.executionId as string;
+						const workflowId: string | undefined = response[0]?.metadata?.workflowId as string;
+
+						const metadata: ITaskMetadata = {};
+						if (executionId && workflowId) {
+							metadata.subExecution = {
+								executionId,
+								workflowId,
+							};
+						}
+
 						logAiEvent(executeFunctions, 'ai-documents-retrieved', { query });
-						executeFunctions.addOutputData(connectionType, index, [[{ json: { response } }]]);
+						executeFunctions.addOutputData(
+							connectionType,
+							index,
+							[[{ json: { response } }]],
+							metadata,
+						);
 						return response;
 					};
 				}
@@ -386,7 +394,6 @@ export function logWrapper(
 					return async (
 						query: string,
 						k?: number,
-						// @ts-ignore
 						filter?: BiquadFilterType | undefined,
 						_callbacks?: Callbacks | undefined,
 					): Promise<Document[]> => {
diff --git a/packages/@n8n/nodes-langchain/utils/output_parsers/N8nItemListOutputParser.ts b/packages/@n8n/nodes-langchain/utils/output_parsers/N8nItemListOutputParser.ts
index f24238690b..d12f24bf0a 100644
--- a/packages/@n8n/nodes-langchain/utils/output_parsers/N8nItemListOutputParser.ts
+++ b/packages/@n8n/nodes-langchain/utils/output_parsers/N8nItemListOutputParser.ts
@@ -3,16 +3,21 @@ import { BaseOutputParser, OutputParserException } from '@langchain/core/output_
 export class N8nItemListOutputParser extends BaseOutputParser<string[]> {
 	lc_namespace = ['n8n-nodes-langchain', 'output_parsers', 'list_items'];
 
-	private numberOfItems: number = 3;
+	private numberOfItems: number | undefined;
 
 	private separator: string;
 
 	constructor(options: { numberOfItems?: number; separator?: string }) {
 		super();
-		if (options.numberOfItems && options.numberOfItems > 0) {
-			this.numberOfItems = options.numberOfItems;
+
+		const { numberOfItems = 3, separator = '\n' } = options;
+
+		if (numberOfItems && numberOfItems > 0) {
+			this.numberOfItems = numberOfItems;
 		}
-		this.separator = options.separator ?? '\\n';
+
+		this.separator = separator;
+
 		if (this.separator === '\\n') {
 			this.separator = '\n';
 		}
@@ -39,7 +44,7 @@ export class N8nItemListOutputParser extends BaseOutputParser<string[]> {
 			this.numberOfItems ? this.numberOfItems + ' ' : ''
 		}items separated by`;
 
-		const numberOfExamples = this.numberOfItems;
+		const numberOfExamples = this.numberOfItems ?? 3; // Default number of examples in case numberOfItems is not set
 
 		const examples: string[] = [];
 		for (let i = 1; i <= numberOfExamples; i++) {
diff --git a/packages/@n8n/nodes-langchain/utils/output_parsers/N8nOutputFixingParser.ts b/packages/@n8n/nodes-langchain/utils/output_parsers/N8nOutputFixingParser.ts
index eec3b0c187..de07bfc7cf 100644
--- a/packages/@n8n/nodes-langchain/utils/output_parsers/N8nOutputFixingParser.ts
+++ b/packages/@n8n/nodes-langchain/utils/output_parsers/N8nOutputFixingParser.ts
@@ -1,12 +1,12 @@
 import type { Callbacks } from '@langchain/core/callbacks/manager';
 import type { BaseLanguageModel } from '@langchain/core/language_models/base';
 import type { AIMessage } from '@langchain/core/messages';
-import { BaseOutputParser } from '@langchain/core/output_parsers';
+import { BaseOutputParser, OutputParserException } from '@langchain/core/output_parsers';
+import type { PromptTemplate } from '@langchain/core/prompts';
 import type { ISupplyDataFunctions } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
 import type { N8nStructuredOutputParser } from './N8nStructuredOutputParser';
-import { NAIVE_FIX_PROMPT } from './prompt';
 import { logAiEvent } from '../helpers';
 
 export class N8nOutputFixingParser extends BaseOutputParser {
@@ -16,12 +16,13 @@ export class N8nOutputFixingParser extends BaseOutputParser {
 		private context: ISupplyDataFunctions,
 		private model: BaseLanguageModel,
 		private outputParser: N8nStructuredOutputParser,
+		private fixPromptTemplate: PromptTemplate,
 	) {
 		super();
 	}
 
 	getRetryChain() {
-		return NAIVE_FIX_PROMPT.pipe(this.model);
+		return this.fixPromptTemplate.pipe(this.model);
 	}
 
 	/**
@@ -47,11 +48,14 @@ export class N8nOutputFixingParser extends BaseOutputParser {
 
 			return response;
 		} catch (error) {
+			if (!(error instanceof OutputParserException)) {
+				throw error;
+			}
 			try {
 				// Second attempt: use retry chain to fix the output
 				const result = (await this.getRetryChain().invoke({
 					completion,
-					error,
+					error: error.message,
 					instructions: this.getFormatInstructions(),
 				})) as AIMessage;
 
diff --git a/packages/@n8n/nodes-langchain/utils/output_parsers/N8nStructuredOutputParser.ts b/packages/@n8n/nodes-langchain/utils/output_parsers/N8nStructuredOutputParser.ts
index a24052f5e1..3b8410df74 100644
--- a/packages/@n8n/nodes-langchain/utils/output_parsers/N8nStructuredOutputParser.ts
+++ b/packages/@n8n/nodes-langchain/utils/output_parsers/N8nStructuredOutputParser.ts
@@ -32,7 +32,9 @@ export class N8nStructuredOutputParser extends StructuredOutputParser<
 			[{ json: { action: 'parse', text } }],
 		]);
 		try {
-			const parsed = await super.parse(text);
+			const jsonString = text.includes('```') ? text.split(/```(?:json)?/)[1] : text;
+			const json = JSON.parse(jsonString.trim());
+			const parsed = await this.schema.parseAsync(json);
 
 			const result = (get(parsed, [STRUCTURED_OUTPUT_KEY, STRUCTURED_OUTPUT_OBJECT_KEY]) ??
 				get(parsed, [STRUCTURED_OUTPUT_KEY, STRUCTURED_OUTPUT_ARRAY_KEY]) ??
diff --git a/packages/@n8n/nodes-langchain/utils/tests/helpers.test.ts b/packages/@n8n/nodes-langchain/utils/tests/helpers.test.ts
new file mode 100644
index 0000000000..d63ccbb81e
--- /dev/null
+++ b/packages/@n8n/nodes-langchain/utils/tests/helpers.test.ts
@@ -0,0 +1,245 @@
+import { DynamicTool, type Tool } from '@langchain/core/tools';
+import { createMockExecuteFunction } from 'n8n-nodes-base/test/nodes/Helpers';
+import { NodeOperationError } from 'n8n-workflow';
+import type { IExecuteFunctions, INode } from 'n8n-workflow';
+import { z } from 'zod';
+
+import { escapeSingleCurlyBrackets, getConnectedTools } from '../helpers';
+import { N8nTool } from '../N8nTool';
+
+describe('escapeSingleCurlyBrackets', () => {
+	it('should return undefined when input is undefined', () => {
+		expect(escapeSingleCurlyBrackets(undefined)).toBeUndefined();
+	});
+
+	it('should escape single curly brackets', () => {
+		expect(escapeSingleCurlyBrackets('Hello {world}')).toBe('Hello {{world}}');
+		expect(escapeSingleCurlyBrackets('Test {value} here')).toBe('Test {{value}} here');
+	});
+
+	it('should not escape already double curly brackets', () => {
+		expect(escapeSingleCurlyBrackets('Hello {{world}}')).toBe('Hello {{world}}');
+		expect(escapeSingleCurlyBrackets('Test {{value}} here')).toBe('Test {{value}} here');
+	});
+
+	it('should handle mixed single and double curly brackets', () => {
+		expect(escapeSingleCurlyBrackets('Hello {{world}} and {earth}')).toBe(
+			'Hello {{world}} and {{earth}}',
+		);
+	});
+
+	it('should handle empty string', () => {
+		expect(escapeSingleCurlyBrackets('')).toBe('');
+	});
+	it('should handle string with no curly brackets', () => {
+		expect(escapeSingleCurlyBrackets('Hello world')).toBe('Hello world');
+	});
+
+	it('should handle string with only opening curly bracket', () => {
+		expect(escapeSingleCurlyBrackets('Hello { world')).toBe('Hello {{ world');
+	});
+
+	it('should handle string with only closing curly bracket', () => {
+		expect(escapeSingleCurlyBrackets('Hello world }')).toBe('Hello world }}');
+	});
+
+	it('should handle string with multiple single curly brackets', () => {
+		expect(escapeSingleCurlyBrackets('{Hello} {world}')).toBe('{{Hello}} {{world}}');
+	});
+
+	it('should handle string with alternating single and double curly brackets', () => {
+		expect(escapeSingleCurlyBrackets('{a} {{b}} {c} {{d}}')).toBe('{{a}} {{b}} {{c}} {{d}}');
+	});
+
+	it('should handle string with curly brackets at the start and end', () => {
+		expect(escapeSingleCurlyBrackets('{start} middle {end}')).toBe('{{start}} middle {{end}}');
+	});
+
+	it('should handle string with special characters', () => {
+		expect(escapeSingleCurlyBrackets('Special {!@#$%^&*} chars')).toBe(
+			'Special {{!@#$%^&*}} chars',
+		);
+	});
+
+	it('should handle string with numbers in curly brackets', () => {
+		expect(escapeSingleCurlyBrackets('Numbers {123} here')).toBe('Numbers {{123}} here');
+	});
+
+	it('should handle string with whitespace in curly brackets', () => {
+		expect(escapeSingleCurlyBrackets('Whitespace {  } here')).toBe('Whitespace {{  }} here');
+	});
+	it('should handle multi-line input with single curly brackets', () => {
+		const input = `
+      Line 1 {test}
+      Line 2 {another test}
+      Line 3
+    `;
+		const expected = `
+      Line 1 {{test}}
+      Line 2 {{another test}}
+      Line 3
+    `;
+		expect(escapeSingleCurlyBrackets(input)).toBe(expected);
+	});
+
+	it('should handle multi-line input with mixed single and double curly brackets', () => {
+		const input = `
+      {Line 1}
+      {{Line 2}}
+      Line {3} {{4}}
+    `;
+		const expected = `
+      {{Line 1}}
+      {{Line 2}}
+      Line {{3}} {{4}}
+    `;
+		expect(escapeSingleCurlyBrackets(input)).toBe(expected);
+	});
+
+	it('should handle multi-line input with curly brackets at line starts and ends', () => {
+		const input = `
+      {Start of line 1
+      End of line 2}
+      {3} Line 3 {3}
+    `;
+		const expected = `
+      {{Start of line 1
+      End of line 2}}
+      {{3}} Line 3 {{3}}
+    `;
+		expect(escapeSingleCurlyBrackets(input)).toBe(expected);
+	});
+
+	it('should handle multi-line input with nested curly brackets', () => {
+		const input = `
+      Outer {
+        Inner {nested}
+      }
+    `;
+		const expected = `
+      Outer {{
+        Inner {{nested}}
+      }}
+    `;
+		expect(escapeSingleCurlyBrackets(input)).toBe(expected);
+	});
+	it('should handle string with triple uneven curly brackets - opening', () => {
+		expect(escapeSingleCurlyBrackets('Hello {{{world}')).toBe('Hello {{{{world}}');
+	});
+
+	it('should handle string with triple uneven curly brackets - closing', () => {
+		expect(escapeSingleCurlyBrackets('Hello world}}}')).toBe('Hello world}}}}');
+	});
+
+	it('should handle string with triple uneven curly brackets - mixed opening and closing', () => {
+		expect(escapeSingleCurlyBrackets('{{{Hello}}} {world}}}')).toBe('{{{{Hello}}}} {{world}}}}');
+	});
+
+	it('should handle string with triple uneven curly brackets - multiple occurrences', () => {
+		expect(escapeSingleCurlyBrackets('{{{a}}} {{b}}} {{{c}')).toBe('{{{{a}}}} {{b}}}} {{{{c}}');
+	});
+
+	it('should handle multi-line input with triple uneven curly brackets', () => {
+		const input = `
+					{{{Line 1}
+					Line 2}}}
+					{{{3}}} Line 3 {{{4
+			`;
+		const expected = `
+					{{{{Line 1}}
+					Line 2}}}}
+					{{{{3}}}} Line 3 {{{{4
+			`;
+		expect(escapeSingleCurlyBrackets(input)).toBe(expected);
+	});
+});
+
+describe('getConnectedTools', () => {
+	let mockExecuteFunctions: IExecuteFunctions;
+	let mockNode: INode;
+	let mockN8nTool: N8nTool;
+
+	beforeEach(() => {
+		mockNode = {
+			id: 'test-node',
+			name: 'Test Node',
+			type: 'test',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {},
+		};
+
+		mockExecuteFunctions = createMockExecuteFunction({}, mockNode);
+
+		mockN8nTool = new N8nTool(mockExecuteFunctions, {
+			name: 'Dummy Tool',
+			description: 'A dummy tool for testing',
+			func: jest.fn(),
+			schema: z.object({
+				foo: z.string(),
+			}),
+		});
+	});
+
+	it('should return empty array when no tools are connected', async () => {
+		mockExecuteFunctions.getInputConnectionData = jest.fn().mockResolvedValue([]);
+
+		const tools = await getConnectedTools(mockExecuteFunctions, true);
+		expect(tools).toEqual([]);
+	});
+
+	it('should return tools without modification when enforceUniqueNames is false', async () => {
+		const mockTools = [
+			{ name: 'tool1', description: 'desc1' },
+			{ name: 'tool1', description: 'desc2' }, // Duplicate name
+		];
+
+		mockExecuteFunctions.getInputConnectionData = jest.fn().mockResolvedValue(mockTools);
+
+		const tools = await getConnectedTools(mockExecuteFunctions, false);
+		expect(tools).toEqual(mockTools);
+	});
+
+	it('should throw error when duplicate tool names exist and enforceUniqueNames is true', async () => {
+		const mockTools = [
+			{ name: 'tool1', description: 'desc1' },
+			{ name: 'tool1', description: 'desc2' },
+		];
+
+		mockExecuteFunctions.getInputConnectionData = jest.fn().mockResolvedValue(mockTools);
+
+		await expect(getConnectedTools(mockExecuteFunctions, true)).rejects.toThrow(NodeOperationError);
+	});
+
+	it('should escape curly brackets in tool descriptions when escapeCurlyBrackets is true', async () => {
+		const mockTools = [{ name: 'tool1', description: 'Test {value}' }] as Tool[];
+
+		mockExecuteFunctions.getInputConnectionData = jest.fn().mockResolvedValue(mockTools);
+
+		const tools = await getConnectedTools(mockExecuteFunctions, true, false, true);
+		expect(tools[0].description).toBe('Test {{value}}');
+	});
+
+	it('should convert N8nTool to dynamic tool when convertStructuredTool is true', async () => {
+		const mockDynamicTool = new DynamicTool({
+			name: 'dynamicTool',
+			description: 'desc',
+			func: jest.fn(),
+		});
+		const asDynamicToolSpy = jest.fn().mockReturnValue(mockDynamicTool);
+		mockN8nTool.asDynamicTool = asDynamicToolSpy;
+
+		mockExecuteFunctions.getInputConnectionData = jest.fn().mockResolvedValue([mockN8nTool]);
+
+		const tools = await getConnectedTools(mockExecuteFunctions, true, true);
+		expect(asDynamicToolSpy).toHaveBeenCalled();
+		expect(tools[0]).toEqual(mockDynamicTool);
+	});
+
+	it('should not convert N8nTool when convertStructuredTool is false', async () => {
+		mockExecuteFunctions.getInputConnectionData = jest.fn().mockResolvedValue([mockN8nTool]);
+
+		const tools = await getConnectedTools(mockExecuteFunctions, true, false);
+		expect(tools[0]).toBe(mockN8nTool);
+	});
+});
diff --git a/packages/@n8n/permissions/package.json b/packages/@n8n/permissions/package.json
index d92c2c20ac..c408abe0b8 100644
--- a/packages/@n8n/permissions/package.json
+++ b/packages/@n8n/permissions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@n8n/permissions",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
diff --git a/packages/@n8n/permissions/src/combineScopes.ts b/packages/@n8n/permissions/src/combineScopes.ee.ts
similarity index 98%
rename from packages/@n8n/permissions/src/combineScopes.ts
rename to packages/@n8n/permissions/src/combineScopes.ee.ts
index 23da64d837..96a43b940c 100644
--- a/packages/@n8n/permissions/src/combineScopes.ts
+++ b/packages/@n8n/permissions/src/combineScopes.ee.ts
@@ -1,4 +1,4 @@
-import type { Scope, ScopeLevels, GlobalScopes, MaskLevels } from './types';
+import type { Scope, ScopeLevels, GlobalScopes, MaskLevels } from './types.ee';
 
 export function combineScopes(userScopes: GlobalScopes, masks?: MaskLevels): Set<Scope>;
 export function combineScopes(userScopes: ScopeLevels, masks?: MaskLevels): Set<Scope>;
diff --git a/packages/@n8n/permissions/src/constants.ts b/packages/@n8n/permissions/src/constants.ee.ts
similarity index 100%
rename from packages/@n8n/permissions/src/constants.ts
rename to packages/@n8n/permissions/src/constants.ee.ts
diff --git a/packages/@n8n/permissions/src/hasScope.ts b/packages/@n8n/permissions/src/hasScope.ee.ts
similarity index 90%
rename from packages/@n8n/permissions/src/hasScope.ts
rename to packages/@n8n/permissions/src/hasScope.ee.ts
index d449283490..81bcbc5175 100644
--- a/packages/@n8n/permissions/src/hasScope.ts
+++ b/packages/@n8n/permissions/src/hasScope.ee.ts
@@ -1,5 +1,5 @@
-import { combineScopes } from './combineScopes';
-import type { Scope, ScopeLevels, GlobalScopes, ScopeOptions, MaskLevels } from './types';
+import { combineScopes } from './combineScopes.ee';
+import type { Scope, ScopeLevels, GlobalScopes, ScopeOptions, MaskLevels } from './types.ee';
 
 export function hasScope(
 	scope: Scope | Scope[],
diff --git a/packages/@n8n/permissions/src/index.ts b/packages/@n8n/permissions/src/index.ts
index f04f2e4ef6..ae20358303 100644
--- a/packages/@n8n/permissions/src/index.ts
+++ b/packages/@n8n/permissions/src/index.ts
@@ -1,4 +1,4 @@
-export type * from './types';
-export * from './constants';
-export * from './hasScope';
-export * from './combineScopes';
+export type * from './types.ee';
+export * from './constants.ee';
+export * from './hasScope.ee';
+export * from './combineScopes.ee';
diff --git a/packages/@n8n/permissions/src/types.ts b/packages/@n8n/permissions/src/types.ee.ts
similarity index 96%
rename from packages/@n8n/permissions/src/types.ts
rename to packages/@n8n/permissions/src/types.ee.ts
index b36fb792ae..db74668fbe 100644
--- a/packages/@n8n/permissions/src/types.ts
+++ b/packages/@n8n/permissions/src/types.ee.ts
@@ -1,4 +1,4 @@
-import type { RESOURCES } from './constants';
+import type { RESOURCES } from './constants.ee';
 
 export type Resource = keyof typeof RESOURCES;
 
diff --git a/packages/@n8n/permissions/test/hasScope.test.ts b/packages/@n8n/permissions/test/hasScope.test.ts
index 0e43bc8dc6..b3362e4ea6 100644
--- a/packages/@n8n/permissions/test/hasScope.test.ts
+++ b/packages/@n8n/permissions/test/hasScope.test.ts
@@ -1,5 +1,5 @@
-import { hasScope } from '@/hasScope';
-import type { Scope } from '@/types';
+import { hasScope } from '@/hasScope.ee';
+import type { Scope } from '@/types.ee';
 
 const ownerPermissions: Scope[] = [
 	'workflow:create',
diff --git a/packages/@n8n/storybook/package.json b/packages/@n8n/storybook/package.json
index 7b2230a36b..6018fbd4b2 100644
--- a/packages/@n8n/storybook/package.json
+++ b/packages/@n8n/storybook/package.json
@@ -3,19 +3,19 @@
   "private": true,
   "version": "0.0.1",
   "devDependencies": {
-    "@chromatic-com/storybook": "^2.0.2",
-    "@storybook/addon-a11y": "^8.3.5",
-    "@storybook/addon-actions": "^8.3.5",
-    "@storybook/addon-docs": "^8.3.5",
-    "@storybook/addon-essentials": "^8.3.5",
-    "@storybook/addon-interactions": "^8.3.5",
-    "@storybook/addon-links": "^8.3.5",
-    "@storybook/addon-themes": "^8.3.5",
-    "@storybook/blocks": "^8.3.5",
-    "@storybook/test": "^8.3.5",
-    "@storybook/vue3": "^8.3.5",
-    "@storybook/vue3-vite": "^8.3.5",
-    "chromatic": "^11.10.2",
-    "storybook": "^8.3.5"
+    "@chromatic-com/storybook": "^3.2.2",
+    "@storybook/addon-a11y": "^8.4.6",
+    "@storybook/addon-actions": "^8.4.6",
+    "@storybook/addon-docs": "^8.4.6",
+    "@storybook/addon-essentials": "^8.4.6",
+    "@storybook/addon-interactions": "^8.4.6",
+    "@storybook/addon-links": "^8.4.6",
+    "@storybook/addon-themes": "^8.4.6",
+    "@storybook/blocks": "^8.4.6",
+    "@storybook/test": "^8.4.6",
+    "@storybook/vue3": "^8.4.6",
+    "@storybook/vue3-vite": "^8.4.6",
+    "chromatic": "^11.20.0",
+    "storybook": "^8.4.6"
   }
 }
diff --git a/packages/@n8n/task-runner/jest.config.js b/packages/@n8n/task-runner/jest.config.js
index 5c3abe1ef7..2a3a7a1e02 100644
--- a/packages/@n8n/task-runner/jest.config.js
+++ b/packages/@n8n/task-runner/jest.config.js
@@ -1,5 +1,6 @@
 /** @type {import('jest').Config} */
 module.exports = {
 	...require('../../../jest.config'),
+	setupFilesAfterEnv: ['n8n-workflow/test/setup.ts'],
 	testTimeout: 10_000,
 };
diff --git a/packages/@n8n/task-runner/package.json b/packages/@n8n/task-runner/package.json
index d889bde6f3..880308d968 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.3.0",
+  "version": "1.13.0",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "start": "node dist/start.js",
@@ -17,17 +17,36 @@
   },
   "main": "dist/start.js",
   "module": "src/start.ts",
-  "types": "dist/start.d.ts",
+  "types": "dist/index.d.ts",
   "files": [
     "dist/**/*"
   ],
+  "exports": {
+    "./start": {
+      "require": "./dist/start.js",
+      "import": "./src/start.ts",
+      "types": "./dist/start.d.ts"
+    },
+    ".": {
+      "require": "./dist/index.js",
+      "import": "./src/index.ts",
+      "types": "./dist/index.d.ts"
+    }
+  },
   "dependencies": {
-    "n8n-workflow": "workspace:*",
+    "@n8n/config": "workspace:*",
+    "@n8n/di": "workspace:*",
+    "@sentry/node": "catalog:",
+    "acorn": "8.14.0",
+    "acorn-walk": "8.3.4",
+    "lodash": "catalog:",
+    "luxon": "catalog:",
     "n8n-core": "workspace:*",
-    "nanoid": "^3.3.6",
+    "n8n-workflow": "workspace:*",
+    "nanoid": "catalog:",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "luxon": "catalog:"
+    "@types/lodash": "catalog:"
   }
 }
diff --git a/packages/@n8n/task-runner/src/__tests__/node-types.test.ts b/packages/@n8n/task-runner/src/__tests__/node-types.test.ts
index c102c80df3..c535bb0147 100644
--- a/packages/@n8n/task-runner/src/__tests__/node-types.test.ts
+++ b/packages/@n8n/task-runner/src/__tests__/node-types.test.ts
@@ -63,4 +63,35 @@ describe('TaskRunnerNodeTypes', () => {
 			});
 		});
 	});
+
+	describe('addNodeTypeDescriptions', () => {
+		it('should add new node types', () => {
+			const nodeTypes = new TaskRunnerNodeTypes(TYPES);
+
+			const nodeTypeDescriptions = [
+				{ name: 'new-type', version: 1 },
+				{ name: 'new-type', version: 2 },
+			] as INodeTypeDescription[];
+
+			nodeTypes.addNodeTypeDescriptions(nodeTypeDescriptions);
+
+			expect(nodeTypes.getByNameAndVersion('new-type', 1)).toEqual({
+				description: { name: 'new-type', version: 1 },
+			});
+			expect(nodeTypes.getByNameAndVersion('new-type', 2)).toEqual({
+				description: { name: 'new-type', version: 2 },
+			});
+		});
+	});
+
+	describe('onlyUnknown', () => {
+		it('should return only unknown node types', () => {
+			const nodeTypes = new TaskRunnerNodeTypes(TYPES);
+
+			const candidate = { name: 'unknown', version: 1 };
+
+			expect(nodeTypes.onlyUnknown([candidate])).toEqual([candidate]);
+			expect(nodeTypes.onlyUnknown([SINGLE_VERSIONED])).toEqual([]);
+		});
+	});
 });
diff --git a/packages/@n8n/task-runner/src/__tests__/task-runner-sentry.test.ts b/packages/@n8n/task-runner/src/__tests__/task-runner-sentry.test.ts
new file mode 100644
index 0000000000..6fe14a484a
--- /dev/null
+++ b/packages/@n8n/task-runner/src/__tests__/task-runner-sentry.test.ts
@@ -0,0 +1,178 @@
+import type { ErrorEvent } from '@sentry/types';
+import { mock } from 'jest-mock-extended';
+import type { ErrorReporter } from 'n8n-core';
+
+import { TaskRunnerSentry } from '../task-runner-sentry';
+
+describe('TaskRunnerSentry', () => {
+	afterEach(() => {
+		jest.resetAllMocks();
+	});
+
+	describe('filterOutUserCodeErrors', () => {
+		const sentry = new TaskRunnerSentry(
+			{
+				dsn: 'https://sentry.io/123',
+				n8nVersion: '1.0.0',
+				environment: 'local',
+				deploymentName: 'test',
+			},
+			mock(),
+		);
+
+		it('should filter out user code errors', () => {
+			const event: ErrorEvent = {
+				type: undefined,
+				exception: {
+					values: [
+						{
+							type: 'ReferenceError',
+							value: 'fetch is not defined',
+							stacktrace: {
+								frames: [
+									{
+										filename: 'app:///dist/js-task-runner/js-task-runner.js',
+										module: 'js-task-runner:js-task-runner',
+										function: 'JsTaskRunner.executeTask',
+									},
+									{
+										filename: 'app:///dist/js-task-runner/js-task-runner.js',
+										module: 'js-task-runner:js-task-runner',
+										function: 'JsTaskRunner.runForAllItems',
+									},
+									{
+										filename: '<anonymous>',
+										module: '<anonymous>',
+										function: 'new Promise',
+									},
+									{
+										filename: 'app:///dist/js-task-runner/js-task-runner.js',
+										module: 'js-task-runner:js-task-runner',
+										function: 'result',
+									},
+									{
+										filename: 'node:vm',
+										module: 'node:vm',
+										function: 'runInContext',
+									},
+									{
+										filename: 'node:vm',
+										module: 'node:vm',
+										function: 'Script.runInContext',
+									},
+									{
+										filename: 'evalmachine.<anonymous>',
+										module: 'evalmachine.<anonymous>',
+										function: '?',
+									},
+									{
+										filename: 'evalmachine.<anonymous>',
+										module: 'evalmachine.<anonymous>',
+										function: 'VmCodeWrapper',
+									},
+									{
+										filename: '<anonymous>',
+										module: '<anonymous>',
+										function: 'new Promise',
+									},
+									{
+										filename: 'evalmachine.<anonymous>',
+										module: 'evalmachine.<anonymous>',
+									},
+								],
+							},
+							mechanism: { type: 'onunhandledrejection', handled: false },
+						},
+					],
+				},
+				event_id: '18bb78bb3d9d44c4acf3d774c2cfbfd8',
+				platform: 'node',
+				contexts: {
+					trace: { trace_id: '3c3614d33a6b47f09b85ec7d2710acea', span_id: 'ad00fdf6d6173aeb' },
+					runtime: { name: 'node', version: 'v20.17.0' },
+				},
+			};
+
+			expect(sentry.filterOutUserCodeErrors(event)).toBe(true);
+		});
+	});
+
+	describe('initIfEnabled', () => {
+		const mockErrorReporter = mock<ErrorReporter>();
+
+		it('should not configure sentry if dsn is not set', async () => {
+			const sentry = new TaskRunnerSentry(
+				{
+					dsn: '',
+					n8nVersion: '1.0.0',
+					environment: 'local',
+					deploymentName: 'test',
+				},
+				mockErrorReporter,
+			);
+
+			await sentry.initIfEnabled();
+
+			expect(mockErrorReporter.init).not.toHaveBeenCalled();
+		});
+
+		it('should configure sentry if dsn is set', async () => {
+			const sentry = new TaskRunnerSentry(
+				{
+					dsn: 'https://sentry.io/123',
+					n8nVersion: '1.0.0',
+					environment: 'local',
+					deploymentName: 'test',
+				},
+				mockErrorReporter,
+			);
+
+			await sentry.initIfEnabled();
+
+			expect(mockErrorReporter.init).toHaveBeenCalledWith({
+				dsn: 'https://sentry.io/123',
+				beforeSendFilter: sentry.filterOutUserCodeErrors,
+				release: '1.0.0',
+				environment: 'local',
+				serverName: 'test',
+				serverType: 'task_runner',
+			});
+		});
+	});
+
+	describe('shutdown', () => {
+		const mockErrorReporter = mock<ErrorReporter>();
+
+		it('should not shutdown sentry if dsn is not set', async () => {
+			const sentry = new TaskRunnerSentry(
+				{
+					dsn: '',
+					n8nVersion: '1.0.0',
+					environment: 'local',
+					deploymentName: 'test',
+				},
+				mockErrorReporter,
+			);
+
+			await sentry.shutdown();
+
+			expect(mockErrorReporter.shutdown).not.toHaveBeenCalled();
+		});
+
+		it('should shutdown sentry if dsn is set', async () => {
+			const sentry = new TaskRunnerSentry(
+				{
+					dsn: 'https://sentry.io/123',
+					n8nVersion: '1.0.0',
+					environment: 'local',
+					deploymentName: 'test',
+				},
+				mockErrorReporter,
+			);
+
+			await sentry.shutdown();
+
+			expect(mockErrorReporter.shutdown).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/@n8n/task-runner/src/config/base-runner-config.ts b/packages/@n8n/task-runner/src/config/base-runner-config.ts
new file mode 100644
index 0000000000..f9032dda9f
--- /dev/null
+++ b/packages/@n8n/task-runner/src/config/base-runner-config.ts
@@ -0,0 +1,57 @@
+import { Config, Env, Nested } from '@n8n/config';
+
+@Config
+class HealthcheckServerConfig {
+	@Env('N8N_RUNNERS_HEALTH_CHECK_SERVER_ENABLED')
+	enabled: boolean = false;
+
+	@Env('N8N_RUNNERS_HEALTH_CHECK_SERVER_HOST')
+	host: string = '127.0.0.1';
+
+	@Env('N8N_RUNNERS_HEALTH_CHECK_SERVER_PORT')
+	port: number = 5681;
+}
+
+@Config
+export class BaseRunnerConfig {
+	@Env('N8N_RUNNERS_TASK_BROKER_URI')
+	taskBrokerUri: string = 'http://127.0.0.1:5679';
+
+	@Env('N8N_RUNNERS_GRANT_TOKEN')
+	grantToken: string = '';
+
+	@Env('N8N_RUNNERS_MAX_PAYLOAD')
+	maxPayloadSize: number = 1024 * 1024 * 1024;
+
+	/**
+	 * How many concurrent tasks can a runner execute at a time
+	 *
+	 * Kept high for backwards compatibility - n8n v2 will reduce this to `5`
+	 */
+	@Env('N8N_RUNNERS_MAX_CONCURRENCY')
+	maxConcurrency: number = 10;
+
+	/**
+	 * 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;
+
+	@Env('GENERIC_TIMEZONE')
+	timezone: string = 'America/New_York';
+
+	/**
+	 * How long (in seconds) a task is allowed to take for completion, else the
+	 * task will be aborted. (In internal mode, the runner will also be
+	 * restarted.) Must be greater than 0.
+	 *
+	 * Kept high for backwards compatibility - n8n v2 will reduce this to `60`
+	 */
+	@Env('N8N_RUNNERS_TASK_TIMEOUT')
+	taskTimeout: number = 300; // 5 minutes
+
+	@Nested
+	healthcheckServer!: HealthcheckServerConfig;
+}
diff --git a/packages/@n8n/task-runner/src/config/js-runner-config.ts b/packages/@n8n/task-runner/src/config/js-runner-config.ts
new file mode 100644
index 0000000000..4cba6f1d98
--- /dev/null
+++ b/packages/@n8n/task-runner/src/config/js-runner-config.ts
@@ -0,0 +1,10 @@
+import { Config, Env } from '@n8n/config';
+
+@Config
+export class JsRunnerConfig {
+	@Env('NODE_FUNCTION_ALLOW_BUILTIN')
+	allowedBuiltInModules: string = '';
+
+	@Env('NODE_FUNCTION_ALLOW_EXTERNAL')
+	allowedExternalModules: string = '';
+}
diff --git a/packages/@n8n/task-runner/src/config/main-config.ts b/packages/@n8n/task-runner/src/config/main-config.ts
new file mode 100644
index 0000000000..10b504f1d6
--- /dev/null
+++ b/packages/@n8n/task-runner/src/config/main-config.ts
@@ -0,0 +1,17 @@
+import { Config, Nested } from '@n8n/config';
+
+import { BaseRunnerConfig } from './base-runner-config';
+import { JsRunnerConfig } from './js-runner-config';
+import { SentryConfig } from './sentry-config';
+
+@Config
+export class MainConfig {
+	@Nested
+	baseRunnerConfig!: BaseRunnerConfig;
+
+	@Nested
+	jsRunnerConfig!: JsRunnerConfig;
+
+	@Nested
+	sentryConfig!: SentryConfig;
+}
diff --git a/packages/@n8n/task-runner/src/config/sentry-config.ts b/packages/@n8n/task-runner/src/config/sentry-config.ts
new file mode 100644
index 0000000000..ae24221a5e
--- /dev/null
+++ b/packages/@n8n/task-runner/src/config/sentry-config.ts
@@ -0,0 +1,21 @@
+import { Config, Env } from '@n8n/config';
+
+@Config
+export class SentryConfig {
+	/** Sentry DSN (data source name) */
+	@Env('N8N_SENTRY_DSN')
+	dsn: string = '';
+
+	//#region Metadata about the environment
+
+	@Env('N8N_VERSION')
+	n8nVersion: string = '';
+
+	@Env('ENVIRONMENT')
+	environment: string = '';
+
+	@Env('DEPLOYMENT_NAME')
+	deploymentName: string = '';
+
+	//#endregion
+}
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
new file mode 100644
index 0000000000..29f50c3610
--- /dev/null
+++ b/packages/@n8n/task-runner/src/data-request/data-request-response-reconstruct.ts
@@ -0,0 +1,52 @@
+import type { IExecuteData, INodeExecutionData, ITaskDataConnections } from 'n8n-workflow';
+
+import type { DataRequestResponse, InputDataChunkDefinition } from '@/runner-types';
+
+/**
+ * Reconstructs data from a DataRequestResponse to the initial
+ * data structures.
+ */
+export class DataRequestResponseReconstruct {
+	/**
+	 * Reconstructs `inputData` from a DataRequestResponse
+	 */
+	reconstructConnectionInputItems(
+		inputData: DataRequestResponse['inputData'],
+		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,
+		inputItems: INodeExecutionData[],
+	): IExecuteData {
+		const inputData: ITaskDataConnections = {
+			...response.inputData,
+			main: [inputItems],
+		};
+
+		return {
+			data: inputData,
+			node: response.node,
+			source: response.connectionInputSource,
+		};
+	}
+}
diff --git a/packages/@n8n/task-runner/src/health-check-server.ts b/packages/@n8n/task-runner/src/health-check-server.ts
new file mode 100644
index 0000000000..9cb4cae6a0
--- /dev/null
+++ b/packages/@n8n/task-runner/src/health-check-server.ts
@@ -0,0 +1,38 @@
+import { ApplicationError } from 'n8n-workflow';
+import { createServer } from 'node:http';
+
+export class HealthCheckServer {
+	private server = createServer((_, res) => {
+		res.writeHead(200);
+		res.end('OK');
+	});
+
+	async start(host: string, port: number) {
+		return await new Promise<void>((resolve, reject) => {
+			const portInUseErrorHandler = (error: NodeJS.ErrnoException) => {
+				if (error.code === 'EADDRINUSE') {
+					reject(new ApplicationError(`Port ${port} is already in use`));
+				} else {
+					reject(error);
+				}
+			};
+
+			this.server.on('error', portInUseErrorHandler);
+
+			this.server.listen(port, host, () => {
+				this.server.removeListener('error', portInUseErrorHandler);
+				console.log(`Health check server listening on ${host}, port ${port}`);
+				resolve();
+			});
+		});
+	}
+
+	async stop() {
+		return await new Promise<void>((resolve, reject) => {
+			this.server.close((error) => {
+				if (error) reject(error);
+				else resolve();
+			});
+		});
+	}
+}
diff --git a/packages/@n8n/task-runner/src/index.ts b/packages/@n8n/task-runner/src/index.ts
index 59e6f6d288..5fcc6e078b 100644
--- a/packages/@n8n/task-runner/src/index.ts
+++ b/packages/@n8n/task-runner/src/index.ts
@@ -1,2 +1,4 @@
 export * from './task-runner';
 export * from './runner-types';
+export * from './message-types';
+export * from './data-request/data-request-response-reconstruct';
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 5f83b23ae1..a666240098 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
@@ -1,29 +1,60 @@
-import { DateTime } from 'luxon';
-import type { CodeExecutionMode, IDataObject } from 'n8n-workflow';
+import { DateTime, Duration, Interval } from 'luxon';
+import type { IBinaryData } from 'n8n-workflow';
+import { setGlobalState, type CodeExecutionMode, type 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 { UnsupportedFunctionError } from '@/js-task-runner/errors/unsupported-function.error';
 import { ValidationError } from '@/js-task-runner/errors/validation-error';
-import type { JsTaskRunnerOpts } from '@/js-task-runner/js-task-runner';
+import type { JSExecSettings } from '@/js-task-runner/js-task-runner';
+import { JsTaskRunner } from '@/js-task-runner/js-task-runner';
 import {
-	JsTaskRunner,
-	type AllCodeTaskData,
-	type JSExecSettings,
-} from '@/js-task-runner/js-task-runner';
-import type { Task } from '@/task-runner';
+	UNSUPPORTED_HELPER_FUNCTIONS,
+	type DataRequestResponse,
+	type InputDataChunkDefinition,
+} from '@/runner-types';
+import type { TaskParams } from '@/task-runner';
 
-import { newAllCodeTaskData, newTaskWithSettings, withPairedItem, wrapIntoJson } from './test-data';
-import { ExecutionError } from '../errors/execution-error';
+import {
+	newDataRequestResponse,
+	newTaskParamsWithSettings,
+	newTaskState,
+	withPairedItem,
+	wrapIntoJson,
+} from './test-data';
 
 jest.mock('ws');
 
+const defaultConfig = new MainConfig();
+
 describe('JsTaskRunner', () => {
-	const createRunnerWithOpts = (opts: Partial<JsTaskRunnerOpts> = {}) =>
+	const createRunnerWithOpts = (
+		jsRunnerOpts: Partial<JsRunnerConfig> = {},
+		baseRunnerOpts: Partial<BaseRunnerConfig> = {},
+	) =>
 		new JsTaskRunner({
-			wsUrl: 'ws://localhost',
-			grantToken: 'grantToken',
-			maxConcurrency: 1,
-			...opts,
+			baseRunnerConfig: {
+				...defaultConfig.baseRunnerConfig,
+				grantToken: 'grantToken',
+				maxConcurrency: 1,
+				taskBrokerUri: 'http://localhost',
+				taskTimeout: 60,
+				...baseRunnerOpts,
+			},
+			jsRunnerConfig: {
+				...defaultConfig.jsRunnerConfig,
+				...jsRunnerOpts,
+			},
+			sentryConfig: {
+				dsn: '',
+				deploymentName: '',
+				environment: '',
+				n8nVersion: '',
+			},
 		});
 
 	const defaultTaskRunner = createRunnerWithOpts();
@@ -33,12 +64,12 @@ describe('JsTaskRunner', () => {
 		taskData,
 		runner = defaultTaskRunner,
 	}: {
-		task: Task<JSExecSettings>;
-		taskData: AllCodeTaskData;
+		task: TaskParams<JSExecSettings>;
+		taskData: DataRequestResponse;
 		runner?: JsTaskRunner;
 	}) => {
 		jest.spyOn(runner, 'requestData').mockResolvedValue(taskData);
-		return await runner.executeTask(task);
+		return await runner.executeTask(task, new AbortController().signal);
 	};
 
 	afterEach(() => {
@@ -57,12 +88,12 @@ describe('JsTaskRunner', () => {
 		runner?: JsTaskRunner;
 	}) => {
 		return await execTaskWithParams({
-			task: newTaskWithSettings({
+			task: newTaskParamsWithSettings({
 				code,
 				nodeMode: 'runOnceForAllItems',
 				...settings,
 			}),
-			taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson)),
+			taskData: newDataRequestResponse(inputItems.map(wrapIntoJson)),
 			runner,
 		});
 	};
@@ -72,20 +103,22 @@ describe('JsTaskRunner', () => {
 		inputItems,
 		settings,
 		runner,
+		chunk,
 	}: {
 		code: string;
 		inputItems: IDataObject[];
 		settings?: Partial<JSExecSettings>;
-
 		runner?: JsTaskRunner;
+		chunk?: InputDataChunkDefinition;
 	}) => {
 		return await execTaskWithParams({
-			task: newTaskWithSettings({
+			task: newTaskParamsWithSettings({
 				code,
 				nodeMode: 'runOnceForEachItem',
+				chunk,
 				...settings,
 			}),
-			taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson)),
+			taskData: newDataRequestResponse(inputItems.map(wrapIntoJson)),
 			runner,
 		});
 	};
@@ -95,21 +128,90 @@ describe('JsTaskRunner', () => {
 			'should make an rpc call for console log in %s mode',
 			async (nodeMode) => {
 				jest.spyOn(defaultTaskRunner, 'makeRpcCall').mockResolvedValue(undefined);
-				const task = newTaskWithSettings({
+				const task = newTaskParamsWithSettings({
 					code: "console.log('Hello', 'world!'); return {}",
 					nodeMode,
 				});
 
 				await execTaskWithParams({
 					task,
-					taskData: newAllCodeTaskData([wrapIntoJson({})]),
+					taskData: newDataRequestResponse([wrapIntoJson({})]),
 				});
 
 				expect(defaultTaskRunner.makeRpcCall).toHaveBeenCalledWith(task.taskId, 'logNodeOutput', [
-					'Hello world!',
+					"'Hello'",
+					"'world!'",
 				]);
 			},
 		);
+
+		it('should not throw when using unsupported console methods', async () => {
+			const task = newTaskParamsWithSettings({
+				code: `
+					console.warn('test');
+					console.error('test');
+					console.info('test');
+					console.debug('test');
+					console.trace('test');
+					console.dir({});
+					console.time('test');
+					console.timeEnd('test');
+					console.timeLog('test');
+					console.assert(true);
+					console.clear();
+					console.group('test');
+					console.groupEnd();
+					console.table([]);
+					return {json: {}}
+				`,
+				nodeMode: 'runOnceForAllItems',
+			});
+
+			await expect(
+				execTaskWithParams({
+					task,
+					taskData: newDataRequestResponse([wrapIntoJson({})]),
+				}),
+			).resolves.toBeDefined();
+		});
+
+		it('should not throw when trying to log the context object', async () => {
+			const task = newTaskParamsWithSettings({
+				code: `
+					console.log(this);
+					return {json: {}}
+				`,
+				nodeMode: 'runOnceForAllItems',
+			});
+
+			await expect(
+				execTaskWithParams({
+					task,
+					taskData: newDataRequestResponse([wrapIntoJson({})]),
+				}),
+			).resolves.toBeDefined();
+		});
+
+		it('should log the context object as [[ExecutionContext]]', async () => {
+			const rpcCallSpy = jest.spyOn(defaultTaskRunner, 'makeRpcCall').mockResolvedValue(undefined);
+
+			const task = newTaskParamsWithSettings({
+				code: `
+					console.log(this);
+					return {json: {}}
+				`,
+				nodeMode: 'runOnceForAllItems',
+			});
+
+			await execTaskWithParams({
+				task,
+				taskData: newDataRequestResponse([wrapIntoJson({})]),
+			});
+
+			expect(rpcCallSpy).toHaveBeenCalledWith(task.taskId, 'logNodeOutput', [
+				'[[ExecutionContext]]',
+			]);
+		});
 	});
 
 	describe('built-in methods and variables available in the context', () => {
@@ -188,6 +290,7 @@ describe('JsTaskRunner', () => {
 				['$runIndex', 0],
 				['{ wf: $workflow }', { wf: { active: true, id: '1', name: 'Test Workflow' } }],
 				['$vars', { var: 'value' }],
+				['$getWorkflowStaticData("global")', {}],
 			],
 			'Node.js internal functions': [
 				['typeof Function', 'function'],
@@ -199,6 +302,7 @@ describe('JsTaskRunner', () => {
 				['typeof clearInterval', 'function'],
 				['typeof clearImmediate', 'function'],
 			],
+			eval: [['eval("1+2")', 3]],
 			'JS built-ins': [
 				['typeof btoa', 'function'],
 				['typeof atob', 'function'],
@@ -233,11 +337,11 @@ describe('JsTaskRunner', () => {
 		describe('$env', () => {
 			it('should have the env available in context when access has not been blocked', async () => {
 				const outcome = await execTaskWithParams({
-					task: newTaskWithSettings({
+					task: newTaskParamsWithSettings({
 						code: 'return { val: $env.VAR1 }',
 						nodeMode: 'runOnceForAllItems',
 					}),
-					taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+					taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
 						envProviderState: {
 							isEnvAccessBlocked: false,
 							isProcessAvailable: true,
@@ -252,11 +356,11 @@ describe('JsTaskRunner', () => {
 			it('should be possible to access env if it has been blocked', async () => {
 				await expect(
 					execTaskWithParams({
-						task: newTaskWithSettings({
+						task: newTaskParamsWithSettings({
 							code: 'return { val: $env.VAR1 }',
 							nodeMode: 'runOnceForAllItems',
 						}),
-						taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+						taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
 							envProviderState: {
 								isEnvAccessBlocked: true,
 								isProcessAvailable: true,
@@ -269,11 +373,11 @@ describe('JsTaskRunner', () => {
 
 			it('should not be possible to iterate $env', async () => {
 				const outcome = await execTaskWithParams({
-					task: newTaskWithSettings({
+					task: newTaskParamsWithSettings({
 						code: 'return Object.values($env).concat(Object.keys($env))',
 						nodeMode: 'runOnceForAllItems',
 					}),
-					taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+					taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
 						envProviderState: {
 							isEnvAccessBlocked: false,
 							isProcessAvailable: true,
@@ -286,13 +390,13 @@ describe('JsTaskRunner', () => {
 			});
 
 			it("should not expose task runner's env variables even if no env state is received", async () => {
-				process.env.N8N_RUNNERS_N8N_URI = 'http://127.0.0.1:5679';
+				process.env.N8N_RUNNERS_TASK_BROKER_URI = 'http://127.0.0.1:5679';
 				const outcome = await execTaskWithParams({
-					task: newTaskWithSettings({
-						code: 'return { val: $env.N8N_RUNNERS_N8N_URI }',
+					task: newTaskParamsWithSettings({
+						code: 'return { val: $env.N8N_RUNNERS_TASK_BROKER_URI }',
 						nodeMode: 'runOnceForAllItems',
 					}),
-					taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+					taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
 						envProviderState: undefined,
 					}),
 				});
@@ -301,13 +405,332 @@ describe('JsTaskRunner', () => {
 			});
 		});
 
+		describe('timezone', () => {
+			it('should use the specified timezone in the workflow', async () => {
+				const taskData = newDataRequestResponse(inputItems.map(wrapIntoJson), {});
+				taskData.workflow.settings = {
+					timezone: 'Europe/Helsinki',
+				};
+
+				const outcome = await execTaskWithParams({
+					task: newTaskParamsWithSettings({
+						code: 'return { val: $now.toSeconds() }',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData,
+				});
+
+				const helsinkiTimeNow = DateTime.now().setZone('Europe/Helsinki').toSeconds();
+				expect(outcome.result[0].json.val).toBeCloseTo(helsinkiTimeNow, 1);
+			});
+
+			it('should use the default timezone', async () => {
+				setGlobalState({
+					defaultTimezone: 'Europe/Helsinki',
+				});
+
+				const outcome = await execTaskWithParams({
+					task: newTaskParamsWithSettings({
+						code: 'return { val: $now.toSeconds() }',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {}),
+				});
+
+				const helsinkiTimeNow = DateTime.now().setZone('Europe/Helsinki').toSeconds();
+				expect(outcome.result[0].json.val).toBeCloseTo(helsinkiTimeNow, 1);
+			});
+		});
+
+		describe("$getWorkflowStaticData('global')", () => {
+			it('should have the global workflow static data available in runOnceForAllItems', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskParamsWithSettings({
+						code: 'return { val: $getWorkflowStaticData("global") }',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
+						staticData: {
+							global: { key: 'value' },
+						},
+					}),
+				});
+
+				expect(outcome.result).toEqual([wrapIntoJson({ val: { key: 'value' } })]);
+			});
+
+			it('should have the global workflow static data available in runOnceForEachItem', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskParamsWithSettings({
+						code: 'return { val: $getWorkflowStaticData("global") }',
+						nodeMode: 'runOnceForEachItem',
+					}),
+					taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
+						staticData: {
+							global: { key: 'value' },
+						},
+					}),
+				});
+
+				expect(outcome.result).toEqual([
+					withPairedItem(0, wrapIntoJson({ val: { key: 'value' } })),
+				]);
+			});
+
+			test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+				"does not return static data if it hasn't been modified in %s",
+				async (mode) => {
+					const outcome = await execTaskWithParams({
+						task: newTaskParamsWithSettings({
+							code: `
+								const staticData = $getWorkflowStaticData("global");
+								return { val: staticData };
+							`,
+							nodeMode: mode,
+						}),
+						taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
+							staticData: {
+								global: { key: 'value' },
+							},
+						}),
+					});
+
+					expect(outcome.staticData).toBeUndefined();
+				},
+			);
+
+			test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+				'returns the updated static data in %s',
+				async (mode) => {
+					const outcome = await execTaskWithParams({
+						task: newTaskParamsWithSettings({
+							code: `
+								const staticData = $getWorkflowStaticData("global");
+								staticData.newKey = 'newValue';
+								return { val: staticData };
+							`,
+							nodeMode: mode,
+						}),
+						taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
+							staticData: {
+								global: { key: 'value' },
+								'node:OtherNode': { some: 'data' },
+							},
+						}),
+					});
+
+					expect(outcome.staticData).toEqual({
+						global: { key: 'value', newKey: 'newValue' },
+						'node:OtherNode': { some: 'data' },
+					});
+				},
+			);
+		});
+
+		describe("$getWorkflowStaticData('node')", () => {
+			const createTaskDataWithNodeStaticData = (nodeStaticData: IDataObject) => {
+				const taskData = newDataRequestResponse(inputItems.map(wrapIntoJson));
+				const taskDataKey = `node:${taskData.node.name}`;
+				taskData.workflow.staticData = {
+					global: { 'global-key': 'global-value' },
+					'node:OtherNode': { 'other-key': 'other-value' },
+					[taskDataKey]: nodeStaticData,
+				};
+
+				return taskData;
+			};
+
+			it('should have the node workflow static data available in runOnceForAllItems', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskParamsWithSettings({
+						code: 'return { val: $getWorkflowStaticData("node") }',
+						nodeMode: 'runOnceForAllItems',
+					}),
+					taskData: createTaskDataWithNodeStaticData({ key: 'value' }),
+				});
+
+				expect(outcome.result).toEqual([wrapIntoJson({ val: { key: 'value' } })]);
+			});
+
+			it('should have the node workflow static data available in runOnceForEachItem', async () => {
+				const outcome = await execTaskWithParams({
+					task: newTaskParamsWithSettings({
+						code: 'return { val: $getWorkflowStaticData("node") }',
+						nodeMode: 'runOnceForEachItem',
+					}),
+					taskData: createTaskDataWithNodeStaticData({ key: 'value' }),
+				});
+
+				expect(outcome.result).toEqual([
+					withPairedItem(0, wrapIntoJson({ val: { key: 'value' } })),
+				]);
+			});
+
+			test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+				"does not return static data if it hasn't been modified in %s",
+				async (mode) => {
+					const outcome = await execTaskWithParams({
+						task: newTaskParamsWithSettings({
+							code: `
+								const staticData = $getWorkflowStaticData("node");
+								return { val: staticData };
+							`,
+							nodeMode: mode,
+						}),
+						taskData: createTaskDataWithNodeStaticData({ key: 'value' }),
+					});
+
+					expect(outcome.staticData).toBeUndefined();
+				},
+			);
+
+			test.each<[CodeExecutionMode]>([['runOnceForAllItems'], ['runOnceForEachItem']])(
+				'returns the updated static data in %s',
+				async (mode) => {
+					const outcome = await execTaskWithParams({
+						task: newTaskParamsWithSettings({
+							code: `
+								const staticData = $getWorkflowStaticData("node");
+								staticData.newKey = 'newValue';
+								return { val: staticData };
+							`,
+							nodeMode: mode,
+						}),
+						taskData: createTaskDataWithNodeStaticData({ key: 'value' }),
+					});
+
+					expect(outcome.staticData).toEqual({
+						global: { 'global-key': 'global-value' },
+						'node:JsCode': {
+							key: 'value',
+							newKey: 'newValue',
+						},
+						'node:OtherNode': {
+							'other-key': 'other-value',
+						},
+					});
+				},
+			);
+		});
+
+		describe('helpers', () => {
+			const binaryDataFile: IBinaryData = {
+				data: 'data',
+				fileName: 'file.txt',
+				mimeType: 'text/plain',
+			};
+
+			const groups = [
+				{
+					method: 'helpers.assertBinaryData',
+					invocation: "helpers.assertBinaryData(0, 'binaryFile')",
+					expectedParams: [0, 'binaryFile'],
+				},
+				{
+					method: 'helpers.getBinaryDataBuffer',
+					invocation: "helpers.getBinaryDataBuffer(0, 'binaryFile')",
+					expectedParams: [0, 'binaryFile'],
+				},
+				{
+					method: 'helpers.prepareBinaryData',
+					invocation: "helpers.prepareBinaryData(Buffer.from('123'), 'file.txt', 'text/plain')",
+					expectedParams: [Buffer.from('123'), 'file.txt', 'text/plain'],
+				},
+				{
+					method: 'helpers.setBinaryDataBuffer',
+					invocation:
+						"helpers.setBinaryDataBuffer({ data: '123', mimeType: 'text/plain' }, Buffer.from('321'))",
+					expectedParams: [{ data: '123', mimeType: 'text/plain' }, Buffer.from('321')],
+				},
+				{
+					method: 'helpers.binaryToString',
+					invocation: "helpers.binaryToString(Buffer.from('123'), 'utf8')",
+					expectedParams: [Buffer.from('123'), 'utf8'],
+				},
+				{
+					method: 'helpers.httpRequest',
+					invocation: "helpers.httpRequest({ method: 'GET', url: 'http://localhost' })",
+					expectedParams: [{ method: 'GET', url: 'http://localhost' }],
+				},
+			];
+
+			for (const group of groups) {
+				it(`${group.method} for runOnceForAllItems`, async () => {
+					// Arrange
+					const rpcCallSpy = jest
+						.spyOn(defaultTaskRunner, 'makeRpcCall')
+						.mockResolvedValue(undefined);
+
+					// Act
+					await execTaskWithParams({
+						task: newTaskParamsWithSettings({
+							code: `await ${group.invocation}; return []`,
+							nodeMode: 'runOnceForAllItems',
+						}),
+						taskData: newDataRequestResponse(
+							[{ json: {}, binary: { binaryFile: binaryDataFile } }],
+							{},
+						),
+					});
+
+					// Assert
+					expect(rpcCallSpy).toHaveBeenCalledWith('1', group.method, group.expectedParams);
+				});
+
+				it(`${group.method} for runOnceForEachItem`, async () => {
+					// Arrange
+					const rpcCallSpy = jest
+						.spyOn(defaultTaskRunner, 'makeRpcCall')
+						.mockResolvedValue(undefined);
+
+					// Act
+					await execTaskWithParams({
+						task: newTaskParamsWithSettings({
+							code: `await ${group.invocation}; return {}`,
+							nodeMode: 'runOnceForEachItem',
+						}),
+						taskData: newDataRequestResponse(
+							[{ json: {}, binary: { binaryFile: binaryDataFile } }],
+							{},
+						),
+					});
+
+					expect(rpcCallSpy).toHaveBeenCalledWith('1', group.method, group.expectedParams);
+				});
+			}
+
+			describe('unsupported methods', () => {
+				for (const unsupportedFunction of UNSUPPORTED_HELPER_FUNCTIONS) {
+					it(`should throw an error if ${unsupportedFunction} is used in runOnceForAllItems`, async () => {
+						// Act & Assert
+						await expect(
+							executeForAllItems({
+								code: `${unsupportedFunction}()`,
+								inputItems,
+							}),
+						).rejects.toThrow(UnsupportedFunctionError);
+					});
+
+					it(`should throw an error if ${unsupportedFunction} is used in runOnceForEachItem`, async () => {
+						// Act & Assert
+						await expect(
+							executeForEachItem({
+								code: `${unsupportedFunction}()`,
+								inputItems,
+							}),
+						).rejects.toThrow(UnsupportedFunctionError);
+					});
+				}
+			});
+		});
+
 		it('should allow access to Node.js Buffers', async () => {
 			const outcomeAll = await execTaskWithParams({
-				task: newTaskWithSettings({
+				task: newTaskParamsWithSettings({
 					code: 'return { val: Buffer.from("test-buffer").toString() }',
 					nodeMode: 'runOnceForAllItems',
 				}),
-				taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+				taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
 					envProviderState: undefined,
 				}),
 			});
@@ -315,11 +738,11 @@ describe('JsTaskRunner', () => {
 			expect(outcomeAll.result).toEqual([wrapIntoJson({ val: 'test-buffer' })]);
 
 			const outcomePer = await execTaskWithParams({
-				task: newTaskWithSettings({
+				task: newTaskParamsWithSettings({
 					code: 'return { val: Buffer.from("test-buffer").toString() }',
 					nodeMode: 'runOnceForEachItem',
 				}),
-				taskData: newAllCodeTaskData(inputItems.map(wrapIntoJson), {
+				taskData: newDataRequestResponse(inputItems.map(wrapIntoJson), {
 					envProviderState: undefined,
 				}),
 			});
@@ -486,6 +909,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}}',
@@ -761,11 +1206,11 @@ describe('JsTaskRunner', () => {
 			async (nodeMode) => {
 				await expect(
 					execTaskWithParams({
-						task: newTaskWithSettings({
+						task: newTaskParamsWithSettings({
 							code: 'unknown',
 							nodeMode,
 						}),
-						taskData: newAllCodeTaskData([wrapIntoJson({ a: 1 })]),
+						taskData: newDataRequestResponse([wrapIntoJson({ a: 1 })]),
 					}),
 				).rejects.toThrow(ExecutionError);
 			},
@@ -774,22 +1219,22 @@ describe('JsTaskRunner', () => {
 		it('sends serializes an error correctly', async () => {
 			const runner = createRunnerWithOpts({});
 			const taskId = '1';
-			const task = newTaskWithSettings({
+			const task = newTaskState(taskId);
+			const taskSettings: JSExecSettings = {
 				code: 'unknown; return []',
 				nodeMode: 'runOnceForAllItems',
 				continueOnFail: false,
-				mode: 'manual',
 				workflowMode: 'manual',
-			});
+			};
 			runner.runningTasks.set(taskId, task);
 
 			const sendSpy = jest.spyOn(runner.ws, 'send').mockImplementation(() => {});
 			jest.spyOn(runner, 'sendOffers').mockImplementation(() => {});
 			jest
 				.spyOn(runner, 'requestData')
-				.mockResolvedValue(newAllCodeTaskData([wrapIntoJson({ a: 1 })]));
+				.mockResolvedValue(newDataRequestResponse([wrapIntoJson({ a: 1 })]));
 
-			await runner.receivedSettings(taskId, task.settings);
+			await runner.receivedSettings(taskId, taskSettings);
 
 			expect(sendSpy).toHaveBeenCalled();
 			const calledWith = sendSpy.mock.calls[0][0] as string;
@@ -807,4 +1252,188 @@ 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, newTaskState(taskId));
+
+			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');
+			const task = newTaskState(taskId);
+
+			runner.runningTasks.set(taskId, task);
+
+			jest.advanceTimersByTime(idleTimeout * 1000);
+			expect(emitSpy).not.toHaveBeenCalledWith('runner:reached-idle-timeout');
+			task.cleanup();
+		});
+	});
+
+	describe('prototype pollution prevention', () => {
+		const checkPrototypeIntact = () => {
+			const obj: Record<string, unknown> = {};
+			expect(obj.maliciousKey).toBeUndefined();
+		};
+
+		test('Object.setPrototypeOf should no-op for local object', async () => {
+			checkPrototypeIntact();
+
+			const outcome = await executeForAllItems({
+				code: `
+					const obj = {};
+					Object.setPrototypeOf(obj, { maliciousKey: 'value' });
+					return [{ json: { prototypeChanged: obj.maliciousKey !== undefined } }];
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson({ prototypeChanged: false })]);
+			checkPrototypeIntact();
+		});
+
+		test('Reflect.setPrototypeOf should no-op for local object', async () => {
+			checkPrototypeIntact();
+
+			const outcome = await executeForAllItems({
+				code: `
+					const obj = {};
+					Reflect.setPrototypeOf(obj, { maliciousKey: 'value' });
+					return [{ json: { prototypeChanged: obj.maliciousKey !== undefined } }];
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson({ prototypeChanged: false })]);
+			checkPrototypeIntact();
+		});
+
+		test('Object.setPrototypeOf should no-op for incoming object', async () => {
+			checkPrototypeIntact();
+
+			const outcome = await executeForAllItems({
+				code: `
+					const obj = $input.first();
+					Object.setPrototypeOf(obj, { maliciousKey: 'value' });
+					return [{ json: { prototypeChanged: obj.maliciousKey !== undefined } }];
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson({ prototypeChanged: false })]);
+			checkPrototypeIntact();
+		});
+
+		test('Reflect.setPrototypeOf should no-op for incoming object', async () => {
+			checkPrototypeIntact();
+
+			const outcome = await executeForAllItems({
+				code: `
+					const obj = $input.first();
+					Reflect.setPrototypeOf(obj, { maliciousKey: 'value' });
+					return [{ json: { prototypeChanged: obj.maliciousKey !== undefined } }];
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([wrapIntoJson({ prototypeChanged: false })]);
+			checkPrototypeIntact();
+		});
+
+		test('should freeze luxon prototypes', async () => {
+			const outcome = await executeForAllItems({
+				code: `
+				[DateTime, Interval, Duration]
+						.forEach(constructor => {
+								constructor.prototype.maliciousKey = 'value';
+						});
+
+				return []
+				`,
+				inputItems: [{ a: 1 }],
+			});
+
+			expect(outcome.result).toEqual([]);
+
+			// @ts-expect-error Non-existing property
+			expect(DateTime.now().maliciousKey).toBeUndefined();
+			// @ts-expect-error Non-existing property
+			expect(Interval.fromISO('P1Y2M10DT2H30M').maliciousKey).toBeUndefined();
+			// @ts-expect-error Non-existing property
+			expect(Duration.fromObject({ hours: 1 }).maliciousKey).toBeUndefined();
+		});
+	});
 });
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..324ff6f749
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/result-validation.test.ts
@@ -0,0 +1,111 @@
+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', {}],
+			['index', {}], // temporarily allowed until refactored out
+		])(
+			'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__/task-runner.test.ts b/packages/@n8n/task-runner/src/js-task-runner/__tests__/task-runner.test.ts
new file mode 100644
index 0000000000..9db385eb7f
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/__tests__/task-runner.test.ts
@@ -0,0 +1,341 @@
+import { WebSocket } from 'ws';
+
+import { newTaskState } from '@/js-task-runner/__tests__/test-data';
+import { TimeoutError } from '@/js-task-runner/errors/timeout-error';
+import { TaskRunner, type TaskRunnerOpts } from '@/task-runner';
+import type { TaskStatus } from '@/task-state';
+
+class TestRunner extends TaskRunner {}
+
+jest.mock('ws');
+
+describe('TestRunner', () => {
+	let runner: TestRunner;
+
+	const newTestRunner = (opts: Partial<TaskRunnerOpts> = {}) =>
+		new TestRunner({
+			taskType: 'test-task',
+			maxConcurrency: 5,
+			idleTimeout: 60,
+			grantToken: 'test-token',
+			maxPayloadSize: 1024,
+			taskBrokerUri: 'http://localhost:8080',
+			timezone: 'America/New_York',
+			taskTimeout: 60,
+			healthcheckServer: {
+				enabled: false,
+				host: 'localhost',
+				port: 8081,
+			},
+			...opts,
+		});
+
+	afterEach(() => {
+		runner?.clearIdleTimer();
+	});
+
+	describe('constructor', () => {
+		afterEach(() => {
+			jest.clearAllMocks();
+		});
+
+		it('should correctly construct WebSocket URI with provided taskBrokerUri', () => {
+			runner = newTestRunner({
+				taskBrokerUri: 'http://localhost:8080',
+			});
+
+			expect(WebSocket).toHaveBeenCalledWith(
+				`ws://localhost:8080/runners/_ws?id=${runner.id}`,
+				expect.objectContaining({
+					headers: {
+						authorization: 'Bearer test-token',
+					},
+					maxPayload: 1024,
+				}),
+			);
+		});
+
+		it('should handle different taskBrokerUri formats correctly', () => {
+			runner = newTestRunner({
+				taskBrokerUri: 'https://example.com:3000/path',
+			});
+
+			expect(WebSocket).toHaveBeenCalledWith(
+				`ws://example.com:3000/runners/_ws?id=${runner.id}`,
+				expect.objectContaining({
+					headers: {
+						authorization: 'Bearer test-token',
+					},
+					maxPayload: 1024,
+				}),
+			);
+		});
+
+		it('should throw an error if taskBrokerUri is invalid', () => {
+			expect(() =>
+				newTestRunner({
+					taskBrokerUri: 'not-a-valid-uri',
+				}),
+			).toThrowError(/Invalid URL/);
+		});
+	});
+
+	describe('sendOffers', () => {
+		beforeEach(() => {
+			jest.useFakeTimers();
+		});
+
+		afterEach(() => {
+			jest.clearAllTimers();
+		});
+
+		it('should not send offers if canSendOffers is false', () => {
+			runner = newTestRunner({
+				taskType: 'test-task',
+				maxConcurrency: 2,
+			});
+			const sendSpy = jest.spyOn(runner, 'send');
+			expect(runner.canSendOffers).toBe(false);
+
+			runner.sendOffers();
+
+			expect(sendSpy).toHaveBeenCalledTimes(0);
+		});
+
+		it('should enable sending of offer on runnerregistered message', () => {
+			runner = newTestRunner({
+				taskType: 'test-task',
+				maxConcurrency: 2,
+			});
+			runner.onMessage({
+				type: 'broker:runnerregistered',
+			});
+
+			expect(runner.canSendOffers).toBe(true);
+		});
+
+		it('should send maxConcurrency offers when there are no offers', () => {
+			runner = newTestRunner({
+				taskType: 'test-task',
+				maxConcurrency: 2,
+			});
+			runner.onMessage({
+				type: 'broker:runnerregistered',
+			});
+
+			const sendSpy = jest.spyOn(runner, 'send');
+
+			runner.sendOffers();
+			runner.sendOffers();
+
+			expect(sendSpy).toHaveBeenCalledTimes(2);
+			expect(sendSpy.mock.calls).toEqual([
+				[
+					{
+						type: 'runner:taskoffer',
+						taskType: 'test-task',
+						offerId: expect.any(String),
+						validFor: expect.any(Number),
+					},
+				],
+				[
+					{
+						type: 'runner:taskoffer',
+						taskType: 'test-task',
+						offerId: expect.any(String),
+						validFor: expect.any(Number),
+					},
+				],
+			]);
+		});
+
+		it('should send up to maxConcurrency offers when there is a running task', () => {
+			runner = newTestRunner({
+				taskType: 'test-task',
+				maxConcurrency: 2,
+			});
+			runner.onMessage({
+				type: 'broker:runnerregistered',
+			});
+			const taskState = newTaskState('test-task');
+			runner.runningTasks.set('test-task', taskState);
+			const sendSpy = jest.spyOn(runner, 'send');
+
+			runner.sendOffers();
+
+			expect(sendSpy).toHaveBeenCalledTimes(1);
+			expect(sendSpy.mock.calls).toEqual([
+				[
+					{
+						type: 'runner:taskoffer',
+						taskType: 'test-task',
+						offerId: expect.any(String),
+						validFor: expect.any(Number),
+					},
+				],
+			]);
+			taskState.cleanup();
+		});
+
+		it('should delete stale offers and send new ones', () => {
+			runner = newTestRunner({
+				taskType: 'test-task',
+				maxConcurrency: 2,
+			});
+			runner.onMessage({
+				type: 'broker:runnerregistered',
+			});
+
+			const sendSpy = jest.spyOn(runner, 'send');
+
+			runner.sendOffers();
+			expect(sendSpy).toHaveBeenCalledTimes(2);
+			sendSpy.mockClear();
+
+			jest.advanceTimersByTime(6000);
+			runner.sendOffers();
+			expect(sendSpy).toHaveBeenCalledTimes(2);
+		});
+	});
+
+	describe('taskCancelled', () => {
+		test.each<[TaskStatus, string]>([
+			['aborting:cancelled', 'cancelled'],
+			['aborting:timeout', 'timeout'],
+		])('should not do anything if task status is %s', async (status, reason) => {
+			runner = newTestRunner();
+
+			const taskId = 'test-task';
+			const task = newTaskState(taskId);
+			task.status = status;
+
+			runner.runningTasks.set(taskId, task);
+
+			await runner.taskCancelled(taskId, reason);
+
+			expect(runner.runningTasks.size).toBe(1);
+			expect(task.status).toBe(status);
+		});
+
+		it('should delete task if task is waiting for settings when task is cancelled', async () => {
+			runner = newTestRunner();
+
+			const taskId = 'test-task';
+			const task = newTaskState(taskId);
+			const taskCleanupSpy = jest.spyOn(task, 'cleanup');
+			runner.runningTasks.set(taskId, task);
+
+			await runner.taskCancelled(taskId, 'test-reason');
+
+			expect(runner.runningTasks.size).toBe(0);
+			expect(taskCleanupSpy).toHaveBeenCalled();
+		});
+
+		it('should reject pending requests when task is cancelled', async () => {
+			runner = newTestRunner();
+
+			const taskId = 'test-task';
+			const task = newTaskState(taskId);
+			task.status = 'running';
+			runner.runningTasks.set(taskId, task);
+
+			const dataRequestReject = jest.fn();
+			const nodeTypesRequestReject = jest.fn();
+
+			runner.dataRequests.set('data-req', {
+				taskId,
+				requestId: 'data-req',
+				resolve: jest.fn(),
+				reject: dataRequestReject,
+			});
+
+			runner.nodeTypesRequests.set('node-req', {
+				taskId,
+				requestId: 'node-req',
+				resolve: jest.fn(),
+				reject: nodeTypesRequestReject,
+			});
+
+			await runner.taskCancelled(taskId, 'test-reason');
+
+			expect(dataRequestReject).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: 'Task cancelled: test-reason',
+				}),
+			);
+
+			expect(nodeTypesRequestReject).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: 'Task cancelled: test-reason',
+				}),
+			);
+
+			expect(runner.dataRequests.size).toBe(0);
+			expect(runner.nodeTypesRequests.size).toBe(0);
+		});
+	});
+
+	describe('taskTimedOut', () => {
+		it('should error task if task is waiting for settings', async () => {
+			runner = newTestRunner();
+
+			const taskId = 'test-task';
+			const task = newTaskState(taskId);
+			task.status = 'waitingForSettings';
+			runner.runningTasks.set(taskId, task);
+			const sendSpy = jest.spyOn(runner, 'send');
+
+			await runner.taskTimedOut(taskId);
+
+			expect(runner.runningTasks.size).toBe(0);
+			expect(sendSpy).toHaveBeenCalledWith({
+				type: 'runner:taskerror',
+				taskId,
+				error: expect.any(TimeoutError),
+			});
+		});
+
+		it('should reject pending requests when task is running', async () => {
+			runner = newTestRunner();
+
+			const taskId = 'test-task';
+			const task = newTaskState(taskId);
+			task.status = 'running';
+			runner.runningTasks.set(taskId, task);
+
+			const dataRequestReject = jest.fn();
+			const nodeTypesRequestReject = jest.fn();
+
+			runner.dataRequests.set('data-req', {
+				taskId,
+				requestId: 'data-req',
+				resolve: jest.fn(),
+				reject: dataRequestReject,
+			});
+
+			runner.nodeTypesRequests.set('node-req', {
+				taskId,
+				requestId: 'node-req',
+				resolve: jest.fn(),
+				reject: nodeTypesRequestReject,
+			});
+
+			await runner.taskCancelled(taskId, 'test-reason');
+
+			expect(dataRequestReject).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: 'Task cancelled: test-reason',
+				}),
+			);
+
+			expect(nodeTypesRequestReject).toHaveBeenCalledWith(
+				expect.objectContaining({
+					message: 'Task cancelled: test-reason',
+				}),
+			);
+
+			expect(runner.dataRequests.size).toBe(0);
+			expect(runner.nodeTypesRequests.size).toBe(0);
+		});
+	});
+});
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 b157094619..85a1235dc6 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
@@ -2,24 +2,23 @@ import type { IDataObject, INode, INodeExecutionData, ITaskData } from 'n8n-work
 import { NodeConnectionType } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
-import type { AllCodeTaskData, JSExecSettings } from '@/js-task-runner/js-task-runner';
-import type { Task } from '@/task-runner';
+import type { JSExecSettings } from '@/js-task-runner/js-task-runner';
+import type { DataRequestResponse } from '@/runner-types';
+import type { TaskParams } from '@/task-runner';
+import { TaskState } from '@/task-state';
 
 /**
  * Creates a new task with the given settings
  */
-export const newTaskWithSettings = (
+export const newTaskParamsWithSettings = (
 	settings: Partial<JSExecSettings> & Pick<JSExecSettings, 'code' | 'nodeMode'>,
-): Task<JSExecSettings> => ({
+): TaskParams<JSExecSettings> => ({
 	taskId: '1',
 	settings: {
 		workflowMode: 'manual',
 		continueOnFail: false,
-		mode: 'manual',
 		...settings,
 	},
-	active: true,
-	cancelled: false,
 });
 
 /**
@@ -46,12 +45,14 @@ export const newTaskData = (opts: Partial<ITaskData> & Pick<ITaskData, 'source'>
 });
 
 /**
- * Creates a new all code task data with the given options
+ * Creates a new data request response with the given options
  */
-export const newAllCodeTaskData = (
-	codeNodeInputData: INodeExecutionData[],
-	opts: Partial<AllCodeTaskData> = {},
-): AllCodeTaskData => {
+export const newDataRequestResponse = (
+	inputData: INodeExecutionData[],
+	opts: Partial<DataRequestResponse> & {
+		staticData?: IDataObject;
+	} = {},
+): DataRequestResponse => {
 	const codeNode = newNode({
 		name: 'JsCode',
 		parameters: {
@@ -81,11 +82,11 @@ export const newAllCodeTaskData = (
 				},
 			},
 			nodes: [manualTriggerNode, codeNode],
+			staticData: opts.staticData,
 		},
 		inputData: {
-			main: [codeNodeInputData],
+			main: [inputData],
 		},
-		connectionInputData: codeNodeInputData,
 		node: codeNode,
 		runExecutionData: {
 			startData: {},
@@ -95,7 +96,7 @@ export const newAllCodeTaskData = (
 						newTaskData({
 							source: [],
 							data: {
-								main: [codeNodeInputData],
+								main: [inputData],
 							},
 						}),
 					],
@@ -137,14 +138,13 @@ export const newAllCodeTaskData = (
 				var: 'value',
 			},
 		},
-		executeData: {
-			node: codeNode,
-			data: {
-				main: [codeNodeInputData],
-			},
-			source: {
-				main: [{ previousNode: manualTriggerNode.name }],
-			},
+		connectionInputSource: {
+			main: [
+				{
+					previousNode: 'Trigger',
+					previousNodeOutput: 0,
+				},
+			],
 		},
 		...opts,
 	};
@@ -166,3 +166,13 @@ export const withPairedItem = (index: number, data: INodeExecutionData): INodeEx
 		item: index,
 	},
 });
+
+/**
+ * Creates a new task state with the given taskId
+ */
+export const newTaskState = (taskId: string) =>
+	new TaskState({
+		taskId,
+		timeoutInS: 60,
+		onTimeout: () => {},
+	});
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
new file mode 100644
index 0000000000..eb38eb31c4
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser-state.test.ts
@@ -0,0 +1,167 @@
+import { BuiltInsParserState } from '../built-ins-parser-state';
+
+describe('BuiltInsParserState', () => {
+	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: {
+					chunk: undefined,
+					include: false,
+				},
+				prevNode: false,
+			});
+		});
+
+		it('should return all nodes and input when markNeedsAllNodes is called', () => {
+			const state = new BuiltInsParserState();
+			state.markNeedsAllNodes();
+
+			expect(state.toDataRequestParams()).toEqual({
+				dataOfNodes: 'all',
+				env: false,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
+				prevNode: false,
+			});
+		});
+
+		it('should return specific node names when nodes are marked as needed individually', () => {
+			const state = new BuiltInsParserState();
+			state.markNodeAsNeeded('Node1');
+			state.markNodeAsNeeded('Node2');
+
+			expect(state.toDataRequestParams()).toEqual({
+				dataOfNodes: ['Node1', 'Node2'],
+				env: false,
+				input: {
+					chunk: undefined,
+					include: false,
+				},
+				prevNode: false,
+			});
+		});
+
+		it('should ignore individual nodes when needsAllNodes is marked as true', () => {
+			const state = new BuiltInsParserState();
+			state.markNodeAsNeeded('Node1');
+			state.markNeedsAllNodes();
+			state.markNodeAsNeeded('Node2'); // should be ignored since all nodes are needed
+
+			expect(state.toDataRequestParams()).toEqual({
+				dataOfNodes: 'all',
+				env: false,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
+				prevNode: false,
+			});
+		});
+
+		it('should mark env as needed when markEnvAsNeeded is called', () => {
+			const state = new BuiltInsParserState();
+			state.markEnvAsNeeded();
+
+			expect(state.toDataRequestParams()).toEqual({
+				dataOfNodes: [],
+				env: true,
+				input: {
+					chunk: undefined,
+					include: false,
+				},
+				prevNode: false,
+			});
+		});
+
+		it('should mark input as needed when markInputAsNeeded is called', () => {
+			const state = new BuiltInsParserState();
+			state.markInputAsNeeded();
+
+			expect(state.toDataRequestParams()).toEqual({
+				dataOfNodes: [],
+				env: false,
+				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,
+			});
+		});
+
+		it('should mark prevNode as needed when markPrevNodeAsNeeded is called', () => {
+			const state = new BuiltInsParserState();
+			state.markPrevNodeAsNeeded();
+
+			expect(state.toDataRequestParams()).toEqual({
+				dataOfNodes: [],
+				env: false,
+				input: {
+					chunk: undefined,
+					include: false,
+				},
+				prevNode: true,
+			});
+		});
+
+		it('should return correct specification when multiple properties are marked as needed', () => {
+			const state = new BuiltInsParserState();
+			state.markNeedsAllNodes();
+			state.markEnvAsNeeded();
+			state.markInputAsNeeded();
+			state.markPrevNodeAsNeeded();
+
+			expect(state.toDataRequestParams()).toEqual({
+				dataOfNodes: 'all',
+				env: true,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
+				prevNode: true,
+			});
+		});
+
+		it('should return correct specification when all properties are marked as needed', () => {
+			const state = BuiltInsParserState.newNeedsAllDataState();
+
+			expect(state.toDataRequestParams()).toEqual({
+				dataOfNodes: 'all',
+				env: true,
+				input: {
+					chunk: undefined,
+					include: true,
+				},
+				prevNode: true,
+			});
+		});
+	});
+});
diff --git a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser.test.ts b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser.test.ts
new file mode 100644
index 0000000000..dd866fc381
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/__tests__/built-ins-parser.test.ts
@@ -0,0 +1,284 @@
+import { getAdditionalKeys } from 'n8n-core';
+import type {
+	IDataObject,
+	IExecuteData,
+	INodeType,
+	IWorkflowExecuteAdditionalData,
+} from 'n8n-workflow';
+import { Workflow, WorkflowDataProxy } from 'n8n-workflow';
+
+import { newDataRequestResponse } from '../../__tests__/test-data';
+import { BuiltInsParser } from '../built-ins-parser';
+import { BuiltInsParserState } from '../built-ins-parser-state';
+
+describe('BuiltInsParser', () => {
+	const parser = new BuiltInsParser();
+
+	const parseAndExpectOk = (code: string) => {
+		const result = parser.parseUsedBuiltIns(code);
+		if (!result.ok) {
+			throw result.error;
+		}
+
+		return result.result;
+	};
+
+	describe('Env, input, execution and prevNode', () => {
+		const cases: Array<[string, BuiltInsParserState]> = [
+			['$env', new BuiltInsParserState({ needs$env: true })],
+			['$execution', new BuiltInsParserState({ needs$execution: true })],
+			['$prevNode', new BuiltInsParserState({ needs$prevNode: true })],
+		];
+
+		test.each(cases)("should identify built-ins in '%s'", (code, expected) => {
+			const state = parseAndExpectOk(code);
+			expect(state).toEqual(expected);
+		});
+	});
+
+	describe('Input', () => {
+		it('should mark input as needed when $input is used', () => {
+			const state = parseAndExpectOk(`
+				$input.item.json.age = 10 + Math.floor(Math.random() * 30);
+				$input.item.json.password = $input.item.json.password.split('').map(() => '*').join("")
+				delete $input.item.json.lastname
+				const emailParts = $input.item.json.email.split("@")
+				$input.item.json.emailData = {
+					user: emailParts[0],
+					domain: emailParts[1]
+				}
+
+				return $input.item;
+			`);
+
+			expect(state).toEqual(new BuiltInsParserState({ needs$input: true }));
+		});
+
+		it('should mark input as needed when $json is used', () => {
+			const state = parseAndExpectOk(`
+				$json.age = 10 + Math.floor(Math.random() * 30);
+				return $json;
+				`);
+
+			expect(state).toEqual(new BuiltInsParserState({ needs$input: true }));
+		});
+
+		test.each([['items'], ['item']])(
+			'should mark input as needed when %s is used',
+			(identifier) => {
+				const state = parseAndExpectOk(`return ${identifier};`);
+
+				expect(state).toEqual(new BuiltInsParserState({ needs$input: true }));
+			},
+		);
+	});
+
+	describe('$(...)', () => {
+		const cases: Array<[string, BuiltInsParserState]> = [
+			[
+				'$("nodeName").first()',
+				new BuiltInsParserState({ neededNodeNames: new Set(['nodeName']) }),
+			],
+			[
+				'$("nodeName").all(); $("secondNode").matchingItem()',
+				new BuiltInsParserState({ neededNodeNames: new Set(['nodeName', 'secondNode']) }),
+			],
+		];
+
+		test.each(cases)("should identify nodes in '%s'", (code, expected) => {
+			const state = parseAndExpectOk(code);
+			expect(state).toEqual(expected);
+		});
+
+		it('should need all nodes when $() is called with a variable', () => {
+			const state = parseAndExpectOk('var n = "name"; $(n)');
+			expect(state).toEqual(new BuiltInsParserState({ needsAllNodes: true, needs$input: true }));
+		});
+
+		it('should require all nodes when there are multiple usages of $() and one is with a variable', () => {
+			const state = parseAndExpectOk(`
+				$("nodeName");
+				$("secondNode");
+				var n = "name";
+				$(n)
+			`);
+			expect(state).toEqual(new BuiltInsParserState({ needsAllNodes: true, needs$input: true }));
+		});
+
+		test.each([
+			['without parameters', '$()'],
+			['number literal', '$(123)'],
+		])('should ignore when $ is called %s', (_, code) => {
+			const state = parseAndExpectOk(code);
+			expect(state).toEqual(new BuiltInsParserState());
+		});
+
+		test.each([
+			'$("node").item',
+			'$("node")["item"]',
+			'$("node").pairedItem()',
+			'$("node")["pairedItem"]()',
+			'$("node").itemMatching(0)',
+			'$("node")["itemMatching"](0)',
+			'$("node")[variable]',
+			'var a = $("node")',
+			'let a = $("node")',
+			'const a = $("node")',
+			'a = $("node")',
+		])('should require all nodes if %s is used', (code) => {
+			const state = parseAndExpectOk(code);
+			expect(state).toEqual(new BuiltInsParserState({ needsAllNodes: true, needs$input: true }));
+		});
+
+		test.each(['$("node").first()', '$("node").last()', '$("node").all()', '$("node").params'])(
+			'should require only accessed node if %s is used',
+			(code) => {
+				const state = parseAndExpectOk(code);
+				expect(state).toEqual(
+					new BuiltInsParserState({
+						needsAllNodes: false,
+						neededNodeNames: new Set(['node']),
+					}),
+				);
+			},
+		);
+	});
+
+	describe('$node', () => {
+		it('should require all nodes when $node is used', () => {
+			const state = parseAndExpectOk('return $node["name"];');
+			expect(state).toEqual(new BuiltInsParserState({ needsAllNodes: true, needs$input: true }));
+		});
+	});
+
+	describe('$item', () => {
+		it('should require all nodes and input when $item is used', () => {
+			const state = parseAndExpectOk('$item("0").$node["my node"].json["title"]');
+			expect(state).toEqual(new BuiltInsParserState({ needsAllNodes: true, needs$input: true }));
+		});
+	});
+
+	describe('ECMAScript syntax', () => {
+		describe('ES2020', () => {
+			it('should parse optional chaining', () => {
+				parseAndExpectOk(`
+					const a = { b: { c: 1 } };
+					return a.b?.c;
+				`);
+			});
+
+			it('should parse nullish coalescing', () => {
+				parseAndExpectOk(`
+					const a = null;
+					return a ?? 1;
+				`);
+			});
+		});
+
+		describe('ES2021', () => {
+			it('should parse numeric separators', () => {
+				parseAndExpectOk(`
+					const a = 1_000_000;
+					return a;
+				`);
+			});
+		});
+	});
+
+	describe('WorkflowDataProxy built-ins', () => {
+		it('should have a known list of built-ins', () => {
+			const data = newDataRequestResponse([]);
+			const executeData: IExecuteData = {
+				data: {},
+				node: data.node,
+				source: data.connectionInputSource,
+			};
+			const dataProxy = new WorkflowDataProxy(
+				new Workflow({
+					...data.workflow,
+					nodeTypes: {
+						getByName() {
+							return undefined as unknown as INodeType;
+						},
+						getByNameAndVersion() {
+							return undefined as unknown as INodeType;
+						},
+						getKnownTypes() {
+							return undefined as unknown as IDataObject;
+						},
+					},
+				}),
+				data.runExecutionData,
+				data.runIndex,
+				0,
+				data.activeNodeName,
+				[],
+				data.siblingParameters,
+				data.mode,
+				getAdditionalKeys(
+					data.additionalData as IWorkflowExecuteAdditionalData,
+					data.mode,
+					data.runExecutionData,
+				),
+				executeData,
+				data.defaultReturnRunIndex,
+				data.selfData,
+				data.contextNodeName,
+				// Make sure that even if we don't receive the envProviderState for
+				// whatever reason, we don't expose the task runner's env to the code
+				data.envProviderState ?? {
+					env: {},
+					isEnvAccessBlocked: false,
+					isProcessAvailable: true,
+				},
+			).getDataProxy({ throwOnMissingExecutionData: false });
+
+			/**
+			 * NOTE! If you are adding new built-ins to the WorkflowDataProxy class
+			 * make sure the built-ins parser and Task Runner handle them properly.
+			 */
+			expect(Object.keys(dataProxy)).toStrictEqual([
+				'$',
+				'$input',
+				'$binary',
+				'$data',
+				'$env',
+				'$evaluateExpression',
+				'$item',
+				'$fromAI',
+				'$fromai',
+				'$fromAi',
+				'$items',
+				'$json',
+				'$node',
+				'$self',
+				'$parameter',
+				'$prevNode',
+				'$runIndex',
+				'$mode',
+				'$workflow',
+				'$itemIndex',
+				'$now',
+				'$today',
+				'$jmesPath',
+				'DateTime',
+				'Interval',
+				'Duration',
+				'$execution',
+				'$vars',
+				'$secrets',
+				'$executionId',
+				'$resumeWebhookUrl',
+				'$getPairedItem',
+				'$jmespath',
+				'$position',
+				'$thisItem',
+				'$thisItemIndex',
+				'$thisRunIndex',
+				'$nodeVersion',
+				'$nodeId',
+				'$webhookId',
+			]);
+		});
+	});
+});
diff --git a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/acorn-helpers.ts b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/acorn-helpers.ts
new file mode 100644
index 0000000000..ccab4c1527
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/acorn-helpers.ts
@@ -0,0 +1,28 @@
+import type {
+	AssignmentExpression,
+	Identifier,
+	Literal,
+	MemberExpression,
+	Node,
+	VariableDeclarator,
+} from 'acorn';
+
+export function isLiteral(node?: Node): node is Literal {
+	return node?.type === 'Literal';
+}
+
+export function isIdentifier(node?: Node): node is Identifier {
+	return node?.type === 'Identifier';
+}
+
+export function isMemberExpression(node?: Node): node is MemberExpression {
+	return node?.type === 'MemberExpression';
+}
+
+export function isVariableDeclarator(node?: Node): node is VariableDeclarator {
+	return node?.type === 'VariableDeclarator';
+}
+
+export function isAssignmentExpression(node?: Node): node is AssignmentExpression {
+	return node?.type === 'AssignmentExpression';
+}
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
new file mode 100644
index 0000000000..777738e123
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser-state.ts
@@ -0,0 +1,80 @@
+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
+ */
+export class BuiltInsParserState {
+	neededNodeNames: Set<string> = new Set();
+
+	needsAllNodes = false;
+
+	needs$env = false;
+
+	needs$input = false;
+
+	needs$execution = false;
+
+	needs$prevNode = false;
+
+	constructor(opts: Partial<BuiltInsParserState> = {}) {
+		Object.assign(this, opts);
+	}
+
+	/**
+	 * Marks that all nodes are needed, including input data
+	 */
+	markNeedsAllNodes() {
+		this.needsAllNodes = true;
+		this.needs$input = true;
+		this.neededNodeNames = new Set();
+	}
+
+	markNodeAsNeeded(nodeName: string) {
+		if (this.needsAllNodes) {
+			return;
+		}
+
+		this.neededNodeNames.add(nodeName);
+	}
+
+	markEnvAsNeeded() {
+		this.needs$env = true;
+	}
+
+	markInputAsNeeded() {
+		this.needs$input = true;
+	}
+
+	markExecutionAsNeeded() {
+		this.needs$execution = true;
+	}
+
+	markPrevNodeAsNeeded() {
+		this.needs$prevNode = true;
+	}
+
+	toDataRequestParams(
+		chunk?: InputDataChunkDefinition,
+	): BrokerMessage.ToRequester.TaskDataRequest['requestParams'] {
+		return {
+			dataOfNodes: this.needsAllNodes ? 'all' : Array.from(this.neededNodeNames),
+			env: this.needs$env,
+			input: {
+				include: this.needs$input,
+				chunk,
+			},
+			prevNode: this.needs$prevNode,
+		};
+	}
+
+	static newNeedsAllDataState() {
+		const obj = new BuiltInsParserState();
+		obj.markNeedsAllNodes();
+		obj.markEnvAsNeeded();
+		obj.markInputAsNeeded();
+		obj.markExecutionAsNeeded();
+		obj.markPrevNodeAsNeeded();
+		return obj;
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser.ts b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser.ts
new file mode 100644
index 0000000000..fea0d94469
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/built-ins-parser/built-ins-parser.ts
@@ -0,0 +1,158 @@
+import type { CallExpression, Identifier, Node, Program } from 'acorn';
+import { parse } from 'acorn';
+import { ancestor } from 'acorn-walk';
+import type { Result } from 'n8n-workflow';
+import { toResult } from 'n8n-workflow';
+
+import {
+	isAssignmentExpression,
+	isIdentifier,
+	isLiteral,
+	isMemberExpression,
+	isVariableDeclarator,
+} from './acorn-helpers';
+import { BuiltInsParserState } from './built-ins-parser-state';
+
+/**
+ * Class for parsing Code Node code to identify which built-in variables
+ * are accessed
+ */
+export class BuiltInsParser {
+	/**
+	 * Parses which built-in variables are accessed in the given code
+	 */
+	parseUsedBuiltIns(code: string): Result<BuiltInsParserState, Error> {
+		return toResult(() => {
+			const wrappedCode = `async function VmCodeWrapper() { ${code} }`;
+			const ast = parse(wrappedCode, { ecmaVersion: 2025, sourceType: 'module' });
+
+			return this.identifyBuiltInsByWalkingAst(ast);
+		});
+	}
+
+	/** Traverse the AST of the script and mark any data needed for it to run. */
+	private identifyBuiltInsByWalkingAst(ast: Program) {
+		const accessedBuiltIns = new BuiltInsParserState();
+
+		ancestor(
+			ast,
+			{
+				CallExpression: this.visitCallExpression,
+				Identifier: this.visitIdentifier,
+			},
+			undefined,
+			accessedBuiltIns,
+		);
+
+		return accessedBuiltIns;
+	}
+
+	private visitCallExpression = (
+		node: CallExpression,
+		state: BuiltInsParserState,
+		ancestors: Node[],
+	) => {
+		// $(...)
+		const isDollar = node.callee.type === 'Identifier' && node.callee.name === '$';
+		if (!isDollar) return;
+
+		// $(): This is not valid, ignore
+		if (node.arguments.length === 0) {
+			return;
+		}
+
+		const firstArg = node.arguments[0];
+		if (!isLiteral(firstArg)) {
+			// $(variable): Can't easily determine statically, mark all nodes as needed
+			state.markNeedsAllNodes();
+			return;
+		}
+
+		if (typeof firstArg.value !== 'string') {
+			// $(123): Static value, but not a string --> invalid code --> ignore
+			return;
+		}
+
+		// $("node"): Static value, mark 'nodeName' as needed
+		state.markNodeAsNeeded(firstArg.value);
+
+		// Determine how $("node") is used
+		this.handlePrevNodeCall(node, state, ancestors);
+	};
+
+	private handlePrevNodeCall(_node: CallExpression, state: BuiltInsParserState, ancestors: Node[]) {
+		// $("node").item, .pairedItem or .itemMatching: In a case like this, the execution
+		// engine will traverse back from current node (i.e. the Code Node) to
+		// the "node" node and use `pairedItem`s to find which item is linked
+		// to the current item. So, we need to mark all nodes as needed.
+		// TODO: We could also mark all the nodes between the current node and
+		// the "node" node as needed, but that would require more complex logic.
+		const directParent = ancestors[ancestors.length - 2];
+		if (isMemberExpression(directParent)) {
+			const accessedProperty = directParent.property;
+
+			if (directParent.computed) {
+				// $("node")["item"], ["pairedItem"] or ["itemMatching"]
+				if (isLiteral(accessedProperty)) {
+					if (this.isPairedItemProperty(accessedProperty.value)) {
+						state.markNeedsAllNodes();
+					}
+					// Else: $("node")[123]: Static value, but not any of the ones above --> ignore
+				}
+				// $("node")[variable]
+				else if (isIdentifier(accessedProperty)) {
+					state.markNeedsAllNodes();
+				}
+			}
+			// $("node").item, .pairedItem or .itemMatching
+			else if (isIdentifier(accessedProperty) && this.isPairedItemProperty(accessedProperty.name)) {
+				state.markNeedsAllNodes();
+			}
+		} else if (isVariableDeclarator(directParent) || isAssignmentExpression(directParent)) {
+			// const variable = $("node") or variable = $("node"):
+			// In this case we would need to track down all the possible use sites
+			// of 'variable' and determine if `.item` is accessed on it. This is
+			// more complex and skipped for now.
+			// TODO: Optimize for this case
+			state.markNeedsAllNodes();
+		} else {
+			// Something else than the cases above. Mark all nodes as needed as it
+			// could be a dynamic access.
+			state.markNeedsAllNodes();
+		}
+	}
+
+	private visitIdentifier = (node: Identifier, state: BuiltInsParserState) => {
+		if (node.name === '$env') {
+			state.markEnvAsNeeded();
+		} else if (node.name === '$item') {
+			// $item is legacy syntax that is basically an alias for WorkflowDataProxy
+			// and allows accessing any data. We need to support it for backwards
+			// compatibility, but we're not gonna implement any optimizations
+			state.markNeedsAllNodes();
+		} else if (
+			node.name === '$input' ||
+			node.name === '$json' ||
+			node.name === 'items' ||
+			// item is deprecated but we still need to support it
+			node.name === 'item'
+		) {
+			state.markInputAsNeeded();
+		} else if (node.name === '$node') {
+			// $node is legacy way of accessing any node's output. We need to
+			// support it for backward compatibility, but we're not gonna
+			// implement any optimizations
+			state.markNeedsAllNodes();
+		} else if (node.name === '$execution') {
+			state.markExecutionAsNeeded();
+		} else if (node.name === '$prevNode') {
+			state.markPrevNodeAsNeeded();
+		}
+	};
+
+	private isPairedItemProperty(
+		property?: string | boolean | null | number | RegExp | bigint,
+	): boolean {
+		return property === 'item' || property === 'pairedItem' || property === 'itemMatching';
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts
index c85e52f977..53270c2599 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/__tests__/execution-error.test.ts
@@ -36,7 +36,11 @@ describe('ExecutionError', () => {
 
 	it('should serialize correctly', () => {
 		const error = new Error('a.unknown is not a function');
-		error.stack = defaultStack;
+		Object.defineProperty(error, 'stack', {
+			value: defaultStack,
+			enumerable: true,
+		});
+		// error.stack = defaultStack;
 
 		const executionError = new ExecutionError(error, 1);
 
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts
index 63a2dd5e0b..ef593d9589 100644
--- a/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/execution-error.ts
@@ -10,8 +10,6 @@ export class ExecutionError extends SerializableError {
 
 	context: { itemIndex: number } | undefined = undefined;
 
-	stack = '';
-
 	lineNumber: number | undefined = undefined;
 
 	constructor(error: ErrorLike, itemIndex?: number) {
@@ -22,7 +20,12 @@ export class ExecutionError extends SerializableError {
 			this.context = { itemIndex: this.itemIndex };
 		}
 
-		this.stack = error.stack ?? '';
+		// Override the stack trace with the given error's stack trace. Since
+		// node v22 it's not writable, so we can't assign it directly
+		Object.defineProperty(this, 'stack', {
+			value: error.stack,
+			enumerable: true,
+		});
 
 		this.populateFromStack();
 	}
@@ -31,7 +34,7 @@ export class ExecutionError extends SerializableError {
 	 * Populate error `message` and `description` from error `stack`.
 	 */
 	private populateFromStack() {
-		const stackRows = this.stack.split('\n');
+		const stackRows = (this.stack ?? '').split('\n');
 
 		if (stackRows.length === 0) {
 			this.message = 'Unknown error';
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/task-cancelled-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/task-cancelled-error.ts
new file mode 100644
index 0000000000..1970c11fcd
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/task-cancelled-error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class TaskCancelledError extends ApplicationError {
+	constructor(reason: string) {
+		super(`Task cancelled: ${reason}`, { level: 'warning' });
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/timeout-error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/timeout-error.ts
new file mode 100644
index 0000000000..ef3cc89751
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/timeout-error.ts
@@ -0,0 +1,30 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class TimeoutError extends ApplicationError {
+	description: string;
+
+	constructor(taskTimeout: number) {
+		super(
+			`Task execution timed out after ${taskTimeout} ${taskTimeout === 1 ? 'second' : 'seconds'}`,
+		);
+
+		const subtitle = 'The task runner was taking too long on this task, so the task was aborted.';
+
+		const fixes = {
+			optimizeScript:
+				'Optimize your script to prevent long-running tasks, e.g. by processing data in smaller batches.',
+			ensureTermination:
+				'Ensure that all paths in your script are able to terminate, i.e. no infinite loops.',
+		};
+
+		const suggestions = [fixes.optimizeScript, fixes.ensureTermination];
+
+		const suggestionsText = suggestions
+			.map((suggestion, index) => `${index + 1}. ${suggestion}`)
+			.join('<br/>');
+
+		const description = `${subtitle} You can try the following:<br/><br/>${suggestionsText}`;
+
+		this.description = description;
+	}
+}
diff --git a/packages/@n8n/task-runner/src/js-task-runner/errors/unsupported-function.error.ts b/packages/@n8n/task-runner/src/js-task-runner/errors/unsupported-function.error.ts
new file mode 100644
index 0000000000..ad55ee0bbf
--- /dev/null
+++ b/packages/@n8n/task-runner/src/js-task-runner/errors/unsupported-function.error.ts
@@ -0,0 +1,13 @@
+import { ApplicationError } from 'n8n-workflow';
+
+/**
+ * Error that indicates that a specific function is not available in the
+ * Code Node.
+ */
+export class UnsupportedFunctionError extends ApplicationError {
+	constructor(functionName: string) {
+		super(`The function "${functionName}" is not supported in the Code Node`, {
+			level: 'info',
+		});
+	}
+}
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 d7ec7d85f4..44745a850c 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
@@ -1,74 +1,76 @@
+import set from 'lodash/set';
+import { DateTime, Duration, Interval } from 'luxon';
 import { getAdditionalKeys } from 'n8n-core';
-import {
-	WorkflowDataProxy,
-	// type IWorkflowDataProxyAdditionalKeys,
-	Workflow,
-} from 'n8n-workflow';
+import { WorkflowDataProxy, Workflow, ObservableObject, Expression } from 'n8n-workflow';
 import type {
 	CodeExecutionMode,
-	INode,
-	ITaskDataConnections,
 	IWorkflowExecuteAdditionalData,
-	WorkflowParameters,
 	IDataObject,
-	IExecuteData,
 	INodeExecutionData,
 	INodeParameters,
-	IRunExecutionData,
 	WorkflowExecuteMode,
+	WorkflowParameters,
+	ITaskDataConnections,
+	INode,
+	IRunExecutionData,
 	EnvProviderState,
+	IExecuteData,
+	INodeTypeDescription,
+	IWorkflowDataProxyData,
 } from 'n8n-workflow';
 import * as a from 'node:assert';
-import { runInNewContext, type Context } from 'node:vm';
+import { inspect } from 'node:util';
+import { type Context, createContext, runInContext } from 'node:vm';
 
-import type { TaskResultData } from '@/runner-types';
-import { type Task, TaskRunner } from '@/task-runner';
+import type { MainConfig } from '@/config/main-config';
+import { UnsupportedFunctionError } from '@/js-task-runner/errors/unsupported-function.error';
+import { EXPOSED_RPC_METHODS, UNSUPPORTED_HELPER_FUNCTIONS } from '@/runner-types';
+import type {
+	DataRequestResponse,
+	InputDataChunkDefinition,
+	PartialAdditionalData,
+	TaskResultData,
+} from '@/runner-types';
+import type { TaskParams } from '@/task-runner';
+import { noOp, TaskRunner } from '@/task-runner';
 
+import { BuiltInsParser } from './built-ins-parser/built-ins-parser';
+import { BuiltInsParserState } from './built-ins-parser/built-ins-parser-state';
 import { isErrorLike } from './errors/error-like';
 import { ExecutionError } from './errors/execution-error';
 import { makeSerializable } from './errors/serializable-error';
+import { TimeoutError } from './errors/timeout-error';
 import type { RequireResolver } from './require-resolver';
 import { createRequireResolver } from './require-resolver';
 import { validateRunForAllItemsOutput, validateRunForEachItemOutput } from './result-validation';
+import { DataRequestResponseReconstruct } from '../data-request/data-request-response-reconstruct';
+
+export interface RpcCallObject {
+	[name: string]: ((...args: unknown[]) => Promise<unknown>) | RpcCallObject;
+}
 
 export interface JSExecSettings {
 	code: string;
 	nodeMode: CodeExecutionMode;
 	workflowMode: WorkflowExecuteMode;
 	continueOnFail: boolean;
-
-	// For workflow data proxy
-	mode: WorkflowExecuteMode;
+	// For executing partial input data
+	chunk?: InputDataChunkDefinition;
 }
 
-export interface PartialAdditionalData {
-	executionId?: string;
-	restartExecutionId?: string;
-	restApiUrl: string;
-	instanceBaseUrl: string;
-	formWaitingBaseUrl: string;
-	webhookBaseUrl: string;
-	webhookWaitingBaseUrl: string;
-	webhookTestBaseUrl: string;
-	currentNodeParameters?: INodeParameters;
-	executionTimeoutTimestamp?: number;
-	userId?: string;
-	variables: IDataObject;
-}
-
-export interface AllCodeTaskData {
+export interface JsTaskData {
 	workflow: Omit<WorkflowParameters, 'nodeTypes'>;
 	inputData: ITaskDataConnections;
+	connectionInputData: INodeExecutionData[];
 	node: INode;
 
 	runExecutionData: IRunExecutionData;
 	runIndex: number;
 	itemIndex: number;
 	activeNodeName: string;
-	connectionInputData: INodeExecutionData[];
 	siblingParameters: INodeParameters;
 	mode: WorkflowExecuteMode;
-	envProviderState?: EnvProviderState;
+	envProviderState: EnvProviderState;
 	executeData?: IExecuteData;
 	defaultReturnRunIndex: number;
 	selfData: IDataObject;
@@ -76,23 +78,6 @@ export interface AllCodeTaskData {
 	additionalData: PartialAdditionalData;
 }
 
-export interface JsTaskRunnerOpts {
-	wsUrl: string;
-	grantToken: string;
-	maxConcurrency: number;
-	name?: string;
-	/**
-	 * List of built-in nodejs modules that are allowed to be required in the
-	 * execution sandbox. Asterisk (*) can be used to allow all.
-	 */
-	allowedBuiltInModules?: string;
-	/**
-	 * List of npm modules that are allowed to be required in the execution
-	 * sandbox. Asterisk (*) can be used to allow all.
-	 */
-	allowedExternalModules?: string;
-}
-
 type CustomConsole = {
 	log: (...args: unknown[]) => void;
 };
@@ -100,65 +85,102 @@ type CustomConsole = {
 export class JsTaskRunner extends TaskRunner {
 	private readonly requireResolver: RequireResolver;
 
-	constructor({
-		grantToken,
-		maxConcurrency,
-		wsUrl,
-		name = 'JS Task Runner',
-		allowedBuiltInModules,
-		allowedExternalModules,
-	}: JsTaskRunnerOpts) {
-		super('javascript', wsUrl, grantToken, maxConcurrency, name);
+	private readonly builtInsParser = new BuiltInsParser();
+
+	private readonly taskDataReconstruct = new DataRequestResponseReconstruct();
+
+	constructor(config: MainConfig, name = 'JS Task Runner') {
+		super({
+			taskType: 'javascript',
+			name,
+			...config.baseRunnerConfig,
+		});
+		const { jsRunnerConfig } = config;
 
 		const parseModuleAllowList = (moduleList: string) =>
 			moduleList === '*' ? null : new Set(moduleList.split(',').map((x) => x.trim()));
 
 		this.requireResolver = createRequireResolver({
-			allowedBuiltInModules: parseModuleAllowList(allowedBuiltInModules ?? ''),
-			allowedExternalModules: parseModuleAllowList(allowedExternalModules ?? ''),
+			allowedBuiltInModules: parseModuleAllowList(jsRunnerConfig.allowedBuiltInModules ?? ''),
+			allowedExternalModules: parseModuleAllowList(jsRunnerConfig.allowedExternalModules ?? ''),
 		});
+
+		this.preventPrototypePollution();
 	}
 
-	async executeTask(task: Task<JSExecSettings>): Promise<TaskResultData> {
-		const allData = await this.requestData<AllCodeTaskData>(task.taskId, 'all');
+	private preventPrototypePollution() {
+		// Freeze globals, except for Jest
+		if (process.env.NODE_ENV !== 'test') {
+			Object.getOwnPropertyNames(globalThis)
+				// @ts-expect-error globalThis does not have string in index signature
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
+				.map((name) => globalThis[name])
+				.filter((value) => typeof value === 'function')
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
+				.forEach((fn) => Object.freeze(fn.prototype));
+		}
 
-		const settings = task.settings;
+		// Freeze internal classes
+		[Workflow, Expression, WorkflowDataProxy, DateTime, Interval, Duration]
+			.map((constructor) => constructor.prototype)
+			.forEach(Object.freeze);
+	}
+
+	async executeTask(
+		taskParams: TaskParams<JSExecSettings>,
+		abortSignal: AbortSignal,
+	): Promise<TaskResultData> {
+		const { taskId, settings } = taskParams;
 		a.ok(settings, 'JS Code not sent to runner');
 
-		const workflowParams = allData.workflow;
+		this.validateTaskSettings(settings);
+
+		const neededBuiltInsResult = this.builtInsParser.parseUsedBuiltIns(settings.code);
+		const neededBuiltIns = neededBuiltInsResult.ok
+			? neededBuiltInsResult.result
+			: BuiltInsParserState.newNeedsAllDataState();
+
+		const dataResponse = await this.requestData<DataRequestResponse>(
+			taskId,
+			neededBuiltIns.toDataRequestParams(settings.chunk),
+		);
+
+		const data = this.reconstructTaskData(dataResponse, settings.chunk);
+
+		await this.requestNodeTypeIfNeeded(neededBuiltIns, data.workflow, taskId);
+
+		const workflowParams = data.workflow;
 		const workflow = new Workflow({
 			...workflowParams,
 			nodeTypes: this.nodeTypes,
 		});
 
-		const customConsole = {
-			// Send log output back to the main process. It will take care of forwarding
-			// it to the UI or printing to console.
-			log: (...args: unknown[]) => {
-				const logOutput = args
-					.map((arg) => (typeof arg === 'object' && arg !== null ? JSON.stringify(arg) : arg))
-					.join(' ');
-				void this.makeRpcCall(task.taskId, 'logNodeOutput', [logOutput]);
-			},
-		};
+		workflow.staticData = ObservableObject.create(workflow.staticData);
 
 		const result =
 			settings.nodeMode === 'runOnceForAllItems'
-				? await this.runForAllItems(task.taskId, settings, allData, workflow, customConsole)
-				: await this.runForEachItem(task.taskId, settings, allData, workflow, customConsole);
+				? await this.runForAllItems(taskId, settings, data, workflow, abortSignal)
+				: await this.runForEachItem(taskId, settings, data, workflow, abortSignal);
 
 		return {
 			result,
-			customData: allData.runExecutionData.resultData.metadata,
+			customData: data.runExecutionData.resultData.metadata,
+			staticData: workflow.staticData.__dataChanged ? workflow.staticData : undefined,
 		};
 	}
 
+	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
+			// Exposed Node.js globals
 			Buffer,
-			Function,
-			eval,
 			setTimeout,
 			setInterval,
 			setImmediate,
@@ -183,29 +205,41 @@ export class JsTaskRunner extends TaskRunner {
 	private async runForAllItems(
 		taskId: string,
 		settings: JSExecSettings,
-		allData: AllCodeTaskData,
+		data: JsTaskData,
 		workflow: Workflow,
-		customConsole: CustomConsole,
+		signal: AbortSignal,
 	): Promise<INodeExecutionData[]> {
-		const dataProxy = this.createDataProxy(allData, workflow, allData.itemIndex);
-		const inputItems = allData.connectionInputData;
+		const dataProxy = this.createDataProxy(data, workflow, data.itemIndex);
+		const inputItems = data.connectionInputData;
 
-		const context: Context = {
-			require: this.requireResolver,
-			module: {},
-			console: customConsole,
+		const context = this.buildContext(taskId, workflow, data.node, dataProxy, {
 			items: inputItems,
-
-			...this.getNativeVariables(),
-			...dataProxy,
-			...this.buildRpcCallObject(taskId),
-		};
+		});
 
 		try {
-			const result = (await runInNewContext(
-				`globalThis.global = globalThis; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
-				context,
-			)) as TaskResultData['result'];
+			const result = await new Promise<TaskResultData['result']>((resolve, reject) => {
+				const abortHandler = () => {
+					reject(new TimeoutError(this.taskTimeout));
+				};
+
+				signal.addEventListener('abort', abortHandler, { once: true });
+
+				const preventPrototypeManipulation =
+					'Object.getPrototypeOf = () => ({}); Reflect.getPrototypeOf = () => ({}); Object.setPrototypeOf = () => false; Reflect.setPrototypeOf = () => false;';
+
+				const taskResult = runInContext(
+					`globalThis.global = globalThis; ${preventPrototypeManipulation}; module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
+					context,
+					{ timeout: this.taskTimeout * 1000 },
+				) as Promise<TaskResultData['result']>;
+
+				void taskResult
+					.then(resolve)
+					.catch(reject)
+					.finally(() => {
+						signal.removeEventListener('abort', abortHandler);
+					});
+			});
 
 			if (result === null) {
 				return [];
@@ -230,32 +264,45 @@ export class JsTaskRunner extends TaskRunner {
 	private async runForEachItem(
 		taskId: string,
 		settings: JSExecSettings,
-		allData: AllCodeTaskData,
+		data: JsTaskData,
 		workflow: Workflow,
-		customConsole: CustomConsole,
+		signal: AbortSignal,
 	): Promise<INodeExecutionData[]> {
-		const inputItems = allData.connectionInputData;
+		const inputItems = data.connectionInputData;
 		const returnData: INodeExecutionData[] = [];
 
-		for (let index = 0; index < inputItems.length; index++) {
-			const item = inputItems[index];
-			const dataProxy = this.createDataProxy(allData, workflow, index);
-			const context: Context = {
-				require: this.requireResolver,
-				module: {},
-				console: customConsole,
-				item,
+		// 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;
 
-				...this.getNativeVariables(),
-				...dataProxy,
-				...this.buildRpcCallObject(taskId),
-			};
+		for (let index = chunkStartIdx; index < chunkEndIdx; index++) {
+			const item = inputItems[index];
+			const dataProxy = this.createDataProxy(data, workflow, index);
+			const context = this.buildContext(taskId, workflow, data.node, dataProxy, { item });
 
 			try {
-				let result = (await runInNewContext(
-					`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
-					context,
-				)) as INodeExecutionData | undefined;
+				let result = await new Promise<INodeExecutionData | undefined>((resolve, reject) => {
+					const abortHandler = () => {
+						reject(new TimeoutError(this.taskTimeout));
+					};
+
+					signal.addEventListener('abort', abortHandler);
+
+					const taskResult = runInContext(
+						`module.exports = async function VmCodeWrapper() {${settings.code}\n}()`,
+						context,
+						{ timeout: this.taskTimeout * 1000 },
+					) as Promise<INodeExecutionData>;
+
+					void taskResult
+						.then(resolve)
+						.catch(reject)
+						.finally(() => {
+							signal.removeEventListener('abort', abortHandler);
+						});
+				});
 
 				// Filter out null values
 				if (result === null) {
@@ -297,33 +344,37 @@ export class JsTaskRunner extends TaskRunner {
 		return returnData;
 	}
 
-	private createDataProxy(allData: AllCodeTaskData, workflow: Workflow, itemIndex: number) {
+	private createDataProxy(data: JsTaskData, workflow: Workflow, itemIndex: number) {
 		return new WorkflowDataProxy(
 			workflow,
-			allData.runExecutionData,
-			allData.runIndex,
+			data.runExecutionData,
+			data.runIndex,
 			itemIndex,
-			allData.activeNodeName,
-			allData.connectionInputData,
-			allData.siblingParameters,
-			allData.mode,
+			data.activeNodeName,
+			data.connectionInputData,
+			data.siblingParameters,
+			data.mode,
 			getAdditionalKeys(
-				allData.additionalData as IWorkflowExecuteAdditionalData,
-				allData.mode,
-				allData.runExecutionData,
+				data.additionalData as IWorkflowExecuteAdditionalData,
+				data.mode,
+				data.runExecutionData,
 			),
-			allData.executeData,
-			allData.defaultReturnRunIndex,
-			allData.selfData,
-			allData.contextNodeName,
+			data.executeData,
+			data.defaultReturnRunIndex,
+			data.selfData,
+			data.contextNodeName,
 			// Make sure that even if we don't receive the envProviderState for
 			// whatever reason, we don't expose the task runner's env to the code
-			allData.envProviderState ?? {
+			data.envProviderState ?? {
 				env: {},
 				isEnvAccessBlocked: false,
 				isProcessAvailable: true,
 			},
-		).getDataProxy();
+			// Because we optimize the needed data, it can be partially available.
+			// We assign the available built-ins to the execution context, which
+			// means we run the getter for '$json', and by default $json throws
+			// if there is no data available.
+		).getDataProxy({ throwOnMissingExecutionData: false });
 	}
 
 	private toExecutionErrorIfNeeded(error: unknown): Error {
@@ -337,4 +388,120 @@ export class JsTaskRunner extends TaskRunner {
 
 		return new ExecutionError({ message: JSON.stringify(error) });
 	}
+
+	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: inputData,
+			executeData: this.taskDataReconstruct.reconstructExecuteData(response, inputData),
+		};
+	}
+
+	private async requestNodeTypeIfNeeded(
+		neededBuiltIns: BuiltInsParserState,
+		workflow: JsTaskData['workflow'],
+		taskId: string,
+	) {
+		/**
+		 * We request node types only when we know a task needs all nodes, because
+		 * needing all nodes means that the task relies on paired item functionality,
+		 * which is the same requirement for needing node types.
+		 */
+		if (neededBuiltIns.needsAllNodes) {
+			const uniqueNodeTypes = new Map(
+				workflow.nodes.map((node) => [
+					`${node.type}|${node.typeVersion}`,
+					{ name: node.type, version: node.typeVersion },
+				]),
+			);
+
+			const unknownNodeTypes = this.nodeTypes.onlyUnknown([...uniqueNodeTypes.values()]);
+
+			const nodeTypes = await this.requestNodeTypes<INodeTypeDescription[]>(
+				taskId,
+				unknownNodeTypes,
+			);
+
+			this.nodeTypes.addNodeTypeDescriptions(nodeTypes);
+		}
+	}
+
+	private buildRpcCallObject(taskId: string) {
+		const rpcObject: RpcCallObject = {};
+
+		for (const rpcMethod of EXPOSED_RPC_METHODS) {
+			set(
+				rpcObject,
+				rpcMethod.split('.'),
+				async (...args: unknown[]) => await this.makeRpcCall(taskId, rpcMethod, args),
+			);
+		}
+
+		for (const rpcMethod of UNSUPPORTED_HELPER_FUNCTIONS) {
+			set(rpcObject, rpcMethod.split('.'), () => {
+				throw new UnsupportedFunctionError(rpcMethod);
+			});
+		}
+
+		return rpcObject;
+	}
+
+	private buildCustomConsole(taskId: string): CustomConsole {
+		return {
+			// all except `log` are dummy methods that disregard without throwing, following existing Code node behavior
+			...Object.keys(console).reduce<Record<string, () => void>>((acc, name) => {
+				acc[name] = noOp;
+				return acc;
+			}, {}),
+
+			// Send log output back to the main process. It will take care of forwarding
+			// it to the UI or printing to console.
+			log: (...args: unknown[]) => {
+				const formattedLogArgs = args.map((arg) => inspect(arg));
+				void this.makeRpcCall(taskId, 'logNodeOutput', formattedLogArgs);
+			},
+		};
+	}
+
+	/**
+	 * Builds the 'global' context object that is passed to the script
+	 *
+	 * @param taskId The ID of the task. Needed for RPC calls
+	 * @param workflow The workflow that is being executed. Needed for static data
+	 * @param node The node that is being executed. Needed for static data
+	 * @param dataProxy The data proxy object that provides access to built-ins
+	 * @param additionalProperties Additional properties to add to the context
+	 */
+	buildContext(
+		taskId: string,
+		workflow: Workflow,
+		node: INode,
+		dataProxy: IWorkflowDataProxyData,
+		additionalProperties: Record<string, unknown> = {},
+	): Context {
+		return createContext({
+			[inspect.custom]: () => '[[ExecutionContext]]',
+			require: this.requireResolver,
+			module: {},
+			console: this.buildCustomConsole(taskId),
+			$getWorkflowStaticData: (type: 'global' | 'node') => workflow.getStaticData(type, node),
+			...this.getNativeVariables(),
+			...dataProxy,
+			...this.buildRpcCallObject(taskId),
+			...additionalProperties,
+		});
+	}
 }
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..17c4df9a6e 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
@@ -4,12 +4,24 @@ import type { INodeExecutionData } from 'n8n-workflow';
 import { ValidationError } from './errors/validation-error';
 import { isObject } from './obj-utils';
 
-export const REQUIRED_N8N_ITEM_KEYS = new Set(['json', 'binary', 'pairedItem', 'error']);
+export const REQUIRED_N8N_ITEM_KEYS = new Set([
+	'json',
+	'binary',
+	'pairedItem',
+	'error',
+
+	/**
+	 * The `index` key was added accidentally to Function, FunctionItem, Gong,
+	 * Execute Workflow, and ToolWorkflowV2, so we need to allow it temporarily.
+	 * Once we stop using it in all nodes, we can stop allowing the `index` key.
+	 */
+	'index',
+]);
 
 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/cli/src/runners/runner-types.ts b/packages/@n8n/task-runner/src/message-types.ts
similarity index 64%
rename from packages/cli/src/runners/runner-types.ts
rename to packages/@n8n/task-runner/src/message-types.ts
index 8b205de801..40f7aeca77 100644
--- a/packages/cli/src/runners/runner-types.ts
+++ b/packages/@n8n/task-runner/src/message-types.ts
@@ -1,25 +1,13 @@
-import type { Response } from 'express';
-import type { INodeExecutionData, INodeTypeBaseDescription } from 'n8n-workflow';
-import type WebSocket from 'ws';
+import type { INodeTypeBaseDescription } from 'n8n-workflow';
 
-import type { TaskRunner } from './task-broker.service';
-import type { AuthlessRequest } from '../requests';
+import type {
+	NeededNodeType,
+	AVAILABLE_RPC_METHODS,
+	TaskDataRequestParams,
+	TaskResultData,
+} from './runner-types';
 
-export type DataRequestType = 'input' | 'node' | 'all';
-
-export interface TaskResultData {
-	result: INodeExecutionData[];
-	customData?: Record<string, string>;
-}
-
-export interface TaskRunnerServerInitRequest
-	extends AuthlessRequest<{}, {}, {}, { id: TaskRunner['id']; token?: string }> {
-	ws: WebSocket;
-}
-
-export type TaskRunnerServerInitResponse = Response & { req: TaskRunnerServerInitRequest };
-
-export namespace N8nMessage {
+export namespace BrokerMessage {
 	export namespace ToRunner {
 		export interface InfoRequest {
 			type: 'broker:inforequest';
@@ -64,6 +52,8 @@ export namespace N8nMessage {
 
 		export interface NodeTypes {
 			type: 'broker:nodetypes';
+			taskId: string;
+			requestId: string;
 			nodeTypes: INodeTypeBaseDescription[];
 		}
 
@@ -101,24 +91,30 @@ export namespace N8nMessage {
 			type: 'broker:taskdatarequest';
 			taskId: string;
 			requestId: string;
-			requestType: DataRequestType;
-			param?: string;
+			requestParams: TaskDataRequestParams;
+		}
+
+		export interface NodeTypesRequest {
+			type: 'broker:nodetypesrequest';
+			taskId: string;
+			requestId: string;
+			requestParams: NeededNodeType[];
 		}
 
 		export interface RPC {
 			type: 'broker:rpc';
 			callId: string;
 			taskId: string;
-			name: (typeof RPC_ALLOW_LIST)[number];
+			name: (typeof AVAILABLE_RPC_METHODS)[number];
 			params: unknown[];
 		}
 
-		export type All = TaskReady | TaskDone | TaskError | TaskDataRequest | RPC;
+		export type All = TaskReady | TaskDone | TaskError | TaskDataRequest | NodeTypesRequest | RPC;
 	}
 }
 
 export namespace RequesterMessage {
-	export namespace ToN8n {
+	export namespace ToBroker {
 		export interface TaskSettings {
 			type: 'requester:tasksettings';
 			taskId: string;
@@ -138,6 +134,13 @@ export namespace RequesterMessage {
 			data: unknown;
 		}
 
+		export interface NodeTypesResponse {
+			type: 'requester:nodetypesresponse';
+			taskId: string;
+			requestId: string;
+			nodeTypes: INodeTypeBaseDescription[];
+		}
+
 		export interface RPCResponse {
 			type: 'requester:rpcresponse';
 			taskId: string;
@@ -152,12 +155,18 @@ export namespace RequesterMessage {
 			taskType: string;
 		}
 
-		export type All = TaskSettings | TaskCancel | RPCResponse | TaskDataResponse | TaskRequest;
+		export type All =
+			| TaskSettings
+			| TaskCancel
+			| RPCResponse
+			| TaskDataResponse
+			| NodeTypesResponse
+			| TaskRequest;
 	}
 }
 
 export namespace RunnerMessage {
-	export namespace ToN8n {
+	export namespace ToBroker {
 		export interface Info {
 			type: 'runner:info';
 			name: string;
@@ -175,6 +184,12 @@ export namespace RunnerMessage {
 			reason: string;
 		}
 
+		/** Message where launcher (impersonating runner) requests broker to hold task until runner is ready. */
+		export interface TaskDeferred {
+			type: 'runner:taskdeferred';
+			taskId: string;
+		}
+
 		export interface TaskDone {
 			type: 'runner:taskdone';
 			taskId: string;
@@ -198,15 +213,33 @@ export namespace RunnerMessage {
 			type: 'runner:taskdatarequest';
 			taskId: string;
 			requestId: string;
-			requestType: DataRequestType;
-			param?: string;
+			requestParams: TaskDataRequestParams;
+		}
+
+		export interface NodeTypesRequest {
+			type: 'runner:nodetypesrequest';
+			taskId: string;
+			requestId: string;
+
+			/**
+			 * Which node types should be included in the runner's node types request.
+			 *
+			 * Node types are needed only when the script relies on paired item functionality.
+			 * If so, we need only the node types not already cached in the runner.
+			 *
+			 * TODO: In future we can trim this down to only node types in the paired item chain,
+			 * rather than assuming we need all node types in the workflow.
+			 *
+			 * @example [{ name: 'n8n-nodes-base.httpRequest', version: 1 }]
+			 */
+			requestParams: NeededNodeType[];
 		}
 
 		export interface RPC {
 			type: 'runner:rpc';
 			callId: string;
 			taskId: string;
-			name: (typeof RPC_ALLOW_LIST)[number];
+			name: (typeof AVAILABLE_RPC_METHODS)[number];
 			params: unknown[];
 		}
 
@@ -216,34 +249,10 @@ export namespace RunnerMessage {
 			| TaskError
 			| TaskAccepted
 			| TaskRejected
+			| TaskDeferred
 			| TaskOffer
 			| RPC
-			| TaskDataRequest;
+			| TaskDataRequest
+			| NodeTypesRequest;
 	}
 }
-
-export const RPC_ALLOW_LIST = [
-	'logNodeOutput',
-	'helpers.httpRequestWithAuthentication',
-	'helpers.requestWithAuthenticationPaginated',
-	// "helpers.normalizeItems"
-	// "helpers.constructExecutionMetaData"
-	// "helpers.assertBinaryData"
-	'helpers.getBinaryDataBuffer',
-	// "helpers.copyInputItems"
-	// "helpers.returnJsonArray"
-	'helpers.getSSHClient',
-	'helpers.createReadStream',
-	// "helpers.getStoragePath"
-	'helpers.writeContentToFile',
-	'helpers.prepareBinaryData',
-	'helpers.setBinaryDataBuffer',
-	'helpers.copyBinaryFile',
-	'helpers.binaryToBuffer',
-	// "helpers.binaryToString"
-	// "helpers.getBinaryPath"
-	'helpers.getBinaryStream',
-	'helpers.getBinaryMetadata',
-	'helpers.createDeferredPromise',
-	'helpers.httpRequest',
-] as const;
diff --git a/packages/@n8n/task-runner/src/node-types.ts b/packages/@n8n/task-runner/src/node-types.ts
index 046321bff9..8f910134b5 100644
--- a/packages/@n8n/task-runner/src/node-types.ts
+++ b/packages/@n8n/task-runner/src/node-types.ts
@@ -7,6 +7,8 @@ import {
 	type IVersionedNodeType,
 } from 'n8n-workflow';
 
+import type { NeededNodeType } from './runner-types';
+
 type VersionedTypes = Map<number, INodeTypeDescription>;
 
 export const DEFAULT_NODETYPE_VERSION = 1;
@@ -61,4 +63,30 @@ export class TaskRunnerNodeTypes implements INodeTypes {
 	getKnownTypes(): IDataObject {
 		throw new ApplicationError('Unimplemented `getKnownTypes`', { level: 'error' });
 	}
+
+	addNodeTypeDescriptions(nodeTypeDescriptions: INodeTypeDescription[]) {
+		const newNodeTypes = this.parseNodeTypes(nodeTypeDescriptions);
+
+		for (const [name, newVersions] of newNodeTypes.entries()) {
+			if (!this.nodeTypesByVersion.has(name)) {
+				this.nodeTypesByVersion.set(name, newVersions);
+			} else {
+				const existingVersions = this.nodeTypesByVersion.get(name)!;
+				for (const [version, nodeType] of newVersions.entries()) {
+					existingVersions.set(version, nodeType);
+				}
+			}
+		}
+	}
+
+	/** Filter out node type versions that are already registered. */
+	onlyUnknown(nodeTypes: NeededNodeType[]) {
+		return nodeTypes.filter(({ name, version }) => {
+			const existingVersions = this.nodeTypesByVersion.get(name);
+
+			if (!existingVersions) return true;
+
+			return !existingVersions.has(version);
+		});
+	}
 }
diff --git a/packages/@n8n/task-runner/src/polyfills.ts b/packages/@n8n/task-runner/src/polyfills.ts
new file mode 100644
index 0000000000..7d8a83dd0e
--- /dev/null
+++ b/packages/@n8n/task-runner/src/polyfills.ts
@@ -0,0 +1,5 @@
+// WebCrypto Polyfill for older versions of Node.js 18
+if (!globalThis.crypto?.getRandomValues) {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires, @typescript-eslint/no-unsafe-member-access
+	globalThis.crypto = require('node:crypto').webcrypto;
+}
diff --git a/packages/@n8n/task-runner/src/runner-types.ts b/packages/@n8n/task-runner/src/runner-types.ts
index 1e84843653..e4e76189e2 100644
--- a/packages/@n8n/task-runner/src/runner-types.ts
+++ b/packages/@n8n/task-runner/src/runner-types.ts
@@ -1,237 +1,172 @@
-import type { INodeExecutionData, INodeTypeBaseDescription } from 'n8n-workflow';
+import type {
+	EnvProviderState,
+	IDataObject,
+	IExecuteData,
+	IExecuteFunctions,
+	INode,
+	INodeExecutionData,
+	INodeParameters,
+	IRunExecutionData,
+	ITaskDataConnections,
+	ITaskDataConnectionsSource,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowExecuteMode,
+	WorkflowParameters,
+} from 'n8n-workflow';
 
-export type DataRequestType = 'input' | 'node' | 'all';
+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.
+ */
+export interface TaskDataRequestParams {
+	dataOfNodes: string[] | 'all';
+	prevNode: boolean;
+	/** Whether input data for the node should be included */
+	input: InputDataRequestParams;
+	/** Whether env provider's state should be included */
+	env: boolean;
+}
+
+export interface DataRequestResponse {
+	workflow: Omit<WorkflowParameters, 'nodeTypes'>;
+	inputData: ITaskDataConnections;
+	connectionInputSource: ITaskDataConnectionsSource | null;
+	node: INode;
+
+	runExecutionData: IRunExecutionData;
+	runIndex: number;
+	itemIndex: number;
+	activeNodeName: string;
+	siblingParameters: INodeParameters;
+	mode: WorkflowExecuteMode;
+	envProviderState: EnvProviderState;
+	defaultReturnRunIndex: number;
+	selfData: IDataObject;
+	contextNodeName: string;
+	additionalData: PartialAdditionalData;
+}
 
 export interface TaskResultData {
 	result: INodeExecutionData[];
 	customData?: Record<string, string>;
+	staticData?: IDataObject;
 }
 
-export namespace N8nMessage {
-	export namespace ToRunner {
-		export interface InfoRequest {
-			type: 'broker:inforequest';
-		}
+export interface TaskData {
+	executeFunctions: IExecuteFunctions;
+	inputData: ITaskDataConnections;
+	node: INode;
 
-		export interface RunnerRegistered {
-			type: 'broker:runnerregistered';
-		}
-
-		export interface TaskOfferAccept {
-			type: 'broker:taskofferaccept';
-			taskId: string;
-			offerId: string;
-		}
-
-		export interface TaskCancel {
-			type: 'broker:taskcancel';
-			taskId: string;
-			reason: string;
-		}
-
-		export interface TaskSettings {
-			type: 'broker:tasksettings';
-			taskId: string;
-			settings: unknown;
-		}
-
-		export interface RPCResponse {
-			type: 'broker:rpcresponse';
-			callId: string;
-			taskId: string;
-			status: 'success' | 'error';
-			data: unknown;
-		}
-
-		export interface TaskDataResponse {
-			type: 'broker:taskdataresponse';
-			taskId: string;
-			requestId: string;
-			data: unknown;
-		}
-
-		export interface NodeTypes {
-			type: 'broker:nodetypes';
-			nodeTypes: INodeTypeBaseDescription[];
-		}
-
-		export type All =
-			| InfoRequest
-			| TaskOfferAccept
-			| TaskCancel
-			| TaskSettings
-			| RunnerRegistered
-			| RPCResponse
-			| TaskDataResponse
-			| NodeTypes;
-	}
-
-	export namespace ToRequester {
-		export interface TaskReady {
-			type: 'broker:taskready';
-			requestId: string;
-			taskId: string;
-		}
-
-		export interface TaskDone {
-			type: 'broker:taskdone';
-			taskId: string;
-			data: TaskResultData;
-		}
-
-		export interface TaskError {
-			type: 'broker:taskerror';
-			taskId: string;
-			error: unknown;
-		}
-
-		export interface TaskDataRequest {
-			type: 'broker:taskdatarequest';
-			taskId: string;
-			requestId: string;
-			requestType: DataRequestType;
-			param?: string;
-		}
-
-		export interface RPC {
-			type: 'broker:rpc';
-			callId: string;
-			taskId: string;
-			name: (typeof RPC_ALLOW_LIST)[number];
-			params: unknown[];
-		}
-
-		export type All = TaskReady | TaskDone | TaskError | TaskDataRequest | RPC;
-	}
+	workflow: Workflow;
+	runExecutionData: IRunExecutionData;
+	runIndex: number;
+	itemIndex: number;
+	activeNodeName: string;
+	connectionInputData: INodeExecutionData[];
+	siblingParameters: INodeParameters;
+	mode: WorkflowExecuteMode;
+	envProviderState: EnvProviderState;
+	executeData?: IExecuteData;
+	defaultReturnRunIndex: number;
+	selfData: IDataObject;
+	contextNodeName: string;
+	additionalData: IWorkflowExecuteAdditionalData;
 }
 
-export namespace RequesterMessage {
-	export namespace ToN8n {
-		export interface TaskSettings {
-			type: 'requester:tasksettings';
-			taskId: string;
-			settings: unknown;
-		}
-
-		export interface TaskCancel {
-			type: 'requester:taskcancel';
-			taskId: string;
-			reason: string;
-		}
-
-		export interface TaskDataResponse {
-			type: 'requester:taskdataresponse';
-			taskId: string;
-			requestId: string;
-			data: unknown;
-		}
-
-		export interface RPCResponse {
-			type: 'requester:rpcresponse';
-			taskId: string;
-			callId: string;
-			status: 'success' | 'error';
-			data: unknown;
-		}
-
-		export interface TaskRequest {
-			type: 'requester:taskrequest';
-			requestId: string;
-			taskType: string;
-		}
-
-		export type All = TaskSettings | TaskCancel | RPCResponse | TaskDataResponse | TaskRequest;
-	}
+export interface PartialAdditionalData {
+	executionId?: string;
+	restartExecutionId?: string;
+	restApiUrl: string;
+	instanceBaseUrl: string;
+	formWaitingBaseUrl: string;
+	webhookBaseUrl: string;
+	webhookWaitingBaseUrl: string;
+	webhookTestBaseUrl: string;
+	currentNodeParameters?: INodeParameters;
+	executionTimeoutTimestamp?: number;
+	userId?: string;
+	variables: IDataObject;
 }
 
-export namespace RunnerMessage {
-	export namespace ToN8n {
-		export interface Info {
-			type: 'runner:info';
-			name: string;
-			types: string[];
-		}
+/** RPC methods that are exposed directly to the Code Node */
+export const EXPOSED_RPC_METHODS = [
+	// assertBinaryData(itemIndex: number, propertyName: string): Promise<IBinaryData>
+	'helpers.assertBinaryData',
 
-		export interface TaskAccepted {
-			type: 'runner:taskaccepted';
-			taskId: string;
-		}
+	// getBinaryDataBuffer(itemIndex: number, propertyName: string): Promise<Buffer>
+	'helpers.getBinaryDataBuffer',
 
-		export interface TaskRejected {
-			type: 'runner:taskrejected';
-			taskId: string;
-			reason: string;
-		}
+	// prepareBinaryData(binaryData: Buffer, fileName?: string, mimeType?: string): Promise<IBinaryData>
+	'helpers.prepareBinaryData',
 
-		export interface TaskDone {
-			type: 'runner:taskdone';
-			taskId: string;
-			data: TaskResultData;
-		}
+	// setBinaryDataBuffer(metadata: IBinaryData, buffer: Buffer): Promise<IBinaryData>
+	'helpers.setBinaryDataBuffer',
 
-		export interface TaskError {
-			type: 'runner:taskerror';
-			taskId: string;
-			error: unknown;
-		}
+	// binaryToString(body: Buffer, encoding?: string): string
+	'helpers.binaryToString',
 
-		export interface TaskOffer {
-			type: 'runner:taskoffer';
-			offerId: string;
-			taskType: string;
-			validFor: number;
-		}
+	// httpRequest(opts: IHttpRequestOptions): Promise<IN8nHttpFullResponse | IN8nHttpResponse>
+	'helpers.httpRequest',
+];
 
-		export interface TaskDataRequest {
-			type: 'runner:taskdatarequest';
-			taskId: string;
-			requestId: string;
-			requestType: DataRequestType;
-			param?: string;
-		}
-
-		export interface RPC {
-			type: 'runner:rpc';
-			callId: string;
-			taskId: string;
-			name: (typeof RPC_ALLOW_LIST)[number];
-			params: unknown[];
-		}
-
-		export type All =
-			| Info
-			| TaskDone
-			| TaskError
-			| TaskAccepted
-			| TaskRejected
-			| TaskOffer
-			| RPC
-			| TaskDataRequest;
-	}
-}
-
-export const RPC_ALLOW_LIST = [
+/** Helpers that exist but that we are not exposing to the Code Node */
+export const UNSUPPORTED_HELPER_FUNCTIONS = [
+	// These rely on checking the credentials from the current node type (Code Node)
+	// and hence they can't even work (Code Node doesn't have credentials)
 	'helpers.httpRequestWithAuthentication',
 	'helpers.requestWithAuthenticationPaginated',
-	// "helpers.normalizeItems"
-	// "helpers.constructExecutionMetaData"
-	// "helpers.assertBinaryData"
-	'helpers.getBinaryDataBuffer',
-	// "helpers.copyInputItems"
-	// "helpers.returnJsonArray"
-	'helpers.getSSHClient',
-	'helpers.createReadStream',
-	// "helpers.getStoragePath"
-	'helpers.writeContentToFile',
-	'helpers.prepareBinaryData',
-	'helpers.setBinaryDataBuffer',
+
+	// This has been removed
 	'helpers.copyBinaryFile',
-	'helpers.binaryToBuffer',
-	// "helpers.binaryToString"
-	// "helpers.getBinaryPath"
+
+	// We can't support streams over RPC without implementing it ourselves
+	'helpers.createReadStream',
 	'helpers.getBinaryStream',
+
+	// Makes no sense to support this, as it returns either a stream or a buffer
+	// and we can't support streams over RPC
+	'helpers.binaryToBuffer',
+
+	// These are pretty low-level, so we shouldn't expose them
+	// (require binary data id, which we don't expose)
 	'helpers.getBinaryMetadata',
+	'helpers.getStoragePath',
+	'helpers.getBinaryPath',
+
+	// We shouldn't allow arbitrary FS writes
+	'helpers.writeContentToFile',
+
+	// Not something we need to expose. Can be done in the node itself
+	// copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[]
+	'helpers.copyInputItems',
+
+	// Code Node does these automatically already
+	'helpers.returnJsonArray',
+	'helpers.normalizeItems',
+
+	// The client is instantiated and lives on the n8n instance, so we can't
+	// expose it over RPC without implementing object marshalling
+	'helpers.getSSHClient',
+
+	// Doesn't make sense to expose
 	'helpers.createDeferredPromise',
-	'helpers.httpRequest',
-	'logNodeOutput',
-] as const;
+	'helpers.constructExecutionMetaData',
+];
+
+/** List of all RPC methods that task runner supports */
+export const AVAILABLE_RPC_METHODS = [...EXPOSED_RPC_METHODS, 'logNodeOutput'] as const;
+
+/** Node types needed for the runner to execute a task. */
+export type NeededNodeType = { name: string; version: number };
diff --git a/packages/@n8n/task-runner/src/start.ts b/packages/@n8n/task-runner/src/start.ts
index f5487ba6c2..35b928e9a8 100644
--- a/packages/@n8n/task-runner/src/start.ts
+++ b/packages/@n8n/task-runner/src/start.ts
@@ -1,28 +1,18 @@
-import { ApplicationError, ensureError } from 'n8n-workflow';
+import './polyfills';
+import { Container } from '@n8n/di';
+import { ensureError, setGlobalState } from 'n8n-workflow';
 
+import { MainConfig } from './config/main-config';
+import type { HealthCheckServer } from './health-check-server';
 import { JsTaskRunner } from './js-task-runner/js-task-runner';
+import { TaskRunnerSentry } from './task-runner-sentry';
 
+let healthCheckServer: HealthCheckServer | undefined;
 let runner: JsTaskRunner | undefined;
 let isShuttingDown = false;
+let sentry: TaskRunnerSentry | undefined;
 
-type Config = {
-	n8nUri: string;
-	grantToken: string;
-};
-
-function readAndParseConfig(): Config {
-	const grantToken = process.env.N8N_RUNNERS_GRANT_TOKEN;
-	if (!grantToken) {
-		throw new ApplicationError('Missing N8N_RUNNERS_GRANT_TOKEN environment variable');
-	}
-
-	return {
-		n8nUri: process.env.N8N_RUNNERS_N8N_URI ?? '127.0.0.1:5679',
-		grantToken,
-	};
-}
-
-function createSignalHandler(signal: string) {
+function createSignalHandler(signal: string, timeoutInS = 10) {
 	return async function onSignal() {
 		if (isShuttingDown) {
 			return;
@@ -30,33 +20,57 @@ function createSignalHandler(signal: string) {
 
 		console.log(`Received ${signal} signal, shutting down...`);
 
+		setTimeout(() => {
+			console.error('Shutdown timeout reached, forcing shutdown...');
+			process.exit(1);
+		}, timeoutInS * 1000).unref();
+
 		isShuttingDown = true;
 		try {
 			if (runner) {
 				await runner.stop();
 				runner = undefined;
+				void healthCheckServer?.stop();
+			}
+
+			if (sentry) {
+				await sentry.shutdown();
+				sentry = undefined;
 			}
 		} catch (e) {
 			const error = ensureError(e);
 			console.error('Error stopping task runner', { error });
 		} finally {
+			console.log('Task runner stopped');
 			process.exit(0);
 		}
 	};
 }
 
 void (async function start() {
-	const config = readAndParseConfig();
+	const config = Container.get(MainConfig);
 
-	const wsUrl = `ws://${config.n8nUri}/runners/_ws`;
-	runner = new JsTaskRunner({
-		wsUrl,
-		grantToken: config.grantToken,
-		maxConcurrency: 5,
-		allowedBuiltInModules: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
-		allowedExternalModules: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
+	setGlobalState({
+		defaultTimezone: config.baseRunnerConfig.timezone,
 	});
 
+	sentry = Container.get(TaskRunnerSentry);
+	await sentry.initIfEnabled();
+
+	runner = new JsTaskRunner(config);
+	runner.on('runner:reached-idle-timeout', () => {
+		// Use shorter timeout since we know we don't have any tasks running
+		void createSignalHandler('IDLE_TIMEOUT', 1)();
+	});
+
+	const { enabled, host, port } = config.baseRunnerConfig.healthcheckServer;
+
+	if (enabled) {
+		const { HealthCheckServer } = await import('./health-check-server');
+		healthCheckServer = new HealthCheckServer();
+		await healthCheckServer.start(host, port);
+	}
+
 	process.on('SIGINT', createSignalHandler('SIGINT'));
 	process.on('SIGTERM', createSignalHandler('SIGTERM'));
 })().catch((e) => {
diff --git a/packages/@n8n/task-runner/src/task-runner-sentry.ts b/packages/@n8n/task-runner/src/task-runner-sentry.ts
new file mode 100644
index 0000000000..5443a98d5c
--- /dev/null
+++ b/packages/@n8n/task-runner/src/task-runner-sentry.ts
@@ -0,0 +1,62 @@
+import { Service } from '@n8n/di';
+import type { ErrorEvent, Exception } from '@sentry/types';
+import { ErrorReporter } from 'n8n-core';
+
+import { SentryConfig } from './config/sentry-config';
+
+/**
+ * Sentry service for the task runner.
+ */
+@Service()
+export class TaskRunnerSentry {
+	constructor(
+		private readonly config: SentryConfig,
+		private readonly errorReporter: ErrorReporter,
+	) {}
+
+	async initIfEnabled() {
+		const { dsn, n8nVersion, environment, deploymentName } = this.config;
+
+		if (!dsn) return;
+
+		await this.errorReporter.init({
+			serverType: 'task_runner',
+			dsn,
+			release: n8nVersion,
+			environment,
+			serverName: deploymentName,
+			beforeSendFilter: this.filterOutUserCodeErrors,
+		});
+	}
+
+	async shutdown() {
+		if (!this.config.dsn) return;
+
+		await this.errorReporter.shutdown();
+	}
+
+	/**
+	 * Filter out errors originating from user provided code.
+	 * It is possible for users to create code that causes unhandledrejections
+	 * that end up in the sentry error reporting.
+	 */
+	filterOutUserCodeErrors = (event: ErrorEvent) => {
+		const error = event?.exception?.values?.[0];
+
+		return error ? this.isUserCodeError(error) : false;
+	};
+
+	/**
+	 * Check if the error is originating from user provided code.
+	 * It is possible for users to create code that causes unhandledrejections
+	 * that end up in the sentry error reporting.
+	 */
+	private isUserCodeError(error: Exception) {
+		const frames = error.stacktrace?.frames;
+		if (!frames) return false;
+
+		return frames.some(
+			(frame) => frame.filename === 'node:vm' && frame.function === 'runInContext',
+		);
+	}
+}
diff --git a/packages/@n8n/task-runner/src/task-runner.ts b/packages/@n8n/task-runner/src/task-runner.ts
index 356afb69e5..dd048bcf7e 100644
--- a/packages/@n8n/task-runner/src/task-runner.ts
+++ b/packages/@n8n/task-runner/src/task-runner.ts
@@ -1,22 +1,17 @@
-import { ApplicationError, type INodeTypeDescription } from 'n8n-workflow';
+import { isSerializedBuffer, toBuffer } from 'n8n-core';
+import { ApplicationError, ensureError, randomInt } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
-import { URL } from 'node:url';
+import { EventEmitter } from 'node:events';
 import { type MessageEvent, WebSocket } from 'ws';
 
-import { TaskRunnerNodeTypes } from './node-types';
-import {
-	RPC_ALLOW_LIST,
-	type RunnerMessage,
-	type N8nMessage,
-	type TaskResultData,
-} from './runner-types';
+import type { BaseRunnerConfig } from '@/config/base-runner-config';
+import { TimeoutError } from '@/js-task-runner/errors/timeout-error';
+import type { BrokerMessage, RunnerMessage } from '@/message-types';
+import { TaskRunnerNodeTypes } from '@/node-types';
+import type { TaskResultData } from '@/runner-types';
+import { TaskState } from '@/task-state';
 
-export interface Task<T = unknown> {
-	taskId: string;
-	settings?: T;
-	active: boolean;
-	cancelled: boolean;
-}
+import { TaskCancelledError } from './js-task-runner/errors/task-cancelled-error';
 
 export interface TaskOffer {
 	offerId: string;
@@ -24,6 +19,14 @@ export interface TaskOffer {
 }
 
 interface DataRequest {
+	taskId: string;
+	requestId: string;
+	resolve: (data: unknown) => void;
+	reject: (error: unknown) => void;
+}
+
+interface NodeTypesRequest {
+	taskId: string;
 	requestId: string;
 	resolve: (data: unknown) => void;
 	reject: (error: unknown) => void;
@@ -35,23 +38,33 @@ interface RPCCall {
 	reject: (error: unknown) => void;
 }
 
-export interface RPCCallObject {
-	[name: string]: ((...args: unknown[]) => Promise<unknown>) | RPCCallObject;
+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 const noOp = () => {};
+
+/** Params the task receives when it is executed */
+export interface TaskParams<T = unknown> {
+	taskId: string;
+	settings: T;
 }
 
-const VALID_TIME_MS = 1000;
-const VALID_EXTRA_MS = 100;
+export interface TaskRunnerOpts extends BaseRunnerConfig {
+	taskType: string;
+	name?: string;
+}
 
-const DEFAULT_MAX_PAYLOAD_SIZE = 1024 * 1024 * 1024;
-
-export abstract class TaskRunner {
+export abstract class TaskRunner extends EventEmitter {
 	id: string = nanoid();
 
 	ws: WebSocket;
 
 	canSendOffers = false;
 
-	runningTasks: Map<Task['taskId'], Task> = new Map();
+	runningTasks: Map<TaskState['taskId'], TaskState> = new Map();
 
 	offerInterval: NodeJS.Timeout | undefined;
 
@@ -59,34 +72,80 @@ export abstract class TaskRunner {
 
 	dataRequests: Map<DataRequest['requestId'], DataRequest> = new Map();
 
+	nodeTypesRequests: Map<NodeTypesRequest['requestId'], NodeTypesRequest> = new Map();
+
 	rpcCalls: Map<RPCCall['callId'], RPCCall> = new Map();
 
 	nodeTypes: TaskRunnerNodeTypes = new TaskRunnerNodeTypes([]);
 
-	constructor(
-		public taskType: string,
-		wsUrl: string,
-		grantToken: string,
-		private maxConcurrency: number,
-		public name?: string,
-	) {
-		const url = new URL(wsUrl);
-		url.searchParams.append('id', this.id);
-		this.ws = new WebSocket(url.toString(), {
+	taskType: string;
+
+	maxConcurrency: number;
+
+	name: string;
+
+	private idleTimer: NodeJS.Timeout | undefined;
+
+	/** How long (in seconds) a task is allowed to take for completion, else the task will be aborted. */
+	protected readonly taskTimeout: number;
+
+	/** 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.taskTimeout = opts.taskTimeout;
+		this.idleTimeout = opts.idleTimeout;
+
+		const { host: taskBrokerHost } = new URL(opts.taskBrokerUri);
+
+		const wsUrl = `ws://${taskBrokerHost}/runners/_ws?id=${this.id}`;
+		this.ws = new WebSocket(wsUrl, {
 			headers: {
-				authorization: `Bearer ${grantToken}`,
+				authorization: `Bearer ${opts.grantToken}`,
 			},
-			maxPayload: process.env.N8N_RUNNERS_MAX_PAYLOAD
-				? parseInt(process.env.N8N_RUNNERS_MAX_PAYLOAD)
-				: DEFAULT_MAX_PAYLOAD_SIZE,
+			maxPayload: opts.maxPayloadSize,
+		});
+
+		this.ws.addEventListener('error', (event) => {
+			const error = ensureError(event.error);
+
+			if (
+				'code' in error &&
+				typeof error.code === 'string' &&
+				['ECONNREFUSED', 'ENOTFOUND'].some((code) => code === error.code)
+			) {
+				console.error(
+					`Error: Failed to connect to n8n task broker. Please ensure n8n task broker is reachable at: ${taskBrokerHost}`,
+				);
+				process.exit(1);
+			} else {
+				console.error(`Error: Failed to connect to n8n task broker at ${taskBrokerHost}`);
+				console.error('Details:', event.message || 'Unknown error');
+			}
 		});
 		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) => {
 		// eslint-disable-next-line n8n-local-rules/no-uncaught-json-parse
-		const data = JSON.parse(message.data as string) as N8nMessage.ToRunner.All;
+		const data = JSON.parse(message.data as string) as BrokerMessage.ToRunner.All;
 		void this.onMessage(data);
 	};
 
@@ -117,35 +176,41 @@ export abstract class TaskRunner {
 	sendOffers() {
 		this.deleteStaleOffers();
 
-		const offersToSend =
-			this.maxConcurrency -
-			(Object.values(this.openOffers).length + Object.values(this.runningTasks).length);
+		if (!this.canSendOffers) {
+			return;
+		}
+
+		const offersToSend = this.maxConcurrency - (this.openOffers.size + this.runningTasks.size);
 
 		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,
 			});
 		}
 	}
 
-	send(message: RunnerMessage.ToN8n.All) {
+	send(message: RunnerMessage.ToBroker.All) {
 		this.ws.send(JSON.stringify(message));
 	}
 
-	onMessage(message: N8nMessage.ToRunner.All) {
+	onMessage(message: BrokerMessage.ToRunner.All) {
 		switch (message.type) {
 			case 'broker:inforequest':
 				this.send({
 					type: 'runner:info',
-					name: this.name ?? 'Node.js Task Runner SDK',
+					name: this.name,
 					types: [this.taskType],
 				});
 				break;
@@ -156,7 +221,7 @@ export abstract class TaskRunner {
 				this.offerAccepted(message.offerId, message.taskId);
 				break;
 			case 'broker:taskcancel':
-				this.taskCancelled(message.taskId);
+				void this.taskCancelled(message.taskId, message.reason);
 				break;
 			case 'broker:tasksettings':
 				void this.receivedSettings(message.taskId, message.settings);
@@ -168,15 +233,11 @@ export abstract class TaskRunner {
 				this.handleRpcResponse(message.callId, message.status, message.data);
 				break;
 			case 'broker:nodetypes':
-				this.setNodeTypes(message.nodeTypes as unknown as INodeTypeDescription[]);
+				this.processNodeTypesResponse(message.requestId, message.nodeTypes);
 				break;
 		}
 	}
 
-	setNodeTypes(nodeTypes: INodeTypeDescription[]) {
-		this.nodeTypes = new TaskRunnerNodeTypes(nodeTypes);
-	}
-
 	processDataResponse(requestId: string, data: unknown) {
 		const request = this.dataRequests.get(requestId);
 		if (!request) {
@@ -187,12 +248,23 @@ export abstract class TaskRunner {
 		request.resolve(data);
 	}
 
+	processNodeTypesResponse(requestId: string, nodeTypes: unknown) {
+		const request = this.nodeTypesRequests.get(requestId);
+
+		if (!request) return;
+
+		// Deleting of the request is handled in `requestNodeTypes`, using a
+		// `finally` wrapped around the return
+		request.resolve(nodeTypes);
+	}
+
 	hasOpenTasks() {
-		return Object.values(this.runningTasks).length < this.maxConcurrency;
+		return this.runningTasks.size < this.maxConcurrency;
 	}
 
 	offerAccepted(offerId: string, taskId: string) {
 		if (!this.hasOpenTasks()) {
+			this.openOffers.delete(offerId);
 			this.send({
 				type: 'runner:taskrejected',
 				taskId,
@@ -200,6 +272,7 @@ export abstract class TaskRunner {
 			});
 			return;
 		}
+
 		const offer = this.openOffers.get(offerId);
 		if (!offer) {
 			this.send({
@@ -212,11 +285,15 @@ export abstract class TaskRunner {
 			this.openOffers.delete(offerId);
 		}
 
-		this.runningTasks.set(taskId, {
+		this.resetIdleTimer();
+		const taskState = new TaskState({
 			taskId,
-			active: false,
-			cancelled: false,
+			timeoutInS: this.taskTimeout,
+			onTimeout: () => {
+				void this.taskTimedOut(taskId);
+			},
 		});
+		this.runningTasks.set(taskId, taskState);
 
 		this.send({
 			type: 'runner:taskaccepted',
@@ -224,74 +301,140 @@ export abstract class TaskRunner {
 		});
 	}
 
-	taskCancelled(taskId: string) {
-		const task = this.runningTasks.get(taskId);
-		if (!task) {
+	async taskCancelled(taskId: string, reason: string) {
+		const taskState = this.runningTasks.get(taskId);
+		if (!taskState) {
 			return;
 		}
-		task.cancelled = true;
-		if (task.active) {
-			// TODO
-		} else {
-			this.runningTasks.delete(taskId);
+
+		await taskState.caseOf({
+			// If the cancelled task hasn't received settings yet, we can finish it
+			waitingForSettings: () => this.finishTask(taskState),
+
+			// If the task has already timed out or is already cancelled, we can
+			// ignore the cancellation
+			'aborting:timeout': noOp,
+			'aborting:cancelled': noOp,
+
+			running: () => {
+				taskState.status = 'aborting:cancelled';
+				taskState.abortController.abort('cancelled');
+				this.cancelTaskRequests(taskId, reason);
+			},
+		});
+	}
+
+	async taskTimedOut(taskId: string) {
+		const taskState = this.runningTasks.get(taskId);
+		if (!taskState) {
+			return;
 		}
-		this.sendOffers();
-	}
 
-	taskErrored(taskId: string, error: unknown) {
-		this.send({
-			type: 'runner:taskerror',
-			taskId,
-			error,
-		});
-		this.runningTasks.delete(taskId);
-		this.sendOffers();
-	}
+		await taskState.caseOf({
+			// If we are still waiting for settings for the task, we can error the
+			// task immediately
+			waitingForSettings: () => {
+				try {
+					this.send({
+						type: 'runner:taskerror',
+						taskId,
+						error: new TimeoutError(this.taskTimeout),
+					});
+				} finally {
+					this.finishTask(taskState);
+				}
+			},
 
-	taskDone(taskId: string, data: RunnerMessage.ToN8n.TaskDone['data']) {
-		this.send({
-			type: 'runner:taskdone',
-			taskId,
-			data,
+			// This should never happen, the timeout timer should only fire once
+			'aborting:timeout': TaskState.throwUnexpectedTaskStatus,
+
+			// If we are currently executing the task, abort the execution and
+			// mark the task as timed out
+			running: () => {
+				taskState.status = 'aborting:timeout';
+				taskState.abortController.abort('timeout');
+				this.cancelTaskRequests(taskId, 'timeout');
+			},
+
+			// If the task is already cancelling, we can ignore the timeout
+			'aborting:cancelled': noOp,
 		});
-		this.runningTasks.delete(taskId);
-		this.sendOffers();
 	}
 
 	async receivedSettings(taskId: string, settings: unknown) {
-		const task = this.runningTasks.get(taskId);
-		if (!task) {
+		const taskState = this.runningTasks.get(taskId);
+		if (!taskState) {
 			return;
 		}
-		if (task.cancelled) {
-			this.runningTasks.delete(taskId);
-			return;
-		}
-		task.settings = settings;
-		task.active = true;
-		try {
-			const data = await this.executeTask(task);
-			this.taskDone(taskId, data);
-		} catch (error) {
-			this.taskErrored(taskId, error);
-		}
+
+		await taskState.caseOf({
+			// These states should never happen, as they are handled already in
+			// the other lifecycle methods and the task should be removed from the
+			// running tasks
+			'aborting:cancelled': TaskState.throwUnexpectedTaskStatus,
+			'aborting:timeout': TaskState.throwUnexpectedTaskStatus,
+			running: TaskState.throwUnexpectedTaskStatus,
+
+			waitingForSettings: async () => {
+				taskState.status = 'running';
+
+				await this.executeTask(
+					{
+						taskId,
+						settings,
+					},
+					taskState.abortController.signal,
+				)
+					.then(async (data) => await this.taskExecutionSucceeded(taskState, data))
+					.catch(async (error) => await this.taskExecutionFailed(taskState, error));
+			},
+		});
 	}
 
 	// eslint-disable-next-line @typescript-eslint/naming-convention
-	async executeTask(_task: Task): Promise<TaskResultData> {
+	async executeTask(_taskParams: TaskParams, _signal: AbortSignal): Promise<TaskResultData> {
 		throw new ApplicationError('Unimplemented');
 	}
 
+	async requestNodeTypes<T = unknown>(
+		taskId: TaskState['taskId'],
+		requestParams: RunnerMessage.ToBroker.NodeTypesRequest['requestParams'],
+	) {
+		const requestId = nanoid();
+
+		const nodeTypesPromise = new Promise<T>((resolve, reject) => {
+			this.nodeTypesRequests.set(requestId, {
+				requestId,
+				taskId,
+				resolve: resolve as (data: unknown) => void,
+				reject,
+			});
+		});
+
+		this.send({
+			type: 'runner:nodetypesrequest',
+			taskId,
+			requestId,
+			requestParams,
+		});
+
+		try {
+			return await nodeTypesPromise;
+		} finally {
+			this.nodeTypesRequests.delete(requestId);
+		}
+	}
+
 	async requestData<T = unknown>(
-		taskId: Task['taskId'],
-		type: RunnerMessage.ToN8n.TaskDataRequest['requestType'],
-		param?: string,
+		taskId: TaskState['taskId'],
+		requestParams: RunnerMessage.ToBroker.TaskDataRequest['requestParams'],
 	): Promise<T> {
 		const requestId = nanoid();
 
-		const p = new Promise<T>((resolve, reject) => {
+		const dataRequestPromise = new Promise<T>((resolve, reject) => {
 			this.dataRequests.set(requestId, {
 				requestId,
+				taskId,
 				resolve: resolve as (data: unknown) => void,
 				reject,
 			});
@@ -301,18 +444,17 @@ export abstract class TaskRunner {
 			type: 'runner:taskdatarequest',
 			taskId,
 			requestId,
-			requestType: type,
-			param,
+			requestParams,
 		});
 
 		try {
-			return await p;
+			return await dataRequestPromise;
 		} finally {
 			this.dataRequests.delete(requestId);
 		}
 	}
 
-	async makeRpcCall(taskId: string, name: RunnerMessage.ToN8n.RPC['name'], params: unknown[]) {
+	async makeRpcCall(taskId: string, name: RunnerMessage.ToBroker.RPC['name'], params: unknown[]) {
 		const callId = nanoid();
 
 		const dataPromise = new Promise((resolve, reject) => {
@@ -323,16 +465,18 @@ export abstract class TaskRunner {
 			});
 		});
 
-		this.send({
-			type: 'runner:rpc',
-			callId,
-			taskId,
-			name,
-			params,
-		});
-
 		try {
-			return await dataPromise;
+			this.send({
+				type: 'runner:rpc',
+				callId,
+				taskId,
+				name,
+				params,
+			});
+
+			const returnValue = await dataPromise;
+
+			return isSerializedBuffer(returnValue) ? toBuffer(returnValue) : returnValue;
 		} finally {
 			this.rpcCalls.delete(callId);
 		}
@@ -340,7 +484,7 @@ export abstract class TaskRunner {
 
 	handleRpcResponse(
 		callId: string,
-		status: N8nMessage.ToRunner.RPCResponse['status'],
+		status: BrokerMessage.ToRunner.RPCResponse['status'],
 		data: unknown,
 	) {
 		const call = this.rpcCalls.get(callId);
@@ -354,26 +498,10 @@ export abstract class TaskRunner {
 		}
 	}
 
-	buildRpcCallObject(taskId: string) {
-		const rpcObject: RPCCallObject = {};
-		for (const r of RPC_ALLOW_LIST) {
-			const splitPath = r.split('.');
-			let obj = rpcObject;
-
-			splitPath.forEach((s, index) => {
-				if (index !== splitPath.length - 1) {
-					obj[s] = {};
-					obj = obj[s];
-					return;
-				}
-				obj[s] = async (...args: unknown[]) => await this.makeRpcCall(taskId, r, args);
-			});
-		}
-		return rpcObject;
-	}
-
 	/** Close the connection gracefully and wait until has been closed */
 	async stop() {
+		this.clearIdleTimer();
+
 		this.stopTaskOffers();
 
 		await this.waitUntilAllTasksAreDone();
@@ -381,6 +509,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
@@ -403,4 +536,86 @@ export abstract class TaskRunner {
 			await new Promise((resolve) => setTimeout(resolve, 100));
 		}
 	}
+
+	private async taskExecutionSucceeded(taskState: TaskState, data: TaskResultData) {
+		try {
+			const sendData = () => {
+				this.send({
+					type: 'runner:taskdone',
+					taskId: taskState.taskId,
+					data,
+				});
+			};
+
+			await taskState.caseOf({
+				waitingForSettings: TaskState.throwUnexpectedTaskStatus,
+
+				'aborting:cancelled': noOp,
+
+				// If the task timed out but we ended up reaching this point, we
+				// might as well send the data
+				'aborting:timeout': sendData,
+				running: sendData,
+			});
+		} finally {
+			this.finishTask(taskState);
+		}
+	}
+
+	private async taskExecutionFailed(taskState: TaskState, error: unknown) {
+		try {
+			const sendError = () => {
+				this.send({
+					type: 'runner:taskerror',
+					taskId: taskState.taskId,
+					error,
+				});
+			};
+
+			await taskState.caseOf({
+				waitingForSettings: TaskState.throwUnexpectedTaskStatus,
+
+				'aborting:cancelled': noOp,
+
+				'aborting:timeout': () => {
+					console.warn(`Task ${taskState.taskId} timed out`);
+
+					sendError();
+				},
+
+				running: sendError,
+			});
+		} finally {
+			this.finishTask(taskState);
+		}
+	}
+
+	/**
+	 * Cancels all node type and data requests made by the given task
+	 */
+	private cancelTaskRequests(taskId: string, reason: string) {
+		for (const [requestId, request] of this.dataRequests.entries()) {
+			if (request.taskId === taskId) {
+				request.reject(new TaskCancelledError(reason));
+				this.dataRequests.delete(requestId);
+			}
+		}
+
+		for (const [requestId, request] of this.nodeTypesRequests.entries()) {
+			if (request.taskId === taskId) {
+				request.reject(new TaskCancelledError(reason));
+				this.nodeTypesRequests.delete(requestId);
+			}
+		}
+	}
+
+	/**
+	 * Finishes task by removing it from the running tasks and sending new offers
+	 */
+	private finishTask(taskState: TaskState) {
+		taskState.cleanup();
+		this.runningTasks.delete(taskState.taskId);
+		this.sendOffers();
+		this.resetIdleTimer();
+	}
 }
diff --git a/packages/@n8n/task-runner/src/task-state.ts b/packages/@n8n/task-runner/src/task-state.ts
new file mode 100644
index 0000000000..4c2c0e44a8
--- /dev/null
+++ b/packages/@n8n/task-runner/src/task-state.ts
@@ -0,0 +1,118 @@
+import * as a from 'node:assert';
+
+export type TaskStatus =
+	| 'waitingForSettings'
+	| 'running'
+	| 'aborting:cancelled'
+	| 'aborting:timeout';
+
+export type TaskStateOpts = {
+	taskId: string;
+	timeoutInS: number;
+	onTimeout: () => void;
+};
+
+/**
+ * The state of a task. The task can be in one of the following states:
+ * - waitingForSettings: The task is waiting for settings from the broker
+ * - running: The task is currently running
+ * - aborting:cancelled: The task was canceled by the broker and is being aborted
+ * - aborting:timeout: The task took too long to complete and is being aborted
+ *
+ * The task is discarded once it reaches an end state.
+ *
+ * The class only holds the state, and does not have any logic.
+ *
+ * The task has the following lifecycle:
+ *
+ *                      ┌───┐
+ *                      └───┘
+ *                        │
+ *               broker:taskofferaccept : create task state
+ *                        │
+ *                        ▼
+ *               ┌────────────────────┐  broker:taskcancel / timeout
+ *               │ waitingForSettings ├──────────────────────────────────┐
+ *               └────────┬───────────┘                                  │
+ *                        │                                              │
+ *                broker:tasksettings                                    │
+ *                        │                                              │
+ *                        ▼                                              │
+ *                 ┌───────────────┐            ┌────────────────────┐   │
+ *                 │    running    │            │  aborting:timeout  │   │
+ *                 │               │  timeout   │                    │   │
+ *         ┌───────┤- execute task ├───────────►│- fire abort signal │   │
+ *         │       └──────┬────────┘            └──────────┬─────────┘   │
+ *         │              │                                │             │
+ *         │       broker:taskcancel                       │             │
+ *  Task execution        │                          Task execution      │
+ *  resolves / rejects    │                          resolves / rejects  │
+ *         │              ▼                                │             │
+ *         │    ┌─────────────────────┐                    │             │
+ *         │    │ aborting:cancelled  │                    │             │
+ *         │    │                     │                    │             │
+ *         │    │- fire abort signal  │                    │             │
+ *         │    └──────────┬──────────┘                    │             │
+ *         │        Task execution                         │             │
+ *         │        resolves / rejects                     │             │
+ *         │               │                               │             │
+ *         │               ▼                               │             │
+ *         │              ┌──┐                             │             │
+ *         └─────────────►│  │◄────────────────────────────┴─────────────┘
+ *                        └──┘
+ */
+export class TaskState {
+	status: TaskStatus = 'waitingForSettings';
+
+	readonly taskId: string;
+
+	/** Controller for aborting the execution of the task */
+	readonly abortController = new AbortController();
+
+	/** Timeout timer for the task */
+	private timeoutTimer: NodeJS.Timeout | undefined;
+
+	constructor(opts: TaskStateOpts) {
+		this.taskId = opts.taskId;
+		this.timeoutTimer = setTimeout(opts.onTimeout, opts.timeoutInS * 1000);
+	}
+
+	/** Cleans up any resources before the task can be removed */
+	cleanup() {
+		clearTimeout(this.timeoutTimer);
+		this.timeoutTimer = undefined;
+	}
+
+	/** Custom JSON serialization for the task state for logging purposes */
+	toJSON() {
+		return `[Task ${this.taskId} (${this.status})]`;
+	}
+
+	/**
+	 * Executes the function matching the current task status
+	 *
+	 * @example
+	 * ```ts
+	 * taskState.caseOf({
+	 * 	 waitingForSettings: () => {...},
+	 * 	 running: () => {...},
+	 * 	 aborting:cancelled: () => {...},
+	 * 	 aborting:timeout: () => {...},
+	 * });
+	 * ```
+	 */
+	async caseOf(
+		conditions: Record<TaskStatus, (taskState: TaskState) => void | Promise<void> | never>,
+	) {
+		if (!conditions[this.status]) {
+			TaskState.throwUnexpectedTaskStatus(this);
+		}
+
+		return await conditions[this.status](this);
+	}
+
+	/** Throws an error that the task status is unexpected */
+	static throwUnexpectedTaskStatus = (taskState: TaskState) => {
+		a.fail(`Unexpected task status: ${JSON.stringify(taskState)}`);
+	};
+}
diff --git a/packages/@n8n/task-runner/tsconfig.json b/packages/@n8n/task-runner/tsconfig.json
index db6ad545e3..ddee64ec1f 100644
--- a/packages/@n8n/task-runner/tsconfig.json
+++ b/packages/@n8n/task-runner/tsconfig.json
@@ -2,6 +2,8 @@
 	"extends": ["../../../tsconfig.json", "../../../tsconfig.backend.json"],
 	"compilerOptions": {
 		"rootDir": ".",
+		"emitDecoratorMetadata": true,
+		"experimentalDecorators": true,
 		"baseUrl": "src",
 		"paths": {
 			"@/*": ["./*"]
diff --git a/packages/@n8n_io/eslint-config/base.js b/packages/@n8n_io/eslint-config/base.js
index 629749289a..0864a20a7b 100644
--- a/packages/@n8n_io/eslint-config/base.js
+++ b/packages/@n8n_io/eslint-config/base.js
@@ -316,6 +316,11 @@ const config = (module.exports = {
 		 */
 		'@typescript-eslint/return-await': ['error', 'always'],
 
+		/**
+		 * https://typescript-eslint.io/rules/explicit-member-accessibility/
+		 */
+		'@typescript-eslint/explicit-member-accessibility': ['error', { accessibility: 'no-public' }],
+
 		// ----------------------------------
 		//       eslint-plugin-import
 		// ----------------------------------
diff --git a/packages/cli/README.md b/packages/cli/README.md
index 526f463167..0235c694da 100644
--- a/packages/cli/README.md
+++ b/packages/cli/README.md
@@ -48,7 +48,7 @@ It will download everything that is needed to start n8n.
 You can then access n8n by opening:
 [http://localhost:5678](http://localhost:5678)
 
-**Note:** The minimum required version for Node.js is v14.15. Make sure to update Node.js to v14.15 or above.
+**Note:** The minimum required version for Node.js is v18. Make sure to update Node.js to v18 or above.
 
 ### Run with Docker
 
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2d95aa1cfa..c98737f9f0 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "1.65.0",
+  "version": "1.75.0",
   "description": "n8n Workflow Automation Tool",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -25,9 +25,10 @@
     "start:default": "cd bin && ./n8n",
     "start:windows": "cd bin && n8n",
     "test": "pnpm test:sqlite",
+    "test:dev": "N8N_LOG_LEVEL=silent DB_TYPE=sqlite jest --watch",
     "test:sqlite": "N8N_LOG_LEVEL=silent DB_TYPE=sqlite jest",
     "test:postgres": "N8N_LOG_LEVEL=silent DB_TYPE=postgresdb DB_POSTGRESDB_SCHEMA=alt_schema DB_TABLE_PREFIX=test_ jest --no-coverage",
-    "test:mysql": "N8N_LOG_LEVEL=silent DB_TYPE=mysqldb DB_TABLE_PREFIX=test_ jest --no-coverage",
+    "test:mariadb": "N8N_LOG_LEVEL=silent DB_TYPE=mariadb DB_TABLE_PREFIX=test_ jest --no-coverage",
     "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\""
   },
   "bin": {
@@ -88,23 +89,22 @@
     "@n8n/api-types": "workspace:*",
     "@n8n/client-oauth2": "workspace:*",
     "@n8n/config": "workspace:*",
+    "@n8n/di": "workspace:*",
     "@n8n/localtunnel": "3.0.0",
     "@n8n/n8n-nodes-langchain": "workspace:*",
     "@n8n/permissions": "workspace:*",
     "@n8n/task-runner": "workspace:*",
     "@n8n/typeorm": "0.3.20-12",
-    "@n8n_io/ai-assistant-sdk": "1.10.3",
+    "@n8n_io/ai-assistant-sdk": "1.13.0",
     "@n8n_io/license-sdk": "2.13.1",
     "@oclif/core": "4.0.7",
     "@rudderstack/rudder-sdk-node": "2.0.9",
-    "@sentry/integrations": "7.87.0",
-    "@sentry/node": "7.87.0",
+    "@sentry/node": "catalog:",
     "aws4": "1.11.0",
     "axios": "catalog:",
     "bcryptjs": "2.4.3",
     "bull": "4.12.1",
     "cache-manager": "5.2.3",
-    "callsites": "3.1.0",
     "change-case": "4.1.2",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.0",
@@ -122,7 +122,7 @@
     "express-rate-limit": "7.2.0",
     "fast-glob": "catalog:",
     "flat": "5.0.2",
-    "flatted": "3.2.7",
+    "flatted": "catalog:",
     "formidable": "3.5.1",
     "handlebars": "4.7.8",
     "helmet": "7.1.0",
@@ -149,13 +149,13 @@
     "p-cancelable": "2.1.1",
     "p-lazy": "3.1.0",
     "pg": "8.12.0",
-    "picocolors": "1.0.1",
+    "picocolors": "catalog:",
     "pkce-challenge": "3.0.0",
     "posthog-node": "3.2.1",
     "prom-client": "13.2.0",
     "psl": "1.9.0",
     "raw-body": "2.5.1",
-    "reflect-metadata": "0.2.2",
+    "reflect-metadata": "catalog:",
     "replacestream": "4.0.3",
     "samlify": "2.8.9",
     "semver": "7.5.4",
@@ -166,10 +166,8 @@
     "sshpk": "1.17.0",
     "swagger-ui-express": "5.0.1",
     "syslog-client": "1.1.1",
-    "typedi": "catalog:",
     "uuid": "catalog:",
     "validator": "13.7.0",
-    "winston": "3.14.2",
     "ws": "8.17.1",
     "xml2js": "catalog:",
     "xmllint-wasm": "3.0.1",
diff --git a/packages/cli/src/__tests__/active-workflow-manager.test.ts b/packages/cli/src/__tests__/active-workflow-manager.test.ts
new file mode 100644
index 0000000000..a167f1e5a5
--- /dev/null
+++ b/packages/cli/src/__tests__/active-workflow-manager.test.ts
@@ -0,0 +1,125 @@
+import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
+import type {
+	WorkflowParameters,
+	INode,
+	INodeType,
+	INodeTypeDescription,
+	WorkflowActivateMode,
+} from 'n8n-workflow';
+import { Workflow } from 'n8n-workflow';
+
+import { ActiveWorkflowManager } from '@/active-workflow-manager';
+import type { NodeTypes } from '@/node-types';
+
+describe('ActiveWorkflowManager', () => {
+	let activeWorkflowManager: ActiveWorkflowManager;
+	const instanceSettings = mock<InstanceSettings>();
+	const nodeTypes = mock<NodeTypes>();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		activeWorkflowManager = new ActiveWorkflowManager(
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			nodeTypes,
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+			instanceSettings,
+			mock(),
+		);
+	});
+
+	describe('checkIfWorkflowCanBeActivated', () => {
+		const disabledNode = mock<INode>({ type: 'triggerNode', disabled: true });
+		const unknownNode = mock<INode>({ type: 'unknownNode' });
+		const noTriggersNode = mock<INode>({ type: 'noTriggersNode' });
+		const pollNode = mock<INode>({ type: 'pollNode' });
+		const triggerNode = mock<INode>({ type: 'triggerNode' });
+		const webhookNode = mock<INode>({ type: 'webhookNode' });
+
+		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
+			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
+			if (type === 'unknownNode') return undefined as unknown as INodeType;
+			const partial: Partial<INodeType> = {
+				poll: undefined,
+				trigger: undefined,
+				webhook: undefined,
+				description: mock<INodeTypeDescription>({
+					properties: [],
+				}),
+			};
+			if (type === 'pollNode') partial.poll = jest.fn();
+			if (type === 'triggerNode') partial.trigger = jest.fn();
+			if (type === 'webhookNode') partial.webhook = jest.fn();
+			return mock(partial);
+		});
+
+		test.each([
+			['should skip disabled nodes', disabledNode, [], false],
+			['should skip nodes marked as ignored', triggerNode, ['triggerNode'], false],
+			['should skip unknown nodes', unknownNode, [], false],
+			['should skip nodes with no trigger method', noTriggersNode, [], false],
+			['should activate if poll method exists', pollNode, [], true],
+			['should activate if trigger method exists', triggerNode, [], true],
+			['should activate if webhook method exists', webhookNode, [], true],
+		])('%s', async (_, node, ignoredNodes, expected) => {
+			const workflow = new Workflow(mock<WorkflowParameters>({ nodeTypes, nodes: [node] }));
+			const canBeActivated = activeWorkflowManager.checkIfWorkflowCanBeActivated(
+				workflow,
+				ignoredNodes,
+			);
+			expect(canBeActivated).toBe(expected);
+		});
+	});
+
+	describe('shouldAddWebhooks', () => {
+		describe('if leader', () => {
+			beforeAll(() => {
+				Object.assign(instanceSettings, { isLeader: true, isFollower: false });
+			});
+
+			test('should return `true` for `init`', () => {
+				// ensure webhooks are populated on init: https://github.com/n8n-io/n8n/pull/8830
+				const result = activeWorkflowManager.shouldAddWebhooks('init');
+				expect(result).toBe(true);
+			});
+
+			test('should return `false` for `leadershipChange`', () => {
+				const result = activeWorkflowManager.shouldAddWebhooks('leadershipChange');
+				expect(result).toBe(false);
+			});
+
+			test('should return `true` for `update` or `activate`', () => {
+				const modes = ['update', 'activate'] as WorkflowActivateMode[];
+				for (const mode of modes) {
+					const result = activeWorkflowManager.shouldAddWebhooks(mode);
+					expect(result).toBe(true);
+				}
+			});
+		});
+
+		describe('if follower', () => {
+			beforeAll(() => {
+				Object.assign(instanceSettings, { isLeader: false, isFollower: true });
+			});
+
+			test('should return `false` for `update` or `activate`', () => {
+				const modes = ['update', 'activate'] as WorkflowActivateMode[];
+				for (const mode of modes) {
+					const result = activeWorkflowManager.shouldAddWebhooks(mode);
+					expect(result).toBe(false);
+				}
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/__tests__/credential-types.test.ts b/packages/cli/src/__tests__/credential-types.test.ts
index 0ccb5ab771..82780d114c 100644
--- a/packages/cli/src/__tests__/credential-types.test.ts
+++ b/packages/cli/src/__tests__/credential-types.test.ts
@@ -1,41 +1,121 @@
-import { Container } from 'typedi';
+import { mock } from 'jest-mock-extended';
+import { UnrecognizedCredentialTypeError } from 'n8n-core';
+import type { ICredentialType, LoadedClass } from 'n8n-workflow';
 
 import { CredentialTypes } from '@/credential-types';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { mockInstance } from '@test/mocking';
+import type { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 describe('CredentialTypes', () => {
-	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {
-		loadedCredentials: {
-			fakeFirstCredential: {
-				type: {
-					name: 'fakeFirstCredential',
-					displayName: 'Fake First Credential',
-					properties: [],
-				},
-				sourcePath: '',
-			},
-			fakeSecondCredential: {
-				type: {
-					name: 'fakeSecondCredential',
-					displayName: 'Fake Second Credential',
-					properties: [],
-				},
-				sourcePath: '',
-			},
-		},
+	const loadNodesAndCredentials = mock<LoadNodesAndCredentials>();
+
+	const credentialTypes = new CredentialTypes(loadNodesAndCredentials);
+
+	const testCredential: LoadedClass<ICredentialType> = {
+		sourcePath: '',
+		type: mock(),
+	};
+
+	loadNodesAndCredentials.getCredential.mockImplementation((credentialType) => {
+		if (credentialType === 'testCredential') return testCredential;
+		throw new UnrecognizedCredentialTypeError(credentialType);
 	});
 
-	const credentialTypes = Container.get(CredentialTypes);
-
-	test('Should throw error when calling invalid credential name', () => {
-		expect(() => credentialTypes.getByName('fakeThirdCredential')).toThrowError();
+	beforeEach(() => {
+		jest.clearAllMocks();
 	});
 
-	test('Should return correct credential type for valid name', () => {
-		const mockedCredentialTypes = mockNodesAndCredentials.loadedCredentials;
-		expect(credentialTypes.getByName('fakeFirstCredential')).toStrictEqual(
-			mockedCredentialTypes.fakeFirstCredential.type,
-		);
+	describe('getByName', () => {
+		test('Should throw error when calling invalid credential name', () => {
+			expect(() => credentialTypes.getByName('unknownCredential')).toThrowError('c');
+		});
+
+		test('Should return correct credential type for valid name', () => {
+			expect(credentialTypes.getByName('testCredential')).toStrictEqual(testCredential.type);
+		});
+	});
+
+	describe('recognizes', () => {
+		test('Should recognize credential type that exists in knownCredentials', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					loadedCredentials: {},
+					knownCredentials: { testCredential: mock({ supportedNodes: [] }) },
+				}),
+			);
+
+			expect(credentialTypes.recognizes('testCredential')).toBe(true);
+		});
+
+		test('Should recognize credential type that exists in loadedCredentials', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					loadedCredentials: { testCredential },
+					knownCredentials: {},
+				}),
+			);
+
+			expect(credentialTypes.recognizes('testCredential')).toBe(true);
+		});
+
+		test('Should not recognize unknown credential type', () => {
+			expect(credentialTypes.recognizes('unknownCredential')).toBe(false);
+		});
+	});
+
+	describe('getSupportedNodes', () => {
+		test('Should return supported nodes for known credential type', () => {
+			const supportedNodes = ['node1', 'node2'];
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					knownCredentials: { testCredential: mock({ supportedNodes }) },
+				}),
+			);
+
+			expect(credentialTypes.getSupportedNodes('testCredential')).toEqual(supportedNodes);
+		});
+
+		test('Should return empty array for unknown credential type supported nodes', () => {
+			expect(credentialTypes.getSupportedNodes('unknownCredential')).toBeEmptyArray();
+		});
+	});
+
+	describe('getParentTypes', () => {
+		test('Should return parent types for credential type with extends', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					knownCredentials: {
+						childType: { extends: ['parentType1', 'parentType2'] },
+						parentType1: { extends: ['grandparentType'] },
+						parentType2: { extends: [] },
+						grandparentType: { extends: [] },
+					},
+				}),
+			);
+
+			const parentTypes = credentialTypes.getParentTypes('childType');
+			expect(parentTypes).toContain('parentType1');
+			expect(parentTypes).toContain('parentType2');
+			expect(parentTypes).toContain('grandparentType');
+		});
+
+		test('Should return empty array for credential type without extends', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					knownCredentials: { testCredential: { extends: [] } },
+				}),
+			);
+
+			expect(credentialTypes.getParentTypes('testCredential')).toBeEmptyArray();
+		});
+
+		test('Should return empty array for unknown credential type parent types', () => {
+			const credentialTypes = new CredentialTypes(
+				mock<LoadNodesAndCredentials>({
+					knownCredentials: {},
+				}),
+			);
+
+			expect(credentialTypes.getParentTypes('unknownCredential')).toBeEmptyArray();
+		});
 	});
 });
diff --git a/packages/cli/src/__tests__/credentials-helper.test.ts b/packages/cli/src/__tests__/credentials-helper.test.ts
index 62cab968e4..7deffcd229 100644
--- a/packages/cli/src/__tests__/credentials-helper.test.ts
+++ b/packages/cli/src/__tests__/credentials-helper.test.ts
@@ -1,3 +1,4 @@
+import { mock } from 'jest-mock-extended';
 import type {
 	IAuthenticateGeneric,
 	ICredentialDataDecryptedObject,
@@ -5,59 +6,25 @@ import type {
 	IHttpRequestOptions,
 	INode,
 	INodeProperties,
+	INodeTypes,
 } from 'n8n-workflow';
-import { NodeConnectionType, deepCopy } from 'n8n-workflow';
-import { Workflow } from 'n8n-workflow';
-import Container from 'typedi';
+import { deepCopy, Workflow } from 'n8n-workflow';
 
+import { CredentialTypes } from '@/credential-types';
 import { CredentialsHelper } from '@/credentials-helper';
-import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
-import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { NodeTypes } from '@/node-types';
-import { mockInstance } from '@test/mocking';
+import type { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 describe('CredentialsHelper', () => {
-	mockInstance(CredentialsRepository);
-	mockInstance(SharedCredentialsRepository);
-	const mockNodesAndCredentials = mockInstance(LoadNodesAndCredentials, {
-		loadedNodes: {
-			'test.set': {
-				sourcePath: '',
-				type: {
-					description: {
-						displayName: 'Set',
-						name: 'set',
-						group: ['input'],
-						version: 1,
-						description: 'Sets a value',
-						defaults: {
-							name: 'Set',
-							color: '#0000FF',
-						},
-						inputs: [NodeConnectionType.Main],
-						outputs: [NodeConnectionType.Main],
-						properties: [
-							{
-								displayName: 'Value1',
-								name: 'value1',
-								type: 'string',
-								default: 'default-value1',
-							},
-							{
-								displayName: 'Value2',
-								name: 'value2',
-								type: 'string',
-								default: 'default-value2',
-							},
-						],
-					},
-				},
-			},
-		},
-	});
+	const nodeTypes = mock<INodeTypes>();
+	const mockNodesAndCredentials = mock<LoadNodesAndCredentials>();
 
-	const nodeTypes = mockInstance(NodeTypes);
+	const credentialsHelper = new CredentialsHelper(
+		new CredentialTypes(mockNodesAndCredentials),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+	);
 
 	describe('authenticate', () => {
 		const tests: Array<{
@@ -272,19 +239,16 @@ describe('CredentialsHelper', () => {
 
 		for (const testData of tests) {
 			test(testData.description, async () => {
-				//@ts-expect-error `loadedCredentials` is a getter and we are replacing it here with a property
-				mockNodesAndCredentials.loadedCredentials = {
-					[testData.input.credentialType.name]: {
-						type: testData.input.credentialType,
-						sourcePath: '',
-					},
-				};
+				const { credentialType } = testData.input;
 
-				const credentialsHelper = Container.get(CredentialsHelper);
+				mockNodesAndCredentials.getCredential.calledWith(credentialType.name).mockReturnValue({
+					type: credentialType,
+					sourcePath: '',
+				});
 
 				const result = await credentialsHelper.authenticate(
 					testData.input.credentials,
-					testData.input.credentialType.name,
+					credentialType.name,
 					deepCopy(incomingRequestOptions),
 					workflow,
 					node,
diff --git a/packages/cli/src/__tests__/execution-lifecycle-hooks.test.ts b/packages/cli/src/__tests__/execution-lifecycle-hooks.test.ts
new file mode 100644
index 0000000000..331d51e97e
--- /dev/null
+++ b/packages/cli/src/__tests__/execution-lifecycle-hooks.test.ts
@@ -0,0 +1,527 @@
+import { stringify } from 'flatted';
+import { mock } from 'jest-mock-extended';
+import { BinaryDataService, ErrorReporter, InstanceSettings, Logger } from 'n8n-core';
+import { ExpressionError, WorkflowHooks } from 'n8n-workflow';
+import type {
+	IRunExecutionData,
+	ITaskData,
+	Workflow,
+	IDataObject,
+	IRun,
+	INode,
+	IWorkflowBase,
+} from 'n8n-workflow';
+
+import config from '@/config';
+import type { Project } from '@/databases/entities/project';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { EventService } from '@/events/event.service';
+import { ExternalHooks } from '@/external-hooks';
+import { Push } from '@/push';
+import { OwnershipService } from '@/services/ownership.service';
+import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
+import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
+import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
+import { mockInstance } from '@test/mocking';
+
+import {
+	getWorkflowHooksMain,
+	getWorkflowHooksWorkerMain,
+} from '../workflow-execute-additional-data';
+
+describe('Execution Lifecycle Hooks', () => {
+	mockInstance(Logger);
+	mockInstance(InstanceSettings);
+	const errorReporter = mockInstance(ErrorReporter);
+	const eventService = mockInstance(EventService);
+	const executionRepository = mockInstance(ExecutionRepository);
+	const externalHooks = mockInstance(ExternalHooks);
+	const push = mockInstance(Push);
+	const workflowStaticDataService = mockInstance(WorkflowStaticDataService);
+	const workflowStatisticsService = mockInstance(WorkflowStatisticsService);
+	const binaryDataService = mockInstance(BinaryDataService);
+	const ownershipService = mockInstance(OwnershipService);
+	const workflowExecutionService = mockInstance(WorkflowExecutionService);
+
+	const nodeName = 'Test Node';
+	const node = mock<INode>();
+	const workflowId = 'test-workflow-id';
+	const executionId = 'test-execution-id';
+	const workflowData: IWorkflowBase = {
+		id: workflowId,
+		name: 'Test Workflow',
+		active: true,
+		connections: {},
+		nodes: [],
+		settings: {},
+		createdAt: new Date(),
+		updatedAt: new Date(),
+	};
+	const workflow = mock<Workflow>();
+	const staticData = mock<IDataObject>();
+	const taskData = mock<ITaskData>();
+	const runExecutionData = mock<IRunExecutionData>();
+	const successfulRun = mock<IRun>({
+		status: 'success',
+		finished: true,
+		waitTill: undefined,
+	});
+	const failedRun = mock<IRun>({
+		status: 'error',
+		finished: true,
+		waitTill: undefined,
+	});
+	const waitingRun = mock<IRun>({
+		finished: true,
+		status: 'waiting',
+		waitTill: new Date(),
+	});
+	const expressionError = new ExpressionError('Error');
+	const executionMode = 'manual';
+	const pushRef = 'test-push-ref';
+	const retryOf = 'test-retry-of';
+
+	const now = new Date('2025-01-13T18:25:50.267Z');
+	jest.useFakeTimers({ now });
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		workflowData.settings = {};
+		successfulRun.data = {
+			resultData: {
+				runData: {},
+			},
+		};
+		failedRun.data = {
+			resultData: {
+				runData: {},
+				error: expressionError,
+			},
+		};
+	});
+
+	describe('getWorkflowHooksMain', () => {
+		let hooks: WorkflowHooks;
+		beforeEach(() => {
+			hooks = getWorkflowHooksMain(
+				{
+					executionMode,
+					workflowData,
+					pushRef,
+					retryOf,
+				},
+				executionId,
+			);
+		});
+
+		it('should setup the correct set of hooks', () => {
+			expect(hooks).toBeInstanceOf(WorkflowHooks);
+			expect(hooks.mode).toBe('manual');
+			expect(hooks.executionId).toBe(executionId);
+			expect(hooks.workflowData).toEqual(workflowData);
+			expect(hooks.pushRef).toEqual('test-push-ref');
+			expect(hooks.retryOf).toEqual('test-retry-of');
+
+			const { hookFunctions } = hooks;
+			expect(hookFunctions.nodeExecuteBefore).toHaveLength(2);
+			expect(hookFunctions.nodeExecuteAfter).toHaveLength(3);
+			expect(hookFunctions.workflowExecuteBefore).toHaveLength(2);
+			expect(hookFunctions.workflowExecuteAfter).toHaveLength(2);
+			expect(hookFunctions.nodeFetchedData).toHaveLength(1);
+			expect(hookFunctions.sendResponse).toBeUndefined();
+		});
+
+		describe('nodeExecuteBefore', () => {
+			it('should send nodeExecuteBefore push event', async () => {
+				await hooks.executeHookFunctions('nodeExecuteBefore', [nodeName]);
+
+				expect(push.send).toHaveBeenCalledWith(
+					{ type: 'nodeExecuteBefore', data: { executionId, nodeName } },
+					pushRef,
+				);
+			});
+
+			it('should emit node-pre-execute event', async () => {
+				await hooks.executeHookFunctions('nodeExecuteBefore', [nodeName]);
+
+				expect(eventService.emit).toHaveBeenCalledWith('node-pre-execute', {
+					executionId,
+					workflow: workflowData,
+					nodeName,
+				});
+			});
+		});
+
+		describe('nodeExecuteAfter', () => {
+			it('should send nodeExecuteAfter push event', async () => {
+				await hooks.executeHookFunctions('nodeExecuteAfter', [
+					nodeName,
+					taskData,
+					runExecutionData,
+				]);
+
+				expect(push.send).toHaveBeenCalledWith(
+					{ type: 'nodeExecuteAfter', data: { executionId, nodeName, data: taskData } },
+					pushRef,
+				);
+			});
+
+			it('should emit node-post-execute event', async () => {
+				await hooks.executeHookFunctions('nodeExecuteAfter', [
+					nodeName,
+					taskData,
+					runExecutionData,
+				]);
+
+				expect(eventService.emit).toHaveBeenCalledWith('node-post-execute', {
+					executionId,
+					workflow: workflowData,
+					nodeName,
+				});
+			});
+
+			it('should save execution progress when enabled', async () => {
+				workflowData.settings = { saveExecutionProgress: true };
+
+				await hooks.executeHookFunctions('nodeExecuteAfter', [
+					nodeName,
+					taskData,
+					runExecutionData,
+				]);
+
+				expect(executionRepository.findSingleExecution).toHaveBeenCalledWith(executionId, {
+					includeData: true,
+					unflattenData: true,
+				});
+			});
+
+			it('should not save execution progress when disabled', async () => {
+				workflowData.settings = { saveExecutionProgress: false };
+
+				await hooks.executeHookFunctions('nodeExecuteAfter', [
+					nodeName,
+					taskData,
+					runExecutionData,
+				]);
+
+				expect(executionRepository.findSingleExecution).not.toHaveBeenCalled();
+			});
+		});
+
+		describe('workflowExecuteBefore', () => {
+			it('should send executionStarted push event', async () => {
+				await hooks.executeHookFunctions('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(push.send).toHaveBeenCalledWith(
+					{
+						type: 'executionStarted',
+						data: {
+							executionId,
+							mode: executionMode,
+							retryOf,
+							workflowId: 'test-workflow-id',
+							workflowName: 'Test Workflow',
+							startedAt: now,
+							flattedRunData: '[{}]',
+						},
+					},
+					pushRef,
+				);
+			});
+
+			it('should not call eventService', async () => {
+				await hooks.executeHookFunctions('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(eventService.emit).not.toHaveBeenCalled();
+			});
+
+			it('should run workflow.preExecute external hook', async () => {
+				await hooks.executeHookFunctions('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(externalHooks.run).toHaveBeenCalledWith('workflow.preExecute', [
+					workflow,
+					executionMode,
+				]);
+			});
+		});
+
+		describe('workflowExecuteAfter', () => {
+			it('should send executionFinished push event', async () => {
+				await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, {}]);
+				expect(eventService.emit).not.toHaveBeenCalled();
+				expect(push.send).toHaveBeenCalledWith(
+					{
+						type: 'executionFinished',
+						data: {
+							executionId,
+							rawData: stringify(successfulRun.data),
+							status: 'success',
+							workflowId: 'test-workflow-id',
+						},
+					},
+					pushRef,
+				);
+			});
+
+			it('should send executionWaiting push event', async () => {
+				await hooks.executeHookFunctions('workflowExecuteAfter', [waitingRun, {}]);
+
+				expect(push.send).toHaveBeenCalledWith(
+					{
+						type: 'executionWaiting',
+						data: { executionId },
+					},
+					pushRef,
+				);
+			});
+
+			describe('saving static data', () => {
+				it('should skip saving static data for manual executions', async () => {
+					hooks.mode = 'manual';
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, staticData]);
+
+					expect(workflowStaticDataService.saveStaticDataById).not.toHaveBeenCalled();
+				});
+
+				it('should save static data for prod executions', async () => {
+					hooks.mode = 'trigger';
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, staticData]);
+
+					expect(workflowStaticDataService.saveStaticDataById).toHaveBeenCalledWith(
+						workflowId,
+						staticData,
+					);
+				});
+
+				it('should handle static data saving errors', async () => {
+					hooks.mode = 'trigger';
+					const error = new Error('Static data save failed');
+					workflowStaticDataService.saveStaticDataById.mockRejectedValueOnce(error);
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, staticData]);
+
+					expect(errorReporter.error).toHaveBeenCalledWith(error);
+				});
+			});
+
+			describe('saving execution data', () => {
+				it('should update execution with proper data', async () => {
+					await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, {}]);
+
+					expect(executionRepository.updateExistingExecution).toHaveBeenCalledWith(
+						executionId,
+						expect.objectContaining({
+							finished: true,
+							status: 'success',
+						}),
+					);
+				});
+
+				it('should handle errors when updating execution', async () => {
+					const error = new Error('Failed to update execution');
+					executionRepository.updateExistingExecution.mockRejectedValueOnce(error);
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, {}]);
+
+					expect(errorReporter.error).toHaveBeenCalledWith(error);
+				});
+
+				it('should not delete unfinished executions', async () => {
+					const unfinishedRun = mock<IRun>({ finished: false, status: 'running' });
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [unfinishedRun, {}]);
+
+					expect(executionRepository.hardDelete).not.toHaveBeenCalled();
+				});
+
+				it('should not delete waiting executions', async () => {
+					await hooks.executeHookFunctions('workflowExecuteAfter', [waitingRun, {}]);
+
+					expect(executionRepository.hardDelete).not.toHaveBeenCalled();
+				});
+
+				it('should soft delete manual executions when manual saving is disabled', async () => {
+					hooks.workflowData.settings = { saveManualExecutions: false };
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, {}]);
+
+					expect(executionRepository.softDelete).toHaveBeenCalledWith(executionId);
+				});
+
+				it('should not soft delete manual executions with waitTill', async () => {
+					hooks.workflowData.settings = { saveManualExecutions: false };
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [waitingRun, {}]);
+
+					expect(executionRepository.softDelete).not.toHaveBeenCalled();
+				});
+			});
+
+			describe('error workflow', () => {
+				it('should not execute error workflow for manual executions', async () => {
+					hooks.mode = 'manual';
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [failedRun, {}]);
+
+					expect(workflowExecutionService.executeErrorWorkflow).not.toHaveBeenCalled();
+				});
+
+				it('should execute error workflow for failed non-manual executions', async () => {
+					hooks.mode = 'trigger';
+					const errorWorkflow = 'error-workflow-id';
+					workflowData.settings = { errorWorkflow };
+					const project = mock<Project>();
+					ownershipService.getWorkflowProjectCached
+						.calledWith(workflowId)
+						.mockResolvedValue(project);
+
+					await hooks.executeHookFunctions('workflowExecuteAfter', [failedRun, {}]);
+
+					expect(workflowExecutionService.executeErrorWorkflow).toHaveBeenCalledWith(
+						errorWorkflow,
+						{
+							workflow: {
+								id: workflowId,
+								name: workflowData.name,
+							},
+							execution: {
+								id: executionId,
+								error: expressionError,
+								mode: 'trigger',
+								retryOf,
+								lastNodeExecuted: undefined,
+								url: `http://localhost:5678/workflow/${workflowId}/executions/${executionId}`,
+							},
+						},
+						project,
+					);
+				});
+			});
+
+			it('should restore binary data IDs after workflow execution for webhooks', async () => {
+				config.set('binaryDataManager.mode', 'filesystem');
+				hooks.mode = 'webhook';
+				(successfulRun.data.resultData.runData = {
+					[nodeName]: [
+						{
+							executionTime: 1,
+							startTime: 1,
+							source: [],
+							data: {
+								main: [
+									[
+										{
+											json: {},
+											binary: {
+												data: {
+													id: `filesystem-v2:workflows/${workflowId}/executions/temp/binary_data/123`,
+													data: '',
+													mimeType: 'text/plain',
+												},
+											},
+										},
+									],
+								],
+							},
+						},
+					],
+				}),
+					await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(binaryDataService.rename).toHaveBeenCalledWith(
+					'workflows/test-workflow-id/executions/temp/binary_data/123',
+					'workflows/test-workflow-id/executions/test-execution-id/binary_data/123',
+				);
+			});
+		});
+
+		describe('statistics events', () => {
+			it('workflowExecuteAfter should emit workflowExecutionCompleted statistics event', async () => {
+				await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(workflowStatisticsService.emit).toHaveBeenCalledWith('workflowExecutionCompleted', {
+					workflowData,
+					fullRunData: successfulRun,
+				});
+			});
+
+			it('nodeFetchedData should handle nodeFetchedData statistics event', async () => {
+				await hooks.executeHookFunctions('nodeFetchedData', [workflowId, node]);
+
+				expect(workflowStatisticsService.emit).toHaveBeenCalledWith('nodeFetchedData', {
+					workflowId,
+					node,
+				});
+			});
+		});
+	});
+
+	describe('getWorkflowHooksWorkerMain', () => {
+		let hooks: WorkflowHooks;
+
+		beforeEach(() => {
+			hooks = getWorkflowHooksWorkerMain(executionMode, executionId, workflowData, {
+				pushRef,
+				retryOf,
+			});
+		});
+
+		it('should setup the correct set of hooks', () => {
+			expect(hooks).toBeInstanceOf(WorkflowHooks);
+			expect(hooks.mode).toBe('manual');
+			expect(hooks.executionId).toBe(executionId);
+			expect(hooks.workflowData).toEqual(workflowData);
+			expect(hooks.pushRef).toEqual('test-push-ref');
+			expect(hooks.retryOf).toEqual('test-retry-of');
+
+			const { hookFunctions } = hooks;
+			expect(hookFunctions.nodeExecuteBefore).toHaveLength(0);
+			expect(hookFunctions.nodeExecuteAfter).toHaveLength(0);
+			expect(hookFunctions.workflowExecuteBefore).toHaveLength(1);
+			expect(hookFunctions.workflowExecuteAfter).toHaveLength(1);
+		});
+
+		describe('workflowExecuteBefore', () => {
+			it('should run the workflow.preExecute external hook', async () => {
+				await hooks.executeHookFunctions('workflowExecuteBefore', [workflow, runExecutionData]);
+
+				expect(externalHooks.run).toHaveBeenCalledWith('workflow.preExecute', [
+					workflow,
+					executionMode,
+				]);
+			});
+		});
+
+		describe('workflowExecuteAfter', () => {
+			it('should delete successful executions when success saving is disabled', async () => {
+				workflowData.settings = {
+					saveDataSuccessExecution: 'none',
+					saveDataErrorExecution: 'all',
+				};
+
+				await hooks.executeHookFunctions('workflowExecuteAfter', [successfulRun, {}]);
+
+				expect(executionRepository.hardDelete).toHaveBeenCalledWith({
+					workflowId,
+					executionId,
+				});
+			});
+
+			it('should delete failed executions when error saving is disabled', async () => {
+				workflowData.settings = {
+					saveDataSuccessExecution: 'all',
+					saveDataErrorExecution: 'none',
+				};
+
+				await hooks.executeHookFunctions('workflowExecuteAfter', [failedRun, {}]);
+
+				expect(executionRepository.hardDelete).toHaveBeenCalledWith({
+					workflowId,
+					executionId,
+				});
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/__tests__/license.test.ts b/packages/cli/src/__tests__/license.test.ts
index d33d7c37cf..d48c361dcc 100644
--- a/packages/cli/src/__tests__/license.test.ts
+++ b/packages/cli/src/__tests__/license.test.ts
@@ -3,7 +3,6 @@ import { LicenseManager } from '@n8n_io/license-sdk';
 import { mock } from 'jest-mock-extended';
 import type { InstanceSettings } from 'n8n-core';
 
-import config from '@/config';
 import { N8N_VERSION } from '@/constants';
 import { License } from '@/license';
 import { mockLogger } from '@test/mocking';
@@ -31,6 +30,7 @@ describe('License', () => {
 	const instanceSettings = mock<InstanceSettings>({
 		instanceId: MOCK_INSTANCE_ID,
 		instanceType: 'main',
+		isLeader: true,
 	});
 
 	beforeEach(async () => {
@@ -38,7 +38,7 @@ describe('License', () => {
 			license: licenseConfig,
 			multiMainSetup: { enabled: false },
 		});
-		license = new License(mockLogger(), instanceSettings, mock(), mock(), mock(), globalConfig);
+		license = new License(mockLogger(), instanceSettings, mock(), mock(), globalConfig);
 		await license.init();
 	});
 
@@ -67,8 +67,7 @@ describe('License', () => {
 
 		license = new License(
 			logger,
-			mock<InstanceSettings>({ instanceType: 'worker' }),
-			mock(),
+			mock<InstanceSettings>({ instanceType: 'worker', isLeader: false }),
 			mock(),
 			mock(),
 			mock<GlobalConfig>({ license: licenseConfig }),
@@ -198,102 +197,65 @@ describe('License', () => {
 
 describe('License', () => {
 	describe('init', () => {
-		describe('in single-main setup', () => {
-			describe('with `license.autoRenewEnabled` enabled', () => {
-				it('should enable renewal', async () => {
-					const globalConfig = mock<GlobalConfig>({
-						license: licenseConfig,
-						multiMainSetup: { enabled: false },
-					});
-
-					await new License(
-						mockLogger(),
-						mock<InstanceSettings>({ instanceType: 'main' }),
-						mock(),
-						mock(),
-						mock(),
-						globalConfig,
-					).init();
-
-					expect(LicenseManager).toHaveBeenCalledWith(
-						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
-					);
-				});
+		it('when leader main with N8N_LICENSE_AUTO_RENEW_ENABLED=true, should enable renewal', async () => {
+			const globalConfig = mock<GlobalConfig>({
+				license: { ...licenseConfig, autoRenewalEnabled: true },
 			});
 
-			describe('with `license.autoRenewEnabled` disabled', () => {
-				it('should disable renewal', async () => {
-					await new License(
-						mockLogger(),
-						mock<InstanceSettings>({ instanceType: 'main' }),
-						mock(),
-						mock(),
-						mock(),
-						mock(),
-					).init();
+			await new License(
+				mockLogger(),
+				mock<InstanceSettings>({ instanceType: 'main', isLeader: true }),
+				mock(),
+				mock(),
+				globalConfig,
+			).init();
 
-					expect(LicenseManager).toHaveBeenCalledWith(
-						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
-					);
-				});
-			});
+			expect(LicenseManager).toHaveBeenCalledWith(
+				expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
+			);
 		});
 
-		describe('in multi-main setup', () => {
-			describe('with `license.autoRenewEnabled` disabled', () => {
-				test.each(['unset', 'leader', 'follower'])(
-					'if %s status, should disable removal',
-					async (status) => {
-						const globalConfig = mock<GlobalConfig>({
-							license: { ...licenseConfig, autoRenewalEnabled: false },
-							multiMainSetup: { enabled: true },
-						});
-						config.set('multiMainSetup.instanceType', status);
-
-						await new License(mockLogger(), mock(), mock(), mock(), mock(), globalConfig).init();
-
-						expect(LicenseManager).toHaveBeenCalledWith(
-							expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
-						);
-					},
-				);
+		it.each([
+			{
+				scenario: 'when leader main with N8N_LICENSE_AUTO_RENEW_ENABLED=false',
+				isLeader: true,
+				autoRenewalEnabled: false,
+			},
+			{
+				scenario: 'when follower main with N8N_LICENSE_AUTO_RENEW_ENABLED=true',
+				isLeader: false,
+				autoRenewalEnabled: true,
+			},
+			{
+				scenario: 'when follower main with N8N_LICENSE_AUTO_RENEW_ENABLED=false',
+				isLeader: false,
+				autoRenewalEnabled: false,
+			},
+		])('$scenario, should disable renewal', async ({ isLeader, autoRenewalEnabled }) => {
+			const globalConfig = mock<GlobalConfig>({
+				license: { ...licenseConfig, autoRenewalEnabled },
 			});
 
-			describe('with `license.autoRenewEnabled` enabled', () => {
-				test.each(['unset', 'follower'])('if %s status, should disable removal', async (status) => {
-					const globalConfig = mock<GlobalConfig>({
-						license: { ...licenseConfig, autoRenewalEnabled: false },
-						multiMainSetup: { enabled: true },
-					});
-					config.set('multiMainSetup.instanceType', status);
+			await new License(
+				mockLogger(),
+				mock<InstanceSettings>({ instanceType: 'main', isLeader }),
+				mock(),
+				mock(),
+				globalConfig,
+			).init();
 
-					await new License(mockLogger(), mock(), mock(), mock(), mock(), globalConfig).init();
+			const expectedRenewalSettings =
+				isLeader && autoRenewalEnabled
+					? { autoRenewEnabled: true, renewOnInit: true }
+					: { autoRenewEnabled: false, renewOnInit: false };
 
-					expect(LicenseManager).toHaveBeenCalledWith(
-						expect.objectContaining({ autoRenewEnabled: false, renewOnInit: false }),
-					);
-				});
-
-				it('if leader status, should enable renewal', async () => {
-					const globalConfig = mock<GlobalConfig>({
-						license: licenseConfig,
-						multiMainSetup: { enabled: true },
-					});
-					config.set('multiMainSetup.instanceType', 'leader');
-
-					await new License(mockLogger(), mock(), mock(), mock(), mock(), globalConfig).init();
-
-					expect(LicenseManager).toHaveBeenCalledWith(
-						expect.objectContaining({ autoRenewEnabled: true, renewOnInit: true }),
-					);
-				});
-			});
+			expect(LicenseManager).toHaveBeenCalledWith(expect.objectContaining(expectedRenewalSettings));
 		});
 	});
 
 	describe('reinit', () => {
 		it('should reinitialize license manager', async () => {
-			const license = new License(mockLogger(), mock(), mock(), mock(), mock(), mock());
+			const license = new License(mockLogger(), mock(), mock(), mock(), mock());
 			await license.init();
 
 			const initSpy = jest.spyOn(license, 'init');
diff --git a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
index bcf485445f..75aa602301 100644
--- a/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
+++ b/packages/cli/src/__tests__/load-nodes-and-credentials.test.ts
@@ -1,5 +1,7 @@
 import { mock } from 'jest-mock-extended';
 import type { DirectoryLoader } from 'n8n-core';
+import type { INodeProperties, INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
 
 import { LoadNodesAndCredentials } from '../load-nodes-and-credentials';
 
@@ -8,7 +10,7 @@ describe('LoadNodesAndCredentials', () => {
 		let instance: LoadNodesAndCredentials;
 
 		beforeEach(() => {
-			instance = new LoadNodesAndCredentials(mock(), mock(), mock());
+			instance = new LoadNodesAndCredentials(mock(), mock(), mock(), mock());
 			instance.loaders.package1 = mock<DirectoryLoader>({
 				directory: '/icons/package1',
 			});
@@ -34,4 +36,179 @@ describe('LoadNodesAndCredentials', () => {
 			expect(result).toBeUndefined();
 		});
 	});
+
+	describe('convertNodeToAiTool', () => {
+		const instance = new LoadNodesAndCredentials(mock(), mock(), mock(), mock());
+
+		let fullNodeWrapper: { description: INodeTypeDescription };
+
+		beforeEach(() => {
+			fullNodeWrapper = {
+				description: {
+					displayName: 'Test Node',
+					name: 'testNode',
+					group: ['test'],
+					description: 'A test node',
+					version: 1,
+					defaults: {},
+					inputs: [NodeConnectionType.Main],
+					outputs: [NodeConnectionType.Main],
+					properties: [],
+				},
+			};
+		});
+
+		it('should modify the name and displayName correctly', () => {
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.name).toBe('testNodeTool');
+			expect(result.description.displayName).toBe('Test Node Tool');
+		});
+
+		it('should update inputs and outputs', () => {
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.inputs).toEqual([]);
+			expect(result.description.outputs).toEqual([NodeConnectionType.AiTool]);
+		});
+
+		it('should remove the usableAsTool property', () => {
+			fullNodeWrapper.description.usableAsTool = true;
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.usableAsTool).toBeUndefined();
+		});
+
+		it("should add toolDescription property if it doesn't exist", () => {
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			const toolDescriptionProp = result.description.properties.find(
+				(prop) => prop.name === 'toolDescription',
+			);
+			expect(toolDescriptionProp).toBeDefined();
+			expect(toolDescriptionProp?.type).toBe('string');
+			expect(toolDescriptionProp?.default).toBe(fullNodeWrapper.description.description);
+		});
+
+		it('should set codex categories correctly', () => {
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.codex).toEqual({
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Tools'],
+					Tools: ['Other Tools'],
+				},
+				resources: {},
+			});
+		});
+
+		it('should preserve existing properties', () => {
+			const existingProp: INodeProperties = {
+				displayName: 'Existing Prop',
+				name: 'existingProp',
+				type: 'string',
+				default: 'test',
+			};
+			fullNodeWrapper.description.properties = [existingProp];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties).toHaveLength(3); // Existing prop + toolDescription + notice
+			expect(result.description.properties).toContainEqual(existingProp);
+		});
+
+		it('should handle nodes with resource property', () => {
+			const resourceProp: INodeProperties = {
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [{ name: 'User', value: 'user' }],
+				default: 'user',
+			};
+			fullNodeWrapper.description.properties = [resourceProp];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(resourceProp);
+		});
+
+		it('should handle nodes with operation property', () => {
+			const operationProp: INodeProperties = {
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [{ name: 'Create', value: 'create' }],
+				default: 'create',
+			};
+			fullNodeWrapper.description.properties = [operationProp];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(operationProp);
+		});
+
+		it('should handle nodes with both resource and operation properties', () => {
+			const resourceProp: INodeProperties = {
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				options: [{ name: 'User', value: 'user' }],
+				default: 'user',
+			};
+			const operationProp: INodeProperties = {
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'options',
+				options: [{ name: 'Create', value: 'create' }],
+				default: 'create',
+			};
+			fullNodeWrapper.description.properties = [resourceProp, operationProp];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties[1].name).toBe('descriptionType');
+			expect(result.description.properties[2].name).toBe('toolDescription');
+			expect(result.description.properties[3]).toEqual(resourceProp);
+			expect(result.description.properties[4]).toEqual(operationProp);
+		});
+
+		it('should handle nodes with empty properties', () => {
+			fullNodeWrapper.description.properties = [];
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.properties).toHaveLength(2);
+			expect(result.description.properties[1].name).toBe('toolDescription');
+		});
+
+		it('should handle nodes with existing codex property', () => {
+			fullNodeWrapper.description.codex = {
+				categories: ['Existing'],
+				subcategories: {
+					Existing: ['Category'],
+				},
+				resources: {
+					primaryDocumentation: [{ url: 'https://example.com' }],
+				},
+			};
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.codex).toEqual({
+				categories: ['AI'],
+				subcategories: {
+					AI: ['Tools'],
+					Tools: ['Other Tools'],
+				},
+				resources: {
+					primaryDocumentation: [{ url: 'https://example.com' }],
+				},
+			});
+		});
+
+		it('should handle nodes with very long names', () => {
+			fullNodeWrapper.description.name = 'veryLongNodeNameThatExceedsNormalLimits'.repeat(10);
+			fullNodeWrapper.description.displayName =
+				'Very Long Node Name That Exceeds Normal Limits'.repeat(10);
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.name.endsWith('Tool')).toBe(true);
+			expect(result.description.displayName.endsWith('Tool')).toBe(true);
+		});
+
+		it('should handle nodes with special characters in name and displayName', () => {
+			fullNodeWrapper.description.name = 'special@#$%Node';
+			fullNodeWrapper.description.displayName = 'Special @#$% Node';
+			const result = instance.convertNodeToAiTool(fullNodeWrapper);
+			expect(result.description.name).toBe('special@#$%NodeTool');
+			expect(result.description.displayName).toBe('Special @#$% Node Tool');
+		});
+	});
 });
diff --git a/packages/cli/src/__tests__/workflow-helpers.test.ts b/packages/cli/src/__tests__/manual-execution.service.test.ts
similarity index 69%
rename from packages/cli/src/__tests__/workflow-helpers.test.ts
rename to packages/cli/src/__tests__/manual-execution.service.test.ts
index e24cfa1f68..383a8dc87c 100644
--- a/packages/cli/src/__tests__/workflow-helpers.test.ts
+++ b/packages/cli/src/__tests__/manual-execution.service.test.ts
@@ -1,8 +1,11 @@
+import { mock } from 'jest-mock-extended';
 import type { Workflow, IWorkflowExecutionDataProcess } from 'n8n-workflow';
 
-import { getExecutionStartNode } from '@/workflow-helpers';
+import { ManualExecutionService } from '@/manual-execution.service';
+
+describe('ManualExecutionService', () => {
+	const manualExecutionService = new ManualExecutionService(mock());
 
-describe('WorkflowHelpers', () => {
 	describe('getExecutionStartNode', () => {
 		it('Should return undefined', () => {
 			const data = {
@@ -16,9 +19,10 @@ describe('WorkflowHelpers', () => {
 					};
 				},
 			} as unknown as Workflow;
-			const executionStartNode = getExecutionStartNode(data, workflow);
+			const executionStartNode = manualExecutionService.getExecutionStartNode(data, workflow);
 			expect(executionStartNode).toBeUndefined();
 		});
+
 		it('Should return startNode', () => {
 			const data = {
 				pinData: {
@@ -37,7 +41,7 @@ describe('WorkflowHelpers', () => {
 					return undefined;
 				},
 			} as unknown as Workflow;
-			const executionStartNode = getExecutionStartNode(data, workflow);
+			const executionStartNode = manualExecutionService.getExecutionStartNode(data, workflow);
 			expect(executionStartNode).toEqual({
 				name: 'node2',
 			});
diff --git a/packages/cli/src/__tests__/node-types.test.ts b/packages/cli/src/__tests__/node-types.test.ts
index 11e2c5ba2b..78d0c5e18a 100644
--- a/packages/cli/src/__tests__/node-types.test.ts
+++ b/packages/cli/src/__tests__/node-types.test.ts
@@ -1,95 +1,114 @@
 import { mock } from 'jest-mock-extended';
-import type { INodeType, IVersionedNodeType } from 'n8n-workflow';
+import { UnrecognizedNodeTypeError } from 'n8n-core';
+import type {
+	LoadedClass,
+	INodeType,
+	IVersionedNodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
-import type { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-
-import { NodeTypes } from '../node-types';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { NodeTypes } from '@/node-types';
 
 describe('NodeTypes', () => {
-	let nodeTypes: NodeTypes;
 	const loadNodesAndCredentials = mock<LoadNodesAndCredentials>();
 
+	const nodeTypes: NodeTypes = new NodeTypes(loadNodesAndCredentials);
+
+	const nonVersionedNode: LoadedClass<INodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-base.nonVersioned',
+				usableAsTool: undefined,
+			}),
+		},
+	};
+	const v1Node = mock<INodeType>();
+	const v2Node = mock<INodeType>();
+	const versionedNode: LoadedClass<IVersionedNodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-base.versioned',
+			}),
+			currentVersion: 2,
+			nodeVersions: {
+				1: v1Node,
+				2: v2Node,
+			},
+			getNodeType(version) {
+				if (version === 1) return v1Node;
+				return v2Node;
+			},
+		},
+	};
+	const toolSupportingNode: LoadedClass<INodeType> = {
+		sourcePath: '',
+		type: {
+			description: mock<INodeTypeDescription>({
+				name: 'n8n-nodes-base.testNode',
+				displayName: 'TestNode',
+				usableAsTool: true,
+				properties: [],
+			}),
+		},
+	};
+
+	loadNodesAndCredentials.getNode.mockImplementation((fullNodeType) => {
+		const [packageName, nodeType] = fullNodeType.split('.');
+		if (nodeType === 'nonVersioned') return nonVersionedNode;
+		if (nodeType === 'versioned') return versionedNode;
+		if (nodeType === 'testNode') return toolSupportingNode;
+		throw new UnrecognizedNodeTypeError(packageName, nodeType);
+	});
+
 	beforeEach(() => {
 		jest.clearAllMocks();
-		nodeTypes = new NodeTypes(loadNodesAndCredentials);
+	});
+
+	describe('getByName', () => {
+		it('should return node type when it exists', () => {
+			const result = nodeTypes.getByName('n8n-nodes-base.nonVersioned');
+			expect(result).toBe(nonVersionedNode.type);
+		});
 	});
 
 	describe('getByNameAndVersion', () => {
-		const nodeTypeName = 'n8n-nodes-base.testNode';
+		it('should throw an error if the package does not exist', () => {
+			expect(() => nodeTypes.getByNameAndVersion('invalid-package.unknownNode')).toThrow(
+				'Unrecognized node type: invalid-package.unknownNode',
+			);
+		});
 
 		it('should throw an error if the node-type does not exist', () => {
-			const nodeTypeName = 'unknownNode';
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {};
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.knownNodes = {};
-
-			expect(() => nodeTypes.getByNameAndVersion(nodeTypeName)).toThrow(
-				'Unrecognized node type: unknownNode',
+			expect(() => nodeTypes.getByNameAndVersion('n8n-nodes-base.unknownNode')).toThrow(
+				'Unrecognized node type: n8n-nodes-base.unknownNode',
 			);
 		});
 
 		it('should return a regular node-type without version', () => {
-			const nodeType = mock<INodeType>();
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {
-				[nodeTypeName]: { type: nodeType },
-			};
-
-			const result = nodeTypes.getByNameAndVersion(nodeTypeName);
-
-			expect(result).toEqual(nodeType);
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.nonVersioned');
+			expect(result).toBe(nonVersionedNode.type);
 		});
 
 		it('should return a regular node-type with version', () => {
-			const nodeTypeV1 = mock<INodeType>();
-			const nodeType = mock<IVersionedNodeType>({
-				nodeVersions: { 1: nodeTypeV1 },
-				getNodeType: () => nodeTypeV1,
-			});
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {
-				[nodeTypeName]: { type: nodeType },
-			};
-
-			const result = nodeTypes.getByNameAndVersion(nodeTypeName);
-
-			expect(result).toEqual(nodeTypeV1);
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.versioned');
+			expect(result).toBe(v2Node);
 		});
 
 		it('should throw when a node-type is requested as tool, but does not support being used as one', () => {
-			const nodeType = mock<INodeType>();
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {
-				[nodeTypeName]: { type: nodeType },
-			};
-
-			expect(() => nodeTypes.getByNameAndVersion(`${nodeTypeName}Tool`)).toThrow(
+			expect(() => nodeTypes.getByNameAndVersion('n8n-nodes-base.nonVersionedTool')).toThrow(
 				'Node cannot be used as a tool',
 			);
 		});
 
 		it('should return the tool node-type when requested as tool', () => {
-			const nodeType = mock<INodeType>();
-			// @ts-expect-error can't use a mock here
-			nodeType.description = {
-				name: nodeTypeName,
-				displayName: 'TestNode',
-				usableAsTool: true,
-				properties: [],
-			};
-
-			// @ts-expect-error overwriting a readonly property
-			loadNodesAndCredentials.loadedNodes = {
-				[nodeTypeName]: { type: nodeType },
-			};
-
-			const result = nodeTypes.getByNameAndVersion(`${nodeTypeName}Tool`);
-			expect(result).not.toEqual(nodeType);
+			// @ts-expect-error don't mock convertNodeToAiTool for now
+			loadNodesAndCredentials.convertNodeToAiTool =
+				LoadNodesAndCredentials.prototype.convertNodeToAiTool;
+			const result = nodeTypes.getByNameAndVersion('n8n-nodes-base.testNodeTool');
+			expect(result).not.toEqual(toolSupportingNode);
 			expect(result.description.name).toEqual('n8n-nodes-base.testNodeTool');
 			expect(result.description.displayName).toEqual('TestNode Tool');
 			expect(result.description.codex?.categories).toContain('AI');
@@ -97,4 +116,47 @@ describe('NodeTypes', () => {
 			expect(result.description.outputs).toEqual(['ai_tool']);
 		});
 	});
+
+	describe('getWithSourcePath', () => {
+		it('should return description and source path for existing node', () => {
+			const result = nodeTypes.getWithSourcePath('n8n-nodes-base.nonVersioned', 1);
+			expect(result).toHaveProperty('description');
+			expect(result).toHaveProperty('sourcePath');
+			expect(result.sourcePath).toBe(nonVersionedNode.sourcePath);
+		});
+
+		it('should throw error for non-existent node', () => {
+			expect(() => nodeTypes.getWithSourcePath('n8n-nodes-base.nonExistent', 1)).toThrow(
+				'Unrecognized node type: n8n-nodes-base.nonExistent',
+			);
+		});
+	});
+
+	describe('getKnownTypes', () => {
+		it('should return known node types', () => {
+			// @ts-expect-error readonly property
+			loadNodesAndCredentials.knownNodes = ['n8n-nodes-base.nonVersioned'];
+			const result = nodeTypes.getKnownTypes();
+			expect(result).toEqual(['n8n-nodes-base.nonVersioned']);
+		});
+	});
+
+	describe('getNodeTypeDescriptions', () => {
+		it('should return descriptions for valid node types', () => {
+			const nodeTypes = new NodeTypes(loadNodesAndCredentials);
+			const result = nodeTypes.getNodeTypeDescriptions([
+				{ name: 'n8n-nodes-base.nonVersioned', version: 1 },
+			]);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].name).toBe('n8n-nodes-base.nonVersioned');
+		});
+
+		it('should throw error for invalid node type', () => {
+			const nodeTypes = new NodeTypes(loadNodesAndCredentials);
+			expect(() =>
+				nodeTypes.getNodeTypeDescriptions([{ name: 'n8n-nodes-base.nonExistent', version: 1 }]),
+			).toThrow('Unrecognized node type: n8n-nodes-base.nonExistent');
+		});
+	});
 });
diff --git a/packages/cli/src/__tests__/object-to-error.test.ts b/packages/cli/src/__tests__/object-to-error.test.ts
new file mode 100644
index 0000000000..311f4dce55
--- /dev/null
+++ b/packages/cli/src/__tests__/object-to-error.test.ts
@@ -0,0 +1,43 @@
+import { mock } from 'jest-mock-extended';
+import type { INode } from 'n8n-workflow';
+import { NodeOperationError, type Workflow } from 'n8n-workflow';
+
+import { objectToError } from '../workflow-execute-additional-data';
+
+describe('objectToError', () => {
+	describe('node error handling', () => {
+		it('should create `NodeOperationError` when node is found', () => {
+			const errorObject = {
+				message: 'Test error',
+				node: {
+					name: 'testNode',
+				},
+			};
+			const workflow = mock<Workflow>();
+			const node = mock<INode>();
+			workflow.getNode.mockReturnValue(node);
+
+			const result = objectToError(errorObject, workflow);
+
+			expect(workflow.getNode).toHaveBeenCalledWith('testNode');
+			expect(result).toBeInstanceOf(NodeOperationError);
+		});
+
+		it('should create `Error` when node is not found', () => {
+			const errorObject = {
+				message: 'Test error',
+				node: {
+					// missing `name`
+				},
+			};
+			const workflow = mock<Workflow>();
+
+			const result = objectToError(errorObject, workflow);
+
+			expect(workflow.getNode).not.toHaveBeenCalled();
+			expect(result).toBeInstanceOf(Error);
+			expect(result).not.toBeInstanceOf(NodeOperationError);
+			expect(result.message).toBe('Test error');
+		});
+	});
+});
diff --git a/packages/cli/src/__tests__/project.test-data.ts b/packages/cli/src/__tests__/project.test-data.ts
new file mode 100644
index 0000000000..cd176bd291
--- /dev/null
+++ b/packages/cli/src/__tests__/project.test-data.ts
@@ -0,0 +1,19 @@
+import { nanoId, date, firstName, lastName, email } from 'minifaker';
+import 'minifaker/locales/en';
+
+import type { Project } from '@/databases/entities/project';
+
+type RawProjectData = Pick<Project, 'name' | 'type' | 'createdAt' | 'updatedAt' | 'id'>;
+
+const projectName = `${firstName()} ${lastName()} <${email}>`;
+
+export const createRawProjectData = (payload: Partial<RawProjectData>): Project => {
+	return {
+		createdAt: date(),
+		updatedAt: date(),
+		id: nanoId.nanoid(),
+		name: projectName,
+		type: 'personal',
+		...payload,
+	} as Project;
+};
diff --git a/packages/cli/src/__tests__/wait-tracker.test.ts b/packages/cli/src/__tests__/wait-tracker.test.ts
index 66c26f00c6..6721c31bae 100644
--- a/packages/cli/src/__tests__/wait-tracker.test.ts
+++ b/packages/cli/src/__tests__/wait-tracker.test.ts
@@ -1,33 +1,51 @@
 import { mock } from 'jest-mock-extended';
 import type { InstanceSettings } from 'n8n-core';
+import type { IRun, IWorkflowBase } from 'n8n-workflow';
+import { createDeferredPromise } from 'n8n-workflow';
 
+import type { ActiveExecutions } from '@/active-executions';
+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();
+jest.useFakeTimers({ advanceTimers: true });
 
 describe('WaitTracker', () => {
+	const activeExecutions = mock<ActiveExecutions>();
+	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 instanceSettings = mock<InstanceSettings>({ isLeader: true, isMultiMain: false });
 
+	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',
+			parentExecution: undefined,
+		}),
 	});
+	execution.workflowData = mock<IWorkflowBase>({ id: 'abcd' });
 
 	let waitTracker: WaitTracker;
 	beforeEach(() => {
 		waitTracker = new WaitTracker(
 			mockLogger(),
 			executionRepository,
-			mock(),
-			mock(),
+			ownershipService,
+			activeExecutions,
+			workflowRunner,
 			orchestrationService,
 			instanceSettings,
 		);
@@ -64,29 +82,33 @@ 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
+					.calledWith(execution.id)
+					.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);
@@ -95,18 +117,95 @@ describe('WaitTracker', () => {
 	});
 
 	describe('startExecution()', () => {
-		it('should query for execution to start', async () => {
+		beforeEach(() => {
 			executionRepository.getWaitingExecutions.mockResolvedValue([]);
 			waitTracker.init();
 
-			executionRepository.findSingleExecution.mockResolvedValue(execution);
-			waitTracker.startExecution(execution.id);
-			jest.advanceTimersByTime(5);
+			executionRepository.findSingleExecution.calledWith(execution.id).mockResolvedValue(execution);
+			ownershipService.getWorkflowProjectCached.mockResolvedValue(project);
+
+			execution.data.parentExecution = undefined;
+		});
+
+		it('should query for execution to start', async () => {
+			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,
+			);
+		});
+
+		it('should also resume parent execution once sub-workflow finishes', async () => {
+			const parentExecution = mock<IExecutionResponse>({
+				id: 'parent_execution_id',
+				finished: false,
+			});
+			parentExecution.workflowData = mock<IWorkflowBase>({ id: 'parent_workflow_id' });
+			execution.data.parentExecution = {
+				executionId: parentExecution.id,
+				workflowId: parentExecution.workflowData.id,
+			};
+			executionRepository.findSingleExecution
+				.calledWith(parentExecution.id)
+				.mockResolvedValue(parentExecution);
+			const postExecutePromise = createDeferredPromise<IRun | undefined>();
+			activeExecutions.getPostExecutePromise
+				.calledWith(execution.id)
+				.mockReturnValue(postExecutePromise.promise);
+
+			await waitTracker.startExecution(execution.id);
+
+			expect(executionRepository.findSingleExecution).toHaveBeenNthCalledWith(1, execution.id, {
+				includeData: true,
+				unflattenData: true,
+			});
+
+			expect(workflowRunner.run).toHaveBeenCalledTimes(1);
+			expect(workflowRunner.run).toHaveBeenNthCalledWith(
+				1,
+				{
+					executionMode: execution.mode,
+					executionData: execution.data,
+					workflowData: execution.workflowData,
+					projectId: project.id,
+					pushRef: execution.data.pushRef,
+				},
+				false,
+				false,
+				execution.id,
+			);
+
+			postExecutePromise.resolve(mock<IRun>());
+			await jest.advanceTimersByTimeAsync(100);
+
+			expect(workflowRunner.run).toHaveBeenCalledTimes(2);
+			expect(workflowRunner.run).toHaveBeenNthCalledWith(
+				2,
+				{
+					executionMode: parentExecution.mode,
+					executionData: parentExecution.data,
+					workflowData: parentExecution.workflowData,
+					projectId: project.id,
+					pushRef: parentExecution.data.pushRef,
+				},
+				false,
+				false,
+				parentExecution.id,
+			);
 		});
 	});
 
@@ -122,8 +221,6 @@ describe('WaitTracker', () => {
 
 	describe('multi-main setup', () => {
 		it('should start tracking if leader', () => {
-			jest.spyOn(orchestrationService, 'isSingleMainSetup', 'get').mockReturnValue(false);
-
 			executionRepository.getWaitingExecutions.mockResolvedValue([]);
 
 			waitTracker.init();
@@ -135,12 +232,12 @@ describe('WaitTracker', () => {
 			const waitTracker = new WaitTracker(
 				mockLogger(),
 				executionRepository,
-				mock(),
-				mock(),
+				ownershipService,
+				activeExecutions,
+				workflowRunner,
 				orchestrationService,
-				mock<InstanceSettings>({ isLeader: false }),
+				mock<InstanceSettings>({ isLeader: false, isMultiMain: false }),
 			);
-			jest.spyOn(orchestrationService, 'isSingleMainSetup', 'get').mockReturnValue(false);
 
 			executionRepository.getWaitingExecutions.mockResolvedValue([]);
 
diff --git a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts
index 88aee51540..4c3af0e696 100644
--- a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts
+++ b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts
@@ -1,63 +1,82 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
+import type { IWorkflowBase } from 'n8n-workflow';
 import type {
 	IExecuteWorkflowInfo,
 	IWorkflowExecuteAdditionalData,
 	ExecuteWorkflowOptions,
 	IRun,
+	INodeExecutionData,
 } from 'n8n-workflow';
 import type PCancelable from 'p-cancelable';
-import Container from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import { CredentialsHelper } from '@/credentials-helper';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { VariablesService } from '@/environments.ee/variables/variables.service.ee';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
-import { SecretsHelper } from '@/secrets-helpers';
+import { SecretsHelper } from '@/secrets-helpers.ee';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
 import { SubworkflowPolicyChecker } from '@/subworkflows/subworkflow-policy-checker.service';
 import { Telemetry } from '@/telemetry';
 import { PermissionChecker } from '@/user-management/permission-checker';
-import { executeWorkflow, getBase } from '@/workflow-execute-additional-data';
+import { executeWorkflow, getBase, getRunData } from '@/workflow-execute-additional-data';
 import { mockInstance } from '@test/mocking';
 
-const run = mock<IRun>({
-	data: { resultData: {} },
-	finished: true,
-	mode: 'manual',
-	startedAt: new Date(),
-	status: 'new',
-});
+const EXECUTION_ID = '123';
+const LAST_NODE_EXECUTED = 'Last node executed';
 
-const cancelablePromise = mock<PCancelable<IRun>>({
-	then: jest
-		.fn()
-		.mockImplementation(async (onfulfilled) => await Promise.resolve(run).then(onfulfilled)),
-	catch: jest
-		.fn()
-		.mockImplementation(async (onrejected) => await Promise.resolve(run).catch(onrejected)),
-	finally: jest
-		.fn()
-		.mockImplementation(async (onfinally) => await Promise.resolve(run).finally(onfinally)),
-	[Symbol.toStringTag]: 'PCancelable',
-});
+const getMockRun = ({ lastNodeOutput }: { lastNodeOutput: Array<INodeExecutionData[] | null> }) =>
+	mock<IRun>({
+		data: {
+			resultData: {
+				runData: {
+					[LAST_NODE_EXECUTED]: [
+						{
+							startTime: 100,
+							data: {
+								main: lastNodeOutput,
+							},
+						},
+					],
+				},
+				lastNodeExecuted: LAST_NODE_EXECUTED,
+			},
+		},
+		finished: true,
+		mode: 'manual',
+		startedAt: new Date(),
+		status: 'new',
+		waitTill: undefined,
+	});
+
+const getCancelablePromise = async (run: IRun) =>
+	await mock<PCancelable<IRun>>({
+		then: jest
+			.fn()
+			.mockImplementation(async (onfulfilled) => await Promise.resolve(run).then(onfulfilled)),
+		catch: jest
+			.fn()
+			.mockImplementation(async (onrejected) => await Promise.resolve(run).catch(onrejected)),
+		finally: jest
+			.fn()
+			.mockImplementation(async (onfinally) => await Promise.resolve(run).finally(onfinally)),
+		[Symbol.toStringTag]: 'PCancelable',
+	});
+
+const processRunExecutionData = jest.fn();
 
 jest.mock('n8n-core', () => ({
 	__esModule: true,
 	...jest.requireActual('n8n-core'),
 	WorkflowExecute: jest.fn().mockImplementation(() => ({
-		processRunExecutionData: jest.fn().mockReturnValue(cancelablePromise),
+		processRunExecutionData,
 	})),
 }));
 
-jest.mock('../workflow-helpers', () => ({
-	...jest.requireActual('../workflow-helpers'),
-	getDataLastExecutedNodeData: jest.fn().mockReturnValue({ data: { main: [] } }),
-}));
-
 describe('WorkflowExecuteAdditionalData', () => {
 	const variablesService = mockInstance(VariablesService);
 	variablesService.getAllCached.mockResolvedValue([]);
@@ -95,17 +114,152 @@ describe('WorkflowExecuteAdditionalData', () => {
 		expect(eventService.emit).toHaveBeenCalledWith(eventName, payload);
 	});
 
-	it('`executeWorkflow` should set subworkflow execution as running', async () => {
-		const executionId = '123';
-		workflowRepository.get.mockResolvedValue(mock<WorkflowEntity>({ id: executionId, nodes: [] }));
-		activeExecutions.add.mockResolvedValue(executionId);
+	describe('executeWorkflow', () => {
+		const runWithData = getMockRun({
+			lastNodeOutput: [[{ json: { test: 1 } }]],
+		});
 
-		await executeWorkflow(
-			mock<IExecuteWorkflowInfo>(),
-			mock<IWorkflowExecuteAdditionalData>(),
-			mock<ExecuteWorkflowOptions>({ loadedWorkflowData: undefined }),
-		);
+		beforeEach(() => {
+			workflowRepository.get.mockResolvedValue(
+				mock<WorkflowEntity>({ id: EXECUTION_ID, nodes: [] }),
+			);
+			activeExecutions.add.mockResolvedValue(EXECUTION_ID);
+			processRunExecutionData.mockReturnValue(getCancelablePromise(runWithData));
+		});
 
-		expect(executionRepository.setRunning).toHaveBeenCalledWith(executionId);
+		it('should execute workflow, return data and execution id', async () => {
+			const response = await executeWorkflow(
+				mock<IExecuteWorkflowInfo>(),
+				mock<IWorkflowExecuteAdditionalData>(),
+				mock<ExecuteWorkflowOptions>({ loadedWorkflowData: undefined, doNotWaitToFinish: false }),
+			);
+
+			expect(response).toEqual({
+				data: runWithData.data.resultData.runData[LAST_NODE_EXECUTED][0].data!.main,
+				executionId: EXECUTION_ID,
+			});
+		});
+
+		it('should execute workflow, skip waiting', async () => {
+			const response = await executeWorkflow(
+				mock<IExecuteWorkflowInfo>(),
+				mock<IWorkflowExecuteAdditionalData>(),
+				mock<ExecuteWorkflowOptions>({ loadedWorkflowData: undefined, doNotWaitToFinish: true }),
+			);
+
+			expect(response).toEqual({
+				data: [null],
+				executionId: EXECUTION_ID,
+			});
+		});
+
+		it('should set sub workflow execution as running', async () => {
+			await executeWorkflow(
+				mock<IExecuteWorkflowInfo>(),
+				mock<IWorkflowExecuteAdditionalData>(),
+				mock<ExecuteWorkflowOptions>({ loadedWorkflowData: undefined }),
+			);
+
+			expect(executionRepository.setRunning).toHaveBeenCalledWith(EXECUTION_ID);
+		});
+
+		it('should return waitTill property when workflow execution is waiting', async () => {
+			const waitTill = new Date();
+			runWithData.waitTill = waitTill;
+
+			const response = await executeWorkflow(
+				mock<IExecuteWorkflowInfo>(),
+				mock<IWorkflowExecuteAdditionalData>(),
+				mock<ExecuteWorkflowOptions>({ loadedWorkflowData: undefined, doNotWaitToFinish: false }),
+			);
+
+			expect(response).toEqual({
+				data: runWithData.data.resultData.runData[LAST_NODE_EXECUTED][0].data!.main,
+				executionId: EXECUTION_ID,
+				waitTill,
+			});
+		});
+	});
+
+	describe('getRunData', () => {
+		it('should throw error to add trigger ndoe', async () => {
+			const workflow = mock<IWorkflowBase>({
+				id: '1',
+				name: 'test',
+				nodes: [],
+				active: false,
+			});
+			await expect(getRunData(workflow)).rejects.toThrowError('Missing node to start execution');
+		});
+
+		const workflow = mock<IWorkflowBase>({
+			id: '1',
+			name: 'test',
+			nodes: [
+				{
+					type: 'n8n-nodes-base.executeWorkflowTrigger',
+				},
+			],
+			active: false,
+		});
+
+		it('should return default data', async () => {
+			expect(await getRunData(workflow)).toEqual({
+				executionData: {
+					executionData: {
+						contextData: {},
+						metadata: {},
+						nodeExecutionStack: [
+							{
+								data: { main: [[{ json: {} }]] },
+								metadata: { parentExecution: undefined },
+								node: workflow.nodes[0],
+								source: null,
+							},
+						],
+						waitingExecution: {},
+						waitingExecutionSource: {},
+					},
+					resultData: { runData: {} },
+					startData: {},
+				},
+				executionMode: 'integrated',
+				workflowData: workflow,
+			});
+		});
+
+		it('should return run data with input data and metadata', async () => {
+			const data = [{ json: { test: 1 } }];
+			const parentExecution = {
+				executionId: '123',
+				workflowId: '567',
+			};
+			expect(await getRunData(workflow, data, parentExecution)).toEqual({
+				executionData: {
+					executionData: {
+						contextData: {},
+						metadata: {},
+						nodeExecutionStack: [
+							{
+								data: { main: [data] },
+								metadata: { parentExecution },
+								node: workflow.nodes[0],
+								source: null,
+							},
+						],
+						waitingExecution: {},
+						waitingExecutionSource: {},
+					},
+					parentExecution: {
+						executionId: '123',
+						workflowId: '567',
+					},
+					resultData: { runData: {} },
+					startData: {},
+				},
+				executionMode: 'integrated',
+				workflowData: workflow,
+			});
+		});
 	});
 });
diff --git a/packages/cli/src/__tests__/workflow-runner.test.ts b/packages/cli/src/__tests__/workflow-runner.test.ts
index f828880c74..7330f85997 100644
--- a/packages/cli/src/__tests__/workflow-runner.test.ts
+++ b/packages/cli/src/__tests__/workflow-runner.test.ts
@@ -1,10 +1,31 @@
-import { WorkflowHooks, type ExecutionError, type IWorkflowExecuteHooks } from 'n8n-workflow';
-import Container from 'typedi';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+import { DirectedGraph, WorkflowExecute } from 'n8n-core';
+import * as core from 'n8n-core';
+import type {
+	IExecuteData,
+	INode,
+	IRun,
+	ITaskData,
+	IWaitingForExecution,
+	IWaitingForExecutionSource,
+	IWorkflowExecutionDataProcess,
+	StartNodeData,
+} from 'n8n-workflow';
+import {
+	Workflow,
+	WorkflowHooks,
+	type ExecutionError,
+	type IWorkflowExecuteHooks,
+} from 'n8n-workflow';
+import PCancelable from 'p-cancelable';
 
 import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
 import type { User } from '@/databases/entities/user';
+import { ExecutionNotFoundError } from '@/errors/execution-not-found-error';
 import { Telemetry } from '@/telemetry';
+import { PermissionChecker } from '@/user-management/permission-checker';
 import { WorkflowRunner } from '@/workflow-runner';
 import { mockInstance } from '@test/mocking';
 import { createExecution } from '@test-integration/db/executions';
@@ -42,48 +63,138 @@ afterAll(() => {
 
 beforeEach(async () => {
 	await testDb.truncate(['Workflow', 'SharedWorkflow']);
+	jest.clearAllMocks();
 });
 
-test('processError should return early in Bull stalled edge case', async () => {
-	const workflow = await createWorkflow({}, owner);
-	const execution = await createExecution(
-		{
-			status: 'success',
-			finished: true,
-		},
-		workflow,
-	);
-	config.set('executions.mode', 'queue');
-	await runner.processError(
-		new Error('test') as ExecutionError,
-		new Date(),
-		'webhook',
-		execution.id,
-		new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
-	);
-	expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(0);
+describe('processError', () => {
+	test('processError should return early in Bull stalled edge case', async () => {
+		const workflow = await createWorkflow({}, owner);
+		const execution = await createExecution(
+			{
+				status: 'success',
+				finished: true,
+			},
+			workflow,
+		);
+		config.set('executions.mode', 'queue');
+		await runner.processError(
+			new Error('test') as ExecutionError,
+			new Date(),
+			'webhook',
+			execution.id,
+			new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
+		);
+		expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(0);
+	});
+
+	test('processError should return early if the error is `ExecutionNotFoundError`', async () => {
+		const workflow = await createWorkflow({}, owner);
+		const execution = await createExecution({ status: 'success', finished: true }, workflow);
+		await runner.processError(
+			new ExecutionNotFoundError(execution.id),
+			new Date(),
+			'webhook',
+			execution.id,
+			new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
+		);
+		expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(0);
+	});
+
+	test('processError should process error', async () => {
+		const workflow = await createWorkflow({}, owner);
+		const execution = await createExecution(
+			{
+				status: 'success',
+				finished: true,
+			},
+			workflow,
+		);
+		await Container.get(ActiveExecutions).add(
+			{ executionMode: 'webhook', workflowData: workflow },
+			execution.id,
+		);
+		config.set('executions.mode', 'regular');
+		await runner.processError(
+			new Error('test') as ExecutionError,
+			new Date(),
+			'webhook',
+			execution.id,
+			new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
+		);
+		expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(1);
+	});
 });
 
-test('processError should process error', async () => {
-	const workflow = await createWorkflow({}, owner);
-	const execution = await createExecution(
-		{
-			status: 'success',
-			finished: true,
-		},
-		workflow,
-	);
-	await Container.get(ActiveExecutions).add(
-		{ executionMode: 'webhook', workflowData: workflow },
-		execution.id,
-	);
-	config.set('executions.mode', 'regular');
-	await runner.processError(
-		new Error('test') as ExecutionError,
-		new Date(),
-		'webhook',
-		execution.id,
-		new WorkflowHooks(hookFunctions, 'webhook', execution.id, workflow),
-	);
-	expect(watchedWorkflowExecuteAfter).toHaveBeenCalledTimes(1);
+describe('run', () => {
+	it('uses recreateNodeExecutionStack to create a partial execution if a triggerToStartFrom with data is sent', async () => {
+		// ARRANGE
+		const activeExecutions = Container.get(ActiveExecutions);
+		jest.spyOn(activeExecutions, 'add').mockResolvedValue('1');
+		jest.spyOn(activeExecutions, 'attachWorkflowExecution').mockReturnValueOnce();
+		const permissionChecker = Container.get(PermissionChecker);
+		jest.spyOn(permissionChecker, 'check').mockResolvedValueOnce();
+
+		jest.spyOn(WorkflowExecute.prototype, 'processRunExecutionData').mockReturnValueOnce(
+			new PCancelable(() => {
+				return mock<IRun>();
+			}),
+		);
+
+		jest.spyOn(Workflow.prototype, 'getNode').mockReturnValueOnce(mock<INode>());
+		jest.spyOn(DirectedGraph, 'fromWorkflow').mockReturnValueOnce(new DirectedGraph());
+		const recreateNodeExecutionStackSpy = jest
+			.spyOn(core, 'recreateNodeExecutionStack')
+			.mockReturnValueOnce({
+				nodeExecutionStack: mock<IExecuteData[]>(),
+				waitingExecution: mock<IWaitingForExecution>(),
+				waitingExecutionSource: mock<IWaitingForExecutionSource>(),
+			});
+
+		const data = mock<IWorkflowExecutionDataProcess>({
+			triggerToStartFrom: { name: 'trigger', data: mock<ITaskData>() },
+
+			workflowData: { nodes: [] },
+			executionData: undefined,
+			startNodes: [mock<StartNodeData>()],
+			destinationNode: undefined,
+		});
+
+		// ACT
+		await runner.run(data);
+
+		// ASSERT
+		expect(recreateNodeExecutionStackSpy).toHaveBeenCalled();
+	});
+
+	it('does not use recreateNodeExecutionStack to create a partial execution if a triggerToStartFrom without data is sent', async () => {
+		// ARRANGE
+		const activeExecutions = Container.get(ActiveExecutions);
+		jest.spyOn(activeExecutions, 'add').mockResolvedValue('1');
+		jest.spyOn(activeExecutions, 'attachWorkflowExecution').mockReturnValueOnce();
+		const permissionChecker = Container.get(PermissionChecker);
+		jest.spyOn(permissionChecker, 'check').mockResolvedValueOnce();
+
+		jest.spyOn(WorkflowExecute.prototype, 'processRunExecutionData').mockReturnValueOnce(
+			new PCancelable(() => {
+				return mock<IRun>();
+			}),
+		);
+
+		const recreateNodeExecutionStackSpy = jest.spyOn(core, 'recreateNodeExecutionStack');
+
+		const data = mock<IWorkflowExecutionDataProcess>({
+			triggerToStartFrom: { name: 'trigger', data: undefined },
+
+			workflowData: { nodes: [] },
+			executionData: undefined,
+			startNodes: [mock<StartNodeData>()],
+			destinationNode: undefined,
+		});
+
+		// ACT
+		await runner.run(data);
+
+		// ASSERT
+		expect(recreateNodeExecutionStackSpy).not.toHaveBeenCalled();
+	});
 });
diff --git a/packages/cli/src/abstract-server.ts b/packages/cli/src/abstract-server.ts
index f440b2879a..a9340b0a87 100644
--- a/packages/cli/src/abstract-server.ts
+++ b/packages/cli/src/abstract-server.ts
@@ -1,18 +1,18 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import compression from 'compression';
 import express from 'express';
 import { engine as expressHandlebars } from 'express-handlebars';
 import { readFile } from 'fs/promises';
 import type { Server } from 'http';
 import isbot from 'isbot';
-import { Container, Service } from 'typedi';
+import { Logger } from 'n8n-core';
 
 import config from '@/config';
 import { N8N_VERSION, TEMPLATES_DIR, inDevelopment, inTest } from '@/constants';
 import * as Db from '@/db';
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { ExternalHooks } from '@/external-hooks';
-import { Logger } from '@/logging/logger.service';
 import { rawBodyReader, bodyParser, corsMiddleware } from '@/middlewares';
 import { send, sendErrorResponse } from '@/response-helper';
 import { LiveWebhooks } from '@/webhooks/live-webhooks';
@@ -94,11 +94,8 @@ export abstract class AbstractServer {
 		const { app } = this;
 
 		// Augment errors sent to Sentry
-		const {
-			Handlers: { requestHandler, errorHandler },
-		} = await import('@sentry/node');
-		app.use(requestHandler());
-		app.use(errorHandler());
+		const { setupExpressErrorHandler } = await import('@sentry/node');
+		setupExpressErrorHandler(app);
 	}
 
 	private setupCommonMiddlewares() {
diff --git a/packages/cli/src/activation-errors.service.ts b/packages/cli/src/activation-errors.service.ts
index 9ddcad9317..1d1bb349aa 100644
--- a/packages/cli/src/activation-errors.service.ts
+++ b/packages/cli/src/activation-errors.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { CacheService } from '@/services/cache/cache.service';
 
diff --git a/packages/cli/src/active-executions.ts b/packages/cli/src/active-executions.ts
index bc18eade16..9056271f64 100644
--- a/packages/cli/src/active-executions.ts
+++ b/packages/cli/src/active-executions.ts
@@ -1,3 +1,5 @@
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import type {
 	IDeferredPromise,
 	IExecuteResponsePromiseData,
@@ -8,7 +10,6 @@ import type {
 import { createDeferredPromise, ExecutionCancelledError, sleep } from 'n8n-workflow';
 import { strict as assert } from 'node:assert';
 import type PCancelable from 'p-cancelable';
-import { Service } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { ExecutionNotFoundError } from '@/errors/execution-not-found-error';
@@ -18,7 +19,6 @@ import type {
 	IExecutionDb,
 	IExecutionsCurrentSummary,
 } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { isWorkflowIdValid } from '@/utils';
 
 import { ConcurrencyControlService } from './concurrency/concurrency-control.service';
diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts
index 189c446b65..a002bc4054 100644
--- a/packages/cli/src/active-workflow-manager.ts
+++ b/packages/cli/src/active-workflow-manager.ts
@@ -1,6 +1,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-
-import { ActiveWorkflows, InstanceSettings, NodeExecuteFunctions } from 'n8n-core';
+import { Service } from '@n8n/di';
+import {
+	ActiveWorkflows,
+	ErrorReporter,
+	InstanceSettings,
+	Logger,
+	PollContext,
+	TriggerContext,
+} from 'n8n-core';
 import type {
 	ExecutionError,
 	IDeferredPromise,
@@ -19,11 +26,9 @@ import type {
 import {
 	Workflow,
 	WorkflowActivationError,
-	ErrorReporterProxy as ErrorReporter,
 	WebhookPathTakenError,
 	ApplicationError,
 } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { ActivationErrorsService } from '@/activation-errors.service';
 import { ActiveExecutions } from '@/active-executions';
@@ -35,10 +40,11 @@ import {
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { OnShutdown } from '@/decorators/on-shutdown';
+import { ExecutionService } from '@/executions/execution.service';
 import { ExternalHooks } from '@/external-hooks';
 import type { IWorkflowDb } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
+import { Publisher } from '@/scaling/pubsub/publisher.service';
 import { ActiveWorkflowsService } from '@/services/active-workflows.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
@@ -47,9 +53,6 @@ import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-da
 import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
 import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
 
-import { ExecutionService } from './executions/execution.service';
-import { Publisher } from './scaling/pubsub/publisher.service';
-
 interface QueuedActivation {
 	activationMode: WorkflowActivateMode;
 	lastTimeout: number;
@@ -63,6 +66,7 @@ export class ActiveWorkflowManager {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly activeWorkflows: ActiveWorkflows,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly externalHooks: ExternalHooks,
@@ -180,12 +184,7 @@ export class ActiveWorkflowManager {
 			try {
 				// TODO: this should happen in a transaction, that way we don't need to manually remove this in `catch`
 				await this.webhookService.storeWebhook(webhook);
-				await workflow.createWebhookIfNotExists(
-					webhookData,
-					NodeExecuteFunctions,
-					mode,
-					activation,
-				);
+				await this.webhookService.createWebhookIfNotExists(workflow, webhookData, mode, activation);
 			} catch (error) {
 				if (activation === 'init' && error.name === 'QueryFailedError') {
 					// n8n does not remove the registered webhooks on exit.
@@ -199,7 +198,7 @@ export class ActiveWorkflowManager {
 				try {
 					await this.clearWebhooks(workflow.id);
 				} catch (error1) {
-					ErrorReporter.error(error1);
+					this.errorReporter.error(error1);
 					this.logger.error(
 						`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error1.message}"`,
 					);
@@ -255,7 +254,7 @@ export class ActiveWorkflowManager {
 		const webhooks = WebhookHelpers.getWorkflowWebhooks(workflow, additionalData, undefined, true);
 
 		for (const webhookData of webhooks) {
-			await workflow.deleteWebhook(webhookData, NodeExecuteFunctions, mode, 'update');
+			await this.webhookService.deleteWebhook(workflow, webhookData, mode, 'update');
 		}
 
 		await this.workflowStaticDataService.saveStaticData(workflow);
@@ -274,18 +273,11 @@ export class ActiveWorkflowManager {
 		activation: WorkflowActivateMode,
 	): IGetExecutePollFunctions {
 		return (workflow: Workflow, node: INode) => {
-			const returnFunctions = NodeExecuteFunctions.getExecutePollFunctions(
-				workflow,
-				node,
-				additionalData,
-				mode,
-				activation,
-			);
-			returnFunctions.__emit = (
+			const __emit = (
 				data: INodeExecutionData[][],
 				responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
 				donePromise?: IDeferredPromise<IRun | undefined>,
-			): void => {
+			) => {
 				this.logger.debug(`Received event to trigger execution for workflow "${workflow.name}"`);
 				void this.workflowStaticDataService.saveStaticData(workflow);
 				const executePromise = this.workflowExecutionService.runWorkflow(
@@ -309,14 +301,15 @@ export class ActiveWorkflowManager {
 				}
 			};
 
-			returnFunctions.__emitError = (error: ExecutionError): void => {
+			const __emitError = (error: ExecutionError) => {
 				void this.executionService
 					.createErrorExecution(error, node, workflowData, workflow, mode)
 					.then(() => {
 						this.executeErrorWorkflow(error, workflowData, mode);
 					});
 			};
-			return returnFunctions;
+
+			return new PollContext(workflow, node, additionalData, mode, activation, __emit, __emitError);
 		};
 	}
 
@@ -331,18 +324,11 @@ export class ActiveWorkflowManager {
 		activation: WorkflowActivateMode,
 	): IGetExecuteTriggerFunctions {
 		return (workflow: Workflow, node: INode) => {
-			const returnFunctions = NodeExecuteFunctions.getExecuteTriggerFunctions(
-				workflow,
-				node,
-				additionalData,
-				mode,
-				activation,
-			);
-			returnFunctions.emit = (
+			const emit = (
 				data: INodeExecutionData[][],
 				responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
 				donePromise?: IDeferredPromise<IRun | undefined>,
-			): void => {
+			) => {
 				this.logger.debug(`Received trigger for workflow "${workflow.name}"`);
 				void this.workflowStaticDataService.saveStaticData(workflow);
 
@@ -366,7 +352,7 @@ export class ActiveWorkflowManager {
 					executePromise.catch((error: Error) => this.logger.error(error.message, { error }));
 				}
 			};
-			returnFunctions.emitError = (error: Error): void => {
+			const emitError = (error: Error): void => {
 				this.logger.info(
 					`The trigger node "${node.name}" of workflow "${workflowData.name}" failed with the error: "${error.message}". Will try to reactivate.`,
 					{
@@ -391,7 +377,7 @@ export class ActiveWorkflowManager {
 
 				this.addQueuedWorkflowActivation(activation, workflowData as WorkflowEntity);
 			};
-			return returnFunctions;
+			return new TriggerContext(workflow, node, additionalData, mode, activation, emit, emitError);
 		};
 	}
 
@@ -446,7 +432,7 @@ export class ActiveWorkflowManager {
 					this.logger.info('     => Started');
 				}
 			} catch (error) {
-				ErrorReporter.error(error);
+				this.errorReporter.error(error);
 				this.logger.info(
 					'     => ERROR: Workflow could not be activated on first try, keep on trying if not an auth issue',
 				);
@@ -518,7 +504,7 @@ export class ActiveWorkflowManager {
 		existingWorkflow?: WorkflowEntity,
 		{ shouldPublish } = { shouldPublish: true },
 	) {
-		if (this.orchestrationService.isMultiMainSetupEnabled && shouldPublish) {
+		if (this.instanceSettings.isMultiMain && shouldPublish) {
 			void this.publisher.publishCommand({
 				command: 'add-webhooks-triggers-and-pollers',
 				payload: { workflowId },
@@ -564,7 +550,7 @@ export class ActiveWorkflowManager {
 				settings: dbWorkflow.settings,
 			});
 
-			const canBeActivated = workflow.checkIfWorkflowCanBeActivated(STARTING_NODES);
+			const canBeActivated = this.checkIfWorkflowCanBeActivated(workflow, STARTING_NODES);
 
 			if (!canBeActivated) {
 				throw new WorkflowActivationError(
@@ -608,6 +594,48 @@ export class ActiveWorkflowManager {
 		return shouldDisplayActivationMessage;
 	}
 
+	/**
+	 * A workflow can only be activated if it has a node which has either triggers
+	 * or webhooks defined.
+	 *
+	 * @param {string[]} [ignoreNodeTypes] Node-types to ignore in the check
+	 */
+	checkIfWorkflowCanBeActivated(workflow: Workflow, ignoreNodeTypes?: string[]): boolean {
+		let node: INode;
+		let nodeType: INodeType | undefined;
+
+		for (const nodeName of Object.keys(workflow.nodes)) {
+			node = workflow.nodes[nodeName];
+
+			if (node.disabled === true) {
+				// Deactivated nodes can not trigger a run so ignore
+				continue;
+			}
+
+			if (ignoreNodeTypes !== undefined && ignoreNodeTypes.includes(node.type)) {
+				continue;
+			}
+
+			nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+			if (nodeType === undefined) {
+				// Type is not known so check is not possible
+				continue;
+			}
+
+			if (
+				nodeType.poll !== undefined ||
+				nodeType.trigger !== undefined ||
+				nodeType.webhook !== undefined
+			) {
+				// Is a trigger node. So workflow can be activated.
+				return true;
+			}
+		}
+
+		return false;
+	}
+
 	/**
 	 * Count all triggers in the workflow, excluding Manual Trigger.
 	 */
@@ -642,7 +670,7 @@ export class ActiveWorkflowManager {
 			try {
 				await this.add(workflowId, activationMode, workflowData);
 			} catch (error) {
-				ErrorReporter.error(error);
+				this.errorReporter.error(error);
 				let lastTimeout = this.queuedActivations[workflowId].lastTimeout;
 				if (lastTimeout < WORKFLOW_REACTIVATE_MAX_TIMEOUT) {
 					lastTimeout = Math.min(lastTimeout * 2, WORKFLOW_REACTIVATE_MAX_TIMEOUT);
@@ -710,11 +738,11 @@ export class ActiveWorkflowManager {
 	// TODO: this should happen in a transaction
 	// maybe, see: https://github.com/n8n-io/n8n/pull/8904#discussion_r1530150510
 	async remove(workflowId: string) {
-		if (this.orchestrationService.isMultiMainSetupEnabled) {
+		if (this.instanceSettings.isMultiMain) {
 			try {
 				await this.clearWebhooks(workflowId);
 			} catch (error) {
-				ErrorReporter.error(error);
+				this.errorReporter.error(error);
 				this.logger.error(
 					`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
 				);
@@ -731,7 +759,7 @@ export class ActiveWorkflowManager {
 		try {
 			await this.clearWebhooks(workflowId);
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 			this.logger.error(
 				`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
 			);
diff --git a/packages/cli/src/auth/auth.service.ts b/packages/cli/src/auth/auth.service.ts
index 989396df84..190f788ba2 100644
--- a/packages/cli/src/auth/auth.service.ts
+++ b/packages/cli/src/auth/auth.service.ts
@@ -1,8 +1,9 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import { createHash } from 'crypto';
 import type { NextFunction, Response } from 'express';
 import { JsonWebTokenError, TokenExpiredError } from 'jsonwebtoken';
-import Container, { Service } from 'typedi';
+import { Logger } from 'n8n-core';
 
 import config from '@/config';
 import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants';
@@ -12,7 +13,6 @@ import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import type { AuthenticatedRequest } from '@/requests';
 import { JwtService } from '@/services/jwt.service';
 import { UrlService } from '@/services/url.service';
@@ -44,6 +44,10 @@ const skipBrowserIdCheckEndpoints = [
 
 	// We need to exclude binary-data downloading endpoint because we can't send custom headers on `<embed>` tags
 	`/${restEndpoint}/binary-data/`,
+
+	// oAuth callback urls aren't called by the frontend. therefore we can't send custom header on these requests
+	`/${restEndpoint}/oauth1-credential/callback`,
+	`/${restEndpoint}/oauth2-credential/callback`,
 ];
 
 @Service()
diff --git a/packages/cli/src/auth/jwt.ts b/packages/cli/src/auth/jwt.ts
index 63255f5f66..0e35263462 100644
--- a/packages/cli/src/auth/jwt.ts
+++ b/packages/cli/src/auth/jwt.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import type { Response } from 'express';
-import { Container } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
 
diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts
index 723365057f..61f344afaf 100644
--- a/packages/cli/src/auth/methods/email.ts
+++ b/packages/cli/src/auth/methods/email.ts
@@ -1,10 +1,10 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { User } from '@/databases/entities/user';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { EventService } from '@/events/event.service';
-import { isLdapLoginEnabled } from '@/ldap/helpers.ee';
+import { isLdapLoginEnabled } from '@/ldap.ee/helpers.ee';
 import { PasswordUtility } from '@/services/password.utility';
 
 export const handleEmailLogin = async (
diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts
index b8fea25989..5466d0d8cb 100644
--- a/packages/cli/src/auth/methods/ldap.ts
+++ b/packages/cli/src/auth/methods/ldap.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { User } from '@/databases/entities/user';
 import { EventService } from '@/events/event.service';
@@ -10,8 +10,8 @@ import {
 	mapLdapAttributesToUser,
 	createLdapAuthIdentity,
 	updateLdapUserOnLocalDb,
-} from '@/ldap/helpers.ee';
-import { LdapService } from '@/ldap/ldap.service.ee';
+} from '@/ldap.ee/helpers.ee';
+import { LdapService } from '@/ldap.ee/ldap.service.ee';
 
 export const handleLdapLogin = async (
 	loginId: string,
diff --git a/packages/cli/src/collaboration/collaboration.service.ts b/packages/cli/src/collaboration/collaboration.service.ts
index cb2ca0d77a..9b2f3dec8e 100644
--- a/packages/cli/src/collaboration/collaboration.service.ts
+++ b/packages/cli/src/collaboration/collaboration.service.ts
@@ -1,7 +1,8 @@
 import type { PushPayload } from '@n8n/api-types';
+import { Service } from '@n8n/di';
+import { ErrorReporter } from 'n8n-core';
 import type { Workflow } from 'n8n-workflow';
-import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
-import { Service } from 'typedi';
+import { ApplicationError } from 'n8n-workflow';
 
 import { CollaborationState } from '@/collaboration/collaboration.state';
 import type { User } from '@/databases/entities/user';
@@ -20,6 +21,7 @@ import { parseWorkflowMessage } from './collaboration.message';
 @Service()
 export class CollaborationService {
 	constructor(
+		private readonly errorReporter: ErrorReporter,
 		private readonly push: Push,
 		private readonly state: CollaborationState,
 		private readonly userRepository: UserRepository,
@@ -31,7 +33,7 @@ export class CollaborationService {
 			try {
 				await this.handleUserMessage(event.userId, event.msg);
 			} catch (error) {
-				ErrorReporterProxy.error(
+				this.errorReporter.error(
 					new ApplicationError('Error handling CollaborationService push message', {
 						extra: {
 							msg: event.msg,
@@ -97,6 +99,6 @@ export class CollaborationService {
 			collaborators: activeCollaborators,
 		};
 
-		this.push.sendToUsers('collaboratorsChanged', msgData, userIds);
+		this.push.sendToUsers({ type: 'collaboratorsChanged', data: msgData }, userIds);
 	}
 }
diff --git a/packages/cli/src/collaboration/collaboration.state.ts b/packages/cli/src/collaboration/collaboration.state.ts
index f8f606a2ad..f2a3b31f24 100644
--- a/packages/cli/src/collaboration/collaboration.state.ts
+++ b/packages/cli/src/collaboration/collaboration.state.ts
@@ -1,6 +1,6 @@
 import type { Iso8601DateTimeString } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import type { Workflow } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { Time } from '@/constants';
 import type { User } from '@/databases/entities/user';
@@ -27,7 +27,7 @@ export class CollaborationState {
 	 * After how many minutes of inactivity a user should be removed
 	 * as being an active user of a workflow.
 	 */
-	public readonly inactivityCleanUpTime = 15 * Time.minutes.toMilliseconds;
+	readonly inactivityCleanUpTime = 15 * Time.minutes.toMilliseconds;
 
 	constructor(private readonly cache: CacheService) {}
 
diff --git a/packages/cli/src/commands/audit.ts b/packages/cli/src/commands/audit.ts
index e86c8c9ab5..1bd76bc4ed 100644
--- a/packages/cli/src/commands/audit.ts
+++ b/packages/cli/src/commands/audit.ts
@@ -1,8 +1,8 @@
+import { SecurityConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import { ApplicationError } from 'n8n-workflow';
-import { Container } from 'typedi';
 
-import config from '@/config';
 import { RISK_CATEGORIES } from '@/security-audit/constants';
 import { SecurityAuditService } from '@/security-audit/security-audit.service';
 import type { Risk } from '@/security-audit/types';
@@ -26,7 +26,7 @@ export class SecurityAudit extends BaseCommand {
 		}),
 
 		'days-abandoned-workflow': Flags.integer({
-			default: config.getEnv('security.audit.daysAbandonedWorkflow'),
+			default: Container.get(SecurityConfig).daysAbandonedWorkflow,
 			description: 'Days for a workflow to be considered abandoned if not executed',
 		}),
 	};
diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index 214d7f4ce7..9bfd992b3d 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -1,19 +1,16 @@
 import 'reflect-metadata';
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { Command, Errors } from '@oclif/core';
 import {
 	BinaryDataService,
 	InstanceSettings,
+	Logger,
 	ObjectStoreService,
 	DataDeduplicationService,
+	ErrorReporter,
 } from 'n8n-core';
-import {
-	ApplicationError,
-	ensureError,
-	ErrorReporterProxy as ErrorReporter,
-	sleep,
-} from 'n8n-workflow';
-import { Container } from 'typedi';
+import { ApplicationError, ensureError, sleep } from 'n8n-workflow';
 
 import type { AbstractServer } from '@/abstract-server';
 import config from '@/config';
@@ -21,23 +18,24 @@ import { LICENSE_FEATURES, inDevelopment, inTest } from '@/constants';
 import * as CrashJournal from '@/crash-journal';
 import * as Db from '@/db';
 import { getDataDeduplicationService } from '@/deduplication';
-import { initErrorHandling } from '@/error-reporting';
+import { DeprecationService } from '@/deprecation/deprecation.service';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay';
 import { initExpressionEvaluator } from '@/expression-evaluator';
 import { ExternalHooks } from '@/external-hooks';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
+import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import { PostHogClient } from '@/posthog';
 import { ShutdownService } from '@/shutdown/shutdown.service';
-import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee';
+import { WorkflowHistoryManager } from '@/workflows/workflow-history.ee/workflow-history-manager.ee';
 
 export abstract class BaseCommand extends Command {
 	protected logger = Container.get(Logger);
 
+	protected errorReporter: ErrorReporter;
+
 	protected externalHooks?: ExternalHooks;
 
 	protected nodeTypes: NodeTypes;
@@ -62,7 +60,16 @@ export abstract class BaseCommand extends Command {
 	protected needsCommunityPackages = false;
 
 	async init(): Promise<void> {
-		await initErrorHandling();
+		this.errorReporter = Container.get(ErrorReporter);
+
+		const { backendDsn, n8nVersion, environment, deploymentName } = this.globalConfig.sentry;
+		await this.errorReporter.init({
+			serverType: this.instanceSettings.instanceType,
+			dsn: backendDsn,
+			environment,
+			release: n8nVersion,
+			serverName: deploymentName,
+		});
 		initExpressionEvaluator();
 
 		process.once('SIGTERM', this.onTerminationSignal('SIGTERM'));
@@ -88,33 +95,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.',
 			);
 		}
 
@@ -148,7 +136,7 @@ export abstract class BaseCommand extends Command {
 	}
 
 	protected async exitWithCrash(message: string, error: unknown) {
-		ErrorReporter.error(new Error(message, { cause: error }), { level: 'fatal' });
+		this.errorReporter.error(new Error(message, { cause: error }), { level: 'fatal' });
 		await sleep(2000);
 		process.exit(1);
 	}
diff --git a/packages/cli/src/commands/db/__tests__/revert.test.ts b/packages/cli/src/commands/db/__tests__/revert.test.ts
index ce3911b2b6..8fdabafbec 100644
--- a/packages/cli/src/commands/db/__tests__/revert.test.ts
+++ b/packages/cli/src/commands/db/__tests__/revert.test.ts
@@ -1,10 +1,10 @@
 import type { Migration, MigrationExecutor } from '@n8n/typeorm';
 import { type DataSource } from '@n8n/typeorm';
 import { mock } from 'jest-mock-extended';
+import { Logger } from 'n8n-core';
 
 import { main } from '@/commands/db/revert';
 import type { IrreversibleMigration, ReversibleMigration } from '@/databases/types';
-import { Logger } from '@/logging/logger.service';
 import { mockInstance } from '@test/mocking';
 
 const logger = mockInstance(Logger);
diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts
index 4510044405..57780d4620 100644
--- a/packages/cli/src/commands/db/revert.ts
+++ b/packages/cli/src/commands/db/revert.ts
@@ -1,14 +1,14 @@
+import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { MigrationExecutor, DataSource as Connection } from '@n8n/typeorm';
 import { Command, Flags } from '@oclif/core';
-import { Container } from 'typedi';
+import { Logger } from 'n8n-core';
 
 import { getConnectionOptions } from '@/databases/config';
 import type { Migration } from '@/databases/types';
 import { wrapMigration } from '@/databases/utils/migration-helpers';
-import { Logger } from '@/logging/logger.service';
 
 // This function is extracted to make it easier to unit test it.
 // Mocking turned into a mess due to this command using typeorm and the db
diff --git a/packages/cli/src/commands/execute-batch.ts b/packages/cli/src/commands/execute-batch.ts
index fbbecd2cbb..883cd7068d 100644
--- a/packages/cli/src/commands/execute-batch.ts
+++ b/packages/cli/src/commands/execute-batch.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import fs from 'fs';
 import { diff } from 'json-diff';
@@ -7,7 +8,6 @@ import type { IRun, ITaskData, IWorkflowExecutionDataProcess } from 'n8n-workflo
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 import os from 'os';
 import { sep } from 'path';
-import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import type { User } from '@/databases/entities/user';
@@ -822,6 +822,11 @@ export class ExecuteBatch extends BaseCommand {
 					}
 				}
 			} catch (e) {
+				this.errorReporter.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/commands/execute.ts b/packages/cli/src/commands/execute.ts
index fd49a2b619..786b91f7fc 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -1,7 +1,7 @@
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import type { IWorkflowBase, IWorkflowExecutionDataProcess } from 'n8n-workflow';
 import { ApplicationError, ExecutionBaseError } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts
index 4644c2556c..ad0b5784c1 100644
--- a/packages/cli/src/commands/export/credentials.ts
+++ b/packages/cli/src/commands/export/credentials.ts
@@ -1,9 +1,9 @@
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import fs from 'fs';
 import { Credentials } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
 import path from 'path';
-import Container from 'typedi';
 
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import type { ICredentialsDb, ICredentialsDecryptedDb } from '@/interfaces';
diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts
index 8e129eec4d..3fa0f1e046 100644
--- a/packages/cli/src/commands/export/workflow.ts
+++ b/packages/cli/src/commands/export/workflow.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import fs from 'fs';
 import { ApplicationError } from 'n8n-workflow';
 import path from 'path';
-import Container from 'typedi';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
diff --git a/packages/cli/src/commands/import/credentials.ts b/packages/cli/src/commands/import/credentials.ts
index 5f9e06f256..aae6c7d23e 100644
--- a/packages/cli/src/commands/import/credentials.ts
+++ b/packages/cli/src/commands/import/credentials.ts
@@ -1,3 +1,4 @@
+import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { EntityManager } from '@n8n/typeorm';
 import { Flags } from '@oclif/core';
@@ -6,7 +7,6 @@ import fs from 'fs';
 import { Cipher } from 'n8n-core';
 import type { ICredentialsEncrypted } from 'n8n-workflow';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
 import { CredentialsEntity } from '@/databases/entities/credentials-entity';
diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts
index 2548ca9523..d8813485a1 100644
--- a/packages/cli/src/commands/import/workflow.ts
+++ b/packages/cli/src/commands/import/workflow.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import glob from 'fast-glob';
 import fs from 'fs';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts
index f9f1f3d0bb..edbf988434 100644
--- a/packages/cli/src/commands/ldap/reset.ts
+++ b/packages/cli/src/commands/ldap/reset.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import { Flags } from '@oclif/core';
 import { ApplicationError } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
 import { CredentialsService } from '@/credentials/credentials.service';
@@ -14,7 +14,7 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants';
+import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants';
 import { WorkflowService } from '@/workflows/workflow.service';
 
 import { BaseCommand } from '../base-command';
diff --git a/packages/cli/src/commands/license/clear.ts b/packages/cli/src/commands/license/clear.ts
index 427a150ebb..03a2ea4dd4 100644
--- a/packages/cli/src/commands/license/clear.ts
+++ b/packages/cli/src/commands/license/clear.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import { SETTINGS_LICENSE_CERT_KEY } from '@/constants';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
diff --git a/packages/cli/src/commands/license/info.ts b/packages/cli/src/commands/license/info.ts
index 5f3e31a573..cc99e925f7 100644
--- a/packages/cli/src/commands/license/info.ts
+++ b/packages/cli/src/commands/license/info.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import { License } from '@/license';
 
diff --git a/packages/cli/src/commands/list/workflow.ts b/packages/cli/src/commands/list/workflow.ts
index 39f5689fcc..74f5916b5c 100644
--- a/packages/cli/src/commands/list/workflow.ts
+++ b/packages/cli/src/commands/list/workflow.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
-import Container from 'typedi';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
diff --git a/packages/cli/src/commands/mfa/disable.ts b/packages/cli/src/commands/mfa/disable.ts
index 3458593252..a739fbda88 100644
--- a/packages/cli/src/commands/mfa/disable.ts
+++ b/packages/cli/src/commands/mfa/disable.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
-import Container from 'typedi';
 
 import { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
 
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 70f52f8cb8..286b20c7c6 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import glob from 'fast-glob';
 import { createReadStream, createWriteStream, existsSync } from 'fs';
@@ -9,7 +9,6 @@ import { jsonParse, randomString, type IWorkflowExecutionDataProcess } from 'n8n
 import path from 'path';
 import replaceStream from 'replacestream';
 import { pipeline } from 'stream/promises';
-import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
@@ -21,15 +20,12 @@ import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { EventService } from '@/events/event.service';
 import { ExecutionService } from '@/executions/execution.service';
-import { License } from '@/license';
-import { LocalTaskManager } from '@/runners/task-managers/local-task-manager';
-import { TaskManager } from '@/runners/task-managers/task-manager';
 import { PubSubHandler } from '@/scaling/pubsub/pubsub-handler';
 import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import { Server } from '@/server';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { OwnershipService } from '@/services/ownership.service';
-import { PruningService } from '@/services/pruning.service';
+import { PruningService } from '@/services/pruning/pruning.service';
 import { UrlService } from '@/services/url.service';
 import { WaitTracker } from '@/wait-tracker';
 import { WorkflowRunner } from '@/workflow-runner';
@@ -102,7 +98,7 @@ export class Start extends BaseCommand {
 
 			await this.activeWorkflowManager.removeAllTriggerAndPollerBasedWorkflows();
 
-			if (Container.get(OrchestrationService).isMultiMainSetupEnabled) {
+			if (this.instanceSettings.isMultiMain) {
 				await Container.get(OrchestrationService).shutdown();
 			}
 
@@ -194,15 +190,23 @@ export class Start extends BaseCommand {
 		await super.init();
 		this.activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
-		await this.initLicense();
+		const isMultiMainEnabled =
+			config.getEnv('executions.mode') === 'queue' && this.globalConfig.multiMainSetup.enabled;
+
+		this.instanceSettings.setMultiMainEnabled(isMultiMainEnabled);
+
+		/**
+		 * We temporarily license multi-main to allow orchestration to set instance
+		 * role, which is needed by license init. Once the license is initialized,
+		 * the actual value will be used for the license check.
+		 */
+		if (isMultiMainEnabled) this.instanceSettings.setMultiMainLicensed(true);
 
 		await this.initOrchestration();
-		this.logger.debug('Orchestration init complete');
+		await this.initLicense();
 
-		if (!this.globalConfig.license.autoRenewalEnabled && this.instanceSettings.isLeader) {
-			this.logger.warn(
-				'Automatic license renewal is disabled. The license will not renew automatically, and access to licensed features may be lost!',
-			);
+		if (isMultiMainEnabled && !this.license.isMultiMainLicensed()) {
+			throw new FeatureNotLicensedError(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
 		}
 
 		Container.get(WaitTracker).init();
@@ -223,20 +227,10 @@ export class Start extends BaseCommand {
 		}
 
 		const { taskRunners: taskRunnerConfig } = this.globalConfig;
-		if (!taskRunnerConfig.disabled) {
-			Container.set(TaskManager, new LocalTaskManager());
-			const { TaskRunnerServer } = await import('@/runners/task-runner-server');
-			const taskRunnerServer = Container.get(TaskRunnerServer);
-			await taskRunnerServer.start();
-
-			if (
-				taskRunnerConfig.mode === 'internal_childprocess' ||
-				taskRunnerConfig.mode === 'internal_launcher'
-			) {
-				const { TaskRunnerProcess } = await import('@/runners/task-runner-process');
-				const runnerProcess = Container.get(TaskRunnerProcess);
-				await runnerProcess.start();
-			}
+		if (taskRunnerConfig.enabled) {
+			const { TaskRunnerModule } = await import('@/task-runners/task-runner-module');
+			const taskRunnerModule = Container.get(TaskRunnerModule);
+			await taskRunnerModule.start();
 		}
 	}
 
@@ -246,13 +240,6 @@ export class Start extends BaseCommand {
 			return;
 		}
 
-		if (
-			Container.get(GlobalConfig).multiMainSetup.enabled &&
-			!Container.get(License).isMultipleMainInstancesLicensed()
-		) {
-			throw new FeatureNotLicensedError(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
-		}
-
 		const orchestrationService = Container.get(OrchestrationService);
 
 		await orchestrationService.init();
@@ -265,7 +252,7 @@ export class Start extends BaseCommand {
 
 		this.logger.scoped(['scaling', 'pubsub']).debug('Pubsub setup completed');
 
-		if (!orchestrationService.isMultiMainSetupEnabled) return;
+		if (this.instanceSettings.isSingleMain) return;
 
 		orchestrationService.multiMainSetup
 			.on('leader-stepdown', async () => {
diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts
index 6c88ed6c43..903d6c9405 100644
--- a/packages/cli/src/commands/update/workflow.ts
+++ b/packages/cli/src/commands/update/workflow.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
-import { Container } from 'typedi';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
diff --git a/packages/cli/src/commands/user-management/reset.ts b/packages/cli/src/commands/user-management/reset.ts
index 3c6709e802..3e8a1c14f1 100644
--- a/packages/cli/src/commands/user-management/reset.ts
+++ b/packages/cli/src/commands/user-management/reset.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import { User } from '@/databases/entities/user';
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index 77ec770aa0..8b6f318576 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -1,6 +1,6 @@
+import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import { ApplicationError } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 4ba505a9b8..f5138f1ef3 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { Flags, type Config } from '@oclif/core';
-import { Container } from 'typedi';
 
 import config from '@/config';
 import { N8N_VERSION, inTest } from '@/constants';
@@ -7,9 +7,6 @@ import { WorkerMissingEncryptionKey } from '@/errors/worker-missing-encryption-k
 import { EventMessageGeneric } from '@/eventbus/event-message-classes/event-message-generic';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay';
-import { Logger } from '@/logging/logger.service';
-import { LocalTaskManager } from '@/runners/task-managers/local-task-manager';
-import { TaskManager } from '@/runners/task-managers/task-manager';
 import { PubSubHandler } from '@/scaling/pubsub/pubsub-handler';
 import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import type { ScalingService } from '@/scaling/scaling.service';
@@ -69,7 +66,7 @@ export class Worker extends BaseCommand {
 
 		super(argv, cmdConfig);
 
-		this.logger = Container.get(Logger).scoped('scaling');
+		this.logger = this.logger.scoped('scaling');
 	}
 
 	async init() {
@@ -115,20 +112,10 @@ export class Worker extends BaseCommand {
 		);
 
 		const { taskRunners: taskRunnerConfig } = this.globalConfig;
-		if (!taskRunnerConfig.disabled) {
-			Container.set(TaskManager, new LocalTaskManager());
-			const { TaskRunnerServer } = await import('@/runners/task-runner-server');
-			const taskRunnerServer = Container.get(TaskRunnerServer);
-			await taskRunnerServer.start();
-
-			if (
-				taskRunnerConfig.mode === 'internal_childprocess' ||
-				taskRunnerConfig.mode === 'internal_launcher'
-			) {
-				const { TaskRunnerProcess } = await import('@/runners/task-runner-process');
-				const runnerProcess = Container.get(TaskRunnerProcess);
-				await runnerProcess.start();
-			}
+		if (taskRunnerConfig.enabled) {
+			const { TaskRunnerModule } = await import('@/task-runners/task-runner-module');
+			const taskRunnerModule = Container.get(TaskRunnerModule);
+			await taskRunnerModule.start();
 		}
 	}
 
@@ -160,6 +147,12 @@ export class Worker extends BaseCommand {
 		const envConcurrency = config.getEnv('executions.concurrency.productionLimit');
 
 		this.concurrency = envConcurrency !== -1 ? envConcurrency : flags.concurrency;
+
+		if (this.concurrency < 5) {
+			this.logger.warn(
+				'Concurrency is set to less than 5. THIS CAN LEAD TO AN UNSTABLE ENVIRONMENT. Please consider increasing it to at least 5 to make best use of the worker.',
+			);
+		}
 	}
 
 	async initScalingService() {
diff --git a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
index 6511ae4d03..a20c1769da 100644
--- a/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
+++ b/packages/cli/src/concurrency/__tests__/concurrency-control.service.test.ts
@@ -1,6 +1,7 @@
 import { mock } from 'jest-mock-extended';
 import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow';
 
+import type { ConcurrencyQueueType } from '@/concurrency/concurrency-control.service';
 import {
 	CLOUD_TEMP_PRODUCTION_LIMIT,
 	CLOUD_TEMP_REPORTABLE_THRESHOLDS,
@@ -24,61 +25,71 @@ describe('ConcurrencyControlService', () => {
 
 	afterEach(() => {
 		config.set('executions.concurrency.productionLimit', -1);
+		config.set('executions.concurrency.evaluationLimit', -1);
 		config.set('executions.mode', 'integrated');
 
 		jest.clearAllMocks();
 	});
 
 	describe('constructor', () => {
-		it('should be enabled if production cap is positive', () => {
-			/**
-			 * Arrange
-			 */
-			config.set('executions.concurrency.productionLimit', 1);
+		it.each(['production', 'evaluation'])(
+			'should be enabled if %s cap is positive',
+			(type: ConcurrencyQueueType) => {
+				/**
+				 * Arrange
+				 */
+				config.set(`executions.concurrency.${type}Limit`, 1);
 
-			/**
-			 * Act
-			 */
-			const service = new ConcurrencyControlService(
-				logger,
-				executionRepository,
-				telemetry,
-				eventService,
-			);
-
-			/**
-			 * Assert
-			 */
-			// @ts-expect-error Private property
-			expect(service.isEnabled).toBe(true);
-			// @ts-expect-error Private property
-			expect(service.productionQueue).toBeDefined();
-		});
-
-		it('should throw if production cap is 0', () => {
-			/**
-			 * Arrange
-			 */
-			config.set('executions.concurrency.productionLimit', 0);
-
-			try {
 				/**
 				 * Act
 				 */
-				new ConcurrencyControlService(logger, executionRepository, telemetry, eventService);
-			} catch (error) {
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+
 				/**
 				 * Assert
 				 */
-				expect(error).toBeInstanceOf(InvalidConcurrencyLimitError);
-			}
-		});
+				// @ts-expect-error Private property
+				expect(service.isEnabled).toBe(true);
+				// @ts-expect-error Private property
+				expect(service.queues.get(type)).toBeDefined();
+				// @ts-expect-error Private property
+				expect(service.queues.size).toBe(1);
+			},
+		);
 
-		it('should be disabled if production cap is -1', () => {
+		it.each(['production', 'evaluation'])(
+			'should throw if %s cap is 0',
+			(type: ConcurrencyQueueType) => {
+				/**
+				 * Arrange
+				 */
+				config.set(`executions.concurrency.${type}Limit`, 0);
+
+				try {
+					/**
+					 * Act
+					 */
+					new ConcurrencyControlService(logger, executionRepository, telemetry, eventService);
+				} catch (error) {
+					/**
+					 * Assert
+					 */
+					expect(error).toBeInstanceOf(InvalidConcurrencyLimitError);
+				}
+			},
+		);
+
+		it('should be disabled if both production and evaluation caps are -1', () => {
 			/**
 			 * Arrange
 			 */
 			config.set('executions.concurrency.productionLimit', -1);
+			config.set('executions.concurrency.evaluationLimit', -1);
 
 			/**
 			 * Act
@@ -97,28 +108,31 @@ describe('ConcurrencyControlService', () => {
 			expect(service.isEnabled).toBe(false);
 		});
 
-		it('should be disabled if production cap is lower than -1', () => {
-			/**
-			 * Arrange
-			 */
-			config.set('executions.concurrency.productionLimit', -2);
+		it.each(['production', 'evaluation'])(
+			'should be disabled if %s cap is lower than -1',
+			(type: ConcurrencyQueueType) => {
+				/**
+				 * Arrange
+				 */
+				config.set(`executions.concurrency.${type}Limit`, -2);
 
-			/**
-			 * Act
-			 */
-			const service = new ConcurrencyControlService(
-				logger,
-				executionRepository,
-				telemetry,
-				eventService,
-			);
+				/**
+				 * Act
+				 */
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
 
-			/**
-			 * Act
-			 */
-			// @ts-expect-error Private property
-			expect(service.isEnabled).toBe(false);
-		});
+				/**
+				 * Act
+				 */
+				// @ts-expect-error Private property
+				expect(service.isEnabled).toBe(false);
+			},
+		);
 
 		it('should be disabled on queue mode', () => {
 			/**
@@ -203,6 +217,31 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(enqueueSpy).toHaveBeenCalled();
 			});
+
+			it('should enqueue on evaluation mode', async () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', 1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const enqueueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'enqueue');
+
+				/**
+				 * Act
+				 */
+				await service.throttle({ mode: 'evaluation', executionId: '1' });
+
+				/**
+				 * Assert
+				 */
+				expect(enqueueSpy).toHaveBeenCalled();
+			});
 		});
 
 		describe('release', () => {
@@ -258,6 +297,31 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(dequeueSpy).toHaveBeenCalled();
 			});
+
+			it('should dequeue on evaluation mode', () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', 1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const dequeueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'dequeue');
+
+				/**
+				 * Act
+				 */
+				service.release({ mode: 'evaluation' });
+
+				/**
+				 * Assert
+				 */
+				expect(dequeueSpy).toHaveBeenCalled();
+			});
 		});
 
 		describe('remove', () => {
@@ -316,14 +380,12 @@ describe('ConcurrencyControlService', () => {
 					expect(removeSpy).toHaveBeenCalled();
 				},
 			);
-		});
 
-		describe('removeAll', () => {
-			it('should remove all executions from the production queue', async () => {
+			it('should remove an execution on evaluation mode', () => {
 				/**
 				 * Arrange
 				 */
-				config.set('executions.concurrency.productionLimit', 2);
+				config.set('executions.concurrency.evaluationLimit', 1);
 
 				const service = new ConcurrencyControlService(
 					logger,
@@ -331,28 +393,112 @@ describe('ConcurrencyControlService', () => {
 					telemetry,
 					eventService,
 				);
-
-				jest
-					.spyOn(ConcurrencyQueue.prototype, 'getAll')
-					.mockReturnValueOnce(new Set(['1', '2', '3']));
-
 				const removeSpy = jest.spyOn(ConcurrencyQueue.prototype, 'remove');
 
 				/**
 				 * Act
 				 */
-				await service.removeAll({
-					'1': mock<IExecutingWorkflowData>(),
-					'2': mock<IExecutingWorkflowData>(),
-					'3': mock<IExecutingWorkflowData>(),
-				});
+				service.remove({ mode: 'evaluation', executionId: '1' });
 
 				/**
 				 * Assert
 				 */
-				expect(removeSpy).toHaveBeenNthCalledWith(1, '1');
-				expect(removeSpy).toHaveBeenNthCalledWith(2, '2');
-				expect(removeSpy).toHaveBeenNthCalledWith(3, '3');
+				expect(removeSpy).toHaveBeenCalled();
+			});
+		});
+
+		describe('removeAll', () => {
+			it.each(['production', 'evaluation'])(
+				'should remove all executions from the %s queue',
+				async (type: ConcurrencyQueueType) => {
+					/**
+					 * Arrange
+					 */
+					config.set(`executions.concurrency.${type}Limit`, 2);
+
+					const service = new ConcurrencyControlService(
+						logger,
+						executionRepository,
+						telemetry,
+						eventService,
+					);
+
+					jest
+						.spyOn(ConcurrencyQueue.prototype, 'getAll')
+						.mockReturnValueOnce(new Set(['1', '2', '3']));
+
+					const removeSpy = jest.spyOn(ConcurrencyQueue.prototype, 'remove');
+
+					/**
+					 * Act
+					 */
+					await service.removeAll({
+						'1': mock<IExecutingWorkflowData>(),
+						'2': mock<IExecutingWorkflowData>(),
+						'3': mock<IExecutingWorkflowData>(),
+					});
+
+					/**
+					 * Assert
+					 */
+					expect(removeSpy).toHaveBeenNthCalledWith(1, '1');
+					expect(removeSpy).toHaveBeenNthCalledWith(2, '2');
+					expect(removeSpy).toHaveBeenNthCalledWith(3, '3');
+				},
+			);
+		});
+
+		describe('get queue', () => {
+			it('should choose the production queue', async () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.productionLimit', 2);
+				config.set('executions.concurrency.evaluationLimit', 2);
+
+				/**
+				 * Act
+				 */
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				// @ts-expect-error Private property
+				const queue = service.getQueue('webhook');
+
+				/**
+				 * Assert
+				 */
+				// @ts-expect-error Private property
+				expect(queue).toEqual(service.queues.get('production'));
+			});
+
+			it('should choose the evaluation queue', async () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.productionLimit', 2);
+				config.set('executions.concurrency.evaluationLimit', 2);
+
+				/**
+				 * Act
+				 */
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				// @ts-expect-error Private property
+				const queue = service.getQueue('evaluation');
+
+				/**
+				 * Assert
+				 */
+				// @ts-expect-error Private property
+				expect(queue).toEqual(service.queues.get('evaluation'));
 			});
 		});
 	});
@@ -388,6 +534,32 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(enqueueSpy).not.toHaveBeenCalled();
 			});
+
+			it('should do nothing for evaluation executions', async () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', -1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const enqueueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'enqueue');
+
+				/**
+				 * Act
+				 */
+				await service.throttle({ mode: 'evaluation', executionId: '1' });
+				await service.throttle({ mode: 'evaluation', executionId: '2' });
+
+				/**
+				 * Assert
+				 */
+				expect(enqueueSpy).not.toHaveBeenCalled();
+			});
 		});
 
 		describe('release', () => {
@@ -415,6 +587,31 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(dequeueSpy).not.toHaveBeenCalled();
 			});
+
+			it('should do nothing for evaluation executions', () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', -1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const dequeueSpy = jest.spyOn(ConcurrencyQueue.prototype, 'dequeue');
+
+				/**
+				 * Act
+				 */
+				service.release({ mode: 'evaluation' });
+
+				/**
+				 * Assert
+				 */
+				expect(dequeueSpy).not.toHaveBeenCalled();
+			});
 		});
 
 		describe('remove', () => {
@@ -442,6 +639,31 @@ describe('ConcurrencyControlService', () => {
 				 */
 				expect(removeSpy).not.toHaveBeenCalled();
 			});
+
+			it('should do nothing for evaluation executions', () => {
+				/**
+				 * Arrange
+				 */
+				config.set('executions.concurrency.evaluationLimit', -1);
+
+				const service = new ConcurrencyControlService(
+					logger,
+					executionRepository,
+					telemetry,
+					eventService,
+				);
+				const removeSpy = jest.spyOn(ConcurrencyQueue.prototype, 'remove');
+
+				/**
+				 * Act
+				 */
+				service.remove({ mode: 'evaluation', executionId: '1' });
+
+				/**
+				 * Assert
+				 */
+				expect(removeSpy).not.toHaveBeenCalled();
+			});
 		});
 	});
 
@@ -470,14 +692,17 @@ describe('ConcurrencyControlService', () => {
 					 * Act
 					 */
 					// @ts-expect-error Private property
-					service.productionQueue.emit('concurrency-check', {
+					service.queues.get('production').emit('concurrency-check', {
 						capacity: CLOUD_TEMP_PRODUCTION_LIMIT - threshold,
 					});
 
 					/**
 					 * Assert
 					 */
-					expect(telemetry.track).toHaveBeenCalledWith('User hit concurrency limit', { threshold });
+					expect(telemetry.track).toHaveBeenCalledWith('User hit concurrency limit', {
+						threshold,
+						concurrencyQueue: 'production',
+					});
 				},
 			);
 
@@ -500,7 +725,7 @@ describe('ConcurrencyControlService', () => {
 					 * Act
 					 */
 					// @ts-expect-error Private property
-					service.productionQueue.emit('concurrency-check', {
+					service.queues.get('production').emit('concurrency-check', {
 						capacity: CLOUD_TEMP_PRODUCTION_LIMIT - threshold,
 					});
 
@@ -532,7 +757,7 @@ describe('ConcurrencyControlService', () => {
 					 * Act
 					 */
 					// @ts-expect-error Private property
-					service.productionQueue.emit('concurrency-check', {
+					service.queues.get('production').emit('concurrency-check', {
 						capacity: CLOUD_TEMP_PRODUCTION_LIMIT - threshold,
 					});
 
diff --git a/packages/cli/src/concurrency/concurrency-control.service.ts b/packages/cli/src/concurrency/concurrency-control.service.ts
index 3896daad2e..1984148c29 100644
--- a/packages/cli/src/concurrency/concurrency-control.service.ts
+++ b/packages/cli/src/concurrency/concurrency-control.service.ts
@@ -1,5 +1,7 @@
+import { Service } from '@n8n/di';
+import { capitalize } from 'lodash';
+import { Logger } from 'n8n-core';
 import type { WorkflowExecuteMode as ExecutionMode } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import config from '@/config';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -7,7 +9,6 @@ import { InvalidConcurrencyLimitError } from '@/errors/invalid-concurrency-limit
 import { UnknownExecutionModeError } from '@/errors/unknown-execution-mode.error';
 import { EventService } from '@/events/event.service';
 import type { IExecutingWorkflowData } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { Telemetry } from '@/telemetry';
 
 import { ConcurrencyQueue } from './concurrency-queue';
@@ -15,13 +16,15 @@ import { ConcurrencyQueue } from './concurrency-queue';
 export const CLOUD_TEMP_PRODUCTION_LIMIT = 999;
 export const CLOUD_TEMP_REPORTABLE_THRESHOLDS = [5, 10, 20, 50, 100, 200];
 
+export type ConcurrencyQueueType = 'production' | 'evaluation';
+
 @Service()
 export class ConcurrencyControlService {
 	private isEnabled: boolean;
 
-	private readonly productionLimit: number;
+	private readonly limits: Map<ConcurrencyQueueType, number>;
 
-	private readonly productionQueue: ConcurrencyQueue;
+	private readonly queues: Map<ConcurrencyQueueType, ConcurrencyQueue>;
 
 	private readonly limitsToReport = CLOUD_TEMP_REPORTABLE_THRESHOLDS.map(
 		(t) => CLOUD_TEMP_PRODUCTION_LIMIT - t,
@@ -35,52 +38,74 @@ export class ConcurrencyControlService {
 	) {
 		this.logger = this.logger.scoped('concurrency');
 
-		this.productionLimit = config.getEnv('executions.concurrency.productionLimit');
+		this.limits = new Map([
+			['production', config.getEnv('executions.concurrency.productionLimit')],
+			['evaluation', config.getEnv('executions.concurrency.evaluationLimit')],
+		]);
 
-		if (this.productionLimit === 0) {
-			throw new InvalidConcurrencyLimitError(this.productionLimit);
-		}
+		this.limits.forEach((limit, type) => {
+			if (limit === 0) {
+				throw new InvalidConcurrencyLimitError(limit);
+			}
 
-		if (this.productionLimit < -1) {
-			this.productionLimit = -1;
-		}
+			if (limit < -1) {
+				this.limits.set(type, -1);
+			}
+		});
 
-		if (this.productionLimit === -1 || config.getEnv('executions.mode') === 'queue') {
+		if (
+			Array.from(this.limits.values()).every((limit) => limit === -1) ||
+			config.getEnv('executions.mode') === 'queue'
+		) {
 			this.isEnabled = false;
 			return;
 		}
 
-		this.productionQueue = new ConcurrencyQueue(this.productionLimit);
+		this.queues = new Map();
+		this.limits.forEach((limit, type) => {
+			if (limit > 0) {
+				this.queues.set(type, new ConcurrencyQueue(limit));
+			}
+		});
 
 		this.logInit();
 
 		this.isEnabled = true;
 
-		this.productionQueue.on('concurrency-check', ({ capacity }) => {
-			if (this.shouldReport(capacity)) {
-				this.telemetry.track('User hit concurrency limit', {
-					threshold: CLOUD_TEMP_PRODUCTION_LIMIT - capacity,
-				});
-			}
-		});
+		this.queues.forEach((queue, type) => {
+			queue.on('concurrency-check', ({ capacity }) => {
+				if (this.shouldReport(capacity)) {
+					this.telemetry.track('User hit concurrency limit', {
+						threshold: CLOUD_TEMP_PRODUCTION_LIMIT - capacity,
+						concurrencyQueue: type,
+					});
+				}
+			});
 
-		this.productionQueue.on('execution-throttled', ({ executionId }) => {
-			this.logger.debug('Execution throttled', { executionId });
-			this.eventService.emit('execution-throttled', { executionId });
-		});
+			queue.on('execution-throttled', ({ executionId }) => {
+				this.logger.debug('Execution throttled', { executionId, type });
+				this.eventService.emit('execution-throttled', { executionId, type });
+			});
 
-		this.productionQueue.on('execution-released', async (executionId) => {
-			this.logger.debug('Execution released', { executionId });
+			queue.on('execution-released', (executionId) => {
+				this.logger.debug('Execution released', { executionId, type });
+			});
 		});
 	}
 
 	/**
-	 * Check whether an execution is in the production queue.
+	 * Check whether an execution is in any of the queues.
 	 */
 	has(executionId: string) {
 		if (!this.isEnabled) return false;
 
-		return this.productionQueue.getAll().has(executionId);
+		for (const queue of this.queues.values()) {
+			if (queue.has(executionId)) {
+				return true;
+			}
+		}
+
+		return false;
 	}
 
 	/**
@@ -89,16 +114,16 @@ export class ConcurrencyControlService {
 	async throttle({ mode, executionId }: { mode: ExecutionMode; executionId: string }) {
 		if (!this.isEnabled || this.isUnlimited(mode)) return;
 
-		await this.productionQueue.enqueue(executionId);
+		await this.getQueue(mode)?.enqueue(executionId);
 	}
 
 	/**
-	 * Release capacity back so the next execution in the production queue can proceed.
+	 * Release capacity back so the next execution in the queue can proceed.
 	 */
 	release({ mode }: { mode: ExecutionMode }) {
 		if (!this.isEnabled || this.isUnlimited(mode)) return;
 
-		this.productionQueue.dequeue();
+		this.getQueue(mode)?.dequeue();
 	}
 
 	/**
@@ -107,7 +132,7 @@ export class ConcurrencyControlService {
 	remove({ mode, executionId }: { mode: ExecutionMode; executionId: string }) {
 		if (!this.isEnabled || this.isUnlimited(mode)) return;
 
-		this.productionQueue.remove(executionId);
+		this.getQueue(mode)?.remove(executionId);
 	}
 
 	/**
@@ -118,11 +143,13 @@ export class ConcurrencyControlService {
 	async removeAll(activeExecutions: { [executionId: string]: IExecutingWorkflowData }) {
 		if (!this.isEnabled) return;
 
-		const enqueuedProductionIds = this.productionQueue.getAll();
+		this.queues.forEach((queue) => {
+			const enqueuedExecutionIds = queue.getAll();
 
-		for (const id of enqueuedProductionIds) {
-			this.productionQueue.remove(id);
-		}
+			for (const id of enqueuedExecutionIds) {
+				queue.remove(id);
+			}
+		});
 
 		const executionIds = Object.entries(activeExecutions)
 			.filter(([_, execution]) => execution.status === 'new' && execution.responsePromise)
@@ -146,15 +173,28 @@ export class ConcurrencyControlService {
 	private logInit() {
 		this.logger.debug('Enabled');
 
-		this.logger.debug(
-			[
-				'Production execution concurrency is',
-				this.productionLimit === -1 ? 'unlimited' : 'limited to ' + this.productionLimit.toString(),
-			].join(' '),
-		);
+		this.limits.forEach((limit, type) => {
+			this.logger.debug(
+				[
+					`${capitalize(type)} execution concurrency is`,
+					limit === -1 ? 'unlimited' : 'limited to ' + limit.toString(),
+				].join(' '),
+			);
+		});
 	}
 
 	private isUnlimited(mode: ExecutionMode) {
+		return this.getQueue(mode) === undefined;
+	}
+
+	private shouldReport(capacity: number) {
+		return config.getEnv('deployment.type') === 'cloud' && this.limitsToReport.includes(capacity);
+	}
+
+	/**
+	 * Get the concurrency queue based on the execution mode.
+	 */
+	private getQueue(mode: ExecutionMode) {
 		if (
 			mode === 'error' ||
 			mode === 'integrated' ||
@@ -163,15 +203,13 @@ export class ConcurrencyControlService {
 			mode === 'manual' ||
 			mode === 'retry'
 		) {
-			return true;
+			return undefined;
 		}
 
-		if (mode === 'webhook' || mode === 'trigger') return this.productionLimit === -1;
+		if (mode === 'webhook' || mode === 'trigger') return this.queues.get('production');
+
+		if (mode === 'evaluation') return this.queues.get('evaluation');
 
 		throw new UnknownExecutionModeError(mode);
 	}
-
-	private shouldReport(capacity: number) {
-		return config.getEnv('deployment.type') === 'cloud' && this.limitsToReport.includes(capacity);
-	}
 }
diff --git a/packages/cli/src/concurrency/concurrency-queue.ts b/packages/cli/src/concurrency/concurrency-queue.ts
index c4c482226c..eac9e478d1 100644
--- a/packages/cli/src/concurrency/concurrency-queue.ts
+++ b/packages/cli/src/concurrency/concurrency-queue.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { TypedEmitter } from '@/typed-emitter';
 
@@ -58,6 +58,10 @@ export class ConcurrencyQueue extends TypedEmitter<ConcurrencyEvents> {
 		return new Set(this.queue.map((item) => item.executionId));
 	}
 
+	has(executionId: string) {
+		return this.queue.some((item) => item.executionId === executionId);
+	}
+
 	private resolveNext() {
 		const item = this.queue.shift();
 
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index c9e34355ba..8839d180ff 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -1,11 +1,13 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import convict from 'convict';
 import { flatten } from 'flat';
 import { readFileSync } from 'fs';
 import merge from 'lodash/merge';
+import { Logger } from 'n8n-core';
 import { ApplicationError, setGlobalState } from 'n8n-workflow';
+import assert from 'node:assert';
 import colors from 'picocolors';
-import { Container } from 'typedi';
 
 import { inTest, inE2ETests } from '@/constants';
 
@@ -21,6 +23,7 @@ if (inE2ETests) {
 	process.env.N8N_PUBLIC_API_DISABLED = 'true';
 	process.env.SKIP_STATISTICS_EVENTS = 'true';
 	process.env.N8N_SECURE_COOKIE = 'false';
+	process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK = 'true';
 }
 
 // Load schema after process.env has been overwritten
@@ -30,13 +33,15 @@ const config = convict(schema, { args: [] });
 // eslint-disable-next-line @typescript-eslint/unbound-method
 config.getEnv = config.get;
 
+const logger = Container.get(Logger);
+const globalConfig = Container.get(GlobalConfig);
+
 // Load overwrites when not in tests
 if (!inE2ETests && !inTest) {
 	// Overwrite default configuration with settings which got defined in
 	// optional configuration files
 	const { N8N_CONFIG_FILES } = process.env;
 	if (N8N_CONFIG_FILES !== undefined) {
-		const globalConfig = Container.get(GlobalConfig);
 		const configFiles = N8N_CONFIG_FILES.split(',');
 		for (const configFile of configFiles) {
 			if (!configFile) continue;
@@ -57,9 +62,10 @@ if (!inE2ETests && !inTest) {
 						}
 					}
 				}
-				console.debug('Loaded config overwrites from', configFile);
+				logger.debug(`Loaded config overwrites from ${configFile}`);
 			} catch (error) {
-				console.error('Error loading config file', configFile, error);
+				assert(error instanceof Error);
+				logger.error(`Error loading config file ${configFile}`, { error });
 			}
 		}
 	}
@@ -95,7 +101,7 @@ config.validate({
 const userManagement = config.get('userManagement');
 if (userManagement.jwtRefreshTimeoutHours >= userManagement.jwtSessionDurationHours) {
 	if (!inTest)
-		console.warn(
+		logger.warn(
 			'N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS needs to smaller than N8N_USER_MANAGEMENT_JWT_DURATION_HOURS. Setting N8N_USER_MANAGEMENT_JWT_REFRESH_TIMEOUT_HOURS to 0 for now.',
 		);
 
@@ -104,16 +110,16 @@ if (userManagement.jwtRefreshTimeoutHours >= userManagement.jwtSessionDurationHo
 
 const executionProcess = config.getEnv('executions.process');
 if (executionProcess) {
-	console.error(
-		colors.yellow('Please unset the deprecated env variable'),
-		colors.bold(colors.yellow('EXECUTIONS_PROCESS')),
+	logger.error(
+		colors.yellow('Please unset the deprecated env variable') +
+			colors.bold(colors.yellow('EXECUTIONS_PROCESS')),
 	);
 }
 if (executionProcess === 'own') {
-	console.error(
+	logger.error(
 		colors.bold(colors.red('Application failed to start because "Own" mode has been removed.')),
 	);
-	console.error(
+	logger.error(
 		colors.red(
 			'If you need the isolation and performance gains, please consider using queue mode instead.\n\n',
 		),
@@ -122,7 +128,7 @@ if (executionProcess === 'own') {
 }
 
 setGlobalState({
-	defaultTimezone: Container.get(GlobalConfig).generic.timezone,
+	defaultTimezone: globalConfig.generic.timezone,
 });
 
 // eslint-disable-next-line import/no-default-export
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 9b711f9766..0e7f747fba 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1,8 +1,8 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import convict from 'convict';
 import { InstanceSettings } from 'n8n-core';
 import path from 'path';
-import { Container } from 'typedi';
 
 import { ensureStringArray } from './utils';
 
@@ -35,6 +35,12 @@ export const schema = {
 				default: -1,
 				env: 'N8N_CONCURRENCY_PRODUCTION_LIMIT',
 			},
+			evaluationLimit: {
+				doc: 'Max evaluation executions allowed to run concurrently.',
+				format: Number,
+				default: -1,
+				env: 'N8N_CONCURRENCY_EVALUATION_LIMIT',
+			},
 		},
 
 		// A Workflow times out and gets canceled after this time (seconds).
@@ -98,54 +104,6 @@ export const schema = {
 			env: 'EXECUTIONS_DATA_SAVE_MANUAL_EXECUTIONS',
 		},
 
-		// To not exceed the database's capacity and keep its size moderate
-		// the execution data gets pruned regularly (default: 15 minute interval).
-		// All saved execution data older than the max age will be deleted.
-		// Pruning is currently not activated by default, which will change in
-		// a future version.
-		pruneData: {
-			doc: 'Delete data of past executions on a rolling basis',
-			format: Boolean,
-			default: true,
-			env: 'EXECUTIONS_DATA_PRUNE',
-		},
-		pruneDataMaxAge: {
-			doc: 'How old (hours) the finished execution data has to be to get soft-deleted',
-			format: Number,
-			default: 336,
-			env: 'EXECUTIONS_DATA_MAX_AGE',
-		},
-		pruneDataHardDeleteBuffer: {
-			doc: 'How old (hours) the finished execution data has to be to get hard-deleted. By default, this buffer excludes recent executions as the user may need them while building a workflow.',
-			format: Number,
-			default: 1,
-			env: 'EXECUTIONS_DATA_HARD_DELETE_BUFFER',
-		},
-		pruneDataIntervals: {
-			hardDelete: {
-				doc: 'How often (minutes) execution data should be hard-deleted',
-				format: Number,
-				default: 15,
-				env: 'EXECUTIONS_DATA_PRUNE_HARD_DELETE_INTERVAL',
-			},
-			softDelete: {
-				doc: 'How often (minutes) execution data should be soft-deleted',
-				format: Number,
-				default: 60,
-				env: 'EXECUTIONS_DATA_PRUNE_SOFT_DELETE_INTERVAL',
-			},
-		},
-
-		// Additional pruning option to delete executions if total count exceeds the configured max.
-		// Deletes the oldest entries first
-		// Set to 0 for No limit
-		pruneDataMaxCount: {
-			doc: "Maximum number of finished executions to keep in DB. Doesn't necessarily prune exactly to max number. 0 = no limit",
-			format: Number,
-			default: 10000,
-			env: 'EXECUTIONS_DATA_PRUNE_MAX_COUNT',
-		},
-
 		queueRecovery: {
 			interval: {
 				doc: 'How often (minutes) to check for queue recovery',
@@ -187,36 +145,6 @@ export const schema = {
 		doc: 'Public URL where the editor is accessible. Also used for emails sent from n8n.',
 	},
 
-	security: {
-		restrictFileAccessTo: {
-			doc: 'If set only files in that directories can be accessed. Multiple directories can be separated by semicolon (";").',
-			format: String,
-			default: '',
-			env: 'N8N_RESTRICT_FILE_ACCESS_TO',
-		},
-		blockFileAccessToN8nFiles: {
-			doc: 'If set to true it will block access to all files in the ".n8n" directory, the static cache dir at ~/.cache/n8n/public, and user defined config files.',
-			format: Boolean,
-			default: true,
-			env: 'N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES',
-		},
-		audit: {
-			daysAbandonedWorkflow: {
-				doc: 'Days for a workflow to be considered abandoned if not executed',
-				format: Number,
-				default: 90,
-				env: 'N8N_SECURITY_AUDIT_DAYS_ABANDONED_WORKFLOW',
-			},
-		},
-	},
-
-	workflowTagsDisabled: {
-		format: Boolean,
-		default: false,
-		env: 'N8N_WORKFLOW_TAGS_DISABLED',
-		doc: 'Disable workflow tags.',
-	},
-
 	userManagement: {
 		jwtSecret: {
 			doc: 'Set a specific JWT secret (optional - n8n can generate one)', // Generated @ start.ts
@@ -367,43 +295,6 @@ export const schema = {
 		},
 	},
 
-	diagnostics: {
-		enabled: {
-			doc: 'Whether diagnostic mode is enabled.',
-			format: Boolean,
-			default: true,
-			env: 'N8N_DIAGNOSTICS_ENABLED',
-		},
-		config: {
-			posthog: {
-				apiKey: {
-					doc: 'API key for PostHog',
-					format: String,
-					default: 'phc_4URIAm1uYfJO7j8kWSe0J8lc8IqnstRLS7Jx8NcakHo',
-					env: 'N8N_DIAGNOSTICS_POSTHOG_API_KEY',
-				},
-				apiHost: {
-					doc: 'API host for PostHog',
-					format: String,
-					default: 'https://ph.n8n.io',
-					env: 'N8N_DIAGNOSTICS_POSTHOG_API_HOST',
-				},
-			},
-			frontend: {
-				doc: 'Diagnostics config for frontend.',
-				format: String,
-				default: '1zPn9bgWPzlQc0p8Gj1uiK6DOTn;https://telemetry.n8n.io',
-				env: 'N8N_DIAGNOSTICS_CONFIG_FRONTEND',
-			},
-			backend: {
-				doc: 'Diagnostics config for backend.',
-				format: String,
-				default: '1zPn7YoGC3ZXE9zLeTKLuQCB4F6;https://telemetry.n8n.io',
-				env: 'N8N_DIAGNOSTICS_CONFIG_BACKEND',
-			},
-		},
-	},
-
 	defaultLocale: {
 		doc: 'Default locale for the UI',
 		format: String,
@@ -449,15 +340,6 @@ export const schema = {
 		},
 	},
 
-	aiAssistant: {
-		baseUrl: {
-			doc: 'Base URL of the AI assistant service',
-			format: String,
-			default: '',
-			env: 'N8N_AI_ASSISTANT_BASE_URL',
-		},
-	},
-
 	expression: {
 		evaluator: {
 			doc: 'Expression evaluator to use',
@@ -473,15 +355,6 @@ export const schema = {
 		},
 	},
 
-	sourceControl: {
-		defaultKeyPairType: {
-			doc: 'Default SSH key type to use when generating SSH keys',
-			format: ['rsa', 'ed25519'] as const,
-			default: 'ed25519',
-			env: 'N8N_SOURCECONTROL_DEFAULT_SSH_KEY_TYPE',
-		},
-	},
-
 	workflowHistory: {
 		enabled: {
 			doc: 'Whether to save workflow history versions',
diff --git a/packages/cli/src/config/types.ts b/packages/cli/src/config/types.ts
index 78f2358f5d..33fff9b946 100644
--- a/packages/cli/src/config/types.ts
+++ b/packages/cli/src/config/types.ts
@@ -80,6 +80,7 @@ type ExceptionPaths = {
 	processedDataManager: IProcessedDataConfig;
 	'userManagement.isInstanceOwnerSetUp': boolean;
 	'ui.banners.dismissed': string[] | undefined;
+	easyAIWorkflowOnboarded: boolean | undefined;
 };
 
 // -----------------------------------
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 04512e8be9..abcf298d3d 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -1,6 +1,7 @@
 import { readFileSync } from 'fs';
 import type { n8n } from 'n8n-core';
-import { jsonParse } from 'n8n-workflow';
+import type { ITaskDataConnections } from 'n8n-workflow';
+import { jsonParse, TRIMMED_TASK_DATA_CONNECTIONS_KEY } from 'n8n-workflow';
 import { resolve, join, dirname } from 'path';
 
 const { NODE_ENV, E2E_TESTS } = process.env;
@@ -93,6 +94,7 @@ export const LICENSE_FEATURES = {
 	AI_ASSISTANT: 'feat:aiAssistant',
 	ASK_AI: 'feat:askAi',
 	COMMUNITY_NODES_CUSTOM_REGISTRY: 'feat:communityNodes:customRegistry',
+	AI_CREDITS: 'feat:aiCredits',
 } as const;
 
 export const LICENSE_QUOTAS = {
@@ -101,6 +103,7 @@ export const LICENSE_QUOTAS = {
 	USERS_LIMIT: 'quota:users',
 	WORKFLOW_HISTORY_PRUNE_LIMIT: 'quota:workflowHistoryPrune',
 	TEAM_PROJECT_LIMIT: 'quota:maxTeamProjects',
+	AI_CREDITS: 'quota:aiCredits',
 } as const;
 export const UNLIMITED_LICENSE_QUOTA = -1;
 
@@ -110,23 +113,13 @@ export const UM_FIX_INSTRUCTION =
 	'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
 
 /**
- * Units of time in milliseconds
- * @deprecated Please use constants.Time instead.
- */
-export const TIME = {
-	SECOND: 1000,
-	MINUTE: 60 * 1000,
-	HOUR: 60 * 60 * 1000,
-	DAY: 24 * 60 * 60 * 1000,
-} as const;
-
-/**
- * Convert time from any unit to any other unit
- *
- * Please amend conversions as necessary.
- * Eventually this will superseed `TIME` above
+ * Convert time from any time unit to any other unit
  */
 export const Time = {
+	milliseconds: {
+		toMinutes: 1 / (60 * 1000),
+		toSeconds: 1 / 1000,
+	},
 	seconds: {
 		toMilliseconds: 1000,
 	},
@@ -147,9 +140,9 @@ export const MIN_PASSWORD_CHAR_LENGTH = 8;
 
 export const MAX_PASSWORD_CHAR_LENGTH = 64;
 
-export const TEST_WEBHOOK_TIMEOUT = 2 * TIME.MINUTE;
+export const TEST_WEBHOOK_TIMEOUT = 2 * Time.minutes.toMilliseconds;
 
-export const TEST_WEBHOOK_TIMEOUT_BUFFER = 30 * TIME.SECOND;
+export const TEST_WEBHOOK_TIMEOUT_BUFFER = 30 * Time.seconds.toMilliseconds;
 
 export const GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE = [
 	'oAuth2Api',
@@ -169,8 +162,36 @@ export const ARTIFICIAL_TASK_DATA = {
 	],
 };
 
+/**
+ * Connections for an item standing in for a manual execution data item too
+ * large to be sent live via pubsub. This signals to the client to direct the
+ * user to the execution history.
+ */
+export const TRIMMED_TASK_DATA_CONNECTIONS: ITaskDataConnections = {
+	main: [
+		[
+			{
+				json: { [TRIMMED_TASK_DATA_CONNECTIONS_KEY]: true },
+				pairedItem: undefined,
+			},
+		],
+	],
+};
+
 /** Lowest priority, meaning shut down happens after other groups */
 export const LOWEST_SHUTDOWN_PRIORITY = 0;
 export const DEFAULT_SHUTDOWN_PRIORITY = 100;
 /** Highest priority, meaning shut down happens before all other groups */
 export const HIGHEST_SHUTDOWN_PRIORITY = 200;
+
+export const WsStatusCodes = {
+	CloseNormal: 1000,
+	CloseGoingAway: 1001,
+	CloseProtocolError: 1002,
+	CloseUnsupportedData: 1003,
+	CloseNoStatus: 1005,
+	CloseAbnormal: 1006,
+	CloseInvalidData: 1007,
+} as const;
+
+export const FREE_AI_CREDITS_CREDENTIAL_NAME = 'n8n free OpenAI API credits';
diff --git a/packages/cli/src/controllers/__tests__/ai.controller.test.ts b/packages/cli/src/controllers/__tests__/ai.controller.test.ts
new file mode 100644
index 0000000000..2cf0a1cdcd
--- /dev/null
+++ b/packages/cli/src/controllers/__tests__/ai.controller.test.ts
@@ -0,0 +1,112 @@
+import type {
+	AiAskRequestDto,
+	AiApplySuggestionRequestDto,
+	AiChatRequestDto,
+} from '@n8n/api-types';
+import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
+import { mock } from 'jest-mock-extended';
+
+import { InternalServerError } from '@/errors/response-errors/internal-server.error';
+import type { AuthenticatedRequest } from '@/requests';
+import type { AiService } from '@/services/ai.service';
+
+import { AiController, type FlushableResponse } from '../ai.controller';
+
+describe('AiController', () => {
+	const aiService = mock<AiService>();
+
+	const controller = new AiController(aiService, mock(), mock());
+
+	const request = mock<AuthenticatedRequest>({
+		user: { id: 'user123' },
+	});
+	const response = mock<FlushableResponse>();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+
+		response.header.mockReturnThis();
+	});
+
+	describe('chat', () => {
+		const payload = mock<AiChatRequestDto>();
+
+		it('should handle chat request successfully', async () => {
+			aiService.chat.mockResolvedValue(
+				mock<Response>({
+					body: mock({
+						pipeTo: jest.fn().mockImplementation(async (writableStream) => {
+							// Simulate stream writing
+							const writer = writableStream.getWriter();
+							await writer.write(JSON.stringify({ message: 'test response' }));
+							await writer.close();
+						}),
+					}),
+				}),
+			);
+
+			await controller.chat(request, response, payload);
+
+			expect(aiService.chat).toHaveBeenCalledWith(payload, request.user);
+			expect(response.header).toHaveBeenCalledWith('Content-type', 'application/json-lines');
+			expect(response.flush).toHaveBeenCalled();
+			expect(response.end).toHaveBeenCalled();
+		});
+
+		it('should throw InternalServerError if chat fails', async () => {
+			const mockError = new Error('Chat failed');
+
+			aiService.chat.mockRejectedValue(mockError);
+
+			await expect(controller.chat(request, response, payload)).rejects.toThrow(
+				InternalServerError,
+			);
+		});
+	});
+
+	describe('applySuggestion', () => {
+		const payload = mock<AiApplySuggestionRequestDto>();
+
+		it('should apply suggestion successfully', async () => {
+			const clientResponse = mock<AiAssistantSDK.ApplySuggestionResponse>();
+			aiService.applySuggestion.mockResolvedValue(clientResponse);
+
+			const result = await controller.applySuggestion(request, response, payload);
+
+			expect(aiService.applySuggestion).toHaveBeenCalledWith(payload, request.user);
+			expect(result).toEqual(clientResponse);
+		});
+
+		it('should throw InternalServerError if applying suggestion fails', async () => {
+			const mockError = new Error('Apply suggestion failed');
+			aiService.applySuggestion.mockRejectedValue(mockError);
+
+			await expect(controller.applySuggestion(request, response, payload)).rejects.toThrow(
+				InternalServerError,
+			);
+		});
+	});
+
+	describe('askAi method', () => {
+		const payload = mock<AiAskRequestDto>();
+
+		it('should ask AI successfully', async () => {
+			const clientResponse = mock<AiAssistantSDK.AskAiResponsePayload>();
+			aiService.askAi.mockResolvedValue(clientResponse);
+
+			const result = await controller.askAi(request, response, payload);
+
+			expect(aiService.askAi).toHaveBeenCalledWith(payload, request.user);
+			expect(result).toEqual(clientResponse);
+		});
+
+		it('should throw InternalServerError if asking AI fails', async () => {
+			const mockError = new Error('Ask AI failed');
+			aiService.askAi.mockRejectedValue(mockError);
+
+			await expect(controller.askAi(request, response, payload)).rejects.toThrow(
+				InternalServerError,
+			);
+		});
+	});
+});
diff --git a/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts b/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts
index 3f34fc1d2c..dc40d3357d 100644
--- a/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/api-keys.controller.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import { Container } from 'typedi';
 
 import type { ApiKey } from '@/databases/entities/api-key';
 import type { User } from '@/databases/entities/user';
diff --git a/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts b/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts
index ff983cdd4a..87ed378a02 100644
--- a/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts
@@ -1,34 +1,223 @@
+import type {
+	OptionsRequestDto,
+	ResourceLocatorRequestDto,
+	ResourceMapperFieldsRequestDto,
+	ActionResultRequestDto,
+} from '@n8n/api-types';
 import { mock } from 'jest-mock-extended';
-import type { ILoadOptions, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+import type {
+	ILoadOptions,
+	IWorkflowExecuteAdditionalData,
+	INodePropertyOptions,
+	NodeParameterValueType,
+} from 'n8n-workflow';
 
 import { DynamicNodeParametersController } from '@/controllers/dynamic-node-parameters.controller';
-import type { DynamicNodeParametersRequest } from '@/requests';
+import type { AuthenticatedRequest } from '@/requests';
 import type { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
 import * as AdditionalData from '@/workflow-execute-additional-data';
 
 describe('DynamicNodeParametersController', () => {
-	const service = mock<DynamicNodeParametersService>();
-	const controller = new DynamicNodeParametersController(service);
+	let service: jest.Mocked<DynamicNodeParametersService>;
+	let controller: DynamicNodeParametersController;
+	let mockUser: { id: string };
+	let baseAdditionalData: IWorkflowExecuteAdditionalData;
 
 	beforeEach(() => {
-		jest.clearAllMocks();
+		service = mock<DynamicNodeParametersService>();
+		controller = new DynamicNodeParametersController(service);
+
+		mockUser = { id: 'user123' };
+		baseAdditionalData = mock<IWorkflowExecuteAdditionalData>();
+
+		jest.spyOn(AdditionalData, 'getBase').mockResolvedValue(baseAdditionalData);
 	});
 
 	describe('getOptions', () => {
-		it('should take `loadOptions` as object', async () => {
-			jest
-				.spyOn(AdditionalData, 'getBase')
-				.mockResolvedValue(mock<IWorkflowExecuteAdditionalData>());
+		const basePayload: OptionsRequestDto = {
+			path: '/test/path',
+			nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+			currentNodeParameters: {},
+		};
 
-			const req = mock<DynamicNodeParametersRequest.Options>();
-			const loadOptions: ILoadOptions = {};
-			req.body.loadOptions = loadOptions;
+		it('should call getOptionsViaMethodName when methodName is provided', async () => {
+			const payload: OptionsRequestDto = {
+				...basePayload,
+				methodName: 'testMethod',
+			};
+			const req = { user: mockUser } as AuthenticatedRequest;
 
-			await controller.getOptions(req);
+			const expectedResult: INodePropertyOptions[] = [{ name: 'test', value: 'value' }];
+			service.getOptionsViaMethodName.mockResolvedValue(expectedResult);
 
-			const zerothArg = service.getOptionsViaLoadOptions.mock.calls[0][0];
+			const result = await controller.getOptions(req, mock(), payload);
 
-			expect(zerothArg).toEqual(loadOptions);
+			expect(service.getOptionsViaMethodName).toHaveBeenCalledWith(
+				'testMethod',
+				'/test/path',
+				baseAdditionalData,
+				{ name: 'TestNode', version: 1 },
+				{},
+				undefined,
+			);
+			expect(result).toEqual(expectedResult);
+		});
+
+		it('should call getOptionsViaLoadOptions when loadOptions is provided', async () => {
+			const loadOptions: ILoadOptions = {
+				routing: {
+					operations: {},
+				},
+			};
+			const payload: OptionsRequestDto = {
+				...basePayload,
+				loadOptions,
+			};
+			const req = { user: mockUser } as AuthenticatedRequest;
+
+			const expectedResult: INodePropertyOptions[] = [{ name: 'test', value: 'value' }];
+			service.getOptionsViaLoadOptions.mockResolvedValue(expectedResult);
+
+			const result = await controller.getOptions(req, mock(), payload);
+
+			expect(service.getOptionsViaLoadOptions).toHaveBeenCalledWith(
+				loadOptions,
+				baseAdditionalData,
+				{ name: 'TestNode', version: 1 },
+				{},
+				undefined,
+			);
+			expect(result).toEqual(expectedResult);
+		});
+
+		it('should return empty array when no method or load options are provided', async () => {
+			const req = { user: mockUser } as AuthenticatedRequest;
+
+			const result = await controller.getOptions(req, mock(), basePayload);
+
+			expect(result).toEqual([]);
+		});
+	});
+
+	describe('getResourceLocatorResults', () => {
+		const basePayload: ResourceLocatorRequestDto = {
+			path: '/test/path',
+			nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+			methodName: 'testMethod',
+			currentNodeParameters: {},
+		};
+
+		it('should call getResourceLocatorResults with correct parameters', async () => {
+			const payload: ResourceLocatorRequestDto = {
+				...basePayload,
+				filter: 'testFilter',
+				paginationToken: 'testToken',
+			};
+			const req = { user: mockUser } as AuthenticatedRequest;
+
+			const expectedResult = { results: [{ name: 'test', value: 'value' }] };
+			service.getResourceLocatorResults.mockResolvedValue(expectedResult);
+
+			const result = await controller.getResourceLocatorResults(req, mock(), payload);
+
+			expect(service.getResourceLocatorResults).toHaveBeenCalledWith(
+				'testMethod',
+				'/test/path',
+				baseAdditionalData,
+				{ name: 'TestNode', version: 1 },
+				{},
+				undefined,
+				'testFilter',
+				'testToken',
+			);
+			expect(result).toEqual(expectedResult);
+		});
+	});
+
+	describe('getResourceMappingFields', () => {
+		const basePayload: ResourceMapperFieldsRequestDto = {
+			path: '/test/path',
+			nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+			methodName: 'testMethod',
+			currentNodeParameters: {},
+		};
+
+		it('should call getResourceMappingFields with correct parameters', async () => {
+			const req = { user: mockUser } as AuthenticatedRequest;
+
+			const expectedResult = { fields: [] };
+			service.getResourceMappingFields.mockResolvedValue(expectedResult);
+
+			const result = await controller.getResourceMappingFields(req, mock(), basePayload);
+
+			expect(service.getResourceMappingFields).toHaveBeenCalledWith(
+				'testMethod',
+				'/test/path',
+				baseAdditionalData,
+				{ name: 'TestNode', version: 1 },
+				{},
+				undefined,
+			);
+			expect(result).toEqual(expectedResult);
+		});
+	});
+
+	describe('getLocalResourceMappingFields', () => {
+		const basePayload: ResourceMapperFieldsRequestDto = {
+			path: '/test/path',
+			nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+			methodName: 'testMethod',
+			currentNodeParameters: {},
+		};
+
+		it('should call getLocalResourceMappingFields with correct parameters', async () => {
+			const req = { user: mockUser } as AuthenticatedRequest;
+
+			const expectedResult = { fields: [] };
+			service.getLocalResourceMappingFields.mockResolvedValue(expectedResult);
+
+			const result = await controller.getLocalResourceMappingFields(req, mock(), basePayload);
+
+			expect(service.getLocalResourceMappingFields).toHaveBeenCalledWith(
+				'testMethod',
+				'/test/path',
+				baseAdditionalData,
+				{ name: 'TestNode', version: 1 },
+			);
+			expect(result).toEqual(expectedResult);
+		});
+	});
+
+	describe('getActionResult', () => {
+		const basePayload: ActionResultRequestDto = {
+			path: '/test/path',
+			nodeTypeAndVersion: { name: 'TestNode', version: 1 },
+			handler: 'testHandler',
+			currentNodeParameters: {},
+		};
+
+		it('should call getActionResult with correct parameters', async () => {
+			const payload: ActionResultRequestDto = {
+				...basePayload,
+				payload: { test: 'value' },
+			};
+			const req = { user: mockUser } as AuthenticatedRequest;
+
+			const expectedResult: NodeParameterValueType = 'test result';
+			service.getActionResult.mockResolvedValue(expectedResult);
+
+			const result = await controller.getActionResult(req, mock(), payload);
+
+			expect(service.getActionResult).toHaveBeenCalledWith(
+				'testHandler',
+				'/test/path',
+				baseAdditionalData,
+				{ name: 'TestNode', version: 1 },
+				{},
+				{ test: 'value' },
+				undefined,
+			);
+			expect(result).toEqual(expectedResult);
 		});
 	});
 });
diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts
index 37c391a2dc..9ba6f8ada7 100644
--- a/packages/cli/src/controllers/__tests__/me.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts
@@ -1,8 +1,8 @@
 import { UserUpdateRequestDto } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import type { Response } from 'express';
 import { mock, anyObject } from 'jest-mock-extended';
 import jwt from 'jsonwebtoken';
-import { Container } from 'typedi';
 
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { MeController } from '@/controllers/me.controller';
diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
index 0fd42aae43..b5065fa283 100644
--- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts
@@ -1,7 +1,7 @@
+import type { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
 import type { Response } from 'express';
-import { anyObject, mock } from 'jest-mock-extended';
-import jwt from 'jsonwebtoken';
-import Container from 'typedi';
+import { mock } from 'jest-mock-extended';
+import type { Logger } from 'n8n-core';
 
 import type { AuthService } from '@/auth/auth.service';
 import config from '@/config';
@@ -10,27 +10,31 @@ import type { User } from '@/databases/entities/user';
 import type { SettingsRepository } from '@/databases/repositories/settings.repository';
 import type { UserRepository } from '@/databases/repositories/user.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { License } from '@/license';
-import type { OwnerRequest } from '@/requests';
-import { PasswordUtility } from '@/services/password.utility';
+import type { EventService } from '@/events/event.service';
+import type { PublicUser } from '@/interfaces';
+import type { AuthenticatedRequest } from '@/requests';
+import type { PasswordUtility } from '@/services/password.utility';
 import type { UserService } from '@/services/user.service';
-import { mockInstance } from '@test/mocking';
-import { badPasswords } from '@test/test-data';
 
 describe('OwnerController', () => {
 	const configGetSpy = jest.spyOn(config, 'getEnv');
+	const configSetSpy = jest.spyOn(config, 'set');
+
+	const logger = mock<Logger>();
+	const eventService = mock<EventService>();
 	const authService = mock<AuthService>();
 	const userService = mock<UserService>();
 	const userRepository = mock<UserRepository>();
 	const settingsRepository = mock<SettingsRepository>();
-	mockInstance(License).isWithinUsersLimit.mockReturnValue(true);
+	const passwordUtility = mock<PasswordUtility>();
+
 	const controller = new OwnerController(
-		mock(),
-		mock(),
+		logger,
+		eventService,
 		settingsRepository,
 		authService,
 		userService,
-		Container.get(PasswordUtility),
+		passwordUtility,
 		mock(),
 		userRepository,
 	);
@@ -38,38 +42,18 @@ describe('OwnerController', () => {
 	describe('setupOwner', () => {
 		it('should throw a BadRequestError if the instance owner is already setup', async () => {
 			configGetSpy.mockReturnValue(true);
-			await expect(controller.setupOwner(mock(), mock())).rejects.toThrowError(
+			await expect(controller.setupOwner(mock(), mock(), mock())).rejects.toThrowError(
 				new BadRequestError('Instance owner already setup'),
 			);
-		});
 
-		it('should throw a BadRequestError if the email is invalid', async () => {
-			configGetSpy.mockReturnValue(false);
-			const req = mock<OwnerRequest.Post>({ body: { email: 'invalid email' } });
-			await expect(controller.setupOwner(req, mock())).rejects.toThrowError(
-				new BadRequestError('Invalid email address'),
-			);
-		});
-
-		describe('should throw if the password is invalid', () => {
-			Object.entries(badPasswords).forEach(([password, errorMessage]) => {
-				it(password, async () => {
-					configGetSpy.mockReturnValue(false);
-					const req = mock<OwnerRequest.Post>({ body: { email: 'valid@email.com', password } });
-					await expect(controller.setupOwner(req, mock())).rejects.toThrowError(
-						new BadRequestError(errorMessage),
-					);
-				});
-			});
-		});
-
-		it('should throw a BadRequestError if firstName & lastName are missing ', async () => {
-			configGetSpy.mockReturnValue(false);
-			const req = mock<OwnerRequest.Post>({
-				body: { email: 'valid@email.com', password: 'NewPassword123', firstName: '', lastName: '' },
-			});
-			await expect(controller.setupOwner(req, mock())).rejects.toThrowError(
-				new BadRequestError('First and last names are mandatory'),
+			expect(userRepository.findOneOrFail).not.toHaveBeenCalled();
+			expect(userRepository.save).not.toHaveBeenCalled();
+			expect(authService.issueCookie).not.toHaveBeenCalled();
+			expect(settingsRepository.update).not.toHaveBeenCalled();
+			expect(configSetSpy).not.toHaveBeenCalled();
+			expect(eventService.emit).not.toHaveBeenCalled();
+			expect(logger.debug).toHaveBeenCalledWith(
+				'Request to claim instance ownership failed because instance owner already exists',
 			);
 		});
 
@@ -80,29 +64,52 @@ describe('OwnerController', () => {
 				authIdentities: [],
 			});
 			const browserId = 'test-browser-id';
-			const req = mock<OwnerRequest.Post>({
-				body: {
-					email: 'valid@email.com',
-					password: 'NewPassword123',
-					firstName: 'Jane',
-					lastName: 'Doe',
-				},
-				user,
-				browserId,
-			});
+			const req = mock<AuthenticatedRequest>({ user, browserId });
 			const res = mock<Response>();
+			const payload = mock<OwnerSetupRequestDto>({
+				email: 'valid@email.com',
+				password: 'NewPassword123',
+				firstName: 'Jane',
+				lastName: 'Doe',
+			});
 			configGetSpy.mockReturnValue(false);
-			userRepository.findOneOrFail.calledWith(anyObject()).mockResolvedValue(user);
-			userRepository.save.calledWith(anyObject()).mockResolvedValue(user);
-			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
+			userRepository.findOneOrFail.mockResolvedValue(user);
+			userRepository.save.mockResolvedValue(user);
+			userService.toPublic.mockResolvedValue(mock<PublicUser>({ id: 'newUserId' }));
 
-			await controller.setupOwner(req, res);
+			const result = await controller.setupOwner(req, res, payload);
 
 			expect(userRepository.findOneOrFail).toHaveBeenCalledWith({
 				where: { role: 'global:owner' },
 			});
 			expect(userRepository.save).toHaveBeenCalledWith(user, { transaction: false });
 			expect(authService.issueCookie).toHaveBeenCalledWith(res, user, browserId);
+			expect(settingsRepository.update).toHaveBeenCalledWith(
+				{ key: 'userManagement.isInstanceOwnerSetUp' },
+				{ value: JSON.stringify(true) },
+			);
+			expect(configSetSpy).toHaveBeenCalledWith('userManagement.isInstanceOwnerSetUp', true);
+			expect(eventService.emit).toHaveBeenCalledWith('instance-owner-setup', { userId: 'userId' });
+			expect(result.id).toEqual('newUserId');
+		});
+	});
+
+	describe('dismissBanner', () => {
+		it('should not call dismissBanner if no banner is provided', async () => {
+			const payload = mock<DismissBannerRequestDto>({ banner: undefined });
+
+			const result = await controller.dismissBanner(mock(), mock(), payload);
+
+			expect(settingsRepository.dismissBanner).not.toHaveBeenCalled();
+			expect(result).toBeUndefined();
+		});
+
+		it('should call dismissBanner with the correct banner name', async () => {
+			const payload = mock<DismissBannerRequestDto>({ banner: 'TRIAL' });
+
+			await controller.dismissBanner(mock(), mock(), payload);
+
+			expect(settingsRepository.dismissBanner).toHaveBeenCalledWith({ bannerName: 'TRIAL' });
 		});
 	});
 });
diff --git a/packages/cli/src/controllers/__tests__/users.controller.test.ts b/packages/cli/src/controllers/__tests__/users.controller.test.ts
index 91ad6bd28b..5eaaca5840 100644
--- a/packages/cli/src/controllers/__tests__/users.controller.test.ts
+++ b/packages/cli/src/controllers/__tests__/users.controller.test.ts
@@ -4,7 +4,7 @@ import type { User } from '@/databases/entities/user';
 import type { UserRepository } from '@/databases/repositories/user.repository';
 import type { EventService } from '@/events/event.service';
 import type { AuthenticatedRequest } from '@/requests';
-import type { ProjectService } from '@/services/project.service';
+import type { ProjectService } from '@/services/project.service.ee';
 
 import { UsersController } from '../users.controller';
 
diff --git a/packages/cli/src/controllers/ai.controller.ts b/packages/cli/src/controllers/ai.controller.ts
index 1957db2971..e82ecd77ef 100644
--- a/packages/cli/src/controllers/ai.controller.ts
+++ b/packages/cli/src/controllers/ai.controller.ts
@@ -1,24 +1,38 @@
+import {
+	AiChatRequestDto,
+	AiApplySuggestionRequestDto,
+	AiAskRequestDto,
+	AiFreeCreditsRequestDto,
+} from '@n8n/api-types';
 import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
-import type { Response } from 'express';
-import { ErrorReporterProxy } from 'n8n-workflow';
+import { Response } from 'express';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
 import { strict as assert } from 'node:assert';
 import { WritableStream } from 'node:stream/web';
 
-import { Post, RestController } from '@/decorators';
+import { FREE_AI_CREDITS_CREDENTIAL_NAME } from '@/constants';
+import { CredentialsService } from '@/credentials/credentials.service';
+import { Body, Post, RestController } from '@/decorators';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
-import { AiAssistantRequest } from '@/requests';
+import type { CredentialRequest } from '@/requests';
+import { AuthenticatedRequest } from '@/requests';
 import { AiService } from '@/services/ai.service';
+import { UserService } from '@/services/user.service';
 
-type FlushableResponse = Response & { flush: () => void };
+export type FlushableResponse = Response & { flush: () => void };
 
 @RestController('/ai')
 export class AiController {
-	constructor(private readonly aiService: AiService) {}
+	constructor(
+		private readonly aiService: AiService,
+		private readonly credentialsService: CredentialsService,
+		private readonly userService: UserService,
+	) {}
 
 	@Post('/chat', { rateLimit: { limit: 100 } })
-	async chat(req: AiAssistantRequest.Chat, res: FlushableResponse) {
+	async chat(req: AuthenticatedRequest, res: FlushableResponse, @Body payload: AiChatRequestDto) {
 		try {
-			const aiResponse = await this.aiService.chat(req.body, req.user);
+			const aiResponse = await this.aiService.chat(payload, req.user);
 			if (aiResponse.body) {
 				res.header('Content-type', 'application/json-lines').flush();
 				await aiResponse.body.pipeTo(
@@ -33,32 +47,67 @@ export class AiController {
 			}
 		} catch (e) {
 			assert(e instanceof Error);
-			ErrorReporterProxy.error(e);
-			throw new InternalServerError(`Something went wrong: ${e.message}`);
+			throw new InternalServerError(e.message, e);
 		}
 	}
 
 	@Post('/chat/apply-suggestion')
 	async applySuggestion(
-		req: AiAssistantRequest.ApplySuggestionPayload,
+		req: AuthenticatedRequest,
+		_: Response,
+		@Body payload: AiApplySuggestionRequestDto,
 	): Promise<AiAssistantSDK.ApplySuggestionResponse> {
 		try {
-			return await this.aiService.applySuggestion(req.body, req.user);
+			return await this.aiService.applySuggestion(payload, req.user);
 		} catch (e) {
 			assert(e instanceof Error);
-			ErrorReporterProxy.error(e);
-			throw new InternalServerError(`Something went wrong: ${e.message}`);
+			throw new InternalServerError(e.message, e);
 		}
 	}
 
 	@Post('/ask-ai')
-	async askAi(req: AiAssistantRequest.AskAiPayload): Promise<AiAssistantSDK.AskAiResponsePayload> {
+	async askAi(
+		req: AuthenticatedRequest,
+		_: Response,
+		@Body payload: AiAskRequestDto,
+	): Promise<AiAssistantSDK.AskAiResponsePayload> {
 		try {
-			return await this.aiService.askAi(req.body, req.user);
+			return await this.aiService.askAi(payload, req.user);
 		} catch (e) {
 			assert(e instanceof Error);
-			ErrorReporterProxy.error(e);
-			throw new InternalServerError(`Something went wrong: ${e.message}`);
+			throw new InternalServerError(e.message, e);
+		}
+	}
+
+	@Post('/free-credits')
+	async aiCredits(req: AuthenticatedRequest, _: Response, @Body payload: AiFreeCreditsRequestDto) {
+		try {
+			const aiCredits = await this.aiService.createFreeAiCredits(req.user);
+
+			const credentialProperties: CredentialRequest.CredentialProperties = {
+				name: FREE_AI_CREDITS_CREDENTIAL_NAME,
+				type: OPEN_AI_API_CREDENTIAL_TYPE,
+				data: {
+					apiKey: aiCredits.apiKey,
+					url: aiCredits.url,
+				},
+				isManaged: true,
+				projectId: payload?.projectId,
+			};
+
+			const newCredential = await this.credentialsService.createCredential(
+				credentialProperties,
+				req.user,
+			);
+
+			await this.userService.updateSettings(req.user.id, {
+				userClaimedAiCredits: true,
+			});
+
+			return newCredential;
+		} catch (e) {
+			assert(e instanceof Error);
+			throw new InternalServerError(e.message, e);
 		}
 	}
 }
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index c2ee1c92fb..fb06c1a80b 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -1,29 +1,28 @@
+import { LoginRequestDto, ResolveSignupTokenQueryDto } from '@n8n/api-types';
 import { Response } from 'express';
-import { ApplicationError } from 'n8n-workflow';
-import validator from 'validator';
+import { Logger } from 'n8n-core';
 
 import { handleEmailLogin, handleLdapLogin } from '@/auth';
 import { AuthService } from '@/auth/auth.service';
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import type { User } from '@/databases/entities/user';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { Get, Post, RestController } from '@/decorators';
+import { Body, Get, Post, Query, RestController } from '@/decorators';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { EventService } from '@/events/event.service';
 import type { PublicUser } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { MfaService } from '@/mfa/mfa.service';
 import { PostHogClient } from '@/posthog';
-import { AuthenticatedRequest, LoginRequest, UserRequest } from '@/requests';
+import { AuthenticatedRequest, AuthlessRequest } from '@/requests';
 import { UserService } from '@/services/user.service';
 import {
 	getCurrentAuthenticationMethod,
 	isLdapCurrentAuthenticationMethod,
 	isSamlCurrentAuthenticationMethod,
-} from '@/sso/sso-helpers';
+} from '@/sso.ee/sso-helpers';
 
 @RestController()
 export class AuthController {
@@ -40,10 +39,12 @@ export class AuthController {
 
 	/** Log in a user */
 	@Post('/login', { skipAuth: true, rateLimit: true })
-	async login(req: LoginRequest, res: Response): Promise<PublicUser | undefined> {
-		const { email, password, mfaToken, mfaRecoveryCode } = req.body;
-		if (!email) throw new ApplicationError('Email is required to log in');
-		if (!password) throw new ApplicationError('Password is required to log in');
+	async login(
+		req: AuthlessRequest,
+		res: Response,
+		@Body payload: LoginRequestDto,
+	): Promise<PublicUser | undefined> {
+		const { email, password, mfaCode, mfaRecoveryCode } = payload;
 
 		let user: User | undefined;
 
@@ -75,16 +76,16 @@ export class AuthController {
 
 		if (user) {
 			if (user.mfaEnabled) {
-				if (!mfaToken && !mfaRecoveryCode) {
+				if (!mfaCode && !mfaRecoveryCode) {
 					throw new AuthError('MFA Error', 998);
 				}
 
-				const isMFATokenValid = await this.mfaService.validateMfa(
+				const isMfaCodeOrMfaRecoveryCodeValid = await this.mfaService.validateMfa(
 					user.id,
-					mfaToken,
+					mfaCode,
 					mfaRecoveryCode,
 				);
-				if (!isMFATokenValid) {
+				if (!isMfaCodeOrMfaRecoveryCodeValid) {
 					throw new AuthError('Invalid mfa token or recovery code');
 				}
 			}
@@ -117,8 +118,12 @@ export class AuthController {
 
 	/** Validate invite token to enable invitee to set up their account */
 	@Get('/resolve-signup-token', { skipAuth: true })
-	async resolveSignupToken(req: UserRequest.ResolveSignUp) {
-		const { inviterId, inviteeId } = req.query;
+	async resolveSignupToken(
+		_req: AuthlessRequest,
+		_res: Response,
+		@Query payload: ResolveSignupTokenQueryDto,
+	) {
+		const { inviterId, inviteeId } = payload;
 		const isWithinUsersLimit = this.license.isWithinUsersLimit();
 
 		if (!isWithinUsersLimit) {
@@ -129,24 +134,6 @@ export class AuthController {
 			throw new ForbiddenError(RESPONSE_ERROR_MESSAGES.USERS_QUOTA_REACHED);
 		}
 
-		if (!inviterId || !inviteeId) {
-			this.logger.debug(
-				'Request to resolve signup token failed because of missing user IDs in query string',
-				{ inviterId, inviteeId },
-			);
-			throw new BadRequestError('Invalid payload');
-		}
-
-		// Postgres validates UUID format
-		for (const userId of [inviterId, inviteeId]) {
-			if (!validator.isUUID(userId)) {
-				this.logger.debug('Request to resolve signup token failed because of invalid user ID', {
-					userId,
-				});
-				throw new BadRequestError('Invalid userId');
-			}
-		}
-
 		const users = await this.userRepository.findManyByIds([inviterId, inviteeId]);
 
 		if (users.length !== 2) {
diff --git a/packages/cli/src/controllers/community-packages.controller.ts b/packages/cli/src/controllers/community-packages.controller.ts
index 5caf835f60..ab2134b7e0 100644
--- a/packages/cli/src/controllers/community-packages.controller.ts
+++ b/packages/cli/src/controllers/community-packages.controller.ts
@@ -115,9 +115,12 @@ export class CommunityPackagesController {
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
-			this.push.broadcast('reloadNodeType', {
-				name: node.type,
-				version: node.latestVersion,
+			this.push.broadcast({
+				type: 'reloadNodeType',
+				data: {
+					name: node.type,
+					version: node.latestVersion,
+				},
 			});
 		});
 
@@ -201,14 +204,17 @@ export class CommunityPackagesController {
 				error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
 			].join(':');
 
-			throw new InternalServerError(message);
+			throw new InternalServerError(message, error);
 		}
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
-			this.push.broadcast('removeNodeType', {
-				name: node.type,
-				version: node.latestVersion,
+			this.push.broadcast({
+				type: 'removeNodeType',
+				data: {
+					name: node.type,
+					version: node.latestVersion,
+				},
 			});
 		});
 
@@ -246,16 +252,22 @@ export class CommunityPackagesController {
 
 			// broadcast to connected frontends that node list has been updated
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				this.push.broadcast('removeNodeType', {
-					name: node.type,
-					version: node.latestVersion,
+				this.push.broadcast({
+					type: 'removeNodeType',
+					data: {
+						name: node.type,
+						version: node.latestVersion,
+					},
 				});
 			});
 
 			newInstalledPackage.installedNodes.forEach((node) => {
-				this.push.broadcast('reloadNodeType', {
-					name: node.name,
-					version: node.latestVersion,
+				this.push.broadcast({
+					type: 'reloadNodeType',
+					data: {
+						name: node.name,
+						version: node.latestVersion,
+					},
 				});
 			});
 
@@ -272,9 +284,12 @@ export class CommunityPackagesController {
 			return newInstalledPackage;
 		} catch (error) {
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				this.push.broadcast('removeNodeType', {
-					name: node.type,
-					version: node.latestVersion,
+				this.push.broadcast({
+					type: 'removeNodeType',
+					data: {
+						name: node.type,
+						version: node.latestVersion,
+					},
 				});
 			});
 
@@ -283,7 +298,7 @@ export class CommunityPackagesController {
 				error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
 			].join(':');
 
-			throw new InternalServerError(message);
+			throw new InternalServerError(message, error);
 		}
 	}
 }
diff --git a/packages/cli/src/controllers/dynamic-node-parameters.controller.ts b/packages/cli/src/controllers/dynamic-node-parameters.controller.ts
index f3df53d95b..987040d010 100644
--- a/packages/cli/src/controllers/dynamic-node-parameters.controller.ts
+++ b/packages/cli/src/controllers/dynamic-node-parameters.controller.ts
@@ -1,8 +1,13 @@
+import {
+	OptionsRequestDto,
+	ResourceLocatorRequestDto,
+	ResourceMapperFieldsRequestDto,
+	ActionResultRequestDto,
+} from '@n8n/api-types';
 import type { INodePropertyOptions, NodeParameterValueType } from 'n8n-workflow';
 
-import { Post, RestController } from '@/decorators';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { DynamicNodeParametersRequest } from '@/requests';
+import { Post, RestController, Body } from '@/decorators';
+import { AuthenticatedRequest } from '@/requests';
 import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
 import { getBase } from '@/workflow-execute-additional-data';
 
@@ -11,7 +16,11 @@ export class DynamicNodeParametersController {
 	constructor(private readonly service: DynamicNodeParametersService) {}
 
 	@Post('/options')
-	async getOptions(req: DynamicNodeParametersRequest.Options): Promise<INodePropertyOptions[]> {
+	async getOptions(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: OptionsRequestDto,
+	): Promise<INodePropertyOptions[]> {
 		const {
 			credentials,
 			currentNodeParameters,
@@ -19,7 +28,7 @@ export class DynamicNodeParametersController {
 			path,
 			methodName,
 			loadOptions,
-		} = req.body;
+		} = payload;
 
 		const additionalData = await getBase(req.user.id, currentNodeParameters);
 
@@ -48,7 +57,11 @@ export class DynamicNodeParametersController {
 	}
 
 	@Post('/resource-locator-results')
-	async getResourceLocatorResults(req: DynamicNodeParametersRequest.ResourceLocatorResults) {
+	async getResourceLocatorResults(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: ResourceLocatorRequestDto,
+	) {
 		const {
 			path,
 			methodName,
@@ -57,9 +70,7 @@ export class DynamicNodeParametersController {
 			credentials,
 			currentNodeParameters,
 			nodeTypeAndVersion,
-		} = req.body;
-
-		if (!methodName) throw new BadRequestError('Missing `methodName` in request body');
+		} = payload;
 
 		const additionalData = await getBase(req.user.id, currentNodeParameters);
 
@@ -76,10 +87,12 @@ export class DynamicNodeParametersController {
 	}
 
 	@Post('/resource-mapper-fields')
-	async getResourceMappingFields(req: DynamicNodeParametersRequest.ResourceMapperFields) {
-		const { path, methodName, credentials, currentNodeParameters, nodeTypeAndVersion } = req.body;
-
-		if (!methodName) throw new BadRequestError('Missing `methodName` in request body');
+	async getResourceMappingFields(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: ResourceMapperFieldsRequestDto,
+	) {
+		const { path, methodName, credentials, currentNodeParameters, nodeTypeAndVersion } = payload;
 
 		const additionalData = await getBase(req.user.id, currentNodeParameters);
 
@@ -93,27 +106,49 @@ export class DynamicNodeParametersController {
 		);
 	}
 
-	@Post('/action-result')
-	async getActionResult(
-		req: DynamicNodeParametersRequest.ActionResult,
-	): Promise<NodeParameterValueType> {
-		const { currentNodeParameters, nodeTypeAndVersion, path, credentials, handler, payload } =
-			req.body;
+	@Post('/local-resource-mapper-fields')
+	async getLocalResourceMappingFields(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: ResourceMapperFieldsRequestDto,
+	) {
+		const { path, methodName, currentNodeParameters, nodeTypeAndVersion } = payload;
 
 		const additionalData = await getBase(req.user.id, currentNodeParameters);
 
-		if (handler) {
-			return await this.service.getActionResult(
-				handler,
-				path,
-				additionalData,
-				nodeTypeAndVersion,
-				currentNodeParameters,
-				payload,
-				credentials,
-			);
-		}
+		return await this.service.getLocalResourceMappingFields(
+			methodName,
+			path,
+			additionalData,
+			nodeTypeAndVersion,
+		);
+	}
 
-		return;
+	@Post('/action-result')
+	async getActionResult(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: ActionResultRequestDto,
+	): Promise<NodeParameterValueType> {
+		const {
+			currentNodeParameters,
+			nodeTypeAndVersion,
+			path,
+			credentials,
+			handler,
+			payload: actionPayload,
+		} = payload;
+
+		const additionalData = await getBase(req.user.id, currentNodeParameters);
+
+		return await this.service.getActionResult(
+			handler,
+			path,
+			additionalData,
+			nodeTypeAndVersion,
+			currentNodeParameters,
+			actionPayload,
+			credentials,
+		);
 	}
 }
diff --git a/packages/cli/src/controllers/e2e.controller.ts b/packages/cli/src/controllers/e2e.controller.ts
index 9c5a1ff36d..025139aec2 100644
--- a/packages/cli/src/controllers/e2e.controller.ts
+++ b/packages/cli/src/controllers/e2e.controller.ts
@@ -1,6 +1,7 @@
-import type { PushPayload, PushType } from '@n8n/api-types';
+import type { PushMessage } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import { Request } from 'express';
-import Container from 'typedi';
+import { Logger } from 'n8n-core';
 import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
@@ -14,10 +15,8 @@ import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'
 import type { BooleanLicenseFeature, NumericLicenseFeature } from '@/interfaces';
 import type { FeatureReturnType } from '@/license';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { MfaService } from '@/mfa/mfa.service';
 import { Push } from '@/push';
-import type { UserSetupPayload } from '@/requests';
 import { CacheService } from '@/services/cache/cache.service';
 import { PasswordUtility } from '@/services/password.utility';
 
@@ -48,6 +47,16 @@ const tablesToTruncate = [
 	'workflows_tags',
 ];
 
+type UserSetupPayload = {
+	email: string;
+	password: string;
+	firstName: string;
+	lastName: string;
+	mfaEnabled?: boolean;
+	mfaSecret?: string;
+	mfaRecoveryCodes?: string[];
+};
+
 type ResetRequest = Request<
 	{},
 	{},
@@ -58,14 +67,12 @@ type ResetRequest = Request<
 	}
 >;
 
-type PushRequest<T extends PushType> = Request<
+type PushRequest = Request<
 	{},
 	{},
 	{
-		type: T;
 		pushRef: string;
-		data: PushPayload<T>;
-	}
+	} & PushMessage
 >;
 
 @RestController('/e2e')
@@ -93,14 +100,29 @@ export class E2EController {
 		[LICENSE_FEATURES.AI_ASSISTANT]: false,
 		[LICENSE_FEATURES.COMMUNITY_NODES_CUSTOM_REGISTRY]: false,
 		[LICENSE_FEATURES.ASK_AI]: false,
+		[LICENSE_FEATURES.AI_CREDITS]: false,
 	};
 
-	private numericFeatures: Record<NumericLicenseFeature, number> = {
+	private static readonly numericFeaturesDefaults: Record<NumericLicenseFeature, number> = {
 		[LICENSE_QUOTAS.TRIGGER_LIMIT]: -1,
 		[LICENSE_QUOTAS.VARIABLES_LIMIT]: -1,
 		[LICENSE_QUOTAS.USERS_LIMIT]: -1,
 		[LICENSE_QUOTAS.WORKFLOW_HISTORY_PRUNE_LIMIT]: -1,
 		[LICENSE_QUOTAS.TEAM_PROJECT_LIMIT]: 0,
+		[LICENSE_QUOTAS.AI_CREDITS]: 0,
+	};
+
+	private numericFeatures: Record<NumericLicenseFeature, number> = {
+		[LICENSE_QUOTAS.TRIGGER_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.TRIGGER_LIMIT],
+		[LICENSE_QUOTAS.VARIABLES_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.VARIABLES_LIMIT],
+		[LICENSE_QUOTAS.USERS_LIMIT]: E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.USERS_LIMIT],
+		[LICENSE_QUOTAS.WORKFLOW_HISTORY_PRUNE_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.WORKFLOW_HISTORY_PRUNE_LIMIT],
+		[LICENSE_QUOTAS.TEAM_PROJECT_LIMIT]:
+			E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.TEAM_PROJECT_LIMIT],
+		[LICENSE_QUOTAS.AI_CREDITS]: E2EController.numericFeaturesDefaults[LICENSE_QUOTAS.AI_CREDITS],
 	};
 
 	constructor(
@@ -144,8 +166,9 @@ export class E2EController {
 	}
 
 	@Post('/push', { skipAuth: true })
-	async pushSend(req: PushRequest<any>) {
-		this.push.broadcast(req.body.type, req.body.data);
+	async pushSend(req: PushRequest) {
+		const { pushRef: _, ...pushMsg } = req.body;
+		this.push.broadcast(pushMsg);
 	}
 
 	@Patch('/feature', { skipAuth: true })
@@ -171,6 +194,11 @@ export class E2EController {
 		for (const feature of Object.keys(this.enabledFeatures)) {
 			this.enabledFeatures[feature as BooleanLicenseFeature] = false;
 		}
+
+		for (const feature of Object.keys(this.numericFeatures)) {
+			this.numericFeatures[feature as NumericLicenseFeature] =
+				E2EController.numericFeaturesDefaults[feature as NumericLicenseFeature];
+		}
 	}
 
 	private async removeActiveWorkflows() {
diff --git a/packages/cli/src/controllers/invitation.controller.ts b/packages/cli/src/controllers/invitation.controller.ts
index cbd2afb9f4..d8a0e503f6 100644
--- a/packages/cli/src/controllers/invitation.controller.ts
+++ b/packages/cli/src/controllers/invitation.controller.ts
@@ -1,23 +1,23 @@
+import { AcceptInvitationRequestDto, InviteUsersRequestDto } from '@n8n/api-types';
 import { Response } from 'express';
-import validator from 'validator';
+import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import type { User } from '@/databases/entities/user';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { Post, GlobalScope, RestController } from '@/decorators';
+import { Post, GlobalScope, RestController, Body, Param } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { PostHogClient } from '@/posthog';
-import { UserRequest } from '@/requests';
+import { AuthenticatedRequest, AuthlessRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
 import { UserService } from '@/services/user.service';
-import { isSamlLicensedAndEnabled } from '@/sso/saml/saml-helpers';
+import { isSamlLicensedAndEnabled } from '@/sso.ee/saml/saml-helpers';
 
 @RestController('/invitations')
 export class InvitationController {
@@ -39,7 +39,13 @@ export class InvitationController {
 
 	@Post('/', { rateLimit: { limit: 10 } })
 	@GlobalScope('user:create')
-	async inviteUser(req: UserRequest.Invite) {
+	async inviteUser(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body invitations: InviteUsersRequestDto,
+	) {
+		if (invitations.length === 0) return [];
+
 		const isWithinUsersLimit = this.license.isWithinUsersLimit();
 
 		if (isSamlLicensedAndEnabled()) {
@@ -65,50 +71,15 @@ export class InvitationController {
 			throw new BadRequestError('You must set up your own account before inviting others');
 		}
 
-		if (!Array.isArray(req.body)) {
-			this.logger.debug(
-				'Request to send email invite(s) to user(s) failed because the payload is not an array',
-				{
-					payload: req.body,
-				},
-			);
-			throw new BadRequestError('Invalid payload');
-		}
-
-		if (!req.body.length) return [];
-
-		req.body.forEach((invite) => {
-			if (typeof invite !== 'object' || !invite.email) {
-				throw new BadRequestError(
-					'Request to send email invite(s) to user(s) failed because the payload is not an array shaped Array<{ email: string }>',
-				);
-			}
-
-			if (!validator.isEmail(invite.email)) {
-				this.logger.debug('Invalid email in payload', { invalidEmail: invite.email });
-				throw new BadRequestError(
-					`Request to send email invite(s) to user(s) failed because of an invalid email address: ${invite.email}`,
-				);
-			}
-
-			if (invite.role && !['global:member', 'global:admin'].includes(invite.role)) {
-				throw new BadRequestError(
-					`Cannot invite user with invalid role: ${invite.role}. Please ensure all invitees' roles are either 'global:member' or 'global:admin'.`,
-				);
-			}
-
-			if (invite.role === 'global:admin' && !this.license.isAdvancedPermissionsLicensed()) {
+		const attributes = invitations.map(({ email, role }) => {
+			if (role === 'global:admin' && !this.license.isAdvancedPermissionsLicensed()) {
 				throw new ForbiddenError(
 					'Cannot invite admin user without advanced permissions. Please upgrade to a license that includes this feature.',
 				);
 			}
+			return { email, role };
 		});
 
-		const attributes = req.body.map(({ email, role }) => ({
-			email,
-			role: role ?? 'global:member',
-		}));
-
 		const { usersInvited, usersCreated } = await this.userService.inviteUsers(req.user, attributes);
 
 		await this.externalHooks.run('user.invited', [usersCreated]);
@@ -120,20 +91,13 @@ export class InvitationController {
 	 * Fill out user shell with first name, last name, and password.
 	 */
 	@Post('/:id/accept', { skipAuth: true })
-	async acceptInvitation(req: UserRequest.Update, res: Response) {
-		const { id: inviteeId } = req.params;
-
-		const { inviterId, firstName, lastName, password } = req.body;
-
-		if (!inviterId || !inviteeId || !firstName || !lastName || !password) {
-			this.logger.debug(
-				'Request to fill out a user shell failed because of missing properties in payload',
-				{ payload: req.body },
-			);
-			throw new BadRequestError('Invalid payload');
-		}
-
-		const validPassword = this.passwordUtility.validate(password);
+	async acceptInvitation(
+		req: AuthlessRequest,
+		res: Response,
+		@Body payload: AcceptInvitationRequestDto,
+		@Param('id') inviteeId: string,
+	) {
+		const { inviterId, firstName, lastName, password } = payload;
 
 		const users = await this.userRepository.findManyByIds([inviterId, inviteeId]);
 
@@ -160,7 +124,7 @@ export class InvitationController {
 
 		invitee.firstName = firstName;
 		invitee.lastName = lastName;
-		invitee.password = await this.passwordUtility.hash(validPassword);
+		invitee.password = await this.passwordUtility.hash(password);
 
 		const updatedUser = await this.userRepository.save(invitee, { transaction: false });
 
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 6cbbda3622..bb42d13878 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -1,10 +1,12 @@
 import {
+	passwordSchema,
 	PasswordUpdateRequestDto,
 	SettingsUpdateRequestDto,
 	UserUpdateRequestDto,
 } from '@n8n/api-types';
 import { plainToInstance } from 'class-transformer';
 import { Response } from 'express';
+import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import type { User } from '@/databases/entities/user';
@@ -16,12 +18,11 @@ import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
 import type { PublicUser } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { MfaService } from '@/mfa/mfa.service';
 import { AuthenticatedRequest, MeRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
 import { UserService } from '@/services/user.service';
-import { isSamlLicensedAndEnabled } from '@/sso/saml/saml-helpers';
+import { isSamlLicensedAndEnabled } from '@/sso.ee/saml/saml-helpers';
 
 import { PersonalizationSurveyAnswersV4 } from './survey-answers.dto';
 @RestController('/me')
@@ -68,8 +69,8 @@ export class MeController {
 				throw new BadRequestError('Two-factor code is required to change email');
 			}
 
-			const isMfaTokenValid = await this.mfaService.validateMfa(userId, payload.mfaCode, undefined);
-			if (!isMfaTokenValid) {
+			const isMfaCodeValid = await this.mfaService.validateMfa(userId, payload.mfaCode, undefined);
+			if (!isMfaCodeValid) {
 				throw new InvalidMfaCodeError();
 			}
 		}
@@ -122,10 +123,6 @@ export class MeController {
 			);
 		}
 
-		if (typeof currentPassword !== 'string' || typeof newPassword !== 'string') {
-			throw new BadRequestError('Invalid payload.');
-		}
-
 		if (!user.password) {
 			throw new BadRequestError('Requesting user not set up.');
 		}
@@ -135,20 +132,25 @@ export class MeController {
 			throw new BadRequestError('Provided current password is incorrect.');
 		}
 
-		const validPassword = this.passwordUtility.validate(newPassword);
+		const passwordValidation = passwordSchema.safeParse(newPassword);
+		if (!passwordValidation.success) {
+			throw new BadRequestError(
+				passwordValidation.error.errors.map(({ message }) => message).join(' '),
+			);
+		}
 
 		if (user.mfaEnabled) {
 			if (typeof mfaCode !== 'string') {
 				throw new BadRequestError('Two-factor code is required to change password.');
 			}
 
-			const isMfaTokenValid = await this.mfaService.validateMfa(user.id, mfaCode, undefined);
-			if (!isMfaTokenValid) {
+			const isMfaCodeValid = await this.mfaService.validateMfa(user.id, mfaCode, undefined);
+			if (!isMfaCodeValid) {
 				throw new InvalidMfaCodeError();
 			}
 		}
 
-		user.password = await this.passwordUtility.hash(validPassword);
+		user.password = await this.passwordUtility.hash(newPassword);
 
 		const updatedUser = await this.userRepository.save(user, { transaction: false });
 		this.logger.info('Password updated successfully', { userId: user.id });
diff --git a/packages/cli/src/controllers/mfa.controller.ts b/packages/cli/src/controllers/mfa.controller.ts
index 694765761c..26aeca5432 100644
--- a/packages/cli/src/controllers/mfa.controller.ts
+++ b/packages/cli/src/controllers/mfa.controller.ts
@@ -59,7 +59,7 @@ export class MFAController {
 
 	@Post('/enable', { rateLimit: true })
 	async activateMFA(req: MFA.Activate) {
-		const { token = null } = req.body;
+		const { mfaCode = null } = req.body;
 		const { id, mfaEnabled } = req.user;
 
 		await this.externalHooks.run('mfa.beforeSetup', [req.user]);
@@ -67,7 +67,7 @@ export class MFAController {
 		const { decryptedSecret: secret, decryptedRecoveryCodes: recoveryCodes } =
 			await this.mfaService.getSecretAndRecoveryCodes(id);
 
-		if (!token) throw new BadRequestError('Token is required to enable MFA feature');
+		if (!mfaCode) throw new BadRequestError('Token is required to enable MFA feature');
 
 		if (mfaEnabled) throw new BadRequestError('MFA already enabled');
 
@@ -75,10 +75,10 @@ export class MFAController {
 			throw new BadRequestError('Cannot enable MFA without generating secret and recovery codes');
 		}
 
-		const verified = this.mfaService.totp.verifySecret({ secret, token, window: 10 });
+		const verified = this.mfaService.totp.verifySecret({ secret, mfaCode, window: 10 });
 
 		if (!verified)
-			throw new BadRequestError('MFA token expired. Close the modal and enable MFA again', 997);
+			throw new BadRequestError('MFA code expired. Close the modal and enable MFA again', 997);
 
 		await this.mfaService.enableMfa(id);
 	}
@@ -86,27 +86,38 @@ export class MFAController {
 	@Post('/disable', { rateLimit: true })
 	async disableMFA(req: MFA.Disable) {
 		const { id: userId } = req.user;
-		const { token = null } = req.body;
 
-		if (typeof token !== 'string' || !token) {
-			throw new BadRequestError('Token is required to disable MFA feature');
+		const { mfaCode, mfaRecoveryCode } = req.body;
+
+		const mfaCodeDefined = mfaCode && typeof mfaCode === 'string';
+
+		const mfaRecoveryCodeDefined = mfaRecoveryCode && typeof mfaRecoveryCode === 'string';
+
+		if (!mfaCodeDefined === !mfaRecoveryCodeDefined) {
+			throw new BadRequestError(
+				'Either MFA code or recovery code is required to disable MFA feature',
+			);
 		}
 
-		await this.mfaService.disableMfa(userId, token);
+		if (mfaCodeDefined) {
+			await this.mfaService.disableMfaWithMfaCode(userId, mfaCode);
+		} else if (mfaRecoveryCodeDefined) {
+			await this.mfaService.disableMfaWithRecoveryCode(userId, mfaRecoveryCode);
+		}
 	}
 
 	@Post('/verify', { rateLimit: true })
 	async verifyMFA(req: MFA.Verify) {
 		const { id } = req.user;
-		const { token } = req.body;
+		const { mfaCode } = req.body;
 
 		const { decryptedSecret: secret } = await this.mfaService.getSecretAndRecoveryCodes(id);
 
-		if (!token) throw new BadRequestError('Token is required to enable MFA feature');
+		if (!mfaCode) throw new BadRequestError('MFA code is required to enable MFA feature');
 
 		if (!secret) throw new BadRequestError('No MFA secret se for this user');
 
-		const verified = this.mfaService.totp.verifySecret({ secret, token });
+		const verified = this.mfaService.totp.verifySecret({ secret, mfaCode });
 
 		if (!verified) throw new BadRequestError('MFA secret could not be verified');
 	}
diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
index 68a86269d3..570181aa78 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth1-credential.controller.test.ts
@@ -1,23 +1,24 @@
+import { Container } from '@n8n/di';
 import Csrf from 'csrf';
 import type { Response } from 'express';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
+import { Logger } from 'n8n-core';
 import nock from 'nock';
-import Container from 'typedi';
 
+import { Time } from '@/constants';
 import { OAuth1CredentialController } from '@/controllers/oauth/oauth1-credential.controller';
 import { CredentialsHelper } from '@/credentials-helper';
-import { CredentialsEntity } from '@/databases/entities/credentials-entity';
+import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { User } from '@/databases/entities/user';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
-import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { VariablesService } from '@/environments.ee/variables/variables.service.ee';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
-import { Logger } from '@/logging/logger.service';
 import type { OAuthRequest } from '@/requests';
-import { SecretsHelper } from '@/secrets-helpers';
+import { SecretsHelper } from '@/secrets-helpers.ee';
 import { mockInstance } from '@test/mocking';
 
 describe('OAuth1CredentialController', () => {
@@ -47,8 +48,12 @@ describe('OAuth1CredentialController', () => {
 
 	const controller = Container.get(OAuth1CredentialController);
 
+	const timestamp = 1706750625678;
+	jest.useFakeTimers({ advanceTimers: true });
+
 	beforeEach(() => {
-		jest.resetAllMocks();
+		jest.setSystemTime(new Date(timestamp));
+		jest.clearAllMocks();
 	});
 
 	describe('getAuthUri', () => {
@@ -76,13 +81,15 @@ describe('OAuth1CredentialController', () => {
 			credentialsHelper.applyDefaultsAndOverwrites.mockReturnValueOnce({
 				requestTokenUrl: 'https://example.domain/oauth/request_token',
 				authUrl: 'https://example.domain/oauth/authorize',
+				accessTokenUrl: 'https://example.domain/oauth/access_token',
 				signatureMethod: 'HMAC-SHA1',
 			});
 			nock('https://example.domain')
 				.post('/oauth/request_token', {
 					oauth_callback:
-						'http://localhost:5678/rest/oauth1-credential/callback?state=eyJ0b2tlbiI6InRva2VuIiwiY2lkIjoiMSJ9',
+						'http://localhost:5678/rest/oauth1-credential/callback?state=eyJ0b2tlbiI6InRva2VuIiwiY2lkIjoiMSIsImNyZWF0ZWRBdCI6MTcwNjc1MDYyNTY3OCwidXNlcklkIjoiMTIzIn0=',
 				})
+				.once()
 				.reply(200, { oauth_token: 'random-token' });
 			cipher.encrypt.mockReturnValue('encrypted');
 
@@ -107,14 +114,23 @@ describe('OAuth1CredentialController', () => {
 			JSON.stringify({
 				token: 'token',
 				cid: '1',
+				createdAt: timestamp,
 			}),
 		).toString('base64');
 
+		const res = mock<Response>();
+		const req = mock<OAuthRequest.OAuth1Credential.Callback>({
+			query: {
+				oauth_verifier: 'verifier',
+				oauth_token: 'token',
+				state: validState,
+			},
+		});
+
 		it('should render the error page when required query params are missing', async () => {
-			const req = mock<OAuthRequest.OAuth1Credential.Callback>();
-			const res = mock<Response>();
-			req.query = { state: 'test' } as OAuthRequest.OAuth1Credential.Callback['query'];
-			await controller.handleCallback(req, res);
+			const invalidReq = mock<OAuthRequest.OAuth1Credential.Callback>();
+			invalidReq.query = { state: 'test' } as OAuthRequest.OAuth1Credential.Callback['query'];
+			await controller.handleCallback(invalidReq, res);
 
 			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
 				error: {
@@ -126,14 +142,14 @@ describe('OAuth1CredentialController', () => {
 		});
 
 		it('should render the error page when `state` query param is invalid', async () => {
-			const req = mock<OAuthRequest.OAuth1Credential.Callback>();
-			const res = mock<Response>();
-			req.query = {
-				oauth_verifier: 'verifier',
-				oauth_token: 'token',
-				state: 'test',
-			} as OAuthRequest.OAuth1Credential.Callback['query'];
-			await controller.handleCallback(req, res);
+			const invalidReq = mock<OAuthRequest.OAuth1Credential.Callback>({
+				query: {
+					oauth_verifier: 'verifier',
+					oauth_token: 'token',
+					state: 'test',
+				},
+			});
+			await controller.handleCallback(invalidReq, res);
 
 			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
 				error: {
@@ -146,18 +162,11 @@ describe('OAuth1CredentialController', () => {
 		it('should render the error page when credential is not found in DB', async () => {
 			credentialsRepository.findOneBy.mockResolvedValueOnce(null);
 
-			const req = mock<OAuthRequest.OAuth1Credential.Callback>();
-			const res = mock<Response>();
-			req.query = {
-				oauth_verifier: 'verifier',
-				oauth_token: 'token',
-				state: validState,
-			} as OAuthRequest.OAuth1Credential.Callback['query'];
 			await controller.handleCallback(req, res);
 
 			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
 				error: {
-					message: 'OAuth1 callback failed because of insufficient permissions',
+					message: 'OAuth callback failed because of insufficient permissions',
 				},
 			});
 			expect(credentialsRepository.findOneBy).toHaveBeenCalledTimes(1);
@@ -165,24 +174,67 @@ describe('OAuth1CredentialController', () => {
 		});
 
 		it('should render the error page when state differs from the stored state in the credential', async () => {
-			credentialsRepository.findOneBy.mockResolvedValue(new CredentialsEntity());
+			credentialsRepository.findOneBy.mockResolvedValue(credential);
 			credentialsHelper.getDecrypted.mockResolvedValue({ csrfSecret: 'invalid' });
 
-			const req = mock<OAuthRequest.OAuth1Credential.Callback>();
-			const res = mock<Response>();
-			req.query = {
-				oauth_verifier: 'verifier',
-				oauth_token: 'token',
-				state: validState,
-			} as OAuthRequest.OAuth1Credential.Callback['query'];
-
 			await controller.handleCallback(req, res);
 
 			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
 				error: {
-					message: 'The OAuth1 callback state is invalid!',
+					message: 'The OAuth callback state is invalid!',
 				},
 			});
 		});
+
+		it('should render the error page when state is older than 5 minutes', async () => {
+			credentialsRepository.findOneBy.mockResolvedValue(credential);
+			credentialsHelper.getDecrypted.mockResolvedValue({ csrfSecret });
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+
+			jest.advanceTimersByTime(10 * Time.minutes.toMilliseconds);
+
+			await controller.handleCallback(req, res);
+
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: {
+					message: 'The OAuth callback state is invalid!',
+				},
+			});
+		});
+
+		it('should exchange the code for a valid token, and save it to DB', async () => {
+			credentialsRepository.findOneBy.mockResolvedValue(credential);
+			credentialsHelper.getDecrypted.mockResolvedValue({ csrfSecret });
+			credentialsHelper.applyDefaultsAndOverwrites.mockReturnValueOnce({
+				requestTokenUrl: 'https://example.domain/oauth/request_token',
+				accessTokenUrl: 'https://example.domain/oauth/access_token',
+				signatureMethod: 'HMAC-SHA1',
+			});
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+			nock('https://example.domain')
+				.post('/oauth/access_token', {
+					oauth_token: 'token',
+					oauth_verifier: 'verifier',
+				})
+				.once()
+				.reply(200, 'access_token=new_token');
+			cipher.encrypt.mockReturnValue('encrypted');
+
+			await controller.handleCallback(req, res);
+
+			expect(cipher.encrypt).toHaveBeenCalledWith({
+				oauthTokenData: { access_token: 'new_token' },
+			});
+			expect(credentialsRepository.update).toHaveBeenCalledWith(
+				'1',
+				expect.objectContaining({
+					data: 'encrypted',
+					id: '1',
+					name: 'Test Credential',
+					type: 'oAuth1Api',
+				}),
+			);
+			expect(res.render).toHaveBeenCalledWith('oauth-callback');
+		});
 	});
 });
diff --git a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
index 9fc98d5557..1984d12f59 100644
--- a/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/oauth2-credential.controller.test.ts
@@ -1,23 +1,24 @@
+import { Container } from '@n8n/di';
 import Csrf from 'csrf';
 import { type Response } from 'express';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
+import { Logger } from 'n8n-core';
 import nock from 'nock';
-import Container from 'typedi';
 
+import { CREDENTIAL_BLANKING_VALUE, Time } from '@/constants';
 import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credential.controller';
 import { CredentialsHelper } from '@/credentials-helper';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { User } from '@/databases/entities/user';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
-import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { VariablesService } from '@/environments.ee/variables/variables.service.ee';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
-import { Logger } from '@/logging/logger.service';
 import type { OAuthRequest } from '@/requests';
-import { SecretsHelper } from '@/secrets-helpers';
+import { SecretsHelper } from '@/secrets-helpers.ee';
 import { mockInstance } from '@test/mocking';
 
 describe('OAuth2CredentialController', () => {
@@ -47,8 +48,19 @@ describe('OAuth2CredentialController', () => {
 
 	const controller = Container.get(OAuth2CredentialController);
 
+	const timestamp = 1706750625678;
+	jest.useFakeTimers({ advanceTimers: true });
+
 	beforeEach(() => {
-		jest.resetAllMocks();
+		jest.setSystemTime(new Date(timestamp));
+		jest.clearAllMocks();
+
+		credentialsHelper.applyDefaultsAndOverwrites.mockReturnValue({
+			clientId: 'test-client-id',
+			clientSecret: 'oauth-secret',
+			authUrl: 'https://example.domain/o/oauth2/v2/auth',
+			accessTokenUrl: 'https://example.domain/token',
+		});
 	});
 
 	describe('getAuthUri', () => {
@@ -73,17 +85,20 @@ describe('OAuth2CredentialController', () => {
 			jest.spyOn(Csrf.prototype, 'create').mockReturnValueOnce('token');
 			sharedCredentialsRepository.findCredentialForUser.mockResolvedValueOnce(credential);
 			credentialsHelper.getDecrypted.mockResolvedValueOnce({});
-			credentialsHelper.applyDefaultsAndOverwrites.mockReturnValue({
-				clientId: 'test-client-id',
-				authUrl: 'https://example.domain/o/oauth2/v2/auth',
-			});
 			cipher.encrypt.mockReturnValue('encrypted');
 
 			const req = mock<OAuthRequest.OAuth2Credential.Auth>({ user, query: { id: '1' } });
 			const authUri = await controller.getAuthUri(req);
 			expect(authUri).toEqual(
-				'https://example.domain/o/oauth2/v2/auth?client_id=test-client-id&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback&response_type=code&state=eyJ0b2tlbiI6InRva2VuIiwiY2lkIjoiMSJ9&scope=openid',
+				'https://example.domain/o/oauth2/v2/auth?client_id=test-client-id&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback&response_type=code&state=eyJ0b2tlbiI6InRva2VuIiwiY2lkIjoiMSIsImNyZWF0ZWRBdCI6MTcwNjc1MDYyNTY3OCwidXNlcklkIjoiMTIzIn0%3D&scope=openid',
 			);
+			const state = new URL(authUri).searchParams.get('state');
+			expect(JSON.parse(Buffer.from(state!, 'base64').toString())).toEqual({
+				token: 'token',
+				cid: '1',
+				createdAt: timestamp,
+				userId: '123',
+			});
 			expect(credentialsRepository.update).toHaveBeenCalledWith(
 				'1',
 				expect.objectContaining({
@@ -101,15 +116,21 @@ describe('OAuth2CredentialController', () => {
 			JSON.stringify({
 				token: 'token',
 				cid: '1',
+				createdAt: timestamp,
 			}),
 		).toString('base64');
 
+		const res = mock<Response>();
+		const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+			query: { code: 'code', state: validState },
+			originalUrl: '?code=code',
+		});
+
 		it('should render the error page when required query params are missing', async () => {
-			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+			const invalidReq = mock<OAuthRequest.OAuth2Credential.Callback>({
 				query: { code: undefined, state: undefined },
 			});
-			const res = mock<Response>();
-			await controller.handleCallback(req, res);
+			await controller.handleCallback(invalidReq, res);
 
 			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
 				error: {
@@ -121,11 +142,11 @@ describe('OAuth2CredentialController', () => {
 		});
 
 		it('should render the error page when `state` query param is invalid', async () => {
-			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
+			const invalidReq = mock<OAuthRequest.OAuth2Credential.Callback>({
 				query: { code: 'code', state: 'invalid-state' },
 			});
-			const res = mock<Response>();
-			await controller.handleCallback(req, res);
+
+			await controller.handleCallback(invalidReq, res);
 
 			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
 				error: {
@@ -138,15 +159,11 @@ describe('OAuth2CredentialController', () => {
 		it('should render the error page when credential is not found in DB', async () => {
 			credentialsRepository.findOneBy.mockResolvedValueOnce(null);
 
-			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
-				query: { code: 'code', state: validState },
-			});
-			const res = mock<Response>();
 			await controller.handleCallback(req, res);
 
 			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
 				error: {
-					message: 'OAuth2 callback failed because of insufficient permissions',
+					message: 'OAuth callback failed because of insufficient permissions',
 				},
 			});
 			expect(credentialsRepository.findOneBy).toHaveBeenCalledTimes(1);
@@ -158,26 +175,94 @@ describe('OAuth2CredentialController', () => {
 			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
 			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(false);
 
-			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
-				query: { code: 'code', state: validState },
-			});
-			const res = mock<Response>();
 			await controller.handleCallback(req, res);
 			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
 				error: {
-					message: 'The OAuth2 callback state is invalid!',
+					message: 'The OAuth callback state is invalid!',
 				},
 			});
 			expect(externalHooks.run).not.toHaveBeenCalled();
 		});
 
+		it('should render the error page when state is older than 5 minutes', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+
+			jest.advanceTimersByTime(10 * Time.minutes.toMilliseconds);
+
+			await controller.handleCallback(req, res);
+
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: {
+					message: 'The OAuth callback state is invalid!',
+				},
+			});
+			expect(externalHooks.run).not.toHaveBeenCalled();
+		});
+
+		it('should render the error page when code exchange fails', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+			nock('https://example.domain')
+				.post(
+					'/token',
+					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
+				)
+				.reply(403, { error: 'Code could not be exchanged' });
+
+			await controller.handleCallback(req, res);
+
+			expect(externalHooks.run).toHaveBeenCalled();
+			expect(res.render).toHaveBeenCalledWith('oauth-error-callback', {
+				error: {
+					message: 'Code could not be exchanged',
+					reason: '{"error":"Code could not be exchanged"}',
+				},
+			});
+		});
+
 		it('should exchange the code for a valid token, and save it to DB', async () => {
 			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
 			credentialsHelper.getDecrypted.mockResolvedValueOnce({ csrfSecret });
-			credentialsHelper.applyDefaultsAndOverwrites.mockReturnValue({
-				clientId: 'test-client-id',
-				clientSecret: 'oauth-secret',
-				accessTokenUrl: 'https://example.domain/token',
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+			nock('https://example.domain')
+				.post(
+					'/token',
+					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
+				)
+				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
+			cipher.encrypt.mockReturnValue('encrypted');
+
+			await controller.handleCallback(req, res);
+
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
+				expect.objectContaining({
+					clientId: 'test-client-id',
+					redirectUri: 'http://localhost:5678/rest/oauth2-credential/callback',
+				}),
+			]);
+			expect(cipher.encrypt).toHaveBeenCalledWith({
+				oauthTokenData: { access_token: 'access-token', refresh_token: 'refresh-token' },
+			});
+			expect(credentialsRepository.update).toHaveBeenCalledWith(
+				'1',
+				expect.objectContaining({
+					data: 'encrypted',
+					id: '1',
+					name: 'Test Credential',
+					type: 'oAuth2Api',
+				}),
+			);
+			expect(res.render).toHaveBeenCalledWith('oauth-callback');
+		});
+
+		it('merges oauthTokenData if it already exists', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({
+				csrfSecret,
+				oauthTokenData: { token: true },
 			});
 			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
 			nock('https://example.domain')
@@ -188,11 +273,48 @@ describe('OAuth2CredentialController', () => {
 				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
 			cipher.encrypt.mockReturnValue('encrypted');
 
-			const req = mock<OAuthRequest.OAuth2Credential.Callback>({
-				query: { code: 'code', state: validState },
-				originalUrl: '?code=code',
+			await controller.handleCallback(req, res);
+
+			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
+				expect.objectContaining({
+					clientId: 'test-client-id',
+					redirectUri: 'http://localhost:5678/rest/oauth2-credential/callback',
+				}),
+			]);
+			expect(cipher.encrypt).toHaveBeenCalledWith({
+				oauthTokenData: {
+					token: true,
+					access_token: 'access-token',
+					refresh_token: 'refresh-token',
+				},
 			});
-			const res = mock<Response>();
+			expect(credentialsRepository.update).toHaveBeenCalledWith(
+				'1',
+				expect.objectContaining({
+					data: 'encrypted',
+					id: '1',
+					name: 'Test Credential',
+					type: 'oAuth2Api',
+				}),
+			);
+			expect(res.render).toHaveBeenCalledWith('oauth-callback');
+		});
+
+		it('overwrites oauthTokenData if it is a string', async () => {
+			credentialsRepository.findOneBy.mockResolvedValueOnce(credential);
+			credentialsHelper.getDecrypted.mockResolvedValueOnce({
+				csrfSecret,
+				oauthTokenData: CREDENTIAL_BLANKING_VALUE,
+			});
+			jest.spyOn(Csrf.prototype, 'verify').mockReturnValueOnce(true);
+			nock('https://example.domain')
+				.post(
+					'/token',
+					'code=code&grant_type=authorization_code&redirect_uri=http%3A%2F%2Flocalhost%3A5678%2Frest%2Foauth2-credential%2Fcallback',
+				)
+				.reply(200, { access_token: 'access-token', refresh_token: 'refresh-token' });
+			cipher.encrypt.mockReturnValue('encrypted');
+
 			await controller.handleCallback(req, res);
 
 			expect(externalHooks.run).toHaveBeenCalledWith('oauth2.callback', [
diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
index 6e162af988..bac924a023 100644
--- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
+++ b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
@@ -1,29 +1,41 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import Csrf from 'csrf';
 import type { Response } from 'express';
-import { Credentials } from 'n8n-core';
+import { Credentials, Logger } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
 import { jsonParse, ApplicationError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
+import { RESPONSE_ERROR_MESSAGES, Time } from '@/constants';
 import { CredentialsHelper } from '@/credentials-helper';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
+import { AuthError } from '@/errors/response-errors/auth.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
 import type { ICredentialsDb } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
-import type { OAuthRequest } from '@/requests';
+import type { AuthenticatedRequest, OAuthRequest } from '@/requests';
 import { UrlService } from '@/services/url.service';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
-export interface CsrfStateParam {
+type CsrfStateParam = {
+	/** Id of the oAuth credential in the DB */
 	cid: string;
+	/** Random CSRF token, used to verify the signature of the CSRF state */
 	token: string;
-}
+	/** Creation timestamp of the CSRF state. Used for expiration.  */
+	createdAt: number;
+	/** User who initiated OAuth flow, included to prevent cross-user credential hijacking. Optional only if `skipAuthOnOAuthCallback` is enabled. */
+	userId?: string;
+};
+
+const MAX_CSRF_AGE = 5 * Time.minutes.toMilliseconds;
+
+// TODO: Flip this flag in v2
+// https://linear.app/n8n/issue/CAT-329
+export const skipAuthOnOAuthCallback = process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK !== 'true';
 
 @Service()
 export abstract class AbstractOAuthController {
@@ -118,35 +130,73 @@ export abstract class AbstractOAuthController {
 		return await this.credentialsRepository.findOneBy({ id: credentialId });
 	}
 
-	createCsrfState(credentialsId: string): [string, string] {
+	createCsrfState(credentialsId: string, userId?: string): [string, string] {
 		const token = new Csrf();
 		const csrfSecret = token.secretSync();
 		const state: CsrfStateParam = {
 			token: token.create(csrfSecret),
 			cid: credentialsId,
+			createdAt: Date.now(),
+			userId,
 		};
 		return [csrfSecret, Buffer.from(JSON.stringify(state)).toString('base64')];
 	}
 
-	protected decodeCsrfState(encodedState: string): CsrfStateParam {
+	protected decodeCsrfState(encodedState: string, req: AuthenticatedRequest): CsrfStateParam {
 		const errorMessage = 'Invalid state format';
 		const decoded = jsonParse<CsrfStateParam>(Buffer.from(encodedState, 'base64').toString(), {
 			errorMessage,
 		});
+
 		if (typeof decoded.cid !== 'string' || typeof decoded.token !== 'string') {
 			throw new ApplicationError(errorMessage);
 		}
+
+		if (decoded.userId !== req.user?.id) {
+			throw new AuthError('Unauthorized');
+		}
+
 		return decoded;
 	}
 
-	protected verifyCsrfState(decrypted: ICredentialDataDecryptedObject, state: CsrfStateParam) {
+	protected verifyCsrfState(
+		decrypted: ICredentialDataDecryptedObject & { csrfSecret?: string },
+		state: CsrfStateParam,
+	) {
 		const token = new Csrf();
+
 		return (
-			decrypted.csrfSecret === undefined ||
-			!token.verify(decrypted.csrfSecret as string, state.token)
+			Date.now() - state.createdAt <= MAX_CSRF_AGE &&
+			decrypted.csrfSecret !== undefined &&
+			token.verify(decrypted.csrfSecret, state.token)
 		);
 	}
 
+	protected async resolveCredential<T>(
+		req: OAuthRequest.OAuth1Credential.Callback | OAuthRequest.OAuth2Credential.Callback,
+	): Promise<[ICredentialsDb, ICredentialDataDecryptedObject, T]> {
+		const { state: encodedState } = req.query;
+		const state = this.decodeCsrfState(encodedState, req);
+		const credential = await this.getCredentialWithoutUser(state.cid);
+		if (!credential) {
+			throw new ApplicationError('OAuth callback failed because of insufficient permissions');
+		}
+
+		const additionalData = await this.getAdditionalData();
+		const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
+		const oauthCredentials = this.applyDefaultsAndOverwrites<T>(
+			credential,
+			decryptedDataOriginal,
+			additionalData,
+		);
+
+		if (!this.verifyCsrfState(decryptedDataOriginal, state)) {
+			throw new ApplicationError('The OAuth callback state is invalid!');
+		}
+
+		return [credential, decryptedDataOriginal, oauthCredentials];
+	}
+
 	protected renderCallbackError(res: Response, message: string, reason?: string) {
 		res.render('oauth-error-callback', { error: { message, reason } });
 	}
diff --git a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
index 1d21c2f332..0211c463a9 100644
--- a/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth1-credential.controller.ts
@@ -2,15 +2,14 @@ import type { AxiosRequestConfig } from 'axios';
 import axios from 'axios';
 import { createHmac } from 'crypto';
 import { Response } from 'express';
+import { ensureError, jsonStringify } from 'n8n-workflow';
 import type { RequestOptions } from 'oauth-1.0a';
 import clientOAuth1 from 'oauth-1.0a';
 
 import { Get, RestController } from '@/decorators';
-import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { OAuthRequest } from '@/requests';
-import { sendErrorResponse } from '@/response-helper';
 
-import { AbstractOAuthController, type CsrfStateParam } from './abstract-oauth.controller';
+import { AbstractOAuthController, skipAuthOnOAuthCallback } from './abstract-oauth.controller';
 
 interface OAuth1CredentialData {
 	signatureMethod: 'HMAC-SHA256' | 'HMAC-SHA512' | 'HMAC-SHA1';
@@ -42,7 +41,10 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 			decryptedDataOriginal,
 			additionalData,
 		);
-		const [csrfSecret, state] = this.createCsrfState(credential.id);
+		const [csrfSecret, state] = this.createCsrfState(
+			credential.id,
+			skipAuthOnOAuthCallback ? undefined : req.user.id,
+		);
 
 		const signatureMethod = oauthCredentials.signatureMethod;
 
@@ -101,7 +103,7 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 	}
 
 	/** Verify and store app code. Generate access tokens and store for respective credential */
-	@Get('/callback', { usesTemplates: true, skipAuth: true })
+	@Get('/callback', { usesTemplates: true, skipAuth: skipAuthOnOAuthCallback })
 	async handleCallback(req: OAuthRequest.OAuth1Credential.Callback, res: Response) {
 		try {
 			const { oauth_verifier, oauth_token, state: encodedState } = req.query;
@@ -114,71 +116,36 @@ export class OAuth1CredentialController extends AbstractOAuthController {
 				);
 			}
 
-			let state: CsrfStateParam;
-			try {
-				state = this.decodeCsrfState(encodedState);
-			} catch (error) {
-				return this.renderCallbackError(res, (error as Error).message);
-			}
+			const [credential, decryptedDataOriginal, oauthCredentials] =
+				await this.resolveCredential<OAuth1CredentialData>(req);
 
-			const credentialId = state.cid;
-			const credential = await this.getCredentialWithoutUser(credentialId);
-			if (!credential) {
-				const errorMessage = 'OAuth1 callback failed because of insufficient permissions';
-				this.logger.error(errorMessage, { credentialId });
-				return this.renderCallbackError(res, errorMessage);
-			}
-
-			const additionalData = await this.getAdditionalData();
-			const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
-			const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth1CredentialData>(
-				credential,
-				decryptedDataOriginal,
-				additionalData,
-			);
-
-			if (this.verifyCsrfState(decryptedDataOriginal, state)) {
-				const errorMessage = 'The OAuth1 callback state is invalid!';
-				this.logger.debug(errorMessage, { credentialId });
-				return this.renderCallbackError(res, errorMessage);
-			}
-
-			const options: AxiosRequestConfig = {
-				method: 'POST',
-				url: oauthCredentials.accessTokenUrl,
-				params: {
-					oauth_token,
-					oauth_verifier,
-				},
-			};
-
-			let oauthToken;
-
-			try {
-				oauthToken = await axios.request(options);
-			} catch (error) {
-				this.logger.error('Unable to fetch tokens for OAuth1 callback', { credentialId });
-				const errorResponse = new NotFoundError('Unable to get access tokens!');
-				return sendErrorResponse(res, errorResponse);
-			}
+			const oauthToken = await axios.post<string>(oauthCredentials.accessTokenUrl, {
+				oauth_token,
+				oauth_verifier,
+			});
 
 			// Response comes as x-www-form-urlencoded string so convert it to JSON
 
-			const paramParser = new URLSearchParams(oauthToken.data as string);
+			const paramParser = new URLSearchParams(oauthToken.data);
 
 			const oauthTokenJson = Object.fromEntries(paramParser.entries());
 
+			delete decryptedDataOriginal.csrfSecret;
 			decryptedDataOriginal.oauthTokenData = oauthTokenJson;
 
 			await this.encryptAndSaveData(credential, decryptedDataOriginal);
 
 			this.logger.debug('OAuth1 callback successful for new credential', {
-				credentialId,
+				credentialId: credential.id,
 			});
 			return res.render('oauth-callback');
-		} catch (error) {
-			this.logger.error('OAuth1 callback failed because of insufficient user permissions');
-			return sendErrorResponse(res, error as Error);
+		} catch (e) {
+			const error = ensureError(e);
+			return this.renderCallbackError(
+				res,
+				error.message,
+				'body' in error ? jsonStringify(error.body) : undefined,
+			);
 		}
 	}
 }
diff --git a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
index fdce783c6e..e188670fde 100644
--- a/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
+++ b/packages/cli/src/controllers/oauth/oauth2-credential.controller.ts
@@ -8,11 +8,11 @@ import { jsonStringify } from 'n8n-workflow';
 import pkceChallenge from 'pkce-challenge';
 import * as qs from 'querystring';
 
+import { GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE as GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE } from '@/constants';
 import { Get, RestController } from '@/decorators';
 import { OAuthRequest } from '@/requests';
 
-import { AbstractOAuthController, type CsrfStateParam } from './abstract-oauth.controller';
-import { GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE as GENERIC_OAUTH2_CREDENTIALS_WITH_EDITABLE_SCOPE } from '../../constants';
+import { AbstractOAuthController, skipAuthOnOAuthCallback } from './abstract-oauth.controller';
 
 @RestController('/oauth2-credential')
 export class OAuth2CredentialController extends AbstractOAuthController {
@@ -44,7 +44,10 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 		);
 
 		// Generate a CSRF prevention token and send it as an OAuth2 state string
-		const [csrfSecret, state] = this.createCsrfState(credential.id);
+		const [csrfSecret, state] = this.createCsrfState(
+			credential.id,
+			skipAuthOnOAuthCallback ? undefined : req.user.id,
+		);
 
 		const oAuthOptions = {
 			...this.convertCredentialToOptions(oauthCredentials),
@@ -82,7 +85,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 	}
 
 	/** Verify and store app code. Generate access tokens and store for respective credential */
-	@Get('/callback', { usesTemplates: true, skipAuth: true })
+	@Get('/callback', { usesTemplates: true, skipAuth: skipAuthOnOAuthCallback })
 	async handleCallback(req: OAuthRequest.OAuth2Credential.Callback, res: Response) {
 		try {
 			const { code, state: encodedState } = req.query;
@@ -94,34 +97,8 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 				);
 			}
 
-			let state: CsrfStateParam;
-			try {
-				state = this.decodeCsrfState(encodedState);
-			} catch (error) {
-				return this.renderCallbackError(res, (error as Error).message);
-			}
-
-			const credentialId = state.cid;
-			const credential = await this.getCredentialWithoutUser(credentialId);
-			if (!credential) {
-				const errorMessage = 'OAuth2 callback failed because of insufficient permissions';
-				this.logger.error(errorMessage, { credentialId });
-				return this.renderCallbackError(res, errorMessage);
-			}
-
-			const additionalData = await this.getAdditionalData();
-			const decryptedDataOriginal = await this.getDecryptedData(credential, additionalData);
-			const oauthCredentials = this.applyDefaultsAndOverwrites<OAuth2CredentialData>(
-				credential,
-				decryptedDataOriginal,
-				additionalData,
-			);
-
-			if (this.verifyCsrfState(decryptedDataOriginal, state)) {
-				const errorMessage = 'The OAuth2 callback state is invalid!';
-				this.logger.debug(errorMessage, { credentialId });
-				return this.renderCallbackError(res, errorMessage);
-			}
+			const [credential, decryptedDataOriginal, oauthCredentials] =
+				await this.resolveCredential<OAuth2CredentialData>(req);
 
 			let options: Partial<ClientOAuth2Options> = {};
 
@@ -156,13 +133,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 				set(oauthToken.data, 'callbackQueryString', omit(req.query, 'state', 'code'));
 			}
 
-			if (oauthToken === undefined) {
-				const errorMessage = 'Unable to get OAuth2 access tokens!';
-				this.logger.error(errorMessage, { credentialId });
-				return this.renderCallbackError(res, errorMessage);
-			}
-
-			if (decryptedDataOriginal.oauthTokenData) {
+			if (typeof decryptedDataOriginal.oauthTokenData === 'object') {
 				// Only overwrite supplied data as some providers do for example just return the
 				// refresh_token on the very first request and not on subsequent ones.
 				Object.assign(decryptedDataOriginal.oauthTokenData, oauthToken.data);
@@ -175,7 +146,7 @@ export class OAuth2CredentialController extends AbstractOAuthController {
 			await this.encryptAndSaveData(credential, decryptedDataOriginal);
 
 			this.logger.debug('OAuth2 callback successful for credential', {
-				credentialId,
+				credentialId: credential.id,
 			});
 
 			return res.render('oauth-callback');
diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts
index 47d50ad3f0..5c7e8d1e2a 100644
--- a/packages/cli/src/controllers/owner.controller.ts
+++ b/packages/cli/src/controllers/owner.controller.ts
@@ -1,17 +1,17 @@
+import { DismissBannerRequestDto, OwnerSetupRequestDto } from '@n8n/api-types';
 import { Response } from 'express';
-import validator from 'validator';
+import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { GlobalScope, Post, RestController } from '@/decorators';
+import { Body, GlobalScope, Post, RestController } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
 import { validateEntity } from '@/generic-helpers';
-import { Logger } from '@/logging/logger.service';
 import { PostHogClient } from '@/posthog';
-import { OwnerRequest } from '@/requests';
+import { AuthenticatedRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
 import { UserService } from '@/services/user.service';
 
@@ -33,8 +33,8 @@ export class OwnerController {
 	 * and enable `isInstanceOwnerSetUp` setting.
 	 */
 	@Post('/setup', { skipAuth: true })
-	async setupOwner(req: OwnerRequest.Post, res: Response) {
-		const { email, firstName, lastName, password } = req.body;
+	async setupOwner(req: AuthenticatedRequest, res: Response, @Body payload: OwnerSetupRequestDto) {
+		const { email, firstName, lastName, password } = payload;
 
 		if (config.getEnv('userManagement.isInstanceOwnerSetUp')) {
 			this.logger.debug(
@@ -43,31 +43,15 @@ export class OwnerController {
 			throw new BadRequestError('Instance owner already setup');
 		}
 
-		if (!email || !validator.isEmail(email)) {
-			this.logger.debug('Request to claim instance ownership failed because of invalid email', {
-				invalidEmail: email,
-			});
-			throw new BadRequestError('Invalid email address');
-		}
-
-		const validPassword = this.passwordUtility.validate(password);
-
-		if (!firstName || !lastName) {
-			this.logger.debug(
-				'Request to claim instance ownership failed because of missing first name or last name in payload',
-				{ payload: req.body },
-			);
-			throw new BadRequestError('First and last names are mandatory');
-		}
-
 		let owner = await this.userRepository.findOneOrFail({
 			where: { role: 'global:owner' },
 		});
 		owner.email = email;
 		owner.firstName = firstName;
 		owner.lastName = lastName;
-		owner.password = await this.passwordUtility.hash(validPassword);
+		owner.password = await this.passwordUtility.hash(password);
 
+		// TODO: move XSS validation out into the DTO class
 		await validateEntity(owner);
 
 		owner = await this.userRepository.save(owner, { transaction: false });
@@ -92,8 +76,13 @@ export class OwnerController {
 
 	@Post('/dismiss-banner')
 	@GlobalScope('banner:dismiss')
-	async dismissBanner(req: OwnerRequest.DismissBanner) {
-		const bannerName = 'banner' in req.body ? (req.body.banner as string) : '';
+	async dismissBanner(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: DismissBannerRequestDto,
+	) {
+		const bannerName = payload.banner;
+		if (!bannerName) return;
 		return await this.settingsRepository.dismissBanner({ bannerName });
 	}
 }
diff --git a/packages/cli/src/controllers/password-reset.controller.ts b/packages/cli/src/controllers/password-reset.controller.ts
index 88155e420a..c2652aa785 100644
--- a/packages/cli/src/controllers/password-reset.controller.ts
+++ b/packages/cli/src/controllers/password-reset.controller.ts
@@ -1,10 +1,15 @@
+import {
+	ChangePasswordRequestDto,
+	ForgotPasswordRequestDto,
+	ResolvePasswordTokenQueryDto,
+} from '@n8n/api-types';
 import { Response } from 'express';
-import validator from 'validator';
+import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { Get, Post, RestController } from '@/decorators';
+import { Body, Get, Post, Query, RestController } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
@@ -13,12 +18,11 @@ import { UnprocessableRequestError } from '@/errors/response-errors/unprocessabl
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { MfaService } from '@/mfa/mfa.service';
-import { PasswordResetRequest } from '@/requests';
+import { AuthlessRequest } from '@/requests';
 import { PasswordUtility } from '@/services/password.utility';
 import { UserService } from '@/services/user.service';
-import { isSamlCurrentAuthenticationMethod } from '@/sso/sso-helpers';
+import { isSamlCurrentAuthenticationMethod } from '@/sso.ee/sso-helpers';
 import { UserManagementMailer } from '@/user-management/email';
 
 @RestController()
@@ -40,7 +44,11 @@ export class PasswordResetController {
 	 * Send a password reset email.
 	 */
 	@Post('/forgot-password', { skipAuth: true, rateLimit: { limit: 3 } })
-	async forgotPassword(req: PasswordResetRequest.Email) {
+	async forgotPassword(
+		_req: AuthlessRequest,
+		_res: Response,
+		@Body payload: ForgotPasswordRequestDto,
+	) {
 		if (!this.mailer.isEmailSetUp) {
 			this.logger.debug(
 				'Request to send password reset email failed because emailing was not set up',
@@ -50,22 +58,7 @@ export class PasswordResetController {
 			);
 		}
 
-		const { email } = req.body;
-		if (!email) {
-			this.logger.debug(
-				'Request to send password reset email failed because of missing email in payload',
-				{ payload: req.body },
-			);
-			throw new BadRequestError('Email is mandatory');
-		}
-
-		if (!validator.isEmail(email)) {
-			this.logger.debug(
-				'Request to send password reset email failed because of invalid email in payload',
-				{ invalidEmail: email },
-			);
-			throw new BadRequestError('Invalid email address');
-		}
+		const { email } = payload;
 
 		// User should just be able to reset password if one is already present
 		const user = await this.userRepository.findNonShellUser(email);
@@ -120,7 +113,7 @@ export class PasswordResetController {
 				publicApi: false,
 			});
 			if (error instanceof Error) {
-				throw new InternalServerError(`Please contact your administrator: ${error.message}`);
+				throw new InternalServerError(`Please contact your administrator: ${error.message}`, error);
 			}
 		}
 
@@ -138,19 +131,12 @@ export class PasswordResetController {
 	 * Verify password reset token and user ID.
 	 */
 	@Get('/resolve-password-token', { skipAuth: true })
-	async resolvePasswordToken(req: PasswordResetRequest.Credentials) {
-		const { token } = req.query;
-
-		if (!token) {
-			this.logger.debug(
-				'Request to resolve password token failed because of missing password reset token',
-				{
-					queryString: req.query,
-				},
-			);
-			throw new BadRequestError('');
-		}
-
+	async resolvePasswordToken(
+		_req: AuthlessRequest,
+		_res: Response,
+		@Query payload: ResolvePasswordTokenQueryDto,
+	) {
+		const { token } = payload;
 		const user = await this.authService.resolvePasswordResetToken(token);
 		if (!user) throw new NotFoundError('');
 
@@ -170,35 +156,27 @@ export class PasswordResetController {
 	 * Verify password reset token and update password.
 	 */
 	@Post('/change-password', { skipAuth: true })
-	async changePassword(req: PasswordResetRequest.NewPassword, res: Response) {
-		const { token, password, mfaToken } = req.body;
-
-		if (!token || !password) {
-			this.logger.debug(
-				'Request to change password failed because of missing user ID or password or reset password token in payload',
-				{
-					payload: req.body,
-				},
-			);
-			throw new BadRequestError('Missing user ID or password or reset password token');
-		}
-
-		const validPassword = this.passwordUtility.validate(password);
+	async changePassword(
+		req: AuthlessRequest,
+		res: Response,
+		@Body payload: ChangePasswordRequestDto,
+	) {
+		const { token, password, mfaCode } = payload;
 
 		const user = await this.authService.resolvePasswordResetToken(token);
 		if (!user) throw new NotFoundError('');
 
 		if (user.mfaEnabled) {
-			if (!mfaToken) throw new BadRequestError('If MFA enabled, mfaToken is required.');
+			if (!mfaCode) throw new BadRequestError('If MFA enabled, mfaCode is required.');
 
 			const { decryptedSecret: secret } = await this.mfaService.getSecretAndRecoveryCodes(user.id);
 
-			const validToken = this.mfaService.totp.verifySecret({ secret, token: mfaToken });
+			const validToken = this.mfaService.totp.verifySecret({ secret, mfaCode });
 
 			if (!validToken) throw new BadRequestError('Invalid MFA token.');
 		}
 
-		const passwordHash = await this.passwordUtility.hash(validPassword);
+		const passwordHash = await this.passwordUtility.hash(password);
 
 		await this.userService.update(user.id, { password: passwordHash });
 
diff --git a/packages/cli/src/controllers/project.controller.ts b/packages/cli/src/controllers/project.controller.ts
index 415e0e9519..665eba9636 100644
--- a/packages/cli/src/controllers/project.controller.ts
+++ b/packages/cli/src/controllers/project.controller.ts
@@ -1,7 +1,9 @@
+import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto } from '@n8n/api-types';
 import { combineScopes } from '@n8n/permissions';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, Not } from '@n8n/typeorm';
+import { Response } from 'express';
 
 import type { Project } from '@/databases/entities/project';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
@@ -14,16 +16,20 @@ import {
 	Patch,
 	ProjectScope,
 	Delete,
+	Body,
+	Param,
+	Query,
 } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
-import { ProjectRequest } from '@/requests';
+import type { ProjectRequest } from '@/requests';
+import { AuthenticatedRequest } from '@/requests';
 import {
 	ProjectService,
 	TeamProjectOverQuotaError,
 	UnlicensedProjectRoleError,
-} from '@/services/project.service';
+} from '@/services/project.service.ee';
 import { RoleService } from '@/services/role.service';
 
 @RestController('/projects')
@@ -36,7 +42,7 @@ export class ProjectController {
 	) {}
 
 	@Get('/')
-	async getAllProjects(req: ProjectRequest.GetAll): Promise<Project[]> {
+	async getAllProjects(req: AuthenticatedRequest): Promise<Project[]> {
 		return await this.projectsService.getAccessibleProjects(req.user);
 	}
 
@@ -49,9 +55,9 @@ export class ProjectController {
 	@GlobalScope('project:create')
 	// Using admin as all plans that contain projects should allow admins at the very least
 	@Licensed('feat:projectRole:admin')
-	async createProject(req: ProjectRequest.Create) {
+	async createProject(req: AuthenticatedRequest, _res: Response, @Body payload: CreateProjectDto) {
 		try {
-			const project = await this.projectsService.createTeamProject(req.body.name, req.user);
+			const project = await this.projectsService.createTeamProject(req.user, payload);
 
 			this.eventService.emit('team-project-created', {
 				userId: req.user.id,
@@ -78,7 +84,8 @@ export class ProjectController {
 
 	@Get('/my-projects')
 	async getMyProjects(
-		req: ProjectRequest.GetMyProjects,
+		req: AuthenticatedRequest,
+		_res: Response,
 	): Promise<ProjectRequest.GetMyProjectsResponse> {
 		const relations = await this.projectsService.getProjectRelationsForUser(req.user);
 		const otherTeamProject = req.user.hasGlobalScope('project:read')
@@ -93,10 +100,7 @@ export class ProjectController {
 		for (const pr of relations) {
 			const result: ProjectRequest.GetMyProjectsResponse[number] = Object.assign(
 				this.projectRepository.create(pr.project),
-				{
-					role: pr.role,
-					scopes: req.query.includeScopes ? ([] as Scope[]) : undefined,
-				},
+				{ role: pr.role, scopes: [] },
 			);
 
 			if (result.scopes) {
@@ -119,7 +123,7 @@ export class ProjectController {
 					// own this relationship in that case we use the global user role
 					// instead of the relation role, which is for another user.
 					role: req.user.role,
-					scopes: req.query.includeScopes ? [] : undefined,
+					scopes: [],
 				},
 			);
 
@@ -143,7 +147,7 @@ export class ProjectController {
 	}
 
 	@Get('/personal')
-	async getPersonalProject(req: ProjectRequest.GetPersonalProject) {
+	async getPersonalProject(req: AuthenticatedRequest) {
 		const project = await this.projectsService.getPersonalProject(req.user);
 		if (!project) {
 			throw new NotFoundError('Could not find a personal project for this user');
@@ -162,16 +166,21 @@ export class ProjectController {
 
 	@Get('/:projectId')
 	@ProjectScope('project:read')
-	async getProject(req: ProjectRequest.Get): Promise<ProjectRequest.ProjectWithRelations> {
-		const [{ id, name, type }, relations] = await Promise.all([
-			this.projectsService.getProject(req.params.projectId),
-			this.projectsService.getProjectRelations(req.params.projectId),
+	async getProject(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Param('projectId') projectId: string,
+	): Promise<ProjectRequest.ProjectWithRelations> {
+		const [{ id, name, icon, type }, relations] = await Promise.all([
+			this.projectsService.getProject(projectId),
+			this.projectsService.getProjectRelations(projectId),
 		]);
 		const myRelation = relations.find((r) => r.userId === req.user.id);
 
 		return {
 			id,
 			name,
+			icon,
 			type,
 			relations: relations.map((r) => ({
 				id: r.user.id,
@@ -191,13 +200,19 @@ export class ProjectController {
 
 	@Patch('/:projectId')
 	@ProjectScope('project:update')
-	async updateProject(req: ProjectRequest.Update) {
-		if (req.body.name) {
-			await this.projectsService.updateProject(req.body.name, req.params.projectId);
+	async updateProject(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: UpdateProjectDto,
+		@Param('projectId') projectId: string,
+	) {
+		const { name, icon, relations } = payload;
+		if (name || icon) {
+			await this.projectsService.updateProject(projectId, { name, icon });
 		}
-		if (req.body.relations) {
+		if (relations) {
 			try {
-				await this.projectsService.syncProjectRelations(req.params.projectId, req.body.relations);
+				await this.projectsService.syncProjectRelations(projectId, relations);
 			} catch (e) {
 				if (e instanceof UnlicensedProjectRoleError) {
 					throw new BadRequestError(e.message);
@@ -208,25 +223,30 @@ export class ProjectController {
 			this.eventService.emit('team-project-updated', {
 				userId: req.user.id,
 				role: req.user.role,
-				members: req.body.relations,
-				projectId: req.params.projectId,
+				members: relations,
+				projectId,
 			});
 		}
 	}
 
 	@Delete('/:projectId')
 	@ProjectScope('project:delete')
-	async deleteProject(req: ProjectRequest.Delete) {
-		await this.projectsService.deleteProject(req.user, req.params.projectId, {
-			migrateToProject: req.query.transferId,
+	async deleteProject(
+		req: AuthenticatedRequest,
+		_res: Response,
+		@Query query: DeleteProjectDto,
+		@Param('projectId') projectId: string,
+	) {
+		await this.projectsService.deleteProject(req.user, projectId, {
+			migrateToProject: query.transferId,
 		});
 
 		this.eventService.emit('team-project-deleted', {
 			userId: req.user.id,
 			role: req.user.role,
-			projectId: req.params.projectId,
-			removalType: req.query.transferId !== undefined ? 'transfer' : 'delete',
-			targetProjectId: req.query.transferId,
+			projectId,
+			removalType: query.transferId !== undefined ? 'transfer' : 'delete',
+			targetProjectId: query.transferId,
 		});
 	}
 }
diff --git a/packages/cli/src/controllers/tags.controller.ts b/packages/cli/src/controllers/tags.controller.ts
index a6551a021d..52432d2d4b 100644
--- a/packages/cli/src/controllers/tags.controller.ts
+++ b/packages/cli/src/controllers/tags.controller.ts
@@ -1,54 +1,60 @@
-import { Request, Response, NextFunction } from 'express';
+import { CreateOrUpdateTagRequestDto, RetrieveTagQueryDto } from '@n8n/api-types';
+import { Response } from 'express';
 
-import config from '@/config';
-import { Delete, Get, Middleware, Patch, Post, RestController, GlobalScope } from '@/decorators';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { TagsRequest } from '@/requests';
+import {
+	Delete,
+	Get,
+	Patch,
+	Post,
+	RestController,
+	GlobalScope,
+	Body,
+	Param,
+	Query,
+} from '@/decorators';
+import { AuthenticatedRequest } from '@/requests';
 import { TagService } from '@/services/tag.service';
 
 @RestController('/tags')
 export class TagsController {
-	private config = config;
-
 	constructor(private readonly tagService: TagService) {}
 
-	// TODO: move this into a new decorator `@IfEnabled('workflowTagsDisabled')`
-	@Middleware()
-	workflowsEnabledMiddleware(_req: Request, _res: Response, next: NextFunction) {
-		if (this.config.getEnv('workflowTagsDisabled'))
-			throw new BadRequestError('Workflow tags are disabled');
-		next();
-	}
-
 	@Get('/')
 	@GlobalScope('tag:list')
-	async getAll(req: TagsRequest.GetAll) {
-		return await this.tagService.getAll({ withUsageCount: req.query.withUsageCount === 'true' });
+	async getAll(_req: AuthenticatedRequest, _res: Response, @Query query: RetrieveTagQueryDto) {
+		return await this.tagService.getAll({ withUsageCount: query.withUsageCount });
 	}
 
 	@Post('/')
 	@GlobalScope('tag:create')
-	async createTag(req: TagsRequest.Create) {
-		const tag = this.tagService.toEntity({ name: req.body.name });
+	async createTag(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Body payload: CreateOrUpdateTagRequestDto,
+	) {
+		const { name } = payload;
+		const tag = this.tagService.toEntity({ name });
 
 		return await this.tagService.save(tag, 'create');
 	}
 
 	@Patch('/:id(\\w+)')
 	@GlobalScope('tag:update')
-	async updateTag(req: TagsRequest.Update) {
-		const newTag = this.tagService.toEntity({ id: req.params.id, name: req.body.name.trim() });
+	async updateTag(
+		_req: AuthenticatedRequest,
+		_res: Response,
+		@Param('id') tagId: string,
+		@Body payload: CreateOrUpdateTagRequestDto,
+	) {
+		const newTag = this.tagService.toEntity({ id: tagId, name: payload.name });
 
 		return await this.tagService.save(newTag, 'update');
 	}
 
 	@Delete('/:id(\\w+)')
 	@GlobalScope('tag:delete')
-	async deleteTag(req: TagsRequest.Delete) {
-		const { id } = req.params;
-
-		await this.tagService.delete(id);
-
+	async deleteTag(_req: AuthenticatedRequest, _res: Response, @Param('id') tagId: string) {
+		await this.tagService.delete(tagId);
 		return true;
 	}
 }
diff --git a/packages/cli/src/controllers/translation.controller.ts b/packages/cli/src/controllers/translation.controller.ts
index 485e290cad..d6ae656afe 100644
--- a/packages/cli/src/controllers/translation.controller.ts
+++ b/packages/cli/src/controllers/translation.controller.ts
@@ -54,7 +54,7 @@ export class TranslationController {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 			return require(NODE_HEADERS_PATH);
 		} catch (error) {
-			throw new InternalServerError('Failed to load headers file');
+			throw new InternalServerError('Failed to load headers file', error);
 		}
 	}
 }
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index 8e19be894d..3177c2c23b 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -1,5 +1,6 @@
 import { RoleChangeRequestDto, SettingsUpdateRequestDto } from '@n8n/api-types';
 import { Response } from 'express';
+import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import { CredentialsService } from '@/credentials/credentials.service';
@@ -10,18 +11,25 @@ import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { GlobalScope, Delete, Get, RestController, Patch, Licensed, Body } from '@/decorators';
-import { Param } from '@/decorators/args';
+import {
+	GlobalScope,
+	Delete,
+	Get,
+	RestController,
+	Patch,
+	Licensed,
+	Body,
+	Param,
+} from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import type { PublicUser } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { listQueryMiddleware } from '@/middlewares';
 import { AuthenticatedRequest, ListQuery, UserRequest } from '@/requests';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 import { UserService } from '@/services/user.service';
 import { WorkflowService } from '@/workflows/workflow.service';
 
diff --git a/packages/cli/src/controllers/workflow-statistics.controller.ts b/packages/cli/src/controllers/workflow-statistics.controller.ts
index 58c99727db..b14afc9179 100644
--- a/packages/cli/src/controllers/workflow-statistics.controller.ts
+++ b/packages/cli/src/controllers/workflow-statistics.controller.ts
@@ -1,4 +1,5 @@
 import { Response, NextFunction } from 'express';
+import { Logger } from 'n8n-core';
 
 import type { WorkflowStatistics } from '@/databases/entities/workflow-statistics';
 import { StatisticsNames } from '@/databases/entities/workflow-statistics';
@@ -7,7 +8,6 @@ import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-
 import { Get, Middleware, RestController } from '@/decorators';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import type { IWorkflowStatisticsDataLoaded } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 
 import { StatisticsRequest } from './workflow-statistics.types';
 
diff --git a/packages/cli/src/crash-journal.ts b/packages/cli/src/crash-journal.ts
index 577a2f34fe..93f7b2e737 100644
--- a/packages/cli/src/crash-journal.ts
+++ b/packages/cli/src/crash-journal.ts
@@ -1,12 +1,11 @@
+import { Container } from '@n8n/di';
 import { existsSync } from 'fs';
 import { mkdir, utimes, open, rm } from 'fs/promises';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { sleep } from 'n8n-workflow';
 import { join, dirname } from 'path';
-import { Container } from 'typedi';
 
 import { inProduction } from '@/constants';
-import { Logger } from '@/logging/logger.service';
 
 export const touchFile = async (filePath: string): Promise<void> => {
 	await mkdir(dirname(filePath), { recursive: true });
diff --git a/packages/cli/src/credential-types.ts b/packages/cli/src/credential-types.ts
index 24e2d9f2ba..5720b7cdbe 100644
--- a/packages/cli/src/credential-types.ts
+++ b/packages/cli/src/credential-types.ts
@@ -1,13 +1,6 @@
-import { loadClassInIsolation } from 'n8n-core';
-import {
-	ApplicationError,
-	type ICredentialType,
-	type ICredentialTypes,
-	type LoadedClass,
-} from 'n8n-workflow';
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
+import type { ICredentialType, ICredentialTypes } from 'n8n-workflow';
 
-import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 
 @Service()
@@ -20,7 +13,7 @@ export class CredentialTypes implements ICredentialTypes {
 	}
 
 	getByName(credentialType: string): ICredentialType {
-		return this.getCredential(credentialType).type;
+		return this.loadNodesAndCredentials.getCredential(credentialType).type;
 	}
 
 	getSupportedNodes(type: string): string[] {
@@ -39,21 +32,4 @@ export class CredentialTypes implements ICredentialTypes {
 		}
 		return extendsArr;
 	}
-
-	private getCredential(type: string): LoadedClass<ICredentialType> {
-		const { loadedCredentials, knownCredentials } = this.loadNodesAndCredentials;
-		if (type in loadedCredentials) {
-			return loadedCredentials[type];
-		}
-
-		if (type in knownCredentials) {
-			const { className, sourcePath } = knownCredentials[type];
-			const loaded: ICredentialType = loadClassInIsolation(sourcePath, className);
-			loadedCredentials[type] = { sourcePath, type: loaded };
-			return loadedCredentials[type];
-		}
-		throw new ApplicationError(RESPONSE_ERROR_MESSAGES.NO_CREDENTIAL, {
-			tags: { credentialType: type },
-		});
-	}
 }
diff --git a/packages/cli/src/credentials-helper.ts b/packages/cli/src/credentials-helper.ts
index e57ad2c6d3..4c869222b5 100644
--- a/packages/cli/src/credentials-helper.ts
+++ b/packages/cli/src/credentials-helper.ts
@@ -2,9 +2,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+import { Service } from '@n8n/di';
 // 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,
@@ -26,7 +27,6 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 import { ICredentialsHelper, NodeHelpers, Workflow, ApplicationError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { CredentialTypes } from '@/credential-types';
 import { CredentialsOverwrites } from '@/credentials-overwrites';
@@ -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/credentials-overwrites.ts b/packages/cli/src/credentials-overwrites.ts
index ed1b492dc6..6689649b0f 100644
--- a/packages/cli/src/credentials-overwrites.ts
+++ b/packages/cli/src/credentials-overwrites.ts
@@ -1,11 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { deepCopy, jsonParse } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { CredentialTypes } from '@/credential-types';
 import type { ICredentialsOverwrite } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 
 @Service()
 export class CredentialsOverwrites {
diff --git a/packages/cli/src/credentials/__tests__/credentials.controller.test.ts b/packages/cli/src/credentials/__tests__/credentials.controller.test.ts
new file mode 100644
index 0000000000..68d2f26750
--- /dev/null
+++ b/packages/cli/src/credentials/__tests__/credentials.controller.test.ts
@@ -0,0 +1,82 @@
+import { mock } from 'jest-mock-extended';
+
+import { createRawProjectData } from '@/__tests__/project.test-data';
+import type { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
+import type { EventService } from '@/events/event.service';
+import type { AuthenticatedRequest } from '@/requests';
+
+import { createdCredentialsWithScopes, createNewCredentialsPayload } from './credentials.test-data';
+import { CredentialsController } from '../credentials.controller';
+import type { CredentialsService } from '../credentials.service';
+
+describe('CredentialsController', () => {
+	const eventService = mock<EventService>();
+	const credentialsService = mock<CredentialsService>();
+	const sharedCredentialsRepository = mock<SharedCredentialsRepository>();
+
+	const credentialsController = new CredentialsController(
+		mock(),
+		credentialsService,
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		sharedCredentialsRepository,
+		mock(),
+		eventService,
+	);
+
+	let req: AuthenticatedRequest;
+	beforeAll(() => {
+		req = { user: { id: '123' } } as AuthenticatedRequest;
+	});
+
+	describe('createCredentials', () => {
+		it('should create new credentials and emit "credentials-created"', async () => {
+			// Arrange
+
+			const newCredentialsPayload = createNewCredentialsPayload();
+
+			req.body = newCredentialsPayload;
+
+			const { data, ...payloadWithoutData } = newCredentialsPayload;
+
+			const createdCredentials = createdCredentialsWithScopes(payloadWithoutData);
+
+			const projectOwningCredentialData = createRawProjectData({
+				id: newCredentialsPayload.projectId,
+			});
+
+			credentialsService.createCredential.mockResolvedValue(createdCredentials);
+
+			sharedCredentialsRepository.findCredentialOwningProject.mockResolvedValue(
+				projectOwningCredentialData,
+			);
+
+			// Act
+
+			const newApiKey = await credentialsController.createCredentials(req);
+
+			// Assert
+
+			expect(credentialsService.createCredential).toHaveBeenCalledWith(
+				newCredentialsPayload,
+				req.user,
+			);
+			expect(sharedCredentialsRepository.findCredentialOwningProject).toHaveBeenCalledWith(
+				createdCredentials.id,
+			);
+			expect(eventService.emit).toHaveBeenCalledWith('credentials-created', {
+				user: expect.objectContaining({ id: req.user.id }),
+				credentialId: createdCredentials.id,
+				credentialType: createdCredentials.type,
+				projectId: projectOwningCredentialData.id,
+				projectType: projectOwningCredentialData.type,
+				publicApi: false,
+			});
+
+			expect(newApiKey).toEqual(createdCredentials);
+		});
+	});
+});
diff --git a/packages/cli/src/credentials/__tests__/credentials.service.test.ts b/packages/cli/src/credentials/__tests__/credentials.service.test.ts
index 4d1cbd5256..526acfc17d 100644
--- a/packages/cli/src/credentials/__tests__/credentials.service.test.ts
+++ b/packages/cli/src/credentials/__tests__/credentials.service.test.ts
@@ -1,10 +1,17 @@
 import { mock } from 'jest-mock-extended';
+import { nanoId, date } from 'minifaker';
+import { Credentials } from 'n8n-core';
 import { CREDENTIAL_EMPTY_VALUE, type ICredentialType } from 'n8n-workflow';
 
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import type { CredentialTypes } from '@/credential-types';
 import { CredentialsService } from '@/credentials/credentials.service';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
+import type { AuthenticatedRequest } from '@/requests';
+
+import { createNewCredentialsPayload, credentialScopes } from './credentials.test-data';
+
+let req = { user: { id: '123' } } as AuthenticatedRequest;
 
 describe('CredentialsService', () => {
 	const credType = mock<ICredentialType>({
@@ -24,6 +31,7 @@ describe('CredentialsService', () => {
 			},
 		],
 	});
+
 	const credentialTypes = mock<CredentialTypes>();
 	const service = new CredentialsService(
 		mock(),
@@ -55,7 +63,7 @@ describe('CredentialsService', () => {
 				csrfSecret: 'super-secret',
 			};
 
-			credentialTypes.getByName.calledWith(credential.type).mockReturnValue(credType);
+			credentialTypes.getByName.calledWith(credential.type).mockReturnValueOnce(credType);
 
 			const redactedData = service.redact(decryptedData, credential);
 
@@ -68,4 +76,123 @@ describe('CredentialsService', () => {
 			});
 		});
 	});
+
+	describe('createCredential', () => {
+		it('it should create new credentials and return with scopes', async () => {
+			// Arrange
+
+			const encryptedData = 'encryptedData';
+
+			const newCredentialPayloadData = createNewCredentialsPayload();
+
+			const newCredential = mock<CredentialsEntity>({
+				name: newCredentialPayloadData.name,
+				data: JSON.stringify(newCredentialPayloadData.data),
+				type: newCredentialPayloadData.type,
+			});
+
+			const encryptedDataResponse = {
+				name: newCredentialPayloadData.name,
+				type: newCredentialPayloadData.type,
+				updatedAt: date(),
+				data: encryptedData,
+			};
+
+			const saveCredentialsResponse = {
+				id: nanoId.nanoid(),
+				name: newCredentialPayloadData.name,
+				type: newCredentialPayloadData.type,
+				updatedAt: encryptedDataResponse.updatedAt,
+				createdAt: date(),
+				data: encryptedDataResponse.data,
+				isManaged: false,
+				shared: undefined,
+			};
+
+			service.prepareCreateData = jest.fn().mockReturnValue(newCredential);
+			service.createEncryptedData = jest.fn().mockImplementation(() => encryptedDataResponse);
+			service.save = jest.fn().mockResolvedValue(saveCredentialsResponse);
+			service.getCredentialScopes = jest.fn().mockReturnValue(credentialScopes);
+
+			// Act
+
+			const createdCredential = await service.createCredential(newCredentialPayloadData, req.user);
+
+			// Assert
+
+			expect(service.prepareCreateData).toHaveBeenCalledWith(newCredentialPayloadData);
+			expect(service.createEncryptedData).toHaveBeenCalledWith(null, newCredential);
+			expect(service.save).toHaveBeenCalledWith(
+				newCredential,
+				encryptedDataResponse,
+				req.user,
+				newCredentialPayloadData.projectId,
+			);
+			expect(service.getCredentialScopes).toHaveBeenCalledWith(
+				req.user,
+				saveCredentialsResponse.id,
+			);
+
+			expect(createdCredential).toEqual({
+				...saveCredentialsResponse,
+				scopes: credentialScopes,
+			});
+		});
+	});
+
+	describe('decrypt', () => {
+		it('should redact sensitive values by default', () => {
+			// ARRANGE
+			const data = {
+				clientId: 'abc123',
+				clientSecret: 'sensitiveSecret',
+				accessToken: '',
+				oauthTokenData: 'super-secret',
+				csrfSecret: 'super-secret',
+			};
+			const credential = mock<CredentialsEntity>({
+				id: '123',
+				name: 'Test Credential',
+				type: 'oauth2',
+			});
+			jest.spyOn(Credentials.prototype, 'getData').mockReturnValueOnce(data);
+			credentialTypes.getByName.calledWith(credential.type).mockReturnValueOnce(credType);
+
+			// ACT
+			const redactedData = service.decrypt(credential);
+
+			// ASSERT
+			expect(redactedData).toEqual({
+				clientId: 'abc123',
+				clientSecret: CREDENTIAL_BLANKING_VALUE,
+				accessToken: CREDENTIAL_EMPTY_VALUE,
+				oauthTokenData: CREDENTIAL_BLANKING_VALUE,
+				csrfSecret: CREDENTIAL_BLANKING_VALUE,
+			});
+		});
+
+		it('should return sensitive values if `includeRawData` is true', () => {
+			// ARRANGE
+			const data = {
+				clientId: 'abc123',
+				clientSecret: 'sensitiveSecret',
+				accessToken: '',
+				oauthTokenData: 'super-secret',
+				csrfSecret: 'super-secret',
+			};
+			const credential = mock<CredentialsEntity>({
+				id: '123',
+				name: 'Test Credential',
+				type: 'oauth2',
+			});
+			jest.spyOn(Credentials.prototype, 'getData').mockReturnValueOnce(data);
+			credentialTypes.getByName.calledWith(credential.type).mockReturnValueOnce(credType);
+
+			// ACT
+			const redactedData = service.decrypt(credential, true);
+
+			// ASSERT
+			expect(redactedData).toEqual(data);
+		});
+	});
 });
diff --git a/packages/cli/src/credentials/__tests__/credentials.test-data.ts b/packages/cli/src/credentials/__tests__/credentials.test-data.ts
new file mode 100644
index 0000000000..8bbbbf3553
--- /dev/null
+++ b/packages/cli/src/credentials/__tests__/credentials.test-data.ts
@@ -0,0 +1,62 @@
+import type { Scope } from '@n8n/permissions';
+import { nanoId, date } from 'minifaker';
+import { randomString } from 'n8n-workflow';
+
+import type { CredentialRequest } from '@/requests';
+
+type NewCredentialWithSCopes = {
+	scopes: Scope[];
+	name: string;
+	data: string;
+	type: string;
+	isManaged: boolean;
+	id: string;
+	createdAt: Date;
+	updatedAt: Date;
+};
+
+const name = 'new Credential';
+const type = 'openAiApi';
+const data = {
+	apiKey: 'apiKey',
+	url: 'url',
+};
+const projectId = nanoId.nanoid();
+
+export const credentialScopes: Scope[] = [
+	'credential:create',
+	'credential:delete',
+	'credential:list',
+	'credential:move',
+	'credential:read',
+	'credential:share',
+	'credential:update',
+];
+
+export const createNewCredentialsPayload = (
+	payload?: Partial<CredentialRequest.CredentialProperties>,
+): CredentialRequest.CredentialProperties => {
+	return {
+		name,
+		type,
+		data,
+		projectId,
+		...payload,
+	};
+};
+
+export const createdCredentialsWithScopes = (
+	payload?: Partial<NewCredentialWithSCopes>,
+): NewCredentialWithSCopes => {
+	return {
+		name,
+		type,
+		data: randomString(20),
+		id: nanoId.nanoid(),
+		createdAt: date(),
+		updatedAt: date(),
+		isManaged: false,
+		scopes: credentialScopes,
+		...payload,
+	};
+};
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index 76db501cf7..73888e1977 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -1,6 +1,8 @@
+import { CredentialsGetManyRequestQuery, CredentialsGetOneRequestQuery } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
+import { Logger } from 'n8n-core';
 import { deepCopy } from 'n8n-workflow';
 import { z } from 'zod';
 
@@ -18,12 +20,12 @@ import {
 	RestController,
 	ProjectScope,
 } from '@/decorators';
+import { Param, Query } from '@/decorators/args';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { listQueryMiddleware } from '@/middlewares';
 import { CredentialRequest } from '@/requests';
 import { NamingService } from '@/services/naming.service';
@@ -49,10 +51,15 @@ export class CredentialsController {
 	) {}
 
 	@Get('/', { middlewares: listQueryMiddleware })
-	async getMany(req: CredentialRequest.GetMany) {
+	async getMany(
+		req: CredentialRequest.GetMany,
+		_res: unknown,
+		@Query query: CredentialsGetManyRequestQuery,
+	) {
 		const credentials = await this.credentialsService.getMany(req.user, {
 			listQueryOptions: req.listQueryOptions,
-			includeScopes: req.query.includeScopes,
+			includeScopes: query.includeScopes,
+			includeData: query.includeData,
 		});
 		credentials.forEach((c) => {
 			// @ts-expect-error: This is to emulate the old behavior of removing the shared
@@ -82,21 +89,22 @@ export class CredentialsController {
 
 	@Get('/:credentialId')
 	@ProjectScope('credential:read')
-	async getOne(req: CredentialRequest.Get) {
+	async getOne(
+		req: CredentialRequest.Get,
+		_res: unknown,
+		@Param('credentialId') credentialId: string,
+		@Query query: CredentialsGetOneRequestQuery,
+	) {
 		const { shared, ...credential } = this.license.isSharingEnabled()
 			? await this.enterpriseCredentialsService.getOne(
 					req.user,
-					req.params.credentialId,
+					credentialId,
 					// TODO: editor-ui is always sending this, maybe we can just rely on the
 					// the scopes and always decrypt the data if the user has the permissions
 					// to do so.
-					req.query.includeData === 'true',
+					query.includeData,
 				)
-			: await this.credentialsService.getOne(
-					req.user,
-					req.params.credentialId,
-					req.query.includeData === 'true',
-				);
+			: await this.credentialsService.getOne(req.user, credentialId, query.includeData);
 
 		const scopes = await this.credentialsService.getCredentialScopes(
 			req.user,
@@ -147,32 +155,22 @@ export class CredentialsController {
 
 	@Post('/')
 	async createCredentials(req: CredentialRequest.Create) {
-		const newCredential = await this.credentialsService.prepareCreateData(req.body);
-
-		const encryptedData = this.credentialsService.createEncryptedData(null, newCredential);
-		const { shared, ...credential } = await this.credentialsService.save(
-			newCredential,
-			encryptedData,
-			req.user,
-			req.body.projectId,
-		);
+		const newCredential = await this.credentialsService.createCredential(req.body, req.user);
 
 		const project = await this.sharedCredentialsRepository.findCredentialOwningProject(
-			credential.id,
+			newCredential.id,
 		);
 
 		this.eventService.emit('credentials-created', {
 			user: req.user,
-			credentialType: credential.type,
-			credentialId: credential.id,
+			credentialType: newCredential.type,
+			credentialId: newCredential.id,
 			publicApi: false,
 			projectId: project?.id,
 			projectType: project?.type,
 		});
 
-		const scopes = await this.credentialsService.getCredentialScopes(req.user, credential.id);
-
-		return { ...credential, scopes };
+		return newCredential;
 	}
 
 	@Patch('/:credentialId')
@@ -196,7 +194,11 @@ export class CredentialsController {
 			);
 		}
 
-		const decryptedData = this.credentialsService.decrypt(credential);
+		if (credential.isManaged) {
+			throw new BadRequestError('Managed credentials cannot be updated');
+		}
+
+		const decryptedData = this.credentialsService.decrypt(credential, true);
 		const preparedCredentialData = await this.credentialsService.prepareUpdateData(
 			req.body,
 			decryptedData,
diff --git a/packages/cli/src/credentials/credentials.service.ee.ts b/packages/cli/src/credentials/credentials.service.ee.ts
index aad78fe7b7..b183e20431 100644
--- a/packages/cli/src/credentials/credentials.service.ee.ts
+++ b/packages/cli/src/credentials/credentials.service.ee.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, type EntityManager } from '@n8n/typeorm';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import { Project } from '@/databases/entities/project';
@@ -11,7 +11,7 @@ import { SharedCredentialsRepository } from '@/databases/repositories/shared-cre
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { TransferCredentialError } from '@/errors/response-errors/transfer-credential.error';
 import { OwnershipService } from '@/services/ownership.service';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 import { RoleService } from '@/services/role.service';
 
 import { CredentialsService } from './credentials.service';
@@ -87,10 +87,7 @@ export class EnterpriseCredentialsService {
 		if (credential) {
 			// Decrypt the data if we found the credential with the `credential:update`
 			// scope.
-			decryptedData = this.credentialsService.redact(
-				this.credentialsService.decrypt(credential),
-				credential,
-			);
+			decryptedData = this.credentialsService.decrypt(credential, true);
 		} else {
 			// Otherwise try to find them with only the `credential:read` scope. In
 			// that case we return them without the decrypted data.
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index f9bbf89e57..52a1a3e88d 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -1,3 +1,4 @@
+import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import {
@@ -6,7 +7,7 @@ import {
 	type FindOptionsRelations,
 	type FindOptionsWhere,
 } from '@n8n/typeorm';
-import { Credentials } from 'n8n-core';
+import { Credentials, Logger } from 'n8n-core';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -14,13 +15,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { ApplicationError, CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { CredentialTypes } from '@/credential-types';
 import { createCredentialsFromCredentialsEntity } from '@/credentials-helper';
 import { CredentialsEntity } from '@/databases/entities/credentials-entity';
-import type { ProjectRelation } from '@/databases/entities/project-relation';
 import { SharedCredentials } from '@/databases/entities/shared-credentials';
 import type { User } from '@/databases/entities/user';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
@@ -33,12 +32,12 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
 import type { ICredentialsDb } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
-import { userHasScopes } from '@/permissions/check-access';
+import { userHasScopes } from '@/permissions.ee/check-access';
 import type { CredentialRequest, ListQuery } from '@/requests';
 import { CredentialsTester } from '@/services/credentials-tester.service';
 import { OwnershipService } from '@/services/ownership.service';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
+import type { ScopesField } from '@/services/role.service';
 import { RoleService } from '@/services/role.service';
 
 export type CredentialsGetSharedOptions =
@@ -63,33 +62,30 @@ export class CredentialsService {
 
 	async getMany(
 		user: User,
-		options: {
-			listQueryOptions?: ListQuery.Options;
-			includeScopes?: string;
+		{
+			listQueryOptions = {},
+			includeScopes = false,
+			includeData = false,
+		}: {
+			listQueryOptions?: ListQuery.Options & { includeData?: boolean };
+			includeScopes?: boolean;
+			includeData?: boolean;
 		} = {},
 	) {
 		const returnAll = user.hasGlobalScope('credential:list');
-		const isDefaultSelect = !options.listQueryOptions?.select;
+		const isDefaultSelect = !listQueryOptions.select;
 
-		let projectRelations: ProjectRelation[] | undefined = undefined;
-		if (options.includeScopes) {
-			projectRelations = await this.projectService.getProjectRelationsForUser(user);
-			if (options.listQueryOptions?.filter?.projectId && user.hasGlobalScope('credential:list')) {
-				// Only instance owners and admins have the credential:list scope
-				// Those users should be able to use _all_ credentials within their workflows.
-				// TODO: Change this so we filter by `workflowId` in this case. Require a slight FE change
-				const projectRelation = projectRelations.find(
-					(relation) => relation.projectId === options.listQueryOptions?.filter?.projectId,
-				);
-				if (projectRelation?.role === 'project:personalOwner') {
-					// Will not affect team projects as these have admins, not owners.
-					delete options.listQueryOptions?.filter?.projectId;
-				}
-			}
+		if (includeData) {
+			// We need the scopes to check if we're allowed to include the decrypted
+			// data.
+			// Only if the user has the `credential:update` scope the user is allowed
+			// to get the data.
+			includeScopes = true;
+			listQueryOptions.includeData = true;
 		}
 
 		if (returnAll) {
-			let credentials = await this.credentialsRepository.findMany(options.listQueryOptions);
+			let credentials = await this.credentialsRepository.findMany(listQueryOptions);
 
 			if (isDefaultSelect) {
 				// Since we're filtering using project ID as part of the relation,
@@ -97,7 +93,7 @@ export class CredentialsService {
 				// it's shared to a project, it won't be able to find the home project.
 				// To solve this, we have to get all the relation now, even though
 				// we're deleting them later.
-				if ((options.listQueryOptions?.filter?.shared as { projectId?: string })?.projectId) {
+				if ((listQueryOptions.filter?.shared as { projectId?: string })?.projectId) {
 					const relations = await this.sharedCredentialsRepository.getAllRelationsForCredentials(
 						credentials.map((c) => c.id),
 					);
@@ -108,23 +104,31 @@ export class CredentialsService {
 				credentials = credentials.map((c) => this.ownershipService.addOwnedByAndSharedWith(c));
 			}
 
-			if (options.includeScopes) {
-				credentials = credentials.map((c) =>
-					this.roleService.addScopes(c, user, projectRelations!),
-				);
+			if (includeScopes) {
+				const projectRelations = await this.projectService.getProjectRelationsForUser(user);
+				credentials = credentials.map((c) => this.roleService.addScopes(c, user, projectRelations));
+			}
+
+			if (includeData) {
+				credentials = credentials.map((c: CredentialsEntity & ScopesField) => {
+					return {
+						...c,
+						data: c.scopes.includes('credential:update') ? this.decrypt(c) : undefined,
+					} as unknown as CredentialsEntity;
+				});
 			}
 
 			return credentials;
 		}
 
-		// If the workflow is part of a personal project we want to show the credentials the user making the request has access to, not the credentials the user owning the workflow has access to.
-		if (typeof options.listQueryOptions?.filter?.projectId === 'string') {
-			const project = await this.projectService.getProject(
-				options.listQueryOptions.filter.projectId,
-			);
+		// If the workflow is part of a personal project we want to show the
+		// credentials the user making the request has access to, not the
+		// credentials the user owning the workflow has access to.
+		if (typeof listQueryOptions.filter?.projectId === 'string') {
+			const project = await this.projectService.getProject(listQueryOptions.filter.projectId);
 			if (project?.type === 'personal') {
 				const currentUsersPersonalProject = await this.projectService.getPersonalProject(user);
-				options.listQueryOptions.filter.projectId = currentUsersPersonalProject?.id;
+				listQueryOptions.filter.projectId = currentUsersPersonalProject?.id;
 			}
 		}
 
@@ -133,7 +137,7 @@ export class CredentialsService {
 		});
 
 		let credentials = await this.credentialsRepository.findMany(
-			options.listQueryOptions,
+			listQueryOptions,
 			ids, // only accessible credentials
 		);
 
@@ -143,7 +147,7 @@ export class CredentialsService {
 			// it's shared to a project, it won't be able to find the home project.
 			// To solve this, we have to get all the relation now, even though
 			// we're deleting them later.
-			if ((options.listQueryOptions?.filter?.shared as { projectId?: string })?.projectId) {
+			if ((listQueryOptions.filter?.shared as { projectId?: string })?.projectId) {
 				const relations = await this.sharedCredentialsRepository.getAllRelationsForCredentials(
 					credentials.map((c) => c.id),
 				);
@@ -155,8 +159,18 @@ export class CredentialsService {
 			credentials = credentials.map((c) => this.ownershipService.addOwnedByAndSharedWith(c));
 		}
 
-		if (options.includeScopes) {
-			credentials = credentials.map((c) => this.roleService.addScopes(c, user, projectRelations!));
+		if (includeScopes) {
+			const projectRelations = await this.projectService.getProjectRelationsForUser(user);
+			credentials = credentials.map((c) => this.roleService.addScopes(c, user, projectRelations));
+		}
+
+		if (includeData) {
+			credentials = credentials.map((c: CredentialsEntity & ScopesField) => {
+				return {
+					...c,
+					data: c.scopes.includes('credential:update') ? this.decrypt(c) : undefined,
+				} as unknown as CredentialsEntity;
+			});
 		}
 
 		return credentials;
@@ -197,6 +211,7 @@ export class CredentialsService {
 				name: c.name,
 				type: c.type,
 				scopes: c.scopes,
+				isManaged: c.isManaged,
 			}));
 	}
 
@@ -308,9 +323,18 @@ export class CredentialsService {
 		return newCredentialData;
 	}
 
-	decrypt(credential: CredentialsEntity) {
+	/**
+	 * Decrypts the credentials data and redacts the content by default.
+	 *
+	 * If `includeRawData` is set to true it will not redact the data.
+	 */
+	decrypt(credential: CredentialsEntity, includeRawData = false) {
 		const coreCredential = createCredentialsFromCredentialsEntity(credential);
-		return coreCredential.getData();
+		const data = coreCredential.getData();
+		if (includeRawData) {
+			return data;
+		}
+		return this.redact(data, credential);
 	}
 
 	async update(credentialId: string, newCredentialData: ICredentialsDb) {
@@ -500,7 +524,7 @@ export class CredentialsService {
 		if (sharing) {
 			// Decrypt the data if we found the credential with the `credential:update`
 			// scope.
-			decryptedData = this.redact(this.decrypt(sharing.credentials), sharing.credentials);
+			decryptedData = this.decrypt(sharing.credentials, true);
 		} else {
 			// Otherwise try to find them with only the `credential:read` scope. In
 			// that case we return them without the decrypted data.
@@ -603,4 +627,25 @@ export class CredentialsService {
 			mergedCredentials.data = decryptedData;
 		}
 	}
+
+	/**
+	 * Create a new credential in user's account and return it along the scopes
+	 * If a projectId is send, then it also binds the credential to that specific project
+	 */
+	async createCredential(credentialsData: CredentialRequest.CredentialProperties, user: User) {
+		const newCredential = await this.prepareCreateData(credentialsData);
+
+		const encryptedData = this.createEncryptedData(null, newCredential);
+
+		const { shared, ...credential } = await this.save(
+			newCredential,
+			encryptedData,
+			user,
+			credentialsData.projectId,
+		);
+
+		const scopes = await this.getCredentialScopes(user, credential.id);
+
+		return { ...credential, scopes };
+	}
 }
diff --git a/packages/cli/src/databases/config.ts b/packages/cli/src/databases/config.ts
index 8845bd0b13..45348e0079 100644
--- a/packages/cli/src/databases/config.ts
+++ b/packages/cli/src/databases/config.ts
@@ -1,4 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { DataSourceOptions, LoggerOptions } from '@n8n/typeorm';
 import type { MysqlConnectionOptions } from '@n8n/typeorm/driver/mysql/MysqlConnectionOptions';
 import type { PostgresConnectionOptions } from '@n8n/typeorm/driver/postgres/PostgresConnectionOptions';
@@ -8,7 +9,6 @@ import { InstanceSettings } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
 import path from 'path';
 import type { TlsOptions } from 'tls';
-import { Container } from 'typedi';
 
 import { entities } from './entities';
 import { mysqlMigrations } from './migrations/mysqldb';
diff --git a/packages/cli/src/databases/dsl/table.ts b/packages/cli/src/databases/dsl/table.ts
index 78ed98272c..f598b674d7 100644
--- a/packages/cli/src/databases/dsl/table.ts
+++ b/packages/cli/src/databases/dsl/table.ts
@@ -50,8 +50,8 @@ export class CreateTable extends TableOperation {
 		ref: {
 			tableName: string;
 			columnName: string;
-			onDelete?: 'CASCADE';
-			onUpdate?: 'CASCADE';
+			onDelete?: 'RESTRICT' | 'CASCADE' | 'NO ACTION' | 'SET NULL';
+			onUpdate?: 'RESTRICT' | 'CASCADE' | 'NO ACTION' | 'SET NULL';
 			name?: string;
 		},
 	) {
diff --git a/packages/cli/src/databases/entities/abstract-entity.ts b/packages/cli/src/databases/entities/abstract-entity.ts
index 0626a5621f..ac16b55bf5 100644
--- a/packages/cli/src/databases/entities/abstract-entity.ts
+++ b/packages/cli/src/databases/entities/abstract-entity.ts
@@ -1,4 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { ColumnOptions } from '@n8n/typeorm';
 import {
 	BeforeInsert,
@@ -8,7 +9,6 @@ import {
 	UpdateDateColumn,
 } from '@n8n/typeorm';
 import type { Class } from 'n8n-core';
-import { Container } from 'typedi';
 
 import { generateNanoId } from '../utils/generators';
 
diff --git a/packages/cli/src/databases/entities/credentials-entity.ts b/packages/cli/src/databases/entities/credentials-entity.ts
index bbfc137f85..b4f1a10c38 100644
--- a/packages/cli/src/databases/entities/credentials-entity.ts
+++ b/packages/cli/src/databases/entities/credentials-entity.ts
@@ -29,6 +29,14 @@ export class CredentialsEntity extends WithTimestampsAndStringId implements ICre
 	@OneToMany('SharedCredentials', 'credentials')
 	shared: SharedCredentials[];
 
+	/**
+	 * Whether the credential is managed by n8n. We currently use this flag
+	 * to provide OpenAI free credits on cloud. Managed credentials cannot be
+	 * edited by the user.
+	 */
+	@Column({ default: false })
+	isManaged: boolean;
+
 	toJSON() {
 		const { shared, ...rest } = this;
 		return rest;
diff --git a/packages/cli/src/databases/entities/execution-entity.ts b/packages/cli/src/databases/entities/execution-entity.ts
index 7b63b63eaf..1c4c11a797 100644
--- a/packages/cli/src/databases/entities/execution-entity.ts
+++ b/packages/cli/src/databases/entities/execution-entity.ts
@@ -31,6 +31,11 @@ export class ExecutionEntity {
 	@PrimaryColumn({ transformer: idStringifier })
 	id: string;
 
+	/**
+	 * Whether the execution finished sucessfully.
+	 *
+	 * @deprecated Use `status` instead
+	 */
 	@Column()
 	finished: boolean;
 
diff --git a/packages/cli/src/databases/entities/index.ts b/packages/cli/src/databases/entities/index.ts
index 39f67b3252..e6a1dedb3f 100644
--- a/packages/cli/src/databases/entities/index.ts
+++ b/packages/cli/src/databases/entities/index.ts
@@ -20,6 +20,9 @@ import { Settings } from './settings';
 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';
@@ -58,4 +61,7 @@ export const entities = {
 	ProjectRelation,
 	ApiKey,
 	ProcessedData,
+	TestDefinition,
+	TestMetric,
+	TestRun,
 };
diff --git a/packages/cli/src/databases/entities/project-relation.ts b/packages/cli/src/databases/entities/project-relation.ts
index 736ef2b223..eb73b62502 100644
--- a/packages/cli/src/databases/entities/project-relation.ts
+++ b/packages/cli/src/databases/entities/project-relation.ts
@@ -1,19 +1,13 @@
+import { ProjectRole } from '@n8n/api-types';
 import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
 
 import { WithTimestamps } from './abstract-entity';
 import { Project } from './project';
 import { User } from './user';
 
-// personalOwner is only used for personal projects
-export type ProjectRole =
-	| 'project:personalOwner'
-	| 'project:admin'
-	| 'project:editor'
-	| 'project:viewer';
-
 @Entity()
 export class ProjectRelation extends WithTimestamps {
-	@Column()
+	@Column({ type: 'varchar' })
 	role: ProjectRole;
 
 	@ManyToOne('User', 'projectRelations')
diff --git a/packages/cli/src/databases/entities/project.ts b/packages/cli/src/databases/entities/project.ts
index 88c4ed009a..48f86fe0e9 100644
--- a/packages/cli/src/databases/entities/project.ts
+++ b/packages/cli/src/databases/entities/project.ts
@@ -1,3 +1,4 @@
+import { ProjectIcon, ProjectType } from '@n8n/api-types';
 import { Column, Entity, OneToMany } from '@n8n/typeorm';
 
 import { WithTimestampsAndStringId } from './abstract-entity';
@@ -5,16 +6,17 @@ import type { ProjectRelation } from './project-relation';
 import type { SharedCredentials } from './shared-credentials';
 import type { SharedWorkflow } from './shared-workflow';
 
-export type ProjectType = 'personal' | 'team';
-
 @Entity()
 export class Project extends WithTimestampsAndStringId {
 	@Column({ length: 255 })
 	name: string;
 
-	@Column({ length: 36 })
+	@Column({ type: 'varchar', length: 36 })
 	type: ProjectType;
 
+	@Column({ type: 'json', nullable: true })
+	icon: ProjectIcon;
+
 	@OneToMany('ProjectRelation', 'project')
 	projectRelations: ProjectRelation[];
 
diff --git a/packages/cli/src/databases/entities/test-definition.ee.ts b/packages/cli/src/databases/entities/test-definition.ee.ts
new file mode 100644
index 0000000000..bcbf701e79
--- /dev/null
+++ b/packages/cli/src/databases/entities/test-definition.ee.ts
@@ -0,0 +1,69 @@
+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 { jsonColumnType, WithTimestampsAndStringId } from './abstract-entity';
+
+// Entity representing a node in a workflow under test, for which data should be mocked during test execution
+export type MockedNodeItem = {
+	name?: string;
+	id: string;
+};
+
+/**
+ * Entity representing a Test Definition
+ * It combines:
+ * - the workflow under test
+ * - the workflow used to evaluate the results of test execution
+ * - the filter used to select test cases from previous executions of the workflow under test - annotation tag
+ */
+@Entity()
+@Index(['workflow'])
+@Index(['evaluationWorkflow'])
+export class TestDefinition extends WithTimestampsAndStringId {
+	@Column({ length: 255 })
+	@Length(1, 255, {
+		message: 'Test definition name must be $constraint1 to $constraint2 characters long.',
+	})
+	name: string;
+
+	@Column('text')
+	description: string;
+
+	@Column(jsonColumnType, { default: '[]' })
+	mockedNodes: MockedNodeItem[];
+
+	/**
+	 * Relation to the workflow under test
+	 */
+	@ManyToOne('WorkflowEntity', 'tests')
+	workflow: WorkflowEntity;
+
+	@RelationId((test: TestDefinition) => test.workflow)
+	workflowId: string;
+
+	/**
+	 * Relation to the workflow used to evaluate the results of test execution
+	 */
+	@ManyToOne('WorkflowEntity', 'evaluationTests')
+	evaluationWorkflow: WorkflowEntity;
+
+	@RelationId((test: TestDefinition) => test.evaluationWorkflow)
+	evaluationWorkflowId: string;
+
+	/**
+	 * Relation to the annotation tag associated with the test
+	 * This tag will be used to select the test cases to run from previous executions
+	 */
+	@ManyToOne('AnnotationTagEntity', 'test')
+	annotationTag: AnnotationTagEntity;
+
+	@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..79c7bc9f07
--- /dev/null
+++ b/packages/cli/src/databases/entities/test-run.ee.ts
@@ -0,0 +1,57 @@
+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' | 'cancelled';
+
+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;
+
+	/**
+	 * Total number of the test cases, matching the filter condition of the test definition (specified annotationTag)
+	 */
+	@Column('integer', { nullable: true })
+	totalCases: number;
+
+	/**
+	 * Number of test cases that passed (evaluation workflow was executed successfully)
+	 */
+	@Column('integer', { nullable: true })
+	passedCases: number;
+
+	/**
+	 * Number of failed test cases
+	 * (any unexpected exception happened during the execution or evaluation workflow ended with an error)
+	 */
+	@Column('integer', { nullable: true })
+	failedCases: number;
+}
diff --git a/packages/cli/src/databases/entities/user.ts b/packages/cli/src/databases/entities/user.ts
index b75bec757c..5aae21d003 100644
--- a/packages/cli/src/databases/entities/user.ts
+++ b/packages/cli/src/databases/entities/user.ts
@@ -18,7 +18,7 @@ import {
 	GLOBAL_OWNER_SCOPES,
 	GLOBAL_MEMBER_SCOPES,
 	GLOBAL_ADMIN_SCOPES,
-} from '@/permissions/global-roles';
+} from '@/permissions.ee/global-roles';
 import { NoUrl } from '@/validators/no-url.validator';
 import { NoXss } from '@/validators/no-xss.validator';
 
diff --git a/packages/cli/src/databases/entities/workflow-entity.ts b/packages/cli/src/databases/entities/workflow-entity.ts
index b03cf2c28d..67d0f0e345 100644
--- a/packages/cli/src/databases/entities/workflow-entity.ts
+++ b/packages/cli/src/databases/entities/workflow-entity.ts
@@ -80,7 +80,7 @@ export class WorkflowEntity extends WithTimestampsAndStringId implements IWorkfl
 		nullable: true,
 		transformer: sqlite.jsonColumn,
 	})
-	pinData: ISimplifiedPinData;
+	pinData?: ISimplifiedPinData;
 
 	@Column({ length: 36 })
 	versionId: string;
diff --git a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts b/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts
index 84d3040a10..75ce65ad6b 100644
--- a/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts
+++ b/packages/cli/src/databases/migrations/common/1659888469333-AddJsonKeyPinData.ts
@@ -1,7 +1,7 @@
+import { isObjectLiteral } from 'n8n-core';
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import type { MigrationContext, IrreversibleMigration } from '@/databases/types';
-import { isObjectLiteral } from '@/utils';
 
 type OldPinnedData = { [nodeName: string]: IDataObject[] };
 type NewPinnedData = { [nodeName: string]: INodeExecutionData[] };
diff --git a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts
index 5ccd0c40a4..95a2c11a51 100644
--- a/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts
+++ b/packages/cli/src/databases/migrations/common/1674509946020-CreateLdapEntities.ts
@@ -1,5 +1,5 @@
 import type { MigrationContext, ReversibleMigration } from '@/databases/types';
-import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants';
+import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants';
 
 export class CreateLdapEntities1674509946020 implements ReversibleMigration {
 	async up({ escape, dbType, isMysql, runQuery }: MigrationContext) {
diff --git a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts
index 894e741344..7ee46ca0d0 100644
--- a/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/common/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -38,7 +38,7 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements Irreversibl
 
 						// It filters out all connections that are connected to a node that cannot receive input
 						outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
-							outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
+							outputConnection[outputConnectionItemIdx] = (outputConnectionItem ?? []).filter(
 								(outgoingConnections) =>
 									!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
 							);
diff --git a/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts b/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts
index f8d4eb60a9..2db009da07 100644
--- a/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts
+++ b/packages/cli/src/databases/migrations/common/1711390882123-MoveSshKeysToDatabase.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import { Cipher, InstanceSettings } from 'n8n-core';
 import { jsonParse } from 'n8n-workflow';
 import { readFile, writeFile, rm } from 'node:fs/promises';
 import path from 'node:path';
-import Container from 'typedi';
 
 import type { MigrationContext, ReversibleMigration } from '@/databases/types';
 
diff --git a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
index fe101fac7a..d7b8a2d47c 100644
--- a/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
+++ b/packages/cli/src/databases/migrations/common/1714133768519-CreateProject.ts
@@ -1,7 +1,7 @@
+import type { ProjectRole } from '@n8n/api-types';
 import { ApplicationError } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import type { MigrationContext, ReversibleMigration } from '@/databases/types';
 import { generateNanoId } from '@/databases/utils/generators';
diff --git a/packages/cli/src/databases/migrations/common/1729607673469-AddProjectIcons.ts b/packages/cli/src/databases/migrations/common/1729607673469-AddProjectIcons.ts
new file mode 100644
index 0000000000..e2c710428a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1729607673469-AddProjectIcons.ts
@@ -0,0 +1,10 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+export class AddProjectIcons1729607673469 implements ReversibleMigration {
+	async up({ schemaBuilder: { addColumns, column } }: MigrationContext) {
+		await addColumns('project', [column('icon').json]);
+	}
+
+	async down({ schemaBuilder: { dropColumns } }: MigrationContext) {
+		await dropColumns('project', ['icon']);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1730386903556-CreateTestDefinitionTable.ts b/packages/cli/src/databases/migrations/common/1730386903556-CreateTestDefinitionTable.ts
new file mode 100644
index 0000000000..d71353ee73
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1730386903556-CreateTestDefinitionTable.ts
@@ -0,0 +1,37 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+const testEntityTableName = 'test_definition';
+
+export class CreateTestDefinitionTable1730386903556 implements ReversibleMigration {
+	async up({ schemaBuilder: { createTable, column } }: MigrationContext) {
+		await createTable(testEntityTableName)
+			.withColumns(
+				column('id').int.notNull.primary.autoGenerate,
+				column('name').varchar(255).notNull,
+				column('workflowId').varchar(36).notNull,
+				column('evaluationWorkflowId').varchar(36),
+				column('annotationTagId').varchar(16),
+			)
+			.withIndexOn('workflowId')
+			.withIndexOn('evaluationWorkflowId')
+			.withForeignKey('workflowId', {
+				tableName: 'workflow_entity',
+				columnName: 'id',
+				onDelete: 'CASCADE',
+			})
+			.withForeignKey('evaluationWorkflowId', {
+				tableName: 'workflow_entity',
+				columnName: 'id',
+				onDelete: 'SET NULL',
+			})
+			.withForeignKey('annotationTagId', {
+				tableName: 'annotation_tag_entity',
+				columnName: 'id',
+				onDelete: 'SET NULL',
+			}).withTimestamps;
+	}
+
+	async down({ schemaBuilder: { dropTable } }: MigrationContext) {
+		await dropTable(testEntityTableName);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts b/packages/cli/src/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts
new file mode 100644
index 0000000000..5063bdf232
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1731404028106-AddDescriptionToTestDefinition.ts
@@ -0,0 +1,11 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+export class AddDescriptionToTestDefinition1731404028106 implements ReversibleMigration {
+	async up({ schemaBuilder: { addColumns, column } }: MigrationContext) {
+		await addColumns('test_definition', [column('description').text]);
+	}
+
+	async down({ schemaBuilder: { dropColumns } }: MigrationContext) {
+		await dropColumns('test_definition', ['description']);
+	}
+}
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/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts b/packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts
new file mode 100644
index 0000000000..53f650ebcf
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1733133775640-AddMockedNodesColumnToTestDefinition.ts
@@ -0,0 +1,22 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+// We have to use raw query migration instead of schemaBuilder helpers,
+// because the typeorm schema builder implements addColumns by a table recreate for sqlite
+// which causes weird issues with the migration
+export class AddMockedNodesColumnToTestDefinition1733133775640 implements ReversibleMigration {
+	async up({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('test_definition');
+		const mockedNodesColumnName = escape.columnName('mockedNodes');
+
+		await runQuery(
+			`ALTER TABLE ${tableName} ADD COLUMN ${mockedNodesColumnName} JSON DEFAULT ('[]') NOT NULL`,
+		);
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('test_definition');
+		const columnName = escape.columnName('mockedNodes');
+
+		await runQuery(`ALTER TABLE ${tableName} DROP COLUMN ${columnName}`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts b/packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts
new file mode 100644
index 0000000000..00fc2d16e7
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1734479635324-AddManagedColumnToCredentialsTable.ts
@@ -0,0 +1,21 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+export class AddManagedColumnToCredentialsTable1734479635324 implements ReversibleMigration {
+	async up({ escape, runQuery, isSqlite }: MigrationContext) {
+		const tableName = escape.tableName('credentials_entity');
+		const columnName = escape.columnName('isManaged');
+
+		const defaultValue = isSqlite ? 0 : 'FALSE';
+
+		await runQuery(
+			`ALTER TABLE ${tableName} ADD COLUMN ${columnName} BOOLEAN NOT NULL DEFAULT ${defaultValue}`,
+		);
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('credentials_entity');
+		const columnName = escape.columnName('isManaged');
+
+		await runQuery(`ALTER TABLE ${tableName} DROP COLUMN ${columnName}`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts b/packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts
new file mode 100644
index 0000000000..8d6a5cdc20
--- /dev/null
+++ b/packages/cli/src/databases/migrations/common/1736172058779-AddStatsColumnsToTestRun.ts
@@ -0,0 +1,31 @@
+import type { MigrationContext, ReversibleMigration } from '@/databases/types';
+
+const columns = ['totalCases', 'passedCases', 'failedCases'] as const;
+
+export class AddStatsColumnsToTestRun1736172058779 implements ReversibleMigration {
+	async up({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('test_run');
+		const columnNames = columns.map((name) => escape.columnName(name));
+
+		// Values can be NULL only if the test run is new, otherwise they must be non-negative integers.
+		// Test run might be cancelled or interrupted by unexpected error at any moment, so values can be either NULL or non-negative integers.
+		for (const name of columnNames) {
+			await runQuery(`ALTER TABLE ${tableName} ADD COLUMN ${name} INT CHECK(
+				CASE
+					WHEN status = 'new' THEN ${name} IS NULL
+					WHEN status in ('cancelled', 'error') THEN ${name} IS NULL OR ${name} >= 0
+					ELSE ${name} >= 0
+				END
+			)`);
+		}
+	}
+
+	async down({ escape, runQuery }: MigrationContext) {
+		const tableName = escape.tableName('test_run');
+		const columnNames = columns.map((name) => escape.columnName(name));
+
+		for (const name of columnNames) {
+			await runQuery(`ALTER TABLE ${tableName} DROP COLUMN ${name}`);
+		}
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts b/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts
index 1f6bf77123..ec4389e416 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1690000000001-MigrateIntegerKeysToString.ts
@@ -29,7 +29,7 @@ export class MigrateIntegerKeysToString1690000000001 implements IrreversibleMigr
 		);
 		await queryRunner.query(`UPDATE ${tablePrefix}workflow_entity SET id = CONVERT(tmp_id, CHAR);`);
 		await queryRunner.query(
-			`CREATE INDEX \`TMP_idx_${tablePrefix}workflow_entity_id\` ON ${tablePrefix}workflow_entity (\`id\`);`,
+			`CREATE UNIQUE INDEX \`TMP_idx_${tablePrefix}workflow_entity_id\` ON ${tablePrefix}workflow_entity (\`id\`);`,
 		);
 
 		await queryRunner.query(
@@ -40,7 +40,7 @@ export class MigrateIntegerKeysToString1690000000001 implements IrreversibleMigr
 		);
 		await queryRunner.query(`UPDATE ${tablePrefix}tag_entity SET id = CONVERT(tmp_id, CHAR);`);
 		await queryRunner.query(
-			`CREATE INDEX \`TMP_idx_${tablePrefix}tag_entity_id\` ON ${tablePrefix}tag_entity (\`id\`);`,
+			`CREATE UNIQUE INDEX \`TMP_idx_${tablePrefix}tag_entity_id\` ON ${tablePrefix}tag_entity (\`id\`);`,
 		);
 
 		await queryRunner.query(
@@ -65,7 +65,7 @@ export class MigrateIntegerKeysToString1690000000001 implements IrreversibleMigr
 			`ALTER TABLE ${tablePrefix}workflows_tags DROP PRIMARY KEY, ADD PRIMARY KEY (\`workflowId\`, \`tagId\`);`,
 		);
 		await queryRunner.query(
-			`CREATE INDEX \`idx_${tablePrefix}workflows_tags_workflowid\` ON ${tablePrefix}workflows_tags (\`workflowId\`);`,
+			`CREATE INDEX \`idx_${tablePrefix}workflows_tags_workflow_id\` ON ${tablePrefix}workflows_tags (\`workflowId\`);`,
 		);
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}workflows_tags DROP FOREIGN KEY \`FK_${tablePrefix}54b2f0343d6a2078fa137443869\`;`,
@@ -207,7 +207,7 @@ export class MigrateIntegerKeysToString1690000000001 implements IrreversibleMigr
 			`UPDATE ${tablePrefix}credentials_entity SET id = CONVERT(tmp_id, CHAR);`,
 		);
 		await queryRunner.query(
-			`CREATE INDEX \`TMP_idx_${tablePrefix}credentials_entity_id\` ON ${tablePrefix}credentials_entity (\`id\`);`,
+			`CREATE UNIQUE INDEX \`TMP_idx_${tablePrefix}credentials_entity_id\` ON ${tablePrefix}credentials_entity (\`id\`);`,
 		);
 
 		await queryRunner.query(
@@ -259,7 +259,7 @@ export class MigrateIntegerKeysToString1690000000001 implements IrreversibleMigr
 			`UPDATE ${tablePrefix}variables SET \`id\` = CONVERT(\`tmp_id\`, CHAR);`,
 		);
 		await queryRunner.query(
-			`CREATE INDEX \`TMP_idx_${tablePrefix}variables_id\` ON ${tablePrefix}variables (\`id\`);`,
+			`CREATE UNIQUE INDEX \`TMP_idx_${tablePrefix}variables_id\` ON ${tablePrefix}variables (\`id\`);`,
 		);
 		await queryRunner.query(
 			`ALTER TABLE ${tablePrefix}variables CHANGE \`tmp_id\` \`tmp_id\` int NOT NULL;`,
@@ -268,5 +268,8 @@ export class MigrateIntegerKeysToString1690000000001 implements IrreversibleMigr
 			`ALTER TABLE ${tablePrefix}variables DROP PRIMARY KEY, ADD PRIMARY KEY (\`id\`);`,
 		);
 		await queryRunner.query(`ALTER TABLE ${tablePrefix}variables DROP COLUMN \`tmp_id\`;`);
+		await queryRunner.query(
+			`DROP INDEX \`TMP_idx_${tablePrefix}variables_id\` ON ${tablePrefix}variables;`,
+		);
 	}
 }
diff --git a/packages/cli/src/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts b/packages/cli/src/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts
new file mode 100644
index 0000000000..793aa3a262
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1731582748663-MigrateTestDefinitionKeyToString.ts
@@ -0,0 +1,18 @@
+import type { MigrationContext, IrreversibleMigration } from '@/databases/types';
+
+export class MigrateTestDefinitionKeyToString1731582748663 implements IrreversibleMigration {
+	async up(context: MigrationContext) {
+		const { queryRunner, tablePrefix } = context;
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}test_definition CHANGE id tmp_id int NOT NULL AUTO_INCREMENT;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}test_definition ADD COLUMN id varchar(36) NOT NULL;`,
+		);
+		await queryRunner.query(`UPDATE ${tablePrefix}test_definition SET id = CONVERT(tmp_id, CHAR);`);
+		await queryRunner.query(
+			`CREATE INDEX \`TMP_idx_${tablePrefix}test_definition_id\` ON ${tablePrefix}test_definition (\`id\`);`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index ff40fd9dc0..b76409c0c1 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -43,6 +43,7 @@ import { MigrateIntegerKeysToString1690000000001 } from './1690000000001-Migrate
 import { SeparateExecutionData1690000000030 } from './1690000000030-SeparateExecutionData';
 import { FixExecutionDataType1690000000031 } from './1690000000031-FixExecutionDataType';
 import { AddActivatedAtUserSetting1717498465931 } from './1717498465931-AddActivatedAtUserSetting';
+import { MigrateTestDefinitionKeyToString1731582748663 } from './1731582748663-MigrateTestDefinitionKeyToString';
 import { CreateLdapEntities1674509946020 } from '../common/1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from '../common/1675940580449-PurgeInvalidWorkflowConnections';
 import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
@@ -68,6 +69,14 @@ import { CreateProcessedDataTable1726606152711 } from '../common/1726606152711-C
 import { SeparateExecutionCreationFromStart1727427440136 } from '../common/1727427440136-SeparateExecutionCreationFromStart';
 import { AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644 } from '../common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping';
 import { UpdateProcessedDataValueColumnToText1729607673464 } from '../common/1729607673464-UpdateProcessedDataValueColumnToText';
+import { AddProjectIcons1729607673469 } from '../common/1729607673469-AddProjectIcons';
+import { CreateTestDefinitionTable1730386903556 } from '../common/1730386903556-CreateTestDefinitionTable';
+import { AddDescriptionToTestDefinition1731404028106 } from '../common/1731404028106-AddDescriptionToTestDefinition';
+import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-CreateTestMetricTable';
+import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
+import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
+import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
+import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
 
 export const mysqlMigrations: Migration[] = [
 	InitialMigration1588157391238,
@@ -138,4 +147,13 @@ export const mysqlMigrations: Migration[] = [
 	CreateProcessedDataTable1726606152711,
 	AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644,
 	UpdateProcessedDataValueColumnToText1729607673464,
+	CreateTestDefinitionTable1730386903556,
+	AddDescriptionToTestDefinition1731404028106,
+	MigrateTestDefinitionKeyToString1731582748663,
+	CreateTestMetricTable1732271325258,
+	CreateTestRun1732549866705,
+	AddMockedNodesColumnToTestDefinition1733133775640,
+	AddManagedColumnToCredentialsTable1734479635324,
+	AddProjectIcons1729607673469,
+	AddStatsColumnsToTestRun1736172058779,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts b/packages/cli/src/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts
new file mode 100644
index 0000000000..9afc1c3ae3
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1731582748663-MigrateTestDefinitionKeyToString.ts
@@ -0,0 +1,30 @@
+import type { MigrationContext, IrreversibleMigration } from '@/databases/types';
+
+export class MigrateTestDefinitionKeyToString1731582748663 implements IrreversibleMigration {
+	async up(context: MigrationContext) {
+		const { queryRunner, tablePrefix } = context;
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}test_definition RENAME COLUMN id to tmp_id;`,
+		);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}test_definition ADD COLUMN id varchar(36);`);
+		await queryRunner.query(`UPDATE ${tablePrefix}test_definition SET id = tmp_id::text;`);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}test_definition ALTER COLUMN id SET NOT NULL;`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}test_definition ALTER COLUMN tmp_id DROP DEFAULT;`,
+		);
+		await queryRunner.query(`DROP SEQUENCE IF EXISTS ${tablePrefix}test_definition_id_seq;`);
+		await queryRunner.query(
+			`CREATE UNIQUE INDEX "pk_${tablePrefix}test_definition_id" ON ${tablePrefix}test_definition ("id");`,
+		);
+
+		await queryRunner.query(
+			`ALTER TABLE ${tablePrefix}test_definition DROP CONSTRAINT IF EXISTS "PK_${tablePrefix}245a0013672c8cdc7727afa9b99";`,
+		);
+
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}test_definition DROP COLUMN tmp_id;`);
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}test_definition ADD PRIMARY KEY (id);`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index f3ac7e0474..7cf90bde5b 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -43,6 +43,7 @@ import { AddMissingPrimaryKeyOnExecutionData1690787606731 } from './169078760673
 import { MigrateToTimestampTz1694091729095 } from './1694091729095-MigrateToTimestampTz';
 import { AddActivatedAtUserSetting1717498465931 } from './1717498465931-AddActivatedAtUserSetting';
 import { FixExecutionMetadataSequence1721377157740 } from './1721377157740-FixExecutionMetadataSequence';
+import { MigrateTestDefinitionKeyToString1731582748663 } from './1731582748663-MigrateTestDefinitionKeyToString';
 import { CreateLdapEntities1674509946020 } from '../common/1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from '../common/1675940580449-PurgeInvalidWorkflowConnections';
 import { RemoveResetPasswordColumns1690000000030 } from '../common/1690000000030-RemoveResetPasswordColumns';
@@ -68,6 +69,14 @@ import { CreateProcessedDataTable1726606152711 } from '../common/1726606152711-C
 import { SeparateExecutionCreationFromStart1727427440136 } from '../common/1727427440136-SeparateExecutionCreationFromStart';
 import { AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644 } from '../common/1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping';
 import { UpdateProcessedDataValueColumnToText1729607673464 } from '../common/1729607673464-UpdateProcessedDataValueColumnToText';
+import { AddProjectIcons1729607673469 } from '../common/1729607673469-AddProjectIcons';
+import { CreateTestDefinitionTable1730386903556 } from '../common/1730386903556-CreateTestDefinitionTable';
+import { AddDescriptionToTestDefinition1731404028106 } from '../common/1731404028106-AddDescriptionToTestDefinition';
+import { CreateTestMetricTable1732271325258 } from '../common/1732271325258-CreateTestMetricTable';
+import { CreateTestRun1732549866705 } from '../common/1732549866705-CreateTestRunTable';
+import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
+import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
+import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
 
 export const postgresMigrations: Migration[] = [
 	InitialMigration1587669153312,
@@ -138,4 +147,13 @@ export const postgresMigrations: Migration[] = [
 	CreateProcessedDataTable1726606152711,
 	AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644,
 	UpdateProcessedDataValueColumnToText1729607673464,
+	CreateTestDefinitionTable1730386903556,
+	AddDescriptionToTestDefinition1731404028106,
+	MigrateTestDefinitionKeyToString1731582748663,
+	CreateTestMetricTable1732271325258,
+	CreateTestRun1732549866705,
+	AddMockedNodesColumnToTestDefinition1733133775640,
+	AddManagedColumnToCredentialsTable1734479635324,
+	AddProjectIcons1729607673469,
+	AddStatsColumnsToTestRun1736172058779,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts b/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts
index 99cbef5aac..1c72db35ed 100644
--- a/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1690000000002-MigrateIntegerKeysToString.ts
@@ -1,8 +1,8 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { statSync } from 'fs';
 import { InstanceSettings } from 'n8n-core';
 import path from 'path';
-import { Container } from 'typedi';
 
 import type { MigrationContext, IrreversibleMigration } from '@/databases/types';
 
diff --git a/packages/cli/src/databases/migrations/sqlite/1729607673469-AddProjectIcons.ts b/packages/cli/src/databases/migrations/sqlite/1729607673469-AddProjectIcons.ts
new file mode 100644
index 0000000000..f5eb94ffc0
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1729607673469-AddProjectIcons.ts
@@ -0,0 +1,5 @@
+import { AddProjectIcons1729607673469 as BaseMigration } from '../common/1729607673469-AddProjectIcons';
+
+export class AddProjectIcons1729607673469 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.ts b/packages/cli/src/databases/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.ts
new file mode 100644
index 0000000000..3c3ad4e4ed
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1731404028106-AddDescriptionToTestDefinition.ts
@@ -0,0 +1,5 @@
+import { AddDescriptionToTestDefinition1731404028106 as BaseMigration } from '../common/1731404028106-AddDescriptionToTestDefinition';
+
+export class AddDescriptionToTestDefinition1731404028106 extends BaseMigration {
+	transaction = false as const;
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts b/packages/cli/src/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts
new file mode 100644
index 0000000000..4ffa3da983
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1731582748663-MigrateTestDefinitionKeyToString.ts
@@ -0,0 +1,25 @@
+import type { MigrationContext, IrreversibleMigration } from '@/databases/types';
+
+export class MigrateTestDefinitionKeyToString1731582748663 implements IrreversibleMigration {
+	transaction = false as const;
+
+	async up(context: MigrationContext) {
+		const { queryRunner, tablePrefix } = context;
+
+		await queryRunner.query(`
+			CREATE TABLE "${tablePrefix}TMP_test_definition" ("id" varchar(36) PRIMARY KEY NOT NULL, "name" varchar(255) NOT NULL, "workflowId" varchar(36) NOT NULL, "evaluationWorkflowId" varchar(36), "annotationTagId" varchar(16), "createdAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "updatedAt" datetime(3) NOT NULL DEFAULT (STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')), "description" text, CONSTRAINT "FK_${tablePrefix}test_definition_annotation_tag" FOREIGN KEY ("annotationTagId") REFERENCES "annotation_tag_entity" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_${tablePrefix}test_definition_evaluation_workflow_entity" FOREIGN KEY ("evaluationWorkflowId") REFERENCES "workflow_entity" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_${tablePrefix}test_definition_workflow_entity" FOREIGN KEY ("workflowId") REFERENCES "workflow_entity" ("id") ON DELETE CASCADE ON UPDATE NO ACTION);`);
+		await queryRunner.query(
+			`INSERT INTO "${tablePrefix}TMP_test_definition" SELECT * FROM "${tablePrefix}test_definition";`,
+		);
+		await queryRunner.query(`DROP TABLE "${tablePrefix}test_definition";`);
+		await queryRunner.query(
+			`ALTER TABLE "${tablePrefix}TMP_test_definition" RENAME TO "${tablePrefix}test_definition";`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}test_definition_workflow_id" ON "${tablePrefix}test_definition" ("workflowId");`,
+		);
+		await queryRunner.query(
+			`CREATE INDEX "idx_${tablePrefix}test_definition_evaluation_workflow_id" ON "${tablePrefix}test_definition" ("evaluationWorkflowId");`,
+		);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index e53b5f43bd..363a6e47c3 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -39,6 +39,9 @@ import { DropRoleMapping1705429061930 } from './1705429061930-DropRoleMapping';
 import { AddActivatedAtUserSetting1717498465931 } from './1717498465931-AddActivatedAtUserSetting';
 import { AddApiKeysTable1724951148974 } from './1724951148974-AddApiKeysTable';
 import { AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644 } from './1728659839644-AddMissingPrimaryKeyOnAnnotationTagMapping';
+import { AddProjectIcons1729607673469 } from './1729607673469-AddProjectIcons';
+import { AddDescriptionToTestDefinition1731404028106 } from './1731404028106-AddDescriptionToTestDefinition';
+import { MigrateTestDefinitionKeyToString1731582748663 } from './1731582748663-MigrateTestDefinitionKeyToString';
 import { UniqueWorkflowNames1620821879465 } from '../common/1620821879465-UniqueWorkflowNames';
 import { UpdateWorkflowCredentials1630330987096 } from '../common/1630330987096-UpdateWorkflowCredentials';
 import { AddNodeIds1658930531669 } from '../common/1658930531669-AddNodeIds';
@@ -65,6 +68,12 @@ import { CreateAnnotationTables1724753530828 } from '../common/1724753530828-Cre
 import { CreateProcessedDataTable1726606152711 } from '../common/1726606152711-CreateProcessedDataTable';
 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';
+import { AddMockedNodesColumnToTestDefinition1733133775640 } from '../common/1733133775640-AddMockedNodesColumnToTestDefinition';
+import { AddManagedColumnToCredentialsTable1734479635324 } from '../common/1734479635324-AddManagedColumnToCredentialsTable';
+import { AddStatsColumnsToTestRun1736172058779 } from '../common/1736172058779-AddStatsColumnsToTestRun';
 
 const sqliteMigrations: Migration[] = [
 	InitialMigration1588102412422,
@@ -132,6 +141,15 @@ const sqliteMigrations: Migration[] = [
 	CreateProcessedDataTable1726606152711,
 	AddMissingPrimaryKeyOnAnnotationTagMapping1728659839644,
 	UpdateProcessedDataValueColumnToText1729607673464,
+	CreateTestDefinitionTable1730386903556,
+	AddDescriptionToTestDefinition1731404028106,
+	MigrateTestDefinitionKeyToString1731582748663,
+	CreateTestMetricTable1732271325258,
+	CreateTestRun1732549866705,
+	AddMockedNodesColumnToTestDefinition1733133775640,
+	AddManagedColumnToCredentialsTable1734479635324,
+	AddProjectIcons1729607673469,
+	AddStatsColumnsToTestRun1736172058779,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/databases/repositories/__tests__/credentials.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/credentials.repository.test.ts
new file mode 100644
index 0000000000..7b70587d65
--- /dev/null
+++ b/packages/cli/src/databases/repositories/__tests__/credentials.repository.test.ts
@@ -0,0 +1,50 @@
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+
+import { CredentialsEntity } from '@/databases/entities/credentials-entity';
+import { mockEntityManager } from '@test/mocking';
+
+import { CredentialsRepository } from '../credentials.repository';
+
+const entityManager = mockEntityManager(CredentialsEntity);
+const repository = Container.get(CredentialsRepository);
+
+describe('findMany', () => {
+	const credentialsId = 'cred_123';
+	const credential = mock<CredentialsEntity>({ id: credentialsId });
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+	});
+
+	test('return `data` property if `includeData:true` and select is using the record syntax', async () => {
+		// ARRANGE
+		entityManager.find.mockResolvedValueOnce([credential]);
+
+		// ACT
+		const credentials = await repository.findMany({ includeData: true, select: { id: true } });
+
+		// ASSERT
+		expect(credentials).toHaveLength(1);
+		expect(credentials[0]).toHaveProperty('data');
+	});
+
+	test('return `data` property if `includeData:true` and select is using the record syntax', async () => {
+		// ARRANGE
+		entityManager.find.mockResolvedValueOnce([credential]);
+
+		// ACT
+		const credentials = await repository.findMany({
+			includeData: true,
+			//TODO: fix this
+			// The function's type does not support this but this is what it
+			// actually gets from the service because the middlewares are typed
+			// loosely.
+			select: ['id'] as never,
+		});
+
+		// ASSERT
+		expect(credentials).toHaveLength(1);
+		expect(credentials[0]).toHaveProperty('data');
+	});
+});
diff --git a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
index 10d1371f37..8e36f0189b 100644
--- a/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/execution.repository.test.ts
@@ -1,10 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { SelectQueryBuilder } from '@n8n/typeorm';
 import { Not, LessThanOrEqual } from '@n8n/typeorm';
 import { mock } from 'jest-mock-extended';
 import { BinaryDataService } from 'n8n-core';
 import { nanoid } from 'nanoid';
-import Container from 'typedi';
 
 import { ExecutionEntity } from '@/databases/entities/execution-entity';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
diff --git a/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts b/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts
index afaca2206f..d7e108389a 100644
--- a/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/shared-credentials.repository.test.ts
@@ -1,13 +1,13 @@
+import { Container } from '@n8n/di';
 import { hasScope } from '@n8n/permissions';
 import { In } from '@n8n/typeorm';
 import { mock } from 'jest-mock-extended';
-import { Container } from 'typedi';
 
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import { SharedCredentials } from '@/databases/entities/shared-credentials';
 import type { User } from '@/databases/entities/user';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
-import { GLOBAL_MEMBER_SCOPES, GLOBAL_OWNER_SCOPES } from '@/permissions/global-roles';
+import { GLOBAL_MEMBER_SCOPES, GLOBAL_OWNER_SCOPES } from '@/permissions.ee/global-roles';
 import { mockEntityManager } from '@test/mocking';
 
 describe('SharedCredentialsRepository', () => {
diff --git a/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts b/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts
index 202938e526..b1d36b0263 100644
--- a/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts
+++ b/packages/cli/src/databases/repositories/__tests__/workflow-statistics.test.ts
@@ -1,6 +1,6 @@
+import { Container } from '@n8n/di';
 import { type InsertResult, QueryFailedError } from '@n8n/typeorm';
 import { mock, mockClear } from 'jest-mock-extended';
-import { Container } from 'typedi';
 
 import { StatisticsNames, WorkflowStatistics } from '@/databases/entities/workflow-statistics';
 import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
diff --git a/packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts b/packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts
index 07bb79815b..7f1039c3a1 100644
--- a/packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts
+++ b/packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
 
diff --git a/packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts b/packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts
index e3aa993460..3f4d5c161f 100644
--- a/packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts
+++ b/packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
 
diff --git a/packages/cli/src/databases/repositories/api-key.repository.ts b/packages/cli/src/databases/repositories/api-key.repository.ts
index 21ad2c3e40..b24a8984dc 100644
--- a/packages/cli/src/databases/repositories/api-key.repository.ts
+++ b/packages/cli/src/databases/repositories/api-key.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { ApiKey } from '../entities/api-key';
 
diff --git a/packages/cli/src/databases/repositories/auth-identity.repository.ts b/packages/cli/src/databases/repositories/auth-identity.repository.ts
index 349fe29cd5..1036994680 100644
--- a/packages/cli/src/databases/repositories/auth-identity.repository.ts
+++ b/packages/cli/src/databases/repositories/auth-identity.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { AuthIdentity } from '../entities/auth-identity';
 
diff --git a/packages/cli/src/databases/repositories/auth-provider-sync-history.repository.ts b/packages/cli/src/databases/repositories/auth-provider-sync-history.repository.ts
index d4c5d50b5a..6f217e7454 100644
--- a/packages/cli/src/databases/repositories/auth-provider-sync-history.repository.ts
+++ b/packages/cli/src/databases/repositories/auth-provider-sync-history.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { AuthProviderSyncHistory } from '../entities/auth-provider-sync-history';
 
diff --git a/packages/cli/src/databases/repositories/auth-user.repository.ts b/packages/cli/src/databases/repositories/auth-user.repository.ts
index 0d94fc9ba6..c5a06d9b66 100644
--- a/packages/cli/src/databases/repositories/auth-user.repository.ts
+++ b/packages/cli/src/databases/repositories/auth-user.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { AuthUser } from '../entities/auth-user';
 
diff --git a/packages/cli/src/databases/repositories/credentials.repository.ts b/packages/cli/src/databases/repositories/credentials.repository.ts
index 4c62e30f63..42fac4f8dc 100644
--- a/packages/cli/src/databases/repositories/credentials.repository.ts
+++ b/packages/cli/src/databases/repositories/credentials.repository.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import { DataSource, In, Repository, Like } from '@n8n/typeorm';
 import type { FindManyOptions, FindOptionsWhere } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import type { ListQuery } from '@/requests';
 import { RoleService } from '@/services/role.service';
@@ -25,7 +25,10 @@ export class CredentialsRepository extends Repository<CredentialsEntity> {
 		});
 	}
 
-	async findMany(listQueryOptions?: ListQuery.Options, credentialIds?: string[]) {
+	async findMany(
+		listQueryOptions?: ListQuery.Options & { includeData?: boolean },
+		credentialIds?: string[],
+	) {
 		const findManyOptions = this.toFindManyOptions(listQueryOptions);
 
 		if (credentialIds) {
@@ -35,13 +38,13 @@ export class CredentialsRepository extends Repository<CredentialsEntity> {
 		return await this.find(findManyOptions);
 	}
 
-	private toFindManyOptions(listQueryOptions?: ListQuery.Options) {
+	private toFindManyOptions(listQueryOptions?: ListQuery.Options & { includeData?: boolean }) {
 		const findManyOptions: FindManyOptions<CredentialsEntity> = {};
 
 		type Select = Array<keyof CredentialsEntity>;
 
 		const defaultRelations = ['shared', 'shared.project'];
-		const defaultSelect: Select = ['id', 'name', 'type', 'createdAt', 'updatedAt'];
+		const defaultSelect: Select = ['id', 'name', 'type', 'isManaged', 'createdAt', 'updatedAt'];
 
 		if (!listQueryOptions) return { select: defaultSelect, relations: defaultRelations };
 
@@ -74,6 +77,14 @@ export class CredentialsRepository extends Repository<CredentialsEntity> {
 			findManyOptions.relations = defaultRelations;
 		}
 
+		if (listQueryOptions.includeData) {
+			if (Array.isArray(findManyOptions.select)) {
+				findManyOptions.select.push('data');
+			} else {
+				findManyOptions.select.data = true;
+			}
+		}
+
 		return findManyOptions;
 	}
 
diff --git a/packages/cli/src/databases/repositories/event-destinations.repository.ts b/packages/cli/src/databases/repositories/event-destinations.repository.ts
index 56a2ab0f90..2af7bca8bb 100644
--- a/packages/cli/src/databases/repositories/event-destinations.repository.ts
+++ b/packages/cli/src/databases/repositories/event-destinations.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { EventDestinations } from '../entities/event-destinations';
 
diff --git a/packages/cli/src/databases/repositories/execution-annotation.repository.ts b/packages/cli/src/databases/repositories/execution-annotation.repository.ts
index 97ca972733..a8329669f9 100644
--- a/packages/cli/src/databases/repositories/execution-annotation.repository.ts
+++ b/packages/cli/src/databases/repositories/execution-annotation.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
 
diff --git a/packages/cli/src/databases/repositories/execution-data.repository.ts b/packages/cli/src/databases/repositories/execution-data.repository.ts
index f7de742941..75463fd0f5 100644
--- a/packages/cli/src/databases/repositories/execution-data.repository.ts
+++ b/packages/cli/src/databases/repositories/execution-data.repository.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 import type { EntityManager } from '@n8n/typeorm';
 import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
-import { Service } from 'typedi';
 
 import { ExecutionData } from '../entities/execution-data';
 
diff --git a/packages/cli/src/databases/repositories/execution-metadata.repository.ts b/packages/cli/src/databases/repositories/execution-metadata.repository.ts
index efaf239c4a..e0f27e6c09 100644
--- a/packages/cli/src/databases/repositories/execution-metadata.repository.ts
+++ b/packages/cli/src/databases/repositories/execution-metadata.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { ExecutionMetadata } from '../entities/execution-metadata';
 
diff --git a/packages/cli/src/databases/repositories/execution.repository.ts b/packages/cli/src/databases/repositories/execution.repository.ts
index ce4bedac2a..160b7ace87 100644
--- a/packages/cli/src/databases/repositories/execution.repository.ts
+++ b/packages/cli/src/databases/repositories/execution.repository.ts
@@ -1,4 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import type {
 	FindManyOptions,
 	FindOneOptions,
@@ -21,21 +22,15 @@ import {
 import { DateUtils } from '@n8n/typeorm/util/DateUtils';
 import { parse, stringify } from 'flatted';
 import pick from 'lodash/pick';
-import { BinaryDataService } from 'n8n-core';
-import {
-	ExecutionCancelledError,
-	ErrorReporterProxy as ErrorReporter,
-	ApplicationError,
-} from 'n8n-workflow';
+import { BinaryDataService, ErrorReporter, Logger } from 'n8n-core';
+import { ExecutionCancelledError, ApplicationError } from 'n8n-workflow';
 import type {
 	AnnotationVote,
 	ExecutionStatus,
 	ExecutionSummary,
 	IRunExecutionData,
 } from 'n8n-workflow';
-import { Service } from 'typedi';
 
-import config from '@/config';
 import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
 import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
 import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
@@ -47,7 +42,6 @@ import type {
 	IExecutionFlattedDb,
 	IExecutionResponse,
 } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { separate } from '@/utils';
 
 import { ExecutionDataRepository } from './execution-data.repository';
@@ -126,6 +120,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 		dataSource: DataSource,
 		private readonly globalConfig: GlobalConfig,
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly executionDataRepository: ExecutionDataRepository,
 		private readonly binaryDataService: BinaryDataService,
 	) {
@@ -164,7 +159,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);
@@ -204,7 +205,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 	reportInvalidExecutions(executions: ExecutionEntity[]) {
 		if (executions.length === 0) return;
 
-		ErrorReporter.error(
+		this.errorReporter.error(
 			new ApplicationError('Found executions without executionData', {
 				extra: { executionIds: executions.map(({ id }) => id) },
 			}),
@@ -460,8 +461,7 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 	}
 
 	async softDeletePrunableExecutions() {
-		const maxAge = config.getEnv('executions.pruneDataMaxAge'); // in h
-		const maxCount = config.getEnv('executions.pruneDataMaxCount');
+		const { pruneDataMaxAge, pruneDataMaxCount } = this.globalConfig.executions;
 
 		// Sub-query to exclude executions having annotations
 		const annotatedExecutionsSubQuery = this.manager
@@ -472,18 +472,18 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 
 		// Find ids of all executions that were stopped longer that pruneDataMaxAge ago
 		const date = new Date();
-		date.setHours(date.getHours() - maxAge);
+		date.setHours(date.getHours() - pruneDataMaxAge);
 
 		const toPrune: Array<FindOptionsWhere<ExecutionEntity>> = [
 			// date reformatting needed - see https://github.com/typeorm/typeorm/issues/2286
 			{ stoppedAt: LessThanOrEqual(DateUtils.mixedDateToUtcDatetimeString(date)) },
 		];
 
-		if (maxCount > 0) {
+		if (pruneDataMaxCount > 0) {
 			const executions = await this.createQueryBuilder('execution')
 				.select('execution.id')
 				.where('execution.id NOT IN ' + annotatedExecutionsSubQuery.getQuery())
-				.skip(maxCount)
+				.skip(pruneDataMaxCount)
 				.take(1)
 				.orderBy('execution.id', 'DESC')
 				.getMany();
@@ -515,9 +515,9 @@ export class ExecutionRepository extends Repository<ExecutionEntity> {
 			.execute();
 	}
 
-	async hardDeleteSoftDeletedExecutions() {
+	async findSoftDeletedExecutions() {
 		const date = new Date();
-		date.setHours(date.getHours() - config.getEnv('executions.pruneDataHardDeleteBuffer'));
+		date.setHours(date.getHours() - this.globalConfig.executions.pruneDataHardDeleteBuffer);
 
 		const workflowIdsAndExecutionIds = (
 			await this.find({
@@ -983,7 +983,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/installed-nodes.repository.ts b/packages/cli/src/databases/repositories/installed-nodes.repository.ts
index 880b4375ca..68fc564ca3 100644
--- a/packages/cli/src/databases/repositories/installed-nodes.repository.ts
+++ b/packages/cli/src/databases/repositories/installed-nodes.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { InstalledNodes } from '../entities/installed-nodes';
 
diff --git a/packages/cli/src/databases/repositories/installed-packages.repository.ts b/packages/cli/src/databases/repositories/installed-packages.repository.ts
index 50f9e7ad4f..873880dc90 100644
--- a/packages/cli/src/databases/repositories/installed-packages.repository.ts
+++ b/packages/cli/src/databases/repositories/installed-packages.repository.ts
@@ -1,6 +1,6 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
 import type { PackageDirectoryLoader } from 'n8n-core';
-import { Service } from 'typedi';
 
 import { InstalledNodesRepository } from './installed-nodes.repository';
 import { InstalledPackages } from '../entities/installed-packages';
@@ -35,7 +35,7 @@ export class InstalledPackagesRepository extends Repository<InstalledPackages> {
 			for (const loadedNode of loadedNodes) {
 				const installedNode = this.installedNodesRepository.create({
 					name: nodeTypes[loadedNode.name].type.description.displayName,
-					type: loadedNode.name,
+					type: `${packageName}.${loadedNode.name}`,
 					latestVersion: loadedNode.version,
 					package: { packageName },
 				});
diff --git a/packages/cli/src/databases/repositories/invalid-auth-token.repository.ts b/packages/cli/src/databases/repositories/invalid-auth-token.repository.ts
index 94909b998d..b9c8e0a4d9 100644
--- a/packages/cli/src/databases/repositories/invalid-auth-token.repository.ts
+++ b/packages/cli/src/databases/repositories/invalid-auth-token.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { InvalidAuthToken } from '../entities/invalid-auth-token';
 
diff --git a/packages/cli/src/databases/repositories/license-metrics.repository.ts b/packages/cli/src/databases/repositories/license-metrics.repository.ts
index 6be6ee0e7b..26f4bd7328 100644
--- a/packages/cli/src/databases/repositories/license-metrics.repository.ts
+++ b/packages/cli/src/databases/repositories/license-metrics.repository.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import { DataSource, Repository, Entity } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 @Entity()
 export class LicenseMetrics {}
@@ -15,18 +15,8 @@ export class LicenseMetricsRepository extends Repository<LicenseMetrics> {
 	}
 
 	toTableName(name: string) {
-		const tablePrefix = this.globalConfig.database.tablePrefix;
-
-		let tableName =
-			this.globalConfig.database.type === 'mysqldb'
-				? `\`${tablePrefix}${name}\``
-				: `"${tablePrefix}${name}"`;
-
-		const pgSchema = this.globalConfig.database.postgresdb.schema;
-
-		if (pgSchema !== 'public') tableName = [pgSchema, tablePrefix + name].join('.');
-
-		return tableName;
+		const { tablePrefix } = this.globalConfig.database;
+		return this.manager.connection.driver.escape(`${tablePrefix}${name}`);
 	}
 
 	async getLicenseRenewalMetrics() {
diff --git a/packages/cli/src/databases/repositories/processed-data.repository.ts b/packages/cli/src/databases/repositories/processed-data.repository.ts
index f02fbf270a..0063cdf9db 100644
--- a/packages/cli/src/databases/repositories/processed-data.repository.ts
+++ b/packages/cli/src/databases/repositories/processed-data.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { ProcessedData } from '../entities/processed-data';
 
diff --git a/packages/cli/src/databases/repositories/project-relation.repository.ts b/packages/cli/src/databases/repositories/project-relation.repository.ts
index 8d8faba1ba..89e5028b19 100644
--- a/packages/cli/src/databases/repositories/project-relation.repository.ts
+++ b/packages/cli/src/databases/repositories/project-relation.repository.ts
@@ -1,7 +1,8 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import { DataSource, In, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
-import { ProjectRelation, type ProjectRole } from '../entities/project-relation';
+import { ProjectRelation } from '../entities/project-relation';
 
 @Service()
 export class ProjectRelationRepository extends Repository<ProjectRelation> {
diff --git a/packages/cli/src/databases/repositories/project.repository.ts b/packages/cli/src/databases/repositories/project.repository.ts
index c67d4e9456..052668743b 100644
--- a/packages/cli/src/databases/repositories/project.repository.ts
+++ b/packages/cli/src/databases/repositories/project.repository.ts
@@ -1,6 +1,6 @@
+import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { Project } from '../entities/project';
 
diff --git a/packages/cli/src/databases/repositories/settings.repository.ts b/packages/cli/src/databases/repositories/settings.repository.ts
index 8d87fcffff..6e28b71c1b 100644
--- a/packages/cli/src/databases/repositories/settings.repository.ts
+++ b/packages/cli/src/databases/repositories/settings.repository.ts
@@ -1,15 +1,18 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
-import { Service } from 'typedi';
+import { ErrorReporter } from 'n8n-core';
 
 import config from '@/config';
-import { EXTERNAL_SECRETS_DB_KEY } from '@/external-secrets/constants';
+import { EXTERNAL_SECRETS_DB_KEY } from '@/external-secrets.ee/constants';
 
 import { Settings } from '../entities/settings';
 
 @Service()
 export class SettingsRepository extends Repository<Settings> {
-	constructor(dataSource: DataSource) {
+	constructor(
+		dataSource: DataSource,
+		private readonly errorReporter: ErrorReporter,
+	) {
 		super(Settings, dataSource.manager);
 	}
 
@@ -49,7 +52,7 @@ export class SettingsRepository extends Repository<Settings> {
 			config.set(key, value);
 			return { success: true };
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 		}
 		return { success: false };
 	}
diff --git a/packages/cli/src/databases/repositories/shared-credentials.repository.ts b/packages/cli/src/databases/repositories/shared-credentials.repository.ts
index 516c546929..f696a3bd59 100644
--- a/packages/cli/src/databases/repositories/shared-credentials.repository.ts
+++ b/packages/cli/src/databases/repositories/shared-credentials.repository.ts
@@ -1,12 +1,12 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import type { EntityManager, FindOptionsRelations, FindOptionsWhere } from '@n8n/typeorm';
 import { DataSource, In, Not, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { RoleService } from '@/services/role.service';
 
 import type { Project } from '../entities/project';
-import type { ProjectRole } from '../entities/project-relation';
 import { type CredentialSharingRole, SharedCredentials } from '../entities/shared-credentials';
 import type { User } from '../entities/user';
 
diff --git a/packages/cli/src/databases/repositories/shared-workflow.repository.ts b/packages/cli/src/databases/repositories/shared-workflow.repository.ts
index 31eef22e2a..f0a574fa0c 100644
--- a/packages/cli/src/databases/repositories/shared-workflow.repository.ts
+++ b/packages/cli/src/databases/repositories/shared-workflow.repository.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import { DataSource, Repository, In, Not } from '@n8n/typeorm';
 import type { EntityManager, FindManyOptions, FindOptionsWhere } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { RoleService } from '@/services/role.service';
 
@@ -211,4 +211,13 @@ export class SharedWorkflowRepository extends Repository<SharedWorkflow> {
 			},
 		});
 	}
+
+	async getAllRelationsForWorkflows(workflowIds: string[]) {
+		return await this.find({
+			where: {
+				workflowId: In(workflowIds),
+			},
+			relations: ['project'],
+		});
+	}
 }
diff --git a/packages/cli/src/databases/repositories/tag.repository.ts b/packages/cli/src/databases/repositories/tag.repository.ts
index 800fe225ae..f58b0e5b68 100644
--- a/packages/cli/src/databases/repositories/tag.repository.ts
+++ b/packages/cli/src/databases/repositories/tag.repository.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 import intersection from 'lodash/intersection';
-import { Service } from 'typedi';
 
 import { TagEntity } from '../entities/tag-entity';
 import type { WorkflowEntity } from '../entities/workflow-entity';
diff --git a/packages/cli/src/databases/repositories/test-definition.repository.ee.ts b/packages/cli/src/databases/repositories/test-definition.repository.ee.ts
new file mode 100644
index 0000000000..0955e6f89d
--- /dev/null
+++ b/packages/cli/src/databases/repositories/test-definition.repository.ee.ts
@@ -0,0 +1,70 @@
+import { Service } from '@n8n/di';
+import type { FindManyOptions, FindOptionsWhere } from '@n8n/typeorm';
+import { DataSource, In, Repository } from '@n8n/typeorm';
+
+import { TestDefinition } from '@/databases/entities/test-definition.ee';
+import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
+import type { ListQuery } from '@/requests';
+
+@Service()
+export class TestDefinitionRepository extends Repository<TestDefinition> {
+	constructor(dataSource: DataSource) {
+		super(TestDefinition, dataSource.manager);
+	}
+
+	async getMany(accessibleWorkflowIds: string[], options?: ListQuery.Options) {
+		if (accessibleWorkflowIds.length === 0) return { tests: [], count: 0 };
+
+		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,
+			relations: ['annotationTag'],
+			order: { createdAt: 'DESC' },
+		};
+
+		if (options?.take) {
+			findManyOptions.skip = options.skip;
+			findManyOptions.take = options.take;
+		}
+
+		const [testDefinitions, count] = await this.findAndCount(findManyOptions);
+
+		return { testDefinitions, count };
+	}
+
+	async getOne(id: string, accessibleWorkflowIds: string[]) {
+		return await this.findOne({
+			where: {
+				id,
+				workflow: {
+					id: In(accessibleWorkflowIds),
+				},
+			},
+			relations: ['annotationTag', 'metrics'],
+		});
+	}
+
+	async deleteById(id: string, accessibleWorkflowIds: string[]) {
+		return await this.delete({
+			id,
+			workflow: {
+				id: In(accessibleWorkflowIds),
+			},
+		});
+	}
+}
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..a08cf414f8
--- /dev/null
+++ b/packages/cli/src/databases/repositories/test-metric.repository.ee.ts
@@ -0,0 +1,11 @@
+import { Service } from '@n8n/di';
+import { DataSource, Repository } from '@n8n/typeorm';
+
+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..728f0bc464
--- /dev/null
+++ b/packages/cli/src/databases/repositories/test-run.repository.ee.ts
@@ -0,0 +1,63 @@
+import { Service } from '@n8n/di';
+import type { FindManyOptions } from '@n8n/typeorm';
+import { DataSource, Repository } from '@n8n/typeorm';
+
+import type { AggregatedTestRunMetrics } from '@/databases/entities/test-run.ee';
+import { TestRun } from '@/databases/entities/test-run.ee';
+import type { ListQuery } from '@/requests';
+
+@Service()
+export class TestRunRepository extends Repository<TestRun> {
+	constructor(dataSource: DataSource) {
+		super(TestRun, dataSource.manager);
+	}
+
+	async createTestRun(testDefinitionId: string) {
+		const testRun = this.create({
+			status: 'new',
+			testDefinition: { id: testDefinitionId },
+		});
+
+		return await this.save(testRun);
+	}
+
+	async markAsRunning(id: string, totalCases: number) {
+		return await this.update(id, {
+			status: 'running',
+			runAt: new Date(),
+			totalCases,
+			passedCases: 0,
+			failedCases: 0,
+		});
+	}
+
+	async markAsCompleted(id: string, metrics: AggregatedTestRunMetrics) {
+		return await this.update(id, { status: 'completed', completedAt: new Date(), metrics });
+	}
+
+	async markAsCancelled(id: string) {
+		return await this.update(id, { status: 'cancelled' });
+	}
+
+	async incrementPassed(id: string) {
+		return await this.increment({ id }, 'passedCases', 1);
+	}
+
+	async incrementFailed(id: string) {
+		return await this.increment({ id }, 'failedCases', 1);
+	}
+
+	async getMany(testDefinitionId: string, options: ListQuery.Options) {
+		const findManyOptions: FindManyOptions<TestRun> = {
+			where: { testDefinition: { id: testDefinitionId } },
+			order: { createdAt: 'DESC' },
+		};
+
+		if (options?.take) {
+			findManyOptions.skip = options.skip;
+			findManyOptions.take = options.take;
+		}
+
+		return await this.find(findManyOptions);
+	}
+}
diff --git a/packages/cli/src/databases/repositories/user.repository.ts b/packages/cli/src/databases/repositories/user.repository.ts
index 61a4edffa5..d785ce407d 100644
--- a/packages/cli/src/databases/repositories/user.repository.ts
+++ b/packages/cli/src/databases/repositories/user.repository.ts
@@ -1,6 +1,6 @@
+import { Service } from '@n8n/di';
 import type { DeepPartial, EntityManager, FindManyOptions } from '@n8n/typeorm';
 import { DataSource, In, IsNull, Not, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import type { ListQuery } from '@/requests';
 
diff --git a/packages/cli/src/databases/repositories/variables.repository.ts b/packages/cli/src/databases/repositories/variables.repository.ts
index 2f2500250b..5ea9711935 100644
--- a/packages/cli/src/databases/repositories/variables.repository.ts
+++ b/packages/cli/src/databases/repositories/variables.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { Variables } from '../entities/variables';
 
diff --git a/packages/cli/src/databases/repositories/webhook.repository.ts b/packages/cli/src/databases/repositories/webhook.repository.ts
index b89b9fba0f..5254793a78 100644
--- a/packages/cli/src/databases/repositories/webhook.repository.ts
+++ b/packages/cli/src/databases/repositories/webhook.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { WebhookEntity } from '../entities/webhook-entity';
 
diff --git a/packages/cli/src/databases/repositories/workflow-history.repository.ts b/packages/cli/src/databases/repositories/workflow-history.repository.ts
index ca791ebcb7..7e0cdfac1e 100644
--- a/packages/cli/src/databases/repositories/workflow-history.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow-history.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, LessThan, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { WorkflowHistory } from '../entities/workflow-history';
 
diff --git a/packages/cli/src/databases/repositories/workflow-statistics.repository.ts b/packages/cli/src/databases/repositories/workflow-statistics.repository.ts
index c2ea18fe2c..ad94e83ec1 100644
--- a/packages/cli/src/databases/repositories/workflow-statistics.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow-statistics.repository.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import { DataSource, MoreThanOrEqual, QueryFailedError, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
 
diff --git a/packages/cli/src/databases/repositories/workflow-tag-mapping.repository.ts b/packages/cli/src/databases/repositories/workflow-tag-mapping.repository.ts
index 108affaf11..0196437891 100644
--- a/packages/cli/src/databases/repositories/workflow-tag-mapping.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow-tag-mapping.repository.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
 import { WorkflowTagMapping } from '../entities/workflow-tag-mapping';
 
diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/cli/src/databases/repositories/workflow.repository.ts
index 0317124472..0952ae3cdc 100644
--- a/packages/cli/src/databases/repositories/workflow.repository.ts
+++ b/packages/cli/src/databases/repositories/workflow.repository.ts
@@ -1,4 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import {
 	DataSource,
 	Repository,
@@ -10,9 +11,7 @@ import {
 	type FindManyOptions,
 	type FindOptionsRelations,
 } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
-import config from '@/config';
 import type { ListQuery } from '@/requests';
 import { isStringArray } from '@/utils';
 
@@ -95,7 +94,8 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 			.execute();
 	}
 
-	async getMany(sharedWorkflowIds: string[], options?: ListQuery.Options) {
+	async getMany(sharedWorkflowIds: string[], originalOptions: ListQuery.Options = {}) {
+		const options = structuredClone(originalOptions);
 		if (sharedWorkflowIds.length === 0) return { workflows: [], count: 0 };
 
 		if (typeof options?.filter?.projectId === 'string' && options.filter.projectId !== '') {
@@ -131,7 +131,7 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 
 		const relations: string[] = [];
 
-		const areTagsEnabled = !config.getEnv('workflowTagsDisabled');
+		const areTagsEnabled = !this.globalConfig.tags.disabled;
 		const isDefaultSelect = options?.select === undefined;
 		const areTagsRequested = isDefaultSelect || options?.select?.tags === true;
 		const isOwnedByIncluded = isDefaultSelect || options?.select?.ownedBy === true;
diff --git a/packages/cli/src/databases/subscribers/user-subscriber.ts b/packages/cli/src/databases/subscribers/user-subscriber.ts
index 2f9e698890..485eeb6fc5 100644
--- a/packages/cli/src/databases/subscribers/user-subscriber.ts
+++ b/packages/cli/src/databases/subscribers/user-subscriber.ts
@@ -1,9 +1,8 @@
+import { Container } from '@n8n/di';
 import type { EntitySubscriberInterface, UpdateEvent } from '@n8n/typeorm';
 import { EventSubscriber } from '@n8n/typeorm';
-import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
-import { Container } from 'typedi';
-
-import { Logger } from '@/logging/logger.service';
+import { ErrorReporter, Logger } from 'n8n-core';
+import { ApplicationError } from 'n8n-workflow';
 
 import { Project } from '../entities/project';
 import { User } from '../entities/user';
@@ -11,6 +10,8 @@ import { UserRepository } from '../repositories/user.repository';
 
 @EventSubscriber()
 export class UserSubscriber implements EntitySubscriberInterface<User> {
+	private readonly eventReporter = Container.get(ErrorReporter);
+
 	listenTo() {
 		return User;
 	}
@@ -47,7 +48,7 @@ export class UserSubscriber implements EntitySubscriberInterface<User> {
 						const message = "Could not update the personal project's name";
 						Container.get(Logger).warn(message, event.entity);
 						const exception = new ApplicationError(message);
-						ErrorReporterProxy.warn(exception, event.entity);
+						this.eventReporter.warn(exception, event.entity);
 						return;
 					}
 
@@ -69,7 +70,7 @@ export class UserSubscriber implements EntitySubscriberInterface<User> {
 					const message = "Could not update the personal project's name";
 					Container.get(Logger).warn(message, event.entity);
 					const exception = new ApplicationError(message);
-					ErrorReporterProxy.warn(exception, event.entity);
+					this.eventReporter.warn(exception, event.entity);
 				}
 			}
 		}
diff --git a/packages/cli/src/databases/types.ts b/packages/cli/src/databases/types.ts
index 2bb1802bf2..dce7d9d243 100644
--- a/packages/cli/src/databases/types.ts
+++ b/packages/cli/src/databases/types.ts
@@ -1,8 +1,7 @@
 import type { QueryRunner, ObjectLiteral } from '@n8n/typeorm';
+import type { Logger } from 'n8n-core';
 import type { INodeTypes } from 'n8n-workflow';
 
-import type { Logger } from '@/logging/logger.service';
-
 import type { createSchemaBuilder } from './dsl';
 
 export type DatabaseType = 'mariadb' | 'postgresdb' | 'mysqldb' | 'sqlite';
diff --git a/packages/cli/src/databases/utils/migration-helpers.ts b/packages/cli/src/databases/utils/migration-helpers.ts
index 1093096f43..e248f19c83 100644
--- a/packages/cli/src/databases/utils/migration-helpers.ts
+++ b/packages/cli/src/databases/utils/migration-helpers.ts
@@ -1,15 +1,14 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { ObjectLiteral } from '@n8n/typeorm';
 import type { QueryRunner } from '@n8n/typeorm/query-runner/QueryRunner';
 import { readFileSync, rmSync } from 'fs';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { inTest } from '@/constants';
 import { createSchemaBuilder } from '@/databases/dsl';
 import type { BaseMigration, Migration, MigrationContext, MigrationFn } from '@/databases/types';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 
 const PERSONALIZATION_SURVEY_FILENAME = 'personalizationSurvey.json';
diff --git a/packages/cli/src/databases/utils/transformers.ts b/packages/cli/src/databases/utils/transformers.ts
index a18d0cf633..7a454d519c 100644
--- a/packages/cli/src/databases/utils/transformers.ts
+++ b/packages/cli/src/databases/utils/transformers.ts
@@ -1,7 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { ValueTransformer, FindOperator } from '@n8n/typeorm';
 import { jsonParse } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 export const idStringifier = {
 	from: (value?: number): string | undefined => value?.toString(),
diff --git a/packages/cli/src/db.ts b/packages/cli/src/db.ts
index 13147b4106..6f336d659d 100644
--- a/packages/cli/src/db.ts
+++ b/packages/cli/src/db.ts
@@ -1,13 +1,10 @@
+import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { EntityManager } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { DataSource as Connection } from '@n8n/typeorm';
-import {
-	DbConnectionTimeoutError,
-	ensureError,
-	ErrorReporterProxy as ErrorReporter,
-} from 'n8n-workflow';
-import { Container } from 'typedi';
+import { ErrorReporter } from 'n8n-core';
+import { DbConnectionTimeoutError, ensureError } from 'n8n-workflow';
 
 import { inTest } from '@/constants';
 import { getConnectionOptions, arePostgresOptions } from '@/databases/config';
@@ -38,7 +35,7 @@ if (!inTest) {
 				connectionState.connected = true;
 				return;
 			} catch (error) {
-				ErrorReporter.error(error);
+				Container.get(ErrorReporter).error(error);
 			} finally {
 				pingTimer = setTimeout(pingDBFn, 2000);
 			}
diff --git a/packages/cli/src/decorators/__tests__/on-shutdown.test.ts b/packages/cli/src/decorators/__tests__/on-shutdown.test.ts
index 28e70dac47..a5c720c993 100644
--- a/packages/cli/src/decorators/__tests__/on-shutdown.test.ts
+++ b/packages/cli/src/decorators/__tests__/on-shutdown.test.ts
@@ -1,5 +1,5 @@
+import { Container, Service } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import Container, { Service } from 'typedi';
 
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { ShutdownService } from '@/shutdown/shutdown.service';
@@ -8,7 +8,7 @@ describe('OnShutdown', () => {
 	let shutdownService: ShutdownService;
 
 	beforeEach(() => {
-		shutdownService = new ShutdownService(mock());
+		shutdownService = new ShutdownService(mock(), mock());
 		Container.set(ShutdownService, shutdownService);
 		jest.spyOn(shutdownService, 'register');
 	});
diff --git a/packages/cli/src/decorators/controller.registry.ts b/packages/cli/src/decorators/controller.registry.ts
index 3a22090db1..645a675011 100644
--- a/packages/cli/src/decorators/controller.registry.ts
+++ b/packages/cli/src/decorators/controller.registry.ts
@@ -1,9 +1,9 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import { Router } from 'express';
 import type { Application, Request, Response, RequestHandler } from 'express';
 import { rateLimit as expressRateLimit } from 'express-rate-limit';
 import { ApplicationError } from 'n8n-workflow';
-import { Container, Service } from 'typedi';
 import type { ZodClass } from 'zod-class';
 
 import { AuthService } from '@/auth/auth.service';
@@ -11,7 +11,7 @@ import { inProduction, RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { UnauthenticatedError } from '@/errors/response-errors/unauthenticated.error';
 import type { BooleanLicenseFeature } from '@/interfaces';
 import { License } from '@/license';
-import { userHasScopes } from '@/permissions/check-access';
+import { userHasScopes } from '@/permissions.ee/check-access';
 import type { AuthenticatedRequest } from '@/requests';
 import { send } from '@/response-helper'; // TODO: move `ResponseHelper.send` to this file
 
@@ -73,7 +73,7 @@ export class ControllerRegistry {
 			.replace(/\/$/, '');
 		app.use(prefix, router);
 
-		const controller = Container.get<Controller>(controllerClass);
+		const controller = Container.get(controllerClass) as Controller;
 		const controllerMiddlewares = metadata.middlewares.map(
 			(handlerName) => controller[handlerName].bind(controller) as RequestHandler,
 		);
@@ -93,7 +93,7 @@ export class ControllerRegistry {
 					if (arg.type === 'param') args.push(req.params[arg.key]);
 					else if (['body', 'query'].includes(arg.type)) {
 						const paramType = argTypes[index] as ZodClass;
-						if (paramType && 'parse' in paramType) {
+						if (paramType && 'safeParse' in paramType) {
 							const output = paramType.safeParse(req[arg.type]);
 							if (output.success) args.push(output.data);
 							else {
diff --git a/packages/cli/src/decorators/index.ts b/packages/cli/src/decorators/index.ts
index bd32add475..8002bbe094 100644
--- a/packages/cli/src/decorators/index.ts
+++ b/packages/cli/src/decorators/index.ts
@@ -1,4 +1,4 @@
-export { Body } from './args';
+export { Body, Query, Param } from './args';
 export { RestController } from './rest-controller';
 export { Get, Post, Put, Patch, Delete } from './route';
 export { Middleware } from './middleware';
diff --git a/packages/cli/src/decorators/on-shutdown.ts b/packages/cli/src/decorators/on-shutdown.ts
index dbcb547d42..3d17002105 100644
--- a/packages/cli/src/decorators/on-shutdown.ts
+++ b/packages/cli/src/decorators/on-shutdown.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { ApplicationError } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { DEFAULT_SHUTDOWN_PRIORITY } from '@/constants';
 import { type ServiceClass, ShutdownService } from '@/shutdown/shutdown.service';
diff --git a/packages/cli/src/decorators/rest-controller.ts b/packages/cli/src/decorators/rest-controller.ts
index d540f6a8ac..cdd32b6e21 100644
--- a/packages/cli/src/decorators/rest-controller.ts
+++ b/packages/cli/src/decorators/rest-controller.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { getControllerMetadata } from './controller.registry';
 import type { Controller } from './types';
diff --git a/packages/cli/src/decorators/types.ts b/packages/cli/src/decorators/types.ts
index f410df7831..17a7425882 100644
--- a/packages/cli/src/decorators/types.ts
+++ b/packages/cli/src/decorators/types.ts
@@ -1,6 +1,6 @@
+import type { Constructable } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import type { RequestHandler } from 'express';
-import type { Class } from 'n8n-core';
 
 import type { BooleanLicenseFeature } from '@/interfaces';
 
@@ -46,5 +46,5 @@ export interface ControllerMetadata {
 	routes: Map<HandlerName, RouteMetadata>;
 }
 
-export type Controller = Class<object> &
+export type Controller = Constructable<object> &
 	Record<HandlerName, (...args: unknown[]) => Promise<unknown>>;
diff --git a/packages/cli/src/deduplication/deduplication-helper.ts b/packages/cli/src/deduplication/deduplication-helper.ts
index a913a21a8c..dc6b59ac29 100644
--- a/packages/cli/src/deduplication/deduplication-helper.ts
+++ b/packages/cli/src/deduplication/deduplication-helper.ts
@@ -1,3 +1,4 @@
+import { Container } from '@n8n/di';
 import { createHash } from 'crypto';
 import {
 	type ICheckProcessedContextData,
@@ -10,7 +11,6 @@ import {
 	tryToParseDateTime,
 } from 'n8n-workflow';
 import * as assert from 'node:assert/strict';
-import { Container } from 'typedi';
 
 import type { ProcessedData } from '@/databases/entities/processed-data';
 import { ProcessedDataRepository } from '@/databases/repositories/processed-data.repository';
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..1b2e6c6174
--- /dev/null
+++ b/packages/cli/src/deprecation/deprecation.service.ts
@@ -0,0 +1,84 @@
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
+import { ApplicationError } from 'n8n-workflow';
+
+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/environments.ee/source-control/__tests__/source-control-export.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts
new file mode 100644
index 0000000000..96f2f8ecdb
--- /dev/null
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts
@@ -0,0 +1,261 @@
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Container } from '@n8n/di';
+import { mock, captor } from 'jest-mock-extended';
+import { Cipher, type InstanceSettings } from 'n8n-core';
+import fsp from 'node:fs/promises';
+
+import type { SharedCredentials } from '@/databases/entities/shared-credentials';
+import type { SharedWorkflow } from '@/databases/entities/shared-workflow';
+import type { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
+import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
+import type { TagRepository } from '@/databases/repositories/tag.repository';
+import type { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+import type { VariablesService } from '../../variables/variables.service.ee';
+import { SourceControlExportService } from '../source-control-export.service.ee';
+
+describe('SourceControlExportService', () => {
+	const cipher = Container.get(Cipher);
+	const sharedCredentialsRepository = mock<SharedCredentialsRepository>();
+	const sharedWorkflowRepository = mock<SharedWorkflowRepository>();
+	const workflowRepository = mock<WorkflowRepository>();
+	const tagRepository = mock<TagRepository>();
+	const workflowTagMappingRepository = mock<WorkflowTagMappingRepository>();
+	const variablesService = mock<VariablesService>();
+
+	const service = new SourceControlExportService(
+		mock(),
+		variablesService,
+		tagRepository,
+		sharedCredentialsRepository,
+		sharedWorkflowRepository,
+		workflowRepository,
+		workflowTagMappingRepository,
+		mock<InstanceSettings>({ n8nFolder: '/mock/n8n' }),
+	);
+
+	const fsWriteFile = jest.spyOn(fsp, 'writeFile');
+
+	beforeEach(() => jest.clearAllMocks());
+
+	describe('exportCredentialsToWorkFolder', () => {
+		const credentialData = {
+			authUrl: 'test',
+			accessTokenUrl: 'test',
+			clientId: 'test',
+			clientSecret: 'test',
+			oauthTokenData: {
+				access_token: 'test',
+				token_type: 'test',
+				expires_in: 123,
+				refresh_token: 'test',
+			},
+		};
+
+		const mockCredentials = mock({
+			id: 'cred1',
+			name: 'Test Credential',
+			type: 'oauth2',
+			data: cipher.encrypt(credentialData),
+		});
+
+		it('should export credentials to work folder', async () => {
+			sharedCredentialsRepository.findByCredentialIds.mockResolvedValue([
+				mock<SharedCredentials>({
+					credentials: mockCredentials,
+					project: mock({
+						type: 'personal',
+						projectRelations: [
+							{
+								role: 'project:personalOwner',
+								user: mock({ email: 'user@example.com' }),
+							},
+						],
+					}),
+				}),
+			]);
+
+			// Act
+			const result = await service.exportCredentialsToWorkFolder([mock()]);
+
+			// Assert
+			expect(result.count).toBe(1);
+			expect(result.files).toHaveLength(1);
+
+			const dataCaptor = captor<string>();
+			expect(fsWriteFile).toHaveBeenCalledWith(
+				'/mock/n8n/git/credential_stubs/cred1.json',
+				dataCaptor,
+			);
+			expect(JSON.parse(dataCaptor.value)).toEqual({
+				id: 'cred1',
+				name: 'Test Credential',
+				type: 'oauth2',
+				data: {
+					authUrl: '',
+					accessTokenUrl: '',
+					clientId: '',
+					clientSecret: '',
+				},
+				ownedBy: {
+					type: 'personal',
+					personalEmail: 'user@example.com',
+				},
+			});
+		});
+
+		it('should handle team project credentials', async () => {
+			sharedCredentialsRepository.findByCredentialIds.mockResolvedValue([
+				mock<SharedCredentials>({
+					credentials: mockCredentials,
+					project: mock({
+						type: 'team',
+						id: 'team1',
+						name: 'Test Team',
+					}),
+				}),
+			]);
+
+			// Act
+			const result = await service.exportCredentialsToWorkFolder([
+				mock<SourceControlledFile>({ id: 'cred1' }),
+			]);
+
+			// Assert
+			expect(result.count).toBe(1);
+
+			const dataCaptor = captor<string>();
+			expect(fsWriteFile).toHaveBeenCalledWith(
+				'/mock/n8n/git/credential_stubs/cred1.json',
+				dataCaptor,
+			);
+			expect(JSON.parse(dataCaptor.value)).toEqual({
+				id: 'cred1',
+				name: 'Test Credential',
+				type: 'oauth2',
+				data: {
+					authUrl: '',
+					accessTokenUrl: '',
+					clientId: '',
+					clientSecret: '',
+				},
+				ownedBy: {
+					type: 'team',
+					teamId: 'team1',
+					teamName: 'Test Team',
+				},
+			});
+		});
+
+		it('should handle missing credentials', async () => {
+			// Arrange
+			sharedCredentialsRepository.findByCredentialIds.mockResolvedValue([]);
+
+			// Act
+			const result = await service.exportCredentialsToWorkFolder([
+				mock<SourceControlledFile>({ id: 'cred1' }),
+			]);
+
+			// Assert
+			expect(result.missingIds).toHaveLength(1);
+			expect(result.missingIds?.[0]).toBe('cred1');
+		});
+	});
+
+	describe('exportTagsToWorkFolder', () => {
+		it('should export tags to work folder', async () => {
+			// Arrange
+			tagRepository.find.mockResolvedValue([mock()]);
+			workflowTagMappingRepository.find.mockResolvedValue([mock()]);
+
+			// Act
+			const result = await service.exportTagsToWorkFolder();
+
+			// Assert
+			expect(result.count).toBe(1);
+			expect(result.files).toHaveLength(1);
+		});
+
+		it('should not export empty tags', async () => {
+			// Arrange
+			tagRepository.find.mockResolvedValue([]);
+
+			// Act
+			const result = await service.exportTagsToWorkFolder();
+
+			// Assert
+			expect(result.count).toBe(0);
+			expect(result.files).toHaveLength(0);
+		});
+	});
+
+	describe('exportVariablesToWorkFolder', () => {
+		it('should export variables to work folder', async () => {
+			// Arrange
+			variablesService.getAllCached.mockResolvedValue([mock()]);
+
+			// Act
+			const result = await service.exportVariablesToWorkFolder();
+
+			// Assert
+			expect(result.count).toBe(1);
+			expect(result.files).toHaveLength(1);
+		});
+
+		it('should not export empty variables', async () => {
+			// Arrange
+			variablesService.getAllCached.mockResolvedValue([]);
+
+			// Act
+			const result = await service.exportVariablesToWorkFolder();
+
+			// Assert
+			expect(result.count).toBe(0);
+			expect(result.files).toHaveLength(0);
+		});
+	});
+
+	describe('exportWorkflowsToWorkFolder', () => {
+		it('should export workflows to work folder', async () => {
+			// Arrange
+			workflowRepository.findByIds.mockResolvedValue([mock()]);
+			sharedWorkflowRepository.findByWorkflowIds.mockResolvedValue([
+				mock<SharedWorkflow>({
+					project: mock({
+						type: 'personal',
+						projectRelations: [{ role: 'project:personalOwner', user: mock() }],
+					}),
+					workflow: mock(),
+				}),
+			]);
+
+			// Act
+			const result = await service.exportWorkflowsToWorkFolder([mock()]);
+
+			// Assert
+			expect(result.count).toBe(1);
+			expect(result.files).toHaveLength(1);
+		});
+
+		it('should throw an error if workflow has no owner', async () => {
+			// Arrange
+			sharedWorkflowRepository.findByWorkflowIds.mockResolvedValue([
+				mock<SharedWorkflow>({
+					project: mock({
+						type: 'personal',
+						projectRelations: [],
+					}),
+					workflow: mock({
+						display: () => 'TestWorkflow',
+					}),
+				}),
+			]);
+
+			// Act & Assert
+			await expect(service.exportWorkflowsToWorkFolder([mock()])).rejects.toThrow(
+				'Workflow TestWorkflow has no owner',
+			);
+		});
+	});
+});
diff --git a/packages/cli/src/environments/source-control/__tests__/source-control-git.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-git.service.test.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/__tests__/source-control-git.service.test.ts
rename to packages/cli/src/environments.ee/source-control/__tests__/source-control-git.service.test.ts
diff --git a/packages/cli/src/environments/source-control/__tests__/source-control-helper.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts
similarity index 84%
rename from packages/cli/src/environments/source-control/__tests__/source-control-helper.ee.test.ts
rename to packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts
index 508d1eb49a..4824b85ba6 100644
--- a/packages/cli/src/environments/source-control/__tests__/source-control-helper.ee.test.ts
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-helper.ee.test.ts
@@ -1,12 +1,14 @@
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import { constants as fsConstants, accessSync } from 'fs';
+import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 import path from 'path';
-import Container from 'typedi';
 
 import {
 	SOURCE_CONTROL_SSH_FOLDER,
 	SOURCE_CONTROL_GIT_FOLDER,
-} from '@/environments/source-control/constants';
+} from '@/environments.ee/source-control/constants';
 import {
 	generateSshKeyPair,
 	getRepoType,
@@ -14,12 +16,9 @@ import {
 	getTrackingInformationFromPrePushResult,
 	getTrackingInformationFromPullResult,
 	sourceControlFoldersExistCheck,
-} from '@/environments/source-control/source-control-helper.ee';
-import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
-import type { SourceControlPreferences } from '@/environments/source-control/types/source-control-preferences';
-import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file';
-import { License } from '@/license';
-import { mockInstance } from '@test/mocking';
+} from '@/environments.ee/source-control/source-control-helper.ee';
+import type { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
+import type { License } from '@/license';
 
 const pushResult: SourceControlledFile[] = [
 	{
@@ -151,12 +150,13 @@ const pullResult: SourceControlledFile[] = [
 	},
 ];
 
-const license = mockInstance(License);
+const license = mock<License>();
+const sourceControlPreferencesService = mock<SourceControlPreferencesService>();
 
 beforeAll(async () => {
 	jest.resetAllMocks();
 	license.isSourceControlLicensed.mockReturnValue(true);
-	Container.get(SourceControlPreferencesService).getPreferences = () => ({
+	sourceControlPreferencesService.getPreferences.mockReturnValue({
 		branchName: 'main',
 		connected: true,
 		repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
@@ -245,17 +245,4 @@ describe('Source Control', () => {
 			workflowUpdates: 3,
 		});
 	});
-
-	it('should class validate correct preferences', async () => {
-		const validPreferences: Partial<SourceControlPreferences> = {
-			branchName: 'main',
-			repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
-			branchReadOnly: false,
-			branchColor: '#5296D6',
-		};
-		const validationResult = await Container.get(
-			SourceControlPreferencesService,
-		).validateSourceControlPreferences(validPreferences);
-		expect(validationResult).toBeTruthy();
-	});
 });
diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts
new file mode 100644
index 0000000000..fff60bd566
--- /dev/null
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts
@@ -0,0 +1,180 @@
+import * as fastGlob from 'fast-glob';
+import { mock } from 'jest-mock-extended';
+import { type InstanceSettings } from 'n8n-core';
+import fsp from 'node:fs/promises';
+
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+import { SourceControlImportService } from '../source-control-import.service.ee';
+
+jest.mock('fast-glob');
+
+describe('SourceControlImportService', () => {
+	const workflowRepository = mock<WorkflowRepository>();
+	const service = new SourceControlImportService(
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		workflowRepository,
+		mock(),
+		mock<InstanceSettings>({ n8nFolder: '/mock/n8n' }),
+	);
+
+	const globMock = fastGlob.default as unknown as jest.Mock<Promise<string[]>, string[]>;
+	const fsReadFile = jest.spyOn(fsp, 'readFile');
+
+	beforeEach(() => jest.clearAllMocks());
+
+	describe('getRemoteVersionIdsFromFiles', () => {
+		const mockWorkflowFile = '/mock/workflow1.json';
+		it('should parse workflow files correctly', async () => {
+			globMock.mockResolvedValue([mockWorkflowFile]);
+
+			const mockWorkflowData = {
+				id: 'workflow1',
+				versionId: 'v1',
+				name: 'Test Workflow',
+			};
+
+			fsReadFile.mockResolvedValue(JSON.stringify(mockWorkflowData));
+
+			const result = await service.getRemoteVersionIdsFromFiles();
+			expect(fsReadFile).toHaveBeenCalledWith(mockWorkflowFile, { encoding: 'utf8' });
+
+			expect(result).toHaveLength(1);
+			expect(result[0]).toEqual(
+				expect.objectContaining({
+					id: 'workflow1',
+					versionId: 'v1',
+					name: 'Test Workflow',
+				}),
+			);
+		});
+
+		it('should filter out files without valid workflow data', async () => {
+			globMock.mockResolvedValue(['/mock/invalid.json']);
+
+			fsReadFile.mockResolvedValue('{}');
+
+			const result = await service.getRemoteVersionIdsFromFiles();
+
+			expect(result).toHaveLength(0);
+		});
+	});
+
+	describe('getRemoteCredentialsFromFiles', () => {
+		it('should parse credential files correctly', async () => {
+			globMock.mockResolvedValue(['/mock/credential1.json']);
+
+			const mockCredentialData = {
+				id: 'cred1',
+				name: 'Test Credential',
+				type: 'oauth2',
+			};
+
+			fsReadFile.mockResolvedValue(JSON.stringify(mockCredentialData));
+
+			const result = await service.getRemoteCredentialsFromFiles();
+
+			expect(result).toHaveLength(1);
+			expect(result[0]).toEqual(
+				expect.objectContaining({
+					id: 'cred1',
+					name: 'Test Credential',
+					type: 'oauth2',
+				}),
+			);
+		});
+
+		it('should filter out files without valid credential data', async () => {
+			globMock.mockResolvedValue(['/mock/invalid.json']);
+			fsReadFile.mockResolvedValue('{}');
+
+			const result = await service.getRemoteCredentialsFromFiles();
+
+			expect(result).toHaveLength(0);
+		});
+	});
+
+	describe('getRemoteVariablesFromFile', () => {
+		it('should parse variables file correctly', async () => {
+			globMock.mockResolvedValue(['/mock/variables.json']);
+
+			const mockVariablesData = [
+				{ key: 'VAR1', value: 'value1' },
+				{ key: 'VAR2', value: 'value2' },
+			];
+
+			fsReadFile.mockResolvedValue(JSON.stringify(mockVariablesData));
+
+			const result = await service.getRemoteVariablesFromFile();
+
+			expect(result).toEqual(mockVariablesData);
+		});
+
+		it('should return empty array if no variables file found', async () => {
+			globMock.mockResolvedValue([]);
+
+			const result = await service.getRemoteVariablesFromFile();
+
+			expect(result).toHaveLength(0);
+		});
+	});
+
+	describe('getRemoteTagsAndMappingsFromFile', () => {
+		it('should parse tags and mappings file correctly', async () => {
+			globMock.mockResolvedValue(['/mock/tags.json']);
+
+			const mockTagsData = {
+				tags: [{ id: 'tag1', name: 'Tag 1' }],
+				mappings: [{ workflowId: 'workflow1', tagId: 'tag1' }],
+			};
+
+			fsReadFile.mockResolvedValue(JSON.stringify(mockTagsData));
+
+			const result = await service.getRemoteTagsAndMappingsFromFile();
+
+			expect(result.tags).toEqual(mockTagsData.tags);
+			expect(result.mappings).toEqual(mockTagsData.mappings);
+		});
+
+		it('should return empty tags and mappings if no file found', async () => {
+			globMock.mockResolvedValue([]);
+
+			const result = await service.getRemoteTagsAndMappingsFromFile();
+
+			expect(result.tags).toHaveLength(0);
+			expect(result.mappings).toHaveLength(0);
+		});
+	});
+
+	describe('getLocalVersionIdsFromDb', () => {
+		const now = new Date();
+		jest.useFakeTimers({ now });
+
+		it('should replace invalid updatedAt with current timestamp', async () => {
+			const mockWorkflows = [
+				{
+					id: 'workflow1',
+					name: 'Test Workflow',
+					updatedAt: 'invalid-date',
+				},
+			] as unknown as WorkflowEntity[];
+
+			workflowRepository.find.mockResolvedValue(mockWorkflows);
+
+			const result = await service.getLocalVersionIdsFromDb();
+
+			expect(result[0].updatedAt).toBe(now.toISOString());
+		});
+	});
+});
diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-preferences.service.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-preferences.service.ee.test.ts
new file mode 100644
index 0000000000..d35c7ac9c7
--- /dev/null
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-preferences.service.ee.test.ts
@@ -0,0 +1,27 @@
+import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
+
+import { SourceControlPreferencesService } from '../source-control-preferences.service.ee';
+import type { SourceControlPreferences } from '../types/source-control-preferences';
+
+describe('SourceControlPreferencesService', () => {
+	const instanceSettings = mock<InstanceSettings>({ n8nFolder: '' });
+	const service = new SourceControlPreferencesService(
+		instanceSettings,
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+	);
+
+	it('should class validate correct preferences', async () => {
+		const validPreferences: Partial<SourceControlPreferences> = {
+			branchName: 'main',
+			repositoryUrl: 'git@example.com:n8ntest/n8n_testrepo.git',
+			branchReadOnly: false,
+			branchColor: '#5296D6',
+		};
+		const validationResult = await service.validateSourceControlPreferences(validPreferences);
+		expect(validationResult).toBeTruthy();
+	});
+});
diff --git a/packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts
similarity index 76%
rename from packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts
rename to packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts
index e1ebf0e56a..56b58646c9 100644
--- a/packages/cli/src/environments/source-control/__tests__/source-control.service.test.ts
+++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts
@@ -1,12 +1,15 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 
-import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
-import { SourceControlService } from '@/environments/source-control/source-control.service.ee';
+import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
+import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee';
 
 describe('SourceControlService', () => {
 	const preferencesService = new SourceControlPreferencesService(
-		new InstanceSettings(mock()),
+		Container.get(InstanceSettings),
+		mock(),
+		mock(),
 		mock(),
 		mock(),
 	);
diff --git a/packages/cli/src/environments/source-control/constants.ts b/packages/cli/src/environments.ee/source-control/constants.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/constants.ts
rename to packages/cli/src/environments.ee/source-control/constants.ts
diff --git a/packages/cli/src/environments/source-control/middleware/source-control-enabled-middleware.ee.ts b/packages/cli/src/environments.ee/source-control/middleware/source-control-enabled-middleware.ee.ts
similarity index 96%
rename from packages/cli/src/environments/source-control/middleware/source-control-enabled-middleware.ee.ts
rename to packages/cli/src/environments.ee/source-control/middleware/source-control-enabled-middleware.ee.ts
index 2a8480561d..4157374d56 100644
--- a/packages/cli/src/environments/source-control/middleware/source-control-enabled-middleware.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/middleware/source-control-enabled-middleware.ee.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import type { RequestHandler } from 'express';
-import { Container } from 'typedi';
 
 import { isSourceControlLicensed } from '../source-control-helper.ee';
 import { SourceControlPreferencesService } from '../source-control-preferences.service.ee';
diff --git a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
similarity index 87%
rename from packages/cli/src/environments/source-control/source-control-export.service.ee.ts
rename to packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
index 9c495bbb8d..ec8e4efd22 100644
--- a/packages/cli/src/environments/source-control/source-control-export.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts
@@ -1,9 +1,10 @@
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import { rmSync } from 'fs';
-import { Credentials, InstanceSettings } from 'n8n-core';
+import { Credentials, InstanceSettings, Logger } from 'n8n-core';
 import { ApplicationError, type ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { writeFile as fsWriteFile, rm as fsRm } from 'node:fs/promises';
 import path from 'path';
-import Container, { Service } from 'typedi';
 
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
@@ -11,7 +12,6 @@ import { SharedWorkflowRepository } from '@/databases/repositories/shared-workfl
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { Logger } from '@/logging/logger.service';
 
 import {
 	SOURCE_CONTROL_CREDENTIAL_EXPORT_FOLDER,
@@ -30,7 +30,6 @@ import type { ExportResult } from './types/export-result';
 import type { ExportableCredential } from './types/exportable-credential';
 import type { ExportableWorkflow } from './types/exportable-workflow';
 import type { ResourceOwner } from './types/resource-owner';
-import type { SourceControlledFile } from './types/source-controlled-file';
 import { VariablesService } from '../variables/variables.service.ee';
 
 @Service()
@@ -45,6 +44,10 @@ export class SourceControlExportService {
 		private readonly logger: Logger,
 		private readonly variablesService: VariablesService,
 		private readonly tagRepository: TagRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowTagMappingRepository: WorkflowTagMappingRepository,
 		instanceSettings: InstanceSettings,
 	) {
 		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
@@ -71,7 +74,7 @@ export class SourceControlExportService {
 		}
 	}
 
-	public rmFilesFromExportFolder(filesToBeDeleted: Set<string>): Set<string> {
+	rmFilesFromExportFolder(filesToBeDeleted: Set<string>): Set<string> {
 		try {
 			filesToBeDeleted.forEach((e) => rmSync(e));
 		} catch (error) {
@@ -107,17 +110,16 @@ export class SourceControlExportService {
 		try {
 			sourceControlFoldersExistCheck([this.workflowExportFolder]);
 			const workflowIds = candidates.map((e) => e.id);
-			const sharedWorkflows =
-				await Container.get(SharedWorkflowRepository).findByWorkflowIds(workflowIds);
-			const workflows = await Container.get(WorkflowRepository).findByIds(workflowIds);
+			const sharedWorkflows = await this.sharedWorkflowRepository.findByWorkflowIds(workflowIds);
+			const workflows = await this.workflowRepository.findByIds(workflowIds);
 
 			// determine owner of each workflow to be exported
 			const owners: Record<string, ResourceOwner> = {};
-			sharedWorkflows.forEach((e) => {
-				const project = e.project;
+			sharedWorkflows.forEach((sharedWorkflow) => {
+				const project = sharedWorkflow.project;
 
 				if (!project) {
-					throw new ApplicationError(`Workflow ${e.workflow.display()} has no owner`);
+					throw new ApplicationError(`Workflow ${sharedWorkflow.workflow.display()} has no owner`);
 				}
 
 				if (project.type === 'personal') {
@@ -125,14 +127,16 @@ export class SourceControlExportService {
 						(pr) => pr.role === 'project:personalOwner',
 					);
 					if (!ownerRelation) {
-						throw new ApplicationError(`Workflow ${e.workflow.display()} has no owner`);
+						throw new ApplicationError(
+							`Workflow ${sharedWorkflow.workflow.display()} has no owner`,
+						);
 					}
-					owners[e.workflowId] = {
+					owners[sharedWorkflow.workflowId] = {
 						type: 'personal',
 						personalEmail: ownerRelation.user.email,
 					};
 				} else if (project.type === 'team') {
-					owners[e.workflowId] = {
+					owners[sharedWorkflow.workflowId] = {
 						type: 'team',
 						teamId: project.id,
 						teamName: project.name,
@@ -157,6 +161,7 @@ export class SourceControlExportService {
 				})),
 			};
 		} catch (error) {
+			if (error instanceof ApplicationError) throw error;
 			throw new ApplicationError('Failed to export workflows to work folder', { cause: error });
 		}
 	}
@@ -205,7 +210,7 @@ export class SourceControlExportService {
 					files: [],
 				};
 			}
-			const mappings = await Container.get(WorkflowTagMappingRepository).find();
+			const mappings = await this.workflowTagMappingRepository.find();
 			const fileName = path.join(this.gitFolder, SOURCE_CONTROL_TAGS_EXPORT_FILE);
 			await fsWriteFile(
 				fileName,
@@ -261,9 +266,10 @@ export class SourceControlExportService {
 		try {
 			sourceControlFoldersExistCheck([this.credentialExportFolder]);
 			const credentialIds = candidates.map((e) => e.id);
-			const credentialsToBeExported = await Container.get(
-				SharedCredentialsRepository,
-			).findByCredentialIds(credentialIds, 'credential:owner');
+			const credentialsToBeExported = await this.sharedCredentialsRepository.findByCredentialIds(
+				credentialIds,
+				'credential:owner',
+			);
 			let missingIds: string[] = [];
 			if (credentialsToBeExported.length !== credentialIds.length) {
 				const foundCredentialIds = credentialsToBeExported.map((e) => e.credentialsId);
diff --git a/packages/cli/src/environments/source-control/source-control-git.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts
similarity index 99%
rename from packages/cli/src/environments/source-control/source-control-git.service.ee.ts
rename to packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts
index 99571cdd52..01aaf78c68 100644
--- a/packages/cli/src/environments/source-control/source-control-git.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-git.service.ee.ts
@@ -1,4 +1,6 @@
+import { Service } from '@n8n/di';
 import { execSync } from 'child_process';
+import { Logger } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
 import path from 'path';
 import type {
@@ -11,10 +13,8 @@ import type {
 	SimpleGitOptions,
 	StatusResult,
 } from 'simple-git';
-import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logging/logger.service';
 import { OwnershipService } from '@/services/ownership.service';
 
 import {
diff --git a/packages/cli/src/environments/source-control/source-control-helper.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
similarity index 97%
rename from packages/cli/src/environments/source-control/source-control-helper.ee.ts
rename to packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
index 00a9875741..45ca38ed96 100644
--- a/packages/cli/src/environments/source-control/source-control-helper.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-helper.ee.ts
@@ -1,12 +1,13 @@
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import { generateKeyPairSync } from 'crypto';
 import { constants as fsConstants, mkdirSync, accessSync } from 'fs';
+import { Logger } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
 import { ok } from 'node:assert/strict';
 import path from 'path';
-import { Container } from 'typedi';
 
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { isContainedWithin } from '@/utils/path-util';
 
 import {
@@ -16,7 +17,6 @@ import {
 } from './constants';
 import type { KeyPair } from './types/key-pair';
 import type { KeyPairType } from './types/key-pair-type';
-import type { SourceControlledFile } from './types/source-controlled-file';
 
 export function stringContainsExpression(testString: string): boolean {
 	return /^=.*\{\{.*\}\}/.test(testString);
diff --git a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
similarity index 81%
rename from packages/cli/src/environments/source-control/source-control-import.service.ee.ts
rename to packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
index b5012d2762..21640dad0e 100644
--- a/packages/cli/src/environments/source-control/source-control-import.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts
@@ -1,16 +1,12 @@
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import glob from 'fast-glob';
-import { Credentials, InstanceSettings } from 'n8n-core';
-import {
-	ApplicationError,
-	jsonParse,
-	ErrorReporterProxy as ErrorReporter,
-	ensureError,
-} from 'n8n-workflow';
+import { Credentials, ErrorReporter, InstanceSettings, Logger } from 'n8n-core';
+import { ApplicationError, jsonParse, ensureError } from 'n8n-workflow';
 import { readFile as fsReadFile } from 'node:fs/promises';
 import path from 'path';
-import { Container, Service } from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import type { Project } from '@/databases/entities/project';
@@ -28,7 +24,6 @@ import { VariablesRepository } from '@/databases/repositories/variables.reposito
 import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { IWorkflowToImport } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { isUniqueConstraintError } from '@/response-helper';
 import { assertNever } from '@/utils';
 
@@ -43,7 +38,6 @@ import { getCredentialExportPath, getWorkflowExportPath } from './source-control
 import type { ExportableCredential } from './types/exportable-credential';
 import type { ResourceOwner } from './types/resource-owner';
 import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
-import type { SourceControlledFile } from './types/source-controlled-file';
 import { VariablesService } from '../variables/variables.service.ee';
 
 @Service()
@@ -56,9 +50,18 @@ export class SourceControlImportService {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly variablesService: VariablesService,
 		private readonly activeWorkflowManager: ActiveWorkflowManager,
+		private readonly credentialsRepository: CredentialsRepository,
+		private readonly projectRepository: ProjectRepository,
 		private readonly tagRepository: TagRepository,
+		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
+		private readonly sharedCredentialsRepository: SharedCredentialsRepository,
+		private readonly userRepository: UserRepository,
+		private readonly variablesRepository: VariablesRepository,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowTagMappingRepository: WorkflowTagMappingRepository,
 		instanceSettings: InstanceSettings,
 	) {
 		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
@@ -69,7 +72,7 @@ export class SourceControlImportService {
 		);
 	}
 
-	public async getRemoteVersionIdsFromFiles(): Promise<SourceControlWorkflowVersionId[]> {
+	async getRemoteVersionIdsFromFiles(): Promise<SourceControlWorkflowVersionId[]> {
 		const remoteWorkflowFiles = await glob('*.json', {
 			cwd: this.workflowExportFolder,
 			absolute: true,
@@ -95,8 +98,8 @@ export class SourceControlImportService {
 		);
 	}
 
-	public async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {
-		const localWorkflows = await Container.get(WorkflowRepository).find({
+	async getLocalVersionIdsFromDb(): Promise<SourceControlWorkflowVersionId[]> {
+		const localWorkflows = await this.workflowRepository.find({
 			select: ['id', 'name', 'versionId', 'updatedAt'],
 		});
 		return localWorkflows.map((local) => {
@@ -104,7 +107,7 @@ export class SourceControlImportService {
 			if (local.updatedAt instanceof Date) {
 				updatedAt = local.updatedAt;
 			} else {
-				ErrorReporter.warn('updatedAt is not a Date', {
+				this.errorReporter.warn('updatedAt is not a Date', {
 					extra: {
 						type: typeof local.updatedAt,
 						value: local.updatedAt,
@@ -123,7 +126,7 @@ export class SourceControlImportService {
 		}) as SourceControlWorkflowVersionId[];
 	}
 
-	public async getRemoteCredentialsFromFiles(): Promise<
+	async getRemoteCredentialsFromFiles(): Promise<
 		Array<ExportableCredential & { filename: string }>
 	> {
 		const remoteCredentialFiles = await glob('*.json', {
@@ -150,10 +153,8 @@ export class SourceControlImportService {
 		>;
 	}
 
-	public async getLocalCredentialsFromDb(): Promise<
-		Array<ExportableCredential & { filename: string }>
-	> {
-		const localCredentials = await Container.get(CredentialsRepository).find({
+	async getLocalCredentialsFromDb(): Promise<Array<ExportableCredential & { filename: string }>> {
+		const localCredentials = await this.credentialsRepository.find({
 			select: ['id', 'name', 'type'],
 		});
 		return localCredentials.map((local) => ({
@@ -164,7 +165,7 @@ export class SourceControlImportService {
 		})) as Array<ExportableCredential & { filename: string }>;
 	}
 
-	public async getRemoteVariablesFromFile(): Promise<Variables[]> {
+	async getRemoteVariablesFromFile(): Promise<Variables[]> {
 		const variablesFile = await glob(SOURCE_CONTROL_VARIABLES_EXPORT_FILE, {
 			cwd: this.gitFolder,
 			absolute: true,
@@ -178,11 +179,11 @@ export class SourceControlImportService {
 		return [];
 	}
 
-	public async getLocalVariablesFromDb(): Promise<Variables[]> {
+	async getLocalVariablesFromDb(): Promise<Variables[]> {
 		return await this.variablesService.getAllCached();
 	}
 
-	public async getRemoteTagsAndMappingsFromFile(): Promise<{
+	async getRemoteTagsAndMappingsFromFile(): Promise<{
 		tags: TagEntity[];
 		mappings: WorkflowTagMapping[];
 	}> {
@@ -201,31 +202,29 @@ export class SourceControlImportService {
 		return { tags: [], mappings: [] };
 	}
 
-	public async getLocalTagsAndMappingsFromDb(): Promise<{
+	async getLocalTagsAndMappingsFromDb(): Promise<{
 		tags: TagEntity[];
 		mappings: WorkflowTagMapping[];
 	}> {
 		const localTags = await this.tagRepository.find({
 			select: ['id', 'name'],
 		});
-		const localMappings = await Container.get(WorkflowTagMappingRepository).find({
+		const localMappings = await this.workflowTagMappingRepository.find({
 			select: ['workflowId', 'tagId'],
 		});
 		return { tags: localTags, mappings: localMappings };
 	}
 
-	public async importWorkflowFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
-		const personalProject =
-			await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(userId);
+	async importWorkflowFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
+		const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(userId);
 		const workflowManager = this.activeWorkflowManager;
 		const candidateIds = candidates.map((c) => c.id);
-		const existingWorkflows = await Container.get(WorkflowRepository).findByIds(candidateIds, {
+		const existingWorkflows = await this.workflowRepository.findByIds(candidateIds, {
 			fields: ['id', 'name', 'versionId', 'active'],
 		});
-		const allSharedWorkflows = await Container.get(SharedWorkflowRepository).findWithFields(
-			candidateIds,
-			{ select: ['workflowId', 'role', 'projectId'] },
-		);
+		const allSharedWorkflows = await this.sharedWorkflowRepository.findWithFields(candidateIds, {
+			select: ['workflowId', 'role', 'projectId'],
+		});
 		const importWorkflowsResult = [];
 
 		// Due to SQLite concurrency issues, we cannot save all workflows at once
@@ -242,9 +241,7 @@ export class SourceControlImportService {
 			const existingWorkflow = existingWorkflows.find((e) => e.id === importedWorkflow.id);
 			importedWorkflow.active = existingWorkflow?.active ?? false;
 			this.logger.debug(`Updating workflow id ${importedWorkflow.id ?? 'new'}`);
-			const upsertResult = await Container.get(WorkflowRepository).upsert({ ...importedWorkflow }, [
-				'id',
-			]);
+			const upsertResult = await this.workflowRepository.upsert({ ...importedWorkflow }, ['id']);
 			if (upsertResult?.identifiers?.length !== 1) {
 				throw new ApplicationError('Failed to upsert workflow', {
 					extra: { workflowId: importedWorkflow.id ?? 'new' },
@@ -260,7 +257,7 @@ export class SourceControlImportService {
 					? await this.findOrCreateOwnerProject(importedWorkflow.owner)
 					: null;
 
-				await Container.get(SharedWorkflowRepository).upsert(
+				await this.sharedWorkflowRepository.upsert(
 					{
 						workflowId: importedWorkflow.id,
 						projectId: remoteOwnerProject?.id ?? personalProject.id,
@@ -283,7 +280,7 @@ export class SourceControlImportService {
 					const error = ensureError(e);
 					this.logger.error(`Failed to activate workflow ${existingWorkflow.id}`, { error });
 				} finally {
-					await Container.get(WorkflowRepository).update(
+					await this.workflowRepository.update(
 						{ id: existingWorkflow.id },
 						{ versionId: importedWorkflow.versionId },
 					);
@@ -301,17 +298,16 @@ export class SourceControlImportService {
 		}>;
 	}
 
-	public async importCredentialsFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
-		const personalProject =
-			await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(userId);
+	async importCredentialsFromWorkFolder(candidates: SourceControlledFile[], userId: string) {
+		const personalProject = await this.projectRepository.getPersonalProjectForUserOrFail(userId);
 		const candidateIds = candidates.map((c) => c.id);
-		const existingCredentials = await Container.get(CredentialsRepository).find({
+		const existingCredentials = await this.credentialsRepository.find({
 			where: {
 				id: In(candidateIds),
 			},
 			select: ['id', 'name', 'type', 'data'],
 		});
-		const existingSharedCredentials = await Container.get(SharedCredentialsRepository).find({
+		const existingSharedCredentials = await this.sharedCredentialsRepository.find({
 			select: ['credentialsId', 'role'],
 			where: {
 				credentialsId: In(candidateIds),
@@ -343,7 +339,7 @@ export class SourceControlImportService {
 				}
 
 				this.logger.debug(`Updating credential id ${newCredentialObject.id as string}`);
-				await Container.get(CredentialsRepository).upsert(newCredentialObject, ['id']);
+				await this.credentialsRepository.upsert(newCredentialObject, ['id']);
 
 				const isOwnedLocally = existingSharedCredentials.some(
 					(c) => c.credentialsId === credential.id && c.role === 'credential:owner',
@@ -359,7 +355,7 @@ export class SourceControlImportService {
 					newSharedCredential.projectId = remoteOwnerProject?.id ?? personalProject.id;
 					newSharedCredential.role = 'credential:owner';
 
-					await Container.get(SharedCredentialsRepository).upsert({ ...newSharedCredential }, [
+					await this.sharedCredentialsRepository.upsert({ ...newSharedCredential }, [
 						'credentialsId',
 						'projectId',
 					]);
@@ -375,7 +371,7 @@ export class SourceControlImportService {
 		return importCredentialsResult.filter((e) => e !== undefined);
 	}
 
-	public async importTagsFromWorkFolder(candidate: SourceControlledFile) {
+	async importTagsFromWorkFolder(candidate: SourceControlledFile) {
 		let mappedTags;
 		try {
 			this.logger.debug(`Importing tags from file ${candidate.file}`);
@@ -395,7 +391,7 @@ export class SourceControlImportService {
 
 		const existingWorkflowIds = new Set(
 			(
-				await Container.get(WorkflowRepository).find({
+				await this.workflowRepository.find({
 					select: ['id'],
 				})
 			).map((e) => e.id),
@@ -424,7 +420,7 @@ export class SourceControlImportService {
 		await Promise.all(
 			mappedTags.mappings.map(async (mapping) => {
 				if (!existingWorkflowIds.has(String(mapping.workflowId))) return;
-				await Container.get(WorkflowTagMappingRepository).upsert(
+				await this.workflowTagMappingRepository.upsert(
 					{ tagId: String(mapping.tagId), workflowId: String(mapping.workflowId) },
 					{
 						skipUpdateIfNoValuesChanged: true,
@@ -437,7 +433,7 @@ export class SourceControlImportService {
 		return mappedTags;
 	}
 
-	public async importVariablesFromWorkFolder(
+	async importVariablesFromWorkFolder(
 		candidate: SourceControlledFile,
 		valueOverrides?: {
 			[key: string]: string;
@@ -471,12 +467,12 @@ export class SourceControlImportService {
 				overriddenKeys.splice(overriddenKeys.indexOf(variable.key), 1);
 			}
 			try {
-				await Container.get(VariablesRepository).upsert({ ...variable }, ['id']);
+				await this.variablesRepository.upsert({ ...variable }, ['id']);
 			} catch (errorUpsert) {
 				if (isUniqueConstraintError(errorUpsert as Error)) {
 					this.logger.debug(`Variable ${variable.key} already exists, updating instead`);
 					try {
-						await Container.get(VariablesRepository).update({ key: variable.key }, { ...variable });
+						await this.variablesRepository.update({ key: variable.key }, { ...variable });
 					} catch (errorUpdate) {
 						this.logger.debug(`Failed to update variable ${variable.key}, skipping`);
 						this.logger.debug((errorUpdate as Error).message);
@@ -491,11 +487,11 @@ export class SourceControlImportService {
 		if (overriddenKeys.length > 0 && valueOverrides) {
 			for (const key of overriddenKeys) {
 				result.imported.push(key);
-				const newVariable = Container.get(VariablesRepository).create({
+				const newVariable = this.variablesRepository.create({
 					key,
 					value: valueOverrides[key],
 				});
-				await Container.get(VariablesRepository).save(newVariable, { transaction: false });
+				await this.variablesRepository.save(newVariable, { transaction: false });
 			}
 		}
 
@@ -505,32 +501,30 @@ export class SourceControlImportService {
 	}
 
 	private async findOrCreateOwnerProject(owner: ResourceOwner): Promise<Project | null> {
-		const projectRepository = Container.get(ProjectRepository);
-		const userRepository = Container.get(UserRepository);
 		if (typeof owner === 'string' || owner.type === 'personal') {
 			const email = typeof owner === 'string' ? owner : owner.personalEmail;
-			const user = await userRepository.findOne({
+			const user = await this.userRepository.findOne({
 				where: { email },
 			});
 			if (!user) {
 				return null;
 			}
-			return await projectRepository.getPersonalProjectForUserOrFail(user.id);
+			return await this.projectRepository.getPersonalProjectForUserOrFail(user.id);
 		} else if (owner.type === 'team') {
-			let teamProject = await projectRepository.findOne({
+			let teamProject = await this.projectRepository.findOne({
 				where: { id: owner.teamId },
 			});
 			if (!teamProject) {
 				try {
-					teamProject = await projectRepository.save(
-						projectRepository.create({
+					teamProject = await this.projectRepository.save(
+						this.projectRepository.create({
 							id: owner.teamId,
 							name: owner.teamName,
 							type: 'team',
 						}),
 					);
 				} catch (e) {
-					teamProject = await projectRepository.findOne({
+					teamProject = await this.projectRepository.findOne({
 						where: { id: owner.teamId },
 					});
 					if (!teamProject) {
diff --git a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
similarity index 88%
rename from packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
rename to packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
index d3a34d784f..d424a844b2 100644
--- a/packages/cli/src/environments/source-control/source-control-preferences.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control-preferences.service.ee.ts
@@ -1,15 +1,13 @@
+import { Service } from '@n8n/di';
 import type { ValidationError } from 'class-validator';
 import { validate } from 'class-validator';
 import { rm as fsRm } from 'fs/promises';
-import { Cipher, InstanceSettings } from 'n8n-core';
+import { Cipher, InstanceSettings, Logger } from 'n8n-core';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { writeFile, chmod, readFile } from 'node:fs/promises';
 import path from 'path';
-import Container, { Service } from 'typedi';
 
-import config from '@/config';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
-import { Logger } from '@/logging/logger.service';
 
 import {
 	SOURCE_CONTROL_SSH_FOLDER,
@@ -18,6 +16,7 @@ import {
 	SOURCE_CONTROL_PREFERENCES_DB_KEY,
 } from './constants';
 import { generateSshKeyPair, isSourceControlLicensed } from './source-control-helper.ee';
+import { SourceControlConfig } from './source-control.config';
 import type { KeyPairType } from './types/key-pair-type';
 import { SourceControlPreferences } from './types/source-control-preferences';
 
@@ -35,13 +34,15 @@ export class SourceControlPreferencesService {
 		private readonly instanceSettings: InstanceSettings,
 		private readonly logger: Logger,
 		private readonly cipher: Cipher,
+		private readonly settingsRepository: SettingsRepository,
+		private readonly sourceControlConfig: SourceControlConfig,
 	) {
 		this.sshFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_SSH_FOLDER);
 		this.gitFolder = path.join(instanceSettings.n8nFolder, SOURCE_CONTROL_GIT_FOLDER);
 		this.sshKeyName = path.join(this.sshFolder, SOURCE_CONTROL_SSH_KEY_NAME);
 	}
 
-	public get sourceControlPreferences(): SourceControlPreferences {
+	get sourceControlPreferences(): SourceControlPreferences {
 		return {
 			...this._sourceControlPreferences,
 			connected: this._sourceControlPreferences.connected ?? false,
@@ -49,14 +50,14 @@ export class SourceControlPreferencesService {
 	}
 
 	// merge the new preferences with the existing preferences when setting
-	public set sourceControlPreferences(preferences: Partial<SourceControlPreferences>) {
+	set sourceControlPreferences(preferences: Partial<SourceControlPreferences>) {
 		this._sourceControlPreferences = SourceControlPreferences.merge(
 			preferences,
 			this._sourceControlPreferences,
 		);
 	}
 
-	public isSourceControlSetup() {
+	isSourceControlSetup() {
 		return (
 			this.isSourceControlLicensedAndEnabled() &&
 			this.getPreferences().repositoryUrl &&
@@ -65,9 +66,7 @@ export class SourceControlPreferencesService {
 	}
 
 	private async getKeyPairFromDatabase() {
-		const dbSetting = await Container.get(SettingsRepository).findByKey(
-			'features.sourceControl.sshKeys',
-		);
+		const dbSetting = await this.settingsRepository.findByKey('features.sourceControl.sshKeys');
 
 		if (!dbSetting?.value) return null;
 
@@ -121,7 +120,7 @@ export class SourceControlPreferencesService {
 	async deleteKeyPair() {
 		try {
 			await fsRm(this.sshFolder, { recursive: true });
-			await Container.get(SettingsRepository).delete({ key: 'features.sourceControl.sshKeys' });
+			await this.settingsRepository.delete({ key: 'features.sourceControl.sshKeys' });
 		} catch (e) {
 			const error = e instanceof Error ? e : new Error(`${e}`);
 			this.logger.error(`Failed to delete SSH key pair: ${error.message}`);
@@ -134,14 +133,12 @@ export class SourceControlPreferencesService {
 	async generateAndSaveKeyPair(keyPairType?: KeyPairType): Promise<SourceControlPreferences> {
 		if (!keyPairType) {
 			keyPairType =
-				this.getPreferences().keyGeneratorType ??
-				(config.get('sourceControl.defaultKeyPairType') as KeyPairType) ??
-				'ed25519';
+				this.getPreferences().keyGeneratorType ?? this.sourceControlConfig.defaultKeyPairType;
 		}
 		const keyPair = await generateSshKeyPair(keyPairType);
 
 		try {
-			await Container.get(SettingsRepository).save({
+			await this.settingsRepository.save({
 				key: 'features.sourceControl.sshKeys',
 				value: JSON.stringify({
 					encryptedPrivateKey: this.cipher.encrypt(keyPair.privateKey),
@@ -212,7 +209,7 @@ export class SourceControlPreferencesService {
 		if (saveToDb) {
 			const settingsValue = JSON.stringify(this._sourceControlPreferences);
 			try {
-				await Container.get(SettingsRepository).save(
+				await this.settingsRepository.save(
 					{
 						key: SOURCE_CONTROL_PREFERENCES_DB_KEY,
 						value: settingsValue,
@@ -230,7 +227,7 @@ export class SourceControlPreferencesService {
 	async loadFromDbAndApplySourceControlPreferences(): Promise<
 		SourceControlPreferences | undefined
 	> {
-		const loadedPreferences = await Container.get(SettingsRepository).findOne({
+		const loadedPreferences = await this.settingsRepository.findOne({
 			where: { key: SOURCE_CONTROL_PREFERENCES_DB_KEY },
 		});
 		if (loadedPreferences) {
diff --git a/packages/cli/src/environments.ee/source-control/source-control.config.ts b/packages/cli/src/environments.ee/source-control/source-control.config.ts
new file mode 100644
index 0000000000..04d12dce4f
--- /dev/null
+++ b/packages/cli/src/environments.ee/source-control/source-control.config.ts
@@ -0,0 +1,8 @@
+import { Config, Env } from '@n8n/config';
+
+@Config
+export class SourceControlConfig {
+	/** Default SSH key type to use when generating SSH keys. */
+	@Env('N8N_SOURCECONTROL_DEFAULT_SSH_KEY_TYPE')
+	defaultKeyPairType: 'ed25519' | 'rsa' = 'ed25519';
+}
diff --git a/packages/cli/src/environments/source-control/source-control.controller.ee.ts b/packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts
similarity index 94%
rename from packages/cli/src/environments/source-control/source-control.controller.ee.ts
rename to packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts
index 7b8b2a7266..a7dd00d199 100644
--- a/packages/cli/src/environments/source-control/source-control.controller.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control.controller.ee.ts
@@ -1,9 +1,12 @@
+import { PullWorkFolderRequestDto, PushWorkFolderRequestDto } from '@n8n/api-types';
+import type { SourceControlledFile } from '@n8n/api-types';
 import express from 'express';
 import type { PullResult } from 'simple-git';
 
-import { Get, Post, Patch, RestController, GlobalScope } from '@/decorators';
+import { Get, Post, Patch, RestController, GlobalScope, Body } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
+import { AuthenticatedRequest } from '@/requests';
 
 import { SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
 import {
@@ -17,7 +20,6 @@ import type { ImportResult } from './types/import-result';
 import { SourceControlRequest } from './types/requests';
 import { SourceControlGetStatus } from './types/source-control-get-status';
 import type { SourceControlPreferences } from './types/source-control-preferences';
-import type { SourceControlledFile } from './types/source-controlled-file';
 
 @RestController('/source-control')
 export class SourceControlController {
@@ -164,19 +166,16 @@ export class SourceControlController {
 	@Post('/push-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
 	@GlobalScope('sourceControl:push')
 	async pushWorkfolder(
-		req: SourceControlRequest.PushWorkFolder,
+		req: AuthenticatedRequest,
 		res: express.Response,
+		@Body payload: PushWorkFolderRequestDto,
 	): Promise<SourceControlledFile[]> {
-		if (this.sourceControlPreferencesService.isBranchReadOnly()) {
-			throw new BadRequestError('Cannot push onto read-only branch.');
-		}
-
 		try {
 			await this.sourceControlService.setGitUserDetails(
 				`${req.user.firstName} ${req.user.lastName}`,
 				req.user.email,
 			);
-			const result = await this.sourceControlService.pushWorkfolder(req.body);
+			const result = await this.sourceControlService.pushWorkfolder(payload);
 			res.statusCode = result.statusCode;
 			return result.statusResult;
 		} catch (error) {
@@ -187,15 +186,12 @@ export class SourceControlController {
 	@Post('/pull-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
 	@GlobalScope('sourceControl:pull')
 	async pullWorkfolder(
-		req: SourceControlRequest.PullWorkFolder,
+		req: AuthenticatedRequest,
 		res: express.Response,
+		@Body payload: PullWorkFolderRequestDto,
 	): Promise<SourceControlledFile[] | ImportResult | PullResult | undefined> {
 		try {
-			const result = await this.sourceControlService.pullWorkfolder({
-				force: req.body.force,
-				variables: req.body.variables,
-				userId: req.user.id,
-			});
+			const result = await this.sourceControlService.pullWorkfolder(req.user.id, payload);
 			res.statusCode = result.statusCode;
 			return result.statusResult;
 		} catch (error) {
diff --git a/packages/cli/src/environments/source-control/source-control.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
similarity index 97%
rename from packages/cli/src/environments/source-control/source-control.service.ee.ts
rename to packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
index 58c213f03c..3b330fffa3 100644
--- a/packages/cli/src/environments/source-control/source-control.service.ee.ts
+++ b/packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
@@ -1,8 +1,14 @@
+import type {
+	PullWorkFolderRequestDto,
+	PushWorkFolderRequestDto,
+	SourceControlledFile,
+} from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import { writeFileSync } from 'fs';
+import { Logger } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
 import path from 'path';
 import type { PushResult } from 'simple-git';
-import { Service } from 'typedi';
 
 import type { TagEntity } from '@/databases/entities/tag-entity';
 import type { User } from '@/databases/entities/user';
@@ -10,7 +16,6 @@ import type { Variables } from '@/databases/entities/variables';
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logging/logger.service';
 
 import {
 	SOURCE_CONTROL_DEFAULT_EMAIL,
@@ -34,10 +39,7 @@ import type { ExportableCredential } from './types/exportable-credential';
 import type { ImportResult } from './types/import-result';
 import type { SourceControlGetStatus } from './types/source-control-get-status';
 import type { SourceControlPreferences } from './types/source-control-preferences';
-import type { SourceControllPullOptions } from './types/source-control-pull-work-folder';
-import type { SourceControlPushWorkFolder } from './types/source-control-push-work-folder';
 import type { SourceControlWorkflowVersionId } from './types/source-control-workflow-version-id';
-import type { SourceControlledFile } from './types/source-controlled-file';
 
 @Service()
 export class SourceControlService {
@@ -81,7 +83,7 @@ export class SourceControlService {
 		});
 	}
 
-	public async sanityCheck(): Promise<void> {
+	async sanityCheck(): Promise<void> {
 		try {
 			const foldersExisted = sourceControlFoldersExistCheck(
 				[this.gitFolder, this.sshFolder],
@@ -207,7 +209,7 @@ export class SourceControlService {
 		return;
 	}
 
-	async pushWorkfolder(options: SourceControlPushWorkFolder): Promise<{
+	async pushWorkfolder(options: PushWorkFolderRequestDto): Promise<{
 		statusCode: number;
 		pushResult: PushResult | undefined;
 		statusResult: SourceControlledFile[];
@@ -299,7 +301,7 @@ export class SourceControlService {
 			}
 		}
 
-		await this.gitService.commit(options.message ?? 'Updated Workfolder');
+		await this.gitService.commit(options.commitMessage ?? 'Updated Workfolder');
 
 		const pushResult = await this.gitService.push({
 			branch: this.sourceControlPreferencesService.getBranchName(),
@@ -321,7 +323,8 @@ export class SourceControlService {
 	}
 
 	async pullWorkfolder(
-		options: SourceControllPullOptions,
+		userId: User['id'],
+		options: PullWorkFolderRequestDto,
 	): Promise<{ statusCode: number; statusResult: SourceControlledFile[] }> {
 		await this.sanityCheck();
 
@@ -345,7 +348,7 @@ export class SourceControlService {
 			return true;
 		});
 
-		if (options.force !== true) {
+		if (!options.force) {
 			const possibleConflicts = filteredResult?.filter(
 				(file) => (file.conflict || file.status === 'modified') && file.type === 'workflow',
 			);
@@ -363,7 +366,7 @@ export class SourceControlService {
 		);
 		await this.sourceControlImportService.importWorkflowFromWorkFolder(
 			workflowsToBeImported,
-			options.userId,
+			userId,
 		);
 
 		const credentialsToBeImported = statusResult.filter(
@@ -371,7 +374,7 @@ export class SourceControlService {
 		);
 		await this.sourceControlImportService.importCredentialsFromWorkFolder(
 			credentialsToBeImported,
-			options.userId,
+			userId,
 		);
 
 		const tagsToBeImported = statusResult.find((e) => e.type === 'tags');
diff --git a/packages/cli/src/environments/source-control/types/export-result.ts b/packages/cli/src/environments.ee/source-control/types/export-result.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/export-result.ts
rename to packages/cli/src/environments.ee/source-control/types/export-result.ts
diff --git a/packages/cli/src/environments/source-control/types/exportable-credential.ts b/packages/cli/src/environments.ee/source-control/types/exportable-credential.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/exportable-credential.ts
rename to packages/cli/src/environments.ee/source-control/types/exportable-credential.ts
diff --git a/packages/cli/src/environments/source-control/types/exportable-workflow.ts b/packages/cli/src/environments.ee/source-control/types/exportable-workflow.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/exportable-workflow.ts
rename to packages/cli/src/environments.ee/source-control/types/exportable-workflow.ts
diff --git a/packages/cli/src/environments/source-control/types/import-result.ts b/packages/cli/src/environments.ee/source-control/types/import-result.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/import-result.ts
rename to packages/cli/src/environments.ee/source-control/types/import-result.ts
diff --git a/packages/cli/src/environments/source-control/types/key-pair-type.ts b/packages/cli/src/environments.ee/source-control/types/key-pair-type.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/key-pair-type.ts
rename to packages/cli/src/environments.ee/source-control/types/key-pair-type.ts
diff --git a/packages/cli/src/environments/source-control/types/key-pair.ts b/packages/cli/src/environments.ee/source-control/types/key-pair.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/key-pair.ts
rename to packages/cli/src/environments.ee/source-control/types/key-pair.ts
diff --git a/packages/cli/src/environments/source-control/types/requests.ts b/packages/cli/src/environments.ee/source-control/types/requests.ts
similarity index 81%
rename from packages/cli/src/environments/source-control/types/requests.ts
rename to packages/cli/src/environments.ee/source-control/types/requests.ts
index 4f5d583f40..75c6c1995d 100644
--- a/packages/cli/src/environments/source-control/types/requests.ts
+++ b/packages/cli/src/environments.ee/source-control/types/requests.ts
@@ -5,9 +5,7 @@ import type { SourceControlDisconnect } from './source-control-disconnect';
 import type { SourceControlGenerateKeyPair } from './source-control-generate-key-pair';
 import type { SourceControlGetStatus } from './source-control-get-status';
 import type { SourceControlPreferences } from './source-control-preferences';
-import type { SourceControlPullWorkFolder } from './source-control-pull-work-folder';
 import type { SourceControlPush } from './source-control-push';
-import type { SourceControlPushWorkFolder } from './source-control-push-work-folder';
 import type { SourceControlSetBranch } from './source-control-set-branch';
 import type { SourceControlSetReadOnly } from './source-control-set-read-only';
 import type { SourceControlStage } from './source-control-stage';
@@ -20,8 +18,6 @@ export declare namespace SourceControlRequest {
 	type Stage = AuthenticatedRequest<{}, {}, SourceControlStage, {}>;
 	type Push = AuthenticatedRequest<{}, {}, SourceControlPush, {}>;
 	type Disconnect = AuthenticatedRequest<{}, {}, SourceControlDisconnect, {}>;
-	type PushWorkFolder = AuthenticatedRequest<{}, {}, SourceControlPushWorkFolder, {}>;
-	type PullWorkFolder = AuthenticatedRequest<{}, {}, SourceControlPullWorkFolder, {}>;
 	type GetStatus = AuthenticatedRequest<{}, {}, {}, SourceControlGetStatus>;
 	type GenerateKeyPair = AuthenticatedRequest<{}, {}, SourceControlGenerateKeyPair, {}>;
 }
diff --git a/packages/cli/src/environments/source-control/types/resource-owner.ts b/packages/cli/src/environments.ee/source-control/types/resource-owner.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/resource-owner.ts
rename to packages/cli/src/environments.ee/source-control/types/resource-owner.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-commit.ts b/packages/cli/src/environments.ee/source-control/types/source-control-commit.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-commit.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-commit.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-disconnect.ts b/packages/cli/src/environments.ee/source-control/types/source-control-disconnect.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-disconnect.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-disconnect.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-generate-key-pair.ts b/packages/cli/src/environments.ee/source-control/types/source-control-generate-key-pair.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-generate-key-pair.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-generate-key-pair.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-get-status.ts b/packages/cli/src/environments.ee/source-control/types/source-control-get-status.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-get-status.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-get-status.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-preferences.ts b/packages/cli/src/environments.ee/source-control/types/source-control-preferences.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-preferences.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-preferences.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-push.ts b/packages/cli/src/environments.ee/source-control/types/source-control-push.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-push.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-push.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-set-branch.ts b/packages/cli/src/environments.ee/source-control/types/source-control-set-branch.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-set-branch.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-set-branch.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-set-read-only.ts b/packages/cli/src/environments.ee/source-control/types/source-control-set-read-only.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-set-read-only.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-set-read-only.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-stage.ts b/packages/cli/src/environments.ee/source-control/types/source-control-stage.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-stage.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-stage.ts
diff --git a/packages/cli/src/environments/source-control/types/source-control-workflow-version-id.ts b/packages/cli/src/environments.ee/source-control/types/source-control-workflow-version-id.ts
similarity index 100%
rename from packages/cli/src/environments/source-control/types/source-control-workflow-version-id.ts
rename to packages/cli/src/environments.ee/source-control/types/source-control-workflow-version-id.ts
diff --git a/packages/cli/src/environments/variables/variables.controller.ee.ts b/packages/cli/src/environments.ee/variables/variables.controller.ee.ts
similarity index 86%
rename from packages/cli/src/environments/variables/variables.controller.ee.ts
rename to packages/cli/src/environments.ee/variables/variables.controller.ee.ts
index 5da4221a3d..460d5fa009 100644
--- a/packages/cli/src/environments/variables/variables.controller.ee.ts
+++ b/packages/cli/src/environments.ee/variables/variables.controller.ee.ts
@@ -1,4 +1,15 @@
-import { Delete, Get, GlobalScope, Licensed, Patch, Post, RestController } from '@/decorators';
+import { VariableListRequestDto } from '@n8n/api-types';
+
+import {
+	Delete,
+	Get,
+	GlobalScope,
+	Licensed,
+	Patch,
+	Post,
+	Query,
+	RestController,
+} from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error';
@@ -13,8 +24,8 @@ export class VariablesController {
 
 	@Get('/')
 	@GlobalScope('variable:list')
-	async getVariables() {
-		return await this.variablesService.getAllCached();
+	async getVariables(_req: unknown, _res: unknown, @Query query: VariableListRequestDto) {
+		return await this.variablesService.getAllCached(query.state);
 	}
 
 	@Post('/')
diff --git a/packages/cli/src/environments/variables/variables.service.ee.ts b/packages/cli/src/environments.ee/variables/variables.service.ee.ts
similarity index 71%
rename from packages/cli/src/environments/variables/variables.service.ee.ts
rename to packages/cli/src/environments.ee/variables/variables.service.ee.ts
index 31cf725099..f59880fe60 100644
--- a/packages/cli/src/environments/variables/variables.service.ee.ts
+++ b/packages/cli/src/environments.ee/variables/variables.service.ee.ts
@@ -1,4 +1,4 @@
-import { Container, Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { Variables } from '@/databases/entities/variables';
 import { VariablesRepository } from '@/databases/repositories/variables.repository';
@@ -6,25 +6,32 @@ import { generateNanoId } from '@/databases/utils/generators';
 import { VariableCountLimitReachedError } from '@/errors/variable-count-limit-reached.error';
 import { VariableValidationError } from '@/errors/variable-validation.error';
 import { EventService } from '@/events/event.service';
+import { License } from '@/license';
 import { CacheService } from '@/services/cache/cache.service';
 
-import { canCreateNewVariable } from './environment-helpers';
-
 @Service()
 export class VariablesService {
 	constructor(
-		protected cacheService: CacheService,
-		protected variablesRepository: VariablesRepository,
+		private readonly cacheService: CacheService,
+		private readonly variablesRepository: VariablesRepository,
 		private readonly eventService: EventService,
+		private readonly license: License,
 	) {}
 
-	async getAllCached(): Promise<Variables[]> {
-		const variables = await this.cacheService.get('variables', {
-			async refreshFn() {
-				return await Container.get(VariablesService).findAll();
-			},
+	async getAllCached(state?: 'empty'): Promise<Variables[]> {
+		let variables = await this.cacheService.get('variables', {
+			refreshFn: async () => await this.findAll(),
 		});
-		return (variables as Array<Partial<Variables>>).map((v) => this.variablesRepository.create(v));
+
+		if (variables === undefined) {
+			return [];
+		}
+
+		if (state === 'empty') {
+			variables = variables.filter((v) => v.value === '');
+		}
+
+		return variables.map((v) => this.variablesRepository.create(v));
 	}
 
 	async getCount(): Promise<number> {
@@ -68,7 +75,7 @@ export class VariablesService {
 	}
 
 	async create(variable: Omit<Variables, 'id'>): Promise<Variables> {
-		if (!canCreateNewVariable(await this.getCount())) {
+		if (!this.canCreateNewVariable(await this.getCount())) {
 			throw new VariableCountLimitReachedError('Variables limit reached');
 		}
 		this.validateVariable(variable);
@@ -91,4 +98,17 @@ export class VariablesService {
 		await this.updateCache();
 		return (await this.getCached(id))!;
 	}
+
+	private canCreateNewVariable(variableCount: number): boolean {
+		if (!this.license.isVariablesEnabled()) {
+			return false;
+		}
+		// This defaults to -1 which is what we want if we've enabled
+		// variables via the config
+		const limit = this.license.getVariablesLimit();
+		if (limit === -1) {
+			return true;
+		}
+		return limit > variableCount;
+	}
 }
diff --git a/packages/cli/src/environments/source-control/__tests__/source-control-export.service.test.ts b/packages/cli/src/environments/source-control/__tests__/source-control-export.service.test.ts
deleted file mode 100644
index b04d8a2239..0000000000
--- a/packages/cli/src/environments/source-control/__tests__/source-control-export.service.test.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import mock from 'jest-mock-extended/lib/Mock';
-import { Cipher, type InstanceSettings } from 'n8n-core';
-import { ApplicationError, deepCopy } from 'n8n-workflow';
-import Container from 'typedi';
-
-import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
-import type { SharedCredentials } from '@/databases/entities/shared-credentials';
-import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
-import { mockInstance } from '@test/mocking';
-
-import { SourceControlExportService } from '../source-control-export.service.ee';
-import type { SourceControlledFile } from '../types/source-controlled-file';
-
-// https://github.com/jestjs/jest/issues/4715
-function deepSpyOn<O extends object, M extends keyof O>(object: O, methodName: M) {
-	const spy = jest.fn();
-
-	const originalMethod = object[methodName];
-
-	if (typeof originalMethod !== 'function') {
-		throw new ApplicationError(`${methodName.toString()} is not a function`, { level: 'warning' });
-	}
-
-	object[methodName] = function (...args: unknown[]) {
-		const clonedArgs = deepCopy(args);
-		spy(...clonedArgs);
-		return originalMethod.apply(this, args);
-	} as O[M];
-
-	return spy;
-}
-
-describe('SourceControlExportService', () => {
-	const service = new SourceControlExportService(
-		mock(),
-		mock(),
-		mock(),
-		mock<InstanceSettings>({ n8nFolder: '' }),
-	);
-
-	describe('exportCredentialsToWorkFolder', () => {
-		it('should export credentials to work folder', async () => {
-			/**
-			 * Arrange
-			 */
-			// @ts-expect-error Private method
-			const replaceSpy = deepSpyOn(service, 'replaceCredentialData');
-
-			mockInstance(SharedCredentialsRepository).findByCredentialIds.mockResolvedValue([
-				mock<SharedCredentials>({
-					credentials: mock<CredentialsEntity>({
-						data: Container.get(Cipher).encrypt(
-							JSON.stringify({
-								authUrl: 'test',
-								accessTokenUrl: 'test',
-								clientId: 'test',
-								clientSecret: 'test',
-								oauthTokenData: {
-									access_token: 'test',
-									token_type: 'test',
-									expires_in: 123,
-									refresh_token: 'test',
-								},
-							}),
-						),
-					}),
-				}),
-			]);
-
-			/**
-			 * Act
-			 */
-			await service.exportCredentialsToWorkFolder([mock<SourceControlledFile>()]);
-
-			/**
-			 * Assert
-			 */
-			expect(replaceSpy).toHaveBeenCalledWith({
-				authUrl: 'test',
-				accessTokenUrl: 'test',
-				clientId: 'test',
-				clientSecret: 'test',
-			});
-		});
-	});
-});
diff --git a/packages/cli/src/environments/source-control/types/source-control-pull-work-folder.ts b/packages/cli/src/environments/source-control/types/source-control-pull-work-folder.ts
deleted file mode 100644
index b87c970f0e..0000000000
--- a/packages/cli/src/environments/source-control/types/source-control-pull-work-folder.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { IsBoolean, IsObject, IsOptional, IsString } from 'class-validator';
-
-export class SourceControlPullWorkFolder {
-	@IsBoolean()
-	@IsOptional()
-	force?: boolean;
-
-	@IsBoolean()
-	@IsOptional()
-	importAfterPull?: boolean = true;
-
-	@IsString({ each: true })
-	@IsOptional()
-	files?: Set<string>;
-
-	@IsObject()
-	@IsOptional()
-	variables?: { [key: string]: string };
-}
-
-export class SourceControllPullOptions {
-	/** ID of user performing a source control pull. */
-	userId: string;
-
-	force?: boolean;
-
-	variables?: { [key: string]: string };
-}
diff --git a/packages/cli/src/environments/source-control/types/source-control-push-work-folder.ts b/packages/cli/src/environments/source-control/types/source-control-push-work-folder.ts
deleted file mode 100644
index 55c8e178c4..0000000000
--- a/packages/cli/src/environments/source-control/types/source-control-push-work-folder.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { IsBoolean, IsOptional, IsString } from 'class-validator';
-
-import type { SourceControlledFile } from './source-controlled-file';
-
-export class SourceControlPushWorkFolder {
-	@IsBoolean()
-	@IsOptional()
-	force?: boolean;
-
-	@IsString({ each: true })
-	fileNames: SourceControlledFile[];
-
-	@IsString()
-	@IsOptional()
-	message?: string;
-
-	@IsBoolean()
-	@IsOptional()
-	skipDiff?: boolean;
-}
diff --git a/packages/cli/src/environments/source-control/types/source-controlled-file.ts b/packages/cli/src/environments/source-control/types/source-controlled-file.ts
deleted file mode 100644
index 5bbf75921b..0000000000
--- a/packages/cli/src/environments/source-control/types/source-controlled-file.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-export type SourceControlledFileStatus =
-	| 'new'
-	| 'modified'
-	| 'deleted'
-	| 'created'
-	| 'renamed'
-	| 'conflicted'
-	| 'ignored'
-	| 'staged'
-	| 'unknown';
-export type SourceControlledFileLocation = 'local' | 'remote';
-export type SourceControlledFileType = 'credential' | 'workflow' | 'tags' | 'variables' | 'file';
-export type SourceControlledFile = {
-	file: string;
-	id: string;
-	name: string;
-	type: SourceControlledFileType;
-	status: SourceControlledFileStatus;
-	location: SourceControlledFileLocation;
-	conflict: boolean;
-	updatedAt: string;
-	pushed?: boolean;
-};
diff --git a/packages/cli/src/environments/variables/environment-helpers.ts b/packages/cli/src/environments/variables/environment-helpers.ts
deleted file mode 100644
index 720d2f3a23..0000000000
--- a/packages/cli/src/environments/variables/environment-helpers.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Container } from 'typedi';
-
-import { License } from '@/license';
-
-export function isVariablesEnabled(): boolean {
-	const license = Container.get(License);
-	return license.isVariablesEnabled();
-}
-
-export function canCreateNewVariable(variableCount: number): boolean {
-	if (!isVariablesEnabled()) {
-		return false;
-	}
-	const license = Container.get(License);
-	// This defaults to -1 which is what we want if we've enabled
-	// variables via the config
-	const limit = license.getVariablesLimit();
-	if (limit === -1) {
-		return true;
-	}
-	return limit > variableCount;
-}
-
-export function getVariablesLimit(): number {
-	const license = Container.get(License);
-	return license.getVariablesLimit();
-}
diff --git a/packages/cli/src/error-reporting.ts b/packages/cli/src/error-reporting.ts
deleted file mode 100644
index 897bef6fef..0000000000
--- a/packages/cli/src/error-reporting.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { GlobalConfig } from '@n8n/config';
-// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
-import { QueryFailedError } from '@n8n/typeorm';
-import { AxiosError } from 'axios';
-import { createHash } from 'crypto';
-import { InstanceSettings } from 'n8n-core';
-import { ErrorReporterProxy, ApplicationError } from 'n8n-workflow';
-import Container from 'typedi';
-
-let initialized = false;
-
-export const initErrorHandling = async () => {
-	if (initialized) return;
-
-	process.on('uncaughtException', (error) => {
-		ErrorReporterProxy.error(error);
-	});
-
-	const dsn = Container.get(GlobalConfig).sentry.backendDsn;
-	if (!dsn) {
-		initialized = true;
-		return;
-	}
-
-	// Collect longer stacktraces
-	Error.stackTraceLimit = 50;
-
-	const {
-		N8N_VERSION: release,
-		ENVIRONMENT: environment,
-		DEPLOYMENT_NAME: serverName,
-	} = process.env;
-
-	const { init, captureException, setTag } = await import('@sentry/node');
-
-	const { RewriteFrames } = await import('@sentry/integrations');
-	const { Integrations } = await import('@sentry/node');
-
-	const enabledIntegrations = [
-		'InboundFilters',
-		'FunctionToString',
-		'LinkedErrors',
-		'OnUnhandledRejection',
-		'ContextLines',
-	];
-	const seenErrors = new Set<string>();
-
-	init({
-		dsn,
-		release,
-		environment,
-		enableTracing: false,
-		serverName,
-		beforeBreadcrumb: () => null,
-		integrations: (integrations) => [
-			...integrations.filter(({ name }) => enabledIntegrations.includes(name)),
-			new RewriteFrames({ root: process.cwd() }),
-			new Integrations.RequestData({
-				include: {
-					cookies: false,
-					data: false,
-					headers: false,
-					query_string: false,
-					url: true,
-					user: false,
-				},
-			}),
-		],
-		async beforeSend(event, { originalException }) {
-			if (!originalException) return null;
-
-			if (originalException instanceof Promise) {
-				originalException = await originalException.catch((error) => error as Error);
-			}
-
-			if (originalException instanceof AxiosError) return null;
-
-			if (
-				originalException instanceof QueryFailedError &&
-				['SQLITE_FULL', 'SQLITE_IOERR'].some((errMsg) => originalException.message.includes(errMsg))
-			) {
-				return null;
-			}
-
-			if (originalException instanceof ApplicationError) {
-				const { level, extra, tags } = originalException;
-				if (level === 'warning') return null;
-				event.level = level;
-				if (extra) event.extra = { ...event.extra, ...extra };
-				if (tags) event.tags = { ...event.tags, ...tags };
-			}
-
-			if (originalException instanceof Error && originalException.stack) {
-				const eventHash = createHash('sha1').update(originalException.stack).digest('base64');
-				if (seenErrors.has(eventHash)) return null;
-				seenErrors.add(eventHash);
-			}
-
-			return event;
-		},
-	});
-
-	setTag('server_type', Container.get(InstanceSettings).instanceType);
-
-	ErrorReporterProxy.init({
-		report: (error, options) => captureException(error, options),
-	});
-
-	initialized = true;
-};
diff --git a/packages/cli/src/errors/feature-not-licensed.error.ts b/packages/cli/src/errors/feature-not-licensed.error.ts
index a61015f2e4..aa53655154 100644
--- a/packages/cli/src/errors/feature-not-licensed.error.ts
+++ b/packages/cli/src/errors/feature-not-licensed.error.ts
@@ -6,6 +6,7 @@ export class FeatureNotLicensedError extends ApplicationError {
 	constructor(feature: (typeof LICENSE_FEATURES)[keyof typeof LICENSE_FEATURES]) {
 		super(
 			`Your license does not allow for ${feature}. To enable ${feature}, please upgrade to a license that supports this feature.`,
+			{ level: 'warning' },
 		);
 	}
 }
diff --git a/packages/cli/src/errors/response-errors/abstract/response.error.ts b/packages/cli/src/errors/response-errors/abstract/response.error.ts
index f756afce41..fa7d4a8b06 100644
--- a/packages/cli/src/errors/response-errors/abstract/response.error.ts
+++ b/packages/cli/src/errors/response-errors/abstract/response.error.ts
@@ -16,8 +16,9 @@ export abstract class ResponseError extends ApplicationError {
 		readonly errorCode: number = httpStatusCode,
 		// The error hint the response
 		readonly hint: string | undefined = undefined,
+		cause?: unknown,
 	) {
-		super(message);
+		super(message, { cause });
 		this.name = 'ResponseError';
 	}
 }
diff --git a/packages/cli/src/errors/response-errors/internal-server.error.ts b/packages/cli/src/errors/response-errors/internal-server.error.ts
index 4c10e93f95..2a6a8d6b77 100644
--- a/packages/cli/src/errors/response-errors/internal-server.error.ts
+++ b/packages/cli/src/errors/response-errors/internal-server.error.ts
@@ -1,7 +1,7 @@
 import { ResponseError } from './abstract/response.error';
 
 export class InternalServerError extends ResponseError {
-	constructor(message: string, errorCode = 500) {
-		super(message, 500, errorCode);
+	constructor(message: string, cause?: unknown) {
+		super(message, 500, 500, undefined, cause);
 	}
 }
diff --git a/packages/cli/src/errors/response-errors/invalid-mfa-recovery-code-error.ts b/packages/cli/src/errors/response-errors/invalid-mfa-recovery-code-error.ts
new file mode 100644
index 0000000000..baa0ead870
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/invalid-mfa-recovery-code-error.ts
@@ -0,0 +1,7 @@
+import { ForbiddenError } from './forbidden.error';
+
+export class InvalidMfaRecoveryCodeError extends ForbiddenError {
+	constructor(hint?: string) {
+		super('Invalid MFA recovery code', hint);
+	}
+}
diff --git a/packages/cli/src/errors/response-errors/not-implemented.error.ts b/packages/cli/src/errors/response-errors/not-implemented.error.ts
new file mode 100644
index 0000000000..f6c66391ff
--- /dev/null
+++ b/packages/cli/src/errors/response-errors/not-implemented.error.ts
@@ -0,0 +1,7 @@
+import { ResponseError } from './abstract/response.error';
+
+export class NotImplementedError extends ResponseError {
+	constructor(message: string, hint: string | undefined = undefined) {
+		super(message, 501, 501, hint);
+	}
+}
diff --git a/packages/cli/src/evaluation.ee/metric.schema.ts b/packages/cli/src/evaluation.ee/metric.schema.ts
new file mode 100644
index 0000000000..fb186c50df
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/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.ee/metrics.controller.ts b/packages/cli/src/evaluation.ee/metrics.controller.ts
new file mode 100644
index 0000000000..2072b978b1
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/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.ee/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.Delete) {
+		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.ee/test-definition.schema.ts b/packages/cli/src/evaluation.ee/test-definition.schema.ts
new file mode 100644
index 0000000000..a2499f995c
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-definition.schema.ts
@@ -0,0 +1,21 @@
+import { z } from 'zod';
+
+export const testDefinitionCreateRequestBodySchema = z
+	.object({
+		name: z.string().min(1).max(255),
+		workflowId: z.string().min(1),
+		description: z.string().optional(),
+		evaluationWorkflowId: z.string().min(1).optional(),
+		annotationTagId: z.string().min(1).optional(),
+	})
+	.strict();
+
+export const testDefinitionPatchRequestBodySchema = z
+	.object({
+		name: z.string().min(1).max(255).optional(),
+		description: z.string().optional(),
+		evaluationWorkflowId: z.string().min(1).optional(),
+		annotationTagId: z.string().min(1).optional(),
+		mockedNodes: z.array(z.object({ id: z.string(), name: z.string() })).optional(),
+	})
+	.strict();
diff --git a/packages/cli/src/evaluation.ee/test-definition.service.ee.ts b/packages/cli/src/evaluation.ee/test-definition.service.ee.ts
new file mode 100644
index 0000000000..ed393421b0
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-definition.service.ee.ts
@@ -0,0 +1,165 @@
+import { Service } from '@n8n/di';
+
+import type { MockedNodeItem, TestDefinition } from '@/databases/entities/test-definition.ee';
+import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository.ee';
+import { TestDefinitionRepository } from '@/databases/repositories/test-definition.repository.ee';
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { validateEntity } from '@/generic-helpers';
+import type { ListQuery } from '@/requests';
+
+type TestDefinitionLike = Omit<
+	Partial<TestDefinition>,
+	'workflow' | 'evaluationWorkflow' | 'annotationTag' | 'metrics'
+> & {
+	workflow?: { id: string };
+	evaluationWorkflow?: { id: string };
+	annotationTag?: { id: string };
+};
+
+@Service()
+export class TestDefinitionService {
+	constructor(
+		private testDefinitionRepository: TestDefinitionRepository,
+		private annotationTagRepository: AnnotationTagRepository,
+	) {}
+
+	private toEntityLike(attrs: {
+		name?: string;
+		description?: string;
+		workflowId?: string;
+		evaluationWorkflowId?: string;
+		annotationTagId?: string;
+		id?: string;
+		mockedNodes?: MockedNodeItem[];
+	}) {
+		const entity: TestDefinitionLike = {};
+
+		if (attrs.id) {
+			entity.id = attrs.id;
+		}
+
+		if (attrs.name) {
+			entity.name = attrs.name?.trim();
+		}
+
+		if (attrs.description) {
+			entity.description = attrs.description.trim();
+		}
+
+		if (attrs.workflowId) {
+			entity.workflow = {
+				id: attrs.workflowId,
+			};
+		}
+
+		if (attrs.evaluationWorkflowId) {
+			entity.evaluationWorkflow = {
+				id: attrs.evaluationWorkflowId,
+			};
+		}
+
+		if (attrs.annotationTagId) {
+			entity.annotationTag = {
+				id: attrs.annotationTagId,
+			};
+		}
+
+		if (attrs.mockedNodes) {
+			entity.mockedNodes = attrs.mockedNodes;
+		}
+
+		return entity;
+	}
+
+	toEntity(attrs: {
+		name?: string;
+		workflowId?: string;
+		evaluationWorkflowId?: string;
+		annotationTagId?: string;
+		id?: string;
+	}) {
+		const entity = this.toEntityLike(attrs);
+		return this.testDefinitionRepository.create(entity);
+	}
+
+	async findOne(id: string, accessibleWorkflowIds: string[]) {
+		return await this.testDefinitionRepository.getOne(id, accessibleWorkflowIds);
+	}
+
+	async save(test: TestDefinition) {
+		await validateEntity(test);
+
+		return await this.testDefinitionRepository.save(test);
+	}
+
+	async update(id: string, attrs: TestDefinitionLike) {
+		if (attrs.name) {
+			const updatedTest = this.toEntity(attrs);
+			await validateEntity(updatedTest);
+		}
+
+		// Check if the annotation tag exists
+		if (attrs.annotationTagId) {
+			const annotationTagExists = await this.annotationTagRepository.exists({
+				where: {
+					id: attrs.annotationTagId,
+				},
+			});
+
+			if (!annotationTagExists) {
+				throw new BadRequestError('Annotation tag not found');
+			}
+		}
+
+		// If there are mocked nodes, validate them
+		if (attrs.mockedNodes && attrs.mockedNodes.length > 0) {
+			const existingTestDefinition = await this.testDefinitionRepository.findOneOrFail({
+				where: {
+					id,
+				},
+				relations: ['workflow'],
+			});
+
+			const existingNodeNames = new Map(
+				existingTestDefinition.workflow.nodes.map((n) => [n.name, n]),
+			);
+			const existingNodeIds = new Map(existingTestDefinition.workflow.nodes.map((n) => [n.id, n]));
+
+			attrs.mockedNodes.forEach((node) => {
+				if (!existingNodeIds.has(node.id) || (node.name && !existingNodeNames.has(node.name))) {
+					throw new BadRequestError(
+						`Pinned node not found in the workflow: ${node.id} (${node.name})`,
+					);
+				}
+			});
+
+			// Update the node names OR node ids if they are not provided
+			attrs.mockedNodes = attrs.mockedNodes.map((node) => {
+				return {
+					id: node.id ?? (node.name && existingNodeNames.get(node.name)?.id),
+					name: node.name ?? (node.id && existingNodeIds.get(node.id)?.name),
+				};
+			});
+		}
+
+		// Update the test definition
+		const queryResult = await this.testDefinitionRepository.update(id, this.toEntityLike(attrs));
+
+		if (queryResult.affected === 0) {
+			throw new NotFoundError('Test definition not found');
+		}
+	}
+
+	async delete(id: string, accessibleWorkflowIds: string[]) {
+		const deleteResult = await this.testDefinitionRepository.deleteById(id, accessibleWorkflowIds);
+
+		if (deleteResult.affected === 0) {
+			throw new NotFoundError('Test definition not found');
+		}
+	}
+
+	async getMany(options: ListQuery.Options, accessibleWorkflowIds: string[] = []) {
+		return await this.testDefinitionRepository.getMany(accessibleWorkflowIds, options);
+	}
+}
diff --git a/packages/cli/src/evaluation.ee/test-definitions.controller.ee.ts b/packages/cli/src/evaluation.ee/test-definitions.controller.ee.ts
new file mode 100644
index 0000000000..bd4a841948
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-definitions.controller.ee.ts
@@ -0,0 +1,148 @@
+import express from 'express';
+import assert from 'node:assert';
+
+import { Get, Post, Patch, RestController, Delete } from '@/decorators';
+import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import {
+	testDefinitionCreateRequestBodySchema,
+	testDefinitionPatchRequestBodySchema,
+} from '@/evaluation.ee/test-definition.schema';
+import { TestRunnerService } from '@/evaluation.ee/test-runner/test-runner.service.ee';
+import { listQueryMiddleware } from '@/middlewares';
+import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service';
+
+import { TestDefinitionService } from './test-definition.service.ee';
+import { TestDefinitionsRequest } from './test-definitions.types.ee';
+
+@RestController('/evaluation/test-definitions')
+export class TestDefinitionsController {
+	constructor(
+		private readonly testDefinitionService: TestDefinitionService,
+		private readonly testRunnerService: TestRunnerService,
+	) {}
+
+	@Get('/', { middlewares: listQueryMiddleware })
+	async getMany(req: TestDefinitionsRequest.GetMany) {
+		const userAccessibleWorkflowIds = await getSharedWorkflowIds(req.user, ['workflow:read']);
+
+		return await this.testDefinitionService.getMany(
+			req.listQueryOptions,
+			userAccessibleWorkflowIds,
+		);
+	}
+
+	@Get('/:id')
+	async getOne(req: TestDefinitionsRequest.GetOne) {
+		const { id: 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;
+	}
+
+	@Post('/')
+	async create(req: TestDefinitionsRequest.Create, res: express.Response) {
+		const bodyParseResult = testDefinitionCreateRequestBodySchema.safeParse(req.body);
+		if (!bodyParseResult.success) {
+			res.status(400).json({ errors: bodyParseResult.error.errors });
+			return;
+		}
+
+		const userAccessibleWorkflowIds = await getSharedWorkflowIds(req.user, ['workflow:read']);
+
+		if (!userAccessibleWorkflowIds.includes(req.body.workflowId)) {
+			throw new ForbiddenError('User does not have access to the workflow');
+		}
+
+		if (
+			req.body.evaluationWorkflowId &&
+			!userAccessibleWorkflowIds.includes(req.body.evaluationWorkflowId)
+		) {
+			throw new ForbiddenError('User does not have access to the evaluation workflow');
+		}
+
+		return await this.testDefinitionService.save(
+			this.testDefinitionService.toEntity(bodyParseResult.data),
+		);
+	}
+
+	@Delete('/:id')
+	async delete(req: TestDefinitionsRequest.Delete) {
+		const { id: testDefinitionId } = req.params;
+
+		const userAccessibleWorkflowIds = await getSharedWorkflowIds(req.user, ['workflow:read']);
+
+		if (userAccessibleWorkflowIds.length === 0)
+			throw new ForbiddenError('User does not have access to any workflows');
+
+		await this.testDefinitionService.delete(testDefinitionId, userAccessibleWorkflowIds);
+
+		return { success: true };
+	}
+
+	@Patch('/:id')
+	async patch(req: TestDefinitionsRequest.Patch, res: express.Response) {
+		const { id: testDefinitionId } = req.params;
+
+		const bodyParseResult = testDefinitionPatchRequestBodySchema.safeParse(req.body);
+		if (!bodyParseResult.success) {
+			res.status(400).json({ errors: bodyParseResult.error.errors });
+			return;
+		}
+
+		const userAccessibleWorkflowIds = await getSharedWorkflowIds(req.user, ['workflow:read']);
+
+		// Fail fast if no workflows are accessible
+		if (userAccessibleWorkflowIds.length === 0)
+			throw new ForbiddenError('User does not have access to any workflows');
+
+		const existingTest = await this.testDefinitionService.findOne(
+			testDefinitionId,
+			userAccessibleWorkflowIds,
+		);
+		if (!existingTest) throw new NotFoundError('Test definition not found');
+
+		if (
+			req.body.evaluationWorkflowId &&
+			!userAccessibleWorkflowIds.includes(req.body.evaluationWorkflowId)
+		) {
+			throw new ForbiddenError('User does not have access to the evaluation workflow');
+		}
+
+		await this.testDefinitionService.update(testDefinitionId, req.body);
+
+		// Respond with the updated test definition
+		const testDefinition = await this.testDefinitionService.findOne(
+			testDefinitionId,
+			userAccessibleWorkflowIds,
+		);
+
+		assert(testDefinition, 'Test definition not found');
+
+		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.ee/test-definitions.types.ee.ts b/packages/cli/src/evaluation.ee/test-definitions.types.ee.ts
new file mode 100644
index 0000000000..9b0507f248
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-definitions.types.ee.ts
@@ -0,0 +1,97 @@
+import type { MockedNodeItem } from '@/databases/entities/test-definition.ee';
+import type { AuthenticatedRequest, ListQuery } from '@/requests';
+
+// ----------------------------------
+//             /test-definitions
+// ----------------------------------
+
+export declare namespace TestDefinitionsRequest {
+	namespace RouteParams {
+		type TestId = {
+			id: string;
+		};
+	}
+
+	type GetOne = AuthenticatedRequest<RouteParams.TestId>;
+
+	type GetMany = AuthenticatedRequest<{}, {}, {}, ListQuery.Params> & {
+		listQueryOptions: ListQuery.Options;
+	};
+
+	type Create = AuthenticatedRequest<
+		{},
+		{},
+		{ name: string; workflowId: string; evaluationWorkflowId?: string }
+	>;
+
+	type Patch = AuthenticatedRequest<
+		RouteParams.TestId,
+		{},
+		{
+			name?: string;
+			evaluationWorkflowId?: string;
+			annotationTagId?: string;
+			mockedNodes?: MockedNodeItem[];
+		}
+	>;
+
+	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>;
+}
+
+// ----------------------------------
+// 					 /test-definitions/:testDefinitionId/runs
+// ----------------------------------
+
+export declare namespace TestRunsRequest {
+	namespace RouteParams {
+		type TestId = {
+			testDefinitionId: string;
+		};
+
+		type TestRunId = {
+			id: string;
+		};
+	}
+
+	type GetMany = AuthenticatedRequest<RouteParams.TestId, {}, {}, ListQuery.Params> & {
+		listQueryOptions: ListQuery.Options;
+	};
+
+	type GetOne = AuthenticatedRequest<RouteParams.TestId & RouteParams.TestRunId>;
+
+	type Delete = AuthenticatedRequest<RouteParams.TestId & RouteParams.TestRunId>;
+
+	type Cancel = AuthenticatedRequest<RouteParams.TestId & RouteParams.TestRunId>;
+}
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/create-pin-data.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/create-pin-data.ee.test.ts
new file mode 100644
index 0000000000..9603220432
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/create-pin-data.ee.test.ts
@@ -0,0 +1,104 @@
+import { readFileSync } from 'fs';
+import path from 'path';
+
+import { createPinData } from '../utils.ee';
+
+const wfUnderTestJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/workflow.under-test.json'), { encoding: 'utf-8' }),
+);
+
+const wfUnderTestRenamedNodesJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/workflow.under-test-renamed-nodes.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
+const executionDataJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.json'), { encoding: 'utf-8' }),
+);
+
+describe('createPinData', () => {
+	test('should create pin data from past execution data', () => {
+		const mockedNodes = [
+			{
+				id: '72256d90-3a67-4e29-b032-47df4e5768af',
+				name: 'When clicking ‘Test workflow’',
+			},
+		];
+
+		const pinData = createPinData(wfUnderTestJson, mockedNodes, executionDataJson);
+
+		expect(pinData).toEqual(
+			expect.objectContaining({
+				'When clicking ‘Test workflow’': expect.anything(),
+			}),
+		);
+	});
+
+	test('should not create pin data for non-existing mocked nodes', () => {
+		const mockedNodes = ['non-existing-ID'].map((id) => ({ id }));
+
+		const pinData = createPinData(wfUnderTestJson, mockedNodes, executionDataJson);
+
+		expect(pinData).toEqual({});
+	});
+
+	test('should create pin data for all mocked nodes', () => {
+		const mockedNodes = [
+			{
+				id: '72256d90-3a67-4e29-b032-47df4e5768af', // 'When clicking ‘Test workflow’'
+			},
+			{
+				id: '319f29bc-1dd4-4122-b223-c584752151a4', // 'Edit Fields'
+			},
+			{
+				id: 'd2474215-63af-40a4-a51e-0ea30d762621', // 'Code'
+			},
+		];
+
+		const pinData = createPinData(wfUnderTestJson, mockedNodes, executionDataJson);
+
+		expect(pinData).toEqual(
+			expect.objectContaining({
+				'When clicking ‘Test workflow’': expect.anything(),
+				'Edit Fields': expect.anything(),
+				Code: expect.anything(),
+			}),
+		);
+	});
+
+	test('should return empty object if no mocked nodes are provided', () => {
+		const pinData = createPinData(wfUnderTestJson, [], executionDataJson);
+
+		expect(pinData).toEqual({});
+	});
+
+	test('should create pin data for all mocked nodes with renamed nodes', () => {
+		const mockedNodes = [
+			{
+				id: '72256d90-3a67-4e29-b032-47df4e5768af', // 'Manual Run'
+			},
+			{
+				id: '319f29bc-1dd4-4122-b223-c584752151a4', // 'Set Attribute'
+			},
+			{
+				id: 'd2474215-63af-40a4-a51e-0ea30d762621', // 'Code'
+			},
+		];
+
+		const pinData = createPinData(
+			wfUnderTestRenamedNodesJson,
+			mockedNodes,
+			executionDataJson,
+			wfUnderTestJson, // Pass original workflow JSON as pastWorkflowData
+		);
+
+		expect(pinData).toEqual(
+			expect.objectContaining({
+				'Manual Run': expect.anything(),
+				'Set Attribute': expect.anything(),
+				Code: expect.anything(),
+			}),
+		);
+	});
+});
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/evaluation-metrics.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/evaluation-metrics.ee.test.ts
new file mode 100644
index 0000000000..27daf3aa79
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/evaluation-metrics.ee.test.ts
@@ -0,0 +1,72 @@
+import { EvaluationMetrics } from '../evaluation-metrics.ee';
+
+describe('EvaluationMetrics', () => {
+	test('should aggregate metrics correctly', () => {
+		const testMetricNames = new Set(['metric1', 'metric2']);
+		const metrics = new EvaluationMetrics(testMetricNames);
+
+		metrics.addResults({ metric1: 1, metric2: 0 });
+		metrics.addResults({ metric1: 0.5, metric2: 0.2 });
+
+		const aggregatedMetrics = metrics.getAggregatedMetrics();
+
+		expect(aggregatedMetrics).toEqual({ metric1: 0.75, metric2: 0.1 });
+	});
+
+	test('should aggregate only numbers', () => {
+		const testMetricNames = new Set(['metric1', 'metric2']);
+		const metrics = new EvaluationMetrics(testMetricNames);
+
+		metrics.addResults({ metric1: 1, metric2: 0 });
+		metrics.addResults({ metric1: '0.5', metric2: 0.2 });
+		metrics.addResults({ metric1: 'not a number', metric2: [1, 2, 3] });
+
+		const aggregatedUpMetrics = metrics.getAggregatedMetrics();
+
+		expect(aggregatedUpMetrics).toEqual({ metric1: 1, metric2: 0.1 });
+	});
+
+	test('should handle missing values', () => {
+		const testMetricNames = new Set(['metric1', 'metric2']);
+		const metrics = new EvaluationMetrics(testMetricNames);
+
+		metrics.addResults({ metric1: 1 });
+		metrics.addResults({ metric2: 0.2 });
+
+		const aggregatedMetrics = metrics.getAggregatedMetrics();
+
+		expect(aggregatedMetrics).toEqual({ metric1: 1, metric2: 0.2 });
+	});
+
+	test('should handle empty metrics', () => {
+		const testMetricNames = new Set(['metric1', 'metric2']);
+		const metrics = new EvaluationMetrics(testMetricNames);
+
+		const aggregatedMetrics = metrics.getAggregatedMetrics();
+
+		expect(aggregatedMetrics).toEqual({});
+	});
+
+	test('should handle empty testMetrics', () => {
+		const metrics = new EvaluationMetrics(new Set());
+
+		metrics.addResults({ metric1: 1, metric2: 0 });
+		metrics.addResults({ metric1: 0.5, metric2: 0.2 });
+
+		const aggregatedMetrics = metrics.getAggregatedMetrics();
+
+		expect(aggregatedMetrics).toEqual({});
+	});
+
+	test('should ignore non-relevant values', () => {
+		const testMetricNames = new Set(['metric1']);
+		const metrics = new EvaluationMetrics(testMetricNames);
+
+		metrics.addResults({ metric1: 1, notRelevant: 0 });
+		metrics.addResults({ metric1: 0.5, notRelevant2: { foo: 'bar' } });
+
+		const aggregatedMetrics = metrics.getAggregatedMetrics();
+
+		expect(aggregatedMetrics).toEqual({ metric1: 0.75 });
+	});
+});
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/get-start-node.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/get-start-node.ee.test.ts
new file mode 100644
index 0000000000..107cea80c6
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/get-start-node.ee.test.ts
@@ -0,0 +1,40 @@
+import { readFileSync } from 'fs';
+import path from 'path';
+
+import { getPastExecutionTriggerNode } from '../utils.ee';
+
+const executionDataJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.json'), { encoding: 'utf-8' }),
+);
+
+const executionDataMultipleTriggersJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.multiple-triggers.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
+const executionDataMultipleTriggersJson2 = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.multiple-triggers-2.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
+describe('getPastExecutionStartNode', () => {
+	test('should return the start node of the past execution', () => {
+		const startNode = getPastExecutionTriggerNode(executionDataJson);
+
+		expect(startNode).toEqual('When clicking ‘Test workflow’');
+	});
+
+	test('should return the start node of the past execution with multiple triggers', () => {
+		const startNode = getPastExecutionTriggerNode(executionDataMultipleTriggersJson);
+
+		expect(startNode).toEqual('When clicking ‘Test workflow’');
+	});
+
+	test('should return the start node of the past execution with multiple triggers - chat trigger', () => {
+		const startNode = getPastExecutionTriggerNode(executionDataMultipleTriggersJson2);
+
+		expect(startNode).toEqual('When chat message received');
+	});
+});
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.json
new file mode 100644
index 0000000000..1c974205d0
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/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.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers-2.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers-2.json
new file mode 100644
index 0000000000..12bb837912
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers-2.json
@@ -0,0 +1,95 @@
+{
+	"startData": {},
+	"resultData": {
+		"runData": {
+			"When chat message received": [
+				{
+					"startTime": 1732882447976,
+					"executionTime": 0,
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"sessionId": "192c5b3c0b0642d68eab1a747a59cb6e",
+										"action": "sendMessage",
+										"chatInput": "hey"
+									}
+								}
+							]
+						]
+					},
+					"source": [null]
+				}
+			],
+			"NoOp": [
+				{
+					"hints": [],
+					"startTime": 1732882448034,
+					"executionTime": 0,
+					"source": [
+						{
+							"previousNode": "When clicking ‘Test workflow’"
+						}
+					],
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"sessionId": "192c5b3c0b0642d68eab1a747a59cb6e",
+										"action": "sendMessage",
+										"chatInput": "hey"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					}
+				}
+			],
+			"NoOp2": [
+				{
+					"hints": [],
+					"startTime": 1732882448037,
+					"executionTime": 0,
+					"source": [
+						{
+							"previousNode": "NoOp"
+						}
+					],
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"sessionId": "192c5b3c0b0642d68eab1a747a59cb6e",
+										"action": "sendMessage",
+										"chatInput": "hey"
+									},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					}
+				}
+			]
+		},
+		"pinData": {},
+		"lastNodeExecuted": "NoOp2"
+	},
+	"executionData": {
+		"contextData": {},
+		"nodeExecutionStack": [],
+		"metadata": {},
+		"waitingExecution": {},
+		"waitingExecutionSource": {}
+	}
+}
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers.json
new file mode 100644
index 0000000000..ec802fdc31
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/execution-data.multiple-triggers.json
@@ -0,0 +1,87 @@
+{
+	"startData": {},
+	"resultData": {
+		"runData": {
+			"When clicking ‘Test workflow’": [
+				{
+					"hints": [],
+					"startTime": 1732882424975,
+					"executionTime": 0,
+					"source": [],
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					}
+				}
+			],
+			"NoOp": [
+				{
+					"hints": [],
+					"startTime": 1732882424977,
+					"executionTime": 1,
+					"source": [
+						{
+							"previousNode": "When clicking ‘Test workflow’"
+						}
+					],
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					}
+				}
+			],
+			"NoOp2": [
+				{
+					"hints": [],
+					"startTime": 1732882424978,
+					"executionTime": 0,
+					"source": [
+						{
+							"previousNode": "NoOp"
+						}
+					],
+					"executionStatus": "success",
+					"data": {
+						"main": [
+							[
+								{
+									"json": {},
+									"pairedItem": {
+										"item": 0
+									}
+								}
+							]
+						]
+					}
+				}
+			]
+		},
+		"pinData": {},
+		"lastNodeExecuted": "NoOp2"
+	},
+	"executionData": {
+		"contextData": {},
+		"nodeExecutionStack": [],
+		"metadata": {},
+		"waitingExecution": {},
+		"waitingExecutionSource": {}
+	}
+}
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.evaluation.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.evaluation.json
new file mode 100644
index 0000000000..6ec7f2c386
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.evaluation.json
@@ -0,0 +1,130 @@
+{
+	"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"
+						},
+						{
+							"id": "877d1bf8-31a7-4571-9293-a6837b51d22b",
+							"name": "metric1",
+							"value": 0.1,
+							"type": "number"
+						}
+					]
+				},
+				"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.ee/test-runner/__tests__/mock-data/workflow.multiple-triggers.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.multiple-triggers.json
new file mode 100644
index 0000000000..73dbf2136f
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.multiple-triggers.json
@@ -0,0 +1,76 @@
+{
+	"name": "Multiple Triggers Workflow",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-20, -120],
+			"id": "19562c2d-d2c8-45c8-ae0a-1b1effe29817",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"type": "@n8n/n8n-nodes-langchain.chatTrigger",
+			"typeVersion": 1.1,
+			"position": [-20, 120],
+			"id": "9b4b833b-56f6-4099-9b7d-5e94b75a735c",
+			"name": "When chat message received",
+			"webhookId": "8aeccd03-d45f-48d2-a2c7-1fb8c53d2ad7"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [260, -20],
+			"id": "d3ab7426-11e7-4f42-9a57-11b8de019783",
+			"name": "NoOp"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, -20],
+			"id": "fb73bed6-ec2a-4283-b564-c96730b94889",
+			"name": "NoOp2"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "NoOp",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"When chat message received": {
+			"main": [
+				[
+					{
+						"node": "NoOp",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"NoOp": {
+			"main": [
+				[
+					{
+						"node": "NoOp2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.under-test-renamed-nodes.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.under-test-renamed-nodes.json
new file mode 100644
index 0000000000..d384687feb
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.under-test-renamed-nodes.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": "Manual Run"
+		},
+		{
+			"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": "Set Attribute"
+		},
+		{
+			"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": {
+		"Manual Run": {
+			"main": [
+				[
+					{
+						"node": "Set attribute",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set attribute": {
+			"main": [
+				[
+					{
+						"node": "Wait",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Wait": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.under-test.json b/packages/cli/src/evaluation.ee/test-runner/__tests__/mock-data/workflow.under-test.json
new file mode 100644
index 0000000000..0204283a1b
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/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.ee/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
new file mode 100644
index 0000000000..026b5d2eb8
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts
@@ -0,0 +1,721 @@
+import type { SelectQueryBuilder } from '@n8n/typeorm';
+import { stringify } from 'flatted';
+import { readFileSync } from 'fs';
+import { mock, mockDeep } from 'jest-mock-extended';
+import type { ErrorReporter } from 'n8n-core';
+import type { ExecutionError, GenericValue, 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 { TestMetric } from '@/databases/entities/test-metric.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 { TestMetricRepository } from '@/databases/repositories/test-metric.repository.ee';
+import type { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { NodeTypes } from '@/node-types';
+import type { WorkflowRunner } from '@/workflow-runner';
+import { mockInstance, mockLogger } from '@test/mocking';
+import { mockNodeTypesData } from '@test-integration/utils/node-types-data';
+
+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 wfUnderTestRenamedNodesJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/workflow.under-test-renamed-nodes.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
+const wfEvaluationJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/workflow.evaluation.json'), { encoding: 'utf-8' }),
+);
+
+const wfMultipleTriggersJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/workflow.multiple-triggers.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
+const executionDataJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.json'), { encoding: 'utf-8' }),
+);
+
+const executionDataMultipleTriggersJson = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.multiple-triggers.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
+const executionDataMultipleTriggersJson2 = JSON.parse(
+	readFileSync(path.join(__dirname, './mock-data/execution-data.multiple-triggers-2.json'), {
+		encoding: 'utf-8',
+	}),
+);
+
+const executionMocks = [
+	mock<ExecutionEntity>({
+		id: 'some-execution-id',
+		workflowId: 'workflow-under-test-id',
+		status: 'success',
+		executionData: {
+			data: stringify(executionDataJson),
+			workflowData: wfUnderTestJson,
+		},
+	}),
+	mock<ExecutionEntity>({
+		id: 'some-execution-id-2',
+		workflowId: 'workflow-under-test-id',
+		status: 'success',
+		executionData: {
+			data: stringify(executionDataJson),
+			workflowData: wfUnderTestRenamedNodesJson,
+		},
+	}),
+];
+
+function mockExecutionData() {
+	return mock<IRun>({
+		data: {
+			resultData: {
+				runData: {},
+			},
+		},
+	});
+}
+
+function mockErrorExecutionData() {
+	return mock<IRun>({
+		data: {
+			resultData: {
+				error: mock<ExecutionError>(),
+			},
+		},
+	});
+}
+
+function mockEvaluationExecutionData(metrics: Record<string, GenericValue>) {
+	return mock<IRun>({
+		data: {
+			resultData: {
+				lastNodeExecuted: 'lastNode',
+				runData: {
+					lastNode: [
+						{
+							data: {
+								main: [
+									[
+										{
+											json: metrics,
+										},
+									],
+								],
+							},
+						},
+					],
+				},
+				// error is an optional prop, but jest-mock-extended will mock it by default,
+				// which affects the code logic. So, we need to explicitly set it to undefined.
+				error: undefined,
+			},
+		},
+	});
+}
+
+const errorReporter = mock<ErrorReporter>();
+const logger = mockLogger();
+
+async function mockLongExecutionPromise(data: IRun, delay: number): Promise<IRun> {
+	return await new Promise((resolve) => {
+		setTimeout(() => resolve(data), delay);
+	});
+}
+
+describe('TestRunnerService', () => {
+	const executionRepository = mock<ExecutionRepository>();
+	const workflowRepository = mock<WorkflowRepository>();
+	const workflowRunner = mock<WorkflowRunner>();
+	const activeExecutions = mock<ActiveExecutions>();
+	const testRunRepository = mock<TestRunRepository>();
+	const testMetricRepository = mock<TestMetricRepository>();
+
+	const mockNodeTypes = mockInstance(NodeTypes);
+	mockInstance(LoadNodesAndCredentials, {
+		loadedNodes: mockNodeTypesData(['manualTrigger', 'set', 'if', 'code']),
+	});
+
+	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' }));
+
+		testMetricRepository.find.mockResolvedValue([
+			mock<TestMetric>({ name: 'metric1' }),
+			mock<TestMetric>({ name: 'metric2' }),
+		]);
+	});
+
+	afterEach(() => {
+		jest.resetAllMocks();
+		testRunRepository.incrementFailed.mockClear();
+		testRunRepository.incrementPassed.mockClear();
+	});
+
+	test('should create an instance of TestRunnerService', async () => {
+		const testRunnerService = new TestRunnerService(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		expect(testRunnerService).toBeInstanceOf(TestRunnerService);
+	});
+
+	test('should create and run test cases from past executions', async () => {
+		const testRunnerService = new TestRunnerService(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		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',
+				mockedNodes: [],
+			}),
+		);
+
+		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(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		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-3')
+			.mockResolvedValue(mockExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-4')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 0.5 }));
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [{ id: '72256d90-3a67-4e29-b032-47df4e5768af' }],
+			}),
+		);
+
+		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.any(Number));
+		expect(testRunRepository.markAsCompleted).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.markAsCompleted).toHaveBeenCalledWith('test-run-id', {
+			metric1: 0.75,
+			metric2: 0,
+		});
+
+		expect(testRunRepository.incrementPassed).toHaveBeenCalledTimes(2);
+		expect(testRunRepository.incrementFailed).not.toHaveBeenCalled();
+	});
+
+	test('should properly count passed and failed executions', async () => {
+		const testRunnerService = new TestRunnerService(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		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-3')
+			.mockResolvedValue(mockExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-4')
+			.mockRejectedValue(new Error('Some error'));
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [],
+			}),
+		);
+
+		expect(testRunRepository.incrementPassed).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.incrementFailed).toHaveBeenCalledTimes(1);
+	});
+
+	test('should properly count failed test executions', async () => {
+		const testRunnerService = new TestRunnerService(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		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-3')
+			.mockResolvedValue(mockErrorExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [],
+			}),
+		);
+
+		expect(testRunRepository.incrementPassed).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.incrementFailed).toHaveBeenCalledTimes(1);
+	});
+
+	test('should properly count failed evaluations', async () => {
+		const testRunnerService = new TestRunnerService(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		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-3')
+			.mockResolvedValue(mockExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-4')
+			.mockResolvedValue(mockErrorExecutionData());
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [],
+			}),
+		);
+
+		expect(testRunRepository.incrementPassed).toHaveBeenCalledTimes(1);
+		expect(testRunRepository.incrementFailed).toHaveBeenCalledTimes(1);
+	});
+
+	test('should specify correct start nodes when running workflow under test', async () => {
+		const testRunnerService = new TestRunnerService(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		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-3')
+			.mockResolvedValue(mockExecutionData());
+
+		// Mock executions of evaluation workflow
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-2')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }));
+
+		activeExecutions.getPostExecutePromise
+			.calledWith('some-execution-id-4')
+			.mockResolvedValue(mockEvaluationExecutionData({ metric1: 0.5 }));
+
+		await testRunnerService.runTest(
+			mock<User>(),
+			mock<TestDefinition>({
+				workflowId: 'workflow-under-test-id',
+				evaluationWorkflowId: 'evaluation-workflow-id',
+				mockedNodes: [{ id: '72256d90-3a67-4e29-b032-47df4e5768af' }],
+			}),
+		);
+
+		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',
+				}),
+				triggerToStartFrom: expect.objectContaining({
+					name: 'When clicking ‘Test workflow’',
+				}),
+			}),
+		);
+	});
+
+	test('should properly choose trigger and start nodes', async () => {
+		const testRunnerService = new TestRunnerService(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		const startNodesData = (testRunnerService as any).getStartNodesData(
+			wfMultipleTriggersJson,
+			executionDataMultipleTriggersJson,
+		);
+
+		expect(startNodesData).toEqual({
+			startNodes: expect.arrayContaining([expect.objectContaining({ name: 'NoOp' })]),
+			triggerToStartFrom: expect.objectContaining({
+				name: 'When clicking ‘Test workflow’',
+			}),
+		});
+	});
+
+	test('should properly choose trigger and start nodes 2', async () => {
+		const testRunnerService = new TestRunnerService(
+			logger,
+			workflowRepository,
+			workflowRunner,
+			executionRepository,
+			activeExecutions,
+			testRunRepository,
+			testMetricRepository,
+			mockNodeTypes,
+			errorReporter,
+		);
+
+		const startNodesData = (testRunnerService as any).getStartNodesData(
+			wfMultipleTriggersJson,
+			executionDataMultipleTriggersJson2,
+		);
+
+		expect(startNodesData).toEqual({
+			startNodes: expect.arrayContaining([expect.objectContaining({ name: 'NoOp' })]),
+			triggerToStartFrom: expect.objectContaining({
+				name: 'When chat message received',
+			}),
+		});
+	});
+
+	describe('Test Run cancellation', () => {
+		beforeAll(() => {
+			jest.useFakeTimers();
+		});
+
+		test('should cancel test run', async () => {
+			const testRunnerService = new TestRunnerService(
+				logger,
+				workflowRepository,
+				workflowRunner,
+				executionRepository,
+				activeExecutions,
+				testRunRepository,
+				testMetricRepository,
+				mockNodeTypes,
+				mock<ErrorReporter>(),
+			);
+
+			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 long execution of workflow under test
+			activeExecutions.getPostExecutePromise
+				.calledWith('some-execution-id')
+				.mockReturnValue(mockLongExecutionPromise(mockExecutionData(), 1000));
+
+			activeExecutions.getPostExecutePromise
+				.calledWith('some-execution-id-3')
+				.mockReturnValue(mockLongExecutionPromise(mockExecutionData(), 1000));
+
+			// Mock executions of evaluation workflow
+			activeExecutions.getPostExecutePromise
+				.calledWith('some-execution-id-2')
+				.mockReturnValue(
+					mockLongExecutionPromise(mockEvaluationExecutionData({ metric1: 1, metric2: 0 }), 1000),
+				);
+
+			activeExecutions.getPostExecutePromise
+				.calledWith('some-execution-id-4')
+				.mockReturnValue(
+					mockLongExecutionPromise(mockEvaluationExecutionData({ metric1: 0.5 }), 1000),
+				);
+
+			// Do not await here to test canceling
+			void testRunnerService.runTest(
+				mock<User>(),
+				mock<TestDefinition>({
+					workflowId: 'workflow-under-test-id',
+					evaluationWorkflowId: 'evaluation-workflow-id',
+					mockedNodes: [{ id: '72256d90-3a67-4e29-b032-47df4e5768af' }],
+				}),
+			);
+
+			// Simulate the moment when first test case is running (wf under test execution)
+			await jest.advanceTimersByTimeAsync(100);
+			expect(workflowRunner.run).toHaveBeenCalledTimes(1);
+
+			const abortController = (testRunnerService as any).abortControllers.get('test-run-id');
+			expect(abortController).toBeDefined();
+
+			await testRunnerService.cancelTestRun('test-run-id');
+
+			expect(abortController.signal.aborted).toBe(true);
+			expect(activeExecutions.stopExecution).toBeCalledWith('some-execution-id');
+		});
+
+		afterAll(() => {
+			jest.useRealTimers();
+		});
+	});
+});
diff --git a/packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts b/packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts
new file mode 100644
index 0000000000..ab5c921f8c
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/evaluation-metrics.ee.ts
@@ -0,0 +1,32 @@
+import type { IDataObject } from 'n8n-workflow';
+
+export class EvaluationMetrics {
+	private readonly rawMetricsByName = new Map<string, number[]>();
+
+	constructor(private readonly metricNames: Set<string>) {
+		for (const metricName of metricNames) {
+			this.rawMetricsByName.set(metricName, []);
+		}
+	}
+
+	addResults(result: IDataObject) {
+		for (const [metricName, metricValue] of Object.entries(result)) {
+			if (typeof metricValue === 'number' && this.metricNames.has(metricName)) {
+				this.rawMetricsByName.get(metricName)!.push(metricValue);
+			}
+		}
+	}
+
+	getAggregatedMetrics() {
+		const aggregatedMetrics: Record<string, number> = {};
+
+		for (const [metricName, metricValues] of this.rawMetricsByName.entries()) {
+			if (metricValues.length > 0) {
+				const metricSum = metricValues.reduce((acc, val) => acc + val, 0);
+				aggregatedMetrics[metricName] = metricSum / metricValues.length;
+			}
+		}
+
+		return aggregatedMetrics;
+	}
+}
diff --git a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
new file mode 100644
index 0000000000..a594e15c05
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts
@@ -0,0 +1,397 @@
+import { Service } from '@n8n/di';
+import { parse } from 'flatted';
+import { ErrorReporter, Logger } from 'n8n-core';
+import { ExecutionCancelledError, NodeConnectionType, Workflow } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IRun,
+	IRunData,
+	IRunExecutionData,
+	IWorkflowBase,
+	IWorkflowExecutionDataProcess,
+} from 'n8n-workflow';
+import assert from 'node:assert';
+
+import { ActiveExecutions } from '@/active-executions';
+import type { ExecutionEntity } from '@/databases/entities/execution-entity';
+import type { MockedNodeItem, TestDefinition } from '@/databases/entities/test-definition.ee';
+import type { TestRun } from '@/databases/entities/test-run.ee';
+import type { User } from '@/databases/entities/user';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { TestMetricRepository } from '@/databases/repositories/test-metric.repository.ee';
+import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { NodeTypes } from '@/node-types';
+import { getRunData } from '@/workflow-execute-additional-data';
+import { WorkflowRunner } from '@/workflow-runner';
+
+import { EvaluationMetrics } from './evaluation-metrics.ee';
+import { createPinData, getPastExecutionTriggerNode } from './utils.ee';
+
+/**
+ * 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, and collects the metrics.
+ */
+@Service()
+export class TestRunnerService {
+	private abortControllers: Map<TestRun['id'], AbortController> = new Map();
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly workflowRunner: WorkflowRunner,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly activeExecutions: ActiveExecutions,
+		private readonly testRunRepository: TestRunRepository,
+		private readonly testMetricRepository: TestMetricRepository,
+		private readonly nodeTypes: NodeTypes,
+		private readonly errorReporter: ErrorReporter,
+	) {}
+
+	/**
+	 * Prepares the start nodes and trigger node data props for the `workflowRunner.run` method input.
+	 */
+	private getStartNodesData(
+		workflow: WorkflowEntity,
+		pastExecutionData: IRunExecutionData,
+	): Pick<IWorkflowExecutionDataProcess, 'startNodes' | 'triggerToStartFrom'> {
+		// Create a new workflow instance to use the helper functions (getChildNodes)
+		const workflowInstance = new Workflow({
+			nodes: workflow.nodes,
+			connections: workflow.connections,
+			active: false,
+			nodeTypes: this.nodeTypes,
+		});
+
+		// Determine the trigger node of the past execution
+		const pastExecutionTriggerNode = getPastExecutionTriggerNode(pastExecutionData);
+		assert(pastExecutionTriggerNode, 'Could not find the trigger node of the past execution');
+
+		const triggerNodeData = pastExecutionData.resultData.runData[pastExecutionTriggerNode][0];
+		assert(triggerNodeData, 'Trigger node data not found');
+
+		const triggerToStartFrom = {
+			name: pastExecutionTriggerNode,
+			data: triggerNodeData,
+		};
+
+		// Start nodes are the nodes that are connected to the trigger node
+		const startNodes = workflowInstance
+			.getChildNodes(pastExecutionTriggerNode, NodeConnectionType.Main, 1)
+			.map((nodeName) => ({
+				name: nodeName,
+				sourceData: { previousNode: pastExecutionTriggerNode },
+			}));
+
+		return {
+			startNodes,
+			triggerToStartFrom,
+		};
+	}
+
+	/**
+	 * Runs a test case with the given pin data.
+	 * Waits for the workflow under test to finish execution.
+	 */
+	private async runTestCase(
+		workflow: WorkflowEntity,
+		pastExecutionData: IRunExecutionData,
+		pastExecutionWorkflowData: IWorkflowBase,
+		mockedNodes: MockedNodeItem[],
+		userId: string,
+		abortSignal: AbortSignal,
+	): Promise<IRun | undefined> {
+		// Do not run if the test run is cancelled
+		if (abortSignal.aborted) {
+			return;
+		}
+
+		// Create pin data from the past execution data
+		const pinData = createPinData(
+			workflow,
+			mockedNodes,
+			pastExecutionData,
+			pastExecutionWorkflowData,
+		);
+
+		// Prepare the data to run the workflow
+		const data: IWorkflowExecutionDataProcess = {
+			...this.getStartNodesData(workflow, pastExecutionData),
+			executionMode: 'evaluation',
+			runData: {},
+			pinData,
+			workflowData: { ...workflow, pinData },
+			userId,
+			partialExecutionVersion: '1',
+		};
+
+		// Trigger the workflow under test with mocked data
+		const executionId = await this.workflowRunner.run(data);
+		assert(executionId);
+
+		// Listen to the abort signal to stop the execution in case test run is cancelled
+		abortSignal.addEventListener('abort', () => {
+			this.activeExecutions.stopExecution(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,
+		abortSignal: AbortSignal,
+		testRunId?: string,
+	) {
+		// Do not run if the test run is cancelled
+		if (abortSignal.aborted) {
+			return;
+		}
+
+		// 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]);
+		// FIXME: This is a hack to add the testRunId to the evaluation workflow execution data
+		// So that we can fetch all execution runs for a test run
+		if (testRunId && data.executionData) {
+			data.executionData.resultData.metadata = {
+				testRunId,
+			};
+		}
+		data.executionMode = 'evaluation';
+
+		// Trigger the evaluation workflow
+		const executionId = await this.workflowRunner.run(data);
+		assert(executionId);
+
+		// Listen to the abort signal to stop the execution in case test run is cancelled
+		abortSignal.addEventListener('abort', () => {
+			this.activeExecutions.stopExecution(executionId);
+		});
+
+		// Wait for the execution to finish
+		const executePromise = this.activeExecutions.getPostExecutePromise(executionId);
+
+		return await executePromise;
+	}
+
+	/**
+	 * Evaluation result is the first item in the output of the last node
+	 * executed in the evaluation workflow. Defaults to an empty object
+	 * in case the node doesn't produce any output items.
+	 */
+	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 ?? {};
+	}
+
+	/**
+	 * Get the metrics to collect from the evaluation workflow execution results.
+	 */
+	private async getTestMetricNames(testDefinitionId: string) {
+		const metrics = await this.testMetricRepository.find({
+			where: {
+				testDefinition: {
+					id: testDefinitionId,
+				},
+			},
+		});
+
+		return new Set(metrics.map((m) => m.name));
+	}
+
+	/**
+	 * Creates a new test run for the given test definition.
+	 */
+	async runTest(user: User, test: TestDefinition): Promise<void> {
+		this.logger.debug('Starting new test run', { testId: test.id });
+
+		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');
+
+		// 0.1 Initialize AbortController
+		const abortController = new AbortController();
+		this.abortControllers.set(testRun.id, abortController);
+
+		const abortSignal = abortController.signal;
+		try {
+			// 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();
+
+			this.logger.debug('Found past executions', { count: pastExecutions.length });
+
+			// Get the metrics to collect from the evaluation workflow
+			const testMetricNames = await this.getTestMetricNames(test.id);
+
+			// 2. Run over all the test cases
+			await this.testRunRepository.markAsRunning(testRun.id, pastExecutions.length);
+
+			// Object to collect the results of the evaluation workflow executions
+			const metrics = new EvaluationMetrics(testMetricNames);
+
+			for (const { id: pastExecutionId } of pastExecutions) {
+				if (abortSignal.aborted) {
+					this.logger.debug('Test run was cancelled', {
+						testId: test.id,
+						stoppedOn: pastExecutionId,
+					});
+					break;
+				}
+
+				this.logger.debug('Running test case', { pastExecutionId });
+
+				try {
+					// Fetch past execution with data
+					const pastExecution = await this.executionRepository.findOne({
+						where: { id: pastExecutionId },
+						relations: ['executionData', 'metadata'],
+					});
+					assert(pastExecution, 'Execution not found');
+
+					const executionData = parse(pastExecution.executionData.data) as IRunExecutionData;
+
+					// Run the test case and wait for it to finish
+					const testCaseExecution = await this.runTestCase(
+						workflow,
+						executionData,
+						pastExecution.executionData.workflowData,
+						test.mockedNodes,
+						user.id,
+						abortSignal,
+					);
+
+					this.logger.debug('Test case execution finished', { pastExecutionId });
+
+					// In case of a permission check issue, the test case execution will be undefined.
+					// Skip them, increment the failed count and continue with the next test case
+					if (!testCaseExecution) {
+						await this.testRunRepository.incrementFailed(testRun.id);
+						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,
+						abortSignal,
+						testRun.id,
+					);
+					assert(evalExecution);
+
+					this.logger.debug('Evaluation execution finished', { pastExecutionId });
+
+					// Extract the output of the last node executed in the evaluation workflow
+					metrics.addResults(this.extractEvaluationResult(evalExecution));
+
+					if (evalExecution.data.resultData.error) {
+						await this.testRunRepository.incrementFailed(testRun.id);
+					} else {
+						await this.testRunRepository.incrementPassed(testRun.id);
+					}
+				} catch (e) {
+					// In case of an unexpected error, increment the failed count and continue with the next test case
+					await this.testRunRepository.incrementFailed(testRun.id);
+
+					this.errorReporter.error(e);
+				}
+			}
+
+			// Mark the test run as completed or cancelled
+			if (abortSignal.aborted) {
+				await this.testRunRepository.markAsCancelled(testRun.id);
+			} else {
+				const aggregatedMetrics = metrics.getAggregatedMetrics();
+				await this.testRunRepository.markAsCompleted(testRun.id, aggregatedMetrics);
+
+				this.logger.debug('Test run finished', { testId: test.id });
+			}
+		} catch (e) {
+			if (e instanceof ExecutionCancelledError) {
+				this.logger.debug('Evaluation execution was cancelled. Cancelling test run', {
+					testRunId: testRun.id,
+					stoppedOn: e.extra?.executionId,
+				});
+
+				await this.testRunRepository.markAsCancelled(testRun.id);
+			} else {
+				throw e;
+			}
+		} finally {
+			// Clean up abort controller
+			this.abortControllers.delete(testRun.id);
+		}
+	}
+
+	/**
+	 * Checks if the test run in a cancellable state.
+	 */
+	canBeCancelled(testRun: TestRun) {
+		return testRun.status !== 'running' && testRun.status !== 'new';
+	}
+
+	/**
+	 * Cancels the test run with the given ID.
+	 * TODO: Implement the cancellation of the test run in a multi-main scenario
+	 */
+	async cancelTestRun(testRunId: string) {
+		const abortController = this.abortControllers.get(testRunId);
+		if (abortController) {
+			abortController.abort();
+			this.abortControllers.delete(testRunId);
+		} else {
+			// If there is no abort controller - just mark the test run as cancelled
+			await this.testRunRepository.markAsCancelled(testRunId);
+		}
+	}
+}
diff --git a/packages/cli/src/evaluation.ee/test-runner/utils.ee.ts b/packages/cli/src/evaluation.ee/test-runner/utils.ee.ts
new file mode 100644
index 0000000000..be40b7ecfb
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runner/utils.ee.ts
@@ -0,0 +1,60 @@
+import assert from 'assert';
+import type { IRunExecutionData, IPinData, IWorkflowBase } from 'n8n-workflow';
+
+import type { MockedNodeItem } from '@/databases/entities/test-definition.ee';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+
+/**
+ * Extracts the execution data from the past execution
+ * and creates a pin data object from it for the given workflow.
+ * It uses a list of mocked nodes defined in a test definition
+ * to decide which nodes to pin.
+ */
+export function createPinData(
+	workflow: WorkflowEntity,
+	mockedNodes: MockedNodeItem[],
+	executionData: IRunExecutionData,
+	pastWorkflowData?: IWorkflowBase,
+) {
+	const pinData = {} as IPinData;
+
+	const workflowNodeIds = new Map(workflow.nodes.map((node) => [node.id, node.name]));
+
+	// If the past workflow data is provided, use it to create a map between node IDs and node names
+	const pastWorkflowNodeIds = new Map<string, string>();
+	if (pastWorkflowData) {
+		for (const node of pastWorkflowData.nodes) {
+			pastWorkflowNodeIds.set(node.id, node.name);
+		}
+	}
+
+	for (const mockedNode of mockedNodes) {
+		assert(mockedNode.id, 'Mocked node ID is missing');
+
+		const nodeName = workflowNodeIds.get(mockedNode.id);
+
+		// If mocked node is still present in the workflow
+		if (nodeName) {
+			// Try to restore node name from past execution data (it might have been renamed between past execution and up-to-date workflow)
+			const pastNodeName = pastWorkflowNodeIds.get(mockedNode.id) ?? nodeName;
+			const nodeData = executionData.resultData.runData[pastNodeName];
+
+			if (nodeData?.[0]?.data?.main?.[0]) {
+				pinData[nodeName] = nodeData[0]?.data?.main?.[0];
+			}
+		}
+	}
+
+	return pinData;
+}
+
+/**
+ * Returns the trigger node of the past execution.
+ * The trigger node is the node that has no source and has run data.
+ */
+export function getPastExecutionTriggerNode(executionData: IRunExecutionData) {
+	return Object.keys(executionData.resultData.runData).find((nodeName) => {
+		const data = executionData.resultData.runData[nodeName];
+		return !data[0].source || data[0].source.length === 0 || data[0].source[0] === null;
+	});
+}
diff --git a/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts b/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts
new file mode 100644
index 0000000000..7e95cb4dce
--- /dev/null
+++ b/packages/cli/src/evaluation.ee/test-runs.controller.ee.ts
@@ -0,0 +1,113 @@
+import express from 'express';
+import { InstanceSettings } from 'n8n-core';
+
+import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
+import { Delete, Get, Post, RestController } from '@/decorators';
+import { ConflictError } from '@/errors/response-errors/conflict.error';
+import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { NotImplementedError } from '@/errors/response-errors/not-implemented.error';
+import { TestRunsRequest } from '@/evaluation.ee/test-definitions.types.ee';
+import { TestRunnerService } from '@/evaluation.ee/test-runner/test-runner.service.ee';
+import { listQueryMiddleware } from '@/middlewares';
+import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service';
+
+import { TestDefinitionService } from './test-definition.service.ee';
+
+@RestController('/evaluation/test-definitions')
+export class TestRunsController {
+	constructor(
+		private readonly testDefinitionService: TestDefinitionService,
+		private readonly testRunRepository: TestRunRepository,
+		private readonly testRunnerService: TestRunnerService,
+		private readonly instanceSettings: InstanceSettings,
+	) {}
+
+	/**
+	 * 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: TestRunsRequest.GetOne | TestRunsRequest.GetMany | TestRunsRequest.Delete,
+	) {
+		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 the test run (or just check that it exists and the user has access to it)
+	 */
+	private async getTestRun(
+		req: TestRunsRequest.GetOne | TestRunsRequest.Delete | TestRunsRequest.Cancel,
+	) {
+		const { id: testRunId, testDefinitionId } = req.params;
+
+		const testRun = await this.testRunRepository.findOne({
+			where: { id: testRunId, testDefinition: { id: testDefinitionId } },
+		});
+
+		if (!testRun) throw new NotFoundError('Test run not found');
+
+		return testRun;
+	}
+
+	@Get('/:testDefinitionId/runs', { middlewares: listQueryMiddleware })
+	async getMany(req: TestRunsRequest.GetMany) {
+		const { testDefinitionId } = req.params;
+
+		await this.getTestDefinition(req);
+
+		return await this.testRunRepository.getMany(testDefinitionId, req.listQueryOptions);
+	}
+
+	@Get('/:testDefinitionId/runs/:id')
+	async getOne(req: TestRunsRequest.GetOne) {
+		await this.getTestDefinition(req);
+
+		return await this.getTestRun(req);
+	}
+
+	@Delete('/:testDefinitionId/runs/:id')
+	async delete(req: TestRunsRequest.Delete) {
+		const { id: testRunId } = req.params;
+
+		// Check test definition and test run exist
+		await this.getTestDefinition(req);
+		await this.getTestRun(req);
+
+		await this.testRunRepository.delete({ id: testRunId });
+
+		return { success: true };
+	}
+
+	@Post('/:testDefinitionId/runs/:id/cancel')
+	async cancel(req: TestRunsRequest.Cancel, res: express.Response) {
+		if (this.instanceSettings.isMultiMain) {
+			throw new NotImplementedError('Cancelling test runs is not yet supported in multi-main mode');
+		}
+
+		const { id: testRunId } = req.params;
+
+		// Check test definition and test run exist
+		await this.getTestDefinition(req);
+		const testRun = await this.getTestRun(req);
+
+		if (this.testRunnerService.canBeCancelled(testRun)) {
+			const message = `The test run "${testRunId}" cannot be cancelled`;
+			throw new ConflictError(message);
+		}
+
+		await this.testRunnerService.cancelTestRun(testRunId);
+
+		res.status(202).json({ success: true });
+	}
+}
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts
index 4046855f30..f091d529e4 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-from-db.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import type { EventDestinations } from '@/databases/entities/event-destinations';
-import { Logger } from '@/logging/logger.service';
 
 import { MessageEventBusDestinationSentry } from './message-event-bus-destination-sentry.ee';
 import { MessageEventBusDestinationSyslog } from './message-event-bus-destination-syslog.ee';
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts
index 5678cbb59c..35aef63cb1 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-sentry.ee.ts
@@ -48,7 +48,7 @@ export class MessageEventBusDestinationSentry
 			environment,
 			release: N8N_VERSION,
 			transport: Sentry.makeNodeTransport,
-			integrations: Sentry.defaultIntegrations,
+			integrations: Sentry.getDefaultIntegrations({}),
 			stackParser: Sentry.defaultStackParser,
 		});
 	}
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts
index 83db469d79..b1f0675dab 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee.ts
@@ -1,13 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { Container } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import type {
 	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationSyslogOptions,
 } from 'n8n-workflow';
 import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import syslog from 'syslog-client';
-import Container from 'typedi';
-
-import { Logger } from '@/logging/logger.service';
 
 import { MessageEventBusDestination } from './message-event-bus-destination.ee';
 import { eventMessageGenericDestinationTestEvent } from '../event-message-classes/event-message-generic';
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts
index a5373d0cc5..34d4eec569 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination-webhook.ee.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 
+import { Container } from '@n8n/di';
 import axios from 'axios';
 import type { AxiosRequestConfig, Method } from 'axios';
 import { Agent as HTTPSAgent } from 'https';
@@ -11,10 +12,9 @@ import type {
 	IWorkflowExecuteAdditionalData,
 	MessageEventBusDestinationWebhookOptions,
 } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { CredentialsHelper } from '@/credentials-helper';
-import * as SecretsHelpers from '@/external-secrets/external-secrets-helper.ee';
+import * as SecretsHelpers from '@/external-secrets.ee/external-secrets-helper.ee';
 
 import { MessageEventBusDestination } from './message-event-bus-destination.ee';
 import { eventMessageGenericDestinationTestEvent } from '../event-message-classes/event-message-generic';
diff --git a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts
index 7b65767b04..6f990a5cfb 100644
--- a/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts
+++ b/packages/cli/src/eventbus/message-event-bus-destination/message-event-bus-destination.ee.ts
@@ -1,11 +1,11 @@
+import { Container } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import type { INodeCredentials, MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
-import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { EventDestinationsRepository } from '@/databases/repositories/event-destinations.repository';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 
 import type { EventMessageTypes } from '../event-message-classes';
 import type { AbstractEventMessage } from '../event-message-classes/abstract-event-message';
diff --git a/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts b/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
index 6c6a928a67..0cc5d5e3a6 100644
--- a/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
+++ b/packages/cli/src/eventbus/message-event-bus-writer/message-event-bus-log-writer.ts
@@ -1,18 +1,17 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { once as eventOnce } from 'events';
 import { createReadStream, existsSync, rmSync } from 'fs';
 import remove from 'lodash/remove';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { EventMessageTypeNames, jsonParse } from 'n8n-workflow';
 import path, { parse } from 'path';
 import readline from 'readline';
-import Container from 'typedi';
 import { Worker } from 'worker_threads';
 
 import { inTest } from '@/constants';
-import { Logger } from '@/logging/logger.service';
 
 import type { EventMessageTypes } from '../event-message-classes';
 import { isEventMessageOptions } from '../event-message-classes/abstract-event-message';
@@ -70,7 +69,7 @@ export class MessageEventBusLogWriter {
 		this.globalConfig = Container.get(GlobalConfig);
 	}
 
-	public get worker(): Worker | undefined {
+	get worker(): Worker | undefined {
 		return this._worker;
 	}
 
diff --git a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts
index 3cf5a5a5d0..22a974f5ee 100644
--- a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts
+++ b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts
@@ -1,19 +1,19 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { DeleteResult } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import EventEmitter from 'events';
 import uniqby from 'lodash/uniqBy';
+import { Logger } from 'n8n-core';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import config from '@/config';
 import { EventDestinationsRepository } from '@/databases/repositories/event-destinations.repository';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
 
 import { ExecutionRecoveryService } from '../../executions/execution-recovery.service';
diff --git a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
index 4727c8ef72..1729509210 100644
--- a/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/log-streaming-event-relay.test.ts
@@ -934,6 +934,7 @@ describe('LogStreamingEventRelay', () => {
 		it('should log on `execution-throttled` event', () => {
 			const event: RelayEventMap['execution-throttled'] = {
 				executionId: 'exec123456',
+				type: 'production',
 			};
 
 			eventService.emit('execution-throttled', event);
@@ -942,6 +943,7 @@ describe('LogStreamingEventRelay', () => {
 				eventName: 'n8n.execution.throttled',
 				payload: {
 					executionId: 'exec123456',
+					type: 'production',
 				},
 			});
 		});
diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
index df65a70ecb..01673cd375 100644
--- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
+++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts
@@ -1,10 +1,13 @@
 import type { GlobalConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
-import type { IWorkflowBase } from 'n8n-workflow';
+import { InstanceSettings } from 'n8n-core';
+import type { INode, INodesGraphResult } from 'n8n-workflow';
+import { NodeApiError, TelemetryHelpers, type IRun, type IWorkflowBase } from 'n8n-workflow';
 
-import config from '@/config';
 import { N8N_VERSION } from '@/constants';
+import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import type { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import type { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -15,6 +18,7 @@ import type { IWorkflowDb } from '@/interfaces';
 import type { License } from '@/license';
 import type { NodeTypes } from '@/node-types';
 import type { Telemetry } from '@/telemetry';
+import { mockInstance } from '@test/mocking';
 
 const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve));
 
@@ -27,6 +31,9 @@ describe('TelemetryEventRelay', () => {
 				mode: 'smtp',
 			},
 		},
+		diagnostics: {
+			enabled: true,
+		},
 		endpoints: {
 			metrics: {
 				enable: true,
@@ -42,10 +49,12 @@ describe('TelemetryEventRelay', () => {
 			outputs: ['console'],
 		},
 	});
+	const instanceSettings = mockInstance(InstanceSettings, { isDocker: false, n8nFolder: '/test' });
 	const workflowRepository = mock<WorkflowRepository>();
 	const nodeTypes = mock<NodeTypes>();
 	const sharedWorkflowRepository = mock<SharedWorkflowRepository>();
 	const projectRelationRepository = mock<ProjectRelationRepository>();
+	const credentialsRepository = mock<CredentialsRepository>();
 	const eventService = new EventService();
 
 	let telemetryEventRelay: TelemetryEventRelay;
@@ -56,35 +65,36 @@ describe('TelemetryEventRelay', () => {
 			telemetry,
 			license,
 			globalConfig,
+			instanceSettings,
 			workflowRepository,
 			nodeTypes,
 			sharedWorkflowRepository,
 			projectRelationRepository,
+			credentialsRepository,
 		);
 
 		await telemetryEventRelay.init();
 	});
 
 	beforeEach(() => {
-		config.set('diagnostics.enabled', true);
-	});
-
-	afterEach(() => {
 		jest.clearAllMocks();
+		globalConfig.diagnostics.enabled = true;
 	});
 
 	describe('init', () => {
 		it('with diagnostics enabled, should init telemetry and register listeners', async () => {
-			config.set('diagnostics.enabled', true);
+			globalConfig.diagnostics.enabled = true;
 			const telemetryEventRelay = new TelemetryEventRelay(
 				eventService,
 				telemetry,
 				license,
 				globalConfig,
+				instanceSettings,
 				workflowRepository,
 				nodeTypes,
 				sharedWorkflowRepository,
 				projectRelationRepository,
+				credentialsRepository,
 			);
 			// @ts-expect-error Private method
 			const setupListenersSpy = jest.spyOn(telemetryEventRelay, 'setupListeners');
@@ -96,16 +106,18 @@ describe('TelemetryEventRelay', () => {
 		});
 
 		it('with diagnostics disabled, should neither init telemetry nor register listeners', async () => {
-			config.set('diagnostics.enabled', false);
+			globalConfig.diagnostics.enabled = false;
 			const telemetryEventRelay = new TelemetryEventRelay(
 				eventService,
 				telemetry,
 				license,
 				globalConfig,
+				instanceSettings,
 				workflowRepository,
 				nodeTypes,
 				sharedWorkflowRepository,
 				projectRelationRepository,
+				credentialsRepository,
 			);
 			// @ts-expect-error Private method
 			const setupListenersSpy = jest.spyOn(telemetryEventRelay, 'setupListeners');
@@ -943,7 +955,36 @@ describe('TelemetryEventRelay', () => {
 
 			await flushPromises();
 
-			// expect(telemetry.identify).toHaveBeenCalled();
+			expect(telemetry.identify).toHaveBeenCalledWith(
+				expect.objectContaining({
+					version_cli: N8N_VERSION,
+					metrics: {
+						metrics_category_cache: false,
+						metrics_category_default: true,
+						metrics_category_logs: false,
+						metrics_category_queue: false,
+						metrics_category_routes: false,
+						metrics_enabled: true,
+					},
+					n8n_binary_data_mode: 'default',
+					n8n_deployment_type: 'default',
+					saml_enabled: false,
+					smtp_set_up: true,
+					system_info: {
+						is_docker: false,
+						cpus: expect.objectContaining({
+							count: expect.any(Number),
+							model: expect.any(String),
+							speed: expect.any(Number),
+						}),
+						memory: expect.any(Number),
+						os: expect.objectContaining({
+							type: expect.any(String),
+							version: expect.any(String),
+						}),
+					},
+				}),
+			);
 			expect(telemetry.track).toHaveBeenCalledWith(
 				'Instance started',
 				expect.objectContaining({
@@ -1061,6 +1102,7 @@ describe('TelemetryEventRelay', () => {
 	describe('Community+ registered', () => {
 		it('should track `license-community-plus-registered` event', () => {
 			const event: RelayEventMap['license-community-plus-registered'] = {
+				userId: 'user123',
 				email: 'user@example.com',
 				licenseKey: 'license123',
 			};
@@ -1068,9 +1110,586 @@ describe('TelemetryEventRelay', () => {
 			eventService.emit('license-community-plus-registered', event);
 
 			expect(telemetry.track).toHaveBeenCalledWith('User registered for license community plus', {
+				user_id: 'user123',
 				email: 'user@example.com',
 				licenseKey: 'license123',
 			});
 		});
 	});
+
+	describe('workflow post execute events', () => {
+		beforeEach(() => {
+			jest.clearAllMocks();
+		});
+
+		const mockWorkflowBase = mock<IWorkflowBase>({
+			id: 'workflow123',
+			name: 'Test Workflow',
+			active: true,
+			nodes: [
+				{
+					id: 'node1',
+					name: 'Start',
+					type: 'n8n-nodes-base.start',
+					parameters: {},
+					typeVersion: 1,
+					position: [100, 200],
+				},
+			],
+			connections: {},
+			createdAt: new Date(),
+			updatedAt: new Date(),
+			staticData: {},
+			settings: {},
+		});
+
+		it('should not track when workflow has no id', async () => {
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: { ...mockWorkflowBase, id: '' },
+				executionId: 'execution123',
+				userId: 'user123',
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			expect(telemetry.trackWorkflowExecution).not.toHaveBeenCalled();
+		});
+
+		it('should not track when execution status is "waiting"', async () => {
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData: {
+					status: 'waiting',
+					data: { resultData: {} },
+				} as IRun,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			expect(telemetry.trackWorkflowExecution).not.toHaveBeenCalled();
+		});
+
+		it('should track successful workflow execution', async () => {
+			const runData = mock<IRun>({
+				finished: true,
+				status: 'success',
+				mode: 'manual',
+				data: { resultData: {} },
+			});
+
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData: runData as unknown as IRun,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(telemetry.trackWorkflowExecution).toHaveBeenCalledWith(
+				expect.objectContaining({
+					workflow_id: 'workflow123',
+					user_id: 'user123',
+					success: true,
+					is_manual: true,
+					execution_mode: 'manual',
+				}),
+			);
+		});
+
+		it('should call telemetry.track when manual node execution finished', async () => {
+			sharedWorkflowRepository.findSharingRole.mockResolvedValue('workflow:editor');
+			credentialsRepository.findOneBy.mockResolvedValue(
+				mock<CredentialsEntity>({ type: 'openAiApi', isManaged: false }),
+			);
+
+			const runData = {
+				status: 'error',
+				mode: 'manual',
+				data: {
+					startData: {
+						destinationNode: 'OpenAI',
+						runNodeFilter: ['OpenAI'],
+					},
+					resultData: {
+						runData: {},
+						lastNodeExecuted: 'OpenAI',
+						error: new NodeApiError(
+							{
+								id: '1',
+								typeVersion: 1,
+								name: 'Jira',
+								type: 'n8n-nodes-base.jira',
+								parameters: {},
+								position: [100, 200],
+							},
+							{
+								message: 'Error message',
+								description: 'Incorrect API key provided',
+								httpCode: '401',
+								stack: '',
+							},
+							{
+								message: 'Error message',
+								description: 'Error description',
+								level: 'warning',
+								functionality: 'regular',
+							},
+						),
+					},
+				},
+			} as IRun;
+
+			const nodeGraph: INodesGraphResult = {
+				nodeGraph: { node_types: [], node_connections: [], webhookNodeNames: [] },
+				nameIndices: {
+					Jira: '1',
+					OpenAI: '1',
+				},
+			} as unknown as INodesGraphResult;
+
+			jest.spyOn(TelemetryHelpers, 'generateNodesGraph').mockImplementation(() => nodeGraph);
+
+			jest
+				.spyOn(TelemetryHelpers, 'getNodeTypeForName')
+				.mockImplementation(
+					() => ({ type: 'n8n-nodes-base.jira', version: 1, name: 'Jira' }) as unknown as INode,
+				);
+
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(telemetry.track).toHaveBeenCalledWith(
+				'Manual node exec finished',
+				expect.objectContaining({
+					webhook_domain: null,
+					user_id: 'user123',
+					workflow_id: 'workflow123',
+					status: 'error',
+					executionStatus: 'error',
+					sharing_role: 'sharee',
+					error_message: 'Error message',
+					error_node_type: 'n8n-nodes-base.jira',
+					error_node_id: '1',
+					node_id: '1',
+					node_type: 'n8n-nodes-base.jira',
+					is_managed: false,
+					credential_type: null,
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+				}),
+			);
+
+			expect(telemetry.trackWorkflowExecution).toHaveBeenCalledWith(
+				expect.objectContaining({
+					workflow_id: 'workflow123',
+					success: false,
+					is_manual: true,
+					execution_mode: 'manual',
+					version_cli: N8N_VERSION,
+					error_message: 'Error message',
+					error_node_type: 'n8n-nodes-base.jira',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+					error_node_id: '1',
+				}),
+			);
+		});
+
+		it('should call telemetry.track when manual node execution finished with canceled error message', async () => {
+			sharedWorkflowRepository.findSharingRole.mockResolvedValue('workflow:owner');
+
+			const runData = {
+				status: 'error',
+				mode: 'manual',
+				data: {
+					startData: {
+						destinationNode: 'OpenAI',
+						runNodeFilter: ['OpenAI'],
+					},
+					resultData: {
+						runData: {},
+						lastNodeExecuted: 'OpenAI',
+						error: new NodeApiError(
+							{
+								id: '1',
+								typeVersion: 1,
+								name: 'Jira',
+								type: 'n8n-nodes-base.jira',
+								parameters: {},
+								position: [100, 200],
+							},
+							{
+								message: 'Error message',
+								description: 'Incorrect API key provided',
+								httpCode: '401',
+								stack: '',
+							},
+							{
+								message: 'Error message canceled',
+								description: 'Error description',
+								level: 'warning',
+								functionality: 'regular',
+							},
+						),
+					},
+				},
+			} as IRun;
+
+			const nodeGraph: INodesGraphResult = {
+				nodeGraph: { node_types: [], node_connections: [] },
+				nameIndices: {
+					Jira: '1',
+					OpenAI: '1',
+				},
+			} as unknown as INodesGraphResult;
+
+			jest.spyOn(TelemetryHelpers, 'generateNodesGraph').mockImplementation(() => nodeGraph);
+
+			jest
+				.spyOn(TelemetryHelpers, 'getNodeTypeForName')
+				.mockImplementation(
+					() => ({ type: 'n8n-nodes-base.jira', version: 1, name: 'Jira' }) as unknown as INode,
+				);
+
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(telemetry.track).toHaveBeenCalledWith(
+				'Manual node exec finished',
+				expect.objectContaining({
+					webhook_domain: null,
+					user_id: 'user123',
+					workflow_id: 'workflow123',
+					status: 'canceled',
+					executionStatus: 'canceled',
+					sharing_role: 'owner',
+					error_message: 'Error message canceled',
+					error_node_type: 'n8n-nodes-base.jira',
+					error_node_id: '1',
+					node_id: '1',
+					node_type: 'n8n-nodes-base.jira',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+				}),
+			);
+
+			expect(telemetry.trackWorkflowExecution).toHaveBeenCalledWith(
+				expect.objectContaining({
+					workflow_id: 'workflow123',
+					success: false,
+					is_manual: true,
+					execution_mode: 'manual',
+					version_cli: N8N_VERSION,
+					error_message: 'Error message canceled',
+					error_node_type: 'n8n-nodes-base.jira',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+					error_node_id: '1',
+				}),
+			);
+		});
+
+		it('should call telemetry.track when manual workflow execution finished', async () => {
+			sharedWorkflowRepository.findSharingRole.mockResolvedValue('workflow:owner');
+
+			const runData = {
+				status: 'error',
+				mode: 'manual',
+				data: {
+					startData: {
+						runNodeFilter: ['OpenAI'],
+					},
+					resultData: {
+						runData: {
+							Jira: [
+								{
+									data: { main: [[{ json: { headers: { origin: 'https://www.test.com' } } }]] },
+								},
+							],
+						},
+						lastNodeExecuted: 'OpenAI',
+						error: new NodeApiError(
+							{
+								id: '1',
+								typeVersion: 1,
+								name: 'Jira',
+								type: 'n8n-nodes-base.jira',
+								parameters: {},
+								position: [100, 200],
+							},
+							{
+								message: 'Error message',
+								description: 'Incorrect API key provided',
+								httpCode: '401',
+								stack: '',
+							},
+							{
+								message: 'Error message',
+								description: 'Error description',
+								level: 'warning',
+								functionality: 'regular',
+							},
+						),
+					},
+				},
+			} as unknown as IRun;
+
+			const nodeGraph: INodesGraphResult = {
+				webhookNodeNames: ['Jira'],
+				nodeGraph: { node_types: [], node_connections: [] },
+				nameIndices: {
+					Jira: '1',
+					OpenAI: '1',
+				},
+			} as unknown as INodesGraphResult;
+
+			jest.spyOn(TelemetryHelpers, 'generateNodesGraph').mockImplementation(() => nodeGraph);
+
+			jest
+				.spyOn(TelemetryHelpers, 'getNodeTypeForName')
+				.mockImplementation(
+					() => ({ type: 'n8n-nodes-base.jira', version: 1, name: 'Jira' }) as unknown as INode,
+				);
+
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(telemetry.track).toHaveBeenCalledWith(
+				'Manual workflow exec finished',
+				expect.objectContaining({
+					webhook_domain: 'test.com',
+					user_id: 'user123',
+					workflow_id: 'workflow123',
+					status: 'error',
+					executionStatus: 'error',
+					sharing_role: 'owner',
+					error_message: 'Error message',
+					error_node_type: 'n8n-nodes-base.jira',
+					error_node_id: '1',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+				}),
+			);
+
+			expect(telemetry.trackWorkflowExecution).toHaveBeenCalledWith(
+				expect.objectContaining({
+					workflow_id: 'workflow123',
+					success: false,
+					is_manual: true,
+					execution_mode: 'manual',
+					version_cli: N8N_VERSION,
+					error_message: 'Error message',
+					error_node_type: 'n8n-nodes-base.jira',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+					error_node_id: '1',
+				}),
+			);
+		});
+
+		it('should call telemetry.track when manual node execution finished with is_managed and credential_type properties', async () => {
+			sharedWorkflowRepository.findSharingRole.mockResolvedValue('workflow:editor');
+			credentialsRepository.findOneBy.mockResolvedValue(
+				mock<CredentialsEntity>({ type: 'openAiApi', isManaged: true }),
+			);
+
+			const runData = {
+				status: 'error',
+				mode: 'manual',
+				data: {
+					executionData: {
+						nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+					},
+					startData: {
+						destinationNode: 'OpenAI',
+						runNodeFilter: ['OpenAI'],
+					},
+					resultData: {
+						runData: {},
+						lastNodeExecuted: 'OpenAI',
+						error: new NodeApiError(
+							{
+								id: '1',
+								typeVersion: 1,
+								name: 'Jira',
+								type: 'n8n-nodes-base.jira',
+								parameters: {},
+								position: [100, 200],
+							},
+							{
+								message: 'Error message',
+								description: 'Incorrect API key provided',
+								httpCode: '401',
+								stack: '',
+							},
+							{
+								message: 'Error message',
+								description: 'Error description',
+								level: 'warning',
+								functionality: 'regular',
+							},
+						),
+					},
+				},
+			} as unknown as IRun;
+
+			const nodeGraph: INodesGraphResult = {
+				nodeGraph: { node_types: [], node_connections: [], webhookNodeNames: [] },
+				nameIndices: {
+					Jira: '1',
+					OpenAI: '1',
+				},
+			} as unknown as INodesGraphResult;
+
+			jest.spyOn(TelemetryHelpers, 'generateNodesGraph').mockImplementation(() => nodeGraph);
+
+			jest
+				.spyOn(TelemetryHelpers, 'getNodeTypeForName')
+				.mockImplementation(
+					() => ({ type: 'n8n-nodes-base.jira', version: 1, name: 'Jira' }) as unknown as INode,
+				);
+
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(credentialsRepository.findOneBy).toHaveBeenCalledWith({
+				id: 'nhu-l8E4hX',
+			});
+
+			expect(telemetry.track).toHaveBeenCalledWith(
+				'Manual node exec finished',
+				expect.objectContaining({
+					webhook_domain: null,
+					user_id: 'user123',
+					workflow_id: 'workflow123',
+					status: 'error',
+					executionStatus: 'error',
+					sharing_role: 'sharee',
+					error_message: 'Error message',
+					error_node_type: 'n8n-nodes-base.jira',
+					error_node_id: '1',
+					node_id: '1',
+					node_type: 'n8n-nodes-base.jira',
+
+					is_managed: true,
+					credential_type: 'openAiApi',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+				}),
+			);
+
+			expect(telemetry.trackWorkflowExecution).toHaveBeenCalledWith(
+				expect.objectContaining({
+					workflow_id: 'workflow123',
+					success: false,
+					is_manual: true,
+					execution_mode: 'manual',
+					version_cli: N8N_VERSION,
+					error_message: 'Error message',
+					error_node_type: 'n8n-nodes-base.jira',
+					node_graph_string: JSON.stringify(nodeGraph.nodeGraph),
+					error_node_id: '1',
+				}),
+			);
+		});
+
+		it('should call telemetry.track when user ran out of free AI credits', async () => {
+			sharedWorkflowRepository.findSharingRole.mockResolvedValue('workflow:editor');
+			credentialsRepository.findOneBy.mockResolvedValue(
+				mock<CredentialsEntity>({ type: 'openAiApi', isManaged: true }),
+			);
+
+			const runData = {
+				status: 'error',
+				mode: 'trigger',
+				data: {
+					startData: {
+						destinationNode: 'OpenAI',
+						runNodeFilter: ['OpenAI'],
+					},
+					executionData: {
+						nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+					},
+					resultData: {
+						runData: {},
+						lastNodeExecuted: 'OpenAI',
+						error: new NodeApiError(
+							{
+								id: '1',
+								typeVersion: 1,
+								name: 'OpenAI',
+								type: 'n8n-nodes-base.openAi',
+								parameters: {},
+								position: [100, 200],
+							},
+							{
+								message: `400 - ${JSON.stringify({
+									error: {
+										message: 'error message',
+										type: 'error_type',
+										code: 200,
+									},
+								})}`,
+								error: {
+									message: 'error message',
+									type: 'error_type',
+									code: 200,
+								},
+							},
+							{
+								httpCode: '400',
+							},
+						),
+					},
+				},
+			} as unknown as IRun;
+
+			jest
+				.spyOn(TelemetryHelpers, 'userInInstanceRanOutOfFreeAiCredits')
+				.mockImplementation(() => true);
+
+			const event: RelayEventMap['workflow-post-execute'] = {
+				workflow: mockWorkflowBase,
+				executionId: 'execution123',
+				userId: 'user123',
+				runData,
+			};
+
+			eventService.emit('workflow-post-execute', event);
+
+			await flushPromises();
+
+			expect(telemetry.track).toHaveBeenCalledWith('User ran out of free AI credits');
+		});
+	});
 });
diff --git a/packages/cli/src/events/event.service.ts b/packages/cli/src/events/event.service.ts
index b8e00ecea7..dbcb5f2955 100644
--- a/packages/cli/src/events/event.service.ts
+++ b/packages/cli/src/events/event.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { TypedEmitter } from '@/typed-emitter';
 
diff --git a/packages/cli/src/events/maps/pub-sub.event-map.ts b/packages/cli/src/events/maps/pub-sub.event-map.ts
index ff27741b9b..0d71fcff91 100644
--- a/packages/cli/src/events/maps/pub-sub.event-map.ts
+++ b/packages/cli/src/events/maps/pub-sub.event-map.ts
@@ -1,4 +1,4 @@
-import type { PushType, WorkerStatus } from '@n8n/api-types';
+import type { PushMessage, WorkerStatus } from '@n8n/api-types';
 
 import type { IWorkflowDb } from '@/interfaces';
 
@@ -64,9 +64,7 @@ export type PubSubCommandMap = {
 		errorMessage: string;
 	};
 
-	'relay-execution-lifecycle-event': {
-		type: PushType;
-		args: Record<string, unknown>;
+	'relay-execution-lifecycle-event': PushMessage & {
 		pushRef: string;
 	};
 
diff --git a/packages/cli/src/events/maps/relay.event-map.ts b/packages/cli/src/events/maps/relay.event-map.ts
index 21b673a2b5..b174c66587 100644
--- a/packages/cli/src/events/maps/relay.event-map.ts
+++ b/packages/cli/src/events/maps/relay.event-map.ts
@@ -1,4 +1,4 @@
-import type { AuthenticationMethod } from '@n8n/api-types';
+import type { AuthenticationMethod, ProjectRelation } from '@n8n/api-types';
 import type {
 	IPersonalizationSurveyAnswersV4,
 	IRun,
@@ -6,9 +6,9 @@ import type {
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
 
+import type { ConcurrencyQueueType } from '@/concurrency/concurrency-control.service';
 import type { AuthProviderType } from '@/databases/entities/auth-identity';
-import type { ProjectRole } from '@/databases/entities/project-relation';
-import type { GlobalRole } from '@/databases/entities/user';
+import type { GlobalRole, User } from '@/databases/entities/user';
 import type { IWorkflowDb } from '@/interfaces';
 
 import type { AiEventMap } from './ai.event-map';
@@ -338,6 +338,7 @@ export type RelayEventMap = {
 
 	'execution-throttled': {
 		executionId: string;
+		type: ConcurrencyQueueType;
 	};
 
 	'execution-started-during-bootup': {
@@ -351,10 +352,7 @@ export type RelayEventMap = {
 	'team-project-updated': {
 		userId: string;
 		role: GlobalRole;
-		members: Array<{
-			userId: string;
-			role: ProjectRole;
-		}>;
+		members: ProjectRelation[];
 		projectId: string;
 	};
 
@@ -421,6 +419,7 @@ export type RelayEventMap = {
 	};
 
 	'license-community-plus-registered': {
+		userId: User['id'];
 		email: string;
 		licenseKey: string;
 	};
diff --git a/packages/cli/src/events/relays/event-relay.ts b/packages/cli/src/events/relays/event-relay.ts
index 13e7dc01be..742bfcba27 100644
--- a/packages/cli/src/events/relays/event-relay.ts
+++ b/packages/cli/src/events/relays/event-relay.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { EventService } from '@/events/event.service';
 import type { RelayEventMap } from '@/events/maps/relay.event-map';
diff --git a/packages/cli/src/events/relays/log-streaming.event-relay.ts b/packages/cli/src/events/relays/log-streaming.event-relay.ts
index c65af2874c..76b578451d 100644
--- a/packages/cli/src/events/relays/log-streaming.event-relay.ts
+++ b/packages/cli/src/events/relays/log-streaming.event-relay.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import type { IWorkflowBase } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { Redactable } from '@/decorators/redactable';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
@@ -385,10 +385,10 @@ export class LogStreamingEventRelay extends EventRelay {
 
 	// #region Execution
 
-	private executionThrottled({ executionId }: RelayEventMap['execution-throttled']) {
+	private executionThrottled({ executionId, type }: RelayEventMap['execution-throttled']) {
 		void this.eventBus.sendExecutionEvent({
 			eventName: 'n8n.execution.throttled',
-			payload: { executionId },
+			payload: { executionId, type },
 		});
 	}
 
diff --git a/packages/cli/src/events/relays/telemetry.event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts
index 7b0cacffaf..67fbacb107 100644
--- a/packages/cli/src/events/relays/telemetry.event-relay.ts
+++ b/packages/cli/src/events/relays/telemetry.event-relay.ts
@@ -1,13 +1,15 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import { snakeCase } from 'change-case';
+import { InstanceSettings } from 'n8n-core';
 import type { ExecutionStatus, INodesGraphResult, ITelemetryTrackProperties } from 'n8n-workflow';
 import { TelemetryHelpers } from 'n8n-workflow';
 import os from 'node:os';
 import { get as pslGet } from 'psl';
-import { Service } from 'typedi';
 
 import config from '@/config';
 import { N8N_VERSION } from '@/constants';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -28,16 +30,18 @@ export class TelemetryEventRelay extends EventRelay {
 		private readonly telemetry: Telemetry,
 		private readonly license: License,
 		private readonly globalConfig: GlobalConfig,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly nodeTypes: NodeTypes,
 		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
 		private readonly projectRelationRepository: ProjectRelationRepository,
+		private readonly credentialsRepository: CredentialsRepository,
 	) {
 		super(eventService);
 	}
 
 	async init() {
-		if (!config.getEnv('diagnostics.enabled')) return;
+		if (!this.globalConfig.diagnostics.enabled) return;
 
 		await this.telemetry.init();
 
@@ -236,10 +240,12 @@ export class TelemetryEventRelay extends EventRelay {
 	}
 
 	private licenseCommunityPlusRegistered({
+		userId,
 		email,
 		licenseKey,
 	}: RelayEventMap['license-community-plus-registered']) {
 		this.telemetry.track('User registered for license community plus', {
+			user_id: userId,
 			email,
 			licenseKey,
 		});
@@ -628,6 +634,10 @@ export class TelemetryEventRelay extends EventRelay {
 			let nodeGraphResult: INodesGraphResult | null = null;
 
 			if (!telemetryProperties.success && runData?.data.resultData.error) {
+				if (TelemetryHelpers.userInInstanceRanOutOfFreeAiCredits(runData)) {
+					this.telemetry.track('User ran out of free AI credits');
+				}
+
 				telemetryProperties.error_message = runData?.data.resultData.error.message;
 				let errorNodeName =
 					'node' in runData?.data.resultData.error
@@ -689,6 +699,8 @@ export class TelemetryEventRelay extends EventRelay {
 					error_node_id: telemetryProperties.error_node_id as string,
 					webhook_domain: null,
 					sharing_role: userRole,
+					credential_type: null,
+					is_managed: false,
 				};
 
 				if (!manualExecEventProperties.node_graph_string) {
@@ -699,7 +711,18 @@ export class TelemetryEventRelay extends EventRelay {
 				}
 
 				if (runData.data.startData?.destinationNode) {
-					const telemetryPayload = {
+					const credentialsData = TelemetryHelpers.extractLastExecutedNodeCredentialData(runData);
+					if (credentialsData) {
+						manualExecEventProperties.credential_type = credentialsData.credentialType;
+						const credential = await this.credentialsRepository.findOneBy({
+							id: credentialsData.credentialId,
+						});
+						if (credential) {
+							manualExecEventProperties.is_managed = credential.isManaged;
+						}
+					}
+
+					const telemetryPayload: ITelemetryTrackProperties = {
 						...manualExecEventProperties,
 						node_type: TelemetryHelpers.getNodeTypeForName(
 							workflow,
@@ -758,6 +781,7 @@ export class TelemetryEventRelay extends EventRelay {
 					model: cpus[0].model,
 					speed: cpus[0].speed,
 				},
+				is_docker: this.instanceSettings.isDocker,
 			},
 			execution_variables: {
 				executions_mode: config.getEnv('executions.mode'),
@@ -769,8 +793,8 @@ export class TelemetryEventRelay extends EventRelay {
 				executions_data_save_manual_executions: config.getEnv(
 					'executions.saveDataManualExecutions',
 				),
-				executions_data_prune: config.getEnv('executions.pruneData'),
-				executions_data_max_age: config.getEnv('executions.pruneDataMaxAge'),
+				executions_data_prune: this.globalConfig.executions.pruneData,
+				executions_data_max_age: this.globalConfig.executions.pruneDataMaxAge,
 			},
 			n8n_deployment_type: config.getEnv('deployment.type'),
 			n8n_binary_data_mode: binaryDataConfig.mode,
diff --git a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
index c8e6b3e88f..ac52cf3920 100644
--- a/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/__tests__/save-execution-progress.test.ts
@@ -1,19 +1,15 @@
-import {
-	ErrorReporterProxy,
-	type IRunExecutionData,
-	type ITaskData,
-	type IWorkflowBase,
-} from 'n8n-workflow';
+import { ErrorReporter } from 'n8n-core';
+import { Logger } from 'n8n-core';
+import type { IRunExecutionData, ITaskData, IWorkflowBase } from 'n8n-workflow';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { saveExecutionProgress } from '@/execution-lifecycle-hooks/save-execution-progress';
 import * as fnModule from '@/execution-lifecycle-hooks/to-save-settings';
 import type { IExecutionResponse } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { mockInstance } from '@test/mocking';
 
 mockInstance(Logger);
-
+const errorReporter = mockInstance(ErrorReporter);
 const executionRepository = mockInstance(ExecutionRepository);
 
 afterEach(() => {
@@ -57,14 +53,12 @@ test('should ignore on leftover async call', async () => {
 	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
 });
 
-test('should update execution', async () => {
+test('should update execution when saving progress is enabled', async () => {
 	jest.spyOn(fnModule, 'toSaveSettings').mockReturnValue({
 		...commonSettings,
 		progress: true,
 	});
 
-	const reporterSpy = jest.spyOn(ErrorReporterProxy, 'error');
-
 	executionRepository.findSingleExecution.mockResolvedValue({} as IExecutionResponse);
 
 	await saveExecutionProgress(...commonArgs);
@@ -83,7 +77,7 @@ test('should update execution', async () => {
 		status: 'running',
 	});
 
-	expect(reporterSpy).not.toHaveBeenCalled();
+	expect(errorReporter.error).not.toHaveBeenCalled();
 });
 
 test('should report error on failure', async () => {
@@ -92,8 +86,6 @@ test('should report error on failure', async () => {
 		progress: true,
 	});
 
-	const reporterSpy = jest.spyOn(ErrorReporterProxy, 'error');
-
 	const error = new Error('Something went wrong');
 
 	executionRepository.findSingleExecution.mockImplementation(() => {
@@ -103,5 +95,5 @@ test('should report error on failure', async () => {
 	await saveExecutionProgress(...commonArgs);
 
 	expect(executionRepository.updateExistingExecution).not.toHaveBeenCalled();
-	expect(reporterSpy).toHaveBeenCalledWith(error);
+	expect(errorReporter.error).toHaveBeenCalledWith(error);
 });
diff --git a/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts b/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts
index d9a1a9a0e9..47c1031859 100644
--- a/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/restore-binary-data-id.ts
@@ -1,10 +1,9 @@
-import { BinaryDataService } from 'n8n-core';
+import { Container } from '@n8n/di';
 import type { BinaryData } from 'n8n-core';
+import { BinaryDataService, Logger } from 'n8n-core';
 import type { IRun, WorkflowExecuteMode } from 'n8n-workflow';
-import Container from 'typedi';
 
 import config from '@/config';
-import { Logger } from '@/logging/logger.service';
 
 /**
  * Whenever the execution ID is not available to the binary data service at the
diff --git a/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts b/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
index ca9899e1ec..9e751c90f6 100644
--- a/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/save-execution-progress.ts
@@ -1,10 +1,9 @@
+import { Container } from '@n8n/di';
+import { ErrorReporter, Logger } from 'n8n-core';
 import type { IRunExecutionData, ITaskData, IWorkflowBase } from 'n8n-workflow';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { toSaveSettings } from '@/execution-lifecycle-hooks/to-save-settings';
-import { Logger } from '@/logging/logger.service';
 
 export async function saveExecutionProgress(
 	workflowData: IWorkflowBase,
@@ -85,7 +84,7 @@ export async function saveExecutionProgress(
 	} catch (e) {
 		const error = e instanceof Error ? e : new Error(`${e}`);
 
-		ErrorReporter.error(error);
+		Container.get(ErrorReporter).error(error);
 		// TODO: Improve in the future!
 		// Errors here might happen because of database access
 		// For busy machines, we may get "Database is locked" errors.
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/execution-lifecycle-hooks/shared/shared-hook-functions.ts b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts
index 68fd528f14..657c430e17 100644
--- a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts
@@ -1,10 +1,10 @@
+import { Container } from '@n8n/di';
 import pick from 'lodash/pick';
+import { Logger } from 'n8n-core';
 import { ensureError, type ExecutionStatus, type IRun, type IWorkflowBase } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type { IExecutionDb, UpdateExecutionPayload } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { ExecutionMetadataService } from '@/services/execution-metadata.service';
 import { isWorkflowIdValid } from '@/utils';
 
diff --git a/packages/cli/src/execution-lifecycle-hooks/to-save-settings.ts b/packages/cli/src/execution-lifecycle-hooks/to-save-settings.ts
index 7a25adaeba..a7af8f3ddc 100644
--- a/packages/cli/src/execution-lifecycle-hooks/to-save-settings.ts
+++ b/packages/cli/src/execution-lifecycle-hooks/to-save-settings.ts
@@ -18,20 +18,20 @@ export function toSaveSettings(workflowSettings: IWorkflowSettings = {}) {
 		PROGRESS: config.getEnv('executions.saveExecutionProgress'),
 	};
 
+	const {
+		saveDataErrorExecution = DEFAULTS.ERROR,
+		saveDataSuccessExecution = DEFAULTS.SUCCESS,
+		saveManualExecutions = DEFAULTS.MANUAL,
+		saveExecutionProgress = DEFAULTS.PROGRESS,
+	} = workflowSettings;
+
 	return {
-		error: workflowSettings.saveDataErrorExecution
-			? workflowSettings.saveDataErrorExecution !== 'none'
-			: DEFAULTS.ERROR !== 'none',
-		success: workflowSettings.saveDataSuccessExecution
-			? workflowSettings.saveDataSuccessExecution !== 'none'
-			: DEFAULTS.SUCCESS !== 'none',
-		manual:
-			workflowSettings === undefined || workflowSettings.saveManualExecutions === 'DEFAULT'
-				? DEFAULTS.MANUAL
-				: (workflowSettings.saveManualExecutions ?? DEFAULTS.MANUAL),
-		progress:
-			workflowSettings === undefined || workflowSettings.saveExecutionProgress === 'DEFAULT'
-				? DEFAULTS.PROGRESS
-				: (workflowSettings.saveExecutionProgress ?? DEFAULTS.PROGRESS),
+		error: saveDataErrorExecution === 'DEFAULT' ? DEFAULTS.ERROR : saveDataErrorExecution === 'all',
+		success:
+			saveDataSuccessExecution === 'DEFAULT'
+				? DEFAULTS.SUCCESS
+				: saveDataSuccessExecution === 'all',
+		manual: saveManualExecutions === 'DEFAULT' ? DEFAULTS.MANUAL : saveManualExecutions,
+		progress: saveExecutionProgress === 'DEFAULT' ? DEFAULTS.PROGRESS : saveExecutionProgress,
 	};
 }
diff --git a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
index 115a1a52f6..9cb681a7ef 100644
--- a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import { stringify } from 'flatted';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 import { randomInt } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { ARTIFICIAL_TASK_DATA } from '@/constants';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -22,7 +22,7 @@ import { setupMessages } from './utils';
 
 describe('ExecutionRecoveryService', () => {
 	const push = mockInstance(Push);
-	const instanceSettings = new InstanceSettings(mock());
+	const instanceSettings = Container.get(InstanceSettings);
 
 	let executionRecoveryService: ExecutionRecoveryService;
 	let executionRepository: ExecutionRepository;
diff --git a/packages/cli/src/executions/__tests__/execution.service.test.ts b/packages/cli/src/executions/__tests__/execution.service.test.ts
index b91836578c..e425c1e588 100644
--- a/packages/cli/src/executions/__tests__/execution.service.test.ts
+++ b/packages/cli/src/executions/__tests__/execution.service.test.ts
@@ -183,7 +183,7 @@ describe('ExecutionService', () => {
 
 		describe('scaling mode', () => {
 			describe('manual execution', () => {
-				it('should delegate to regular mode in scaling mode', async () => {
+				it('should stop a `running` execution in scaling mode', async () => {
 					/**
 					 * Arrange
 					 */
@@ -197,6 +197,8 @@ describe('ExecutionService', () => {
 					concurrencyControl.has.mockReturnValue(false);
 					activeExecutions.has.mockReturnValue(true);
 					waitTracker.has.mockReturnValue(false);
+					const job = mock<Job>({ data: { executionId: '123' } });
+					scalingService.findJobsByStatus.mockResolvedValue([job]);
 					executionRepository.stopDuringRun.mockResolvedValue(mock<IExecutionResponse>());
 					// @ts-expect-error Private method
 					const stopInRegularModeSpy = jest.spyOn(executionService, 'stopInRegularMode');
@@ -209,7 +211,7 @@ describe('ExecutionService', () => {
 					/**
 					 * Assert
 					 */
-					expect(stopInRegularModeSpy).toHaveBeenCalledWith(execution);
+					expect(stopInRegularModeSpy).not.toHaveBeenCalled();
 					expect(activeExecutions.stopExecution).toHaveBeenCalledWith(execution.id);
 					expect(executionRepository.stopDuringRun).toHaveBeenCalledWith(execution);
 
@@ -242,8 +244,8 @@ describe('ExecutionService', () => {
 					 */
 					expect(waitTracker.stopExecution).not.toHaveBeenCalled();
 					expect(activeExecutions.stopExecution).toHaveBeenCalled();
-					expect(scalingService.findJobsByStatus).toHaveBeenCalled();
-					expect(scalingService.stopJob).toHaveBeenCalled();
+					expect(scalingService.findJobsByStatus).not.toHaveBeenCalled();
+					expect(scalingService.stopJob).not.toHaveBeenCalled();
 					expect(executionRepository.stopDuringRun).toHaveBeenCalled();
 				});
 
@@ -268,8 +270,8 @@ describe('ExecutionService', () => {
 					 * Assert
 					 */
 					expect(waitTracker.stopExecution).toHaveBeenCalledWith(execution.id);
-					expect(scalingService.findJobsByStatus).toHaveBeenCalled();
-					expect(scalingService.stopJob).toHaveBeenCalled();
+					expect(scalingService.findJobsByStatus).not.toHaveBeenCalled();
+					expect(scalingService.stopJob).not.toHaveBeenCalled();
 					expect(executionRepository.stopDuringRun).toHaveBeenCalled();
 				});
 			});
diff --git a/packages/cli/src/executions/__tests__/parse-range-query.middleware.test.ts b/packages/cli/src/executions/__tests__/parse-range-query.middleware.test.ts
index 8b3395b226..3c8fa93053 100644
--- a/packages/cli/src/executions/__tests__/parse-range-query.middleware.test.ts
+++ b/packages/cli/src/executions/__tests__/parse-range-query.middleware.test.ts
@@ -108,6 +108,22 @@ describe('`parseRangeQuery` middleware', () => {
 			expect(nextFn).toBeCalledTimes(1);
 		});
 
+		test('should parse `projectId` field', () => {
+			const req = mock<ExecutionRequest.GetMany>({
+				query: {
+					filter: '{ "projectId": "123" }',
+					limit: undefined,
+					firstId: undefined,
+					lastId: undefined,
+				},
+			});
+
+			parseRangeQuery(req, res, nextFn);
+
+			expect(req.rangeQuery.projectId).toBe('123');
+			expect(nextFn).toBeCalledTimes(1);
+		});
+
 		test('should delete invalid fields', () => {
 			const req = mock<ExecutionRequest.GetMany>({
 				query: {
diff --git a/packages/cli/src/executions/execution-recovery.service.ts b/packages/cli/src/executions/execution-recovery.service.ts
index 33576d1368..503e53d023 100644
--- a/packages/cli/src/executions/execution-recovery.service.ts
+++ b/packages/cli/src/executions/execution-recovery.service.ts
@@ -1,8 +1,8 @@
+import { Service } from '@n8n/di';
 import type { DateTime } from 'luxon';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { sleep } from 'n8n-workflow';
 import type { IRun, ITaskData } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { ARTIFICIAL_TASK_DATA } from '@/constants';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -10,7 +10,6 @@ import { NodeCrashedError } from '@/errors/node-crashed.error';
 import { WorkflowCrashedError } from '@/errors/workflow-crashed.error';
 import { EventService } from '@/events/event.service';
 import type { IExecutionResponse } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { Push } from '@/push';
 import { getWorkflowHooksMain } from '@/workflow-execute-additional-data'; // @TODO: Dependency cycle
 
@@ -49,7 +48,7 @@ export class ExecutionRecoveryService {
 
 		this.push.once('editorUiConnected', async () => {
 			await sleep(1000);
-			this.push.broadcast('executionRecovered', { executionId });
+			this.push.broadcast({ type: 'executionRecovered', data: { executionId } });
 		});
 
 		return amendedExecution;
diff --git a/packages/cli/src/executions/execution.service.ee.ts b/packages/cli/src/executions/execution.service.ee.ts
index cb4ae332ed..b345ef6c99 100644
--- a/packages/cli/src/executions/execution.service.ee.ts
+++ b/packages/cli/src/executions/execution.service.ee.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { IExecutionResponse, IExecutionFlattedResponse } from '@/interfaces';
diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts
index 5f4ec0c535..7daff214bb 100644
--- a/packages/cli/src/executions/execution.service.ts
+++ b/packages/cli/src/executions/execution.service.ts
@@ -1,5 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import { validate as jsonSchemaValidate } from 'jsonschema';
+import { Logger } from 'n8n-core';
 import type {
 	ExecutionError,
 	ExecutionStatus,
@@ -15,7 +17,6 @@ import {
 	Workflow,
 	WorkflowOperationError,
 } from 'n8n-workflow';
-import { Container, Service } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
@@ -38,7 +39,6 @@ import type {
 	IWorkflowDb,
 } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import { WaitTracker } from '@/wait-tracker';
 import { WorkflowRunner } from '@/workflow-runner';
@@ -66,6 +66,7 @@ export const schemaGetExecutionsQueryFilter = {
 		startedBefore: { type: 'date-time' },
 		annotationTags: { type: 'array', items: { type: 'string' } },
 		vote: { type: 'string' },
+		projectId: { type: 'string' },
 	},
 	$defs: {
 		metadata: {
@@ -250,7 +251,7 @@ export class ExecutionService {
 					requestFilters = requestFiltersRaw as IGetExecutionsQueryFilter;
 				}
 			} catch (error) {
-				throw new InternalServerError('Parameter "filter" contained invalid JSON string.');
+				throw new InternalServerError('Parameter "filter" contained invalid JSON string.', error);
 			}
 		}
 
@@ -463,11 +464,6 @@ export class ExecutionService {
 	}
 
 	private async stopInScalingMode(execution: IExecutionResponse) {
-		if (execution.mode === 'manual') {
-			// manual executions in scaling mode are processed by main
-			return await this.stopInRegularMode(execution);
-		}
-
 		if (this.activeExecutions.has(execution.id)) {
 			this.activeExecutions.stopExecution(execution.id);
 		}
@@ -476,18 +472,6 @@ export class ExecutionService {
 			this.waitTracker.stopExecution(execution.id);
 		}
 
-		const { ScalingService } = await import('@/scaling/scaling.service');
-		const scalingService = Container.get(ScalingService);
-		const jobs = await scalingService.findJobsByStatus(['active', 'waiting']);
-
-		const job = jobs.find(({ data }) => data.executionId === execution.id);
-
-		if (job) {
-			await scalingService.stopJob(job);
-		} else {
-			this.logger.debug('Job to stop not in queue', { executionId: execution.id });
-		}
-
 		return await this.executionRepository.stopDuringRun(execution);
 	}
 
@@ -503,7 +487,7 @@ export class ExecutionService {
 		}
 	}
 
-	public async annotate(
+	async annotate(
 		executionId: string,
 		updateData: ExecutionRequest.ExecutionUpdatePayload,
 		sharedWorkflowIds: string[],
diff --git a/packages/cli/src/expression-evaluator.ts b/packages/cli/src/expression-evaluator.ts
index 9a91b4864f..d77838dbc1 100644
--- a/packages/cli/src/expression-evaluator.ts
+++ b/packages/cli/src/expression-evaluator.ts
@@ -1,4 +1,6 @@
-import { ErrorReporterProxy, ExpressionEvaluatorProxy } from 'n8n-workflow';
+import { Container } from '@n8n/di';
+import { ErrorReporter } from 'n8n-core';
+import { ExpressionEvaluatorProxy } from 'n8n-workflow';
 
 import config from '@/config';
 
@@ -6,7 +8,7 @@ export const initExpressionEvaluator = () => {
 	ExpressionEvaluatorProxy.setEvaluator(config.getEnv('expression.evaluator'));
 	ExpressionEvaluatorProxy.setDifferEnabled(config.getEnv('expression.reportDifference'));
 	ExpressionEvaluatorProxy.setDiffReporter((expr) => {
-		ErrorReporterProxy.warn('Expression difference', {
+		Container.get(ErrorReporter).warn('Expression difference', {
 			extra: {
 				expression: expr,
 			},
diff --git a/packages/cli/src/external-hooks.ts b/packages/cli/src/external-hooks.ts
index 764625fa23..8a0ba82c98 100644
--- a/packages/cli/src/external-hooks.ts
+++ b/packages/cli/src/external-hooks.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
+import { Service } from '@n8n/di';
 import { ApplicationError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import config from '@/config';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
diff --git a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts b/packages/cli/src/external-secrets.ee/__tests__/external-secrets-manager.ee.test.ts
similarity index 94%
rename from packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts
rename to packages/cli/src/external-secrets.ee/__tests__/external-secrets-manager.ee.test.ts
index 05eabd104f..f3ff03af85 100644
--- a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts
+++ b/packages/cli/src/external-secrets.ee/__tests__/external-secrets-manager.ee.test.ts
@@ -1,10 +1,10 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
-import { Container } from 'typedi';
 
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
-import { ExternalSecretsProviders } from '@/external-secrets/external-secrets-providers.ee';
+import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee';
+import { ExternalSecretsProviders } from '@/external-secrets.ee/external-secrets-providers.ee';
 import type { ExternalSecretsSettings } from '@/interfaces';
 import { License } from '@/license';
 import {
diff --git a/packages/cli/src/external-secrets/constants.ts b/packages/cli/src/external-secrets.ee/constants.ts
similarity index 100%
rename from packages/cli/src/external-secrets/constants.ts
rename to packages/cli/src/external-secrets.ee/constants.ts
diff --git a/packages/cli/src/external-secrets/external-secrets-helper.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets-helper.ee.ts
similarity index 91%
rename from packages/cli/src/external-secrets/external-secrets-helper.ee.ts
rename to packages/cli/src/external-secrets.ee/external-secrets-helper.ee.ts
index 946badde42..d2a8ba34bb 100644
--- a/packages/cli/src/external-secrets/external-secrets-helper.ee.ts
+++ b/packages/cli/src/external-secrets.ee/external-secrets-helper.ee.ts
@@ -1,5 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { License } from '@/license';
 
diff --git a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts
similarity index 98%
rename from packages/cli/src/external-secrets/external-secrets-manager.ee.ts
rename to packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts
index 2de681a7d6..83579c3e8e 100644
--- a/packages/cli/src/external-secrets/external-secrets-manager.ee.ts
+++ b/packages/cli/src/external-secrets.ee/external-secrets-manager.ee.ts
@@ -1,6 +1,6 @@
-import { Cipher } from 'n8n-core';
+import { Service } from '@n8n/di';
+import { Cipher, Logger } from 'n8n-core';
 import { jsonParse, type IDataObject, ApplicationError, ensureError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { EventService } from '@/events/event.service';
@@ -10,7 +10,6 @@ import type {
 	SecretsProviderSettings,
 } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
 
 import { EXTERNAL_SECRETS_INITIAL_BACKOFF, EXTERNAL_SECRETS_MAX_BACKOFF } from './constants';
diff --git a/packages/cli/src/external-secrets/external-secrets-providers.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets-providers.ee.ts
similarity index 96%
rename from packages/cli/src/external-secrets/external-secrets-providers.ee.ts
rename to packages/cli/src/external-secrets.ee/external-secrets-providers.ee.ts
index 642c107603..8be0f4af06 100644
--- a/packages/cli/src/external-secrets/external-secrets-providers.ee.ts
+++ b/packages/cli/src/external-secrets.ee/external-secrets-providers.ee.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { SecretsProvider } from '@/interfaces';
 
diff --git a/packages/cli/src/external-secrets/external-secrets.controller.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets.controller.ee.ts
similarity index 100%
rename from packages/cli/src/external-secrets/external-secrets.controller.ee.ts
rename to packages/cli/src/external-secrets.ee/external-secrets.controller.ee.ts
diff --git a/packages/cli/src/external-secrets/external-secrets.service.ee.ts b/packages/cli/src/external-secrets.ee/external-secrets.service.ee.ts
similarity index 99%
rename from packages/cli/src/external-secrets/external-secrets.service.ee.ts
rename to packages/cli/src/external-secrets.ee/external-secrets.service.ee.ts
index aab3b2069a..f9f0613348 100644
--- a/packages/cli/src/external-secrets/external-secrets.service.ee.ts
+++ b/packages/cli/src/external-secrets.ee/external-secrets.service.ee.ts
@@ -1,6 +1,6 @@
+import { Container, Service } from '@n8n/di';
 import type { IDataObject } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
-import Container, { Service } from 'typedi';
 
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { ExternalSecretsProviderNotFoundError } from '@/errors/external-secrets-provider-not-found.error';
diff --git a/packages/cli/src/external-secrets/providers/__tests__/azure-key-vault.test.ts b/packages/cli/src/external-secrets.ee/providers/__tests__/azure-key-vault.test.ts
similarity index 100%
rename from packages/cli/src/external-secrets/providers/__tests__/azure-key-vault.test.ts
rename to packages/cli/src/external-secrets.ee/providers/__tests__/azure-key-vault.test.ts
diff --git a/packages/cli/src/external-secrets/providers/__tests__/gcp-secrets-manager.test.ts b/packages/cli/src/external-secrets.ee/providers/__tests__/gcp-secrets-manager.test.ts
similarity index 100%
rename from packages/cli/src/external-secrets/providers/__tests__/gcp-secrets-manager.test.ts
rename to packages/cli/src/external-secrets.ee/providers/__tests__/gcp-secrets-manager.test.ts
diff --git a/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-client.ts b/packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-client.ts
similarity index 100%
rename from packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-client.ts
rename to packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-client.ts
diff --git a/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts b/packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-manager.ts
similarity index 96%
rename from packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts
rename to packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-manager.ts
index 6c2c0669fb..3e43041735 100644
--- a/packages/cli/src/external-secrets/providers/aws-secrets/aws-secrets-manager.ts
+++ b/packages/cli/src/external-secrets.ee/providers/aws-secrets/aws-secrets-manager.ts
@@ -1,10 +1,10 @@
+import { Container } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import type { INodeProperties } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { UnknownAuthTypeError } from '@/errors/unknown-auth-type.error';
-import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants';
+import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets.ee/constants';
 import type { SecretsProvider, SecretsProviderState } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 
 import { AwsSecretsClient } from './aws-secrets-client';
 import type { AwsSecretsManagerContext } from './types';
diff --git a/packages/cli/src/external-secrets/providers/aws-secrets/types.ts b/packages/cli/src/external-secrets.ee/providers/aws-secrets/types.ts
similarity index 100%
rename from packages/cli/src/external-secrets/providers/aws-secrets/types.ts
rename to packages/cli/src/external-secrets.ee/providers/aws-secrets/types.ts
diff --git a/packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts b/packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts
similarity index 97%
rename from packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts
rename to packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts
index 7961f21bad..ce83b09146 100644
--- a/packages/cli/src/external-secrets/providers/azure-key-vault/azure-key-vault.ts
+++ b/packages/cli/src/external-secrets.ee/providers/azure-key-vault/azure-key-vault.ts
@@ -1,11 +1,11 @@
 import type { SecretClient } from '@azure/keyvault-secrets';
+import { Container } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import { ensureError } from 'n8n-workflow';
 import type { INodeProperties } from 'n8n-workflow';
-import Container from 'typedi';
 
-import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants';
+import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets.ee/constants';
 import type { SecretsProvider, SecretsProviderState } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 
 import type { AzureKeyVaultContext } from './types';
 
diff --git a/packages/cli/src/external-secrets/providers/azure-key-vault/types.ts b/packages/cli/src/external-secrets.ee/providers/azure-key-vault/types.ts
similarity index 100%
rename from packages/cli/src/external-secrets/providers/azure-key-vault/types.ts
rename to packages/cli/src/external-secrets.ee/providers/azure-key-vault/types.ts
diff --git a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts b/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts
similarity index 97%
rename from packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts
rename to packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts
index c4bf71cb72..72f9380ff4 100644
--- a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/gcp-secrets-manager.ts
+++ b/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/gcp-secrets-manager.ts
@@ -1,10 +1,10 @@
 import type { SecretManagerServiceClient as GcpClient } from '@google-cloud/secret-manager';
+import { Container } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import { ensureError, jsonParse, type INodeProperties } from 'n8n-workflow';
-import Container from 'typedi';
 
-import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets/constants';
+import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '@/external-secrets.ee/constants';
 import type { SecretsProvider, SecretsProviderState } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 
 import type {
 	GcpSecretsManagerContext,
diff --git a/packages/cli/src/external-secrets/providers/gcp-secrets-manager/types.ts b/packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/types.ts
similarity index 100%
rename from packages/cli/src/external-secrets/providers/gcp-secrets-manager/types.ts
rename to packages/cli/src/external-secrets.ee/providers/gcp-secrets-manager/types.ts
diff --git a/packages/cli/src/external-secrets/providers/infisical.ts b/packages/cli/src/external-secrets.ee/providers/infisical.ts
similarity index 100%
rename from packages/cli/src/external-secrets/providers/infisical.ts
rename to packages/cli/src/external-secrets.ee/providers/infisical.ts
diff --git a/packages/cli/src/external-secrets/providers/vault.ts b/packages/cli/src/external-secrets.ee/providers/vault.ts
similarity index 99%
rename from packages/cli/src/external-secrets/providers/vault.ts
rename to packages/cli/src/external-secrets.ee/providers/vault.ts
index 0f1e93a5da..e27df4cc6d 100644
--- a/packages/cli/src/external-secrets/providers/vault.ts
+++ b/packages/cli/src/external-secrets.ee/providers/vault.ts
@@ -1,11 +1,11 @@
+import { Container } from '@n8n/di';
 import type { AxiosInstance, AxiosResponse } from 'axios';
 import axios from 'axios';
+import { Logger } from 'n8n-core';
 import type { IDataObject, INodeProperties } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import type { SecretsProviderSettings, SecretsProviderState } from '@/interfaces';
 import { SecretsProvider } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 
 import { DOCS_HELP_NOTICE, EXTERNAL_SECRETS_NAME_REGEX } from '../constants';
 import { preferGet } from '../external-secrets-helper.ee';
diff --git a/packages/cli/src/generic-helpers.ts b/packages/cli/src/generic-helpers.ts
index e5978bb34a..89ed1369ef 100644
--- a/packages/cli/src/generic-helpers.ts
+++ b/packages/cli/src/generic-helpers.ts
@@ -3,6 +3,7 @@ import { validate } from 'class-validator';
 import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { TagEntity } from '@/databases/entities/tag-entity';
+import type { TestDefinition } from '@/databases/entities/test-definition.ee';
 import type { User } from '@/databases/entities/user';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 
@@ -12,6 +13,7 @@ import { BadRequestError } from './errors/response-errors/bad-request.error';
 export async function validateEntity(
 	entity:
 		| WorkflowEntity
+		| TestDefinition
 		| CredentialsEntity
 		| TagEntity
 		| AnnotationTagEntity
diff --git a/packages/cli/src/help.ts b/packages/cli/src/help.ts
index 8581483577..9213048fdd 100644
--- a/packages/cli/src/help.ts
+++ b/packages/cli/src/help.ts
@@ -1,6 +1,6 @@
+import { Container } from '@n8n/di';
 import { Help } from '@oclif/core';
-import Container from 'typedi';
-import { Logger } from 'winston';
+import { Logger } from 'n8n-core';
 
 // oclif expects a default export
 // eslint-disable-next-line import/no-default-export
diff --git a/packages/cli/src/interfaces.ts b/packages/cli/src/interfaces.ts
index 65b3a56346..e50b96c384 100644
--- a/packages/cli/src/interfaces.ts
+++ b/packages/cli/src/interfaces.ts
@@ -1,6 +1,5 @@
 import type { Scope } from '@n8n/permissions';
 import type { Application } from 'express';
-import type { WorkflowExecute } from 'n8n-core';
 import type {
 	ExecutionError,
 	ICredentialDataDecryptedObject,
@@ -14,7 +13,6 @@ import type {
 	ITelemetryTrackProperties,
 	IWorkflowBase,
 	CredentialLoadingDetails,
-	Workflow,
 	WorkflowExecuteMode,
 	ExecutionStatus,
 	ExecutionSummary,
@@ -135,6 +133,10 @@ export interface IExecutionBase {
 	startedAt: Date;
 	stoppedAt?: Date; // empty value means execution is still running
 	workflowId: string;
+
+	/**
+	 * @deprecated Use `status` instead
+	 */
 	finished: boolean;
 	retryOf?: string; // If it is a retry, the id of the execution it is a retry of.
 	retrySuccessId?: string; // If it failed and a retry did succeed. The id of the successful retry.
@@ -296,12 +298,6 @@ export interface IWorkflowErrorData {
 	};
 }
 
-export interface IWorkflowExecuteProcess {
-	startedAt: Date;
-	workflow: Workflow;
-	workflowExecute: WorkflowExecute;
-}
-
 export interface IWorkflowStatisticsDataLoaded {
 	dataLoaded: boolean;
 }
diff --git a/packages/cli/src/ldap/__tests__/helpers.test.ts b/packages/cli/src/ldap.ee/__tests__/helpers.test.ts
similarity index 96%
rename from packages/cli/src/ldap/__tests__/helpers.test.ts
rename to packages/cli/src/ldap.ee/__tests__/helpers.test.ts
index 5d38c58e1a..3e7a9c4b4b 100644
--- a/packages/cli/src/ldap/__tests__/helpers.test.ts
+++ b/packages/cli/src/ldap.ee/__tests__/helpers.test.ts
@@ -2,7 +2,7 @@ import { AuthIdentity } from '@/databases/entities/auth-identity';
 import { User } from '@/databases/entities/user';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { generateNanoId } from '@/databases/utils/generators';
-import * as helpers from '@/ldap/helpers.ee';
+import * as helpers from '@/ldap.ee/helpers.ee';
 import { mockInstance } from '@test/mocking';
 
 const userRepository = mockInstance(UserRepository);
diff --git a/packages/cli/src/ldap/constants.ts b/packages/cli/src/ldap.ee/constants.ts
similarity index 100%
rename from packages/cli/src/ldap/constants.ts
rename to packages/cli/src/ldap.ee/constants.ts
diff --git a/packages/cli/src/ldap/helpers.ee.ts b/packages/cli/src/ldap.ee/helpers.ee.ts
similarity index 99%
rename from packages/cli/src/ldap/helpers.ee.ts
rename to packages/cli/src/ldap.ee/helpers.ee.ts
index 7af0917054..dcc643d808 100644
--- a/packages/cli/src/ldap/helpers.ee.ts
+++ b/packages/cli/src/ldap.ee/helpers.ee.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import { validate } from 'jsonschema';
 import type { Entry as LdapUser } from 'ldapts';
 import { Filter } from 'ldapts/filters/Filter';
 import { randomString } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import config from '@/config';
 import { AuthIdentity } from '@/databases/entities/auth-identity';
diff --git a/packages/cli/src/ldap/ldap.controller.ee.ts b/packages/cli/src/ldap.ee/ldap.controller.ee.ts
similarity index 100%
rename from packages/cli/src/ldap/ldap.controller.ee.ts
rename to packages/cli/src/ldap.ee/ldap.controller.ee.ts
diff --git a/packages/cli/src/ldap/ldap.service.ee.ts b/packages/cli/src/ldap.ee/ldap.service.ee.ts
similarity index 98%
rename from packages/cli/src/ldap/ldap.service.ee.ts
rename to packages/cli/src/ldap.ee/ldap.service.ee.ts
index b552db6974..a4d9cbc97d 100644
--- a/packages/cli/src/ldap/ldap.service.ee.ts
+++ b/packages/cli/src/ldap.ee/ldap.service.ee.ts
@@ -1,11 +1,11 @@
+import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { QueryFailedError } from '@n8n/typeorm';
 import type { Entry as LdapUser, ClientOptions } from 'ldapts';
 import { Client } from 'ldapts';
-import { Cipher } from 'n8n-core';
+import { Cipher, Logger } from 'n8n-core';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 import type { ConnectionOptions } from 'tls';
-import { Service } from 'typedi';
 
 import config from '@/config';
 import type { RunningMode, SyncStatus } from '@/databases/entities/auth-provider-sync-history';
@@ -14,13 +14,12 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logging/logger.service';
 import {
 	getCurrentAuthenticationMethod,
 	isEmailCurrentAuthenticationMethod,
 	isLdapCurrentAuthenticationMethod,
 	setCurrentAuthenticationMethod,
-} from '@/sso/sso-helpers';
+} from '@/sso.ee/sso-helpers';
 
 import {
 	BINARY_AD_ATTRIBUTES,
diff --git a/packages/cli/src/ldap/types.ts b/packages/cli/src/ldap.ee/types.ts
similarity index 100%
rename from packages/cli/src/ldap/types.ts
rename to packages/cli/src/ldap.ee/types.ts
diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts
index 8f1bd26e64..ed9b66a1a6 100644
--- a/packages/cli/src/license.ts
+++ b/packages/cli/src/license.ts
@@ -1,15 +1,13 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import type { TEntitlement, TFeatures, TLicenseBlock } from '@n8n_io/license-sdk';
 import { LicenseManager } from '@n8n_io/license-sdk';
-import { InstanceSettings, ObjectStoreService } from 'n8n-core';
-import Container, { Service } from 'typedi';
+import { InstanceSettings, ObjectStoreService, Logger } from 'n8n-core';
 
 import config from '@/config';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { OnShutdown } from '@/decorators/on-shutdown';
-import { Logger } from '@/logging/logger.service';
 import { LicenseMetricsService } from '@/metrics/license-metrics.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 
 import {
 	LICENSE_FEATURES,
@@ -20,6 +18,9 @@ import {
 } from './constants';
 import type { BooleanLicenseFeature, NumericLicenseFeature } from './interfaces';
 
+const LICENSE_RENEWAL_DISABLED_WARNING =
+	'Automatic license renewal is disabled. The license will not renew automatically, and access to licensed features may be lost!';
+
 export type FeatureReturnType = Partial<
 	{
 		planName: string;
@@ -35,7 +36,6 @@ export class License {
 	constructor(
 		private readonly logger: Logger,
 		private readonly instanceSettings: InstanceSettings,
-		private readonly orchestrationService: OrchestrationService,
 		private readonly settingsRepository: SettingsRepository,
 		private readonly licenseMetricsService: LicenseMetricsService,
 		private readonly globalConfig: GlobalConfig,
@@ -43,25 +43,6 @@ export class License {
 		this.logger = this.logger.scoped('license');
 	}
 
-	/**
-	 * Whether this instance should renew the license - on init and periodically.
-	 */
-	private renewalEnabled() {
-		if (this.instanceSettings.instanceType !== 'main') return false;
-		const autoRenewEnabled = this.globalConfig.license.autoRenewalEnabled;
-
-		/**
-		 * In multi-main setup, all mains start off with `unset` status and so renewal disabled.
-		 * On becoming leader or follower, each will enable or disable renewal, respectively.
-		 * This ensures the mains do not cause a 429 (too many requests) on license init.
-		 */
-		if (this.globalConfig.multiMainSetup.enabled) {
-			return autoRenewEnabled && this.instanceSettings.isLeader;
-		}
-
-		return autoRenewEnabled;
-	}
-
 	async init(forceRecreate = false) {
 		if (this.manager && !forceRecreate) {
 			this.logger.warn('License manager already initialized or shutting down');
@@ -90,15 +71,20 @@ export class License {
 			? async () => await this.licenseMetricsService.collectPassthroughData()
 			: async () => ({});
 
-		const renewalEnabled = this.renewalEnabled();
+		const { isLeader } = this.instanceSettings;
+		const { autoRenewalEnabled } = this.globalConfig.license;
+
+		const shouldRenew = isLeader && autoRenewalEnabled;
+
+		if (isLeader && !autoRenewalEnabled) this.logger.warn(LICENSE_RENEWAL_DISABLED_WARNING);
 
 		try {
 			this.manager = new LicenseManager({
 				server,
 				tenantId: this.globalConfig.license.tenantId,
 				productIdentifier: `n8n-${N8N_VERSION}`,
-				autoRenewEnabled: renewalEnabled,
-				renewOnInit: renewalEnabled,
+				autoRenewEnabled: shouldRenew,
+				renewOnInit: shouldRenew,
 				autoRenewOffset,
 				offlineMode,
 				logger: this.logger,
@@ -138,23 +124,24 @@ export class License {
 		this.logger.debug('License feature change detected', _features);
 
 		if (config.getEnv('executions.mode') === 'queue' && this.globalConfig.multiMainSetup.enabled) {
-			const isMultiMainLicensed = _features[LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES] as
-				| boolean
-				| undefined;
+			const isMultiMainLicensed =
+				(_features[LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES] as boolean | undefined) ?? false;
 
-			this.orchestrationService.setMultiMainSetupLicensed(isMultiMainLicensed ?? false);
+			this.instanceSettings.setMultiMainLicensed(isMultiMainLicensed);
 
-			if (this.orchestrationService.isMultiMainSetupEnabled && this.instanceSettings.isFollower) {
-				this.logger.debug(
-					'[Multi-main setup] Instance is follower, skipping sending of "reload-license" command...',
-				);
+			if (this.instanceSettings.isMultiMain && !this.instanceSettings.isLeader) {
+				this.logger
+					.scoped(['scaling', 'multi-main-setup', 'license'])
+					.debug('Instance is not leader, skipping sending of "reload-license" command...');
 				return;
 			}
 
-			if (this.orchestrationService.isMultiMainSetupEnabled && !isMultiMainLicensed) {
-				this.logger.debug(
-					'[Multi-main setup] License changed with no support for multi-main setup - no new followers will be allowed to init. To restore multi-main setup, please upgrade to a license that supports this feature.',
-				);
+			if (this.globalConfig.multiMainSetup.enabled && !isMultiMainLicensed) {
+				this.logger
+					.scoped(['scaling', 'multi-main-setup', 'license'])
+					.debug(
+						'License changed with no support for multi-main setup - no new followers will be allowed to init. To restore multi-main setup, please upgrade to a license that supports this feature.',
+					);
 			}
 		}
 
@@ -257,6 +244,10 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.ASK_AI);
 	}
 
+	isAiCreditsEnabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.AI_CREDITS);
+	}
+
 	isAdvancedExecutionFiltersEnabled() {
 		return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS);
 	}
@@ -273,7 +264,7 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.BINARY_DATA_S3);
 	}
 
-	isMultipleMainInstancesLicensed() {
+	isMultiMainLicensed() {
 		return this.isFeatureEnabled(LICENSE_FEATURES.MULTIPLE_MAIN_INSTANCES);
 	}
 
@@ -367,6 +358,10 @@ export class License {
 		return this.getFeatureValue(LICENSE_QUOTAS.VARIABLES_LIMIT) ?? UNLIMITED_LICENSE_QUOTA;
 	}
 
+	getAiCredits() {
+		return this.getFeatureValue(LICENSE_QUOTAS.AI_CREDITS) ?? 0;
+	}
+
 	getWorkflowHistoryPruneLimit() {
 		return (
 			this.getFeatureValue(LICENSE_QUOTAS.WORKFLOW_HISTORY_PRUNE_LIMIT) ?? UNLIMITED_LICENSE_QUOTA
diff --git a/packages/cli/src/license/__tests__/license.service.test.ts b/packages/cli/src/license/__tests__/license.service.test.ts
index 9cd9c0ee0b..8ffc1dbf3d 100644
--- a/packages/cli/src/license/__tests__/license.service.test.ts
+++ b/packages/cli/src/license/__tests__/license.service.test.ts
@@ -94,6 +94,7 @@ describe('LicenseService', () => {
 				.spyOn(axios, 'post')
 				.mockResolvedValueOnce({ data: { title: 'Title', text: 'Text', licenseKey: 'abc-123' } });
 			const data = await licenseService.registerCommunityEdition({
+				userId: '123',
 				email: 'test@ema.il',
 				instanceId: '123',
 				instanceUrl: 'http://localhost',
@@ -102,6 +103,7 @@ describe('LicenseService', () => {
 
 			expect(data).toEqual({ title: 'Title', text: 'Text' });
 			expect(eventService.emit).toHaveBeenCalledWith('license-community-plus-registered', {
+				userId: '123',
 				email: 'test@ema.il',
 				licenseKey: 'abc-123',
 			});
@@ -111,6 +113,7 @@ describe('LicenseService', () => {
 			jest.spyOn(axios, 'post').mockRejectedValueOnce(new AxiosError('Failed'));
 			await expect(
 				licenseService.registerCommunityEdition({
+					userId: '123',
 					email: 'test@ema.il',
 					instanceId: '123',
 					instanceUrl: 'http://localhost',
diff --git a/packages/cli/src/license/license.controller.ts b/packages/cli/src/license/license.controller.ts
index db895ef4a0..3c284a25cb 100644
--- a/packages/cli/src/license/license.controller.ts
+++ b/packages/cli/src/license/license.controller.ts
@@ -4,7 +4,7 @@ import { InstanceSettings } from 'n8n-core';
 
 import { Get, Post, RestController, GlobalScope, Body } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { AuthenticatedRequest, AuthlessRequest, LicenseRequest } from '@/requests';
+import { AuthenticatedRequest, LicenseRequest } from '@/requests';
 import { UrlService } from '@/services/url.service';
 
 import { LicenseService } from './license.service';
@@ -41,11 +41,12 @@ export class LicenseController {
 
 	@Post('/enterprise/community-registered')
 	async registerCommunityEdition(
-		_req: AuthlessRequest,
+		req: AuthenticatedRequest,
 		_res: Response,
 		@Body payload: CommunityRegisteredRequestDto,
 	) {
 		return await this.licenseService.registerCommunityEdition({
+			userId: req.user.id,
 			email: payload.email,
 			instanceId: this.instanceSettings.instanceId,
 			instanceUrl: this.urlService.getInstanceBaseUrl(),
diff --git a/packages/cli/src/license/license.service.ts b/packages/cli/src/license/license.service.ts
index cdd6454036..bd2eca414c 100644
--- a/packages/cli/src/license/license.service.ts
+++ b/packages/cli/src/license/license.service.ts
@@ -1,13 +1,13 @@
+import { Service } from '@n8n/di';
 import axios, { AxiosError } from 'axios';
+import { Logger } from 'n8n-core';
 import { ensureError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { UrlService } from '@/services/url.service';
 
 type LicenseError = Error & { errorId?: keyof typeof LicenseErrors };
@@ -61,11 +61,13 @@ export class LicenseService {
 	}
 
 	async registerCommunityEdition({
+		userId,
 		email,
 		instanceId,
 		instanceUrl,
 		licenseType,
 	}: {
+		userId: User['id'];
 		email: string;
 		instanceId: string;
 		instanceUrl: string;
@@ -83,7 +85,7 @@ export class LicenseService {
 					licenseType,
 				},
 			);
-			this.eventService.emit('license-community-plus-registered', { email, licenseKey });
+			this.eventService.emit('license-community-plus-registered', { userId, email, licenseKey });
 			return rest;
 		} catch (e: unknown) {
 			if (e instanceof AxiosError) {
diff --git a/packages/cli/src/load-nodes-and-credentials.ts b/packages/cli/src/load-nodes-and-credentials.ts
index a5cff3764f..88cbfc05cb 100644
--- a/packages/cli/src/load-nodes-and-credentials.ts
+++ b/packages/cli/src/load-nodes-and-credentials.ts
@@ -1,13 +1,18 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import glob from 'fast-glob';
 import fsPromises from 'fs/promises';
 import type { Class, DirectoryLoader, Types } from 'n8n-core';
 import {
 	CUSTOM_EXTENSION_ENV,
+	ErrorReporter,
 	InstanceSettings,
 	CustomDirectoryLoader,
 	PackageDirectoryLoader,
 	LazyPackageDirectoryLoader,
+	UnrecognizedCredentialTypeError,
+	UnrecognizedNodeTypeError,
+	Logger,
 } from 'n8n-core';
 import type {
 	KnownNodesAndCredentials,
@@ -15,11 +20,15 @@ import type {
 	INodeTypeDescription,
 	INodeTypeData,
 	ICredentialTypeData,
+	LoadedClass,
+	ICredentialType,
+	INodeType,
+	IVersionedNodeType,
+	INodeProperties,
 } from 'n8n-workflow';
-import { NodeHelpers, ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
 import path from 'path';
 import picocolors from 'picocolors';
-import { Container, Service } from 'typedi';
 
 import {
 	CUSTOM_API_CALL_KEY,
@@ -28,7 +37,6 @@ import {
 	CLI_DIR,
 	inE2ETests,
 } from '@/constants';
-import { Logger } from '@/logging/logger.service';
 import { isContainedWithin } from '@/utils/path-util';
 
 interface LoadedNodesAndCredentials {
@@ -57,6 +65,7 @@ export class LoadNodesAndCredentials {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly instanceSettings: InstanceSettings,
 		private readonly globalConfig: GlobalConfig,
 	) {}
@@ -149,7 +158,7 @@ export class LoadNodesAndCredentials {
 				);
 			} catch (error) {
 				this.logger.error((error as Error).message);
-				ErrorReporter.error(error);
+				this.errorReporter.error(error);
 			}
 		}
 	}
@@ -285,7 +294,7 @@ export class LoadNodesAndCredentials {
 		for (const usableNode of usableNodes) {
 			const description: INodeTypeBaseDescription | INodeTypeDescription =
 				structuredClone(usableNode);
-			const wrapped = NodeHelpers.convertNodeToAiTool({ description }).description;
+			const wrapped = this.convertNodeToAiTool({ description }).description;
 
 			this.types.nodes.push(wrapped);
 			this.known.nodes[wrapped.name] = structuredClone(this.known.nodes[usableNode.name]);
@@ -307,13 +316,26 @@ export class LoadNodesAndCredentials {
 
 		for (const loader of Object.values(this.loaders)) {
 			// list of node & credential types that will be sent to the frontend
-			const { known, types, directory } = loader;
-			this.types.nodes = this.types.nodes.concat(types.nodes);
-			this.types.credentials = this.types.credentials.concat(types.credentials);
+			const { known, types, directory, packageName } = loader;
+			this.types.nodes = this.types.nodes.concat(
+				types.nodes.map(({ name, ...rest }) => ({
+					...rest,
+					name: `${packageName}.${name}`,
+				})),
+			);
+			this.types.credentials = this.types.credentials.concat(
+				types.credentials.map(({ supportedNodes, ...rest }) => ({
+					...rest,
+					supportedNodes:
+						loader instanceof PackageDirectoryLoader
+							? supportedNodes?.map((nodeName) => `${loader.packageName}.${nodeName}`)
+							: undefined,
+				})),
+			);
 
 			// Nodes and credentials that have been loaded immediately
 			for (const nodeTypeName in loader.nodeTypes) {
-				this.loaded.nodes[nodeTypeName] = loader.nodeTypes[nodeTypeName];
+				this.loaded.nodes[`${packageName}.${nodeTypeName}`] = loader.nodeTypes[nodeTypeName];
 			}
 
 			for (const credentialTypeName in loader.credentialTypes) {
@@ -322,7 +344,7 @@ export class LoadNodesAndCredentials {
 
 			for (const type in known.nodes) {
 				const { className, sourcePath } = known.nodes[type];
-				this.known.nodes[type] = {
+				this.known.nodes[`${packageName}.${type}`] = {
 					className,
 					sourcePath: path.join(directory, sourcePath),
 				};
@@ -356,6 +378,128 @@ export class LoadNodesAndCredentials {
 		}
 	}
 
+	getNode(fullNodeType: string): LoadedClass<INodeType | IVersionedNodeType> {
+		const [packageName, nodeType] = fullNodeType.split('.');
+		const { loaders } = this;
+		const loader = loaders[packageName];
+		if (!loader) {
+			throw new UnrecognizedNodeTypeError(packageName, nodeType);
+		}
+		return loader.getNode(nodeType);
+	}
+
+	getCredential(credentialType: string): LoadedClass<ICredentialType> {
+		const { loadedCredentials } = this;
+
+		for (const loader of Object.values(this.loaders)) {
+			if (credentialType in loader.known.credentials) {
+				const loaded = loader.getCredential(credentialType);
+				loadedCredentials[credentialType] = loaded;
+			}
+		}
+
+		if (credentialType in loadedCredentials) {
+			return loadedCredentials[credentialType];
+		}
+
+		throw new UnrecognizedCredentialTypeError(credentialType);
+	}
+
+	/**
+	 * Modifies the description of the passed in object, such that it can be used
+	 * as an AI Agent Tool.
+	 * Returns the modified item (not copied)
+	 */
+	convertNodeToAiTool<
+		T extends object & { description: INodeTypeDescription | INodeTypeBaseDescription },
+	>(item: T): T {
+		// quick helper function for type-guard down below
+		function isFullDescription(obj: unknown): obj is INodeTypeDescription {
+			return typeof obj === 'object' && obj !== null && 'properties' in obj;
+		}
+
+		if (isFullDescription(item.description)) {
+			item.description.name += 'Tool';
+			item.description.inputs = [];
+			item.description.outputs = [NodeConnectionType.AiTool];
+			item.description.displayName += ' Tool';
+			delete item.description.usableAsTool;
+
+			const hasResource = item.description.properties.some((prop) => prop.name === 'resource');
+			const hasOperation = item.description.properties.some((prop) => prop.name === 'operation');
+
+			if (!item.description.properties.map((prop) => prop.name).includes('toolDescription')) {
+				const descriptionType: INodeProperties = {
+					displayName: 'Tool Description',
+					name: 'descriptionType',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Set Automatically',
+							value: 'auto',
+							description: 'Automatically set based on resource and operation',
+						},
+						{
+							name: 'Set Manually',
+							value: 'manual',
+							description: 'Manually set the description',
+						},
+					],
+					default: 'auto',
+				};
+
+				const descProp: INodeProperties = {
+					displayName: 'Description',
+					name: 'toolDescription',
+					type: 'string',
+					default: item.description.description,
+					required: true,
+					typeOptions: { rows: 2 },
+					description:
+						'Explain to the LLM what this tool does, a good, specific description would allow LLMs to produce expected results much more often',
+					placeholder: `e.g. ${item.description.description}`,
+				};
+
+				const noticeProp: INodeProperties = {
+					displayName:
+						"Use the expression {{ $fromAI('placeholder_name') }} for any data to be filled by the model",
+					name: 'notice',
+					type: 'notice',
+					default: '',
+				};
+
+				item.description.properties.unshift(descProp);
+
+				// If node has resource or operation we can determine pre-populate tool description based on it
+				// so we add the descriptionType property as the first property
+				if (hasResource || hasOperation) {
+					item.description.properties.unshift(descriptionType);
+
+					descProp.displayOptions = {
+						show: {
+							descriptionType: ['manual'],
+						},
+					};
+				}
+
+				item.description.properties.unshift(noticeProp);
+			}
+		}
+
+		const resources = item.description.codex?.resources ?? {};
+
+		item.description.codex = {
+			categories: ['AI'],
+			subcategories: {
+				AI: ['Tools'],
+				Tools: ['Other Tools'],
+			},
+			resources,
+		};
+		return item;
+	}
+
 	async setupHotReload() {
 		const { default: debounce } = await import('lodash/debounce');
 		// eslint-disable-next-line import/no-extraneous-dependencies
@@ -384,13 +528,21 @@ export class LoadNodesAndCredentials {
 				loader.reset();
 				await loader.loadAll();
 				await this.postProcessLoaders();
-				push.broadcast('nodeDescriptionUpdated', {});
+				push.broadcast({ type: 'nodeDescriptionUpdated', data: {} });
 			}, 100);
 
 			const toWatch = loader.isLazyLoaded
 				? ['**/nodes.json', '**/credentials.json']
 				: ['**/*.js', '**/*.json'];
-			watch(toWatch, { cwd: realModulePath }).on('change', reloader);
+			const files = await glob(toWatch, {
+				cwd: realModulePath,
+				ignore: ['node_modules/**'],
+			});
+			const watcher = watch(files, {
+				cwd: realModulePath,
+				ignoreInitial: true,
+			});
+			watcher.on('add', reloader).on('change', reloader).on('unlink', reloader);
 		});
 	}
 }
diff --git a/packages/cli/src/logging/constants.ts b/packages/cli/src/logging/constants.ts
deleted file mode 100644
index 107327694b..0000000000
--- a/packages/cli/src/logging/constants.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const noOp = () => {};
-
-export const LOG_LEVELS = ['error', 'warn', 'info', 'debug', 'silent'] as const;
diff --git a/packages/cli/src/logging/types.ts b/packages/cli/src/logging/types.ts
deleted file mode 100644
index bb01834326..0000000000
--- a/packages/cli/src/logging/types.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { LogScope } from '@n8n/config';
-
-import type { LOG_LEVELS } from './constants';
-
-export type LogLevel = (typeof LOG_LEVELS)[number];
-
-export type LogMetadata = {
-	[key: string]: unknown;
-	scopes?: LogScope[];
-	file?: string;
-	function?: string;
-};
-
-export type LogLocationMetadata = Pick<LogMetadata, 'file' | 'function'>;
diff --git a/packages/cli/src/manual-execution.service.ts b/packages/cli/src/manual-execution.service.ts
new file mode 100644
index 0000000000..0b8b9360d3
--- /dev/null
+++ b/packages/cli/src/manual-execution.service.ts
@@ -0,0 +1,127 @@
+import { Service } from '@n8n/di';
+import * as a from 'assert/strict';
+import {
+	DirectedGraph,
+	filterDisabledNodes,
+	recreateNodeExecutionStack,
+	WorkflowExecute,
+	Logger,
+} from 'n8n-core';
+import type {
+	IPinData,
+	IRun,
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
+	IWorkflowExecutionDataProcess,
+	Workflow,
+} from 'n8n-workflow';
+import type PCancelable from 'p-cancelable';
+
+@Service()
+export class ManualExecutionService {
+	constructor(private readonly logger: Logger) {}
+
+	getExecutionStartNode(data: IWorkflowExecutionDataProcess, workflow: Workflow) {
+		let startNode;
+		if (
+			data.startNodes?.length === 1 &&
+			Object.keys(data.pinData ?? {}).includes(data.startNodes[0].name)
+		) {
+			startNode = workflow.getNode(data.startNodes[0].name) ?? undefined;
+		}
+
+		return startNode;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/promise-function-async
+	runManually(
+		data: IWorkflowExecutionDataProcess,
+		workflow: Workflow,
+		additionalData: IWorkflowExecuteAdditionalData,
+		executionId: string,
+		pinData?: IPinData,
+	): PCancelable<IRun> {
+		if (data.triggerToStartFrom?.data && data.startNodes && !data.destinationNode) {
+			this.logger.debug(
+				`Execution ID ${executionId} had triggerToStartFrom. Starting from that trigger.`,
+				{ executionId },
+			);
+			const startNodes = data.startNodes.map((startNode) => {
+				const node = workflow.getNode(startNode.name);
+				a.ok(node, `Could not find a node named "${startNode.name}" in the workflow.`);
+				return node;
+			});
+			const runData = { [data.triggerToStartFrom.name]: [data.triggerToStartFrom.data] };
+
+			const { nodeExecutionStack, waitingExecution, waitingExecutionSource } =
+				recreateNodeExecutionStack(
+					filterDisabledNodes(DirectedGraph.fromWorkflow(workflow)),
+					new Set(startNodes),
+					runData,
+					data.pinData ?? {},
+				);
+			const executionData: IRunExecutionData = {
+				resultData: { runData, pinData },
+				executionData: {
+					contextData: {},
+					metadata: {},
+					nodeExecutionStack,
+					waitingExecution,
+					waitingExecutionSource,
+				},
+			};
+
+			const workflowExecute = new WorkflowExecute(
+				additionalData,
+				data.executionMode,
+				executionData,
+			);
+			return workflowExecute.processRunExecutionData(workflow);
+		} else if (
+			data.runData === undefined ||
+			data.startNodes === undefined ||
+			data.startNodes.length === 0
+		) {
+			// Full Execution
+			// TODO: When the old partial execution logic is removed this block can
+			// be removed and the previous one can be merged into
+			// `workflowExecute.runPartialWorkflow2`.
+			// Partial executions then require either a destination node from which
+			// everything else can be derived, or a triggerToStartFrom with
+			// triggerData.
+			this.logger.debug(`Execution ID ${executionId} will run executing all nodes.`, {
+				executionId,
+			});
+			// Execute all nodes
+
+			const startNode = this.getExecutionStartNode(data, workflow);
+
+			// Can execute without webhook so go on
+			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
+			return workflowExecute.run(workflow, startNode, data.destinationNode, data.pinData);
+		} else {
+			// Partial Execution
+			this.logger.debug(`Execution ID ${executionId} is a partial execution.`, { executionId });
+			// Execute only the nodes between start and destination nodes
+			const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
+
+			if (data.partialExecutionVersion === '1') {
+				return workflowExecute.runPartialWorkflow2(
+					workflow,
+					data.runData,
+					data.pinData,
+					data.dirtyNodeNames,
+					data.destinationNode,
+				);
+			} else {
+				return workflowExecute.runPartialWorkflow(
+					workflow,
+					data.runData,
+					data.startNodes,
+					data.destinationNode,
+					data.pinData,
+				);
+			}
+		}
+	}
+}
diff --git a/packages/cli/src/metrics/license-metrics.service.ts b/packages/cli/src/metrics/license-metrics.service.ts
index 338fa70a3e..bd4ca6055b 100644
--- a/packages/cli/src/metrics/license-metrics.service.ts
+++ b/packages/cli/src/metrics/license-metrics.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { LicenseMetricsRepository } from '@/databases/repositories/license-metrics.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
diff --git a/packages/cli/src/metrics/prometheus-metrics.service.ts b/packages/cli/src/metrics/prometheus-metrics.service.ts
index 41714d25ad..b17b8f8578 100644
--- a/packages/cli/src/metrics/prometheus-metrics.service.ts
+++ b/packages/cli/src/metrics/prometheus-metrics.service.ts
@@ -1,11 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import type express from 'express';
 import promBundle from 'express-prom-bundle';
 import { InstanceSettings } from 'n8n-core';
 import { EventMessageTypeNames } from 'n8n-workflow';
 import promClient, { type Counter, type Gauge } from 'prom-client';
 import semverParse from 'semver/functions/parse';
-import { Service } from 'typedi';
 
 import config from '@/config';
 import { N8N_VERSION } from '@/constants';
diff --git a/packages/cli/src/mfa/helpers.ts b/packages/cli/src/mfa/helpers.ts
index d08ed98c16..9e785d293c 100644
--- a/packages/cli/src/mfa/helpers.ts
+++ b/packages/cli/src/mfa/helpers.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import config from '@/config';
 import { UserRepository } from '@/databases/repositories/user.repository';
diff --git a/packages/cli/src/mfa/mfa.service.ts b/packages/cli/src/mfa/mfa.service.ts
index 5f730b7bf1..19bc9aead0 100644
--- a/packages/cli/src/mfa/mfa.service.ts
+++ b/packages/cli/src/mfa/mfa.service.ts
@@ -1,9 +1,10 @@
+import { Service } from '@n8n/di';
 import { Cipher } from 'n8n-core';
-import { Service } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
 import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';
+import { InvalidMfaRecoveryCodeError } from '@/errors/response-errors/invalid-mfa-recovery-code-error';
 
 import { TOTPService } from './totp.service';
 
@@ -56,13 +57,13 @@ export class MfaService {
 
 	async validateMfa(
 		userId: string,
-		mfaToken: string | undefined,
+		mfaCode: string | undefined,
 		mfaRecoveryCode: string | undefined,
 	) {
 		const user = await this.authUserRepository.findOneByOrFail({ id: userId });
-		if (mfaToken) {
+		if (mfaCode) {
 			const decryptedSecret = this.cipher.decrypt(user.mfaSecret!);
-			return this.totp.verifySecret({ secret: decryptedSecret, token: mfaToken });
+			return this.totp.verifySecret({ secret: decryptedSecret, mfaCode });
 		}
 
 		if (mfaRecoveryCode) {
@@ -85,12 +86,27 @@ export class MfaService {
 		return await this.authUserRepository.save(user);
 	}
 
-	async disableMfa(userId: string, mfaToken: string) {
-		const isValidToken = await this.validateMfa(userId, mfaToken, undefined);
+	async disableMfaWithMfaCode(userId: string, mfaCode: string) {
+		const isValidToken = await this.validateMfa(userId, mfaCode, undefined);
+
 		if (!isValidToken) {
 			throw new InvalidMfaCodeError();
 		}
 
+		await this.disableMfaForUser(userId);
+	}
+
+	async disableMfaWithRecoveryCode(userId: string, recoveryCode: string) {
+		const isValidToken = await this.validateMfa(userId, undefined, recoveryCode);
+
+		if (!isValidToken) {
+			throw new InvalidMfaRecoveryCodeError();
+		}
+
+		await this.disableMfaForUser(userId);
+	}
+
+	private async disableMfaForUser(userId: string) {
 		await this.authUserRepository.update(userId, {
 			mfaEnabled: false,
 			mfaSecret: null,
diff --git a/packages/cli/src/mfa/totp.service.ts b/packages/cli/src/mfa/totp.service.ts
index cbb1f65aac..5d543fd2b1 100644
--- a/packages/cli/src/mfa/totp.service.ts
+++ b/packages/cli/src/mfa/totp.service.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import OTPAuth from 'otpauth';
-import { Service } from 'typedi';
 
 @Service()
 export class TOTPService {
@@ -23,10 +23,14 @@ export class TOTPService {
 		}).toString();
 	}
 
-	verifySecret({ secret, token, window = 2 }: { secret: string; token: string; window?: number }) {
+	verifySecret({
+		secret,
+		mfaCode,
+		window = 2,
+	}: { secret: string; mfaCode: string; window?: number }) {
 		return new OTPAuth.TOTP({
 			secret: OTPAuth.Secret.fromBase32(secret),
-		}).validate({ token, window }) === null
+		}).validate({ token: mfaCode, window }) === null
 			? false
 			: true;
 	}
diff --git a/packages/cli/src/middlewares/body-parser.ts b/packages/cli/src/middlewares/body-parser.ts
index 59327ea080..699ff72c6b 100644
--- a/packages/cli/src/middlewares/body-parser.ts
+++ b/packages/cli/src/middlewares/body-parser.ts
@@ -1,11 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { Request, RequestHandler } from 'express';
 import { parseIncomingMessage } from 'n8n-core';
 import { jsonParse } from 'n8n-workflow';
 import { parse as parseQueryString } from 'querystring';
 import getRawBody from 'raw-body';
 import { type Readable } from 'stream';
-import Container from 'typedi';
 import { Parser as XmlParser } from 'xml2js';
 import { createGunzip, createInflate } from 'zlib';
 
diff --git a/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts b/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
index 678cb86981..9fa5c21677 100644
--- a/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
+++ b/packages/cli/src/middlewares/list-query/dtos/base.filter.dto.ts
@@ -1,9 +1,8 @@
 import { plainToInstance, instanceToPlain } from 'class-transformer';
 import { validate } from 'class-validator';
+import { isObjectLiteral } from 'n8n-core';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 
-import { isObjectLiteral } from '@/utils';
-
 export class BaseFilter {
 	protected static async toFilter(rawFilter: string, Filter: typeof BaseFilter) {
 		const dto = jsonParse(rawFilter, { errorMessage: 'Failed to parse filter JSON' });
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/node-types.ts b/packages/cli/src/node-types.ts
index 26b1b61e36..77d872dc26 100644
--- a/packages/cli/src/node-types.ts
+++ b/packages/cli/src/node-types.ts
@@ -1,25 +1,16 @@
+import { Service } from '@n8n/di';
+import type { NeededNodeType } from '@n8n/task-runner';
 import type { Dirent } from 'fs';
 import { readdir } from 'fs/promises';
-import { loadClassInIsolation } from 'n8n-core';
-import type {
-	INodeType,
-	INodeTypeDescription,
-	INodeTypes,
-	IVersionedNodeType,
-	LoadedClass,
-} from 'n8n-workflow';
+import type { INodeType, INodeTypeDescription, INodeTypes, IVersionedNodeType } from 'n8n-workflow';
 import { ApplicationError, NodeHelpers } from 'n8n-workflow';
 import { join, dirname } from 'path';
-import { Service } from 'typedi';
 
-import { UnrecognizedNodeTypeError } from './errors/unrecognized-node-type.error';
 import { LoadNodesAndCredentials } from './load-nodes-and-credentials';
 
 @Service()
 export class NodeTypes implements INodeTypes {
-	constructor(private loadNodesAndCredentials: LoadNodesAndCredentials) {
-		loadNodesAndCredentials.addPostProcessor(async () => this.applySpecialNodeParameters());
-	}
+	constructor(private loadNodesAndCredentials: LoadNodesAndCredentials) {}
 
 	/**
 	 * Variant of `getByNameAndVersion` that includes the node's source path, used to locate a node's translations.
@@ -28,19 +19,14 @@ export class NodeTypes implements INodeTypes {
 		nodeTypeName: string,
 		version: number,
 	): { description: INodeTypeDescription } & { sourcePath: string } {
-		const nodeType = this.getNode(nodeTypeName);
-
-		if (!nodeType) {
-			throw new ApplicationError('Unknown node type', { tags: { nodeTypeName } });
-		}
-
+		const nodeType = this.loadNodesAndCredentials.getNode(nodeTypeName);
 		const { description } = NodeHelpers.getVersionedNodeType(nodeType.type, version);
 
 		return { description: { ...description }, sourcePath: nodeType.sourcePath };
 	}
 
 	getByName(nodeType: string): INodeType | IVersionedNodeType {
-		return this.getNode(nodeType).type;
+		return this.loadNodesAndCredentials.getNode(nodeType).type;
 	}
 
 	getByNameAndVersion(nodeType: string, version?: number): INodeType {
@@ -51,7 +37,7 @@ export class NodeTypes implements INodeTypes {
 			nodeType = nodeType.replace(/Tool$/, '');
 		}
 
-		const node = this.getNode(nodeType);
+		const node = this.loadNodesAndCredentials.getNode(nodeType);
 		const versionedNodeType = NodeHelpers.getVersionedNodeType(node.type, version);
 		if (!toolRequested) return versionedNodeType;
 
@@ -73,41 +59,15 @@ export class NodeTypes implements INodeTypes {
 		const clonedNode = Object.create(versionedNodeType, {
 			description: { value: clonedDescription },
 		}) as INodeType;
-		const tool = NodeHelpers.convertNodeToAiTool(clonedNode);
+		const tool = this.loadNodesAndCredentials.convertNodeToAiTool(clonedNode);
 		loadedNodes[nodeType + 'Tool'] = { sourcePath: '', type: tool };
 		return tool;
 	}
 
-	/* Some nodeTypes need to get special parameters applied like the polling nodes the polling times */
-	applySpecialNodeParameters() {
-		for (const nodeTypeData of Object.values(this.loadNodesAndCredentials.loadedNodes)) {
-			const nodeType = NodeHelpers.getVersionedNodeType(nodeTypeData.type);
-			NodeHelpers.applySpecialNodeParameters(nodeType);
-		}
-	}
-
 	getKnownTypes() {
 		return this.loadNodesAndCredentials.knownNodes;
 	}
 
-	private getNode(type: string): LoadedClass<INodeType | IVersionedNodeType> {
-		const { loadedNodes, knownNodes } = this.loadNodesAndCredentials;
-		if (type in loadedNodes) {
-			return loadedNodes[type];
-		}
-
-		if (type in knownNodes) {
-			const { className, sourcePath } = knownNodes[type];
-			const loaded: INodeType = loadClassInIsolation(sourcePath, className);
-			NodeHelpers.applySpecialNodeParameters(loaded);
-
-			loadedNodes[type] = { sourcePath, type: loaded };
-			return loadedNodes[type];
-		}
-
-		throw new UnrecognizedNodeTypeError(type);
-	}
-
 	async getNodeTranslationPath({
 		nodeSourcePath,
 		longNodeType,
@@ -149,4 +109,20 @@ export class NodeTypes implements INodeTypes {
 			dirent.name.toLowerCase().startsWith('v')
 		);
 	}
+
+	getNodeTypeDescriptions(nodeTypes: NeededNodeType[]): INodeTypeDescription[] {
+		return nodeTypes.map(({ name: nodeTypeName, version: nodeTypeVersion }) => {
+			const nodeType = this.loadNodesAndCredentials.getNode(nodeTypeName);
+			const { description } = NodeHelpers.getVersionedNodeType(nodeType.type, nodeTypeVersion);
+
+			const descriptionCopy = { ...description };
+
+			// TODO: do we still need this?
+			descriptionCopy.name = descriptionCopy.name.startsWith('n8n-nodes')
+				? descriptionCopy.name
+				: `n8n-nodes-base.${descriptionCopy.name}`; // nodes-base nodes are unprefixed
+
+			return descriptionCopy;
+		});
+	}
 }
diff --git a/packages/cli/src/permissions/check-access.ts b/packages/cli/src/permissions.ee/check-access.ts
similarity index 98%
rename from packages/cli/src/permissions/check-access.ts
rename to packages/cli/src/permissions.ee/check-access.ts
index f4abfcc00f..062e3c1865 100644
--- a/packages/cli/src/permissions/check-access.ts
+++ b/packages/cli/src/permissions.ee/check-access.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import { ApplicationError } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
diff --git a/packages/cli/src/permissions/global-roles.ts b/packages/cli/src/permissions.ee/global-roles.ts
similarity index 100%
rename from packages/cli/src/permissions/global-roles.ts
rename to packages/cli/src/permissions.ee/global-roles.ts
diff --git a/packages/cli/src/permissions/project-roles.ts b/packages/cli/src/permissions.ee/project-roles.ts
similarity index 100%
rename from packages/cli/src/permissions/project-roles.ts
rename to packages/cli/src/permissions.ee/project-roles.ts
diff --git a/packages/cli/src/permissions/resource-roles.ts b/packages/cli/src/permissions.ee/resource-roles.ts
similarity index 100%
rename from packages/cli/src/permissions/resource-roles.ts
rename to packages/cli/src/permissions.ee/resource-roles.ts
diff --git a/packages/cli/src/posthog/__tests__/posthog.test.ts b/packages/cli/src/posthog/__tests__/posthog.test.ts
index 5c8fe282bf..5e11d24773 100644
--- a/packages/cli/src/posthog/__tests__/posthog.test.ts
+++ b/packages/cli/src/posthog/__tests__/posthog.test.ts
@@ -3,7 +3,6 @@ import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 import { PostHog } from 'posthog-node';
 
-import config from '@/config';
 import { PostHogClient } from '@/posthog';
 import { mockInstance } from '@test/mocking';
 
@@ -20,12 +19,11 @@ describe('PostHog', () => {
 	const globalConfig = mock<GlobalConfig>({ logging: { level: 'debug' } });
 
 	beforeAll(() => {
-		config.set('diagnostics.config.posthog.apiKey', apiKey);
-		config.set('diagnostics.config.posthog.apiHost', apiHost);
+		globalConfig.diagnostics.posthogConfig = { apiKey, apiHost };
 	});
 
 	beforeEach(() => {
-		config.set('diagnostics.enabled', true);
+		globalConfig.diagnostics.enabled = true;
 		jest.resetAllMocks();
 	});
 
@@ -37,7 +35,7 @@ describe('PostHog', () => {
 	});
 
 	it('does not initialize or track if diagnostics are not enabled', async () => {
-		config.set('diagnostics.enabled', false);
+		globalConfig.diagnostics.enabled = false;
 
 		const ph = new PostHogClient(instanceSettings, globalConfig);
 		await ph.init();
diff --git a/packages/cli/src/posthog/index.ts b/packages/cli/src/posthog/index.ts
index 8dec9755b3..6dcc6dd650 100644
--- a/packages/cli/src/posthog/index.ts
+++ b/packages/cli/src/posthog/index.ts
@@ -1,10 +1,9 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
 import type { FeatureFlags, ITelemetryTrackProperties } from 'n8n-workflow';
 import type { PostHog } from 'posthog-node';
-import { Service } from 'typedi';
 
-import config from '@/config';
 import type { PublicUser } from '@/interfaces';
 
 @Service()
@@ -17,14 +16,14 @@ export class PostHogClient {
 	) {}
 
 	async init() {
-		const enabled = config.getEnv('diagnostics.enabled');
+		const { enabled, posthogConfig } = this.globalConfig.diagnostics;
 		if (!enabled) {
 			return;
 		}
 
 		const { PostHog } = await import('posthog-node');
-		this.postHog = new PostHog(config.getEnv('diagnostics.config.posthog.apiKey'), {
-			host: config.getEnv('diagnostics.config.posthog.apiHost'),
+		this.postHog = new PostHog(posthogConfig.apiKey, {
+			host: posthogConfig.apiHost,
 		});
 
 		const logLevel = this.globalConfig.logging.level;
diff --git a/packages/cli/src/public-api/index.ts b/packages/cli/src/public-api/index.ts
index 92b3602828..1696135990 100644
--- a/packages/cli/src/public-api/index.ts
+++ b/packages/cli/src/public-api/index.ts
@@ -1,11 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { Router } from 'express';
 import express from 'express';
 import type { HttpError } from 'express-openapi-validator/dist/framework/types';
 import fs from 'fs/promises';
 import path from 'path';
 import type { JsonObject } from 'swagger-ui-express';
-import { Container } from 'typedi';
 import validator from 'validator';
 import YAML from 'yamljs';
 
diff --git a/packages/cli/src/public-api/types.ts b/packages/cli/src/public-api/types.ts
index 327d363073..14e586dfdb 100644
--- a/packages/cli/src/public-api/types.ts
+++ b/packages/cli/src/public-api/types.ts
@@ -74,11 +74,12 @@ export declare namespace WorkflowRequest {
 			active: boolean;
 			name?: string;
 			projectId?: string;
+			excludePinnedData?: boolean;
 		}
 	>;
 
 	type Create = AuthenticatedRequest<{}, {}, WorkflowEntity, {}>;
-	type Get = AuthenticatedRequest<{ id: string }, {}, {}, {}>;
+	type Get = AuthenticatedRequest<{ id: string }, {}, {}, { excludePinnedData?: boolean }>;
 	type Delete = Get;
 	type Update = AuthenticatedRequest<{ id: string }, {}, WorkflowEntity, {}>;
 	type Activate = Get;
@@ -172,16 +173,6 @@ export interface IJsonSchema {
 	required: string[];
 }
 
-export class SourceControlPull {
-	force?: boolean;
-
-	variables?: { [key: string]: string };
-}
-
-export declare namespace PublicSourceControlRequest {
-	type Pull = AuthenticatedRequest<{}, {}, SourceControlPull, {}>;
-}
-
 // ----------------------------------
 //           /audit
 // ----------------------------------
diff --git a/packages/cli/src/public-api/v1/handlers/audit/audit.handler.ts b/packages/cli/src/public-api/v1/handlers/audit/audit.handler.ts
index eb611d9ba5..595dd0cf42 100644
--- a/packages/cli/src/public-api/v1/handlers/audit/audit.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/audit/audit.handler.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import type { Response } from 'express';
-import Container from 'typedi';
 
 import type { AuditRequest } from '@/public-api/types';
 import { globalScope } from '@/public-api/v1/shared/middlewares/global.middleware';
diff --git a/packages/cli/src/public-api/v1/handlers/credentials/credentials.handler.ts b/packages/cli/src/public-api/v1/handlers/credentials/credentials.handler.ts
index d987aa827e..ef029cdaf6 100644
--- a/packages/cli/src/public-api/v1/handlers/credentials/credentials.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/credentials/credentials.handler.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
+import { Container } from '@n8n/di';
 import type express from 'express';
-import { Container } from 'typedi';
 import { z } from 'zod';
 
 import { CredentialTypes } from '@/credential-types';
diff --git a/packages/cli/src/public-api/v1/handlers/credentials/credentials.middleware.ts b/packages/cli/src/public-api/v1/handlers/credentials/credentials.middleware.ts
index 59ebb7b6d0..181092a9b9 100644
--- a/packages/cli/src/public-api/v1/handlers/credentials/credentials.middleware.ts
+++ b/packages/cli/src/public-api/v1/handlers/credentials/credentials.middleware.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-invalid-void-type */
 
+import { Container } from '@n8n/di';
 import type express from 'express';
 import { validate } from 'jsonschema';
-import { Container } from 'typedi';
 
 import { CredentialTypes } from '@/credential-types';
 import { CredentialsHelper } from '@/credentials-helper';
diff --git a/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts
index 2477ef928f..4e2754a12e 100644
--- a/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts
+++ b/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts
@@ -1,3 +1,4 @@
+import { Container } from '@n8n/di';
 import { Credentials } from 'n8n-core';
 import type {
 	DisplayCondition,
@@ -5,7 +6,6 @@ import type {
 	INodeProperties,
 	INodePropertyOptions,
 } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import { SharedCredentials } from '@/databases/entities/shared-credentials';
diff --git a/packages/cli/src/public-api/v1/handlers/executions/executions.handler.ts b/packages/cli/src/public-api/v1/handlers/executions/executions.handler.ts
index 896a4f2d0d..1eedc8de8b 100644
--- a/packages/cli/src/public-api/v1/handlers/executions/executions.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/executions/executions.handler.ts
@@ -1,6 +1,6 @@
+import { Container } from '@n8n/di';
 import type express from 'express';
 import { replaceCircularReferences } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
diff --git a/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts b/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts
index ea7220f788..c55b10053d 100644
--- a/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts
@@ -1,25 +1,28 @@
+import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import type { Response } from 'express';
-import Container from 'typedi';
 
 import { ProjectController } from '@/controllers/project.controller';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import type { PaginatedRequest } from '@/public-api/types';
-import type { ProjectRequest } from '@/requests';
+import type { AuthenticatedRequest } from '@/requests';
 
 import { globalScope, isLicensed, validCursor } from '../../shared/middlewares/global.middleware';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
 
-type Create = ProjectRequest.Create;
-type Update = ProjectRequest.Update;
-type Delete = ProjectRequest.Delete;
 type GetAll = PaginatedRequest;
 
 export = {
 	createProject: [
 		isLicensed('feat:projectRole:admin'),
 		globalScope('project:create'),
-		async (req: Create, res: Response) => {
-			const project = await Container.get(ProjectController).createProject(req);
+		async (req: AuthenticatedRequest, res: Response) => {
+			const payload = CreateProjectDto.safeParse(req.body);
+			if (payload.error) {
+				return res.status(400).json(payload.error.errors[0]);
+			}
+
+			const project = await Container.get(ProjectController).createProject(req, res, payload.data);
 
 			return res.status(201).json(project);
 		},
@@ -27,8 +30,18 @@ export = {
 	updateProject: [
 		isLicensed('feat:projectRole:admin'),
 		globalScope('project:update'),
-		async (req: Update, res: Response) => {
-			await Container.get(ProjectController).updateProject(req);
+		async (req: AuthenticatedRequest<{ projectId: string }>, res: Response) => {
+			const payload = UpdateProjectDto.safeParse(req.body);
+			if (payload.error) {
+				return res.status(400).json(payload.error.errors[0]);
+			}
+
+			await Container.get(ProjectController).updateProject(
+				req,
+				res,
+				payload.data,
+				req.params.projectId,
+			);
 
 			return res.status(204).send();
 		},
@@ -36,8 +49,18 @@ export = {
 	deleteProject: [
 		isLicensed('feat:projectRole:admin'),
 		globalScope('project:delete'),
-		async (req: Delete, res: Response) => {
-			await Container.get(ProjectController).deleteProject(req);
+		async (req: AuthenticatedRequest<{ projectId: string }>, res: Response) => {
+			const query = DeleteProjectDto.safeParse(req.query);
+			if (query.error) {
+				return res.status(400).json(query.error.errors[0]);
+			}
+
+			await Container.get(ProjectController).deleteProject(
+				req,
+				res,
+				query.data,
+				req.params.projectId,
+			);
 
 			return res.status(204).send();
 		},
diff --git a/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts b/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts
index fdcb2f16ba..09f5a1bc85 100644
--- a/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts
@@ -1,24 +1,25 @@
+import { PullWorkFolderRequestDto } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import type express from 'express';
 import type { StatusResult } from 'simple-git';
-import { Container } from 'typedi';
 
 import {
 	getTrackingInformationFromPullResult,
 	isSourceControlLicensed,
-} from '@/environments/source-control/source-control-helper.ee';
-import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
-import { SourceControlService } from '@/environments/source-control/source-control.service.ee';
-import type { ImportResult } from '@/environments/source-control/types/import-result';
+} from '@/environments.ee/source-control/source-control-helper.ee';
+import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
+import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee';
+import type { ImportResult } from '@/environments.ee/source-control/types/import-result';
 import { EventService } from '@/events/event.service';
+import type { AuthenticatedRequest } from '@/requests';
 
-import type { PublicSourceControlRequest } from '../../../types';
 import { globalScope } from '../../shared/middlewares/global.middleware';
 
 export = {
 	pull: [
 		globalScope('sourceControl:pull'),
 		async (
-			req: PublicSourceControlRequest.Pull,
+			req: AuthenticatedRequest,
 			res: express.Response,
 		): Promise<ImportResult | StatusResult | Promise<express.Response>> => {
 			const sourceControlPreferencesService = Container.get(SourceControlPreferencesService);
@@ -33,17 +34,14 @@ export = {
 					.json({ status: 'Error', message: 'Source Control is not connected to a repository' });
 			}
 			try {
+				const payload = PullWorkFolderRequestDto.parse(req.body);
 				const sourceControlService = Container.get(SourceControlService);
-				const result = await sourceControlService.pullWorkfolder({
-					force: req.body.force,
-					variables: req.body.variables,
-					userId: req.user.id,
-				});
+				const result = await sourceControlService.pullWorkfolder(req.user.id, payload);
 
 				if (result.statusCode === 200) {
 					Container.get(EventService).emit('source-control-user-pulled-api', {
 						...getTrackingInformationFromPullResult(result.statusResult),
-						forced: req.body.force ?? false,
+						forced: payload.force ?? false,
 					});
 					return res.status(200).send(result.statusResult);
 				} else {
diff --git a/packages/cli/src/public-api/v1/handlers/tags/tags.handler.ts b/packages/cli/src/public-api/v1/handlers/tags/tags.handler.ts
index daf5d78414..821be0c5fd 100644
--- a/packages/cli/src/public-api/v1/handlers/tags/tags.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/tags/tags.handler.ts
@@ -1,7 +1,7 @@
+import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { FindManyOptions } from '@n8n/typeorm';
 import type express from 'express';
-import { Container } from 'typedi';
 
 import type { TagEntity } from '@/databases/entities/tag-entity';
 import { TagRepository } from '@/databases/repositories/tag.repository';
diff --git a/packages/cli/src/public-api/v1/handlers/users/users.handler.ee.ts b/packages/cli/src/public-api/v1/handlers/users/users.handler.ee.ts
index 3b84b89da3..1a544aca29 100644
--- a/packages/cli/src/public-api/v1/handlers/users/users.handler.ee.ts
+++ b/packages/cli/src/public-api/v1/handlers/users/users.handler.ee.ts
@@ -1,7 +1,7 @@
-import { RoleChangeRequestDto } from '@n8n/api-types';
+import { InviteUsersRequestDto, RoleChangeRequestDto } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import type express from 'express';
 import type { Response } from 'express';
-import { Container } from 'typedi';
 
 import { InvitationController } from '@/controllers/invitation.controller';
 import { UsersController } from '@/controllers/users.controller';
@@ -18,7 +18,7 @@ import {
 } from '../../shared/middlewares/global.middleware';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
 
-type Create = UserRequest.Invite;
+type Create = AuthenticatedRequest<{}, {}, InviteUsersRequestDto>;
 type Delete = UserRequest.Delete;
 type ChangeRole = AuthenticatedRequest<{ id: string }, {}, RoleChangeRequestDto, {}>;
 
@@ -82,8 +82,16 @@ export = {
 	createUser: [
 		globalScope('user:create'),
 		async (req: Create, res: Response) => {
-			const usersInvited = await Container.get(InvitationController).inviteUser(req);
+			const { data, error } = InviteUsersRequestDto.safeParse(req.body);
+			if (error) {
+				return res.status(400).json(error.errors[0]);
+			}
 
+			const usersInvited = await Container.get(InvitationController).inviteUser(
+				req,
+				res,
+				data as InviteUsersRequestDto,
+			);
 			return res.status(201).json(usersInvited);
 		},
 	],
diff --git a/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts b/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts
index f4e1b86878..fa50ce3cf0 100644
--- a/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts
+++ b/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts
@@ -1,7 +1,7 @@
+import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import pick from 'lodash/pick';
-import { Container } from 'typedi';
 import { validate as uuidValidate } from 'uuid';
 
 import type { User } from '@/databases/entities/user';
diff --git a/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts b/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts
index 65fb1daab5..d3eec9b2d5 100644
--- a/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import type { Response } from 'express';
-import Container from 'typedi';
 
 import { VariablesRepository } from '@/databases/repositories/variables.repository';
-import { VariablesController } from '@/environments/variables/variables.controller.ee';
+import { VariablesController } from '@/environments.ee/variables/variables.controller.ee';
 import type { PaginatedRequest } from '@/public-api/types';
 import type { VariablesRequest } from '@/requests';
 
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
index 37cad74c86..c8b2bf51cd 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
+++ b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
@@ -6,6 +6,13 @@ get:
   summary: Retrieves a workflow
   description: Retrieves a workflow.
   parameters:
+    - name: excludePinnedData
+      in: query
+      required: false
+      description: Set this to avoid retrieving pinned data
+      schema:
+        type: boolean
+        example: true
     - $ref: '../schemas/parameters/workflowId.yml'
   responses:
     '200':
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml
index 1024e36cb5..4b3bc5e069 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml
+++ b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml
@@ -60,6 +60,13 @@ get:
       schema:
         type: string
         example: VmwOO9HeTEj20kxM
+    - name: excludePinnedData
+      in: query
+      required: false
+      description: Set this to avoid retrieving pinned data
+      schema:
+        type: boolean
+        example: true
     - $ref: '../../../../shared/spec/parameters/limit.yml'
     - $ref: '../../../../shared/spec/parameters/cursor.yml'
   responses:
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
index b0956a15c1..77a07fea0f 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
@@ -1,14 +1,14 @@
-// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
-import type { FindOptionsWhere } from '@n8n/typeorm';
+import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, Like, QueryFailedError } from '@n8n/typeorm';
+// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
+import type { FindOptionsWhere } from '@n8n/typeorm';
 import type express from 'express';
-import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
 import { z } from 'zod';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import config from '@/config';
 import { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
@@ -17,7 +17,7 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { addNodeIds, replaceInvalidCredentials } from '@/workflow-helpers';
-import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee';
+import { WorkflowHistoryService } from '@/workflows/workflow-history.ee/workflow-history.service.ee';
 import { WorkflowService } from '@/workflows/workflow.service';
 import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';
 
@@ -105,12 +105,13 @@ export = {
 		projectScope('workflow:read', 'workflow'),
 		async (req: WorkflowRequest.Get, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
+			const { excludePinnedData = false } = req.query;
 
 			const workflow = await Container.get(SharedWorkflowRepository).findWorkflowForUser(
 				id,
 				req.user,
 				['workflow:read'],
-				{ includeTags: !config.getEnv('workflowTagsDisabled') },
+				{ includeTags: !Container.get(GlobalConfig).tags.disabled },
 			);
 
 			if (!workflow) {
@@ -120,6 +121,10 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
+			if (excludePinnedData) {
+				delete workflow.pinData;
+			}
+
 			Container.get(EventService).emit('user-retrieved-workflow', {
 				userId: req.user.id,
 				publicApi: true,
@@ -131,7 +136,15 @@ export = {
 	getWorkflows: [
 		validCursor,
 		async (req: WorkflowRequest.GetAll, res: express.Response): Promise<express.Response> => {
-			const { offset = 0, limit = 100, active, tags, name, projectId } = req.query;
+			const {
+				offset = 0,
+				limit = 100,
+				excludePinnedData = false,
+				active,
+				tags,
+				name,
+				projectId,
+			} = req.query;
 
 			const where: FindOptionsWhere<WorkflowEntity> = {
 				...(active !== undefined && { active }),
@@ -196,9 +209,15 @@ export = {
 				skip: offset,
 				take: limit,
 				where,
-				...(!config.getEnv('workflowTagsDisabled') && { relations: ['tags'] }),
+				...(!Container.get(GlobalConfig).tags.disabled && { relations: ['tags'] }),
 			});
 
+			if (excludePinnedData) {
+				workflows.forEach((workflow) => {
+					delete workflow.pinData;
+				});
+			}
+
 			Container.get(EventService).emit('user-retrieved-all-workflows', {
 				userId: req.user.id,
 				publicApi: true,
@@ -360,7 +379,7 @@ export = {
 		async (req: WorkflowRequest.GetTags, res: express.Response): Promise<express.Response> => {
 			const { id } = req.params;
 
-			if (config.getEnv('workflowTagsDisabled')) {
+			if (Container.get(GlobalConfig).tags.disabled) {
 				return res.status(400).json({ message: 'Workflow Tags Disabled' });
 			}
 
@@ -387,7 +406,7 @@ export = {
 			const { id } = req.params;
 			const newTags = req.body.map((newTag) => newTag.id);
 
-			if (config.getEnv('workflowTagsDisabled')) {
+			if (Container.get(GlobalConfig).tags.disabled) {
 				return res.status(400).json({ message: 'Workflow Tags Disabled' });
 			}
 
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts
index f4a2d38156..131919d096 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts
+++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts
@@ -1,7 +1,7 @@
+import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
-import { Container } from 'typedi';
 
-import config from '@/config';
 import type { Project } from '@/databases/entities/project';
 import { SharedWorkflow, type WorkflowSharingRole } from '@/databases/entities/shared-workflow';
 import type { User } from '@/databases/entities/user';
@@ -46,7 +46,10 @@ export async function getSharedWorkflow(
 			...(!['global:owner', 'global:admin'].includes(user.role) && { userId: user.id }),
 			...(workflowId && { workflowId }),
 		},
-		relations: [...insertIf(!config.getEnv('workflowTagsDisabled'), ['workflow.tags']), 'workflow'],
+		relations: [
+			...insertIf(!Container.get(GlobalConfig).tags.disabled, ['workflow.tags']),
+			'workflow',
+		],
 	});
 }
 
diff --git a/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts b/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts
index ed68d4761c..3343d8daac 100644
--- a/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts
+++ b/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-invalid-void-type */
+import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import type express from 'express';
-import { Container } from 'typedi';
 
 import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import type { BooleanLicenseFeature } from '@/interfaces';
 import { License } from '@/license';
-import { userHasScopes } from '@/permissions/check-access';
+import { userHasScopes } from '@/permissions.ee/check-access';
 import type { AuthenticatedRequest } from '@/requests';
 
 import type { PaginatedRequest } from '../../../types';
diff --git a/packages/cli/src/push/__tests__/index.test.ts b/packages/cli/src/push/__tests__/index.test.ts
index 03457926b1..ae46487a38 100644
--- a/packages/cli/src/push/__tests__/index.test.ts
+++ b/packages/cli/src/push/__tests__/index.test.ts
@@ -20,7 +20,7 @@ describe('Push', () => {
 
 	test('should validate pushRef on requests for websocket backend', () => {
 		config.set('push.backend', 'websocket');
-		const push = new Push(mock(), mock());
+		const push = new Push(mock(), mock(), mock());
 		const ws = mock<WebSocket>();
 		const request = mock<WebSocketPushRequest>({ user, ws });
 		request.query = { pushRef: '' };
@@ -33,7 +33,7 @@ describe('Push', () => {
 
 	test('should validate pushRef on requests for SSE backend', () => {
 		config.set('push.backend', 'sse');
-		const push = new Push(mock(), mock());
+		const push = new Push(mock(), mock(), mock());
 		const request = mock<SSEPushRequest>({ user, ws: undefined });
 		request.query = { pushRef: '' };
 		expect(() => push.handleRequest(request, mock())).toThrow(BadRequestError);
diff --git a/packages/cli/src/push/__tests__/websocket.push.test.ts b/packages/cli/src/push/__tests__/websocket.push.test.ts
index 209f91b17e..64a5526300 100644
--- a/packages/cli/src/push/__tests__/websocket.push.test.ts
+++ b/packages/cli/src/push/__tests__/websocket.push.test.ts
@@ -1,25 +1,25 @@
 import type { PushMessage } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import { EventEmitter } from 'events';
-import { Container } from 'typedi';
+import { Logger } from 'n8n-core';
 import type WebSocket from 'ws';
 
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logging/logger.service';
 import { WebSocketPush } from '@/push/websocket.push';
 import { mockInstance } from '@test/mocking';
 
 jest.useFakeTimers();
 
 class MockWebSocket extends EventEmitter {
-	public isAlive = true;
+	isAlive = true;
 
-	public ping = jest.fn();
+	ping = jest.fn();
 
-	public send = jest.fn();
+	send = jest.fn();
 
-	public terminate = jest.fn();
+	terminate = jest.fn();
 
-	public close = jest.fn();
+	close = jest.fn();
 }
 
 const createMockWebSocket = () => new MockWebSocket() as unknown as jest.Mocked<WebSocket>;
@@ -73,7 +73,7 @@ describe('WebSocketPush', () => {
 	it('sends data to one connection', () => {
 		webSocketPush.add(pushRef1, userId, mockWebSocket1);
 		webSocketPush.add(pushRef2, userId, mockWebSocket2);
-		webSocketPush.sendToOne(pushMessage.type, pushMessage.data, pushRef1);
+		webSocketPush.sendToOne(pushMessage, pushRef1);
 
 		expect(mockWebSocket1.send).toHaveBeenCalledWith(expectedMsg);
 		expect(mockWebSocket2.send).not.toHaveBeenCalled();
@@ -82,7 +82,7 @@ describe('WebSocketPush', () => {
 	it('sends data to all connections', () => {
 		webSocketPush.add(pushRef1, userId, mockWebSocket1);
 		webSocketPush.add(pushRef2, userId, mockWebSocket2);
-		webSocketPush.sendToAll(pushMessage.type, pushMessage.data);
+		webSocketPush.sendToAll(pushMessage);
 
 		expect(mockWebSocket1.send).toHaveBeenCalledWith(expectedMsg);
 		expect(mockWebSocket2.send).toHaveBeenCalledWith(expectedMsg);
@@ -101,7 +101,7 @@ describe('WebSocketPush', () => {
 	it('sends data to all users connections', () => {
 		webSocketPush.add(pushRef1, userId, mockWebSocket1);
 		webSocketPush.add(pushRef2, userId, mockWebSocket2);
-		webSocketPush.sendToUsers(pushMessage.type, pushMessage.data, [userId]);
+		webSocketPush.sendToUsers(pushMessage, [userId]);
 
 		expect(mockWebSocket1.send).toHaveBeenCalledWith(expectedMsg);
 		expect(mockWebSocket2.send).toHaveBeenCalledWith(expectedMsg);
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
index 24cafa8121..d42fddb556 100644
--- a/packages/cli/src/push/abstract.push.ts
+++ b/packages/cli/src/push/abstract.push.ts
@@ -1,9 +1,9 @@
-import type { PushPayload, PushType } from '@n8n/api-types';
+import type { PushMessage } from '@n8n/api-types';
+import { Service } from '@n8n/di';
+import { ErrorReporter, Logger } from 'n8n-core';
 import { assert, jsonStringify } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logging/logger.service';
 import type { OnPushMessage } from '@/push/types';
 import { TypedEmitter } from '@/typed-emitter';
 
@@ -27,7 +27,10 @@ export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPush
 	protected abstract sendToOneConnection(connection: Connection, data: string): void;
 	protected abstract ping(connection: Connection): void;
 
-	constructor(protected readonly logger: Logger) {
+	constructor(
+		protected readonly logger: Logger,
+		protected readonly errorReporter: ErrorReporter,
+	) {
 		super();
 		// Ping all connected clients every 60 seconds
 		setInterval(() => this.pingAll(), 60 * 1000);
@@ -65,8 +68,8 @@ export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPush
 		delete this.userIdByPushRef[pushRef];
 	}
 
-	private sendTo<Type extends PushType>(type: Type, data: PushPayload<Type>, pushRefs: string[]) {
-		this.logger.debug(`Send data of type "${type}" to editor-UI`, {
+	private sendTo({ type, data }: PushMessage, pushRefs: string[]) {
+		this.logger.debug(`Pushed to frontend: ${type}`, {
 			dataType: type,
 			pushRefs: pushRefs.join(', '),
 		});
@@ -86,30 +89,26 @@ export abstract class AbstractPush<Connection> extends TypedEmitter<AbstractPush
 		}
 	}
 
-	sendToAll<Type extends PushType>(type: Type, data: PushPayload<Type>) {
-		this.sendTo(type, data, Object.keys(this.connections));
+	sendToAll(pushMsg: PushMessage) {
+		this.sendTo(pushMsg, Object.keys(this.connections));
 	}
 
-	sendToOne<Type extends PushType>(type: Type, data: PushPayload<Type>, pushRef: string) {
+	sendToOne(pushMsg: PushMessage, pushRef: string) {
 		if (this.connections[pushRef] === undefined) {
 			this.logger.error(`The session "${pushRef}" is not registered.`, { pushRef });
 			return;
 		}
 
-		this.sendTo(type, data, [pushRef]);
+		this.sendTo(pushMsg, [pushRef]);
 	}
 
-	sendToUsers<Type extends PushType>(
-		type: Type,
-		data: PushPayload<Type>,
-		userIds: Array<User['id']>,
-	) {
+	sendToUsers(pushMsg: PushMessage, userIds: Array<User['id']>) {
 		const { connections } = this;
 		const userPushRefs = Object.keys(connections).filter((pushRef) =>
 			userIds.includes(this.userIdByPushRef[pushRef]),
 		);
 
-		this.sendTo(type, data, userPushRefs);
+		this.sendTo(pushMsg, userPushRefs);
 	}
 
 	closeAllConnections() {
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
index bfbfb43a51..4c2d8ac032 100644
--- a/packages/cli/src/push/index.ts
+++ b/packages/cli/src/push/index.ts
@@ -1,19 +1,21 @@
-import type { PushPayload, PushType } from '@n8n/api-types';
+import type { PushMessage } from '@n8n/api-types';
+import { Container, Service } from '@n8n/di';
 import type { Application } from 'express';
 import { ServerResponse } from 'http';
 import type { Server } from 'http';
+import { InstanceSettings, Logger } from 'n8n-core';
+import { deepCopy } from 'n8n-workflow';
 import type { Socket } from 'net';
-import { Container, Service } from 'typedi';
 import { parse as parseUrl } from 'url';
 import { Server as WSServer } from 'ws';
 
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';
+import { TRIMMED_TASK_DATA_CONNECTIONS } from '@/constants';
 import type { User } from '@/databases/entities/user';
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 import { TypedEmitter } from '@/typed-emitter';
 
 import { SSEPush } from './sse.push';
@@ -27,6 +29,12 @@ type PushEvents = {
 
 const useWebSockets = config.getEnv('push.backend') === 'websocket';
 
+/**
+ * Max allowed size of a push message in bytes. Events going through the pubsub
+ * channel are trimmed if exceeding this size.
+ */
+const MAX_PAYLOAD_SIZE_BYTES = 5 * 1024 * 1024; // 5 MiB
+
 /**
  * Push service for uni- or bi-directional communication with frontend clients.
  * Uses either server-sent events (SSE, unidirectional from backend --> frontend)
@@ -36,15 +44,17 @@ const useWebSockets = config.getEnv('push.backend') === 'websocket';
  */
 @Service()
 export class Push extends TypedEmitter<PushEvents> {
-	public isBidirectional = useWebSockets;
+	isBidirectional = useWebSockets;
 
 	private backend = useWebSockets ? Container.get(WebSocketPush) : Container.get(SSEPush);
 
 	constructor(
-		private readonly orchestrationService: OrchestrationService,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly publisher: Publisher,
+		private readonly logger: Logger,
 	) {
 		super();
+		this.logger = this.logger.scoped('push');
 
 		if (useWebSockets) this.backend.on('message', (msg) => this.emit('message', msg));
 	}
@@ -81,40 +91,96 @@ export class Push extends TypedEmitter<PushEvents> {
 		this.emit('editorUiConnected', pushRef);
 	}
 
-	broadcast<Type extends PushType>(type: Type, data: PushPayload<Type>) {
-		this.backend.sendToAll(type, data);
+	broadcast(pushMsg: PushMessage) {
+		this.backend.sendToAll(pushMsg);
 	}
 
-	send<Type extends PushType>(type: Type, data: PushPayload<Type>, pushRef: string) {
-		/**
-		 * Multi-main setup: In a manual webhook execution, the main process that
-		 * handles a webhook might not be the same as the main process that created
-		 * the webhook. If so, the handler process commands the creator process to
-		 * relay the former's execution lifecycle events to the creator's frontend.
-		 */
-		if (this.orchestrationService.isMultiMainSetupEnabled && !this.backend.hasPushRef(pushRef)) {
-			void this.publisher.publishCommand({
-				command: 'relay-execution-lifecycle-event',
-				payload: { type, args: data, pushRef },
-			});
+	/** Returns whether a given push ref is registered. */
+	hasPushRef(pushRef: string) {
+		return this.backend.hasPushRef(pushRef);
+	}
+
+	send(pushMsg: PushMessage, pushRef: string) {
+		if (this.shouldRelayViaPubSub(pushRef)) {
+			this.relayViaPubSub(pushMsg, pushRef);
 			return;
 		}
 
-		this.backend.sendToOne(type, data, pushRef);
+		this.backend.sendToOne(pushMsg, pushRef);
 	}
 
-	sendToUsers<Type extends PushType>(
-		type: Type,
-		data: PushPayload<Type>,
-		userIds: Array<User['id']>,
-	) {
-		this.backend.sendToUsers(type, data, userIds);
+	sendToUsers(pushMsg: PushMessage, userIds: Array<User['id']>) {
+		this.backend.sendToUsers(pushMsg, userIds);
 	}
 
 	@OnShutdown()
 	onShutdown() {
 		this.backend.closeAllConnections();
 	}
+
+	/**
+	 * Whether to relay a push message via pubsub channel to other instances,
+	 * instead of pushing the message directly to the frontend.
+	 *
+	 * This is needed in two scenarios:
+	 *
+	 * In scaling mode, in single- or multi-main setup, in a manual execution, a
+	 * worker has no connection to a frontend and so relays to all mains lifecycle
+	 * events for manual executions. Only the main who holds the session for the
+	 * execution will push to the frontend who commissioned the execution.
+	 *
+	 * In scaling mode, in multi-main setup, in a manual webhook execution, if
+	 * the main who handles a webhook is not the main who created the webhook,
+	 * the handler main relays execution lifecycle events to all mains. Only
+	 * the main who holds the session for the execution will push events to
+	 * the frontend who commissioned the execution.
+	 */
+	private shouldRelayViaPubSub(pushRef: string) {
+		const { isWorker, isMultiMain } = this.instanceSettings;
+
+		return isWorker || (isMultiMain && !this.hasPushRef(pushRef));
+	}
+
+	/**
+	 * Relay a push message via the `n8n.commands` pubsub channel,
+	 * reducing the payload size if too large.
+	 *
+	 * See {@link shouldRelayViaPubSub} for more details.
+	 */
+	private relayViaPubSub(pushMsg: PushMessage, pushRef: string) {
+		const eventSizeBytes = new TextEncoder().encode(JSON.stringify(pushMsg.data)).length;
+
+		if (eventSizeBytes <= MAX_PAYLOAD_SIZE_BYTES) {
+			void this.publisher.publishCommand({
+				command: 'relay-execution-lifecycle-event',
+				payload: { ...pushMsg, pushRef },
+			});
+			return;
+		}
+
+		// too large for pubsub channel, trim it
+
+		const pushMsgCopy = deepCopy(pushMsg);
+
+		const toMb = (bytes: number) => (bytes / (1024 * 1024)).toFixed(0);
+		const eventMb = toMb(eventSizeBytes);
+		const maxMb = toMb(MAX_PAYLOAD_SIZE_BYTES);
+		const { type } = pushMsgCopy;
+
+		this.logger.warn(`Size of "${type}" (${eventMb} MB) exceeds max size ${maxMb} MB. Trimming...`);
+
+		if (type === 'nodeExecuteAfter') {
+			pushMsgCopy.data.itemCount = pushMsgCopy.data.data.data?.main[0]?.length ?? 1;
+			pushMsgCopy.data.data.data = TRIMMED_TASK_DATA_CONNECTIONS;
+		} else if (type === 'executionFinished') {
+			pushMsgCopy.data.rawData = ''; // prompt client to fetch from DB
+		}
+
+		void this.publisher.publishCommand({
+			command: 'relay-execution-lifecycle-event',
+			payload: { ...pushMsgCopy, pushRef },
+		});
+	}
 }
 
 export const setupPushServer = (restEndpoint: string, server: Server, app: Application) => {
diff --git a/packages/cli/src/push/sse.push.ts b/packages/cli/src/push/sse.push.ts
index 04e39d6d79..9c92cc8cb3 100644
--- a/packages/cli/src/push/sse.push.ts
+++ b/packages/cli/src/push/sse.push.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { User } from '@/databases/entities/user';
 
diff --git a/packages/cli/src/push/websocket.push.ts b/packages/cli/src/push/websocket.push.ts
index a2ea39c500..297490f6cf 100644
--- a/packages/cli/src/push/websocket.push.ts
+++ b/packages/cli/src/push/websocket.push.ts
@@ -1,5 +1,5 @@
-import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
+import { ApplicationError } from 'n8n-workflow';
 import type WebSocket from 'ws';
 
 import type { User } from '@/databases/entities/user';
@@ -24,7 +24,7 @@ export class WebSocketPush extends AbstractPush<WebSocket> {
 
 				this.onMessageReceived(pushRef, JSON.parse(buffer.toString('utf8')));
 			} catch (error) {
-				ErrorReporterProxy.error(
+				this.errorReporter.error(
 					new ApplicationError('Error parsing push message', {
 						extra: {
 							userId,
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 4765ac1fad..b9a5ae97a3 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -1,28 +1,22 @@
+import type { ProjectIcon, ProjectRole, ProjectType } from '@n8n/api-types';
 import type { Scope } from '@n8n/permissions';
-import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
 import type express from 'express';
 import type {
-	BannerName,
 	ICredentialDataDecryptedObject,
 	IDataObject,
-	ILoadOptions,
 	INodeCredentialTestRequest,
-	INodeCredentials,
-	INodeParameters,
-	INodeTypeNameVersion,
 	IPersonalizationSurveyAnswersV4,
 	IUser,
 } from 'n8n-workflow';
 
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
-import type { Project, ProjectType } from '@/databases/entities/project';
+import type { Project } from '@/databases/entities/project';
 import type { AssignableRole, GlobalRole, User } from '@/databases/entities/user';
 import type { Variables } from '@/databases/entities/variables';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import type { WorkflowHistory } from '@/databases/entities/workflow-history';
-import type { PublicUser, SecretsProvider, SecretsProviderState } from '@/interfaces';
+import type { SecretsProvider, SecretsProviderState } from '@/interfaces';
 
-import type { ProjectRole } from './databases/entities/project-relation';
 import type { ScopesField } from './services/role.service';
 
 export type APIRequest<
@@ -125,7 +119,7 @@ export namespace ListQuery {
 }
 
 type SlimUser = Pick<IUser, 'id' | 'email' | 'firstName' | 'lastName'>;
-export type SlimProject = Pick<Project, 'id' | 'type' | 'name'>;
+export type SlimProject = Pick<Project, 'id' | 'type' | 'name' | 'icon'>;
 
 export function hasSharing(
 	workflows: ListQuery.Workflow.Plain[] | ListQuery.Workflow.WithSharing[],
@@ -144,6 +138,7 @@ export declare namespace CredentialRequest {
 		type: string;
 		data: ICredentialDataDecryptedObject;
 		projectId?: string;
+		isManaged?: boolean;
 	}>;
 
 	type Create = AuthenticatedRequest<{}, {}, CredentialProperties>;
@@ -196,53 +191,11 @@ export declare namespace MeRequest {
 	export type SurveyAnswers = AuthenticatedRequest<{}, {}, IPersonalizationSurveyAnswersV4>;
 }
 
-export interface UserSetupPayload {
-	email: string;
-	password: string;
-	firstName: string;
-	lastName: string;
-	mfaEnabled?: boolean;
-	mfaSecret?: string;
-	mfaRecoveryCodes?: string[];
-}
-
-// ----------------------------------
-//             /owner
-// ----------------------------------
-
-export declare namespace OwnerRequest {
-	type Post = AuthenticatedRequest<{}, {}, UserSetupPayload, {}>;
-
-	type DismissBanner = AuthenticatedRequest<{}, {}, Partial<{ bannerName: BannerName }>, {}>;
-}
-
-// ----------------------------------
-//     password reset endpoints
-// ----------------------------------
-
-export declare namespace PasswordResetRequest {
-	export type Email = AuthlessRequest<{}, {}, Pick<PublicUser, 'email'>>;
-
-	export type Credentials = AuthlessRequest<{}, {}, {}, { userId?: string; token?: string }>;
-
-	export type NewPassword = AuthlessRequest<
-		{},
-		{},
-		Pick<PublicUser, 'password'> & { token?: string; userId?: string; mfaToken?: string }
-	>;
-}
-
 // ----------------------------------
 //             /users
 // ----------------------------------
 
 export declare namespace UserRequest {
-	export type Invite = AuthenticatedRequest<
-		{},
-		{},
-		Array<{ email: string; role?: AssignableRole }>
-	>;
-
 	export type InviteResponse = {
 		user: {
 			id: string;
@@ -254,18 +207,6 @@ export declare namespace UserRequest {
 		error?: string;
 	};
 
-	export type ResolveSignUp = AuthlessRequest<
-		{},
-		{},
-		{},
-		{ inviterId?: string; inviteeId?: string }
-	>;
-
-	export type SignUp = AuthenticatedRequest<
-		{ id: string },
-		{ inviterId?: string; inviteeId?: string }
-	>;
-
 	export type Delete = AuthenticatedRequest<
 		{ id: string; email: string; identifier: string },
 		{},
@@ -281,44 +222,16 @@ export declare namespace UserRequest {
 	>;
 
 	export type PasswordResetLink = AuthenticatedRequest<{ id: string }, {}, {}, {}>;
-
-	export type Reinvite = AuthenticatedRequest<{ id: string }>;
-
-	export type Update = AuthlessRequest<
-		{ id: string },
-		{},
-		{
-			inviterId: string;
-			firstName: string;
-			lastName: string;
-			password: string;
-		}
-	>;
 }
 
-// ----------------------------------
-//             /login
-// ----------------------------------
-
-export type LoginRequest = AuthlessRequest<
-	{},
-	{},
-	{
-		email: string;
-		password: string;
-		mfaToken?: string;
-		mfaRecoveryCode?: string;
-	}
->;
-
 // ----------------------------------
 //          MFA endpoints
 // ----------------------------------
 
 export declare namespace MFA {
-	type Verify = AuthenticatedRequest<{}, {}, { token: string }, {}>;
-	type Activate = AuthenticatedRequest<{}, {}, { token: string }, {}>;
-	type Disable = AuthenticatedRequest<{}, {}, { token: string }, {}>;
+	type Verify = AuthenticatedRequest<{}, {}, { mfaCode: string }, {}>;
+	type Activate = AuthenticatedRequest<{}, {}, { mfaCode: string }, {}>;
+	type Disable = AuthenticatedRequest<{}, {}, { mfaCode?: string; mfaRecoveryCode?: string }, {}>;
 	type Config = AuthenticatedRequest<{}, {}, { login: { enabled: boolean } }, {}>;
 	type ValidateRecoveryCode = AuthenticatedRequest<
 		{},
@@ -335,7 +248,7 @@ export declare namespace MFA {
 export declare namespace OAuthRequest {
 	namespace OAuth1Credential {
 		type Auth = AuthenticatedRequest<{}, {}, {}, { id: string }>;
-		type Callback = AuthlessRequest<
+		type Callback = AuthenticatedRequest<
 			{},
 			{},
 			{},
@@ -347,62 +260,10 @@ export declare namespace OAuthRequest {
 
 	namespace OAuth2Credential {
 		type Auth = AuthenticatedRequest<{}, {}, {}, { id: string }>;
-		type Callback = AuthlessRequest<{}, {}, {}, { code: string; state: string }>;
+		type Callback = AuthenticatedRequest<{}, {}, {}, { code: string; state: string }>;
 	}
 }
 
-// ----------------------------------
-//      /dynamic-node-parameters
-// ----------------------------------
-export declare namespace DynamicNodeParametersRequest {
-	type BaseRequest<RequestBody = {}> = AuthenticatedRequest<
-		{},
-		{},
-		{
-			path: string;
-			nodeTypeAndVersion: INodeTypeNameVersion;
-			currentNodeParameters: INodeParameters;
-			methodName?: string;
-			credentials?: INodeCredentials;
-		} & RequestBody,
-		{}
-	>;
-
-	/** POST /dynamic-node-parameters/options */
-	type Options = BaseRequest<{
-		loadOptions?: ILoadOptions;
-	}>;
-
-	/** POST /dynamic-node-parameters/resource-locator-results */
-	type ResourceLocatorResults = BaseRequest<{
-		methodName: string;
-		filter?: string;
-		paginationToken?: string;
-	}>;
-
-	/** POST dynamic-node-parameters/resource-mapper-fields */
-	type ResourceMapperFields = BaseRequest<{
-		methodName: string;
-	}>;
-
-	/** POST /dynamic-node-parameters/action-result */
-	type ActionResult = BaseRequest<{
-		handler: string;
-		payload: IDataObject | string | undefined;
-	}>;
-}
-
-// ----------------------------------
-//             /tags
-// ----------------------------------
-
-export declare namespace TagsRequest {
-	type GetAll = AuthenticatedRequest<{}, {}, {}, { withUsageCount: string }>;
-	type Create = AuthenticatedRequest<{}, {}, { name: string }>;
-	type Update = AuthenticatedRequest<{ id: string }, {}, { name: string }>;
-	type Delete = AuthenticatedRequest<{ id: string }>;
-}
-
 // ----------------------------------
 //             /annotation-tags
 // ----------------------------------
@@ -516,31 +377,10 @@ export declare namespace ActiveWorkflowRequest {
 // ----------------------------------
 
 export declare namespace ProjectRequest {
-	type GetAll = AuthenticatedRequest<{}, Project[]>;
-
-	type Create = AuthenticatedRequest<
-		{},
-		Project,
-		{
-			name: string;
-		}
-	>;
-
-	type GetMyProjects = AuthenticatedRequest<
-		{},
-		Array<Project & { role: ProjectRole }>,
-		{},
-		{
-			includeScopes?: boolean;
-		}
-	>;
 	type GetMyProjectsResponse = Array<
 		Project & { role: ProjectRole | GlobalRole; scopes?: Scope[] }
 	>;
 
-	type GetPersonalProject = AuthenticatedRequest<{}, Project>;
-
-	type ProjectRelationPayload = { userId: string; role: ProjectRole };
 	type ProjectRelationResponse = {
 		id: string;
 		email: string;
@@ -551,18 +391,11 @@ export declare namespace ProjectRequest {
 	type ProjectWithRelations = {
 		id: string;
 		name: string | undefined;
+		icon: ProjectIcon;
 		type: ProjectType;
 		relations: ProjectRelationResponse[];
 		scopes: Scope[];
 	};
-
-	type Get = AuthenticatedRequest<{ projectId: string }, {}>;
-	type Update = AuthenticatedRequest<
-		{ projectId: string },
-		{},
-		{ name?: string; relations?: ProjectRelationPayload[] }
-	>;
-	type Delete = AuthenticatedRequest<{ projectId: string }, {}, {}, { transferId?: string }>;
 }
 
 // ----------------------------------
@@ -574,15 +407,3 @@ export declare namespace NpsSurveyRequest {
 	// once some schema validation is added
 	type NpsSurveyUpdate = AuthenticatedRequest<{}, {}, unknown>;
 }
-
-// ----------------------------------
-//             /ai-assistant
-// ----------------------------------
-
-export declare namespace AiAssistantRequest {
-	type Chat = AuthenticatedRequest<{}, {}, AiAssistantSDK.ChatRequestPayload>;
-
-	type SuggestionPayload = { sessionId: string; suggestionId: string };
-	type ApplySuggestionPayload = AuthenticatedRequest<{}, {}, SuggestionPayload>;
-	type AskAiPayload = AuthenticatedRequest<{}, {}, AiAssistantSDK.AskAiRequestPayload>;
-}
diff --git a/packages/cli/src/response-helper.ts b/packages/cli/src/response-helper.ts
index 0dff1625cb..74f274560e 100644
--- a/packages/cli/src/response-helper.ts
+++ b/packages/cli/src/response-helper.ts
@@ -1,16 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { Container } from '@n8n/di';
 import type { Request, Response } from 'express';
-import {
-	ErrorReporterProxy as ErrorReporter,
-	FORM_TRIGGER_PATH_IDENTIFIER,
-	NodeApiError,
-} from 'n8n-workflow';
+import { ErrorReporter, Logger } from 'n8n-core';
+import { FORM_TRIGGER_PATH_IDENTIFIER, NodeApiError } from 'n8n-workflow';
 import { Readable } from 'node:stream';
 import picocolors from 'picocolors';
-import Container from 'typedi';
 
 import { inDevelopment } from '@/constants';
-import { Logger } from '@/logging/logger.service';
 
 import { ResponseError } from './errors/response-errors/abstract/response.error';
 
@@ -103,6 +99,14 @@ export function sendErrorResponse(res: Response, error: Error) {
 			}
 		}
 
+		if (error.errorCode === 409 && originalUrl && originalUrl.includes('form-waiting')) {
+			//codes other than 200  breaks redirection to form-waiting page from form trigger
+			//render form page instead of json
+			return res.render('form-trigger-409', {
+				message: error.message,
+			});
+		}
+
 		httpStatusCode = error.httpStatusCode;
 
 		if (error.errorCode) {
@@ -133,7 +137,7 @@ export const isUniqueConstraintError = (error: Error) =>
 
 export function reportError(error: Error) {
 	if (!(error instanceof ResponseError) || error.httpStatusCode > 404) {
-		ErrorReporter.error(error);
+		Container.get(ErrorReporter).error(error);
 	}
 }
 
diff --git a/packages/cli/src/runners/__tests__/task-runner-process.test.ts b/packages/cli/src/runners/__tests__/task-runner-process.test.ts
deleted file mode 100644
index 1bae991811..0000000000
--- a/packages/cli/src/runners/__tests__/task-runner-process.test.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { TaskRunnersConfig } from '@n8n/config';
-import { mock } from 'jest-mock-extended';
-import type { ChildProcess, SpawnOptions } from 'node:child_process';
-
-import { mockInstance } from '../../../test/shared/mocking';
-import type { TaskRunnerAuthService } from '../auth/task-runner-auth.service';
-import { TaskRunnerProcess } from '../task-runner-process';
-
-const spawnMock = jest.fn(() =>
-	mock<ChildProcess>({
-		stdout: {
-			pipe: jest.fn(),
-		},
-		stderr: {
-			pipe: jest.fn(),
-		},
-	}),
-);
-require('child_process').spawn = spawnMock;
-
-describe('TaskRunnerProcess', () => {
-	const runnerConfig = mockInstance(TaskRunnersConfig);
-	runnerConfig.disabled = false;
-	runnerConfig.mode = 'internal_childprocess';
-	const authService = mock<TaskRunnerAuthService>();
-	const taskRunnerProcess = new TaskRunnerProcess(runnerConfig, authService);
-
-	afterEach(async () => {
-		spawnMock.mockClear();
-	});
-
-	describe('constructor', () => {
-		it('should throw if runner mode is external', () => {
-			runnerConfig.mode = 'external';
-
-			expect(() => new TaskRunnerProcess(runnerConfig, authService)).toThrow();
-
-			runnerConfig.mode = 'internal_childprocess';
-		});
-	});
-
-	describe('start', () => {
-		it('should propagate NODE_FUNCTION_ALLOW_BUILTIN and NODE_FUNCTION_ALLOW_EXTERNAL from env', async () => {
-			jest.spyOn(authService, 'createGrantToken').mockResolvedValue('grantToken');
-			process.env.NODE_FUNCTION_ALLOW_BUILTIN = '*';
-			process.env.NODE_FUNCTION_ALLOW_EXTERNAL = '*';
-
-			await taskRunnerProcess.start();
-
-			// @ts-expect-error The type is not correct
-			const options = spawnMock.mock.calls[0][2] as SpawnOptions;
-			expect(options.env).toEqual(
-				expect.objectContaining({
-					NODE_FUNCTION_ALLOW_BUILTIN: '*',
-					NODE_FUNCTION_ALLOW_EXTERNAL: '*',
-				}),
-			);
-		});
-	});
-});
diff --git a/packages/cli/src/runners/runner-ws-server.ts b/packages/cli/src/runners/runner-ws-server.ts
deleted file mode 100644
index 38b70c97dc..0000000000
--- a/packages/cli/src/runners/runner-ws-server.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { Service } from 'typedi';
-import type WebSocket from 'ws';
-
-import { Logger } from '@/logging/logger.service';
-
-import type {
-	RunnerMessage,
-	N8nMessage,
-	TaskRunnerServerInitRequest,
-	TaskRunnerServerInitResponse,
-} from './runner-types';
-import { TaskBroker, type MessageCallback, type TaskRunner } from './task-broker.service';
-
-function heartbeat(this: WebSocket) {
-	this.isAlive = true;
-}
-
-@Service()
-export class TaskRunnerService {
-	runnerConnections: Map<TaskRunner['id'], WebSocket> = new Map();
-
-	constructor(
-		private readonly logger: Logger,
-		private readonly taskBroker: TaskBroker,
-	) {}
-
-	sendMessage(id: TaskRunner['id'], message: N8nMessage.ToRunner.All) {
-		this.runnerConnections.get(id)?.send(JSON.stringify(message));
-	}
-
-	add(id: TaskRunner['id'], connection: WebSocket) {
-		connection.isAlive = true;
-		connection.on('pong', heartbeat);
-
-		let isConnected = false;
-
-		const onMessage = (data: WebSocket.RawData) => {
-			try {
-				const buffer = Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data);
-
-				const message: RunnerMessage.ToN8n.All = JSON.parse(
-					buffer.toString('utf8'),
-				) as RunnerMessage.ToN8n.All;
-
-				if (!isConnected && message.type !== 'runner:info') {
-					return;
-				} else if (!isConnected && message.type === 'runner:info') {
-					this.removeConnection(id);
-					isConnected = true;
-
-					this.runnerConnections.set(id, connection);
-
-					this.taskBroker.registerRunner(
-						{
-							id,
-							taskTypes: message.types,
-							lastSeen: new Date(),
-							name: message.name,
-						},
-						this.sendMessage.bind(this, id) as MessageCallback,
-					);
-
-					this.logger.info(`Runner "${message.name}"(${id}) has been registered`);
-					return;
-				}
-
-				void this.taskBroker.onRunnerMessage(id, message);
-			} catch (error) {
-				this.logger.error(`Couldn't parse message from runner "${id}"`, {
-					error: error as unknown,
-					id,
-					data,
-				});
-			}
-		};
-
-		// Makes sure to remove the session if the connection is closed
-		connection.once('close', () => {
-			connection.off('pong', heartbeat);
-			connection.off('message', onMessage);
-			this.removeConnection(id);
-		});
-
-		connection.on('message', onMessage);
-		connection.send(
-			JSON.stringify({ type: 'broker:inforequest' } as N8nMessage.ToRunner.InfoRequest),
-		);
-	}
-
-	removeConnection(id: TaskRunner['id']) {
-		const connection = this.runnerConnections.get(id);
-		if (connection) {
-			this.taskBroker.deregisterRunner(id);
-			connection.close();
-			this.runnerConnections.delete(id);
-		}
-	}
-
-	handleRequest(req: TaskRunnerServerInitRequest, _res: TaskRunnerServerInitResponse) {
-		this.add(req.query.id, req.ws);
-	}
-}
diff --git a/packages/cli/src/runners/task-runner-process.ts b/packages/cli/src/runners/task-runner-process.ts
deleted file mode 100644
index 413b74d725..0000000000
--- a/packages/cli/src/runners/task-runner-process.ts
+++ /dev/null
@@ -1,158 +0,0 @@
-import { TaskRunnersConfig } from '@n8n/config';
-import * as a from 'node:assert/strict';
-import { spawn } from 'node:child_process';
-import * as process from 'node:process';
-import { Service } from 'typedi';
-
-import { TaskRunnerAuthService } from './auth/task-runner-auth.service';
-import { OnShutdown } from '../decorators/on-shutdown';
-
-type ChildProcess = ReturnType<typeof spawn>;
-
-/**
- * Manages the JS task runner process as a child process
- */
-@Service()
-export class TaskRunnerProcess {
-	public get isRunning() {
-		return this.process !== null;
-	}
-
-	/** The process ID of the task runner process */
-	public get pid() {
-		return this.process?.pid;
-	}
-
-	/** Promise that resolves when the process has exited */
-	public get runPromise() {
-		return this._runPromise;
-	}
-
-	private get useLauncher() {
-		return this.runnerConfig.mode === 'internal_launcher';
-	}
-
-	private process: ChildProcess | null = null;
-
-	private _runPromise: Promise<void> | null = null;
-
-	private isShuttingDown = false;
-
-	constructor(
-		private readonly runnerConfig: TaskRunnersConfig,
-		private readonly authService: TaskRunnerAuthService,
-	) {
-		a.ok(
-			this.runnerConfig.mode === 'internal_childprocess' ||
-				this.runnerConfig.mode === 'internal_launcher',
-		);
-	}
-
-	async start() {
-		a.ok(!this.process, 'Task Runner Process already running');
-
-		const grantToken = await this.authService.createGrantToken();
-
-		const n8nUri = `127.0.0.1:${this.runnerConfig.port}`;
-		this.process = this.useLauncher
-			? this.startLauncher(grantToken, n8nUri)
-			: this.startNode(grantToken, n8nUri);
-
-		this.process.stdout?.pipe(process.stdout);
-		this.process.stderr?.pipe(process.stderr);
-
-		this.monitorProcess(this.process);
-	}
-
-	startNode(grantToken: string, n8nUri: string) {
-		const startScript = require.resolve('@n8n/task-runner');
-
-		return spawn('node', [startScript], {
-			env: {
-				PATH: process.env.PATH,
-				N8N_RUNNERS_GRANT_TOKEN: grantToken,
-				N8N_RUNNERS_N8N_URI: n8nUri,
-				N8N_RUNNERS_MAX_PAYLOAD: this.runnerConfig.maxPayload.toString(),
-				NODE_FUNCTION_ALLOW_BUILTIN: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
-				NODE_FUNCTION_ALLOW_EXTERNAL: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
-			},
-		});
-	}
-
-	startLauncher(grantToken: string, n8nUri: string) {
-		return spawn(this.runnerConfig.launcherPath, ['launch', this.runnerConfig.launcherRunner], {
-			env: {
-				PATH: process.env.PATH,
-				N8N_RUNNERS_GRANT_TOKEN: grantToken,
-				N8N_RUNNERS_N8N_URI: n8nUri,
-				N8N_RUNNERS_MAX_PAYLOAD: this.runnerConfig.maxPayload.toString(),
-				NODE_FUNCTION_ALLOW_BUILTIN: process.env.NODE_FUNCTION_ALLOW_BUILTIN,
-				NODE_FUNCTION_ALLOW_EXTERNAL: process.env.NODE_FUNCTION_ALLOW_EXTERNAL,
-				// For debug logging if enabled
-				RUST_LOG: process.env.RUST_LOG,
-			},
-		});
-	}
-
-	@OnShutdown()
-	async stop() {
-		if (!this.process) {
-			return;
-		}
-
-		this.isShuttingDown = true;
-
-		// TODO: Timeout & force kill
-		if (this.useLauncher) {
-			await this.killLauncher();
-		} else {
-			this.killNode();
-		}
-		await this._runPromise;
-
-		this.isShuttingDown = false;
-	}
-
-	killNode() {
-		if (!this.process) {
-			return;
-		}
-		this.process.kill();
-	}
-
-	async killLauncher() {
-		if (!this.process?.pid) {
-			return;
-		}
-
-		const killProcess = spawn(this.runnerConfig.launcherPath, [
-			'kill',
-			this.runnerConfig.launcherRunner,
-			this.process.pid.toString(),
-		]);
-
-		await new Promise<void>((resolve) => {
-			killProcess.on('exit', () => {
-				resolve();
-			});
-		});
-	}
-
-	private monitorProcess(taskRunnerProcess: ChildProcess) {
-		this._runPromise = new Promise((resolve) => {
-			taskRunnerProcess.on('exit', (code) => {
-				this.onProcessExit(code, resolve);
-			});
-		});
-	}
-
-	private onProcessExit(_code: number | null, resolveFn: () => void) {
-		this.process = null;
-		resolveFn();
-
-		// If we are not shutting down, restart the process
-		if (!this.isShuttingDown) {
-			setImmediate(async () => await this.start());
-		}
-	}
-}
diff --git a/packages/cli/src/scaling/__tests__/job-processor.service.test.ts b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts
new file mode 100644
index 0000000000..897986c915
--- /dev/null
+++ b/packages/cli/src/scaling/__tests__/job-processor.service.test.ts
@@ -0,0 +1,29 @@
+import { mock } from 'jest-mock-extended';
+
+import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import type { IExecutionResponse } from '@/interfaces';
+
+import { JobProcessor } from '../job-processor';
+import type { Job } from '../scaling.types';
+
+describe('JobProcessor', () => {
+	it('should refrain from processing a crashed execution', async () => {
+		const executionRepository = mock<ExecutionRepository>();
+		executionRepository.findSingleExecution.mockResolvedValue(
+			mock<IExecutionResponse>({ status: 'crashed' }),
+		);
+		const jobProcessor = new JobProcessor(
+			mock(),
+			mock(),
+			executionRepository,
+			mock(),
+			mock(),
+			mock(),
+			mock(),
+		);
+
+		const result = await jobProcessor.processJob(mock<Job>());
+
+		expect(result).toEqual({ success: false });
+	});
+});
diff --git a/packages/cli/src/scaling/__tests__/publisher.service.test.ts b/packages/cli/src/scaling/__tests__/publisher.service.test.ts
index f69ad08cb5..fb0a340c11 100644
--- a/packages/cli/src/scaling/__tests__/publisher.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/publisher.service.test.ts
@@ -65,6 +65,42 @@ describe('Publisher', () => {
 				JSON.stringify({ ...msg, senderId: hostId, selfSend: false, debounce: true }),
 			);
 		});
+
+		it('should not debounce `add-webhooks-triggers-and-pollers`', async () => {
+			const publisher = new Publisher(logger, redisClientService, instanceSettings);
+			const msg = mock<PubSub.Command>({ command: 'add-webhooks-triggers-and-pollers' });
+
+			await publisher.publishCommand(msg);
+
+			expect(client.publish).toHaveBeenCalledWith(
+				'n8n.commands',
+				JSON.stringify({
+					...msg,
+					_isMockObject: true,
+					senderId: hostId,
+					selfSend: true,
+					debounce: false,
+				}),
+			);
+		});
+
+		it('should not debounce `remove-triggers-and-pollers`', async () => {
+			const publisher = new Publisher(logger, redisClientService, instanceSettings);
+			const msg = mock<PubSub.Command>({ command: 'remove-triggers-and-pollers' });
+
+			await publisher.publishCommand(msg);
+
+			expect(client.publish).toHaveBeenCalledWith(
+				'n8n.commands',
+				JSON.stringify({
+					...msg,
+					_isMockObject: true,
+					senderId: hostId,
+					selfSend: true,
+					debounce: false,
+				}),
+			);
+		});
 	});
 
 	describe('publishWorkerResponse', () => {
diff --git a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts
index 314ded0b8b..bc15911913 100644
--- a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts
+++ b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts
@@ -7,17 +7,16 @@ import type { ActiveWorkflowManager } from '@/active-workflow-manager';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { EventService } from '@/events/event.service';
-import type { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
+import type { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee';
 import type { IWorkflowDb } from '@/interfaces';
 import type { License } from '@/license';
 import type { Push } from '@/push';
-import type { WebSocketPush } from '@/push/websocket.push';
 import type { CommunityPackagesService } from '@/services/community-packages.service';
 import type { TestWebhooks } from '@/webhooks/test-webhooks';
 
 import type { Publisher } from '../pubsub/publisher.service';
 import { PubSubHandler } from '../pubsub/pubsub-handler';
-import type { WorkerStatusService } from '../worker-status.service';
+import type { WorkerStatusService } from '../worker-status.service.ee';
 
 const flushPromises = async () => await new Promise((resolve) => setImmediate(resolve));
 
@@ -620,7 +619,10 @@ describe('PubSubHandler', () => {
 				expect(activeWorkflowManager.add).toHaveBeenCalledWith(workflowId, 'activate', undefined, {
 					shouldPublish: false,
 				});
-				expect(push.broadcast).toHaveBeenCalledWith('workflowActivated', { workflowId });
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowActivated',
+					data: { workflowId },
+				});
 				expect(publisher.publishCommand).toHaveBeenCalledWith({
 					command: 'display-workflow-activation',
 					payload: { workflowId },
@@ -680,7 +682,10 @@ describe('PubSubHandler', () => {
 				expect(activeWorkflowManager.removeWorkflowTriggersAndPollers).toHaveBeenCalledWith(
 					workflowId,
 				);
-				expect(push.broadcast).toHaveBeenCalledWith('workflowDeactivated', { workflowId });
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowDeactivated',
+					data: { workflowId },
+				});
 				expect(publisher.publishCommand).toHaveBeenCalledWith({
 					command: 'display-workflow-deactivation',
 					payload: { workflowId },
@@ -735,7 +740,10 @@ describe('PubSubHandler', () => {
 
 				eventService.emit('display-workflow-activation', { workflowId });
 
-				expect(push.broadcast).toHaveBeenCalledWith('workflowActivated', { workflowId });
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowActivated',
+					data: { workflowId },
+				});
 			});
 
 			it('should handle `display-workflow-deactivation` event', () => {
@@ -758,7 +766,10 @@ describe('PubSubHandler', () => {
 
 				eventService.emit('display-workflow-deactivation', { workflowId });
 
-				expect(push.broadcast).toHaveBeenCalledWith('workflowDeactivated', { workflowId });
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowDeactivated',
+					data: { workflowId },
+				});
 			});
 
 			it('should handle `display-workflow-activation-error` event', () => {
@@ -782,9 +793,12 @@ describe('PubSubHandler', () => {
 
 				eventService.emit('display-workflow-activation-error', { workflowId, errorMessage });
 
-				expect(push.broadcast).toHaveBeenCalledWith('workflowFailedToActivate', {
-					workflowId,
-					errorMessage,
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'workflowFailedToActivate',
+					data: {
+						workflowId,
+						errorMessage,
+					},
 				});
 			});
 
@@ -806,15 +820,19 @@ describe('PubSubHandler', () => {
 
 				const pushRef = 'test-push-ref';
 				const type = 'executionStarted';
-				const args = { testArg: 'value' };
+				const data = {
+					executionId: '123',
+					mode: 'webhook' as const,
+					startedAt: new Date(),
+					workflowId: '456',
+					flattedRunData: '[]',
+				};
 
-				push.getBackend.mockReturnValue(
-					mock<WebSocketPush>({ hasPushRef: jest.fn().mockReturnValue(true) }),
-				);
+				push.hasPushRef.mockReturnValue(true);
 
-				eventService.emit('relay-execution-lifecycle-event', { type, args, pushRef });
+				eventService.emit('relay-execution-lifecycle-event', { type, data, pushRef });
 
-				expect(push.send).toHaveBeenCalledWith(type, args, pushRef);
+				expect(push.send).toHaveBeenCalledWith({ type, data }, pushRef);
 			});
 
 			it('should handle `clear-test-webhooks` event', () => {
@@ -837,9 +855,7 @@ describe('PubSubHandler', () => {
 				const workflowEntity = mock<IWorkflowDb>({ id: 'test-workflow-id' });
 				const pushRef = 'test-push-ref';
 
-				push.getBackend.mockReturnValue(
-					mock<WebSocketPush>({ hasPushRef: jest.fn().mockReturnValue(true) }),
-				);
+				push.hasPushRef.mockReturnValue(true);
 				testWebhooks.toWorkflow.mockReturnValue(mock<Workflow>({ id: 'test-workflow-id' }));
 
 				eventService.emit('clear-test-webhooks', { webhookKey, workflowEntity, pushRef });
@@ -868,9 +884,12 @@ describe('PubSubHandler', () => {
 
 				eventService.emit('response-to-get-worker-status', workerStatus);
 
-				expect(push.broadcast).toHaveBeenCalledWith('sendWorkerStatusMessage', {
-					workerId: workerStatus.senderId,
-					status: workerStatus,
+				expect(push.broadcast).toHaveBeenCalledWith({
+					type: 'sendWorkerStatusMessage',
+					data: {
+						workerId: workerStatus.senderId,
+						status: workerStatus,
+					},
 				});
 			});
 		});
diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
index 0b5f80da48..2d03dac507 100644
--- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -1,11 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import * as BullModule from 'bull';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
-import { ApplicationError } from 'n8n-workflow';
-import Container from 'typedi';
+import { ApplicationError, ExecutionCancelledError } from 'n8n-workflow';
 
-import type { OrchestrationService } from '@/services/orchestration.service';
 import { mockInstance, mockLogger } from '@test/mocking';
 
 import { JOB_TYPE_NAME, QUEUE_NAME } from '../constants';
@@ -47,7 +46,6 @@ describe('ScalingService', () => {
 	});
 
 	const instanceSettings = Container.get(InstanceSettings);
-	const orchestrationService = mock<OrchestrationService>({ isMultiMainSetupEnabled: false });
 	const jobProcessor = mock<JobProcessor>();
 
 	let scalingService: ScalingService;
@@ -77,11 +75,12 @@ describe('ScalingService', () => {
 		scalingService = new ScalingService(
 			mockLogger(),
 			mock(),
+			mock(),
 			jobProcessor,
 			globalConfig,
 			mock(),
 			instanceSettings,
-			orchestrationService,
+			mock(),
 			mock(),
 		);
 
@@ -288,6 +287,8 @@ describe('ScalingService', () => {
 			const result = await scalingService.stopJob(job);
 
 			expect(job.progress).toHaveBeenCalledWith({ kind: 'abort-job' });
+			expect(job.discard).toHaveBeenCalled();
+			expect(job.moveToFailed).toHaveBeenCalledWith(new ExecutionCancelledError('123'), true);
 			expect(result).toBe(true);
 		});
 
diff --git a/packages/cli/src/scaling/constants.ts b/packages/cli/src/scaling/constants.ts
index e56596e4a0..336da006d8 100644
--- a/packages/cli/src/scaling/constants.ts
+++ b/packages/cli/src/scaling/constants.ts
@@ -1,3 +1,5 @@
+import type { PubSub } from './pubsub/pubsub.types';
+
 export const QUEUE_NAME = 'jobs';
 
 export const JOB_TYPE_NAME = 'job';
@@ -11,7 +13,7 @@ export const WORKER_RESPONSE_PUBSUB_CHANNEL = 'n8n.worker-response';
 /**
  * Commands that should be sent to the sender as well, e.g. during workflow activation and
  * deactivation in multi-main setup. */
-export const SELF_SEND_COMMANDS = new Set([
+export const SELF_SEND_COMMANDS = new Set<PubSub.Command['command']>([
 	'add-webhooks-triggers-and-pollers',
 	'remove-triggers-and-pollers',
 ]);
@@ -20,7 +22,8 @@ export const SELF_SEND_COMMANDS = new Set([
  * Commands that should not be debounced when received, e.g. during webhook handling in
  * multi-main setup.
  */
-export const IMMEDIATE_COMMANDS = new Set([
+export const IMMEDIATE_COMMANDS = new Set<PubSub.Command['command']>([
 	'add-webhooks-triggers-and-pollers',
+	'remove-triggers-and-pollers',
 	'relay-execution-lifecycle-event',
 ]);
diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts
index 9a531d3039..2aff0787c4 100644
--- a/packages/cli/src/scaling/job-processor.ts
+++ b/packages/cli/src/scaling/job-processor.ts
@@ -1,19 +1,19 @@
 import type { RunningJobSummary } from '@n8n/api-types';
-import { InstanceSettings, WorkflowExecute } from 'n8n-core';
-import type { ExecutionStatus, IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
-import {
-	BINARY_ENCODING,
-	ApplicationError,
-	Workflow,
-	ErrorReporterProxy as ErrorReporter,
+import { Service } from '@n8n/di';
+import { InstanceSettings, WorkflowExecute, ErrorReporter, Logger } from 'n8n-core';
+import type {
+	ExecutionStatus,
+	IExecuteResponsePromiseData,
+	IRun,
+	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
+import { BINARY_ENCODING, ApplicationError, Workflow } from 'n8n-workflow';
 import type PCancelable from 'p-cancelable';
-import { Service } from 'typedi';
 
 import config from '@/config';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { Logger } from '@/logging/logger.service';
+import { ManualExecutionService } from '@/manual-execution.service';
 import { NodeTypes } from '@/node-types';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
@@ -35,10 +35,12 @@ export class JobProcessor {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly nodeTypes: NodeTypes,
 		private readonly instanceSettings: InstanceSettings,
+		private readonly manualExecutionService: ManualExecutionService,
 	) {
 		this.logger = this.logger.scoped('scaling');
 	}
@@ -58,6 +60,13 @@ export class JobProcessor {
 			);
 		}
 
+		/**
+		 * Bull's implicit retry mechanism and n8n's execution recovery mechanism may
+		 * cause a crashed execution to be enqueued. We refrain from processing it,
+		 * until we have reworked both mechanisms to prevent this scenario.
+		 */
+		if (execution.status === 'crashed') return { success: false };
+
 		const workflowId = execution.workflowData.id;
 
 		this.logger.info(`Worker started execution ${executionId} (job ${job.id})`, {
@@ -113,13 +122,20 @@ export class JobProcessor {
 			executionTimeoutTimestamp,
 		);
 
+		const { pushRef } = job.data;
+
 		additionalData.hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerExecuter(
 			execution.mode,
 			job.data.executionId,
 			execution.workflowData,
-			{ retryOf: execution.retryOf as string },
+			{ retryOf: execution.retryOf as string, pushRef },
 		);
 
+		if (pushRef) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			additionalData.sendDataToUI = WorkflowExecuteAdditionalData.sendDataToUI.bind({ pushRef });
+		}
+
 		additionalData.hooks.hookFunctions.sendResponse = [
 			async (response: IExecuteResponsePromiseData): Promise<void> => {
 				const msg: RespondToWebhookMessage = {
@@ -144,11 +160,35 @@ export class JobProcessor {
 
 		let workflowExecute: WorkflowExecute;
 		let workflowRun: PCancelable<IRun>;
-		if (execution.data !== undefined) {
+
+		const { startData, resultData, manualData, isTestWebhook } = execution.data;
+
+		if (execution.mode === 'manual' && !isTestWebhook) {
+			const data: IWorkflowExecutionDataProcess = {
+				executionMode: execution.mode,
+				workflowData: execution.workflowData,
+				destinationNode: startData?.destinationNode,
+				startNodes: startData?.startNodes,
+				runData: resultData.runData,
+				pinData: resultData.pinData,
+				partialExecutionVersion: manualData?.partialExecutionVersion,
+				dirtyNodeNames: manualData?.dirtyNodeNames,
+				triggerToStartFrom: manualData?.triggerToStartFrom,
+				userId: manualData?.userId,
+			};
+
+			workflowRun = this.manualExecutionService.runManually(
+				data,
+				workflow,
+				additionalData,
+				executionId,
+				resultData.pinData,
+			);
+		} else if (execution.data !== undefined) {
 			workflowExecute = new WorkflowExecute(additionalData, execution.mode, execution.data);
 			workflowRun = workflowExecute.processRunExecutionData(workflow);
 		} else {
-			ErrorReporter.info(`Worker found execution ${executionId} without data`);
+			this.errorReporter.info(`Worker found execution ${executionId} without data`);
 			// Execute all nodes
 			// Can execute without webhook so go on
 			workflowExecute = new WorkflowExecute(additionalData, execution.mode);
diff --git a/packages/cli/src/scaling/multi-main-setup.ee.ts b/packages/cli/src/scaling/multi-main-setup.ee.ts
index 8be7f4ae51..52f186bdcc 100644
--- a/packages/cli/src/scaling/multi-main-setup.ee.ts
+++ b/packages/cli/src/scaling/multi-main-setup.ee.ts
@@ -1,10 +1,9 @@
 import { GlobalConfig } from '@n8n/config';
-import { InstanceSettings } from 'n8n-core';
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
+import { InstanceSettings, Logger } from 'n8n-core';
 
 import config from '@/config';
-import { TIME } from '@/constants';
-import { Logger } from '@/logging/logger.service';
+import { Time } from '@/constants';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
 import { RedisClientService } from '@/services/redis-client.service';
 import { TypedEmitter } from '@/typed-emitter';
@@ -54,7 +53,7 @@ export class MultiMainSetup extends TypedEmitter<MultiMainEvents> {
 
 		this.leaderCheckInterval = setInterval(async () => {
 			await this.checkLeader();
-		}, this.globalConfig.multiMainSetup.interval * TIME.SECOND);
+		}, this.globalConfig.multiMainSetup.interval * Time.seconds.toMilliseconds);
 	}
 
 	async shutdown() {
diff --git a/packages/cli/src/scaling/pubsub/publisher.service.ts b/packages/cli/src/scaling/pubsub/publisher.service.ts
index 248a455e3e..a0d2079704 100644
--- a/packages/cli/src/scaling/pubsub/publisher.service.ts
+++ b/packages/cli/src/scaling/pubsub/publisher.service.ts
@@ -1,9 +1,9 @@
+import { Service } from '@n8n/di';
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
-import { InstanceSettings } from 'n8n-core';
-import { Service } from 'typedi';
+import { InstanceSettings, Logger } from 'n8n-core';
+import type { LogMetadata } from 'n8n-workflow';
 
 import config from '@/config';
-import { Logger } from '@/logging/logger.service';
 import { RedisClientService } from '@/services/redis-client.service';
 
 import type { PubSub } from './pubsub.types';
@@ -45,7 +45,7 @@ export class Publisher {
 	// #region Publishing
 
 	/** Publish a command into the `n8n.commands` channel. */
-	async publishCommand(msg: Omit<PubSub.Command, 'senderId'>) {
+	async publishCommand(msg: PubSub.Command) {
 		// @TODO: Once this class is only ever used in scaling mode, remove next line.
 		if (config.getEnv('executions.mode') !== 'queue') return;
 
@@ -59,7 +59,18 @@ export class Publisher {
 			}),
 		);
 
-		this.logger.debug(`Published ${msg.command} to command channel`);
+		let msgName = msg.command;
+
+		const metadata: LogMetadata = { msg: msg.command, channel: 'n8n.commands' };
+
+		if (msg.command === 'relay-execution-lifecycle-event') {
+			const { data, type } = msg.payload;
+			msgName += ` (${type})`;
+			metadata.type = type;
+			if ('executionId' in data) metadata.executionId = data.executionId;
+		}
+
+		this.logger.debug(`Published pubsub msg: ${msgName}`, metadata);
 	}
 
 	/** Publish a response to a command into the `n8n.worker-response` channel. */
diff --git a/packages/cli/src/scaling/pubsub/pubsub-handler.ts b/packages/cli/src/scaling/pubsub/pubsub-handler.ts
index deeed5b584..25b189c141 100644
--- a/packages/cli/src/scaling/pubsub/pubsub-handler.ts
+++ b/packages/cli/src/scaling/pubsub/pubsub-handler.ts
@@ -1,13 +1,13 @@
+import { Service } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
 import { ensureError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { EventService } from '@/events/event.service';
 import type { PubSubEventMap } from '@/events/maps/pub-sub.event-map';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
+import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee';
 import { License } from '@/license';
 import { Push } from '@/push';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
@@ -16,7 +16,7 @@ import { assertNever } from '@/utils';
 import { TestWebhooks } from '@/webhooks/test-webhooks';
 
 import type { PubSub } from './pubsub.types';
-import { WorkerStatusService } from '../worker-status.service';
+import { WorkerStatusService } from '../worker-status.service.ee';
 
 /**
  * Responsible for handling events emitted from messages received via a pubsub channel.
@@ -59,9 +59,12 @@ export class PubSubHandler {
 					...this.commonHandlers,
 					...this.multiMainHandlers,
 					'response-to-get-worker-status': async (payload) =>
-						this.push.broadcast('sendWorkerStatusMessage', {
-							workerId: payload.senderId,
-							status: payload,
+						this.push.broadcast({
+							type: 'sendWorkerStatusMessage',
+							data: {
+								workerId: payload.senderId,
+								status: payload,
+							},
 						}),
 				});
 
@@ -113,7 +116,7 @@ export class PubSubHandler {
 					shouldPublish: false, // prevent leader from re-publishing message
 				});
 
-				this.push.broadcast('workflowActivated', { workflowId });
+				this.push.broadcast({ type: 'workflowActivated', data: { workflowId } });
 
 				await this.publisher.publishCommand({
 					command: 'display-workflow-activation',
@@ -125,7 +128,10 @@ export class PubSubHandler {
 
 				await this.workflowRepository.update(workflowId, { active: false });
 
-				this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage: message });
+				this.push.broadcast({
+					type: 'workflowFailedToActivate',
+					data: { workflowId, errorMessage: message },
+				});
 
 				await this.publisher.publishCommand({
 					command: 'display-workflow-activation-error',
@@ -139,7 +145,7 @@ export class PubSubHandler {
 			await this.activeWorkflowManager.removeActivationError(workflowId);
 			await this.activeWorkflowManager.removeWorkflowTriggersAndPollers(workflowId);
 
-			this.push.broadcast('workflowDeactivated', { workflowId });
+			this.push.broadcast({ type: 'workflowDeactivated', data: { workflowId } });
 
 			// instruct followers to show workflow deactivation in UI
 			await this.publisher.publishCommand({
@@ -148,18 +154,18 @@ export class PubSubHandler {
 			});
 		},
 		'display-workflow-activation': async ({ workflowId }) =>
-			this.push.broadcast('workflowActivated', { workflowId }),
+			this.push.broadcast({ type: 'workflowActivated', data: { workflowId } }),
 		'display-workflow-deactivation': async ({ workflowId }) =>
-			this.push.broadcast('workflowDeactivated', { workflowId }),
+			this.push.broadcast({ type: 'workflowDeactivated', data: { workflowId } }),
 		'display-workflow-activation-error': async ({ workflowId, errorMessage }) =>
-			this.push.broadcast('workflowFailedToActivate', { workflowId, errorMessage }),
-		'relay-execution-lifecycle-event': async ({ type, args, pushRef }) => {
-			if (!this.push.getBackend().hasPushRef(pushRef)) return;
+			this.push.broadcast({ type: 'workflowFailedToActivate', data: { workflowId, errorMessage } }),
+		'relay-execution-lifecycle-event': async ({ pushRef, ...pushMsg }) => {
+			if (!this.push.hasPushRef(pushRef)) return;
 
-			this.push.send(type, args, pushRef);
+			this.push.send(pushMsg, pushRef);
 		},
 		'clear-test-webhooks': async ({ webhookKey, workflowEntity, pushRef }) => {
-			if (!this.push.getBackend().hasPushRef(pushRef)) return;
+			if (!this.push.hasPushRef(pushRef)) return;
 
 			this.testWebhooks.clearTimeout(webhookKey);
 
diff --git a/packages/cli/src/scaling/pubsub/pubsub.types.ts b/packages/cli/src/scaling/pubsub/pubsub.types.ts
index eec0110201..501185d07e 100644
--- a/packages/cli/src/scaling/pubsub/pubsub.types.ts
+++ b/packages/cli/src/scaling/pubsub/pubsub.types.ts
@@ -23,10 +23,14 @@ export namespace PubSub {
 	// ----------------------------------
 
 	type _ToCommand<CommandKey extends keyof PubSubCommandMap> = {
-		senderId: string;
-		targets?: string[];
 		command: CommandKey;
 
+		/** Host ID of the sender, added during publishing. */
+		senderId?: string;
+
+		/** Host IDs of the receivers. */
+		targets?: string[];
+
 		/** Whether the command should be sent to the sender as well. */
 		selfSend?: boolean;
 
diff --git a/packages/cli/src/scaling/pubsub/subscriber.service.ts b/packages/cli/src/scaling/pubsub/subscriber.service.ts
index ed673fc4e4..4d2b5e3314 100644
--- a/packages/cli/src/scaling/pubsub/subscriber.service.ts
+++ b/packages/cli/src/scaling/pubsub/subscriber.service.ts
@@ -1,12 +1,12 @@
+import { Service } from '@n8n/di';
 import type { Redis as SingleNodeClient, Cluster as MultiNodeClient } from 'ioredis';
 import debounce from 'lodash/debounce';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { jsonParse } from 'n8n-workflow';
-import { Service } from 'typedi';
+import type { LogMetadata } from 'n8n-workflow';
 
 import config from '@/config';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logging/logger.service';
 import { RedisClientService } from '@/services/redis-client.service';
 
 import type { PubSub } from './pubsub.types';
@@ -72,7 +72,7 @@ export class Subscriber {
 		});
 
 		if (!msg) {
-			this.logger.error(`Received malformed message via channel ${channel}`, {
+			this.logger.error('Received malformed pubsub message', {
 				msg: str,
 				channel,
 			});
@@ -89,12 +89,18 @@ export class Subscriber {
 			return null;
 		}
 
-		const msgName = 'command' in msg ? msg.command : msg.response;
+		let msgName = 'command' in msg ? msg.command : msg.response;
 
-		this.logger.debug(`Received message ${msgName} via channel ${channel}`, {
-			msg,
-			channel,
-		});
+		const metadata: LogMetadata = { msg: msgName, channel };
+
+		if ('command' in msg && msg.command === 'relay-execution-lifecycle-event') {
+			const { data, type } = msg.payload;
+			msgName += ` (${type})`;
+			metadata.type = type;
+			if ('executionId' in data) metadata.executionId = data.executionId;
+		}
+
+		this.logger.debug(`Received pubsub msg: ${msgName}`, metadata);
 
 		return msg;
 	}
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index f7731e26c2..f20d0764c6 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -1,16 +1,16 @@
 import { GlobalConfig } from '@n8n/config';
-import { InstanceSettings } from 'n8n-core';
+import { Container, Service } from '@n8n/di';
+import { ErrorReporter, InstanceSettings, isObjectLiteral, Logger } from 'n8n-core';
 import {
 	ApplicationError,
 	BINARY_ENCODING,
 	sleep,
 	jsonStringify,
-	ErrorReporterProxy,
 	ensureError,
+	ExecutionCancelledError,
 } from 'n8n-workflow';
 import type { IExecuteResponsePromiseData } from 'n8n-workflow';
-import { strict } from 'node:assert';
-import Container, { Service } from 'typedi';
+import assert, { strict } from 'node:assert';
 
 import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
@@ -19,7 +19,6 @@ import { ExecutionRepository } from '@/databases/repositories/execution.reposito
 import { OnShutdown } from '@/decorators/on-shutdown';
 import { MaxStalledCountError } from '@/errors/max-stalled-count.error';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logging/logger.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { assertNever } from '@/utils';
 
@@ -43,6 +42,7 @@ export class ScalingService {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly jobProcessor: JobProcessor,
 		private readonly globalConfig: GlobalConfig,
@@ -72,9 +72,11 @@ export class ScalingService {
 
 		this.registerListeners();
 
-		if (this.instanceSettings.isLeader) this.scheduleQueueRecovery();
+		const { isLeader, isMultiMain } = this.instanceSettings;
 
-		if (this.orchestrationService.isMultiMainSetupEnabled) {
+		if (isLeader) this.scheduleQueueRecovery();
+
+		if (isMultiMain) {
 			this.orchestrationService.multiMainSetup
 				.on('leader-takeover', () => this.scheduleQueueRecovery())
 				.on('leader-stepdown', () => this.stopQueueRecovery());
@@ -91,6 +93,12 @@ export class ScalingService {
 
 		void this.queue.process(JOB_TYPE_NAME, concurrency, async (job: Job) => {
 			try {
+				if (!this.hasValidJobData(job)) {
+					throw new ApplicationError('Worker received invalid job', {
+						extra: { jobData: jsonStringify(job, { replaceCircularRefs: true }) },
+					});
+				}
+
 				await this.jobProcessor.processJob(job);
 			} catch (error) {
 				await this.reportJobProcessingError(ensureError(error), job);
@@ -119,7 +127,7 @@ export class ScalingService {
 
 		await job.progress(msg);
 
-		ErrorReporterProxy.error(error, { executionId });
+		this.errorReporter.error(error, { executionId });
 
 		throw error;
 	}
@@ -133,7 +141,7 @@ export class ScalingService {
 	}
 
 	private async stopMain() {
-		if (this.orchestrationService.isSingleMainSetup) {
+		if (this.instanceSettings.isSingleMain) {
 			await this.queue.pause(true, true); // no more jobs will be picked up
 			this.logger.debug('Queue paused');
 		}
@@ -211,7 +219,8 @@ export class ScalingService {
 		try {
 			if (await job.isActive()) {
 				await job.progress({ kind: 'abort-job' }); // being processed by worker
-				this.logger.debug('Stopped active job', props);
+				await job.discard(); // prevent retries
+				await job.moveToFailed(new ExecutionCancelledError(job.data.executionId), true); // remove from queue
 				return true;
 			}
 
@@ -219,8 +228,15 @@ export class ScalingService {
 			this.logger.debug('Stopped inactive job', props);
 			return true;
 		} catch (error: unknown) {
-			await job.progress({ kind: 'abort-job' });
-			this.logger.error('Failed to stop job', { ...props, error });
+			assert(error instanceof Error);
+			this.logger.error('Failed to stop job', {
+				...props,
+				error: {
+					message: error.message,
+					name: error.name,
+					stack: error.stack,
+				},
+			});
 			return false;
 		}
 	}
@@ -379,7 +395,7 @@ export class ScalingService {
 		return (
 			this.globalConfig.endpoints.metrics.includeQueueMetrics &&
 			this.instanceSettings.instanceType === 'main' &&
-			!this.orchestrationService.isMultiMainSetupEnabled
+			this.instanceSettings.isSingleMain
 		);
 	}
 
@@ -493,5 +509,9 @@ export class ScalingService {
 			: jsonStringify(error, { replaceCircularRefs: true });
 	}
 
+	private hasValidJobData(job: Job) {
+		return isObjectLiteral(job.data) && 'executionId' in job.data && 'loadStaticData' in job.data;
+	}
+
 	// #endregion
 }
diff --git a/packages/cli/src/scaling/scaling.types.ts b/packages/cli/src/scaling/scaling.types.ts
index ae7e790a16..3c69294172 100644
--- a/packages/cli/src/scaling/scaling.types.ts
+++ b/packages/cli/src/scaling/scaling.types.ts
@@ -12,6 +12,7 @@ export type JobId = Job['id'];
 export type JobData = {
 	executionId: string;
 	loadStaticData: boolean;
+	pushRef?: string;
 };
 
 export type JobResult = {
diff --git a/packages/cli/src/scaling/worker-server.ts b/packages/cli/src/scaling/worker-server.ts
index ee622d789c..07b9533626 100644
--- a/packages/cli/src/scaling/worker-server.ts
+++ b/packages/cli/src/scaling/worker-server.ts
@@ -1,11 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import type { Application } from 'express';
 import express from 'express';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { strict as assert } from 'node:assert';
 import http from 'node:http';
 import type { Server } from 'node:http';
-import { Service } from 'typedi';
 
 import { CredentialsOverwrites } from '@/credentials-overwrites';
 import * as Db from '@/db';
@@ -13,7 +13,6 @@ import { CredentialsOverwritesAlreadySetError } from '@/errors/credentials-overw
 import { NonJsonBodyError } from '@/errors/non-json-body.error';
 import { ExternalHooks } from '@/external-hooks';
 import type { ICredentialsOverwrite } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { PrometheusMetricsService } from '@/metrics/prometheus-metrics.service';
 import { rawBodyReader, bodyParser } from '@/middlewares';
 import * as ResponseHelper from '@/response-helper';
diff --git a/packages/cli/src/scaling/worker-status.service.ts b/packages/cli/src/scaling/worker-status.service.ee.ts
similarity index 97%
rename from packages/cli/src/scaling/worker-status.service.ts
rename to packages/cli/src/scaling/worker-status.service.ee.ts
index a50a1b8d2e..226ee3f70f 100644
--- a/packages/cli/src/scaling/worker-status.service.ts
+++ b/packages/cli/src/scaling/worker-status.service.ee.ts
@@ -1,7 +1,7 @@
 import type { WorkerStatus } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
 import os from 'node:os';
-import { Service } from 'typedi';
 
 import { N8N_VERSION } from '@/constants';
 
diff --git a/packages/cli/src/secrets-helpers.ts b/packages/cli/src/secrets-helpers.ee.ts
similarity index 87%
rename from packages/cli/src/secrets-helpers.ts
rename to packages/cli/src/secrets-helpers.ee.ts
index 88a75ae3da..7390bf8795 100644
--- a/packages/cli/src/secrets-helpers.ts
+++ b/packages/cli/src/secrets-helpers.ee.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import type { SecretsHelpersBase } from 'n8n-workflow';
-import { Service } from 'typedi';
 
-import { ExternalSecretsManager } from './external-secrets/external-secrets-manager.ee';
+import { ExternalSecretsManager } from './external-secrets.ee/external-secrets-manager.ee';
 
 @Service()
 export class SecretsHelper implements SecretsHelpersBase {
diff --git a/packages/cli/src/security-audit/risk-reporters/credentials-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/credentials-risk-reporter.ts
index ab7873e808..ca8bf11415 100644
--- a/packages/cli/src/security-audit/risk-reporters/credentials-risk-reporter.ts
+++ b/packages/cli/src/security-audit/risk-reporters/credentials-risk-reporter.ts
@@ -1,7 +1,7 @@
+import { SecurityConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import type { IWorkflowBase } from 'n8n-workflow';
-import { Service } from 'typedi';
 
-import config from '@/config';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository';
@@ -15,10 +15,11 @@ export class CredentialsRiskReporter implements RiskReporter {
 		private readonly credentialsRepository: CredentialsRepository,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly executionDataRepository: ExecutionDataRepository,
+		private readonly securityConfig: SecurityConfig,
 	) {}
 
 	async report(workflows: WorkflowEntity[]) {
-		const days = config.getEnv('security.audit.daysAbandonedWorkflow');
+		const days = this.securityConfig.daysAbandonedWorkflow;
 
 		const allExistingCreds = await this.getAllExistingCreds();
 		const { credsInAnyUse, credsInActiveUse } = await this.getAllCredsInUse(workflows);
diff --git a/packages/cli/src/security-audit/risk-reporters/database-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/database-risk-reporter.ts
index 9dad0829ae..f66ae02282 100644
--- a/packages/cli/src/security-audit/risk-reporters/database-risk-reporter.ts
+++ b/packages/cli/src/security-audit/risk-reporters/database-risk-reporter.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { WorkflowEntity as Workflow } from '@/databases/entities/workflow-entity';
 import {
diff --git a/packages/cli/src/security-audit/risk-reporters/filesystem-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/filesystem-risk-reporter.ts
index 645e6f8684..a73b152d2e 100644
--- a/packages/cli/src/security-audit/risk-reporters/filesystem-risk-reporter.ts
+++ b/packages/cli/src/security-audit/risk-reporters/filesystem-risk-reporter.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/security-audit/constants';
diff --git a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts
index b0d6ccfad3..8d870b5d76 100644
--- a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts
+++ b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts
@@ -1,12 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import axios from 'axios';
-import { InstanceSettings } from 'n8n-core';
-import { Service } from 'typedi';
+import { InstanceSettings, Logger } from 'n8n-core';
 
 import config from '@/config';
 import { getN8nPackageJson, inDevelopment } from '@/constants';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
-import { Logger } from '@/logging/logger.service';
 import { isApiEnabled } from '@/public-api';
 import {
 	ENV_VARS_DOCS_URL,
@@ -103,7 +102,7 @@ export class InstanceRiskReporter implements RiskReporter {
 		};
 
 		settings.telemetry = {
-			diagnosticsEnabled: config.getEnv('diagnostics.enabled'),
+			diagnosticsEnabled: this.globalConfig.diagnostics.enabled,
 		};
 
 		return settings;
@@ -119,7 +118,7 @@ export class InstanceRiskReporter implements RiskReporter {
 		node: WorkflowEntity['nodes'][number];
 		workflow: WorkflowEntity;
 	}) {
-		const childNodeNames = workflow.connections[node.name]?.main[0].map((i) => i.node);
+		const childNodeNames = workflow.connections[node.name]?.main[0]?.map((i) => i.node);
 
 		if (!childNodeNames) return false;
 
diff --git a/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts
index 4908ff9329..58f6da5e18 100644
--- a/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts
+++ b/packages/cli/src/security-audit/risk-reporters/nodes-risk-reporter.ts
@@ -1,7 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import glob from 'fast-glob';
 import * as path from 'path';
-import { Service } from 'typedi';
 
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
diff --git a/packages/cli/src/security-audit/security-audit.service.ts b/packages/cli/src/security-audit/security-audit.service.ts
index 19582450c4..b0946b5409 100644
--- a/packages/cli/src/security-audit/security-audit.service.ts
+++ b/packages/cli/src/security-audit/security-audit.service.ts
@@ -1,4 +1,5 @@
-import Container, { Service } from 'typedi';
+import { SecurityConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 
 import config from '@/config';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -8,7 +9,10 @@ import { toReportTitle } from '@/security-audit/utils';
 
 @Service()
 export class SecurityAuditService {
-	constructor(private readonly workflowRepository: WorkflowRepository) {}
+	constructor(
+		private readonly workflowRepository: WorkflowRepository,
+		private readonly securityConfig: SecurityConfig,
+	) {}
 
 	private reporters: {
 		[name: string]: RiskReporter;
@@ -19,7 +23,7 @@ export class SecurityAuditService {
 
 		await this.initReporters(categories);
 
-		const daysFromEnv = config.getEnv('security.audit.daysAbandonedWorkflow');
+		const daysFromEnv = this.securityConfig.daysAbandonedWorkflow;
 
 		if (daysAbandonedWorkflow) {
 			config.set('security.audit.daysAbandonedWorkflow', daysAbandonedWorkflow);
diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts
index 3cfd93054b..17ffd66ad9 100644
--- a/packages/cli/src/server.ts
+++ b/packages/cli/src/server.ts
@@ -1,10 +1,10 @@
+import { Container, Service } from '@n8n/di';
 import cookieParser from 'cookie-parser';
 import express from 'express';
 import { access as fsAccess } from 'fs/promises';
 import helmet from 'helmet';
 import { InstanceSettings } from 'n8n-core';
 import { resolve } from 'path';
-import { Container, Service } from 'typedi';
 
 import { AbstractServer } from '@/abstract-server';
 import config from '@/config';
@@ -23,7 +23,7 @@ import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'
 import { EventService } from '@/events/event.service';
 import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay';
 import type { ICredentialsOverwrite } from '@/interfaces';
-import { isLdapEnabled } from '@/ldap/helpers.ee';
+import { isLdapEnabled } from '@/ldap.ee/helpers.ee';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { handleMfaDisable, isMfaFeatureEnabled } from '@/mfa/helpers';
 import { PostHogClient } from '@/posthog';
@@ -32,7 +32,6 @@ import { setupPushServer, setupPushHandler, Push } from '@/push';
 import type { APIRequest } from '@/requests';
 import * as ResponseHelper from '@/response-helper';
 import type { FrontendService } from '@/services/frontend.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 
 import '@/controllers/active-workflows.controller';
 import '@/controllers/annotation-tags.controller.ee';
@@ -61,9 +60,12 @@ import '@/credentials/credentials.controller';
 import '@/eventbus/event-bus.controller';
 import '@/events/events.controller';
 import '@/executions/executions.controller';
-import '@/external-secrets/external-secrets.controller.ee';
+import '@/external-secrets.ee/external-secrets.controller.ee';
 import '@/license/license.controller';
-import '@/workflows/workflow-history/workflow-history.controller.ee';
+import '@/evaluation.ee/test-definitions.controller.ee';
+import '@/evaluation.ee/metrics.controller';
+import '@/evaluation.ee/test-runs.controller.ee';
+import '@/workflows/workflow-history.ee/workflow-history.controller.ee';
 import '@/workflows/workflows.controller';
 
 @Service()
@@ -76,7 +78,6 @@ export class Server extends AbstractServer {
 
 	constructor(
 		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
-		private readonly orchestrationService: OrchestrationService,
 		private readonly postHogClient: PostHogClient,
 		private readonly eventService: EventService,
 		private readonly instanceSettings: InstanceSettings,
@@ -108,13 +109,13 @@ export class Server extends AbstractServer {
 	}
 
 	private async registerAdditionalControllers() {
-		if (!inProduction && this.orchestrationService.isMultiMainSetupEnabled) {
+		if (!inProduction && this.instanceSettings.isMultiMain) {
 			await import('@/controllers/debug.controller');
 		}
 
 		if (isLdapEnabled()) {
-			const { LdapService } = await import('@/ldap/ldap.service.ee');
-			await import('@/ldap/ldap.controller.ee');
+			const { LdapService } = await import('@/ldap.ee/ldap.service.ee');
+			await import('@/ldap.ee/ldap.controller.ee');
 			await Container.get(LdapService).init();
 		}
 
@@ -134,6 +135,9 @@ export class Server extends AbstractServer {
 			await import('@/controllers/cta.controller');
 		}
 
+		if (!this.globalConfig.tags.disabled) {
+			await import('@/controllers/tags.controller');
+		}
 		// ----------------------------------------
 		// SAML
 		// ----------------------------------------
@@ -141,9 +145,9 @@ export class Server extends AbstractServer {
 		// initialize SamlService if it is licensed, even if not enabled, to
 		// set up the initial environment
 		try {
-			const { SamlService } = await import('@/sso/saml/saml.service.ee');
+			const { SamlService } = await import('@/sso.ee/saml/saml.service.ee');
 			await Container.get(SamlService).init();
-			await import('@/sso/saml/routes/saml.controller.ee');
+			await import('@/sso.ee/saml/routes/saml.controller.ee');
 		} catch (error) {
 			this.logger.warn(`SAML initialization failed: ${(error as Error).message}`);
 		}
@@ -153,11 +157,11 @@ export class Server extends AbstractServer {
 		// ----------------------------------------
 		try {
 			const { SourceControlService } = await import(
-				'@/environments/source-control/source-control.service.ee'
+				'@/environments.ee/source-control/source-control.service.ee'
 			);
 			await Container.get(SourceControlService).init();
-			await import('@/environments/source-control/source-control.controller.ee');
-			await import('@/environments/variables/variables.controller.ee');
+			await import('@/environments.ee/source-control/source-control.controller.ee');
+			await import('@/environments.ee/variables/variables.controller.ee');
 		} catch (error) {
 			this.logger.warn(`Source Control initialization failed: ${(error as Error).message}`);
 		}
diff --git a/packages/cli/src/services/__tests__/ai.service.test.ts b/packages/cli/src/services/__tests__/ai.service.test.ts
new file mode 100644
index 0000000000..dbdcaa3e71
--- /dev/null
+++ b/packages/cli/src/services/__tests__/ai.service.test.ts
@@ -0,0 +1,132 @@
+import type {
+	AiAskRequestDto,
+	AiApplySuggestionRequestDto,
+	AiChatRequestDto,
+} from '@n8n/api-types';
+import type { GlobalConfig } from '@n8n/config';
+import { AiAssistantClient, type AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
+import { mock } from 'jest-mock-extended';
+import type { IUser } from 'n8n-workflow';
+
+import { N8N_VERSION } from '@/constants';
+import type { License } from '@/license';
+
+import { AiService } from '../ai.service';
+
+jest.mock('@n8n_io/ai-assistant-sdk', () => ({
+	AiAssistantClient: jest.fn(),
+}));
+
+describe('AiService', () => {
+	let aiService: AiService;
+
+	const baseUrl = 'https://ai-assistant-url.com';
+	const user = mock<IUser>({ id: 'user123' });
+	const client = mock<AiAssistantClient>();
+	const license = mock<License>();
+	const globalConfig = mock<GlobalConfig>({
+		logging: { level: 'info' },
+		aiAssistant: { baseUrl },
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		(AiAssistantClient as jest.Mock).mockImplementation(() => client);
+		aiService = new AiService(license, globalConfig);
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('init', () => {
+		it('should not initialize client if AI assistant is not enabled', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(false);
+
+			await aiService.init();
+
+			expect(AiAssistantClient).not.toHaveBeenCalled();
+		});
+
+		it('should initialize client when AI assistant is enabled', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(true);
+			license.loadCertStr.mockResolvedValue('mock-license-cert');
+			license.getConsumerId.mockReturnValue('mock-consumer-id');
+
+			await aiService.init();
+
+			expect(AiAssistantClient).toHaveBeenCalledWith({
+				licenseCert: 'mock-license-cert',
+				consumerId: 'mock-consumer-id',
+				n8nVersion: N8N_VERSION,
+				baseUrl,
+				logLevel: 'info',
+			});
+		});
+	});
+
+	describe('chat', () => {
+		const payload = mock<AiChatRequestDto>();
+
+		it('should call client chat method after initialization', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(true);
+			const clientResponse = mock<Response>();
+			client.chat.mockResolvedValue(clientResponse);
+
+			const result = await aiService.chat(payload, user);
+
+			expect(client.chat).toHaveBeenCalledWith(payload, { id: user.id });
+			expect(result).toEqual(clientResponse);
+		});
+
+		it('should throw error if client is not initialized', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(false);
+
+			await expect(aiService.chat(payload, user)).rejects.toThrow('Assistant client not setup');
+		});
+	});
+
+	describe('applySuggestion', () => {
+		const payload = mock<AiApplySuggestionRequestDto>();
+
+		it('should call client applySuggestion', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(true);
+			const clientResponse = mock<AiAssistantSDK.ApplySuggestionResponse>();
+			client.applySuggestion.mockResolvedValue(clientResponse);
+
+			const result = await aiService.applySuggestion(payload, user);
+
+			expect(client.applySuggestion).toHaveBeenCalledWith(payload, { id: user.id });
+			expect(result).toEqual(clientResponse);
+		});
+
+		it('should throw error if client is not initialized', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(false);
+
+			await expect(aiService.applySuggestion(payload, user)).rejects.toThrow(
+				'Assistant client not setup',
+			);
+		});
+	});
+
+	describe('askAi', () => {
+		const payload = mock<AiAskRequestDto>();
+
+		it('should call client askAi method after initialization', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(true);
+			const clientResponse = mock<AiAssistantSDK.AskAiResponsePayload>();
+			client.askAi.mockResolvedValue(clientResponse);
+
+			const result = await aiService.askAi(payload, user);
+
+			expect(client.askAi).toHaveBeenCalledWith(payload, { id: user.id });
+			expect(result).toEqual(clientResponse);
+		});
+
+		it('should throw error if client is not initialized', async () => {
+			license.isAiAssistantEnabled.mockReturnValue(false);
+
+			await expect(aiService.askAi(payload, user)).rejects.toThrow('Assistant client not setup');
+		});
+	});
+});
diff --git a/packages/cli/src/services/__tests__/community-packages.service.test.ts b/packages/cli/src/services/__tests__/community-packages.service.test.ts
index df4591cd08..7298e73a63 100644
--- a/packages/cli/src/services/__tests__/community-packages.service.test.ts
+++ b/packages/cli/src/services/__tests__/community-packages.service.test.ts
@@ -410,6 +410,12 @@ describe('CommunityPackagesService', () => {
 				expect.any(Object),
 				expect.any(Function),
 			);
+			expect(loadNodesAndCredentials.unloadPackage).toHaveBeenCalledWith(
+				installedPackage.packageName,
+			);
+			expect(loadNodesAndCredentials.loadPackage).toHaveBeenCalledWith(
+				installedPackage.packageName,
+			);
 		});
 
 		test('should throw when not licensed', async () => {
diff --git a/packages/cli/src/services/__tests__/credentials-tester.service.test.ts b/packages/cli/src/services/__tests__/credentials-tester.service.test.ts
index 4da925c532..60c49b7773 100644
--- a/packages/cli/src/services/__tests__/credentials-tester.service.test.ts
+++ b/packages/cli/src/services/__tests__/credentials-tester.service.test.ts
@@ -8,7 +8,13 @@ import { CredentialsTester } from '@/services/credentials-tester.service';
 describe('CredentialsTester', () => {
 	const credentialTypes = mock<CredentialTypes>();
 	const nodeTypes = mock<NodeTypes>();
-	const credentialsTester = new CredentialsTester(mock(), credentialTypes, nodeTypes, mock());
+	const credentialsTester = new CredentialsTester(
+		mock(),
+		mock(),
+		credentialTypes,
+		nodeTypes,
+		mock(),
+	);
 
 	beforeEach(() => {
 		jest.clearAllMocks();
diff --git a/packages/cli/src/services/__tests__/execution-metadata.service.test.ts b/packages/cli/src/services/__tests__/execution-metadata.service.test.ts
index 4b713d6872..309da5a354 100644
--- a/packages/cli/src/services/__tests__/execution-metadata.service.test.ts
+++ b/packages/cli/src/services/__tests__/execution-metadata.service.test.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
 import { ExecutionMetadataService } from '@/services/execution-metadata.service';
diff --git a/packages/cli/src/services/__tests__/orchestration.service.test.ts b/packages/cli/src/services/__tests__/orchestration.service.test.ts
index a8e72c49bf..89c043a589 100644
--- a/packages/cli/src/services/__tests__/orchestration.service.test.ts
+++ b/packages/cli/src/services/__tests__/orchestration.service.test.ts
@@ -1,11 +1,11 @@
+import { Container } from '@n8n/di';
 import type Redis from 'ioredis';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
-import Container from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import config from '@/config';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
+import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee';
 import { Push } from '@/push';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { RedisClientService } from '@/services/redis-client.service';
diff --git a/packages/cli/src/services/__tests__/ownership.service.test.ts b/packages/cli/src/services/__tests__/ownership.service.test.ts
index ee6922dd76..6e79c83bb2 100644
--- a/packages/cli/src/services/__tests__/ownership.service.test.ts
+++ b/packages/cli/src/services/__tests__/ownership.service.test.ts
@@ -1,4 +1,5 @@
 import { mock } from 'jest-mock-extended';
+import { v4 as uuid } from 'uuid';
 
 import { Project } from '@/databases/entities/project';
 import { ProjectRelation } from '@/databases/entities/project-relation';
@@ -13,12 +14,15 @@ import { OwnershipService } from '@/services/ownership.service';
 import { mockCredential, mockProject } from '@test/mock-objects';
 import { mockInstance } from '@test/mocking';
 
+import { CacheService } from '../cache/cache.service';
+
 describe('OwnershipService', () => {
 	const userRepository = mockInstance(UserRepository);
 	const sharedWorkflowRepository = mockInstance(SharedWorkflowRepository);
 	const projectRelationRepository = mockInstance(ProjectRelationRepository);
+	const cacheService = mockInstance(CacheService);
 	const ownershipService = new OwnershipService(
-		mock(),
+		cacheService,
 		userRepository,
 		mock(),
 		projectRelationRepository,
@@ -52,22 +56,22 @@ describe('OwnershipService', () => {
 		});
 	});
 
-	describe('getProjectOwnerCached()', () => {
+	describe('getPersonalProjectOwnerCached()', () => {
 		test('should retrieve a project owner', async () => {
-			const mockProject = new Project();
-			const mockOwner = new User();
-
-			const projectRelation = Object.assign(new ProjectRelation(), {
-				role: 'project:personalOwner',
-				project: mockProject,
-				user: mockOwner,
-			});
+			// ARRANGE
+			const project = new Project();
+			const owner = new User();
+			const projectRelation = new ProjectRelation();
+			projectRelation.role = 'project:personalOwner';
+			(projectRelation.project = project), (projectRelation.user = owner);
 
 			projectRelationRepository.getPersonalProjectOwners.mockResolvedValueOnce([projectRelation]);
 
+			// ACT
 			const returnedOwner = await ownershipService.getPersonalProjectOwnerCached('some-project-id');
 
-			expect(returnedOwner).toBe(mockOwner);
+			// ASSERT
+			expect(returnedOwner).toBe(owner);
 		});
 
 		test('should not throw if no project owner found, should return null instead', async () => {
@@ -77,6 +81,29 @@ describe('OwnershipService', () => {
 
 			expect(owner).toBeNull();
 		});
+
+		test('should not use the repository if the owner was found in the cache', async () => {
+			// ARRANGE
+			const project = new Project();
+			project.id = uuid();
+			const owner = new User();
+			owner.id = uuid();
+			const projectRelation = new ProjectRelation();
+			projectRelation.role = 'project:personalOwner';
+			(projectRelation.project = project), (projectRelation.user = owner);
+
+			cacheService.getHashValue.mockResolvedValueOnce(owner);
+			userRepository.create.mockReturnValueOnce(owner);
+
+			// ACT
+			const foundOwner = await ownershipService.getPersonalProjectOwnerCached(project.id);
+
+			// ASSERT
+			expect(cacheService.getHashValue).toHaveBeenCalledTimes(1);
+			expect(cacheService.getHashValue).toHaveBeenCalledWith('project-owner', project.id);
+			expect(projectRelationRepository.getPersonalProjectOwners).not.toHaveBeenCalled();
+			expect(foundOwner).toEqual(owner);
+		});
 	});
 
 	describe('getProjectOwnerCached()', () => {
diff --git a/packages/cli/src/services/__tests__/password.utility.test.ts b/packages/cli/src/services/__tests__/password.utility.test.ts
index 48be7588c2..4662f7c32a 100644
--- a/packages/cli/src/services/__tests__/password.utility.test.ts
+++ b/packages/cli/src/services/__tests__/password.utility.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { PasswordUtility } from '@/services/password.utility';
 
@@ -49,57 +49,4 @@ describe('PasswordUtility', () => {
 			expect(isMatch).toBe(false);
 		});
 	});
-
-	describe('validate()', () => {
-		test('should throw on empty password', () => {
-			const check = () => passwordUtility.validate();
-
-			expect(check).toThrowError('Password is mandatory');
-		});
-
-		test('should return same password if valid', () => {
-			const validPassword = 'abcd1234X';
-
-			const validated = passwordUtility.validate(validPassword);
-
-			expect(validated).toBe(validPassword);
-		});
-
-		test('should require at least one uppercase letter', () => {
-			const invalidPassword = 'abcd1234';
-
-			const failingCheck = () => passwordUtility.validate(invalidPassword);
-
-			expect(failingCheck).toThrowError('Password must contain at least 1 uppercase letter.');
-		});
-
-		test('should require at least one number', () => {
-			const validPassword = 'abcd1234X';
-			const invalidPassword = 'abcdEFGH';
-
-			const validated = passwordUtility.validate(validPassword);
-
-			expect(validated).toBe(validPassword);
-
-			const check = () => passwordUtility.validate(invalidPassword);
-
-			expect(check).toThrowError('Password must contain at least 1 number.');
-		});
-
-		test('should require a minimum length of 8 characters', () => {
-			const invalidPassword = 'a'.repeat(7);
-
-			const check = () => passwordUtility.validate(invalidPassword);
-
-			expect(check).toThrowError('Password must be 8 to 64 characters long.');
-		});
-
-		test('should require a maximum length of 64 characters', () => {
-			const invalidPassword = 'a'.repeat(65);
-
-			const check = () => passwordUtility.validate(invalidPassword);
-
-			expect(check).toThrowError('Password must be 8 to 64 characters long.');
-		});
-	});
 });
diff --git a/packages/cli/src/services/__tests__/url.service.test.ts b/packages/cli/src/services/__tests__/url.service.test.ts
new file mode 100644
index 0000000000..c89d62789c
--- /dev/null
+++ b/packages/cli/src/services/__tests__/url.service.test.ts
@@ -0,0 +1,43 @@
+import type { GlobalConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+
+import config from '@/config';
+
+import { UrlService } from '../url.service';
+
+describe('UrlService', () => {
+	beforeEach(() => {
+		process.env.WEBHOOK_URL = undefined;
+		config.load(config.default);
+	});
+
+	describe('getInstanceBaseUrl', () => {
+		it('should set URL from N8N_EDITOR_BASE_URL', () => {
+			config.set('editorBaseUrl', 'https://example.com/');
+			process.env.WEBHOOK_URL = undefined;
+			const urlService = new UrlService(mock<GlobalConfig>());
+			expect(urlService.getInstanceBaseUrl()).toBe('https://example.com');
+		});
+
+		it('should set URL from WEBHOOK_URL', () => {
+			config.set('editorBaseUrl', '');
+			process.env.WEBHOOK_URL = 'https://example.com/';
+			const urlService = new UrlService(mock<GlobalConfig>());
+			expect(urlService.getInstanceBaseUrl()).toBe('https://example.com');
+		});
+
+		it('should trim quotes when setting URL from N8N_EDITOR_BASE_URL', () => {
+			config.set('editorBaseUrl', '"https://example.com"');
+			process.env.WEBHOOK_URL = undefined;
+			const urlService = new UrlService(mock<GlobalConfig>());
+			expect(urlService.getInstanceBaseUrl()).toBe('https://example.com');
+		});
+
+		it('should trim quotes when setting URL from WEBHOOK_URL', () => {
+			config.set('editorBaseUrl', '');
+			process.env.WEBHOOK_URL = '"https://example.com/"';
+			const urlService = new UrlService(mock<GlobalConfig>());
+			expect(urlService.getInstanceBaseUrl()).toBe('https://example.com');
+		});
+	});
+});
diff --git a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
index fdecb7ae5a..6336eb546a 100644
--- a/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
+++ b/packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
@@ -1,4 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import {
 	QueryFailedError,
 	type DataSource,
@@ -8,7 +9,6 @@ import {
 import { mocked } from 'jest-mock';
 import { mock } from 'jest-mock-extended';
 import type { INode, IRun, WorkflowExecuteMode } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import config from '@/config';
 import type { Project } from '@/databases/entities/project';
@@ -39,7 +39,7 @@ describe('WorkflowStatisticsService', () => {
 	});
 	Object.assign(entityManager, { connection: dataSource });
 
-	config.set('diagnostics.enabled', true);
+	globalConfig.diagnostics.enabled = true;
 	config.set('deployment.type', 'n8n-testing');
 	mocked(ownershipService.getWorkflowProjectCached).mockResolvedValue(fakeProject);
 	mocked(ownershipService.getPersonalProjectOwnerCached).mockResolvedValue(fakeUser);
diff --git a/packages/cli/src/services/access.service.ts b/packages/cli/src/services/access.service.ts
index 49ac7bfe23..7a7030b93e 100644
--- a/packages/cli/src/services/access.service.ts
+++ b/packages/cli/src/services/access.service.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import type { Workflow } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
diff --git a/packages/cli/src/services/active-workflows.service.ts b/packages/cli/src/services/active-workflows.service.ts
index 61aa875d1a..98b96af33a 100644
--- a/packages/cli/src/services/active-workflows.service.ts
+++ b/packages/cli/src/services/active-workflows.service.ts
@@ -1,11 +1,11 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
 
 import { ActivationErrorsService } from '@/activation-errors.service';
 import type { User } from '@/databases/entities/user';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { Logger } from '@/logging/logger.service';
 
 @Service()
 export class ActiveWorkflowsService {
diff --git a/packages/cli/src/services/ai.service.ts b/packages/cli/src/services/ai.service.ts
index a7b07219b5..32c6c8b0f9 100644
--- a/packages/cli/src/services/ai.service.ts
+++ b/packages/cli/src/services/ai.service.ts
@@ -1,11 +1,12 @@
+import type {
+	AiApplySuggestionRequestDto,
+	AiAskRequestDto,
+	AiChatRequestDto,
+} from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
-import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk';
+import { Service } from '@n8n/di';
 import { AiAssistantClient } from '@n8n_io/ai-assistant-sdk';
 import { assert, type IUser } from 'n8n-workflow';
-import { Service } from 'typedi';
-
-import config from '@/config';
-import type { AiAssistantRequest } from '@/requests';
 
 import { N8N_VERSION } from '../constants';
 import { License } from '../license';
@@ -21,13 +22,14 @@ export class AiService {
 
 	async init() {
 		const aiAssistantEnabled = this.licenseService.isAiAssistantEnabled();
+
 		if (!aiAssistantEnabled) {
 			return;
 		}
 
 		const licenseCert = await this.licenseService.loadCertStr();
 		const consumerId = this.licenseService.getConsumerId();
-		const baseUrl = config.get('aiAssistant.baseUrl');
+		const baseUrl = this.globalConfig.aiAssistant.baseUrl;
 		const logLevel = this.globalConfig.logging.level;
 
 		this.client = new AiAssistantClient({
@@ -39,7 +41,7 @@ export class AiService {
 		});
 	}
 
-	async chat(payload: AiAssistantSDK.ChatRequestPayload, user: IUser) {
+	async chat(payload: AiChatRequestDto, user: IUser) {
 		if (!this.client) {
 			await this.init();
 		}
@@ -48,7 +50,7 @@ export class AiService {
 		return await this.client.chat(payload, { id: user.id });
 	}
 
-	async applySuggestion(payload: AiAssistantRequest.SuggestionPayload, user: IUser) {
+	async applySuggestion(payload: AiApplySuggestionRequestDto, user: IUser) {
 		if (!this.client) {
 			await this.init();
 		}
@@ -57,7 +59,7 @@ export class AiService {
 		return await this.client.applySuggestion(payload, { id: user.id });
 	}
 
-	async askAi(payload: AiAssistantSDK.AskAiRequestPayload, user: IUser) {
+	async askAi(payload: AiAskRequestDto, user: IUser) {
 		if (!this.client) {
 			await this.init();
 		}
@@ -65,4 +67,13 @@ export class AiService {
 
 		return await this.client.askAi(payload, { id: user.id });
 	}
+
+	async createFreeAiCredits(user: IUser) {
+		if (!this.client) {
+			await this.init();
+		}
+		assert(this.client, 'Assistant client not setup');
+
+		return await this.client.generateAiCreditsCredentials(user);
+	}
 }
diff --git a/packages/cli/src/services/annotation-tag.service.ee.ts b/packages/cli/src/services/annotation-tag.service.ee.ts
index 671395168c..9c56a7bee4 100644
--- a/packages/cli/src/services/annotation-tag.service.ee.ts
+++ b/packages/cli/src/services/annotation-tag.service.ee.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
 import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository.ee';
diff --git a/packages/cli/src/services/cache/__tests__/cache-mock.service.test.ts b/packages/cli/src/services/cache/__tests__/cache-mock.service.test.ts
index d515aae5be..a6863997a5 100644
--- a/packages/cli/src/services/cache/__tests__/cache-mock.service.test.ts
+++ b/packages/cli/src/services/cache/__tests__/cache-mock.service.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import Container from 'typedi';
 
 import { CacheService } from '@/services/cache/cache.service';
 
diff --git a/packages/cli/src/services/cache/__tests__/cache.service.test.ts b/packages/cli/src/services/cache/__tests__/cache.service.test.ts
index e87e46984b..5aaaf4b860 100644
--- a/packages/cli/src/services/cache/__tests__/cache.service.test.ts
+++ b/packages/cli/src/services/cache/__tests__/cache.service.test.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { sleep } from 'n8n-workflow';
-import Container from 'typedi';
 
 import config from '@/config';
 import { CacheService } from '@/services/cache/cache.service';
diff --git a/packages/cli/src/services/cache/cache.service.ts b/packages/cli/src/services/cache/cache.service.ts
index aefe9310fc..ab681d3e5b 100644
--- a/packages/cli/src/services/cache/cache.service.ts
+++ b/packages/cli/src/services/cache/cache.service.ts
@@ -1,10 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import { caching } from 'cache-manager';
 import { ApplicationError, jsonStringify } from 'n8n-workflow';
-import Container, { Service } from 'typedi';
 
 import config from '@/config';
-import { TIME } from '@/constants';
+import { Time } from '@/constants';
 import { MalformedRefreshValueError } from '@/errors/cache-errors/malformed-refresh-value.error';
 import { UncacheableValueError } from '@/errors/cache-errors/uncacheable-value.error';
 import type {
@@ -160,7 +160,7 @@ export class CacheService extends TypedEmitter<CacheEvents> {
 			});
 		}
 
-		await this.cache.store.expire(key, ttlMs / TIME.SECOND);
+		await this.cache.store.expire(key, ttlMs * Time.milliseconds.toSeconds);
 	}
 
 	// ----------------------------------
diff --git a/packages/cli/src/services/community-packages.service.ts b/packages/cli/src/services/community-packages.service.ts
index 4906a6ef33..c85872c5e2 100644
--- a/packages/cli/src/services/community-packages.service.ts
+++ b/packages/cli/src/services/community-packages.service.ts
@@ -1,11 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import axios from 'axios';
 import { exec } from 'child_process';
 import { access as fsAccess, mkdir as fsMkdir } from 'fs/promises';
-import { InstanceSettings } from 'n8n-core';
 import type { PackageDirectoryLoader } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import { ApplicationError, type PublicInstalledPackage } from 'n8n-workflow';
-import { Service } from 'typedi';
 import { promisify } from 'util';
 
 import {
@@ -22,7 +22,6 @@ import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import type { CommunityPackages } from '@/interfaces';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { Logger } from '@/logging/logger.service';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
 import { toError } from '@/utils';
 
@@ -354,6 +353,7 @@ export class CommunityPackagesService {
 
 		let loader: PackageDirectoryLoader;
 		try {
+			await this.loadNodesAndCredentials.unloadPackage(packageName);
 			loader = await this.loadNodesAndCredentials.loadPackage(packageName);
 		} catch (error) {
 			// Remove this package since loading it failed
diff --git a/packages/cli/src/services/credentials-tester.service.ts b/packages/cli/src/services/credentials-tester.service.ts
index 30504e464b..1954923481 100644
--- a/packages/cli/src/services/credentials-tester.service.ts
+++ b/packages/cli/src/services/credentials-tester.service.ts
@@ -3,8 +3,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
+import { Service } from '@n8n/di';
 import get from 'lodash/get';
-import { NodeExecuteFunctions } from 'n8n-core';
+import {
+	ErrorReporter,
+	Logger,
+	NodeExecuteFunctions,
+	RoutingNode,
+	isObjectLiteral,
+} from 'n8n-core';
 import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunction,
@@ -23,25 +30,15 @@ import type {
 	ICredentialTestFunctions,
 	IDataObject,
 } from 'n8n-workflow';
-import {
-	VersionedNodeType,
-	NodeHelpers,
-	RoutingNode,
-	Workflow,
-	ErrorReporterProxy as ErrorReporter,
-	ApplicationError,
-} from 'n8n-workflow';
-import { Service } from 'typedi';
+import { VersionedNodeType, NodeHelpers, Workflow, ApplicationError } from 'n8n-workflow';
 
 import { CredentialTypes } from '@/credential-types';
 import type { User } from '@/databases/entities/user';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
 import { RESPONSE_ERROR_MESSAGES } from '../constants';
 import { CredentialsHelper } from '../credentials-helper';
-import { isObjectLiteral } from '../utils';
 
 const { OAUTH2_CREDENTIAL_TEST_SUCCEEDED, OAUTH2_CREDENTIAL_TEST_FAILED } = RESPONSE_ERROR_MESSAGES;
 
@@ -75,6 +72,7 @@ const mockNodeTypes: INodeTypes = {
 export class CredentialsTester {
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly credentialTypes: CredentialTypes,
 		private readonly nodeTypes: NodeTypes,
 		private readonly credentialsHelper: CredentialsHelper,
@@ -312,11 +310,10 @@ export class CredentialsTester {
 				runIndex,
 				nodeTypeCopy,
 				{ node, data: {}, source: null },
-				NodeExecuteFunctions,
 				credentialsDecrypted,
 			);
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 			// Do not fail any requests to allow custom error messages and
 			// make logic easier
 			if (error.cause?.response) {
diff --git a/packages/cli/src/services/cta.service.ts b/packages/cli/src/services/cta.service.ts
index 221674cfa7..ec0763dcda 100644
--- a/packages/cli/src/services/cta.service.ts
+++ b/packages/cli/src/services/cta.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { User } from '@/databases/entities/user';
 import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
diff --git a/packages/cli/src/services/curl.service.ts b/packages/cli/src/services/curl.service.ts
index 8875fd9828..fae967154e 100644
--- a/packages/cli/src/services/curl.service.ts
+++ b/packages/cli/src/services/curl.service.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import get from 'lodash/get';
 import type { IDataObject } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import curlconverter from 'curlconverter';
 
diff --git a/packages/cli/src/services/dynamic-node-parameters.service.ts b/packages/cli/src/services/dynamic-node-parameters.service.ts
index 7a641e84a6..0cde1c8489 100644
--- a/packages/cli/src/services/dynamic-node-parameters.service.ts
+++ b/packages/cli/src/services/dynamic-node-parameters.service.ts
@@ -1,4 +1,5 @@
-import { NodeExecuteFunctions } from 'n8n-core';
+import { Service } from '@n8n/di';
+import { LoadOptionsContext, RoutingNode, LocalLoadOptionsContext } from 'n8n-core';
 import type {
 	ILoadOptions,
 	ILoadOptionsFunctions,
@@ -17,15 +18,42 @@ import type {
 	INodeTypeNameVersion,
 	NodeParameterValueType,
 	IDataObject,
+	ILocalLoadOptionsFunctions,
 } from 'n8n-workflow';
-import { Workflow, RoutingNode, ApplicationError } from 'n8n-workflow';
-import { Service } from 'typedi';
+import { Workflow, ApplicationError } from 'n8n-workflow';
 
 import { NodeTypes } from '@/node-types';
 
+import { WorkflowLoaderService } from './workflow-loader.service';
+
+type LocalResourceMappingMethod = (
+	this: ILocalLoadOptionsFunctions,
+) => Promise<ResourceMapperFields>;
+type ListSearchMethod = (
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+) => Promise<INodeListSearchResult>;
+type LoadOptionsMethod = (this: ILoadOptionsFunctions) => Promise<INodePropertyOptions[]>;
+type ActionHandlerMethod = (
+	this: ILoadOptionsFunctions,
+	payload?: string,
+) => Promise<NodeParameterValueType>;
+type ResourceMappingMethod = (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
+
+type NodeMethod =
+	| LocalResourceMappingMethod
+	| ListSearchMethod
+	| LoadOptionsMethod
+	| ActionHandlerMethod
+	| ResourceMappingMethod;
+
 @Service()
 export class DynamicNodeParametersService {
-	constructor(private nodeTypes: NodeTypes) {}
+	constructor(
+		private nodeTypes: NodeTypes,
+		private workflowLoaderService: WorkflowLoaderService,
+	) {}
 
 	/** Returns the available options via a predefined method */
 	async getOptionsViaMethodName(
@@ -40,6 +68,8 @@ export class DynamicNodeParametersService {
 		const method = this.getMethod('loadOptions', methodName, nodeType);
 		const workflow = this.getWorkflow(nodeTypeAndVersion, currentNodeParameters, credentials);
 		const thisArgs = this.getThisArg(path, additionalData, workflow);
+		// Need to use untyped call since `this` usage is widespread and we don't have `strictBindCallApply`
+		// enabled in `tsconfig.json`
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 		return method.call(thisArgs);
 	}
@@ -54,7 +84,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.
@@ -105,13 +135,11 @@ export class DynamicNodeParametersService {
 			main: [[{ json: {} }]],
 		};
 
-		const optionsData = await routingNode.runNode(
-			inputData,
-			runIndex,
-			tempNode,
-			{ node, source: null, data: {} },
-			NodeExecuteFunctions,
-		);
+		const optionsData = await routingNode.runNode(inputData, runIndex, tempNode, {
+			node,
+			source: null,
+			data: {},
+		});
 
 		if (optionsData?.length === 0) {
 			return [];
@@ -159,6 +187,20 @@ export class DynamicNodeParametersService {
 		return method.call(thisArgs);
 	}
 
+	/** Returns the available workflow input mapping fields for the ResourceMapper component */
+	async getLocalResourceMappingFields(
+		methodName: string,
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+		nodeTypeAndVersion: INodeTypeNameVersion,
+	): Promise<ResourceMapperFields> {
+		const nodeType = this.getNodeType(nodeTypeAndVersion);
+		const method = this.getMethod('localResourceMapping', methodName, nodeType);
+		const thisArgs = this.getLocalLoadOptionsContext(path, additionalData);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return method.call(thisArgs);
+	}
+
 	/** Returns the result of the action handler */
 	async getActionResult(
 		handler: string,
@@ -181,33 +223,34 @@ export class DynamicNodeParametersService {
 		type: 'resourceMapping',
 		methodName: string,
 		nodeType: INodeType,
-	): (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
+	): ResourceMappingMethod;
 	private getMethod(
-		type: 'listSearch',
+		type: 'localResourceMapping',
 		methodName: string,
 		nodeType: INodeType,
-	): (
-		this: ILoadOptionsFunctions,
-		filter?: string | undefined,
-		paginationToken?: string | undefined,
-	) => Promise<INodeListSearchResult>;
+	): LocalResourceMappingMethod;
+	private getMethod(type: 'listSearch', methodName: string, nodeType: INodeType): ListSearchMethod;
 	private getMethod(
 		type: 'loadOptions',
 		methodName: string,
 		nodeType: INodeType,
-	): (this: ILoadOptionsFunctions) => Promise<INodePropertyOptions[]>;
+	): LoadOptionsMethod;
 	private getMethod(
 		type: 'actionHandler',
 		methodName: string,
 		nodeType: INodeType,
-	): (this: ILoadOptionsFunctions, payload?: string) => Promise<NodeParameterValueType>;
-
+	): ActionHandlerMethod;
 	private getMethod(
-		type: 'resourceMapping' | 'listSearch' | 'loadOptions' | 'actionHandler',
+		type:
+			| 'resourceMapping'
+			| 'localResourceMapping'
+			| 'listSearch'
+			| 'loadOptions'
+			| 'actionHandler',
 		methodName: string,
 		nodeType: INodeType,
-	) {
-		const method = nodeType.methods?.[type]?.[methodName];
+	): NodeMethod {
+		const method = nodeType.methods?.[type]?.[methodName] as NodeMethod;
 		if (typeof method !== 'function') {
 			throw new ApplicationError('Node type does not have method defined', {
 				tags: { nodeType: nodeType.description.name },
@@ -253,6 +296,18 @@ export class DynamicNodeParametersService {
 		workflow: Workflow,
 	) {
 		const node = workflow.nodes['Temp-Node'];
-		return NodeExecuteFunctions.getLoadOptionsFunctions(workflow, node, path, additionalData);
+		return new LoadOptionsContext(workflow, node, additionalData, path);
+	}
+
+	private getLocalLoadOptionsContext(
+		path: string,
+		additionalData: IWorkflowExecuteAdditionalData,
+	): ILocalLoadOptionsFunctions {
+		return new LocalLoadOptionsContext(
+			this.nodeTypes,
+			additionalData,
+			path,
+			this.workflowLoaderService,
+		);
 	}
 }
diff --git a/packages/cli/src/services/execution-metadata.service.ts b/packages/cli/src/services/execution-metadata.service.ts
index b88b68f12f..0c66b1daa2 100644
--- a/packages/cli/src/services/execution-metadata.service.ts
+++ b/packages/cli/src/services/execution-metadata.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { ExecutionMetadata } from '@/databases/entities/execution-metadata';
 import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts
index 144540467f..954c3e9fc3 100644
--- a/packages/cli/src/services/frontend.service.ts
+++ b/packages/cli/src/services/frontend.service.ts
@@ -1,32 +1,29 @@
 import type { FrontendSettings, ITelemetrySettings } from '@n8n/api-types';
-import { GlobalConfig } from '@n8n/config';
+import { GlobalConfig, FrontendConfig, SecurityConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import { createWriteStream } from 'fs';
 import { mkdir } from 'fs/promises';
 import uniq from 'lodash/uniq';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import type { ICredentialType, INodeTypeBaseDescription } from 'n8n-workflow';
-import fs from 'node:fs';
 import path from 'path';
-import { Container, Service } from 'typedi';
 
 import config from '@/config';
-import { LICENSE_FEATURES, N8N_VERSION } from '@/constants';
+import { inE2ETests, LICENSE_FEATURES, N8N_VERSION } from '@/constants';
 import { CredentialTypes } from '@/credential-types';
 import { CredentialsOverwrites } from '@/credentials-overwrites';
-import { getVariablesLimit } from '@/environments/variables/environment-helpers';
-import { getLdapLoginLabel } from '@/ldap/helpers.ee';
+import { getLdapLoginLabel } from '@/ldap.ee/helpers.ee';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { Logger } from '@/logging/logger.service';
 import { isApiEnabled } from '@/public-api';
 import type { CommunityPackagesService } from '@/services/community-packages.service';
-import { getSamlLoginLabel } from '@/sso/saml/saml-helpers';
-import { getCurrentAuthenticationMethod } from '@/sso/sso-helpers';
+import { getSamlLoginLabel } from '@/sso.ee/saml/saml-helpers';
+import { getCurrentAuthenticationMethod } from '@/sso.ee/sso-helpers';
 import { UserManagementMailer } from '@/user-management/email';
 import {
 	getWorkflowHistoryLicensePruneTime,
 	getWorkflowHistoryPruneTime,
-} from '@/workflows/workflow-history/workflow-history-helper.ee';
+} from '@/workflows/workflow-history.ee/workflow-history-helper.ee';
 
 import { UrlService } from './url.service';
 
@@ -46,6 +43,8 @@ export class FrontendService {
 		private readonly mailer: UserManagementMailer,
 		private readonly instanceSettings: InstanceSettings,
 		private readonly urlService: UrlService,
+		private readonly securityConfig: SecurityConfig,
+		private readonly frontendConfig: FrontendConfig,
 	) {
 		loadNodesAndCredentials.addPostProcessor(async () => await this.generateTypes());
 		void this.generateTypes();
@@ -64,11 +63,11 @@ export class FrontendService {
 		const restEndpoint = this.globalConfig.endpoints.rest;
 
 		const telemetrySettings: ITelemetrySettings = {
-			enabled: config.getEnv('diagnostics.enabled'),
+			enabled: this.globalConfig.diagnostics.enabled,
 		};
 
 		if (telemetrySettings.enabled) {
-			const conf = config.getEnv('diagnostics.config.frontend');
+			const conf = this.globalConfig.diagnostics.frontendConfig;
 			const [key, url] = conf.split(';');
 
 			if (!key || !url) {
@@ -80,7 +79,8 @@ export class FrontendService {
 		}
 
 		this.settings = {
-			isDocker: this.isDocker(),
+			inE2ETests,
+			isDocker: this.instanceSettings.isDocker,
 			databaseType: this.globalConfig.database.type,
 			previewMode: process.env.N8N_PREVIEW_MODE === 'true',
 			endpointForm: this.globalConfig.endpoints.form,
@@ -119,15 +119,15 @@ export class FrontendService {
 			instanceId: this.instanceSettings.instanceId,
 			telemetry: telemetrySettings,
 			posthog: {
-				enabled: config.getEnv('diagnostics.enabled'),
-				apiHost: config.getEnv('diagnostics.config.posthog.apiHost'),
-				apiKey: config.getEnv('diagnostics.config.posthog.apiKey'),
+				enabled: this.globalConfig.diagnostics.enabled,
+				apiHost: this.globalConfig.diagnostics.posthogConfig.apiHost,
+				apiKey: this.globalConfig.diagnostics.posthogConfig.apiKey,
 				autocapture: false,
 				disableSessionRecording: config.getEnv('deployment.type') !== 'cloud',
 				debug: this.globalConfig.logging.level === 'debug',
 			},
 			personalizationSurveyEnabled:
-				config.getEnv('personalization.enabled') && config.getEnv('diagnostics.enabled'),
+				config.getEnv('personalization.enabled') && this.globalConfig.diagnostics.enabled,
 			defaultLocale: config.getEnv('defaultLocale'),
 			userManagement: {
 				quota: this.license.getUsersLimit(),
@@ -153,7 +153,7 @@ export class FrontendService {
 					enabled: !this.globalConfig.publicApi.swaggerUiDisabled,
 				},
 			},
-			workflowTagsDisabled: config.getEnv('workflowTagsDisabled'),
+			workflowTagsDisabled: this.globalConfig.tags.disabled,
 			logLevel: this.globalConfig.logging.level,
 			hiringBannerEnabled: config.getEnv('hiringBanner.enabled'),
 			aiAssistant: {
@@ -215,18 +215,24 @@ export class FrontendService {
 			askAi: {
 				enabled: false,
 			},
+			aiCredits: {
+				enabled: false,
+				credits: 0,
+			},
 			workflowHistory: {
 				pruneTime: -1,
 				licensePruneTime: -1,
 			},
 			pruning: {
-				isEnabled: config.getEnv('executions.pruneData'),
-				maxAge: config.getEnv('executions.pruneDataMaxAge'),
-				maxCount: config.getEnv('executions.pruneDataMaxCount'),
+				isEnabled: this.globalConfig.executions.pruneData,
+				maxAge: this.globalConfig.executions.pruneDataMaxAge,
+				maxCount: this.globalConfig.executions.pruneDataMaxCount,
 			},
 			security: {
-				blockFileAccessToN8nFiles: config.getEnv('security.blockFileAccessToN8nFiles'),
+				blockFileAccessToN8nFiles: this.securityConfig.blockFileAccessToN8nFiles,
 			},
+			betaFeatures: this.frontendConfig.betaFeatures,
+			easyAIWorkflowOnboarded: false,
 		};
 	}
 
@@ -269,12 +275,18 @@ export class FrontendService {
 		}
 
 		this.settings.banners.dismissed = dismissedBanners;
+		try {
+			this.settings.easyAIWorkflowOnboarded = config.getEnv('easyAIWorkflowOnboarded') ?? false;
+		} catch {
+			this.settings.easyAIWorkflowOnboarded = false;
+		}
 
 		const isS3Selected = config.getEnv('binaryDataManager.mode') === 's3';
 		const isS3Available = config.getEnv('binaryDataManager.availableModes').includes('s3');
 		const isS3Licensed = this.license.isBinaryDataS3Licensed();
 		const isAiAssistantEnabled = this.license.isAiAssistantEnabled();
 		const isAskAiEnabled = this.license.isAskAiEnabled();
+		const isAiCreditsEnabled = this.license.isAiCreditsEnabled();
 
 		this.settings.license.planName = this.license.getPlanName();
 		this.settings.license.consumerId = this.license.getConsumerId();
@@ -313,7 +325,7 @@ export class FrontendService {
 		}
 
 		if (this.license.isVariablesEnabled()) {
-			this.settings.variables.limit = getVariablesLimit();
+			this.settings.variables.limit = this.license.getVariablesLimit();
 		}
 
 		if (this.license.isWorkflowHistoryLicensed() && config.getEnv('workflowHistory.enabled')) {
@@ -335,6 +347,11 @@ export class FrontendService {
 			this.settings.askAi.enabled = isAskAiEnabled;
 		}
 
+		if (isAiCreditsEnabled) {
+			this.settings.aiCredits.enabled = isAiCreditsEnabled;
+			this.settings.aiCredits.credits = this.license.getAiCredits();
+		}
+
 		this.settings.mfa.enabled = config.get('mfa.enabled');
 
 		this.settings.executionMode = config.getEnv('executions.mode');
@@ -382,20 +399,4 @@ export class FrontendService {
 			}
 		}
 	}
-
-	/**
-	 * Whether this instance is running inside a Docker container.
-	 *
-	 * Based on: https://github.com/sindresorhus/is-docker
-	 */
-	private isDocker() {
-		try {
-			return (
-				fs.existsSync('/.dockerenv') ||
-				fs.readFileSync('/proc/self/cgroup', 'utf8').includes('docker')
-			);
-		} catch {
-			return false;
-		}
-	}
 }
diff --git a/packages/cli/src/services/hooks.service.ts b/packages/cli/src/services/hooks.service.ts
index 19b2f8deb8..2d2b137279 100644
--- a/packages/cli/src/services/hooks.service.ts
+++ b/packages/cli/src/services/hooks.service.ts
@@ -1,9 +1,9 @@
+import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { FindManyOptions, FindOneOptions, FindOptionsWhere } from '@n8n/typeorm';
 import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
 import RudderStack, { type constructorOptions } from '@rudderstack/rudder-sdk-node';
 import type { NextFunction, Response } from 'express';
-import { Service } from 'typedi';
 
 import { AuthService } from '@/auth/auth.service';
 import type { AuthUser } from '@/databases/entities/auth-user';
diff --git a/packages/cli/src/services/import.service.ts b/packages/cli/src/services/import.service.ts
index 2402863bab..dcb7bff0ad 100644
--- a/packages/cli/src/services/import.service.ts
+++ b/packages/cli/src/services/import.service.ts
@@ -1,5 +1,6 @@
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import { type INode, type INodeCredentialsDetails } from 'n8n-workflow';
-import { Service } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { Project } from '@/databases/entities/project';
@@ -11,7 +12,6 @@ import { CredentialsRepository } from '@/databases/repositories/credentials.repo
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import * as Db from '@/db';
 import type { ICredentialsDb } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { replaceInvalidCredentials } from '@/workflow-helpers';
 
 @Service()
diff --git a/packages/cli/src/services/jwt.service.ts b/packages/cli/src/services/jwt.service.ts
index 8058de10dd..0601309013 100644
--- a/packages/cli/src/services/jwt.service.ts
+++ b/packages/cli/src/services/jwt.service.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import { createHash } from 'crypto';
 import jwt from 'jsonwebtoken';
 import { InstanceSettings } from 'n8n-core';
-import { Service } from 'typedi';
 
 import config from '@/config';
 
diff --git a/packages/cli/src/services/naming.service.ts b/packages/cli/src/services/naming.service.ts
index a715b2b360..70384ac15a 100644
--- a/packages/cli/src/services/naming.service.ts
+++ b/packages/cli/src/services/naming.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
diff --git a/packages/cli/src/services/orchestration.service.ts b/packages/cli/src/services/orchestration.service.ts
index 225badbf18..2745108c69 100644
--- a/packages/cli/src/services/orchestration.service.ts
+++ b/packages/cli/src/services/orchestration.service.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
-import Container, { Service } from 'typedi';
 
 import config from '@/config';
 import type { Publisher } from '@/scaling/pubsub/publisher.service';
@@ -20,30 +20,7 @@ export class OrchestrationService {
 
 	private subscriber: Subscriber;
 
-	protected isInitialized = false;
-
-	private isMultiMainSetupLicensed = false;
-
-	setMultiMainSetupLicensed(newState: boolean) {
-		this.isMultiMainSetupLicensed = newState;
-	}
-
-	get isMultiMainSetupEnabled() {
-		return (
-			config.getEnv('executions.mode') === 'queue' &&
-			this.globalConfig.multiMainSetup.enabled &&
-			this.instanceSettings.instanceType === 'main' &&
-			this.isMultiMainSetupLicensed
-		);
-	}
-
-	get isSingleMainSetup() {
-		return !this.isMultiMainSetupEnabled;
-	}
-
-	sanityCheck() {
-		return this.isInitialized && config.get('executions.mode') === 'queue';
-	}
+	isInitialized = false;
 
 	async init() {
 		if (this.isInitialized) return;
@@ -56,7 +33,7 @@ export class OrchestrationService {
 			this.subscriber = Container.get(Subscriber);
 		}
 
-		if (this.isMultiMainSetupEnabled) {
+		if (this.instanceSettings.isMultiMain) {
 			await this.multiMainSetup.init();
 		} else {
 			this.instanceSettings.markAsLeader();
@@ -69,7 +46,7 @@ export class OrchestrationService {
 	async shutdown() {
 		if (!this.isInitialized) return;
 
-		if (this.isMultiMainSetupEnabled) await this.multiMainSetup.shutdown();
+		if (this.instanceSettings.isMultiMain) await this.multiMainSetup.shutdown();
 
 		this.publisher.shutdown();
 		this.subscriber.shutdown();
diff --git a/packages/cli/src/services/ownership.service.ts b/packages/cli/src/services/ownership.service.ts
index 65e83e53eb..21ce4b573a 100644
--- a/packages/cli/src/services/ownership.service.ts
+++ b/packages/cli/src/services/ownership.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { Project } from '@/databases/entities/project';
 import type { User } from '@/databases/entities/user';
@@ -45,13 +45,9 @@ export class OwnershipService {
 	 * Personal project ownership is **immutable**.
 	 */
 	async getPersonalProjectOwnerCached(projectId: string): Promise<User | null> {
-		const cachedValue = await this.cacheService.getHashValue<User | null>(
-			'project-owner',
-			projectId,
-		);
+		const cachedValue = await this.cacheService.getHashValue<User>('project-owner', projectId);
 
-		if (cachedValue) this.userRepository.create(cachedValue);
-		if (cachedValue === null) return null;
+		if (cachedValue) return this.userRepository.create(cachedValue);
 
 		const ownerRel = await this.projectRelationRepository.getPersonalProjectOwners([projectId]);
 		const owner = ownerRel[0]?.user ?? null;
@@ -91,12 +87,14 @@ export class OwnershipService {
 					id: project.id,
 					type: project.type,
 					name: project.name,
+					icon: project.icon,
 				};
 			} else {
 				entity.sharedWithProjects.push({
 					id: project.id,
 					type: project.type,
 					name: project.name,
+					icon: project.icon,
 				});
 			}
 		}
diff --git a/packages/cli/src/services/password.utility.ts b/packages/cli/src/services/password.utility.ts
index 9719db44bb..f4119c47a0 100644
--- a/packages/cli/src/services/password.utility.ts
+++ b/packages/cli/src/services/password.utility.ts
@@ -1,11 +1,5 @@
+import { Service as Utility } from '@n8n/di';
 import { compare, hash } from 'bcryptjs';
-import { Service as Utility } from 'typedi';
-
-import {
-	MAX_PASSWORD_CHAR_LENGTH as maxLength,
-	MIN_PASSWORD_CHAR_LENGTH as minLength,
-} from '@/constants';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 
 const SALT_ROUNDS = 10;
 
@@ -18,28 +12,4 @@ export class PasswordUtility {
 	async compare(plaintext: string, hashed: string) {
 		return await compare(plaintext, hashed);
 	}
-
-	validate(plaintext?: string) {
-		if (!plaintext) throw new BadRequestError('Password is mandatory');
-
-		const errorMessages: string[] = [];
-
-		if (plaintext.length < minLength || plaintext.length > maxLength) {
-			errorMessages.push(`Password must be ${minLength} to ${maxLength} characters long.`);
-		}
-
-		if (!/\d/.test(plaintext)) {
-			errorMessages.push('Password must contain at least 1 number.');
-		}
-
-		if (!/[A-Z]/.test(plaintext)) {
-			errorMessages.push('Password must contain at least 1 uppercase letter.');
-		}
-
-		if (errorMessages.length > 0) {
-			throw new BadRequestError(errorMessages.join(' '));
-		}
-
-		return plaintext;
-	}
 }
diff --git a/packages/cli/src/services/project.service.ts b/packages/cli/src/services/project.service.ee.ts
similarity index 94%
rename from packages/cli/src/services/project.service.ts
rename to packages/cli/src/services/project.service.ee.ts
index d78e3a07e1..43605939a3 100644
--- a/packages/cli/src/services/project.service.ts
+++ b/packages/cli/src/services/project.service.ee.ts
@@ -1,15 +1,15 @@
+import type { CreateProjectDto, ProjectRole, ProjectType, UpdateProjectDto } from '@n8n/api-types';
+import { Container, Service } from '@n8n/di';
 import { type Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { FindOptionsWhere, EntityManager } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, Not } from '@n8n/typeorm';
 import { ApplicationError } from 'n8n-workflow';
-import Container, { Service } from 'typedi';
 
 import { UNLIMITED_LICENSE_QUOTA } from '@/constants';
-import { Project, type ProjectType } from '@/databases/entities/project';
+import { Project } from '@/databases/entities/project';
 import { ProjectRelation } from '@/databases/entities/project-relation';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
@@ -167,7 +167,7 @@ export class ProjectService {
 		return await this.projectRelationRepository.getPersonalProjectOwners(projectIds);
 	}
 
-	async createTeamProject(name: string, adminUser: User, id?: string): Promise<Project> {
+	async createTeamProject(adminUser: User, data: CreateProjectDto): Promise<Project> {
 		const limit = this.license.getTeamProjectLimit();
 		if (
 			limit !== UNLIMITED_LICENSE_QUOTA &&
@@ -177,11 +177,7 @@ export class ProjectService {
 		}
 
 		const project = await this.projectRepository.save(
-			this.projectRepository.create({
-				id,
-				name,
-				type: 'team',
-			}),
+			this.projectRepository.create({ ...data, type: 'team' }),
 		);
 
 		// Link admin
@@ -190,16 +186,11 @@ export class ProjectService {
 		return project;
 	}
 
-	async updateProject(name: string, projectId: string): Promise<Project> {
-		const result = await this.projectRepository.update(
-			{
-				id: projectId,
-				type: 'team',
-			},
-			{
-				name,
-			},
-		);
+	async updateProject(
+		projectId: string,
+		data: Pick<UpdateProjectDto, 'name' | 'icon'>,
+	): Promise<Project> {
+		const result = await this.projectRepository.update({ id: projectId, type: 'team' }, data);
 
 		if (!result.affected) {
 			throw new ForbiddenError('Project not found');
diff --git a/packages/cli/src/services/pruning.service.ts b/packages/cli/src/services/pruning.service.ts
deleted file mode 100644
index 0859dddd39..0000000000
--- a/packages/cli/src/services/pruning.service.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-import { GlobalConfig } from '@n8n/config';
-import { BinaryDataService, InstanceSettings } from 'n8n-core';
-import { jsonStringify } from 'n8n-workflow';
-import { Service } from 'typedi';
-
-import config from '@/config';
-import { inTest, TIME } from '@/constants';
-import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { OnShutdown } from '@/decorators/on-shutdown';
-import { Logger } from '@/logging/logger.service';
-
-import { OrchestrationService } from './orchestration.service';
-
-@Service()
-export class PruningService {
-	private hardDeletionBatchSize = 100;
-
-	private rates: Record<string, number> = {
-		softDeletion: config.getEnv('executions.pruneDataIntervals.softDelete') * TIME.MINUTE,
-		hardDeletion: config.getEnv('executions.pruneDataIntervals.hardDelete') * TIME.MINUTE,
-	};
-
-	public softDeletionInterval: NodeJS.Timer | undefined;
-
-	public hardDeletionTimeout: NodeJS.Timeout | undefined;
-
-	private isShuttingDown = false;
-
-	constructor(
-		private readonly logger: Logger,
-		private readonly instanceSettings: InstanceSettings,
-		private readonly executionRepository: ExecutionRepository,
-		private readonly binaryDataService: BinaryDataService,
-		private readonly orchestrationService: OrchestrationService,
-		private readonly globalConfig: GlobalConfig,
-	) {}
-
-	/**
-	 * @important Requires `OrchestrationService` to be initialized.
-	 */
-	init() {
-		const { isLeader } = this.instanceSettings;
-		const { isMultiMainSetupEnabled } = this.orchestrationService;
-
-		if (isLeader) this.startPruning();
-
-		if (isMultiMainSetupEnabled) {
-			this.orchestrationService.multiMainSetup.on('leader-takeover', () => this.startPruning());
-			this.orchestrationService.multiMainSetup.on('leader-stepdown', () => this.stopPruning());
-		}
-	}
-
-	private isPruningEnabled() {
-		const { instanceType, isFollower } = this.instanceSettings;
-		if (!config.getEnv('executions.pruneData') || inTest || instanceType !== 'main') {
-			return false;
-		}
-
-		if (this.globalConfig.multiMainSetup.enabled && instanceType === 'main' && isFollower) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @important Call this method only after DB migrations have completed.
-	 */
-	startPruning() {
-		if (!this.isPruningEnabled()) return;
-
-		if (this.isShuttingDown) {
-			this.logger.warn('[Pruning] Cannot start pruning while shutting down');
-			return;
-		}
-
-		this.logger.debug('[Pruning] Starting soft-deletion and hard-deletion timers');
-
-		this.setSoftDeletionInterval();
-		this.scheduleHardDeletion();
-	}
-
-	stopPruning() {
-		if (!this.isPruningEnabled()) return;
-
-		this.logger.debug('[Pruning] Removing soft-deletion and hard-deletion timers');
-
-		clearInterval(this.softDeletionInterval);
-		clearTimeout(this.hardDeletionTimeout);
-	}
-
-	private setSoftDeletionInterval(rateMs = this.rates.softDeletion) {
-		const when = [rateMs / TIME.MINUTE, 'min'].join(' ');
-
-		this.softDeletionInterval = setInterval(
-			async () => await this.softDeleteOnPruningCycle(),
-			this.rates.softDeletion,
-		);
-
-		this.logger.debug(`[Pruning] Soft-deletion scheduled every ${when}`);
-	}
-
-	private scheduleHardDeletion(rateMs = this.rates.hardDeletion) {
-		const when = [rateMs / TIME.MINUTE, 'min'].join(' ');
-
-		this.hardDeletionTimeout = setTimeout(() => {
-			this.hardDeleteOnPruningCycle()
-				.then((rate) => this.scheduleHardDeletion(rate))
-				.catch((error) => {
-					this.scheduleHardDeletion(1 * TIME.SECOND);
-
-					const errorMessage =
-						error instanceof Error
-							? error.message
-							: jsonStringify(error, { replaceCircularRefs: true });
-
-					this.logger.error('[Pruning] Failed to hard-delete executions', { errorMessage });
-				});
-		}, rateMs);
-
-		this.logger.debug(`[Pruning] Hard-deletion scheduled for next ${when}`);
-	}
-
-	/**
-	 * Mark executions as deleted based on age and count, in a pruning cycle.
-	 */
-	async softDeleteOnPruningCycle() {
-		this.logger.debug('[Pruning] Starting soft-deletion of executions');
-
-		const result = await this.executionRepository.softDeletePrunableExecutions();
-
-		if (result.affected === 0) {
-			this.logger.debug('[Pruning] Found no executions to soft-delete');
-			return;
-		}
-
-		this.logger.debug('[Pruning] Soft-deleted executions', { count: result.affected });
-	}
-
-	@OnShutdown()
-	shutdown(): void {
-		this.isShuttingDown = true;
-		this.stopPruning();
-	}
-
-	/**
-	 * Permanently remove all soft-deleted executions and their binary data, in a pruning cycle.
-	 * @return Delay in ms after which the next cycle should be started
-	 */
-	private async hardDeleteOnPruningCycle() {
-		const ids = await this.executionRepository.hardDeleteSoftDeletedExecutions();
-
-		const executionIds = ids.map((o) => o.executionId);
-
-		if (executionIds.length === 0) {
-			this.logger.debug('[Pruning] Found no executions to hard-delete');
-
-			return this.rates.hardDeletion;
-		}
-
-		try {
-			this.logger.debug('[Pruning] Starting hard-deletion of executions', { executionIds });
-
-			await this.binaryDataService.deleteMany(ids);
-
-			await this.executionRepository.deleteByIds(executionIds);
-
-			this.logger.debug('[Pruning] Hard-deleted executions', { executionIds });
-		} catch (error) {
-			this.logger.error('[Pruning] Failed to hard-delete executions', {
-				executionIds,
-				error: error instanceof Error ? error.message : `${error}`,
-			});
-		}
-
-		/**
-		 * For next batch, speed up hard-deletion cycle in high-volume case
-		 * to prevent high concurrency from causing duplicate deletions.
-		 */
-		const isHighVolume = executionIds.length >= this.hardDeletionBatchSize;
-
-		return isHighVolume ? 1 * TIME.SECOND : this.rates.hardDeletion;
-	}
-}
diff --git a/packages/cli/src/services/pruning/__tests__/pruning.service.test.ts b/packages/cli/src/services/pruning/__tests__/pruning.service.test.ts
new file mode 100644
index 0000000000..050d1b82d9
--- /dev/null
+++ b/packages/cli/src/services/pruning/__tests__/pruning.service.test.ts
@@ -0,0 +1,204 @@
+import type { ExecutionsConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
+
+import type { MultiMainSetup } from '@/scaling/multi-main-setup.ee';
+import type { OrchestrationService } from '@/services/orchestration.service';
+import { mockLogger } from '@test/mocking';
+
+import { PruningService } from '../pruning.service';
+
+jest.mock('@/db', () => ({
+	connectionState: { migrated: true },
+}));
+
+describe('PruningService', () => {
+	describe('init', () => {
+		it('should start pruning on main instance that is the leader', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({ isLeader: true, isMultiMain: true }),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>(),
+				}),
+				mock(),
+			);
+			const startPruningSpy = jest.spyOn(pruningService, 'startPruning');
+
+			pruningService.init();
+
+			expect(startPruningSpy).toHaveBeenCalled();
+		});
+
+		it('should not start pruning on main instance that is a follower', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({ isLeader: false, isMultiMain: true }),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>(),
+				}),
+				mock(),
+			);
+			const startPruningSpy = jest.spyOn(pruningService, 'startPruning');
+
+			pruningService.init();
+
+			expect(startPruningSpy).not.toHaveBeenCalled();
+		});
+
+		it('should register leadership events if main on multi-main setup', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({ isLeader: true, isMultiMain: true }),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>({ on: jest.fn() }),
+				}),
+				mock(),
+			);
+
+			pruningService.init();
+
+			// @ts-expect-error Private method
+			expect(pruningService.orchestrationService.multiMainSetup.on).toHaveBeenCalledWith(
+				'leader-takeover',
+				expect.any(Function),
+			);
+
+			// @ts-expect-error Private method
+			expect(pruningService.orchestrationService.multiMainSetup.on).toHaveBeenCalledWith(
+				'leader-stepdown',
+				expect.any(Function),
+			);
+		});
+	});
+
+	describe('isEnabled', () => {
+		it('should return `true` based on config if leader main', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({ isLeader: true, instanceType: 'main', isMultiMain: true }),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>(),
+				}),
+				mock<ExecutionsConfig>({ pruneData: true }),
+			);
+
+			expect(pruningService.isEnabled).toBe(true);
+		});
+
+		it('should return `false` based on config if leader main', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({ isLeader: true, instanceType: 'main', isMultiMain: true }),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>(),
+				}),
+				mock<ExecutionsConfig>({ pruneData: false }),
+			);
+
+			expect(pruningService.isEnabled).toBe(false);
+		});
+
+		it('should return `false` if non-main even if config is enabled', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({ isLeader: false, instanceType: 'worker', isMultiMain: true }),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>(),
+				}),
+				mock<ExecutionsConfig>({ pruneData: true }),
+			);
+
+			expect(pruningService.isEnabled).toBe(false);
+		});
+
+		it('should return `false` if follower main even if config is enabled', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({
+					isLeader: false,
+					isFollower: true,
+					instanceType: 'main',
+					isMultiMain: true,
+				}),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>(),
+				}),
+				mock<ExecutionsConfig>({ pruneData: true }),
+			);
+
+			expect(pruningService.isEnabled).toBe(false);
+		});
+	});
+
+	describe('startPruning', () => {
+		it('should not start pruning if service is disabled', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({ isLeader: true, instanceType: 'main', isMultiMain: true }),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>(),
+				}),
+				mock<ExecutionsConfig>({ pruneData: false }),
+			);
+
+			const scheduleRollingSoftDeletionsSpy = jest.spyOn(
+				pruningService,
+				// @ts-expect-error Private method
+				'scheduleRollingSoftDeletions',
+			);
+
+			// @ts-expect-error Private method
+			const scheduleNextHardDeletionSpy = jest.spyOn(pruningService, 'scheduleNextHardDeletion');
+
+			pruningService.startPruning();
+
+			expect(scheduleRollingSoftDeletionsSpy).not.toHaveBeenCalled();
+			expect(scheduleNextHardDeletionSpy).not.toHaveBeenCalled();
+		});
+
+		it('should start pruning if service is enabled and DB is migrated', () => {
+			const pruningService = new PruningService(
+				mockLogger(),
+				mock<InstanceSettings>({ isLeader: true, instanceType: 'main', isMultiMain: true }),
+				mock(),
+				mock(),
+				mock<OrchestrationService>({
+					multiMainSetup: mock<MultiMainSetup>(),
+				}),
+				mock<ExecutionsConfig>({ pruneData: true }),
+			);
+
+			const scheduleRollingSoftDeletionsSpy = jest
+				// @ts-expect-error Private method
+				.spyOn(pruningService, 'scheduleRollingSoftDeletions')
+				.mockImplementation();
+
+			const scheduleNextHardDeletionSpy = jest
+				// @ts-expect-error Private method
+				.spyOn(pruningService, 'scheduleNextHardDeletion')
+				.mockImplementation();
+
+			pruningService.startPruning();
+
+			expect(scheduleRollingSoftDeletionsSpy).toHaveBeenCalled();
+			expect(scheduleNextHardDeletionSpy).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/cli/src/services/pruning/pruning.service.ts b/packages/cli/src/services/pruning/pruning.service.ts
new file mode 100644
index 0000000000..749c2d9d45
--- /dev/null
+++ b/packages/cli/src/services/pruning/pruning.service.ts
@@ -0,0 +1,163 @@
+import { ExecutionsConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
+import { BinaryDataService, InstanceSettings, Logger } from 'n8n-core';
+import { ensureError } from 'n8n-workflow';
+import { strict } from 'node:assert';
+
+import { Time } from '@/constants';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { connectionState as dbConnectionState } from '@/db';
+import { OnShutdown } from '@/decorators/on-shutdown';
+
+import { OrchestrationService } from '../orchestration.service';
+
+/**
+ * Responsible for deleting old executions from the database and deleting their
+ * associated binary data from the filesystem, on a rolling basis.
+ *
+ * By default:
+ *
+ * - Soft deletion (every 60m) identifies all prunable executions based on max
+ *   age and/or max count, exempting annotated executions.
+ * - Hard deletion (every 15m) processes prunable executions in batches of 100,
+ *   switching to 1s intervals until the total to prune is back down low enough,
+ *   or in case the hard deletion fails.
+ * - Once mostly caught up, hard deletion goes back to the 15m schedule.
+ */
+@Service()
+export class PruningService {
+	/** Timer for soft-deleting executions on a rolling basis. */
+	private softDeletionInterval: NodeJS.Timer | undefined;
+
+	/** Timeout for next hard-deletion of soft-deleted executions. */
+	private hardDeletionTimeout: NodeJS.Timeout | undefined;
+
+	private readonly rates = {
+		softDeletion: this.executionsConfig.pruneDataIntervals.softDelete * Time.minutes.toMilliseconds,
+		hardDeletion: this.executionsConfig.pruneDataIntervals.hardDelete * Time.minutes.toMilliseconds,
+	};
+
+	/** Max number of executions to hard-delete in a cycle. */
+	private readonly batchSize = 100;
+
+	private isShuttingDown = false;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly instanceSettings: InstanceSettings,
+		private readonly executionRepository: ExecutionRepository,
+		private readonly binaryDataService: BinaryDataService,
+		private readonly orchestrationService: OrchestrationService,
+		private readonly executionsConfig: ExecutionsConfig,
+	) {
+		this.logger = this.logger.scoped('pruning');
+	}
+
+	init() {
+		strict(this.instanceSettings.instanceRole !== 'unset', 'Instance role is not set');
+
+		if (this.instanceSettings.isLeader) this.startPruning();
+
+		if (this.instanceSettings.isMultiMain) {
+			this.orchestrationService.multiMainSetup.on('leader-takeover', () => this.startPruning());
+			this.orchestrationService.multiMainSetup.on('leader-stepdown', () => this.stopPruning());
+		}
+	}
+
+	get isEnabled() {
+		return (
+			this.executionsConfig.pruneData &&
+			this.instanceSettings.instanceType === 'main' &&
+			this.instanceSettings.isLeader
+		);
+	}
+
+	startPruning() {
+		if (!this.isEnabled || !dbConnectionState.migrated || this.isShuttingDown) return;
+
+		this.scheduleRollingSoftDeletions();
+		this.scheduleNextHardDeletion();
+	}
+
+	stopPruning() {
+		if (!this.isEnabled) return;
+
+		clearInterval(this.softDeletionInterval);
+		clearTimeout(this.hardDeletionTimeout);
+	}
+
+	private scheduleRollingSoftDeletions(rateMs = this.rates.softDeletion) {
+		this.softDeletionInterval = setInterval(
+			async () => await this.softDelete(),
+			this.rates.softDeletion,
+		);
+
+		this.logger.debug(`Soft-deletion every ${rateMs * Time.milliseconds.toMinutes} minutes`);
+	}
+
+	private scheduleNextHardDeletion(rateMs = this.rates.hardDeletion) {
+		this.hardDeletionTimeout = setTimeout(() => {
+			this.hardDelete()
+				.then((rate) => this.scheduleNextHardDeletion(rate))
+				.catch((error) => {
+					this.scheduleNextHardDeletion(1_000);
+					this.logger.error('Failed to hard-delete executions', { error: ensureError(error) });
+				});
+		}, rateMs);
+
+		this.logger.debug(`Hard-deletion in next ${rateMs * Time.milliseconds.toMinutes} minutes`);
+	}
+
+	/** Soft-delete executions based on max age and/or max count. */
+	async softDelete() {
+		const result = await this.executionRepository.softDeletePrunableExecutions();
+
+		if (result.affected === 0) {
+			this.logger.debug('Found no executions to soft-delete');
+			return;
+		}
+
+		this.logger.debug('Soft-deleted executions', { count: result.affected });
+	}
+
+	@OnShutdown()
+	shutdown(): void {
+		this.isShuttingDown = true;
+		this.stopPruning();
+	}
+
+	/**
+	 * Delete all soft-deleted executions and their binary data.
+	 *
+	 * @returns Delay in milliseconds until next hard-deletion
+	 */
+	private async hardDelete(): Promise<number> {
+		const ids = await this.executionRepository.findSoftDeletedExecutions();
+
+		const executionIds = ids.map((o) => o.executionId);
+
+		if (executionIds.length === 0) {
+			this.logger.debug('Found no executions to hard-delete');
+
+			return this.rates.hardDeletion;
+		}
+
+		try {
+			await this.binaryDataService.deleteMany(ids);
+
+			await this.executionRepository.deleteByIds(executionIds);
+
+			this.logger.debug('Hard-deleted executions', { executionIds });
+		} catch (error) {
+			this.logger.error('Failed to hard-delete executions', {
+				executionIds,
+				error: ensureError(error),
+			});
+		}
+
+		// if high volume, speed up next hard-deletion
+		if (executionIds.length >= this.batchSize) return 1 * Time.seconds.toMilliseconds;
+
+		return this.rates.hardDeletion;
+	}
+}
diff --git a/packages/cli/src/services/public-api-key.service.ts b/packages/cli/src/services/public-api-key.service.ts
index bca3cd0d62..a6b1133bc2 100644
--- a/packages/cli/src/services/public-api-key.service.ts
+++ b/packages/cli/src/services/public-api-key.service.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import type { OpenAPIV3 } from 'openapi-types';
-import { Service } from 'typedi';
 
 import { ApiKey } from '@/databases/entities/api-key';
 import type { User } from '@/databases/entities/user';
diff --git a/packages/cli/src/services/redis-client.service.ts b/packages/cli/src/services/redis-client.service.ts
index c584530165..6dea89a801 100644
--- a/packages/cli/src/services/redis-client.service.ts
+++ b/packages/cli/src/services/redis-client.service.ts
@@ -1,10 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import ioRedis from 'ioredis';
 import type { Cluster, RedisOptions } from 'ioredis';
-import { Service } from 'typedi';
+import { Logger } from 'n8n-core';
 
 import { Debounce } from '@/decorators/debounce';
-import { Logger } from '@/logging/logger.service';
 import { TypedEmitter } from '@/typed-emitter';
 
 import type { RedisClientType } from '../scaling/redis/redis.types';
diff --git a/packages/cli/src/services/role.service.ts b/packages/cli/src/services/role.service.ts
index 97adbbfb7d..e060c0dd81 100644
--- a/packages/cli/src/services/role.service.ts
+++ b/packages/cli/src/services/role.service.ts
@@ -1,9 +1,10 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import { combineScopes, type Resource, type Scope } from '@n8n/permissions';
 import { ApplicationError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
-import type { ProjectRelation, ProjectRole } from '@/databases/entities/project-relation';
+import type { ProjectRelation } from '@/databases/entities/project-relation';
 import type {
 	CredentialSharingRole,
 	SharedCredentials,
@@ -15,19 +16,19 @@ import {
 	GLOBAL_ADMIN_SCOPES,
 	GLOBAL_MEMBER_SCOPES,
 	GLOBAL_OWNER_SCOPES,
-} from '@/permissions/global-roles';
+} from '@/permissions.ee/global-roles';
 import {
 	PERSONAL_PROJECT_OWNER_SCOPES,
 	PROJECT_EDITOR_SCOPES,
 	PROJECT_VIEWER_SCOPES,
 	REGULAR_PROJECT_ADMIN_SCOPES,
-} from '@/permissions/project-roles';
+} from '@/permissions.ee/project-roles';
 import {
 	CREDENTIALS_SHARING_OWNER_SCOPES,
 	CREDENTIALS_SHARING_USER_SCOPES,
 	WORKFLOW_SHARING_EDITOR_SCOPES,
 	WORKFLOW_SHARING_OWNER_SCOPES,
-} from '@/permissions/resource-roles';
+} from '@/permissions.ee/resource-roles';
 import type { ListQuery } from '@/requests';
 
 export type RoleNamespace = 'global' | 'project' | 'credential' | 'workflow';
diff --git a/packages/cli/src/services/tag.service.ts b/packages/cli/src/services/tag.service.ts
index 7ed3feebff..09695f44ff 100644
--- a/packages/cli/src/services/tag.service.ts
+++ b/packages/cli/src/services/tag.service.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import type { TagEntity } from '@/databases/entities/tag-entity';
 import { TagRepository } from '@/databases/repositories/tag.repository';
diff --git a/packages/cli/src/services/url.service.ts b/packages/cli/src/services/url.service.ts
index 43b53f28ad..3851c011ca 100644
--- a/packages/cli/src/services/url.service.ts
+++ b/packages/cli/src/services/url.service.ts
@@ -1,5 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import config from '@/config';
 
@@ -14,7 +14,7 @@ export class UrlService {
 
 	/** Returns the base URL of the webhooks */
 	getWebhookBaseUrl() {
-		let urlBaseWebhook = process.env.WEBHOOK_URL ?? this.baseUrl;
+		let urlBaseWebhook = this.trimQuotes(process.env.WEBHOOK_URL) || this.baseUrl;
 		if (!urlBaseWebhook.endsWith('/')) {
 			urlBaseWebhook += '/';
 		}
@@ -23,7 +23,7 @@ export class UrlService {
 
 	/** Return the n8n instance base URL without trailing slash */
 	getInstanceBaseUrl(): string {
-		const n8nBaseUrl = config.getEnv('editorBaseUrl') || this.getWebhookBaseUrl();
+		const n8nBaseUrl = this.trimQuotes(config.getEnv('editorBaseUrl')) || this.getWebhookBaseUrl();
 
 		return n8nBaseUrl.endsWith('/') ? n8nBaseUrl.slice(0, n8nBaseUrl.length - 1) : n8nBaseUrl;
 	}
@@ -36,4 +36,9 @@ export class UrlService {
 		}
 		return `${protocol}://${host}:${port}${path}`;
 	}
+
+	/** Remove leading and trailing double quotes from a URL. */
+	private trimQuotes(url?: string) {
+		return url?.replace(/^["]+|["]+$/g, '') ?? '';
+	}
 }
diff --git a/packages/cli/src/services/user-onboarding.service.ts b/packages/cli/src/services/user-onboarding.service.ts
deleted file mode 100644
index 5e92830a87..0000000000
--- a/packages/cli/src/services/user-onboarding.service.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
-import { In } from '@n8n/typeorm';
-import { Service } from 'typedi';
-
-import type { User } from '@/databases/entities/user';
-import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
-import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { UserService } from '@/services/user.service';
-
-@Service()
-export class UserOnboardingService {
-	constructor(
-		private readonly sharedWorkflowRepository: SharedWorkflowRepository,
-		private readonly workflowRepository: WorkflowRepository,
-		private readonly userService: UserService,
-	) {}
-
-	/**
-	 * Check if user owns more than 15 workflows or more than 2 workflows with at least 2 nodes.
-	 * If user does, set flag in its settings.
-	 */
-	async isBelowThreshold(user: User): Promise<boolean> {
-		let belowThreshold = true;
-		const skippedTypes = ['n8n-nodes-base.start', 'n8n-nodes-base.stickyNote'];
-
-		const ownedWorkflowsIds = await this.sharedWorkflowRepository
-			.find({
-				where: {
-					project: {
-						projectRelations: {
-							role: 'project:personalOwner',
-							userId: user.id,
-						},
-					},
-					role: 'workflow:owner',
-				},
-				select: ['workflowId'],
-			})
-			.then((ownedWorkflows) => ownedWorkflows.map(({ workflowId }) => workflowId));
-
-		if (ownedWorkflowsIds.length > 15) {
-			belowThreshold = false;
-		} else {
-			// just fetch workflows' nodes to keep memory footprint low
-			const workflows = await this.workflowRepository.find({
-				where: { id: In(ownedWorkflowsIds) },
-				select: ['nodes'],
-			});
-
-			// valid workflow: 2+ nodes without start node
-			const validWorkflowCount = workflows.reduce((counter, workflow) => {
-				if (counter <= 2 && workflow.nodes.length > 2) {
-					const nodes = workflow.nodes.filter((node) => !skippedTypes.includes(node.type));
-					if (nodes.length >= 2) {
-						return counter + 1;
-					}
-				}
-				return counter;
-			}, 0);
-
-			// more than 2 valid workflows required
-			belowThreshold = validWorkflowCount <= 2;
-		}
-
-		// user is above threshold --> set flag in settings
-		if (!belowThreshold) {
-			void this.userService.updateSettings(user.id, { isOnboarded: true });
-		}
-
-		return belowThreshold;
-	}
-}
diff --git a/packages/cli/src/services/user.service.ts b/packages/cli/src/services/user.service.ts
index ba02375aba..ab188fc972 100644
--- a/packages/cli/src/services/user.service.ts
+++ b/packages/cli/src/services/user.service.ts
@@ -1,13 +1,13 @@
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import type { IUserSettings } from 'n8n-workflow';
-import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
-import { Service } from 'typedi';
+import { ApplicationError } from 'n8n-workflow';
 
 import type { User, AssignableRole } from '@/databases/entities/user';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { EventService } from '@/events/event.service';
 import type { Invitation, PublicUser } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import type { PostHogClient } from '@/posthog';
 import type { UserRequest } from '@/requests';
 import { UrlService } from '@/services/url.service';
@@ -213,9 +213,8 @@ export class UserService {
 					),
 			);
 		} catch (error) {
-			ErrorReporter.error(error);
 			this.logger.error('Failed to create user shells', { userShells: createdUsers });
-			throw new InternalServerError('An error occurred during user creation');
+			throw new InternalServerError('An error occurred during user creation', error);
 		}
 
 		pendingUsersToInvite.forEach(({ email, id }) => createdUsers.set(email, id));
diff --git a/packages/cli/src/services/workflow-loader.service.ts b/packages/cli/src/services/workflow-loader.service.ts
new file mode 100644
index 0000000000..5d5e08c1fe
--- /dev/null
+++ b/packages/cli/src/services/workflow-loader.service.ts
@@ -0,0 +1,19 @@
+import { Service } from '@n8n/di';
+import { ApplicationError, type IWorkflowBase, type IWorkflowLoader } from 'n8n-workflow';
+
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+
+@Service()
+export class WorkflowLoaderService implements IWorkflowLoader {
+	constructor(private readonly workflowRepository: WorkflowRepository) {}
+
+	async get(workflowId: string): Promise<IWorkflowBase> {
+		const workflow = await this.workflowRepository.findById(workflowId);
+
+		if (!workflow) {
+			throw new ApplicationError(`Failed to find workflow with ID "${workflowId}"`);
+		}
+
+		return workflow;
+	}
+}
diff --git a/packages/cli/src/services/workflow-statistics.service.ts b/packages/cli/src/services/workflow-statistics.service.ts
index 53cbac5094..efcdc8320f 100644
--- a/packages/cli/src/services/workflow-statistics.service.ts
+++ b/packages/cli/src/services/workflow-statistics.service.ts
@@ -1,10 +1,10 @@
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { StatisticsNames } from '@/databases/entities/workflow-statistics';
 import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logging/logger.service';
 import { UserService } from '@/services/user.service';
 import { TypedEmitter } from '@/typed-emitter';
 
diff --git a/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts b/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
index 9c2f5b4887..41afed9398 100644
--- a/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
+++ b/packages/cli/src/shutdown/__tests__/shutdown.service.test.ts
@@ -1,6 +1,7 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import { ApplicationError, ErrorReporterProxy } from 'n8n-workflow';
-import Container from 'typedi';
+import type { ErrorReporter } from 'n8n-core';
+import { ApplicationError } from 'n8n-workflow';
 
 import type { ServiceClass } from '@/shutdown/shutdown.service';
 import { ShutdownService } from '@/shutdown/shutdown.service';
@@ -13,14 +14,13 @@ describe('ShutdownService', () => {
 	let shutdownService: ShutdownService;
 	let mockComponent: MockComponent;
 	let onShutdownSpy: jest.SpyInstance;
-	let mockErrorReporterProxy: jest.SpyInstance;
+	const errorReporter = mock<ErrorReporter>();
 
 	beforeEach(() => {
-		shutdownService = new ShutdownService(mock());
+		shutdownService = new ShutdownService(mock(), errorReporter);
 		mockComponent = new MockComponent();
 		Container.set(MockComponent, mockComponent);
 		onShutdownSpy = jest.spyOn(mockComponent, 'onShutdown');
-		mockErrorReporterProxy = jest.spyOn(ErrorReporterProxy, 'error').mockImplementation(() => {});
 	});
 
 	describe('shutdown', () => {
@@ -83,8 +83,8 @@ describe('ShutdownService', () => {
 			shutdownService.shutdown();
 			await shutdownService.waitForShutdown();
 
-			expect(mockErrorReporterProxy).toHaveBeenCalledTimes(1);
-			const error = mockErrorReporterProxy.mock.calls[0][0];
+			expect(errorReporter.error).toHaveBeenCalledTimes(1);
+			const error = errorReporter.error.mock.calls[0][0] as ApplicationError;
 			expect(error).toBeInstanceOf(ApplicationError);
 			expect(error.message).toBe('Failed to shutdown gracefully');
 			expect(error.extra).toEqual({
diff --git a/packages/cli/src/shutdown/shutdown.service.ts b/packages/cli/src/shutdown/shutdown.service.ts
index 1bedc3a7d4..d31ca9b154 100644
--- a/packages/cli/src/shutdown/shutdown.service.ts
+++ b/packages/cli/src/shutdown/shutdown.service.ts
@@ -1,9 +1,9 @@
-import type { Class } from 'n8n-core';
-import { ApplicationError, ErrorReporterProxy, assert } from 'n8n-workflow';
-import { Container, Service } from 'typedi';
+import { Container, Service } from '@n8n/di';
+import { type Class, ErrorReporter } from 'n8n-core';
+import { Logger } from 'n8n-core';
+import { ApplicationError, assert } from 'n8n-workflow';
 
 import { LOWEST_SHUTDOWN_PRIORITY, HIGHEST_SHUTDOWN_PRIORITY } from '@/constants';
-import { Logger } from '@/logging/logger.service';
 
 type HandlerFn = () => Promise<void> | void;
 export type ServiceClass = Class<Record<string, HandlerFn>>;
@@ -31,7 +31,10 @@ export class ShutdownService {
 
 	private shutdownPromise: Promise<void> | undefined;
 
-	constructor(private readonly logger: Logger) {}
+	constructor(
+		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
+	) {}
 
 	/** Registers given listener to be notified when the application is shutting down */
 	register(priority: number, handler: ShutdownHandler) {
@@ -108,7 +111,7 @@ export class ShutdownService {
 			await method.call(service);
 		} catch (error) {
 			assert(error instanceof Error);
-			ErrorReporterProxy.error(new ComponentShutdownError(name, error));
+			this.errorReporter.error(new ComponentShutdownError(name, error));
 		}
 	}
 }
diff --git a/packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts b/packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts
similarity index 92%
rename from packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts
rename to packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts
index 76ae2e4d50..d75fdc8a7f 100644
--- a/packages/cli/src/sso/saml/__tests__/saml-helpers.test.ts
+++ b/packages/cli/src/sso.ee/saml/__tests__/saml-helpers.test.ts
@@ -3,8 +3,8 @@ import { User } from '@/databases/entities/user';
 import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { generateNanoId } from '@/databases/utils/generators';
-import * as helpers from '@/sso/saml/saml-helpers';
-import type { SamlUserAttributes } from '@/sso/saml/types/saml-user-attributes';
+import * as helpers from '@/sso.ee/saml/saml-helpers';
+import type { SamlUserAttributes } from '@/sso.ee/saml/types';
 import { mockInstance } from '@test/mocking';
 
 const userRepository = mockInstance(UserRepository);
diff --git a/packages/cli/src/sso.ee/saml/__tests__/saml-validator.test.ts b/packages/cli/src/sso.ee/saml/__tests__/saml-validator.test.ts
new file mode 100644
index 0000000000..9f93550bf2
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/__tests__/saml-validator.test.ts
@@ -0,0 +1,469 @@
+import { mock } from 'jest-mock-extended';
+
+import { SamlValidator } from '../saml-validator';
+
+describe('saml-validator', () => {
+	const validator = new SamlValidator(mock());
+	const VALID_CERTIFICATE =
+		'MIIC8DCCAdigAwIBAgIQf+iroClVKohAtsyk0Ne13TANBgkqhkiG9w0BAQsFADA0MTIwMAYDVQQDEylNaWNyb3NvZnQgQXp1cmUgRmVkZXJhdGVkIFNTTyBDZXJ0aWZpY2F0ZTAeFw0yNDExMTMxMDEwNTNaFw0yNzExMTMxMDEwNTNaMDQxMjAwBgNVBAMTKU1pY3Jvc29mdCBBenVyZSBGZWRlcmF0ZWQgU1NPIENlcnRpZmljYXRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwE8Ad1OMQKfaHi6YrsEcmMNwIAQ86h7JmnuABf5xLNd27jaMF4FVxHbEtC/BYxtcmwld5zbkCVXQ6PT6VoeYIjHMVnptFXg15EGgjnqpxWsjLDQNoSdSQu8VhG+8Yb5M7KPt+UEZfsRZVrgqMjdSEMVrOzPMD8KMB7wnghYX6npcZhn7D5w/F9gVDpI1Um8M/FIUKYVSYFjky1i24WvKmcBf71mAacZp48Zuj5by/ELIb6gAjpW5xpd02smpLthy/Yo4XDIQQurFOfjqyZd8xAZu/SfPsbjtymWw59tgd9RdYISl6O/241kY9h6Ojtx6WShOVDi6q+bJrfj9Z8WKcQIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQCiVxiQ9KpjihliQzIW45YO0EvRJtoPtyVAh9RiSGozbTl4otfrUJf8nbRtj7iZBRuuW4rrtRAH5kDb+i1wNUUQED2Pl/l4x5cN0oBytP3GSymq6NJx1gUOBO1BrNY+c3r5yHOUyj5qpbw9UkqpG1AqQkLLeZqB/yVCyOBQT7SKTbXVYhGefFM/+6z0/rGsWZN5OF6/2NC06ws1v4In28Atgpg4XxFh5TL7rPMJ11ca5MN9lHJoIUsvls053eQBcd7vJneqzd904B6WtPld6KOJK4dzIt9edHzPhaz158awWwx3iHsMn1Y/T0WVy5/4ZTzxY/i4U3t1Yt8ktxewVJYT';
+
+	beforeAll(async () => {
+		await validator.init();
+	});
+
+	describe('validateMetadata', () => {
+		test('successfully validates metadata containing ws federation tags', async () => {
+			// ARRANGE
+			const metadata = `<?xml version="1.0" encoding="utf-8"?>
+			<EntityDescriptor ID="_1069c6df-0612-4058-ae4e-1987ca45431b"
+				entityID="https://sts.windows.net/random-issuer/"
+				xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+				<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+					<SignedInfo>
+						<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+						<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
+						<Reference URI="#_1069c6df-0612-4058-ae4e-1987ca45431b">
+							<Transforms>
+								<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+								<Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+							</Transforms>
+							<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+							<DigestValue>hoeupPMPzijHu6caNarGYjsG0eKm4DOFUhjo0bPo0Ls=</DigestValue>
+						</Reference>
+					</SignedInfo>
+					<SignatureValue>
+						DQnnT/5se4dqYN86R35MCdbyKVl64lGPLSIVrxFxrOQ9YRK1br7Z1Bt1/LQD4f92z+GwAl+9tZTWhuoy6OGHCV6LlqBEztW43KnlCKw6eaNg4/6NluzJ/XeknXYLURDnfFVyGbLQAYWGND4Qm8CUXO/GjGfWTZuArvrDDC36/2FA41jKXtf1InxGFx1Bbaskx3n3KCFFth/V9knbnc1zftEe022aQluPRoGccROOI4ZeLUFL6+1gYlxjx0gFIOTRiuvrzR765lHNrF7iZ4aD+XukqtkGEtxTkiLoB+Bnr8Fd7IF5rV5FKTZWSxo+ZFcLimrDGtFPItVrC/oKRc+MGA==</SignatureValue>
+					<ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+						<ds:X509Data>
+							<ds:X509Certificate>${VALID_CERTIFICATE}</ds:X509Certificate>
+						</ds:X509Data>
+					</ds:KeyInfo>
+				</Signature>
+				<RoleDescriptor xsi:type="fed:SecurityTokenServiceType"
+					protocolSupportEnumeration="http://docs.oasis-open.org/wsfed/federation/200706"
+					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+					xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
+					<KeyDescriptor use="signing">
+						<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+							<X509Data>
+								<X509Certificate>${VALID_CERTIFICATE}</X509Certificate>
+							</X509Data>
+						</KeyInfo>
+					</KeyDescriptor>
+					<fed:ClaimTypesOffered>
+						<auth:ClaimType Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Name</auth:DisplayName>
+							<auth:Description>The mutable display name of the user.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Subject</auth:DisplayName>
+							<auth:Description>An immutable, globally unique, non-reusable identifier of the user that is
+								unique to the application for which a token is issued.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Given Name</auth:DisplayName>
+							<auth:Description>First name of the user.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Surname</auth:DisplayName>
+							<auth:Description>Last name of the user.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/identity/claims/displayname"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Display Name</auth:DisplayName>
+							<auth:Description>Display name of the user.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/identity/claims/nickname"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Nick Name</auth:DisplayName>
+							<auth:Description>Nick name of the user.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType
+							Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationinstant"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Authentication Instant</auth:DisplayName>
+							<auth:Description>The time (UTC) when the user is authenticated to Windows Azure Active
+								Directory.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType
+							Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Authentication Method</auth:DisplayName>
+							<auth:Description>The method that Windows Azure Active Directory uses to authenticate users.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/identity/claims/objectidentifier"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>ObjectIdentifier</auth:DisplayName>
+							<auth:Description>Primary identifier for the user in the directory. Immutable, globally
+								unique, non-reusable.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/identity/claims/tenantid"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>TenantId</auth:DisplayName>
+							<auth:Description>Identifier for the user's tenant.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/identity/claims/identityprovider"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>IdentityProvider</auth:DisplayName>
+							<auth:Description>Identity provider for the user.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Email</auth:DisplayName>
+							<auth:Description>Email address of the user.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/groups"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Groups</auth:DisplayName>
+							<auth:Description>Groups of the user.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/identity/claims/accesstoken"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>External Access Token</auth:DisplayName>
+							<auth:Description>Access token issued by external identity provider.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/expiration"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>External Access Token Expiration</auth:DisplayName>
+							<auth:Description>UTC expiration time of access token issued by external identity provider.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/identity/claims/openid2_id"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>External OpenID 2.0 Identifier</auth:DisplayName>
+							<auth:Description>OpenID 2.0 identifier issued by external identity provider.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/claims/groups.link"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>GroupsOverageClaim</auth:DisplayName>
+							<auth:Description>Issued when number of user's group claims exceeds return limit.</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/role"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>Role Claim</auth:DisplayName>
+							<auth:Description>Roles that the user or Service Principal is attached to</auth:Description>
+						</auth:ClaimType>
+						<auth:ClaimType Uri="http://schemas.microsoft.com/ws/2008/06/identity/claims/wids"
+							xmlns:auth="http://docs.oasis-open.org/wsfed/authorization/200706">
+							<auth:DisplayName>RoleTemplate Id Claim</auth:DisplayName>
+							<auth:Description>Role template id of the Built-in Directory Roles that the user is a member
+								of</auth:Description>
+						</auth:ClaimType>
+					</fed:ClaimTypesOffered>
+					<fed:SecurityTokenServiceEndpoint>
+						<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
+							<wsa:Address>https://login.microsoftonline.com/random-issuer/wsfed</wsa:Address>
+						</wsa:EndpointReference>
+					</fed:SecurityTokenServiceEndpoint>
+					<fed:PassiveRequestorEndpoint>
+						<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
+							<wsa:Address>https://login.microsoftonline.com/random-issuer/wsfed</wsa:Address>
+						</wsa:EndpointReference>
+					</fed:PassiveRequestorEndpoint>
+				</RoleDescriptor>
+				<RoleDescriptor xsi:type="fed:ApplicationServiceType"
+					protocolSupportEnumeration="http://docs.oasis-open.org/wsfed/federation/200706"
+					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+					xmlns:fed="http://docs.oasis-open.org/wsfed/federation/200706">
+					<KeyDescriptor use="signing">
+						<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+							<X509Data>
+								<X509Certificate>${VALID_CERTIFICATE}</X509Certificate>
+							</X509Data>
+						</KeyInfo>
+					</KeyDescriptor>
+					<fed:TargetScopes>
+						<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
+							<wsa:Address>https://sts.windows.net/random-issuer/</wsa:Address>
+						</wsa:EndpointReference>
+					</fed:TargetScopes>
+					<fed:ApplicationServiceEndpoint>
+						<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
+							<wsa:Address>https://login.microsoftonline.com/random-issuer/wsfed</wsa:Address>
+						</wsa:EndpointReference>
+					</fed:ApplicationServiceEndpoint>
+					<fed:PassiveRequestorEndpoint>
+						<wsa:EndpointReference xmlns:wsa="http://www.w3.org/2005/08/addressing">
+							<wsa:Address>https://login.microsoftonline.com/random-issuer/wsfed</wsa:Address>
+						</wsa:EndpointReference>
+					</fed:PassiveRequestorEndpoint>
+				</RoleDescriptor>
+				<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+					<KeyDescriptor use="signing">
+						<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+							<X509Data>
+								<X509Certificate>${VALID_CERTIFICATE}</X509Certificate>
+							</X509Data>
+						</KeyInfo>
+					</KeyDescriptor>
+					<SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+						Location="https://login.microsoftonline.com/random-issuer/saml2" />
+					<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+						Location="https://login.microsoftonline.com/random-issuer/saml2" />
+					<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+						Location="https://login.microsoftonline.com/random-issuer/saml2" />
+				</IDPSSODescriptor>
+			</EntityDescriptor>`;
+
+			// ACT
+			const result = await validator.validateMetadata(metadata);
+
+			// ASSERT
+			expect(result).toBe(true);
+		});
+
+		test('rejects invalid metadata', async () => {
+			// ARRANGE
+			// Invalid because required children are missing
+			const metadata = `<?xml version="1.0" encoding="utf-8"?>
+			<EntityDescriptor ID="_1069c6df-0612-4058-ae4e-1987ca45431b"
+				entityID="https://sts.windows.net/random-issuer/"
+				xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+			</EntityDescriptor>`;
+
+			// ACT
+			const result = await validator.validateMetadata(metadata);
+
+			// ASSERT
+			expect(result).toBe(false);
+		});
+
+		test('rejects malformed XML metadata', async () => {
+			// ARRANGE
+			const metadata = `<?xml version="1.0" encoding="utf-8"?>
+			<EntityDescriptor ID="_1069c6df-0612-4058-ae4e-1987ca45431b"
+					entityID="https://sts.windows.net/random-issuer/"
+					xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+					<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+							<KeyDescriptor use="signing">
+									<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+											<X509Data>
+													<X509Certificate>${VALID_CERTIFICATE}
+													</X509Certificate>
+											</X509Data>
+									</KeyInfo>
+							</KeyDescriptor>
+					</IDPSSODescriptor>
+			`; // Missing closing tags
+
+			// ACT
+			const result = await validator.validateMetadata(metadata);
+
+			// ASSERT
+			expect(result).toBe(false);
+		});
+
+		test('rejects metadata missing SingleSignOnService', async () => {
+			// ARRANGE
+			const metadata = `<?xml version="1.0" encoding="utf-8"?>
+			<EntityDescriptor ID="_1069c6df-0612-4058-ae4e-1987ca45431b"
+					entityID="https://sts.windows.net/random-issuer/"
+					xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+					<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+							<KeyDescriptor use="signing">
+									<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+											<X509Data>
+													<X509Certificate>${VALID_CERTIFICATE}
+													</X509Certificate>
+											</X509Data>
+									</KeyInfo>
+							</KeyDescriptor>
+					</IDPSSODescriptor>
+			</EntityDescriptor>`;
+
+			// ACT
+			const result = await validator.validateMetadata(metadata);
+
+			// ASSERT
+			expect(result).toBe(false);
+		});
+
+		test('rejects metadata with invalid X.509 certificate', async () => {
+			// ARRANGE
+			const metadata = `<?xml version="1.0" encoding="utf-8"?>
+			<EntityDescriptor ID="_1069c6df-0612-4058-ae4e-1987ca45431b"
+					entityID="https://sts.windows.net/random-issuer/"
+					xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+					<IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+							<KeyDescriptor use="signing">
+									<KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#">
+											<X509Data>
+													<X509Certificate>
+															INVALID_CERTIFICATE
+													</X509Certificate>
+											</X509Data>
+									</KeyInfo>
+							</KeyDescriptor>
+							<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"
+									Location="https://login.microsoftonline.com/random-issuer/saml2" />
+					</IDPSSODescriptor>
+			</EntityDescriptor>`;
+
+			// ACT
+			const result = await validator.validateMetadata(metadata);
+
+			// ASSERT
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('validateResponse', () => {
+		test('successfully validates response', async () => {
+			// ARRANGE
+			const response = `<samlp:Response ID="random_id" Version="2.0"
+	IssueInstant="2024-11-13T14:58:00.371Z" Destination="random-url"
+	InResponseTo="random_id"
+	xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol">
+	<Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion">
+		https://sts.windows.net/random-issuer/</Issuer>
+	<samlp:Status>
+		<samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" />
+	</samlp:Status>
+	<Assertion ID="_random_id" IssueInstant="2024-11-13T14:58:00.367Z"
+		Version="2.0" xmlns="urn:oasis:names:tc:SAML:2.0:assertion">
+		<Issuer>https://sts.windows.net/random-issuer/</Issuer>
+		<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+			<SignedInfo>
+				<CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+				<SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" />
+				<Reference URI="#_random_id">
+					<Transforms>
+						<Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+						<Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+					</Transforms>
+					<DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" />
+					<DigestValue>random_digest</DigestValue>
+				</Reference>
+			</SignedInfo>
+			<SignatureValue>
+				cmFuZG9tX3NpZ25hdHVyZQo=</SignatureValue>
+			<KeyInfo>
+				<X509Data>
+					<X509Certificate>
+						cmFuZG9tX3NpZ25hdHVyZQo=</X509Certificate>
+				</X509Data>
+			</KeyInfo>
+		</Signature>
+		<Subject>
+			<NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress">
+				random_name_id</NameID>
+			<SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
+				<SubjectConfirmationData InResponseTo="random_id"
+					NotOnOrAfter="2024-11-13T15:58:00.284Z"
+					Recipient="random-url" />
+			</SubjectConfirmation>
+		</Subject>
+		<Conditions NotBefore="2024-11-13T14:53:00.284Z" NotOnOrAfter="2024-11-13T15:58:00.284Z">
+			<AudienceRestriction>
+				<Audience>http://localhost:5678/rest/sso/saml/metadata</Audience>
+			</AudienceRestriction>
+		</Conditions>
+		<AttributeStatement>
+			<Attribute Name="http://schemas.microsoft.com/identity/claims/tenantid">
+				<AttributeValue>random-issuer</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.microsoft.com/identity/claims/objectidentifier">
+				<AttributeValue>4663f730-51c5-4490-a38a-19dda804865a</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.microsoft.com/identity/claims/displayname">
+				<AttributeValue>Danny n8n</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.microsoft.com/identity/claims/identityprovider">
+				<AttributeValue>mail</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname">
+				<AttributeValue>Danny</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname">
+				<AttributeValue>Martini</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress">
+				<AttributeValue>danny@n8n.io</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name">
+				<AttributeValue>random_name_id</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname/firstname">
+				<AttributeValue>Danny</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname/lastname">
+				<AttributeValue>Martini</AttributeValue>
+			</Attribute>
+			<Attribute Name="http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn/upn">
+				<AttributeValue>danny@n8n.io</AttributeValue>
+			</Attribute>
+		</AttributeStatement>
+		<AuthnStatement AuthnInstant="2024-11-13T14:51:51.267Z"
+			SessionIndex="_random_id">
+			<AuthnContext>
+				<AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:Unspecified</AuthnContextClassRef>
+			</AuthnContext>
+		</AuthnStatement>
+	</Assertion>
+</samlp:Response>`;
+
+			// ACT
+			const result = await validator.validateResponse(response);
+
+			// ASSERT
+			expect(result).toBe(true);
+		});
+
+		test('rejects invalid response', async () => {
+			// ARRANGE
+			// Invalid because required children are missing
+			const response = `<samlp:Response ID="random_id" Version="2.0"
+	IssueInstant="2024-11-13T14:58:00.371Z" Destination="random-url"
+	InResponseTo="random_id"
+	xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol">
+</samlp:Response>`;
+
+			// ACT
+			const result = await validator.validateResponse(response);
+
+			// ASSERT
+			expect(result).toBe(false);
+		});
+
+		test('rejects expired SAML response', async () => {
+			// ARRANGE
+			const response = `<samlp:Response ID="random_id" Version="2.0"
+					IssueInstant="2024-11-13T14:58:00.371Z" Destination="random-url"
+					InResponseTo="random_id"
+					xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol">
+					<Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion">
+							https://sts.windows.net/random-issuer/</Issuer>
+					<samlp:Status>
+							<samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" />
+					</samlp:Status>
+					<Assertion ID="_random_id" IssueInstant="2024-11-13T14:58:00.367Z"
+							Version="2.0" xmlns="urn:oasis:names:tc:SAML:2.0:assertion">
+							<Issuer>https://sts.windows.net/random-issuer/</Issuer>
+							<Subject>
+									<NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress">
+											random_name_id</NameID>
+									<SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
+											<SubjectConfirmationData InResponseTo="random_id"
+													NotOnOrAfter="2023-11-13T15:58:00.284Z" // Expired
+													Recipient="random-url" />
+									</SubjectConfirmation>
+							</Subject>
+							<Conditions NotBefore="2024-11-13T14:53:00.284Z" NotOnOrAfter="2023-11-13T15:58:00.284Z"> // Expired
+									<AudienceRestriction>
+											<Audience>http://localhost:5678/rest/sso/saml/metadata</Audience>
+									</AudienceRestriction>
+							</Conditions>
+					</Assertion>
+			</samlp:Response>`;
+
+			// ACT
+			const result = await validator.validateResponse(response);
+
+			// ASSERT
+			expect(result).toBe(false);
+		});
+	});
+});
diff --git a/packages/cli/src/sso.ee/saml/__tests__/saml.service.ee.test.ts b/packages/cli/src/sso.ee/saml/__tests__/saml.service.ee.test.ts
new file mode 100644
index 0000000000..ebf34e3075
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/__tests__/saml.service.ee.test.ts
@@ -0,0 +1,125 @@
+import type express from 'express';
+import { mock } from 'jest-mock-extended';
+import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
+
+import { SettingsRepository } from '@/databases/repositories/settings.repository';
+import * as samlHelpers from '@/sso.ee/saml/saml-helpers';
+import { SamlService } from '@/sso.ee/saml/saml.service.ee';
+import { mockInstance } from '@test/mocking';
+
+import { SAML_PREFERENCES_DB_KEY } from '../constants';
+import { InvalidSamlMetadataError } from '../errors/invalid-saml-metadata.error';
+
+describe('SamlService', () => {
+	const settingsRepository = mockInstance(SettingsRepository);
+	const samlService = new SamlService(mock(), mock(), mock(), mock(), settingsRepository);
+
+	beforeEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	describe('getAttributesFromLoginResponse', () => {
+		test('throws when any attribute is missing', async () => {
+			// ARRANGE
+			jest
+				.spyOn(samlService, 'getIdentityProviderInstance')
+				.mockReturnValue(mock<IdentityProviderInstance>());
+
+			const serviceProviderInstance = mock<ServiceProviderInstance>();
+			serviceProviderInstance.parseLoginResponse.mockResolvedValue({
+				samlContent: '',
+				extract: {},
+			});
+			jest
+				.spyOn(samlService, 'getServiceProviderInstance')
+				.mockReturnValue(serviceProviderInstance);
+
+			jest.spyOn(samlHelpers, 'getMappedSamlAttributesFromFlowResult').mockReturnValue({
+				attributes: {} as never,
+				missingAttributes: [
+					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
+					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname',
+					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname',
+					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn',
+				],
+			});
+
+			// ACT & ASSERT
+			await expect(
+				samlService.getAttributesFromLoginResponse(mock<express.Request>(), 'post'),
+			).rejects.toThrowError(
+				'SAML Authentication failed. Invalid SAML response (missing attributes: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn).',
+			);
+		});
+	});
+
+	describe('init', () => {
+		test('calls `reset` if an InvalidSamlMetadataError is thrown', async () => {
+			// ARRANGE
+			jest
+				.spyOn(samlService, 'loadFromDbAndApplySamlPreferences')
+				.mockRejectedValue(new InvalidSamlMetadataError());
+			jest.spyOn(samlService, 'reset');
+
+			// ACT
+			await samlService.init();
+
+			// ASSERT
+			expect(samlService.reset).toHaveBeenCalledTimes(1);
+		});
+
+		test('calls `reset` if a SyntaxError is thrown', async () => {
+			// ARRANGE
+			jest
+				.spyOn(samlService, 'loadFromDbAndApplySamlPreferences')
+				.mockRejectedValue(new SyntaxError());
+			jest.spyOn(samlService, 'reset');
+
+			// ACT
+			await samlService.init();
+
+			// ASSERT
+			expect(samlService.reset).toHaveBeenCalledTimes(1);
+		});
+
+		test('does not call reset and rethrows if another error is thrown', async () => {
+			// ARRANGE
+			jest
+				.spyOn(samlService, 'loadFromDbAndApplySamlPreferences')
+				.mockRejectedValue(new TypeError());
+			jest.spyOn(samlService, 'reset');
+
+			// ACT & ASSERT
+			await expect(samlService.init()).rejects.toThrowError(TypeError);
+			expect(samlService.reset).toHaveBeenCalledTimes(0);
+		});
+
+		test('does not call reset if no error is thrown', async () => {
+			// ARRANGE
+			jest.spyOn(samlService, 'reset');
+
+			// ACT
+			await samlService.init();
+
+			// ASSERT
+			expect(samlService.reset).toHaveBeenCalledTimes(0);
+		});
+	});
+
+	describe('reset', () => {
+		test('disables saml login and deletes the saml `features.saml` key in the db', async () => {
+			// ARRANGE
+			jest.spyOn(samlHelpers, 'setSamlLoginEnabled');
+			jest.spyOn(settingsRepository, 'delete');
+
+			// ACT
+			await samlService.reset();
+
+			// ASSERT
+			expect(samlHelpers.setSamlLoginEnabled).toHaveBeenCalledTimes(1);
+			expect(samlHelpers.setSamlLoginEnabled).toHaveBeenCalledWith(false);
+			expect(settingsRepository.delete).toHaveBeenCalledTimes(1);
+			expect(settingsRepository.delete).toHaveBeenCalledWith({ key: SAML_PREFERENCES_DB_KEY });
+		});
+	});
+});
diff --git a/packages/cli/src/sso/saml/constants.ts b/packages/cli/src/sso.ee/saml/constants.ts
similarity index 100%
rename from packages/cli/src/sso/saml/constants.ts
rename to packages/cli/src/sso.ee/saml/constants.ts
diff --git a/packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts b/packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts
new file mode 100644
index 0000000000..3d2ceaddb6
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/errors/invalid-saml-metadata.error.ts
@@ -0,0 +1,7 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class InvalidSamlMetadataError extends ApplicationError {
+	constructor() {
+		super('Invalid SAML metadata', { level: 'warning' });
+	}
+}
diff --git a/packages/cli/src/sso/saml/middleware/saml-enabled-middleware.ts b/packages/cli/src/sso.ee/saml/middleware/saml-enabled-middleware.ts
similarity index 100%
rename from packages/cli/src/sso/saml/middleware/saml-enabled-middleware.ts
rename to packages/cli/src/sso.ee/saml/middleware/saml-enabled-middleware.ts
diff --git a/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts b/packages/cli/src/sso.ee/saml/routes/__tests__/saml.controller.ee.test.ts
similarity index 63%
rename from packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts
rename to packages/cli/src/sso.ee/saml/routes/__tests__/saml.controller.ee.test.ts
index c4a33ed441..928f6d6df0 100644
--- a/packages/cli/src/sso/saml/routes/__tests__/saml.controller.ee.test.ts
+++ b/packages/cli/src/sso.ee/saml/routes/__tests__/saml.controller.ee.test.ts
@@ -2,18 +2,14 @@ import { type Response } from 'express';
 import { mock } from 'jest-mock-extended';
 
 import type { User } from '@/databases/entities/user';
-import { UrlService } from '@/services/url.service';
-import { mockInstance } from '@test/mocking';
+import type { AuthlessRequest } from '@/requests';
 
-import { SamlService } from '../../saml.service.ee';
+import type { SamlService } from '../../saml.service.ee';
 import { getServiceProviderConfigTestReturnUrl } from '../../service-provider.ee';
-import type { SamlConfiguration } from '../../types/requests';
-import type { SamlUserAttributes } from '../../types/saml-user-attributes';
+import type { SamlUserAttributes } from '../../types';
 import { SamlController } from '../saml.controller.ee';
 
-const urlService = mockInstance(UrlService);
-urlService.getInstanceBaseUrl.mockReturnValue('');
-const samlService = mockInstance(SamlService);
+const samlService = mock<SamlService>();
 const controller = new SamlController(mock(), samlService, mock(), mock());
 
 const user = mock<User>({
@@ -31,46 +27,45 @@ const attributes: SamlUserAttributes = {
 };
 
 describe('Test views', () => {
+	const RelayState = getServiceProviderConfigTestReturnUrl();
+
 	test('Should render success with template', async () => {
-		const req = mock<SamlConfiguration.AcsRequest>();
+		const req = mock<AuthlessRequest>();
 		const res = mock<Response>();
 
-		req.body.RelayState = getServiceProviderConfigTestReturnUrl();
 		samlService.handleSamlLogin.mockResolvedValueOnce({
 			authenticatedUser: user,
 			attributes,
 			onboardingRequired: false,
 		});
 
-		await controller.acsPost(req, res);
+		await controller.acsPost(req, res, { RelayState });
 
 		expect(res.render).toBeCalledWith('saml-connection-test-success', attributes);
 	});
 
 	test('Should render failure with template', async () => {
-		const req = mock<SamlConfiguration.AcsRequest>();
+		const req = mock<AuthlessRequest>();
 		const res = mock<Response>();
 
-		req.body.RelayState = getServiceProviderConfigTestReturnUrl();
 		samlService.handleSamlLogin.mockResolvedValueOnce({
 			authenticatedUser: undefined,
 			attributes,
 			onboardingRequired: false,
 		});
 
-		await controller.acsPost(req, res);
+		await controller.acsPost(req, res, { RelayState });
 
 		expect(res.render).toBeCalledWith('saml-connection-test-failed', { message: '', attributes });
 	});
 
 	test('Should render error with template', async () => {
-		const req = mock<SamlConfiguration.AcsRequest>();
+		const req = mock<AuthlessRequest>();
 		const res = mock<Response>();
 
-		req.body.RelayState = getServiceProviderConfigTestReturnUrl();
 		samlService.handleSamlLogin.mockRejectedValueOnce(new Error('Test Error'));
 
-		await controller.acsPost(req, res);
+		await controller.acsPost(req, res, { RelayState });
 
 		expect(res.render).toBeCalledWith('saml-connection-test-failed', { message: 'Test Error' });
 	});
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts b/packages/cli/src/sso.ee/saml/routes/saml.controller.ee.ts
similarity index 77%
rename from packages/cli/src/sso/saml/routes/saml.controller.ee.ts
rename to packages/cli/src/sso.ee/saml/routes/saml.controller.ee.ts
index c7b954914b..c8f636eec4 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.ee.ts
+++ b/packages/cli/src/sso.ee/saml/routes/saml.controller.ee.ts
@@ -1,15 +1,14 @@
-import { validate } from 'class-validator';
-import express from 'express';
+import { SamlAcsDto, SamlPreferences, SamlToggleDto } from '@n8n/api-types';
+import { Response } from 'express';
 import querystring from 'querystring';
 import type { PostBindingContext } from 'samlify/types/src/entity';
 import url from 'url';
 
 import { AuthService } from '@/auth/auth.service';
-import { Get, Post, RestController, GlobalScope } from '@/decorators';
+import { Get, Post, RestController, GlobalScope, Body } from '@/decorators';
 import { AuthError } from '@/errors/response-errors/auth.error';
-import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';
-import { AuthenticatedRequest } from '@/requests';
+import { AuthenticatedRequest, AuthlessRequest } from '@/requests';
 import { sendErrorResponse } from '@/response-helper';
 import { UrlService } from '@/services/url.service';
 
@@ -25,7 +24,6 @@ import {
 	getServiceProviderReturnUrl,
 } from '../service-provider.ee';
 import type { SamlLoginBinding } from '../types';
-import { SamlConfiguration } from '../types/requests';
 import { getInitSSOFormView } from '../views/init-sso-post';
 
 @RestController('/sso/saml')
@@ -38,7 +36,7 @@ export class SamlController {
 	) {}
 
 	@Get('/metadata', { skipAuth: true })
-	async getServiceProviderMetadata(_: express.Request, res: express.Response) {
+	async getServiceProviderMetadata(_: AuthlessRequest, res: Response) {
 		return res
 			.header('Content-Type', 'text/xml')
 			.send(this.samlService.getServiceProviderInstance().getMetadata());
@@ -62,17 +60,8 @@ export class SamlController {
 	 */
 	@Post('/config', { middlewares: [samlLicensedMiddleware] })
 	@GlobalScope('saml:manage')
-	async configPost(req: SamlConfiguration.Update) {
-		const validationResult = await validate(req.body);
-		if (validationResult.length === 0) {
-			const result = await this.samlService.setSamlPreferences(req.body);
-			return result;
-		} else {
-			throw new BadRequestError(
-				'Body is not a valid SamlPreferences object: ' +
-					validationResult.map((e) => e.toString()).join(','),
-			);
-		}
+	async configPost(_req: AuthenticatedRequest, _res: Response, @Body payload: SamlPreferences) {
+		return await this.samlService.setSamlPreferences(payload);
 	}
 
 	/**
@@ -80,11 +69,12 @@ export class SamlController {
 	 */
 	@Post('/config/toggle', { middlewares: [samlLicensedMiddleware] })
 	@GlobalScope('saml:manage')
-	async toggleEnabledPost(req: SamlConfiguration.Toggle, res: express.Response) {
-		if (req.body.loginEnabled === undefined) {
-			throw new BadRequestError('Body should contain a boolean "loginEnabled" property');
-		}
-		await this.samlService.setSamlPreferences({ loginEnabled: req.body.loginEnabled });
+	async toggleEnabledPost(
+		_req: AuthenticatedRequest,
+		res: Response,
+		@Body { loginEnabled }: SamlToggleDto,
+	) {
+		await this.samlService.setSamlPreferences({ loginEnabled });
 		return res.sendStatus(200);
 	}
 
@@ -92,7 +82,7 @@ export class SamlController {
 	 * Assertion Consumer Service endpoint
 	 */
 	@Get('/acs', { middlewares: [samlLicensedMiddleware], skipAuth: true, usesTemplates: true })
-	async acsGet(req: SamlConfiguration.AcsRequest, res: express.Response) {
+	async acsGet(req: AuthlessRequest, res: Response) {
 		return await this.acsHandler(req, res, 'redirect');
 	}
 
@@ -100,8 +90,8 @@ export class SamlController {
 	 * Assertion Consumer Service endpoint
 	 */
 	@Post('/acs', { middlewares: [samlLicensedMiddleware], skipAuth: true, usesTemplates: true })
-	async acsPost(req: SamlConfiguration.AcsRequest, res: express.Response) {
-		return await this.acsHandler(req, res, 'post');
+	async acsPost(req: AuthlessRequest, res: Response, @Body payload: SamlAcsDto) {
+		return await this.acsHandler(req, res, 'post', payload);
 	}
 
 	/**
@@ -110,14 +100,15 @@ export class SamlController {
 	 * For test connections, returns status 202 if SAML is not enabled
 	 */
 	private async acsHandler(
-		req: SamlConfiguration.AcsRequest,
-		res: express.Response,
+		req: AuthlessRequest,
+		res: Response,
 		binding: SamlLoginBinding,
+		payload: SamlAcsDto = {},
 	) {
 		try {
 			const loginResult = await this.samlService.handleSamlLogin(req, binding);
 			// if RelayState is set to the test connection Url, this is a test connection
-			if (isConnectionTestRequest(req)) {
+			if (isConnectionTestRequest(payload)) {
 				if (loginResult.authenticatedUser) {
 					return res.render('saml-connection-test-success', loginResult.attributes);
 				} else {
@@ -139,7 +130,7 @@ export class SamlController {
 					if (loginResult.onboardingRequired) {
 						return res.redirect(this.urlService.getInstanceBaseUrl() + '/saml/onboarding');
 					} else {
-						const redirectUrl = req.body?.RelayState ?? '/';
+						const redirectUrl = payload.RelayState ?? '/';
 						return res.redirect(this.urlService.getInstanceBaseUrl() + redirectUrl);
 					}
 				} else {
@@ -153,7 +144,7 @@ export class SamlController {
 			// Need to manually send the error response since we're using templates
 			return sendErrorResponse(res, new AuthError('SAML Authentication failed'));
 		} catch (error) {
-			if (isConnectionTestRequest(req)) {
+			if (isConnectionTestRequest(payload)) {
 				return res.render('saml-connection-test-failed', { message: (error as Error).message });
 			}
 			this.eventService.emit('user-login-failed', {
@@ -173,7 +164,7 @@ export class SamlController {
 	 * This endpoint is available if SAML is licensed and enabled
 	 */
 	@Get('/initsso', { middlewares: [samlLicensedAndEnabledMiddleware], skipAuth: true })
-	async initSsoGet(req: express.Request, res: express.Response) {
+	async initSsoGet(req: AuthlessRequest, res: Response) {
 		let redirectUrl = '';
 		try {
 			const refererUrl = req.headers.referer;
@@ -198,11 +189,11 @@ export class SamlController {
 	 */
 	@Get('/config/test', { middlewares: [samlLicensedMiddleware] })
 	@GlobalScope('saml:manage')
-	async configTestGet(_: AuthenticatedRequest, res: express.Response) {
+	async configTestGet(_: AuthenticatedRequest, res: Response) {
 		return await this.handleInitSSO(res, getServiceProviderConfigTestReturnUrl());
 	}
 
-	private async handleInitSSO(res: express.Response, relayState?: string) {
+	private async handleInitSSO(res: Response, relayState?: string) {
 		const result = await this.samlService.getLoginRequestUrl(relayState);
 		if (result?.binding === 'redirect') {
 			return result.context.context;
diff --git a/packages/cli/src/sso/saml/saml-helpers.ts b/packages/cli/src/sso.ee/saml/saml-helpers.ts
similarity index 92%
rename from packages/cli/src/sso/saml/saml-helpers.ts
rename to packages/cli/src/sso.ee/saml/saml-helpers.ts
index 996e17b359..b0620acdd3 100644
--- a/packages/cli/src/sso/saml/saml-helpers.ts
+++ b/packages/cli/src/sso.ee/saml/saml-helpers.ts
@@ -1,6 +1,7 @@
+import type { SamlAcsDto, SamlPreferences } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import { randomString } from 'n8n-workflow';
 import type { FlowResult } from 'samlify/types/src/flow';
-import { Container } from 'typedi';
 
 import config from '@/config';
 import { AuthIdentity } from '@/databases/entities/auth-identity';
@@ -14,10 +15,7 @@ import { PasswordUtility } from '@/services/password.utility';
 
 import { SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants';
 import { getServiceProviderConfigTestReturnUrl } from './service-provider.ee';
-import type { SamlConfiguration } from './types/requests';
-import type { SamlAttributeMapping } from './types/saml-attribute-mapping';
-import type { SamlPreferences } from './types/saml-preferences';
-import type { SamlUserAttributes } from './types/saml-user-attributes';
+import type { SamlAttributeMapping, SamlUserAttributes } from './types';
 import {
 	getCurrentAuthenticationMethod,
 	isEmailCurrentAuthenticationMethod,
@@ -165,6 +163,6 @@ export function getMappedSamlAttributesFromFlowResult(
 	return result;
 }
 
-export function isConnectionTestRequest(req: SamlConfiguration.AcsRequest): boolean {
-	return req.body.RelayState === getServiceProviderConfigTestReturnUrl();
+export function isConnectionTestRequest(payload: SamlAcsDto): boolean {
+	return payload.RelayState === getServiceProviderConfigTestReturnUrl();
 }
diff --git a/packages/cli/src/sso.ee/saml/saml-validator.ts b/packages/cli/src/sso.ee/saml/saml-validator.ts
new file mode 100644
index 0000000000..e2deaa6b6d
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/saml-validator.ts
@@ -0,0 +1,87 @@
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
+import type { XMLFileInfo, XMLLintOptions, XMLValidationResult } from 'xmllint-wasm';
+
+@Service()
+export class SamlValidator {
+	private xmlMetadata: XMLFileInfo;
+
+	private xmlProtocol: XMLFileInfo;
+
+	private preload: XMLFileInfo[] = [];
+
+	constructor(private readonly logger: Logger) {}
+
+	private xmllint: {
+		validateXML: (options: XMLLintOptions) => Promise<XMLValidationResult>;
+	};
+
+	async init() {
+		await this.loadSchemas();
+		this.xmllint = await import('xmllint-wasm');
+	}
+
+	async validateMetadata(metadata: string): Promise<boolean> {
+		return await this.validateXml('metadata', metadata);
+	}
+
+	async validateResponse(response: string): Promise<boolean> {
+		return await this.validateXml('response', response);
+	}
+
+	// dynamically load schema files
+	private async loadSchemas(): Promise<void> {
+		this.xmlProtocol = (await import('./schema/saml-schema-protocol-2.0.xsd')).xmlFileInfo;
+		this.xmlMetadata = (await import('./schema/saml-schema-metadata-2.0.xsd')).xmlFileInfo;
+		this.preload = (
+			await Promise.all([
+				// SAML
+				import('./schema/saml-schema-assertion-2.0.xsd'),
+				import('./schema/xmldsig-core-schema.xsd'),
+				import('./schema/xenc-schema.xsd'),
+				import('./schema/xml.xsd'),
+
+				// WS-Federation
+				import('./schema/ws-federation.xsd'),
+				import('./schema/oasis-200401-wss-wssecurity-secext-1.0.xsd'),
+				import('./schema/oasis-200401-wss-wssecurity-utility-1.0.xsd'),
+				import('./schema/ws-addr.xsd'),
+				import('./schema/metadata-exchange.xsd'),
+				import('./schema/ws-securitypolicy-1.2.xsd'),
+				import('./schema/ws-authorization.xsd'),
+			])
+		).map((m) => m.xmlFileInfo);
+	}
+
+	private async validateXml(type: 'metadata' | 'response', contents: string): Promise<boolean> {
+		const fileName = `${type}.xml`;
+		const schema = type === 'metadata' ? [this.xmlMetadata] : [this.xmlProtocol];
+		const preload = [type === 'metadata' ? this.xmlProtocol : this.xmlMetadata, ...this.preload];
+
+		try {
+			const validationResult = await this.xmllint.validateXML({
+				xml: [{ fileName, contents }],
+				extension: 'schema',
+				schema,
+				preload,
+			});
+			if (validationResult?.valid) {
+				this.logger.debug(`SAML ${type} is valid`);
+				return true;
+			} else {
+				this.logger.debug(`SAML ${type} is invalid`);
+				this.logger.warn(
+					validationResult
+						? validationResult.errors
+								.map((error) => `${error.message} - ${error.rawMessage}`)
+								.join('\n')
+						: '',
+				);
+			}
+		} catch (error) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+			this.logger.warn(error);
+		}
+		return false;
+	}
+}
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso.ee/saml/saml.service.ee.ts
similarity index 82%
rename from packages/cli/src/sso/saml/saml.service.ee.ts
rename to packages/cli/src/sso.ee/saml/saml.service.ee.ts
index 6b07919730..a0d20e4102 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso.ee/saml/saml.service.ee.ts
@@ -1,10 +1,12 @@
+import type { SamlPreferences } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import axios from 'axios';
 import type express from 'express';
 import https from 'https';
+import { Logger } from 'n8n-core';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
 import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
-import Container, { Service } from 'typedi';
 
 import type { Settings } from '@/databases/entities/settings';
 import type { User } from '@/databases/entities/user';
@@ -12,10 +14,10 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
-import { Logger } from '@/logging/logger.service';
 import { UrlService } from '@/services/url.service';
 
 import { SAML_PREFERENCES_DB_KEY } from './constants';
+import { InvalidSamlMetadataError } from './errors/invalid-saml-metadata.error';
 import {
 	createUserFromSamlAttributes,
 	getMappedSamlAttributesFromFlowResult,
@@ -26,11 +28,9 @@ import {
 	setSamlLoginLabel,
 	updateUserFromSamlAttributes,
 } from './saml-helpers';
-import { validateMetadata, validateResponse } from './saml-validator';
+import { SamlValidator } from './saml-validator';
 import { getServiceProviderInstance } from './service-provider.ee';
-import type { SamlLoginBinding } from './types';
-import type { SamlPreferences } from './types/saml-preferences';
-import type { SamlUserAttributes } from './types/saml-user-attributes';
+import type { SamlLoginBinding, SamlUserAttributes } from './types';
 import { isSsoJustInTimeProvisioningEnabled } from '../sso-helpers';
 
 @Service()
@@ -67,7 +67,7 @@ export class SamlService {
 		},
 	};
 
-	public get samlPreferences(): SamlPreferences {
+	get samlPreferences(): SamlPreferences {
 		return {
 			...this._samlPreferences,
 			loginEnabled: isSamlLoginEnabled(),
@@ -78,14 +78,31 @@ export class SamlService {
 	constructor(
 		private readonly logger: Logger,
 		private readonly urlService: UrlService,
+		private readonly validator: SamlValidator,
+		private readonly userRepository: UserRepository,
+		private readonly settingsRepository: SettingsRepository,
 	) {}
 
 	async init(): Promise<void> {
-		// load preferences first but do not apply so as to not load samlify unnecessarily
-		await this.loadFromDbAndApplySamlPreferences(false);
-		if (isSamlLicensedAndEnabled()) {
-			await this.loadSamlify();
-			await this.loadFromDbAndApplySamlPreferences(true);
+		try {
+			// load preferences first but do not apply so as to not load samlify unnecessarily
+			await this.loadFromDbAndApplySamlPreferences(false);
+			await this.validator.init();
+			if (isSamlLicensedAndEnabled()) {
+				await this.loadSamlify();
+				await this.loadFromDbAndApplySamlPreferences(true);
+			}
+		} catch (error) {
+			// If the SAML configuration has been corrupted in the database we'll
+			// delete the corrupted configuration and enable email logins again.
+			if (error instanceof InvalidSamlMetadataError || error instanceof SyntaxError) {
+				this.logger.warn(
+					`SAML initialization failed because of invalid metadata in database: ${error.message}. IMPORTANT: Disabling SAML and switching to email-based login for all users. Please review your configuration and re-enable SAML.`,
+				);
+				await this.reset();
+			} else {
+				throw error;
+			}
 		}
 	}
 
@@ -94,11 +111,12 @@ export class SamlService {
 			this.logger.debug('Loading samlify library into memory');
 			this.samlify = await import('samlify');
 		}
+
 		this.samlify.setSchemaValidator({
 			validate: async (response: string) => {
-				const valid = await validateResponse(response);
+				const valid = await this.validator.validateResponse(response);
 				if (!valid) {
-					throw new ApplicationError('Invalid SAML response');
+					throw new InvalidSamlMetadataError();
 				}
 			},
 		});
@@ -174,7 +192,7 @@ export class SamlService {
 		const attributes = await this.getAttributesFromLoginResponse(req, binding);
 		if (attributes.email) {
 			const lowerCasedEmail = attributes.email.toLowerCase();
-			const user = await Container.get(UserRepository).findOne({
+			const user = await this.userRepository.findOne({
 				where: { email: lowerCasedEmail },
 				relations: ['authIdentities'],
 			});
@@ -219,7 +237,7 @@ export class SamlService {
 		};
 	}
 
-	async setSamlPreferences(prefs: SamlPreferences): Promise<SamlPreferences | undefined> {
+	async setSamlPreferences(prefs: Partial<SamlPreferences>): Promise<SamlPreferences | undefined> {
 		await this.loadSamlify();
 		await this.loadPreferencesWithoutValidation(prefs);
 		if (prefs.metadataUrl) {
@@ -228,9 +246,9 @@ export class SamlService {
 				this._samlPreferences.metadata = fetchedMetadata;
 			}
 		} else if (prefs.metadata) {
-			const validationResult = await validateMetadata(prefs.metadata);
+			const validationResult = await this.validator.validateMetadata(prefs.metadata);
 			if (!validationResult) {
-				throw new ApplicationError('Invalid SAML metadata');
+				throw new InvalidSamlMetadataError();
 			}
 		}
 		this.getIdentityProviderInstance(true);
@@ -238,7 +256,7 @@ export class SamlService {
 		return result;
 	}
 
-	async loadPreferencesWithoutValidation(prefs: SamlPreferences) {
+	async loadPreferencesWithoutValidation(prefs: Partial<SamlPreferences>) {
 		this._samlPreferences.loginBinding = prefs.loginBinding ?? this._samlPreferences.loginBinding;
 		this._samlPreferences.metadata = prefs.metadata ?? this._samlPreferences.metadata;
 		this._samlPreferences.mapping = prefs.mapping ?? this._samlPreferences.mapping;
@@ -264,7 +282,7 @@ export class SamlService {
 	}
 
 	async loadFromDbAndApplySamlPreferences(apply = true): Promise<SamlPreferences | undefined> {
-		const samlPreferences = await Container.get(SettingsRepository).findOne({
+		const samlPreferences = await this.settingsRepository.findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
 		if (samlPreferences) {
@@ -282,18 +300,18 @@ export class SamlService {
 	}
 
 	async saveSamlPreferencesToDb(): Promise<SamlPreferences | undefined> {
-		const samlPreferences = await Container.get(SettingsRepository).findOne({
+		const samlPreferences = await this.settingsRepository.findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
 		const settingsValue = JSON.stringify(this.samlPreferences);
 		let result: Settings;
 		if (samlPreferences) {
 			samlPreferences.value = settingsValue;
-			result = await Container.get(SettingsRepository).save(samlPreferences, {
+			result = await this.settingsRepository.save(samlPreferences, {
 				transaction: false,
 			});
 		} else {
-			result = await Container.get(SettingsRepository).save(
+			result = await this.settingsRepository.save(
 				{
 					key: SAML_PREFERENCES_DB_KEY,
 					value: settingsValue,
@@ -318,7 +336,7 @@ export class SamlService {
 			const response = await axios.get(this._samlPreferences.metadataUrl, { httpsAgent: agent });
 			if (response.status === 200 && response.data) {
 				const xml = (await response.data) as string;
-				const validationResult = await validateMetadata(xml);
+				const validationResult = await this.validator.validateMetadata(xml);
 				if (!validationResult) {
 					throw new BadRequestError(
 						`Data received from ${this._samlPreferences.metadataUrl} is not valid SAML metadata.`,
@@ -371,4 +389,13 @@ export class SamlService {
 		}
 		return attributes;
 	}
+
+	/**
+	 * Disables SAML, switches to email based logins and deletes the SAML
+	 * configuration from the database.
+	 */
+	async reset() {
+		await setSamlLoginEnabled(false);
+		await this.settingsRepository.delete({ key: SAML_PREFERENCES_DB_KEY });
+	}
 }
diff --git a/packages/cli/src/sso.ee/saml/schema/metadata-exchange.xsd.ts b/packages/cli/src/sso.ee/saml/schema/metadata-exchange.xsd.ts
new file mode 100644
index 0000000000..d24876d682
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/schema/metadata-exchange.xsd.ts
@@ -0,0 +1,117 @@
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'MetadataExchange.xsd',
+	contents: `<?xml version='1.0' encoding='UTF-8' ?>
+<!--
+(c) 2004-2006 BEA Systems Inc., Computer Associates International, Inc.,
+International Business Machines Corporation, Microsoft Corporation,
+Inc., SAP AG, Sun Microsystems, and webMethods. All rights reserved. 
+
+Permission to copy and display the WS-MetadataExchange Specification
+(the "Specification"), in any medium without fee or royalty is hereby
+granted, provided that you include the following on ALL copies of the
+Specification that you make:
+
+1.	A link or URL to the Specification at this location.
+2.	The copyright notice as shown in the Specification.
+
+BEA Systems, Computer Associates, IBM, Microsoft, SAP, Sun, and
+webMethods (collectively, the "Authors") each agree to grant you a
+license, under royalty-free and otherwise reasonable,
+non-discriminatory terms and conditions, to their respective essential
+patent claims that they deem necessary to implement the
+WS-MetadataExchange Specification.
+
+THE SPECIFICATION IS PROVIDED "AS IS," AND THE AUTHORS MAKE NO
+REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE, NON-INFRINGEMENT, OR TITLE; THAT THE CONTENTS OF THE
+SPECIFICATION ARE SUITABLE FOR ANY PURPOSE; NOR THAT THE
+IMPLEMENTATION OF SUCH CONTENTS WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
+INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
+USE OR DISTRIBUTION OF THE SPECIFICATIONS.
+
+The name and trademarks of the Authors may NOT be used in any manner,
+including advertising or publicity pertaining to the Specifications or
+their contents without specific, written prior permission. Title to
+copyright in the Specifications will at all times remain with the
+Authors.
+
+No other rights are granted by implication, estoppel or otherwise.
+-->
+
+<xs:schema
+    targetNamespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
+    xmlns:tns='http://schemas.xmlsoap.org/ws/2004/09/mex'
+    xmlns:wsa10='http://www.w3.org/2005/08/addressing'
+    xmlns:wsa04='http://schemas.xmlsoap.org/ws/2004/08/addressing'
+    xmlns:xs='http://www.w3.org/2001/XMLSchema'
+    elementFormDefault='qualified'
+    blockDefault='#all' >
+
+  <!-- Get Metadata request -->
+  <xs:element name='GetMetadata' >
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='tns:Dialect' minOccurs='0' />
+        <xs:element ref='tns:Identifier' minOccurs='0' />
+      </xs:sequence>
+      <xs:anyAttribute namespace='##other' processContents='lax' />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='Dialect' type='xs:anyURI' />
+  <xs:element name='Identifier' type='xs:anyURI' />
+
+  <!-- Get Metadata response -->
+  <xs:element name='Metadata' >
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element ref='tns:MetadataSection'
+                    minOccurs='0'
+                    maxOccurs='unbounded' />
+        <xs:any namespace='##other' processContents='lax'
+                minOccurs='0'
+                maxOccurs='unbounded' />
+      </xs:sequence>
+      <xs:anyAttribute namespace='##other' processContents='lax' />
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name='MetadataSection' >
+    <xs:complexType>
+      <xs:choice>
+        <xs:any namespace='##other' processContents='lax' />
+        <xs:element ref='tns:MetadataReference' />
+        <xs:element ref='tns:Location' />
+      </xs:choice>
+      <xs:attribute name='Dialect' type='xs:anyURI' use='required' />
+      <xs:attribute name='Identifier' type='xs:anyURI' />
+      <xs:anyAttribute namespace='##other' processContents='lax' />
+    </xs:complexType>
+  </xs:element>
+  
+  <!-- 
+       Ideally, the type of the MetadataReference would have been
+       the union of wsa04:EndpointReferenceType and
+       wsa10:EndpointReferenceType but unfortunately xs:union only
+       works for simple types. As a result, we have to define
+       the mex:MetadataReference using xs:any.
+  -->
+
+  <xs:element name='MetadataReference'>
+    <xs:complexType>
+      <xs:sequence>
+        <xs:any minOccurs='1' maxOccurs='unbounded' 
+                processContents='lax' namespace='##other' />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name='Location'
+              type='xs:anyURI' />
+</xs:schema>`,
+};
diff --git a/packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.ts
new file mode 100644
index 0000000000..7a823c060b
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-secext-1.0.xsd.ts
@@ -0,0 +1,200 @@
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'oasis-200401-wss-wssecurity-secext-1.0.xsd',
+	contents: `<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+Copyright © OASIS Open 2002-2004. All Rights Reserved.
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+-->
+<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2">
+	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
+	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+	<xsd:complexType name="AttributedString">
+		<xsd:annotation>
+			<xsd:documentation>This type represents an element with arbitrary attributes.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:string">
+				<xsd:attribute ref="wsu:Id"/>
+				<xsd:anyAttribute namespace="##other" processContents="lax"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:complexType name="PasswordString">
+		<xsd:annotation>
+			<xsd:documentation>This type is used for password elements per Section 4.1.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:extension base="wsse:AttributedString">
+				<xsd:attribute name="Type" type="xsd:anyURI"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:complexType name="EncodedString">
+		<xsd:annotation>
+			<xsd:documentation>This type is used for elements containing stringified binary data.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:extension base="wsse:AttributedString">
+				<xsd:attribute name="EncodingType" type="xsd:anyURI"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:complexType name="UsernameTokenType">
+		<xsd:annotation>
+			<xsd:documentation>This type represents a username token per Section 4.1</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element name="Username" type="wsse:AttributedString"/>
+			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xsd:sequence>
+		<xsd:attribute ref="wsu:Id"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:complexType name="BinarySecurityTokenType">
+		<xsd:annotation>
+			<xsd:documentation>A security token that is encoded in binary</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:extension base="wsse:EncodedString">
+				<xsd:attribute name="ValueType" type="xsd:anyURI"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:complexType name="KeyIdentifierType">
+		<xsd:annotation>
+			<xsd:documentation>A security token key identifier</xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:extension base="wsse:EncodedString">
+				<xsd:attribute name="ValueType" type="xsd:anyURI"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:simpleType name="tUsage">
+		<xsd:annotation>
+			<xsd:documentation>Typedef to allow a list of usages (as URIs).</xsd:documentation>
+		</xsd:annotation>
+		<xsd:list itemType="xsd:anyURI"/>
+	</xsd:simpleType>
+	<xsd:attribute name="Usage" type="tUsage">
+		<xsd:annotation>
+			<xsd:documentation>This global attribute is used to indicate the usage of a referenced or indicated token within the containing context</xsd:documentation>
+		</xsd:annotation>
+	</xsd:attribute>
+	<xsd:complexType name="ReferenceType">
+		<xsd:annotation>
+			<xsd:documentation>This type represents a reference to an external security token.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="URI" type="xsd:anyURI"/>
+		<xsd:attribute name="ValueType" type="xsd:anyURI"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:complexType name="EmbeddedType">
+		<xsd:annotation>
+			<xsd:documentation>This type represents a reference to an embedded security token.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:choice minOccurs="0" maxOccurs="unbounded">
+			<xsd:any processContents="lax"/>
+		</xsd:choice>
+		<xsd:attribute name="ValueType" type="xsd:anyURI"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:complexType name="SecurityTokenReferenceType">
+		<xsd:annotation>
+			<xsd:documentation>This type is used reference a security token.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:choice minOccurs="0" maxOccurs="unbounded">
+			<xsd:any processContents="lax"/>
+		</xsd:choice>
+		<xsd:attribute ref="wsu:Id"/>
+		<xsd:attribute ref="wsse:Usage"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:complexType name="SecurityHeaderType">
+		<xsd:annotation>
+			<xsd:documentation>This complexType defines header block to use for security-relevant data directed at a specific SOAP actor.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>The use of "any" is to allow extensibility and different forms of security data.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:any>
+		</xsd:sequence>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:complexType name="TransformationParametersType">
+		<xsd:annotation>
+			<xsd:documentation>This complexType defines a container for elements to be specified from any namespace as properties/parameters of a DSIG transformation.</xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:any processContents="lax" minOccurs="0" maxOccurs="unbounded">
+				<xsd:annotation>
+					<xsd:documentation>The use of "any" is to allow extensibility from any namespace.</xsd:documentation>
+				</xsd:annotation>
+			</xsd:any>
+		</xsd:sequence>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:complexType>
+	<xsd:element name="UsernameToken" type="wsse:UsernameTokenType">
+		<xsd:annotation>
+			<xsd:documentation>This element defines the wsse:UsernameToken element per Section 4.1.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="BinarySecurityToken" type="wsse:BinarySecurityTokenType">
+		<xsd:annotation>
+			<xsd:documentation>This element defines the wsse:BinarySecurityToken element per Section 4.2.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="Reference" type="wsse:ReferenceType">
+		<xsd:annotation>
+			<xsd:documentation>This element defines a security token reference</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="Embedded" type="wsse:EmbeddedType">
+		<xsd:annotation>
+			<xsd:documentation>This element defines a security token embedded reference</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="KeyIdentifier" type="wsse:KeyIdentifierType">
+		<xsd:annotation>
+			<xsd:documentation>This element defines a key identifier reference</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="SecurityTokenReference" type="wsse:SecurityTokenReferenceType">
+		<xsd:annotation>
+			<xsd:documentation>This element defines the wsse:SecurityTokenReference per Section 4.3.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="Security" type="wsse:SecurityHeaderType">
+		<xsd:annotation>
+			<xsd:documentation>This element defines the wsse:Security SOAP header element per Section 4.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="TransformationParameters" type="wsse:TransformationParametersType">
+		<xsd:annotation>
+			<xsd:documentation>This element contains properties for transformations from any namespace, including DSIG.</xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="Password" type="wsse:PasswordString"/>
+	<xsd:element name="Nonce" type="wsse:EncodedString"/>
+	<xsd:simpleType name="FaultcodeEnum">
+		<xsd:restriction base="xsd:QName">
+			<xsd:enumeration value="wsse:UnsupportedSecurityToken"/>
+			<xsd:enumeration value="wsse:UnsupportedAlgorithm"/>
+			<xsd:enumeration value="wsse:InvalidSecurity"/>
+			<xsd:enumeration value="wsse:InvalidSecurityToken"/>
+			<xsd:enumeration value="wsse:FailedAuthentication"/>
+			<xsd:enumeration value="wsse:FailedCheck"/>
+			<xsd:enumeration value="wsse:SecurityTokenUnavailable"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+</xsd:schema>`,
+};
diff --git a/packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.ts
new file mode 100644
index 0000000000..b6238e39c2
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/schema/oasis-200401-wss-wssecurity-utility-1.0.xsd.ts
@@ -0,0 +1,113 @@
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'oasis-200401-wss-wssecurity-utility-1.0.xsd',
+	contents: `<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users of this specification, can be obtained from the OASIS Executive Director.
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+Copyright © OASIS Open 2002-2004. All Rights Reserved.
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+-->
+<xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+
+
+
+xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" 
+elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
+	<!-- // Fault Codes /////////////////////////////////////////// -->
+	<xsd:simpleType name="tTimestampFault">
+		<xsd:annotation>
+			<xsd:documentation>
+This type defines the fault code value for Timestamp message expiration.
+          </xsd:documentation>
+		</xsd:annotation>
+		<xsd:restriction base="xsd:QName">
+			<xsd:enumeration value="wsu:MessageExpired"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+	<!-- // Global attributes //////////////////////////////////// -->
+	<xsd:attribute name="Id" type="xsd:ID">
+		<xsd:annotation>
+			<xsd:documentation>
+This global attribute supports annotating arbitrary elements with an ID.
+          </xsd:documentation>
+		</xsd:annotation>
+	</xsd:attribute>
+	<xsd:attributeGroup name="commonAtts">
+		<xsd:annotation>
+			<xsd:documentation>
+Convenience attribute group used to simplify this schema.
+          </xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute ref="wsu:Id" use="optional"/>
+		<xsd:anyAttribute namespace="##other" processContents="lax"/>
+	</xsd:attributeGroup>
+	<!-- // Utility types //////////////////////////////////////// -->
+	<xsd:complexType name="AttributedDateTime">
+		<xsd:annotation>
+			<xsd:documentation>
+This type is for elements whose [children] is a psuedo-dateTime and can have arbitrary attributes. 
+      </xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:string">
+				<xsd:attributeGroup ref="wsu:commonAtts"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<xsd:complexType name="AttributedURI">
+		<xsd:annotation>
+			<xsd:documentation>
+This type is for elements whose [children] is an anyURI and can have arbitrary attributes.
+      </xsd:documentation>
+		</xsd:annotation>
+		<xsd:simpleContent>
+			<xsd:extension base="xsd:anyURI">
+				<xsd:attributeGroup ref="wsu:commonAtts"/>
+			</xsd:extension>
+		</xsd:simpleContent>
+	</xsd:complexType>
+	<!-- // Timestamp header components /////////////////////////// -->
+	<xsd:complexType name="TimestampType">
+		<xsd:annotation>
+			<xsd:documentation>
+This complex type ties together the timestamp related elements into a composite type.
+            </xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence>
+			<xsd:element ref="wsu:Created" minOccurs="0"/>
+			<xsd:element ref="wsu:Expires" minOccurs="0"/>
+			<xsd:choice minOccurs="0" maxOccurs="unbounded">
+				<xsd:any namespace="##other" processContents="lax"/>
+			</xsd:choice>
+		</xsd:sequence>
+		<xsd:attributeGroup ref="wsu:commonAtts"/>
+	</xsd:complexType>
+	<xsd:element name="Timestamp" type="wsu:TimestampType">
+		<xsd:annotation>
+			<xsd:documentation>
+This element allows Timestamps to be applied anywhere element wildcards are present,
+including as a SOAP header.
+            </xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<!-- global element decls to allow individual elements to appear anywhere -->
+	<xsd:element name="Expires" type="wsu:AttributedDateTime">
+		<xsd:annotation>
+			<xsd:documentation>
+This element allows an expiration time to be applied anywhere element wildcards are present.
+            </xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+	<xsd:element name="Created" type="wsu:AttributedDateTime">
+		<xsd:annotation>
+			<xsd:documentation>
+This element allows a creation time to be applied anywhere element wildcards are present.
+            </xsd:documentation>
+		</xsd:annotation>
+	</xsd:element>
+</xsd:schema>`,
+};
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/saml-schema-assertion-2.0.xsd.ts
similarity index 98%
rename from packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts
rename to packages/cli/src/sso.ee/saml/schema/saml-schema-assertion-2.0.xsd.ts
index 5000484753..7121427920 100644
--- a/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts
+++ b/packages/cli/src/sso.ee/saml/schema/saml-schema-assertion-2.0.xsd.ts
@@ -1,4 +1,8 @@
-export const xsdSamlSchemaAssertion20 = `<?xml version="1.0" encoding="US-ASCII"?>
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'saml-schema-assertion-2.0.xsd',
+	contents: `<?xml version="1.0" encoding="US-ASCII"?>
 <schema
     targetNamespace="urn:oasis:names:tc:SAML:2.0:assertion"
     xmlns="http://www.w3.org/2001/XMLSchema"
@@ -280,4 +284,5 @@ export const xsdSamlSchemaAssertion20 = `<?xml version="1.0" encoding="US-ASCII"
     </complexType>
     <element name="AttributeValue" type="anyType" nillable="true"/>
     <element name="EncryptedAttribute" type="saml:EncryptedElementType"/>
-</schema>`;
+	</schema>`,
+};
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/saml-schema-metadata-2.0.xsd.ts
similarity index 97%
rename from packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts
rename to packages/cli/src/sso.ee/saml/schema/saml-schema-metadata-2.0.xsd.ts
index 6ed44930af..677872c03d 100644
--- a/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts
+++ b/packages/cli/src/sso.ee/saml/schema/saml-schema-metadata-2.0.xsd.ts
@@ -1,4 +1,8 @@
-export const xsdSamlSchemaMetadata20 = `<?xml version="1.0" encoding="UTF-8"?>
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'saml-schema-metadata-2.0.xsd',
+	contents: `<?xml version="1.0" encoding="UTF-8"?>
 <schema
     targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata"
     xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -18,6 +22,8 @@ export const xsdSamlSchemaMetadata20 = `<?xml version="1.0" encoding="UTF-8"?>
         schemaLocation="saml-schema-assertion-2.0.xsd"/>
     <import namespace="http://www.w3.org/XML/1998/namespace"
         schemaLocation="xml.xsd"/>
+    <import namespace="http://docs.oasis-open.org/wsfed/authorization/200706"
+        schemaLocation="ws-federation.xsd"/>
     <annotation>
         <documentation>
             Document identifier: saml-schema-metadata-2.0
@@ -333,4 +339,5 @@ export const xsdSamlSchemaMetadata20 = `<?xml version="1.0" encoding="UTF-8"?>
         <anyAttribute namespace="##other" processContents="lax"/>
     </complexType>
     <element name="AffiliateMember" type="md:entityIDType"/>
-</schema>`;
+</schema>`,
+};
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts b/packages/cli/src/sso.ee/saml/schema/saml-schema-protocol-2.0.xsd.ts
similarity index 98%
rename from packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts
rename to packages/cli/src/sso.ee/saml/schema/saml-schema-protocol-2.0.xsd.ts
index e8bb9d0aae..ffc5a11640 100644
--- a/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts
+++ b/packages/cli/src/sso.ee/saml/schema/saml-schema-protocol-2.0.xsd.ts
@@ -1,4 +1,8 @@
-export const xsdSamlSchemaProtocol20 = `<?xml version="1.0" encoding="UTF-8"?>
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'saml-schema-protocol-2.0.xsd',
+	contents: `<?xml version="1.0" encoding="UTF-8"?>
 <schema
     targetNamespace="urn:oasis:names:tc:SAML:2.0:protocol"
     xmlns="http://www.w3.org/2001/XMLSchema"
@@ -299,4 +303,5 @@ export const xsdSamlSchemaProtocol20 = `<?xml version="1.0" encoding="UTF-8"?>
             </extension>
         </complexContent>
     </complexType>
-</schema>`;
+</schema>`,
+};
diff --git a/packages/cli/src/sso.ee/saml/schema/ws-addr.xsd.ts b/packages/cli/src/sso.ee/saml/schema/ws-addr.xsd.ts
new file mode 100644
index 0000000000..9a275a5dcc
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/schema/ws-addr.xsd.ts
@@ -0,0 +1,142 @@
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'ws-addr.xsd',
+	contents: `<?xml version="1.0" encoding="utf-8"?>
+<!--
+    W3C XML Schema defined in the Web Services Addressing 1.0 specification
+    http://www.w3.org/TR/ws-addr-core
+
+   Copyright © 2005 World Wide Web Consortium,
+
+   (Massachusetts Institute of Technology, European Research Consortium for
+   Informatics and Mathematics, Keio University). All Rights Reserved. This
+   work is distributed under the W3C® Software License [1] in the hope that
+   it will be useful, but WITHOUT ANY WARRANTY; without even the implied
+   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+   [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+   $Id: ws-addr.xsd,v 1.2 2008/07/23 13:38:16 plehegar Exp $
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.w3.org/2005/08/addressing" targetNamespace="http://www.w3.org/2005/08/addressing" blockDefault="#all" elementFormDefault="qualified" finalDefault="" attributeFormDefault="unqualified">
+	
+	<!-- Constructs from the WS-Addressing Core -->
+
+	<xs:element name="EndpointReference" type="tns:EndpointReferenceType"/>
+	<xs:complexType name="EndpointReferenceType" mixed="false">
+		<xs:sequence>
+			<xs:element name="Address" type="tns:AttributedURIType"/>
+			<xs:element ref="tns:ReferenceParameters" minOccurs="0"/>
+			<xs:element ref="tns:Metadata" minOccurs="0"/>
+			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute namespace="##other" processContents="lax"/>
+	</xs:complexType>
+	
+	<xs:element name="ReferenceParameters" type="tns:ReferenceParametersType"/>
+	<xs:complexType name="ReferenceParametersType" mixed="false">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute namespace="##other" processContents="lax"/>
+	</xs:complexType>
+	
+	<xs:element name="Metadata" type="tns:MetadataType"/>
+	<xs:complexType name="MetadataType" mixed="false">
+		<xs:sequence>
+			<xs:any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</xs:sequence>
+		<xs:anyAttribute namespace="##other" processContents="lax"/>
+	</xs:complexType>
+	
+	<xs:element name="MessageID" type="tns:AttributedURIType"/>
+	<xs:element name="RelatesTo" type="tns:RelatesToType"/>
+	<xs:complexType name="RelatesToType" mixed="false">
+		<xs:simpleContent>
+			<xs:extension base="xs:anyURI">
+				<xs:attribute name="RelationshipType" type="tns:RelationshipTypeOpenEnum" use="optional" default="http://www.w3.org/2005/08/addressing/reply"/>
+				<xs:anyAttribute namespace="##other" processContents="lax"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	
+	<xs:simpleType name="RelationshipTypeOpenEnum">
+		<xs:union memberTypes="tns:RelationshipType xs:anyURI"/>
+	</xs:simpleType>
+	
+	<xs:simpleType name="RelationshipType">
+		<xs:restriction base="xs:anyURI">
+			<xs:enumeration value="http://www.w3.org/2005/08/addressing/reply"/>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:element name="ReplyTo" type="tns:EndpointReferenceType"/>
+	<xs:element name="From" type="tns:EndpointReferenceType"/>
+	<xs:element name="FaultTo" type="tns:EndpointReferenceType"/>
+	<xs:element name="To" type="tns:AttributedURIType"/>
+	<xs:element name="Action" type="tns:AttributedURIType"/>
+
+	<xs:complexType name="AttributedURIType" mixed="false">
+		<xs:simpleContent>
+			<xs:extension base="xs:anyURI">
+				<xs:anyAttribute namespace="##other" processContents="lax"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	
+	<!-- Constructs from the WS-Addressing SOAP binding -->
+
+	<xs:attribute name="IsReferenceParameter" type="xs:boolean"/>
+	
+	<xs:simpleType name="FaultCodesOpenEnumType">
+		<xs:union memberTypes="tns:FaultCodesType xs:QName"/>
+	</xs:simpleType>
+	
+	<xs:simpleType name="FaultCodesType">
+		<xs:restriction base="xs:QName">
+			<xs:enumeration value="tns:InvalidAddressingHeader"/>
+			<xs:enumeration value="tns:InvalidAddress"/>
+			<xs:enumeration value="tns:InvalidEPR"/>
+			<xs:enumeration value="tns:InvalidCardinality"/>
+			<xs:enumeration value="tns:MissingAddressInEPR"/>
+			<xs:enumeration value="tns:DuplicateMessageID"/>
+			<xs:enumeration value="tns:ActionMismatch"/>
+			<xs:enumeration value="tns:MessageAddressingHeaderRequired"/>
+			<xs:enumeration value="tns:DestinationUnreachable"/>
+			<xs:enumeration value="tns:ActionNotSupported"/>
+			<xs:enumeration value="tns:EndpointUnavailable"/>
+		</xs:restriction>
+	</xs:simpleType>
+	
+	<xs:element name="RetryAfter" type="tns:AttributedUnsignedLongType"/>
+	<xs:complexType name="AttributedUnsignedLongType" mixed="false">
+		<xs:simpleContent>
+			<xs:extension base="xs:unsignedLong">
+				<xs:anyAttribute namespace="##other" processContents="lax"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	
+	<xs:element name="ProblemHeaderQName" type="tns:AttributedQNameType"/>
+	<xs:complexType name="AttributedQNameType" mixed="false">
+		<xs:simpleContent>
+			<xs:extension base="xs:QName">
+				<xs:anyAttribute namespace="##other" processContents="lax"/>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+	
+	<xs:element name="ProblemIRI" type="tns:AttributedURIType"/>
+	
+	<xs:element name="ProblemAction" type="tns:ProblemActionType"/>
+	<xs:complexType name="ProblemActionType" mixed="false">
+		<xs:sequence>
+			<xs:element ref="tns:Action" minOccurs="0"/>
+			<xs:element name="SoapAction" minOccurs="0" type="xs:anyURI"/>
+		</xs:sequence>
+		<xs:anyAttribute namespace="##other" processContents="lax"/>
+	</xs:complexType>
+	
+</xs:schema>`,
+};
diff --git a/packages/cli/src/sso.ee/saml/schema/ws-authorization.xsd.ts b/packages/cli/src/sso.ee/saml/schema/ws-authorization.xsd.ts
new file mode 100644
index 0000000000..e12fb570fa
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/schema/ws-authorization.xsd.ts
@@ -0,0 +1,150 @@
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'ws-authorization.xsd',
+	contents: `<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the 
+implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; 
+neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS 
+specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made 
+available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users 
+of this specification, can be obtained from the OASIS Executive Director.
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may 
+cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+Copyright © OASIS Open 2002-2007. All Rights Reserved.
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist 
+in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the 
+above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified 
+in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, 
+in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate 
+it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+This document and the information contained herein is provided on an AS IS basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF 
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+  -->
+
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
+       xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'    
+		   xmlns:tns='http://docs.oasis-open.org/wsfed/authorization/200706'
+		   targetNamespace='http://docs.oasis-open.org/wsfed/authorization/200706'
+		   elementFormDefault='qualified' >
+  <xs:import namespace='http://www.w3.org/2001/04/xmlenc#'
+             schemaLocation='xenc-schema.xsd'/>
+  
+  <!-- Section 9.2 -->
+  <xs:element name='AdditionalContext' type='tns:AdditionalContextType' />
+  <xs:complexType name='AdditionalContextType' >
+    <xs:sequence>
+      <xs:element name='ContextItem' type='tns:ContextItemType' minOccurs='0' maxOccurs='unbounded' />
+      <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+    </xs:sequence>
+    <xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <xs:complexType name='ContextItemType' >
+    <xs:choice minOccurs='0'>
+      <xs:element name='Value' type='xs:string' minOccurs='1' maxOccurs='1' />
+      <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
+    </xs:choice>
+    <xs:attribute name='Name' type='xs:anyURI' use='required' />
+	<xs:attribute name='Scope' type='xs:anyURI' use='optional' />
+	<xs:anyAttribute namespace='##other' processContents='lax' />	
+  </xs:complexType>
+
+  <!-- Section 9.3 -->
+  <xs:element name='ClaimType' type='tns:ClaimType' />
+  <xs:complexType name='ClaimType' >
+    <xs:sequence>
+      <xs:element name="DisplayName" type="tns:DisplayNameType" minOccurs="0" maxOccurs="1" />
+      <xs:element name="Description" type="tns:DescriptionType" minOccurs="0" maxOccurs="1" />
+      <xs:element name="DisplayValue" type="tns:DisplayValueType" minOccurs="0" maxOccurs="1" />
+      <xs:choice minOccurs='0'>
+	      <xs:element name='Value' type='xs:string' minOccurs='1' maxOccurs='1' />
+        <xs:element name='EncryptedValue' type='tns:EncryptedValueType' minOccurs='1' maxOccurs='1' />
+        <xs:element name='StructuredValue' type='tns:StructuredValueType' minOccurs='1' maxOccurs='1' />
+        <xs:element name='ConstrainedValue' type='tns:ConstrainedValueType' minOccurs='1' maxOccurs='1' />
+ 	      <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
+	    </xs:choice>
+    </xs:sequence>
+	<xs:attribute name='Uri' type='xs:anyURI' use='required' />
+	<xs:attribute name='Optional' type='xs:boolean' use='optional' />
+	<xs:anyAttribute namespace='##other' processContents='lax' />	
+  </xs:complexType>
+
+  <xs:complexType name="DisplayNameType">
+    <xs:simpleContent>
+     <xs:extension base="xs:string">
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="DescriptionType">
+    <xs:simpleContent>
+      <xs:extension base="xs:string">
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="DisplayValueType">
+    <xs:simpleContent>
+      <xs:extension base="xs:string">
+        <xs:anyAttribute namespace="##other" processContents="lax" />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+
+  <xs:complexType name="EncryptedValueType">
+    <xs:sequence>
+      <xs:element ref="xenc:EncryptedData" minOccurs="1" maxOccurs="1"/>
+    </xs:sequence>
+    <xs:attribute name="DecryptionCondition" type="xs:anyURI" use="optional"/>
+  </xs:complexType>
+
+  <xs:complexType name="StructuredValueType">
+    <xs:sequence>
+      <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='unbounded' />
+    </xs:sequence>
+    <xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <!-- Section 9.3.1 -->
+
+  <xs:complexType name='ConstrainedValueType'>
+    <xs:sequence>
+      <xs:choice minOccurs='1'>
+        <xs:element name='ValueLessThan' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
+        <xs:element name='ValueLessThanOrEqual' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
+        <xs:element name='ValueGreaterThan' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
+        <xs:element name='ValueGreaterThanOrEqual' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
+        <xs:element name='ValueInRangen' type='tns:ValueInRangeType' minOccurs='1' maxOccurs='1'/>
+        <xs:element name='ValueOneOf' type='tns:ConstrainedManyValueType' minOccurs='1' maxOccurs='1'/>
+      </xs:choice>
+      <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='unbounded' />
+    </xs:sequence>
+    <xs:attribute name='AssertConstraint' type='xs:boolean' use='optional' />
+  </xs:complexType>
+  <xs:complexType name='ValueInRangeType'>
+    <xs:sequence>
+      <xs:element name='ValueUpperBound' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
+      <xs:element name='ValueLowerBound' type='tns:ConstrainedSingleValueType' minOccurs='1' maxOccurs='1'/>
+    </xs:sequence>
+  </xs:complexType>
+  
+  <xs:complexType name='ConstrainedSingleValueType'>
+    <xs:choice minOccurs='0'>
+      <xs:element name='Value' type='xs:string' minOccurs='1' maxOccurs='1' />
+      <xs:element name='StructuredValue' type='tns:StructuredValueType' minOccurs='1' maxOccurs='1' />
+    </xs:choice>
+  </xs:complexType>
+
+  <xs:complexType name='ConstrainedManyValueType'>
+    <xs:choice minOccurs='0'>
+      <xs:element name='Value' type='xs:string' minOccurs='1' maxOccurs='unbounded' />
+      <xs:element name='StructuredValue' type='tns:StructuredValueType' minOccurs='1' maxOccurs='unbounded' />
+    </xs:choice>
+  </xs:complexType>
+
+</xs:schema>`,
+};
diff --git a/packages/cli/src/sso.ee/saml/schema/ws-federation.xsd.ts b/packages/cli/src/sso.ee/saml/schema/ws-federation.xsd.ts
new file mode 100644
index 0000000000..5006c633ed
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/schema/ws-federation.xsd.ts
@@ -0,0 +1,475 @@
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'ws-federation.xsd',
+	contents: `<?xml version="1.0" encoding="UTF-8" ?>
+<!-- 
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the 
+implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; 
+neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS 
+specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made 
+available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users 
+of this specification, can be obtained from the OASIS Executive Director.
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may 
+cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+Copyright © OASIS Open 2002-2007. All Rights Reserved.
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist 
+in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the 
+above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified 
+in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, 
+in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate 
+it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+This document and the information contained herein is provided on an AS IS basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF 
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+  -->
+<xs:schema xmlns:xs='http://www.w3.org/2001/XMLSchema'
+		   xmlns:sp='http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702'
+		   xmlns:tns='http://docs.oasis-open.org/wsfed/federation/200706'
+		   xmlns:wsa='http://www.w3.org/2005/08/addressing'
+       xmlns:mex='http://schemas.xmlsoap.org/ws/2004/09/mex'
+       xmlns:wsse='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
+		   xmlns:wsu='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'
+       xmlns:md='urn:oasis:names:tc:SAML:2.0:metadata'
+       xmlns:auth='http://docs.oasis-open.org/wsfed/authorization/200706'
+		   targetNamespace='http://docs.oasis-open.org/wsfed/federation/200706'
+		   elementFormDefault='qualified' >
+
+  <xs:import namespace='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd'
+			 schemaLocation='oasis-200401-wss-wssecurity-secext-1.0.xsd' />
+  <xs:import namespace='http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd'
+			 schemaLocation='oasis-200401-wss-wssecurity-utility-1.0.xsd' />
+  <xs:import namespace='http://www.w3.org/2005/08/addressing'
+			 schemaLocation='ws-addr.xsd' />
+  <xs:import namespace='http://schemas.xmlsoap.org/ws/2004/09/mex'
+			 schemaLocation='MetadataExchange.xsd' />
+  <xs:import namespace='urn:oasis:names:tc:SAML:2.0:metadata'
+			 schemaLocation='saml-schema-metadata-2.0.xsd' />
+  <xs:import namespace='http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702'
+			 schemaLocation='ws-securitypolicy-1.2.xsd'/>
+  <xs:import namespace='http://docs.oasis-open.org/wsfed/authorization/200706'
+       schemaLocation='ws-authorization.xsd'/>
+
+  <!-- Section 3.1 -->
+  <!-- Note: Use of this root element is discouraged in favor of use of md:EntitiesDescriptor or md EntityDescriptor -->
+  <xs:element name='FederationMetadata' type='tns:FederationMetadataType' />
+
+  <xs:complexType name='FederationMetadataType' >
+    <xs:sequence>
+	  <!--
+		  *** Accurate content model is nondeterministic ***
+		  <xs:element name='Federation' type='tns:FederationType' minOccurs='1' maxOccurs='unbounded' />
+		  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	  -->
+	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <xs:complexType name='FederationType' >
+	<xs:sequence>
+	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:attribute name='FederationID' type='xs:anyURI' />
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <!-- Section 3.1.2.1 -->
+  <xs:complexType name="WebServiceDescriptorType" abstract="true">
+    <xs:complexContent>
+      <xs:extension base="md:RoleDescriptorType">
+        <xs:sequence>
+          <xs:element ref="tns:LogicalServiceNamesOffered" minOccurs="0" maxOccurs="1" />
+          <xs:element ref="tns:TokenTypesOffered" minOccurs="0" maxOccurs="1" />
+          <xs:element ref="tns:ClaimDialectsOffered" minOccurs="0" maxOccurs="1" />
+          <xs:element ref="tns:ClaimTypesOffered" minOccurs="0" maxOccurs="1" />
+          <xs:element ref="tns:ClaimTypesRequested" minOccurs="0" maxOccurs="1" />
+          <xs:element ref="tns:AutomaticPseudonyms" minOccurs="0" maxOccurs="1"/>
+          <xs:element ref="tns:TargetScopes" minOccurs="0" maxOccurs="1"/>
+        </xs:sequence>
+        <xs:attribute name="ServiceDisplayName" type="xs:string" use="optional"/>
+        <xs:attribute name="ServiceDescription" type="xs:string" use="optional"/>
+    </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name='LogicalServiceNamesOffered' type='tns:LogicalServiceNamesOfferedType' />
+  <xs:element name='TokenTypesOffered' type='tns:TokenTypesOfferedType' />
+  <xs:element name='ClaimDialectsOffered' type='tns:ClaimDialectsOfferedType' />
+  <xs:element name='ClaimTypesOffered' type='tns:ClaimTypesOfferedType' />
+  <xs:element name='ClaimTypesRequested' type='tns:ClaimTypesRequestedType' />
+  <xs:element name="AutomaticPseudonyms" type="xs:boolean"/>
+  <xs:element name='TargetScopes' type='tns:EndpointType'/>
+
+  <!-- Section 3.1.2.2 -->
+  <xs:complexType name="SecurityTokenServiceType">
+    <xs:complexContent>
+      <xs:extension base="tns:WebServiceDescriptorType">
+        <xs:sequence>
+          <xs:element ref="tns:SecurityTokenServiceEndpoint" minOccurs="1" maxOccurs="unbounded"/>
+          <xs:element ref="tns:SingleSignOutSubscriptionEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element ref="tns:SingleSignOutNotificationEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element ref="tns:PassiveRequestorEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="SecurityTokenServiceEndpoint" type="tns:EndpointType"/>
+  <xs:element name="SingleSignOutSubscriptionEndpoint" type="tns:EndpointType"/>
+  <xs:element name="SingleSignOutNotificationEndpoint" type="tns:EndpointType"/>
+  <xs:element name="PassiveRequestorEndpoint" type="tns:EndpointType"/>
+
+  <!-- Section 3.1.2.3 -->
+  <xs:complexType name="PseudonymServiceType">
+    <xs:complexContent>
+      <xs:extension base="tns:WebServiceDescriptorType">
+        <xs:sequence>
+          <xs:element ref="tns:PseudonymServiceEndpoint" minOccurs="1" maxOccurs="unbounded"/>
+          <xs:element ref="tns:SingleSignOutNotificationEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+
+  <xs:element name="PseudonymServiceEndpoint" type="tns:EndpointType"/>
+  <!-- Defined above -->
+  <!-- <xs:element name="SingleSignOutNotificationEndpoint" type="tns:EndpointType"/> -->
+
+  <!-- Section 3.1.2.4 -->
+  <xs:complexType name="AttributeServiceType">
+    <xs:complexContent>
+      <xs:extension base="tns:WebServiceDescriptorType">
+        <xs:sequence>
+          <xs:element ref="tns:AttributeServiceEndpoint" minOccurs="1" maxOccurs="unbounded"/>
+          <xs:element ref="tns:SingleSignOutNotificationEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="AttributeServiceEndpoint" type="tns:EndpointType"/>
+  <!-- Defined above -->
+  <!-- <xs:element name="SingleSignOutNotificationEndpoint" type="tns:EndpointType"/> -->
+
+  <!-- Section 3.1.2.5 -->
+  <xs:complexType name="ApplicationServiceType">
+    <xs:complexContent>
+      <xs:extension base="tns:WebServiceDescriptorType">
+        <xs:sequence>
+          <xs:element ref="tns:ApplicationServiceEndpoint" minOccurs="1" maxOccurs="unbounded"/>
+          <xs:element ref="tns:SingleSignOutNotificationEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+          <xs:element ref="tns:PassiveRequestorEndpoint" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+      </xs:extension>
+    </xs:complexContent>
+  </xs:complexType>
+  <xs:element name="ApplicationServiceEndpoint" type="tns:EndpointType"/>
+  <!-- Defined above -->
+  <!-- <xs:element name="SingleSignOutNotificationEndpoint" type="tns:EndpointType"/> -->
+  <!-- <xs:element name="PassiveRequestorEndpoint" type="tns:EndpointType"/> -->
+
+
+  <!-- Section 3.1.3 -->
+  <!-- Defined above -->
+  <!--<xs:element name='LogicalServiceNamesOffered' type='tns:LogicalServiceNamesOfferedType' />-->
+
+  <xs:complexType name='LogicalServiceNamesOfferedType' >
+	<xs:sequence>
+	  <xs:element name='IssuerName' type='tns:IssuerNameType' minOccurs='1' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <xs:complexType name='IssuerNameType' >
+	<xs:attribute name='Uri' type='xs:anyURI' use='required' />
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>  
+  
+  <!-- Section 3.1.4 -->
+  <xs:element name='PsuedonymServiceEndpoints' type='tns:EndpointType' />
+  <xs:complexType name='EndpointType' >
+    <xs:sequence>
+      <xs:element ref='wsa:EndpointReference' minOccurs='1' maxOccurs='unbounded'/>
+    </xs:sequence>
+  </xs:complexType>
+  
+  <!-- Section 3.1.5 -->
+  <xs:element name='AttributeServiceEndpoints' type='tns:EndpointType' />
+
+  <!-- Section 3.1.6 -->
+  <xs:element name='SingleSignOutSubscriptionEndpoints' type='tns:EndpointType' />
+
+  <!-- Section 3.1.7 -->
+  <xs:element name='SingleSignOutNotificationEndpoints' type='tns:EndpointType' />
+
+  <!-- Section 3.1.8 -->
+  <!-- Defined above -->
+  <!--<xs:element name='TokenTypesOffered' type='tns:TokenTypesOfferedType' />-->
+  <xs:complexType name='TokenTypesOfferedType' >
+	<xs:sequence>
+	  <xs:element name='TokenType' type='tns:TokenType' minOccurs='1' maxOccurs='unbounded' />
+	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <xs:complexType name='TokenType' >
+	<xs:sequence>
+	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:attribute name='Uri' type='xs:anyURI' />
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <!-- Section 3.1.9 -->
+  <!-- Defined above -->
+  <!-- <xs:element name='ClaimTypesOffered' type='tns:ClaimTypesOfferedType' /> -->
+  <xs:complexType name='ClaimTypesOfferedType'>
+	<xs:sequence>
+	  <xs:element ref='auth:ClaimType' minOccurs='1' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+  
+  <!-- Section 3.1.10 -->
+  <!-- Defined above -->
+  <!-- <xs:element name='ClaimTypesRequested' ype='tns:ClaimTypesRequestedType' /> -->
+  <xs:complexType name='ClaimTypesRequestedType'>
+    <xs:sequence>
+      <xs:element ref='auth:ClaimType' minOccurs='1' maxOccurs='unbounded' />
+    </xs:sequence>
+    <xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+  
+  <!-- Section 3.1.11 -->
+  <!-- Defined above -->
+  <!--<xs:element name='ClaimDialectsOffered' type='tns:ClaimDialectsOfferedType' />-->
+  <xs:complexType name='ClaimDialectsOfferedType'>
+    <xs:sequence>
+      <xs:element name='ClaimDialect' type='tns:ClaimDialectType' minOccurs='1' maxOccurs='unbounded' />
+    </xs:sequence>
+    <xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <xs:complexType name='ClaimDialectType' >
+    <xs:sequence>
+      <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+    </xs:sequence>
+    <xs:attribute name='Uri' type='xs:anyURI' />
+    <xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+  
+  <!-- Section 3.1.12 -->
+  <!-- Defined above -->
+  <!-- <xs:element name='AutomaticPseudonyms' type='xs:boolean' /> -->
+
+  <!-- Section 3.1.13 -->
+  <xs:element name='PassiveRequestorEnpoints' type='tns:EndpointType'/>
+  
+  <!-- Section 3.1.14 -->
+  <!-- Defined above -->
+  <!--<xs:element name='TargetScopes' type='tns:EndpointType'/>-->
+  
+  <!-- Section 3.2.4 -->
+  <xs:element name='FederationMetadataHandler' type='tns:FederationMetadataHandlerType' />
+  <xs:complexType name='FederationMetadataHandlerType' >
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <!-- Section 4.1 -->
+  <xs:element name='SignOut' type='tns:SignOutType' />
+  <xs:complexType name='SignOutType' >
+	<xs:sequence>
+	  <xs:element ref='tns:Realm' minOccurs='0' />
+	  <xs:element name='SignOutBasis' type='tns:SignOutBasisType' minOccurs='1' maxOccurs='1' />
+	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:attribute ref='wsu:Id' use='optional' />
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <xs:complexType name='SignOutBasisType' >
+	<xs:sequence>
+	  <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />	
+  </xs:complexType>
+
+  <!-- Section 4.2 -->
+  <xs:element name='Realm' type='xs:anyURI' />
+
+  <!-- Section 6.1 -->
+  <xs:element name='FilterPseudonyms' type='tns:FilterPseudonymsType' />
+  <xs:complexType name='FilterPseudonymsType' >
+	<xs:sequence>
+	  <xs:element ref='tns:PseudonymBasis' minOccurs='0' maxOccurs='1' />
+	  <xs:element ref='tns:RelativeTo' minOccurs='0' maxOccurs='1' />
+	  <xs:any namespace='##other' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />	
+  </xs:complexType>
+
+  <xs:element name='PseudonymBasis' type='tns:PseudonymBasisType' />
+  <xs:complexType name='PseudonymBasisType' >
+ 	<xs:sequence>
+	  <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <xs:element name='RelativeTo' type='tns:RelativeToType' />
+  <xs:complexType name='RelativeToType' >
+	<xs:sequence>
+	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <!-- Section 6.2  -->
+  <xs:element name='Pseudonym' type='tns:PseudonymType' />
+
+  <xs:complexType name='PseudonymType' >
+	<xs:sequence>
+	  <!--
+		  *** Accurate content model is nondeterministic ***
+		  <xs:element ref='tns:PseudonymBasis' minOccurs='1' maxOccurs='1' /> 
+		  <xs:element ref='tns:RelativeTo' minOccurs='1' maxOccurs='1' />
+		  <xs:element ref='wsu:Expires' minOccurs='0' maxOccurs='1' />
+		  <xs:element ref='tns:SecurityToken' minOccurs='0' maxOccurs='unbounded' />
+		  <xs:element ref='tns:ProofToken' minOccurs='0' maxOccurs='unbounded' />
+		  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  
+	  -->
+
+	  <xs:element ref='tns:PseudonymBasis' minOccurs='1' maxOccurs='1' /> 
+	  <xs:element ref='tns:RelativeTo' minOccurs='1' maxOccurs='1' />
+	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />	
+  </xs:complexType>
+
+  <xs:element name='SecurityToken' type='tns:SecurityTokenType' />
+  <xs:complexType name='SecurityTokenType' >
+ 	<xs:sequence>
+	  <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <xs:element name='ProofToken' type='tns:ProofTokenType' />
+  <xs:complexType name='ProofTokenType' >
+ 	<xs:sequence>
+	  <xs:any namespace='##other' processContents='lax' minOccurs='1' maxOccurs='1' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <!-- Section 7.1 -->
+  <xs:element name='RequestPseudonym' type='tns:RequestPseudonymType' />
+  <xs:complexType name='RequestPseudonymType' >
+	<xs:sequence>
+	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  
+	</xs:sequence>
+	<xs:attribute name='SingleUse' type='xs:boolean' use='optional' />
+	<xs:attribute name='Lookup' type='xs:boolean' use='optional' />
+	<xs:anyAttribute namespace='##other' processContents='lax' />  
+  </xs:complexType>
+
+  <!-- Section 8.1 -->
+  <xs:element name='ReferenceToken' type='tns:ReferenceTokenType' />
+  <xs:complexType name='ReferenceTokenType'>
+	<xs:sequence>
+	  <xs:element name='ReferenceEPR' type='wsa:EndpointReferenceType' minOccurs='1' maxOccurs='unbounded' />
+	  <xs:element name='ReferenceDigest' type='tns:ReferenceDigestType' minOccurs='0' maxOccurs='1' />
+	  <xs:element name='ReferenceType' type='tns:AttributeExtensibleURI' minOccurs='0' maxOccurs='1' />
+	  <xs:element name='SerialNo' type='tns:AttributeExtensibleURI' minOccurs='0' maxOccurs='1' />
+	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  	  
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />  
+  </xs:complexType>
+
+  <xs:complexType name='ReferenceDigestType' >
+	<xs:simpleContent>
+	  <xs:extension base='xs:base64Binary' >
+		<xs:anyAttribute namespace='##other' processContents='lax' />  
+	  </xs:extension>
+	</xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name='AttributeExtensibleURI' >
+    <xs:simpleContent>
+      <xs:extension base='xs:anyURI' >
+        <xs:anyAttribute namespace='##other' processContents='lax' />
+      </xs:extension>
+    </xs:simpleContent>
+  </xs:complexType>
+  
+  <!-- Section 8.2 -->
+  <xs:element name='FederationID' type='tns:AttributeExtensibleURI' />
+
+  <!-- Section 8.3 -->
+  <xs:element name='RequestProofToken' type='tns:RequestProofTokenType' />
+  <xs:complexType name='RequestProofTokenType' >
+	<xs:sequence>
+	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <!-- Section 8.4 -->
+  <xs:element name='ClientPseudonym' type='tns:ClientPseudonymType' />
+  <xs:complexType name='ClientPseudonymType' >
+	<xs:sequence>
+	  <xs:element name='PPID' type='tns:AttributeExtensibleString' minOccurs='0' />
+	  <xs:element name='DisplayName' type='tns:AttributeExtensibleString' minOccurs='0' />
+	  <xs:element name='EMail' type='tns:AttributeExtensibleString' minOccurs='0' />
+	  <xs:any namespace='##other' processContents='lax' minOccurs='0' maxOccurs='unbounded' />	  	  
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />	
+  </xs:complexType>
+
+  <xs:complexType name='AttributeExtensibleString' >
+	<xs:simpleContent>
+	  <xs:extension base='xs:string' >
+		<xs:anyAttribute namespace='##other' processContents='lax' />
+	  </xs:extension>
+	</xs:simpleContent>
+  </xs:complexType>
+
+  <!-- Section 8.5 -->
+  <xs:element name='Freshness' type='tns:Freshness' />
+  <xs:complexType name='Freshness'>
+	<xs:simpleContent>
+	  <xs:extension base='xs:unsignedInt' >
+		<xs:attribute name='AllowCache' type='xs:boolean' use='optional' />
+		<xs:anyAttribute namespace='##other' processContents='lax' />		
+	  </xs:extension>
+	</xs:simpleContent>
+  </xs:complexType>
+
+  <!-- Section 14.1 -->
+  <xs:element name='RequireReferenceToken' type='sp:TokenAssertionType' />
+  <xs:element name='ReferenceToken11' type='tns:AssertionType' />
+
+  <xs:complexType name='AssertionType' >
+	<xs:sequence>
+	  <xs:any namespace='##any' processContents='lax' minOccurs='0' maxOccurs='unbounded' />
+	</xs:sequence>
+	<xs:anyAttribute namespace='##other' processContents='lax' />
+  </xs:complexType>
+
+  <!-- Section 14.2 -->
+  <xs:element name='WebBinding' type='sp:NestedPolicyType' />
+  <xs:element name='AuthenticationToken' type='sp:NestedPolicyType' />
+  <!-- ReferenceToken defined above -->
+  <xs:element name='RequireSignedTokens' type='tns:AssertionType' />
+  <xs:element name='RequireBearerTokens' type='tns:AssertionType' />
+  <xs:element name='RequireSharedCookies' type='tns:AssertionType' />
+  
+
+  <!-- Section 14.3 -->
+  <xs:element name='RequiresGenericClaimDialect' type='tns:AssertionType' />
+  <xs:element name='IssuesSpecificPolicyFault' type='tns:AssertionType' />
+  <xs:element name='AdditionalContextProcessed' type='tns:AssertionType' />
+
+
+</xs:schema>`,
+};
diff --git a/packages/cli/src/sso.ee/saml/schema/ws-securitypolicy-1.2.xsd.ts b/packages/cli/src/sso.ee/saml/schema/ws-securitypolicy-1.2.xsd.ts
new file mode 100644
index 0000000000..6beb4a7c86
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/schema/ws-securitypolicy-1.2.xsd.ts
@@ -0,0 +1,1210 @@
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'ws-securitypolicy-1.2.xsd',
+	contents: `<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+OASIS takes no position regarding the validity or scope of any intellectual property or other rights that might be claimed to pertain to the 
+implementation or use of the technology described in this document or the extent to which any license under such rights might or might not be available; 
+neither does it represent that it has made any effort to identify any such rights. Information on OASIS's procedures with respect to rights in OASIS 
+specifications can be found at the OASIS website. Copies of claims of rights made available for publication and any assurances of licenses to be made 
+available, or the result of an attempt made to obtain a general license or permission for the use of such proprietary rights by implementors or users 
+of this specification, can be obtained from the OASIS Executive Director.
+OASIS invites any interested party to bring to its attention any copyrights, patents or patent applications, or other proprietary rights which may 
+cover technology that may be required to implement this specification. Please address the information to the OASIS Executive Director.
+Copyright © OASIS Open 2002-2007. All Rights Reserved.
+This document and translations of it may be copied and furnished to others, and derivative works that comment on or otherwise explain it or assist 
+in its implementation may be prepared, copied, published and distributed, in whole or in part, without restriction of any kind, provided that the 
+above copyright notice and this paragraph are included on all such copies and derivative works. However, this document itself does not be modified 
+in any way, such as by removing the copyright notice or references to OASIS, except as needed for the purpose of developing OASIS specifications, 
+in which case the procedures for copyrights defined in the OASIS Intellectual Property Rights document must be followed, or as required to translate 
+it into languages other than English.
+The limited permissions granted above are perpetual and will not be revoked by OASIS or its successors or assigns.
+This document and the information contained herein is provided on an AS IS basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, 
+INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF 
+MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+-->
+<xs:schema
+	targetNamespace='http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702'
+  xmlns:tns='http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702'
+	xmlns:wsa="http://www.w3.org/2005/08/addressing"
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	elementFormDefault="qualified"
+	blockDefault="#all" >
+
+  <xs:import namespace="http://www.w3.org/2005/08/addressing" 
+		schemaLocation="ws-addr.xsd" />
+
+  <!--
+	4. Protection Assertions
+	-->
+  <xs:element name="SignedParts" type="tns:SePartsType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        4.1.1 SignedParts Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="EncryptedParts" type="tns:SePartsType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        4.2.1 EncryptedParts Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="SePartsType">
+    <xs:sequence>
+      <xs:element name="Body" type="tns:EmptyType" minOccurs="0" />
+      <xs:element name="Header" type="tns:HeaderType" minOccurs="0" maxOccurs="unbounded" />
+      <xs:element name="Attachments" type="tns:EmptyType" minOccurs="0" />
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+  <xs:complexType name="EmptyType" />
+  <xs:complexType name="HeaderType" >
+    <xs:attribute name="Name" type="xs:QName" use="optional" />
+    <xs:attribute name="Namespace" type="xs:anyURI" use="required" />
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="SignedElements" type="tns:SerElementsType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en" >
+        4.1.2 SignedElements Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="EncryptedElements" type="tns:SerElementsType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        4.2.2 EncryptedElements Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequiredElements" type="tns:SerElementsType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en" >
+        4.3.1 RequiredElements Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="SerElementsType">
+    <xs:sequence>
+      <xs:element name="XPath" type="xs:string" minOccurs="1" maxOccurs="unbounded" />
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+    </xs:sequence>
+    <xs:attribute name="XPathVersion" type="xs:anyURI" use="optional" />
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+
+  <!--
+	5. Token Assertions
+	-->
+  <xs:attribute name="IncludeToken" type="tns:IncludeTokenOpenType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.1 Token Inclusion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:attribute>
+  <xs:simpleType name="IncludeTokenOpenType">
+    <xs:union memberTypes="tns:IncludeTokenType xs:anyURI" />
+  </xs:simpleType>
+  <xs:simpleType name="IncludeTokenType">
+    <xs:restriction base="xs:anyURI" >
+      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/Never" />
+      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/Once" />
+      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/AlwaysToRecipient" />
+      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/AlwaysToInitiator" />
+      <xs:enumeration value="http://docs.oasis-open.org/ws-sx/ws-trust/200702/ws-securitypolicy/IncludeToken/Always" />
+    </xs:restriction>
+  </xs:simpleType>
+
+  <xs:element name="UsernameToken" type="tns:TokenAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en" >
+        5.4.1 UsernameToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="TokenAssertionType">
+    <xs:sequence>
+      <xs:choice minOccurs="0">
+        <xs:element name="Issuer" type="wsa:EndpointReferenceType" />
+        <xs:element name="IssuerName" type="xs:anyURI" />
+      </xs:choice>
+      <!--
+			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
+			<xs:element ref="wsp:Policy" minOccurs="0" />
+			-->
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+    </xs:sequence>
+    <xs:attribute ref="tns:IncludeToken" use="optional" />
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="NoPassword" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.1 UsernameToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="HashPassword" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.1 UsernameToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssUsernameToken10" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.1 UsernameToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssUsernameToken11" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.1 UsernameToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- RequireDerivedKeys defined below. -->
+  <!-- RequireImpliedDerivedKeys defined below. -->
+  <!-- RequireExplicitDerivedKeys defined below. -->
+
+  <xs:complexType name="QNameAssertionType">
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="IssuedToken" type="tns:IssuedTokenType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.2 IssuedToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="IssuedTokenType">
+    <xs:sequence>
+      <xs:choice minOccurs="0">
+        <xs:element name="Issuer" type="wsa:EndpointReferenceType" />
+        <xs:element name="IssuerName" type="xs:anyURI" />
+      </xs:choice>
+      <xs:element name="RequestSecurityTokenTemplate" type="tns:RequestSecurityTokenTemplateType" />
+      <!--
+			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
+			<xs:element ref="wsp:Policy" minOccurs="0" />
+			-->
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
+    </xs:sequence>
+    <xs:attribute ref="tns:IncludeToken" use="optional" />
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+  <xs:complexType name="RequestSecurityTokenTemplateType">
+    <xs:sequence>
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
+    </xs:sequence>
+    <xs:attribute name="TrustVersion" type="xs:anyURI" use="optional" />
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="RequireDerivedKeys" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.2 IssuedToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireImpliedDerivedKeys" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.2 IssuedToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireExplicitDerivedKeys" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.2 IssuedToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireExternalReference" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.2 IssuedToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireInternalReference" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.2 IssuedToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="X509Token" type="tns:TokenAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- RequireDerivedKeys defined above. -->
+  <!-- RequireImpliedDerivedKeys defined above. -->
+  <!-- RequireExplicitDerivedKeys defined above. -->
+  
+  <xs:element name="RequireKeyIdentifierReference" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireIssuerSerialReference" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireEmbeddedTokenReference" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireThumbprintReference" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssX509V3Token10" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssX509Pkcs7Token10" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssX509PkiPathV1Token10" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssX509V1Token11" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssX509V3Token11" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssX509Pkcs7Token11" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssX509PkiPathV1Token11" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.3 X509Token Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="KerberosToken" type="tns:TokenAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.4 KerberosToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- RequireDerivedKeys defined above. -->
+  <!-- RequireImpliedDerivedKeys defined above. -->
+  <!-- RequireExplicitDerivedKeys defined above. -->
+  <!-- RequireKeyIdentifierReference defined above. -->
+
+  <xs:element name="WssKerberosV5ApReqToken11" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.4 KerberosToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssGssKerberosV5ApReqToken11" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.4 KerberosToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="SpnegoContextToken" type="tns:SpnegoContextTokenType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en" >
+        5.4.5 SpnegoContextToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="SpnegoContextTokenType">
+    <xs:sequence>
+      <xs:choice minOccurs="0">
+        <xs:element name="Issuer" type="wsa:EndpointReferenceType" />
+        <xs:element name="IssuerName" type="xs:anyURI" />
+      </xs:choice>
+      <!--
+			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
+			<xs:element ref="wsp:Policy" minOccurs="0" />
+			-->
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
+    </xs:sequence>
+    <xs:attribute ref="tns:IncludeToken" use="optional" />
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+  <!-- RequireDerivedKeys defined above. -->
+  <!-- RequireImpliedDerivedKeys defined above. -->
+  <!-- RequireExplicitDerivedKeys defined above. -->
+  <xs:element name="MustNotSendCancel" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.5 SpnegoContextToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MustNotSendAmend" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.5 SpnegoContextToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MustNotSendRenew" type="tns:QNameAssertionType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.5 SpnegoContextToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="SecurityContextToken" type="tns:TokenAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.6 SecurityContextToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- RequireDerivedKeys defined above. -->
+  <!-- RequireImpliedDerivedKeys defined above. -->
+  <!-- RequireExplicitDerivedKeys defined above. -->
+
+  <xs:element name="RequireExternalUriReference" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.6 SecurityContextToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SC13SecurityContextToken" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.6 SecurityContextToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="SecureConversationToken" type="tns:SecureConversationTokenType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.7 SecureConversationToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="SecureConversationTokenType">
+    <xs:sequence>
+      <xs:choice minOccurs="0">
+        <xs:element name="Issuer" type="wsa:EndpointReferenceType" />
+        <xs:element name="IssuerName" type="xs:anyURI" />
+      </xs:choice>
+      <!--
+			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
+			<xs:element ref="wsp:Policy" minOccurs="0" />
+			-->
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
+    </xs:sequence>
+    <xs:attribute ref="tns:IncludeToken" use="optional" />
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+  <!-- RequireDerivedKeys defined above. -->
+  <!-- RequireImpliedDerivedKeys defined above. -->
+  <!-- RequireExplicitDerivedKeys defined above. -->
+  <!-- RequireExternalUriReference defined above. -->
+  <!-- SC13SecurityContextToken defined above. -->
+  <!-- MustNotSendCancel defined above. -->
+  <!-- MustNotSendAmend defined above. -->
+  <!-- MustNotSendRenew defined above. -->
+
+  <xs:element name="BootstrapPolicy" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.7 SecureConversationToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="SamlToken" type="tns:TokenAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en" >
+        5.4.8 SamlToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- RequireDerivedKeys defined above. -->
+  <!-- RequireImpliedDerivedKeys defined above. -->
+  <!-- RequireExplicitDerivedKeys defined above. -->
+  <!-- RequireKeyIdentifierReference defined above. -->
+
+  <xs:element name="WssSamlV11Token10" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.8 SamlToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssSamlV11Token11" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.8 SamlToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssSamlV20Token11" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.8 SamlToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="RelToken" type="tns:TokenAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.9 RelToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- RequireDerivedKeys defined above. -->
+  <!-- RequireImpliedDerivedKeys defined above. -->
+  <!-- RequireExplicitDerivedKeys defined above. -->
+  <!-- RequireKeyIdentifierReference defined above. -->
+
+  <xs:element name="WssRelV10Token10" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.9 RelToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssRelV20Token10" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.9 RelToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssRelV10Token11" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.9 RelToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="WssRelV20Token11" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.9 RelToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="HttpsToken" type="tns:TokenAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.10 HttpsToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="HttpBasicAuthentication" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.10 HttpsToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="HttpDigestAuthentication" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.10 HttpsToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireClientCertificate" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.10 HttpsToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  
+  <xs:element name="KeyValueToken" type="tns:KeyValueTokenType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.11 KeyValueToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="KeyValueTokenType">
+    <xs:sequence>
+      <!--
+			Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
+			<xs:element ref="wsp:Policy" minOccurs="0" />
+			-->
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax" />
+    </xs:sequence>
+    <xs:attribute ref="tns:IncludeToken" use="optional" />
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+  <xs:element name="RsaKeyValue" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        5.4.11 KeyValueToken Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  
+  <!--
+	7. Security Binding Assertions
+	-->
+  <xs:element name="AlgorithmSuite" type="tns:NestedPolicyType" >
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:complexType name="NestedPolicyType">
+    <xs:sequence>
+      <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+    </xs:sequence>
+    <xs:anyAttribute namespace="##any" processContents="lax" />
+  </xs:complexType>
+
+  <xs:element name="Basic256" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic192" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic128" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="TripleDes" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic256Rsa15" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic192Rsa15" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic128Rsa15" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="TripleDesRsa15" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic256Sha256" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic192Sha256" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic128Sha256" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="TripleDesSha256" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic256Sha256Rsa15" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic192Sha256Rsa15" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Basic128Sha256Rsa15" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="TripleDesSha256Rsa15" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="InclusiveC14N" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SOAPNormalization10" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="STRTransform10" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="XPath10" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="XPathFilter20" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="AbsXPath" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.1 AlgorithmSuite Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="Layout" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.2 Layout Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="Strict" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.2 Layout Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="Lax" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.2 Layout Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="LaxTsFirst" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.2 Layout Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="LaxTsLast" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.2 Layout Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="TransportBinding" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.3 TransportBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="TransportToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.3 TransportBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- Layout defined above. -->
+
+  <xs:element name="IncludeTimestamp" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.3 TransportBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="SymmetricBinding" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.4 SymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="EncryptionToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.4 SymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="SignatureToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8=7.4 SymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ProtectionToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.4 SymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- Layout defined above. -->
+  <!-- IncludeTimestamp defined above. -->
+
+  <xs:element name="EncryptBeforeSigning" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.4 SymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="EncryptSignature" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.4 SymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="ProtectTokens" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.4 SymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="OnlySignEntireHeadersAndBody" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.4 SymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="AsymmetricBinding" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.5 AsymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="InitiatorToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.5 AsymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="InitiatorSignatureToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.5 AsymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="InitiatorEncryptionToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.5 AsymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="RecipientToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.5 AsymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="RecipientSignatureToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.5 AsymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="RecipientEncryptionToken" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        7.5 AsymmetricBinding Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- Layout defined above. -->
+  <!-- IncludeTimestamp defined above. -->
+  <!-- EncryptBeforeSigning defined above. -->
+  <!-- EncryptSignature defined above. -->
+  <!-- ProtectTokens defined above. -->
+  <!-- OnlySignEntireHeadersAndBody defined above. -->
+
+  <!--
+	8. Supporting Tokens
+	-->
+  <xs:element name="SupportingTokens" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8.1 SupportingTokens Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- SignedParts defined above. -->
+  <!-- SignedElements defined above. -->
+  <!-- EncryptedParts defined above. -->
+  <!-- EncryptedElements defined above. -->
+
+  <xs:element name="SignedSupportingTokens" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8.2 SignedSupportingTokens Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- SignedParts defined above. -->
+  <!-- SignedElements defined above. -->
+  <!-- EncryptedParts defined above. -->
+  <!-- EncryptedElements defined above. -->
+
+  <xs:element name="EndorsingSupportingTokens" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8.3 EndorsingSupportingTokens Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- SignedParts defined above. -->
+  <!-- SignedElements defined above. -->
+  <!-- EncryptedParts defined above. -->
+  <!-- EncryptedElements defined above. -->
+
+  <xs:element name="SignedEndorsingSupportingTokens" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8.4 SignedEndorsingSupportingTokens Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- SignedParts defined above. -->
+  <!-- SignedElements defined above. -->
+  <!-- EncryptedParts defined above. -->
+  <!-- EncryptedElements defined above. -->
+
+  <xs:element name="SignedEncryptedSupportingTokens" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8.5 SignedEncryptedSupportingTokens Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- SignedParts defined above. -->
+  <!-- SignedElements defined above. -->
+  <!-- EncryptedParts defined above. -->
+  <!-- EncryptedElements defined above. -->
+
+  <xs:element name="EncryptedSupportingTokens" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8.6 EncryptedSupportingTokens Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- SignedParts defined above. -->
+  <!-- SignedElements defined above. -->
+  <!-- EncryptedParts defined above. -->
+  <!-- EncryptedElements defined above. -->
+  
+  <xs:element name="EndorsingEncryptedSupportingTokens" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8.7 EndorsingEncryptedSupportingTokens Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- SignedParts defined above. -->
+  <!-- SignedElements defined above. -->
+  <!-- EncryptedParts defined above. -->
+  <!-- EncryptedElements defined above. -->
+
+  <xs:element name="SignedEndorsingEncryptedSupportingTokens" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        8.8 SignedEndorsingEncryptedSupportingTokens Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- AlgorithmSuite defined above. -->
+  <!-- SignedParts defined above. -->
+  <!-- SignedElements defined above. -->
+  <!-- EncryptedParts defined above. -->
+  <!-- EncryptedElements defined above. -->
+  
+  <!--
+	9. WSS: SOAP Message Security Options
+	-->
+  <xs:element name="Wss10" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.1 Wss10 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="MustSupportRefKeyIdentifier" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.1 Wss10 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MustSupportRefIssuerSerial" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.1 Wss10 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MustSupportRefExternalURI" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.1 Wss10 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MustSupportRefEmbeddedToken" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.1 Wss10 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="Wss11" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.2 Wss11 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <!-- MustSupportRefKeyIdentifier defined above. -->
+  <!-- MustSupportRefIssuerSerial defined above. -->
+  <!-- MustSupportRefExternalURI defined above. -->
+  <!-- MustSupportRefEmbeddedToken defined above. -->
+
+  <xs:element name="MustSupportRefThumbprint" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.2 Wss11 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MustSupportRefEncryptedKey" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.2 Wss11 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireSignatureConfirmation" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        9.2 Wss11 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <!--
+	10. WS-Trust Options
+	-->
+  <xs:element name="Trust13" type="tns:NestedPolicyType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        10.1 Trust13 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+
+  <xs:element name="MustSupportClientChallenge" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        10.1 Trust13 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MustSupportServerChallenge" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        10.1 Trust13 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireClientEntropy" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        10.1 Trust13 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireServerEntropy" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        10.1 Trust13 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="MustSupportIssuedTokens" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        10.1 Trust13 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireRequestSecurityTokenCollection" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        10.1 Trust13 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  <xs:element name="RequireAppiesTo" type="tns:QNameAssertionType">
+    <xs:annotation>
+      <xs:documentation xml:lang="en">
+        10.1 Trust13 Assertion
+      </xs:documentation>
+    </xs:annotation>
+  </xs:element>
+  
+</xs:schema>`,
+};
diff --git a/packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts b/packages/cli/src/sso.ee/saml/schema/xenc-schema.xsd.ts
similarity index 96%
rename from packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts
rename to packages/cli/src/sso.ee/saml/schema/xenc-schema.xsd.ts
index de9d3ca34e..1630937858 100644
--- a/packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts
+++ b/packages/cli/src/sso.ee/saml/schema/xenc-schema.xsd.ts
@@ -1,4 +1,8 @@
-export const xsdXenc = `<?xml version="1.0" encoding="utf-8"?>
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'xenc-schema.xsd',
+	contents: `<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE schema  PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
  "http://www.w3.org/2001/XMLSchema.dtd"
  [
@@ -142,4 +146,5 @@ export const xsdXenc = `<?xml version="1.0" encoding="utf-8"?>
       <anyAttribute namespace="http://www.w3.org/XML/1998/namespace"/>
     </complexType>
 
-</schema>`;
+</schema>`,
+};
diff --git a/packages/cli/src/sso/saml/schema/xml.xsd.ts b/packages/cli/src/sso.ee/saml/schema/xml.xsd.ts
similarity index 96%
rename from packages/cli/src/sso/saml/schema/xml.xsd.ts
rename to packages/cli/src/sso.ee/saml/schema/xml.xsd.ts
index 4487356ea5..d07b490c2e 100644
--- a/packages/cli/src/sso/saml/schema/xml.xsd.ts
+++ b/packages/cli/src/sso.ee/saml/schema/xml.xsd.ts
@@ -1,4 +1,8 @@
-export const xsdXml = `<?xml version='1.0'?>
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'xml.xsd',
+	contents: `<?xml version='1.0'?>
 <!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
 <xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
 
@@ -114,4 +118,5 @@ export const xsdXml = `<?xml version='1.0'?>
   <xs:attribute ref="xml:space"/>
  </xs:attributeGroup>
 
-</xs:schema>`;
+</xs:schema>`,
+};
diff --git a/packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts b/packages/cli/src/sso.ee/saml/schema/xmldsig-core-schema.xsd.ts
similarity index 98%
rename from packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts
rename to packages/cli/src/sso.ee/saml/schema/xmldsig-core-schema.xsd.ts
index 9cd615b616..ea0014b889 100644
--- a/packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts
+++ b/packages/cli/src/sso.ee/saml/schema/xmldsig-core-schema.xsd.ts
@@ -1,4 +1,8 @@
-export const xsdXmldsigCore = `<?xml version="1.0" encoding="utf-8"?>
+import type { XMLFileInfo } from 'xmllint-wasm';
+
+export const xmlFileInfo: XMLFileInfo = {
+	fileName: 'xmldsig-core-schema.xsd',
+	contents: `<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE schema
   PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
  [
@@ -315,4 +319,5 @@ export const xsdXmldsigCore = `<?xml version="1.0" encoding="utf-8"?>
 
 <!-- End Signature -->
 
-</schema>`;
+</schema>`,
+};
diff --git a/packages/cli/src/sso/saml/service-provider.ee.ts b/packages/cli/src/sso.ee/saml/service-provider.ee.ts
similarity index 94%
rename from packages/cli/src/sso/saml/service-provider.ee.ts
rename to packages/cli/src/sso.ee/saml/service-provider.ee.ts
index 2e6511df09..2fa82eda0a 100644
--- a/packages/cli/src/sso/saml/service-provider.ee.ts
+++ b/packages/cli/src/sso.ee/saml/service-provider.ee.ts
@@ -1,10 +1,9 @@
+import type { SamlPreferences } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import type { ServiceProviderInstance } from 'samlify';
-import { Container } from 'typedi';
 
 import { UrlService } from '@/services/url.service';
 
-import type { SamlPreferences } from './types/saml-preferences';
-
 let serviceProviderInstance: ServiceProviderInstance | undefined;
 
 export function getServiceProviderEntityId(): string {
diff --git a/packages/cli/src/sso.ee/saml/types.ts b/packages/cli/src/sso.ee/saml/types.ts
new file mode 100644
index 0000000000..35687777b1
--- /dev/null
+++ b/packages/cli/src/sso.ee/saml/types.ts
@@ -0,0 +1,5 @@
+import type { SamlPreferences } from '@n8n/api-types';
+
+export type SamlLoginBinding = SamlPreferences['loginBinding'];
+export type SamlAttributeMapping = NonNullable<SamlPreferences['mapping']>;
+export type SamlUserAttributes = SamlAttributeMapping;
diff --git a/packages/cli/src/sso/saml/views/init-sso-post.ts b/packages/cli/src/sso.ee/saml/views/init-sso-post.ts
similarity index 100%
rename from packages/cli/src/sso/saml/views/init-sso-post.ts
rename to packages/cli/src/sso.ee/saml/views/init-sso-post.ts
diff --git a/packages/cli/src/sso/sso-helpers.ts b/packages/cli/src/sso.ee/sso-helpers.ts
similarity index 88%
rename from packages/cli/src/sso/sso-helpers.ts
rename to packages/cli/src/sso.ee/sso-helpers.ts
index 925c7a1eb1..d69d9bc3a8 100644
--- a/packages/cli/src/sso/sso-helpers.ts
+++ b/packages/cli/src/sso.ee/sso-helpers.ts
@@ -1,14 +1,14 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import config from '@/config';
 import type { AuthProviderType } from '@/databases/entities/auth-identity';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 
 /**
- * Only one authentication method can be active at a time. This function sets the current authentication method
- * and saves it to the database.
- * SSO methods should only switch to email and then to another method. Email can switch to any method.
- * @param authenticationMethod
+ * Only one authentication method can be active at a time. This function sets
+ * the current authentication method and saves it to the database.
+ * SSO methods should only switch to email and then to another method. Email
+ * can switch to any method.
  */
 export async function setCurrentAuthenticationMethod(
 	authenticationMethod: AuthProviderType,
diff --git a/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts b/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts
deleted file mode 100644
index 5dda04dc18..0000000000
--- a/packages/cli/src/sso/saml/__tests__/saml.service.ee.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import type express from 'express';
-import { mock } from 'jest-mock-extended';
-import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
-
-import { Logger } from '@/logging/logger.service';
-import { UrlService } from '@/services/url.service';
-import * as samlHelpers from '@/sso/saml/saml-helpers';
-import { SamlService } from '@/sso/saml/saml.service.ee';
-import { mockInstance } from '@test/mocking';
-
-describe('SamlService', () => {
-	const logger = mockInstance(Logger);
-	const urlService = mockInstance(UrlService);
-	const samlService = new SamlService(logger, urlService);
-
-	describe('getAttributesFromLoginResponse', () => {
-		test('throws when any attribute is missing', async () => {
-			//
-			// ARRANGE
-			//
-			jest
-				.spyOn(samlService, 'getIdentityProviderInstance')
-				.mockReturnValue(mock<IdentityProviderInstance>());
-
-			const serviceProviderInstance = mock<ServiceProviderInstance>();
-			serviceProviderInstance.parseLoginResponse.mockResolvedValue({
-				samlContent: '',
-				extract: {},
-			});
-			jest
-				.spyOn(samlService, 'getServiceProviderInstance')
-				.mockReturnValue(serviceProviderInstance);
-
-			jest.spyOn(samlHelpers, 'getMappedSamlAttributesFromFlowResult').mockReturnValue({
-				attributes: {} as never,
-				missingAttributes: [
-					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
-					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname',
-					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname',
-					'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn',
-				],
-			});
-
-			//
-			// ACT & ASSERT
-			//
-			await expect(
-				samlService.getAttributesFromLoginResponse(mock<express.Request>(), 'post'),
-			).rejects.toThrowError(
-				'SAML Authentication failed. Invalid SAML response (missing attributes: http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname, http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn).',
-			);
-		});
-	});
-});
diff --git a/packages/cli/src/sso/saml/saml-validator.ts b/packages/cli/src/sso/saml/saml-validator.ts
deleted file mode 100644
index 06a93cc4fb..0000000000
--- a/packages/cli/src/sso/saml/saml-validator.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import { Container } from 'typedi';
-import type { XMLFileInfo } from 'xmllint-wasm';
-
-import { Logger } from '@/logging/logger.service';
-
-let xml: XMLFileInfo;
-let xmldsigCore: XMLFileInfo;
-let xmlXenc: XMLFileInfo;
-let xmlMetadata: XMLFileInfo;
-let xmlAssertion: XMLFileInfo;
-let xmlProtocol: XMLFileInfo;
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
-let xmllintWasm: typeof import('xmllint-wasm') | undefined;
-
-// dynamically load schema files
-async function loadSchemas(): Promise<void> {
-	if (!xml || xml.contents === '') {
-		Container.get(Logger).debug('Loading XML schema files for SAML validation into memory');
-		const f = await import('./schema/xml.xsd');
-		xml = {
-			fileName: 'xml.xsd',
-			contents: f.xsdXml,
-		};
-	}
-	if (!xmldsigCore || xmldsigCore.contents === '') {
-		const f = await import('./schema/xmldsig-core-schema.xsd');
-		xmldsigCore = {
-			fileName: 'xmldsig-core-schema.xsd',
-			contents: f.xsdXmldsigCore,
-		};
-	}
-	if (!xmlXenc || xmlXenc.contents === '') {
-		const f = await import('./schema/xenc-schema.xsd');
-		xmlXenc = {
-			fileName: 'xenc-schema.xsd',
-			contents: f.xsdXenc,
-		};
-	}
-	if (!xmlMetadata || xmlMetadata.contents === '') {
-		const f = await import('./schema/saml-schema-metadata-2.0.xsd');
-		xmlMetadata = {
-			fileName: 'saml-schema-metadata-2.0.xsd',
-			contents: f.xsdSamlSchemaMetadata20,
-		};
-	}
-	if (!xmlAssertion || xmlAssertion.contents === '') {
-		const f = await import('./schema/saml-schema-assertion-2.0.xsd');
-		xmlAssertion = {
-			fileName: 'saml-schema-assertion-2.0.xsd',
-			contents: f.xsdSamlSchemaAssertion20,
-		};
-	}
-	if (!xmlProtocol || xmlProtocol.contents === '') {
-		const f = await import('./schema/saml-schema-protocol-2.0.xsd');
-		xmlProtocol = {
-			fileName: 'saml-schema-protocol-2.0.xsd',
-			contents: f.xsdSamlSchemaProtocol20,
-		};
-	}
-}
-
-// dynamically load xmllint-wasm
-async function loadXmllintWasm(): Promise<void> {
-	if (xmllintWasm === undefined) {
-		Container.get(Logger).debug('Loading xmllint-wasm library into memory');
-		xmllintWasm = await import('xmllint-wasm');
-	}
-}
-
-export async function validateMetadata(metadata: string): Promise<boolean> {
-	const logger = Container.get(Logger);
-	try {
-		await loadXmllintWasm();
-		await loadSchemas();
-		const validationResult = await xmllintWasm?.validateXML({
-			xml: [
-				{
-					fileName: 'metadata.xml',
-					contents: metadata,
-				},
-			],
-			extension: 'schema',
-			schema: [xmlMetadata],
-			preload: [xmlProtocol, xmlAssertion, xmldsigCore, xmlXenc, xml],
-		});
-		if (validationResult?.valid) {
-			logger.debug('SAML Metadata is valid');
-			return true;
-		} else {
-			logger.warn('SAML Validate Metadata: Invalid metadata');
-			logger.warn(
-				validationResult
-					? validationResult.errors
-							.map((error) => `${error.message} - ${error.rawMessage}`)
-							.join('\n')
-					: '',
-			);
-		}
-	} catch (error) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		logger.warn(error);
-	}
-	return false;
-}
-
-export async function validateResponse(response: string): Promise<boolean> {
-	const logger = Container.get(Logger);
-	try {
-		await loadXmllintWasm();
-		await loadSchemas();
-		const validationResult = await xmllintWasm?.validateXML({
-			xml: [
-				{
-					fileName: 'response.xml',
-					contents: response,
-				},
-			],
-			extension: 'schema',
-			schema: [xmlProtocol],
-			preload: [xmlMetadata, xmlAssertion, xmldsigCore, xmlXenc, xml],
-		});
-		if (validationResult?.valid) {
-			logger.debug('SAML Response is valid');
-			return true;
-		} else {
-			logger.warn('SAML Validate Response: Failed');
-			logger.warn(
-				validationResult
-					? validationResult.errors
-							.map((error) => `${error.message} - ${error.rawMessage}`)
-							.join('\n')
-					: '',
-			);
-		}
-	} catch (error) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-		logger.warn(error);
-	}
-	return false;
-}
diff --git a/packages/cli/src/sso/saml/types/index.ts b/packages/cli/src/sso/saml/types/index.ts
deleted file mode 100644
index 560f7003f8..0000000000
--- a/packages/cli/src/sso/saml/types/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export type SamlLoginBinding = 'post' | 'redirect';
diff --git a/packages/cli/src/sso/saml/types/requests.ts b/packages/cli/src/sso/saml/types/requests.ts
deleted file mode 100644
index 69fb89a1eb..0000000000
--- a/packages/cli/src/sso/saml/types/requests.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import type { AuthenticatedRequest, AuthlessRequest } from '@/requests';
-
-import type { SamlPreferences } from './saml-preferences';
-
-export declare namespace SamlConfiguration {
-	type Update = AuthenticatedRequest<{}, {}, SamlPreferences, {}>;
-	type Toggle = AuthenticatedRequest<{}, {}, { loginEnabled: boolean }, {}>;
-
-	type AcsRequest = AuthlessRequest<
-		{},
-		{},
-		{
-			RelayState?: string;
-		},
-		{}
-	>;
-}
diff --git a/packages/cli/src/sso/saml/types/saml-attribute-mapping.ts b/packages/cli/src/sso/saml/types/saml-attribute-mapping.ts
deleted file mode 100644
index af7dd76e23..0000000000
--- a/packages/cli/src/sso/saml/types/saml-attribute-mapping.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface SamlAttributeMapping {
-	email: string;
-	firstName: string;
-	lastName: string;
-	userPrincipalName: string;
-}
diff --git a/packages/cli/src/sso/saml/types/saml-preferences.ts b/packages/cli/src/sso/saml/types/saml-preferences.ts
deleted file mode 100644
index 1231684360..0000000000
--- a/packages/cli/src/sso/saml/types/saml-preferences.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { IsBoolean, IsObject, IsOptional, IsString } from 'class-validator';
-import { SignatureConfig } from 'samlify/types/src/types';
-
-import { SamlLoginBinding } from '.';
-import { SamlAttributeMapping } from './saml-attribute-mapping';
-
-export class SamlPreferences {
-	@IsObject()
-	@IsOptional()
-	mapping?: SamlAttributeMapping;
-
-	@IsString()
-	@IsOptional()
-	metadata?: string;
-
-	@IsString()
-	@IsOptional()
-	metadataUrl?: string;
-
-	@IsBoolean()
-	@IsOptional()
-	ignoreSSL?: boolean = false;
-
-	@IsString()
-	@IsOptional()
-	loginBinding?: SamlLoginBinding = 'redirect';
-
-	@IsBoolean()
-	@IsOptional()
-	loginEnabled?: boolean;
-
-	@IsString()
-	@IsOptional()
-	loginLabel?: string;
-
-	@IsBoolean()
-	@IsOptional()
-	authnRequestsSigned?: boolean = false;
-
-	@IsBoolean()
-	@IsOptional()
-	wantAssertionsSigned?: boolean = true;
-
-	@IsBoolean()
-	@IsOptional()
-	wantMessageSigned?: boolean = true;
-
-	@IsString()
-	@IsOptional()
-	acsBinding?: SamlLoginBinding = 'post';
-
-	@IsObject()
-	@IsOptional()
-	signatureConfig?: SignatureConfig = {
-		prefix: 'ds',
-		location: {
-			reference: '/samlp:Response/saml:Issuer',
-			action: 'after',
-		},
-	};
-
-	@IsString()
-	@IsOptional()
-	relayState?: string = '';
-}
diff --git a/packages/cli/src/sso/saml/types/saml-user-attributes.ts b/packages/cli/src/sso/saml/types/saml-user-attributes.ts
deleted file mode 100644
index fa3c849f65..0000000000
--- a/packages/cli/src/sso/saml/types/saml-user-attributes.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface SamlUserAttributes {
-	email: string;
-	firstName: string;
-	lastName: string;
-	userPrincipalName: string;
-}
diff --git a/packages/cli/src/subworkflows/subworkflow-policy-checker.service.ts b/packages/cli/src/subworkflows/subworkflow-policy-checker.service.ts
index cf9b122e72..218c083c54 100644
--- a/packages/cli/src/subworkflows/subworkflow-policy-checker.service.ts
+++ b/packages/cli/src/subworkflows/subworkflow-policy-checker.service.ts
@@ -1,11 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import { type Workflow, type INode, type WorkflowSettings } from 'n8n-workflow';
-import { strict as assert } from 'node:assert';
-import { Service } from 'typedi';
 
 import type { Project } from '@/databases/entities/project';
 import { SubworkflowPolicyDenialError } from '@/errors/subworkflow-policy-denial.error';
-import { Logger } from '@/logging/logger.service';
 import { AccessService } from '@/services/access.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { UrlService } from '@/services/url.service';
@@ -68,11 +67,9 @@ export class SubworkflowPolicyChecker {
 
 		const owner = await this.ownershipService.getPersonalProjectOwnerCached(subworkflowProject.id);
 
-		assert(owner !== null); // only `null` if not personal
-
 		return {
 			hasReadAccess,
-			ownerName: owner.firstName + ' ' + owner.lastName,
+			ownerName: owner ? owner.firstName + ' ' + owner.lastName : 'No owner (team project)',
 		};
 	}
 
diff --git a/packages/cli/src/task-runners/__tests__/forward-to-logger.test.ts b/packages/cli/src/task-runners/__tests__/forward-to-logger.test.ts
new file mode 100644
index 0000000000..64352ab54d
--- /dev/null
+++ b/packages/cli/src/task-runners/__tests__/forward-to-logger.test.ts
@@ -0,0 +1,114 @@
+import type { Logger } from 'n8n-workflow';
+import { Readable } from 'stream';
+
+import { forwardToLogger } from '../forward-to-logger';
+
+describe('forwardToLogger', () => {
+	let logger: Logger;
+	let stdout: Readable;
+	let stderr: Readable;
+
+	beforeEach(() => {
+		logger = {
+			info: jest.fn(),
+			error: jest.fn(),
+		} as unknown as Logger;
+
+		stdout = new Readable({ read() {} });
+		stderr = new Readable({ read() {} });
+
+		jest.resetAllMocks();
+	});
+
+	const pushToStdout = async (data: string) => {
+		stdout.push(Buffer.from(data));
+		stdout.push(null);
+		// Wait for the next tick to allow the event loop to process the data
+		await new Promise((resolve) => setImmediate(resolve));
+	};
+
+	const pushToStderr = async (data: string) => {
+		stderr.push(Buffer.from(data));
+		stderr.push(null);
+		// Wait for the next tick to allow the event loop to process the data
+		await new Promise((resolve) => setImmediate(resolve));
+	};
+
+	it('should forward stdout data to logger.info', async () => {
+		forwardToLogger(logger, { stdout, stderr: null });
+
+		await pushToStdout('Test stdout message');
+
+		await new Promise((resolve) => setImmediate(resolve));
+
+		expect(logger.info).toHaveBeenCalledWith('Test stdout message');
+	});
+
+	it('should forward stderr data to logger.error', async () => {
+		forwardToLogger(logger, { stdout: null, stderr });
+
+		await pushToStderr('Test stderr message');
+
+		expect(logger.error).toHaveBeenCalledWith('Test stderr message');
+	});
+
+	it('should remove trailing newline from stdout', async () => {
+		forwardToLogger(logger, { stdout, stderr: null });
+
+		await pushToStdout('Test stdout message\n');
+
+		expect(logger.info).toHaveBeenCalledWith('Test stdout message');
+	});
+
+	it('should remove trailing newline from stderr', async () => {
+		forwardToLogger(logger, { stdout: null, stderr });
+
+		await pushToStderr('Test stderr message\n');
+
+		expect(logger.error).toHaveBeenCalledWith('Test stderr message');
+	});
+
+	it('should forward stderr data to logger.error', async () => {
+		forwardToLogger(logger, { stdout: null, stderr });
+
+		await pushToStderr('Test stderr message');
+
+		expect(logger.error).toHaveBeenCalledWith('Test stderr message');
+	});
+
+	it('should include prefix if provided for stdout', async () => {
+		const prefix = '[PREFIX]';
+		forwardToLogger(logger, { stdout, stderr: null }, prefix);
+
+		await pushToStdout('Message with prefix');
+
+		expect(logger.info).toHaveBeenCalledWith('[PREFIX] Message with prefix');
+	});
+
+	it('should include prefix if provided for stderr', async () => {
+		const prefix = '[PREFIX]';
+		forwardToLogger(logger, { stdout: null, stderr }, prefix);
+
+		await pushToStderr('Error message with prefix');
+
+		expect(logger.error).toHaveBeenCalledWith('[PREFIX] Error message with prefix');
+	});
+
+	it('should make sure there is no duplicate space after prefix for stdout', async () => {
+		const prefix = '[PREFIX] ';
+		forwardToLogger(logger, { stdout, stderr: null }, prefix);
+
+		await pushToStdout('Message with prefix');
+
+		expect(logger.info).toHaveBeenCalledWith('[PREFIX] Message with prefix');
+	});
+
+	it('should make sure there is no duplicate space after prefix for stderr', async () => {
+		const prefix = '[PREFIX] ';
+		forwardToLogger(logger, { stdout: null, stderr }, prefix);
+
+		await pushToStderr('Error message with prefix');
+
+		expect(logger.error).toHaveBeenCalledWith('[PREFIX] Error message with prefix');
+	});
+});
diff --git a/packages/cli/src/task-runners/__tests__/node-process-oom-detector.test.ts b/packages/cli/src/task-runners/__tests__/node-process-oom-detector.test.ts
new file mode 100644
index 0000000000..5b619e0e08
--- /dev/null
+++ b/packages/cli/src/task-runners/__tests__/node-process-oom-detector.test.ts
@@ -0,0 +1,43 @@
+import { spawn } from 'node:child_process';
+
+import { NodeProcessOomDetector } from '../node-process-oom-detector';
+
+describe('NodeProcessOomDetector', () => {
+	test('should detect an out-of-memory error in a monitored process', (done) => {
+		const childProcess = spawn(process.execPath, [
+			// set low memory limit
+			'--max-old-space-size=20',
+			'-e',
+			`
+      const data = [];
+			// fill memory until it crashes
+      while (true) data.push(Array.from({ length: 10_000 }).map(() => Math.random().toString()).join());
+      `,
+		]);
+
+		const detector = new NodeProcessOomDetector(childProcess);
+
+		childProcess.on('exit', (code) => {
+			expect(detector.didProcessOom).toBe(true);
+			expect(code).not.toBe(0);
+			done();
+		});
+	});
+
+	test('should not detect an out-of-memory error in a process that exits normally', (done) => {
+		const childProcess = spawn(process.execPath, [
+			'-e',
+			`
+      console.log("Hello, World!");
+      `,
+		]);
+
+		const detector = new NodeProcessOomDetector(childProcess);
+
+		childProcess.on('exit', (code) => {
+			expect(detector.didProcessOom).toBe(false);
+			expect(code).toBe(0);
+			done();
+		});
+	});
+});
diff --git a/packages/cli/src/task-runners/__tests__/sliding-window-signal.test.ts b/packages/cli/src/task-runners/__tests__/sliding-window-signal.test.ts
new file mode 100644
index 0000000000..56462d186a
--- /dev/null
+++ b/packages/cli/src/task-runners/__tests__/sliding-window-signal.test.ts
@@ -0,0 +1,71 @@
+import { TypedEmitter } from '../../typed-emitter';
+import { SlidingWindowSignal } from '../sliding-window-signal';
+
+type TestEventMap = {
+	testEvent: string;
+};
+
+describe('SlidingWindowSignal', () => {
+	let eventEmitter: TypedEmitter<TestEventMap>;
+	let slidingWindowSignal: SlidingWindowSignal<TestEventMap, 'testEvent'>;
+
+	beforeEach(() => {
+		eventEmitter = new TypedEmitter<TestEventMap>();
+		slidingWindowSignal = new SlidingWindowSignal(eventEmitter, 'testEvent', {
+			windowSizeInMs: 500,
+		});
+	});
+
+	afterEach(() => {
+		jest.clearAllTimers();
+		jest.clearAllMocks();
+	});
+
+	it('should return the last signal if within window size', async () => {
+		const signal = 'testSignal';
+		eventEmitter.emit('testEvent', signal);
+
+		const receivedSignal = await slidingWindowSignal.getSignal();
+
+		expect(receivedSignal).toBe(signal);
+	});
+
+	it('should return null if there is no signal within the window', async () => {
+		jest.useFakeTimers();
+		const receivedSignalPromise = slidingWindowSignal.getSignal();
+		jest.advanceTimersByTime(600);
+		const receivedSignal = await receivedSignalPromise;
+
+		expect(receivedSignal).toBeNull();
+		jest.useRealTimers();
+	});
+
+	it('should return null if "exit" event is not emitted before timeout', async () => {
+		const signal = 'testSignal';
+		jest.useFakeTimers();
+		const receivedSignalPromise = slidingWindowSignal.getSignal();
+		jest.advanceTimersByTime(600);
+		eventEmitter.emit('testEvent', signal);
+
+		const receivedSignal = await receivedSignalPromise;
+		expect(receivedSignal).toBeNull();
+		jest.useRealTimers();
+	});
+
+	it('should return the signal emitted on "exit" event before timeout', async () => {
+		jest.useFakeTimers();
+		const receivedSignalPromise = slidingWindowSignal.getSignal();
+
+		// Emit 'exit' with a signal before timeout
+		const exitSignal = 'exitSignal';
+		eventEmitter.emit('testEvent', exitSignal);
+
+		// Advance timers enough to go outside the timeout window
+		jest.advanceTimersByTime(600);
+
+		const receivedSignal = await receivedSignalPromise;
+		expect(receivedSignal).toBe(exitSignal);
+
+		jest.useRealTimers();
+	});
+});
diff --git a/packages/cli/src/runners/__tests__/task-broker.test.ts b/packages/cli/src/task-runners/__tests__/task-broker.test.ts
similarity index 58%
rename from packages/cli/src/runners/__tests__/task-broker.test.ts
rename to packages/cli/src/task-runners/__tests__/task-broker.test.ts
index 4a226c5b98..ced7e1c07e 100644
--- a/packages/cli/src/runners/__tests__/task-broker.test.ts
+++ b/packages/cli/src/task-runners/__tests__/task-broker.test.ts
@@ -1,9 +1,15 @@
+import type { TaskRunnersConfig } from '@n8n/config';
+import type { RunnerMessage, TaskResultData } from '@n8n/task-runner';
 import { mock } from 'jest-mock-extended';
+import { ApplicationError, type INodeTypeBaseDescription } from 'n8n-workflow';
+
+import { Time } from '@/constants';
 
 import { TaskRejectError } from '../errors';
-import type { RunnerMessage, TaskResultData } from '../runner-types';
+import { TaskRunnerTimeoutError } from '../errors/task-runner-timeout.error';
 import { TaskBroker } from '../task-broker.service';
 import type { TaskOffer, TaskRequest, TaskRunner } from '../task-broker.service';
+import type { TaskRunnerLifecycleEvents } from '../task-runner-lifecycle-events';
 
 const createValidUntil = (ms: number) => process.hrtime.bigint() + BigInt(ms * 1_000_000);
 
@@ -11,7 +17,7 @@ describe('TaskBroker', () => {
 	let taskBroker: TaskBroker;
 
 	beforeEach(() => {
-		taskBroker = new TaskBroker(mock(), mock());
+		taskBroker = new TaskBroker(mock(), mock(), mock());
 		jest.restoreAllMocks();
 	});
 
@@ -50,6 +56,35 @@ describe('TaskBroker', () => {
 			expect(offers).toHaveLength(1);
 			expect(offers[0]).toEqual(validOffer);
 		});
+
+		it('should not expire non-expiring task offers', () => {
+			const nonExpiringOffer: TaskOffer = {
+				offerId: 'nonExpiring',
+				runnerId: 'runner1',
+				taskType: 'taskType1',
+				validFor: -1,
+				validUntil: 0n, // sentinel value for non-expiring offer
+			};
+
+			const expiredOffer: TaskOffer = {
+				offerId: 'expired',
+				runnerId: 'runner2',
+				taskType: 'taskType1',
+				validFor: 1000,
+				validUntil: createValidUntil(-1000), // 1 second in the past
+			};
+
+			taskBroker.setPendingTaskOffers([
+				nonExpiringOffer, // will not be removed
+				expiredOffer, // will be removed
+			]);
+
+			taskBroker.expireTasks();
+
+			const offers = taskBroker.getPendingTaskOffers();
+			expect(offers).toHaveLength(1);
+			expect(offers[0]).toEqual(nonExpiringOffer);
+		});
 	});
 
 	describe('registerRunner', () => {
@@ -76,13 +111,6 @@ describe('TaskBroker', () => {
 			const messageCallback = jest.fn();
 
 			taskBroker.registerRunner(runner, messageCallback);
-
-			expect(messageCallback).toBeCalledWith({
-				type: 'broker:nodetypes',
-				// We're mocking the node types service, so this will
-				// be undefined.
-				nodeType: undefined,
-			});
 		});
 	});
 
@@ -110,7 +138,7 @@ describe('TaskBroker', () => {
 			const messageCallback = jest.fn();
 
 			taskBroker.registerRunner(runner, messageCallback);
-			taskBroker.deregisterRunner(runnerId);
+			taskBroker.deregisterRunner(runnerId, new Error());
 
 			const knownRunners = taskBroker.getKnownRunners();
 			const runnerIds = Object.keys(knownRunners);
@@ -138,7 +166,7 @@ describe('TaskBroker', () => {
 				validFor: 1000,
 				validUntil: createValidUntil(1000),
 			});
-			taskBroker.deregisterRunner(runnerId);
+			taskBroker.deregisterRunner(runnerId, new Error());
 
 			const offers = taskBroker.getPendingTaskOffers();
 			expect(offers).toHaveLength(1);
@@ -161,10 +189,14 @@ describe('TaskBroker', () => {
 				[taskId]: { id: taskId, requesterId: 'requester1', runnerId, taskType: 'mock' },
 				task2: { id: 'task2', requesterId: 'requester1', runnerId: 'runner2', taskType: 'mock' },
 			});
-			taskBroker.deregisterRunner(runnerId);
+			const error = new Error('error');
+			taskBroker.deregisterRunner(runnerId, error);
 
-			expect(failSpy).toBeCalledWith(taskId, `The Task Runner (${runnerId}) has disconnected`);
-			expect(rejectSpy).toBeCalledWith(taskId, `The Task Runner (${runnerId}) has disconnected`);
+			expect(failSpy).toBeCalledWith(taskId, error);
+			expect(rejectSpy).toBeCalledWith(
+				taskId,
+				`The Task Runner (${runnerId}) has disconnected: error`,
+			);
 		});
 	});
 
@@ -377,7 +409,7 @@ describe('TaskBroker', () => {
 			const runnerId = 'runner1';
 			const taskId = 'task1';
 
-			const message: RunnerMessage.ToN8n.TaskAccepted = {
+			const message: RunnerMessage.ToBroker.TaskAccepted = {
 				type: 'runner:taskaccepted',
 				taskId,
 			};
@@ -402,7 +434,7 @@ describe('TaskBroker', () => {
 			const taskId = 'task1';
 			const rejectionReason = 'Task execution failed';
 
-			const message: RunnerMessage.ToN8n.TaskRejected = {
+			const message: RunnerMessage.ToBroker.TaskRejected = {
 				type: 'runner:taskrejected',
 				taskId,
 				reason: rejectionReason,
@@ -429,7 +461,7 @@ describe('TaskBroker', () => {
 			const requesterId = 'requester1';
 			const data = mock<TaskResultData>();
 
-			const message: RunnerMessage.ToN8n.TaskDone = {
+			const message: RunnerMessage.ToBroker.TaskDone = {
 				type: 'runner:taskdone',
 				taskId,
 				data,
@@ -460,7 +492,7 @@ describe('TaskBroker', () => {
 			const requesterId = 'requester1';
 			const errorMessage = 'Task execution failed';
 
-			const message: RunnerMessage.ToN8n.TaskError = {
+			const message: RunnerMessage.ToBroker.TaskError = {
 				type: 'runner:taskerror',
 				taskId,
 				error: errorMessage,
@@ -490,15 +522,20 @@ describe('TaskBroker', () => {
 			const taskId = 'task1';
 			const requesterId = 'requester1';
 			const requestId = 'request1';
-			const requestType = 'input';
-			const param = 'test_param';
+			const requestParams: RunnerMessage.ToBroker.TaskDataRequest['requestParams'] = {
+				dataOfNodes: 'all',
+				env: true,
+				input: {
+					include: true,
+				},
+				prevNode: true,
+			};
 
-			const message: RunnerMessage.ToN8n.TaskDataRequest = {
+			const message: RunnerMessage.ToBroker.TaskDataRequest = {
 				type: 'runner:taskdatarequest',
 				taskId,
 				requestId,
-				requestType,
-				param,
+				requestParams,
 			};
 
 			const requesterMessageCallback = jest.fn();
@@ -515,8 +552,7 @@ describe('TaskBroker', () => {
 				type: 'broker:taskdatarequest',
 				taskId,
 				requestId,
-				requestType,
-				param,
+				requestParams,
 			});
 		});
 
@@ -528,7 +564,7 @@ describe('TaskBroker', () => {
 			const rpcName = 'helpers.httpRequestWithAuthentication';
 			const rpcParams = ['param1', 'param2'];
 
-			const message: RunnerMessage.ToN8n.RPC = {
+			const message: RunnerMessage.ToBroker.RPC = {
 				type: 'runner:rpc',
 				taskId,
 				callId,
@@ -554,5 +590,300 @@ describe('TaskBroker', () => {
 				params: rpcParams,
 			});
 		});
+
+		it('should handle `runner:nodetypesrequest` message', async () => {
+			const runnerId = 'runner1';
+			const taskId = 'task1';
+			const requesterId = 'requester1';
+			const requestId = 'request1';
+			const requestParams = [
+				{
+					name: 'n8n-nodes-base.someNode',
+					version: 1,
+				},
+			];
+
+			const message: RunnerMessage.ToBroker.NodeTypesRequest = {
+				type: 'runner:nodetypesrequest',
+				taskId,
+				requestId,
+				requestParams,
+			};
+
+			const requesterMessageCallback = jest.fn();
+
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+			taskBroker.registerRequester(requesterId, requesterMessageCallback);
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			expect(requesterMessageCallback).toHaveBeenCalledWith({
+				type: 'broker:nodetypesrequest',
+				taskId,
+				requestId,
+				requestParams,
+			});
+		});
+
+		it('should handle `runner:taskoffer` message with expiring offer', async () => {
+			const runnerId = 'runner1';
+			const validFor = 1000; // 1 second
+			const message: RunnerMessage.ToBroker.TaskOffer = {
+				type: 'runner:taskoffer',
+				offerId: 'offer1',
+				taskType: 'taskType1',
+				validFor,
+			};
+
+			const beforeTime = process.hrtime.bigint();
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			const afterTime = process.hrtime.bigint();
+
+			const offers = taskBroker.getPendingTaskOffers();
+			expect(offers).toHaveLength(1);
+
+			const expectedMinValidUntil = beforeTime + BigInt(validFor * 1_000_000);
+			const expectedMaxValidUntil = afterTime + BigInt(validFor * 1_000_000);
+
+			expect(offers[0].validUntil).toBeGreaterThanOrEqual(expectedMinValidUntil);
+			expect(offers[0].validUntil).toBeLessThanOrEqual(expectedMaxValidUntil);
+			expect(offers[0]).toEqual(
+				expect.objectContaining({
+					runnerId,
+					taskType: message.taskType,
+					offerId: message.offerId,
+					validFor,
+				}),
+			);
+		});
+
+		it('should handle `runner:taskoffer` message with non-expiring offer', async () => {
+			const runnerId = 'runner1';
+			const message: RunnerMessage.ToBroker.TaskOffer = {
+				type: 'runner:taskoffer',
+				offerId: 'offer1',
+				taskType: 'taskType1',
+				validFor: -1,
+			};
+
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), jest.fn());
+
+			await taskBroker.onRunnerMessage(runnerId, message);
+
+			const offers = taskBroker.getPendingTaskOffers();
+
+			expect(offers).toHaveLength(1);
+			expect(offers[0]).toEqual({
+				runnerId,
+				taskType: message.taskType,
+				offerId: message.offerId,
+				validFor: -1,
+				validUntil: 0n,
+			});
+		});
+	});
+
+	describe('onRequesterMessage', () => {
+		it('should handle `requester:nodetypesresponse` message', async () => {
+			const runnerId = 'runner1';
+			const taskId = 'task1';
+			const requesterId = 'requester1';
+			const requestId = 'request1';
+			const nodeTypes = [mock<INodeTypeBaseDescription>(), mock<INodeTypeBaseDescription>()];
+
+			const runnerMessageCallback = jest.fn();
+
+			taskBroker.registerRunner(mock<TaskRunner>({ id: runnerId }), runnerMessageCallback);
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+
+			await taskBroker.handleRequesterNodeTypesResponse(taskId, requestId, nodeTypes);
+
+			expect(runnerMessageCallback).toHaveBeenCalledWith({
+				type: 'broker:nodetypes',
+				taskId,
+				requestId,
+				nodeTypes,
+			});
+		});
+	});
+
+	describe('task timeouts', () => {
+		let taskBroker: TaskBroker;
+		let config: TaskRunnersConfig;
+		let runnerLifecycleEvents = mock<TaskRunnerLifecycleEvents>();
+
+		beforeAll(() => {
+			jest.useFakeTimers();
+			config = mock<TaskRunnersConfig>({ taskTimeout: 30, mode: 'internal' });
+			taskBroker = new TaskBroker(mock(), config, runnerLifecycleEvents);
+		});
+
+		afterAll(() => {
+			jest.useRealTimers();
+		});
+
+		it('on sending task, we should set up task timeout', async () => {
+			jest.spyOn(global, 'setTimeout');
+
+			const taskId = 'task1';
+			const runnerId = 'runner1';
+			const runner = mock<TaskRunner>({ id: runnerId });
+			const runnerMessageCallback = jest.fn();
+
+			taskBroker.registerRunner(runner, runnerMessageCallback);
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId: 'requester1', taskType: 'test' },
+			});
+
+			await taskBroker.sendTaskSettings(taskId, {});
+
+			expect(setTimeout).toHaveBeenCalledWith(
+				expect.any(Function),
+				config.taskTimeout * Time.seconds.toMilliseconds,
+			);
+		});
+
+		it('on task completion, we should clear timeout', async () => {
+			jest.spyOn(global, 'clearTimeout');
+
+			const taskId = 'task1';
+			const runnerId = 'runner1';
+			const requesterId = 'requester1';
+			const requesterCallback = jest.fn();
+
+			taskBroker.registerRequester(requesterId, requesterCallback);
+			taskBroker.setTasks({
+				[taskId]: {
+					id: taskId,
+					runnerId,
+					requesterId,
+					taskType: 'test',
+					timeout: setTimeout(() => {}, config.taskTimeout * Time.seconds.toMilliseconds),
+				},
+			});
+
+			await taskBroker.taskDoneHandler(taskId, { result: [] });
+
+			expect(clearTimeout).toHaveBeenCalled();
+			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
+		});
+
+		it('on task error, we should clear timeout', async () => {
+			jest.spyOn(global, 'clearTimeout');
+
+			const taskId = 'task1';
+			const runnerId = 'runner1';
+			const requesterId = 'requester1';
+			const requesterCallback = jest.fn();
+
+			taskBroker.registerRequester(requesterId, requesterCallback);
+			taskBroker.setTasks({
+				[taskId]: {
+					id: taskId,
+					runnerId,
+					requesterId,
+					taskType: 'test',
+					timeout: setTimeout(() => {}, config.taskTimeout * Time.seconds.toMilliseconds),
+				},
+			});
+
+			await taskBroker.taskErrorHandler(taskId, new Error('Test error'));
+
+			expect(clearTimeout).toHaveBeenCalled();
+			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
+		});
+
+		it('[internal mode] on timeout, we should emit `runner:timed-out-during-task` event and send error to requester', async () => {
+			jest.spyOn(global, 'clearTimeout');
+
+			const taskId = 'task1';
+			const runnerId = 'runner1';
+			const requesterId = 'requester1';
+			const runner = mock<TaskRunner>({ id: runnerId });
+			const runnerCallback = jest.fn();
+			const requesterCallback = jest.fn();
+
+			taskBroker.registerRunner(runner, runnerCallback);
+			taskBroker.registerRequester(requesterId, requesterCallback);
+
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+
+			await taskBroker.sendTaskSettings(taskId, {});
+
+			jest.runAllTimers();
+
+			await Promise.resolve();
+
+			expect(runnerLifecycleEvents.emit).toHaveBeenCalledWith('runner:timed-out-during-task');
+
+			await Promise.resolve();
+
+			expect(clearTimeout).toHaveBeenCalled();
+
+			expect(requesterCallback).toHaveBeenCalledWith({
+				type: 'broker:taskerror',
+				taskId,
+				error: new ApplicationError(`Task execution timed out after ${config.taskTimeout} seconds`),
+			});
+
+			await Promise.resolve();
+
+			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
+		});
+
+		it('[external mode] on timeout, we should instruct the runner to cancel and send error to requester', async () => {
+			const config = mock<TaskRunnersConfig>({ taskTimeout: 30, mode: 'external' });
+			taskBroker = new TaskBroker(mock(), config, runnerLifecycleEvents);
+
+			jest.spyOn(global, 'clearTimeout');
+
+			const taskId = 'task1';
+			const runnerId = 'runner1';
+			const requesterId = 'requester1';
+			const runner = mock<TaskRunner>({ id: runnerId });
+			const runnerCallback = jest.fn();
+			const requesterCallback = jest.fn();
+
+			taskBroker.registerRunner(runner, runnerCallback);
+			taskBroker.registerRequester(requesterId, requesterCallback);
+
+			taskBroker.setTasks({
+				[taskId]: { id: taskId, runnerId, requesterId, taskType: 'test' },
+			});
+
+			await taskBroker.sendTaskSettings(taskId, {});
+			runnerCallback.mockClear();
+
+			jest.runAllTimers();
+
+			await Promise.resolve(); // for timeout callback
+			await Promise.resolve(); // for sending messages to runner and requester
+			await Promise.resolve(); // for task cleanup and removal
+
+			expect(runnerCallback).toHaveBeenLastCalledWith({
+				type: 'broker:taskcancel',
+				taskId,
+				reason: 'Task execution timed out',
+			});
+
+			expect(requesterCallback).toHaveBeenCalledWith({
+				type: 'broker:taskerror',
+				taskId,
+				error: expect.any(TaskRunnerTimeoutError),
+			});
+
+			expect(clearTimeout).toHaveBeenCalled();
+			expect(taskBroker.getTasks().get(taskId)).toBeUndefined();
+		});
 	});
 });
diff --git a/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts b/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts
new file mode 100644
index 0000000000..bf3bab4c27
--- /dev/null
+++ b/packages/cli/src/task-runners/__tests__/task-runner-process-restart-loop-detector.test.ts
@@ -0,0 +1,57 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+import type { Logger } from 'n8n-core';
+
+import type { TaskRunnerAuthService } from '@/task-runners/auth/task-runner-auth.service';
+import { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error';
+import { TaskRunnerLifecycleEvents } from '@/task-runners/task-runner-lifecycle-events';
+import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
+import { TaskRunnerProcessRestartLoopDetector } from '@/task-runners/task-runner-process-restart-loop-detector';
+
+describe('TaskRunnerProcessRestartLoopDetector', () => {
+	const mockLogger = mock<Logger>();
+	const mockAuthService = mock<TaskRunnerAuthService>();
+	const runnerConfig = new TaskRunnersConfig();
+	const taskRunnerProcess = new TaskRunnerProcess(
+		mockLogger,
+		runnerConfig,
+		mockAuthService,
+		new TaskRunnerLifecycleEvents(),
+	);
+
+	it('should detect a restart loop if process exits 5 times within 5s', () => {
+		const restartLoopDetector = new TaskRunnerProcessRestartLoopDetector(taskRunnerProcess);
+		let emittedError: TaskRunnerRestartLoopError | undefined = undefined;
+		restartLoopDetector.on('restart-loop-detected', (error) => {
+			emittedError = error;
+		});
+
+		taskRunnerProcess.emit('exit');
+		taskRunnerProcess.emit('exit');
+		taskRunnerProcess.emit('exit');
+		taskRunnerProcess.emit('exit');
+		taskRunnerProcess.emit('exit');
+
+		expect(emittedError).toBeInstanceOf(TaskRunnerRestartLoopError);
+	});
+
+	it('should not detect a restart loop if process exits less than 5 times within 5s', () => {
+		jest.useFakeTimers();
+		const restartLoopDetector = new TaskRunnerProcessRestartLoopDetector(taskRunnerProcess);
+		let emittedError: TaskRunnerRestartLoopError | undefined = undefined;
+		restartLoopDetector.on('restart-loop-detected', (error) => {
+			emittedError = error;
+		});
+
+		taskRunnerProcess.emit('exit');
+		taskRunnerProcess.emit('exit');
+		taskRunnerProcess.emit('exit');
+		taskRunnerProcess.emit('exit');
+
+		jest.advanceTimersByTime(5010);
+
+		taskRunnerProcess.emit('exit');
+
+		expect(emittedError).toBeUndefined();
+	});
+});
diff --git a/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts b/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts
new file mode 100644
index 0000000000..7bf475bf7c
--- /dev/null
+++ b/packages/cli/src/task-runners/__tests__/task-runner-process.test.ts
@@ -0,0 +1,133 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+import { Logger } from 'n8n-core';
+import type { ChildProcess, SpawnOptions } from 'node:child_process';
+
+import type { TaskRunnerAuthService } from '@/task-runners/auth/task-runner-auth.service';
+import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
+import { mockInstance } from '@test/mocking';
+
+import type { TaskRunnerLifecycleEvents } from '../task-runner-lifecycle-events';
+
+const spawnMock = jest.fn(() =>
+	mock<ChildProcess>({
+		stdout: {
+			pipe: jest.fn(),
+		},
+		stderr: {
+			pipe: jest.fn(),
+		},
+	}),
+);
+require('child_process').spawn = spawnMock;
+
+describe('TaskRunnerProcess', () => {
+	const logger = mockInstance(Logger);
+	const runnerConfig = mockInstance(TaskRunnersConfig);
+	runnerConfig.enabled = true;
+	runnerConfig.mode = 'internal';
+	const authService = mock<TaskRunnerAuthService>();
+	let taskRunnerProcess = new TaskRunnerProcess(logger, runnerConfig, authService, mock());
+
+	afterEach(async () => {
+		spawnMock.mockClear();
+	});
+
+	describe('constructor', () => {
+		it('should throw if runner mode is external', () => {
+			runnerConfig.mode = 'external';
+
+			expect(() => new TaskRunnerProcess(logger, runnerConfig, authService, mock())).toThrow();
+
+			runnerConfig.mode = 'internal';
+		});
+
+		it('should register listener for `runner:failed-heartbeat-check` event', () => {
+			const runnerLifecycleEvents = mock<TaskRunnerLifecycleEvents>();
+			new TaskRunnerProcess(logger, runnerConfig, authService, runnerLifecycleEvents);
+
+			expect(runnerLifecycleEvents.on).toHaveBeenCalledWith(
+				'runner:failed-heartbeat-check',
+				expect.any(Function),
+			);
+		});
+
+		it('should register listener for `runner:timed-out-during-task` event', () => {
+			const runnerLifecycleEvents = mock<TaskRunnerLifecycleEvents>();
+			new TaskRunnerProcess(logger, runnerConfig, authService, runnerLifecycleEvents);
+
+			expect(runnerLifecycleEvents.on).toHaveBeenCalledWith(
+				'runner:timed-out-during-task',
+				expect.any(Function),
+			);
+		});
+	});
+
+	describe('start', () => {
+		beforeEach(() => {
+			taskRunnerProcess = new TaskRunnerProcess(logger, runnerConfig, authService, mock());
+		});
+
+		test.each([
+			'PATH',
+			'NODE_FUNCTION_ALLOW_BUILTIN',
+			'NODE_FUNCTION_ALLOW_EXTERNAL',
+			'N8N_SENTRY_DSN',
+			'N8N_VERSION',
+			'ENVIRONMENT',
+			'DEPLOYMENT_NAME',
+			'GENERIC_TIMEZONE',
+		])('should propagate %s from env as is', async (envVar) => {
+			jest.spyOn(authService, 'createGrantToken').mockResolvedValue('grantToken');
+			process.env[envVar] = 'custom value';
+
+			await taskRunnerProcess.start();
+
+			// @ts-expect-error The type is not correct
+			const options = spawnMock.mock.calls[0][2] as SpawnOptions;
+			expect(options.env).toEqual(
+				expect.objectContaining({
+					[envVar]: 'custom value',
+				}),
+			);
+		});
+
+		it('should pass NODE_OPTIONS env if maxOldSpaceSize is configured', async () => {
+			jest.spyOn(authService, 'createGrantToken').mockResolvedValue('grantToken');
+			runnerConfig.maxOldSpaceSize = '1024';
+
+			await taskRunnerProcess.start();
+
+			// @ts-expect-error The type is not correct
+			const options = spawnMock.mock.calls[0][2] as SpawnOptions;
+			expect(options.env).toEqual(
+				expect.objectContaining({
+					NODE_OPTIONS: '--max-old-space-size=1024',
+				}),
+			);
+		});
+
+		it('should not pass NODE_OPTIONS env if maxOldSpaceSize is not configured', async () => {
+			jest.spyOn(authService, 'createGrantToken').mockResolvedValue('grantToken');
+			runnerConfig.maxOldSpaceSize = '';
+
+			await taskRunnerProcess.start();
+
+			// @ts-expect-error The type is not correct
+			const options = spawnMock.mock.calls[0][2] as SpawnOptions;
+			expect(options.env).not.toHaveProperty('NODE_OPTIONS');
+		});
+
+		it('should use --disallow-code-generation-from-strings and --disable-proto=delete flags', async () => {
+			jest.spyOn(authService, 'createGrantToken').mockResolvedValue('grantToken');
+
+			await taskRunnerProcess.start();
+
+			expect(spawnMock.mock.calls[0].at(1)).toEqual([
+				'--disallow-code-generation-from-strings',
+				'--disable-proto=delete',
+				expect.stringContaining('/packages/@n8n/task-runner/dist/start.js'),
+			]);
+		});
+	});
+});
diff --git a/packages/cli/src/task-runners/__tests__/task-runner-server.test.ts b/packages/cli/src/task-runners/__tests__/task-runner-server.test.ts
new file mode 100644
index 0000000000..33de18c605
--- /dev/null
+++ b/packages/cli/src/task-runners/__tests__/task-runner-server.test.ts
@@ -0,0 +1,67 @@
+import type { GlobalConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+import { ServerResponse } from 'node:http';
+import type WebSocket from 'ws';
+
+import type { TaskRunnerAuthController } from '@/task-runners/auth/task-runner-auth.controller';
+import { TaskRunnerServer } from '@/task-runners/task-runner-server';
+
+import type { TaskRunnerServerInitRequest } from '../task-runner-types';
+
+describe('TaskRunnerServer', () => {
+	describe('handleUpgradeRequest', () => {
+		it('should close WebSocket when response status code is > 200', () => {
+			const ws = mock<WebSocket>();
+			const request = mock<TaskRunnerServerInitRequest>({
+				url: '/runners/_ws',
+				ws,
+			});
+
+			const server = new TaskRunnerServer(
+				mock(),
+				mock<GlobalConfig>({ taskRunners: { path: '/runners' } }),
+				mock<TaskRunnerAuthController>(),
+				mock(),
+			);
+
+			// @ts-expect-error Private property
+			server.handleUpgradeRequest(request, mock(), Buffer.from(''));
+
+			const response = new ServerResponse(request);
+			response.writeHead = (statusCode) => {
+				if (statusCode > 200) ws.close();
+				return response;
+			};
+
+			response.writeHead(401);
+			expect(ws.close).toHaveBeenCalledWith(); // no args
+		});
+
+		it('should not close WebSocket when response status code is 200', () => {
+			const ws = mock<WebSocket>();
+			const request = mock<TaskRunnerServerInitRequest>({
+				url: '/runners/_ws',
+				ws,
+			});
+
+			const server = new TaskRunnerServer(
+				mock(),
+				mock<GlobalConfig>({ taskRunners: { path: '/runners' } }),
+				mock<TaskRunnerAuthController>(),
+				mock(),
+			);
+
+			// @ts-expect-error Private property
+			server.handleUpgradeRequest(request, mock(), Buffer.from(''));
+
+			const response = new ServerResponse(request);
+			response.writeHead = (statusCode) => {
+				if (statusCode > 200) ws.close();
+				return response;
+			};
+
+			response.writeHead(200);
+			expect(ws.close).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/cli/src/task-runners/__tests__/task-runner-ws-server.test.ts b/packages/cli/src/task-runners/__tests__/task-runner-ws-server.test.ts
new file mode 100644
index 0000000000..cabedc530b
--- /dev/null
+++ b/packages/cli/src/task-runners/__tests__/task-runner-ws-server.test.ts
@@ -0,0 +1,85 @@
+import type { TaskRunnersConfig } from '@n8n/config';
+import { mock } from 'jest-mock-extended';
+import type WebSocket from 'ws';
+
+import { Time, WsStatusCodes } from '@/constants';
+import { TaskRunnerWsServer } from '@/task-runners/task-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');
+
+			const server = new TaskRunnerWsServer(
+				mock(),
+				mock(),
+				mock(),
+				mock<TaskRunnersConfig>({ path: '/runners', heartbeatInterval: 30 }),
+				mock(),
+			);
+
+			server.start();
+
+			expect(setIntervalSpy).toHaveBeenCalledWith(
+				expect.any(Function),
+				30 * Time.seconds.toMilliseconds,
+			);
+
+			await server.stop();
+		});
+
+		it('should clear heartbeat timer on server stop', async () => {
+			jest.spyOn(global, 'setInterval');
+			const clearIntervalSpy = jest.spyOn(global, 'clearInterval');
+
+			const server = new TaskRunnerWsServer(
+				mock(),
+				mock(),
+				mock(),
+				mock<TaskRunnersConfig>({ path: '/runners', heartbeatInterval: 30 }),
+				mock(),
+			);
+			server.start();
+
+			await server.stop();
+
+			expect(clearIntervalSpy).toHaveBeenCalled();
+		});
+	});
+
+	describe('sendMessage', () => {
+		it('should work with a message containing circular references', () => {
+			const server = new TaskRunnerWsServer(mock(), mock(), mock(), mock(), mock());
+			const ws = mock<WebSocket>();
+			server.runnerConnections.set('test-runner', ws);
+
+			const messageData: Record<string, unknown> = {};
+			messageData.circular = messageData;
+
+			expect(() =>
+				server.sendMessage('test-runner', {
+					type: 'broker:taskdataresponse',
+					taskId: 'taskId',
+					requestId: 'requestId',
+					data: messageData,
+				}),
+			).not.toThrow();
+
+			expect(ws.send).toHaveBeenCalledWith(
+				'{"type":"broker:taskdataresponse","taskId":"taskId","requestId":"requestId","data":{"circular":"[Circular Reference]"}}',
+			);
+		});
+	});
+});
diff --git a/packages/cli/src/runners/auth/__tests__/task-runner-auth.controller.test.ts b/packages/cli/src/task-runners/auth/__tests__/task-runner-auth.controller.test.ts
similarity index 97%
rename from packages/cli/src/runners/auth/__tests__/task-runner-auth.controller.test.ts
rename to packages/cli/src/task-runners/auth/__tests__/task-runner-auth.controller.test.ts
index 7d43f91458..3c650d1644 100644
--- a/packages/cli/src/runners/auth/__tests__/task-runner-auth.controller.test.ts
+++ b/packages/cli/src/task-runners/auth/__tests__/task-runner-auth.controller.test.ts
@@ -8,7 +8,7 @@ import { mockInstance } from '@test/mocking';
 import { BadRequestError } from '../../../errors/response-errors/bad-request.error';
 import { ForbiddenError } from '../../../errors/response-errors/forbidden.error';
 import type { AuthlessRequest } from '../../../requests';
-import type { TaskRunnerServerInitRequest } from '../../runner-types';
+import type { TaskRunnerServerInitRequest } from '../../task-runner-types';
 import { TaskRunnerAuthController } from '../task-runner-auth.controller';
 import { TaskRunnerAuthService } from '../task-runner-auth.service';
 
diff --git a/packages/cli/src/runners/auth/__tests__/task-runner-auth.service.test.ts b/packages/cli/src/task-runners/auth/__tests__/task-runner-auth.service.test.ts
similarity index 94%
rename from packages/cli/src/runners/auth/__tests__/task-runner-auth.service.test.ts
rename to packages/cli/src/task-runners/auth/__tests__/task-runner-auth.service.test.ts
index a1321945e3..66581ffce0 100644
--- a/packages/cli/src/runners/auth/__tests__/task-runner-auth.service.test.ts
+++ b/packages/cli/src/task-runners/auth/__tests__/task-runner-auth.service.test.ts
@@ -33,11 +33,11 @@ describe('TaskRunnerAuthService', () => {
 
 	describe('isValidAuthToken', () => {
 		it('should be valid for the configured token', () => {
-			expect(authService.isValidAuthToken('random-secret'));
+			expect(authService.isValidAuthToken('random-secret')).toBe(true);
 		});
 
 		it('should be invalid for anything else', () => {
-			expect(authService.isValidAuthToken('!random-secret'));
+			expect(authService.isValidAuthToken('!random-secret')).toBe(false);
 		});
 	});
 
diff --git a/packages/cli/src/runners/auth/task-runner-auth.controller.ts b/packages/cli/src/task-runners/auth/task-runner-auth.controller.ts
similarity index 94%
rename from packages/cli/src/runners/auth/task-runner-auth.controller.ts
rename to packages/cli/src/task-runners/auth/task-runner-auth.controller.ts
index a117dfca0d..4ea5f3b6f4 100644
--- a/packages/cli/src/runners/auth/task-runner-auth.controller.ts
+++ b/packages/cli/src/task-runners/auth/task-runner-auth.controller.ts
@@ -1,5 +1,5 @@
+import { Service } from '@n8n/di';
 import type { NextFunction, Response } from 'express';
-import { Service } from 'typedi';
 
 import type { AuthlessRequest } from '@/requests';
 
@@ -7,7 +7,7 @@ import { taskRunnerAuthRequestBodySchema } from './task-runner-auth.schema';
 import { TaskRunnerAuthService } from './task-runner-auth.service';
 import { BadRequestError } from '../../errors/response-errors/bad-request.error';
 import { ForbiddenError } from '../../errors/response-errors/forbidden.error';
-import type { TaskRunnerServerInitRequest } from '../runner-types';
+import type { TaskRunnerServerInitRequest } from '../task-runner-types';
 
 /**
  * Controller responsible for authenticating Task Runner connections
diff --git a/packages/cli/src/runners/auth/task-runner-auth.schema.ts b/packages/cli/src/task-runners/auth/task-runner-auth.schema.ts
similarity index 100%
rename from packages/cli/src/runners/auth/task-runner-auth.schema.ts
rename to packages/cli/src/task-runners/auth/task-runner-auth.schema.ts
diff --git a/packages/cli/src/runners/auth/task-runner-auth.service.ts b/packages/cli/src/task-runners/auth/task-runner-auth.service.ts
similarity index 80%
rename from packages/cli/src/runners/auth/task-runner-auth.service.ts
rename to packages/cli/src/task-runners/auth/task-runner-auth.service.ts
index 5907cf6678..770a5ae1fa 100644
--- a/packages/cli/src/runners/auth/task-runner-auth.service.ts
+++ b/packages/cli/src/task-runners/auth/task-runner-auth.service.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
-import { randomBytes } from 'crypto';
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
+import { randomBytes, timingSafeEqual } from 'crypto';
 
 import { Time } from '@/constants';
 import { CacheService } from '@/services/cache/cache.service';
@@ -9,6 +9,8 @@ const GRANT_TOKEN_TTL = 15 * Time.seconds.toMilliseconds;
 
 @Service()
 export class TaskRunnerAuthService {
+	private readonly authToken = Buffer.from(this.globalConfig.taskRunners.authToken);
+
 	constructor(
 		private readonly globalConfig: GlobalConfig,
 		private readonly cacheService: CacheService,
@@ -17,7 +19,10 @@ export class TaskRunnerAuthService {
 	) {}
 
 	isValidAuthToken(token: string) {
-		return token === this.globalConfig.taskRunners.authToken;
+		const tokenBuffer = Buffer.from(token);
+		if (tokenBuffer.length !== this.authToken.length) return false;
+
+		return timingSafeEqual(tokenBuffer, this.authToken);
 	}
 
 	/**
diff --git a/packages/cli/src/task-runners/default-task-runner-disconnect-analyzer.ts b/packages/cli/src/task-runners/default-task-runner-disconnect-analyzer.ts
new file mode 100644
index 0000000000..a0193c40e0
--- /dev/null
+++ b/packages/cli/src/task-runners/default-task-runner-disconnect-analyzer.ts
@@ -0,0 +1,34 @@
+import { Service } from '@n8n/di';
+
+import config from '@/config';
+
+import { TaskRunnerDisconnectedError } from './errors/task-runner-disconnected-error';
+import { TaskRunnerFailedHeartbeatError } from './errors/task-runner-failed-heartbeat.error';
+import type { DisconnectAnalyzer, DisconnectErrorOptions } from './task-runner-types';
+
+/**
+ * Analyzes the disconnect reason of a task runner to provide a more
+ * meaningful error message to the user.
+ */
+@Service()
+export class DefaultTaskRunnerDisconnectAnalyzer implements DisconnectAnalyzer {
+	get isCloudDeployment() {
+		return config.get('deployment.type') === 'cloud';
+	}
+
+	async toDisconnectError(opts: DisconnectErrorOptions): Promise<Error> {
+		const { reason, heartbeatInterval } = opts;
+
+		if (reason === 'failed-heartbeat-check' && heartbeatInterval) {
+			return new TaskRunnerFailedHeartbeatError(
+				heartbeatInterval,
+				config.get('deployment.type') !== 'cloud',
+			);
+		}
+
+		return new TaskRunnerDisconnectedError(
+			opts.runnerId ?? 'Unknown runner ID',
+			this.isCloudDeployment,
+		);
+	}
+}
diff --git a/packages/cli/src/runners/errors.ts b/packages/cli/src/task-runners/errors.ts
similarity index 64%
rename from packages/cli/src/runners/errors.ts
rename to packages/cli/src/task-runners/errors.ts
index cc53e18fd4..c530e5a95d 100644
--- a/packages/cli/src/runners/errors.ts
+++ b/packages/cli/src/task-runners/errors.ts
@@ -6,4 +6,10 @@ export class TaskRejectError extends ApplicationError {
 	}
 }
 
+export class TaskDeferredError extends ApplicationError {
+	constructor() {
+		super('Task deferred until runner is ready', { level: 'info' });
+	}
+}
+
 export class TaskError extends ApplicationError {}
diff --git a/packages/cli/src/task-runners/errors/__tests__/task-runner-disconnected-error.test.ts b/packages/cli/src/task-runners/errors/__tests__/task-runner-disconnected-error.test.ts
new file mode 100644
index 0000000000..a6b88462e3
--- /dev/null
+++ b/packages/cli/src/task-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/task-runners/errors/missing-auth-token.error.ts b/packages/cli/src/task-runners/errors/missing-auth-token.error.ts
new file mode 100644
index 0000000000..3c99a09edb
--- /dev/null
+++ b/packages/cli/src/task-runners/errors/missing-auth-token.error.ts
@@ -0,0 +1,7 @@
+export class MissingAuthTokenError extends Error {
+	constructor() {
+		super(
+			'Missing auth token. When `N8N_RUNNERS_MODE` is `external`, it is required to set `N8N_RUNNERS_AUTH_TOKEN`. Its value should be a shared secret between the main instance and the launcher.',
+		);
+	}
+}
diff --git a/packages/cli/src/task-runners/errors/task-runner-disconnected-error.ts b/packages/cli/src/task-runners/errors/task-runner-disconnected-error.ts
new file mode 100644
index 0000000000..e29958adfb
--- /dev/null
+++ b/packages/cli/src/task-runners/errors/task-runner-disconnected-error.ts
@@ -0,0 +1,34 @@
+import type { TaskRunner } from '@n8n/task-runner';
+import { ApplicationError } from 'n8n-workflow';
+
+export class TaskRunnerDisconnectedError extends ApplicationError {
+	description: string;
+
+	constructor(
+		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/task-runners/errors/task-runner-failed-heartbeat.error.ts b/packages/cli/src/task-runners/errors/task-runner-failed-heartbeat.error.ts
new file mode 100644
index 0000000000..55b9448574
--- /dev/null
+++ b/packages/cli/src/task-runners/errors/task-runner-failed-heartbeat.error.ts
@@ -0,0 +1,32 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class TaskRunnerFailedHeartbeatError extends ApplicationError {
+	description: string;
+
+	constructor(heartbeatInterval: number, isSelfHosted: boolean) {
+		super('Task execution aborted because runner became unresponsive');
+
+		const subtitle =
+			'The task runner failed to respond as expected, so it was considered unresponsive, and the task was aborted. You can try the following:';
+
+		const fixes = {
+			optimizeScript:
+				'Optimize your script to prevent CPU-intensive operations, e.g. by breaking them down into smaller chunks or batch processing.',
+			ensureTermination:
+				'Ensure that all paths in your script are able to terminate, i.e. no infinite loops.',
+			increaseInterval: `If your task can reasonably keep the task runner busy for more than ${heartbeatInterval} ${heartbeatInterval === 1 ? 'second' : 'seconds'}, increase the heartbeat interval using the N8N_RUNNERS_HEARTBEAT_INTERVAL environment variable.`,
+		};
+
+		const suggestions = [fixes.optimizeScript, fixes.ensureTermination];
+
+		if (isSelfHosted) suggestions.push(fixes.increaseInterval);
+
+		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/task-runners/errors/task-runner-oom-error.ts b/packages/cli/src/task-runners/errors/task-runner-oom-error.ts
new file mode 100644
index 0000000000..5c78bef816
--- /dev/null
+++ b/packages/cli/src/task-runners/errors/task-runner-oom-error.ts
@@ -0,0 +1,35 @@
+import { ApplicationError } from 'n8n-workflow';
+
+import type { TaskRunner } from '../task-broker.service';
+
+export class TaskRunnerOomError extends ApplicationError {
+	description: string;
+
+	constructor(
+		readonly runnerId: TaskRunner['id'],
+		isCloudDeployment: boolean,
+	) {
+		super('Node ran out of memory.', { level: 'error' });
+
+		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 usually happens when there are too many items to process. 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/task-runners/errors/task-runner-restart-loop-error.ts b/packages/cli/src/task-runners/errors/task-runner-restart-loop-error.ts
new file mode 100644
index 0000000000..fa02430ade
--- /dev/null
+++ b/packages/cli/src/task-runners/errors/task-runner-restart-loop-error.ts
@@ -0,0 +1,14 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class TaskRunnerRestartLoopError extends ApplicationError {
+	constructor(
+		readonly howManyTimes: number,
+		readonly timePeriodMs: number,
+	) {
+		const message = `Task runner has restarted ${howManyTimes} times within ${timePeriodMs / 1000} seconds. This is an abnormally high restart rate that suggests a bug or other issue is preventing your runner process from starting up. If this issues persists, please file a report at: https://github.com/n8n-io/n8n/issues`;
+
+		super(message, {
+			level: 'fatal',
+		});
+	}
+}
diff --git a/packages/cli/src/task-runners/errors/task-runner-timeout.error.ts b/packages/cli/src/task-runners/errors/task-runner-timeout.error.ts
new file mode 100644
index 0000000000..1d9d463e3a
--- /dev/null
+++ b/packages/cli/src/task-runners/errors/task-runner-timeout.error.ts
@@ -0,0 +1,42 @@
+import type { TaskRunnerMode } from '@n8n/config/src/configs/runners.config';
+import { ApplicationError } from 'n8n-workflow';
+
+export class TaskRunnerTimeoutError extends ApplicationError {
+	description: string;
+
+	constructor({
+		taskTimeout,
+		isSelfHosted,
+		mode,
+	}: { taskTimeout: number; isSelfHosted: boolean; mode: TaskRunnerMode }) {
+		super(
+			`Task execution timed out after ${taskTimeout} ${taskTimeout === 1 ? 'second' : 'seconds'}`,
+		);
+
+		const subtitles = {
+			internal:
+				'The task runner was taking too long on this task, so it was suspected of being unresponsive and restarted, and the task was aborted.',
+			external: 'The task runner was taking too long on this task, so the task was aborted.',
+		};
+
+		const fixes = {
+			optimizeScript:
+				'Optimize your script to prevent long-running tasks, e.g. by processing data in smaller batches.',
+			ensureTermination:
+				'Ensure that all paths in your script are able to terminate, i.e. no infinite loops.',
+			increaseTimeout: `If your task can reasonably take more than ${taskTimeout} ${taskTimeout === 1 ? 'second' : 'seconds'}, increase the timeout using the N8N_RUNNERS_TASK_TIMEOUT environment variable.`,
+		};
+
+		const suggestions = [fixes.optimizeScript, fixes.ensureTermination];
+
+		if (isSelfHosted) suggestions.push(fixes.increaseTimeout);
+
+		const suggestionsText = suggestions
+			.map((suggestion, index) => `${index + 1}. ${suggestion}`)
+			.join('<br/>');
+
+		const description = `${mode === 'internal' ? subtitles.internal : subtitles.external} You can try the following:<br/><br/>${suggestionsText}`;
+
+		this.description = description;
+	}
+}
diff --git a/packages/cli/src/task-runners/forward-to-logger.ts b/packages/cli/src/task-runners/forward-to-logger.ts
new file mode 100644
index 0000000000..0bcc813225
--- /dev/null
+++ b/packages/cli/src/task-runners/forward-to-logger.ts
@@ -0,0 +1,42 @@
+import type { Logger } from 'n8n-workflow';
+import type { Readable } from 'stream';
+
+/**
+ * Forwards stdout and stderr of a given producer to the given
+ * logger's info and error methods respectively.
+ */
+export function forwardToLogger(
+	logger: Logger,
+	producer: {
+		stdout?: Readable | null;
+		stderr?: Readable | null;
+	},
+	prefix?: string,
+) {
+	if (prefix) {
+		prefix = prefix.trimEnd();
+	}
+
+	const stringify = (data: Buffer) => {
+		let str = data.toString();
+
+		// Remove possible trailing newline (otherwise it's duplicated)
+		if (str.endsWith('\n')) {
+			str = str.slice(0, -1);
+		}
+
+		return prefix ? `${prefix} ${str}` : str;
+	};
+
+	if (producer.stdout) {
+		producer.stdout.on('data', (data: Buffer) => {
+			logger.info(stringify(data));
+		});
+	}
+
+	if (producer.stderr) {
+		producer.stderr.on('data', (data: Buffer) => {
+			logger.error(stringify(data));
+		});
+	}
+}
diff --git a/packages/cli/src/task-runners/internal-task-runner-disconnect-analyzer.ts b/packages/cli/src/task-runners/internal-task-runner-disconnect-analyzer.ts
new file mode 100644
index 0000000000..a84682e521
--- /dev/null
+++ b/packages/cli/src/task-runners/internal-task-runner-disconnect-analyzer.ts
@@ -0,0 +1,56 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
+
+import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
+import { TaskRunnerOomError } from './errors/task-runner-oom-error';
+import { SlidingWindowSignal } from './sliding-window-signal';
+import type { ExitReason, TaskRunnerProcessEventMap } from './task-runner-process';
+import { TaskRunnerProcess } from './task-runner-process';
+import type { DisconnectErrorOptions } from './task-runner-types';
+
+/**
+ * Analyzes the disconnect reason of a task runner process to provide a more
+ * meaningful error message to the user.
+ */
+@Service()
+export class InternalTaskRunnerDisconnectAnalyzer extends DefaultTaskRunnerDisconnectAnalyzer {
+	private readonly exitReasonSignal: SlidingWindowSignal<TaskRunnerProcessEventMap, 'exit'>;
+
+	constructor(
+		private readonly runnerConfig: TaskRunnersConfig,
+		private readonly taskRunnerProcess: TaskRunnerProcess,
+	) {
+		super();
+
+		// When the task runner process is running as a child process, there's
+		// no determinate time when it exits compared to when the runner disconnects
+		// (i.e. it's a race condition). Hence we use a sliding window to determine
+		// the exit reason. As long as we receive the exit signal from the task
+		// runner process within the window, we can determine the exit reason.
+		this.exitReasonSignal = new SlidingWindowSignal(this.taskRunnerProcess, 'exit', {
+			windowSizeInMs: 500,
+		});
+	}
+
+	async toDisconnectError(opts: DisconnectErrorOptions): Promise<Error> {
+		const exitCode = await this.awaitExitSignal();
+		if (exitCode === 'oom') {
+			return new TaskRunnerOomError(opts.runnerId ?? 'Unknown runner ID', this.isCloudDeployment);
+		}
+
+		return await super.toDisconnectError(opts);
+	}
+
+	private async awaitExitSignal(): Promise<ExitReason> {
+		if (this.runnerConfig.mode === 'external') {
+			// If the task runner is running in external mode, we don't have
+			// control over the process and hence cannot determine the exit
+			// reason. We just return 'unknown' in this case.
+			return 'unknown';
+		}
+
+		const lastExitReason = await this.exitReasonSignal.getSignal();
+
+		return lastExitReason?.reason ?? 'unknown';
+	}
+}
diff --git a/packages/cli/src/task-runners/node-process-oom-detector.ts b/packages/cli/src/task-runners/node-process-oom-detector.ts
new file mode 100644
index 0000000000..a97df32974
--- /dev/null
+++ b/packages/cli/src/task-runners/node-process-oom-detector.ts
@@ -0,0 +1,34 @@
+import * as a from 'node:assert/strict';
+import type { ChildProcess } from 'node:child_process';
+
+/**
+ * Class to monitor a nodejs process and detect if it runs out of
+ * memory (OOMs).
+ */
+export class NodeProcessOomDetector {
+	get didProcessOom() {
+		return this._didProcessOom;
+	}
+
+	private _didProcessOom = false;
+
+	constructor(processToMonitor: ChildProcess) {
+		this.monitorProcess(processToMonitor);
+	}
+
+	private monitorProcess(processToMonitor: ChildProcess) {
+		a.ok(processToMonitor.stderr, "Can't monitor a process without stderr");
+
+		processToMonitor.stderr.on('data', this.onStderr);
+
+		processToMonitor.once('exit', () => {
+			processToMonitor.stderr?.off('data', this.onStderr);
+		});
+	}
+
+	private onStderr = (data: Buffer) => {
+		if (data.includes('JavaScript heap out of memory')) {
+			this._didProcessOom = true;
+		}
+	};
+}
diff --git a/packages/cli/src/task-runners/sliding-window-signal.ts b/packages/cli/src/task-runners/sliding-window-signal.ts
new file mode 100644
index 0000000000..3e88f0df95
--- /dev/null
+++ b/packages/cli/src/task-runners/sliding-window-signal.ts
@@ -0,0 +1,59 @@
+import type { TypedEmitter } from '../typed-emitter';
+
+export type SlidingWindowSignalOpts = {
+	windowSizeInMs?: number;
+};
+
+/**
+ * A class that listens for a specific event on an emitter (signal) and
+ * provides a sliding window of the last event that was emitted.
+ */
+export class SlidingWindowSignal<TEvents, TEventName extends keyof TEvents & string> {
+	private lastSignal: TEvents[TEventName] | null = null;
+
+	private lastSignalTime: number = 0;
+
+	private windowSizeInMs: number;
+
+	constructor(
+		private readonly eventEmitter: TypedEmitter<TEvents>,
+		private readonly eventName: TEventName,
+		opts: SlidingWindowSignalOpts = {},
+	) {
+		const { windowSizeInMs = 500 } = opts;
+
+		this.windowSizeInMs = windowSizeInMs;
+
+		eventEmitter.on(eventName, (signal: TEvents[TEventName]) => {
+			this.lastSignal = signal;
+			this.lastSignalTime = Date.now();
+		});
+	}
+
+	/**
+	 * If an event has been emitted within the last `windowSize` milliseconds,
+	 * that event is returned. Otherwise it will wait for up to `windowSize`
+	 * milliseconds for the event to be emitted. `null` is returned
+	 * if no event is emitted within the window.
+	 */
+	async getSignal(): Promise<TEvents[TEventName] | null> {
+		const timeSinceLastEvent = Date.now() - this.lastSignalTime;
+		if (timeSinceLastEvent <= this.windowSizeInMs) return this.lastSignal;
+
+		return await new Promise<TEvents[TEventName] | null>((resolve) => {
+			let timeoutTimerId: NodeJS.Timeout | null = null;
+
+			const onExit = (signal: TEvents[TEventName]) => {
+				if (timeoutTimerId) clearTimeout(timeoutTimerId);
+				resolve(signal);
+			};
+
+			timeoutTimerId = setTimeout(() => {
+				this.eventEmitter.off(this.eventName, onExit);
+				resolve(null);
+			});
+
+			this.eventEmitter.once(this.eventName, onExit);
+		});
+	}
+}
diff --git a/packages/cli/src/runners/task-broker.service.ts b/packages/cli/src/task-runners/task-broker.service.ts
similarity index 69%
rename from packages/cli/src/runners/task-broker.service.ts
rename to packages/cli/src/task-runners/task-broker.service.ts
index 40ad6d6e90..42e0d3cd25 100644
--- a/packages/cli/src/runners/task-broker.service.ts
+++ b/packages/cli/src/task-runners/task-broker.service.ts
@@ -1,12 +1,21 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
+import type {
+	BrokerMessage,
+	RequesterMessage,
+	RunnerMessage,
+	TaskResultData,
+} from '@n8n/task-runner';
+import { Logger } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
-import { Service } from 'typedi';
 
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { Logger } from '@/logging/logger.service';
+import config from '@/config';
+import { Time } from '@/constants';
 
-import { TaskRejectError } from './errors';
-import type { N8nMessage, RunnerMessage, RequesterMessage, TaskResultData } from './runner-types';
+import { TaskDeferredError, TaskRejectError } from './errors';
+import { TaskRunnerTimeoutError } from './errors/task-runner-timeout.error';
+import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
 
 export interface TaskRunner {
 	id: string;
@@ -20,12 +29,15 @@ export interface Task {
 	runnerId: TaskRunner['id'];
 	requesterId: string;
 	taskType: string;
+	timeout?: NodeJS.Timeout;
 }
 
 export interface TaskOffer {
 	offerId: string;
 	runnerId: TaskRunner['id'];
 	taskType: string;
+
+	/** How long (in milliseconds) the task offer is valid for. `-1` for non-expiring offer from launcher. */
 	validFor: number;
 	validUntil: bigint;
 }
@@ -38,14 +50,16 @@ export interface TaskRequest {
 	acceptInProgress?: boolean;
 }
 
-export type MessageCallback = (message: N8nMessage.ToRunner.All) => Promise<void> | void;
+export type MessageCallback = (message: BrokerMessage.ToRunner.All) => Promise<void> | void;
 export type RequesterMessageCallback = (
-	message: N8nMessage.ToRequester.All,
+	message: BrokerMessage.ToRequester.All,
 ) => Promise<void> | void;
 
 type RunnerAcceptCallback = () => void;
-type RequesterAcceptCallback = (settings: RequesterMessage.ToN8n.TaskSettings['settings']) => void;
-type TaskRejectCallback = (reason: TaskRejectError) => void;
+type RequesterAcceptCallback = (
+	settings: RequesterMessage.ToBroker.TaskSettings['settings'],
+) => void;
+type TaskRejectCallback = (reason: TaskRejectError | TaskDeferredError) => void;
 
 @Service()
 export class TaskBroker {
@@ -74,22 +88,20 @@ export class TaskBroker {
 
 	constructor(
 		private readonly logger: Logger,
-		private readonly loadNodesAndCredentials: LoadNodesAndCredentials,
+		private readonly taskRunnersConfig: TaskRunnersConfig,
+		private readonly taskRunnerLifecycleEvents: TaskRunnerLifecycleEvents,
 	) {
-		this.loadNodesAndCredentials.addPostProcessor(this.updateNodeTypes);
+		if (this.taskRunnersConfig.taskTimeout <= 0) {
+			throw new ApplicationError('Task timeout must be greater than 0');
+		}
 	}
 
-	updateNodeTypes = async () => {
-		await this.messageAllRunners({
-			type: 'broker:nodetypes',
-			nodeTypes: this.loadNodesAndCredentials.types.nodes,
-		});
-	};
-
 	expireTasks() {
 		const now = process.hrtime.bigint();
 		for (let i = this.pendingTaskOffers.length - 1; i >= 0; i--) {
-			if (this.pendingTaskOffers[i].validUntil < now) {
+			const offer = this.pendingTaskOffers[i];
+			if (offer.validFor === -1) continue; // non-expiring offer
+			if (offer.validUntil < now) {
 				this.pendingTaskOffers.splice(i, 1);
 			}
 		}
@@ -98,13 +110,9 @@ export class TaskBroker {
 	registerRunner(runner: TaskRunner, messageCallback: MessageCallback) {
 		this.knownRunners.set(runner.id, { runner, messageCallback });
 		void this.knownRunners.get(runner.id)!.messageCallback({ type: 'broker:runnerregistered' });
-		void this.knownRunners.get(runner.id)!.messageCallback({
-			type: 'broker:nodetypes',
-			nodeTypes: this.loadNodesAndCredentials.types.nodes,
-		});
 	}
 
-	deregisterRunner(runnerId: string) {
+	deregisterRunner(runnerId: string, error: Error) {
 		this.knownRunners.delete(runnerId);
 
 		// Remove any pending offers
@@ -117,8 +125,11 @@ export class TaskBroker {
 		// Fail any tasks
 		for (const task of this.tasks.values()) {
 			if (task.runnerId === runnerId) {
-				void this.failTask(task.id, `The Task Runner (${runnerId}) has disconnected`);
-				this.handleRunnerReject(task.id, `The Task Runner (${runnerId}) has disconnected`);
+				void this.failTask(task.id, error);
+				this.handleRunnerReject(
+					task.id,
+					`The Task Runner (${runnerId}) has disconnected: ${error.message}`,
+				);
 			}
 		}
 	}
@@ -131,23 +142,15 @@ export class TaskBroker {
 		this.requesters.delete(requesterId);
 	}
 
-	private async messageRunner(runnerId: TaskRunner['id'], message: N8nMessage.ToRunner.All) {
+	private async messageRunner(runnerId: TaskRunner['id'], message: BrokerMessage.ToRunner.All) {
 		await this.knownRunners.get(runnerId)?.messageCallback(message);
 	}
 
-	private async messageAllRunners(message: N8nMessage.ToRunner.All) {
-		await Promise.allSettled(
-			[...this.knownRunners.values()].map(async (runner) => {
-				await runner.messageCallback(message);
-			}),
-		);
-	}
-
-	private async messageRequester(requesterId: string, message: N8nMessage.ToRequester.All) {
+	private async messageRequester(requesterId: string, message: BrokerMessage.ToRequester.All) {
 		await this.requesters.get(requesterId)?.(message);
 	}
 
-	async onRunnerMessage(runnerId: TaskRunner['id'], message: RunnerMessage.ToN8n.All) {
+	async onRunnerMessage(runnerId: TaskRunner['id'], message: RunnerMessage.ToBroker.All) {
 		const runner = this.knownRunners.get(runnerId);
 		if (!runner) {
 			return;
@@ -159,13 +162,19 @@ export class TaskBroker {
 			case 'runner:taskrejected':
 				this.handleRunnerReject(message.taskId, message.reason);
 				break;
+			case 'runner:taskdeferred':
+				this.handleRunnerDeferred(message.taskId);
+				break;
 			case 'runner:taskoffer':
 				this.taskOffered({
 					runnerId,
 					taskType: message.taskType,
 					offerId: message.offerId,
 					validFor: message.validFor,
-					validUntil: process.hrtime.bigint() + BigInt(message.validFor * 1_000_000),
+					validUntil:
+						message.validFor === -1
+							? 0n // sentinel value for non-expiring offer
+							: process.hrtime.bigint() + BigInt(message.validFor * 1_000_000),
 				});
 				break;
 			case 'runner:taskdone':
@@ -175,14 +184,11 @@ export class TaskBroker {
 				await this.taskErrorHandler(message.taskId, message.error);
 				break;
 			case 'runner:taskdatarequest':
-				await this.handleDataRequest(
-					message.taskId,
-					message.requestId,
-					message.requestType,
-					message.param,
-				);
+				await this.handleDataRequest(message.taskId, message.requestId, message.requestParams);
+				break;
+			case 'runner:nodetypesrequest':
+				await this.handleNodeTypesRequest(message.taskId, message.requestId, message.requestParams);
 				break;
-
 			case 'runner:rpc':
 				await this.handleRpcRequest(message.taskId, message.callId, message.name, message.params);
 				break;
@@ -195,7 +201,7 @@ export class TaskBroker {
 	async handleRpcRequest(
 		taskId: Task['id'],
 		callId: string,
-		name: RunnerMessage.ToN8n.RPC['name'],
+		name: RunnerMessage.ToBroker.RPC['name'],
 		params: unknown[],
 	) {
 		const task = this.tasks.get(taskId);
@@ -227,11 +233,18 @@ export class TaskBroker {
 		}
 	}
 
+	handleRunnerDeferred(taskId: Task['id']) {
+		const acceptReject = this.runnerAcceptRejects.get(taskId);
+		if (acceptReject) {
+			acceptReject.reject(new TaskDeferredError());
+			this.runnerAcceptRejects.delete(taskId);
+		}
+	}
+
 	async handleDataRequest(
 		taskId: Task['id'],
-		requestId: RunnerMessage.ToN8n.TaskDataRequest['requestId'],
-		requestType: RunnerMessage.ToN8n.TaskDataRequest['requestType'],
-		param?: string,
+		requestId: RunnerMessage.ToBroker.TaskDataRequest['requestId'],
+		requestParams: RunnerMessage.ToBroker.TaskDataRequest['requestParams'],
 	) {
 		const task = this.tasks.get(taskId);
 		if (!task) {
@@ -241,14 +254,30 @@ export class TaskBroker {
 			type: 'broker:taskdatarequest',
 			taskId,
 			requestId,
-			requestType,
-			param,
+			requestParams,
+		});
+	}
+
+	async handleNodeTypesRequest(
+		taskId: Task['id'],
+		requestId: RunnerMessage.ToBroker.NodeTypesRequest['requestId'],
+		requestParams: RunnerMessage.ToBroker.NodeTypesRequest['requestParams'],
+	) {
+		const task = this.tasks.get(taskId);
+		if (!task) {
+			return;
+		}
+		await this.messageRequester(task.requesterId, {
+			type: 'broker:nodetypesrequest',
+			taskId,
+			requestId,
+			requestParams,
 		});
 	}
 
 	async handleResponse(
 		taskId: Task['id'],
-		requestId: RunnerMessage.ToN8n.TaskDataRequest['requestId'],
+		requestId: RunnerMessage.ToBroker.TaskDataRequest['requestId'],
 		data: unknown,
 	) {
 		const task = this.tasks.get(taskId);
@@ -263,7 +292,7 @@ export class TaskBroker {
 		});
 	}
 
-	async onRequesterMessage(requesterId: string, message: RequesterMessage.ToN8n.All) {
+	async onRequesterMessage(requesterId: string, message: RequesterMessage.ToBroker.All) {
 		switch (message.type) {
 			case 'requester:tasksettings':
 				this.handleRequesterAccept(message.taskId, message.settings);
@@ -281,6 +310,13 @@ export class TaskBroker {
 			case 'requester:taskdataresponse':
 				await this.handleRequesterDataResponse(message.taskId, message.requestId, message.data);
 				break;
+			case 'requester:nodetypesresponse':
+				await this.handleRequesterNodeTypesResponse(
+					message.taskId,
+					message.requestId,
+					message.nodeTypes,
+				);
+				break;
 			case 'requester:rpcresponse':
 				await this.handleRequesterRpcResponse(
 					message.taskId,
@@ -295,7 +331,7 @@ export class TaskBroker {
 	async handleRequesterRpcResponse(
 		taskId: string,
 		callId: string,
-		status: RequesterMessage.ToN8n.RPCResponse['status'],
+		status: RequesterMessage.ToBroker.RPCResponse['status'],
 		data: unknown,
 	) {
 		const runner = await this.getRunnerOrFailTask(taskId);
@@ -319,9 +355,24 @@ export class TaskBroker {
 		});
 	}
 
+	async handleRequesterNodeTypesResponse(
+		taskId: Task['id'],
+		requestId: RequesterMessage.ToBroker.NodeTypesResponse['requestId'],
+		nodeTypes: RequesterMessage.ToBroker.NodeTypesResponse['nodeTypes'],
+	) {
+		const runner = await this.getRunnerOrFailTask(taskId);
+
+		await this.messageRunner(runner.id, {
+			type: 'broker:nodetypes',
+			taskId,
+			requestId,
+			nodeTypes,
+		});
+	}
+
 	handleRequesterAccept(
 		taskId: Task['id'],
-		settings: RequesterMessage.ToN8n.TaskSettings['settings'],
+		settings: RequesterMessage.ToBroker.TaskSettings['settings'],
 	) {
 		const acceptReject = this.requesterAcceptRejects.get(taskId);
 		if (acceptReject) {
@@ -352,7 +403,7 @@ export class TaskBroker {
 		});
 	}
 
-	private async failTask(taskId: Task['id'], reason: string) {
+	private async failTask(taskId: Task['id'], error: Error) {
 		const task = this.tasks.get(taskId);
 		if (!task) {
 			return;
@@ -362,7 +413,7 @@ export class TaskBroker {
 		await this.messageRequester(task.requesterId, {
 			type: 'broker:taskerror',
 			taskId,
-			error: reason,
+			error,
 		});
 	}
 
@@ -375,17 +426,28 @@ export class TaskBroker {
 		}
 		const runner = this.knownRunners.get(task.runnerId);
 		if (!runner) {
-			const reason = `Cannot find runner, failed to find runner (${task.runnerId})`;
-			await this.failTask(taskId, reason);
-			throw new ApplicationError(reason, {
-				level: 'error',
-			});
+			const error = new ApplicationError(
+				`Cannot find runner, failed to find runner (${task.runnerId})`,
+				{
+					level: 'error',
+				},
+			);
+			await this.failTask(taskId, error);
+			throw error;
 		}
 		return runner.runner;
 	}
 
 	async sendTaskSettings(taskId: Task['id'], settings: unknown) {
 		const runner = await this.getRunnerOrFailTask(taskId);
+
+		const task = this.tasks.get(taskId);
+		if (!task) return;
+
+		task.timeout = setTimeout(async () => {
+			await this.handleTaskTimeout(taskId);
+		}, this.taskRunnersConfig.taskTimeout * Time.seconds.toMilliseconds);
+
 		await this.messageRunner(runner.id, {
 			type: 'broker:tasksettings',
 			taskId,
@@ -393,11 +455,38 @@ export class TaskBroker {
 		});
 	}
 
+	private async handleTaskTimeout(taskId: Task['id']) {
+		const task = this.tasks.get(taskId);
+		if (!task) return;
+
+		if (this.taskRunnersConfig.mode === 'internal') {
+			this.taskRunnerLifecycleEvents.emit('runner:timed-out-during-task');
+		} else if (this.taskRunnersConfig.mode === 'external') {
+			await this.messageRunner(task.runnerId, {
+				type: 'broker:taskcancel',
+				taskId,
+				reason: 'Task execution timed out',
+			});
+		}
+
+		const { taskTimeout, mode } = this.taskRunnersConfig;
+
+		await this.taskErrorHandler(
+			taskId,
+			new TaskRunnerTimeoutError({
+				taskTimeout,
+				isSelfHosted: config.getEnv('deployment.type') !== 'cloud',
+				mode,
+			}),
+		);
+	}
+
 	async taskDoneHandler(taskId: Task['id'], data: TaskResultData) {
 		const task = this.tasks.get(taskId);
-		if (!task) {
-			return;
-		}
+		if (!task) return;
+
+		clearTimeout(task.timeout);
+
 		await this.requesters.get(task.requesterId)?.({
 			type: 'broker:taskdone',
 			taskId: task.id,
@@ -408,9 +497,10 @@ export class TaskBroker {
 
 	async taskErrorHandler(taskId: Task['id'], error: unknown) {
 		const task = this.tasks.get(taskId);
-		if (!task) {
-			return;
-		}
+		if (!task) return;
+
+		clearTimeout(task.timeout);
+
 		await this.requesters.get(task.requesterId)?.({
 			type: 'broker:taskerror',
 			taskId: task.id,
@@ -445,6 +535,11 @@ export class TaskBroker {
 				this.logger.info(`Task (${taskId}) rejected by Runner with reason "${e.reason}"`);
 				return;
 			}
+			if (e instanceof TaskDeferredError) {
+				this.logger.debug(`Task (${taskId}) deferred until runner is ready`);
+				this.pendingTaskRequests.push(request); // will settle on receiving task offer from runner
+				return;
+			}
 			throw e;
 		}
 
@@ -468,10 +563,12 @@ export class TaskBroker {
 		this.pendingTaskRequests.splice(requestIndex, 1);
 
 		try {
-			const acceptPromise = new Promise<RequesterMessage.ToN8n.TaskSettings['settings']>(
+			const acceptPromise = new Promise<RequesterMessage.ToBroker.TaskSettings['settings']>(
 				(resolve, reject) => {
 					this.requesterAcceptRejects.set(taskId, {
-						accept: resolve as (settings: RequesterMessage.ToN8n.TaskSettings['settings']) => void,
+						accept: resolve as (
+							settings: RequesterMessage.ToBroker.TaskSettings['settings'],
+						) => void,
 						reject,
 					});
 
diff --git a/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-builder.test.ts b/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-builder.test.ts
new file mode 100644
index 0000000000..ae01cdd776
--- /dev/null
+++ b/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-builder.test.ts
@@ -0,0 +1,142 @@
+import type { PartialAdditionalData, TaskData } from '@n8n/task-runner';
+import { mock } from 'jest-mock-extended';
+import type {
+	IExecuteContextData,
+	INode,
+	INodeExecutionData,
+	IRunExecutionData,
+	Workflow,
+} from 'n8n-workflow';
+
+import { DataRequestResponseBuilder } from '../data-request-response-builder';
+
+const additionalData = mock<PartialAdditionalData>({
+	formWaitingBaseUrl: 'http://localhost:5678/form-waiting',
+	instanceBaseUrl: 'http://localhost:5678/',
+	restApiUrl: 'http://localhost:5678/rest',
+	variables: {},
+	webhookBaseUrl: 'http://localhost:5678/webhook',
+	webhookTestBaseUrl: 'http://localhost:5678/webhook-test',
+	webhookWaitingBaseUrl: 'http://localhost:5678/webhook-waiting',
+	executionId: '45844',
+	userId: '114984bc-44b3-4dd4-9b54-a4a8d34d51d5',
+	currentNodeParameters: undefined,
+	executionTimeoutTimestamp: undefined,
+	restartExecutionId: undefined,
+});
+
+const node = mock<INode>();
+const outputItems: INodeExecutionData[] = [
+	{
+		json: {
+			uid: 'abb74fd4-bef2-4fae-9d53-ea24e9eb3032',
+			email: 'Dan.Schmidt31@yahoo.com',
+			firstname: 'Toni',
+			lastname: 'Schuster',
+			password: 'Q!D6C2',
+		},
+		pairedItem: {
+			item: 0,
+		},
+	},
+];
+
+const workflow: TaskData['workflow'] = mock<Workflow>({
+	id: '1',
+	name: 'Test Workflow',
+	active: true,
+	connectionsBySourceNode: {},
+	nodes: {},
+	pinData: {},
+	settings: {},
+	staticData: {},
+});
+
+const contextData = mock<IExecuteContextData>();
+const metadata = {
+	'0': [],
+};
+
+const runExecutionData = mock<IRunExecutionData>({
+	executionData: {
+		contextData,
+		metadata,
+		nodeExecutionStack: [
+			{
+				node,
+				data: {
+					main: [outputItems],
+				},
+				source: {},
+			},
+		],
+		waitingExecution: {
+			node: {
+				'0': {
+					main: [],
+				},
+			},
+		},
+		waitingExecutionSource: {},
+	},
+});
+
+const taskData = mock<TaskData>({
+	additionalData,
+	workflow,
+	runExecutionData,
+});
+
+describe('DataRequestResponseBuilder', () => {
+	const builder = new DataRequestResponseBuilder();
+
+	it('picks only specific properties for additional data', () => {
+		const result = builder.buildFromTaskData(taskData);
+
+		expect(result.additionalData).toStrictEqual({
+			formWaitingBaseUrl: 'http://localhost:5678/form-waiting',
+			instanceBaseUrl: 'http://localhost:5678/',
+			restApiUrl: 'http://localhost:5678/rest',
+			variables: additionalData.variables,
+			webhookBaseUrl: 'http://localhost:5678/webhook',
+			webhookTestBaseUrl: 'http://localhost:5678/webhook-test',
+			webhookWaitingBaseUrl: 'http://localhost:5678/webhook-waiting',
+			executionId: '45844',
+			userId: '114984bc-44b3-4dd4-9b54-a4a8d34d51d5',
+			currentNodeParameters: undefined,
+			executionTimeoutTimestamp: undefined,
+			restartExecutionId: undefined,
+		});
+	});
+
+	it('picks only specific properties for workflow', () => {
+		const result = builder.buildFromTaskData(taskData);
+
+		expect(result.workflow).toStrictEqual({
+			id: '1',
+			name: 'Test Workflow',
+			active: true,
+			connections: workflow.connectionsBySourceNode,
+			nodes: [],
+			pinData: workflow.pinData,
+			settings: workflow.settings,
+			staticData: workflow.staticData,
+		});
+	});
+
+	it('clears nodeExecutionStack, waitingExecution and waitingExecutionSource from runExecutionData', () => {
+		const result = builder.buildFromTaskData(taskData);
+
+		expect(result.runExecutionData).toStrictEqual({
+			startData: runExecutionData.startData,
+			resultData: runExecutionData.resultData,
+			executionData: {
+				contextData,
+				metadata,
+				nodeExecutionStack: [],
+				waitingExecution: {},
+				waitingExecutionSource: null,
+			},
+		});
+	});
+});
diff --git a/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-stripper.test.ts b/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-stripper.test.ts
new file mode 100644
index 0000000000..4b27542c4d
--- /dev/null
+++ b/packages/cli/src/task-runners/task-managers/__tests__/data-request-response-stripper.test.ts
@@ -0,0 +1,327 @@
+import type { DataRequestResponse, TaskDataRequestParams } from '@n8n/task-runner';
+import { mock } from 'jest-mock-extended';
+import type { IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+import { type INode, type INodeExecutionData } from 'n8n-workflow';
+
+import { DataRequestResponseStripper } from '../data-request-response-stripper';
+
+const triggerNode: INode = mock<INode>({
+	name: 'Trigger',
+});
+const debugHelperNode: INode = mock<INode>({
+	name: 'DebugHelper',
+});
+const codeNode: INode = mock<INode>({
+	name: 'Code',
+});
+const workflow: DataRequestResponse['workflow'] = mock<DataRequestResponse['workflow']>();
+const debugHelperNodeOutItems: INodeExecutionData[] = [
+	{
+		json: {
+			idx: 0,
+			uid: 'abb74fd4-bef2-4fae-9d53-ea24e9eb3032',
+			email: 'Dan.Schmidt31@yahoo.com',
+			firstname: 'Toni',
+			lastname: 'Schuster',
+			password: 'Q!D6C2',
+		},
+		pairedItem: {
+			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<
+	DataRequestResponse['envProviderState']
+>({
+	env: {},
+	isEnvAccessBlocked: false,
+	isProcessAvailable: true,
+});
+const additionalData = mock<IWorkflowExecuteAdditionalData>({
+	formWaitingBaseUrl: 'http://localhost:5678/form-waiting',
+	instanceBaseUrl: 'http://localhost:5678/',
+	restApiUrl: 'http://localhost:5678/rest',
+	variables: {},
+	webhookBaseUrl: 'http://localhost:5678/webhook',
+	webhookTestBaseUrl: 'http://localhost:5678/webhook-test',
+	webhookWaitingBaseUrl: 'http://localhost:5678/webhook-waiting',
+	executionId: '45844',
+	userId: '114984bc-44b3-4dd4-9b54-a4a8d34d51d5',
+	currentNodeParameters: undefined,
+	executionTimeoutTimestamp: undefined,
+	restartExecutionId: undefined,
+});
+
+/**
+ * Drawn with https://asciiflow.com/#/
+ * Task data for an execution of the following WF:
+ * where ►► denotes the currently being executing node.
+ *																			►►
+ *	┌───────────┐   ┌─────────────┐    ┌────────┐
+ *	│  Trigger  ├──►│ DebugHelper ├───►│  Code  │
+ *	└───────────┘   └─────────────┘    └────────┘
+ */
+const taskData: DataRequestResponse = {
+	workflow,
+	inputData: {
+		main: [codeNodeInputItems],
+	},
+	itemIndex: 0,
+	activeNodeName: codeNode.name,
+	contextNodeName: codeNode.name,
+	defaultReturnRunIndex: -1,
+	mode: 'manual',
+	envProviderState,
+	node: codeNode,
+	runExecutionData: {
+		startData: {
+			destinationNode: codeNode.name,
+			runNodeFilter: [triggerNode.name, debugHelperNode.name, codeNode.name],
+		},
+		resultData: {
+			runData: {
+				[triggerNode.name]: [
+					{
+						hints: [],
+						startTime: 1730313407328,
+						executionTime: 1,
+						source: [],
+						executionStatus: 'success',
+						data: {
+							main: [[]],
+						},
+					},
+				],
+				[debugHelperNode.name]: [
+					{
+						hints: [],
+						startTime: 1730313407330,
+						executionTime: 1,
+						source: [
+							{
+								previousNode: triggerNode.name,
+							},
+						],
+						executionStatus: 'success',
+						data: {
+							main: [debugHelperNodeOutItems],
+						},
+					},
+				],
+			},
+			pinData: {},
+		},
+		executionData: {
+			contextData: {},
+			nodeExecutionStack: [],
+			metadata: {},
+			waitingExecution: {},
+			waitingExecutionSource: {},
+		},
+	},
+	runIndex: 0,
+	selfData: {},
+	siblingParameters: {},
+	connectionInputSource: {
+		main: [
+			{
+				previousNode: debugHelperNode.name,
+				previousNodeOutput: 0,
+			},
+		],
+	},
+	additionalData,
+} as const;
+
+describe('DataRequestResponseStripper', () => {
+	const allDataParam: TaskDataRequestParams = {
+		dataOfNodes: 'all',
+		env: true,
+		input: {
+			include: true,
+		},
+		prevNode: true,
+	};
+
+	const newRequestParam = (opts: Partial<TaskDataRequestParams>) => ({
+		...allDataParam,
+		...opts,
+	});
+
+	describe('all data', () => {
+		it('should build the runExecutionData as is when everything is requested', () => {
+			const dataRequestResponseBuilder = new DataRequestResponseStripper(taskData, allDataParam);
+
+			const { runExecutionData } = dataRequestResponseBuilder.strip();
+
+			expect(runExecutionData).toStrictEqual(taskData.runExecutionData);
+		});
+	});
+
+	describe('envProviderState', () => {
+		it("should filter out envProviderState when it's not requested", () => {
+			const dataRequestResponseBuilder = new DataRequestResponseStripper(
+				taskData,
+				newRequestParam({
+					env: false,
+				}),
+			);
+
+			const result = dataRequestResponseBuilder.strip();
+
+			expect(result.envProviderState).toStrictEqual({
+				env: {},
+				isEnvAccessBlocked: false,
+				isProcessAvailable: true,
+			});
+		});
+	});
+
+	describe('input data', () => {
+		const allExceptInputParam = newRequestParam({
+			input: {
+				include: false,
+			},
+		});
+
+		it('drops input data from result', () => {
+			const result = new DataRequestResponseStripper(taskData, allExceptInputParam).strip();
+
+			expect(result.inputData).toStrictEqual({});
+		});
+
+		it('returns only chunked data', () => {
+			const result = new DataRequestResponseStripper(
+				taskData,
+				newRequestParam({
+					input: {
+						include: true,
+						chunk: {
+							startIndex: 1,
+							count: 1,
+						},
+					},
+				}),
+			).strip();
+
+			expect(result.inputData).toStrictEqual({
+				main: [debugHelperNodeOutItems.slice(1, 2)],
+			});
+		});
+	});
+
+	describe('nodes', () => {
+		it('should return empty run data when only Code node is requested', () => {
+			const result = new DataRequestResponseStripper(
+				taskData,
+				newRequestParam({ dataOfNodes: ['Code'], prevNode: false }),
+			).strip();
+
+			expect(result.runExecutionData.resultData.runData).toStrictEqual({});
+			expect(result.runExecutionData.resultData.pinData).toStrictEqual({});
+			// executionData & startData contain only metadata --> returned as is
+			expect(result.runExecutionData.startData).toStrictEqual(taskData.runExecutionData.startData);
+			expect(result.runExecutionData.executionData).toStrictEqual(
+				taskData.runExecutionData.executionData,
+			);
+		});
+
+		it('should return empty run data when only Code node is requested', () => {
+			const result = new DataRequestResponseStripper(
+				taskData,
+				newRequestParam({ dataOfNodes: [codeNode.name], prevNode: false }),
+			).strip();
+
+			expect(result.runExecutionData.resultData.runData).toStrictEqual({});
+			expect(result.runExecutionData.resultData.pinData).toStrictEqual({});
+			// executionData & startData contain only metadata --> returned as is
+			expect(result.runExecutionData.startData).toStrictEqual(taskData.runExecutionData.startData);
+			expect(result.runExecutionData.executionData).toStrictEqual(
+				taskData.runExecutionData.executionData,
+			);
+		});
+
+		it("should return only DebugHelper's data when only DebugHelper node is requested", () => {
+			const result = new DataRequestResponseStripper(
+				taskData,
+				newRequestParam({ dataOfNodes: [debugHelperNode.name], prevNode: false }),
+			).strip();
+
+			expect(result.runExecutionData.resultData.runData).toStrictEqual({
+				[debugHelperNode.name]: taskData.runExecutionData.resultData.runData[debugHelperNode.name],
+			});
+			expect(result.runExecutionData.resultData.pinData).toStrictEqual({});
+			// executionData & startData contain only metadata --> returned as is
+			expect(result.runExecutionData.startData).toStrictEqual(taskData.runExecutionData.startData);
+			expect(result.runExecutionData.executionData).toStrictEqual(
+				taskData.runExecutionData.executionData,
+			);
+		});
+
+		it("should return DebugHelper's data when only prevNode node is requested", () => {
+			const result = new DataRequestResponseStripper(
+				taskData,
+				newRequestParam({ dataOfNodes: [], prevNode: true }),
+			).strip();
+
+			expect(result.runExecutionData.resultData.runData).toStrictEqual({
+				[debugHelperNode.name]: taskData.runExecutionData.resultData.runData[debugHelperNode.name],
+			});
+			expect(result.runExecutionData.resultData.pinData).toStrictEqual({});
+			// executionData & startData contain only metadata --> returned as is
+			expect(result.runExecutionData.startData).toStrictEqual(taskData.runExecutionData.startData);
+			expect(result.runExecutionData.executionData).toStrictEqual(
+				taskData.runExecutionData.executionData,
+			);
+		});
+	});
+
+	describe('passthrough properties', () => {
+		test.each<Array<keyof DataRequestResponse>>([
+			['workflow'],
+			['connectionInputSource'],
+			['node'],
+			['runIndex'],
+			['itemIndex'],
+			['activeNodeName'],
+			['siblingParameters'],
+			['mode'],
+			['defaultReturnRunIndex'],
+			['selfData'],
+			['contextNodeName'],
+			['additionalData'],
+		])("it doesn't change %s", (propertyName) => {
+			const dataRequestResponseBuilder = new DataRequestResponseStripper(taskData, allDataParam);
+
+			const result = dataRequestResponseBuilder.strip();
+
+			expect(result[propertyName]).toBe(taskData[propertyName]);
+		});
+	});
+});
diff --git a/packages/cli/src/task-runners/task-managers/__tests__/task-manager.test.ts b/packages/cli/src/task-runners/task-managers/__tests__/task-manager.test.ts
new file mode 100644
index 0000000000..3066f25cfd
--- /dev/null
+++ b/packages/cli/src/task-runners/task-managers/__tests__/task-manager.test.ts
@@ -0,0 +1,136 @@
+import { mock } from 'jest-mock-extended';
+import { get, set } from 'lodash';
+
+import type { NodeTypes } from '@/node-types';
+import type { Task } from '@/task-runners/task-managers/task-requester';
+import { TaskRequester } from '@/task-runners/task-managers/task-requester';
+
+class TestTaskRequester extends TaskRequester {
+	sentMessages: unknown[] = [];
+
+	sendMessage(message: unknown) {
+		this.sentMessages.push(message);
+	}
+}
+
+describe('TaskRequester', () => {
+	let instance: TestTaskRequester;
+	const mockNodeTypes = mock<NodeTypes>();
+
+	beforeEach(() => {
+		instance = new TestTaskRequester(mockNodeTypes);
+	});
+
+	describe('handleRpc', () => {
+		test.each([
+			['logNodeOutput', ['hello world']],
+			['helpers.assertBinaryData', [0, 'propertyName']],
+			['helpers.getBinaryDataBuffer', [0, 'propertyName']],
+			['helpers.prepareBinaryData', [Buffer.from('data').toJSON(), 'filename', 'mimetype']],
+			['helpers.setBinaryDataBuffer', [{ data: '123' }, Buffer.from('data').toJSON()]],
+			['helpers.binaryToString', [Buffer.from('data').toJSON(), 'utf8']],
+			['helpers.httpRequest', [{ url: 'http://localhost' }]],
+		])('should handle %s rpc call', async (methodName, args) => {
+			const executeFunctions = set({}, methodName.split('.'), jest.fn());
+
+			const mockTask = mock<Task>({
+				taskId: 'taskId',
+				data: {
+					executeFunctions,
+				},
+			});
+			instance.tasks.set('taskId', mockTask);
+
+			await instance.handleRpc('taskId', 'callId', methodName, args);
+
+			expect(instance.sentMessages).toEqual([
+				{
+					callId: 'callId',
+					data: undefined,
+					status: 'success',
+					taskId: 'taskId',
+					type: 'requester:rpcresponse',
+				},
+			]);
+			expect(get(executeFunctions, methodName.split('.'))).toHaveBeenCalledWith(...args);
+		});
+
+		it('converts any serialized buffer arguments into buffers', async () => {
+			const mockPrepareBinaryData = jest.fn().mockResolvedValue(undefined);
+			const mockTask = mock<Task>({
+				taskId: 'taskId',
+				data: {
+					executeFunctions: {
+						helpers: {
+							prepareBinaryData: mockPrepareBinaryData,
+						},
+					},
+				},
+			});
+			instance.tasks.set('taskId', mockTask);
+
+			await instance.handleRpc('taskId', 'callId', 'helpers.prepareBinaryData', [
+				Buffer.from('data').toJSON(),
+				'filename',
+				'mimetype',
+			]);
+
+			expect(mockPrepareBinaryData).toHaveBeenCalledWith(
+				Buffer.from('data'),
+				'filename',
+				'mimetype',
+			);
+		});
+
+		describe('errors', () => {
+			it('sends method not allowed error if method is not in the allow list', async () => {
+				const mockTask = mock<Task>({
+					taskId: 'taskId',
+					data: {
+						executeFunctions: {},
+					},
+				});
+				instance.tasks.set('taskId', mockTask);
+
+				await instance.handleRpc('taskId', 'callId', 'notAllowedMethod', []);
+
+				expect(instance.sentMessages).toEqual([
+					{
+						callId: 'callId',
+						data: 'Method not allowed',
+						status: 'error',
+						taskId: 'taskId',
+						type: 'requester:rpcresponse',
+					},
+				]);
+			});
+
+			it('sends error if method throws', async () => {
+				const error = new Error('Test error');
+				const mockTask = mock<Task>({
+					taskId: 'taskId',
+					data: {
+						executeFunctions: {
+							helpers: {
+								assertBinaryData: jest.fn().mockRejectedValue(error),
+							},
+						},
+					},
+				});
+				instance.tasks.set('taskId', mockTask);
+
+				await instance.handleRpc('taskId', 'callId', 'helpers.assertBinaryData', []);
+
+				expect(instance.sentMessages).toEqual([
+					{
+						callId: 'callId',
+						data: error,
+						status: 'error',
+						taskId: 'taskId',
+						type: 'requester:rpcresponse',
+					},
+				]);
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/task-runners/task-managers/data-request-response-builder.ts b/packages/cli/src/task-runners/task-managers/data-request-response-builder.ts
new file mode 100644
index 0000000000..7809a94a8d
--- /dev/null
+++ b/packages/cli/src/task-runners/task-managers/data-request-response-builder.ts
@@ -0,0 +1,86 @@
+import type { DataRequestResponse, PartialAdditionalData, TaskData } from '@n8n/task-runner';
+import type {
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowParameters,
+} from 'n8n-workflow';
+
+/**
+ * Transforms TaskData to DataRequestResponse. The main purpose of the
+ * transformation is to make sure there is no duplication in the data
+ * (e.g. connectionInputData and executeData.data can be derived from
+ * inputData).
+ */
+export class DataRequestResponseBuilder {
+	buildFromTaskData(taskData: TaskData): DataRequestResponse {
+		return {
+			workflow: this.buildWorkflow(taskData.workflow),
+			inputData: taskData.inputData,
+			connectionInputSource: taskData.executeData?.source ?? null,
+			itemIndex: taskData.itemIndex,
+			activeNodeName: taskData.activeNodeName,
+			contextNodeName: taskData.contextNodeName,
+			defaultReturnRunIndex: taskData.defaultReturnRunIndex,
+			mode: taskData.mode,
+			envProviderState: taskData.envProviderState,
+			node: taskData.node,
+			runExecutionData: this.buildRunExecutionData(taskData.runExecutionData),
+			runIndex: taskData.runIndex,
+			selfData: taskData.selfData,
+			siblingParameters: taskData.siblingParameters,
+			additionalData: this.buildAdditionalData(taskData.additionalData),
+		};
+	}
+
+	private buildAdditionalData(
+		additionalData: IWorkflowExecuteAdditionalData,
+	): PartialAdditionalData {
+		return {
+			formWaitingBaseUrl: additionalData.formWaitingBaseUrl,
+			instanceBaseUrl: additionalData.instanceBaseUrl,
+			restApiUrl: additionalData.restApiUrl,
+			variables: additionalData.variables,
+			webhookBaseUrl: additionalData.webhookBaseUrl,
+			webhookTestBaseUrl: additionalData.webhookTestBaseUrl,
+			webhookWaitingBaseUrl: additionalData.webhookWaitingBaseUrl,
+			currentNodeParameters: additionalData.currentNodeParameters,
+			executionId: additionalData.executionId,
+			executionTimeoutTimestamp: additionalData.executionTimeoutTimestamp,
+			restartExecutionId: additionalData.restartExecutionId,
+			userId: additionalData.userId,
+		};
+	}
+
+	private buildWorkflow(workflow: Workflow): Omit<WorkflowParameters, 'nodeTypes'> {
+		return {
+			id: workflow.id,
+			name: workflow.name,
+			active: workflow.active,
+			connections: workflow.connectionsBySourceNode,
+			nodes: Object.values(workflow.nodes),
+			pinData: workflow.pinData,
+			settings: workflow.settings,
+			staticData: workflow.staticData,
+		};
+	}
+
+	private buildRunExecutionData(runExecutionData: IRunExecutionData) {
+		return {
+			startData: runExecutionData.startData,
+			resultData: runExecutionData.resultData,
+			executionData: runExecutionData.executionData
+				? {
+						contextData: runExecutionData.executionData.contextData,
+						metadata: runExecutionData.executionData.metadata,
+
+						// These are related to workflow execution and are not something
+						// that are accessible by nodes, so we always omit them
+						nodeExecutionStack: [],
+						waitingExecution: {},
+						waitingExecutionSource: null,
+					}
+				: undefined,
+		};
+	}
+}
diff --git a/packages/cli/src/task-runners/task-managers/data-request-response-stripper.ts b/packages/cli/src/task-runners/task-managers/data-request-response-stripper.ts
new file mode 100644
index 0000000000..8acfd26c7b
--- /dev/null
+++ b/packages/cli/src/task-runners/task-managers/data-request-response-stripper.ts
@@ -0,0 +1,144 @@
+import type { DataRequestResponse, BrokerMessage } from '@n8n/task-runner';
+import type {
+	EnvProviderState,
+	IPinData,
+	IRunData,
+	IRunExecutionData,
+	ITaskDataConnections,
+} from 'n8n-workflow';
+import * as a from 'node:assert/strict';
+
+/**
+ * Strips data from data request response based on the specified parameters
+ */
+export class DataRequestResponseStripper {
+	private requestedNodeNames = new Set<string>();
+
+	constructor(
+		private readonly dataResponse: DataRequestResponse,
+		private readonly stripParams: BrokerMessage.ToRequester.TaskDataRequest['requestParams'],
+	) {
+		this.requestedNodeNames = new Set(stripParams.dataOfNodes);
+
+		if (this.stripParams.prevNode && this.stripParams.dataOfNodes !== 'all') {
+			this.requestedNodeNames.add(this.determinePrevNodeName());
+		}
+	}
+
+	/**
+	 * Builds a response to the data request
+	 */
+	strip(): DataRequestResponse {
+		const { dataResponse: dr } = this;
+
+		return {
+			...dr,
+			inputData: this.stripInputData(dr.inputData),
+			envProviderState: this.stripEnvProviderState(dr.envProviderState),
+			runExecutionData: this.stripRunExecutionData(dr.runExecutionData),
+		};
+	}
+
+	private stripRunExecutionData(runExecutionData: IRunExecutionData): IRunExecutionData {
+		if (this.stripParams.dataOfNodes === 'all') {
+			return runExecutionData;
+		}
+
+		return {
+			startData: runExecutionData.startData,
+			resultData: {
+				error: runExecutionData.resultData.error,
+				lastNodeExecuted: runExecutionData.resultData.lastNodeExecuted,
+				metadata: runExecutionData.resultData.metadata,
+				runData: this.stripRunData(runExecutionData.resultData.runData),
+				pinData: this.stripPinData(runExecutionData.resultData.pinData),
+			},
+			// TODO: We could send `runExecutionData.contextData` only if requested,
+			// since it's only needed if $input.context or $("node").context is used.
+			executionData: runExecutionData.executionData,
+		};
+	}
+
+	private stripRunData(runData: IRunData): IRunData {
+		return this.filterObjectByNodeNames(runData);
+	}
+
+	private stripPinData(pinData: IPinData | undefined): IPinData | undefined {
+		return pinData ? this.filterObjectByNodeNames(pinData) : undefined;
+	}
+
+	private stripEnvProviderState(envProviderState: EnvProviderState): EnvProviderState {
+		if (this.stripParams.env) {
+			// In case `isEnvAccessBlocked` = true, the provider state has already sanitized
+			// the environment variables and we can return it as is.
+			return envProviderState;
+		}
+
+		return {
+			env: {},
+			isEnvAccessBlocked: envProviderState.isEnvAccessBlocked,
+			isProcessAvailable: envProviderState.isProcessAvailable,
+		};
+	}
+
+	private stripInputData(inputData: ITaskDataConnections): ITaskDataConnections {
+		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;
+		}
+
+		// 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;
+	}
+
+	/**
+	 * Assuming the given `obj` is an object where the keys are node names,
+	 * filters the object to only include the node names that are requested.
+	 */
+	private filterObjectByNodeNames<T extends Record<string, unknown>>(obj: T): T {
+		if (this.stripParams.dataOfNodes === 'all') {
+			return obj;
+		}
+
+		const filteredObj: T = {} as T;
+
+		for (const nodeName in obj) {
+			if (!Object.prototype.hasOwnProperty.call(obj, nodeName)) {
+				continue;
+			}
+
+			if (this.requestedNodeNames.has(nodeName)) {
+				filteredObj[nodeName] = obj[nodeName];
+			}
+		}
+
+		return filteredObj;
+	}
+
+	private determinePrevNodeName(): string {
+		const sourceData = this.dataResponse.connectionInputSource?.main?.[0];
+		if (!sourceData) {
+			return '';
+		}
+
+		return sourceData.previousNode;
+	}
+}
diff --git a/packages/cli/src/runners/task-managers/local-task-manager.ts b/packages/cli/src/task-runners/task-managers/local-task-requester.ts
similarity index 51%
rename from packages/cli/src/runners/task-managers/local-task-manager.ts
rename to packages/cli/src/task-runners/task-managers/local-task-requester.ts
index a8fca01b2c..1de959936b 100644
--- a/packages/cli/src/runners/task-managers/local-task-manager.ts
+++ b/packages/cli/src/task-runners/task-managers/local-task-requester.ts
@@ -1,17 +1,20 @@
-import Container from 'typedi';
+import { Container, Service } from '@n8n/di';
+import type { RequesterMessage } from '@n8n/task-runner';
 
-import { TaskManager } from './task-manager';
-import type { RequesterMessage } from '../runner-types';
+import { NodeTypes } from '@/node-types';
+
+import { TaskRequester } from './task-requester';
 import type { RequesterMessageCallback } from '../task-broker.service';
 import { TaskBroker } from '../task-broker.service';
 
-export class LocalTaskManager extends TaskManager {
+@Service()
+export class LocalTaskRequester extends TaskRequester {
 	taskBroker: TaskBroker;
 
-	id: string = 'single-main';
+	id = 'local-task-requester';
 
-	constructor() {
-		super();
+	constructor(nodeTypes: NodeTypes) {
+		super(nodeTypes);
 		this.registerRequester();
 	}
 
@@ -24,7 +27,7 @@ export class LocalTaskManager extends TaskManager {
 		);
 	}
 
-	sendMessage(message: RequesterMessage.ToN8n.All) {
+	sendMessage(message: RequesterMessage.ToBroker.All) {
 		void this.taskBroker.onRequesterMessage(this.id, message);
 	}
 }
diff --git a/packages/cli/src/runners/task-managers/task-manager.ts b/packages/cli/src/task-runners/task-managers/task-requester.ts
similarity index 61%
rename from packages/cli/src/runners/task-managers/task-manager.ts
rename to packages/cli/src/task-runners/task-managers/task-requester.ts
index 58d8ade906..8124df8e13 100644
--- a/packages/cli/src/runners/task-managers/task-manager.ts
+++ b/packages/cli/src/task-runners/task-managers/task-requester.ts
@@ -1,29 +1,29 @@
-import {
-	type EnvProviderState,
-	type IExecuteFunctions,
-	type Workflow,
-	type IRunExecutionData,
-	type INodeExecutionData,
-	type ITaskDataConnections,
-	type INode,
-	type WorkflowParameters,
-	type INodeParameters,
-	type WorkflowExecuteMode,
-	type IExecuteData,
-	type IDataObject,
-	type IWorkflowExecuteAdditionalData,
-	type Result,
-	createResultOk,
-	createResultError,
+import { Service } from '@n8n/di';
+import type { TaskResultData, RequesterMessage, BrokerMessage, TaskData } from '@n8n/task-runner';
+import { AVAILABLE_RPC_METHODS } from '@n8n/task-runner';
+import { isSerializedBuffer, toBuffer } from 'n8n-core';
+import { createResultOk, createResultError } from 'n8n-workflow';
+import type {
+	EnvProviderState,
+	IExecuteFunctions,
+	Workflow,
+	IRunExecutionData,
+	INodeExecutionData,
+	ITaskDataConnections,
+	INode,
+	INodeParameters,
+	WorkflowExecuteMode,
+	IExecuteData,
+	IDataObject,
+	IWorkflowExecuteAdditionalData,
+	Result,
 } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
-import {
-	RPC_ALLOW_LIST,
-	type TaskResultData,
-	type N8nMessage,
-	type RequesterMessage,
-} from '../runner-types';
+import { NodeTypes } from '@/node-types';
+
+import { DataRequestResponseBuilder } from './data-request-response-builder';
+import { DataRequestResponseStripper } from './data-request-response-stripper';
 
 export type RequestAccept = (jobId: string) => void;
 export type RequestReject = (reason: string) => void;
@@ -31,62 +31,6 @@ export type RequestReject = (reason: string) => void;
 export type TaskAccept = (data: TaskResultData) => void;
 export type TaskReject = (error: unknown) => void;
 
-export interface TaskData {
-	executeFunctions: IExecuteFunctions;
-	inputData: ITaskDataConnections;
-	node: INode;
-
-	workflow: Workflow;
-	runExecutionData: IRunExecutionData;
-	runIndex: number;
-	itemIndex: number;
-	activeNodeName: string;
-	connectionInputData: INodeExecutionData[];
-	siblingParameters: INodeParameters;
-	mode: WorkflowExecuteMode;
-	envProviderState: EnvProviderState;
-	executeData?: IExecuteData;
-	defaultReturnRunIndex: number;
-	selfData: IDataObject;
-	contextNodeName: string;
-	additionalData: IWorkflowExecuteAdditionalData;
-}
-
-export interface PartialAdditionalData {
-	executionId?: string;
-	restartExecutionId?: string;
-	restApiUrl: string;
-	instanceBaseUrl: string;
-	formWaitingBaseUrl: string;
-	webhookBaseUrl: string;
-	webhookWaitingBaseUrl: string;
-	webhookTestBaseUrl: string;
-	currentNodeParameters?: INodeParameters;
-	executionTimeoutTimestamp?: number;
-	userId?: string;
-	variables: IDataObject;
-}
-
-export interface AllCodeTaskData {
-	workflow: Omit<WorkflowParameters, 'nodeTypes'>;
-	inputData: ITaskDataConnections;
-	node: INode;
-
-	runExecutionData: IRunExecutionData;
-	runIndex: number;
-	itemIndex: number;
-	activeNodeName: string;
-	connectionInputData: INodeExecutionData[];
-	siblingParameters: INodeParameters;
-	mode: WorkflowExecuteMode;
-	envProviderState: EnvProviderState;
-	executeData?: IExecuteData;
-	defaultReturnRunIndex: number;
-	selfData: IDataObject;
-	contextNodeName: string;
-	additionalData: PartialAdditionalData;
-}
-
 export interface TaskRequest {
 	requestId: string;
 	taskType: string;
@@ -104,20 +48,8 @@ interface ExecuteFunctionObject {
 	[name: string]: ((...args: unknown[]) => unknown) | ExecuteFunctionObject;
 }
 
-const workflowToParameters = (workflow: Workflow): Omit<WorkflowParameters, 'nodeTypes'> => {
-	return {
-		id: workflow.id,
-		name: workflow.name,
-		active: workflow.active,
-		connections: workflow.connectionsBySourceNode,
-		nodes: Object.values(workflow.nodes),
-		pinData: workflow.pinData,
-		settings: workflow.settings,
-		staticData: workflow.staticData,
-	};
-};
-
-export class TaskManager {
+@Service()
+export abstract class TaskRequester {
 	requestAcceptRejects: Map<string, { accept: RequestAccept; reject: RequestReject }> = new Map();
 
 	taskAcceptRejects: Map<string, { accept: TaskAccept; reject: TaskReject }> = new Map();
@@ -126,6 +58,10 @@ export class TaskManager {
 
 	tasks: Map<string, Task> = new Map();
 
+	private readonly dataResponseBuilder = new DataRequestResponseBuilder();
+
+	constructor(private readonly nodeTypes: NodeTypes) {}
+
 	async startTask<TData, TError>(
 		additionalData: IWorkflowExecuteAdditionalData,
 		taskType: string,
@@ -223,6 +159,11 @@ export class TaskManager {
 				});
 			}
 
+			const { staticData: incomingStaticData } = resultData;
+
+			// if the runner sent back static data, then it changed, so update it
+			if (incomingStaticData) workflow.overrideStaticData(incomingStaticData);
+
 			return createResultOk(resultData.result as TData);
 		} catch (e: unknown) {
 			return createResultError(e as TError);
@@ -231,9 +172,9 @@ export class TaskManager {
 		}
 	}
 
-	sendMessage(_message: RequesterMessage.ToN8n.All) {}
+	sendMessage(_message: RequesterMessage.ToBroker.All) {}
 
-	onMessage(message: N8nMessage.ToRequester.All) {
+	onMessage(message: BrokerMessage.ToRequester.All) {
 		switch (message.type) {
 			case 'broker:taskready':
 				this.taskReady(message.requestId, message.taskId);
@@ -245,7 +186,10 @@ export class TaskManager {
 				this.taskError(message.taskId, message.error);
 				break;
 			case 'broker:taskdatarequest':
-				this.sendTaskData(message.taskId, message.requestId, message.requestType);
+				this.sendTaskData(message.taskId, message.requestId, message.requestParams);
+				break;
+			case 'broker:nodetypesrequest':
+				this.sendNodeTypes(message.taskId, message.requestId, message.requestParams);
 				break;
 			case 'broker:rpc':
 				void this.handleRpc(message.taskId, message.callId, message.name, message.params);
@@ -294,60 +238,48 @@ export class TaskManager {
 	sendTaskData(
 		taskId: string,
 		requestId: string,
-		requestType: N8nMessage.ToRequester.TaskDataRequest['requestType'],
+		requestParams: BrokerMessage.ToRequester.TaskDataRequest['requestParams'],
 	) {
 		const job = this.tasks.get(taskId);
 		if (!job) {
 			// TODO: logging
 			return;
 		}
-		if (requestType === 'all') {
-			const jd = job.data;
-			const ad = jd.additionalData;
-			const data: AllCodeTaskData = {
-				workflow: workflowToParameters(jd.workflow),
-				connectionInputData: jd.connectionInputData,
-				inputData: jd.inputData,
-				itemIndex: jd.itemIndex,
-				activeNodeName: jd.activeNodeName,
-				contextNodeName: jd.contextNodeName,
-				defaultReturnRunIndex: jd.defaultReturnRunIndex,
-				mode: jd.mode,
-				envProviderState: jd.envProviderState,
-				node: jd.node,
-				runExecutionData: jd.runExecutionData,
-				runIndex: jd.runIndex,
-				selfData: jd.selfData,
-				siblingParameters: jd.siblingParameters,
-				executeData: jd.executeData,
-				additionalData: {
-					formWaitingBaseUrl: ad.formWaitingBaseUrl,
-					instanceBaseUrl: ad.instanceBaseUrl,
-					restApiUrl: ad.restApiUrl,
-					variables: ad.variables,
-					webhookBaseUrl: ad.webhookBaseUrl,
-					webhookTestBaseUrl: ad.webhookTestBaseUrl,
-					webhookWaitingBaseUrl: ad.webhookWaitingBaseUrl,
-					currentNodeParameters: ad.currentNodeParameters,
-					executionId: ad.executionId,
-					executionTimeoutTimestamp: ad.executionTimeoutTimestamp,
-					restartExecutionId: ad.restartExecutionId,
-					userId: ad.userId,
-				},
-			};
-			this.sendMessage({
-				type: 'requester:taskdataresponse',
-				taskId,
-				requestId,
-				data,
-			});
-		}
+
+		const dataRequestResponse = this.dataResponseBuilder.buildFromTaskData(job.data);
+
+		const strippedData = new DataRequestResponseStripper(
+			dataRequestResponse,
+			requestParams,
+		).strip();
+
+		this.sendMessage({
+			type: 'requester:taskdataresponse',
+			taskId,
+			requestId,
+			data: strippedData,
+		});
+	}
+
+	sendNodeTypes(
+		taskId: string,
+		requestId: string,
+		neededNodeTypes: BrokerMessage.ToRequester.NodeTypesRequest['requestParams'],
+	) {
+		const nodeTypes = this.nodeTypes.getNodeTypeDescriptions(neededNodeTypes);
+
+		this.sendMessage({
+			type: 'requester:nodetypesresponse',
+			taskId,
+			requestId,
+			nodeTypes,
+		});
 	}
 
 	async handleRpc(
 		taskId: string,
 		callId: string,
-		name: N8nMessage.ToRequester.RPC['name'],
+		name: BrokerMessage.ToRequester.RPC['name'],
 		params: unknown[],
 	) {
 		const job = this.tasks.get(taskId);
@@ -357,7 +289,7 @@ export class TaskManager {
 		}
 
 		try {
-			if (!RPC_ALLOW_LIST.includes(name)) {
+			if (!AVAILABLE_RPC_METHODS.includes(name)) {
 				this.sendMessage({
 					type: 'requester:rpcresponse',
 					taskId,
@@ -391,6 +323,15 @@ export class TaskManager {
 				});
 				return;
 			}
+
+			// Convert any serialized buffers back to buffers
+			for (let i = 0; i < params.length; i++) {
+				const paramValue = params[i];
+				if (isSerializedBuffer(paramValue)) {
+					params[i] = toBuffer(paramValue);
+				}
+			}
+
 			const data = (await func.call(funcs, ...params)) as unknown;
 
 			this.sendMessage({
diff --git a/packages/cli/src/task-runners/task-runner-lifecycle-events.ts b/packages/cli/src/task-runners/task-runner-lifecycle-events.ts
new file mode 100644
index 0000000000..f269caeb64
--- /dev/null
+++ b/packages/cli/src/task-runners/task-runner-lifecycle-events.ts
@@ -0,0 +1,11 @@
+import { Service } from '@n8n/di';
+
+import { TypedEmitter } from '@/typed-emitter';
+
+type TaskRunnerLifecycleEventMap = {
+	'runner:failed-heartbeat-check': never;
+	'runner:timed-out-during-task': never;
+};
+
+@Service()
+export class TaskRunnerLifecycleEvents extends TypedEmitter<TaskRunnerLifecycleEventMap> {}
diff --git a/packages/cli/src/task-runners/task-runner-module.ts b/packages/cli/src/task-runners/task-runner-module.ts
new file mode 100644
index 0000000000..bcc54f653f
--- /dev/null
+++ b/packages/cli/src/task-runners/task-runner-module.ts
@@ -0,0 +1,126 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
+import { ErrorReporter, Logger } from 'n8n-core';
+import { sleep } from 'n8n-workflow';
+import * as a from 'node:assert/strict';
+
+import { OnShutdown } from '@/decorators/on-shutdown';
+import type { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error';
+import type { TaskRunnerProcess } from '@/task-runners/task-runner-process';
+import { TaskRunnerProcessRestartLoopDetector } from '@/task-runners/task-runner-process-restart-loop-detector';
+
+import { MissingAuthTokenError } from './errors/missing-auth-token.error';
+import type { LocalTaskRequester } from './task-managers/local-task-requester';
+import type { TaskRunnerServer } from './task-runner-server';
+import { TaskRunnerWsServer } from './task-runner-ws-server';
+
+/**
+ * Module responsible for loading and starting task runner. Task runner can be
+ * run either internally (=launched by n8n as a child process) or externally
+ * (=launched by some other orchestrator)
+ */
+@Service()
+export class TaskRunnerModule {
+	private taskRunnerHttpServer: TaskRunnerServer | undefined;
+
+	private taskRunnerWsServer: TaskRunnerWsServer | undefined;
+
+	private taskRequester: LocalTaskRequester | undefined;
+
+	private taskRunnerProcess: TaskRunnerProcess | undefined;
+
+	private taskRunnerProcessRestartLoopDetector: TaskRunnerProcessRestartLoopDetector | undefined;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
+		private readonly runnerConfig: TaskRunnersConfig,
+	) {
+		this.logger = this.logger.scoped('task-runner');
+	}
+
+	async start() {
+		a.ok(this.runnerConfig.enabled, 'Task runner is disabled');
+
+		const { mode, authToken } = this.runnerConfig;
+
+		if (mode === 'external' && !authToken) throw new MissingAuthTokenError();
+
+		await this.loadTaskRequester();
+		await this.loadTaskRunnerServer();
+
+		if (mode === 'internal') {
+			await this.startInternalTaskRunner();
+		}
+	}
+
+	@OnShutdown()
+	async stop() {
+		const stopRunnerProcessTask = (async () => {
+			if (this.taskRunnerProcess) {
+				await this.taskRunnerProcess.stop();
+				this.taskRunnerProcess = undefined;
+			}
+		})();
+
+		const stopRunnerServerTask = (async () => {
+			if (this.taskRunnerHttpServer) {
+				await this.taskRunnerHttpServer.stop();
+				this.taskRunnerHttpServer = undefined;
+			}
+		})();
+
+		await Promise.all([stopRunnerProcessTask, stopRunnerServerTask]);
+	}
+
+	private async loadTaskRequester() {
+		const { TaskRequester } = await import('@/task-runners/task-managers/task-requester');
+		const { LocalTaskRequester } = await import(
+			'@/task-runners/task-managers/local-task-requester'
+		);
+		this.taskRequester = Container.get(LocalTaskRequester);
+		Container.set(TaskRequester, this.taskRequester);
+	}
+
+	private async loadTaskRunnerServer() {
+		// These are imported dynamically because we need to set the task manager
+		// instance before importing them
+		const { TaskRunnerServer } = await import('@/task-runners/task-runner-server');
+		this.taskRunnerHttpServer = Container.get(TaskRunnerServer);
+		this.taskRunnerWsServer = Container.get(TaskRunnerWsServer);
+
+		await this.taskRunnerHttpServer.start();
+	}
+
+	private async startInternalTaskRunner() {
+		a.ok(this.taskRunnerWsServer, 'Task Runner WS Server not loaded');
+
+		const { TaskRunnerProcess } = await import('@/task-runners/task-runner-process');
+		this.taskRunnerProcess = Container.get(TaskRunnerProcess);
+		this.taskRunnerProcessRestartLoopDetector = new TaskRunnerProcessRestartLoopDetector(
+			this.taskRunnerProcess,
+		);
+		this.taskRunnerProcessRestartLoopDetector.on(
+			'restart-loop-detected',
+			this.onRunnerRestartLoopDetected,
+		);
+
+		await this.taskRunnerProcess.start();
+
+		const { InternalTaskRunnerDisconnectAnalyzer } = await import(
+			'@/task-runners/internal-task-runner-disconnect-analyzer'
+		);
+		this.taskRunnerWsServer.setDisconnectAnalyzer(
+			Container.get(InternalTaskRunnerDisconnectAnalyzer),
+		);
+	}
+
+	private onRunnerRestartLoopDetected = async (error: TaskRunnerRestartLoopError) => {
+		this.logger.error(error.message);
+		this.errorReporter.error(error);
+
+		// Allow some time for the error to be flushed
+		await sleep(1000);
+		process.exit(1);
+	};
+}
diff --git a/packages/cli/src/task-runners/task-runner-process-restart-loop-detector.ts b/packages/cli/src/task-runners/task-runner-process-restart-loop-detector.ts
new file mode 100644
index 0000000000..f816c97c00
--- /dev/null
+++ b/packages/cli/src/task-runners/task-runner-process-restart-loop-detector.ts
@@ -0,0 +1,73 @@
+import { Time } from '@/constants';
+import { TaskRunnerRestartLoopError } from '@/task-runners/errors/task-runner-restart-loop-error';
+import type { TaskRunnerProcess } from '@/task-runners/task-runner-process';
+import { TypedEmitter } from '@/typed-emitter';
+
+const MAX_RESTARTS = 5;
+const RESTARTS_WINDOW = 2 * Time.seconds.toMilliseconds;
+
+type TaskRunnerProcessRestartLoopDetectorEventMap = {
+	'restart-loop-detected': TaskRunnerRestartLoopError;
+};
+
+/**
+ * A class to monitor the task runner process for restart loops
+ */
+export class TaskRunnerProcessRestartLoopDetector extends TypedEmitter<TaskRunnerProcessRestartLoopDetectorEventMap> {
+	/**
+	 * How many times the process needs to restart for it to be detected
+	 * being in a loop.
+	 */
+	private readonly maxCount = MAX_RESTARTS;
+
+	/**
+	 * The time interval in which the process needs to restart `maxCount` times
+	 * to be detected as being in a loop.
+	 */
+	private readonly restartsWindow = RESTARTS_WINDOW;
+
+	private numRestarts = 0;
+
+	/** Time when the first restart of a loop happened within a time window */
+	private firstRestartedAt = Date.now();
+
+	constructor(private readonly taskRunnerProcess: TaskRunnerProcess) {
+		super();
+
+		this.taskRunnerProcess.on('exit', () => {
+			this.increment();
+
+			if (this.isMaxCountExceeded()) {
+				this.emit(
+					'restart-loop-detected',
+					new TaskRunnerRestartLoopError(this.numRestarts, this.msSinceFirstIncrement()),
+				);
+			}
+		});
+	}
+
+	/**
+	 * Increments the counter
+	 */
+	private increment() {
+		const now = Date.now();
+		if (now > this.firstRestartedAt + this.restartsWindow) {
+			this.reset();
+		}
+
+		this.numRestarts++;
+	}
+
+	private reset() {
+		this.numRestarts = 0;
+		this.firstRestartedAt = Date.now();
+	}
+
+	private isMaxCountExceeded() {
+		return this.numRestarts >= this.maxCount;
+	}
+
+	private msSinceFirstIncrement() {
+		return Date.now() - this.firstRestartedAt;
+	}
+}
diff --git a/packages/cli/src/task-runners/task-runner-process.ts b/packages/cli/src/task-runners/task-runner-process.ts
new file mode 100644
index 0000000000..a657a35e5b
--- /dev/null
+++ b/packages/cli/src/task-runners/task-runner-process.ts
@@ -0,0 +1,191 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
+import * as a from 'node:assert/strict';
+import { spawn } from 'node:child_process';
+import * as process from 'node:process';
+
+import { OnShutdown } from '@/decorators/on-shutdown';
+
+import { TaskRunnerAuthService } from './auth/task-runner-auth.service';
+import { forwardToLogger } from './forward-to-logger';
+import { NodeProcessOomDetector } from './node-process-oom-detector';
+import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
+import { TypedEmitter } from '../typed-emitter';
+
+type ChildProcess = ReturnType<typeof spawn>;
+
+export type ExitReason = 'unknown' | 'oom';
+
+export type TaskRunnerProcessEventMap = {
+	exit: {
+		reason: ExitReason;
+	};
+};
+
+/**
+ * Manages the JS task runner process as a child process
+ */
+@Service()
+export class TaskRunnerProcess extends TypedEmitter<TaskRunnerProcessEventMap> {
+	get isRunning() {
+		return this.process !== null;
+	}
+
+	/** The process ID of the task runner process */
+	get pid() {
+		return this.process?.pid;
+	}
+
+	/** Promise that resolves when the process has exited */
+	get runPromise() {
+		return this._runPromise;
+	}
+
+	private process: ChildProcess | null = null;
+
+	private _runPromise: Promise<void> | null = null;
+
+	private oomDetector: NodeProcessOomDetector | null = null;
+
+	private isShuttingDown = false;
+
+	private logger: Logger;
+
+	private readonly passthroughEnvVars = [
+		'PATH',
+		'GENERIC_TIMEZONE',
+		'NODE_FUNCTION_ALLOW_BUILTIN',
+		'NODE_FUNCTION_ALLOW_EXTERNAL',
+		'N8N_SENTRY_DSN',
+		// Metadata about the environment
+		'N8N_VERSION',
+		'ENVIRONMENT',
+		'DEPLOYMENT_NAME',
+	] as const;
+
+	constructor(
+		logger: Logger,
+		private readonly runnerConfig: TaskRunnersConfig,
+		private readonly authService: TaskRunnerAuthService,
+		private readonly runnerLifecycleEvents: TaskRunnerLifecycleEvents,
+	) {
+		super();
+
+		a.ok(
+			this.runnerConfig.mode !== 'external',
+			'Task Runner Process cannot be used in external mode',
+		);
+
+		this.logger = logger.scoped('task-runner');
+
+		this.runnerLifecycleEvents.on('runner:failed-heartbeat-check', () => {
+			this.logger.warn('Task runner failed heartbeat check, restarting...');
+			void this.forceRestart();
+		});
+
+		this.runnerLifecycleEvents.on('runner:timed-out-during-task', () => {
+			this.logger.warn('Task runner timed out during task, restarting...');
+			void this.forceRestart();
+		});
+	}
+
+	async start() {
+		a.ok(!this.process, 'Task Runner Process already running');
+
+		const grantToken = await this.authService.createGrantToken();
+
+		const taskBrokerUri = `http://127.0.0.1:${this.runnerConfig.port}`;
+		this.process = this.startNode(grantToken, taskBrokerUri);
+
+		forwardToLogger(this.logger, this.process, '[Task Runner]: ');
+
+		this.monitorProcess(this.process);
+	}
+
+	startNode(grantToken: string, taskBrokerUri: string) {
+		const startScript = require.resolve('@n8n/task-runner/start');
+
+		return spawn(
+			'node',
+			['--disallow-code-generation-from-strings', '--disable-proto=delete', startScript],
+			{
+				env: this.getProcessEnvVars(grantToken, taskBrokerUri),
+			},
+		);
+	}
+
+	@OnShutdown()
+	async stop() {
+		if (!this.process) return;
+
+		this.isShuttingDown = true;
+
+		// TODO: Timeout & force kill
+		this.killNode();
+		await this._runPromise;
+
+		this.isShuttingDown = false;
+	}
+
+	/** Force-restart a runner suspected of being unresponsive. */
+	async forceRestart() {
+		if (!this.process) return;
+
+		this.process.kill('SIGKILL');
+
+		await this._runPromise;
+	}
+
+	killNode() {
+		if (!this.process) return;
+
+		this.process.kill();
+	}
+
+	private monitorProcess(taskRunnerProcess: ChildProcess) {
+		this._runPromise = new Promise((resolve) => {
+			this.oomDetector = new NodeProcessOomDetector(taskRunnerProcess);
+
+			taskRunnerProcess.on('exit', (code) => {
+				this.onProcessExit(code, resolve);
+			});
+		});
+	}
+
+	private onProcessExit(_code: number | null, resolveFn: () => void) {
+		this.process = null;
+		this.emit('exit', { reason: this.oomDetector?.didProcessOom ? 'oom' : 'unknown' });
+		resolveFn();
+
+		if (!this.isShuttingDown) {
+			setImmediate(async () => await this.start());
+		}
+	}
+
+	private getProcessEnvVars(grantToken: string, taskBrokerUri: string) {
+		const envVars: Record<string, string> = {
+			N8N_RUNNERS_GRANT_TOKEN: grantToken,
+			N8N_RUNNERS_TASK_BROKER_URI: taskBrokerUri,
+			N8N_RUNNERS_MAX_PAYLOAD: this.runnerConfig.maxPayload.toString(),
+			N8N_RUNNERS_MAX_CONCURRENCY: this.runnerConfig.maxConcurrency.toString(),
+			...this.getPassthroughEnvVars(),
+		};
+
+		if (this.runnerConfig.maxOldSpaceSize) {
+			envVars.NODE_OPTIONS = `--max-old-space-size=${this.runnerConfig.maxOldSpaceSize}`;
+		}
+
+		return envVars;
+	}
+
+	private getPassthroughEnvVars() {
+		return this.passthroughEnvVars.reduce<Record<string, string>>((env, key) => {
+			if (process.env[key]) {
+				env[key] = process.env[key];
+			}
+
+			return env;
+		}, {});
+	}
+}
diff --git a/packages/cli/src/runners/task-runner-server.ts b/packages/cli/src/task-runners/task-runner-server.ts
similarity index 77%
rename from packages/cli/src/runners/task-runner-server.ts
rename to packages/cli/src/task-runners/task-runner-server.ts
index 2199e70b38..80679f8c41 100644
--- a/packages/cli/src/runners/task-runner-server.ts
+++ b/packages/cli/src/task-runners/task-runner-server.ts
@@ -1,25 +1,25 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import compression from 'compression';
 import express from 'express';
+import { rateLimit as expressRateLimit } from 'express-rate-limit';
+import { Logger } from 'n8n-core';
 import * as a from 'node:assert/strict';
 import { randomBytes } from 'node:crypto';
 import { ServerResponse, type Server, createServer as createHttpServer } from 'node:http';
 import type { AddressInfo, Socket } from 'node:net';
 import { parse as parseUrl } from 'node:url';
-import { Service } from 'typedi';
 import { Server as WSServer } from 'ws';
 
-import { inTest, LOWEST_SHUTDOWN_PRIORITY } from '@/constants';
-import { OnShutdown } from '@/decorators/on-shutdown';
-import { Logger } from '@/logging/logger.service';
+import { inTest } from '@/constants';
 import { bodyParser, rawBodyReader } from '@/middlewares';
 import { send } from '@/response-helper';
-import { TaskRunnerAuthController } from '@/runners/auth/task-runner-auth.controller';
+import { TaskRunnerAuthController } from '@/task-runners/auth/task-runner-auth.controller';
 import type {
 	TaskRunnerServerInitRequest,
 	TaskRunnerServerInitResponse,
-} from '@/runners/runner-types';
-import { TaskRunnerService } from '@/runners/runner-ws-server';
+} from '@/task-runners/task-runner-types';
+import { TaskRunnerWsServer } from '@/task-runners/task-runner-ws-server';
 
 /**
  * Task Runner HTTP & WS server
@@ -32,7 +32,7 @@ export class TaskRunnerServer {
 
 	readonly app: express.Application;
 
-	public get port() {
+	get port() {
 		return (this.server?.address() as AddressInfo)?.port;
 	}
 
@@ -44,7 +44,7 @@ export class TaskRunnerServer {
 		private readonly logger: Logger,
 		private readonly globalConfig: GlobalConfig,
 		private readonly taskRunnerAuthController: TaskRunnerAuthController,
-		private readonly taskRunnerService: TaskRunnerService,
+		private readonly taskRunnerWsServer: TaskRunnerWsServer,
 	) {
 		this.app = express();
 		this.app.disable('x-powered-by');
@@ -69,16 +69,22 @@ export class TaskRunnerServer {
 		this.configureRoutes();
 	}
 
-	@OnShutdown(LOWEST_SHUTDOWN_PRIORITY)
 	async stop(): Promise<void> {
 		if (this.wsServer) {
 			this.wsServer.close();
 			this.wsServer = undefined;
 		}
-		if (this.server) {
-			await new Promise<void>((resolve) => this.server?.close(() => resolve()));
-			this.server = undefined;
-		}
+
+		const stopHttpServerTask = (async () => {
+			if (this.server) {
+				await new Promise<void>((resolve) => this.server?.close(() => resolve()));
+				this.server = undefined;
+			}
+		})();
+
+		const stopWsServerTask = this.taskRunnerWsServer.stop();
+
+		await Promise.all([stopHttpServerTask, stopWsServerTask]);
 	}
 
 	/** Creates an HTTP server and listens to the configured port */
@@ -119,6 +125,8 @@ export class TaskRunnerServer {
 			maxPayload: this.globalConfig.taskRunners.maxPayload,
 		});
 		this.server.on('upgrade', this.handleUpgradeRequest);
+
+		this.taskRunnerWsServer.start();
 	}
 
 	private async setupErrorHandlers() {
@@ -126,11 +134,8 @@ export class TaskRunnerServer {
 
 		// Augment errors sent to Sentry
 		if (this.globalConfig.sentry.backendDsn) {
-			const {
-				Handlers: { requestHandler, errorHandler },
-			} = await import('@sentry/node');
-			app.use(requestHandler());
-			app.use(errorHandler());
+			const { setupExpressErrorHandler } = await import('@sentry/node');
+			setupExpressErrorHandler(app);
 		}
 	}
 
@@ -143,19 +148,30 @@ export class TaskRunnerServer {
 	}
 
 	private configureRoutes() {
+		const createRateLimiter = () =>
+			expressRateLimit({
+				windowMs: 1000,
+				limit: 5,
+				message: { message: 'Too many requests' },
+			});
+
 		this.app.use(
 			this.upgradeEndpoint,
+			createRateLimiter(),
 			// eslint-disable-next-line @typescript-eslint/unbound-method
 			this.taskRunnerAuthController.authMiddleware,
 			(req: TaskRunnerServerInitRequest, res: TaskRunnerServerInitResponse) =>
-				this.taskRunnerService.handleRequest(req, res),
+				this.taskRunnerWsServer.handleRequest(req, res),
 		);
 
 		const authEndpoint = `${this.getEndpointBasePath()}/auth`;
 		this.app.post(
 			authEndpoint,
+			createRateLimiter(),
 			send(async (req) => await this.taskRunnerAuthController.createGrantToken(req)),
 		);
+
+		this.app.get('/healthz', (_, res) => res.send({ status: 'ok' }));
 	}
 
 	private handleUpgradeRequest = (
@@ -181,7 +197,10 @@ export class TaskRunnerServer {
 
 			const response = new ServerResponse(request);
 			response.writeHead = (statusCode) => {
-				if (statusCode > 200) ws.close(100);
+				if (statusCode > 200) {
+					this.logger.error(`Task runner connection attempt failed with status code ${statusCode}`);
+					ws.close();
+				}
 				return response;
 			};
 
diff --git a/packages/cli/src/task-runners/task-runner-types.ts b/packages/cli/src/task-runners/task-runner-types.ts
new file mode 100644
index 0000000000..ca26ed41b8
--- /dev/null
+++ b/packages/cli/src/task-runners/task-runner-types.ts
@@ -0,0 +1,34 @@
+import type { Response } from 'express';
+import type { INodeExecutionData } from 'n8n-workflow';
+import type WebSocket from 'ws';
+
+import type { TaskRunner } from './task-broker.service';
+import type { AuthlessRequest } from '../requests';
+
+export interface DisconnectAnalyzer {
+	isCloudDeployment: boolean;
+
+	toDisconnectError(opts: DisconnectErrorOptions): Promise<Error>;
+}
+
+export type DataRequestType = 'input' | 'node' | 'all';
+
+export interface TaskResultData {
+	result: INodeExecutionData[];
+	customData?: Record<string, string>;
+}
+
+export interface TaskRunnerServerInitRequest
+	extends AuthlessRequest<{}, {}, {}, { id: TaskRunner['id']; token?: string }> {
+	ws: WebSocket;
+}
+
+export type TaskRunnerServerInitResponse = Response & { req: TaskRunnerServerInitRequest };
+
+export type DisconnectReason = 'shutting-down' | 'failed-heartbeat-check' | 'unknown';
+
+export type DisconnectErrorOptions = {
+	runnerId?: TaskRunner['id'];
+	reason?: DisconnectReason;
+	heartbeatInterval?: number;
+};
diff --git a/packages/cli/src/task-runners/task-runner-ws-server.ts b/packages/cli/src/task-runners/task-runner-ws-server.ts
new file mode 100644
index 0000000000..dbec7cef3e
--- /dev/null
+++ b/packages/cli/src/task-runners/task-runner-ws-server.ts
@@ -0,0 +1,181 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
+import type { BrokerMessage, RunnerMessage } from '@n8n/task-runner';
+import { Logger } from 'n8n-core';
+import { ApplicationError, jsonStringify } from 'n8n-workflow';
+import type WebSocket from 'ws';
+
+import { Time, WsStatusCodes } from '@/constants';
+
+import { DefaultTaskRunnerDisconnectAnalyzer } from './default-task-runner-disconnect-analyzer';
+import { TaskBroker, type MessageCallback, type TaskRunner } from './task-broker.service';
+import { TaskRunnerLifecycleEvents } from './task-runner-lifecycle-events';
+import type {
+	DisconnectAnalyzer,
+	DisconnectReason,
+	TaskRunnerServerInitRequest,
+	TaskRunnerServerInitResponse,
+} from './task-runner-types';
+
+function heartbeat(this: WebSocket) {
+	this.isAlive = true;
+}
+
+type WsStatusCode = (typeof WsStatusCodes)[keyof typeof WsStatusCodes];
+
+@Service()
+export class TaskRunnerWsServer {
+	runnerConnections: Map<TaskRunner['id'], WebSocket> = new Map();
+
+	private heartbeatTimer: NodeJS.Timer | undefined;
+
+	constructor(
+		private readonly logger: Logger,
+		private readonly taskBroker: TaskBroker,
+		private disconnectAnalyzer: DefaultTaskRunnerDisconnectAnalyzer,
+		private readonly taskTunnersConfig: TaskRunnersConfig,
+		private readonly runnerLifecycleEvents: TaskRunnerLifecycleEvents,
+	) {}
+
+	start() {
+		this.startHeartbeatChecks();
+	}
+
+	private startHeartbeatChecks() {
+		const { heartbeatInterval } = this.taskTunnersConfig;
+
+		if (heartbeatInterval <= 0) {
+			throw new ApplicationError('Heartbeat interval must be greater than 0');
+		}
+
+		this.heartbeatTimer = setInterval(() => {
+			for (const [runnerId, connection] of this.runnerConnections.entries()) {
+				if (!connection.isAlive) {
+					void this.removeConnection(
+						runnerId,
+						'failed-heartbeat-check',
+						WsStatusCodes.CloseNoStatus,
+					);
+					this.runnerLifecycleEvents.emit('runner:failed-heartbeat-check');
+					return;
+				}
+				connection.isAlive = false;
+				connection.ping();
+			}
+		}, heartbeatInterval * Time.seconds.toMilliseconds);
+	}
+
+	async stop() {
+		if (this.heartbeatTimer) {
+			clearInterval(this.heartbeatTimer);
+			this.heartbeatTimer = undefined;
+		}
+
+		await this.stopConnectedRunners();
+	}
+
+	setDisconnectAnalyzer(disconnectAnalyzer: DisconnectAnalyzer) {
+		this.disconnectAnalyzer = disconnectAnalyzer;
+	}
+
+	getDisconnectAnalyzer() {
+		return this.disconnectAnalyzer;
+	}
+
+	sendMessage(id: TaskRunner['id'], message: BrokerMessage.ToRunner.All) {
+		this.runnerConnections.get(id)?.send(jsonStringify(message, { replaceCircularRefs: true }));
+	}
+
+	add(id: TaskRunner['id'], connection: WebSocket) {
+		connection.isAlive = true;
+		connection.on('pong', heartbeat);
+
+		let isConnected = false;
+
+		const onMessage = async (data: WebSocket.RawData) => {
+			try {
+				const buffer = Array.isArray(data) ? Buffer.concat(data) : Buffer.from(data);
+
+				const message: RunnerMessage.ToBroker.All = JSON.parse(
+					buffer.toString('utf8'),
+				) as RunnerMessage.ToBroker.All;
+
+				if (!isConnected && message.type !== 'runner:info') {
+					return;
+				} else if (!isConnected && message.type === 'runner:info') {
+					await this.removeConnection(id);
+					isConnected = true;
+
+					this.runnerConnections.set(id, connection);
+
+					this.taskBroker.registerRunner(
+						{
+							id,
+							taskTypes: message.types,
+							lastSeen: new Date(),
+							name: message.name,
+						},
+						this.sendMessage.bind(this, id) as MessageCallback,
+					);
+
+					this.logger.info(`Registered runner "${message.name}" (${id}) `);
+					return;
+				}
+
+				void this.taskBroker.onRunnerMessage(id, message);
+			} catch (error) {
+				this.logger.error(`Couldn't parse message from runner "${id}"`, {
+					error: error as unknown,
+					id,
+					data,
+				});
+			}
+		};
+
+		// Makes sure to remove the session if the connection is closed
+		connection.once('close', async () => {
+			connection.off('pong', heartbeat);
+			connection.off('message', onMessage);
+			await this.removeConnection(id);
+		});
+
+		connection.on('message', onMessage);
+		connection.send(
+			JSON.stringify({ type: 'broker:inforequest' } as BrokerMessage.ToRunner.InfoRequest),
+		);
+	}
+
+	async removeConnection(
+		id: TaskRunner['id'],
+		reason: DisconnectReason = 'unknown',
+		code: WsStatusCode = WsStatusCodes.CloseNormal,
+	) {
+		const connection = this.runnerConnections.get(id);
+		if (connection) {
+			const disconnectError = await this.disconnectAnalyzer.toDisconnectError({
+				runnerId: id,
+				reason,
+				heartbeatInterval: this.taskTunnersConfig.heartbeatInterval,
+			});
+			this.taskBroker.deregisterRunner(id, disconnectError);
+			this.logger.debug(`Deregistered runner "${id}"`);
+			connection.close(code);
+			this.runnerConnections.delete(id);
+		}
+	}
+
+	handleRequest(req: TaskRunnerServerInitRequest, _res: TaskRunnerServerInitResponse) {
+		this.add(req.query.id, req.ws);
+	}
+
+	private async stopConnectedRunners() {
+		// TODO: We should give runners some time to finish their tasks before
+		// shutting them down
+		await Promise.all(
+			Array.from(this.runnerConnections.keys()).map(
+				async (id) =>
+					await this.removeConnection(id, 'shutting-down', WsStatusCodes.CloseGoingAway),
+			),
+		);
+	}
+}
diff --git a/packages/cli/src/telemetry/__tests__/telemetry.test.ts b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
index 04a6cecfca..d0f9fae3cd 100644
--- a/packages/cli/src/telemetry/__tests__/telemetry.test.ts
+++ b/packages/cli/src/telemetry/__tests__/telemetry.test.ts
@@ -21,6 +21,10 @@ describe('Telemetry', () => {
 	const instanceId = 'Telemetry unit test';
 	const testDateTime = new Date('2022-01-01 00:00:00');
 	const instanceSettings = mockInstance(InstanceSettings, { instanceId });
+	const globalConfig = mock<GlobalConfig>({
+		diagnostics: { enabled: true },
+		logging: { level: 'info', outputs: ['console'] },
+	});
 
 	beforeAll(() => {
 		// @ts-expect-error Spying on private method
@@ -28,7 +32,6 @@ describe('Telemetry', () => {
 
 		jest.useFakeTimers();
 		jest.setSystemTime(testDateTime);
-		config.set('diagnostics.enabled', true);
 		config.set('deployment.type', 'n8n-testing');
 	});
 
@@ -45,14 +48,7 @@ describe('Telemetry', () => {
 		const postHog = new PostHogClient(instanceSettings, mock());
 		await postHog.init();
 
-		telemetry = new Telemetry(
-			mock(),
-			postHog,
-			mock(),
-			instanceSettings,
-			mock(),
-			mock<GlobalConfig>({ logging: { level: 'info', outputs: ['console'] } }),
-		);
+		telemetry = new Telemetry(mock(), postHog, mock(), instanceSettings, mock(), globalConfig);
 		// @ts-expect-error Assigning to private property
 		telemetry.rudderStack = mockRudderStack;
 	});
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index d9a8e590f4..5b16656713 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -1,11 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import type RudderStack from '@rudderstack/rudder-sdk-node';
 import axios from 'axios';
-import { InstanceSettings } from 'n8n-core';
+import { InstanceSettings, Logger } from 'n8n-core';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
-import { Container, Service } from 'typedi';
 
-import config from '@/config';
 import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
@@ -14,10 +13,9 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository
 import { OnShutdown } from '@/decorators/on-shutdown';
 import type { IExecutionTrackProperties } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { PostHogClient } from '@/posthog';
 
-import { SourceControlPreferencesService } from '../environments/source-control/source-control-preferences.service.ee';
+import { SourceControlPreferencesService } from '../environments.ee/source-control/source-control-preferences.service.ee';
 
 type ExecutionTrackDataKey = 'manual_error' | 'manual_success' | 'prod_error' | 'prod_success';
 
@@ -54,10 +52,9 @@ export class Telemetry {
 	) {}
 
 	async init() {
-		const enabled = config.getEnv('diagnostics.enabled');
+		const { enabled, backendConfig } = this.globalConfig.diagnostics;
 		if (enabled) {
-			const conf = config.getEnv('diagnostics.config.backend');
-			const [key, dataPlaneUrl] = conf.split(';');
+			const [key, dataPlaneUrl] = backendConfig.split(';');
 
 			if (!key || !dataPlaneUrl) {
 				this.logger.warn('Diagnostics backend config is invalid');
diff --git a/packages/cli/src/user-management/email/node-mailer.ts b/packages/cli/src/user-management/email/node-mailer.ts
index 661c3fed7f..ac555155d2 100644
--- a/packages/cli/src/user-management/email/node-mailer.ts
+++ b/packages/cli/src/user-management/email/node-mailer.ts
@@ -1,13 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import { pick } from 'lodash';
-import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
+import { ErrorReporter, Logger } from 'n8n-core';
 import path from 'node:path';
 import type { Transporter } from 'nodemailer';
 import { createTransport } from 'nodemailer';
 import type SMTPConnection from 'nodemailer/lib/smtp-connection';
-import { Service } from 'typedi';
-
-import { Logger } from '@/logging/logger.service';
 
 import type { MailData, SendEmailResult } from './interfaces';
 
@@ -20,6 +18,7 @@ export class NodeMailer {
 	constructor(
 		globalConfig: GlobalConfig,
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 	) {
 		const smtpConfig = globalConfig.userManagement.emails.smtp;
 		const transportConfig: SMTPConnection.Options = pick(smtpConfig, ['host', 'port', 'secure']);
@@ -66,7 +65,7 @@ export class NodeMailer {
 				`Email sent successfully to the following recipients: ${mailData.emailRecipients.toString()}`,
 			);
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 			this.logger.error('Failed to send email', {
 				recipients: mailData.emailRecipients,
 				error: error as Error,
diff --git a/packages/cli/src/user-management/email/user-management-mailer.ts b/packages/cli/src/user-management/email/user-management-mailer.ts
index b5df958d7d..53320c61e1 100644
--- a/packages/cli/src/user-management/email/user-management-mailer.ts
+++ b/packages/cli/src/user-management/email/user-management-mailer.ts
@@ -1,9 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container, Service } from '@n8n/di';
 import { existsSync } from 'fs';
 import { readFile } from 'fs/promises';
 import Handlebars from 'handlebars';
+import { Logger } from 'n8n-core';
 import { join as pathJoin } from 'path';
-import { Container, Service } from 'typedi';
 
 import { inTest } from '@/constants';
 import type { User } from '@/databases/entities/user';
@@ -11,7 +12,6 @@ import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { EventService } from '@/events/event.service';
-import { Logger } from '@/logging/logger.service';
 import { UrlService } from '@/services/url.service';
 import { toError } from '@/utils';
 
@@ -125,7 +125,7 @@ export class UserManagementMailer {
 
 			const error = toError(e);
 
-			throw new InternalServerError(`Please contact your administrator: ${error.message}`);
+			throw new InternalServerError(`Please contact your administrator: ${error.message}`, e);
 		}
 	}
 
@@ -180,7 +180,7 @@ export class UserManagementMailer {
 
 			const error = toError(e);
 
-			throw new InternalServerError(`Please contact your administrator: ${error.message}`);
+			throw new InternalServerError(`Please contact your administrator: ${error.message}`, e);
 		}
 	}
 
diff --git a/packages/cli/src/user-management/permission-checker.ts b/packages/cli/src/user-management/permission-checker.ts
index c93d2acf91..72ac867061 100644
--- a/packages/cli/src/user-management/permission-checker.ts
+++ b/packages/cli/src/user-management/permission-checker.ts
@@ -1,10 +1,10 @@
+import { Service } from '@n8n/di';
 import type { INode } from 'n8n-workflow';
 import { CredentialAccessError, NodeOperationError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { OwnershipService } from '@/services/ownership.service';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 
 @Service()
 export class PermissionChecker {
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index ff172de181..d701707a11 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -58,10 +58,6 @@ export function isStringArray(value: unknown): value is string[] {
 
 export const isIntegerString = (value: string) => /^\d+$/.test(value);
 
-export function isObjectLiteral(item: unknown): item is { [key: string]: string } {
-	return typeof item === 'object' && item !== null && !Array.isArray(item);
-}
-
 export function removeTrailingSlash(path: string) {
 	return path.endsWith('/') ? path.slice(0, -1) : path;
 }
diff --git a/packages/cli/src/wait-tracker.ts b/packages/cli/src/wait-tracker.ts
index 868fafa526..d3c9d54c3a 100644
--- a/packages/cli/src/wait-tracker.ts
+++ b/packages/cli/src/wait-tracker.ts
@@ -1,13 +1,9 @@
-import { InstanceSettings } from 'n8n-core';
-import {
-	ApplicationError,
-	ErrorReporterProxy as ErrorReporter,
-	type IWorkflowExecutionDataProcess,
-} from 'n8n-workflow';
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
+import { InstanceSettings, Logger } from 'n8n-core';
+import { ApplicationError, type IWorkflowExecutionDataProcess } from 'n8n-workflow';
 
+import { ActiveExecutions } from '@/active-executions';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { Logger } from '@/logging/logger.service';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { OwnershipService } from '@/services/ownership.service';
 import { WorkflowRunner } from '@/workflow-runner';
@@ -27,6 +23,7 @@ export class WaitTracker {
 		private readonly logger: Logger,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly ownershipService: OwnershipService,
+		private readonly activeExecutions: ActiveExecutions,
 		private readonly workflowRunner: WorkflowRunner,
 		private readonly orchestrationService: OrchestrationService,
 		private readonly instanceSettings: InstanceSettings,
@@ -42,12 +39,11 @@ export class WaitTracker {
 	 * @important Requires `OrchestrationService` to be initialized.
 	 */
 	init() {
-		const { isLeader } = this.instanceSettings;
-		const { isMultiMainSetupEnabled } = this.orchestrationService;
+		const { isLeader, isMultiMain } = this.instanceSettings;
 
 		if (isLeader) this.startTracking();
 
-		if (isMultiMainSetupEnabled) {
+		if (isMultiMain) {
 			this.orchestrationService.multiMainSetup
 				.on('leader-takeover', () => this.startTracking())
 				.on('leader-stepdown', () => this.stopTracking());
@@ -88,7 +84,7 @@ export class WaitTracker {
 				this.waitingExecutions[executionId] = {
 					executionId,
 					timer: setTimeout(() => {
-						this.startExecution(executionId);
+						void this.startExecution(executionId);
 					}, triggerTime),
 				};
 			}
@@ -103,46 +99,48 @@ 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);
+
+		const { parentExecution } = fullExecutionData.data;
+		if (parentExecution) {
+			// on child execution completion, resume parent execution
+			void this.activeExecutions.getPostExecutePromise(executionId).then(() => {
+				void this.startExecution(parentExecution.executionId);
+			});
+		}
 	}
 
 	stopTracking() {
diff --git a/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
index 0642a5eaa5..b3b4515d68 100644
--- a/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhook-registrations.service.test.ts
@@ -1,7 +1,7 @@
 import { mock } from 'jest-mock-extended';
+import type { InstanceSettings } from 'n8n-core';
 
 import type { CacheService } from '@/services/cache/cache.service';
-import type { OrchestrationService } from '@/services/orchestration.service';
 import type { TestWebhookRegistration } from '@/webhooks/test-webhook-registrations.service';
 import { TestWebhookRegistrationsService } from '@/webhooks/test-webhook-registrations.service';
 
@@ -9,7 +9,7 @@ describe('TestWebhookRegistrationsService', () => {
 	const cacheService = mock<CacheService>();
 	const registrations = new TestWebhookRegistrationsService(
 		cacheService,
-		mock<OrchestrationService>({ isMultiMainSetupEnabled: false }),
+		mock<InstanceSettings>({ isMultiMain: false }),
 	);
 
 	const registration = mock<TestWebhookRegistration>({
diff --git a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
index 3f8972ad9a..a07d4fc0fd 100644
--- a/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts
@@ -1,6 +1,11 @@
 import type * as express from 'express';
 import { mock } from 'jest-mock-extended';
-import type { IWebhookData, IWorkflowExecuteAdditionalData, Workflow } from 'n8n-workflow';
+import type { ITaskData } from 'n8n-workflow';
+import {
+	type IWebhookData,
+	type IWorkflowExecuteAdditionalData,
+	type Workflow,
+} from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
 import { generateNanoId } from '@/databases/utils/generators';
@@ -13,6 +18,7 @@ import type {
 } from '@/webhooks/test-webhook-registrations.service';
 import { TestWebhooks } from '@/webhooks/test-webhooks';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
+import type { WebhookService } from '@/webhooks/webhook.service';
 import type { WebhookRequest } from '@/webhooks/webhook.types';
 import * as AdditionalData from '@/workflow-execute-additional-data';
 
@@ -33,22 +39,33 @@ const webhook = mock<IWebhookData>({
 	userId,
 });
 
-const registrations = mock<TestWebhookRegistrationsService>();
-
-let testWebhooks: TestWebhooks;
-
 describe('TestWebhooks', () => {
+	const registrations = mock<TestWebhookRegistrationsService>();
+	const webhookService = mock<WebhookService>();
+
+	const testWebhooks = new TestWebhooks(
+		mock(),
+		mock(),
+		registrations,
+		mock(),
+		mock(),
+		webhookService,
+	);
+
 	beforeAll(() => {
-		testWebhooks = new TestWebhooks(mock(), mock(), registrations, mock(), mock());
 		jest.useFakeTimers();
 	});
 
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
 	describe('needsWebhook()', () => {
-		const args: Parameters<typeof testWebhooks.needsWebhook> = [
+		const args: Parameters<typeof testWebhooks.needsWebhook>[0] = {
 			userId,
 			workflowEntity,
-			mock<IWorkflowExecuteAdditionalData>(),
-		];
+			additionalData: mock<IWorkflowExecuteAdditionalData>(),
+		};
 
 		test('if webhook is needed, should register then create webhook and return true', async () => {
 			const workflow = mock<Workflow>();
@@ -56,10 +73,10 @@ describe('TestWebhooks', () => {
 			jest.spyOn(testWebhooks, 'toWorkflow').mockReturnValueOnce(workflow);
 			jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([webhook]);
 
-			const needsWebhook = await testWebhooks.needsWebhook(...args);
+			const needsWebhook = await testWebhooks.needsWebhook(args);
 
 			const [registerOrder] = registrations.register.mock.invocationCallOrder;
-			const [createOrder] = workflow.createWebhookIfNotExists.mock.invocationCallOrder;
+			const [createOrder] = webhookService.createWebhookIfNotExists.mock.invocationCallOrder;
 
 			expect(registerOrder).toBeLessThan(createOrder);
 			expect(needsWebhook).toBe(true);
@@ -72,7 +89,7 @@ describe('TestWebhooks', () => {
 			jest.spyOn(registrations, 'register').mockRejectedValueOnce(new Error(msg));
 			registrations.getAllRegistrations.mockResolvedValue([]);
 
-			const needsWebhook = testWebhooks.needsWebhook(...args);
+			const needsWebhook = testWebhooks.needsWebhook(args);
 
 			await expect(needsWebhook).rejects.toThrowError(msg);
 		});
@@ -81,10 +98,55 @@ describe('TestWebhooks', () => {
 			webhook.webhookDescription.restartWebhook = true;
 			jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([webhook]);
 
-			const result = await testWebhooks.needsWebhook(...args);
+			const result = await testWebhooks.needsWebhook(args);
 
 			expect(result).toBe(false);
 		});
+
+		test('returns false if a triggerToStartFrom with triggerData is given', async () => {
+			const workflow = mock<Workflow>();
+			jest.spyOn(testWebhooks, 'toWorkflow').mockReturnValueOnce(workflow);
+			jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([webhook]);
+
+			const needsWebhook = await testWebhooks.needsWebhook({
+				...args,
+				triggerToStartFrom: {
+					name: 'trigger',
+					data: mock<ITaskData>(),
+				},
+			});
+
+			expect(needsWebhook).toBe(false);
+		});
+
+		test('returns true, registers and then creates webhook if triggerToStartFrom is given with no triggerData', async () => {
+			// ARRANGE
+			const workflow = mock<Workflow>();
+			const webhook2 = mock<IWebhookData>({
+				node: 'trigger',
+				httpMethod,
+				path,
+				workflowId: workflowEntity.id,
+				userId,
+			});
+			jest.spyOn(testWebhooks, 'toWorkflow').mockReturnValueOnce(workflow);
+			jest.spyOn(WebhookHelpers, 'getWorkflowWebhooks').mockReturnValue([webhook, webhook2]);
+
+			// ACT
+			const needsWebhook = await testWebhooks.needsWebhook({
+				...args,
+				triggerToStartFrom: { name: 'trigger' },
+			});
+
+			// ASSERT
+			const [registerOrder] = registrations.register.mock.invocationCallOrder;
+			const [createOrder] = webhookService.createWebhookIfNotExists.mock.invocationCallOrder;
+
+			expect(registerOrder).toBeLessThan(createOrder);
+			expect(registrations.register.mock.calls[0][0].webhook.node).toBe(webhook2.node);
+			expect(webhookService.createWebhookIfNotExists.mock.calls[0][1].node).toBe(webhook2.node);
+			expect(needsWebhook).toBe(true);
+		});
 	});
 
 	describe('executeWebhook()', () => {
diff --git a/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts b/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts
new file mode 100644
index 0000000000..f342095b77
--- /dev/null
+++ b/packages/cli/src/webhooks/__tests__/waiting-forms.test.ts
@@ -0,0 +1,199 @@
+import { mock } from 'jest-mock-extended';
+import { FORM_NODE_TYPE, type Workflow } from 'n8n-workflow';
+
+import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
+import { WaitingForms } from '@/webhooks/waiting-forms';
+
+describe('WaitingForms', () => {
+	const executionRepository = mock<ExecutionRepository>();
+	const waitingWebhooks = new WaitingForms(mock(), mock(), executionRepository, mock());
+
+	beforeEach(() => {
+		jest.restoreAllMocks();
+	});
+
+	describe('findCompletionPage', () => {
+		it('should return lastNodeExecuted if it is a non-disabled form completion node', () => {
+			const workflow = mock<Workflow>({
+				getParentNodes: jest.fn().mockReturnValue([]),
+				nodes: {
+					Form1: {
+						disabled: undefined,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+				},
+			});
+
+			const result = waitingWebhooks.findCompletionPage(workflow, {}, 'Form1');
+			expect(result).toBe('Form1');
+		});
+
+		it('should return undefined if lastNodeExecuted is disabled', () => {
+			const workflow = mock<Workflow>({
+				getParentNodes: jest.fn().mockReturnValue([]),
+				nodes: {
+					Form1: {
+						disabled: true,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+				},
+			});
+
+			const result = waitingWebhooks.findCompletionPage(workflow, {}, 'Form1');
+			expect(result).toBeUndefined();
+		});
+
+		it('should return undefined if lastNodeExecuted is not a form node', () => {
+			const workflow = mock<Workflow>({
+				getParentNodes: jest.fn().mockReturnValue([]),
+				nodes: {
+					NonForm: {
+						disabled: undefined,
+						type: 'other-node-type',
+						parameters: {},
+					},
+				},
+			});
+
+			const result = waitingWebhooks.findCompletionPage(workflow, {}, 'NonForm');
+			expect(result).toBeUndefined();
+		});
+
+		it('should return undefined if lastNodeExecuted operation is not completion', () => {
+			const workflow = mock<Workflow>({
+				getParentNodes: jest.fn().mockReturnValue([]),
+				nodes: {
+					Form1: {
+						disabled: undefined,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'page',
+						},
+					},
+				},
+			});
+
+			const result = waitingWebhooks.findCompletionPage(workflow, {}, 'Form1');
+			expect(result).toBeUndefined();
+		});
+
+		it('should find first valid completion form in parent nodes if lastNodeExecuted is not valid', () => {
+			const workflow = mock<Workflow>({
+				getParentNodes: jest.fn().mockReturnValue(['Form1', 'Form2', 'Form3']),
+				nodes: {
+					LastNode: {
+						disabled: undefined,
+						type: 'other-node-type',
+						parameters: {},
+					},
+					Form1: {
+						disabled: true,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+					Form2: {
+						disabled: undefined,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+					Form3: {
+						disabled: undefined,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+				},
+			});
+
+			const runData = {
+				Form2: [],
+				Form3: [],
+			};
+
+			const result = waitingWebhooks.findCompletionPage(workflow, runData, 'LastNode');
+			expect(result).toBe('Form3');
+		});
+
+		it('should return undefined if no valid completion form is found in parent nodes', () => {
+			const workflow = mock<Workflow>({
+				getParentNodes: jest.fn().mockReturnValue(['Form1', 'Form2']),
+				nodes: {
+					LastNode: {
+						disabled: undefined,
+						type: 'other-node-type',
+						parameters: {},
+					},
+					Form1: {
+						disabled: true,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+					Form2: {
+						disabled: undefined,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'submit',
+						},
+					},
+				},
+			});
+
+			const result = waitingWebhooks.findCompletionPage(workflow, {}, 'LastNode');
+			expect(result).toBeUndefined();
+		});
+
+		it('should skip parent nodes without runData', () => {
+			const workflow = mock<Workflow>({
+				getParentNodes: jest.fn().mockReturnValue(['Form1', 'Form2', 'Form3']),
+				nodes: {
+					LastNode: {
+						disabled: undefined,
+						type: 'other-node-type',
+						parameters: {},
+					},
+					Form1: {
+						disabled: undefined,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+					Form2: {
+						disabled: undefined,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+					Form3: {
+						disabled: undefined,
+						type: FORM_NODE_TYPE,
+						parameters: {
+							operation: 'completion',
+						},
+					},
+				},
+			});
+
+			const runData = {
+				Form2: [],
+			};
+
+			const result = waitingWebhooks.findCompletionPage(workflow, runData, 'LastNode');
+			expect(result).toBe('Form2');
+		});
+	});
+});
diff --git a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
index 892d87e773..72fe654c55 100644
--- a/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
+++ b/packages/cli/src/webhooks/__tests__/waiting-webhooks.test.ts
@@ -10,7 +10,7 @@ import type { WaitingWebhookRequest } from '@/webhooks/webhook.types';
 
 describe('WaitingWebhooks', () => {
 	const executionRepository = mock<ExecutionRepository>();
-	const waitingWebhooks = new WaitingWebhooks(mock(), mock(), executionRepository);
+	const waitingWebhooks = new WaitingWebhooks(mock(), mock(), executionRepository, mock());
 
 	beforeEach(() => {
 		jest.restoreAllMocks();
diff --git a/packages/cli/src/webhooks/__tests__/webhook-form-data.test.ts b/packages/cli/src/webhooks/__tests__/webhook-form-data.test.ts
index 1b43143d38..8eb308f7e4 100644
--- a/packages/cli/src/webhooks/__tests__/webhook-form-data.test.ts
+++ b/packages/cli/src/webhooks/__tests__/webhook-form-data.test.ts
@@ -14,7 +14,7 @@ jest.unmock('node:fs');
 
 /** Test server for testing the form data parsing */
 class TestServer {
-	public agent: TestAgent;
+	agent: TestAgent;
 
 	private app: express.Application;
 
diff --git a/packages/cli/src/webhooks/__tests__/webhook.service.test.ts b/packages/cli/src/webhooks/__tests__/webhook.service.test.ts
index 534c36bca0..46ffb82dc6 100644
--- a/packages/cli/src/webhooks/__tests__/webhook.service.test.ts
+++ b/packages/cli/src/webhooks/__tests__/webhook.service.test.ts
@@ -1,11 +1,14 @@
+import { mock } from 'jest-mock-extended';
+import type { INode, INodeType, IWebhookData, IWorkflowExecuteAdditionalData } from 'n8n-workflow';
+import { Workflow } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
 import config from '@/config';
 import { WebhookEntity } from '@/databases/entities/webhook-entity';
-import { WebhookRepository } from '@/databases/repositories/webhook.repository';
-import { CacheService } from '@/services/cache/cache.service';
+import type { WebhookRepository } from '@/databases/repositories/webhook.repository';
+import type { NodeTypes } from '@/node-types';
+import type { CacheService } from '@/services/cache/cache.service';
 import { WebhookService } from '@/webhooks/webhook.service';
-import { mockInstance } from '@test/mocking';
 
 const createWebhook = (method: string, path: string, webhookId?: string, pathSegments?: number) =>
 	Object.assign(new WebhookEntity(), {
@@ -16,9 +19,11 @@ const createWebhook = (method: string, path: string, webhookId?: string, pathSeg
 	}) as WebhookEntity;
 
 describe('WebhookService', () => {
-	const webhookRepository = mockInstance(WebhookRepository);
-	const cacheService = mockInstance(CacheService);
-	const webhookService = new WebhookService(webhookRepository, cacheService);
+	const webhookRepository = mock<WebhookRepository>();
+	const cacheService = mock<CacheService>();
+	const nodeTypes = mock<NodeTypes>();
+	const webhookService = new WebhookService(mock(), webhookRepository, cacheService, nodeTypes);
+	const additionalData = mock<IWorkflowExecuteAdditionalData>();
 
 	beforeEach(() => {
 		config.load(config.default);
@@ -188,4 +193,171 @@ describe('WebhookService', () => {
 			expect(webhookRepository.upsert).toHaveBeenCalledWith(mockWebhook, ['method', 'webhookPath']);
 		});
 	});
+
+	describe('getNodeWebhooks()', () => {
+		const workflow = new Workflow({
+			id: 'test-workflow',
+			nodes: [],
+			connections: {},
+			active: true,
+			nodeTypes,
+		});
+
+		test('should return empty array if node is disabled', async () => {
+			const node = { disabled: true } as INode;
+
+			const webhooks = webhookService.getNodeWebhooks(workflow, node, additionalData);
+
+			expect(webhooks).toEqual([]);
+		});
+
+		test('should return webhooks for node with webhook definitions', async () => {
+			const node = {
+				name: 'Webhook',
+				type: 'n8n-nodes-base.webhook',
+				disabled: false,
+			} as INode;
+
+			const nodeType = {
+				description: {
+					webhooks: [
+						{
+							name: 'default',
+							httpMethod: 'GET',
+							path: '/webhook',
+							isFullPath: false,
+							restartWebhook: false,
+						},
+					],
+				},
+			} as INodeType;
+
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			const webhooks = webhookService.getNodeWebhooks(workflow, node, additionalData);
+
+			expect(webhooks).toHaveLength(1);
+			expect(webhooks[0]).toMatchObject({
+				httpMethod: 'GET',
+				node: 'Webhook',
+				workflowId: 'test-workflow',
+			});
+		});
+	});
+
+	describe('createWebhookIfNotExists()', () => {
+		const workflow = new Workflow({
+			id: 'test-workflow',
+			nodes: [
+				mock<INode>({
+					name: 'Webhook',
+					type: 'n8n-nodes-base.webhook',
+					typeVersion: 1,
+					parameters: {},
+				}),
+			],
+			connections: {},
+			active: false,
+			nodeTypes,
+		});
+
+		const webhookData = mock<IWebhookData>({
+			node: 'Webhook',
+			webhookDescription: {
+				name: 'default',
+				httpMethod: 'GET',
+				path: '/webhook',
+			},
+		});
+
+		const defaultWebhookMethods = {
+			checkExists: jest.fn(),
+			create: jest.fn(),
+		};
+
+		const nodeType = mock<INodeType>({
+			webhookMethods: { default: defaultWebhookMethods },
+		});
+
+		test('should create webhook if it does not exist', async () => {
+			defaultWebhookMethods.checkExists.mockResolvedValue(false);
+			defaultWebhookMethods.create.mockResolvedValue(true);
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			await webhookService.createWebhookIfNotExists(workflow, webhookData, 'trigger', 'init');
+
+			expect(defaultWebhookMethods.checkExists).toHaveBeenCalled();
+			expect(defaultWebhookMethods.create).toHaveBeenCalled();
+		});
+
+		test('should not create webhook if it already exists', async () => {
+			defaultWebhookMethods.checkExists.mockResolvedValue(true);
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			await webhookService.createWebhookIfNotExists(workflow, webhookData, 'trigger', 'init');
+
+			expect(defaultWebhookMethods.checkExists).toHaveBeenCalled();
+			expect(defaultWebhookMethods.create).not.toHaveBeenCalled();
+		});
+
+		test('should handle case when webhook methods are not defined', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue({} as INodeType);
+
+			await webhookService.createWebhookIfNotExists(workflow, webhookData, 'trigger', 'init');
+			// Test passes if no error is thrown when webhook methods are undefined
+		});
+	});
+
+	describe('deleteWebhook()', () => {
+		test('should call runWebhookMethod with delete', async () => {
+			const workflow = mock<Workflow>();
+			const webhookData = mock<IWebhookData>();
+			const runWebhookMethodSpy = jest.spyOn(webhookService as any, 'runWebhookMethod');
+
+			await webhookService.deleteWebhook(workflow, webhookData, 'trigger', 'init');
+
+			expect(runWebhookMethodSpy).toHaveBeenCalledWith(
+				'delete',
+				workflow,
+				webhookData,
+				'trigger',
+				'init',
+			);
+		});
+	});
+
+	describe('runWebhook()', () => {
+		const workflow = mock<Workflow>();
+		const webhookData = mock<IWebhookData>();
+		const node = mock<INode>();
+		const responseData = { workflowData: [] };
+
+		test('should throw error if node does not have webhooks', async () => {
+			const nodeType = {} as INodeType;
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			await expect(
+				webhookService.runWebhook(workflow, webhookData, node, additionalData, 'trigger', null),
+			).rejects.toThrow('Node does not have any webhooks defined');
+		});
+
+		test('should execute webhook and return response data', async () => {
+			const nodeType = mock<INodeType>({
+				webhook: jest.fn().mockResolvedValue(responseData),
+			});
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			const result = await webhookService.runWebhook(
+				workflow,
+				webhookData,
+				node,
+				additionalData,
+				'trigger',
+				null,
+			);
+
+			expect(result).toEqual(responseData);
+			expect(nodeType.webhook).toHaveBeenCalled();
+		});
+	});
 });
diff --git a/packages/cli/src/webhooks/live-webhooks.ts b/packages/cli/src/webhooks/live-webhooks.ts
index 458701caee..440e8254dc 100644
--- a/packages/cli/src/webhooks/live-webhooks.ts
+++ b/packages/cli/src/webhooks/live-webhooks.ts
@@ -1,12 +1,12 @@
+import { Service } from '@n8n/di';
 import type { Response } from 'express';
-import { Workflow, NodeHelpers, CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow';
+import { Logger } from 'n8n-core';
+import { Workflow, CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow';
 import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import { WebhookService } from '@/webhooks/webhook.service';
@@ -114,11 +114,9 @@ export class LiveWebhooks implements IWebhookManager {
 
 		const additionalData = await WorkflowExecuteAdditionalData.getBase();
 
-		const webhookData = NodeHelpers.getNodeWebhooks(
-			workflow,
-			workflow.getNode(webhook.node) as INode,
-			additionalData,
-		).find((w) => w.httpMethod === httpMethod && w.path === webhook.webhookPath) as IWebhookData;
+		const webhookData = this.webhookService
+			.getNodeWebhooks(workflow, workflow.getNode(webhook.node) as INode, additionalData)
+			.find((w) => w.httpMethod === httpMethod && w.path === webhook.webhookPath) as IWebhookData;
 
 		// Get the node which has the webhook defined to know where to start from and to
 		// get additional data
diff --git a/packages/cli/src/webhooks/test-webhook-registrations.service.ts b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
index 6a3e205f58..565608c583 100644
--- a/packages/cli/src/webhooks/test-webhook-registrations.service.ts
+++ b/packages/cli/src/webhooks/test-webhook-registrations.service.ts
@@ -1,10 +1,10 @@
+import { Service } from '@n8n/di';
+import { InstanceSettings } from 'n8n-core';
 import type { IWebhookData } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { TEST_WEBHOOK_TIMEOUT, TEST_WEBHOOK_TIMEOUT_BUFFER } from '@/constants';
 import type { IWorkflowDb } from '@/interfaces';
 import { CacheService } from '@/services/cache/cache.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 
 export type TestWebhookRegistration = {
 	pushRef?: string;
@@ -17,7 +17,7 @@ export type TestWebhookRegistration = {
 export class TestWebhookRegistrationsService {
 	constructor(
 		private readonly cacheService: CacheService,
-		private readonly orchestrationService: OrchestrationService,
+		private readonly instanceSettings: InstanceSettings,
 	) {}
 
 	private readonly cacheKey = 'test-webhooks';
@@ -27,7 +27,7 @@ export class TestWebhookRegistrationsService {
 
 		await this.cacheService.setHash(this.cacheKey, { [hashKey]: registration });
 
-		if (!this.orchestrationService.isMultiMainSetupEnabled) return;
+		if (this.instanceSettings.isSingleMain) return;
 
 		/**
 		 * Multi-main setup: In a manual webhook execution, the main process that
diff --git a/packages/cli/src/webhooks/test-webhooks.ts b/packages/cli/src/webhooks/test-webhooks.ts
index bf2fa6c9d8..61d29d7b79 100644
--- a/packages/cli/src/webhooks/test-webhooks.ts
+++ b/packages/cli/src/webhooks/test-webhooks.ts
@@ -1,5 +1,6 @@
+import { Service } from '@n8n/di';
 import type express from 'express';
-import * as NodeExecuteFunctions from 'n8n-core';
+import { InstanceSettings } from 'n8n-core';
 import { WebhookPathTakenError, Workflow } from 'n8n-workflow';
 import type {
 	IWebhookData,
@@ -7,7 +8,6 @@ import type {
 	IHttpRequestMethods,
 	IRunData,
 } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { TEST_WEBHOOK_TIMEOUT } from '@/constants';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
@@ -17,13 +17,14 @@ import type { IWorkflowDb } from '@/interfaces';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
-import { OrchestrationService } from '@/services/orchestration.service';
 import { removeTrailingSlash } from '@/utils';
 import type { TestWebhookRegistration } from '@/webhooks/test-webhook-registrations.service';
 import { TestWebhookRegistrationsService } from '@/webhooks/test-webhook-registrations.service';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
+import type { WorkflowRequest } from '@/workflows/workflow.request';
 
+import { WebhookService } from './webhook.service';
 import type {
 	IWebhookResponseCallbackData,
 	IWebhookManager,
@@ -41,8 +42,9 @@ export class TestWebhooks implements IWebhookManager {
 		private readonly push: Push,
 		private readonly nodeTypes: NodeTypes,
 		private readonly registrations: TestWebhookRegistrationsService,
-		private readonly orchestrationService: OrchestrationService,
+		private readonly instanceSettings: InstanceSettings,
 		private readonly publisher: Publisher,
+		private readonly webhookService: WebhookService,
 	) {}
 
 	private timeouts: { [webhookKey: string]: NodeJS.Timeout } = {};
@@ -140,8 +142,7 @@ export class TestWebhooks implements IWebhookManager {
 				// Inform editor-ui that webhook got received
 				if (pushRef !== undefined) {
 					this.push.send(
-						'testWebhookReceived',
-						{ workflowId: webhook?.workflowId, executionId },
+						{ type: 'testWebhookReceived', data: { workflowId: webhook?.workflowId, executionId } },
 						pushRef,
 					);
 				}
@@ -153,11 +154,7 @@ export class TestWebhooks implements IWebhookManager {
 			 * the webhook. If so, after the test webhook has been successfully executed,
 			 * the handler process commands the creator process to clear its test webhooks.
 			 */
-			if (
-				this.orchestrationService.isMultiMainSetupEnabled &&
-				pushRef &&
-				!this.push.getBackend().hasPushRef(pushRef)
-			) {
+			if (this.instanceSettings.isMultiMain && pushRef && !this.push.hasPushRef(pushRef)) {
 				void this.publisher.publishCommand({
 					command: 'clear-test-webhooks',
 					payload: { webhookKey: key, workflowEntity, pushRef },
@@ -218,25 +215,48 @@ export class TestWebhooks implements IWebhookManager {
 	 * Return whether activating a workflow requires listening for webhook calls.
 	 * For every webhook call to listen for, also activate the webhook.
 	 */
-	async needsWebhook(
-		userId: string,
-		workflowEntity: IWorkflowDb,
-		additionalData: IWorkflowExecuteAdditionalData,
-		runData?: IRunData,
-		pushRef?: string,
-		destinationNode?: string,
-	) {
+	async needsWebhook(options: {
+		userId: string;
+		workflowEntity: IWorkflowDb;
+		additionalData: IWorkflowExecuteAdditionalData;
+		runData?: IRunData;
+		pushRef?: string;
+		destinationNode?: string;
+		triggerToStartFrom?: WorkflowRequest.ManualRunPayload['triggerToStartFrom'];
+	}) {
+		const {
+			userId,
+			workflowEntity,
+			additionalData,
+			runData,
+			pushRef,
+			destinationNode,
+			triggerToStartFrom,
+		} = options;
+
 		if (!workflowEntity.id) throw new WorkflowMissingIdError(workflowEntity);
 
 		const workflow = this.toWorkflow(workflowEntity);
 
-		const webhooks = WebhookHelpers.getWorkflowWebhooks(
+		let webhooks = WebhookHelpers.getWorkflowWebhooks(
 			workflow,
 			additionalData,
 			destinationNode,
 			true,
 		);
 
+		// If we have a preferred trigger with data, we don't have to listen for a
+		// webhook.
+		if (triggerToStartFrom?.data) {
+			return false;
+		}
+
+		// If we have a preferred trigger without data we only want to listen for
+		// that trigger, not the other ones.
+		if (triggerToStartFrom) {
+			webhooks = webhooks.filter((w) => w.node === triggerToStartFrom.name);
+		}
+
 		if (!webhooks.some((w) => w.webhookDescription.restartWebhook !== true)) {
 			return false; // no webhooks found to start a workflow
 		}
@@ -290,7 +310,7 @@ export class TestWebhooks implements IWebhookManager {
 				 */
 				await this.registrations.register(registration);
 
-				await workflow.createWebhookIfNotExists(webhook, NodeExecuteFunctions, 'manual', 'manual');
+				await this.webhookService.createWebhookIfNotExists(workflow, webhook, 'manual', 'manual');
 
 				cacheableWebhook.staticData = workflow.staticData;
 
@@ -329,7 +349,7 @@ export class TestWebhooks implements IWebhookManager {
 
 			if (pushRef !== undefined) {
 				try {
-					this.push.send('testWebhookDeleted', { workflowId }, pushRef);
+					this.push.send({ type: 'testWebhookDeleted', data: { workflowId } }, pushRef);
 				} catch {
 					// Could not inform editor, probably is not connected anymore. So simply go on.
 				}
@@ -407,7 +427,7 @@ export class TestWebhooks implements IWebhookManager {
 
 			if (staticData) workflow.staticData = staticData;
 
-			await workflow.deleteWebhook(webhook, NodeExecuteFunctions, 'internal', 'update');
+			await this.webhookService.deleteWebhook(workflow, webhook, 'internal', 'update');
 		}
 
 		await this.registrations.deregisterAll();
diff --git a/packages/cli/src/webhooks/waiting-forms.ts b/packages/cli/src/webhooks/waiting-forms.ts
index 5a491c1fb3..93294d24d0 100644
--- a/packages/cli/src/webhooks/waiting-forms.ts
+++ b/packages/cli/src/webhooks/waiting-forms.ts
@@ -1,7 +1,8 @@
+import { Service } from '@n8n/di';
 import axios from 'axios';
 import type express from 'express';
+import type { IRunData } from 'n8n-workflow';
 import { FORM_NODE_TYPE, sleep, Workflow } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { ConflictError } from '@/errors/response-errors/conflict.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
@@ -57,6 +58,29 @@ export class WaitingForms extends WaitingWebhooks {
 		} catch (error) {}
 	}
 
+	findCompletionPage(workflow: Workflow, runData: IRunData, lastNodeExecuted: string) {
+		const parentNodes = workflow.getParentNodes(lastNodeExecuted);
+		const lastNode = workflow.nodes[lastNodeExecuted];
+
+		if (
+			!lastNode.disabled &&
+			lastNode.type === FORM_NODE_TYPE &&
+			lastNode.parameters.operation === 'completion'
+		) {
+			return lastNodeExecuted;
+		} else {
+			return parentNodes.reverse().find((nodeName) => {
+				const node = workflow.nodes[nodeName];
+				return (
+					!node.disabled &&
+					node.type === FORM_NODE_TYPE &&
+					node.parameters.operation === 'completion' &&
+					runData[nodeName]
+				);
+			});
+		}
+	}
+
 	async executeWebhook(
 		req: WaitingWebhookRequest,
 		res: express.Response,
@@ -89,35 +113,19 @@ export class WaitingForms extends WaitingWebhooks {
 			throw new ConflictError(`The execution "${executionId}" is running already.`);
 		}
 
-		let completionPage;
+		let lastNodeExecuted = execution.data.resultData.lastNodeExecuted as string;
+
 		if (execution.finished) {
+			// find the completion page to render
+			// if there is no completion page, render the default page
 			const workflow = this.getWorkflow(execution);
 
-			const parentNodes = workflow.getParentNodes(
-				execution.data.resultData.lastNodeExecuted as string,
+			const completionPage = this.findCompletionPage(
+				workflow,
+				execution.data.resultData.runData,
+				lastNodeExecuted,
 			);
 
-			const lastNodeExecuted = execution.data.resultData.lastNodeExecuted as string;
-			const lastNode = workflow.nodes[lastNodeExecuted];
-
-			if (
-				!lastNode.disabled &&
-				lastNode.type === FORM_NODE_TYPE &&
-				lastNode.parameters.operation === 'completion'
-			) {
-				completionPage = lastNodeExecuted;
-			} else {
-				completionPage = Object.keys(workflow.nodes).find((nodeName) => {
-					const node = workflow.nodes[nodeName];
-					return (
-						parentNodes.includes(nodeName) &&
-						!node.disabled &&
-						node.type === FORM_NODE_TYPE &&
-						node.parameters.operation === 'completion'
-					);
-				});
-			}
-
 			if (!completionPage) {
 				res.render('form-trigger-completion', {
 					title: 'Form Submitted',
@@ -128,16 +136,16 @@ export class WaitingForms extends WaitingWebhooks {
 				return {
 					noWebhookResponse: true,
 				};
+			} else {
+				lastNodeExecuted = completionPage;
 			}
 		}
 
-		const targetNode = completionPage || (execution.data.resultData.lastNodeExecuted as string);
-
 		return await this.getWebhookExecutionData({
 			execution,
 			req,
 			res,
-			lastNodeExecuted: targetNode,
+			lastNodeExecuted,
 			executionId,
 			suffix,
 		});
diff --git a/packages/cli/src/webhooks/waiting-webhooks.ts b/packages/cli/src/webhooks/waiting-webhooks.ts
index 9529d04c04..90413b433d 100644
--- a/packages/cli/src/webhooks/waiting-webhooks.ts
+++ b/packages/cli/src/webhooks/waiting-webhooks.ts
@@ -1,24 +1,24 @@
+import { Service } from '@n8n/di';
 import type express from 'express';
+import { Logger } from 'n8n-core';
 import {
 	FORM_NODE_TYPE,
 	type INodes,
 	type IWorkflowBase,
-	NodeHelpers,
 	SEND_AND_WAIT_OPERATION,
 	WAIT_NODE_TYPE,
 	Workflow,
 } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { ConflictError } from '@/errors/response-errors/conflict.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import type { IExecutionResponse, IWorkflowDb } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
+import { WebhookService } from './webhook.service';
 import type {
 	IWebhookResponseCallbackData,
 	IWebhookManager,
@@ -38,6 +38,7 @@ export class WaitingWebhooks implements IWebhookManager {
 		protected readonly logger: Logger,
 		protected readonly nodeTypes: NodeTypes,
 		private readonly executionRepository: ExecutionRepository,
+		private readonly webhookService: WebhookService,
 	) {}
 
 	// TODO: implement `getWebhookMethods` for CORS support
@@ -164,17 +165,15 @@ export class WaitingWebhooks implements IWebhookManager {
 		}
 
 		const additionalData = await WorkflowExecuteAdditionalData.getBase();
-		const webhookData = NodeHelpers.getNodeWebhooks(
-			workflow,
-			workflowStartNode,
-			additionalData,
-		).find(
-			(webhook) =>
-				webhook.httpMethod === req.method &&
-				webhook.path === (suffix ?? '') &&
-				webhook.webhookDescription.restartWebhook === true &&
-				(webhook.webhookDescription.isForm || false) === this.includeForms,
-		);
+		const webhookData = this.webhookService
+			.getNodeWebhooks(workflow, workflowStartNode, additionalData)
+			.find(
+				(webhook) =>
+					webhook.httpMethod === req.method &&
+					webhook.path === (suffix ?? '') &&
+					webhook.webhookDescription.restartWebhook === true &&
+					(webhook.webhookDescription.isForm || false) === this.includeForms,
+			);
 
 		if (webhookData === undefined) {
 			// If no data got found it means that the execution can not be started via a webhook.
@@ -215,7 +214,7 @@ export class WaitingWebhooks implements IWebhookManager {
 				workflowData as IWorkflowDb,
 				workflowStartNode,
 				executionMode,
-				undefined,
+				runExecutionData.pushRef,
 				runExecutionData,
 				execution.id,
 				req,
diff --git a/packages/cli/src/webhooks/webhook-helpers.ts b/packages/cli/src/webhooks/webhook-helpers.ts
index 72628b8351..dd6a775606 100644
--- a/packages/cli/src/webhooks/webhook-helpers.ts
+++ b/packages/cli/src/webhooks/webhook-helpers.ts
@@ -7,9 +7,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type express from 'express';
 import get from 'lodash/get';
-import { BinaryDataService, NodeExecuteFunctions } from 'n8n-core';
+import { BinaryDataService, ErrorReporter, Logger } from 'n8n-core';
 import type {
 	IBinaryData,
 	IBinaryKeyData,
@@ -33,31 +34,30 @@ import {
 	ApplicationError,
 	BINARY_ENCODING,
 	createDeferredPromise,
-	ErrorReporterProxy as ErrorReporter,
-	ErrorReporterProxy,
 	ExecutionCancelledError,
 	FORM_NODE_TYPE,
-	NodeHelpers,
 	NodeOperationError,
 } from 'n8n-workflow';
+import assert from 'node:assert';
 import { finished } from 'stream/promises';
-import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
+import config from '@/config';
 import type { Project } from '@/databases/entities/project';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { UnprocessableRequestError } from '@/errors/response-errors/unprocessable.error';
-import type { IExecutionDb, IWorkflowDb } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
+import type { IWorkflowDb } from '@/interfaces';
 import { parseBody } from '@/middlewares';
 import { OwnershipService } from '@/services/ownership.service';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
+import { WaitTracker } from '@/wait-tracker';
 import { createMultiFormDataParser } from '@/webhooks/webhook-form-data';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 import * as WorkflowHelpers from '@/workflow-helpers';
 import { WorkflowRunner } from '@/workflow-runner';
 
+import { WebhookService } from './webhook.service';
 import type { IWebhookResponseCallbackData, WebhookRequest } from './webhook.types';
 
 /**
@@ -89,7 +89,12 @@ export function getWorkflowWebhooks(
 		}
 		returnData.push.apply(
 			returnData,
-			NodeHelpers.getNodeWebhooks(workflow, node, additionalData, ignoreRestartWebhooks),
+			Container.get(WebhookService).getNodeWebhooks(
+				workflow,
+				node,
+				additionalData,
+				ignoreRestartWebhooks,
+			),
 		);
 	}
 
@@ -255,11 +260,11 @@ export async function executeWebhook(
 		}
 
 		try {
-			webhookResultData = await workflow.runWebhook(
+			webhookResultData = await Container.get(WebhookService).runWebhook(
+				workflow,
 				webhookData,
 				workflowStartNode,
 				additionalData,
-				NodeExecuteFunctions,
 				executionMode,
 				runExecutionData ?? null,
 			);
@@ -279,7 +284,7 @@ export async function executeWebhook(
 				errorMessage = err.message;
 			}
 
-			ErrorReporterProxy.error(err, {
+			Container.get(ErrorReporter).error(err, {
 				extra: {
 					nodeName: workflowStartNode.name,
 					nodeType: workflowStartNode.type,
@@ -449,7 +454,7 @@ export async function executeWebhook(
 		}
 
 		let pinData: IPinData | undefined;
-		const usePinData = executionMode === 'manual';
+		const usePinData = ['manual', 'evaluation'].includes(executionMode);
 		if (usePinData) {
 			pinData = workflowData.pinData;
 			runExecutionData.resultData.pinData = pinData;
@@ -464,6 +469,11 @@ export async function executeWebhook(
 			projectId: project?.id,
 		};
 
+		// When resuming from a wait node, copy over the pushRef from the execution-data
+		if (!runData.pushRef) {
+			runData.pushRef = runExecutionData.pushRef;
+		}
+
 		let responsePromise: IDeferredPromise<IN8nHttpFullResponse> | undefined;
 		if (responseMode === 'responseNode') {
 			responsePromise = createDeferredPromise<IN8nHttpFullResponse>();
@@ -515,7 +525,7 @@ export async function executeWebhook(
 					didSendResponse = true;
 				})
 				.catch(async (error) => {
-					ErrorReporter.error(error);
+					Container.get(ErrorReporter).error(error);
 					Container.get(Logger).error(
 						`Error with Webhook-Response for execution "${executionId}": "${error.message}"`,
 						{ executionId, workflowId: workflow.id },
@@ -523,6 +533,15 @@ export async function executeWebhook(
 				});
 		}
 
+		if (
+			config.getEnv('executions.mode') === 'queue' &&
+			process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS === 'true' &&
+			runData.executionMode === 'manual'
+		) {
+			assert(runData.executionData);
+			runData.executionData.isTestWebhook = true;
+		}
+
 		// Start now to run the workflow
 		executionId = await Container.get(WorkflowRunner).run(
 			runData,
@@ -543,11 +562,21 @@ export async function executeWebhook(
 			{ executionId },
 		);
 
+		const activeExecutions = Container.get(ActiveExecutions);
+
+		// Get a promise which resolves when the workflow did execute and send then response
+		const executePromise = activeExecutions.getPostExecutePromise(executionId);
+
+		const { parentExecution } = runExecutionData;
+		if (parentExecution) {
+			// on child execution completion, resume parent execution
+			void executePromise.then(() => {
+				const waitTracker = Container.get(WaitTracker);
+				void waitTracker.startExecution(parentExecution.executionId);
+			});
+		}
+
 		if (!didSendResponse) {
-			// Get a promise which resolves when the workflow did execute and send then response
-			const executePromise = Container.get(ActiveExecutions).getPostExecutePromise(
-				executionId,
-			) as Promise<IExecutionDb | undefined>;
 			executePromise
 				// eslint-disable-next-line complexity
 				.then(async (data) => {
@@ -757,7 +786,7 @@ export async function executeWebhook(
 						);
 					}
 
-					const internalServerError = new InternalServerError(e.message);
+					const internalServerError = new InternalServerError(e.message, e);
 					if (e instanceof ExecutionCancelledError) internalServerError.level = 'warning';
 					throw internalServerError;
 				});
diff --git a/packages/cli/src/webhooks/webhook-request-handler.ts b/packages/cli/src/webhooks/webhook-request-handler.ts
index 96cf6da745..8eb62358b1 100644
--- a/packages/cli/src/webhooks/webhook-request-handler.ts
+++ b/packages/cli/src/webhooks/webhook-request-handler.ts
@@ -1,5 +1,7 @@
+import { Container } from '@n8n/di';
 import type express from 'express';
-import type { IHttpRequestMethods } from 'n8n-workflow';
+import { Logger } from 'n8n-core';
+import { ensureError, type IHttpRequestMethods } from 'n8n-workflow';
 
 import * as ResponseHelper from '@/response-helper';
 import type {
@@ -52,8 +54,14 @@ class WebhookRequestHandler {
 					response.headers,
 				);
 			}
-		} catch (error) {
-			return ResponseHelper.sendErrorResponse(res, error as Error);
+		} catch (e) {
+			const error = ensureError(e);
+			Container.get(Logger).debug(
+				`Error in handling webhook request ${req.method} ${req.path}: ${error.message}`,
+				{ stacktrace: error.stack },
+			);
+
+			return ResponseHelper.sendErrorResponse(res, error);
 		}
 	}
 
diff --git a/packages/cli/src/webhooks/webhook-server.ts b/packages/cli/src/webhooks/webhook-server.ts
index 263375325b..648dcd7bfb 100644
--- a/packages/cli/src/webhooks/webhook-server.ts
+++ b/packages/cli/src/webhooks/webhook-server.ts
@@ -1,4 +1,4 @@
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
 
 import { AbstractServer } from '@/abstract-server';
 
diff --git a/packages/cli/src/webhooks/webhook.service.ts b/packages/cli/src/webhooks/webhook.service.ts
index 8e72f0abf9..1a3dbf37cb 100644
--- a/packages/cli/src/webhooks/webhook.service.ts
+++ b/packages/cli/src/webhooks/webhook.service.ts
@@ -1,8 +1,22 @@
-import type { IHttpRequestMethods } from 'n8n-workflow';
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
+import { HookContext, WebhookContext, Logger } from 'n8n-core';
+import { ApplicationError, Node, NodeHelpers } from 'n8n-workflow';
+import type {
+	IHttpRequestMethods,
+	INode,
+	IRunExecutionData,
+	IWebhookData,
+	IWebhookResponseData,
+	IWorkflowExecuteAdditionalData,
+	WebhookSetupMethodNames,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
 
 import type { WebhookEntity } from '@/databases/entities/webhook-entity';
 import { WebhookRepository } from '@/databases/repositories/webhook.repository';
+import { NodeTypes } from '@/node-types';
 import { CacheService } from '@/services/cache/cache.service';
 
 type Method = NonNullable<IHttpRequestMethods>;
@@ -10,8 +24,10 @@ type Method = NonNullable<IHttpRequestMethods>;
 @Service()
 export class WebhookService {
 	constructor(
-		private webhookRepository: WebhookRepository,
-		private cacheService: CacheService,
+		private readonly logger: Logger,
+		private readonly webhookRepository: WebhookRepository,
+		private readonly cacheService: CacheService,
+		private readonly nodeTypes: NodeTypes,
 	) {}
 
 	async populateCache() {
@@ -118,4 +134,210 @@ export class WebhookService {
 			.find({ select: ['method'], where: { webhookPath: path } })
 			.then((rows) => rows.map((r) => r.method));
 	}
+
+	/**
+	 * Returns all the webhooks which should be created for the give node
+	 */
+	getNodeWebhooks(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		ignoreRestartWebhooks = false,
+	): IWebhookData[] {
+		if (node.disabled === true) {
+			// Node is disabled so webhooks will also not be enabled
+			return [];
+		}
+
+		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		if (nodeType.description.webhooks === undefined) {
+			// Node does not have any webhooks so return
+			return [];
+		}
+
+		const workflowId = workflow.id || '__UNSAVED__';
+		const mode = 'internal';
+
+		const returnData: IWebhookData[] = [];
+		for (const webhookDescription of nodeType.description.webhooks) {
+			if (ignoreRestartWebhooks && webhookDescription.restartWebhook === true) {
+				continue;
+			}
+
+			let nodeWebhookPath = workflow.expression.getSimpleParameterValue(
+				node,
+				webhookDescription.path,
+				mode,
+				{},
+			);
+			if (nodeWebhookPath === undefined) {
+				this.logger.error(
+					`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`,
+				);
+				continue;
+			}
+
+			nodeWebhookPath = nodeWebhookPath.toString();
+
+			if (nodeWebhookPath.startsWith('/')) {
+				nodeWebhookPath = nodeWebhookPath.slice(1);
+			}
+			if (nodeWebhookPath.endsWith('/')) {
+				nodeWebhookPath = nodeWebhookPath.slice(0, -1);
+			}
+
+			const isFullPath: boolean = workflow.expression.getSimpleParameterValue(
+				node,
+				webhookDescription.isFullPath,
+				'internal',
+				{},
+				undefined,
+				false,
+			) as boolean;
+			const restartWebhook: boolean = workflow.expression.getSimpleParameterValue(
+				node,
+				webhookDescription.restartWebhook,
+				'internal',
+				{},
+				undefined,
+				false,
+			) as boolean;
+			const path = NodeHelpers.getNodeWebhookPath(
+				workflowId,
+				node,
+				nodeWebhookPath,
+				isFullPath,
+				restartWebhook,
+			);
+
+			const webhookMethods = workflow.expression.getSimpleParameterValue(
+				node,
+				webhookDescription.httpMethod,
+				mode,
+				{},
+				undefined,
+				'GET',
+			);
+
+			if (webhookMethods === undefined) {
+				this.logger.error(
+					`The webhook "${path}" for node "${node.name}" in workflow "${workflowId}" could not be added because the httpMethod is not defined.`,
+				);
+				continue;
+			}
+
+			let webhookId: string | undefined;
+			if ((path.startsWith(':') || path.includes('/:')) && node.webhookId) {
+				webhookId = node.webhookId;
+			}
+
+			String(webhookMethods)
+				.split(',')
+				.forEach((httpMethod) => {
+					if (!httpMethod) return;
+					returnData.push({
+						httpMethod: httpMethod.trim() as IHttpRequestMethods,
+						node: node.name,
+						path,
+						webhookDescription,
+						workflowId,
+						workflowExecuteAdditionalData: additionalData,
+						webhookId,
+					});
+				});
+		}
+
+		return returnData;
+	}
+
+	async createWebhookIfNotExists(
+		workflow: Workflow,
+		webhookData: IWebhookData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): Promise<void> {
+		const webhookExists = await this.runWebhookMethod(
+			'checkExists',
+			workflow,
+			webhookData,
+			mode,
+			activation,
+		);
+		if (!webhookExists) {
+			// If webhook does not exist yet create it
+			await this.runWebhookMethod('create', workflow, webhookData, mode, activation);
+		}
+	}
+
+	async deleteWebhook(
+		workflow: Workflow,
+		webhookData: IWebhookData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	) {
+		await this.runWebhookMethod('delete', workflow, webhookData, mode, activation);
+	}
+
+	private async runWebhookMethod(
+		method: WebhookSetupMethodNames,
+		workflow: Workflow,
+		webhookData: IWebhookData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): Promise<boolean | undefined> {
+		const node = workflow.getNode(webhookData.node);
+
+		if (!node) return;
+
+		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		const webhookFn = nodeType.webhookMethods?.[webhookData.webhookDescription.name]?.[method];
+		if (webhookFn === undefined) return;
+
+		const context = new HookContext(
+			workflow,
+			node,
+			webhookData.workflowExecuteAdditionalData,
+			mode,
+			activation,
+			webhookData,
+		);
+
+		return (await webhookFn.call(context)) as boolean;
+	}
+
+	/**
+	 * Executes the webhook data to see what it should return and if the
+	 * workflow should be started or not
+	 */
+	async runWebhook(
+		workflow: Workflow,
+		webhookData: IWebhookData,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		runExecutionData: IRunExecutionData | null,
+	): Promise<IWebhookResponseData> {
+		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+		if (nodeType.webhook === undefined) {
+			throw new ApplicationError('Node does not have any webhooks defined', {
+				extra: { nodeName: node.name },
+			});
+		}
+
+		const context = new WebhookContext(
+			workflow,
+			node,
+			additionalData,
+			mode,
+			webhookData,
+			[],
+			runExecutionData ?? null,
+		);
+
+		return nodeType instanceof Node
+			? await nodeType.webhook(context)
+			: ((await nodeType.webhook.call(context)) as IWebhookResponseData);
+	}
 }
diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts
index 2deae842fc..f559765ec3 100644
--- a/packages/cli/src/workflow-execute-additional-data.ts
+++ b/packages/cli/src/workflow-execute-additional-data.ts
@@ -1,18 +1,19 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-use-before-define */
-
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import type { PushType } from '@n8n/api-types';
+import type { PushMessage, PushType } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
-import { WorkflowExecute } from 'n8n-core';
+import { Container } from '@n8n/di';
+import { stringify } from 'flatted';
 import {
-	ApplicationError,
-	ErrorReporterProxy as ErrorReporter,
-	NodeOperationError,
-	Workflow,
-	WorkflowHooks,
-} from 'n8n-workflow';
+	ErrorReporter,
+	Logger,
+	InstanceSettings,
+	WorkflowExecute,
+	isObjectLiteral,
+} from 'n8n-core';
+import { ApplicationError, NodeOperationError, Workflow, WorkflowHooks } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteData,
@@ -36,20 +37,16 @@ import type {
 	ExecuteWorkflowOptions,
 	IWorkflowExecutionDataProcess,
 	EnvProviderState,
+	ExecuteWorkflowData,
+	RelatedExecution,
 } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
-import config from '@/config';
 import { CredentialsHelper } from '@/credentials-helper';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import type { AiEventMap, AiEventPayload } from '@/events/maps/ai.event-map';
 import { ExternalHooks } from '@/external-hooks';
-import type {
-	IWorkflowExecuteProcess,
-	IWorkflowErrorData,
-	UpdateExecutionPayload,
-} from '@/interfaces';
+import type { IWorkflowErrorData, UpdateExecutionPayload } from '@/interfaces';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
 import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
@@ -66,12 +63,11 @@ import {
 	updateExistingExecution,
 } from './execution-lifecycle-hooks/shared/shared-hook-functions';
 import { toSaveSettings } from './execution-lifecycle-hooks/to-save-settings';
-import { Logger } from './logging/logger.service';
-import { TaskManager } from './runners/task-managers/task-manager';
-import { SecretsHelper } from './secrets-helpers';
+import { SecretsHelper } from './secrets-helpers.ee';
 import { OwnershipService } from './services/ownership.service';
 import { UrlService } from './services/url.service';
 import { SubworkflowPolicyChecker } from './subworkflows/subworkflow-policy-checker.service';
+import { TaskRequester } from './task-runners/task-managers/task-requester';
 import { PermissionChecker } from './user-management/permission-checker';
 import { WorkflowExecutionService } from './workflows/workflow-execution.service';
 import { WorkflowStaticDataService } from './workflows/workflow-static-data.service';
@@ -81,11 +77,20 @@ export function objectToError(errorObject: unknown, workflow: Workflow): Error {
 	if (errorObject instanceof Error) {
 		// If it's already an Error instance, return it as is.
 		return errorObject;
-	} else if (errorObject && typeof errorObject === 'object' && 'message' in errorObject) {
+	} else if (
+		isObjectLiteral(errorObject) &&
+		'message' in errorObject &&
+		typeof errorObject.message === 'string'
+	) {
 		// If it's an object with a 'message' property, create a new Error instance.
 		let error: Error | undefined;
-		if ('node' in errorObject) {
-			const node = workflow.getNode((errorObject.node as { name: string }).name);
+		if (
+			'node' in errorObject &&
+			isObjectLiteral(errorObject.node) &&
+			typeof errorObject.node.name === 'string'
+		) {
+			const node = workflow.getNode(errorObject.node.name);
+
 			if (node) {
 				error = new NodeOperationError(
 					node,
@@ -96,7 +101,7 @@ export function objectToError(errorObject: unknown, workflow: Workflow): Error {
 		}
 
 		if (error === undefined) {
-			error = new Error(errorObject.message as string);
+			error = new Error(errorObject.message);
 		}
 
 		if ('description' in errorObject) {
@@ -207,7 +212,7 @@ export function executeErrorWorkflow(
 					);
 				})
 				.catch((error: Error) => {
-					ErrorReporter.error(error);
+					Container.get(ErrorReporter).error(error);
 					logger.error(
 						`Could not execute ErrorWorkflow for execution ID ${this.executionId} because of error querying the workflow owner`,
 						{
@@ -261,7 +266,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				pushInstance.send('nodeExecuteBefore', { executionId, nodeName }, pushRef);
+				pushInstance.send({ type: 'nodeExecuteBefore', data: { executionId, nodeName } }, pushRef);
 			},
 		],
 		nodeExecuteAfter: [
@@ -278,11 +283,14 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				pushInstance.send('nodeExecuteAfter', { executionId, nodeName, data }, pushRef);
+				pushInstance.send(
+					{ type: 'nodeExecuteAfter', data: { executionId, nodeName, data } },
+					pushRef,
+				);
 			},
 		],
 		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)', {
@@ -295,14 +303,19 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					return;
 				}
 				pushInstance.send(
-					'executionStarted',
 					{
-						executionId,
-						mode: this.mode,
-						startedAt: new Date(),
-						retryOf: this.retryOf,
-						workflowId,
-						workflowName,
+						type: 'executionStarted',
+						data: {
+							executionId,
+							mode: this.mode,
+							startedAt: new Date(),
+							retryOf: this.retryOf,
+							workflowId,
+							workflowName,
+							flattedRunData: data?.resultData.runData
+								? stringify(data.resultData.runData)
+								: stringify({}),
+						},
 					},
 					pushRef,
 				);
@@ -310,53 +323,26 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 		],
 		workflowExecuteAfter: [
 			async function (this: WorkflowHooks, fullRunData: IRun): Promise<void> {
-				const { pushRef, executionId, retryOf } = this;
+				const { pushRef, executionId } = this;
+				if (pushRef === undefined) return;
+
 				const { id: workflowId } = this.workflowData;
 				logger.debug('Executing hook (hookFunctionsPush)', {
 					executionId,
 					pushRef,
 					workflowId,
 				});
-				// Push data to session which started the workflow
-				if (pushRef === undefined) {
-					return;
-				}
 
-				// Clone the object except the runData. That one is not supposed
-				// to be send. Because that data got send piece by piece after
-				// each node which finished executing
-				// Edit: we now DO send the runData to the UI if mode=manual so that it shows the point of crashes
-				let pushRunData;
-				if (fullRunData.mode === 'manual') {
-					pushRunData = fullRunData;
+				const { status } = fullRunData;
+				if (status === 'waiting') {
+					pushInstance.send({ type: 'executionWaiting', data: { executionId } }, pushRef);
 				} else {
-					pushRunData = {
-						...fullRunData,
-						data: {
-							...fullRunData.data,
-							resultData: {
-								...fullRunData.data.resultData,
-								runData: {},
-							},
-						},
-					};
+					const rawData = stringify(fullRunData.data);
+					pushInstance.send(
+						{ type: 'executionFinished', data: { executionId, workflowId, status, rawData } },
+						pushRef,
+					);
 				}
-
-				// Push data to editor-ui once workflow finished
-				logger.debug(`Save execution progress to database for execution ID ${executionId} `, {
-					executionId,
-					workflowId,
-				});
-				// TODO: Look at this again
-				pushInstance.send(
-					'executionFinished',
-					{
-						executionId,
-						data: pushRunData,
-						retryOf,
-					},
-					pushRef,
-				);
 			},
 		],
 	};
@@ -438,7 +424,7 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 								newStaticData,
 							);
 						} catch (e) {
-							ErrorReporter.error(e);
+							Container.get(ErrorReporter).error(e);
 							logger.error(
 								`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (hookFunctionsSave)`,
 								{ executionId: this.executionId, workflowId: this.workflowData.id },
@@ -446,6 +432,9 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						}
 					}
 
+					const executionStatus = determineFinalExecutionStatus(fullRunData);
+					fullRunData.status = executionStatus;
+
 					const saveSettings = toSaveSettings(this.workflowData.settings);
 
 					if (isManualMode && !saveSettings.manual && !fullRunData.waitTill) {
@@ -463,27 +452,25 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						return;
 					}
 
-					const executionStatus = determineFinalExecutionStatus(fullRunData);
 					const shouldNotSave =
 						(executionStatus === 'success' && !saveSettings.success) ||
 						(executionStatus !== 'success' && !saveSettings.error);
 
-					if (shouldNotSave) {
-						if (!fullRunData.waitTill && !isManualMode) {
-							executeErrorWorkflow(
-								this.workflowData,
-								fullRunData,
-								this.mode,
-								this.executionId,
-								this.retryOf,
-							);
-							await Container.get(ExecutionRepository).hardDelete({
-								workflowId: this.workflowData.id,
-								executionId: this.executionId,
-							});
+					if (shouldNotSave && !fullRunData.waitTill && !isManualMode) {
+						executeErrorWorkflow(
+							this.workflowData,
+							fullRunData,
+							this.mode,
+							this.executionId,
+							this.retryOf,
+						);
 
-							return;
-						}
+						await Container.get(ExecutionRepository).hardDelete({
+							workflowId: this.workflowData.id,
+							executionId: this.executionId,
+						});
+
+						return;
 					}
 
 					// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
@@ -495,6 +482,11 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						retryOf: this.retryOf,
 					});
 
+					// When going into the waiting state, store the pushRef in the execution-data
+					if (fullRunData.waitTill && isManualMode) {
+						fullExecutionData.data.pushRef = this.pushRef;
+					}
+
 					await updateExistingExecution({
 						executionId: this.executionId,
 						workflowId: this.workflowData.id,
@@ -511,7 +503,7 @@ function hookFunctionsSave(): IWorkflowExecuteHooks {
 						);
 					}
 				} catch (error) {
-					ErrorReporter.error(error);
+					Container.get(ErrorReporter).error(error);
 					logger.error(`Failed saving execution data to DB on execution ID ${this.executionId}`, {
 						executionId: this.executionId,
 						workflowId: this.workflowData.id,
@@ -593,7 +585,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 								newStaticData,
 							);
 						} catch (e) {
-							ErrorReporter.error(e);
+							Container.get(ErrorReporter).error(e);
 							logger.error(
 								`There was a problem saving the workflow with id "${this.workflowData.id}" to save changed staticData: "${e.message}" (workflowExecuteAfter)`,
 								{ pushRef: this.pushRef, workflowId: this.workflowData.id },
@@ -602,6 +594,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 					}
 
 					const workflowStatusFinal = determineFinalExecutionStatus(fullRunData);
+					fullRunData.status = workflowStatusFinal;
 
 					if (workflowStatusFinal !== 'success' && workflowStatusFinal !== 'waiting') {
 						executeErrorWorkflow(
@@ -661,7 +654,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 							this.executionId,
 						]);
 					} catch (error) {
-						ErrorReporter.error(error);
+						Container.get(ErrorReporter).error(error);
 						Container.get(Logger).error(
 							'There was a problem running hook "workflow.postExecute"',
 							error,
@@ -681,6 +674,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 export async function getRunData(
 	workflowData: IWorkflowBase,
 	inputData?: INodeExecutionData[],
+	parentExecution?: RelatedExecution,
 ): Promise<IWorkflowExecutionDataProcess> {
 	const mode = 'integrated';
 
@@ -700,6 +694,7 @@ export async function getRunData(
 		data: {
 			main: [inputData],
 		},
+		metadata: { parentExecution },
 		source: null,
 	});
 
@@ -715,6 +710,7 @@ export async function getRunData(
 			waitingExecution: {},
 			waitingExecutionSource: {},
 		},
+		parentExecution,
 	};
 
 	return {
@@ -737,7 +733,7 @@ export async function getWorkflowData(
 
 	let workflowData: IWorkflowBase | null;
 	if (workflowInfo.id !== undefined) {
-		const relations = config.getEnv('workflowTagsDisabled') ? [] : ['tags'];
+		const relations = Container.get(GlobalConfig).tags.disabled ? [] : ['tags'];
 
 		workflowData = await Container.get(WorkflowRepository).get(
 			{ id: workflowInfo.id },
@@ -771,7 +767,41 @@ export async function executeWorkflow(
 	workflowInfo: IExecuteWorkflowInfo,
 	additionalData: IWorkflowExecuteAdditionalData,
 	options: ExecuteWorkflowOptions,
-): Promise<Array<INodeExecutionData[] | null> | IWorkflowExecuteProcess> {
+): Promise<ExecuteWorkflowData> {
+	const activeExecutions = Container.get(ActiveExecutions);
+
+	const workflowData =
+		options.loadedWorkflowData ??
+		(await getWorkflowData(workflowInfo, options.parentWorkflowId, options.parentWorkflowSettings));
+
+	const runData =
+		options.loadedRunData ??
+		(await getRunData(workflowData, options.inputData, options.parentExecution));
+
+	const executionId = await activeExecutions.add(runData);
+
+	const executionPromise = startExecution(
+		additionalData,
+		options,
+		executionId,
+		runData,
+		workflowData,
+	);
+
+	if (options.doNotWaitToFinish) {
+		return { executionId, data: [null] };
+	}
+
+	return await executionPromise;
+}
+
+async function startExecution(
+	additionalData: IWorkflowExecuteAdditionalData,
+	options: ExecuteWorkflowOptions,
+	executionId: string,
+	runData: IWorkflowExecutionDataProcess,
+	workflowData: IWorkflowBase,
+): Promise<ExecuteWorkflowData> {
 	const externalHooks = Container.get(ExternalHooks);
 	await externalHooks.init();
 
@@ -780,10 +810,6 @@ export async function executeWorkflow(
 	const eventService = Container.get(EventService);
 	const executionRepository = Container.get(ExecutionRepository);
 
-	const workflowData =
-		options.loadedWorkflowData ??
-		(await getWorkflowData(workflowInfo, options.parentWorkflowId, options.parentWorkflowSettings));
-
 	const workflowName = workflowData ? workflowData.name : undefined;
 	const workflow = new Workflow({
 		id: workflowData.id,
@@ -796,10 +822,6 @@ export async function executeWorkflow(
 		settings: workflowData.settings,
 	});
 
-	const runData = options.loadedRunData ?? (await getRunData(workflowData, options.inputData));
-
-	const executionId = await activeExecutions.add(runData);
-
 	/**
 	 * A subworkflow execution in queue mode is not enqueued, but rather runs in the
 	 * same worker process as the parent execution. Hence ensure the subworkflow
@@ -921,7 +943,11 @@ export async function executeWorkflow(
 
 		activeExecutions.finalizeExecution(executionId, data);
 		const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
-		return returnData!.data!.main;
+		return {
+			executionId,
+			data: returnData!.data!.main,
+			waitTill: data.waitTill,
+		};
 	}
 	activeExecutions.finalizeExecution(executionId, data);
 
@@ -956,7 +982,7 @@ export function sendDataToUI(type: PushType, data: IDataObject | IDataObject[])
 	// Push data to session which started workflow
 	try {
 		const pushInstance = Container.get(Push);
-		pushInstance.send(type, data, pushRef);
+		pushInstance.send({ type, data } as PushMessage, pushRef);
 	} catch (error) {
 		const logger = Container.get(Logger);
 		logger.warn(`There was a problem sending message to UI: ${error.message}`);
@@ -994,7 +1020,7 @@ export async function getBase(
 		setExecutionStatus,
 		variables,
 		secretsHelpers: Container.get(SecretsHelper),
-		async startAgentJob(
+		async startRunnerTask(
 			additionalData: IWorkflowExecuteAdditionalData,
 			jobType: string,
 			settings: unknown,
@@ -1011,11 +1037,8 @@ export async function getBase(
 			mode: WorkflowExecuteMode,
 			envProviderState: EnvProviderState,
 			executeData?: IExecuteData,
-			defaultReturnRunIndex?: number,
-			selfData?: IDataObject,
-			contextNodeName?: string,
 		) {
-			return await Container.get(TaskManager).startTask(
+			return await Container.get(TaskRequester).startTask(
 				additionalData,
 				jobType,
 				settings,
@@ -1032,9 +1055,6 @@ export async function getBase(
 				mode,
 				envProviderState,
 				executeData,
-				defaultReturnRunIndex,
-				selfData,
-				contextNodeName,
 			);
 		},
 		logAiEvent: (eventName: keyof AiEventMap, payload: AiEventPayload) =>
@@ -1061,8 +1081,7 @@ function getWorkflowHooksIntegrated(
 }
 
 /**
- * Returns WorkflowHooks instance for running integrated workflows
- * (Workflows which get started inside of another workflow)
+ * Returns WorkflowHooks instance for worker in scaling mode.
  */
 export function getWorkflowHooksWorkerExecuter(
 	mode: WorkflowExecuteMode,
@@ -1078,6 +1097,17 @@ export function getWorkflowHooksWorkerExecuter(
 		hooks.push.apply(hookFunctions[key], preExecuteFunctions[key]);
 	}
 
+	if (mode === 'manual' && Container.get(InstanceSettings).isWorker) {
+		const pushHooks = hookFunctionsPush();
+		for (const key of Object.keys(pushHooks)) {
+			if (hookFunctions[key] === undefined) {
+				hookFunctions[key] = [];
+			}
+			// eslint-disable-next-line prefer-spread
+			hookFunctions[key].push.apply(hookFunctions[key], pushHooks[key]);
+		}
+	}
+
 	return new WorkflowHooks(hookFunctions, mode, executionId, workflowData, optionalParameters);
 }
 
@@ -1112,7 +1142,12 @@ export function getWorkflowHooksWorkerMain(
 	hookFunctions.nodeExecuteAfter = [];
 	hookFunctions.workflowExecuteAfter = [
 		async function (this: WorkflowHooks, fullRunData: IRun): Promise<void> {
+			// Don't delete executions before they are finished
+			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-helpers.ts b/packages/cli/src/workflow-helpers.ts
index 7cbce6b8a2..36946dd77e 100644
--- a/packages/cli/src/workflow-helpers.ts
+++ b/packages/cli/src/workflow-helpers.ts
@@ -1,3 +1,4 @@
+import { Container } from '@n8n/di';
 import type {
 	IDataObject,
 	INode,
@@ -7,16 +8,13 @@ import type {
 	NodeApiError,
 	WorkflowExecuteMode,
 	WorkflowOperationError,
-	Workflow,
 	NodeOperationError,
-	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
-import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
-import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { VariablesService } from '@/environments.ee/variables/variables.service.ee';
 
 export function generateFailedExecutionFromError(
 	mode: WorkflowExecuteMode,
@@ -223,18 +221,6 @@ export async function replaceInvalidCredentials(workflow: WorkflowEntity): Promi
 	return workflow;
 }
 
-export function getExecutionStartNode(data: IWorkflowExecutionDataProcess, workflow: Workflow) {
-	let startNode;
-	if (
-		data.startNodes?.length === 1 &&
-		Object.keys(data.pinData ?? {}).includes(data.startNodes[0].name)
-	) {
-		startNode = workflow.getNode(data.startNodes[0].name) ?? undefined;
-	}
-
-	return startNode;
-}
-
 export async function getVariables(): Promise<IDataObject> {
 	const variables = await Container.get(VariablesService).getAllCached();
 	return Object.freeze(
diff --git a/packages/cli/src/workflow-runner.ts b/packages/cli/src/workflow-runner.ts
index 4dd5e08714..598e6a8b58 100644
--- a/packages/cli/src/workflow-runner.ts
+++ b/packages/cli/src/workflow-runner.ts
@@ -2,7 +2,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { InstanceSettings, WorkflowExecute } from 'n8n-core';
+import { Container, Service } from '@n8n/di';
+import { ErrorReporter, InstanceSettings, Logger, WorkflowExecute } from 'n8n-core';
 import type {
 	ExecutionError,
 	IDeferredPromise,
@@ -13,30 +14,24 @@ import type {
 	WorkflowHooks,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
-import {
-	ApplicationError,
-	ErrorReporterProxy as ErrorReporter,
-	ExecutionCancelledError,
-	Workflow,
-} from 'n8n-workflow';
+import { ExecutionCancelledError, Workflow } from 'n8n-workflow';
 import PCancelable from 'p-cancelable';
-import { Container, Service } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import config from '@/config';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { ExternalHooks } from '@/external-hooks';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import type { ScalingService } from '@/scaling/scaling.service';
 import type { Job, JobData } from '@/scaling/scaling.types';
 import { PermissionChecker } from '@/user-management/permission-checker';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
-import * as WorkflowHelpers from '@/workflow-helpers';
 import { generateFailedExecutionFromError } from '@/workflow-helpers';
 import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service';
 
+import { ExecutionNotFoundError } from './errors/execution-not-found-error';
 import { EventService } from './events/event.service';
+import { ManualExecutionService } from './manual-execution.service';
 
 @Service()
 export class WorkflowRunner {
@@ -46,6 +41,7 @@ export class WorkflowRunner {
 
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly activeExecutions: ActiveExecutions,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly externalHooks: ExternalHooks,
@@ -54,24 +50,39 @@ export class WorkflowRunner {
 		private readonly permissionChecker: PermissionChecker,
 		private readonly eventService: EventService,
 		private readonly instanceSettings: InstanceSettings,
+		private readonly manualExecutionService: ManualExecutionService,
 	) {}
 
 	/** The process did error */
 	async processError(
-		error: ExecutionError,
+		error: ExecutionError | ExecutionNotFoundError,
 		startedAt: Date,
 		executionMode: WorkflowExecuteMode,
 		executionId: string,
 		hooks?: WorkflowHooks,
 	) {
-		ErrorReporter.error(error, { executionId });
+		// This means the execution was probably cancelled and has already
+		// been cleaned up.
+		//
+		// FIXME: This is a quick fix. The proper fix would be to not remove
+		// the execution from the active executions while it's still running.
+		if (
+			error instanceof ExecutionNotFoundError ||
+			error instanceof ExecutionCancelledError ||
+			error.message.includes('cancelled')
+		) {
+			return;
+		}
+
+		this.logger.error(`Problem with execution ${executionId}: ${error.message}. Aborting.`);
+		this.errorReporter.error(error, { executionId });
 
 		const isQueueMode = config.getEnv('executions.mode') === 'queue';
 
 		// in queue mode, first do a sanity run for the edge case that the execution was not marked as stalled
 		// by Bull even though it executed successfully, see https://github.com/OptimalBits/bull/issues/1415
 
-		if (isQueueMode && executionMode !== 'manual') {
+		if (isQueueMode) {
 			const executionWithoutData = await this.executionRepository.findSingleExecution(executionId, {
 				includeData: false,
 			});
@@ -128,7 +139,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);
@@ -139,9 +153,13 @@ export class WorkflowRunner {
 			this.activeExecutions.attachResponsePromise(executionId, responsePromise);
 		}
 
-		if (this.executionsMode === 'queue' && data.executionMode !== 'manual') {
-			// Do not run "manual" executions in bull because sending events to the
-			// frontend would not be possible
+		// @TODO: Reduce to true branch once feature is stable
+		const shouldEnqueue =
+			process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS === 'true'
+				? this.executionsMode === 'queue'
+				: this.executionsMode === 'queue' && data.executionMode !== 'manual';
+
+		if (shouldEnqueue) {
 			await this.enqueueExecution(executionId, data, loadStaticData, realtime);
 		} else {
 			await this.runMainProcess(executionId, data, loadStaticData, restartExecutionId);
@@ -172,14 +190,14 @@ export class WorkflowRunner {
 								executionId,
 							]);
 						} catch (error) {
-							ErrorReporter.error(error);
+							this.errorReporter.error(error);
 							this.logger.error('There was a problem running hook "workflow.postExecute"', error);
 						}
 					}
 				})
 				.catch((error) => {
 					if (error instanceof ExecutionCancelledError) return;
-					ErrorReporter.error(error);
+					this.errorReporter.error(error);
 					this.logger.error(
 						'There was a problem running internal hook "onWorkflowPostExecute"',
 						error,
@@ -191,6 +209,7 @@ export class WorkflowRunner {
 	}
 
 	/** Run the workflow in current process */
+	// eslint-disable-next-line complexity
 	private async runMainProcess(
 		executionId: string,
 		data: IWorkflowExecutionDataProcess,
@@ -215,7 +234,7 @@ export class WorkflowRunner {
 		}
 
 		let pinData: IPinData | undefined;
-		if (data.executionMode === 'manual') {
+		if (['manual', 'evaluation'].includes(data.executionMode)) {
 			pinData = data.pinData ?? data.workflowData.pinData;
 		}
 
@@ -274,49 +293,14 @@ export class WorkflowRunner {
 					data.executionData,
 				);
 				workflowExecution = workflowExecute.processRunExecutionData(workflow);
-			} else if (
-				data.runData === undefined ||
-				data.startNodes === undefined ||
-				data.startNodes.length === 0
-			) {
-				// Full Execution
-				this.logger.debug(`Execution ID ${executionId} will run executing all nodes.`, {
-					executionId,
-				});
-				// Execute all nodes
-
-				const startNode = WorkflowHelpers.getExecutionStartNode(data, workflow);
-
-				// Can execute without webhook so go on
-				const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
-				workflowExecution = workflowExecute.run(
-					workflow,
-					startNode,
-					data.destinationNode,
-					data.pinData,
-				);
 			} else {
-				// Partial Execution
-				this.logger.debug(`Execution ID ${executionId} is a partial execution.`, { executionId });
-				// Execute only the nodes between start and destination nodes
-				const workflowExecute = new WorkflowExecute(additionalData, data.executionMode);
-
-				if (data.partialExecutionVersion === '1') {
-					workflowExecution = workflowExecute.runPartialWorkflow2(
-						workflow,
-						data.runData,
-						data.destinationNode,
-						data.pinData,
-					);
-				} else {
-					workflowExecution = workflowExecute.runPartialWorkflow(
-						workflow,
-						data.runData,
-						data.startNodes,
-						data.destinationNode,
-						data.pinData,
-					);
-				}
+				workflowExecution = this.manualExecutionService.runManually(
+					data,
+					workflow,
+					additionalData,
+					executionId,
+					pinData,
+				);
 			}
 
 			this.activeExecutions.attachWorkflowExecution(executionId, workflowExecution);
@@ -369,6 +353,7 @@ export class WorkflowRunner {
 		const jobData: JobData = {
 			executionId,
 			loadStaticData: !!loadStaticData,
+			pushRef: data.pushRef,
 		};
 
 		if (!this.scalingService) {
@@ -381,17 +366,6 @@ export class WorkflowRunner {
 		let job: Job;
 		let hooks: WorkflowHooks;
 		try {
-			// check to help diagnose PAY-2100
-			if (
-				data.executionData?.executionData?.nodeExecutionStack?.length === 0 &&
-				config.getEnv('deployment.type') === 'internal'
-			) {
-				await this.executionRepository.setRunning(executionId); // set `startedAt` so we display it correctly in UI
-				throw new ApplicationError('Execution to enqueue has empty node execution stack', {
-					extra: { executionData: data.executionData },
-				});
-			}
-
 			job = await this.scalingService.addJob(jobData, { priority: realtime ? 50 : 100 });
 
 			hooks = WorkflowExecuteAdditionalData.getWorkflowHooksWorkerMain(
@@ -403,7 +377,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.
@@ -449,7 +423,6 @@ export class WorkflowRunner {
 						data.workflowData,
 						{ retryOf: data.retryOf ? data.retryOf.toString() : undefined },
 					);
-					this.logger.error(`Problem with execution ${executionId}: ${error.message}. Aborting.`);
 					await this.processError(error, new Date(), data.executionMode, executionId, hooks);
 
 					reject(error);
diff --git a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
index 35228dcfd4..3d0bec39de 100644
--- a/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
+++ b/packages/cli/src/workflows/__tests__/workflow-execution.service.test.ts
@@ -57,6 +57,7 @@ describe('WorkflowExecutionService', () => {
 		mock(),
 		mock(),
 		mock(),
+		mock(),
 		workflowRunner,
 		mock(),
 		mock(),
diff --git a/packages/cli/src/workflows/__tests__/workflows.controller.test.ts b/packages/cli/src/workflows/__tests__/workflows.controller.test.ts
new file mode 100644
index 0000000000..4168d487bf
--- /dev/null
+++ b/packages/cli/src/workflows/__tests__/workflows.controller.test.ts
@@ -0,0 +1,72 @@
+import type { ImportWorkflowFromUrlDto } from '@n8n/api-types/src/dto/workflows/import-workflow-from-url.dto';
+import axios from 'axios';
+import type { Response } from 'express';
+import { mock } from 'jest-mock-extended';
+
+import { BadRequestError } from '@/errors/response-errors/bad-request.error';
+import type { AuthenticatedRequest } from '@/requests';
+
+import { WorkflowsController } from '../workflows.controller';
+
+jest.mock('axios');
+
+describe('WorkflowsController', () => {
+	const controller = Object.create(WorkflowsController.prototype);
+	const axiosMock = axios.get as jest.Mock;
+	const req = mock<AuthenticatedRequest>();
+	const res = mock<Response>();
+
+	describe('getFromUrl', () => {
+		describe('should return workflow data', () => {
+			it('when the URL points to a valid JSON file', async () => {
+				const mockWorkflowData = {
+					nodes: [],
+					connections: {},
+				};
+
+				axiosMock.mockResolvedValue({ data: mockWorkflowData });
+
+				const query: ImportWorkflowFromUrlDto = { url: 'https://example.com/workflow.json' };
+				const result = await controller.getFromUrl(req, res, query);
+
+				expect(result).toEqual(mockWorkflowData);
+				expect(axiosMock).toHaveBeenCalledWith(query.url);
+			});
+		});
+
+		describe('should throw a BadRequestError', () => {
+			const query: ImportWorkflowFromUrlDto = { url: 'https://example.com/invalid.json' };
+
+			it('when the URL does not point to a valid JSON file', async () => {
+				axiosMock.mockRejectedValue(new Error('Network Error'));
+
+				await expect(controller.getFromUrl(req, res, query)).rejects.toThrow(BadRequestError);
+				expect(axiosMock).toHaveBeenCalledWith(query.url);
+			});
+
+			it('when the data is not a valid n8n workflow JSON', async () => {
+				const invalidWorkflowData = {
+					nodes: 'not an array',
+					connections: 'not an object',
+				};
+
+				axiosMock.mockResolvedValue({ data: invalidWorkflowData });
+
+				await expect(controller.getFromUrl(req, res, query)).rejects.toThrow(BadRequestError);
+				expect(axiosMock).toHaveBeenCalledWith(query.url);
+			});
+
+			it('when the data is missing required fields', async () => {
+				const incompleteWorkflowData = {
+					nodes: [],
+					// Missing connections field
+				};
+
+				axiosMock.mockResolvedValue({ data: incompleteWorkflowData });
+
+				await expect(controller.getFromUrl(req, res, query)).rejects.toThrow(BadRequestError);
+				expect(axiosMock).toHaveBeenCalledWith(query.url);
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts
index dd8480d759..bccd5c1f13 100644
--- a/packages/cli/src/workflows/workflow-execution.service.ts
+++ b/packages/cli/src/workflows/workflow-execution.service.ts
@@ -1,4 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
+import { ErrorReporter, Logger } from 'n8n-core';
 import type {
 	IDeferredPromise,
 	IExecuteData,
@@ -11,19 +13,14 @@ import type {
 	WorkflowExecuteMode,
 	IWorkflowExecutionDataProcess,
 } from 'n8n-workflow';
-import {
-	SubworkflowOperationError,
-	Workflow,
-	ErrorReporterProxy as ErrorReporter,
-} from 'n8n-workflow';
-import { Service } from 'typedi';
+import { SubworkflowOperationError, Workflow } from 'n8n-workflow';
 
+import config from '@/config';
 import type { Project } from '@/databases/entities/project';
 import type { User } from '@/databases/entities/user';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { CreateExecutionPayload, IWorkflowDb, IWorkflowErrorData } from '@/interfaces';
-import { Logger } from '@/logging/logger.service';
 import { NodeTypes } from '@/node-types';
 import { SubworkflowPolicyChecker } from '@/subworkflows/subworkflow-policy-checker.service';
 import { TestWebhooks } from '@/webhooks/test-webhooks';
@@ -36,6 +33,7 @@ import type { WorkflowRequest } from '@/workflows/workflow.request';
 export class WorkflowExecutionService {
 	constructor(
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly nodeTypes: NodeTypes,
@@ -89,7 +87,14 @@ export class WorkflowExecutionService {
 	}
 
 	async executeManually(
-		{ workflowData, runData, startNodes, destinationNode }: WorkflowRequest.ManualRunPayload,
+		{
+			workflowData,
+			runData,
+			startNodes,
+			destinationNode,
+			dirtyNodeNames,
+			triggerToStartFrom,
+		}: WorkflowRequest.ManualRunPayload,
 		user: User,
 		pushRef?: string,
 		partialExecutionVersion?: string,
@@ -111,14 +116,15 @@ export class WorkflowExecutionService {
 		) {
 			const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id);
 
-			const needsWebhook = await this.testWebhooks.needsWebhook(
-				user.id,
-				workflowData,
+			const needsWebhook = await this.testWebhooks.needsWebhook({
+				userId: user.id,
+				workflowEntity: workflowData,
 				additionalData,
 				runData,
 				pushRef,
 				destinationNode,
-			);
+				triggerToStartFrom,
+			});
 
 			if (needsWebhook) return { waitingForWebhook: true };
 		}
@@ -137,6 +143,8 @@ export class WorkflowExecutionService {
 			workflowData,
 			userId: user.id,
 			partialExecutionVersion: partialExecutionVersion ?? '0',
+			dirtyNodeNames,
+			triggerToStartFrom,
 		};
 
 		const hasRunData = (node: INode) => runData !== undefined && !!runData[node.name];
@@ -145,6 +153,35 @@ export class WorkflowExecutionService {
 			data.startNodes = [{ name: pinnedTrigger.name, sourceData: null }];
 		}
 
+		/**
+		 * Historically, manual executions in scaling mode ran in the main process,
+		 * so some execution details were never persisted in the database.
+		 *
+		 * Currently, manual executions in scaling mode are offloaded to workers,
+		 * so we persist all details to give workers full access to them.
+		 */
+		if (
+			config.getEnv('executions.mode') === 'queue' &&
+			process.env.OFFLOAD_MANUAL_EXECUTIONS_TO_WORKERS === 'true'
+		) {
+			data.executionData = {
+				startData: {
+					startNodes: data.startNodes,
+					destinationNode,
+				},
+				resultData: {
+					pinData,
+					runData,
+				},
+				manualData: {
+					userId: data.userId,
+					partialExecutionVersion: data.partialExecutionVersion,
+					dirtyNodeNames,
+					triggerToStartFrom,
+				},
+			};
+		}
+
 		const executionId = await this.workflowRunner.run(data);
 
 		return {
@@ -283,7 +320,7 @@ export class WorkflowExecutionService {
 
 			await this.workflowRunner.run(runData);
 		} catch (error) {
-			ErrorReporter.error(error);
+			this.errorReporter.error(error);
 			this.logger.error(
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				`Calling Error Workflow for "${workflowErrorData.workflow.id}": "${error.message}"`,
diff --git a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history-helper.ee.test.ts b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history-helper.ee.test.ts
similarity index 97%
rename from packages/cli/src/workflows/workflow-history/__tests__/workflow-history-helper.ee.test.ts
rename to packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history-helper.ee.test.ts
index ce3927f730..70e00d2c6d 100644
--- a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history-helper.ee.test.ts
+++ b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history-helper.ee.test.ts
@@ -1,6 +1,6 @@
 import config from '@/config';
 import { License } from '@/license';
-import { getWorkflowHistoryPruneTime } from '@/workflows/workflow-history/workflow-history-helper.ee';
+import { getWorkflowHistoryPruneTime } from '@/workflows/workflow-history.ee/workflow-history-helper.ee';
 import { mockInstance } from '@test/mocking';
 
 let licensePruneTime = -1;
diff --git a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts
similarity index 96%
rename from packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts
rename to packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts
index a2a48587f0..b80b38eb9e 100644
--- a/packages/cli/src/workflows/workflow-history/__tests__/workflow-history.service.ee.test.ts
+++ b/packages/cli/src/workflows/workflow-history.ee/__tests__/workflow-history.service.ee.test.ts
@@ -3,7 +3,7 @@ import { mockClear } from 'jest-mock-extended';
 import { User } from '@/databases/entities/user';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
-import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee';
+import { WorkflowHistoryService } from '@/workflows/workflow-history.ee/workflow-history.service.ee';
 import { mockInstance, mockLogger } from '@test/mocking';
 import { getWorkflow } from '@test-integration/workflow';
 
@@ -24,7 +24,7 @@ const testUser = Object.assign(new User(), {
 });
 let isWorkflowHistoryEnabled = true;
 
-jest.mock('@/workflows/workflow-history/workflow-history-helper.ee', () => {
+jest.mock('@/workflows/workflow-history.ee/workflow-history-helper.ee', () => {
 	return {
 		isWorkflowHistoryEnabled: jest.fn(() => isWorkflowHistoryEnabled),
 	};
diff --git a/packages/cli/src/workflows/workflow-history/workflow-history-helper.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history-helper.ee.ts
similarity index 96%
rename from packages/cli/src/workflows/workflow-history/workflow-history-helper.ee.ts
rename to packages/cli/src/workflows/workflow-history.ee/workflow-history-helper.ee.ts
index 11363a45bc..c8b06851e7 100644
--- a/packages/cli/src/workflows/workflow-history/workflow-history-helper.ee.ts
+++ b/packages/cli/src/workflows/workflow-history.ee/workflow-history-helper.ee.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import config from '@/config';
 import { License } from '@/license';
diff --git a/packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history-manager.ee.ts
similarity index 88%
rename from packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts
rename to packages/cli/src/workflows/workflow-history.ee/workflow-history-manager.ee.ts
index e710637441..b320c144f6 100644
--- a/packages/cli/src/workflows/workflow-history/workflow-history-manager.ee.ts
+++ b/packages/cli/src/workflows/workflow-history.ee/workflow-history-manager.ee.ts
@@ -1,9 +1,9 @@
+import { Service } from '@n8n/di';
 import { DateTime } from 'luxon';
-import { Service } from 'typedi';
 
+import { Time } from '@/constants';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
 
-import { WORKFLOW_HISTORY_PRUNE_INTERVAL } from './constants';
 import {
 	getWorkflowHistoryPruneTime,
 	isWorkflowHistoryEnabled,
@@ -20,7 +20,7 @@ export class WorkflowHistoryManager {
 			clearInterval(this.pruneTimer);
 		}
 
-		this.pruneTimer = setInterval(async () => await this.prune(), WORKFLOW_HISTORY_PRUNE_INTERVAL);
+		this.pruneTimer = setInterval(async () => await this.prune(), 1 * Time.hours.toMilliseconds);
 	}
 
 	shutdown() {
diff --git a/packages/cli/src/workflows/workflow-history/workflow-history.controller.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history.controller.ee.ts
similarity index 100%
rename from packages/cli/src/workflows/workflow-history/workflow-history.controller.ee.ts
rename to packages/cli/src/workflows/workflow-history.ee/workflow-history.controller.ee.ts
diff --git a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts b/packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts
similarity index 97%
rename from packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts
rename to packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts
index 3b171e3422..05256ec7a6 100644
--- a/packages/cli/src/workflows/workflow-history/workflow-history.service.ee.ts
+++ b/packages/cli/src/workflows/workflow-history.ee/workflow-history.service.ee.ts
@@ -1,5 +1,6 @@
+import { Service } from '@n8n/di';
+import { Logger } from 'n8n-core';
 import { ensureError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
@@ -8,7 +9,6 @@ import { SharedWorkflowRepository } from '@/databases/repositories/shared-workfl
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
 import { SharedWorkflowNotFoundError } from '@/errors/shared-workflow-not-found.error';
 import { WorkflowHistoryVersionNotFoundError } from '@/errors/workflow-history-version-not-found.error';
-import { Logger } from '@/logging/logger.service';
 
 import { isWorkflowHistoryEnabled } from './workflow-history-helper.ee';
 
diff --git a/packages/cli/src/workflows/workflow-history/constants.ts b/packages/cli/src/workflows/workflow-history/constants.ts
deleted file mode 100644
index dc4f7c7867..0000000000
--- a/packages/cli/src/workflows/workflow-history/constants.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { TIME } from '@/constants';
-
-export const WORKFLOW_HISTORY_PRUNE_INTERVAL = 1 * TIME.HOUR;
diff --git a/packages/cli/src/workflows/workflow-sharing.service.ts b/packages/cli/src/workflows/workflow-sharing.service.ts
index 280c553a5e..d10ad45083 100644
--- a/packages/cli/src/workflows/workflow-sharing.service.ts
+++ b/packages/cli/src/workflows/workflow-sharing.service.ts
@@ -1,9 +1,9 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
-import { Service } from 'typedi';
 
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { WorkflowSharingRole } from '@/databases/entities/shared-workflow';
 import type { User } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
diff --git a/packages/cli/src/workflows/workflow-static-data.service.ts b/packages/cli/src/workflows/workflow-static-data.service.ts
index 10655b77c7..5ef9a52480 100644
--- a/packages/cli/src/workflows/workflow-static-data.service.ts
+++ b/packages/cli/src/workflows/workflow-static-data.service.ts
@@ -1,9 +1,9 @@
 import { GlobalConfig } from '@n8n/config';
-import { type IDataObject, type Workflow, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
-import { Service } from 'typedi';
+import { Service } from '@n8n/di';
+import { ErrorReporter, Logger } from 'n8n-core';
+import type { IDataObject, Workflow } from 'n8n-workflow';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { Logger } from '@/logging/logger.service';
 import { isWorkflowIdValid } from '@/utils';
 
 @Service()
@@ -11,6 +11,7 @@ export class WorkflowStaticDataService {
 	constructor(
 		private readonly globalConfig: GlobalConfig,
 		private readonly logger: Logger,
+		private readonly errorReporter: ErrorReporter,
 		private readonly workflowRepository: WorkflowRepository,
 	) {}
 
@@ -33,7 +34,7 @@ export class WorkflowStaticDataService {
 					await this.saveStaticDataById(workflow.id, workflow.staticData);
 					workflow.staticData.__dataChanged = false;
 				} catch (error) {
-					ErrorReporter.error(error);
+					this.errorReporter.error(error);
 					this.logger.error(
 						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 						`There was a problem saving the workflow with id "${workflow.id}" to save changed Data: "${error.message}"`,
diff --git a/packages/cli/src/workflows/workflow.request.ts b/packages/cli/src/workflows/workflow.request.ts
index d45cfd14d3..47fd2cdb93 100644
--- a/packages/cli/src/workflows/workflow.request.ts
+++ b/packages/cli/src/workflows/workflow.request.ts
@@ -1,4 +1,11 @@
-import type { INode, IConnections, IWorkflowSettings, IRunData, StartNodeData } from 'n8n-workflow';
+import type {
+	INode,
+	IConnections,
+	IWorkflowSettings,
+	IRunData,
+	StartNodeData,
+	ITaskData,
+} from 'n8n-workflow';
 
 import type { IWorkflowDb } from '@/interfaces';
 import type { AuthenticatedRequest, ListQuery } from '@/requests';
@@ -22,6 +29,11 @@ export declare namespace WorkflowRequest {
 		runData: IRunData;
 		startNodes?: StartNodeData[];
 		destinationNode?: string;
+		dirtyNodeNames?: string[];
+		triggerToStartFrom?: {
+			name: string;
+			data?: ITaskData;
+		};
 	};
 
 	type Create = AuthenticatedRequest<{}, {}, CreateUpdatePayload>;
@@ -57,6 +69,4 @@ export declare namespace WorkflowRequest {
 		{},
 		{ destinationProjectId: string }
 	>;
-
-	type FromUrl = AuthenticatedRequest<{}, {}, {}, { url?: string }>;
 }
diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts
index 90a8af90b1..8122e909c4 100644
--- a/packages/cli/src/workflows/workflow.service.ee.ts
+++ b/packages/cli/src/workflows/workflow.service.ee.ts
@@ -1,8 +1,9 @@
+import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, type EntityManager } from '@n8n/typeorm';
 import omit from 'lodash/omit';
+import { Logger } from 'n8n-core';
 import { ApplicationError, NodeOperationError, WorkflowActivationError } from 'n8n-workflow';
-import { Service } from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { CredentialsService } from '@/credentials/credentials.service';
@@ -17,9 +18,8 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { TransferWorkflowError } from '@/errors/response-errors/transfer-workflow.error';
-import { Logger } from '@/logging/logger.service';
 import { OwnershipService } from '@/services/ownership.service';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 
 import type {
 	WorkflowWithSharingsAndCredentials,
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index bce8770303..6460348b23 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -1,3 +1,5 @@
+import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { EntityManager } from '@n8n/typeorm';
@@ -5,9 +7,8 @@ import type { EntityManager } from '@n8n/typeorm';
 import { In } from '@n8n/typeorm';
 import omit from 'lodash/omit';
 import pick from 'lodash/pick';
-import { BinaryDataService } from 'n8n-core';
+import { BinaryDataService, Logger } from 'n8n-core';
 import { NodeApiError } from 'n8n-workflow';
-import { Service } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
@@ -24,16 +25,15 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
-import { Logger } from '@/logging/logger.service';
 import { hasSharing, type ListQuery } from '@/requests';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { OwnershipService } from '@/services/ownership.service';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 import { RoleService } from '@/services/role.service';
 import { TagService } from '@/services/tag.service';
 import * as WorkflowHelpers from '@/workflow-helpers';
 
-import { WorkflowHistoryService } from './workflow-history/workflow-history.service.ee';
+import { WorkflowHistoryService } from './workflow-history.ee/workflow-history.service.ee';
 import { WorkflowSharingService } from './workflow-sharing.service';
 
 @Service()
@@ -55,6 +55,7 @@ export class WorkflowService {
 		private readonly projectService: ProjectService,
 		private readonly executionRepository: ExecutionRepository,
 		private readonly eventService: EventService,
+		private readonly globalConfig: GlobalConfig,
 	) {}
 
 	async getMany(user: User, options?: ListQuery.Options, includeScopes?: boolean) {
@@ -66,6 +67,20 @@ export class WorkflowService {
 		let { workflows, count } = await this.workflowRepository.getMany(sharedWorkflowIds, options);
 
 		if (hasSharing(workflows)) {
+			// Since we're filtering using project ID as part of the relation,
+			// we end up filtering out all the other relations, meaning that if
+			// it's shared to a project, it won't be able to find the home project.
+			// To solve this, we have to get all the relation now, even though
+			// we're deleting them later.
+			if (typeof options?.filter?.projectId === 'string' && options.filter.projectId !== '') {
+				const relations = await this.sharedWorkflowRepository.getAllRelationsForWorkflows(
+					workflows.map((c) => c.id),
+				);
+				workflows.forEach((c) => {
+					c.shared = relations.filter((r) => r.workflowId === c.id);
+				});
+			}
+
 			workflows = workflows.map((w) => this.ownershipService.addOwnedByAndSharedWith(w));
 		}
 
@@ -75,8 +90,8 @@ export class WorkflowService {
 		}
 
 		workflows.forEach((w) => {
-			// @ts-expect-error: This is to emulate the old behaviour of removing the shared
-			// field as part of `addOwnedByAndSharedWith`. We need this field in `addScopes`
+			// This is to emulate the old behaviour of removing the shared field as
+			// part of `addOwnedByAndSharedWith`. We need this field in `addScopes`
 			// though. So to avoid leaking the information we just delete it.
 			delete w.shared;
 		});
@@ -189,7 +204,9 @@ export class WorkflowService {
 			]),
 		);
 
-		if (tagIds && !config.getEnv('workflowTagsDisabled')) {
+		const tagsDisabled = this.globalConfig.tags.disabled;
+
+		if (tagIds && !tagsDisabled) {
 			await this.workflowTagMappingRepository.overwriteTaggings(workflowId, tagIds);
 		}
 
@@ -197,7 +214,7 @@ export class WorkflowService {
 			await this.workflowHistoryService.saveVersion(user, workflowUpdateData, workflowId);
 		}
 
-		const relations = config.getEnv('workflowTagsDisabled') ? [] : ['tags'];
+		const relations = tagsDisabled ? [] : ['tags'];
 
 		// We sadly get nothing back from "update". Neither if it updated a record
 		// nor the new value. So query now the hopefully updated entry.
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 59f53e0df1..2716b8c4b2 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -1,8 +1,10 @@
+import { ImportWorkflowFromUrlDto } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, type FindOptionsRelations } from '@n8n/typeorm';
 import axios from 'axios';
 import express from 'express';
+import { Logger } from 'n8n-core';
 import { ApplicationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 import { z } from 'zod';
@@ -17,7 +19,7 @@ import { SharedWorkflowRepository } from '@/databases/repositories/shared-workfl
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import * as Db from '@/db';
-import { Delete, Get, Patch, Post, ProjectScope, Put, RestController } from '@/decorators';
+import { Delete, Get, Patch, Post, ProjectScope, Put, Query, RestController } from '@/decorators';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { InternalServerError } from '@/errors/response-errors/internal-server.error';
@@ -27,19 +29,18 @@ import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
 import type { IWorkflowResponse } from '@/interfaces';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { listQueryMiddleware } from '@/middlewares';
+import { AuthenticatedRequest } from '@/requests';
 import * as ResponseHelper from '@/response-helper';
 import { NamingService } from '@/services/naming.service';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 import { TagService } from '@/services/tag.service';
-import { UserOnboardingService } from '@/services/user-onboarding.service';
 import { UserManagementMailer } from '@/user-management/email';
 import * as utils from '@/utils';
 import * as WorkflowHelpers from '@/workflow-helpers';
 
 import { WorkflowExecutionService } from './workflow-execution.service';
-import { WorkflowHistoryService } from './workflow-history/workflow-history.service.ee';
+import { WorkflowHistoryService } from './workflow-history.ee/workflow-history.service.ee';
 import { WorkflowRequest } from './workflow.request';
 import { WorkflowService } from './workflow.service';
 import { EnterpriseWorkflowService } from './workflow.service.ee';
@@ -55,7 +56,6 @@ export class WorkflowsController {
 		private readonly workflowHistoryService: WorkflowHistoryService,
 		private readonly tagService: TagService,
 		private readonly namingService: NamingService,
-		private readonly userOnboardingService: UserOnboardingService,
 		private readonly workflowRepository: WorkflowRepository,
 		private readonly workflowService: WorkflowService,
 		private readonly workflowExecutionService: WorkflowExecutionService,
@@ -89,7 +89,7 @@ export class WorkflowsController {
 
 		const { tags: tagIds } = req.body;
 
-		if (tagIds?.length && !config.getEnv('workflowTagsDisabled')) {
+		if (tagIds?.length && !this.globalConfig.tags.disabled) {
 			newWorkflow.tags = await this.tagRepository.findMany(tagIds);
 		}
 
@@ -164,7 +164,7 @@ export class WorkflowsController {
 
 		await this.workflowHistoryService.saveVersion(req.user, savedWorkflow, savedWorkflow.id);
 
-		if (tagIds && !config.getEnv('workflowTagsDisabled') && savedWorkflow.tags) {
+		if (tagIds && !this.globalConfig.tags.disabled && savedWorkflow.tags) {
 			savedWorkflow.tags = this.tagService.sortByRequestOrder(savedWorkflow.tags, {
 				requestOrder: tagIds,
 			});
@@ -213,28 +213,18 @@ export class WorkflowsController {
 		const requestedName = req.query.name ?? this.globalConfig.workflows.defaultName;
 
 		const name = await this.namingService.getUniqueWorkflowName(requestedName);
-
-		const onboardingFlowEnabled =
-			!this.globalConfig.workflows.onboardingFlowDisabled &&
-			!req.user.settings?.isOnboarded &&
-			(await this.userOnboardingService.isBelowThreshold(req.user));
-
-		return { name, onboardingFlowEnabled };
+		return { name };
 	}
 
 	@Get('/from-url')
-	async getFromUrl(req: WorkflowRequest.FromUrl) {
-		if (req.query.url === undefined) {
-			throw new BadRequestError('The parameter "url" is missing!');
-		}
-		if (!/^http[s]?:\/\/.*\.json$/i.exec(req.query.url)) {
-			throw new BadRequestError(
-				'The parameter "url" is not valid! It does not seem to be a URL pointing to a n8n workflow JSON file.',
-			);
-		}
+	async getFromUrl(
+		_req: AuthenticatedRequest,
+		_res: express.Response,
+		@Query query: ImportWorkflowFromUrlDto,
+	) {
 		let workflowData: IWorkflowResponse | undefined;
 		try {
-			const { data } = await axios.get<IWorkflowResponse>(req.query.url);
+			const { data } = await axios.get<IWorkflowResponse>(query.url);
 			workflowData = data;
 		} catch (error) {
 			throw new BadRequestError('The URL does not point to valid JSON file!');
@@ -270,7 +260,7 @@ export class WorkflowsController {
 				},
 			};
 
-			if (!config.getEnv('workflowTagsDisabled')) {
+			if (!this.globalConfig.tags.disabled) {
 				relations.tags = true;
 			}
 
@@ -278,7 +268,7 @@ export class WorkflowsController {
 				workflowId,
 				req.user,
 				['workflow:read'],
-				{ includeTags: !config.getEnv('workflowTagsDisabled') },
+				{ includeTags: !this.globalConfig.tags.disabled },
 			);
 
 			if (!workflow) {
@@ -306,7 +296,7 @@ export class WorkflowsController {
 			workflowId,
 			req.user,
 			['workflow:read'],
-			{ includeTags: !config.getEnv('workflowTagsDisabled') },
+			{ includeTags: !this.globalConfig.tags.disabled },
 		);
 
 		if (!workflow) {
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
new file mode 100644
index 0000000000..95c14105d7
--- /dev/null
+++ b/packages/cli/templates/form-trigger-409.handlebars
@@ -0,0 +1,74 @@
+<html lang='en'>
+
+	<head>
+		<meta charset='UTF-8' />
+		<meta name='viewport' content='width=device-width, initial-scale=1.0' />
+		<link rel='icon' type='image/png' href='https://n8n.io/favicon.ico' />
+		<link
+			href='https://fonts.googleapis.com/css?family=Open+Sans'
+			rel='stylesheet'
+			type='text/css'
+		/>
+		<title>Problem loading form</title>
+		<style>
+			*, ::after, ::before { box-sizing: border-box; margin: 0; padding: 0; } body { font-family:
+			Open Sans, sans-serif; font-weight: 400; font-size: 12px; display: flex; flex-direction:
+			column; justify-content: start; background-color: #FBFCFE; } .container { margin: auto;
+			text-align: center; padding-top: 24px; width: 448px; } .card { padding: 24px;
+			background-color: white; border: 1px solid #DBDFE7; border-radius: 8px; box-shadow: 0px 4px
+			16px 0px #634DFF0F; margin-bottom: 16px; } .n8n-link a { color: #7E8186; font-weight: 600;
+			font-size: 12px; text-decoration: none; } .n8n-link svg { display: inline-block;
+			vertical-align: middle; } .header h1 { color: #525356; font-size: 20px; font-weight: 400;
+			padding-bottom: 8px; } .header p { color: #7E8186; font-size: 14px; font-weight: 400; }
+		</style>
+	</head>
+
+	<body>
+		<div class='container'>
+			<section>
+				<div class='card'>
+					<div class='header'>
+						<h1>Problem loading form</h1>
+						<p>{{message}}</p>
+					</div>
+				</div>
+				<div class='n8n-link'>
+					<a
+						href='https://n8n.io/?utm_source=n8n-internal&amp;utm_medium=form-trigger&amp'
+						target='_blank'
+					>
+						Form automated with
+						<svg
+							width='73'
+							height='20'
+							viewBox='0 0 73 20'
+							fill='none'
+							xmlns='http://www.w3.org/2000/svg'
+						>
+							<path
+								fill-rule='evenodd'
+								clip-rule='evenodd'
+								d='M40.2373 4C40.2373 6.20915 38.4464 8 36.2373 8C34.3735 8 32.8074 6.72525 32.3633 5H26.7787C25.801 5 24.9666 5.70685 24.8059 6.6712L24.6415 7.6576C24.4854 8.59415 24.0116 9.40925 23.3417 10C24.0116 10.5907 24.4854 11.4058 24.6415 12.3424L24.8059 13.3288C24.9666 14.2931 25.801 15 26.7787 15H28.3633C28.8074 13.2747 30.3735 12 32.2373 12C34.4464 12 36.2373 13.7908 36.2373 16C36.2373 18.2092 34.4464 20 32.2373 20C30.3735 20 28.8074 18.7253 28.3633 17H26.7787C24.8233 17 23.1546 15.5864 22.8331 13.6576L22.6687 12.6712C22.508 11.7069 21.6736 11 20.6959 11H19.0645C18.5652 12.64 17.0406 13.8334 15.2373 13.8334C13.434 13.8334 11.9094 12.64 11.4101 11H9.06449C8.56519 12.64 7.04059 13.8334 5.2373 13.8334C3.02817 13.8334 1.2373 12.0424 1.2373 9.83335C1.2373 7.6242 3.02817 5.83335 5.2373 5.83335C7.16069 5.83335 8.76699 7.19085 9.15039 9H11.3242C11.7076 7.19085 13.3139 5.83335 15.2373 5.83335C17.1607 5.83335 18.767 7.19085 19.1504 9H20.6959C21.6736 9 22.508 8.29315 22.6687 7.3288L22.8331 6.3424C23.1546 4.41365 24.8233 3 26.7787 3H32.3633C32.8074 1.27478 34.3735 0 36.2373 0C38.4464 0 40.2373 1.79086 40.2373 4ZM38.2373 4C38.2373 5.10455 37.3419 6 36.2373 6C35.1327 6 34.2373 5.10455 34.2373 4C34.2373 2.89543 35.1327 2 36.2373 2C37.3419 2 38.2373 2.89543 38.2373 4ZM5.2373 11.8334C6.34189 11.8334 7.23729 10.9379 7.23729 9.83335C7.23729 8.72875 6.34189 7.83335 5.2373 7.83335C4.13273 7.83335 3.2373 8.72875 3.2373 9.83335C3.2373 10.9379 4.13273 11.8334 5.2373 11.8334ZM15.2373 11.8334C16.3419 11.8334 17.2373 10.9379 17.2373 9.83335C17.2373 8.72875 16.3419 7.83335 15.2373 7.83335C14.1327 7.83335 13.2373 8.72875 13.2373 9.83335C13.2373 10.9379 14.1327 11.8334 15.2373 11.8334ZM32.2373 18C33.3419 18 34.2373 17.1045 34.2373 16C34.2373 14.8954 33.3419 14 32.2373 14C31.1327 14 30.2373 14.8954 30.2373 16C30.2373 17.1045 31.1327 18 32.2373 18Z'
+								fill='#EA4B71'
+							></path>
+							<path
+								d='M44.2393 15.0007H46.3277V10.5791C46.3277 9.12704 47.2088 8.49074 48.204 8.49074C49.183 8.49074 49.9498 9.14334 49.9498 10.4812V15.0007H52.038V10.057C52.038 7.91969 50.798 6.67969 48.8567 6.67969C47.633 6.67969 46.9477 7.16914 46.4582 7.80544H46.3277L46.1482 6.84284H44.2393V15.0007Z'
+								fill='#101330'
+							></path>
+							<path
+								d='M60.0318 9.50205V9.40415C60.7498 9.0452 61.4678 8.4252 61.4678 7.20155C61.4678 5.43945 60.0153 4.37891 58.0088 4.37891C55.9528 4.37891 54.4843 5.5047 54.4843 7.23415C54.4843 8.4089 55.1698 9.0452 55.9203 9.40415V9.50205C55.0883 9.79575 54.0928 10.6768 54.0928 12.1452C54.0928 13.9237 55.5613 15.1637 57.9923 15.1637C60.4233 15.1637 61.8428 13.9237 61.8428 12.1452C61.8428 10.6768 60.8638 9.81205 60.0318 9.50205ZM57.9923 5.87995C58.8083 5.87995 59.4118 6.40205 59.4118 7.2831C59.4118 8.16415 58.7918 8.6863 57.9923 8.6863C57.1928 8.6863 56.5238 8.16415 56.5238 7.2831C56.5238 6.38575 57.1603 5.87995 57.9923 5.87995ZM57.9923 13.5974C57.0458 13.5974 56.2793 12.9937 56.2793 11.9658C56.2793 11.0358 56.9153 10.3342 57.9758 10.3342C59.0203 10.3342 59.6568 11.0195 59.6568 11.9984C59.6568 12.9937 58.9223 13.5974 57.9923 13.5974Z'
+								fill='#101330'
+							></path>
+							<path
+								d='M63.9639 15.0007H66.0524V10.5791C66.0524 9.12704 66.9334 8.49074 67.9289 8.49074C68.9079 8.49074 69.6744 9.14334 69.6744 10.4812V15.0007H71.7629V10.057C71.7629 7.91969 70.5229 6.67969 68.5814 6.67969C67.3579 6.67969 66.6724 7.16914 66.1829 7.80544H66.0524L65.8729 6.84284H63.9639V15.0007Z'
+								fill='#101330'
+							></path>
+						</svg>
+
+					</a>
+				</div>
+			</section>
+		</div>
+	</body>
+
+</html>
diff --git a/packages/cli/templates/form-trigger-completion.handlebars b/packages/cli/templates/form-trigger-completion.handlebars
index 761d09937b..a15855d371 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'
 		/>
@@ -69,6 +69,9 @@
 				{{/if}}
 			</section>
 		</div>
+		<script>
+			fetch('', { method: 'POST', body: {}, }).catch(() => {});
+		</script>
 	</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 08f6d2e290..ee868b072f 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'
 		/>
@@ -226,6 +226,7 @@
 
 			.multiselect-checkbox {
 				vertical-align: middle;
+				min-width: 18px;
 			}
 
 			input[type='checkbox'] {
@@ -449,7 +450,11 @@
 
 				<div class='card' id='submitted-form' style='display: none;'>
 					<div class='form-header'>
-						<h1 id='submitted-header'>Form Submitted</h1>
+						{{#if formSubmittedHeader}}
+							<h1 id='submitted-header'>{{formSubmittedHeader}}</h1>
+						{{else}}
+							<h1 id='submitted-header'>Form Submitted</h1>
+						{{/if}}
 						{{#if formSubmittedText}}
 							<p id='submitted-content'>
 								{{formSubmittedText}}
@@ -739,14 +744,6 @@
 							}
 
 							return;
-						}).then(() => {
-							window.addEventListener('storage', function(event) {
-								if (event.key === 'n8n_redirect_to_next_form_test_page' && event.newValue) {
-									const newUrl = event.newValue;
-									localStorage.removeItem('n8n_redirect_to_next_form_test_page');
-									window.location.replace(newUrl);
-								}
-							});
 						})
 						.catch(function (error) {
 							console.error('Error:', error);
diff --git a/packages/cli/templates/send-and-wait-no-action-required.handlebars b/packages/cli/templates/send-and-wait-no-action-required.handlebars
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/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts
index 8ea790ade7..3c98c2a4f1 100644
--- a/packages/cli/test/integration/active-workflow-manager.test.ts
+++ b/packages/cli/test/integration/active-workflow-manager.test.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import type { InstanceSettings } from 'n8n-core';
-import { NodeApiError, NodeOperationError, Workflow } from 'n8n-workflow';
+import { Logger } from 'n8n-core';
+import { NodeApiError, Workflow } from 'n8n-workflow';
 import type { IWebhookData, WorkflowActivateMode } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { ActiveExecutions } from '@/active-executions';
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
@@ -10,10 +10,9 @@ import type { WebhookEntity } from '@/databases/entities/webhook-entity';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExecutionService } from '@/executions/execution.service';
 import { ExternalHooks } from '@/external-hooks';
-import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { NodeTypes } from '@/node-types';
 import { Push } from '@/push';
-import { SecretsHelper } from '@/secrets-helpers';
+import { SecretsHelper } from '@/secrets-helpers.ee';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import { WebhookService } from '@/webhooks/webhook.service';
 import * as AdditionalData from '@/workflow-execute-additional-data';
@@ -22,29 +21,16 @@ import { WorkflowService } from '@/workflows/workflow.service';
 import { createOwner } from './shared/db/users';
 import { createWorkflow } from './shared/db/workflows';
 import * as testDb from './shared/test-db';
+import * as utils from './shared/utils/';
 import { mockInstance } from '../shared/mocking';
 
 mockInstance(ActiveExecutions);
+mockInstance(Logger);
 mockInstance(Push);
 mockInstance(SecretsHelper);
 mockInstance(ExecutionService);
 mockInstance(WorkflowService);
 
-const loader = mockInstance(LoadNodesAndCredentials);
-
-Object.assign(loader.loadedNodes, {
-	'n8n-nodes-base.scheduleTrigger': {
-		type: {
-			description: {
-				displayName: 'Schedule Trigger',
-				name: 'scheduleTrigger',
-				properties: [],
-			},
-			trigger: async () => {},
-		},
-	},
-});
-
 const webhookService = mockInstance(WebhookService);
 const externalHooks = mockInstance(ExternalHooks);
 
@@ -58,15 +44,17 @@ beforeAll(async () => {
 
 	activeWorkflowManager = Container.get(ActiveWorkflowManager);
 
+	await utils.initNodeTypes();
+
 	const owner = await createOwner();
 	createActiveWorkflow = async () => await createWorkflow({ active: true }, owner);
 	createInactiveWorkflow = async () => await createWorkflow({ active: false }, owner);
 });
 
 afterEach(async () => {
-	await testDb.truncate(['Workflow', 'Webhook']);
 	await activeWorkflowManager.removeAll();
-	jest.restoreAllMocks();
+	await testDb.truncate(['Workflow', 'Webhook']);
+	jest.clearAllMocks();
 });
 
 afterAll(async () => {
@@ -98,7 +86,7 @@ describe('init()', () => {
 		await Promise.all([createActiveWorkflow(), createActiveWorkflow()]);
 
 		const checkSpy = jest
-			.spyOn(Workflow.prototype, 'checkIfWorkflowCanBeActivated')
+			.spyOn(activeWorkflowManager, 'checkIfWorkflowCanBeActivated')
 			.mockReturnValue(true);
 
 		await activeWorkflowManager.init();
@@ -179,7 +167,6 @@ describe('remove()', () => {
 
 		it('should remove all webhooks of a workflow from external service', async () => {
 			const dbWorkflow = await createActiveWorkflow();
-			const deleteWebhookSpy = jest.spyOn(Workflow.prototype, 'deleteWebhook');
 			jest
 				.spyOn(WebhookHelpers, 'getWorkflowWebhooks')
 				.mockReturnValue([mock<IWebhookData>({ path: 'some-path' })]);
@@ -187,7 +174,7 @@ describe('remove()', () => {
 			await activeWorkflowManager.init();
 			await activeWorkflowManager.remove(dbWorkflow.id);
 
-			expect(deleteWebhookSpy).toHaveBeenCalledTimes(1);
+			expect(webhookService.deleteWebhook).toHaveBeenCalledTimes(1);
 		});
 
 		it('should stop running triggers and pollers', async () => {
@@ -206,22 +193,22 @@ describe('remove()', () => {
 });
 
 describe('executeErrorWorkflow()', () => {
-	it('should delegate to `WorkflowExecuteAdditionalData`', async () => {
-		const dbWorkflow = await createActiveWorkflow();
-		const [node] = dbWorkflow.nodes;
+	// it('should delegate to `WorkflowExecuteAdditionalData`', async () => {
+	// 	const dbWorkflow = await createActiveWorkflow();
+	// 	const [node] = dbWorkflow.nodes;
 
-		const executeSpy = jest.spyOn(AdditionalData, 'executeErrorWorkflow');
+	// 	const executeSpy = jest.spyOn(AdditionalData, 'executeErrorWorkflow');
 
-		await activeWorkflowManager.init();
+	// 	await activeWorkflowManager.init();
 
-		activeWorkflowManager.executeErrorWorkflow(
-			new NodeOperationError(node, 'Something went wrong'),
-			dbWorkflow,
-			'trigger',
-		);
+	// 	activeWorkflowManager.executeErrorWorkflow(
+	// 		new NodeOperationError(node, 'Something went wrong'),
+	// 		dbWorkflow,
+	// 		'trigger',
+	// 	);
 
-		expect(executeSpy).toHaveBeenCalledTimes(1);
-	});
+	// 	expect(executeSpy).toHaveBeenCalledTimes(1);
+	// });
 
 	it('should be called on failure to activate due to 401', async () => {
 		const dbWorkflow = await createActiveWorkflow();
@@ -271,80 +258,11 @@ describe('addWebhooks()', () => {
 		const [node] = dbWorkflow.nodes;
 
 		jest.spyOn(Workflow.prototype, 'getNode').mockReturnValue(node);
-		jest.spyOn(Workflow.prototype, 'checkIfWorkflowCanBeActivated').mockReturnValue(true);
-		jest.spyOn(Workflow.prototype, 'createWebhookIfNotExists').mockResolvedValue(undefined);
+		jest.spyOn(activeWorkflowManager, 'checkIfWorkflowCanBeActivated').mockReturnValue(true);
+		webhookService.createWebhookIfNotExists.mockResolvedValue(undefined);
 
 		await activeWorkflowManager.addWebhooks(workflow, additionalData, 'trigger', 'init');
 
 		expect(webhookService.storeWebhook).toHaveBeenCalledTimes(1);
 	});
 });
-
-describe('shouldAddWebhooks', () => {
-	describe('if leader', () => {
-		const activeWorkflowManager = new ActiveWorkflowManager(
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock<InstanceSettings>({ isLeader: true, isFollower: false }),
-			mock(),
-		);
-
-		test('should return `true` for `init`', () => {
-			// ensure webhooks are populated on init: https://github.com/n8n-io/n8n/pull/8830
-			const result = activeWorkflowManager.shouldAddWebhooks('init');
-			expect(result).toBe(true);
-		});
-
-		test('should return `false` for `leadershipChange`', () => {
-			const result = activeWorkflowManager.shouldAddWebhooks('leadershipChange');
-			expect(result).toBe(false);
-		});
-
-		test('should return `true` for `update` or `activate`', () => {
-			const modes = ['update', 'activate'] as WorkflowActivateMode[];
-			for (const mode of modes) {
-				const result = activeWorkflowManager.shouldAddWebhooks(mode);
-				expect(result).toBe(true);
-			}
-		});
-	});
-
-	describe('if follower', () => {
-		const activeWorkflowManager = new ActiveWorkflowManager(
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock(),
-			mock<InstanceSettings>({ isLeader: false, isFollower: true }),
-			mock(),
-		);
-
-		test('should return `false` for `update` or `activate`', () => {
-			const modes = ['update', 'activate'] as WorkflowActivateMode[];
-			for (const mode of modes) {
-				const result = activeWorkflowManager.shouldAddWebhooks(mode);
-				expect(result).toBe(false);
-			}
-		});
-	});
-});
diff --git a/packages/cli/test/integration/ai/ai.api.test.ts b/packages/cli/test/integration/ai/ai.api.test.ts
new file mode 100644
index 0000000000..6741930b2e
--- /dev/null
+++ b/packages/cli/test/integration/ai/ai.api.test.ts
@@ -0,0 +1,100 @@
+import { Container } from '@n8n/di';
+import { randomUUID } from 'crypto';
+import { mock } from 'jest-mock-extended';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
+
+import { FREE_AI_CREDITS_CREDENTIAL_NAME } from '@/constants';
+import type { Project } from '@/databases/entities/project';
+import type { User } from '@/databases/entities/user';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import { ProjectRepository } from '@/databases/repositories/project.repository';
+import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { AiService } from '@/services/ai.service';
+
+import { createOwner } from '../shared/db/users';
+import * as testDb from '../shared/test-db';
+import type { SuperAgentTest } from '../shared/types';
+import { setupTestServer } from '../shared/utils';
+
+const createAiCreditsResponse = {
+	apiKey: randomUUID(),
+	url: 'https://api.openai.com',
+};
+
+Container.set(
+	AiService,
+	mock<AiService>({
+		createFreeAiCredits: async () => createAiCreditsResponse,
+	}),
+);
+
+const testServer = setupTestServer({ endpointGroups: ['ai'] });
+
+let owner: User;
+let ownerPersonalProject: Project;
+
+let authOwnerAgent: SuperAgentTest;
+
+beforeEach(async () => {
+	await testDb.truncate(['SharedCredentials', 'Credentials']);
+
+	owner = await createOwner();
+
+	ownerPersonalProject = await Container.get(ProjectRepository).getPersonalProjectForUserOrFail(
+		owner.id,
+	);
+
+	authOwnerAgent = testServer.authAgentFor(owner);
+});
+
+describe('POST /ai/free-credits', () => {
+	test('should create OpenAI managed credential', async () => {
+		// Act
+		const response = await authOwnerAgent.post('/ai/free-credits').send({
+			projectId: ownerPersonalProject.id,
+		});
+
+		// Assert
+
+		expect(response.statusCode).toBe(200);
+
+		const { id, name, type, data: encryptedData, scopes } = response.body.data;
+
+		expect(name).toBe(FREE_AI_CREDITS_CREDENTIAL_NAME);
+		expect(type).toBe(OPEN_AI_API_CREDENTIAL_TYPE);
+		expect(encryptedData).not.toBe(createAiCreditsResponse);
+
+		expect(scopes).toEqual(
+			[
+				'credential:create',
+				'credential:delete',
+				'credential:list',
+				'credential:move',
+				'credential:read',
+				'credential:share',
+				'credential:update',
+			].sort(),
+		);
+
+		const credential = await Container.get(CredentialsRepository).findOneByOrFail({ id });
+
+		expect(credential.name).toBe(FREE_AI_CREDITS_CREDENTIAL_NAME);
+		expect(credential.type).toBe(OPEN_AI_API_CREDENTIAL_TYPE);
+		expect(credential.data).not.toBe(createAiCreditsResponse);
+		expect(credential.isManaged).toBe(true);
+
+		const sharedCredential = await Container.get(SharedCredentialsRepository).findOneOrFail({
+			relations: { project: true, credentials: true },
+			where: { credentialsId: credential.id },
+		});
+
+		expect(sharedCredential.project.id).toBe(ownerPersonalProject.id);
+		expect(sharedCredential.credentials.name).toBe(FREE_AI_CREDITS_CREDENTIAL_NAME);
+		expect(sharedCredential.credentials.isManaged).toBe(true);
+
+		const user = await Container.get(UserRepository).findOneOrFail({ where: { id: owner.id } });
+
+		expect(user.settings?.userClaimedAiCredits).toBe(true);
+	});
+});
diff --git a/packages/cli/test/integration/api-keys.api.test.ts b/packages/cli/test/integration/api-keys.api.test.ts
index f577e0cf78..14050b543a 100644
--- a/packages/cli/test/integration/api-keys.api.test.ts
+++ b/packages/cli/test/integration/api-keys.api.test.ts
@@ -1,5 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { ApiKey } from '@/databases/entities/api-key';
 import type { User } from '@/databases/entities/user';
diff --git a/packages/cli/test/integration/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts
index 2880526668..7fd3f50eac 100644
--- a/packages/cli/test/integration/auth.api.test.ts
+++ b/packages/cli/test/integration/auth.api.test.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 import validator from 'validator';
 
 import config from '@/config';
@@ -89,7 +89,7 @@ describe('POST /login', () => {
 		const response = await testServer.authlessAgent.post('/login').send({
 			email: owner.email,
 			password: ownerPassword,
-			mfaToken: mfaService.totp.generateTOTP(secret),
+			mfaCode: mfaService.totp.generateTOTP(secret),
 		});
 
 		expect(response.statusCode).toBe(200);
@@ -147,6 +147,21 @@ describe('POST /login', () => {
 		const response = await testServer.authAgentFor(ownerUser).get('/login');
 		expect(response.statusCode).toBe(200);
 	});
+
+	test('should fail on invalid email in the payload', async () => {
+		const response = await testServer.authlessAgent.post('/login').send({
+			email: 'invalid-email',
+			password: ownerPassword,
+		});
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body).toEqual({
+			validation: 'email',
+			code: 'invalid_string',
+			message: 'Invalid email',
+			path: ['email'],
+		});
+	});
 });
 
 describe('GET /login', () => {
diff --git a/packages/cli/test/integration/collaboration/collaboration.service.test.ts b/packages/cli/test/integration/collaboration/collaboration.service.test.ts
index df5f901f28..33ebb9ee31 100644
--- a/packages/cli/test/integration/collaboration/collaboration.service.test.ts
+++ b/packages/cli/test/integration/collaboration/collaboration.service.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import Container from 'typedi';
 
 import type {
 	WorkflowClosedMessage,
@@ -16,7 +16,7 @@ import { createWorkflow, shareWorkflowWithUsers } from '@test-integration/db/wor
 import * as testDb from '@test-integration/test-db';
 
 describe('CollaborationService', () => {
-	mockInstance(Push, new Push(mock(), mock()));
+	mockInstance(Push, new Push(mock(), mock(), mock()));
 	let pushService: Push;
 	let collaborationService: CollaborationService;
 	let owner: User;
@@ -78,37 +78,41 @@ describe('CollaborationService', () => {
 			// Assert
 			expect(sendToUsersSpy).toHaveBeenNthCalledWith(
 				1,
-				'collaboratorsChanged',
 				{
-					collaborators: [
-						{
-							lastSeen: expect.any(String),
-							user: owner.toIUser(),
-						},
-					],
-					workflowId: workflow.id,
+					type: 'collaboratorsChanged',
+					data: {
+						collaborators: [
+							{
+								lastSeen: expect.any(String),
+								user: owner.toIUser(),
+							},
+						],
+						workflowId: workflow.id,
+					},
 				},
 				[owner.id],
 			);
 			expect(sendToUsersSpy).toHaveBeenNthCalledWith(
 				2,
-				'collaboratorsChanged',
 				{
-					collaborators: expect.arrayContaining([
-						expect.objectContaining({
-							lastSeen: expect.any(String),
-							user: expect.objectContaining({
-								id: owner.id,
+					type: 'collaboratorsChanged',
+					data: {
+						collaborators: expect.arrayContaining([
+							expect.objectContaining({
+								lastSeen: expect.any(String),
+								user: expect.objectContaining({
+									id: owner.id,
+								}),
 							}),
-						}),
-						expect.objectContaining({
-							lastSeen: expect.any(String),
-							user: expect.objectContaining({
-								id: memberWithAccess.id,
+							expect.objectContaining({
+								lastSeen: expect.any(String),
+								user: expect.objectContaining({
+									id: memberWithAccess.id,
+								}),
 							}),
-						}),
-					]),
-					workflowId: workflow.id,
+						]),
+						workflowId: workflow.id,
+					},
 				},
 				[owner.id, memberWithAccess.id],
 			);
@@ -151,17 +155,19 @@ describe('CollaborationService', () => {
 
 			// Assert
 			expect(sendToUsersSpy).toHaveBeenCalledWith(
-				'collaboratorsChanged',
 				{
-					collaborators: expect.arrayContaining([
-						expect.objectContaining({
-							lastSeen: expect.any(String),
-							user: expect.objectContaining({
-								id: memberWithAccess.id,
+					type: 'collaboratorsChanged',
+					data: {
+						collaborators: expect.arrayContaining([
+							expect.objectContaining({
+								lastSeen: expect.any(String),
+								user: expect.objectContaining({
+									id: memberWithAccess.id,
+								}),
 							}),
-						}),
-					]),
-					workflowId: workflow.id,
+						]),
+						workflowId: workflow.id,
+					},
 				},
 				[memberWithAccess.id],
 			);
diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts
index ef0ab2c0d6..11051b9d98 100644
--- a/packages/cli/test/integration/commands/ldap/reset.test.ts
+++ b/packages/cli/test/integration/commands/ldap/reset.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { EntityNotFoundError } from '@n8n/typeorm';
-import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { Reset } from '@/commands/ldap/reset';
@@ -7,8 +7,8 @@ import { CredentialsRepository } from '@/databases/repositories/credentials.repo
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
-import { getLdapSynchronizations, saveLdapSynchronization } from '@/ldap/helpers.ee';
-import { LdapService } from '@/ldap/ldap.service.ee';
+import { getLdapSynchronizations, saveLdapSynchronization } from '@/ldap.ee/helpers.ee';
+import { LdapService } from '@/ldap.ee/ldap.service.ee';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { Push } from '@/push';
 import { Telemetry } from '@/telemetry';
diff --git a/packages/cli/test/integration/commands/license.cmd.test.ts b/packages/cli/test/integration/commands/license.cmd.test.ts
index 363d2feae6..d35c4fdc4a 100644
--- a/packages/cli/test/integration/commands/license.cmd.test.ts
+++ b/packages/cli/test/integration/commands/license.cmd.test.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import { ClearLicenseCommand } from '@/commands/license/clear';
 import { SETTINGS_LICENSE_CERT_KEY } from '@/constants';
diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts
index 58e8e344e5..19b301f596 100644
--- a/packages/cli/test/integration/commands/reset.cmd.test.ts
+++ b/packages/cli/test/integration/commands/reset.cmd.test.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import { Reset } from '@/commands/user-management/reset';
 import { CredentialsEntity } from '@/databases/entities/credentials-entity';
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
index ce3280aa48..8b9cebe854 100644
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -1,24 +1,24 @@
 process.argv[2] = 'worker';
 
 import { TaskRunnersConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { BinaryDataService } from 'n8n-core';
-import Container from 'typedi';
 
 import { Worker } from '@/commands/worker';
 import config from '@/config';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { LogStreamingEventRelay } from '@/events/relays/log-streaming.event-relay';
 import { ExternalHooks } from '@/external-hooks';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
+import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee';
 import { License } from '@/license';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { Push } from '@/push';
-import { TaskRunnerProcess } from '@/runners/task-runner-process';
-import { TaskRunnerServer } from '@/runners/task-runner-server';
 import { Publisher } from '@/scaling/pubsub/publisher.service';
 import { Subscriber } from '@/scaling/pubsub/subscriber.service';
 import { ScalingService } from '@/scaling/scaling.service';
 import { OrchestrationService } from '@/services/orchestration.service';
+import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
+import { TaskRunnerServer } from '@/task-runners/task-runner-server';
 import { Telemetry } from '@/telemetry';
 import { setupTestCommand } from '@test-integration/utils/test-command';
 
@@ -26,7 +26,7 @@ import { mockInstance } from '../../shared/mocking';
 
 config.set('executions.mode', 'queue');
 config.set('binaryDataManager.availableModes', 'filesystem');
-Container.get(TaskRunnersConfig).disabled = false;
+Container.get(TaskRunnersConfig).enabled = true;
 mockInstance(LoadNodesAndCredentials);
 const binaryDataService = mockInstance(BinaryDataService);
 const externalHooks = mockInstance(ExternalHooks);
diff --git a/packages/cli/test/integration/controllers/dynamic-node-parameters.controller.test.ts b/packages/cli/test/integration/controllers/dynamic-node-parameters.controller.test.ts
index 8f7436fc75..82e97a11f6 100644
--- a/packages/cli/test/integration/controllers/dynamic-node-parameters.controller.test.ts
+++ b/packages/cli/test/integration/controllers/dynamic-node-parameters.controller.test.ts
@@ -3,16 +3,21 @@ import type {
 	INodeListSearchResult,
 	IWorkflowExecuteAdditionalData,
 	ResourceMapperFields,
+	NodeParameterValueType,
 } from 'n8n-workflow';
 
 import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service';
 import * as AdditionalData from '@/workflow-execute-additional-data';
+import { mockInstance } from '@test/mocking';
 
 import { createOwner } from '../shared/db/users';
 import type { SuperAgentTest } from '../shared/types';
 import { setupTestServer } from '../shared/utils';
 
 describe('DynamicNodeParametersController', () => {
+	const additionalData = mock<IWorkflowExecuteAdditionalData>();
+	const service = mockInstance(DynamicNodeParametersService);
+
 	const testServer = setupTestServer({ endpointGroups: ['dynamic-node-parameters'] });
 	let ownerAgent: SuperAgentTest;
 
@@ -21,62 +26,171 @@ describe('DynamicNodeParametersController', () => {
 		ownerAgent = testServer.authAgentFor(owner);
 	});
 
+	beforeEach(() => {
+		jest.clearAllMocks();
+		jest.spyOn(AdditionalData, 'getBase').mockResolvedValue(additionalData);
+	});
+
 	const commonRequestParams = {
 		credentials: {},
 		currentNodeParameters: {},
-		nodeTypeAndVersion: {},
+		nodeTypeAndVersion: { name: 'TestNode', version: 1 },
 		path: 'path',
-		methodName: 'methodName',
 	};
 
 	describe('POST /dynamic-node-parameters/options', () => {
-		jest.spyOn(AdditionalData, 'getBase').mockResolvedValue(mock<IWorkflowExecuteAdditionalData>());
-
 		it('should take params via body', async () => {
-			jest
-				.spyOn(DynamicNodeParametersService.prototype, 'getOptionsViaMethodName')
-				.mockResolvedValue([]);
+			service.getOptionsViaMethodName.mockResolvedValue([]);
 
 			await ownerAgent
 				.post('/dynamic-node-parameters/options')
 				.send({
 					...commonRequestParams,
-					loadOptions: {},
+					methodName: 'testMethod',
 				})
 				.expect(200);
 		});
+
+		it('should take params with loadOptions', async () => {
+			const expectedResult = [{ name: 'Test Option', value: 'test' }];
+			service.getOptionsViaLoadOptions.mockResolvedValue(expectedResult);
+
+			const response = await ownerAgent
+				.post('/dynamic-node-parameters/options')
+				.send({
+					...commonRequestParams,
+					loadOptions: { type: 'test' },
+				})
+				.expect(200);
+
+			expect(response.body).toEqual({ data: expectedResult });
+		});
+
+		it('should return empty array when no method or loadOptions provided', async () => {
+			const response = await ownerAgent
+				.post('/dynamic-node-parameters/options')
+				.send({
+					...commonRequestParams,
+				})
+				.expect(200);
+
+			expect(response.body).toEqual({ data: [] });
+		});
 	});
 
 	describe('POST /dynamic-node-parameters/resource-locator-results', () => {
-		it('should take params via body', async () => {
-			jest
-				.spyOn(DynamicNodeParametersService.prototype, 'getResourceLocatorResults')
-				.mockResolvedValue(mock<INodeListSearchResult>());
+		it('should return resource locator results', async () => {
+			const expectedResult: INodeListSearchResult = { results: [] };
+			service.getResourceLocatorResults.mockResolvedValue(expectedResult);
+
+			const response = await ownerAgent
+				.post('/dynamic-node-parameters/resource-locator-results')
+				.send({
+					...commonRequestParams,
+					methodName: 'testMethod',
+					filter: 'testFilter',
+					paginationToken: 'testToken',
+				})
+				.expect(200);
+
+			expect(response.body).toEqual({ data: expectedResult });
+		});
+
+		it('should handle resource locator results without pagination', async () => {
+			const mockResults = mock<INodeListSearchResult>();
+			service.getResourceLocatorResults.mockResolvedValue(mockResults);
 
 			await ownerAgent
 				.post('/dynamic-node-parameters/resource-locator-results')
 				.send({
+					methodName: 'testMethod',
 					...commonRequestParams,
-					filter: 'filter',
-					paginationToken: 'paginationToken',
 				})
 				.expect(200);
 		});
+
+		it('should return a 400 if methodName is not defined', async () => {
+			await ownerAgent
+				.post('/dynamic-node-parameters/resource-locator-results')
+				.send(commonRequestParams)
+				.expect(400);
+		});
 	});
 
 	describe('POST /dynamic-node-parameters/resource-mapper-fields', () => {
-		it('should take params via body', async () => {
-			jest
-				.spyOn(DynamicNodeParametersService.prototype, 'getResourceMappingFields')
-				.mockResolvedValue(mock<ResourceMapperFields>());
+		it('should return resource mapper fields', async () => {
+			const expectedResult: ResourceMapperFields = { fields: [] };
+			service.getResourceMappingFields.mockResolvedValue(expectedResult);
 
-			await ownerAgent
+			const response = await ownerAgent
 				.post('/dynamic-node-parameters/resource-mapper-fields')
 				.send({
 					...commonRequestParams,
-					loadOptions: 'loadOptions',
+					methodName: 'testMethod',
+					loadOptions: 'testLoadOptions',
 				})
 				.expect(200);
+
+			expect(response.body).toEqual({ data: expectedResult });
+		});
+
+		it('should return a 400 if methodName is not defined', async () => {
+			await ownerAgent
+				.post('/dynamic-node-parameters/resource-mapper-fields')
+				.send(commonRequestParams)
+				.expect(400);
+		});
+	});
+
+	describe('POST /dynamic-node-parameters/local-resource-mapper-fields', () => {
+		it('should return local resource mapper fields', async () => {
+			const expectedResult: ResourceMapperFields = { fields: [] };
+			service.getLocalResourceMappingFields.mockResolvedValue(expectedResult);
+
+			const response = await ownerAgent
+				.post('/dynamic-node-parameters/local-resource-mapper-fields')
+				.send({
+					...commonRequestParams,
+					methodName: 'testMethod',
+				})
+				.expect(200);
+
+			expect(response.body).toEqual({ data: expectedResult });
+		});
+
+		it('should return a 400 if methodName is not defined', async () => {
+			await ownerAgent
+				.post('/dynamic-node-parameters/local-resource-mapper-fields')
+				.send(commonRequestParams)
+				.expect(400);
+		});
+	});
+
+	describe('POST /dynamic-node-parameters/action-result', () => {
+		it('should return action result with handler', async () => {
+			const expectedResult: NodeParameterValueType = { test: true };
+			service.getActionResult.mockResolvedValue(expectedResult);
+
+			const response = await ownerAgent
+				.post('/dynamic-node-parameters/action-result')
+				.send({
+					...commonRequestParams,
+					handler: 'testHandler',
+					payload: { someData: 'test' },
+				})
+				.expect(200);
+
+			expect(response.body).toEqual({ data: expectedResult });
+		});
+
+		it('should return a 400 if handler is not defined', async () => {
+			await ownerAgent
+				.post('/dynamic-node-parameters/action-result')
+				.send({
+					...commonRequestParams,
+					payload: { someData: 'test' },
+				})
+				.expect(400);
 		});
 	});
 });
diff --git a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
index f1e8e2a1b9..64ef210ab9 100644
--- a/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
+++ b/packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { Not } from '@n8n/typeorm';
-import Container from 'typedi';
 
 import type { User } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
diff --git a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts
index 6712b4f231..f20f9df550 100644
--- a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts
+++ b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts
@@ -1,14 +1,14 @@
+import { Container } from '@n8n/di';
 import { response as Response } from 'express';
 import nock from 'nock';
 import { parse as parseQs } from 'querystring';
-import { Container } from 'typedi';
 
 import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credential.controller';
 import { CredentialsHelper } from '@/credentials-helper';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { User } from '@/databases/entities/user';
 import { saveCredential } from '@test-integration/db/credentials';
-import { createOwner } from '@test-integration/db/users';
+import { createMember, createOwner } from '@test-integration/db/users';
 import * as testDb from '@test-integration/test-db';
 import type { SuperAgentTest } from '@test-integration/types';
 import { setupTestServer } from '@test-integration/utils';
@@ -17,6 +17,7 @@ describe('OAuth2 API', () => {
 	const testServer = setupTestServer({ endpointGroups: ['oauth2'] });
 
 	let owner: User;
+	let anotherUser: User;
 	let ownerAgent: SuperAgentTest;
 	let credential: CredentialsEntity;
 	const credentialData = {
@@ -32,6 +33,7 @@ describe('OAuth2 API', () => {
 
 	beforeAll(async () => {
 		owner = await createOwner();
+		anotherUser = await createMember();
 		ownerAgent = testServer.authAgentFor(owner);
 	});
 
@@ -74,6 +76,28 @@ describe('OAuth2 API', () => {
 		});
 	});
 
+	it('should fail on auth when callback is called as another user', async () => {
+		const controller = Container.get(OAuth2CredentialController);
+		const csrfSpy = jest.spyOn(controller, 'createCsrfState').mockClear();
+		const renderSpy = (Response.render = jest.fn(function () {
+			this.end();
+		}));
+
+		await ownerAgent.get('/oauth2-credential/auth').query({ id: credential.id }).expect(200);
+
+		const [_, state] = csrfSpy.mock.results[0].value;
+
+		await testServer
+			.authAgentFor(anotherUser)
+			.get('/oauth2-credential/callback')
+			.query({ code: 'auth_code', state })
+			.expect(200);
+
+		expect(renderSpy).toHaveBeenCalledWith('oauth-error-callback', {
+			error: { message: 'Unauthorized' },
+		});
+	});
+
 	it('should handle a valid callback without auth', async () => {
 		const controller = Container.get(OAuth2CredentialController);
 		const csrfSpy = jest.spyOn(controller, 'createCsrfState').mockClear();
@@ -87,7 +111,7 @@ describe('OAuth2 API', () => {
 
 		nock('https://test.domain').post('/oauth2/token').reply(200, { access_token: 'updated_token' });
 
-		await testServer.authlessAgent
+		await ownerAgent
 			.get('/oauth2-credential/callback')
 			.query({ code: 'auth_code', state })
 			.expect(200);
diff --git a/packages/cli/test/integration/credentials-helper.test.ts b/packages/cli/test/integration/credentials-helper.test.ts
index b3cb15555b..7b8522589a 100644
--- a/packages/cli/test/integration/credentials-helper.test.ts
+++ b/packages/cli/test/integration/credentials-helper.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { CredentialsHelper } from '@/credentials-helper';
 import type { User } from '@/databases/entities/user';
diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
index 5428cafbd4..98cecb6664 100644
--- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts
@@ -1,14 +1,15 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import { In } from '@n8n/typeorm';
-import { Container } from 'typedi';
 
 import config from '@/config';
+import { CredentialsService } from '@/credentials/credentials.service';
 import type { Project } from '@/databases/entities/project';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import type { ListQuery } from '@/requests';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 import { UserManagementMailer } from '@/user-management/email';
 import { createWorkflow, shareWorkflowWithUsers } from '@test-integration/db/workflows';
 
@@ -225,12 +226,12 @@ describe('GET /credentials', () => {
 		//
 		// ARRANGE
 		//
-		const project1 = await projectService.createTeamProject('Team Project', member);
+		const project1 = await projectService.createTeamProject(member, { name: 'Team Project' });
 		await projectService.addUser(project1.id, anotherMember.id, 'project:editor');
 		// anotherMember should see this one
 		const credential1 = await saveCredential(randomCredentialPayload(), { project: project1 });
 
-		const project2 = await projectService.createTeamProject('Team Project', member);
+		const project2 = await projectService.createTeamProject(member, { name: 'Team Project' });
 		// anotherMember should NOT see this one
 		await saveCredential(randomCredentialPayload(), { project: project2 });
 
@@ -540,6 +541,7 @@ describe('GET /credentials/:id', () => {
 			id: ownerPersonalProject.id,
 			name: owner.createPersonalProjectName(),
 			type: ownerPersonalProject.type,
+			icon: null,
 		});
 		expect(firstCredential.sharedWithProjects).toHaveLength(0);
 
@@ -554,6 +556,22 @@ describe('GET /credentials/:id', () => {
 		expect(secondCredential.data).toBeDefined();
 	});
 
+	test('should not redact the data when `includeData:true` is passed', async () => {
+		const credentialService = Container.get(CredentialsService);
+		const redactSpy = jest.spyOn(credentialService, 'redact');
+		const savedCredential = await saveCredential(randomCredentialPayload(), {
+			user: owner,
+		});
+
+		const response = await authOwnerAgent
+			.get(`/credentials/${savedCredential.id}`)
+			.query({ includeData: true });
+
+		validateMainCredentialData(response.body.data);
+		expect(response.body.data.data).toBeDefined();
+		expect(redactSpy).not.toHaveBeenCalled();
+	});
+
 	test('should retrieve non-owned cred for owner', async () => {
 		const [member1, member2] = await createManyUsers(2, {
 			role: 'global:member',
@@ -629,17 +647,20 @@ describe('GET /credentials/:id', () => {
 			homeProject: {
 				id: member1PersonalProject.id,
 				name: member1.createPersonalProjectName(),
+				icon: null,
 				type: 'personal',
 			},
 			sharedWithProjects: expect.arrayContaining([
 				{
 					id: member2PersonalProject.id,
 					name: member2.createPersonalProjectName(),
+					icon: null,
 					type: member2PersonalProject.type,
 				},
 				{
 					id: member3PersonalProject.id,
 					name: member3.createPersonalProjectName(),
+					icon: null,
 					type: member3PersonalProject.type,
 				},
 			]),
diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts
index 5f40850e59..ece8340e83 100644
--- a/packages/cli/test/integration/credentials/credentials.api.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.api.test.ts
@@ -1,9 +1,11 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { Scope } from '@sentry/node';
 import { Credentials } from 'n8n-core';
 import { randomString } from 'n8n-workflow';
-import { Container } from 'typedi';
 
+import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
+import { CredentialsService } from '@/credentials/credentials.service';
 import type { Project } from '@/databases/entities/project';
 import type { User } from '@/databases/entities/user';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
@@ -87,6 +89,7 @@ describe('GET /credentials', () => {
 			validateMainCredentialData(credential);
 			expect('data' in credential).toBe(false);
 			expect(savedCredentialsIds).toContain(credential.id);
+			expect('isManaged' in credential).toBe(true);
 		});
 	});
 
@@ -225,6 +228,161 @@ describe('GET /credentials', () => {
 		}
 	});
 
+	test('should return data when ?includeData=true', async () => {
+		// ARRANGE
+		const [actor, otherMember] = await createManyUsers(2, {
+			role: 'global:member',
+		});
+
+		const teamProjectViewer = await createTeamProject(undefined);
+		await linkUserToProject(actor, teamProjectViewer, 'project:viewer');
+		const teamProjectEditor = await createTeamProject(undefined);
+		await linkUserToProject(actor, teamProjectEditor, 'project:editor');
+
+		const [
+			// should have data
+			ownedCredential,
+			// should not have
+			sharedCredential,
+			// should not have data
+			teamCredentialAsViewer,
+			// should have data
+			teamCredentialAsEditor,
+		] = await Promise.all([
+			saveCredential(randomCredentialPayload(), { user: actor, role: 'credential:owner' }),
+			saveCredential(randomCredentialPayload(), { user: otherMember, role: 'credential:owner' }),
+			saveCredential(randomCredentialPayload(), {
+				project: teamProjectViewer,
+				role: 'credential:owner',
+			}),
+			saveCredential(randomCredentialPayload(), {
+				project: teamProjectEditor,
+				role: 'credential:owner',
+			}),
+		]);
+		await shareCredentialWithUsers(sharedCredential, [actor]);
+
+		// ACT
+		const response = await testServer
+			.authAgentFor(actor)
+			.get('/credentials')
+			.query({ includeData: true });
+
+		// ASSERT
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(4);
+
+		const creds = response.body.data as Array<Credentials & { scopes: Scope[] }>;
+		const ownedCred = creds.find((c) => c.id === ownedCredential.id)!;
+		const sharedCred = creds.find((c) => c.id === sharedCredential.id)!;
+		const teamCredAsViewer = creds.find((c) => c.id === teamCredentialAsViewer.id)!;
+		const teamCredAsEditor = creds.find((c) => c.id === teamCredentialAsEditor.id)!;
+
+		expect(ownedCred.id).toBe(ownedCredential.id);
+		expect(ownedCred.data).toBeDefined();
+		expect(ownedCred.scopes).toEqual(
+			[
+				'credential:move',
+				'credential:read',
+				'credential:update',
+				'credential:share',
+				'credential:delete',
+			].sort(),
+		);
+
+		expect(sharedCred.id).toBe(sharedCredential.id);
+		expect(sharedCred.data).not.toBeDefined();
+		expect(sharedCred.scopes).toEqual(['credential:read'].sort());
+
+		expect(teamCredAsViewer.id).toBe(teamCredentialAsViewer.id);
+		expect(teamCredAsViewer.data).not.toBeDefined();
+		expect(teamCredAsViewer.scopes).toEqual(['credential:read'].sort());
+
+		expect(teamCredAsEditor.id).toBe(teamCredentialAsEditor.id);
+		expect(teamCredAsEditor.data).toBeDefined();
+		expect(teamCredAsEditor.scopes).toEqual(
+			['credential:read', 'credential:update', 'credential:delete'].sort(),
+		);
+	});
+
+	test('should return data when ?includeData=true for owners', async () => {
+		// ARRANGE
+		const teamProjectViewer = await createTeamProject(undefined);
+
+		const [
+			// should have data
+			ownedCredential,
+			// should have data
+			sharedCredential,
+			// should have data
+			teamCredentialAsViewer,
+		] = await Promise.all([
+			saveCredential(randomCredentialPayload(), { user: owner, role: 'credential:owner' }),
+			saveCredential(randomCredentialPayload(), { user: member, role: 'credential:owner' }),
+			saveCredential(randomCredentialPayload(), {
+				project: teamProjectViewer,
+				role: 'credential:owner',
+			}),
+		]);
+
+		// ACT
+		const response = await testServer
+			.authAgentFor(owner)
+			.get('/credentials')
+			.query({ includeData: true });
+
+		// ASSERT
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(3);
+
+		const creds = response.body.data as Array<Credentials & { scopes: Scope[] }>;
+		const ownedCred = creds.find((c) => c.id === ownedCredential.id)!;
+		const sharedCred = creds.find((c) => c.id === sharedCredential.id)!;
+		const teamCredAsViewer = creds.find((c) => c.id === teamCredentialAsViewer.id)!;
+
+		expect(ownedCred.id).toBe(ownedCredential.id);
+		expect(ownedCred.data).toBeDefined();
+		expect(ownedCred.scopes).toEqual(
+			[
+				'credential:move',
+				'credential:read',
+				'credential:update',
+				'credential:share',
+				'credential:delete',
+				'credential:create',
+				'credential:list',
+			].sort(),
+		);
+
+		expect(sharedCred.id).toBe(sharedCredential.id);
+		expect(sharedCred.data).toBeDefined();
+		expect(sharedCred.scopes).toEqual(
+			[
+				'credential:move',
+				'credential:read',
+				'credential:update',
+				'credential:share',
+				'credential:delete',
+				'credential:create',
+				'credential:list',
+			].sort(),
+		);
+
+		expect(teamCredAsViewer.id).toBe(teamCredentialAsViewer.id);
+		expect(teamCredAsViewer.data).toBeDefined();
+		expect(teamCredAsViewer.scopes).toEqual(
+			[
+				'credential:move',
+				'credential:read',
+				'credential:update',
+				'credential:share',
+				'credential:delete',
+				'credential:create',
+				'credential:list',
+			].sort(),
+		);
+	});
+
 	describe('should return', () => {
 		test('all credentials for owner', async () => {
 			const { id: id1 } = await saveCredential(payload(), {
@@ -475,25 +633,25 @@ describe('GET /credentials', () => {
 			expect(response.body.data.map((credential) => credential.id)).toContain(memberCredential.id);
 		});
 
-		test('should return all credentials to instance owners when working on their own personal project', async () => {
+		test('should not ignore the project filter when the request is done by an owner and also includes the scopes', async () => {
 			const ownerCredential = await saveCredential(payload(), {
 				user: owner,
 				role: 'credential:owner',
 			});
-			const memberCredential = await saveCredential(payload(), {
-				user: member,
-				role: 'credential:owner',
-			});
+			// should not show up
+			await saveCredential(payload(), { user: member, role: 'credential:owner' });
 
 			const response: GetAllResponse = await testServer
 				.authAgentFor(owner)
 				.get('/credentials')
-				.query(`filter={ "projectId": "${ownerPersonalProject.id}" }&includeScopes=true`)
+				.query({
+					filter: JSON.stringify({ projectId: ownerPersonalProject.id }),
+					includeScopes: true,
+				})
 				.expect(200);
 
-			expect(response.body.data).toHaveLength(2);
-			expect(response.body.data.map((credential) => credential.id)).toContain(ownerCredential.id);
-			expect(response.body.data.map((credential) => credential.id)).toContain(memberCredential.id);
+			expect(response.body.data).toHaveLength(1);
+			expect(response.body.data[0].id).toBe(ownerCredential.id);
 		});
 	});
 
@@ -1007,6 +1165,73 @@ describe('PATCH /credentials/:id', () => {
 		expect(shellCredential.name).toBe(patchPayload.name); // updated
 	});
 
+	test('should not store redacted value in the db for oauthTokenData', async () => {
+		// ARRANGE
+		const credentialService = Container.get(CredentialsService);
+		const redactSpy = jest.spyOn(credentialService, 'redact').mockReturnValueOnce({
+			accessToken: CREDENTIAL_BLANKING_VALUE,
+			oauthTokenData: CREDENTIAL_BLANKING_VALUE,
+		});
+
+		const payload = randomCredentialPayload();
+		payload.data.oauthTokenData = { tokenData: true };
+		const savedCredential = await saveCredential(payload, {
+			user: owner,
+			role: 'credential:owner',
+		});
+
+		// ACT
+		const patchPayload = { ...payload, data: { foo: 'bar' } };
+		await authOwnerAgent.patch(`/credentials/${savedCredential.id}`).send(patchPayload).expect(200);
+
+		// ASSERT
+		const response = await authOwnerAgent
+			.get(`/credentials/${savedCredential.id}`)
+			.query({ includeData: true })
+			.expect(200);
+
+		const { id, data } = response.body.data;
+
+		expect(id).toBe(savedCredential.id);
+		expect(data).toEqual({
+			...patchPayload.data,
+			// should be the original
+			oauthTokenData: payload.data.oauthTokenData,
+		});
+		expect(redactSpy).not.toHaveBeenCalled();
+	});
+
+	test('should not allow to overwrite oauthTokenData', async () => {
+		// ARRANGE
+		const payload = randomCredentialPayload();
+		payload.data.oauthTokenData = { tokenData: true };
+		const savedCredential = await saveCredential(payload, {
+			user: owner,
+			role: 'credential:owner',
+		});
+
+		// ACT
+		const patchPayload = {
+			...payload,
+			data: { accessToken: 'new', oauthTokenData: { tokenData: false } },
+		};
+		await authOwnerAgent.patch(`/credentials/${savedCredential.id}`).send(patchPayload).expect(200);
+
+		// ASSERT
+		const response = await authOwnerAgent
+			.get(`/credentials/${savedCredential.id}`)
+			.query({ includeData: true })
+			.expect(200);
+
+		const { id, data } = response.body.data;
+
+		expect(id).toBe(savedCredential.id);
+		// was overwritten
+		expect(data.accessToken).toBe(patchPayload.data.accessToken);
+		// was not overwritten
+		expect(data.oauthTokenData).toEqual(payload.data.oauthTokenData);
+	});
+
 	test('should fail with invalid inputs', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), {
 			user: owner,
@@ -1035,6 +1260,19 @@ describe('PATCH /credentials/:id', () => {
 
 		expect(response.statusCode).toBe(403);
 	});
+
+	test('should fail with a 400 is credential is managed', async () => {
+		const { id } = await saveCredential(randomCredentialPayload({ isManaged: true }), {
+			user: owner,
+			role: 'credential:owner',
+		});
+
+		const response = await authOwnerAgent
+			.patch(`/credentials/${id}`)
+			.send(randomCredentialPayload());
+
+		expect(response.statusCode).toBe(400);
+	});
 });
 
 describe('GET /credentials/new', () => {
@@ -1103,6 +1341,23 @@ describe('GET /credentials/:id', () => {
 		expect(secondResponse.body.data.data).toBeDefined();
 	});
 
+	test('should not redact the data when `includeData:true` is passed', async () => {
+		const credentialService = Container.get(CredentialsService);
+		const redactSpy = jest.spyOn(credentialService, 'redact');
+		const savedCredential = await saveCredential(randomCredentialPayload(), {
+			user: owner,
+			role: 'credential:owner',
+		});
+
+		const response = await authOwnerAgent
+			.get(`/credentials/${savedCredential.id}`)
+			.query({ includeData: true });
+
+		validateMainCredentialData(response.body.data);
+		expect(response.body.data.data).toBeDefined();
+		expect(redactSpy).not.toHaveBeenCalled();
+	});
+
 	test('should retrieve owned cred for member', async () => {
 		const savedCredential = await saveCredential(randomCredentialPayload(), {
 			user: member,
@@ -1188,10 +1443,11 @@ const INVALID_PAYLOADS = [
 ];
 
 function validateMainCredentialData(credential: ListQuery.Credentials.WithOwnedByAndSharedWith) {
-	const { name, type, sharedWithProjects, homeProject } = credential;
+	const { name, type, sharedWithProjects, homeProject, isManaged } = credential;
 
 	expect(typeof name).toBe('string');
 	expect(typeof type).toBe('string');
+	expect(typeof isManaged).toBe('boolean');
 
 	if (sharedWithProjects) {
 		expect(Array.isArray(sharedWithProjects)).toBe(true);
diff --git a/packages/cli/test/integration/credentials/credentials.service.test.ts b/packages/cli/test/integration/credentials/credentials.service.test.ts
index ecfafada3f..9638228183 100644
--- a/packages/cli/test/integration/credentials/credentials.service.test.ts
+++ b/packages/cli/test/integration/credentials/credentials.service.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { CredentialsService } from '@/credentials/credentials.service';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
diff --git a/packages/cli/test/integration/cta.service.test.ts b/packages/cli/test/integration/cta.service.test.ts
index 68c1f24c5f..366b86e3ec 100644
--- a/packages/cli/test/integration/cta.service.test.ts
+++ b/packages/cli/test/integration/cta.service.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { User } from '@/databases/entities/user';
 import { StatisticsNames } from '@/databases/entities/workflow-statistics';
diff --git a/packages/cli/test/integration/database/repositories/execution.repository.test.ts b/packages/cli/test/integration/database/repositories/execution.repository.test.ts
index 1b50415686..cb368b511c 100644
--- a/packages/cli/test/integration/database/repositories/execution.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/execution.repository.test.ts
@@ -1,5 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
diff --git a/packages/cli/test/integration/database/repositories/project.repository.test.ts b/packages/cli/test/integration/database/repositories/project.repository.test.ts
index cc494fd542..334929e4e7 100644
--- a/packages/cli/test/integration/database/repositories/project.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/project.repository.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { EntityNotFoundError } from '@n8n/typeorm';
-import Container from 'typedi';
 
 import { AuthIdentity } from '@/databases/entities/auth-identity';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
index acff2cbce9..63b87df7e8 100644
--- a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
diff --git a/packages/cli/test/integration/debug.controller.test.ts b/packages/cli/test/integration/debug.controller.test.ts
index 8ab58bd1a0..7ca483a912 100644
--- a/packages/cli/test/integration/debug.controller.test.ts
+++ b/packages/cli/test/integration/debug.controller.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { InstanceSettings } from 'n8n-core';
-import Container from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
diff --git a/packages/cli/test/integration/deduplication/deduplication-helper.test.ts b/packages/cli/test/integration/deduplication/deduplication-helper.test.ts
index 2859bb363c..467e6e0924 100644
--- a/packages/cli/test/integration/deduplication/deduplication-helper.test.ts
+++ b/packages/cli/test/integration/deduplication/deduplication-helper.test.ts
@@ -1,5 +1,5 @@
 import { DataDeduplicationService } from 'n8n-core';
-import type { ICheckProcessedContextData, INodeTypeData } from 'n8n-workflow';
+import type { ICheckProcessedContextData } from 'n8n-workflow';
 import type { IDeduplicationOutput, INode, DeduplicationItemTypes } from 'n8n-workflow';
 import { Workflow } from 'n8n-workflow';
 
@@ -8,6 +8,7 @@ import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { NodeTypes } from '@/node-types';
 import { mockInstance } from '@test/mocking';
 import { createWorkflow } from '@test-integration/db/workflows';
+import { mockNodeTypesData } from '@test-integration/utils/node-types-data';
 
 import * as testDb from '../shared/test-db';
 
@@ -22,35 +23,7 @@ mockInstance(LoadNodesAndCredentials, {
 		credentials: {},
 	},
 });
-function mockNodeTypesData(
-	nodeNames: string[],
-	options?: {
-		addTrigger?: boolean;
-	},
-) {
-	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
-		return (
-			(acc[`n8n-nodes-base.${nodeName}`] = {
-				sourcePath: '',
-				type: {
-					description: {
-						displayName: nodeName,
-						name: nodeName,
-						group: [],
-						description: '',
-						version: 1,
-						defaults: {},
-						inputs: [],
-						outputs: [],
-						properties: [],
-					},
-					trigger: options?.addTrigger ? async () => undefined : undefined,
-				},
-			}),
-			acc
-		);
-	}, {});
-}
+
 const node: INode = {
 	id: 'uuid-1234',
 	parameters: {},
diff --git a/packages/cli/test/integration/environments/source-control-import.service.test.ts b/packages/cli/test/integration/environments/source-control-import.service.test.ts
index 78732a99bc..8b774f8fa9 100644
--- a/packages/cli/test/integration/environments/source-control-import.service.test.ts
+++ b/packages/cli/test/integration/environments/source-control-import.service.test.ts
@@ -1,17 +1,18 @@
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
 import type { InstanceSettings } from 'n8n-core';
 import * as utils from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 import fsp from 'node:fs/promises';
-import Container from 'typedi';
 
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
-import { SourceControlImportService } from '@/environments/source-control/source-control-import.service.ee';
-import type { ExportableCredential } from '@/environments/source-control/types/exportable-credential';
-import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file';
+import { UserRepository } from '@/databases/repositories/user.repository';
+import { SourceControlImportService } from '@/environments.ee/source-control/source-control-import.service.ee';
+import type { ExportableCredential } from '@/environments.ee/source-control/types/exportable-credential';
 
 import { mockInstance } from '../../shared/mocking';
 import { saveCredential } from '../shared/db/credentials';
@@ -21,19 +22,36 @@ import { randomCredentialPayload } from '../shared/random';
 import * as testDb from '../shared/test-db';
 
 describe('SourceControlImportService', () => {
+	let credentialsRepository: CredentialsRepository;
+	let projectRepository: ProjectRepository;
+	let sharedCredentialsRepository: SharedCredentialsRepository;
+	let userRepository: UserRepository;
 	let service: SourceControlImportService;
 	const cipher = mockInstance(Cipher);
 
 	beforeAll(async () => {
+		await testDb.init();
+
+		credentialsRepository = Container.get(CredentialsRepository);
+		projectRepository = Container.get(ProjectRepository);
+		sharedCredentialsRepository = Container.get(SharedCredentialsRepository);
+		userRepository = Container.get(UserRepository);
 		service = new SourceControlImportService(
 			mock(),
 			mock(),
 			mock(),
 			mock(),
+			credentialsRepository,
+			projectRepository,
+			mock(),
+			mock(),
+			sharedCredentialsRepository,
+			userRepository,
+			mock(),
+			mock(),
+			mock(),
 			mock<InstanceSettings>({ n8nFolder: '/some-path' }),
 		);
-
-		await testDb.init();
 	});
 
 	afterEach(async () => {
@@ -74,7 +92,7 @@ describe('SourceControlImportService', () => {
 
 				const personalProject = await getPersonalProject(member);
 
-				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+				const sharing = await sharedCredentialsRepository.findOneBy({
 					credentialsId: CREDENTIAL_ID,
 					projectId: personalProject.id,
 					role: 'credential:owner',
@@ -111,7 +129,7 @@ describe('SourceControlImportService', () => {
 
 				const personalProject = await getPersonalProject(importingUser);
 
-				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+				const sharing = await sharedCredentialsRepository.findOneBy({
 					credentialsId: CREDENTIAL_ID,
 					projectId: personalProject.id,
 					role: 'credential:owner',
@@ -148,7 +166,7 @@ describe('SourceControlImportService', () => {
 
 				const personalProject = await getPersonalProject(importingUser);
 
-				const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+				const sharing = await sharedCredentialsRepository.findOneBy({
 					credentialsId: CREDENTIAL_ID,
 					projectId: personalProject.id,
 					role: 'credential:owner',
@@ -189,7 +207,7 @@ describe('SourceControlImportService', () => {
 
 			const personalProject = await getPersonalProject(importingUser);
 
-			const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+			const sharing = await sharedCredentialsRepository.findOneBy({
 				credentialsId: CREDENTIAL_ID,
 				projectId: personalProject.id,
 				role: 'credential:owner',
@@ -222,7 +240,7 @@ describe('SourceControlImportService', () => {
 			cipher.encrypt.mockReturnValue('some-encrypted-data');
 
 			{
-				const project = await Container.get(ProjectRepository).findOne({
+				const project = await projectRepository.findOne({
 					where: [
 						{
 							id: '1234-asdf',
@@ -240,7 +258,7 @@ describe('SourceControlImportService', () => {
 				importingUser.id,
 			);
 
-			const sharing = await Container.get(SharedCredentialsRepository).findOne({
+			const sharing = await sharedCredentialsRepository.findOne({
 				where: {
 					credentialsId: CREDENTIAL_ID,
 					role: 'credential:owner',
@@ -287,7 +305,7 @@ describe('SourceControlImportService', () => {
 				importingUser.id,
 			);
 
-			const sharing = await Container.get(SharedCredentialsRepository).findOneBy({
+			const sharing = await sharedCredentialsRepository.findOneBy({
 				credentialsId: CREDENTIAL_ID,
 				projectId: project.id,
 				role: 'credential:owner',
@@ -331,7 +349,7 @@ describe('SourceControlImportService', () => {
 			);
 
 			await expect(
-				Container.get(SharedCredentialsRepository).findBy({
+				sharedCredentialsRepository.findBy({
 					credentialsId: credential.id,
 				}),
 			).resolves.toMatchObject([
@@ -341,7 +359,7 @@ describe('SourceControlImportService', () => {
 				},
 			]);
 			await expect(
-				Container.get(CredentialsRepository).findBy({
+				credentialsRepository.findBy({
 					id: credential.id,
 				}),
 			).resolves.toMatchObject([
diff --git a/packages/cli/test/integration/environments/source-control.test.ts b/packages/cli/test/integration/environments/source-control.api.test.ts
similarity index 64%
rename from packages/cli/test/integration/environments/source-control.test.ts
rename to packages/cli/test/integration/environments/source-control.api.test.ts
index f983b899aa..6ad771493b 100644
--- a/packages/cli/test/integration/environments/source-control.test.ts
+++ b/packages/cli/test/integration/environments/source-control.api.test.ts
@@ -1,10 +1,9 @@
-import { Container } from 'typedi';
+import type { SourceControlledFile } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 
-import config from '@/config';
 import type { User } from '@/databases/entities/user';
-import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
-import { SourceControlService } from '@/environments/source-control/source-control.service.ee';
-import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file';
+import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
+import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee';
 import { Telemetry } from '@/telemetry';
 import { mockInstance } from '@test/mocking';
 
@@ -21,11 +20,17 @@ const testServer = utils.setupTestServer({
 	enabledFeatures: ['feat:sourceControl', 'feat:sharing'],
 });
 
+let sourceControlPreferencesService: SourceControlPreferencesService;
+
 beforeAll(async () => {
 	owner = await createUser({ role: 'global:owner' });
 	authOwnerAgent = testServer.authAgentFor(owner);
 
-	Container.get(SourceControlPreferencesService).isSourceControlConnected = () => true;
+	sourceControlPreferencesService = Container.get(SourceControlPreferencesService);
+	await sourceControlPreferencesService.setPreferences({
+		connected: true,
+		keyGeneratorType: 'rsa',
+	});
 });
 
 describe('GET /sourceControl/preferences', () => {
@@ -65,19 +70,11 @@ describe('GET /sourceControl/preferences', () => {
 	});
 
 	test('refreshing key pairsshould return new rsa key', async () => {
-		config.set('sourceControl.defaultKeyPairType', 'rsa');
-		await authOwnerAgent
-			.post('/source-control/generate-key-pair')
-			.send()
-			.expect(200)
-			.expect((res) => {
-				expect(
-					Container.get(SourceControlPreferencesService).getPreferences().keyGeneratorType,
-				).toBe('rsa');
-				expect(res.body.data).toHaveProperty('publicKey');
-				expect(res.body.data).toHaveProperty('keyGeneratorType');
-				expect(res.body.data.keyGeneratorType).toBe('rsa');
-				expect(res.body.data.publicKey).toContain('ssh-rsa');
-			});
+		const res = await authOwnerAgent.post('/source-control/generate-key-pair').send().expect(200);
+
+		expect(res.body.data).toHaveProperty('publicKey');
+		expect(res.body.data).toHaveProperty('keyGeneratorType');
+		expect(res.body.data.keyGeneratorType).toBe('rsa');
+		expect(res.body.data.publicKey).toContain('ssh-rsa');
 	});
 });
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..996fd96148
--- /dev/null
+++ b/packages/cli/test/integration/evaluation/metrics.api.test.ts
@@ -0,0 +1,381 @@
+import { Container } from '@n8n/di';
+
+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
new file mode 100644
index 0000000000..52bc72f6f9
--- /dev/null
+++ b/packages/cli/test/integration/evaluation/test-definitions.api.test.ts
@@ -0,0 +1,505 @@
+import { Container } from '@n8n/di';
+import { mockInstance } from 'n8n-core/test/utils';
+
+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.ee/test-runner/test-runner.service.ee';
+import { createAnnotationTags } from '@test-integration/db/executions';
+
+import { createUserShell } from './../shared/db/users';
+import { createWorkflow } from './../shared/db/workflows';
+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;
+let annotationTag: AnnotationTagEntity;
+const testServer = utils.setupTestServer({ endpointGroups: ['evaluation'] });
+
+beforeAll(async () => {
+	ownerShell = await createUserShell('global:owner');
+	authOwnerAgent = testServer.authAgentFor(ownerShell);
+});
+
+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];
+});
+
+describe('GET /evaluation/test-definitions', () => {
+	test('should retrieve empty test definitions list', async () => {
+		const resp = await authOwnerAgent.get('/evaluation/test-definitions');
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.count).toBe(0);
+		expect(resp.body.data.testDefinitions).toHaveLength(0);
+	});
+
+	test('should retrieve test definitions list', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.get('/evaluation/test-definitions');
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual({
+			count: 1,
+			testDefinitions: [
+				expect.objectContaining({
+					name: 'test',
+					workflowId: workflowUnderTest.id,
+					evaluationWorkflowId: null,
+				}),
+			],
+		});
+	});
+
+	test('should retrieve test definitions list with pagination', async () => {
+		// Add a bunch of test definitions
+		const testDefinitions = [];
+
+		for (let i = 0; i < 15; i++) {
+			const newTest = Container.get(TestDefinitionRepository).create({
+				name: `test-${i}`,
+				workflow: { id: workflowUnderTest.id },
+			});
+			testDefinitions.push(newTest);
+		}
+
+		await Container.get(TestDefinitionRepository).save(testDefinitions);
+
+		// Fetch the first page
+		let resp = await authOwnerAgent.get('/evaluation/test-definitions?take=10');
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.count).toBe(15);
+		expect(resp.body.data.testDefinitions).toHaveLength(10);
+
+		// Fetch the second page
+		resp = await authOwnerAgent.get('/evaluation/test-definitions?take=10&skip=10');
+		expect(resp.statusCode).toBe(200);
+		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', () => {
+	test('should retrieve test definition', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.get(`/evaluation/test-definitions/${newTest.id}`);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.name).toBe('test');
+		expect(resp.body.data.workflowId).toBe(workflowUnderTest.id);
+		expect(resp.body.data.evaluationWorkflowId).toBe(null);
+	});
+
+	test('should return 404 for non-existent test definition', async () => {
+		const resp = await authOwnerAgent.get('/evaluation/test-definitions/123');
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should retrieve test definition with evaluation workflow', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+			evaluationWorkflow: { id: evaluationWorkflow.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.get(`/evaluation/test-definitions/${newTest.id}`);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.name).toBe('test');
+		expect(resp.body.data.workflowId).toBe(workflowUnderTest.id);
+		expect(resp.body.data.evaluationWorkflowId).toBe(evaluationWorkflow.id);
+	});
+
+	test('should not retrieve test definition if user does not have access to workflow under test', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: otherWorkflow.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.get(`/evaluation/test-definitions/${newTest.id}`);
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
+
+describe('POST /evaluation/test-definitions', () => {
+	test('should create test definition', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions').send({
+			name: 'test',
+			workflowId: workflowUnderTest.id,
+		});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.name).toBe('test');
+		expect(resp.body.data.workflowId).toBe(workflowUnderTest.id);
+	});
+
+	test('should create test definition with evaluation workflow', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions').send({
+			name: 'test',
+			workflowId: workflowUnderTest.id,
+			evaluationWorkflowId: evaluationWorkflow.id,
+		});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual(
+			expect.objectContaining({
+				name: 'test',
+				workflowId: workflowUnderTest.id,
+				evaluationWorkflowId: evaluationWorkflow.id,
+			}),
+		);
+	});
+
+	test('should create test definition with all fields', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions').send({
+			name: 'test',
+			description: 'test description',
+			workflowId: workflowUnderTest.id,
+			evaluationWorkflowId: evaluationWorkflow.id,
+			annotationTagId: annotationTag.id,
+		});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual(
+			expect.objectContaining({
+				name: 'test',
+				description: 'test description',
+				workflowId: workflowUnderTest.id,
+				evaluationWorkflowId: evaluationWorkflow.id,
+				annotationTag: expect.objectContaining({
+					id: annotationTag.id,
+				}),
+			}),
+		);
+	});
+
+	test('should return error if name is empty', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions').send({
+			name: '',
+			workflowId: workflowUnderTest.id,
+		});
+
+		expect(resp.statusCode).toBe(400);
+		expect(resp.body.errors).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					code: 'too_small',
+					path: ['name'],
+				}),
+			]),
+		);
+	});
+
+	test('should return error if user has no access to the workflow', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions').send({
+			name: 'test',
+			workflowId: otherWorkflow.id,
+		});
+
+		expect(resp.statusCode).toBe(403);
+		expect(resp.body.message).toBe('User does not have access to the workflow');
+	});
+
+	test('should return error if user has no access to the evaluation workflow', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions').send({
+			name: 'test',
+			workflowId: workflowUnderTest.id,
+			evaluationWorkflowId: otherWorkflow.id,
+		});
+
+		expect(resp.statusCode).toBe(403);
+		expect(resp.body.message).toBe('User does not have access to the evaluation workflow');
+	});
+});
+
+describe('PATCH /evaluation/test-definitions/:id', () => {
+	test('should update test definition', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			name: 'updated-test',
+		});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.name).toBe('updated-test');
+	});
+
+	test('should return 404 if user has no access to the workflow', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: otherWorkflow.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			name: 'updated-test',
+		});
+
+		expect(resp.statusCode).toBe(404);
+		expect(resp.body.message).toBe('Test definition not found');
+	});
+
+	test('should update test definition with evaluation workflow', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			name: 'updated-test',
+			evaluationWorkflowId: evaluationWorkflow.id,
+		});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.name).toBe('updated-test');
+		expect(resp.body.data.evaluationWorkflowId).toBe(evaluationWorkflow.id);
+	});
+
+	test('should return error if user has no access to the evaluation workflow', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			name: 'updated-test',
+			evaluationWorkflowId: otherWorkflow.id,
+		});
+
+		expect(resp.statusCode).toBe(403);
+		expect(resp.body.message).toBe('User does not have access to the evaluation workflow');
+	});
+
+	test('should disallow workflowId', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			name: 'updated-test',
+			workflowId: otherWorkflow.id,
+		});
+
+		expect(resp.statusCode).toBe(400);
+		expect(resp.body.errors).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					code: 'unrecognized_keys',
+					keys: ['workflowId'],
+				}),
+			]),
+		);
+	});
+
+	test('should update annotationTagId', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			annotationTagId: annotationTag.id,
+		});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.annotationTag.id).toBe(annotationTag.id);
+	});
+
+	test('should return error if annotationTagId is invalid', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			annotationTagId: '123',
+		});
+
+		expect(resp.statusCode).toBe(400);
+		expect(resp.body.message).toBe('Annotation tag not found');
+	});
+
+	test('should update pinned nodes', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			mockedNodes: [
+				{
+					id: 'uuid-1234',
+					name: 'Schedule Trigger',
+				},
+			],
+		});
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.mockedNodes).toEqual([{ id: 'uuid-1234', name: 'Schedule Trigger' }]);
+	});
+
+	test('should return error if pinned nodes are invalid', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			mockedNodes: ['Simple string'],
+		});
+
+		expect(resp.statusCode).toBe(400);
+	});
+
+	test('should return error if pinned nodes are not in the workflow', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.patch(`/evaluation/test-definitions/${newTest.id}`).send({
+			mockedNodes: [
+				{
+					name: 'Invalid Node',
+				},
+			],
+		});
+
+		expect(resp.statusCode).toBe(400);
+	});
+});
+
+describe('DELETE /evaluation/test-definitions/:id', () => {
+	test('should delete test definition', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: workflowUnderTest.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.delete(`/evaluation/test-definitions/${newTest.id}`);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data.success).toBe(true);
+	});
+
+	test('should return 404 if test definition does not exist', async () => {
+		const resp = await authOwnerAgent.delete('/evaluation/test-definitions/123');
+
+		expect(resp.statusCode).toBe(404);
+		expect(resp.body.message).toBe('Test definition not found');
+	});
+
+	test('should return 404 if user has no access to the workflow', async () => {
+		const newTest = Container.get(TestDefinitionRepository).create({
+			name: 'test',
+			workflow: { id: otherWorkflow.id },
+		});
+		await Container.get(TestDefinitionRepository).save(newTest);
+
+		const resp = await authOwnerAgent.delete(`/evaluation/test-definitions/${newTest.id}`);
+
+		expect(resp.statusCode).toBe(404);
+		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/evaluation/test-runs.api.test.ts b/packages/cli/test/integration/evaluation/test-runs.api.test.ts
new file mode 100644
index 0000000000..9690d1b50e
--- /dev/null
+++ b/packages/cli/test/integration/evaluation/test-runs.api.test.ts
@@ -0,0 +1,286 @@
+import { Container } from '@n8n/di';
+import { mockInstance } from 'n8n-core/test/utils';
+
+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 { ProjectRepository } from '@/databases/repositories/project.repository';
+import { TestDefinitionRepository } from '@/databases/repositories/test-definition.repository.ee';
+import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
+import { TestRunnerService } from '@/evaluation.ee/test-runner/test-runner.service.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 testRunner = mockInstance(TestRunnerService);
+
+const testServer = utils.setupTestServer({
+	endpointGroups: ['workflows', 'evaluation'],
+	enabledFeatures: ['feat:sharing', 'feat:multipleMainInstances'],
+});
+
+beforeAll(async () => {
+	ownerShell = await createUserShell('global:owner');
+	authOwnerAgent = testServer.authAgentFor(ownerShell);
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['TestDefinition', 'TestRun', 'Workflow', 'SharedWorkflow']);
+
+	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/runs', () => {
+	test('should retrieve empty list of runs for a test definition', async () => {
+		const resp = await authOwnerAgent.get(`/evaluation/test-definitions/${testDefinition.id}/runs`);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual([]);
+	});
+
+	test('should return 404 if test definition does not exist', async () => {
+		const resp = await authOwnerAgent.get('/evaluation/test-definitions/123/runs');
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if user does not have access to test definition', async () => {
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${otherTestDefinition.id}/runs`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should retrieve list of runs for a test definition', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(testDefinition.id);
+
+		const resp = await authOwnerAgent.get(`/evaluation/test-definitions/${testDefinition.id}/runs`);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual([
+			expect.objectContaining({
+				id: testRun.id,
+				status: 'new',
+				testDefinitionId: testDefinition.id,
+				runAt: null,
+				completedAt: null,
+			}),
+		]);
+	});
+
+	test('should retrieve list of runs for a test definition with pagination', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun1 = await testRunRepository.createTestRun(testDefinition.id);
+		// Mark as running just to make a slight delay between the runs
+		await testRunRepository.markAsRunning(testRun1.id, 10);
+		const testRun2 = await testRunRepository.createTestRun(testDefinition.id);
+
+		// Fetch the first page
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/runs?take=1`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual([
+			expect.objectContaining({
+				id: testRun2.id,
+				status: 'new',
+				testDefinitionId: testDefinition.id,
+				runAt: null,
+				completedAt: null,
+			}),
+		]);
+
+		// Fetch the second page
+		const resp2 = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/runs?take=1&skip=1`,
+		);
+
+		expect(resp2.statusCode).toBe(200);
+		expect(resp2.body.data).toEqual([
+			expect.objectContaining({
+				id: testRun1.id,
+				status: 'running',
+				testDefinitionId: testDefinition.id,
+				runAt: expect.any(String),
+				completedAt: null,
+			}),
+		]);
+	});
+});
+
+describe('GET /evaluation/test-definitions/:testDefinitionId/runs/:id', () => {
+	test('should retrieve test run for a test definition', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(testDefinition.id);
+
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/${testRun.id}`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual(
+			expect.objectContaining({
+				id: testRun.id,
+				status: 'new',
+				testDefinitionId: testDefinition.id,
+				runAt: null,
+				completedAt: null,
+			}),
+		);
+	});
+
+	test('should return 404 if test run does not exist', async () => {
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/123`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if user does not have access to test definition', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(otherTestDefinition.id);
+
+		const resp = await authOwnerAgent.get(
+			`/evaluation/test-definitions/${otherTestDefinition.id}/runs/${testRun.id}`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should retrieve test run for a test definition of a shared workflow', async () => {
+		const memberShell = await createUserShell('global:member');
+		const memberAgent = testServer.authAgentFor(memberShell);
+		const memberPersonalProject = await Container.get(
+			ProjectRepository,
+		).getPersonalProjectForUserOrFail(memberShell.id);
+
+		// Share workflow with a member
+		const sharingResponse = await authOwnerAgent
+			.put(`/workflows/${workflowUnderTest.id}/share`)
+			.send({ shareWithIds: [memberPersonalProject.id] });
+
+		expect(sharingResponse.statusCode).toBe(200);
+
+		// Create a test run for the shared workflow
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(testDefinition.id);
+
+		// Check if member can retrieve the test run of a shared workflow
+		const resp = await memberAgent.get(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/${testRun.id}`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual(
+			expect.objectContaining({
+				id: testRun.id,
+			}),
+		);
+	});
+});
+
+describe('DELETE /evaluation/test-definitions/:testDefinitionId/runs/:id', () => {
+	test('should delete test run for a test definition', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(testDefinition.id);
+
+		const resp = await authOwnerAgent.delete(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/${testRun.id}`,
+		);
+
+		expect(resp.statusCode).toBe(200);
+		expect(resp.body.data).toEqual({ success: true });
+
+		const testRunAfterDelete = await testRunRepository.findOne({ where: { id: testRun.id } });
+		expect(testRunAfterDelete).toBeNull();
+	});
+
+	test('should return 404 if test run does not exist', async () => {
+		const resp = await authOwnerAgent.delete(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/123`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if user does not have access to test definition', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(otherTestDefinition.id);
+
+		const resp = await authOwnerAgent.delete(
+			`/evaluation/test-definitions/${otherTestDefinition.id}/runs/${testRun.id}`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
+
+describe('POST /evaluation/test-definitions/:testDefinitionId/runs/:id/cancel', () => {
+	test('should cancel test run', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(testDefinition.id);
+
+		jest.spyOn(testRunRepository, 'markAsCancelled');
+
+		const resp = await authOwnerAgent.post(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/${testRun.id}/cancel`,
+		);
+
+		expect(resp.statusCode).toBe(202);
+		expect(resp.body).toEqual({ success: true });
+
+		expect(testRunner.cancelTestRun).toHaveBeenCalledWith(testRun.id);
+	});
+
+	test('should return 404 if test run does not exist', async () => {
+		const resp = await authOwnerAgent.post(
+			`/evaluation/test-definitions/${testDefinition.id}/runs/123/cancel`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if test definition does not exist', async () => {
+		const resp = await authOwnerAgent.post('/evaluation/test-definitions/123/runs/123/cancel');
+
+		expect(resp.statusCode).toBe(404);
+	});
+
+	test('should return 404 if user does not have access to test definition', async () => {
+		const testRunRepository = Container.get(TestRunRepository);
+		const testRun = await testRunRepository.createTestRun(otherTestDefinition.id);
+
+		const resp = await authOwnerAgent.post(
+			`/evaluation/test-definitions/${otherTestDefinition.id}/runs/${testRun.id}/cancel`,
+		);
+
+		expect(resp.statusCode).toBe(404);
+	});
+});
diff --git a/packages/cli/test/integration/eventbus.ee.test.ts b/packages/cli/test/integration/eventbus.ee.test.ts
index c2b6a7f23c..0be15b6124 100644
--- a/packages/cli/test/integration/eventbus.ee.test.ts
+++ b/packages/cli/test/integration/eventbus.ee.test.ts
@@ -1,3 +1,4 @@
+import { Container } from '@n8n/di';
 import axios from 'axios';
 import type {
 	MessageEventBusDestinationSentryOptions,
@@ -10,7 +11,6 @@ import {
 	defaultMessageEventBusDestinationWebhookOptions,
 } from 'n8n-workflow';
 import syslog from 'syslog-client';
-import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import type { User } from '@/databases/entities/user';
diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts
index 4d7144cd4d..e1de129d7c 100644
--- a/packages/cli/test/integration/execution.service.integration.test.ts
+++ b/packages/cli/test/integration/execution.service.integration.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import Container from 'typedi';
 
 import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -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/external-secrets/external-secrets.api.test.ts b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts
index c36340108e..095555b72b 100644
--- a/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts
+++ b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts
@@ -1,14 +1,14 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
 import { jsonParse, type IDataObject } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import config from '@/config';
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import type { EventService } from '@/events/event.service';
-import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
-import { ExternalSecretsProviders } from '@/external-secrets/external-secrets-providers.ee';
+import { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee';
+import { ExternalSecretsProviders } from '@/external-secrets.ee/external-secrets-providers.ee';
 import type { ExternalSecretsSettings, SecretsProviderState } from '@/interfaces';
 import { License } from '@/license';
 
diff --git a/packages/cli/test/integration/import.service.test.ts b/packages/cli/test/integration/import.service.test.ts
index 39cadde676..0c40d868ce 100644
--- a/packages/cli/test/integration/import.service.test.ts
+++ b/packages/cli/test/integration/import.service.test.ts
@@ -1,6 +1,6 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import type { INode } from 'n8n-workflow';
-import Container from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import type { Project } from '@/databases/entities/project';
diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts
index 17573f49f5..9a4c214f10 100644
--- a/packages/cli/test/integration/ldap/ldap.api.test.ts
+++ b/packages/cli/test/integration/ldap/ldap.api.test.ts
@@ -1,16 +1,19 @@
+import { Container } from '@n8n/di';
 import { Not } from '@n8n/typeorm';
 import type { Entry as LdapUser } from 'ldapts';
 import { Cipher } from 'n8n-core';
-import { Container } from 'typedi';
 
 import config from '@/config';
 import type { User } from '@/databases/entities/user';
 import { AuthProviderSyncHistoryRepository } from '@/databases/repositories/auth-provider-sync-history.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
-import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap/constants';
-import { saveLdapSynchronization } from '@/ldap/helpers.ee';
-import { LdapService } from '@/ldap/ldap.service.ee';
-import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/sso-helpers';
+import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap.ee/constants';
+import { saveLdapSynchronization } from '@/ldap.ee/helpers.ee';
+import { LdapService } from '@/ldap.ee/ldap.service.ee';
+import {
+	getCurrentAuthenticationMethod,
+	setCurrentAuthenticationMethod,
+} from '@/sso.ee/sso-helpers';
 
 import { randomEmail, randomName, uniqueId } from './../shared/random';
 import { getPersonalProject } from '../shared/db/projects';
diff --git a/packages/cli/test/integration/license-metrics.repository.test.ts b/packages/cli/test/integration/license-metrics.repository.test.ts
index 5396b4681f..298c7d67fd 100644
--- a/packages/cli/test/integration/license-metrics.repository.test.ts
+++ b/packages/cli/test/integration/license-metrics.repository.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { StatisticsNames } from '@/databases/entities/workflow-statistics';
 import { LicenseMetricsRepository } from '@/databases/repositories/license-metrics.repository';
diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts
index a29f158a32..25cbe20b64 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { IPersonalizationSurveyAnswersV4 } from 'n8n-workflow';
-import { Container } from 'typedi';
 import validator from 'validator';
 
 import type { User } from '@/databases/entities/user';
diff --git a/packages/cli/test/integration/mfa/mfa.api.test.ts b/packages/cli/test/integration/mfa/mfa.api.test.ts
index 3f19632506..935ede4c17 100644
--- a/packages/cli/test/integration/mfa/mfa.api.test.ts
+++ b/packages/cli/test/integration/mfa/mfa.api.test.ts
@@ -1,5 +1,5 @@
-import { randomInt, randomString } from 'n8n-workflow';
-import Container from 'typedi';
+import { Container } from '@n8n/di';
+import { randomString } from 'n8n-workflow';
 
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';
@@ -55,8 +55,8 @@ describe('Enable MFA setup', () => {
 				secondCall.body.data.recoveryCodes.join(''),
 			);
 
-			const token = new TOTPService().generateTOTP(firstCall.body.data.secret);
-			await testServer.authAgentFor(owner).post('/mfa/disable').send({ token }).expect(200);
+			const mfaCode = new TOTPService().generateTOTP(firstCall.body.data.secret);
+			await testServer.authAgentFor(owner).post('/mfa/disable').send({ mfaCode }).expect(200);
 
 			const thirdCall = await testServer.authAgentFor(owner).get('/mfa/qr').expect(200);
 
@@ -84,22 +84,22 @@ describe('Enable MFA setup', () => {
 			await testServer.authlessAgent.post('/mfa/verify').expect(401);
 		});
 
-		test('POST /verify should fail due to invalid MFA token', async () => {
-			await testServer.authAgentFor(owner).post('/mfa/verify').send({ token: '123' }).expect(400);
+		test('POST /verify should fail due to invalid MFA code', async () => {
+			await testServer.authAgentFor(owner).post('/mfa/verify').send({ mfaCode: '123' }).expect(400);
 		});
 
-		test('POST /verify should fail due to missing token parameter', async () => {
+		test('POST /verify should fail due to missing mfaCode parameter', async () => {
 			await testServer.authAgentFor(owner).get('/mfa/qr').expect(200);
-			await testServer.authAgentFor(owner).post('/mfa/verify').send({ token: '' }).expect(400);
+			await testServer.authAgentFor(owner).post('/mfa/verify').send({ mfaCode: '' }).expect(400);
 		});
 
-		test('POST /verify should validate MFA token', async () => {
+		test('POST /verify should validate MFA code', async () => {
 			const response = await testServer.authAgentFor(owner).get('/mfa/qr').expect(200);
 
 			const { secret } = response.body.data;
-			const token = new TOTPService().generateTOTP(secret);
+			const mfaCode = new TOTPService().generateTOTP(secret);
 
-			await testServer.authAgentFor(owner).post('/mfa/verify').send({ token }).expect(200);
+			await testServer.authAgentFor(owner).post('/mfa/verify').send({ mfaCode }).expect(200);
 		});
 	});
 
@@ -108,13 +108,13 @@ describe('Enable MFA setup', () => {
 			await testServer.authlessAgent.post('/mfa/enable').expect(401);
 		});
 
-		test('POST /verify should fail due to missing token parameter', async () => {
-			await testServer.authAgentFor(owner).post('/mfa/verify').send({ token: '' }).expect(400);
+		test('POST /verify should fail due to missing mfaCode parameter', async () => {
+			await testServer.authAgentFor(owner).post('/mfa/verify').send({ mfaCode: '' }).expect(400);
 		});
 
-		test('POST /enable should fail due to invalid MFA token', async () => {
+		test('POST /enable should fail due to invalid MFA code', async () => {
 			await testServer.authAgentFor(owner).get('/mfa/qr').expect(200);
-			await testServer.authAgentFor(owner).post('/mfa/enable').send({ token: '123' }).expect(400);
+			await testServer.authAgentFor(owner).post('/mfa/enable').send({ mfaCode: '123' }).expect(400);
 		});
 
 		test('POST /enable should fail due to empty secret and recovery codes', async () => {
@@ -125,10 +125,10 @@ describe('Enable MFA setup', () => {
 			const response = await testServer.authAgentFor(owner).get('/mfa/qr').expect(200);
 
 			const { secret } = response.body.data;
-			const token = new TOTPService().generateTOTP(secret);
+			const mfaCode = new TOTPService().generateTOTP(secret);
 
-			await testServer.authAgentFor(owner).post('/mfa/verify').send({ token }).expect(200);
-			await testServer.authAgentFor(owner).post('/mfa/enable').send({ token }).expect(200);
+			await testServer.authAgentFor(owner).post('/mfa/verify').send({ mfaCode }).expect(200);
+			await testServer.authAgentFor(owner).post('/mfa/enable').send({ mfaCode }).expect(200);
 
 			const user = await Container.get(AuthUserRepository).findOneOrFail({
 				where: {},
@@ -145,13 +145,13 @@ describe('Enable MFA setup', () => {
 			const response = await testServer.authAgentFor(owner).get('/mfa/qr').expect(200);
 
 			const { secret } = response.body.data;
-			const token = new TOTPService().generateTOTP(secret);
+			const mfaCode = new TOTPService().generateTOTP(secret);
 
-			await testServer.authAgentFor(owner).post('/mfa/verify').send({ token }).expect(200);
+			await testServer.authAgentFor(owner).post('/mfa/verify').send({ mfaCode }).expect(200);
 
 			externalHooks.run.mockRejectedValue(new BadRequestError('Error message'));
 
-			await testServer.authAgentFor(owner).post('/mfa/enable').send({ token }).expect(400);
+			await testServer.authAgentFor(owner).post('/mfa/enable').send({ mfaCode }).expect(400);
 
 			const user = await Container.get(AuthUserRepository).findOneOrFail({
 				where: {},
@@ -165,13 +165,13 @@ describe('Enable MFA setup', () => {
 describe('Disable MFA setup', () => {
 	test('POST /disable should disable login with MFA', async () => {
 		const { user, rawSecret } = await createUserWithMfaEnabled();
-		const token = new TOTPService().generateTOTP(rawSecret);
+		const mfaCode = new TOTPService().generateTOTP(rawSecret);
 
 		await testServer
 			.authAgentFor(user)
 			.post('/mfa/disable')
 			.send({
-				token,
+				mfaCode,
 			})
 			.expect(200);
 
@@ -184,21 +184,39 @@ describe('Disable MFA setup', () => {
 		expect(dbUser.mfaRecoveryCodes.length).toBe(0);
 	});
 
-	test('POST /disable should fail if invalid token is given', async () => {
+	test('POST /disable should fail if invalid MFA recovery code is given', async () => {
 		const { user } = await createUserWithMfaEnabled();
 
 		await testServer
 			.authAgentFor(user)
 			.post('/mfa/disable')
 			.send({
-				token: 'invalid token',
+				mfaRecoveryCode: 'invalid token',
 			})
 			.expect(403);
 	});
+
+	test('POST /disable should fail if invalid MFA code is given', async () => {
+		const { user } = await createUserWithMfaEnabled();
+
+		await testServer
+			.authAgentFor(user)
+			.post('/mfa/disable')
+			.send({
+				mfaCode: 'invalid token',
+			})
+			.expect(403);
+	});
+
+	test('POST /disable should fail if neither MFA code nor recovery code is sent', async () => {
+		const { user } = await createUserWithMfaEnabled();
+
+		await testServer.authAgentFor(user).post('/mfa/disable').send({ anotherParam: '' }).expect(400);
+	});
 });
 
 describe('Change password with MFA enabled', () => {
-	test('POST /change-password should fail due to missing MFA token', async () => {
+	test('POST /change-password should fail due to missing MFA code', async () => {
 		await createUserWithMfaEnabled();
 
 		const newPassword = randomValidPassword();
@@ -210,7 +228,7 @@ describe('Change password with MFA enabled', () => {
 			.expect(404);
 	});
 
-	test('POST /change-password should fail due to invalid MFA token', async () => {
+	test('POST /change-password should fail due to invalid MFA code', async () => {
 		await createUserWithMfaEnabled();
 
 		const newPassword = randomValidPassword();
@@ -221,7 +239,7 @@ describe('Change password with MFA enabled', () => {
 			.send({
 				password: newPassword,
 				token: resetPasswordToken,
-				mfaToken: randomInt(10),
+				mfaCode: randomString(10),
 			})
 			.expect(404);
 	});
@@ -235,14 +253,14 @@ describe('Change password with MFA enabled', () => {
 
 		const resetPasswordToken = Container.get(AuthService).generatePasswordResetToken(user);
 
-		const mfaToken = new TOTPService().generateTOTP(rawSecret);
+		const mfaCode = new TOTPService().generateTOTP(rawSecret);
 
 		await testServer.authlessAgent
 			.post('/change-password')
 			.send({
 				password: newPassword,
 				token: resetPasswordToken,
-				mfaToken,
+				mfaCode,
 			})
 			.expect(200);
 
@@ -252,7 +270,7 @@ describe('Change password with MFA enabled', () => {
 			.send({
 				email: user.email,
 				password: newPassword,
-				mfaToken: new TOTPService().generateTOTP(rawSecret),
+				mfaCode: new TOTPService().generateTOTP(rawSecret),
 			})
 			.expect(200);
 
@@ -315,7 +333,7 @@ describe('Login', () => {
 
 			await testServer.authlessAgent
 				.post('/login')
-				.send({ email: user.email, password: rawPassword, mfaToken: 'wrongvalue' })
+				.send({ email: user.email, password: rawPassword, mfaCode: 'wrongvalue' })
 				.expect(401);
 		});
 
@@ -337,7 +355,7 @@ describe('Login', () => {
 
 			const response = await testServer.authlessAgent
 				.post('/login')
-				.send({ email: user.email, password: rawPassword, mfaToken: token })
+				.send({ email: user.email, password: rawPassword, mfaCode: token })
 				.expect(200);
 
 			const data = response.body.data;
diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts
index fe5284ffbe..13f660688e 100644
--- a/packages/cli/test/integration/owner.api.test.ts
+++ b/packages/cli/test/integration/owner.api.test.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 import validator from 'validator';
 
 import config from '@/config';
diff --git a/packages/cli/test/integration/password-reset.api.test.ts b/packages/cli/test/integration/password-reset.api.test.ts
index 89d66c3f21..826b4ddef9 100644
--- a/packages/cli/test/integration/password-reset.api.test.ts
+++ b/packages/cli/test/integration/password-reset.api.test.ts
@@ -1,7 +1,7 @@
+import { Container } from '@n8n/di';
 import { compare } from 'bcryptjs';
 import { mock } from 'jest-mock-extended';
 import { randomString } from 'n8n-workflow';
-import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { AuthService } from '@/auth/auth.service';
@@ -12,7 +12,7 @@ import { ExternalHooks } from '@/external-hooks';
 import { License } from '@/license';
 import { JwtService } from '@/services/jwt.service';
 import { PasswordUtility } from '@/services/password.utility';
-import { setCurrentAuthenticationMethod } from '@/sso/sso-helpers';
+import { setCurrentAuthenticationMethod } from '@/sso.ee/sso-helpers';
 import { UserManagementMailer } from '@/user-management/email';
 
 import { createUser } from './shared/db/users';
diff --git a/packages/cli/test/integration/permission-checker.test.ts b/packages/cli/test/integration/permission-checker.test.ts
index e746ec29f7..71dd77b503 100644
--- a/packages/cli/test/integration/permission-checker.test.ts
+++ b/packages/cli/test/integration/permission-checker.test.ts
@@ -1,6 +1,6 @@
-import type { INode, INodeTypeData } from 'n8n-workflow';
+import { Container } from '@n8n/di';
+import type { INode } from 'n8n-workflow';
 import { randomInt } from 'n8n-workflow';
-import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import type { Project } from '@/databases/entities/project';
@@ -14,6 +14,7 @@ import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { NodeTypes } from '@/node-types';
 import { OwnershipService } from '@/services/ownership.service';
 import { PermissionChecker } from '@/user-management/permission-checker';
+import { mockNodeTypesData } from '@test-integration/utils/node-types-data';
 
 import { affixRoleToSaveCredential } from './shared/db/credentials';
 import { getPersonalProject } from './shared/db/projects';
@@ -25,36 +26,6 @@ import { mockInstance } from '../shared/mocking';
 
 const ownershipService = mockInstance(OwnershipService);
 
-function mockNodeTypesData(
-	nodeNames: string[],
-	options?: {
-		addTrigger?: boolean;
-	},
-) {
-	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
-		return (
-			(acc[`n8n-nodes-base.${nodeName}`] = {
-				sourcePath: '',
-				type: {
-					description: {
-						displayName: nodeName,
-						name: nodeName,
-						group: [],
-						description: '',
-						version: 1,
-						defaults: {},
-						inputs: [],
-						outputs: [],
-						properties: [],
-					},
-					trigger: options?.addTrigger ? async () => undefined : undefined,
-				},
-			}),
-			acc
-		);
-	}, {});
-}
-
 const createWorkflow = async (nodes: INode[], workflowOwner?: User): Promise<WorkflowEntity> => {
 	const workflowDetails = {
 		id: randomInt(1, 10).toString(),
diff --git a/packages/cli/test/integration/project.api.test.ts b/packages/cli/test/integration/project.api.test.ts
index 14707ad764..5f7c7e1b27 100644
--- a/packages/cli/test/integration/project.api.test.ts
+++ b/packages/cli/test/integration/project.api.test.ts
@@ -1,10 +1,10 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import { EntityNotFoundError } from '@n8n/typeorm';
-import Container from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import type { Project } from '@/databases/entities/project';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { GlobalRole } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
@@ -177,11 +177,7 @@ describe('GET /projects/my-projects', () => {
 		//
 		// ACT
 		//
-		const resp = await testServer
-			.authAgentFor(testUser1)
-			.get('/projects/my-projects')
-			.query({ includeScopes: true })
-			.expect(200);
+		const resp = await testServer.authAgentFor(testUser1).get('/projects/my-projects').expect(200);
 		const respProjects: Array<Project & { role: ProjectRole | GlobalRole; scopes?: Scope[] }> =
 			resp.body.data;
 
@@ -258,11 +254,7 @@ describe('GET /projects/my-projects', () => {
 		//
 		// ACT
 		//
-		const resp = await testServer
-			.authAgentFor(ownerUser)
-			.get('/projects/my-projects')
-			.query({ includeScopes: true })
-			.expect(200);
+		const resp = await testServer.authAgentFor(ownerUser).get('/projects/my-projects').expect(200);
 		const respProjects: Array<Project & { role: ProjectRole | GlobalRole; scopes?: Scope[] }> =
 			resp.body.data;
 
diff --git a/packages/cli/test/integration/project.service.integration.test.ts b/packages/cli/test/integration/project.service.integration.test.ts
index 5d425d17ee..b2210b5210 100644
--- a/packages/cli/test/integration/project.service.integration.test.ts
+++ b/packages/cli/test/integration/project.service.integration.test.ts
@@ -1,7 +1,7 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 
 import { linkUserToProject, createTeamProject } from './shared/db/projects';
 import { createUser } from './shared/db/users';
diff --git a/packages/cli/test/integration/prometheus-metrics.test.ts b/packages/cli/test/integration/prometheus-metrics.test.ts
index 2a13d2f091..c5accedbc6 100644
--- a/packages/cli/test/integration/prometheus-metrics.test.ts
+++ b/packages/cli/test/integration/prometheus-metrics.test.ts
@@ -1,7 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { parse as semverParse } from 'semver';
 import request, { type Response } from 'supertest';
-import { Container } from 'typedi';
 
 import config from '@/config';
 import { N8N_VERSION } from '@/constants';
diff --git a/packages/cli/test/integration/pruning.service.test.ts b/packages/cli/test/integration/pruning.service.test.ts
index 5a53d70315..3a97350f79 100644
--- a/packages/cli/test/integration/pruning.service.test.ts
+++ b/packages/cli/test/integration/pruning.service.test.ts
@@ -1,15 +1,14 @@
+import { ExecutionsConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { BinaryDataService, InstanceSettings } from 'n8n-core';
 import type { ExecutionStatus } from 'n8n-workflow';
-import Container from 'typedi';
 
-import config from '@/config';
-import { TIME } from '@/constants';
+import { Time } from '@/constants';
 import type { ExecutionEntity } from '@/databases/entities/execution-entity';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
-import { Logger } from '@/logging/logger.service';
-import { PruningService } from '@/services/pruning.service';
+import { PruningService } from '@/services/pruning/pruning.service';
 
 import {
 	annotateExecution,
@@ -18,27 +17,29 @@ import {
 } from './shared/db/executions';
 import { createWorkflow } from './shared/db/workflows';
 import * as testDb from './shared/test-db';
-import { mockInstance } from '../shared/mocking';
+import { mockInstance, mockLogger } from '../shared/mocking';
 
 describe('softDeleteOnPruningCycle()', () => {
 	let pruningService: PruningService;
-	const instanceSettings = new InstanceSettings(mock());
+	const instanceSettings = Container.get(InstanceSettings);
 	instanceSettings.markAsLeader();
 
 	const now = new Date();
-	const yesterday = new Date(Date.now() - TIME.DAY);
+	const yesterday = new Date(Date.now() - 1 * Time.days.toMilliseconds);
 	let workflow: WorkflowEntity;
+	let executionsConfig: ExecutionsConfig;
 
 	beforeAll(async () => {
 		await testDb.init();
 
+		executionsConfig = Container.get(ExecutionsConfig);
 		pruningService = new PruningService(
-			mockInstance(Logger),
+			mockLogger(),
 			instanceSettings,
 			Container.get(ExecutionRepository),
 			mockInstance(BinaryDataService),
 			mock(),
-			mock(),
+			executionsConfig,
 		);
 
 		workflow = await createWorkflow();
@@ -52,10 +53,6 @@ describe('softDeleteOnPruningCycle()', () => {
 		await testDb.terminate();
 	});
 
-	afterEach(() => {
-		config.load(config.default);
-	});
-
 	async function findAllExecutions() {
 		return await Container.get(ExecutionRepository).find({
 			order: { id: 'asc' },
@@ -64,9 +61,9 @@ describe('softDeleteOnPruningCycle()', () => {
 	}
 
 	describe('when EXECUTIONS_DATA_PRUNE_MAX_COUNT is set', () => {
-		beforeEach(() => {
-			config.set('executions.pruneDataMaxCount', 1);
-			config.set('executions.pruneDataMaxAge', 336);
+		beforeAll(() => {
+			executionsConfig.pruneDataMaxAge = 336;
+			executionsConfig.pruneDataMaxCount = 1;
 		});
 
 		test('should mark as deleted based on EXECUTIONS_DATA_PRUNE_MAX_COUNT', async () => {
@@ -76,7 +73,7 @@ describe('softDeleteOnPruningCycle()', () => {
 				await createSuccessfulExecution(workflow),
 			];
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -95,7 +92,7 @@ describe('softDeleteOnPruningCycle()', () => {
 				await createSuccessfulExecution(workflow),
 			];
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -116,7 +113,7 @@ describe('softDeleteOnPruningCycle()', () => {
 				await createSuccessfulExecution(workflow),
 			];
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -135,7 +132,7 @@ describe('softDeleteOnPruningCycle()', () => {
 				await createSuccessfulExecution(workflow),
 			];
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -153,7 +150,7 @@ describe('softDeleteOnPruningCycle()', () => {
 
 			await annotateExecution(executions[0].id, { vote: 'up' }, [workflow.id]);
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -165,9 +162,9 @@ describe('softDeleteOnPruningCycle()', () => {
 	});
 
 	describe('when EXECUTIONS_DATA_MAX_AGE is set', () => {
-		beforeEach(() => {
-			config.set('executions.pruneDataMaxAge', 1); // 1h
-			config.set('executions.pruneDataMaxCount', 0);
+		beforeAll(() => {
+			executionsConfig.pruneDataMaxAge = 1;
+			executionsConfig.pruneDataMaxCount = 0;
 		});
 
 		test('should mark as deleted based on EXECUTIONS_DATA_MAX_AGE', async () => {
@@ -182,7 +179,7 @@ describe('softDeleteOnPruningCycle()', () => {
 				),
 			];
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -206,7 +203,7 @@ describe('softDeleteOnPruningCycle()', () => {
 				await createSuccessfulExecution(workflow),
 			];
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -224,7 +221,7 @@ describe('softDeleteOnPruningCycle()', () => {
 		])('should prune %s executions', async (status, attributes) => {
 			const execution = await createExecution({ status, ...attributes }, workflow);
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -242,7 +239,7 @@ describe('softDeleteOnPruningCycle()', () => {
 				await createSuccessfulExecution(workflow),
 			];
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
@@ -269,7 +266,7 @@ describe('softDeleteOnPruningCycle()', () => {
 
 			await annotateExecution(executions[0].id, { vote: 'up' }, [workflow.id]);
 
-			await pruningService.softDeleteOnPruningCycle();
+			await pruningService.softDelete();
 
 			const result = await findAllExecutions();
 			expect(result).toEqual([
diff --git a/packages/cli/test/integration/public-api/credentials.test.ts b/packages/cli/test/integration/public-api/credentials.test.ts
index 953a6e1c95..c6e4dc5c12 100644
--- a/packages/cli/test/integration/public-api/credentials.test.ts
+++ b/packages/cli/test/integration/public-api/credentials.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { randomString } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import type { User } from '@/databases/entities/user';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
diff --git a/packages/cli/test/integration/public-api/projects.test.ts b/packages/cli/test/integration/public-api/projects.test.ts
index f815d9d07b..4283382558 100644
--- a/packages/cli/test/integration/public-api/projects.test.ts
+++ b/packages/cli/test/integration/public-api/projects.test.ts
@@ -131,6 +131,7 @@ describe('Projects in Public API', () => {
 			expect(response.status).toBe(201);
 			expect(response.body).toEqual({
 				name: 'some-project',
+				icon: null,
 				type: 'team',
 				id: expect.any(String),
 				createdAt: expect.any(String),
diff --git a/packages/cli/test/integration/public-api/tags.test.ts b/packages/cli/test/integration/public-api/tags.test.ts
index c2e25cc3f6..2be18285f4 100644
--- a/packages/cli/test/integration/public-api/tags.test.ts
+++ b/packages/cli/test/integration/public-api/tags.test.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { User } from '@/databases/entities/user';
 import { TagRepository } from '@/databases/repositories/tag.repository';
diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts
index 687b29da6a..7a1fa9591d 100644
--- a/packages/cli/test/integration/public-api/workflows.test.ts
+++ b/packages/cli/test/integration/public-api/workflows.test.ts
@@ -1,8 +1,8 @@
+import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { INode } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import config from '@/config';
 import { STARTING_NODES } from '@/constants';
 import type { Project } from '@/databases/entities/project';
 import type { TagEntity } from '@/databases/entities/tag-entity';
@@ -11,7 +11,7 @@ import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
 import { ExecutionService } from '@/executions/execution.service';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 import { Telemetry } from '@/telemetry';
 import { createTeamProject } from '@test-integration/db/projects';
 
@@ -36,6 +36,8 @@ let activeWorkflowManager: ActiveWorkflowManager;
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 const license = testServer.license;
 
+const globalConfig = Container.get(GlobalConfig);
+
 mockInstance(ExecutionService);
 
 beforeAll(async () => {
@@ -69,6 +71,8 @@ beforeEach(async () => {
 
 	authOwnerAgent = testServer.publicApiAgentFor(owner);
 	authMemberAgent = testServer.publicApiAgentFor(member);
+
+	globalConfig.tags.disabled = false;
 });
 
 afterEach(async () => {
@@ -263,8 +267,12 @@ describe('GET /workflows', () => {
 
 	test('for owner, should return all workflows filtered by `projectId`', async () => {
 		license.setQuota('quota:maxTeamProjects', -1);
-		const firstProject = await Container.get(ProjectService).createTeamProject('First', owner);
-		const secondProject = await Container.get(ProjectService).createTeamProject('Second', member);
+		const firstProject = await Container.get(ProjectService).createTeamProject(owner, {
+			name: 'First',
+		});
+		const secondProject = await Container.get(ProjectService).createTeamProject(member, {
+			name: 'Second',
+		});
 
 		await Promise.all([
 			createWorkflow({ name: 'First workflow' }, firstProject),
@@ -285,10 +293,9 @@ describe('GET /workflows', () => {
 
 	test('for member, should return all member-accessible workflows filtered by `projectId`', async () => {
 		license.setQuota('quota:maxTeamProjects', -1);
-		const otherProject = await Container.get(ProjectService).createTeamProject(
-			'Other project',
-			member,
-		);
+		const otherProject = await Container.get(ProjectService).createTeamProject(member, {
+			name: 'Other project',
+		});
 
 		await Promise.all([
 			createWorkflow({}, member),
@@ -378,6 +385,47 @@ describe('GET /workflows', () => {
 			expect(updatedAt).toBeDefined();
 		}
 	});
+
+	test('should return all owned workflows without pinned data', async () => {
+		await Promise.all([
+			createWorkflow(
+				{
+					pinData: {
+						Webhook1: [{ json: { first: 'first' } }],
+					},
+				},
+				member,
+			),
+			createWorkflow(
+				{
+					pinData: {
+						Webhook2: [{ json: { second: 'second' } }],
+					},
+				},
+				member,
+			),
+			createWorkflow(
+				{
+					pinData: {
+						Webhook3: [{ json: { third: 'third' } }],
+					},
+				},
+				member,
+			),
+		]);
+
+		const response = await authMemberAgent.get('/workflows?excludePinnedData=true');
+
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(3);
+		expect(response.body.nextCursor).toBeNull();
+
+		for (const workflow of response.body.data) {
+			const { pinData } = workflow;
+
+			expect(pinData).not.toBeDefined();
+		}
+	});
 });
 
 describe('GET /workflows/:id', () => {
@@ -444,6 +492,26 @@ describe('GET /workflows/:id', () => {
 		expect(createdAt).toEqual(workflow.createdAt.toISOString());
 		expect(updatedAt).toEqual(workflow.updatedAt.toISOString());
 	});
+
+	test('should retrieve workflow without pinned data', async () => {
+		// create and assign workflow to owner
+		const workflow = await createWorkflow(
+			{
+				pinData: {
+					Webhook1: [{ json: { first: 'first' } }],
+				},
+			},
+			member,
+		);
+
+		const response = await authMemberAgent.get(`/workflows/${workflow.id}?excludePinnedData=true`);
+
+		expect(response.statusCode).toBe(200);
+
+		const { pinData } = response.body;
+
+		expect(pinData).not.toBeDefined();
+	});
 });
 
 describe('DELETE /workflows/:id', () => {
@@ -528,8 +596,28 @@ describe('POST /workflows/:id/activate', () => {
 		expect(response.statusCode).toBe(404);
 	});
 
+	test('should fail due to trying to activate a workflow without any nodes', async () => {
+		const workflow = await createWorkflow({ nodes: [] }, owner);
+		const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`);
+		expect(response.statusCode).toBe(400);
+	});
+
 	test('should fail due to trying to activate a workflow without a trigger', async () => {
-		const workflow = await createWorkflow({}, owner);
+		const workflow = await createWorkflow(
+			{
+				nodes: [
+					{
+						id: 'uuid-1234',
+						name: 'Start',
+						parameters: {},
+						position: [-20, 260],
+						type: 'n8n-nodes-base.start',
+						typeVersion: 1,
+					},
+				],
+			},
+			owner,
+		);
 		const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`);
 		expect(response.statusCode).toBe(400);
 	});
@@ -1203,8 +1291,8 @@ describe('GET /workflows/:id/tags', () => {
 
 	test('should fail due to invalid API Key', testWithAPIKey('get', '/workflows/2/tags', 'abcXYZ'));
 
-	test('should fail if workflowTagsDisabled', async () => {
-		config.set('workflowTagsDisabled', true);
+	test('should fail if N8N_WORKFLOW_TAGS_DISABLED', async () => {
+		globalConfig.tags.disabled = true;
 
 		const response = await authOwnerAgent.get('/workflows/2/tags');
 
@@ -1213,16 +1301,12 @@ describe('GET /workflows/:id/tags', () => {
 	});
 
 	test('should fail due to non-existing workflow', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const response = await authOwnerAgent.get('/workflows/2/tags');
 
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should return all tags of owned workflow', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const tags = await Promise.all([await createTag({}), await createTag({})]);
 
 		const workflow = await createWorkflow({ tags }, member);
@@ -1247,8 +1331,6 @@ describe('GET /workflows/:id/tags', () => {
 	});
 
 	test('should return empty array if workflow does not have tags', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const workflow = await createWorkflow({}, member);
 
 		const response = await authMemberAgent.get(`/workflows/${workflow.id}/tags`);
@@ -1263,8 +1345,8 @@ describe('PUT /workflows/:id/tags', () => {
 
 	test('should fail due to invalid API Key', testWithAPIKey('put', '/workflows/2/tags', 'abcXYZ'));
 
-	test('should fail if workflowTagsDisabled', async () => {
-		config.set('workflowTagsDisabled', true);
+	test('should fail if N8N_WORKFLOW_TAGS_DISABLED', async () => {
+		globalConfig.tags.disabled = true;
 
 		const response = await authOwnerAgent.put('/workflows/2/tags').send([]);
 
@@ -1273,16 +1355,12 @@ describe('PUT /workflows/:id/tags', () => {
 	});
 
 	test('should fail due to non-existing workflow', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const response = await authOwnerAgent.put('/workflows/2/tags').send([]);
 
 		expect(response.statusCode).toBe(404);
 	});
 
 	test('should add the tags, workflow have not got tags previously', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const workflow = await createWorkflow({}, member);
 		const tags = await Promise.all([await createTag({}), await createTag({})]);
 
@@ -1341,8 +1419,6 @@ describe('PUT /workflows/:id/tags', () => {
 	});
 
 	test('should add the tags, workflow have some tags previously', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const tags = await Promise.all([await createTag({}), await createTag({}), await createTag({})]);
 		const oldTags = [tags[0], tags[1]];
 		const newTags = [tags[0], tags[2]];
@@ -1429,8 +1505,6 @@ describe('PUT /workflows/:id/tags', () => {
 	});
 
 	test('should fail to add the tags as one does not exist, workflow should maintain previous tags', async () => {
-		config.set('workflowTagsDisabled', false);
-
 		const tags = await Promise.all([await createTag({}), await createTag({})]);
 		const oldTags = [tags[0], tags[1]];
 		const workflow = await createWorkflow({ tags: oldTags }, member);
diff --git a/packages/cli/test/integration/role.api.test.ts b/packages/cli/test/integration/role.api.test.ts
index ad961c2565..d8f56604a3 100644
--- a/packages/cli/test/integration/role.api.test.ts
+++ b/packages/cli/test/integration/role.api.test.ts
@@ -1,7 +1,7 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
-import { Container } from 'typedi';
 
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { CredentialSharingRole } from '@/databases/entities/shared-credentials';
 import type { WorkflowSharingRole } from '@/databases/entities/shared-workflow';
 import type { GlobalRole } from '@/databases/entities/user';
diff --git a/packages/cli/test/integration/runners/task-runner-module.external.test.ts b/packages/cli/test/integration/runners/task-runner-module.external.test.ts
new file mode 100644
index 0000000000..d111854db6
--- /dev/null
+++ b/packages/cli/test/integration/runners/task-runner-module.external.test.ts
@@ -0,0 +1,54 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+
+import { MissingAuthTokenError } from '@/task-runners/errors/missing-auth-token.error';
+import { TaskRunnerModule } from '@/task-runners/task-runner-module';
+
+import { DefaultTaskRunnerDisconnectAnalyzer } from '../../../src/task-runners/default-task-runner-disconnect-analyzer';
+import { TaskRunnerWsServer } from '../../../src/task-runners/task-runner-ws-server';
+
+describe('TaskRunnerModule in external mode', () => {
+	const runnerConfig = Container.get(TaskRunnersConfig);
+	runnerConfig.mode = 'external';
+	runnerConfig.port = 0;
+	runnerConfig.authToken = 'test';
+	const module = Container.get(TaskRunnerModule);
+
+	afterEach(async () => {
+		await module.stop();
+	});
+
+	describe('start', () => {
+		it('should throw if the task runner is disabled', async () => {
+			runnerConfig.enabled = false;
+
+			// Act
+			await expect(module.start()).rejects.toThrow('Task runner is disabled');
+		});
+
+		it('should throw if auth token is missing', async () => {
+			const runnerConfig = new TaskRunnersConfig();
+			runnerConfig.mode = 'external';
+			runnerConfig.enabled = true;
+			runnerConfig.authToken = '';
+
+			const module = new TaskRunnerModule(mock(), mock(), runnerConfig);
+
+			await expect(module.start()).rejects.toThrowError(MissingAuthTokenError);
+		});
+
+		it('should start the task runner', async () => {
+			runnerConfig.enabled = true;
+
+			// Act
+			await module.start();
+		});
+
+		it('should use DefaultTaskRunnerDisconnectAnalyzer', () => {
+			const wsServer = Container.get(TaskRunnerWsServer);
+
+			expect(wsServer.getDisconnectAnalyzer()).toBeInstanceOf(DefaultTaskRunnerDisconnectAnalyzer);
+		});
+	});
+});
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
new file mode 100644
index 0000000000..3c373e9614
--- /dev/null
+++ b/packages/cli/test/integration/runners/task-runner-module.internal.test.ts
@@ -0,0 +1,41 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
+
+import { TaskRunnerModule } from '@/task-runners/task-runner-module';
+
+import { InternalTaskRunnerDisconnectAnalyzer } from '../../../src/task-runners/internal-task-runner-disconnect-analyzer';
+import { TaskRunnerWsServer } from '../../../src/task-runners/task-runner-ws-server';
+
+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 () => {
+		await module.stop();
+	});
+
+	describe('start', () => {
+		it('should throw if the task runner is disabled', async () => {
+			runnerConfig.enabled = false;
+
+			// Act
+			await expect(module.start()).rejects.toThrow('Task runner is disabled');
+		});
+
+		it('should start the task runner', async () => {
+			runnerConfig.enabled = true;
+
+			// Act
+			await module.start();
+		});
+
+		it('should use InternalTaskRunnerDisconnectAnalyzer', () => {
+			const wsServer = Container.get(TaskRunnerWsServer);
+
+			expect(wsServer.getDisconnectAnalyzer()).toBeInstanceOf(InternalTaskRunnerDisconnectAnalyzer);
+		});
+	});
+});
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 c893add440..bd6dae00b0 100644
--- a/packages/cli/test/integration/runners/task-runner-process.test.ts
+++ b/packages/cli/test/integration/runners/task-runner-process.test.ts
@@ -1,34 +1,24 @@
-import { TaskRunnersConfig } from '@n8n/config';
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
-import { TaskRunnerService } from '@/runners/runner-ws-server';
-import { TaskBroker } from '@/runners/task-broker.service';
-import { TaskRunnerProcess } from '@/runners/task-runner-process';
-import { TaskRunnerServer } from '@/runners/task-runner-server';
+import { TaskBroker } from '@/task-runners/task-broker.service';
+import { TaskRunnerProcess } from '@/task-runners/task-runner-process';
+import { TaskRunnerProcessRestartLoopDetector } from '@/task-runners/task-runner-process-restart-loop-detector';
+import { TaskRunnerWsServer } from '@/task-runners/task-runner-ws-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.disabled = false;
-	runnerConfig.mode = 'internal_childprocess';
-	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(TaskRunnerService);
-
-	const startLauncherSpy = jest.spyOn(runnerProcess, 'startLauncher');
-	const startNodeSpy = jest.spyOn(runnerProcess, 'startNode');
-	const killLauncherSpy = jest.spyOn(runnerProcess, 'killLauncher');
-	const killNodeSpy = jest.spyOn(runnerProcess, 'killNode');
+	const taskRunnerService = Container.get(TaskRunnerWsServer);
 
 	beforeAll(async () => {
 		await taskRunnerServer.start();
 		// Set the port to the actually used port
-		runnerConfig.port = taskRunnerServer.port;
+		config.port = taskRunnerServer.port;
 	});
 
 	afterAll(async () => {
@@ -37,11 +27,6 @@ describe('TaskRunnerProcess', () => {
 
 	afterEach(async () => {
 		await runnerProcess.stop();
-
-		startLauncherSpy.mockClear();
-		startNodeSpy.mockClear();
-		killLauncherSpy.mockClear();
-		killNodeSpy.mockClear();
 	});
 
 	const getNumConnectedRunners = () => taskRunnerService.runnerConnections.size;
@@ -101,45 +86,32 @@ describe('TaskRunnerProcess', () => {
 		expect(runnerProcess.pid).not.toBe(processId);
 	});
 
-	it('should launch runner directly if not using a launcher', async () => {
-		runnerConfig.mode = 'internal_childprocess';
+	it('should work together with restart loop detector', async () => {
+		// Arrange
+		const restartLoopDetector = new TaskRunnerProcessRestartLoopDetector(runnerProcess);
+		let restartLoopDetectedEventEmitted = false;
+		restartLoopDetector.once('restart-loop-detected', () => {
+			restartLoopDetectedEventEmitted = true;
+		});
 
+		// Act
 		await runnerProcess.start();
 
-		expect(startLauncherSpy).toBeCalledTimes(0);
-		expect(startNodeSpy).toBeCalledTimes(1);
-	});
+		// Simulate a restart loop
+		for (let i = 0; i < 5; i++) {
+			await retryUntil(() => {
+				expect(runnerProcess.pid).toBeDefined();
+			});
 
-	it('should use a launcher if configured', async () => {
-		runnerConfig.mode = 'internal_launcher';
-		runnerConfig.launcherPath = 'node';
+			// @ts-expect-error private property
+			runnerProcess.process?.kill();
 
-		await runnerProcess.start();
+			await new Promise((resolve) => {
+				runnerProcess.once('exit', resolve);
+			});
+		}
 
-		expect(startLauncherSpy).toBeCalledTimes(1);
-		expect(startNodeSpy).toBeCalledTimes(0);
-		runnerConfig.mode = 'internal_childprocess';
-	});
-
-	it('should kill the process directly if not using a launcher', async () => {
-		runnerConfig.mode = 'internal_childprocess';
-
-		await runnerProcess.start();
-		await runnerProcess.stop();
-
-		expect(killLauncherSpy).toBeCalledTimes(0);
-		expect(killNodeSpy).toBeCalledTimes(1);
-	});
-
-	it('should kill the process using a launcher if configured', async () => {
-		runnerConfig.mode = 'internal_launcher';
-		runnerConfig.launcherPath = 'node';
-
-		await runnerProcess.start();
-		await runnerProcess.stop();
-
-		expect(killLauncherSpy).toBeCalledTimes(1);
-		expect(killNodeSpy).toBeCalledTimes(0);
-		runnerConfig.mode = 'internal_childprocess';
+		// Assert
+		expect(restartLoopDetectedEventEmitted).toBe(true);
 	});
 });
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..6088af3525
--- /dev/null
+++ b/packages/cli/test/integration/runners/task-runner-server.test.ts
@@ -0,0 +1,44 @@
+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);
+		});
+	});
+
+	describe('/runners/_ws', () => {
+		it('should return 429 when too many requests are made', async () => {
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(401);
+			await agent.post('/runners/_ws').send({}).expect(429);
+		});
+	});
+
+	describe('/runners/auth', () => {
+		it('should return 429 when too many requests are made', async () => {
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(403);
+			await agent.post('/runners/auth').send({ token: 'invalid' }).expect(429);
+		});
+	});
+});
diff --git a/packages/cli/test/integration/saml/saml-helpers.test.ts b/packages/cli/test/integration/saml/saml-helpers.test.ts
index 6ac48ee93b..87d020248c 100644
--- a/packages/cli/test/integration/saml/saml-helpers.test.ts
+++ b/packages/cli/test/integration/saml/saml-helpers.test.ts
@@ -1,5 +1,5 @@
-import * as helpers from '@/sso/saml/saml-helpers';
-import type { SamlUserAttributes } from '@/sso/saml/types/saml-user-attributes';
+import * as helpers from '@/sso.ee/saml/saml-helpers';
+import type { SamlUserAttributes } from '@/sso.ee/saml/types';
 
 import { getPersonalProject } from '../shared/db/projects';
 import * as testDb from '../shared/test-db';
diff --git a/packages/cli/test/integration/saml/saml.api.test.ts b/packages/cli/test/integration/saml/saml.api.test.ts
index d30d57356a..7737444c6b 100644
--- a/packages/cli/test/integration/saml/saml.api.test.ts
+++ b/packages/cli/test/integration/saml/saml.api.test.ts
@@ -1,6 +1,9 @@
 import type { User } from '@/databases/entities/user';
-import { setSamlLoginEnabled } from '@/sso/saml/saml-helpers';
-import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/sso-helpers';
+import { setSamlLoginEnabled } from '@/sso.ee/saml/saml-helpers';
+import {
+	getCurrentAuthenticationMethod,
+	setCurrentAuthenticationMethod,
+} from '@/sso.ee/sso-helpers';
 
 import { sampleConfig } from './sample-metadata';
 import { createOwner, createUser } from '../shared/db/users';
@@ -31,6 +34,8 @@ beforeAll(async () => {
 	authMemberAgent = testServer.authAgentFor(someUser);
 });
 
+beforeEach(async () => await enableSaml(false));
+
 describe('Instance owner', () => {
 	describe('PATCH /me', () => {
 		test('should succeed with valid inputs', async () => {
@@ -86,6 +91,17 @@ describe('Instance owner', () => {
 				.expect(200);
 			expect(getCurrentAuthenticationMethod()).toBe('saml');
 		});
+
+		test('should return 400 on invalid config', async () => {
+			await authOwnerAgent
+				.post('/sso/saml/config')
+				.send({
+					...sampleConfig,
+					loginBinding: 'invalid',
+				})
+				.expect(400);
+			expect(getCurrentAuthenticationMethod()).toBe('email');
+		});
 	});
 
 	describe('POST /sso/saml/config/toggle', () => {
diff --git a/packages/cli/test/integration/saml/sample-metadata.ts b/packages/cli/test/integration/saml/sample-metadata.ts
index fd7968c2fb..528a3f158f 100644
--- a/packages/cli/test/integration/saml/sample-metadata.ts
+++ b/packages/cli/test/integration/saml/sample-metadata.ts
@@ -1,7 +1,8 @@
+import type { SamlPreferences } from '@n8n/api-types';
 export const sampleMetadata =
 	'<md:EntityDescriptor xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" ID="_2b2b09b520cf971059a06de918bff422ebb0aa943c52972e0309c533149721ef" entityID="authentik"><ds:Signature>\n<ds:SignedInfo>\n<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>\n<ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>\n<ds:Reference URI="#_2b2b09b520cf971059a06de918bff422ebb0aa943c52972e0309c533149721ef">\n<ds:Transforms>\n<ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>\n<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>\n</ds:Transforms>\n<ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>\n<ds:DigestValue>d/0TlU9d7qi9oQxDwjsZi69RMCiheKmcjJ7W0fRCHlM=</ds:DigestValue>\n</ds:Reference>\n</ds:SignedInfo>\n<ds:SignatureValue>um+M46ZJmOhK1vGm6ZTIOY926ZN8pkMClyVprLs0NAWH3sEO11rZZZkcAnSuWrLR\n8BcrwpKRU6qE4zrZBWfh+/Fqp180OvUa7vUDpxuZFJZhv7dSldfLgAdFX2VHctBo\n77hdLmrmJuWv/u6Gzsie/J8/2D0U0OwDGwfsOLLW3rjrfea5opcaAxY+0Rh+2zzk\nzIxVBqtSnSKxAJtkOpCDzbtnQIO0meB0ZvO7ssxwSFjBbHs34TRj1S3GFgCZXzl5\naXDi7AoWEs1YPviRNb368OrD3aljFBK0gzjullFter0rzp2TzSzZilkxaZmhupJe\n388cIDBKJPUmkxumafWXxJIOMfktUTnciUl4kz0OfDQ0J5m5NaDrmvYU8g/2A0+P\nVRI88N9n0GcT9cDvzTCEDSBFefOVpvuQkue+ZYLpZ8bJJS0ykunkcNiXLbGlBlCS\nje3Od78eNjwzG/WYmHsf9ajmBezBrUmzvdJx+SmfGRZplu86z9NrOQMliKcU4/T6\nOGEwz0pRcvhMJLn+MNR2DPzX6YHnPZ0neyiUqnIkzt0fU4q1QNdcyqSTfRQlZjkx\ndbdLsEFALxcNRv8vFaAbsQpxPuFNlfZeyAWQ/MLoBG1rUiEl06I9REMN6KM7CTog\n5i926hP4LLsIki45Ob83glFOrIoj/3nAw2jbd2Crl+E=</ds:SignatureValue>\n<ds:KeyInfo>\n<ds:X509Data>\n<ds:X509Certificate>MIIFUzCCAzugAwIBAgIRAJ1peD6pO0pygujUcWb85QswDQYJKoZIhvcNAQELBQAw\nHTEbMBkGA1UEAwwSYXV0aGVudGlrIDIwMjMuMi4yMB4XDTIzMDIyNzEzMTQ0MFoX\nDTI0MDIyODEzMTQ0MFowVjEqMCgGA1UEAwwhYXV0aGVudGlrIFNlbGYtc2lnbmVk\nIENlcnRpZmljYXRlMRIwEAYDVQQKDAlhdXRoZW50aWsxFDASBgNVBAsMC1NlbGYt\nc2lnbmVkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3thve9UWPL09\nouGwUPlCxfrBDDKmDdvoMc3eahfuop2tSP38EvdBcnPCVYTtu2hhHNqN/QtoyAZc\nTvwD8oDjwiYxdO6VbNjMZAnMD4W84l2niGnG7ATy/niNcZoge4xy+OmCJKXsolbs\nXT+hQGQ2oiUDnbX8QwMQCMN8FBF+EvYoHXKvRjmjO75DHyHY9JP05HZTO3lycVLW\nGrIq4oJfp60PN/0z5tbpk/Tyst21o4lcESAM4fkmndonPmoKMr7q9g+CFYRT+As6\niB+L38J44YNWs0Qm42tHAlveinBRuLLMi+eMC2L0sckvyJKB1qHG+bKl7jVXNDJg\n5KWKEHdM4CBg3dJkign+12EO205ruLYSBydZErAb2NKd2htgYs/zGHSgb3LhQ3vE\nuHiTIcq828PWmVM7l3B8CJ+ZyPLixywT0pKgkb8lrDqzXIffRljCYMT2pIR4FNuy\n+CzXMYm+N30qVO8h9+cl3YRSHpFBk9KJ0/+HQp1k6ELnaYW+LryS8Jr1uPxhwyMq\nGu+4bxCF8JfZncojMhlQghXCQUvOaboNlBWv5jtsoZ9mN266V1EJpnF064UimQ1f\noN1O4l4292NvkChcmiQf2YDE5PrMWm10gQg401oulE9o91OsxLRmyw/qZTJvA06K\ngVamNLfhN/St/CVfl8q6ldgoHmWaxY8CAwEAAaNVMFMwUQYDVR0RAQH/BEcwRYJD\nT1BRVVpWNW1qdWFvQ01hdEVvenU5ajNoUnlhU0UyQThaTjd4WlZqUy5zZWxmLXNp\nZ25lZC5nb2F1dGhlbnRpay5pbzANBgkqhkiG9w0BAQsFAAOCAgEAwaQtK4s2DnJx\njg6i6BSo/rhNg7ClXgnOyF79T7JO3gexVjzboY2UTi1ut/DEII01PI0qgQ62+q9l\nTloWd1SpxPOrOVeu2uVgTK0LkGb63q355iJ2myfhFYYPPprNDzvUhnX8cVY979Ma\niqAOCJW7irlHAH2bLAujanRdlcgFtmoe5lZ+qnS5iOUmp5tehPsDJGlPZ3nCWJcR\nQHDLLSOp3TvR5no8nj0cWxUWnNeaGoJy1GsJlGapLXS5pUKpxVg9GeEcQxjBkFgM\nLWrkWBsQDvC5+GlmHgSkdRvuYBlB6CRK2eGY7G06v7ZRPhf82LvEFRBwzJvGdM0g\n491OTTJquTN2wyq45UlJK4anMYrUbpi8p8MOW7IUw6a+SvZyJab9gNoLTUzA6Mlz\nQP9bPrEALpwNhmHsmD09zNyYiNfpkpLJog96wPscx4b+gsg+5PcilET8qvth6VYD\nup8TdsonPvDPH0oyo66SAYoyOgAeB+BHTicjtVt+UnrhXYj92BHDXfmfdTzA8QcY\n7reLPIOQVk1zV24cwySiLh4F2Hr8z8V1wMRVNVHcezMsVBvCzxQ15XlMq9X2wBuj\nfED93dXJVs+WuzbpTIoXvHHT3zWnzykX8hVbrj9ddzF8TuJW4NYis0cH5SLzvtPj\n7EzvuRaQc7pNrduO1pTKoPAy+2SLgqo=</ds:X509Certificate>\n</ds:X509Data>\n</ds:KeyInfo>\n</ds:Signature><md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"><md:KeyDescriptor use="signing"><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIFUzCCAzugAwIBAgIRAJ1peD6pO0pygujUcWb85QswDQYJKoZIhvcNAQELBQAwHTEbMBkGA1UEAwwSYXV0aGVudGlrIDIwMjMuMi4yMB4XDTIzMDIyNzEzMTQ0MFoXDTI0MDIyODEzMTQ0MFowVjEqMCgGA1UEAwwhYXV0aGVudGlrIFNlbGYtc2lnbmVkIENlcnRpZmljYXRlMRIwEAYDVQQKDAlhdXRoZW50aWsxFDASBgNVBAsMC1NlbGYtc2lnbmVkMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3thve9UWPL09ouGwUPlCxfrBDDKmDdvoMc3eahfuop2tSP38EvdBcnPCVYTtu2hhHNqN/QtoyAZcTvwD8oDjwiYxdO6VbNjMZAnMD4W84l2niGnG7ATy/niNcZoge4xy+OmCJKXsolbsXT+hQGQ2oiUDnbX8QwMQCMN8FBF+EvYoHXKvRjmjO75DHyHY9JP05HZTO3lycVLWGrIq4oJfp60PN/0z5tbpk/Tyst21o4lcESAM4fkmndonPmoKMr7q9g+CFYRT+As6iB+L38J44YNWs0Qm42tHAlveinBRuLLMi+eMC2L0sckvyJKB1qHG+bKl7jVXNDJg5KWKEHdM4CBg3dJkign+12EO205ruLYSBydZErAb2NKd2htgYs/zGHSgb3LhQ3vEuHiTIcq828PWmVM7l3B8CJ+ZyPLixywT0pKgkb8lrDqzXIffRljCYMT2pIR4FNuy+CzXMYm+N30qVO8h9+cl3YRSHpFBk9KJ0/+HQp1k6ELnaYW+LryS8Jr1uPxhwyMqGu+4bxCF8JfZncojMhlQghXCQUvOaboNlBWv5jtsoZ9mN266V1EJpnF064UimQ1foN1O4l4292NvkChcmiQf2YDE5PrMWm10gQg401oulE9o91OsxLRmyw/qZTJvA06KgVamNLfhN/St/CVfl8q6ldgoHmWaxY8CAwEAAaNVMFMwUQYDVR0RAQH/BEcwRYJDT1BRVVpWNW1qdWFvQ01hdEVvenU5ajNoUnlhU0UyQThaTjd4WlZqUy5zZWxmLXNpZ25lZC5nb2F1dGhlbnRpay5pbzANBgkqhkiG9w0BAQsFAAOCAgEAwaQtK4s2DnJxjg6i6BSo/rhNg7ClXgnOyF79T7JO3gexVjzboY2UTi1ut/DEII01PI0qgQ62+q9lTloWd1SpxPOrOVeu2uVgTK0LkGb63q355iJ2myfhFYYPPprNDzvUhnX8cVY979MaiqAOCJW7irlHAH2bLAujanRdlcgFtmoe5lZ+qnS5iOUmp5tehPsDJGlPZ3nCWJcRQHDLLSOp3TvR5no8nj0cWxUWnNeaGoJy1GsJlGapLXS5pUKpxVg9GeEcQxjBkFgMLWrkWBsQDvC5+GlmHgSkdRvuYBlB6CRK2eGY7G06v7ZRPhf82LvEFRBwzJvGdM0g491OTTJquTN2wyq45UlJK4anMYrUbpi8p8MOW7IUw6a+SvZyJab9gNoLTUzA6MlzQP9bPrEALpwNhmHsmD09zNyYiNfpkpLJog96wPscx4b+gsg+5PcilET8qvth6VYDup8TdsonPvDPH0oyo66SAYoyOgAeB+BHTicjtVt+UnrhXYj92BHDXfmfdTzA8QcY7reLPIOQVk1zV24cwySiLh4F2Hr8z8V1wMRVNVHcezMsVBvCzxQ15XlMq9X2wBujfED93dXJVs+WuzbpTIoXvHHT3zWnzykX8hVbrj9ddzF8TuJW4NYis0cH5SLzvtPj7EzvuRaQc7pNrduO1pTKoPAy+2SLgqo=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://localhost:9943/application/saml/n8n-saml-implicit/slo/binding/redirect/"/><md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:9943/application/saml/n8n-saml-implicit/slo/binding/post/"/><md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</md:NameIDFormat><md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat><md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:X509SubjectName</md:NameIDFormat><md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat><md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://localhost:9943/application/saml/n8n-saml-implicit/sso/binding/redirect/"/><md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://localhost:9943/application/saml/n8n-saml-implicit/sso/binding/post/"/></md:IDPSSODescriptor></md:EntityDescriptor>';
 
-export const sampleConfig = {
+export const sampleConfig: SamlPreferences = {
 	mapping: {
 		email: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
 		firstName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname',
@@ -25,6 +26,5 @@ export const sampleConfig = {
 			action: 'after',
 		},
 	},
-	entityID: 'https://n8n-tunnel.localhost.dev/rest/sso/saml/metadata',
-	returnUrl: 'https://n8n-tunnel.localhost.dev/rest/sso/saml/acs',
+	relayState: '',
 };
diff --git a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
index 4513beb6bb..ba38f04bd6 100644
--- a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts
@@ -1,7 +1,8 @@
-import Container from 'typedi';
+import type { SecurityConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
 import { v4 as uuid } from 'uuid';
 
-import config from '@/config';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
@@ -15,10 +16,15 @@ import * as testDb from '../shared/test-db';
 
 let securityAuditService: SecurityAuditService;
 
+const securityConfig = mock<SecurityConfig>({ daysAbandonedWorkflow: 90 });
+
 beforeAll(async () => {
 	await testDb.init();
 
-	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+	securityAuditService = new SecurityAuditService(
+		Container.get(WorkflowRepository),
+		securityConfig,
+	);
 });
 
 beforeEach(async () => {
@@ -154,7 +160,7 @@ test('should report credential in not recently executed workflow', async () => {
 	const workflow = await Container.get(WorkflowRepository).save(workflowDetails);
 
 	const date = new Date();
-	date.setDate(date.getDate() - config.getEnv('security.audit.daysAbandonedWorkflow') - 1);
+	date.setDate(date.getDate() - securityConfig.daysAbandonedWorkflow - 1);
 
 	const savedExecution = await Container.get(ExecutionRepository).save({
 		finished: true,
@@ -223,7 +229,7 @@ test('should not report credentials in recently executed workflow', async () =>
 	const workflow = await Container.get(WorkflowRepository).save(workflowDetails);
 
 	const date = new Date();
-	date.setDate(date.getDate() - config.getEnv('security.audit.daysAbandonedWorkflow') + 1);
+	date.setDate(date.getDate() - securityConfig.daysAbandonedWorkflow + 1);
 
 	const savedExecution = await Container.get(ExecutionRepository).save({
 		finished: true,
diff --git a/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts
index d519f97a23..67927426b3 100644
--- a/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts
@@ -1,4 +1,5 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
 import { v4 as uuid } from 'uuid';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -18,7 +19,7 @@ let securityAuditService: SecurityAuditService;
 beforeAll(async () => {
 	await testDb.init();
 
-	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository), mock());
 });
 
 beforeEach(async () => {
diff --git a/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts
index 34bcb83b49..85ab2e6ec4 100644
--- a/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts
@@ -1,4 +1,5 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
 import { v4 as uuid } from 'uuid';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -13,7 +14,7 @@ let securityAuditService: SecurityAuditService;
 beforeAll(async () => {
 	await testDb.init();
 
-	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository), mock());
 });
 
 beforeEach(async () => {
diff --git a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
index 4f355cbcbc..05a6b2c31f 100644
--- a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
@@ -1,8 +1,9 @@
+import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
 import { NodeConnectionType } from 'n8n-workflow';
-import Container from 'typedi';
 import { v4 as uuid } from 'uuid';
 
-import config from '@/config';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { generateNanoId } from '@/databases/utils/generators';
 import { INSTANCE_REPORT, WEBHOOK_VALIDATOR_NODE_TYPES } from '@/security-audit/constants';
@@ -23,7 +24,7 @@ let securityAuditService: SecurityAuditService;
 beforeAll(async () => {
 	await testDb.init();
 
-	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository), mock());
 
 	simulateUpToDateInstance();
 });
@@ -238,7 +239,7 @@ test('should not report outdated instance when up to date', async () => {
 });
 
 test('should report security settings', async () => {
-	config.set('diagnostics.enabled', true);
+	Container.get(GlobalConfig).diagnostics.enabled = true;
 
 	const testAudit = await securityAuditService.run(['instance']);
 
diff --git a/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts
index 133a574d40..461685ec5c 100644
--- a/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts
@@ -1,4 +1,5 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
 import { v4 as uuid } from 'uuid';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
@@ -24,7 +25,7 @@ let securityAuditService: SecurityAuditService;
 beforeAll(async () => {
 	await testDb.init();
 
-	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository));
+	securityAuditService = new SecurityAuditService(Container.get(WorkflowRepository), mock());
 });
 
 beforeEach(async () => {
diff --git a/packages/cli/test/integration/security-audit/utils.ts b/packages/cli/test/integration/security-audit/utils.ts
index d74bcc9d87..d153db28eb 100644
--- a/packages/cli/test/integration/security-audit/utils.ts
+++ b/packages/cli/test/integration/security-audit/utils.ts
@@ -1,6 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import nock from 'nock';
-import Container from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import * as constants from '@/constants';
diff --git a/packages/cli/test/integration/services/execution-metadata.service.test.ts b/packages/cli/test/integration/services/execution-metadata.service.test.ts
index b69c78b5fe..7288c4b98f 100644
--- a/packages/cli/test/integration/services/execution-metadata.service.test.ts
+++ b/packages/cli/test/integration/services/execution-metadata.service.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
 import { ExecutionMetadataService } from '@/services/execution-metadata.service';
diff --git a/packages/cli/test/integration/services/project.service.test.ts b/packages/cli/test/integration/services/project.service.test.ts
index 85393a4013..b01aed3b3b 100644
--- a/packages/cli/test/integration/services/project.service.test.ts
+++ b/packages/cli/test/integration/services/project.service.test.ts
@@ -1,10 +1,10 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
-import Container from 'typedi';
 
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 
 import { createMember } from '../shared/db/users';
 import * as testDb from '../shared/test-db';
diff --git a/packages/cli/test/integration/services/workflow-static-data.service.test.ts b/packages/cli/test/integration/services/workflow-static-data.service.test.ts
index c6ab9301ce..8cb2cbc1cc 100644
--- a/packages/cli/test/integration/services/workflow-static-data.service.test.ts
+++ b/packages/cli/test/integration/services/workflow-static-data.service.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { Workflow } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { NodeTypes } from '@/node-types';
diff --git a/packages/cli/test/integration/shared/constants.ts b/packages/cli/test/integration/shared/constants.ts
index 5fffacbd11..377a0e45a4 100644
--- a/packages/cli/test/integration/shared/constants.ts
+++ b/packages/cli/test/integration/shared/constants.ts
@@ -1,5 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 export const REST_PATH_SEGMENT = Container.get(GlobalConfig).endpoints.rest;
 
diff --git a/packages/cli/test/integration/shared/db/credentials.ts b/packages/cli/test/integration/shared/db/credentials.ts
index 5593b7d55a..08d99354f2 100644
--- a/packages/cli/test/integration/shared/db/credentials.ts
+++ b/packages/cli/test/integration/shared/db/credentials.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import type { Project } from '@/databases/entities/project';
diff --git a/packages/cli/test/integration/shared/db/executions.ts b/packages/cli/test/integration/shared/db/executions.ts
index 4dd0b4fa76..9af7ad22ed 100644
--- a/packages/cli/test/integration/shared/db/executions.ts
+++ b/packages/cli/test/integration/shared/db/executions.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import type { AnnotationVote } from 'n8n-workflow';
-import Container from 'typedi';
 
 import type { ExecutionData } from '@/databases/entities/execution-data';
 import type { ExecutionEntity } from '@/databases/entities/execution-entity';
diff --git a/packages/cli/test/integration/shared/db/projects.ts b/packages/cli/test/integration/shared/db/projects.ts
index 93310d5a99..9d61c2a667 100644
--- a/packages/cli/test/integration/shared/db/projects.ts
+++ b/packages/cli/test/integration/shared/db/projects.ts
@@ -1,7 +1,8 @@
-import Container from 'typedi';
+import type { ProjectRole } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 
 import type { Project } from '@/databases/entities/project';
-import type { ProjectRelation, ProjectRole } from '@/databases/entities/project-relation';
+import type { ProjectRelation } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
diff --git a/packages/cli/test/integration/shared/db/tags.ts b/packages/cli/test/integration/shared/db/tags.ts
index b9d943b938..af5638f902 100644
--- a/packages/cli/test/integration/shared/db/tags.ts
+++ b/packages/cli/test/integration/shared/db/tags.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { TagEntity } from '@/databases/entities/tag-entity';
 import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
diff --git a/packages/cli/test/integration/shared/db/users.ts b/packages/cli/test/integration/shared/db/users.ts
index 64c4d8ad85..bb4332f9de 100644
--- a/packages/cli/test/integration/shared/db/users.ts
+++ b/packages/cli/test/integration/shared/db/users.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { hash } from 'bcryptjs';
-import Container from 'typedi';
 
 import { AuthIdentity } from '@/databases/entities/auth-identity';
 import { type GlobalRole, type User } from '@/databases/entities/user';
diff --git a/packages/cli/test/integration/shared/db/variables.ts b/packages/cli/test/integration/shared/db/variables.ts
index 582d3ccc1b..2ff052e7c0 100644
--- a/packages/cli/test/integration/shared/db/variables.ts
+++ b/packages/cli/test/integration/shared/db/variables.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { randomString } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { VariablesRepository } from '@/databases/repositories/variables.repository';
 import { generateNanoId } from '@/databases/utils/generators';
diff --git a/packages/cli/test/integration/shared/db/workflow-history.ts b/packages/cli/test/integration/shared/db/workflow-history.ts
index 31d7e50cf5..ff7a2d5bec 100644
--- a/packages/cli/test/integration/shared/db/workflow-history.ts
+++ b/packages/cli/test/integration/shared/db/workflow-history.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 import { v4 as uuid } from 'uuid';
 
 import type { WorkflowHistory } from '@/databases/entities/workflow-history';
diff --git a/packages/cli/test/integration/shared/db/workflow-statistics.ts b/packages/cli/test/integration/shared/db/workflow-statistics.ts
index 842ce6518a..0eee830816 100644
--- a/packages/cli/test/integration/shared/db/workflow-statistics.ts
+++ b/packages/cli/test/integration/shared/db/workflow-statistics.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import type { Workflow } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { StatisticsNames, type WorkflowStatistics } from '@/databases/entities/workflow-statistics';
 import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
diff --git a/packages/cli/test/integration/shared/db/workflows.ts b/packages/cli/test/integration/shared/db/workflows.ts
index 5c86f1dc35..dfd272b396 100644
--- a/packages/cli/test/integration/shared/db/workflows.ts
+++ b/packages/cli/test/integration/shared/db/workflows.ts
@@ -1,6 +1,6 @@
+import { Container } from '@n8n/di';
 import type { DeepPartial } from '@n8n/typeorm';
 import { NodeConnectionType } from 'n8n-workflow';
-import Container from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { Project } from '@/databases/entities/project';
@@ -40,6 +40,7 @@ export function newWorkflow(attributes: Partial<WorkflowEntity> = {}): WorkflowE
 		],
 		connections: connections ?? {},
 		versionId: versionId ?? uuid(),
+		settings: {},
 		...attributes,
 	});
 
diff --git a/packages/cli/test/integration/shared/ldap.ts b/packages/cli/test/integration/shared/ldap.ts
index 3f48cf2e3c..9cf37e6b62 100644
--- a/packages/cli/test/integration/shared/ldap.ts
+++ b/packages/cli/test/integration/shared/ldap.ts
@@ -1,9 +1,9 @@
+import { Container } from '@n8n/di';
 import { jsonParse } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
-import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants';
-import type { LdapConfig } from '@/ldap/types';
+import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap.ee/constants';
+import type { LdapConfig } from '@/ldap.ee/types';
 
 export const defaultLdapConfig = {
 	...LDAP_DEFAULT_CONFIGURATION,
diff --git a/packages/cli/test/integration/shared/random.ts b/packages/cli/test/integration/shared/random.ts
index a51fae3a05..e556c4f512 100644
--- a/packages/cli/test/integration/shared/random.ts
+++ b/packages/cli/test/integration/shared/random.ts
@@ -37,10 +37,13 @@ const randomTopLevelDomain = () => chooseRandomly(POPULAR_TOP_LEVEL_DOMAINS);
 
 export const randomName = () => randomString(4, 8).toLowerCase();
 
-export const randomCredentialPayload = (): CredentialPayload => ({
+export const randomCredentialPayload = ({
+	isManaged = false,
+}: { isManaged?: boolean } = {}): CredentialPayload => ({
 	name: randomName(),
 	type: randomName(),
 	data: { accessToken: randomString(6, 16) },
+	isManaged,
 });
 
 export const uniqueId = () => uuid();
diff --git a/packages/cli/test/integration/shared/retry-until.ts b/packages/cli/test/integration/shared/retry-until.ts
index f469149b31..b6f375ecb4 100644
--- a/packages/cli/test/integration/shared/retry-until.ts
+++ b/packages/cli/test/integration/shared/retry-until.ts
@@ -8,7 +8,7 @@
  */
 export const retryUntil = async (
 	assertion: () => Promise<void> | void,
-	{ interval = 20, timeout = 1000 } = {},
+	{ intervalMs = 200, timeoutMs = 5000 } = {},
 ) => {
 	return await new Promise((resolve, reject) => {
 		const startTime = Date.now();
@@ -18,13 +18,13 @@ export const retryUntil = async (
 				try {
 					resolve(await assertion());
 				} catch (error) {
-					if (Date.now() - startTime > timeout) {
+					if (Date.now() - startTime > timeoutMs) {
 						reject(error);
 					} else {
 						tryAgain();
 					}
 				}
-			}, interval);
+			}, intervalMs);
 		};
 
 		tryAgain();
diff --git a/packages/cli/test/integration/shared/test-db.ts b/packages/cli/test/integration/shared/test-db.ts
index 7faaa3f6eb..052d383c27 100644
--- a/packages/cli/test/integration/shared/test-db.ts
+++ b/packages/cli/test/integration/shared/test-db.ts
@@ -1,10 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import type { DataSourceOptions, Repository } from '@n8n/typeorm';
 import { DataSource as Connection } from '@n8n/typeorm';
 import { kebabCase } from 'lodash';
 import type { Class } from 'n8n-core';
 import { randomString } from 'n8n-workflow';
-import { Container } from 'typedi';
 
 import { getOptionOverrides } from '@/databases/config';
 import * as Db from '@/db';
@@ -74,6 +74,9 @@ const repositories = [
 	'SharedCredentials',
 	'SharedWorkflow',
 	'Tag',
+	'TestDefinition',
+	'TestMetric',
+	'TestRun',
 	'User',
 	'Variables',
 	'Webhook',
diff --git a/packages/cli/test/integration/shared/types.ts b/packages/cli/test/integration/shared/types.ts
index 8dc922dda2..2a789e4f00 100644
--- a/packages/cli/test/integration/shared/types.ts
+++ b/packages/cli/test/integration/shared/types.ts
@@ -41,7 +41,9 @@ type EndpointGroup =
 	| 'project'
 	| 'role'
 	| 'dynamic-node-parameters'
-	| 'apiKeys';
+	| 'apiKeys'
+	| 'evaluation'
+	| 'ai';
 
 export interface SetupProps {
 	endpointGroups?: EndpointGroup[];
@@ -67,6 +69,7 @@ export type CredentialPayload = {
 	name: string;
 	type: string;
 	data: ICredentialDataDecryptedObject;
+	isManaged?: boolean;
 };
 
 export type SaveCredentialFunction = (
diff --git a/packages/cli/test/integration/shared/utils/community-nodes.ts b/packages/cli/test/integration/shared/utils/community-nodes.ts
index 7734f70762..033d86c709 100644
--- a/packages/cli/test/integration/shared/utils/community-nodes.ts
+++ b/packages/cli/test/integration/shared/utils/community-nodes.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { NODE_PACKAGE_PREFIX } from '@/constants';
 import { InstalledPackages } from '@/databases/entities/installed-packages';
@@ -22,7 +22,7 @@ export const mockNode = (packageName: string) => {
 
 	return Container.get(InstalledNodesRepository).create({
 		name: nodeName,
-		type: nodeName,
+		type: `${packageName}.${nodeName}`,
 		latestVersion: COMMUNITY_NODE_VERSION.CURRENT,
 		package: { packageName },
 	});
diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts
index 78de2c1b25..f43b102bd3 100644
--- a/packages/cli/test/integration/shared/utils/index.ts
+++ b/packages/cli/test/integration/shared/utils/index.ts
@@ -1,12 +1,19 @@
-import { BinaryDataService } from 'n8n-core';
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+import {
+	BinaryDataService,
+	InstanceSettings,
+	UnrecognizedNodeTypeError,
+	type DirectoryLoader,
+} from 'n8n-core';
 import { Ftp } from 'n8n-nodes-base/credentials/Ftp.credentials';
 import { GithubApi } from 'n8n-nodes-base/credentials/GithubApi.credentials';
 import { Cron } from 'n8n-nodes-base/nodes/Cron/Cron.node';
+import { ScheduleTrigger } from 'n8n-nodes-base/nodes/Schedule/ScheduleTrigger.node';
 import { Set } from 'n8n-nodes-base/nodes/Set/Set.node';
 import { Start } from 'n8n-nodes-base/nodes/Start/Start.node';
-import { type INode } from 'n8n-workflow';
+import type { INodeTypeData, INode } from 'n8n-workflow';
 import type request from 'supertest';
-import { Container } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import config from '@/config';
@@ -16,7 +23,6 @@ import { SettingsRepository } from '@/databases/repositories/settings.repository
 import { ExecutionService } from '@/executions/execution.service';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
 import { Push } from '@/push';
-import { OrchestrationService } from '@/services/orchestration.service';
 
 import { mockInstance } from '../../../shared/mocking';
 
@@ -30,8 +36,8 @@ export { setupTestServer } from './test-server';
  * Initialize node types.
  */
 export async function initActiveWorkflowManager() {
-	mockInstance(OrchestrationService, {
-		isMultiMainSetupEnabled: false,
+	mockInstance(InstanceSettings, {
+		isMultiMain: false,
 	});
 
 	mockInstance(Push);
@@ -62,7 +68,8 @@ export async function initCredentialsTypes(): Promise<void> {
  * Initialize node types.
  */
 export async function initNodeTypes() {
-	Container.get(LoadNodesAndCredentials).loaded.nodes = {
+	ScheduleTrigger.prototype.trigger = async () => ({});
+	const nodes: INodeTypeData = {
 		'n8n-nodes-base.start': {
 			type: new Start(),
 			sourcePath: '',
@@ -75,7 +82,21 @@ export async function initNodeTypes() {
 			type: new Set(),
 			sourcePath: '',
 		},
+		'n8n-nodes-base.scheduleTrigger': {
+			type: new ScheduleTrigger(),
+			sourcePath: '',
+		},
 	};
+	const loader = mock<DirectoryLoader>();
+	loader.getNode.mockImplementation((nodeType) => {
+		const node = nodes[`n8n-nodes-base.${nodeType}`];
+		if (!node) throw new UnrecognizedNodeTypeError('n8n-nodes-base', nodeType);
+		return node;
+	});
+
+	const loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
+	loadNodesAndCredentials.loaders = { 'n8n-nodes-base': loader };
+	loadNodesAndCredentials.loaded.nodes = nodes;
 }
 
 /**
diff --git a/packages/cli/test/integration/shared/utils/node-types-data.ts b/packages/cli/test/integration/shared/utils/node-types-data.ts
new file mode 100644
index 0000000000..35178de207
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/node-types-data.ts
@@ -0,0 +1,33 @@
+import type { INodeTypeData } from 'n8n-workflow';
+
+export function mockNodeTypesData(
+	nodeNames: string[],
+	options?: {
+		addTrigger?: boolean;
+	},
+) {
+	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
+		const fullName = nodeName.indexOf('.') === -1 ? `n8n-nodes-base.${nodeName}` : nodeName;
+
+		return (
+			(acc[fullName] = {
+				sourcePath: '',
+				type: {
+					description: {
+						displayName: nodeName,
+						name: nodeName,
+						group: [],
+						description: '',
+						version: 1,
+						defaults: {},
+						inputs: [],
+						outputs: [],
+						properties: [],
+					},
+					trigger: options?.addTrigger ? async () => undefined : undefined,
+				},
+			}),
+			acc
+		);
+	}, {});
+}
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..63a96678a2
--- /dev/null
+++ b/packages/cli/test/integration/shared/utils/task-broker-test-server.ts
@@ -0,0 +1,40 @@
+import { TaskRunnersConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
+import request from 'supertest';
+import type TestAgent from 'supertest/lib/agent';
+
+import { TaskRunnerServer } from '@/task-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 b69f21499a..aab78ef33e 100644
--- a/packages/cli/test/integration/shared/utils/test-server.ts
+++ b/packages/cli/test/integration/shared/utils/test-server.ts
@@ -1,8 +1,9 @@
+import { Container } from '@n8n/di';
 import cookieParser from 'cookie-parser';
 import express from 'express';
+import { Logger } from 'n8n-core';
 import type superagent from 'superagent';
 import request from 'supertest';
-import { Container } from 'typedi';
 import { URL } from 'url';
 
 import { AuthService } from '@/auth/auth.service';
@@ -11,7 +12,6 @@ import { AUTH_COOKIE_NAME } from '@/constants';
 import type { User } from '@/databases/entities/user';
 import { ControllerRegistry } from '@/decorators';
 import { License } from '@/license';
-import { Logger } from '@/logging/logger.service';
 import { rawBodyReader, bodyParser } from '@/middlewares';
 import { PostHogClient } from '@/posthog';
 import { Push } from '@/push';
@@ -171,7 +171,7 @@ export const setupTestServer = ({
 						break;
 
 					case 'variables':
-						await import('@/environments/variables/variables.controller.ee');
+						await import('@/environments.ee/variables/variables.controller.ee');
 						break;
 
 					case 'license':
@@ -202,20 +202,22 @@ export const setupTestServer = ({
 						break;
 
 					case 'ldap':
-						const { LdapService } = await import('@/ldap/ldap.service.ee');
-						await import('@/ldap/ldap.controller.ee');
+						const { LdapService } = await import('@/ldap.ee/ldap.service.ee');
+						await import('@/ldap.ee/ldap.controller.ee');
 						testServer.license.enable('feat:ldap');
 						await Container.get(LdapService).init();
 						break;
 
 					case 'saml':
-						const { setSamlLoginEnabled } = await import('@/sso/saml/saml-helpers');
-						await import('@/sso/saml/routes/saml.controller.ee');
+						const { SamlService } = await import('@/sso.ee/saml/saml.service.ee');
+						await Container.get(SamlService).init();
+						await import('@/sso.ee/saml/routes/saml.controller.ee');
+						const { setSamlLoginEnabled } = await import('@/sso.ee/saml/saml-helpers');
 						await setSamlLoginEnabled(true);
 						break;
 
 					case 'sourceControl':
-						await import('@/environments/source-control/source-control.controller.ee');
+						await import('@/environments.ee/source-control/source-control.controller.ee');
 						break;
 
 					case 'community-packages':
@@ -247,11 +249,11 @@ export const setupTestServer = ({
 						break;
 
 					case 'externalSecrets':
-						await import('@/external-secrets/external-secrets.controller.ee');
+						await import('@/external-secrets.ee/external-secrets.controller.ee');
 						break;
 
 					case 'workflowHistory':
-						await import('@/workflows/workflow-history/workflow-history.controller.ee');
+						await import('@/workflows/workflow-history.ee/workflow-history.controller.ee');
 						break;
 
 					case 'binaryData':
@@ -277,6 +279,15 @@ export const setupTestServer = ({
 					case 'apiKeys':
 						await import('@/controllers/api-keys.controller');
 						break;
+
+					case 'evaluation':
+						await import('@/evaluation.ee/metrics.controller');
+						await import('@/evaluation.ee/test-definitions.controller.ee');
+						await import('@/evaluation.ee/test-runs.controller.ee');
+						break;
+
+					case 'ai':
+						await import('@/controllers/ai.controller');
 				}
 			}
 
diff --git a/packages/cli/test/integration/tags.api.test.ts b/packages/cli/test/integration/tags.api.test.ts
index e3acc2a650..90d764f534 100644
--- a/packages/cli/test/integration/tags.api.test.ts
+++ b/packages/cli/test/integration/tags.api.test.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import { TagRepository } from '@/databases/repositories/tag.repository';
 
@@ -8,6 +8,7 @@ import type { SuperAgentTest } from './shared/types';
 import * as utils from './shared/utils/';
 
 let authOwnerAgent: SuperAgentTest;
+
 const testServer = utils.setupTestServer({ endpointGroups: ['tags'] });
 
 beforeAll(async () => {
@@ -22,8 +23,8 @@ beforeEach(async () => {
 describe('POST /tags', () => {
 	test('should create tag', async () => {
 		const resp = await authOwnerAgent.post('/tags').send({ name: 'test' });
-		expect(resp.statusCode).toBe(200);
 
+		expect(resp.statusCode).toBe(200);
 		const dbTag = await Container.get(TagRepository).findBy({ name: 'test' });
 		expect(dbTag.length === 1);
 	});
@@ -38,4 +39,59 @@ describe('POST /tags', () => {
 		const dbTag = await Container.get(TagRepository).findBy({ name: 'test' });
 		expect(dbTag.length).toBe(1);
 	});
+
+	test('should delete tag', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.delete(`/tags/${newTag.id}`);
+		expect(resp.status).toBe(200);
+
+		const dbTag = await Container.get(TagRepository).findBy({ name: 'test' });
+		expect(dbTag.length).toBe(0);
+	});
+
+	test('should update tag name', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.patch(`/tags/${newTag.id}`).send({ name: 'updated' });
+		expect(resp.status).toBe(200);
+
+		const dbTag = await Container.get(TagRepository).findBy({ name: 'updated' });
+		expect(dbTag.length).toBe(1);
+	});
+
+	test('should retrieve all tags', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		const savedTag = await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.get('/tags');
+		expect(resp.status).toBe(200);
+
+		expect(resp.body.data.length).toBe(1);
+		expect(resp.body.data[0]).toMatchObject({
+			id: savedTag.id,
+			name: savedTag.name,
+			createdAt: savedTag.createdAt.toISOString(),
+			updatedAt: savedTag.updatedAt.toISOString(),
+		});
+	});
+
+	test('should retrieve all tags with with usage count', async () => {
+		const newTag = Container.get(TagRepository).create({ name: 'test' });
+		const savedTag = await Container.get(TagRepository).save(newTag);
+
+		const resp = await authOwnerAgent.get('/tags').query({ withUsageCount: 'true' });
+		expect(resp.status).toBe(200);
+
+		expect(resp.body.data.length).toBe(1);
+		expect(resp.body.data[0]).toMatchObject({
+			id: savedTag.id,
+			name: savedTag.name,
+			createdAt: savedTag.createdAt.toISOString(),
+			updatedAt: savedTag.updatedAt.toISOString(),
+			usageCount: 0,
+		});
+	});
 });
diff --git a/packages/cli/test/integration/user.repository.test.ts b/packages/cli/test/integration/user.repository.test.ts
index 4de084ba39..1e5ce846e0 100644
--- a/packages/cli/test/integration/user.repository.test.ts
+++ b/packages/cli/test/integration/user.repository.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts
index 9ecacdec0c..01fc50a17f 100644
--- a/packages/cli/test/integration/users.api.test.ts
+++ b/packages/cli/test/integration/users.api.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 import { v4 as uuid } from 'uuid';
 
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
diff --git a/packages/cli/test/integration/variables.test.ts b/packages/cli/test/integration/variables.test.ts
index f8cef37539..cb47fb8a61 100644
--- a/packages/cli/test/integration/variables.test.ts
+++ b/packages/cli/test/integration/variables.test.ts
@@ -1,9 +1,10 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { Variables } from '@/databases/entities/variables';
 import { VariablesRepository } from '@/databases/repositories/variables.repository';
 import { generateNanoId } from '@/databases/utils/generators';
-import { VariablesService } from '@/environments/variables/variables.service.ee';
+import { VariablesService } from '@/environments.ee/variables/variables.service.ee';
+import { CacheService } from '@/services/cache/cache.service';
 
 import { createOwner, createUser } from './shared/db/users';
 import * as testDb from './shared/test-db';
@@ -65,19 +66,41 @@ beforeEach(async () => {
 // ----------------------------------------
 describe('GET /variables', () => {
 	beforeEach(async () => {
-		await Promise.all([createVariable('test1', 'value1'), createVariable('test2', 'value2')]);
+		await Promise.all([
+			createVariable('test1', 'value1'),
+			createVariable('test2', 'value2'),
+			createVariable('empty', ''),
+		]);
+	});
+
+	test('should return an empty array if there is nothing in the cache', async () => {
+		const cacheService = Container.get(CacheService);
+		const spy = jest.spyOn(cacheService, 'get').mockResolvedValueOnce(undefined);
+		const response = await authOwnerAgent.get('/variables');
+		expect(spy).toHaveBeenCalledTimes(1);
+		expect(response.statusCode).toBe(200);
+		expect(response.body.data.length).toBe(0);
 	});
 
 	test('should return all variables for an owner', async () => {
 		const response = await authOwnerAgent.get('/variables');
 		expect(response.statusCode).toBe(200);
-		expect(response.body.data.length).toBe(2);
+		expect(response.body.data.length).toBe(3);
 	});
 
 	test('should return all variables for a member', async () => {
 		const response = await authMemberAgent.get('/variables');
 		expect(response.statusCode).toBe(200);
-		expect(response.body.data.length).toBe(2);
+		expect(response.body.data.length).toBe(3);
+	});
+
+	describe('state:empty', () => {
+		test('only return empty variables', async () => {
+			const response = await authOwnerAgent.get('/variables').query({ state: 'empty' });
+			expect(response.statusCode).toBe(200);
+			expect(response.body.data.length).toBe(1);
+			expect(response.body.data[0]).toMatchObject({ key: 'empty', value: '', type: 'string' });
+		});
 	});
 });
 
diff --git a/packages/cli/test/integration/webhooks.test.ts b/packages/cli/test/integration/webhooks.test.ts
index 7d7b5105cb..0895f3caa8 100644
--- a/packages/cli/test/integration/webhooks.test.ts
+++ b/packages/cli/test/integration/webhooks.test.ts
@@ -1,8 +1,8 @@
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { agent as testAgent } from 'supertest';
 import type SuperAgentTest from 'supertest/lib/agent';
-import Container from 'typedi';
 
 import { ExternalHooks } from '@/external-hooks';
 import { LiveWebhooks } from '@/webhooks/live-webhooks';
diff --git a/packages/cli/test/integration/workflow-history-manager.test.ts b/packages/cli/test/integration/workflow-history-manager.test.ts
index 825da9fcbf..12dd037357 100644
--- a/packages/cli/test/integration/workflow-history-manager.test.ts
+++ b/packages/cli/test/integration/workflow-history-manager.test.ts
@@ -1,11 +1,11 @@
+import { Container } from '@n8n/di';
 import { In } from '@n8n/typeorm';
 import { DateTime } from 'luxon';
-import Container from 'typedi';
 
 import config from '@/config';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
 import { License } from '@/license';
-import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee';
+import { WorkflowHistoryManager } from '@/workflows/workflow-history.ee/workflow-history-manager.ee';
 
 import { createManyWorkflowHistoryItems } from './shared/db/workflow-history';
 import { createWorkflow } from './shared/db/workflows';
diff --git a/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts b/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts
index 563764de7f..c01adbc51a 100644
--- a/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts
+++ b/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts
@@ -1,4 +1,4 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
diff --git a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts
index 3730d0db6c..3f54420873 100644
--- a/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts
+++ b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts
@@ -1,8 +1,8 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
 import type { User } from '@/databases/entities/user';
 import { License } from '@/license';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 import { WorkflowSharingService } from '@/workflows/workflow-sharing.service';
 
 import { createUser } from '../shared/db/users';
@@ -72,7 +72,7 @@ describe('WorkflowSharingService', () => {
 			//
 			// ARRANGE
 			//
-			const project = await projectService.createTeamProject('Team Project', member);
+			const project = await projectService.createTeamProject(member, { name: 'Team Project' });
 			await projectService.addUser(project.id, anotherMember.id, 'project:admin');
 			const workflow = await createWorkflow(undefined, project);
 
@@ -93,9 +93,9 @@ describe('WorkflowSharingService', () => {
 			//
 			// ARRANGE
 			//
-			const project1 = await projectService.createTeamProject('Team Project 1', member);
+			const project1 = await projectService.createTeamProject(member, { name: 'Team Project 1' });
 			const workflow1 = await createWorkflow(undefined, project1);
-			const project2 = await projectService.createTeamProject('Team Project 2', member);
+			const project2 = await projectService.createTeamProject(member, { name: 'Team Project 2' });
 			const workflow2 = await createWorkflow(undefined, project2);
 			await projectService.addUser(project1.id, anotherMember.id, 'project:admin');
 			await projectService.addUser(project2.id, anotherMember.id, 'project:viewer');
diff --git a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts
index 5fbab55840..0bb272d0c6 100644
--- a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import Container from 'typedi';
 
 import { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
diff --git a/packages/cli/test/integration/workflows/workflow.service.test.ts b/packages/cli/test/integration/workflows/workflow.service.test.ts
index 759dbc54c8..b7d9c033b4 100644
--- a/packages/cli/test/integration/workflows/workflow.service.test.ts
+++ b/packages/cli/test/integration/workflows/workflow.service.test.ts
@@ -1,5 +1,5 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
-import Container from 'typedi';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
@@ -40,6 +40,7 @@ beforeAll(async () => {
 		mock(),
 		mock(),
 		mock(),
+		mock(),
 	);
 });
 
diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
index 2002843bfe..b95304a583 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
@@ -1,11 +1,11 @@
+import type { ProjectRole } from '@n8n/api-types';
+import { Container } from '@n8n/di';
 import { ApplicationError, WorkflowActivationError, type INode } from 'n8n-workflow';
-import Container from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import config from '@/config';
 import type { Project } from '@/databases/entities/project';
-import type { ProjectRole } from '@/databases/entities/project-relation';
 import type { User } from '@/databases/entities/user';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
index 84c1505887..e69e172f97 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -1,6 +1,6 @@
+import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import type { INode, IPinData } from 'n8n-workflow';
-import Container from 'typedi';
 import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
@@ -12,15 +12,19 @@ import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-his
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { License } from '@/license';
 import type { ListQuery } from '@/requests';
-import { ProjectService } from '@/services/project.service';
+import { ProjectService } from '@/services/project.service.ee';
 import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';
 
 import { mockInstance } from '../../shared/mocking';
 import { saveCredential } from '../shared/db/credentials';
-import { createTeamProject, linkUserToProject } from '../shared/db/projects';
+import { createTeamProject, getPersonalProject, linkUserToProject } from '../shared/db/projects';
 import { createTag } from '../shared/db/tags';
 import { createManyUsers, createMember, createOwner } from '../shared/db/users';
-import { createWorkflow, shareWorkflowWithProjects } from '../shared/db/workflows';
+import {
+	createWorkflow,
+	shareWorkflowWithProjects,
+	shareWorkflowWithUsers,
+} from '../shared/db/workflows';
 import { randomCredentialPayload } from '../shared/random';
 import * as testDb from '../shared/test-db';
 import type { SuperAgentTest } from '../shared/types';
@@ -437,6 +441,7 @@ describe('GET /workflows', () => {
 					homeProject: {
 						id: ownerPersonalProject.id,
 						name: owner.createPersonalProjectName(),
+						icon: null,
 						type: ownerPersonalProject.type,
 					},
 					sharedWithProjects: [],
@@ -452,6 +457,7 @@ describe('GET /workflows', () => {
 					homeProject: {
 						id: ownerPersonalProject.id,
 						name: owner.createPersonalProjectName(),
+						icon: null,
 						type: ownerPersonalProject.type,
 					},
 					sharedWithProjects: [],
@@ -676,6 +682,21 @@ describe('GET /workflows', () => {
 
 			expect(response2.body.data).toHaveLength(0);
 		});
+
+		test('should return homeProject when filtering workflows by projectId', async () => {
+			const workflow = await createWorkflow({ name: 'First' }, owner);
+			await shareWorkflowWithUsers(workflow, [member]);
+			const pp = await getPersonalProject(member);
+
+			const response = await authMemberAgent
+				.get('/workflows')
+				.query(`filter={ "projectId": "${pp.id}" }`)
+				.expect(200);
+
+			expect(response.body.data).toHaveLength(1);
+			expect(response.body.data[0].id).toBe(workflow.id);
+			expect(response.body.data[0].homeProject).not.toBeNull();
+		});
 	});
 
 	describe('select', () => {
@@ -814,6 +835,7 @@ describe('GET /workflows', () => {
 						homeProject: {
 							id: ownerPersonalProject.id,
 							name: owner.createPersonalProjectName(),
+							icon: null,
 							type: ownerPersonalProject.type,
 						},
 						sharedWithProjects: [],
@@ -823,6 +845,7 @@ describe('GET /workflows', () => {
 						homeProject: {
 							id: ownerPersonalProject.id,
 							name: owner.createPersonalProjectName(),
+							icon: null,
 							type: ownerPersonalProject.type,
 						},
 						sharedWithProjects: [],
diff --git a/packages/cli/test/setup-test-folder.ts b/packages/cli/test/setup-test-folder.ts
index 997a0ec80f..80b9953333 100644
--- a/packages/cli/test/setup-test-folder.ts
+++ b/packages/cli/test/setup-test-folder.ts
@@ -10,6 +10,7 @@ mkdirSync(baseDir, { recursive: true });
 const testDir = mkdtempSync(baseDir);
 mkdirSync(join(testDir, '.n8n'));
 process.env.N8N_USER_FOLDER = testDir;
+process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
 
 writeFileSync(
 	join(testDir, '.n8n/config'),
@@ -19,3 +20,8 @@ writeFileSync(
 		mode: 0o600,
 	},
 );
+
+// This is needed to ensure that `process.env` overrides in tests
+// are set before any of the config classes are instantiated.
+// TODO: delete this after we are done migrating everything to config classes
+import '@/config';
diff --git a/packages/cli/test/shared/mocking.ts b/packages/cli/test/shared/mocking.ts
index 129acb585c..9fa9852f98 100644
--- a/packages/cli/test/shared/mocking.ts
+++ b/packages/cli/test/shared/mocking.ts
@@ -1,10 +1,9 @@
+import { Container } from '@n8n/di';
 import { DataSource, EntityManager, type EntityMetadata } from '@n8n/typeorm';
 import { mock } from 'jest-mock-extended';
 import type { Class } from 'n8n-core';
+import type { Logger } from 'n8n-core';
 import type { DeepPartial } from 'ts-essentials';
-import { Container } from 'typedi';
-
-import type { Logger } from '@/logging/logger.service';
 
 export const mockInstance = <T>(
 	serviceClass: Class<T>,
diff --git a/packages/cli/test/teardown.ts b/packages/cli/test/teardown.ts
index 1c40bf2df6..4d6339fde9 100644
--- a/packages/cli/test/teardown.ts
+++ b/packages/cli/test/teardown.ts
@@ -1,7 +1,7 @@
 import 'tsconfig-paths/register';
 import { GlobalConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import { DataSource as Connection } from '@n8n/typeorm';
-import { Container } from 'typedi';
 
 import { getBootstrapDBOptions, testDbPrefix } from './integration/shared/test-db';
 
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index d145ba0c63..a427433aa6 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -15,13 +15,14 @@
 		"strict": false,
 		"useUnknownInCatchVariables": false
 	},
-	"include": ["src/**/*.ts", "test/**/*.ts", "src/sso/saml/saml-schema-metadata-2.0.xsd"],
+	"include": ["src/**/*.ts", "test/**/*.ts", "src/sso.ee/saml/saml-schema-metadata-2.0.xsd"],
 	"references": [
 		{ "path": "../workflow/tsconfig.build.json" },
 		{ "path": "../core/tsconfig.build.json" },
 		{ "path": "../@n8n/api-types/tsconfig.build.json" },
 		{ "path": "../@n8n/client-oauth2/tsconfig.build.json" },
 		{ "path": "../@n8n/config/tsconfig.build.json" },
+		{ "path": "../@n8n/di/tsconfig.build.json" },
 		{ "path": "../@n8n/permissions/tsconfig.build.json" }
 	]
 }
diff --git a/packages/core/.eslintrc.js b/packages/core/.eslintrc.js
index 9bfae8a9eb..ceb431ce40 100644
--- a/packages/core/.eslintrc.js
+++ b/packages/core/.eslintrc.js
@@ -16,6 +16,7 @@ module.exports = {
 
 	rules: {
 		complexity: 'error',
+		'unicorn/filename-case': ['error', { case: 'kebabCase' }],
 
 		// TODO: Remove this
 		'@typescript-eslint/ban-ts-comment': ['error', { 'ts-ignore': true }],
diff --git a/packages/core/bin/generate-known b/packages/core/bin/generate-known
deleted file mode 100755
index 3784f15fb1..0000000000
--- a/packages/core/bin/generate-known
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env node
-
-const path = require('path');
-const glob = require('fast-glob');
-const uniq = require('lodash/uniq');
-const { LoggerProxy, getCredentialsForNode } = require('n8n-workflow');
-const { packageDir, writeJSON } = require('./common');
-const { loadClassInIsolation } = require('../dist/ClassLoader');
-
-LoggerProxy.init(console);
-
-const loadClass = (sourcePath) => {
-	try {
-		const [className] = path.parse(sourcePath).name.split('.');
-		const filePath = path.resolve(packageDir, sourcePath);
-		const instance = loadClassInIsolation(filePath, className);
-		return { instance, sourcePath, className };
-	} catch (e) {
-		LoggerProxy.warn(`Failed to load ${sourcePath}: ${e.message}`);
-	}
-};
-
-const generateKnownNodes = async () => {
-	const nodeClasses = glob
-		.sync('dist/nodes/**/*.node.js', { cwd: packageDir })
-		.map(loadClass)
-		// Ignore node versions
-		.filter((nodeClass) => nodeClass && !/[vV]\d.node\.js$/.test(nodeClass.sourcePath));
-
-	const nodes = {};
-	const nodesByCredential = {};
-
-	for (const { className, sourcePath, instance } of nodeClasses) {
-		const nodeName = instance.description.name;
-		nodes[nodeName] = { className, sourcePath };
-
-		for (const credential of getCredentialsForNode(instance)) {
-			if (!nodesByCredential[credential.name]) {
-				nodesByCredential[credential.name] = [];
-			}
-
-			nodesByCredential[credential.name].push(nodeName);
-		}
-	}
-
-	LoggerProxy.info(`Detected ${Object.keys(nodes).length} nodes`);
-	await writeJSON('known/nodes.json', nodes);
-	return { nodes, nodesByCredential };
-};
-
-const generateKnownCredentials = async (nodesByCredential) => {
-	const credentialClasses = glob
-		.sync(`dist/credentials/**/*.credentials.js`, { cwd: packageDir })
-		.map(loadClass)
-		.filter((data) => !!data);
-
-	for (const { instance } of credentialClasses) {
-		if (Array.isArray(instance.extends)) {
-			for (const extendedCredential of instance.extends) {
-				nodesByCredential[extendedCredential] = [
-					...(nodesByCredential[extendedCredential] ?? []),
-					...(nodesByCredential[instance.name] ?? []),
-				];
-			}
-		}
-	}
-
-	const credentials = credentialClasses.reduce(
-		(credentials, { className, sourcePath, instance }) => {
-			const credentialName = instance.name;
-			const credential = {
-				className,
-				sourcePath,
-			};
-
-			if (Array.isArray(instance.extends)) {
-				credential.extends = instance.extends;
-			}
-
-			if (nodesByCredential[credentialName]) {
-				credential.supportedNodes = Array.from(new Set(nodesByCredential[credentialName]));
-			}
-
-			credentials[credentialName] = credential;
-
-			return credentials;
-		},
-		{},
-	);
-
-	LoggerProxy.info(`Detected ${Object.keys(credentials).length} credentials`);
-	await writeJSON('known/credentials.json', credentials);
-	return credentials;
-};
-
-(async () => {
-	const { nodesByCredential } = await generateKnownNodes();
-	await generateKnownCredentials(nodesByCredential);
-})();
diff --git a/packages/core/bin/generate-ui-types b/packages/core/bin/generate-metadata
similarity index 56%
rename from packages/core/bin/generate-ui-types
rename to packages/core/bin/generate-metadata
index f73ca87a15..b4001ccd84 100755
--- a/packages/core/bin/generate-ui-types
+++ b/packages/core/bin/generate-metadata
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-const { LoggerProxy, NodeHelpers } = require('n8n-workflow');
-const { PackageDirectoryLoader } = require('../dist/DirectoryLoader');
+const { LoggerProxy } = require('n8n-workflow');
+const { PackageDirectoryLoader } = require('../dist/nodes-loader/package-directory-loader');
 const { packageDir, writeJSON } = require('./common');
 
 LoggerProxy.init(console);
@@ -33,7 +33,7 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 	const loaderNodeTypes = Object.values(loader.nodeTypes);
 
 	const definedMethods = loaderNodeTypes.reduce((acc, cur) => {
-		NodeHelpers.getVersionedNodeTypeAll(cur.type).forEach((type) => {
+		loader.getVersionedNodeTypeAll(cur.type).forEach((type) => {
 			const methods = type.description?.__loadOptionsMethods;
 
 			if (!methods) return;
@@ -52,51 +52,21 @@ function findReferencedMethods(obj, refs = {}, latestName = '') {
 	}, {});
 
 	const nodeTypes = loaderNodeTypes
-		.map((data) => {
-			const nodeType = NodeHelpers.getVersionedNodeType(data.type);
-			NodeHelpers.applySpecialNodeParameters(nodeType);
-			return data.type;
-		})
+		.map(({ type }) => type)
 		.flatMap((nodeType) =>
-			NodeHelpers.getVersionedNodeTypeAll(nodeType).map((item) => {
+			loader.getVersionedNodeTypeAll(nodeType).map((item) => {
 				const { __loadOptionsMethods, ...rest } = item.description;
 				return rest;
 			}),
 		);
 
 	const knownCredentials = loader.known.credentials;
-	const credentialTypes = Object.values(loader.credentialTypes).map((data) => {
-		const credentialType = data.type;
-		const supportedNodes = knownCredentials[credentialType.name].supportedNodes ?? [];
-		if (supportedNodes.length > 0 && credentialType.httpRequestNode) {
-			credentialType.httpRequestNode.hidden = true;
-		}
-
-		credentialType.supportedNodes = supportedNodes;
-
-		if (!credentialType.iconUrl && !credentialType.icon) {
-			for (const supportedNode of supportedNodes) {
-				const nodeType = loader.nodeTypes[supportedNode]?.type.description;
-
-				if (!nodeType) continue;
-				if (nodeType.icon) {
-					credentialType.icon = nodeType.icon;
-					credentialType.iconColor = nodeType.iconColor;
-					break;
-				}
-				if (nodeType.iconUrl) {
-					credentialType.iconUrl = nodeType.iconUrl;
-					break;
-				}
-			}
-		}
-
-		return credentialType;
-	});
-
+	const credentialTypes = Object.values(loader.credentialTypes).map(({ type }) => type);
 	const referencedMethods = findReferencedMethods(nodeTypes);
 
 	await Promise.all([
+		writeJSON('known/nodes.json', loader.known.nodes),
+		writeJSON('known/credentials.json', loader.known.credentials),
 		writeJSON('types/credentials.json', credentialTypes),
 		writeJSON('types/nodes.json', nodeTypes),
 		writeJSON('methods/defined.json', definedMethods),
diff --git a/packages/core/package.json b/packages/core/package.json
index 0e010052b2..a4a0e651a3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,26 +1,26 @@
 {
   "name": "n8n-core",
-  "version": "1.65.0",
+  "version": "1.75.0",
   "description": "Core functionality of n8n",
   "main": "dist/index",
   "types": "dist/index.d.ts",
   "bin": {
     "n8n-copy-icons": "./bin/copy-icons",
-    "n8n-generate-known": "./bin/generate-known",
     "n8n-generate-translations": "./bin/generate-translations",
-    "n8n-generate-ui-types": "./bin/generate-ui-types"
+    "n8n-generate-metadata": "./bin/generate-metadata"
   },
   "scripts": {
     "clean": "rimraf dist .turbo",
     "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json",
+    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json",
     "dev": "pnpm watch",
     "format": "biome format --write .",
     "format:check": "biome ci .",
     "lint": "eslint . --quiet",
     "lintfix": "eslint . --fix",
-    "watch": "tsc -p tsconfig.build.json --watch",
-    "test": "jest"
+    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\"",
+    "test": "jest",
+    "test:dev": "jest --watch"
   },
   "files": [
     "dist",
@@ -39,13 +39,18 @@
     "@langchain/core": "catalog:",
     "@n8n/client-oauth2": "workspace:*",
     "@n8n/config": "workspace:*",
+    "@n8n/di": "workspace:*",
+    "@sentry/node": "catalog:",
     "aws4": "1.11.0",
     "axios": "catalog:",
+    "callsites": "catalog:",
+    "chardet": "2.0.0",
     "concat-stream": "2.0.0",
     "cron": "3.1.7",
     "fast-glob": "catalog:",
     "file-type": "16.5.4",
     "form-data": "catalog:",
+    "iconv-lite": "catalog:",
     "lodash": "catalog:",
     "luxon": "catalog:",
     "mime-types": "2.1.35",
@@ -53,11 +58,12 @@
     "nanoid": "catalog:",
     "oauth-1.0a": "2.2.6",
     "p-cancelable": "2.1.1",
+    "picocolors": "catalog:",
     "pretty-bytes": "5.6.0",
     "qs": "6.11.0",
     "ssh2": "1.15.0",
-    "typedi": "catalog:",
     "uuid": "catalog:",
+    "winston": "3.14.2",
     "xml2js": "catalog:",
     "zod": "catalog:"
   }
diff --git a/packages/core/src/Agent/index.ts b/packages/core/src/Agent/index.ts
deleted file mode 100644
index ed842d99ee..0000000000
--- a/packages/core/src/Agent/index.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-import type {
-	IExecuteFunctions,
-	Workflow,
-	IRunExecutionData,
-	INodeExecutionData,
-	ITaskDataConnections,
-	INode,
-	IWorkflowExecuteAdditionalData,
-	WorkflowExecuteMode,
-	INodeParameters,
-	IExecuteData,
-	IDataObject,
-	Result,
-} from 'n8n-workflow';
-import { createEnvProviderState } from 'n8n-workflow';
-
-export const createAgentStartJob = (
-	additionalData: IWorkflowExecuteAdditionalData,
-	inputData: ITaskDataConnections,
-	node: INode,
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	activeNodeName: string,
-	connectionInputData: INodeExecutionData[],
-	siblingParameters: INodeParameters,
-	mode: WorkflowExecuteMode,
-	executeData?: IExecuteData,
-	defaultReturnRunIndex?: number,
-	selfData?: IDataObject,
-	contextNodeName?: string,
-): IExecuteFunctions['startJob'] => {
-	return async function startJob<T = unknown, E = unknown>(
-		this: IExecuteFunctions,
-		jobType: string,
-		settings: unknown,
-		itemIndex: number,
-	): Promise<Result<T, E>> {
-		return await additionalData.startAgentJob<T, E>(
-			additionalData,
-			jobType,
-			settings,
-			this,
-			inputData,
-			node,
-			workflow,
-			runExecutionData,
-			runIndex,
-			itemIndex,
-			activeNodeName,
-			connectionInputData,
-			siblingParameters,
-			mode,
-			createEnvProviderState(),
-			executeData,
-			defaultReturnRunIndex,
-			selfData,
-			contextNodeName,
-		);
-	};
-};
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
deleted file mode 100644
index b0e77125a7..0000000000
--- a/packages/core/src/DirectoryLoader.ts
+++ /dev/null
@@ -1,464 +0,0 @@
-import glob from 'fast-glob';
-import type {
-	CodexData,
-	DocumentationLink,
-	ICredentialType,
-	ICredentialTypeData,
-	INodeType,
-	INodeTypeBaseDescription,
-	INodeTypeData,
-	INodeTypeDescription,
-	INodeTypeNameVersion,
-	IVersionedNodeType,
-	KnownNodesAndCredentials,
-} from 'n8n-workflow';
-import {
-	ApplicationError,
-	LoggerProxy as Logger,
-	getCredentialsForNode,
-	getVersionedNodeTypeAll,
-	jsonParse,
-} from 'n8n-workflow';
-import { readFileSync } from 'node:fs';
-import { readFile } from 'node:fs/promises';
-import * as path from 'path';
-
-import { loadClassInIsolation } from './ClassLoader';
-import { CUSTOM_NODES_CATEGORY } from './Constants';
-import type { n8n } from './Interfaces';
-
-function toJSON(this: ICredentialType) {
-	return {
-		...this,
-		authenticate: typeof this.authenticate === 'function' ? {} : this.authenticate,
-	};
-}
-
-export type Types = {
-	nodes: INodeTypeBaseDescription[];
-	credentials: ICredentialType[];
-};
-
-export abstract class DirectoryLoader {
-	isLazyLoaded = false;
-
-	// Another way of keeping track of the names and versions of a node. This
-	// seems to only be used by the installedPackages repository
-	loadedNodes: INodeTypeNameVersion[] = [];
-
-	// Stores the loaded descriptions and sourcepaths
-	nodeTypes: INodeTypeData = {};
-
-	credentialTypes: ICredentialTypeData = {};
-
-	// Stores the location and classnames of the nodes and credentials that are
-	// loaded; used to actually load the files in lazy-loading scenario.
-	known: KnownNodesAndCredentials = { nodes: {}, credentials: {} };
-
-	// Stores the different versions with their individual descriptions
-	types: Types = { nodes: [], credentials: [] };
-
-	protected nodesByCredential: Record<string, string[]> = {};
-
-	constructor(
-		readonly directory: string,
-		protected readonly excludeNodes: string[] = [],
-		protected readonly includeNodes: string[] = [],
-	) {}
-
-	abstract packageName: string;
-
-	abstract loadAll(): Promise<void>;
-
-	reset() {
-		this.loadedNodes = [];
-		this.nodeTypes = {};
-		this.credentialTypes = {};
-		this.known = { nodes: {}, credentials: {} };
-		this.types = { nodes: [], credentials: [] };
-	}
-
-	protected resolvePath(file: string) {
-		return path.resolve(this.directory, file);
-	}
-
-	protected loadNodeFromFile(nodeName: string, filePath: string) {
-		let tempNode: INodeType | IVersionedNodeType;
-		let nodeVersion = 1;
-		const isCustom = this.packageName === 'CUSTOM';
-
-		try {
-			tempNode = loadClassInIsolation(filePath, nodeName);
-			this.addCodex({ node: tempNode, filePath, isCustom });
-		} catch (error) {
-			Logger.error(
-				`Error loading node "${nodeName}" from: "${filePath}" - ${(error as Error).message}`,
-			);
-			throw error;
-		}
-
-		const fullNodeName = `${this.packageName}.${tempNode.description.name}`;
-
-		if (this.includeNodes.length && !this.includeNodes.includes(fullNodeName)) {
-			return;
-		}
-
-		if (this.excludeNodes.includes(fullNodeName)) {
-			return;
-		}
-
-		tempNode.description.name = fullNodeName;
-
-		this.fixIconPaths(tempNode.description, filePath);
-
-		if ('nodeVersions' in tempNode) {
-			for (const versionNode of Object.values(tempNode.nodeVersions)) {
-				this.fixIconPaths(versionNode.description, filePath);
-			}
-
-			for (const version of Object.values(tempNode.nodeVersions)) {
-				this.addLoadOptionsMethods(version);
-			}
-
-			const currentVersionNode = tempNode.nodeVersions[tempNode.currentVersion];
-			this.addCodex({ node: currentVersionNode, filePath, isCustom });
-			nodeVersion = tempNode.currentVersion;
-
-			if (currentVersionNode.hasOwnProperty('executeSingle')) {
-				throw new ApplicationError(
-					'"executeSingle" has been removed. Please update the code of this node to use "execute" instead.',
-					{ extra: { nodeName: `${this.packageName}.${nodeName}` } },
-				);
-			}
-		} else {
-			this.addLoadOptionsMethods(tempNode);
-			// Short renaming to avoid type issues
-
-			nodeVersion = Array.isArray(tempNode.description.version)
-				? tempNode.description.version.slice(-1)[0]
-				: tempNode.description.version;
-		}
-
-		this.known.nodes[fullNodeName] = {
-			className: nodeName,
-			sourcePath: filePath,
-		};
-
-		this.nodeTypes[fullNodeName] = {
-			type: tempNode,
-			sourcePath: filePath,
-		};
-
-		this.loadedNodes.push({
-			name: fullNodeName,
-			version: nodeVersion,
-		});
-
-		getVersionedNodeTypeAll(tempNode).forEach(({ description }) => {
-			this.types.nodes.push(description);
-		});
-
-		for (const credential of getCredentialsForNode(tempNode)) {
-			if (!this.nodesByCredential[credential.name]) {
-				this.nodesByCredential[credential.name] = [];
-			}
-			this.nodesByCredential[credential.name].push(fullNodeName);
-		}
-	}
-
-	protected loadCredentialFromFile(credentialClassName: string, filePath: string): void {
-		let tempCredential: ICredentialType;
-		try {
-			tempCredential = loadClassInIsolation(filePath, credentialClassName);
-
-			// Add serializer method "toJSON" to the class so that authenticate method (if defined)
-			// gets mapped to the authenticate attribute before it is sent to the client.
-			// The authenticate property is used by the client to decide whether or not to
-			// include the credential type in the predefined credentials (HTTP node)
-			Object.assign(tempCredential, { toJSON });
-
-			this.fixIconPaths(tempCredential, filePath);
-		} catch (e) {
-			if (e instanceof TypeError) {
-				throw new ApplicationError(
-					'Class could not be found. Please check if the class is named correctly.',
-					{ extra: { credentialClassName } },
-				);
-			} else {
-				throw e;
-			}
-		}
-
-		this.known.credentials[tempCredential.name] = {
-			className: credentialClassName,
-			sourcePath: filePath,
-			extends: tempCredential.extends,
-			supportedNodes: this.nodesByCredential[tempCredential.name],
-		};
-
-		this.credentialTypes[tempCredential.name] = {
-			type: tempCredential,
-			sourcePath: filePath,
-		};
-
-		this.types.credentials.push(tempCredential);
-	}
-
-	/**
-	 * Retrieves `categories`, `subcategories` and alias (if defined)
-	 * from the codex data for the node at the given file path.
-	 */
-	private getCodex(filePath: string): CodexData {
-		type Codex = {
-			categories: string[];
-			subcategories: { [subcategory: string]: string[] };
-			resources: {
-				primaryDocumentation: DocumentationLink[];
-				credentialDocumentation: DocumentationLink[];
-			};
-			alias: string[];
-		};
-
-		const codexFilePath = `${filePath}on`; // .js to .json
-
-		const {
-			categories,
-			subcategories,
-			resources: allResources,
-			alias,
-		} = module.require(codexFilePath) as Codex;
-
-		const resources = {
-			primaryDocumentation: allResources.primaryDocumentation,
-			credentialDocumentation: allResources.credentialDocumentation,
-		};
-
-		return {
-			...(categories && { categories }),
-			...(subcategories && { subcategories }),
-			...(resources && { resources }),
-			...(alias && { alias }),
-		};
-	}
-
-	/**
-	 * Adds a node codex `categories` and `subcategories` (if defined)
-	 * to a node description `codex` property.
-	 */
-	private addCodex({
-		node,
-		filePath,
-		isCustom,
-	}: {
-		node: INodeType | IVersionedNodeType;
-		filePath: string;
-		isCustom: boolean;
-	}) {
-		try {
-			let codex;
-
-			if (!isCustom) {
-				codex = node.description.codex;
-			}
-
-			if (codex === undefined) {
-				codex = this.getCodex(filePath);
-			}
-
-			if (isCustom) {
-				codex.categories = codex.categories
-					? codex.categories.concat(CUSTOM_NODES_CATEGORY)
-					: [CUSTOM_NODES_CATEGORY];
-			}
-
-			node.description.codex = codex;
-		} catch {
-			Logger.debug(`No codex available for: ${filePath.split('/').pop() ?? ''}`);
-
-			if (isCustom) {
-				node.description.codex = {
-					categories: [CUSTOM_NODES_CATEGORY],
-				};
-			}
-		}
-	}
-
-	private addLoadOptionsMethods(node: INodeType) {
-		if (node?.methods?.loadOptions) {
-			node.description.__loadOptionsMethods = Object.keys(node.methods.loadOptions);
-		}
-	}
-
-	private getIconPath(icon: string, filePath: string) {
-		const iconPath = path.join(path.dirname(filePath), icon.replace('file:', ''));
-		const relativePath = path.relative(this.directory, iconPath);
-		return `icons/${this.packageName}/${relativePath}`;
-	}
-
-	private fixIconPaths(
-		obj: INodeTypeDescription | INodeTypeBaseDescription | ICredentialType,
-		filePath: string,
-	) {
-		const { icon } = obj;
-		if (!icon) return;
-
-		if (typeof icon === 'string') {
-			if (icon.startsWith('file:')) {
-				obj.iconUrl = this.getIconPath(icon, filePath);
-				delete obj.icon;
-			}
-		} else if (icon.light.startsWith('file:') && icon.dark.startsWith('file:')) {
-			obj.iconUrl = {
-				light: this.getIconPath(icon.light, filePath),
-				dark: this.getIconPath(icon.dark, filePath),
-			};
-			delete obj.icon;
-		}
-	}
-}
-
-/**
- * Loader for source files of nodes and credentials located in a custom dir,
- * e.g. `~/.n8n/custom`
- */
-export class CustomDirectoryLoader extends DirectoryLoader {
-	packageName = 'CUSTOM';
-
-	override async loadAll() {
-		const nodes = await glob('**/*.node.js', {
-			cwd: this.directory,
-			absolute: true,
-		});
-
-		for (const nodePath of nodes) {
-			const [fileName] = path.parse(nodePath).name.split('.');
-			this.loadNodeFromFile(fileName, nodePath);
-		}
-
-		const credentials = await glob('**/*.credentials.js', {
-			cwd: this.directory,
-			absolute: true,
-		});
-
-		for (const credentialPath of credentials) {
-			const [fileName] = path.parse(credentialPath).name.split('.');
-			this.loadCredentialFromFile(fileName, credentialPath);
-		}
-	}
-}
-
-/**
- * Loader for source files of nodes and credentials located in a package dir,
- * e.g. /nodes-base or community packages.
- */
-export class PackageDirectoryLoader extends DirectoryLoader {
-	packageJson: n8n.PackageJson = this.readJSONSync('package.json');
-
-	packageName = this.packageJson.name;
-
-	override async loadAll() {
-		const { n8n } = this.packageJson;
-		if (!n8n) return;
-
-		const { nodes, credentials } = n8n;
-
-		if (Array.isArray(nodes)) {
-			for (const node of nodes) {
-				const filePath = this.resolvePath(node);
-				const [nodeName] = path.parse(node).name.split('.');
-
-				this.loadNodeFromFile(nodeName, filePath);
-			}
-		}
-
-		if (Array.isArray(credentials)) {
-			for (const credential of credentials) {
-				const filePath = this.resolvePath(credential);
-				const [credentialName] = path.parse(credential).name.split('.');
-
-				this.loadCredentialFromFile(credentialName, filePath);
-			}
-		}
-
-		Logger.debug(`Loaded all credentials and nodes from ${this.packageName}`, {
-			credentials: credentials?.length ?? 0,
-			nodes: nodes?.length ?? 0,
-		});
-	}
-
-	protected readJSONSync<T>(file: string): T {
-		const filePath = this.resolvePath(file);
-		const fileString = readFileSync(filePath, 'utf8');
-
-		try {
-			return jsonParse<T>(fileString);
-		} catch (error) {
-			throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
-		}
-	}
-
-	protected async readJSON<T>(file: string): Promise<T> {
-		const filePath = this.resolvePath(file);
-		const fileString = await readFile(filePath, 'utf8');
-
-		try {
-			return jsonParse<T>(fileString);
-		} catch (error) {
-			throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
-		}
-	}
-}
-
-/**
- * This loader extends PackageDirectoryLoader to load node and credentials lazily, if possible
- */
-export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
-	override async loadAll() {
-		try {
-			const knownNodes: typeof this.known.nodes = await this.readJSON('dist/known/nodes.json');
-			for (const nodeName in knownNodes) {
-				this.known.nodes[`${this.packageName}.${nodeName}`] = knownNodes[nodeName];
-			}
-			this.known.credentials = await this.readJSON('dist/known/credentials.json');
-
-			this.types.nodes = await this.readJSON('dist/types/nodes.json');
-			this.types.credentials = await this.readJSON('dist/types/credentials.json');
-
-			if (this.includeNodes.length) {
-				const allowedNodes: typeof this.known.nodes = {};
-				for (const nodeName of this.includeNodes) {
-					if (nodeName in this.known.nodes) {
-						allowedNodes[nodeName] = this.known.nodes[nodeName];
-					}
-				}
-				this.known.nodes = allowedNodes;
-
-				this.types.nodes = this.types.nodes.filter((nodeType) =>
-					this.includeNodes.includes(nodeType.name),
-				);
-			}
-
-			if (this.excludeNodes.length) {
-				for (const nodeName of this.excludeNodes) {
-					delete this.known.nodes[nodeName];
-				}
-
-				this.types.nodes = this.types.nodes.filter(
-					(nodeType) => !this.excludeNodes.includes(nodeType.name),
-				);
-			}
-
-			Logger.debug(`Lazy-loading nodes and credentials from ${this.packageJson.name}`, {
-				nodes: this.types.nodes?.length ?? 0,
-				credentials: this.types.credentials?.length ?? 0,
-			});
-
-			this.isLazyLoaded = true;
-
-			return; // We can load nodes and credentials lazily now
-		} catch {
-			Logger.debug("Can't enable lazy-loading");
-			await super.loadAll();
-		}
-	}
-}
diff --git a/packages/core/src/InstanceSettingsConfig.ts b/packages/core/src/InstanceSettingsConfig.ts
deleted file mode 100644
index 60baf8b80f..0000000000
--- a/packages/core/src/InstanceSettingsConfig.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Config, Env } from '@n8n/config';
-
-@Config
-export class InstanceSettingsConfig {
-	/**
-	 * Whether to enforce that n8n settings file doesn't have overly wide permissions.
-	 * If set to true, n8n will check the permissions of the settings file and
-	 * attempt change them to 0600 (only owner has rw access) if they are too wide.
-	 */
-	@Env('N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS')
-	enforceSettingsFilePermissions: boolean = false;
-}
diff --git a/packages/core/src/PartialExecutionUtils/index.ts b/packages/core/src/PartialExecutionUtils/index.ts
deleted file mode 100644
index cea8ded9b9..0000000000
--- a/packages/core/src/PartialExecutionUtils/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export { DirectedGraph } from './DirectedGraph';
-export { findTriggerForPartialExecution } from './findTriggerForPartialExecution';
-export { findStartNodes } from './findStartNodes';
-export { findSubgraph } from './findSubgraph';
-export { recreateNodeExecutionStack } from './recreateNodeExecutionStack';
-export { cleanRunData } from './cleanRunData';
-export { handleCycles } from './handleCycles';
diff --git a/packages/core/test/Credentials.test.ts b/packages/core/src/__tests__/credentials.test.ts
similarity index 88%
rename from packages/core/test/Credentials.test.ts
rename to packages/core/src/__tests__/credentials.test.ts
index fa7be59267..366477def7 100644
--- a/packages/core/test/Credentials.test.ts
+++ b/packages/core/src/__tests__/credentials.test.ts
@@ -1,10 +1,11 @@
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import type { CredentialInformation } from 'n8n-workflow';
-import { Container } from 'typedi';
 
-import { Cipher } from '@/Cipher';
-import { Credentials } from '@/Credentials';
-import type { InstanceSettings } from '@/InstanceSettings';
+import { Cipher } from '@/encryption/cipher';
+import type { InstanceSettings } from '@/instance-settings';
+
+import { Credentials } from '../credentials';
 
 describe('Credentials', () => {
 	const cipher = new Cipher(mock<InstanceSettings>({ encryptionKey: 'password' }));
diff --git a/packages/core/test/NodeExecuteFunctions.test.ts b/packages/core/src/__tests__/node-execute-functions.test.ts
similarity index 61%
rename from packages/core/test/NodeExecuteFunctions.test.ts
rename to packages/core/src/__tests__/node-execute-functions.test.ts
index 421b7cd247..a1c41355e6 100644
--- a/packages/core/test/NodeExecuteFunctions.test.ts
+++ b/packages/core/src/__tests__/node-execute-functions.test.ts
@@ -1,9 +1,9 @@
+import { Container } from '@n8n/di';
+import FormData from 'form-data';
 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,31 +12,31 @@ 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 { BinaryDataService } from '@/binary-data/binary-data.service';
+import { InstanceSettings } from '@/instance-settings';
 import {
-	cleanupParameterData,
+	binaryToString,
 	copyInputItems,
-	ensureType,
 	getBinaryDataBuffer,
+	invokeAxios,
 	isFilePathBlocked,
+	parseContentDisposition,
+	parseContentType,
 	parseIncomingMessage,
 	parseRequestObject,
 	proxyRequestToAxios,
 	removeEmptyBody,
 	setBinaryDataBuffer,
-} from '@/NodeExecuteFunctions';
+} from '@/node-execute-functions';
 
 const temporaryDir = mkdtempSync(join(tmpdir(), 'n8n'));
 
@@ -154,6 +154,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 +320,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*', () => {
@@ -385,6 +545,46 @@ describe('NodeExecuteFunctions', () => {
 	});
 
 	describe('parseRequestObject', () => {
+		test('should handle basic request options', async () => {
+			const axiosOptions = await parseRequestObject({
+				url: 'https://example.com',
+				method: 'POST',
+				headers: { 'content-type': 'application/json' },
+				body: { key: 'value' },
+			});
+
+			expect(axiosOptions).toEqual(
+				expect.objectContaining({
+					url: 'https://example.com',
+					method: 'POST',
+					headers: { accept: '*/*', 'content-type': 'application/json' },
+					data: { key: 'value' },
+					maxRedirects: 0,
+				}),
+			);
+		});
+
+		test('should set correct headers for FormData', async () => {
+			const formData = new FormData();
+			formData.append('key', 'value');
+
+			const axiosOptions = await parseRequestObject({
+				url: 'https://example.com',
+				formData,
+				headers: {
+					'content-type': 'multipart/form-data',
+				},
+			});
+
+			expect(axiosOptions.headers).toMatchObject({
+				accept: '*/*',
+				'content-length': 163,
+				'content-type': expect.stringMatching(/^multipart\/form-data; boundary=/),
+			});
+
+			expect(axiosOptions.data).toBeInstanceOf(FormData);
+		});
+
 		test('should not use Host header for SNI', async () => {
 			const axiosOptions = await parseRequestObject({
 				url: 'https://example.de/foo/bar',
@@ -470,36 +670,74 @@ 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');
+	describe('invokeAxios', () => {
+		const baseUrl = 'http://example.de';
+
+		beforeEach(() => {
+			nock.cleanAll();
+			jest.clearAllMocks();
 		});
 
-		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 throw error for non-401 status codes', async () => {
+			nock(baseUrl).get('/test').reply(500, {});
+
+			await expect(invokeAxios({ url: `${baseUrl}/test` })).rejects.toThrow(
+				'Request failed with status code 500',
+			);
 		});
 
-		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 throw error on 401 without digest auth challenge', async () => {
+			nock(baseUrl).get('/test').reply(401, {});
+
+			await expect(
+				invokeAxios(
+					{
+						url: `${baseUrl}/test`,
+					},
+					{ sendImmediately: false },
+				),
+			).rejects.toThrow('Request failed with status code 401');
 		});
 
-		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');
+		it('should make successful requests', async () => {
+			nock(baseUrl).get('/test').reply(200, { success: true });
+
+			const response = await invokeAxios({
+				url: `${baseUrl}/test`,
+			});
+
+			expect(response.status).toBe(200);
+			expect(response.data).toEqual({ success: true });
+		});
+
+		it('should handle digest auth when receiving 401 with nonce', async () => {
+			nock(baseUrl)
+				.get('/test')
+				.matchHeader('authorization', 'Basic dXNlcjpwYXNz')
+				.once()
+				.reply(401, {}, { 'www-authenticate': 'Digest realm="test", nonce="abc123", qop="auth"' });
+
+			nock(baseUrl)
+				.get('/test')
+				.matchHeader(
+					'authorization',
+					/^Digest username="user",realm="test",nonce="abc123",uri="\/test",qop="auth",algorithm="MD5",response="[0-9a-f]{32}"/,
+				)
+				.reply(200, { success: true });
+
+			const response = await invokeAxios(
+				{
+					url: `${baseUrl}/test`,
+					auth: {
+						username: 'user',
+						password: 'pass',
+					},
+				},
+				{ sendImmediately: false },
+			);
+
+			expect(response.status).toBe(200);
+			expect(response.data).toEqual({ success: true });
 		});
 	});
 
@@ -589,80 +827,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/FileSystem.manager.test.ts b/packages/core/src/binary-data/__tests__/file-system.manager.test.ts
similarity index 91%
rename from packages/core/test/FileSystem.manager.test.ts
rename to packages/core/src/binary-data/__tests__/file-system.manager.test.ts
index 581974c0e9..fae24801f5 100644
--- a/packages/core/test/FileSystem.manager.test.ts
+++ b/packages/core/src/binary-data/__tests__/file-system.manager.test.ts
@@ -3,10 +3,9 @@ import fsp from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import path from 'node:path';
 
-import { FileSystemManager } from '@/BinaryData/FileSystem.manager';
-import { isStream } from '@/ObjectStore/utils';
-
-import { toFileId, toStream } from './utils';
+import { FileSystemManager } from '@/binary-data/file-system.manager';
+import { isStream } from '@/binary-data/object-store/utils';
+import { toFileId, toStream } from '@test/utils';
 
 jest.mock('fs');
 jest.mock('fs/promises');
@@ -147,6 +146,11 @@ describe('copyByFilePath()', () => {
 });
 
 describe('deleteMany()', () => {
+	const rmOptions = {
+		force: true,
+		recursive: true,
+	};
+
 	it('should delete many files by workflow ID and execution ID', async () => {
 		const ids = [
 			{ workflowId, executionId },
@@ -160,6 +164,16 @@ describe('deleteMany()', () => {
 		await expect(promise).resolves.not.toThrow();
 
 		expect(fsp.rm).toHaveBeenCalledTimes(2);
+		expect(fsp.rm).toHaveBeenNthCalledWith(
+			1,
+			`${storagePath}/workflows/${workflowId}/executions/${executionId}`,
+			rmOptions,
+		);
+		expect(fsp.rm).toHaveBeenNthCalledWith(
+			2,
+			`${storagePath}/workflows/${otherWorkflowId}/executions/${otherExecutionId}`,
+			rmOptions,
+		);
 	});
 
 	it('should suppress error on non-existing filepath', async () => {
diff --git a/packages/core/test/ObjectStore.manager.test.ts b/packages/core/src/binary-data/__tests__/object-store.manager.test.ts
similarity index 91%
rename from packages/core/test/ObjectStore.manager.test.ts
rename to packages/core/src/binary-data/__tests__/object-store.manager.test.ts
index f01e170213..9ca99e8d7b 100644
--- a/packages/core/test/ObjectStore.manager.test.ts
+++ b/packages/core/src/binary-data/__tests__/object-store.manager.test.ts
@@ -1,12 +1,11 @@
 import { mock } from 'jest-mock-extended';
 import fs from 'node:fs/promises';
 
-import { ObjectStoreManager } from '@/BinaryData/ObjectStore.manager';
-import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
-import type { MetadataResponseHeaders } from '@/ObjectStore/types';
-import { isStream } from '@/ObjectStore/utils';
-
-import { mockInstance, toFileId, toStream } from './utils';
+import { ObjectStoreService } from '@/binary-data/object-store/object-store.service.ee';
+import type { MetadataResponseHeaders } from '@/binary-data/object-store/types';
+import { isStream } from '@/binary-data/object-store/utils';
+import { ObjectStoreManager } from '@/binary-data/object-store.manager';
+import { mockInstance, toFileId, toStream } from '@test/utils';
 
 jest.mock('fs/promises');
 
diff --git a/packages/core/test/BinaryData/utils.test.ts b/packages/core/src/binary-data/__tests__/utils.test.ts
similarity index 95%
rename from packages/core/test/BinaryData/utils.test.ts
rename to packages/core/src/binary-data/__tests__/utils.test.ts
index 50a7f165df..329345262f 100644
--- a/packages/core/test/BinaryData/utils.test.ts
+++ b/packages/core/src/binary-data/__tests__/utils.test.ts
@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import { createGunzip } from 'node:zlib';
 
-import { binaryToBuffer } from '@/BinaryData/utils';
+import { binaryToBuffer } from '@/binary-data/utils';
 
 describe('BinaryData/utils', () => {
 	describe('binaryToBuffer', () => {
diff --git a/packages/core/src/BinaryData/BinaryData.service.ts b/packages/core/src/binary-data/binary-data.service.ts
similarity index 95%
rename from packages/core/src/BinaryData/BinaryData.service.ts
rename to packages/core/src/binary-data/binary-data.service.ts
index 556a3176de..742ceb500f 100644
--- a/packages/core/src/BinaryData/BinaryData.service.ts
+++ b/packages/core/src/binary-data/binary-data.service.ts
@@ -1,9 +1,9 @@
+import { Container, Service } from '@n8n/di';
 import { BINARY_ENCODING } from 'n8n-workflow';
 import type { INodeExecutionData, IBinaryData } from 'n8n-workflow';
 import { readFile, stat } from 'node:fs/promises';
 import prettyBytes from 'pretty-bytes';
 import type { Readable } from 'stream';
-import Container, { Service } from 'typedi';
 
 import type { BinaryData } from './types';
 import { areConfigModes, binaryToBuffer } from './utils';
@@ -22,7 +22,7 @@ export class BinaryDataService {
 		this.mode = config.mode === 'filesystem' ? 'filesystem-v2' : config.mode;
 
 		if (config.availableModes.includes('filesystem')) {
-			const { FileSystemManager } = await import('./FileSystem.manager');
+			const { FileSystemManager } = await import('./file-system.manager');
 
 			this.managers.filesystem = new FileSystemManager(config.localStoragePath);
 			this.managers['filesystem-v2'] = this.managers.filesystem;
@@ -31,8 +31,8 @@ export class BinaryDataService {
 		}
 
 		if (config.availableModes.includes('s3')) {
-			const { ObjectStoreManager } = await import('./ObjectStore.manager');
-			const { ObjectStoreService } = await import('../ObjectStore/ObjectStore.service.ee');
+			const { ObjectStoreManager } = await import('./object-store.manager');
+			const { ObjectStoreService } = await import('./object-store/object-store.service.ee');
 
 			this.managers.s3 = new ObjectStoreManager(Container.get(ObjectStoreService));
 
diff --git a/packages/core/src/BinaryData/FileSystem.manager.ts b/packages/core/src/binary-data/file-system.manager.ts
similarity index 99%
rename from packages/core/src/BinaryData/FileSystem.manager.ts
rename to packages/core/src/binary-data/file-system.manager.ts
index f49e6e5c02..66eecd626a 100644
--- a/packages/core/src/BinaryData/FileSystem.manager.ts
+++ b/packages/core/src/binary-data/file-system.manager.ts
@@ -93,7 +93,7 @@ export class FileSystemManager implements BinaryData.Manager {
 		// binary files stored in nested dirs - `filesystem-v2`
 
 		const binaryDataDirs = ids.map(({ workflowId, executionId }) =>
-			this.resolvePath(`workflows/${workflowId}/executions/${executionId}/binary_data/`),
+			this.resolvePath(`workflows/${workflowId}/executions/${executionId}`),
 		);
 
 		await Promise.all(
diff --git a/packages/core/src/binary-data/index.ts b/packages/core/src/binary-data/index.ts
new file mode 100644
index 0000000000..ef82dee30f
--- /dev/null
+++ b/packages/core/src/binary-data/index.ts
@@ -0,0 +1,4 @@
+export * from './binary-data.service';
+export * from './types';
+export { ObjectStoreService } from './object-store/object-store.service.ee';
+export { isStoredMode as isValidNonDefaultMode } from './utils';
diff --git a/packages/core/src/BinaryData/ObjectStore.manager.ts b/packages/core/src/binary-data/object-store.manager.ts
similarity index 96%
rename from packages/core/src/BinaryData/ObjectStore.manager.ts
rename to packages/core/src/binary-data/object-store.manager.ts
index 65827d4ef0..cc0fa564ce 100644
--- a/packages/core/src/BinaryData/ObjectStore.manager.ts
+++ b/packages/core/src/binary-data/object-store.manager.ts
@@ -1,11 +1,11 @@
+import { Service } from '@n8n/di';
 import fs from 'node:fs/promises';
 import type { Readable } from 'node:stream';
-import { Service } from 'typedi';
 import { v4 as uuid } from 'uuid';
 
+import { ObjectStoreService } from './object-store/object-store.service.ee';
 import type { BinaryData } from './types';
 import { binaryToBuffer } from './utils';
-import { ObjectStoreService } from '../ObjectStore/ObjectStore.service.ee';
 
 @Service()
 export class ObjectStoreManager implements BinaryData.Manager {
diff --git a/packages/core/test/ObjectStore.service.test.ts b/packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
similarity index 97%
rename from packages/core/test/ObjectStore.service.test.ts
rename to packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
index 77936c20f0..f5d2924eb5 100644
--- a/packages/core/test/ObjectStore.service.test.ts
+++ b/packages/core/src/binary-data/object-store/__tests__/object-store.service.test.ts
@@ -1,8 +1,9 @@
 import axios from 'axios';
+import { mock } from 'jest-mock-extended';
 import { Readable } from 'stream';
 
-import { ObjectStoreService } from '@/ObjectStore/ObjectStore.service.ee';
-import { writeBlockedMessage } from '@/ObjectStore/utils';
+import { ObjectStoreService } from '@/binary-data/object-store/object-store.service.ee';
+import { writeBlockedMessage } from '@/binary-data/object-store/utils';
 
 jest.mock('axios');
 
@@ -25,7 +26,7 @@ const toDeletionXml = (filename: string) => `<Delete>
 let objectStoreService: ObjectStoreService;
 
 beforeEach(async () => {
-	objectStoreService = new ObjectStoreService();
+	objectStoreService = new ObjectStoreService(mock());
 	mockAxios.request.mockResolvedValueOnce({ status: 200 }); // for checkConnection
 	await objectStoreService.init(mockHost, mockBucket, mockCredentials);
 	jest.restoreAllMocks();
diff --git a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts b/packages/core/src/binary-data/object-store/object-store.service.ee.ts
similarity index 97%
rename from packages/core/src/ObjectStore/ObjectStore.service.ee.ts
rename to packages/core/src/binary-data/object-store/object-store.service.ee.ts
index 0e4d8463df..508477d50e 100644
--- a/packages/core/src/ObjectStore/ObjectStore.service.ee.ts
+++ b/packages/core/src/binary-data/object-store/object-store.service.ee.ts
@@ -1,11 +1,13 @@
+import { Service } from '@n8n/di';
 import { sign } from 'aws4';
 import type { Request as Aws4Options, Credentials as Aws4Credentials } from 'aws4';
 import axios from 'axios';
 import type { AxiosRequestConfig, AxiosResponse, InternalAxiosRequestConfig, Method } from 'axios';
-import { ApplicationError, LoggerProxy as Logger } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
 import { createHash } from 'node:crypto';
 import type { Readable } from 'stream';
-import { Service } from 'typedi';
+
+import { Logger } from '@/logging/logger';
 
 import type {
 	Bucket,
@@ -16,7 +18,7 @@ import type {
 	RequestOptions,
 } from './types';
 import { isStream, parseXml, writeBlockedMessage } from './utils';
-import type { BinaryData } from '../BinaryData/types';
+import type { BinaryData } from '../types';
 
 @Service()
 export class ObjectStoreService {
@@ -30,7 +32,7 @@ export class ObjectStoreService {
 
 	private isReadOnly = false;
 
-	private logger = Logger;
+	constructor(private readonly logger: Logger) {}
 
 	async init(host: string, bucket: Bucket, credentials: ConfigSchemaCredentials) {
 		this.host = host;
diff --git a/packages/core/src/ObjectStore/types.ts b/packages/core/src/binary-data/object-store/types.ts
similarity index 94%
rename from packages/core/src/ObjectStore/types.ts
rename to packages/core/src/binary-data/object-store/types.ts
index d0b7ab0713..49726f5c43 100644
--- a/packages/core/src/ObjectStore/types.ts
+++ b/packages/core/src/binary-data/object-store/types.ts
@@ -1,6 +1,6 @@
 import type { AxiosResponseHeaders, ResponseType } from 'axios';
 
-import type { BinaryData } from '../BinaryData/types';
+import type { BinaryData } from '../types';
 
 export type RawListPage = {
 	listBucketResult: {
diff --git a/packages/core/src/ObjectStore/utils.ts b/packages/core/src/binary-data/object-store/utils.ts
similarity index 100%
rename from packages/core/src/ObjectStore/utils.ts
rename to packages/core/src/binary-data/object-store/utils.ts
diff --git a/packages/core/src/BinaryData/types.ts b/packages/core/src/binary-data/types.ts
similarity index 100%
rename from packages/core/src/BinaryData/types.ts
rename to packages/core/src/binary-data/types.ts
diff --git a/packages/core/src/BinaryData/utils.ts b/packages/core/src/binary-data/utils.ts
similarity index 100%
rename from packages/core/src/BinaryData/utils.ts
rename to packages/core/src/binary-data/utils.ts
diff --git a/packages/core/src/Constants.ts b/packages/core/src/constants.ts
similarity index 82%
rename from packages/core/src/Constants.ts
rename to packages/core/src/constants.ts
index d5fc12bffd..feb630e306 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/constants.ts
@@ -1,11 +1,13 @@
+const { NODE_ENV } = process.env;
+export const inProduction = NODE_ENV === 'production';
+export const inDevelopment = !NODE_ENV || NODE_ENV === 'development';
+
 export const CUSTOM_EXTENSION_ENV = 'N8N_CUSTOM_EXTENSIONS';
 export const PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
 export const PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
 export const HTTP_REQUEST_NODE_TYPE = 'n8n-nodes-base.httpRequest';
 export const HTTP_REQUEST_TOOL_NODE_TYPE = '@n8n/n8n-nodes-langchain.toolHttpRequest';
 
-export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
-
 export const RESTRICT_FILE_ACCESS_TO = 'N8N_RESTRICT_FILE_ACCESS_TO';
 export const BLOCK_FILE_ACCESS_TO_N8N_FILES = 'N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES';
 export const CONFIG_FILES = 'N8N_CONFIG_FILES';
diff --git a/packages/core/src/Credentials.ts b/packages/core/src/credentials.ts
similarity index 93%
rename from packages/core/src/Credentials.ts
rename to packages/core/src/credentials.ts
index da6deb742c..9b5b4c1455 100644
--- a/packages/core/src/Credentials.ts
+++ b/packages/core/src/credentials.ts
@@ -1,8 +1,8 @@
+import { Container } from '@n8n/di';
 import type { ICredentialDataDecryptedObject, ICredentialsEncrypted } from 'n8n-workflow';
 import { ApplicationError, ICredentials, jsonParse } from 'n8n-workflow';
-import { Container } from 'typedi';
 
-import { Cipher } from './Cipher';
+import { Cipher } from '@/encryption/cipher';
 
 export class Credentials<
 	T extends object = ICredentialDataDecryptedObject,
diff --git a/packages/core/src/decorators/__tests__/memoized.test.ts b/packages/core/src/decorators/__tests__/memoized.test.ts
new file mode 100644
index 0000000000..053138c60c
--- /dev/null
+++ b/packages/core/src/decorators/__tests__/memoized.test.ts
@@ -0,0 +1,153 @@
+import { AssertionError, ok } from 'node:assert';
+import { setFlagsFromString } from 'node:v8';
+import { runInNewContext } from 'node:vm';
+
+import { Memoized } from '../memoized';
+
+describe('Memoized Decorator', () => {
+	class TestClass {
+		private computeCount = 0;
+
+		constructor(private readonly value: number = 42) {}
+
+		@Memoized
+		get expensiveComputation() {
+			this.computeCount++;
+			return this.value * 2;
+		}
+
+		getComputeCount() {
+			return this.computeCount;
+		}
+	}
+
+	it('should only compute the value once', () => {
+		const instance = new TestClass();
+
+		// First access should compute
+		expect(instance.expensiveComputation).toBe(84);
+		expect(instance.getComputeCount()).toBe(1);
+
+		// Second access should use cached value
+		expect(instance.expensiveComputation).toBe(84);
+		expect(instance.getComputeCount()).toBe(1);
+
+		// Third access should still use cached value
+		expect(instance.expensiveComputation).toBe(84);
+		expect(instance.getComputeCount()).toBe(1);
+	});
+
+	it('should cache values independently for different instances', () => {
+		const instance1 = new TestClass(10);
+		const instance2 = new TestClass(20);
+
+		expect(instance1.expensiveComputation).toBe(20);
+		expect(instance2.expensiveComputation).toBe(40);
+
+		expect(instance1.getComputeCount()).toBe(1);
+		expect(instance2.getComputeCount()).toBe(1);
+	});
+
+	it('should throw error when used on non-getter', () => {
+		expect(() => {
+			class InvalidClass {
+				// @ts-expect-error this code will fail at compile time and at runtime
+				@Memoized
+				normalProperty = 42;
+			}
+			new InvalidClass();
+		}).toThrow(AssertionError);
+	});
+
+	it('should make cached value non-enumerable', () => {
+		const instance = new TestClass();
+		instance.expensiveComputation; // Access to trigger caching
+
+		const propertyNames = Object.keys(instance);
+		expect(propertyNames).not.toContain('expensiveComputation');
+	});
+
+	it('should not allow reconfiguring the cached value', () => {
+		const instance = new TestClass();
+		instance.expensiveComputation; // Access to trigger caching
+
+		expect(() => {
+			Object.defineProperty(instance, 'expensiveComputation', {
+				value: 999,
+				configurable: true,
+			});
+		}).toThrow();
+	});
+
+	it('should work when child class references memoized getter in parent class', () => {
+		class ParentClass {
+			protected computeCount = 0;
+
+			@Memoized
+			get parentValue() {
+				this.computeCount++;
+				return 42;
+			}
+
+			getComputeCount() {
+				return this.computeCount;
+			}
+		}
+
+		class ChildClass extends ParentClass {
+			get childValue() {
+				return this.parentValue * 2;
+			}
+		}
+
+		const child = new ChildClass();
+
+		expect(child.childValue).toBe(84);
+		expect(child.getComputeCount()).toBe(1);
+
+		expect(child.childValue).toBe(84);
+		expect(child.getComputeCount()).toBe(1);
+	});
+
+	it('should have correct property descriptor after memoization', () => {
+		const instance = new TestClass();
+
+		// Before accessing (original getter descriptor)
+		const beforeDescriptor = Object.getOwnPropertyDescriptor(
+			TestClass.prototype,
+			'expensiveComputation',
+		);
+		expect(beforeDescriptor?.configurable).toBe(true);
+		expect(beforeDescriptor?.enumerable).toBe(false);
+		expect(typeof beforeDescriptor?.get).toBe('function');
+		expect(beforeDescriptor?.set).toBeUndefined();
+
+		// After accessing (memoized value descriptor)
+		instance.expensiveComputation; // Trigger memoization
+		const afterDescriptor = Object.getOwnPropertyDescriptor(instance, 'expensiveComputation');
+		expect(afterDescriptor?.configurable).toBe(false);
+		expect(afterDescriptor?.enumerable).toBe(false);
+		expect(afterDescriptor?.writable).toBe(false);
+		expect(afterDescriptor?.value).toBe(84);
+		expect(afterDescriptor?.get).toBeUndefined();
+	});
+
+	it('should not prevent garbage collection of instances', async () => {
+		setFlagsFromString('--expose_gc');
+		const gc = runInNewContext('gc') as unknown as () => void;
+
+		let instance: TestClass | undefined = new TestClass();
+		const weakRef = new WeakRef(instance);
+		instance.expensiveComputation;
+
+		// Remove the strong reference
+		instance = undefined;
+
+		// Wait for garbage collection, forcing it if needed
+		await new Promise((resolve) => setTimeout(resolve, 10));
+		gc();
+
+		const ref = weakRef.deref();
+		ok(!ref, 'GC did not collect the instance ref');
+	});
+});
diff --git a/packages/core/src/decorators/index.ts b/packages/core/src/decorators/index.ts
new file mode 100644
index 0000000000..2bf9174d7a
--- /dev/null
+++ b/packages/core/src/decorators/index.ts
@@ -0,0 +1 @@
+export { Memoized } from './memoized';
diff --git a/packages/core/src/decorators/memoized.ts b/packages/core/src/decorators/memoized.ts
new file mode 100644
index 0000000000..3ff5c56619
--- /dev/null
+++ b/packages/core/src/decorators/memoized.ts
@@ -0,0 +1,41 @@
+import assert from 'node:assert';
+
+/**
+ * A decorator that implements memoization for class property getters.
+ *
+ * The decorated getter will only be executed once and its value cached for subsequent access
+ *
+ * @example
+ * class Example {
+ *   @Memoized
+ *   get computedValue() {
+ *     // This will only run once and the result will be cached
+ *     return heavyComputation();
+ *   }
+ * }
+ *
+ * @throws If decorator is used on something other than a getter
+ */
+export function Memoized<T = unknown>(
+	target: object,
+	propertyKey: string | symbol,
+	descriptor?: TypedPropertyDescriptor<T>,
+): TypedPropertyDescriptor<T> {
+	const originalGetter = descriptor?.get;
+	assert(originalGetter, '@Memoized can only be used on getters');
+
+	// Replace the original getter for the first call
+	descriptor.get = function (this: typeof target.constructor): T {
+		const value = originalGetter.call(this);
+		// Add a property on the class instance to stop reading from the getter on class prototype
+		Object.defineProperty(this, propertyKey, {
+			value,
+			configurable: false,
+			enumerable: false,
+			writable: false,
+		});
+		return value;
+	};
+
+	return descriptor;
+}
diff --git a/packages/core/test/Cipher.test.ts b/packages/core/src/encryption/__tests__/cipher.test.ts
similarity index 84%
rename from packages/core/test/Cipher.test.ts
rename to packages/core/src/encryption/__tests__/cipher.test.ts
index e3dfa609fa..c1e14a9be0 100644
--- a/packages/core/test/Cipher.test.ts
+++ b/packages/core/src/encryption/__tests__/cipher.test.ts
@@ -1,9 +1,9 @@
-import Container from 'typedi';
+import { Container } from '@n8n/di';
 
-import { Cipher } from '@/Cipher';
-import { InstanceSettings } from '@/InstanceSettings';
+import { InstanceSettings } from '@/instance-settings';
+import { mockInstance } from '@test/utils';
 
-import { mockInstance } from './utils';
+import { Cipher } from '../cipher';
 
 describe('Cipher', () => {
 	mockInstance(InstanceSettings, { encryptionKey: 'test_key' });
diff --git a/packages/core/src/Cipher.ts b/packages/core/src/encryption/cipher.ts
similarity index 94%
rename from packages/core/src/Cipher.ts
rename to packages/core/src/encryption/cipher.ts
index d9ed93ddb6..248ca0317b 100644
--- a/packages/core/src/Cipher.ts
+++ b/packages/core/src/encryption/cipher.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import { createHash, createCipheriv, createDecipheriv, randomBytes } from 'crypto';
-import { Service } from 'typedi';
 
-import { InstanceSettings } from './InstanceSettings';
+import { InstanceSettings } from '@/instance-settings';
 
 // Data encrypted by CryptoJS always starts with these bytes
 const RANDOM_BYTES = Buffer.from('53616c7465645f5f', 'hex');
diff --git a/packages/core/src/encryption/index.ts b/packages/core/src/encryption/index.ts
new file mode 100644
index 0000000000..b2ab9e782e
--- /dev/null
+++ b/packages/core/src/encryption/index.ts
@@ -0,0 +1 @@
+export { Cipher } from './cipher';
diff --git a/packages/core/src/errors/__tests__/error-reporter.test.ts b/packages/core/src/errors/__tests__/error-reporter.test.ts
new file mode 100644
index 0000000000..ff260ea1f7
--- /dev/null
+++ b/packages/core/src/errors/__tests__/error-reporter.test.ts
@@ -0,0 +1,162 @@
+import { QueryFailedError } from '@n8n/typeorm';
+import type { ErrorEvent } from '@sentry/types';
+import { AxiosError } from 'axios';
+import { mock } from 'jest-mock-extended';
+import { ApplicationError } from 'n8n-workflow';
+
+import type { Logger } from '@/logging/logger';
+
+import { ErrorReporter } from '../error-reporter';
+
+jest.mock('@sentry/node', () => ({
+	init: jest.fn(),
+	setTag: jest.fn(),
+	captureException: jest.fn(),
+	Integrations: {},
+}));
+
+jest.spyOn(process, 'on');
+
+describe('ErrorReporter', () => {
+	const errorReporter = new ErrorReporter(mock());
+	const event = {} as ErrorEvent;
+
+	describe('beforeSend', () => {
+		it('should ignore errors with level warning', async () => {
+			const originalException = new ApplicationError('test');
+			originalException.level = 'warning';
+
+			expect(await errorReporter.beforeSend(event, { originalException })).toEqual(null);
+		});
+
+		it('should keep events with a cause with error level', async () => {
+			const cause = new Error('cause-error');
+			const originalException = new ApplicationError('test', cause);
+
+			expect(await errorReporter.beforeSend(event, { originalException })).toEqual(event);
+		});
+
+		it('should ignore events with error cause with warning level', async () => {
+			const cause: Error & { level?: 'warning' } = new Error('cause-error');
+			cause.level = 'warning';
+			const originalException = new ApplicationError('test', cause);
+
+			expect(await errorReporter.beforeSend(event, { originalException })).toEqual(null);
+		});
+
+		it('should set level, extra, and tags from ApplicationError', async () => {
+			const originalException = new ApplicationError('Test error', {
+				level: 'error',
+				extra: { foo: 'bar' },
+				tags: { tag1: 'value1' },
+			});
+
+			const testEvent = {} as ErrorEvent;
+
+			const result = await errorReporter.beforeSend(testEvent, { originalException });
+
+			expect(result).toEqual({
+				level: 'error',
+				extra: { foo: 'bar' },
+				tags: { tag1: 'value1' },
+			});
+		});
+
+		it('should deduplicate errors with same stack trace', async () => {
+			const originalException = new Error();
+
+			const firstResult = await errorReporter.beforeSend(event, { originalException });
+			expect(firstResult).toEqual(event);
+
+			const secondResult = await errorReporter.beforeSend(event, { originalException });
+			expect(secondResult).toBeNull();
+		});
+
+		it('should handle Promise rejections', async () => {
+			const originalException = Promise.reject(new Error());
+
+			const result = await errorReporter.beforeSend(event, { originalException });
+
+			expect(result).toEqual(event);
+		});
+
+		test.each([
+			['undefined', undefined],
+			['null', null],
+			['an AxiosError', new AxiosError()],
+			['a rejected Promise with AxiosError', Promise.reject(new AxiosError())],
+			[
+				'a QueryFailedError with SQLITE_FULL',
+				new QueryFailedError('', [], new Error('SQLITE_FULL')),
+			],
+			[
+				'a QueryFailedError with SQLITE_IOERR',
+				new QueryFailedError('', [], new Error('SQLITE_IOERR')),
+			],
+			['an ApplicationError with "warning" level', new ApplicationError('', { level: 'warning' })],
+			[
+				'an Error with ApplicationError as cause with "warning" level',
+				new Error('', { cause: new ApplicationError('', { level: 'warning' }) }),
+			],
+		])('should ignore if originalException is %s', async (_, originalException) => {
+			const result = await errorReporter.beforeSend(event, { originalException });
+			expect(result).toBeNull();
+		});
+
+		describe('beforeSendFilter', () => {
+			const newErrorReportedWithBeforeSendFilter = (beforeSendFilter: jest.Mock) => {
+				const errorReporter = new ErrorReporter(mock());
+				// @ts-expect-error - beforeSendFilter is private
+				errorReporter.beforeSendFilter = beforeSendFilter;
+				return errorReporter;
+			};
+
+			it('should filter out based on the beforeSendFilter', async () => {
+				const beforeSendFilter = jest.fn().mockReturnValue(true);
+				const errorReporter = newErrorReportedWithBeforeSendFilter(beforeSendFilter);
+				const hint = { originalException: new Error() };
+
+				const result = await errorReporter.beforeSend(event, hint);
+
+				expect(result).toBeNull();
+				expect(beforeSendFilter).toHaveBeenCalledWith(event, hint);
+			});
+
+			it('should not filter out when beforeSendFilter returns false', async () => {
+				const beforeSendFilter = jest.fn().mockReturnValue(false);
+				const errorReporter = newErrorReportedWithBeforeSendFilter(beforeSendFilter);
+				const hint = { originalException: new Error() };
+
+				const result = await errorReporter.beforeSend(event, hint);
+
+				expect(result).toEqual(event);
+				expect(beforeSendFilter).toHaveBeenCalledWith(event, hint);
+			});
+		});
+	});
+
+	describe('error', () => {
+		let error: ApplicationError;
+		let logger: Logger;
+		let errorReporter: ErrorReporter;
+		const metadata = undefined;
+
+		beforeEach(() => {
+			error = new ApplicationError('Test error');
+			logger = mock<Logger>();
+			errorReporter = new ErrorReporter(logger);
+		});
+
+		it('should include stack trace for error-level `ApplicationError`', () => {
+			error.level = 'error';
+			errorReporter.error(error);
+			expect(logger.error).toHaveBeenCalledWith(`Test error\n${error.stack}\n`, metadata);
+		});
+
+		it('should exclude stack trace for warning-level `ApplicationError`', () => {
+			error.level = 'warning';
+			errorReporter.error(error);
+			expect(logger.error).toHaveBeenCalledWith('Test error', metadata);
+		});
+	});
+});
diff --git a/packages/core/src/errors/error-reporter.ts b/packages/core/src/errors/error-reporter.ts
new file mode 100644
index 0000000000..3c0bffcd4b
--- /dev/null
+++ b/packages/core/src/errors/error-reporter.ts
@@ -0,0 +1,213 @@
+import { Service } from '@n8n/di';
+import type { NodeOptions } from '@sentry/node';
+import { close } from '@sentry/node';
+import type { ErrorEvent, EventHint } from '@sentry/types';
+import { AxiosError } from 'axios';
+import { ApplicationError, ExecutionCancelledError, type ReportingOptions } from 'n8n-workflow';
+import { createHash } from 'node:crypto';
+
+import type { InstanceType } from '@/instance-settings';
+import { Logger } from '@/logging/logger';
+
+type ErrorReporterInitOptions = {
+	serverType: InstanceType | 'task_runner';
+	dsn: string;
+	release: string;
+	environment: string;
+	serverName: string;
+	/**
+	 * Function to allow filtering out errors before they are sent to Sentry.
+	 * Return true if the error should be filtered out.
+	 */
+	beforeSendFilter?: (event: ErrorEvent, hint: EventHint) => boolean;
+};
+
+@Service()
+export class ErrorReporter {
+	/** Hashes of error stack traces, to deduplicate error reports. */
+	private seenErrors = new Set<string>();
+
+	private report: (error: Error | string, options?: ReportingOptions) => void;
+
+	private beforeSendFilter?: (event: ErrorEvent, hint: EventHint) => boolean;
+
+	constructor(private readonly logger: Logger) {
+		// eslint-disable-next-line @typescript-eslint/unbound-method
+		this.report = this.defaultReport;
+	}
+
+	private defaultReport(error: Error | string, options?: ReportingOptions) {
+		if (error instanceof Error) {
+			let e = error;
+
+			const { executionId } = options ?? {};
+			const context = executionId ? ` (execution ${executionId})` : '';
+
+			do {
+				const msg = [
+					e.message + context,
+					e instanceof ApplicationError && e.level === 'error' && e.stack ? `\n${e.stack}\n` : '',
+				].join('');
+				const meta = e instanceof ApplicationError ? e.extra : undefined;
+				this.logger.error(msg, meta);
+				e = e.cause as Error;
+			} while (e);
+		}
+	}
+
+	async shutdown(timeoutInMs = 1000) {
+		await close(timeoutInMs);
+	}
+
+	async init({
+		beforeSendFilter,
+		dsn,
+		serverType,
+		release,
+		environment,
+		serverName,
+	}: ErrorReporterInitOptions) {
+		process.on('uncaughtException', (error) => {
+			this.error(error);
+		});
+
+		if (!dsn) return;
+
+		// Collect longer stacktraces
+		Error.stackTraceLimit = 50;
+
+		const { init, captureException, setTag } = await import('@sentry/node');
+		const { requestDataIntegration, rewriteFramesIntegration } = await import('@sentry/node');
+
+		const enabledIntegrations = [
+			'InboundFilters',
+			'FunctionToString',
+			'LinkedErrors',
+			'OnUnhandledRejection',
+			'ContextLines',
+		];
+
+		init({
+			dsn,
+			release,
+			environment,
+			enableTracing: false,
+			serverName,
+			beforeBreadcrumb: () => null,
+			beforeSend: this.beforeSend.bind(this) as NodeOptions['beforeSend'],
+			integrations: (integrations) => [
+				...integrations.filter(({ name }) => enabledIntegrations.includes(name)),
+				rewriteFramesIntegration({ root: process.cwd() }),
+				requestDataIntegration({
+					include: {
+						cookies: false,
+						data: false,
+						headers: false,
+						query_string: false,
+						url: true,
+						user: false,
+					},
+				}),
+			],
+		});
+
+		setTag('server_type', serverType);
+
+		this.report = (error, options) => captureException(error, options);
+		this.beforeSendFilter = beforeSendFilter;
+	}
+
+	async beforeSend(event: ErrorEvent, hint: EventHint) {
+		let { originalException } = hint;
+
+		if (!originalException) return null;
+
+		if (originalException instanceof Promise) {
+			originalException = await originalException.catch((error) => error as Error);
+		}
+
+		if (
+			this.beforeSendFilter?.(event, {
+				...hint,
+				originalException,
+			})
+		) {
+			return null;
+		}
+
+		if (originalException instanceof AxiosError) return null;
+
+		if (this.isIgnoredSqliteError(originalException)) return null;
+		if (this.isApplicationError(originalException)) {
+			if (this.isIgnoredApplicationError(originalException)) return null;
+
+			this.extractEventDetailsFromApplicationError(event, originalException);
+		}
+
+		if (
+			originalException instanceof Error &&
+			'cause' in originalException &&
+			originalException.cause instanceof Error &&
+			'level' in originalException.cause &&
+			originalException.cause.level === 'warning'
+		) {
+			// handle underlying errors propagating from dependencies like ai-assistant-sdk
+			return null;
+		}
+
+		if (originalException instanceof Error && originalException.stack) {
+			const eventHash = createHash('sha1').update(originalException.stack).digest('base64');
+			if (this.seenErrors.has(eventHash)) return null;
+			this.seenErrors.add(eventHash);
+		}
+
+		return event;
+	}
+
+	error(e: unknown, options?: ReportingOptions) {
+		if (e instanceof ExecutionCancelledError) return;
+		const toReport = this.wrap(e);
+		if (toReport) this.report(toReport, options);
+	}
+
+	warn(warning: Error | string, options?: ReportingOptions) {
+		this.error(warning, { ...options, level: 'warning' });
+	}
+
+	info(msg: string, options?: ReportingOptions) {
+		this.report(msg, { ...options, level: 'info' });
+	}
+
+	private wrap(e: unknown) {
+		if (e instanceof Error) return e;
+		if (typeof e === 'string') return new ApplicationError(e);
+		return;
+	}
+
+	/** @returns true if the error should be filtered out */
+	private isIgnoredSqliteError(error: unknown) {
+		return (
+			error instanceof Error &&
+			error.name === 'QueryFailedError' &&
+			['SQLITE_FULL', 'SQLITE_IOERR'].some((errMsg) => error.message.includes(errMsg))
+		);
+	}
+
+	private isApplicationError(error: unknown): error is ApplicationError {
+		return error instanceof ApplicationError;
+	}
+
+	private isIgnoredApplicationError(error: ApplicationError) {
+		return error.level === 'warning';
+	}
+
+	private extractEventDetailsFromApplicationError(
+		event: ErrorEvent,
+		originalException: ApplicationError,
+	) {
+		const { level, extra, tags } = originalException;
+		event.level = level;
+		if (extra) event.extra = { ...event.extra, ...extra };
+		if (tags) event.tags = { ...event.tags, ...tags };
+	}
+}
diff --git a/packages/core/src/errors/index.ts b/packages/core/src/errors/index.ts
index c280ecb30d..b6571dd336 100644
--- a/packages/core/src/errors/index.ts
+++ b/packages/core/src/errors/index.ts
@@ -3,3 +3,7 @@ export { DisallowedFilepathError } from './disallowed-filepath.error';
 export { InvalidModeError } from './invalid-mode.error';
 export { InvalidManagerError } from './invalid-manager.error';
 export { InvalidExecutionMetadataError } from './invalid-execution-metadata.error';
+export { UnrecognizedCredentialTypeError } from './unrecognized-credential-type.error';
+export { UnrecognizedNodeTypeError } from './unrecognized-node-type.error';
+
+export { ErrorReporter } from './error-reporter';
diff --git a/packages/core/src/errors/invalid-mode.error.ts b/packages/core/src/errors/invalid-mode.error.ts
index 179582911a..1e3a4f3594 100644
--- a/packages/core/src/errors/invalid-mode.error.ts
+++ b/packages/core/src/errors/invalid-mode.error.ts
@@ -1,6 +1,6 @@
 import { ApplicationError } from 'n8n-workflow';
 
-import { CONFIG_MODES } from '../BinaryData/utils';
+import { CONFIG_MODES } from '../binary-data/utils';
 
 export class InvalidModeError extends ApplicationError {
 	constructor() {
diff --git a/packages/core/src/errors/unrecognized-credential-type.error.ts b/packages/core/src/errors/unrecognized-credential-type.error.ts
new file mode 100644
index 0000000000..c60b576bca
--- /dev/null
+++ b/packages/core/src/errors/unrecognized-credential-type.error.ts
@@ -0,0 +1,9 @@
+import { ApplicationError } from 'n8n-workflow';
+
+export class UnrecognizedCredentialTypeError extends ApplicationError {
+	severity = 'warning';
+
+	constructor(credentialType: string) {
+		super(`Unrecognized credential type: ${credentialType}`);
+	}
+}
diff --git a/packages/cli/src/errors/unrecognized-node-type.error.ts b/packages/core/src/errors/unrecognized-node-type.error.ts
similarity index 55%
rename from packages/cli/src/errors/unrecognized-node-type.error.ts
rename to packages/core/src/errors/unrecognized-node-type.error.ts
index 1ca5281de5..6ca5e34e40 100644
--- a/packages/cli/src/errors/unrecognized-node-type.error.ts
+++ b/packages/core/src/errors/unrecognized-node-type.error.ts
@@ -3,7 +3,7 @@ import { ApplicationError } from 'n8n-workflow';
 export class UnrecognizedNodeTypeError extends ApplicationError {
 	severity = 'warning';
 
-	constructor(nodeType: string) {
-		super(`Unrecognized node type: ${nodeType}".`);
+	constructor(packageName: string, nodeType: string) {
+		super(`Unrecognized node type: ${packageName}.${nodeType}`);
 	}
 }
diff --git a/packages/core/src/execution-engine/__tests__/active-workflows.test.ts b/packages/core/src/execution-engine/__tests__/active-workflows.test.ts
new file mode 100644
index 0000000000..2d96a36488
--- /dev/null
+++ b/packages/core/src/execution-engine/__tests__/active-workflows.test.ts
@@ -0,0 +1,296 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	IGetExecuteTriggerFunctions,
+	INode,
+	ITriggerResponse,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+	TriggerTime,
+	CronExpression,
+} from 'n8n-workflow';
+import { LoggerProxy, TriggerCloseError, WorkflowActivationError } from 'n8n-workflow';
+
+import type { ErrorReporter } from '@/errors/error-reporter';
+
+import { ActiveWorkflows } from '../active-workflows';
+import type { PollContext } from '../node-execution-context';
+import type { ScheduledTaskManager } from '../scheduled-task-manager';
+import type { TriggersAndPollers } from '../triggers-and-pollers';
+
+describe('ActiveWorkflows', () => {
+	const workflowId = 'test-workflow-id';
+	const workflow = mock<Workflow>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>();
+	const mode: WorkflowExecuteMode = 'trigger';
+	const activation: WorkflowActivateMode = 'init';
+
+	const getTriggerFunctions = jest.fn() as IGetExecuteTriggerFunctions;
+	const triggerResponse = mock<ITriggerResponse>();
+
+	const pollFunctions = mock<PollContext>();
+	const getPollFunctions = jest.fn<PollContext, unknown[]>();
+
+	LoggerProxy.init(mock());
+	const scheduledTaskManager = mock<ScheduledTaskManager>();
+	const triggersAndPollers = mock<TriggersAndPollers>();
+	const errorReporter = mock<ErrorReporter>();
+	const triggerNode = mock<INode>();
+	const pollNode = mock<INode>();
+
+	let activeWorkflows: ActiveWorkflows;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		activeWorkflows = new ActiveWorkflows(
+			mock(),
+			scheduledTaskManager,
+			triggersAndPollers,
+			errorReporter,
+		);
+	});
+
+	type PollTimes = { item: TriggerTime[] };
+	type TestOptions = {
+		triggerNodes?: INode[];
+		pollNodes?: INode[];
+		triggerError?: Error;
+		pollError?: Error;
+		pollTimes?: PollTimes;
+	};
+
+	const addWorkflow = async ({
+		triggerNodes = [],
+		pollNodes = [],
+		triggerError,
+		pollError,
+		pollTimes = { item: [{ mode: 'everyMinute' }] },
+	}: TestOptions) => {
+		workflow.getTriggerNodes.mockReturnValue(triggerNodes);
+		workflow.getPollNodes.mockReturnValue(pollNodes);
+		pollFunctions.getNodeParameter.calledWith('pollTimes').mockReturnValue(pollTimes);
+
+		if (triggerError) {
+			triggersAndPollers.runTrigger.mockRejectedValueOnce(triggerError);
+		} else {
+			triggersAndPollers.runTrigger.mockResolvedValue(triggerResponse);
+		}
+
+		if (pollError) {
+			triggersAndPollers.runPoll.mockRejectedValueOnce(pollError);
+		} else {
+			getPollFunctions.mockReturnValue(pollFunctions);
+		}
+
+		return await activeWorkflows.add(
+			workflowId,
+			workflow,
+			additionalData,
+			mode,
+			activation,
+			getTriggerFunctions,
+			getPollFunctions,
+		);
+	};
+
+	describe('add()', () => {
+		describe('should activate workflow', () => {
+			it('with trigger nodes', async () => {
+				await addWorkflow({ triggerNodes: [triggerNode] });
+
+				expect(activeWorkflows.isActive(workflowId)).toBe(true);
+				expect(workflow.getTriggerNodes).toHaveBeenCalled();
+				expect(triggersAndPollers.runTrigger).toHaveBeenCalledWith(
+					workflow,
+					triggerNode,
+					getTriggerFunctions,
+					additionalData,
+					mode,
+					activation,
+				);
+			});
+
+			it('with polling nodes', async () => {
+				await addWorkflow({ pollNodes: [pollNode] });
+
+				expect(activeWorkflows.isActive(workflowId)).toBe(true);
+				expect(workflow.getPollNodes).toHaveBeenCalled();
+				expect(scheduledTaskManager.registerCron).toHaveBeenCalled();
+			});
+
+			it('with both trigger and polling nodes', async () => {
+				await addWorkflow({ triggerNodes: [triggerNode], pollNodes: [pollNode] });
+
+				expect(activeWorkflows.isActive(workflowId)).toBe(true);
+				expect(workflow.getTriggerNodes).toHaveBeenCalled();
+				expect(workflow.getPollNodes).toHaveBeenCalled();
+				expect(triggersAndPollers.runTrigger).toHaveBeenCalledWith(
+					workflow,
+					triggerNode,
+					getTriggerFunctions,
+					additionalData,
+					mode,
+					activation,
+				);
+				expect(scheduledTaskManager.registerCron).toHaveBeenCalled();
+				expect(triggersAndPollers.runPoll).toHaveBeenCalledWith(workflow, pollNode, pollFunctions);
+			});
+		});
+
+		describe('should throw error', () => {
+			it('if trigger activation fails', async () => {
+				const error = new Error('Trigger activation failed');
+				await expect(
+					addWorkflow({ triggerNodes: [triggerNode], triggerError: error }),
+				).rejects.toThrow(WorkflowActivationError);
+				expect(activeWorkflows.isActive(workflowId)).toBe(false);
+			});
+
+			it('if polling activation fails', async () => {
+				const error = new Error('Failed to activate polling');
+				await expect(addWorkflow({ pollNodes: [pollNode], pollError: error })).rejects.toThrow(
+					WorkflowActivationError,
+				);
+				expect(activeWorkflows.isActive(workflowId)).toBe(false);
+			});
+
+			it('if the polling interval is too short', async () => {
+				const pollTimes: PollTimes = {
+					item: [
+						{
+							mode: 'custom',
+							cronExpression: '* * * * *' as CronExpression,
+						},
+					],
+				};
+
+				await expect(addWorkflow({ pollNodes: [pollNode], pollTimes })).rejects.toThrow(
+					'The polling interval is too short. It has to be at least a minute.',
+				);
+
+				expect(scheduledTaskManager.registerCron).not.toHaveBeenCalled();
+			});
+		});
+
+		describe('should handle polling errors', () => {
+			it('should throw error when poll fails during initial testing', async () => {
+				const error = new Error('Poll function failed');
+
+				await expect(addWorkflow({ pollNodes: [pollNode], pollError: error })).rejects.toThrow(
+					WorkflowActivationError,
+				);
+
+				expect(triggersAndPollers.runPoll).toHaveBeenCalledWith(workflow, pollNode, pollFunctions);
+				expect(pollFunctions.__emit).not.toHaveBeenCalled();
+				expect(pollFunctions.__emitError).not.toHaveBeenCalled();
+			});
+
+			it('should emit error when poll fails during regular polling', async () => {
+				const error = new Error('Poll function failed');
+				triggersAndPollers.runPoll
+					.mockResolvedValueOnce(null) // Succeed on first call (testing)
+					.mockRejectedValueOnce(error); // Fail on second call (regular polling)
+
+				await addWorkflow({ pollNodes: [pollNode] });
+
+				// Get the executeTrigger function that was registered
+				const registerCronCall = scheduledTaskManager.registerCron.mock.calls[0];
+				const executeTrigger = registerCronCall[2] as () => Promise<void>;
+
+				// Execute the trigger function to simulate a regular poll
+				await executeTrigger();
+
+				expect(triggersAndPollers.runPoll).toHaveBeenCalledTimes(2);
+				expect(pollFunctions.__emit).not.toHaveBeenCalled();
+				expect(pollFunctions.__emitError).toHaveBeenCalledWith(error);
+			});
+		});
+	});
+
+	describe('remove()', () => {
+		const setupForRemoval = async () => {
+			await addWorkflow({ triggerNodes: [triggerNode] });
+			return await activeWorkflows.remove(workflowId);
+		};
+
+		it('should remove an active workflow', async () => {
+			const result = await setupForRemoval();
+
+			expect(result).toBe(true);
+			expect(activeWorkflows.isActive(workflowId)).toBe(false);
+			expect(scheduledTaskManager.deregisterCrons).toHaveBeenCalledWith(workflowId);
+			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+		});
+
+		it('should return false when removing non-existent workflow', async () => {
+			const result = await activeWorkflows.remove('non-existent');
+
+			expect(result).toBe(false);
+			expect(scheduledTaskManager.deregisterCrons).not.toHaveBeenCalled();
+		});
+
+		it('should handle TriggerCloseError when closing trigger', async () => {
+			const triggerCloseError = new TriggerCloseError(triggerNode, { level: 'warning' });
+			(triggerResponse.closeFunction as jest.Mock).mockRejectedValueOnce(triggerCloseError);
+
+			const result = await setupForRemoval();
+
+			expect(result).toBe(true);
+			expect(activeWorkflows.isActive(workflowId)).toBe(false);
+			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+			expect(errorReporter.error).toHaveBeenCalledWith(triggerCloseError, {
+				extra: { workflowId },
+			});
+		});
+
+		it('should throw WorkflowDeactivationError when closeFunction throws regular error', async () => {
+			const error = new Error('Close function failed');
+			(triggerResponse.closeFunction as jest.Mock).mockRejectedValueOnce(error);
+
+			await addWorkflow({ triggerNodes: [triggerNode] });
+
+			await expect(activeWorkflows.remove(workflowId)).rejects.toThrow(
+				`Failed to deactivate trigger of workflow ID "${workflowId}": "Close function failed"`,
+			);
+
+			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+			expect(errorReporter.error).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('get() and isActive()', () => {
+		it('should return workflow data for active workflow', async () => {
+			await addWorkflow({ triggerNodes: [triggerNode] });
+
+			expect(activeWorkflows.isActive(workflowId)).toBe(true);
+			expect(activeWorkflows.get(workflowId)).toBeDefined();
+		});
+
+		it('should return undefined for non-active workflow', () => {
+			expect(activeWorkflows.isActive('non-existent')).toBe(false);
+			expect(activeWorkflows.get('non-existent')).toBeUndefined();
+		});
+	});
+
+	describe('allActiveWorkflows()', () => {
+		it('should return all active workflow IDs', async () => {
+			await addWorkflow({ triggerNodes: [triggerNode] });
+
+			const activeIds = activeWorkflows.allActiveWorkflows();
+
+			expect(activeIds).toEqual([workflowId]);
+		});
+	});
+
+	describe('removeAllTriggerAndPollerBasedWorkflows()', () => {
+		it('should remove all active workflows', async () => {
+			await addWorkflow({ triggerNodes: [triggerNode] });
+
+			await activeWorkflows.removeAllTriggerAndPollerBasedWorkflows();
+
+			expect(activeWorkflows.allActiveWorkflows()).toEqual([]);
+			expect(scheduledTaskManager.deregisterCrons).toHaveBeenCalledWith(workflowId);
+		});
+	});
+});
diff --git a/packages/workflow/test/RoutingNode.test.ts b/packages/core/src/execution-engine/__tests__/routing-node.test.ts
similarity index 95%
rename from packages/workflow/test/RoutingNode.test.ts
rename to packages/core/src/execution-engine/__tests__/routing-node.test.ts
index a38f4551e2..5203cff3da 100644
--- a/packages/workflow/test/RoutingNode.test.ts
+++ b/packages/core/src/execution-engine/__tests__/routing-node.test.ts
@@ -1,29 +1,30 @@
 import { mock } from 'jest-mock-extended';
-
+import { get } from 'lodash';
 import type {
-	INode,
-	INodeExecutionData,
-	INodeParameters,
 	DeclarativeRestApiSettings,
-	IRunExecutionData,
-	INodeProperties,
+	IExecuteData,
 	IExecuteSingleFunctions,
 	IHttpRequestOptions,
-	ITaskDataConnections,
-	INodeExecuteFunctions,
+	IN8nHttpFullResponse,
+	IN8nHttpResponse,
 	IN8nRequestOperations,
+	INode,
 	INodeCredentialDescription,
-	IExecuteData,
+	INodeExecutionData,
+	INodeParameters,
+	INodeProperties,
+	INodeType,
 	INodeTypeDescription,
+	IRunExecutionData,
+	ITaskDataConnections,
 	IWorkflowExecuteAdditionalData,
-	IExecuteFunctions,
-} from '@/Interfaces';
-import { applyDeclarativeNodeOptionParameters } from '@/NodeHelpers';
-import { RoutingNode } from '@/RoutingNode';
-import * as utilsModule from '@/utils';
-import { Workflow } from '@/Workflow';
+} from 'n8n-workflow';
+import { NodeHelpers, Workflow } from 'n8n-workflow';
 
-import * as Helpers from './Helpers';
+import * as executionContexts from '@/execution-engine/node-execution-context';
+import { NodeTypes } from '@test/helpers';
+
+import { RoutingNode } from '../routing-node';
 
 const postReceiveFunction1 = async function (
 	this: IExecuteSingleFunctions,
@@ -42,14 +43,55 @@ const preSendFunction1 = async function (
 	return requestOptions;
 };
 
+const getExecuteSingleFunctions = (
+	workflow: Workflow,
+	runExecutionData: IRunExecutionData,
+	runIndex: number,
+	node: INode,
+	itemIndex: number,
+) =>
+	mock<executionContexts.ExecuteSingleContext>({
+		getItemIndex: () => itemIndex,
+		getNodeParameter: (parameterName: string) =>
+			workflow.expression.getParameterValue(
+				get(node.parameters, parameterName),
+				runExecutionData,
+				runIndex,
+				itemIndex,
+				node.name,
+				[],
+				'internal',
+				{},
+			),
+		getWorkflow: () => ({
+			id: workflow.id,
+			name: workflow.name,
+			active: workflow.active,
+		}),
+		helpers: mock<IExecuteSingleFunctions['helpers']>({
+			async httpRequest(
+				requestOptions: IHttpRequestOptions,
+			): Promise<IN8nHttpFullResponse | IN8nHttpResponse> {
+				return {
+					body: {
+						headers: {},
+						statusCode: 200,
+						requestOptions,
+					},
+				};
+			},
+		}),
+	});
+
 describe('RoutingNode', () => {
+	const nodeTypes = NodeTypes();
 	const additionalData = mock<IWorkflowExecuteAdditionalData>();
 
 	test('applyDeclarativeNodeOptionParameters', () => {
-		const nodeTypes = Helpers.NodeTypes();
+		const nodeTypes = NodeTypes();
 		const nodeType = nodeTypes.getByNameAndVersion('test.setMulti');
 
-		applyDeclarativeNodeOptionParameters(nodeType);
+		NodeHelpers.applyDeclarativeNodeOptionParameters(nodeType);
 
 		const options = nodeType.description.properties.find(
 			(property) => property.name === 'requestOptions',
@@ -667,7 +709,7 @@ describe('RoutingNode', () => {
 			},
 		];
 
-		const nodeTypes = Helpers.NodeTypes();
+		const nodeTypes = NodeTypes();
 		const node: INode = {
 			parameters: {},
 			name: 'test',
@@ -711,7 +753,7 @@ describe('RoutingNode', () => {
 					mode,
 				);
 
-				const executeSingleFunctions = Helpers.getExecuteSingleFunctions(
+				const executeSingleFunctions = getExecuteSingleFunctions(
 					workflow,
 					runExecutionData,
 					runIndex,
@@ -1861,7 +1903,6 @@ describe('RoutingNode', () => {
 			},
 		];
 
-		const nodeTypes = Helpers.NodeTypes();
 		const baseNode: INode = {
 			parameters: {},
 			name: 'test',
@@ -1877,7 +1918,7 @@ describe('RoutingNode', () => {
 		const connectionInputData: INodeExecutionData[] = [];
 		const runExecutionData: IRunExecutionData = { resultData: { runData: {} } };
 		const nodeType = nodeTypes.getByNameAndVersion(baseNode.type);
-		applyDeclarativeNodeOptionParameters(nodeType);
+		NodeHelpers.applyDeclarativeNodeOptionParameters(nodeType);
 
 		const propertiesOriginal = nodeType.description.properties;
 
@@ -1921,8 +1962,8 @@ describe('RoutingNode', () => {
 					source: null,
 				} as IExecuteData;
 
-				const executeFunctions = mock<IExecuteFunctions>();
-				const executeSingleFunctions = Helpers.getExecuteSingleFunctions(
+				const executeFunctions = mock<executionContexts.ExecuteContext>();
+				const executeSingleFunctions = getExecuteSingleFunctions(
 					workflow,
 					runExecutionData,
 					runIndex,
@@ -1930,10 +1971,10 @@ describe('RoutingNode', () => {
 					itemIndex,
 				);
 
-				const nodeExecuteFunctions: Partial<INodeExecuteFunctions> = {
-					getExecuteFunctions: () => executeFunctions,
-					getExecuteSingleFunctions: () => executeSingleFunctions,
-				};
+				jest.spyOn(executionContexts, 'ExecuteContext').mockReturnValue(executeFunctions);
+				jest
+					.spyOn(executionContexts, 'ExecuteSingleContext')
+					.mockReturnValue(executeSingleFunctions);
 
 				const numberOfItems = testData.input.specialTestOptions?.numberOfItems ?? 1;
 				if (!inputData.main[0] || inputData.main[0].length !== numberOfItems) {
@@ -1943,7 +1984,8 @@ describe('RoutingNode', () => {
 					}
 				}
 
-				const spy = jest.spyOn(utilsModule, 'sleep').mockReturnValue(
+				const workflowPackage = await import('n8n-workflow');
+				const spy = jest.spyOn(workflowPackage, 'sleep').mockReturnValue(
 					new Promise((resolve) => {
 						resolve();
 					}),
@@ -1956,18 +1998,13 @@ describe('RoutingNode', () => {
 				);
 
 				const getNodeParameter = executeSingleFunctions.getNodeParameter;
+				// @ts-expect-error overwriting a method
 				executeSingleFunctions.getNodeParameter = (parameterName: string) =>
 					parameterName in testData.input.node.parameters
 						? testData.input.node.parameters[parameterName]
 						: (getNodeParameter(parameterName) ?? {});
 
-				const result = await routingNode.runNode(
-					inputData,
-					runIndex,
-					nodeType,
-					executeData,
-					nodeExecuteFunctions as INodeExecuteFunctions,
-				);
+				const result = await routingNode.runNode(inputData, runIndex, nodeType, executeData);
 
 				if (testData.input.specialTestOptions?.sleepCalls) {
 					expect(spy.mock.calls).toEqual(testData.input.specialTestOptions?.sleepCalls);
@@ -2042,7 +2079,6 @@ describe('RoutingNode', () => {
 			},
 		];
 
-		const nodeTypes = Helpers.NodeTypes();
 		const baseNode: INode = {
 			parameters: {},
 			name: 'test',
@@ -2052,12 +2088,10 @@ describe('RoutingNode', () => {
 			position: [0, 0],
 		};
 
-		const mode = 'internal';
 		const runIndex = 0;
 		const itemIndex = 0;
-		const connectionInputData: INodeExecutionData[] = [];
 		const runExecutionData: IRunExecutionData = { resultData: { runData: {} } };
-		const nodeType = nodeTypes.getByNameAndVersion(baseNode.type);
+		const nodeType = mock<INodeType>();
 
 		const inputData: ITaskDataConnections = {
 			main: [
@@ -2093,53 +2127,17 @@ describe('RoutingNode', () => {
 					nodeTypes,
 				});
 
-				const routingNode = new RoutingNode(
-					workflow,
-					node,
-					connectionInputData,
-					runExecutionData ?? null,
-					additionalData,
-					mode,
-				);
-
-				const executeData = {
-					data: {},
-					node,
-					source: null,
-				} as IExecuteData;
-
 				let currentItemIndex = 0;
 				for (let iteration = 0; iteration < inputData.main[0]!.length; iteration++) {
-					const nodeExecuteFunctions: Partial<INodeExecuteFunctions> = {
-						getExecuteSingleFunctions: () => {
-							return Helpers.getExecuteSingleFunctions(
-								workflow,
-								runExecutionData,
-								runIndex,
-								node,
-								itemIndex + iteration,
-							);
-						},
-					};
-
-					if (!nodeExecuteFunctions.getExecuteSingleFunctions) {
-						fail('Expected nodeExecuteFunctions to contain getExecuteSingleFunctions');
-					}
-
-					const routingNodeExecutionContext = nodeExecuteFunctions.getExecuteSingleFunctions(
-						routingNode.workflow,
-						routingNode.runExecutionData,
+					const context = getExecuteSingleFunctions(
+						workflow,
+						runExecutionData,
 						runIndex,
-						routingNode.connectionInputData,
-						inputData,
-						routingNode.node,
-						iteration,
-						routingNode.additionalData,
-						executeData,
-						routingNode.mode,
+						node,
+						itemIndex + iteration,
 					);
-
-					currentItemIndex = routingNodeExecutionContext.getItemIndex();
+					jest.spyOn(executionContexts, 'ExecuteSingleContext').mockReturnValue(context);
+					currentItemIndex = context.getItemIndex();
 				}
 
 				const expectedItemIndex = inputData.main[0]!.length - 1;
diff --git a/packages/core/test/ScheduledTaskManager.test.ts b/packages/core/src/execution-engine/__tests__/scheduled-task-manager.test.ts
similarity index 94%
rename from packages/core/test/ScheduledTaskManager.test.ts
rename to packages/core/src/execution-engine/__tests__/scheduled-task-manager.test.ts
index 5166240856..4c39d3afbc 100644
--- a/packages/core/test/ScheduledTaskManager.test.ts
+++ b/packages/core/src/execution-engine/__tests__/scheduled-task-manager.test.ts
@@ -1,8 +1,9 @@
 import { mock } from 'jest-mock-extended';
 import type { Workflow } from 'n8n-workflow';
 
-import type { InstanceSettings } from '@/InstanceSettings';
-import { ScheduledTaskManager } from '@/ScheduledTaskManager';
+import type { InstanceSettings } from '@/instance-settings';
+
+import { ScheduledTaskManager } from '../scheduled-task-manager';
 
 describe('ScheduledTaskManager', () => {
 	const instanceSettings = mock<InstanceSettings>({ isLeader: true });
diff --git a/packages/core/test/SSHClientsManager.test.ts b/packages/core/src/execution-engine/__tests__/ssh-clients-manager.test.ts
similarity index 97%
rename from packages/core/test/SSHClientsManager.test.ts
rename to packages/core/src/execution-engine/__tests__/ssh-clients-manager.test.ts
index 132a54baef..d58fe22802 100644
--- a/packages/core/test/SSHClientsManager.test.ts
+++ b/packages/core/src/execution-engine/__tests__/ssh-clients-manager.test.ts
@@ -1,7 +1,7 @@
 import type { SSHCredentials } from 'n8n-workflow';
 import { Client } from 'ssh2';
 
-import { SSHClientsManager } from '@/SSHClientsManager';
+import { SSHClientsManager } from '../ssh-clients-manager';
 
 describe('SSHClientsManager', () => {
 	const credentials: SSHCredentials = {
diff --git a/packages/core/src/execution-engine/__tests__/triggers-and-pollers.test.ts b/packages/core/src/execution-engine/__tests__/triggers-and-pollers.test.ts
new file mode 100644
index 0000000000..0b7b9cd4a4
--- /dev/null
+++ b/packages/core/src/execution-engine/__tests__/triggers-and-pollers.test.ts
@@ -0,0 +1,163 @@
+import { mock } from 'jest-mock-extended';
+import { ApplicationError } from 'n8n-workflow';
+import type {
+	Workflow,
+	INode,
+	INodeExecutionData,
+	IPollFunctions,
+	IWorkflowExecuteAdditionalData,
+	INodeType,
+	INodeTypes,
+	ITriggerFunctions,
+	WorkflowHooks,
+	IRun,
+} from 'n8n-workflow';
+
+import { TriggersAndPollers } from '../triggers-and-pollers';
+
+describe('TriggersAndPollers', () => {
+	const node = mock<INode>();
+	const nodeType = mock<INodeType>({
+		trigger: undefined,
+		poll: undefined,
+	});
+	const nodeTypes = mock<INodeTypes>();
+	const workflow = mock<Workflow>({ nodeTypes });
+	const hookFunctions = mock<WorkflowHooks['hookFunctions']>({
+		sendResponse: [],
+		workflowExecuteAfter: [],
+	});
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({
+		hooks: {
+			hookFunctions,
+		},
+	});
+	const triggersAndPollers = new TriggersAndPollers();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+	});
+
+	describe('runTrigger()', () => {
+		const triggerFunctions = mock<ITriggerFunctions>();
+		const getTriggerFunctions = jest.fn().mockReturnValue(triggerFunctions);
+		const triggerFn = jest.fn();
+		const mockEmitData: INodeExecutionData[][] = [[{ json: { data: 'test' } }]];
+
+		const runTriggerHelper = async (mode: 'manual' | 'trigger' = 'trigger') =>
+			await triggersAndPollers.runTrigger(
+				workflow,
+				node,
+				getTriggerFunctions,
+				additionalData,
+				mode,
+				'init',
+			);
+
+		it('should throw error if node type does not have trigger function', async () => {
+			await expect(runTriggerHelper()).rejects.toThrow(ApplicationError);
+		});
+
+		it('should call trigger function in regular mode', async () => {
+			nodeType.trigger = triggerFn;
+			triggerFn.mockResolvedValue({ test: true });
+
+			const result = await runTriggerHelper();
+
+			expect(triggerFn).toHaveBeenCalled();
+			expect(result).toEqual({ test: true });
+		});
+
+		describe('manual mode', () => {
+			const getMockTriggerFunctions = () => getTriggerFunctions.mock.results[0]?.value;
+
+			beforeEach(() => {
+				nodeType.trigger = triggerFn;
+				triggerFn.mockResolvedValue({ workflowId: '123' });
+			});
+
+			it('should handle promise resolution', async () => {
+				const result = await runTriggerHelper('manual');
+
+				expect(result?.manualTriggerResponse).toBeInstanceOf(Promise);
+				getMockTriggerFunctions()?.emit?.(mockEmitData);
+			});
+
+			it('should handle error emission', async () => {
+				const testError = new Error('Test error');
+				const result = await runTriggerHelper('manual');
+
+				getMockTriggerFunctions()?.emitError?.(testError);
+				await expect(result?.manualTriggerResponse).rejects.toThrow(testError);
+			});
+
+			it('should handle response promise', async () => {
+				const responsePromise = { resolve: jest.fn(), reject: jest.fn() };
+				await runTriggerHelper('manual');
+
+				getMockTriggerFunctions()?.emit?.(mockEmitData, responsePromise);
+
+				expect(hookFunctions.sendResponse?.length).toBe(1);
+				await hookFunctions.sendResponse![0]?.({ testResponse: true });
+				expect(responsePromise.resolve).toHaveBeenCalledWith({ testResponse: true });
+			});
+
+			it('should handle both response and done promises', async () => {
+				const responsePromise = { resolve: jest.fn(), reject: jest.fn() };
+				const donePromise = { resolve: jest.fn(), reject: jest.fn() };
+				const mockRunData = mock<IRun>({ data: { resultData: { runData: {} } } });
+
+				await runTriggerHelper('manual');
+				getMockTriggerFunctions()?.emit?.(mockEmitData, responsePromise, donePromise);
+
+				await hookFunctions.sendResponse![0]?.({ testResponse: true });
+				expect(responsePromise.resolve).toHaveBeenCalledWith({ testResponse: true });
+
+				await hookFunctions.workflowExecuteAfter?.[0]?.(mockRunData, {});
+				expect(donePromise.resolve).toHaveBeenCalledWith(mockRunData);
+			});
+		});
+	});
+
+	describe('runPoll()', () => {
+		const pollFunctions = mock<IPollFunctions>();
+		const pollFn = jest.fn();
+
+		const runPollHelper = async () =>
+			await triggersAndPollers.runPoll(workflow, node, pollFunctions);
+
+		it('should throw error if node type does not have poll function', async () => {
+			await expect(runPollHelper()).rejects.toThrow(ApplicationError);
+		});
+
+		it('should call poll function and return result', async () => {
+			const mockPollResult: INodeExecutionData[][] = [[{ json: { data: 'test' } }]];
+			nodeType.poll = pollFn;
+			pollFn.mockResolvedValue(mockPollResult);
+
+			const result = await runPollHelper();
+
+			expect(pollFn).toHaveBeenCalled();
+			expect(result).toBe(mockPollResult);
+		});
+
+		it('should return null if poll function returns no data', async () => {
+			nodeType.poll = pollFn;
+			pollFn.mockResolvedValue(null);
+
+			const result = await runPollHelper();
+
+			expect(pollFn).toHaveBeenCalled();
+			expect(result).toBeNull();
+		});
+
+		it('should propagate errors from poll function', async () => {
+			nodeType.poll = pollFn;
+			pollFn.mockRejectedValue(new Error('Poll function failed'));
+
+			await expect(runPollHelper()).rejects.toThrow('Poll function failed');
+			expect(pollFn).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts b/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
new file mode 100644
index 0000000000..3bdc4b5c78
--- /dev/null
+++ b/packages/core/src/execution-engine/__tests__/workflow-execute.test.ts
@@ -0,0 +1,1360 @@
+// 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 { mock } from 'jest-mock-extended';
+import { pick } from 'lodash';
+import type {
+	ExecutionBaseError,
+	IConnection,
+	IExecuteData,
+	INode,
+	INodeExecutionData,
+	INodeType,
+	INodeTypes,
+	IPinData,
+	IRun,
+	IRunData,
+	IRunExecutionData,
+	ITriggerResponse,
+	IWorkflowExecuteAdditionalData,
+	WorkflowTestData,
+	RelatedExecution,
+} from 'n8n-workflow';
+import {
+	ApplicationError,
+	createDeferredPromise,
+	NodeConnectionType,
+	NodeExecutionOutput,
+	NodeHelpers,
+	Workflow,
+} from 'n8n-workflow';
+
+import * as Helpers from '@test/helpers';
+import { legacyWorkflowExecuteTests, v1WorkflowExecuteTests } from '@test/helpers/constants';
+
+import { DirectedGraph } from '../partial-execution-utils';
+import * as partialExecutionUtils from '../partial-execution-utils';
+import { createNodeData, toITaskData } from '../partial-execution-utils/__tests__/helpers';
+import { WorkflowExecute } from '../workflow-execute';
+
+const nodeTypes = Helpers.NodeTypes();
+
+describe('WorkflowExecute', () => {
+	describe('v0 execution order', () => {
+		const tests: WorkflowTestData[] = legacyWorkflowExecuteTests;
+
+		const executionMode = 'manual';
+
+		for (const testData of tests) {
+			test(testData.description, async () => {
+				const workflowInstance = new Workflow({
+					id: 'test',
+					nodes: testData.input.workflowData.nodes,
+					connections: testData.input.workflowData.connections,
+					active: false,
+					nodeTypes,
+					settings: {
+						executionOrder: 'v0',
+					},
+				});
+
+				const waitPromise = createDeferredPromise<IRun>();
+				const nodeExecutionOrder: string[] = [];
+				const additionalData = Helpers.WorkflowExecuteAdditionalData(
+					waitPromise,
+					nodeExecutionOrder,
+				);
+
+				const workflowExecute = new WorkflowExecute(additionalData, executionMode);
+
+				const executionData = await workflowExecute.run(workflowInstance);
+
+				const result = await waitPromise.promise;
+
+				// Check if the data from WorkflowExecute is identical to data received
+				// by the webhooks
+				expect(executionData).toEqual(result);
+
+				// Check if the output data of the nodes is correct
+				for (const nodeName of Object.keys(testData.output.nodeData)) {
+					if (result.data.resultData.runData[nodeName] === undefined) {
+						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
+					}
+
+					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
+						if (nodeData.data === undefined) {
+							return null;
+						}
+						return nodeData.data.main[0]!.map((entry) => entry.json);
+					});
+
+					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+				}
+
+				// Check if the nodes did execute in the correct order
+				expect(nodeExecutionOrder).toEqual(testData.output.nodeExecutionOrder);
+
+				// Check if other data has correct value
+				expect(result.finished).toEqual(true);
+				expect(result.data.executionData!.contextData).toEqual({});
+				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
+			});
+		}
+	});
+
+	describe('v1 execution order', () => {
+		const tests: WorkflowTestData[] = v1WorkflowExecuteTests;
+
+		const executionMode = 'manual';
+		const nodeTypes = Helpers.NodeTypes();
+
+		for (const testData of tests) {
+			test(testData.description, async () => {
+				const workflowInstance = new Workflow({
+					id: 'test',
+					nodes: testData.input.workflowData.nodes,
+					connections: testData.input.workflowData.connections,
+					active: false,
+					nodeTypes,
+					settings: {
+						executionOrder: 'v1',
+					},
+				});
+
+				const waitPromise = createDeferredPromise<IRun>();
+				const nodeExecutionOrder: string[] = [];
+				const additionalData = Helpers.WorkflowExecuteAdditionalData(
+					waitPromise,
+					nodeExecutionOrder,
+				);
+
+				const workflowExecute = new WorkflowExecute(additionalData, executionMode);
+
+				const executionData = await workflowExecute.run(workflowInstance);
+
+				const result = await waitPromise.promise;
+
+				// Check if the data from WorkflowExecute is identical to data received
+				// by the webhooks
+				expect(executionData).toEqual(result);
+
+				// Check if the output data of the nodes is correct
+				for (const nodeName of Object.keys(testData.output.nodeData)) {
+					if (result.data.resultData.runData[nodeName] === undefined) {
+						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
+					}
+
+					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
+						if (nodeData.data === undefined) {
+							return null;
+						}
+						const toMap = testData.output.testAllOutputs
+							? nodeData.data.main
+							: [nodeData.data.main[0]!];
+						return toMap.map((data) => data!.map((entry) => entry.json));
+					});
+
+					// expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+				}
+
+				// Check if the nodes did execute in the correct order
+				expect(nodeExecutionOrder).toEqual(testData.output.nodeExecutionOrder);
+
+				// Check if other data has correct value
+				expect(result.finished).toEqual(true);
+				expect(result.data.executionData!.contextData).toEqual({});
+				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
+			});
+		}
+	});
+
+	//run tests on json files from specified directory, default 'workflows'
+	//workflows must have pinned data that would be used to test output after execution
+	describe('run test workflows', () => {
+		const tests: WorkflowTestData[] = Helpers.workflowToTests(__dirname);
+
+		const executionMode = 'manual';
+		const nodeTypes = Helpers.NodeTypes(Helpers.getNodeTypes(tests));
+
+		for (const testData of tests) {
+			test(testData.description, async () => {
+				const workflowInstance = new Workflow({
+					id: 'test',
+					nodes: testData.input.workflowData.nodes,
+					connections: testData.input.workflowData.connections,
+					active: false,
+					nodeTypes,
+					settings: testData.input.workflowData.settings,
+				});
+
+				const waitPromise = createDeferredPromise<IRun>();
+				const nodeExecutionOrder: string[] = [];
+				const additionalData = Helpers.WorkflowExecuteAdditionalData(
+					waitPromise,
+					nodeExecutionOrder,
+				);
+
+				const workflowExecute = new WorkflowExecute(additionalData, executionMode);
+
+				const executionData = await workflowExecute.run(workflowInstance);
+
+				const result = await waitPromise.promise;
+
+				// Check if the data from WorkflowExecute is identical to data received
+				// by the webhooks
+				expect(executionData).toEqual(result);
+
+				// Check if the output data of the nodes is correct
+				for (const nodeName of Object.keys(testData.output.nodeData)) {
+					if (result.data.resultData.runData[nodeName] === undefined) {
+						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
+					}
+
+					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
+						if (nodeData.data === undefined) {
+							return null;
+						}
+						return nodeData.data.main[0]!.map((entry) => {
+							// remove pairedItem from entry if it is an error output test
+							if (testData.description.includes('error_outputs')) delete entry.pairedItem;
+							return entry;
+						});
+					});
+
+					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+				}
+
+				// Check if other data has correct value
+				expect(result.finished).toEqual(true);
+				// expect(result.data.executionData!.contextData).toEqual({}); //Fails when test workflow Includes splitInbatches
+				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
+			});
+		}
+	});
+
+	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 } }]],
+			[{ message: 'TEXT HINT' }],
+		);
+
+		expect(nodeExecutionOutput).toBeInstanceOf(NodeExecutionOutput);
+		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);
+		});
+
+		//                             ►►
+		//                ┌────┐0     ┌─────────┐
+		// ┌───────┐1     │    ├──────►afterLoop│
+		// │trigger├───┬──►loop│1     └─────────┘
+		// └───────┘   │  │    ├─┐
+		//             │  └────┘ │
+		//             │         │ ┌──────┐1
+		//             │         └─►inLoop├─┐
+		//             │           └──────┘ │
+		//             └────────────────────┘
+		test('passes filtered run data to `recreateNodeExecutionStack`', 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 loop = createNodeData({ name: 'loop', type: 'n8n-nodes-base.splitInBatches' });
+			const inLoop = createNodeData({ name: 'inLoop' });
+			const afterLoop = createNodeData({ name: 'afterLoop' });
+			const workflow = new DirectedGraph()
+				.addNodes(trigger, loop, inLoop, afterLoop)
+				.addConnections(
+					{ from: trigger, to: loop },
+					{ from: loop, to: afterLoop },
+					{ from: loop, to: inLoop, outputIndex: 1 },
+					{ from: inLoop, to: loop },
+				)
+				.toWorkflow({ name: '', active: false, nodeTypes });
+
+			const pinData: IPinData = {};
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
+				[loop.name]: [toITaskData([{ data: { nodeName: loop.name }, outputIndex: 1 }])],
+				[inLoop.name]: [toITaskData([{ data: { nodeName: inLoop.name } }])],
+			};
+			const dirtyNodeNames: string[] = [];
+
+			jest.spyOn(workflowExecute, 'processRunExecutionData').mockImplementationOnce(jest.fn());
+			const recreateNodeExecutionStackSpy = jest.spyOn(
+				partialExecutionUtils,
+				'recreateNodeExecutionStack',
+			);
+
+			// ACT
+			await workflowExecute.runPartialWorkflow2(
+				workflow,
+				runData,
+				pinData,
+				dirtyNodeNames,
+				afterLoop.name,
+			);
+
+			// ASSERT
+			expect(recreateNodeExecutionStackSpy).toHaveBeenNthCalledWith(
+				1,
+				expect.any(DirectedGraph),
+				expect.any(Set),
+				// The run data should only contain the trigger node because the loop
+				// node has no data on the done branch. That means we have to rerun the
+				// whole loop, because we don't know how many iterations would be left.
+				pick(runData, trigger.name),
+				expect.any(Object),
+			);
+		});
+
+		// ┌───────┐    ┌─────┐
+		// │trigger├┬──►│node1│
+		// └───────┘│   └─────┘
+		//          │   ┌─────┐
+		//          └──►│node2│
+		//              └─────┘
+		test('passes subgraph to `cleanRunData`', 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: trigger, to: node2 })
+				.toWorkflow({ name: '', active: false, nodeTypes });
+
+			const pinData: IPinData = {};
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { value: 1 } }])],
+				[node1.name]: [toITaskData([{ data: { nodeName: node1.name } }])],
+				[node2.name]: [toITaskData([{ data: { nodeName: node2.name } }])],
+			};
+			const dirtyNodeNames: string[] = [];
+
+			jest.spyOn(workflowExecute, 'processRunExecutionData').mockImplementationOnce(jest.fn());
+			const cleanRunDataSpy = jest.spyOn(partialExecutionUtils, 'cleanRunData');
+
+			// ACT
+			await workflowExecute.runPartialWorkflow2(
+				workflow,
+				runData,
+				pinData,
+				dirtyNodeNames,
+				node1.name,
+			);
+
+			// ASSERT
+			expect(cleanRunDataSpy).toHaveBeenNthCalledWith(
+				1,
+				runData,
+				new DirectedGraph().addNodes(trigger, node1).addConnections({ from: trigger, to: node1 }),
+				new Set([node1]),
+			);
+		});
+	});
+
+	describe('checkReadyForExecution', () => {
+		const disabledNode = mock<INode>({ name: 'Disabled Node', disabled: true });
+		const startNode = mock<INode>({ name: 'Start Node' });
+		const unknownNode = mock<INode>({ name: 'Unknown Node', type: 'unknownNode' });
+
+		const nodeParamIssuesSpy = jest.spyOn(NodeHelpers, 'getNodeParametersIssues');
+
+		const nodeTypes = mock<INodeTypes>();
+		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
+			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
+			if (type === 'unknownNode') return undefined as unknown as INodeType;
+			return mock<INodeType>({
+				description: {
+					properties: [],
+				},
+			});
+		});
+		const workflowExecute = new WorkflowExecute(mock(), 'manual');
+
+		beforeEach(() => jest.clearAllMocks());
+
+		it('should return null if there are no nodes', () => {
+			const workflow = new Workflow({
+				nodes: [],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+
+			const issues = workflowExecute.checkReadyForExecution(workflow);
+			expect(issues).toBe(null);
+			expect(nodeTypes.getByNameAndVersion).not.toHaveBeenCalled();
+			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
+		});
+
+		it('should return null if there are no enabled nodes', () => {
+			const workflow = new Workflow({
+				nodes: [disabledNode],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+
+			const issues = workflowExecute.checkReadyForExecution(workflow, {
+				startNode: disabledNode.name,
+			});
+			expect(issues).toBe(null);
+			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(1);
+			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
+		});
+
+		it('should return typeUnknown for unknown nodes', () => {
+			const workflow = new Workflow({
+				nodes: [unknownNode],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+
+			const issues = workflowExecute.checkReadyForExecution(workflow, {
+				startNode: unknownNode.name,
+			});
+			expect(issues).toEqual({ [unknownNode.name]: { typeUnknown: true } });
+			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(2);
+			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
+		});
+
+		it('should return issues for regular nodes', () => {
+			const workflow = new Workflow({
+				nodes: [startNode],
+				connections: {},
+				active: false,
+				nodeTypes,
+			});
+			nodeParamIssuesSpy.mockReturnValue({ execution: false });
+
+			const issues = workflowExecute.checkReadyForExecution(workflow, {
+				startNode: startNode.name,
+			});
+			expect(issues).toEqual({ [startNode.name]: { execution: false } });
+			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(2);
+			expect(nodeParamIssuesSpy).toHaveBeenCalled();
+		});
+	});
+
+	describe('runNode', () => {
+		const nodeTypes = mock<INodeTypes>();
+		const triggerNode = mock<INode>();
+		const triggerResponse = mock<ITriggerResponse>({
+			closeFunction: jest.fn(),
+			// This node should never trigger, or return
+			manualTriggerFunction: async () => await new Promise(() => {}),
+		});
+		const triggerNodeType = mock<INodeType>({
+			description: {
+				properties: [],
+			},
+			execute: undefined,
+			poll: undefined,
+			webhook: undefined,
+			async trigger() {
+				return triggerResponse;
+			},
+		});
+
+		nodeTypes.getByNameAndVersion.mockReturnValue(triggerNodeType);
+
+		const workflow = new Workflow({
+			nodeTypes,
+			nodes: [triggerNode],
+			connections: {},
+			active: false,
+		});
+
+		const executionData = mock<IExecuteData>();
+		const runExecutionData = mock<IRunExecutionData>();
+		const additionalData = mock<IWorkflowExecuteAdditionalData>();
+		const abortController = new AbortController();
+		const workflowExecute = new WorkflowExecute(additionalData, 'manual');
+
+		test('should call closeFunction when manual trigger is aborted', async () => {
+			const runPromise = workflowExecute.runNode(
+				workflow,
+				executionData,
+				runExecutionData,
+				0,
+				additionalData,
+				'manual',
+				abortController.signal,
+			);
+			// Yield back to the event-loop to let async parts of `runNode` execute
+			await new Promise((resolve) => setImmediate(resolve));
+
+			let isSettled = false;
+			void runPromise.then(() => {
+				isSettled = true;
+			});
+			expect(isSettled).toBe(false);
+			expect(abortController.signal.aborted).toBe(false);
+			expect(triggerResponse.closeFunction).not.toHaveBeenCalled();
+
+			abortController.abort();
+			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+		});
+	});
+
+	describe('handleNodeErrorOutput', () => {
+		const testNode: INode = {
+			id: '1',
+			name: 'Node1',
+			type: 'test.set',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {},
+		};
+
+		const nodeType = mock<INodeType>({
+			description: {
+				name: 'test',
+				displayName: 'test',
+				defaultVersion: 1,
+				properties: [],
+				inputs: [{ type: NodeConnectionType.Main }],
+				outputs: [
+					{ type: NodeConnectionType.Main },
+					{ type: NodeConnectionType.Main, category: 'error' },
+				],
+			},
+		});
+
+		const nodeTypes = mock<INodeTypes>();
+
+		const workflow = new Workflow({
+			id: 'test',
+			nodes: [testNode],
+			connections: {},
+			active: false,
+			nodeTypes,
+		});
+
+		const executionData = {
+			node: workflow.nodes.Node1,
+			data: {
+				main: [
+					[
+						{
+							json: { data: 'test' },
+							pairedItem: { item: 0, input: 0 },
+						},
+					],
+				],
+			},
+			source: {
+				[NodeConnectionType.Main]: [
+					{
+						previousNode: 'previousNode',
+						previousNodeOutput: 0,
+						previousNodeRun: 0,
+					},
+				],
+			},
+		};
+
+		const runExecutionData: IRunExecutionData = {
+			resultData: {
+				runData: {
+					previousNode: [
+						{
+							data: {
+								main: [[{ json: { someData: 'test' } }]],
+							},
+							source: [],
+							startTime: 0,
+							executionTime: 0,
+						},
+					],
+				},
+			},
+		};
+
+		let workflowExecute: WorkflowExecute;
+
+		beforeEach(() => {
+			jest.clearAllMocks();
+
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+
+			workflowExecute = new WorkflowExecute(mock(), 'manual', runExecutionData);
+		});
+
+		test('should handle undefined error data input correctly', () => {
+			const nodeSuccessData: INodeExecutionData[][] = [
+				[undefined as unknown as INodeExecutionData],
+			];
+			workflowExecute.handleNodeErrorOutput(workflow, executionData, nodeSuccessData, 0);
+			expect(nodeSuccessData[0]).toEqual([undefined]);
+			expect(nodeSuccessData[1]).toEqual([]);
+		});
+
+		test('should handle empty input', () => {
+			const nodeSuccessData: INodeExecutionData[][] = [[]];
+
+			workflowExecute.handleNodeErrorOutput(workflow, executionData, nodeSuccessData, 0);
+
+			expect(nodeSuccessData[0]).toHaveLength(0);
+			expect(nodeSuccessData[1]).toHaveLength(0);
+		});
+
+		test('should route error items to last output', () => {
+			const nodeSuccessData: INodeExecutionData[][] = [
+				[
+					{
+						json: { error: 'Test error', additionalData: 'preserved' },
+						pairedItem: { item: 0, input: 0 },
+					},
+					{
+						json: { regularData: 'success' },
+						pairedItem: { item: 1, input: 0 },
+					},
+				],
+			];
+
+			workflowExecute.handleNodeErrorOutput(workflow, executionData, nodeSuccessData, 0);
+
+			expect(nodeSuccessData[0]).toEqual([
+				{
+					json: { additionalData: 'preserved', error: 'Test error' },
+					pairedItem: { item: 0, input: 0 },
+				},
+				{ json: { regularData: 'success' }, pairedItem: { item: 1, input: 0 } },
+			]);
+			expect(nodeSuccessData[1]).toEqual([]);
+		});
+
+		test('should handle error in json with message property', () => {
+			const nodeSuccessData: INodeExecutionData[][] = [
+				[
+					{
+						json: {
+							error: 'Error occurred',
+							message: 'Error details',
+						},
+						pairedItem: { item: 0, input: 0 },
+					},
+				],
+			];
+
+			workflowExecute.handleNodeErrorOutput(workflow, executionData, nodeSuccessData, 0);
+
+			expect(nodeSuccessData[0]).toEqual([]);
+			expect(nodeSuccessData[1]).toEqual([
+				{
+					json: {
+						error: 'Error occurred',
+						message: 'Error details',
+						someData: 'test',
+					},
+					pairedItem: { item: 0, input: 0 },
+				},
+			]);
+		});
+
+		test('should preserve pairedItem data when routing errors', () => {
+			const nodeSuccessData: INodeExecutionData[][] = [
+				[
+					{
+						json: { error: 'Test error' },
+						pairedItem: [
+							{ item: 0, input: 0 },
+							{ item: 1, input: 1 },
+						],
+					},
+				],
+			];
+
+			workflowExecute.handleNodeErrorOutput(workflow, executionData, nodeSuccessData, 0);
+
+			expect(nodeSuccessData[0]).toEqual([]);
+			expect(nodeSuccessData[1]).toEqual([
+				{
+					json: { someData: 'test', error: 'Test error' },
+					pairedItem: [
+						{ item: 0, input: 0 },
+						{ item: 1, input: 1 },
+					],
+				},
+			]);
+		});
+
+		test('should route multiple error items correctly', () => {
+			const nodeSuccessData: INodeExecutionData[][] = [
+				[
+					{
+						json: { error: 'Error 1', data: 'preserved1' },
+						pairedItem: { item: 0, input: 0 },
+					},
+					{
+						json: { error: 'Error 2', data: 'preserved2' },
+						pairedItem: { item: 1, input: 0 },
+					},
+				],
+			];
+
+			workflowExecute.handleNodeErrorOutput(workflow, executionData, nodeSuccessData, 0);
+
+			expect(nodeSuccessData[1]).toEqual([]);
+			expect(nodeSuccessData[0]).toEqual([
+				{
+					json: { error: 'Error 1', data: 'preserved1' },
+					pairedItem: { item: 0, input: 0 },
+				},
+				{
+					json: { error: 'Error 2', data: 'preserved2' },
+					pairedItem: { item: 1, input: 0 },
+				},
+			]);
+		});
+
+		test('should handle complex pairedItem data correctly', () => {
+			const nodeSuccessData: INodeExecutionData[][] = [
+				[
+					{
+						json: { error: 'Test error' },
+						pairedItem: [
+							{ item: 0, input: 0 },
+							{ item: 1, input: 1 },
+						],
+					},
+				],
+			];
+
+			workflowExecute.handleNodeErrorOutput(workflow, executionData, nodeSuccessData, 0);
+
+			expect(nodeSuccessData[0]).toEqual([]);
+			expect(nodeSuccessData[1]).toEqual([
+				{
+					json: { someData: 'test', error: 'Test error' },
+					pairedItem: [
+						{ item: 0, input: 0 },
+						{ item: 1, input: 1 },
+					],
+				},
+			]);
+		});
+	});
+
+	describe('prepareWaitingToExecution', () => {
+		let runExecutionData: IRunExecutionData;
+		let workflowExecute: WorkflowExecute;
+
+		beforeEach(() => {
+			runExecutionData = {
+				startData: {},
+				resultData: {
+					runData: {},
+					pinData: {},
+				},
+				executionData: {
+					contextData: {},
+					nodeExecutionStack: [],
+					metadata: {},
+					waitingExecution: {},
+					waitingExecutionSource: {},
+				},
+			};
+			workflowExecute = new WorkflowExecute(mock(), 'manual', runExecutionData);
+		});
+
+		test('should initialize waitingExecutionSource if undefined', () => {
+			runExecutionData.executionData!.waitingExecutionSource = null;
+			const nodeName = 'testNode';
+			const numberOfConnections = 2;
+			const runIndex = 0;
+
+			workflowExecute.prepareWaitingToExecution(nodeName, numberOfConnections, runIndex);
+
+			expect(runExecutionData.executionData?.waitingExecutionSource).toBeDefined();
+		});
+
+		test('should create arrays of correct length with null values', () => {
+			const nodeName = 'testNode';
+			const numberOfConnections = 3;
+			const runIndex = 0;
+			runExecutionData.executionData!.waitingExecution[nodeName] = {};
+
+			workflowExecute.prepareWaitingToExecution(nodeName, numberOfConnections, runIndex);
+
+			const nodeWaiting = runExecutionData.executionData!.waitingExecution[nodeName];
+			const nodeWaitingSource = runExecutionData.executionData!.waitingExecutionSource![nodeName];
+
+			expect(nodeWaiting[runIndex].main).toHaveLength(3);
+			expect(nodeWaiting[runIndex].main).toEqual([null, null, null]);
+			expect(nodeWaitingSource[runIndex].main).toHaveLength(3);
+			expect(nodeWaitingSource[runIndex].main).toEqual([null, null, null]);
+		});
+
+		test('should work with zero connections', () => {
+			const nodeName = 'testNode';
+			const numberOfConnections = 0;
+			const runIndex = 0;
+			runExecutionData.executionData!.waitingExecution[nodeName] = {};
+
+			workflowExecute.prepareWaitingToExecution(nodeName, numberOfConnections, runIndex);
+
+			expect(
+				runExecutionData.executionData!.waitingExecution[nodeName][runIndex].main,
+			).toHaveLength(0);
+			expect(
+				runExecutionData.executionData!.waitingExecutionSource![nodeName][runIndex].main,
+			).toHaveLength(0);
+		});
+
+		test('should handle multiple run indices', () => {
+			const nodeName = 'testNode';
+			const numberOfConnections = 2;
+			runExecutionData.executionData!.waitingExecution[nodeName] = {};
+
+			workflowExecute.prepareWaitingToExecution(nodeName, numberOfConnections, 0);
+			workflowExecute.prepareWaitingToExecution(nodeName, numberOfConnections, 1);
+
+			const nodeWaiting = runExecutionData.executionData!.waitingExecution[nodeName];
+			const nodeWaitingSource = runExecutionData.executionData!.waitingExecutionSource![nodeName];
+
+			expect(nodeWaiting[0].main).toHaveLength(2);
+			expect(nodeWaiting[1].main).toHaveLength(2);
+			expect(nodeWaitingSource[0].main).toHaveLength(2);
+			expect(nodeWaitingSource[1].main).toHaveLength(2);
+		});
+	});
+
+	describe('incomingConnectionIsEmpty', () => {
+		let workflowExecute: WorkflowExecute;
+
+		beforeEach(() => {
+			workflowExecute = new WorkflowExecute(mock(), 'manual');
+		});
+
+		test('should return true when there are no input connections', () => {
+			const result = workflowExecute.incomingConnectionIsEmpty({}, [], 0);
+			expect(result).toBe(true);
+		});
+
+		test('should return true when all input connections have no data', () => {
+			const runData: IRunData = {
+				node1: [
+					{
+						source: [],
+						data: { main: [[], []] },
+						startTime: 0,
+						executionTime: 0,
+					},
+				],
+			};
+
+			const inputConnections: IConnection[] = [
+				{ node: 'node1', type: NodeConnectionType.Main, index: 0 },
+				{ node: 'node1', type: NodeConnectionType.Main, index: 1 },
+			];
+
+			const result = workflowExecute.incomingConnectionIsEmpty(runData, inputConnections, 0);
+			expect(result).toBe(true);
+		});
+
+		test('should return true when input connection node does not exist in runData', () => {
+			const runData: IRunData = {};
+			const inputConnections: IConnection[] = [
+				{ node: 'nonexistentNode', type: NodeConnectionType.Main, index: 0 },
+			];
+
+			const result = workflowExecute.incomingConnectionIsEmpty(runData, inputConnections, 0);
+			expect(result).toBe(true);
+		});
+
+		test('should return false when any input connection has data', () => {
+			const runData: IRunData = {
+				node1: [
+					{
+						source: [],
+						data: {
+							main: [[{ json: { data: 'test' } }], []],
+						},
+						startTime: 0,
+						executionTime: 0,
+					},
+				],
+			};
+
+			const inputConnections: IConnection[] = [
+				{ node: 'node1', type: NodeConnectionType.Main, index: 0 },
+				{ node: 'node1', type: NodeConnectionType.Main, index: 1 },
+			];
+
+			const result = workflowExecute.incomingConnectionIsEmpty(runData, inputConnections, 0);
+			expect(result).toBe(false);
+		});
+
+		test('should check correct run index', () => {
+			const runData: IRunData = {
+				node1: [
+					{
+						source: [],
+						data: {
+							main: [[]],
+						},
+						startTime: 0,
+						executionTime: 0,
+					},
+					{
+						source: [],
+						data: {
+							main: [[{ json: { data: 'test' } }]],
+						},
+						startTime: 0,
+						executionTime: 0,
+					},
+				],
+			};
+
+			const inputConnections: IConnection[] = [
+				{ node: 'node1', type: NodeConnectionType.Main, index: 0 },
+			];
+
+			expect(workflowExecute.incomingConnectionIsEmpty(runData, inputConnections, 0)).toBe(true);
+			expect(workflowExecute.incomingConnectionIsEmpty(runData, inputConnections, 1)).toBe(false);
+		});
+
+		test('should handle undefined data in runData correctly', () => {
+			const runData: IRunData = {
+				node1: [
+					{
+						source: [],
+						startTime: 0,
+						executionTime: 0,
+					},
+				],
+			};
+
+			const inputConnections: IConnection[] = [
+				{ node: 'node1', type: NodeConnectionType.Main, index: 0 },
+			];
+
+			const result = workflowExecute.incomingConnectionIsEmpty(runData, inputConnections, 0);
+			expect(result).toBe(true);
+		});
+	});
+
+	describe('moveNodeMetadata', () => {
+		let runExecutionData: IRunExecutionData;
+		let workflowExecute: WorkflowExecute;
+		const parentExecution = mock<RelatedExecution>();
+
+		beforeEach(() => {
+			runExecutionData = {
+				startData: {},
+				resultData: {
+					runData: {},
+					pinData: {},
+				},
+				executionData: {
+					contextData: {},
+					nodeExecutionStack: [],
+					metadata: {},
+					waitingExecution: {},
+					waitingExecutionSource: {},
+				},
+			};
+			workflowExecute = new WorkflowExecute(mock(), 'manual', runExecutionData);
+		});
+
+		test('should do nothing when there is no metadata', () => {
+			runExecutionData.resultData.runData = {
+				node1: [{ startTime: 0, executionTime: 0, source: [] }],
+			};
+
+			workflowExecute.moveNodeMetadata();
+
+			expect(runExecutionData.resultData.runData.node1[0].metadata).toBeUndefined();
+		});
+
+		test('should merge metadata into runData for single node', () => {
+			runExecutionData.resultData.runData = {
+				node1: [{ startTime: 0, executionTime: 0, source: [] }],
+			};
+			runExecutionData.executionData!.metadata = {
+				node1: [{ parentExecution }],
+			};
+
+			workflowExecute.moveNodeMetadata();
+
+			expect(runExecutionData.resultData.runData.node1[0].metadata).toEqual({ parentExecution });
+		});
+
+		test('should merge metadata into runData for multiple nodes', () => {
+			runExecutionData.resultData.runData = {
+				node1: [{ startTime: 0, executionTime: 0, source: [] }],
+				node2: [{ startTime: 0, executionTime: 0, source: [] }],
+			};
+			runExecutionData.executionData!.metadata = {
+				node1: [{ parentExecution }],
+				node2: [{ subExecutionsCount: 4 }],
+			};
+
+			workflowExecute.moveNodeMetadata();
+
+			const { runData } = runExecutionData.resultData;
+			expect(runData.node1[0].metadata).toEqual({ parentExecution });
+			expect(runData.node2[0].metadata).toEqual({ subExecutionsCount: 4 });
+		});
+
+		test('should preserve existing metadata when merging', () => {
+			runExecutionData.resultData.runData = {
+				node1: [
+					{
+						startTime: 0,
+						executionTime: 0,
+						source: [],
+						metadata: { subExecutionsCount: 4 },
+					},
+				],
+			};
+			runExecutionData.executionData!.metadata = {
+				node1: [{ parentExecution }],
+			};
+
+			workflowExecute.moveNodeMetadata();
+
+			expect(runExecutionData.resultData.runData.node1[0].metadata).toEqual({
+				parentExecution,
+				subExecutionsCount: 4,
+			});
+		});
+
+		test('should handle multiple run indices', () => {
+			runExecutionData.resultData.runData = {
+				node1: [
+					{ startTime: 0, executionTime: 0, source: [] },
+					{ startTime: 0, executionTime: 0, source: [] },
+				],
+			};
+			runExecutionData.executionData!.metadata = {
+				node1: [{ parentExecution }, { subExecutionsCount: 4 }],
+			};
+
+			workflowExecute.moveNodeMetadata();
+
+			const { runData } = runExecutionData.resultData;
+			expect(runData.node1[0].metadata).toEqual({ parentExecution });
+			expect(runData.node1[1].metadata).toEqual({ subExecutionsCount: 4 });
+		});
+	});
+
+	describe('getFullRunData', () => {
+		afterAll(() => {
+			jest.useRealTimers();
+		});
+
+		test('should return complete IRun object with all properties correctly set', () => {
+			const runExecutionData = mock<IRunExecutionData>();
+
+			const workflowExecute = new WorkflowExecute(mock(), 'manual', runExecutionData);
+
+			const startedAt = new Date('2023-01-01T00:00:00.000Z');
+			jest.useFakeTimers().setSystemTime(startedAt);
+
+			const result1 = workflowExecute.getFullRunData(startedAt);
+
+			expect(result1).toEqual({
+				data: runExecutionData,
+				mode: 'manual',
+				startedAt,
+				stoppedAt: startedAt,
+				status: 'new',
+			});
+
+			const stoppedAt = new Date('2023-01-01T00:00:10.000Z');
+			jest.setSystemTime(stoppedAt);
+			// @ts-expect-error read-only property
+			workflowExecute.status = 'running';
+
+			const result2 = workflowExecute.getFullRunData(startedAt);
+
+			expect(result2).toEqual({
+				data: runExecutionData,
+				mode: 'manual',
+				startedAt,
+				stoppedAt,
+				status: 'running',
+			});
+		});
+	});
+
+	describe('processSuccessExecution', () => {
+		const startedAt: Date = new Date('2023-01-01T00:00:00.000Z');
+		const workflow = new Workflow({
+			id: 'test',
+			nodes: [],
+			connections: {},
+			active: false,
+			nodeTypes: mock<INodeTypes>(),
+		});
+
+		let runExecutionData: IRunExecutionData;
+		let workflowExecute: WorkflowExecute;
+
+		beforeEach(() => {
+			runExecutionData = {
+				startData: {},
+				resultData: { runData: {} },
+				executionData: {
+					contextData: {},
+					nodeExecutionStack: [],
+					metadata: {},
+					waitingExecution: {},
+					waitingExecutionSource: null,
+				},
+			};
+			workflowExecute = new WorkflowExecute(mock(), 'manual', runExecutionData);
+
+			jest.spyOn(workflowExecute, 'executeHook').mockResolvedValue(undefined);
+			jest.spyOn(workflowExecute, 'moveNodeMetadata').mockImplementation();
+		});
+
+		test('should handle different workflow completion scenarios', async () => {
+			// Test successful execution
+			const successResult = await workflowExecute.processSuccessExecution(startedAt, workflow);
+			expect(successResult.status).toBe('success');
+			expect(successResult.finished).toBe(true);
+
+			// Test execution with wait
+			runExecutionData.waitTill = new Date('2024-01-01');
+			const waitResult = await workflowExecute.processSuccessExecution(startedAt, workflow);
+			expect(waitResult.status).toBe('waiting');
+			expect(waitResult.waitTill).toEqual(runExecutionData.waitTill);
+
+			// Test execution with error
+			const testError = new Error('Test error') as ExecutionBaseError;
+
+			// Reset the status since it was changed by previous tests
+			// @ts-expect-error read-only property
+			workflowExecute.status = 'new';
+			runExecutionData.waitTill = undefined;
+
+			const errorResult = await workflowExecute.processSuccessExecution(
+				startedAt,
+				workflow,
+				testError,
+			);
+
+			expect(errorResult.data.resultData.error).toBeDefined();
+			expect(errorResult.data.resultData.error?.message).toBe('Test error');
+
+			// Test canceled execution
+			const cancelError = new Error('Workflow execution canceled') as ExecutionBaseError;
+			const cancelResult = await workflowExecute.processSuccessExecution(
+				startedAt,
+				workflow,
+				cancelError,
+			);
+			expect(cancelResult.data.resultData.error).toBeDefined();
+			expect(cancelResult.data.resultData.error?.message).toBe('Workflow execution canceled');
+		});
+
+		test('should handle static data, hooks, and cleanup correctly', async () => {
+			// Mock static data change
+			workflow.staticData.__dataChanged = true;
+			workflow.staticData.testData = 'changed';
+
+			// Mock cleanup function that's actually a promise
+			let cleanupCalled = false;
+			const mockCleanupPromise = new Promise<void>((resolve) => {
+				setTimeout(() => {
+					cleanupCalled = true;
+					resolve();
+				}, 0);
+			});
+
+			const result = await workflowExecute.processSuccessExecution(
+				startedAt,
+				workflow,
+				undefined,
+				mockCleanupPromise,
+			);
+
+			// Verify static data handling
+			expect(result).toBeDefined();
+			expect(workflowExecute.moveNodeMetadata).toHaveBeenCalled();
+			expect(workflowExecute.executeHook).toHaveBeenCalledWith('workflowExecuteAfter', [
+				result,
+				workflow.staticData,
+			]);
+
+			// Verify cleanup was called
+			await mockCleanupPromise;
+			expect(cleanupCalled).toBe(true);
+		});
+	});
+
+	describe('assignPairedItems', () => {
+		let workflowExecute: WorkflowExecute;
+
+		beforeEach(() => {
+			workflowExecute = new WorkflowExecute(mock(), 'manual');
+		});
+
+		test('should handle undefined node output', () => {
+			const result = workflowExecute.assignPairedItems(
+				undefined,
+				mock<IExecuteData>({ data: { main: [] } }),
+			);
+			expect(result).toBeNull();
+		});
+
+		test('should auto-fix pairedItem for single input/output scenario', () => {
+			const nodeOutput = [[{ json: { test: true } }]];
+			const executionData = mock<IExecuteData>({ data: { main: [[{ json: { input: true } }]] } });
+
+			const result = workflowExecute.assignPairedItems(nodeOutput, executionData);
+
+			expect(result?.[0][0].pairedItem).toEqual({ item: 0 });
+		});
+
+		test('should auto-fix pairedItem when number of items match', () => {
+			const nodeOutput = [[{ json: { test: 1 } }, { json: { test: 2 } }]];
+			const executionData = mock<IExecuteData>({
+				data: { main: [[{ json: { input: 1 } }, { json: { input: 2 } }]] },
+			});
+
+			const result = workflowExecute.assignPairedItems(nodeOutput, executionData);
+
+			expect(result?.[0][0].pairedItem).toEqual({ item: 0 });
+			expect(result?.[0][1].pairedItem).toEqual({ item: 1 });
+		});
+
+		test('should not modify existing pairedItem data', () => {
+			const existingPairedItem = { item: 5, input: 2 };
+			const nodeOutput = [[{ json: { test: true }, pairedItem: existingPairedItem }]];
+			const executionData = mock<IExecuteData>({ data: { main: [[{ json: { input: true } }]] } });
+
+			const result = workflowExecute.assignPairedItems(nodeOutput, executionData);
+
+			expect(result?.[0][0].pairedItem).toEqual(existingPairedItem);
+		});
+
+		test('should process multiple output branches correctly', () => {
+			const nodeOutput = [[{ json: { test: 1 } }], [{ json: { test: 2 } }]];
+			const executionData = mock<IExecuteData>({ data: { main: [[{ json: { input: true } }]] } });
+
+			const result = workflowExecute.assignPairedItems(nodeOutput, executionData);
+
+			expect(result?.[0][0].pairedItem).toEqual({ item: 0 });
+			expect(result?.[1][0].pairedItem).toEqual({ item: 0 });
+		});
+	});
+});
diff --git a/packages/core/test/workflows/error_outputs.json b/packages/core/src/execution-engine/__tests__/workflows/error_outputs.json
similarity index 84%
rename from packages/core/test/workflows/error_outputs.json
rename to packages/core/src/execution-engine/__tests__/workflows/error_outputs.json
index f8e698bd52..5e143b644e 100644
--- a/packages/core/test/workflows/error_outputs.json
+++ b/packages/core/src/execution-engine/__tests__/workflows/error_outputs.json
@@ -1,13 +1,13 @@
 {
-	"name": "Error Output - Test Workflow",
+	"name": "My workflow 105",
 	"nodes": [
 		{
 			"parameters": {},
-			"id": "c41b46f0-3e76-4655-b5ea-4d15af58c138",
+			"id": "a94bc1fb-1f39-404b-b149-a76c4fbaed25",
 			"name": "When clicking \"Execute Workflow\"",
 			"type": "n8n-nodes-base.manualTrigger",
 			"typeVersion": 1,
-			"position": [-680, 460]
+			"position": [-60, 780]
 		},
 		{
 			"parameters": {
@@ -21,11 +21,11 @@
 				},
 				"options": {}
 			},
-			"id": "247f4118-d80f-49ab-8d9a-0cdbbb9271df",
+			"id": "6ba26bdf-91e2-4f18-8f4c-09e98aa4a9df",
 			"name": "Success",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [200, 860]
+			"position": [820, 1180]
 		},
 		{
 			"parameters": {
@@ -39,21 +39,21 @@
 				},
 				"options": {}
 			},
-			"id": "311e3650-d89c-405a-9c8d-c238f48a8a5a",
+			"id": "e3d1eadf-0994-4806-97ce-c5c5f673c624",
 			"name": "Error",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [200, 1040]
+			"position": [820, 1360]
 		},
 		{
 			"parameters": {
 				"jsCode": "return [\n  {\n    \"id\": \"23423532\",\n    \"name\": \"Jay Gatsby\",\n    \"email\": \"gatsby@west-egg.com\",\n    \"notes\": \"Keeps asking about a green light??\",\n    \"country\": \"US\",\n    \"created\": \"1925-04-10\"\n  },\n  {\n    \"id\": \"23423533\",\n    \"name\": \"José Arcadio Buendía\",\n    \"email\": \"jab@macondo.co\",\n    \"notes\": \"Lots of people named after him. Very confusing\",\n    \"country\": \"CO\",\n    \"created\": \"1967-05-05\"\n  },\n  {\n    \"id\": \"23423534\",\n    \"name\": \"Max Sendak\",\n    \"email\": \"info@in-and-out-of-weeks.org\",\n    \"notes\": \"Keeps rolling his terrible eyes\",\n    \"country\": \"US\",\n    \"created\": \"1963-04-09\"\n  },\n  {\n    \"id\": \"23423535\",\n    \"name\": \"Zaphod Beeblebrox\",\n    \"email\": \"captain@heartofgold.com\",\n    \"notes\": \"Felt like I was talking to more than one person\",\n    \"country\": null,\n    \"created\": \"1979-10-12\"\n  },\n  {\n    \"id\": \"23423536\",\n    \"name\": \"Edmund Pevensie\",\n    \"email\": \"edmund@narnia.gov\",\n    \"notes\": \"Passionate sailor\",\n    \"country\": \"UK\",\n    \"created\": \"1950-10-16\"\n  }\n]"
 			},
-			"id": "179d4fe7-1ae7-4957-a77d-12c3ca6d141b",
+			"id": "01adfc2d-141d-4843-b2d6-04115a476bc1",
 			"name": "Mock Data",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 2,
-			"position": [-460, 460]
+			"position": [160, 780]
 		},
 		{
 			"parameters": {
@@ -61,11 +61,11 @@
 				"height": 414,
 				"width": 564
 			},
-			"id": "1ec2a8b6-54e2-4319-90b3-30b387855b36",
+			"id": "8ca689eb-7910-43ad-bd10-fae35a8fc203",
 			"name": "Sticky Note",
 			"type": "n8n-nodes-base.stickyNote",
 			"typeVersion": 1,
-			"position": [-160, 780]
+			"position": [460, 1100]
 		},
 		{
 			"parameters": {
@@ -73,11 +73,11 @@
 				"height": 279,
 				"width": 564
 			},
-			"id": "49a2b7d9-8bd1-4cdf-9649-2d93668b0f8f",
+			"id": "a17460d6-b0c0-432d-ac6f-8ff684357c8d",
 			"name": "Sticky Note1",
 			"type": "n8n-nodes-base.stickyNote",
 			"typeVersion": 1,
-			"position": [-160, 140]
+			"position": [460, 460]
 		},
 		{
 			"parameters": {
@@ -91,22 +91,22 @@
 				},
 				"options": {}
 			},
-			"id": "9852f1d9-95b4-4ef7-bb18-8f0bab81a0bc",
+			"id": "46df5463-4289-4e61-9f80-87e035931bda",
 			"name": "Combined",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [180, 240]
+			"position": [800, 560]
 		},
 		{
 			"parameters": {
 				"mode": "runOnceForEachItem",
 				"jsCode": "// Add a new field called 'myNewField' to the JSON of the item\n$input.item.json.myNewField = 1;\n\nif ($input.item.json.country === 'US') {\n  throw new Error('This is an error');\n}\n\nreturn $input.item;"
 			},
-			"id": "40d4dba3-3db7-4eb5-aa27-e76f955a5e09",
+			"id": "a4708520-aaca-4618-b7a2-94da268fba37",
 			"name": "Throw Error",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 2,
-			"position": [-140, 960],
+			"position": [480, 1280],
 			"errorOutput": true,
 			"onError": "continueErrorOutput"
 		},
@@ -116,22 +116,22 @@
 				"height": 279,
 				"width": 564
 			},
-			"id": "8eb3dd54-c1dd-4167-abfa-c06d044c63f3",
+			"id": "f0a450cd-4124-490d-964f-a71b645f770c",
 			"name": "Sticky Note2",
 			"type": "n8n-nodes-base.stickyNote",
 			"typeVersion": 1,
-			"position": [-160, 460]
+			"position": [460, 780]
 		},
 		{
 			"parameters": {
 				"mode": "runOnceForEachItem",
 				"jsCode": "// Add a new field called 'myNewField' to the JSON of the item\n$input.item.json.myNewField = 1;\n\nif ($input.item.json.country === 'US') {\n  throw new Error('This is an error');\n}\n\nreturn $input.item;"
 			},
-			"id": "19a3d6ac-e610-4296-9b7a-9ed19d242bdb",
+			"id": "823f12e6-cbfc-4545-8505-fab158d1effe",
 			"name": "Throw Error2",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 2,
-			"position": [-120, 560],
+			"position": [500, 880],
 			"onError": "continueRegularOutput"
 		},
 		{
@@ -146,22 +146,22 @@
 				},
 				"options": {}
 			},
-			"id": "5f803fdc-7d88-4c12-8886-6092cfbc03c6",
+			"id": "8f88d130-9a13-4236-81c0-157f8a8990c0",
 			"name": "Combined1",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [180, 560]
+			"position": [800, 880]
 		},
 		{
 			"parameters": {
 				"mode": "runOnceForEachItem",
 				"jsCode": "// Add a new field called 'myNewField' to the JSON of the item\n$input.item.json.myNewField = 1;\n\nif ($input.item.json.country === 'US') {\n  throw new Error('This is an error');\n}\n\nreturn $input.item;"
 			},
-			"id": "c2696c1f-1abd-4549-9ad9-e62017dc14b8",
+			"id": "1a3f4beb-0d1e-44fe-a411-5bd1096ffd74",
 			"name": "Throw Error1",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 2,
-			"position": [-120, 240],
+			"position": [500, 560],
 			"continueOnFail": true
 		},
 		{
@@ -176,11 +176,11 @@
 				},
 				"options": {}
 			},
-			"id": "01740d7e-e572-408a-9fae-729068803113",
+			"id": "c617a3d7-15e3-49b4-a7dd-d45c5e059a22",
 			"name": "Success1",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [200, 1320]
+			"position": [820, 1640]
 		},
 		{
 			"parameters": {
@@ -188,22 +188,22 @@
 				"height": 509.71047006830065,
 				"width": 1183.725293692246
 			},
-			"id": "ed409181-4847-4d65-af45-f45078a6343e",
+			"id": "046de2cf-970a-4925-b87d-16e8cca511fd",
 			"name": "Sticky Note3",
 			"type": "n8n-nodes-base.stickyNote",
 			"typeVersion": 1,
-			"position": [-160, 1240]
+			"position": [460, 1560]
 		},
 		{
 			"parameters": {
 				"mode": "runOnceForEachItem",
 				"jsCode": "// Add a new field called 'myNewField' to the JSON of the item\n$input.item.json.myNewField = 1;\n\nif ($input.item.json.country === 'US') {\n  throw new Error('This is an error');\n}\n\nreturn $input.item;"
 			},
-			"id": "93d03f38-b928-4b4b-832a-3f1a5deebb2d",
+			"id": "9ec21de1-dfca-4fff-b5a7-a56364239d7b",
 			"name": "Throw Error3",
 			"type": "n8n-nodes-base.code",
 			"typeVersion": 2,
-			"position": [-140, 1420],
+			"position": [480, 1740],
 			"errorOutput": true,
 			"onError": "continueErrorOutput"
 		},
@@ -211,11 +211,11 @@
 			"parameters": {
 				"options": {}
 			},
-			"id": "c92a6ce5-41ea-4fb9-a07b-c4e98f905b12",
+			"id": "e3605953-75cf-4036-99f7-05e3971a6a75",
 			"name": "Edit Fields",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [420, 1500],
+			"position": [1040, 1820],
 			"onError": "continueErrorOutput"
 		},
 		{
@@ -230,11 +230,11 @@
 				},
 				"options": {}
 			},
-			"id": "ab838cc1-0987-4b41-bdc5-fe17f38e0691",
+			"id": "a71cfb77-adfd-4c77-9a8e-7e58cbd0931b",
 			"name": "Success2",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [700, 1360]
+			"position": [1320, 1680]
 		},
 		{
 			"parameters": {
@@ -248,11 +248,11 @@
 				},
 				"options": {}
 			},
-			"id": "22e04172-19b9-4735-9dd0-a3e2fa3bf000",
+			"id": "ea9d02e9-1716-4f69-a14a-9133f5184886",
 			"name": "Error2",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [700, 1580]
+			"position": [1320, 1900]
 		},
 		{
 			"parameters": {
@@ -266,101 +266,19 @@
 				},
 				"options": {}
 			},
-			"id": "69e7257a-1ba8-46ba-9394-d38d65b2e567",
+			"id": "17780679-f7a3-4b1b-b6ee-f3f61e0843ad",
 			"name": "Error1",
 			"type": "n8n-nodes-base.set",
 			"typeVersion": 3.2,
-			"position": [200, 1500]
+			"position": [820, 1820]
 		}
 	],
 	"pinData": {
-		"Error": [
-			{
-				"json": {
-					"id": "23423534",
-					"name": "Max Sendak",
-					"email": "info@in-and-out-of-weeks.org",
-					"notes": "Keeps rolling his terrible eyes",
-					"country": "US",
-					"created": "1963-04-09",
-					"error": "This is an error [line 5, for item 2]",
-					"originalName": "Max Sendak"
-				},
-				"pairedItem": {
-					"item": 0
-				}
-			},
-			{
-				"json": {
-					"id": "23423532",
-					"name": "Jay Gatsby",
-					"email": "gatsby@west-egg.com",
-					"notes": "Keeps asking about a green light??",
-					"country": "US",
-					"created": "1925-04-10",
-					"error": "This is an error [line 5, for item 0]",
-					"originalName": "Jay Gatsby"
-				},
-				"pairedItem": {
-					"item": 1
-				}
-			}
-		],
-		"Success": [
-			{
-				"json": {
-					"id": "23423536",
-					"name": "Edmund Pevensie",
-					"email": "edmund@narnia.gov",
-					"notes": "Passionate sailor",
-					"country": "UK",
-					"created": "1950-10-16",
-					"myNewField": 1,
-					"originalName": "Edmund Pevensie"
-				},
-				"pairedItem": {
-					"item": 0
-				}
-			},
-			{
-				"json": {
-					"id": "23423535",
-					"name": "Zaphod Beeblebrox",
-					"email": "captain@heartofgold.com",
-					"notes": "Felt like I was talking to more than one person",
-					"country": null,
-					"created": "1979-10-12",
-					"myNewField": 1,
-					"originalName": "Zaphod Beeblebrox"
-				},
-				"pairedItem": {
-					"item": 1
-				}
-			},
-			{
-				"json": {
-					"id": "23423533",
-					"name": "José Arcadio Buendía",
-					"email": "jab@macondo.co",
-					"notes": "Lots of people named after him. Very confusing",
-					"country": "CO",
-					"created": "1967-05-05",
-					"myNewField": 1,
-					"originalName": "José Arcadio Buendía"
-				},
-				"pairedItem": {
-					"item": 2
-				}
-			}
-		],
 		"Combined": [
 			{
 				"json": {
 					"error": "This is an error [line 5, for item 0]",
 					"originalName": "Jay Gatsby"
-				},
-				"pairedItem": {
-					"item": 0
 				}
 			},
 			{
@@ -373,18 +291,12 @@
 					"created": "1967-05-05",
 					"myNewField": 1,
 					"originalName": "José Arcadio Buendía"
-				},
-				"pairedItem": {
-					"item": 1
 				}
 			},
 			{
 				"json": {
 					"error": "This is an error [line 5, for item 2]",
 					"originalName": "Max Sendak"
-				},
-				"pairedItem": {
-					"item": 2
 				}
 			},
 			{
@@ -397,9 +309,6 @@
 					"created": "1979-10-12",
 					"myNewField": 1,
 					"originalName": "Zaphod Beeblebrox"
-				},
-				"pairedItem": {
-					"item": 3
 				}
 			},
 			{
@@ -412,9 +321,6 @@
 					"created": "1950-10-16",
 					"myNewField": 1,
 					"originalName": "Edmund Pevensie"
-				},
-				"pairedItem": {
-					"item": 4
 				}
 			}
 		],
@@ -423,9 +329,6 @@
 				"json": {
 					"error": "This is an error [line 5, for item 0]",
 					"originalName": "Jay Gatsby"
-				},
-				"pairedItem": {
-					"item": 0
 				}
 			},
 			{
@@ -438,18 +341,12 @@
 					"created": "1967-05-05",
 					"myNewField": 1,
 					"originalName": "José Arcadio Buendía"
-				},
-				"pairedItem": {
-					"item": 1
 				}
 			},
 			{
 				"json": {
 					"error": "This is an error [line 5, for item 2]",
 					"originalName": "Max Sendak"
-				},
-				"pairedItem": {
-					"item": 2
 				}
 			},
 			{
@@ -462,9 +359,6 @@
 					"created": "1979-10-12",
 					"myNewField": 1,
 					"originalName": "Zaphod Beeblebrox"
-				},
-				"pairedItem": {
-					"item": 3
 				}
 			},
 			{
@@ -477,26 +371,20 @@
 					"created": "1950-10-16",
 					"myNewField": 1,
 					"originalName": "Edmund Pevensie"
-				},
-				"pairedItem": {
-					"item": 4
 				}
 			}
 		],
 		"Success1": [
 			{
 				"json": {
-					"id": "23423536",
-					"name": "Edmund Pevensie",
-					"email": "edmund@narnia.gov",
-					"notes": "Passionate sailor",
-					"country": "UK",
-					"created": "1950-10-16",
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
 					"myNewField": 1,
-					"originalName": "Edmund Pevensie"
-				},
-				"pairedItem": {
-					"item": 0
+					"originalName": "José Arcadio Buendía"
 				}
 			},
 			{
@@ -509,43 +397,22 @@
 					"created": "1979-10-12",
 					"myNewField": 1,
 					"originalName": "Zaphod Beeblebrox"
-				},
-				"pairedItem": {
-					"item": 1
 				}
 			},
 			{
 				"json": {
-					"id": "23423533",
-					"name": "José Arcadio Buendía",
-					"email": "jab@macondo.co",
-					"notes": "Lots of people named after him. Very confusing",
-					"country": "CO",
-					"created": "1967-05-05",
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
 					"myNewField": 1,
-					"originalName": "José Arcadio Buendía"
-				},
-				"pairedItem": {
-					"item": 2
+					"originalName": "Edmund Pevensie"
 				}
 			}
 		],
 		"Error1": [
-			{
-				"json": {
-					"id": "23423534",
-					"name": "Max Sendak",
-					"email": "info@in-and-out-of-weeks.org",
-					"notes": "Keeps rolling his terrible eyes",
-					"country": "US",
-					"created": "1963-04-09",
-					"error": "This is an error [line 5, for item 2]",
-					"originalName": "Max Sendak"
-				},
-				"pairedItem": {
-					"item": 0
-				}
-			},
 			{
 				"json": {
 					"id": "23423532",
@@ -556,9 +423,18 @@
 					"created": "1925-04-10",
 					"error": "This is an error [line 5, for item 0]",
 					"originalName": "Jay Gatsby"
-				},
-				"pairedItem": {
-					"item": 1
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"error": "This is an error [line 5, for item 2]",
+					"originalName": "Max Sendak"
 				}
 			}
 		],
@@ -573,9 +449,6 @@
 					"created": "1925-04-10",
 					"error": "This is an error [line 5, for item 0]",
 					"originalName": "Jay Gatsby"
-				},
-				"pairedItem": {
-					"item": 0
 				}
 			},
 			{
@@ -588,9 +461,70 @@
 					"created": "1963-04-09",
 					"error": "This is an error [line 5, for item 2]",
 					"originalName": "Max Sendak"
-				},
-				"pairedItem": {
-					"item": 1
+				}
+			}
+		],
+		"Error": [
+			{
+				"json": {
+					"id": "23423532",
+					"name": "Jay Gatsby",
+					"email": "gatsby@west-egg.com",
+					"notes": "Keeps asking about a green light??",
+					"country": "US",
+					"created": "1925-04-10",
+					"error": "This is an error [line 5, for item 0]",
+					"originalName": "Jay Gatsby"
+				}
+			},
+			{
+				"json": {
+					"id": "23423534",
+					"name": "Max Sendak",
+					"email": "info@in-and-out-of-weeks.org",
+					"notes": "Keeps rolling his terrible eyes",
+					"country": "US",
+					"created": "1963-04-09",
+					"error": "This is an error [line 5, for item 2]",
+					"originalName": "Max Sendak"
+				}
+			}
+		],
+		"Success": [
+			{
+				"json": {
+					"id": "23423533",
+					"name": "José Arcadio Buendía",
+					"email": "jab@macondo.co",
+					"notes": "Lots of people named after him. Very confusing",
+					"country": "CO",
+					"created": "1967-05-05",
+					"myNewField": 1,
+					"originalName": "José Arcadio Buendía"
+				}
+			},
+			{
+				"json": {
+					"id": "23423535",
+					"name": "Zaphod Beeblebrox",
+					"email": "captain@heartofgold.com",
+					"notes": "Felt like I was talking to more than one person",
+					"country": null,
+					"created": "1979-10-12",
+					"myNewField": 1,
+					"originalName": "Zaphod Beeblebrox"
+				}
+			},
+			{
+				"json": {
+					"id": "23423536",
+					"name": "Edmund Pevensie",
+					"email": "edmund@narnia.gov",
+					"notes": "Passionate sailor",
+					"country": "UK",
+					"created": "1950-10-16",
+					"myNewField": 1,
+					"originalName": "Edmund Pevensie"
 				}
 			}
 		]
@@ -725,10 +659,11 @@
 	"settings": {
 		"executionOrder": "v1"
 	},
-	"versionId": "e73e1eda-293c-4ee2-87b9-923873241774",
-	"id": "UgoluWRMeg7fPLCB",
+	"versionId": "94aaa2ce-558a-4fed-948a-09860174272a",
 	"meta": {
-		"instanceId": "021d3c82ba2d3bc090cbf4fc81c9312668bcc34297e022bb3438c5c88a43a5ff"
+		"templateCredsSetupCompleted": true,
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
 	},
+	"id": "FJvJXVvjM5rw3sUM",
 	"tags": []
 }
diff --git a/packages/core/test/workflows/paired_items_fix.json b/packages/core/src/execution-engine/__tests__/workflows/paired_items_fix.json
similarity index 100%
rename from packages/core/test/workflows/paired_items_fix.json
rename to packages/core/src/execution-engine/__tests__/workflows/paired_items_fix.json
diff --git a/packages/core/src/ActiveWorkflows.ts b/packages/core/src/execution-engine/active-workflows.ts
similarity index 79%
rename from packages/core/src/ActiveWorkflows.ts
rename to packages/core/src/execution-engine/active-workflows.ts
index 93e67488d5..50aa3853be 100644
--- a/packages/core/src/ActiveWorkflows.ts
+++ b/packages/core/src/execution-engine/active-workflows.ts
@@ -1,3 +1,4 @@
+import { Service } from '@n8n/di';
 import type {
 	IGetExecutePollFunctions,
 	IGetExecuteTriggerFunctions,
@@ -11,21 +12,27 @@ import type {
 } from 'n8n-workflow';
 import {
 	ApplicationError,
-	ErrorReporterProxy as ErrorReporter,
-	LoggerProxy as Logger,
 	toCronExpression,
 	TriggerCloseError,
 	WorkflowActivationError,
 	WorkflowDeactivationError,
 } from 'n8n-workflow';
-import { Service } from 'typedi';
 
-import type { IWorkflowData } from './Interfaces';
-import { ScheduledTaskManager } from './ScheduledTaskManager';
+import { ErrorReporter } from '@/errors/error-reporter';
+import type { IWorkflowData } from '@/interfaces';
+import { Logger } from '@/logging/logger';
+
+import { ScheduledTaskManager } from './scheduled-task-manager';
+import { TriggersAndPollers } from './triggers-and-pollers';
 
 @Service()
 export class ActiveWorkflows {
-	constructor(private readonly scheduledTaskManager: ScheduledTaskManager) {}
+	constructor(
+		private readonly logger: Logger,
+		private readonly scheduledTaskManager: ScheduledTaskManager,
+		private readonly triggersAndPollers: TriggersAndPollers,
+		private readonly errorReporter: ErrorReporter,
+	) {}
 
 	private activeWorkflows: { [workflowId: string]: IWorkflowData } = {};
 
@@ -66,16 +73,14 @@ export class ActiveWorkflows {
 		getTriggerFunctions: IGetExecuteTriggerFunctions,
 		getPollFunctions: IGetExecutePollFunctions,
 	) {
-		this.activeWorkflows[workflowId] = {};
 		const triggerNodes = workflow.getTriggerNodes();
 
-		let triggerResponse: ITriggerResponse | undefined;
-
-		this.activeWorkflows[workflowId].triggerResponses = [];
+		const triggerResponses: ITriggerResponse[] = [];
 
 		for (const triggerNode of triggerNodes) {
 			try {
-				triggerResponse = await workflow.runTrigger(
+				const triggerResponse = await this.triggersAndPollers.runTrigger(
+					workflow,
 					triggerNode,
 					getTriggerFunctions,
 					additionalData,
@@ -83,10 +88,7 @@ export class ActiveWorkflows {
 					activation,
 				);
 				if (triggerResponse !== undefined) {
-					// If a response was given save it
-
-					// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-					this.activeWorkflows[workflowId].triggerResponses!.push(triggerResponse);
+					triggerResponses.push(triggerResponse);
 				}
 			} catch (e) {
 				const error = e instanceof Error ? e : new Error(`${e}`);
@@ -98,6 +100,8 @@ export class ActiveWorkflows {
 			}
 		}
 
+		this.activeWorkflows[workflowId] = { triggerResponses };
+
 		const pollingNodes = workflow.getPollNodes();
 
 		if (pollingNodes.length === 0) return;
@@ -113,6 +117,11 @@ export class ActiveWorkflows {
 					activation,
 				);
 			} catch (e) {
+				// Do not mark this workflow as active if there are no triggerResponses, and any polling activation failed
+				if (triggerResponses.length === 0) {
+					delete this.activeWorkflows[workflowId];
+				}
+
 				const error = e instanceof Error ? e : new Error(`${e}`);
 
 				throw new WorkflowActivationError(
@@ -126,7 +135,7 @@ export class ActiveWorkflows {
 	/**
 	 * Activates polling for the given node
 	 */
-	async activatePolling(
+	private async activatePolling(
 		node: INode,
 		workflow: Workflow,
 		additionalData: IWorkflowExecuteAdditionalData,
@@ -144,13 +153,13 @@ export class ActiveWorkflows {
 		const cronTimes = (pollTimes.item || []).map(toCronExpression);
 		// The trigger function to execute when the cron-time got reached
 		const executeTrigger = async (testingTrigger = false) => {
-			Logger.debug(`Polling trigger initiated for workflow "${workflow.name}"`, {
+			this.logger.debug(`Polling trigger initiated for workflow "${workflow.name}"`, {
 				workflowName: workflow.name,
 				workflowId: workflow.id,
 			});
 
 			try {
-				const pollResponse = await workflow.runPoll(node, pollFunctions);
+				const pollResponse = await this.triggersAndPollers.runPoll(workflow, node, pollFunctions);
 
 				if (pollResponse !== null) {
 					pollFunctions.__emit(pollResponse);
@@ -186,7 +195,7 @@ export class ActiveWorkflows {
 	 */
 	async remove(workflowId: string) {
 		if (!this.isActive(workflowId)) {
-			Logger.warn(`Cannot deactivate already inactive workflow ID "${workflowId}"`);
+			this.logger.warn(`Cannot deactivate already inactive workflow ID "${workflowId}"`);
 			return false;
 		}
 
@@ -215,10 +224,10 @@ export class ActiveWorkflows {
 			await response.closeFunction();
 		} catch (e) {
 			if (e instanceof TriggerCloseError) {
-				Logger.error(
+				this.logger.error(
 					`There was a problem calling "closeFunction" on "${e.node.name}" in workflow "${workflowId}"`,
 				);
-				ErrorReporter.error(e, { extra: { workflowId } });
+				this.errorReporter.error(e, { extra: { workflowId } });
 				return;
 			}
 
diff --git a/packages/core/src/execution-engine/index.ts b/packages/core/src/execution-engine/index.ts
new file mode 100644
index 0000000000..1523e93a11
--- /dev/null
+++ b/packages/core/src/execution-engine/index.ts
@@ -0,0 +1,6 @@
+export * from './active-workflows';
+export * from './routing-node';
+export * from './node-execution-context';
+export * from './partial-execution-utils';
+export * from './node-execution-context/utils/execution-metadata';
+export * from './workflow-execute';
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/execute-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/execute-context.test.ts
new file mode 100644
index 0000000000..a888a5a7ff
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/execute-context.test.ts
@@ -0,0 +1,218 @@
+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, NodeConnectionType } 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 connectionType = NodeConnectionType.Main;
+
+		afterEach(() => {
+			inputData[connectionType] = [[{ json: { test: 'data' } }]];
+		});
+
+		it('should return the input data correctly', () => {
+			const expectedData = [{ json: { test: 'data' } }];
+
+			expect(executeContext.getInputData(inputIndex, connectionType)).toEqual(expectedData);
+		});
+
+		it('should return an empty array if the input name does not exist', () => {
+			const connectionType = 'nonExistent';
+			expect(executeContext.getInputData(inputIndex, connectionType as NodeConnectionType)).toEqual(
+				[],
+			);
+		});
+
+		it('should throw an error if the input index is out of range', () => {
+			const inputIndex = 2;
+
+			expect(() => executeContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
+		});
+
+		it('should throw an error if the input index was not set', () => {
+			inputData.main[inputIndex] = null;
+
+			expect(() => executeContext.getInputData(inputIndex, connectionType)).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/execution-engine/node-execution-context/__tests__/execute-single-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/execute-single-context.test.ts
new file mode 100644
index 0000000000..6c1b9f1089
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/execute-single-context.test.ts
@@ -0,0 +1,199 @@
+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, NodeConnectionType } from 'n8n-workflow';
+
+import { describeCommonTests } from './shared-tests';
+import { ExecuteSingleContext } from '../execute-single-context';
+
+describe('ExecuteSingleContext', () => {
+	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 itemIndex = 0;
+	const abortSignal = mock<AbortSignal>();
+
+	const executeSingleContext = new ExecuteSingleContext(
+		workflow,
+		node,
+		additionalData,
+		mode,
+		runExecutionData,
+		runIndex,
+		connectionInputData,
+		inputData,
+		itemIndex,
+		executeData,
+		abortSignal,
+	);
+
+	beforeEach(() => {
+		nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+		expression.getParameterValue.mockImplementation((value) => value);
+	});
+
+	describeCommonTests(executeSingleContext, {
+		abortSignal,
+		node,
+		workflow,
+		executeData,
+		runExecutionData,
+	});
+
+	describe('getInputData', () => {
+		const inputIndex = 0;
+		const connectionType = NodeConnectionType.Main;
+
+		afterEach(() => {
+			inputData[connectionType] = [[{ json: { test: 'data' } }]];
+		});
+
+		it('should return the input data correctly', () => {
+			const expectedData = { json: { test: 'data' } };
+
+			expect(executeSingleContext.getInputData(inputIndex, connectionType)).toEqual(expectedData);
+		});
+
+		it('should return an empty object if the input name does not exist', () => {
+			const connectionType = 'nonExistent';
+			const expectedData = { json: {} };
+
+			expect(
+				executeSingleContext.getInputData(inputIndex, connectionType as NodeConnectionType),
+			).toEqual(expectedData);
+		});
+
+		it('should throw an error if the input index is out of range', () => {
+			const inputIndex = 1;
+
+			expect(() => executeSingleContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
+		});
+
+		it('should throw an error if the input index was not set', () => {
+			inputData.main[inputIndex] = null;
+
+			expect(() => executeSingleContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
+		});
+
+		it('should throw an error if the value of input with given index was not set', () => {
+			delete inputData.main[inputIndex]![itemIndex];
+
+			expect(() => executeSingleContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
+		});
+	});
+
+	describe('getItemIndex', () => {
+		it('should return the item index correctly', () => {
+			expect(executeSingleContext.getItemIndex()).toEqual(itemIndex);
+		});
+	});
+
+	describe('getNodeParameter', () => {
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			expression.getParameterValue.mockImplementation((value) => value);
+		});
+
+		it('should return parameter value when it exists', () => {
+			const parameter = executeSingleContext.getNodeParameter('testParameter');
+
+			expect(parameter).toBe('testValue');
+		});
+
+		it('should return the fallback value when the parameter does not exist', () => {
+			const parameter = executeSingleContext.getNodeParameter('otherParameter', '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 executeSingleContext.getCredentials<ICredentialDataDecryptedObject>(
+					testCredentialType,
+				);
+
+			expect(credentials).toEqual({ secret: 'token' });
+		});
+	});
+
+	describe('getExecuteData', () => {
+		it('should return the execute data correctly', () => {
+			expect(executeSingleContext.getExecuteData()).toEqual(executeData);
+		});
+	});
+
+	describe('getWorkflowDataProxy', () => {
+		it('should return the workflow data proxy correctly', () => {
+			const workflowDataProxy = executeSingleContext.getWorkflowDataProxy();
+			expect(workflowDataProxy.isProxy).toBe(true);
+			expect(Object.keys(workflowDataProxy.$input)).toEqual([
+				'all',
+				'context',
+				'first',
+				'item',
+				'last',
+				'params',
+			]);
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/hook-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/hook-context.test.ts
new file mode 100644
index 0000000000..1092198a23
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/hook-context.test.ts
@@ -0,0 +1,147 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	Expression,
+	ICredentialDataDecryptedObject,
+	ICredentialsHelper,
+	INode,
+	INodeType,
+	INodeTypes,
+	IWebhookDescription,
+	IWebhookData,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
+
+import { HookContext } from '../hook-context';
+
+describe('HookContext', () => {
+	const testCredentialType = 'testCredential';
+	const webhookDescription: IWebhookDescription = {
+		name: 'default',
+		httpMethod: 'GET',
+		responseMode: 'onReceived',
+		path: 'testPath',
+	};
+	const nodeType = mock<INodeType>({
+		description: {
+			credentials: [
+				{
+					name: testCredentialType,
+					required: true,
+				},
+			],
+			properties: [
+				{
+					name: 'testParameter',
+					required: true,
+				},
+			],
+		},
+	});
+	nodeType.description.webhooks = [webhookDescription];
+	const nodeTypes = mock<INodeTypes>();
+	const expression = mock<Expression>();
+	const workflow = mock<Workflow>({ expression, nodeTypes });
+	const node = mock<INode>({
+		credentials: {
+			[testCredentialType]: {
+				id: 'testCredentialId',
+			},
+		},
+	});
+	node.parameters = {
+		testParameter: 'testValue',
+	};
+	const credentialsHelper = mock<ICredentialsHelper>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ credentialsHelper });
+	const mode: WorkflowExecuteMode = 'manual';
+	const activation: WorkflowActivateMode = 'init';
+	const webhookData = mock<IWebhookData>({
+		webhookDescription: {
+			name: 'default',
+			isFullPath: true,
+		},
+	});
+
+	const hookContext = new HookContext(
+		workflow,
+		node,
+		additionalData,
+		mode,
+		activation,
+		webhookData,
+	);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+		expression.getParameterValue.mockImplementation((value) => value);
+		expression.getSimpleParameterValue.mockImplementation((_, value) => value);
+	});
+
+	describe('getActivationMode', () => {
+		it('should return the activation property', () => {
+			const result = hookContext.getActivationMode();
+			expect(result).toBe(activation);
+		});
+	});
+
+	describe('getCredentials', () => {
+		it('should get decrypted credentials', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			credentialsHelper.getDecrypted.mockResolvedValue({ secret: 'token' });
+
+			const credentials =
+				await hookContext.getCredentials<ICredentialDataDecryptedObject>(testCredentialType);
+
+			expect(credentials).toEqual({ secret: 'token' });
+		});
+	});
+
+	describe('getNodeParameter', () => {
+		it('should return parameter value when it exists', () => {
+			const parameter = hookContext.getNodeParameter('testParameter');
+
+			expect(parameter).toBe('testValue');
+		});
+	});
+
+	describe('getNodeWebhookUrl', () => {
+		it('should return node webhook url', () => {
+			const url = hookContext.getNodeWebhookUrl('default');
+
+			expect(url).toContain('testPath');
+		});
+	});
+
+	describe('getWebhookName', () => {
+		it('should return webhook name', () => {
+			const name = hookContext.getWebhookName();
+
+			expect(name).toBe('default');
+		});
+
+		it('should throw an error if webhookData is undefined', () => {
+			const hookContextWithoutWebhookData = new HookContext(
+				workflow,
+				node,
+				additionalData,
+				mode,
+				activation,
+			);
+
+			expect(() => hookContextWithoutWebhookData.getWebhookName()).toThrow(ApplicationError);
+		});
+	});
+
+	describe('getWebhookDescription', () => {
+		it('should return webhook description', () => {
+			const description = hookContext.getWebhookDescription('default');
+
+			expect(description).toEqual<IWebhookDescription>(webhookDescription);
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/load-options-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/load-options-context.test.ts
new file mode 100644
index 0000000000..5ab03e105d
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/load-options-context.test.ts
@@ -0,0 +1,102 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	Expression,
+	ICredentialDataDecryptedObject,
+	ICredentialsHelper,
+	INode,
+	INodeType,
+	INodeTypes,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+} from 'n8n-workflow';
+
+import { LoadOptionsContext } from '../load-options-context';
+
+describe('LoadOptionsContext', () => {
+	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>({
+		credentials: {
+			[testCredentialType]: {
+				id: 'testCredentialId',
+			},
+		},
+	});
+	node.parameters = {
+		testParameter: 'testValue',
+	};
+	const credentialsHelper = mock<ICredentialsHelper>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ credentialsHelper });
+	const path = 'testPath';
+
+	const loadOptionsContext = new LoadOptionsContext(workflow, node, additionalData, path);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('getCredentials', () => {
+		it('should get decrypted credentials', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			credentialsHelper.getDecrypted.mockResolvedValue({ secret: 'token' });
+
+			const credentials =
+				await loadOptionsContext.getCredentials<ICredentialDataDecryptedObject>(testCredentialType);
+
+			expect(credentials).toEqual({ secret: 'token' });
+		});
+	});
+
+	describe('getCurrentNodeParameter', () => {
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+		});
+
+		it('should return parameter value when it exists', () => {
+			additionalData.currentNodeParameters = {
+				testParameter: 'testValue',
+			};
+
+			const parameter = loadOptionsContext.getCurrentNodeParameter('testParameter');
+
+			expect(parameter).toBe('testValue');
+		});
+	});
+
+	describe('getNodeParameter', () => {
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			expression.getParameterValue.mockImplementation((value) => value);
+		});
+
+		it('should return parameter value when it exists', () => {
+			const parameter = loadOptionsContext.getNodeParameter('testParameter');
+
+			expect(parameter).toBe('testValue');
+		});
+
+		it('should return the fallback value when the parameter does not exist', () => {
+			const parameter = loadOptionsContext.getNodeParameter('otherParameter', 'fallback');
+
+			expect(parameter).toBe('fallback');
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/node-execution-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/node-execution-context.test.ts
new file mode 100644
index 0000000000..6a10c2bba5
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/node-execution-context.test.ts
@@ -0,0 +1,338 @@
+import { Container } from '@n8n/di';
+import { mock } from 'jest-mock-extended';
+import type {
+	Expression,
+	INode,
+	INodeType,
+	INodeTypes,
+	INodeExecutionData,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { InstanceSettings } from '@/instance-settings';
+
+import { NodeExecutionContext } from '../node-execution-context';
+
+class TestContext extends NodeExecutionContext {}
+
+describe('NodeExecutionContext', () => {
+	const instanceSettings = mock<InstanceSettings>({ instanceId: 'abc123' });
+	Container.set(InstanceSettings, instanceSettings);
+
+	const node = mock<INode>();
+	const nodeType = mock<INodeType>({ description: mock() });
+	const nodeTypes = mock<INodeTypes>();
+	const expression = mock<Expression>();
+	const workflow = mock<Workflow>({
+		id: '123',
+		name: 'Test Workflow',
+		active: true,
+		nodeTypes,
+		timezone: 'UTC',
+		expression,
+	});
+	let additionalData = mock<IWorkflowExecuteAdditionalData>({
+		credentialsHelper: mock(),
+	});
+
+	const mode: WorkflowExecuteMode = 'manual';
+	let testContext: TestContext;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		testContext = new TestContext(workflow, node, additionalData, mode);
+		nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+	});
+
+	describe('getNode', () => {
+		it('should return a deep copy of the node', () => {
+			const result = testContext.getNode();
+			expect(result).not.toBe(node);
+			expect(JSON.stringify(result)).toEqual(JSON.stringify(node));
+		});
+	});
+
+	describe('getWorkflow', () => {
+		it('should return the id, name, and active properties of the workflow', () => {
+			const result = testContext.getWorkflow();
+
+			expect(result).toEqual({ id: '123', name: 'Test Workflow', active: true });
+		});
+	});
+
+	describe('getMode', () => {
+		it('should return the mode property', () => {
+			const result = testContext.getMode();
+			expect(result).toBe(mode);
+		});
+	});
+
+	describe('getWorkflowStaticData', () => {
+		it('should call getStaticData method of workflow', () => {
+			testContext.getWorkflowStaticData('testType');
+			expect(workflow.getStaticData).toHaveBeenCalledWith('testType', node);
+		});
+	});
+
+	describe('getChildNodes', () => {
+		it('should return an array of NodeTypeAndVersion objects for the child nodes of the given node', () => {
+			const childNode1 = mock<INode>({ name: 'Child Node 1', type: 'testType1', typeVersion: 1 });
+			const childNode2 = mock<INode>({ name: 'Child Node 2', type: 'testType2', typeVersion: 2 });
+			workflow.getChildNodes.mockReturnValue(['Child Node 1', 'Child Node 2']);
+			workflow.nodes = {
+				'Child Node 1': childNode1,
+				'Child Node 2': childNode2,
+			};
+
+			const result = testContext.getChildNodes('Test Node');
+
+			expect(result).toMatchObject([
+				{ name: 'Child Node 1', type: 'testType1', typeVersion: 1 },
+				{ name: 'Child Node 2', type: 'testType2', typeVersion: 2 },
+			]);
+		});
+	});
+
+	describe('getParentNodes', () => {
+		it('should return an array of NodeTypeAndVersion objects for the parent nodes of the given node', () => {
+			const parentNode1 = mock<INode>({ name: 'Parent Node 1', type: 'testType1', typeVersion: 1 });
+			const parentNode2 = mock<INode>({ name: 'Parent Node 2', type: 'testType2', typeVersion: 2 });
+			workflow.getParentNodes.mockReturnValue(['Parent Node 1', 'Parent Node 2']);
+			workflow.nodes = {
+				'Parent Node 1': parentNode1,
+				'Parent Node 2': parentNode2,
+			};
+
+			const result = testContext.getParentNodes('Test Node');
+
+			expect(result).toMatchObject([
+				{ name: 'Parent Node 1', type: 'testType1', typeVersion: 1 },
+				{ name: 'Parent Node 2', type: 'testType2', typeVersion: 2 },
+			]);
+		});
+	});
+
+	describe('getKnownNodeTypes', () => {
+		it('should call getKnownTypes method of nodeTypes', () => {
+			testContext.getKnownNodeTypes();
+			expect(nodeTypes.getKnownTypes).toHaveBeenCalled();
+		});
+	});
+
+	describe('getRestApiUrl', () => {
+		it('should return the restApiUrl property of additionalData', () => {
+			additionalData.restApiUrl = 'https://example.com/api';
+
+			const result = testContext.getRestApiUrl();
+
+			expect(result).toBe('https://example.com/api');
+		});
+	});
+
+	describe('getInstanceBaseUrl', () => {
+		it('should return the instanceBaseUrl property of additionalData', () => {
+			additionalData.instanceBaseUrl = 'https://example.com';
+
+			const result = testContext.getInstanceBaseUrl();
+
+			expect(result).toBe('https://example.com');
+		});
+	});
+
+	describe('getInstanceId', () => {
+		it('should return the instanceId property of instanceSettings', () => {
+			const result = testContext.getInstanceId();
+
+			expect(result).toBe('abc123');
+		});
+	});
+
+	describe('getTimezone', () => {
+		it('should return the timezone property of workflow', () => {
+			const result = testContext.getTimezone();
+			expect(result).toBe('UTC');
+		});
+	});
+
+	describe('getCredentialsProperties', () => {
+		it('should call getCredentialsProperties method of additionalData.credentialsHelper', () => {
+			testContext.getCredentialsProperties('testType');
+			expect(additionalData.credentialsHelper.getCredentialsProperties).toHaveBeenCalledWith(
+				'testType',
+			);
+		});
+	});
+
+	describe('prepareOutputData', () => {
+		it('should return the input array wrapped in another array', async () => {
+			const outputData = [mock<INodeExecutionData>(), mock<INodeExecutionData>()];
+
+			const result = await testContext.prepareOutputData(outputData);
+
+			expect(result).toEqual([outputData]);
+		});
+	});
+
+	describe('getNodeInputs', () => {
+		it('should return static inputs array when inputs is an array', () => {
+			nodeType.description.inputs = [NodeConnectionType.Main, NodeConnectionType.AiLanguageModel];
+
+			const result = testContext.getNodeInputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel },
+			]);
+		});
+
+		it('should return input objects when inputs contains configurations', () => {
+			nodeType.description.inputs = [
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel, required: true },
+			];
+
+			const result = testContext.getNodeInputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel, required: true },
+			]);
+		});
+
+		it('should evaluate dynamic inputs when inputs is a function', () => {
+			const inputsExpressions = '={{ ["main", "ai_languageModel"] }}';
+			nodeType.description.inputs = inputsExpressions;
+			expression.getSimpleParameterValue.mockReturnValue([
+				NodeConnectionType.Main,
+				NodeConnectionType.AiLanguageModel,
+			]);
+
+			const result = testContext.getNodeInputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel },
+			]);
+			expect(expression.getSimpleParameterValue).toHaveBeenCalledWith(
+				node,
+				inputsExpressions,
+				'internal',
+				{},
+			);
+		});
+	});
+
+	describe('getNodeOutputs', () => {
+		it('should return static outputs array when outputs is an array', () => {
+			nodeType.description.outputs = [NodeConnectionType.Main, NodeConnectionType.AiLanguageModel];
+
+			const result = testContext.getNodeOutputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel },
+			]);
+		});
+
+		it('should return output objects when outputs contains configurations', () => {
+			nodeType.description.outputs = [
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel, required: true },
+			];
+
+			const result = testContext.getNodeOutputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel, required: true },
+			]);
+		});
+
+		it('should evaluate dynamic outputs when outputs is a function', () => {
+			const outputsExpressions = '={{ ["main", "ai_languageModel"] }}';
+			nodeType.description.outputs = outputsExpressions;
+			expression.getSimpleParameterValue.mockReturnValue([
+				NodeConnectionType.Main,
+				NodeConnectionType.AiLanguageModel,
+			]);
+
+			const result = testContext.getNodeOutputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main },
+				{ type: NodeConnectionType.AiLanguageModel },
+			]);
+			expect(expression.getSimpleParameterValue).toHaveBeenCalledWith(
+				node,
+				outputsExpressions,
+				'internal',
+				{},
+			);
+		});
+
+		it('should add error output when node has continueOnFail error handling', () => {
+			const nodeWithError = mock<INode>({ onError: 'continueErrorOutput' });
+			const contextWithError = new TestContext(workflow, nodeWithError, additionalData, mode);
+			nodeType.description.outputs = [NodeConnectionType.Main];
+
+			const result = contextWithError.getNodeOutputs();
+
+			expect(result).toEqual([
+				{ type: NodeConnectionType.Main, displayName: 'Success' },
+				{ type: NodeConnectionType.Main, displayName: 'Error', category: 'error' },
+			]);
+		});
+	});
+
+	describe('getConnectedNodes', () => {
+		it('should return connected nodes of given type', () => {
+			const node1 = mock<INode>({ name: 'Node 1', type: 'test', disabled: false });
+			const node2 = mock<INode>({ name: 'Node 2', type: 'test', disabled: false });
+
+			workflow.getParentNodes.mockReturnValue(['Node 1', 'Node 2']);
+			workflow.getNode.mockImplementation((name) => {
+				if (name === 'Node 1') return node1;
+				if (name === 'Node 2') return node2;
+				return null;
+			});
+
+			const result = testContext.getConnectedNodes(NodeConnectionType.Main);
+
+			expect(result).toEqual([node1, node2]);
+			expect(workflow.getParentNodes).toHaveBeenCalledWith(node.name, NodeConnectionType.Main, 1);
+		});
+
+		it('should filter out disabled nodes', () => {
+			const node1 = mock<INode>({ name: 'Node 1', type: 'test', disabled: false });
+			const node2 = mock<INode>({ name: 'Node 2', type: 'test', disabled: true });
+
+			workflow.getParentNodes.mockReturnValue(['Node 1', 'Node 2']);
+			workflow.getNode.mockImplementation((name) => {
+				if (name === 'Node 1') return node1;
+				if (name === 'Node 2') return node2;
+				return null;
+			});
+
+			const result = testContext.getConnectedNodes(NodeConnectionType.Main);
+
+			expect(result).toEqual([node1]);
+		});
+
+		it('should filter out non-existent nodes', () => {
+			const node1 = mock<INode>({ name: 'Node 1', type: 'test', disabled: false });
+
+			workflow.getParentNodes.mockReturnValue(['Node 1', 'NonExistent']);
+			workflow.getNode.mockImplementation((name) => {
+				if (name === 'Node 1') return node1;
+				return null;
+			});
+
+			const result = testContext.getConnectedNodes(NodeConnectionType.Main);
+
+			expect(result).toEqual([node1]);
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/poll-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/poll-context.test.ts
new file mode 100644
index 0000000000..f2ca37998b
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/poll-context.test.ts
@@ -0,0 +1,96 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	Expression,
+	ICredentialDataDecryptedObject,
+	ICredentialsHelper,
+	INode,
+	INodeType,
+	INodeTypes,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+
+import { PollContext } from '../poll-context';
+
+describe('PollContext', () => {
+	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>({
+		credentials: {
+			[testCredentialType]: {
+				id: 'testCredentialId',
+			},
+		},
+	});
+	node.parameters = {
+		testParameter: 'testValue',
+	};
+	const credentialsHelper = mock<ICredentialsHelper>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ credentialsHelper });
+	const mode: WorkflowExecuteMode = 'manual';
+	const activation: WorkflowActivateMode = 'init';
+
+	const pollContext = new PollContext(workflow, node, additionalData, mode, activation);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('getActivationMode', () => {
+		it('should return the activation property', () => {
+			const result = pollContext.getActivationMode();
+			expect(result).toBe(activation);
+		});
+	});
+
+	describe('getCredentials', () => {
+		it('should get decrypted credentials', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			credentialsHelper.getDecrypted.mockResolvedValue({ secret: 'token' });
+
+			const credentials =
+				await pollContext.getCredentials<ICredentialDataDecryptedObject>(testCredentialType);
+
+			expect(credentials).toEqual({ secret: 'token' });
+		});
+	});
+
+	describe('getNodeParameter', () => {
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			expression.getParameterValue.mockImplementation((value) => value);
+		});
+
+		it('should return parameter value when it exists', () => {
+			const parameter = pollContext.getNodeParameter('testParameter');
+
+			expect(parameter).toBe('testValue');
+		});
+
+		it('should return the fallback value when the parameter does not exist', () => {
+			const parameter = pollContext.getNodeParameter('otherParameter', 'fallback');
+
+			expect(parameter).toBe('fallback');
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts
new file mode 100644
index 0000000000..601b49fe4c
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/shared-tests.ts
@@ -0,0 +1,242 @@
+import { Container } from '@n8n/di';
+import { captor, mock, type MockProxy } from 'jest-mock-extended';
+import type {
+	IRunExecutionData,
+	ContextType,
+	IContextObject,
+	INode,
+	OnError,
+	Workflow,
+	ITaskMetadata,
+	ISourceData,
+	IExecuteData,
+	IWorkflowExecuteAdditionalData,
+	ExecuteWorkflowData,
+	RelatedExecution,
+	IExecuteWorkflowInfo,
+} from 'n8n-workflow';
+import { ApplicationError, NodeHelpers, WAIT_INDEFINITELY } from 'n8n-workflow';
+
+import { BinaryDataService } from '@/binary-data/binary-data.service';
+
+import type { BaseExecuteContext } from '../base-execute-context';
+
+const binaryDataService = mock<BinaryDataService>();
+Container.set(BinaryDataService, binaryDataService);
+
+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.additionalData as MockProxy<IWorkflowExecuteAdditionalData>;
+
+	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();
+		});
+	});
+
+	describe('putExecutionToWait', () => {
+		it('should set waitTill and execution status', async () => {
+			const waitTill = new Date();
+
+			await context.putExecutionToWait(waitTill);
+
+			expect(runExecutionData.waitTill).toEqual(waitTill);
+			expect(additionalData.setExecutionStatus).toHaveBeenCalledWith('waiting');
+		});
+	});
+
+	describe('executeWorkflow', () => {
+		const data = [[{ json: { test: true } }]];
+		const executeWorkflowData = mock<ExecuteWorkflowData>();
+		const workflowInfo = mock<IExecuteWorkflowInfo>();
+		const parentExecution: RelatedExecution = {
+			executionId: 'parent_execution_id',
+			workflowId: 'parent_workflow_id',
+		};
+
+		it('should execute workflow and return data', async () => {
+			additionalData.executeWorkflow.mockResolvedValue(executeWorkflowData);
+			binaryDataService.duplicateBinaryData.mockResolvedValue(data);
+
+			const result = await context.executeWorkflow(workflowInfo, undefined, undefined, {
+				parentExecution,
+			});
+
+			expect(result.data).toEqual(data);
+			expect(binaryDataService.duplicateBinaryData).toHaveBeenCalledWith(
+				workflow.id,
+				additionalData.executionId,
+				executeWorkflowData.data,
+			);
+		});
+
+		it('should put execution to wait if waitTill is returned', async () => {
+			const waitTill = new Date();
+			additionalData.executeWorkflow.mockResolvedValue({ ...executeWorkflowData, waitTill });
+			binaryDataService.duplicateBinaryData.mockResolvedValue(data);
+
+			const result = await context.executeWorkflow(workflowInfo, undefined, undefined, {
+				parentExecution,
+			});
+
+			expect(additionalData.setExecutionStatus).toHaveBeenCalledWith('waiting');
+			expect(runExecutionData.waitTill).toEqual(WAIT_INDEFINITELY);
+			expect(result.waitTill).toBe(waitTill);
+		});
+	});
+};
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts
new file mode 100644
index 0000000000..99ee41c6fd
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/supply-data-context.test.ts
@@ -0,0 +1,178 @@
+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, NodeConnectionType } 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 connectionType = NodeConnectionType.Main;
+	const inputData: ITaskDataConnections = { [connectionType]: [[{ 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,
+		connectionType,
+		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;
+
+		afterEach(() => {
+			inputData[connectionType] = [[{ json: { test: 'data' } }]];
+		});
+
+		it('should return the input data correctly', () => {
+			const expectedData = [{ json: { test: 'data' } }];
+
+			expect(supplyDataContext.getInputData(inputIndex, connectionType)).toEqual(expectedData);
+		});
+
+		it('should return an empty array if the input name does not exist', () => {
+			const connectionType = 'nonExistent';
+			expect(
+				supplyDataContext.getInputData(inputIndex, connectionType as NodeConnectionType),
+			).toEqual([]);
+		});
+
+		it('should throw an error if the input index is out of range', () => {
+			const inputIndex = 2;
+
+			expect(() => supplyDataContext.getInputData(inputIndex, connectionType)).toThrow(
+				ApplicationError,
+			);
+		});
+
+		it('should throw an error if the input index was not set', () => {
+			inputData.main[inputIndex] = null;
+
+			expect(() => supplyDataContext.getInputData(inputIndex, connectionType)).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/src/execution-engine/node-execution-context/__tests__/trigger-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/trigger-context.test.ts
new file mode 100644
index 0000000000..3c91d22e6d
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/trigger-context.test.ts
@@ -0,0 +1,96 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	Expression,
+	ICredentialDataDecryptedObject,
+	ICredentialsHelper,
+	INode,
+	INodeType,
+	INodeTypes,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+
+import { TriggerContext } from '../trigger-context';
+
+describe('TriggerContext', () => {
+	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>({
+		credentials: {
+			[testCredentialType]: {
+				id: 'testCredentialId',
+			},
+		},
+	});
+	node.parameters = {
+		testParameter: 'testValue',
+	};
+	const credentialsHelper = mock<ICredentialsHelper>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ credentialsHelper });
+	const mode: WorkflowExecuteMode = 'manual';
+	const activation: WorkflowActivateMode = 'init';
+
+	const triggerContext = new TriggerContext(workflow, node, additionalData, mode, activation);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('getActivationMode', () => {
+		it('should return the activation property', () => {
+			const result = triggerContext.getActivationMode();
+			expect(result).toBe(activation);
+		});
+	});
+
+	describe('getCredentials', () => {
+		it('should get decrypted credentials', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			credentialsHelper.getDecrypted.mockResolvedValue({ secret: 'token' });
+
+			const credentials =
+				await triggerContext.getCredentials<ICredentialDataDecryptedObject>(testCredentialType);
+
+			expect(credentials).toEqual({ secret: 'token' });
+		});
+	});
+
+	describe('getNodeParameter', () => {
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			expression.getParameterValue.mockImplementation((value) => value);
+		});
+
+		it('should return parameter value when it exists', () => {
+			const parameter = triggerContext.getNodeParameter('testParameter');
+
+			expect(parameter).toBe('testValue');
+		});
+
+		it('should return the fallback value when the parameter does not exist', () => {
+			const parameter = triggerContext.getNodeParameter('otherParameter', 'fallback');
+
+			expect(parameter).toBe('fallback');
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/__tests__/webhook-context.test.ts b/packages/core/src/execution-engine/node-execution-context/__tests__/webhook-context.test.ts
new file mode 100644
index 0000000000..15d425c988
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/__tests__/webhook-context.test.ts
@@ -0,0 +1,161 @@
+import type { Request, Response } from 'express';
+import { mock } from 'jest-mock-extended';
+import type {
+	Expression,
+	ICredentialDataDecryptedObject,
+	ICredentialsHelper,
+	INode,
+	INodeType,
+	INodeTypes,
+	IWebhookData,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+
+import { WebhookContext } from '../webhook-context';
+
+describe('WebhookContext', () => {
+	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>({
+		credentials: {
+			[testCredentialType]: {
+				id: 'testCredentialId',
+			},
+		},
+	});
+	node.parameters = {
+		testParameter: 'testValue',
+	};
+	const credentialsHelper = mock<ICredentialsHelper>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({
+		credentialsHelper,
+	});
+	additionalData.httpRequest = {
+		body: { test: 'body' },
+		headers: { test: 'header' },
+		params: { test: 'param' },
+		query: { test: 'query' },
+	} as unknown as Request;
+	additionalData.httpResponse = mock<Response>();
+	const mode: WorkflowExecuteMode = 'manual';
+	const webhookData = mock<IWebhookData>({
+		webhookDescription: {
+			name: 'default',
+		},
+	});
+	const runExecutionData = null;
+
+	const webhookContext = new WebhookContext(
+		workflow,
+		node,
+		additionalData,
+		mode,
+		webhookData,
+		[],
+		runExecutionData,
+	);
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('getCredentials', () => {
+		it('should get decrypted credentials', async () => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			credentialsHelper.getDecrypted.mockResolvedValue({ secret: 'token' });
+
+			const credentials =
+				await webhookContext.getCredentials<ICredentialDataDecryptedObject>(testCredentialType);
+
+			expect(credentials).toEqual({ secret: 'token' });
+		});
+	});
+
+	describe('getBodyData', () => {
+		it('should return the body data of the request', () => {
+			const bodyData = webhookContext.getBodyData();
+			expect(bodyData).toEqual({ test: 'body' });
+		});
+	});
+
+	describe('getHeaderData', () => {
+		it('should return the header data of the request', () => {
+			const headerData = webhookContext.getHeaderData();
+			expect(headerData).toEqual({ test: 'header' });
+		});
+	});
+
+	describe('getParamsData', () => {
+		it('should return the params data of the request', () => {
+			const paramsData = webhookContext.getParamsData();
+			expect(paramsData).toEqual({ test: 'param' });
+		});
+	});
+
+	describe('getQueryData', () => {
+		it('should return the query data of the request', () => {
+			const queryData = webhookContext.getQueryData();
+			expect(queryData).toEqual({ test: 'query' });
+		});
+	});
+
+	describe('getRequestObject', () => {
+		it('should return the request object', () => {
+			const request = webhookContext.getRequestObject();
+			expect(request).toBe(additionalData.httpRequest);
+		});
+	});
+
+	describe('getResponseObject', () => {
+		it('should return the response object', () => {
+			const response = webhookContext.getResponseObject();
+			expect(response).toBe(additionalData.httpResponse);
+		});
+	});
+
+	describe('getWebhookName', () => {
+		it('should return the name of the webhook', () => {
+			const webhookName = webhookContext.getWebhookName();
+			expect(webhookName).toBe('default');
+		});
+	});
+
+	describe('getNodeParameter', () => {
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion.mockReturnValue(nodeType);
+			expression.getParameterValue.mockImplementation((value) => value);
+		});
+
+		it('should return parameter value when it exists', () => {
+			const parameter = webhookContext.getNodeParameter('testParameter');
+
+			expect(parameter).toBe('testValue');
+		});
+
+		it('should return the fallback value when the parameter does not exist', () => {
+			const parameter = webhookContext.getNodeParameter('otherParameter', 'fallback');
+
+			expect(parameter).toBe('fallback');
+		});
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts b/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts
new file mode 100644
index 0000000000..1c4bba34e3
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/base-execute-context.ts
@@ -0,0 +1,227 @@
+import { Container } from '@n8n/di';
+import { get } from 'lodash';
+import type {
+	Workflow,
+	INode,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+	IRunExecutionData,
+	INodeExecutionData,
+	ITaskDataConnections,
+	IExecuteData,
+	ICredentialDataDecryptedObject,
+	CallbackManager,
+	IExecuteWorkflowInfo,
+	RelatedExecution,
+	ExecuteWorkflowData,
+	ITaskMetadata,
+	ContextType,
+	IContextObject,
+	IWorkflowDataProxyData,
+	ISourceData,
+	AiEvent,
+} from 'n8n-workflow';
+import {
+	ApplicationError,
+	NodeHelpers,
+	NodeConnectionType,
+	WAIT_INDEFINITELY,
+	WorkflowDataProxy,
+} from 'n8n-workflow';
+
+import { BinaryDataService } from '@/binary-data/binary-data.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 putExecutionToWait(waitTill: Date): Promise<void> {
+		this.runExecutionData.waitTill = waitTill;
+		if (this.additionalData.setExecutionStatus) {
+			this.additionalData.setExecutionStatus('waiting');
+		}
+	}
+
+	async executeWorkflow(
+		workflowInfo: IExecuteWorkflowInfo,
+		inputData?: INodeExecutionData[],
+		parentCallbackManager?: CallbackManager,
+		options?: {
+			doNotWaitToFinish?: boolean;
+			parentExecution?: RelatedExecution;
+		},
+	): Promise<ExecuteWorkflowData> {
+		const result = await this.additionalData.executeWorkflow(workflowInfo, this.additionalData, {
+			...options,
+			parentWorkflowId: this.workflow.id,
+			inputData,
+			parentWorkflowSettings: this.workflow.settings,
+			node: this.node,
+			parentCallbackManager,
+		});
+
+		// If a sub-workflow execution goes into the waiting state
+		if (result.waitTill) {
+			// then put the parent workflow execution also into the waiting state,
+			// but do not use the sub-workflow `waitTill` to avoid WaitTracker resuming the parent execution at the same time as the sub-workflow
+			await this.putExecutionToWait(WAIT_INDEFINITELY);
+		}
+
+		const data = await this.binaryDataService.duplicateBinaryData(
+			this.workflow.id,
+			this.additionalData.executionId!,
+			result.data,
+		);
+		return { ...result, data };
+	}
+
+	protected getInputItems(inputIndex: number, connectionType: NodeConnectionType) {
+		const inputData = this.inputData[connectionType];
+		if (inputData.length < inputIndex) {
+			throw new ApplicationError('Could not get input with given index', {
+				extra: { inputIndex, connectionType },
+			});
+		}
+
+		const allItems = inputData[inputIndex] as INodeExecutionData[] | null | undefined;
+		if (allItems === null) {
+			throw new ApplicationError('Input index was not set', {
+				extra: { inputIndex, connectionType },
+			});
+		}
+
+		return allItems;
+	}
+
+	getInputSourceData(inputIndex = 0, connectionType = NodeConnectionType.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[connectionType][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/execution-engine/node-execution-context/execute-context.ts b/packages/core/src/execution-engine/node-execution-context/execute-context.ts
new file mode 100644
index 0000000000..7b3ec16bf5
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/execute-context.ts
@@ -0,0 +1,211 @@
+import type {
+	AINodeConnectionType,
+	CallbackManager,
+	CloseFunction,
+	IExecuteData,
+	IExecuteFunctions,
+	IExecuteResponsePromiseData,
+	IGetNodeParameterOptions,
+	INode,
+	INodeExecutionData,
+	IRunExecutionData,
+	ITaskDataConnections,
+	IWorkflowExecuteAdditionalData,
+	Result,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import {
+	ApplicationError,
+	createDeferredPromise,
+	createEnvProviderState,
+	NodeConnectionType,
+} from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import {
+	returnJsonArray,
+	copyInputItems,
+	normalizeItems,
+	constructExecutionMetaData,
+	assertBinaryData,
+	getBinaryDataBuffer,
+	copyBinaryFile,
+	getRequestHelperFunctions,
+	getBinaryHelperFunctions,
+	getSSHTunnelFunctions,
+	getFileSystemHelperFunctions,
+	getCheckProcessedHelperFunctions,
+	detectBinaryEncoding,
+} from '@/node-execute-functions';
+
+import { BaseExecuteContext } from './base-execute-context';
+import { getInputConnectionData } from './utils/get-input-connection-data';
+
+export class ExecuteContext extends BaseExecuteContext implements IExecuteFunctions {
+	readonly helpers: IExecuteFunctions['helpers'];
+
+	readonly nodeHelpers: IExecuteFunctions['nodeHelpers'];
+
+	readonly getNodeParameter: IExecuteFunctions['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,
+			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),
+			detectBinaryEncoding: (buffer: Buffer) => detectBinaryEncoding(buffer),
+		};
+
+		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'];
+	}
+
+	async startJob<T = unknown, E = unknown>(
+		jobType: string,
+		settings: unknown,
+		itemIndex: number,
+	): Promise<Result<T, E>> {
+		return await this.additionalData.startRunnerTask<T, E>(
+			this.additionalData,
+			jobType,
+			settings,
+			this,
+			this.inputData,
+			this.node,
+			this.workflow,
+			this.runExecutionData,
+			this.runIndex,
+			itemIndex,
+			this.node.name,
+			this.connectionInputData,
+			{},
+			this.mode,
+			createEnvProviderState(),
+			this.executeData,
+		);
+	}
+
+	async getInputConnectionData(
+		connectionType: AINodeConnectionType,
+		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,
+			connectionType,
+			itemIndex,
+			this.abortSignal,
+		);
+	}
+
+	getInputData(inputIndex = 0, connectionType = NodeConnectionType.Main) {
+		if (!this.inputData.hasOwnProperty(connectionType)) {
+			// Return empty array because else it would throw error when nothing is connected to input
+			return [];
+		}
+		return super.getInputItems(inputIndex, connectionType) ?? [];
+	}
+
+	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]);
+	}
+
+	/** @deprecated use ISupplyDataFunctions.addInputData */
+	addInputData(): { index: number } {
+		throw new ApplicationError('addInputData should not be called on IExecuteFunctions');
+	}
+
+	/** @deprecated use ISupplyDataFunctions.addOutputData */
+	addOutputData(): void {
+		throw new ApplicationError('addOutputData should not be called on IExecuteFunctions');
+	}
+
+	getParentCallbackManager(): CallbackManager | undefined {
+		return this.additionalData.parentCallbackManager;
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/execute-single-context.ts b/packages/core/src/execution-engine/node-execution-context/execute-single-context.ts
new file mode 100644
index 0000000000..2ba450b593
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/execute-single-context.ts
@@ -0,0 +1,115 @@
+import type {
+	ICredentialDataDecryptedObject,
+	IGetNodeParameterOptions,
+	INode,
+	INodeExecutionData,
+	IRunExecutionData,
+	IExecuteSingleFunctions,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowExecuteMode,
+	ITaskDataConnections,
+	IExecuteData,
+} from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise, NodeConnectionType } from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import {
+	assertBinaryData,
+	detectBinaryEncoding,
+	getBinaryDataBuffer,
+	getBinaryHelperFunctions,
+	getRequestHelperFunctions,
+	returnJsonArray,
+} from '@/node-execute-functions';
+
+import { BaseExecuteContext } from './base-execute-context';
+
+export class ExecuteSingleContext extends BaseExecuteContext implements IExecuteSingleFunctions {
+	readonly helpers: IExecuteSingleFunctions['helpers'];
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		runExecutionData: IRunExecutionData,
+		runIndex: number,
+		connectionInputData: INodeExecutionData[],
+		inputData: ITaskDataConnections,
+		private readonly itemIndex: number,
+		executeData: IExecuteData,
+		abortSignal?: AbortSignal,
+	) {
+		super(
+			workflow,
+			node,
+			additionalData,
+			mode,
+			runExecutionData,
+			runIndex,
+			connectionInputData,
+			inputData,
+			executeData,
+			abortSignal,
+		);
+
+		this.helpers = {
+			createDeferredPromise,
+			returnJsonArray,
+			...getRequestHelperFunctions(
+				workflow,
+				node,
+				additionalData,
+				runExecutionData,
+				connectionInputData,
+			),
+			...getBinaryHelperFunctions(additionalData, workflow.id),
+
+			assertBinaryData: (propertyName, inputIndex = 0) =>
+				assertBinaryData(inputData, node, itemIndex, propertyName, inputIndex),
+			getBinaryDataBuffer: async (propertyName, inputIndex = 0) =>
+				await getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex),
+			detectBinaryEncoding: (buffer) => detectBinaryEncoding(buffer),
+		};
+	}
+
+	evaluateExpression(expression: string, itemIndex: number = this.itemIndex) {
+		return super.evaluateExpression(expression, itemIndex);
+	}
+
+	getInputData(inputIndex = 0, connectionType = NodeConnectionType.Main) {
+		if (!this.inputData.hasOwnProperty(connectionType)) {
+			// Return empty array because else it would throw error when nothing is connected to input
+			return { json: {} };
+		}
+
+		const allItems = super.getInputItems(inputIndex, connectionType);
+
+		const data = allItems?.[this.itemIndex];
+		if (data === undefined) {
+			throw new ApplicationError('Value of input with given index was not set', {
+				extra: { inputIndex, connectionType, itemIndex: this.itemIndex },
+			});
+		}
+
+		return data;
+	}
+
+	getItemIndex() {
+		return this.itemIndex;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	getNodeParameter(parameterName: string, fallbackValue?: any, options?: IGetNodeParameterOptions) {
+		return this._getNodeParameter(parameterName, this.itemIndex, fallbackValue, options);
+	}
+
+	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
+		return await super.getCredentials<T>(type, this.itemIndex);
+	}
+
+	getWorkflowDataProxy() {
+		return super.getWorkflowDataProxy(this.itemIndex);
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/hook-context.ts b/packages/core/src/execution-engine/node-execution-context/hook-context.ts
new file mode 100644
index 0000000000..28dbac802c
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/hook-context.ts
@@ -0,0 +1,69 @@
+import type {
+	ICredentialDataDecryptedObject,
+	INode,
+	IHookFunctions,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+	IWebhookData,
+	WebhookType,
+} from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import {
+	getNodeWebhookUrl,
+	getRequestHelperFunctions,
+	getWebhookDescription,
+} from '@/node-execute-functions';
+
+import { NodeExecutionContext } from './node-execution-context';
+
+export class HookContext extends NodeExecutionContext implements IHookFunctions {
+	readonly helpers: IHookFunctions['helpers'];
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		private readonly activation: WorkflowActivateMode,
+		private readonly webhookData?: IWebhookData,
+	) {
+		super(workflow, node, additionalData, mode);
+
+		this.helpers = getRequestHelperFunctions(workflow, node, additionalData);
+	}
+
+	getActivationMode() {
+		return this.activation;
+	}
+
+	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
+		return await this._getCredentials<T>(type);
+	}
+
+	getNodeWebhookUrl(name: WebhookType): string | undefined {
+		return getNodeWebhookUrl(
+			name,
+			this.workflow,
+			this.node,
+			this.additionalData,
+			this.mode,
+			this.additionalKeys,
+			this.webhookData?.isTest,
+		);
+	}
+
+	getWebhookName(): string {
+		if (this.webhookData === undefined) {
+			throw new ApplicationError('Only supported in webhook functions');
+		}
+		return this.webhookData.webhookDescription.name;
+	}
+
+	getWebhookDescription(name: WebhookType) {
+		return getWebhookDescription(name, this.workflow, this.node);
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/index.ts b/packages/core/src/execution-engine/node-execution-context/index.ts
new file mode 100644
index 0000000000..4c96322211
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/index.ts
@@ -0,0 +1,13 @@
+// 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 { LocalLoadOptionsContext } from './local-load-options-context';
+export { PollContext } from './poll-context';
+// eslint-disable-next-line import/no-cycle
+export { SupplyDataContext } from './supply-data-context';
+export { TriggerContext } from './trigger-context';
+export { WebhookContext } from './webhook-context';
+
+export { getAdditionalKeys } from './utils/get-additional-keys';
diff --git a/packages/core/src/execution-engine/node-execution-context/load-options-context.ts b/packages/core/src/execution-engine/node-execution-context/load-options-context.ts
new file mode 100644
index 0000000000..30c31eacce
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/load-options-context.ts
@@ -0,0 +1,71 @@
+import { get } from 'lodash';
+import type {
+	ICredentialDataDecryptedObject,
+	IGetNodeParameterOptions,
+	INode,
+	ILoadOptionsFunctions,
+	IWorkflowExecuteAdditionalData,
+	NodeParameterValueType,
+	Workflow,
+} from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import { getRequestHelperFunctions, getSSHTunnelFunctions } from '@/node-execute-functions';
+
+import { NodeExecutionContext } from './node-execution-context';
+import { extractValue } from './utils/extract-value';
+
+export class LoadOptionsContext extends NodeExecutionContext implements ILoadOptionsFunctions {
+	readonly helpers: ILoadOptionsFunctions['helpers'];
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		private readonly path: string,
+	) {
+		super(workflow, node, additionalData, 'internal');
+
+		this.helpers = {
+			...getSSHTunnelFunctions(),
+			...getRequestHelperFunctions(workflow, node, additionalData),
+		};
+	}
+
+	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
+		return await this._getCredentials<T>(type);
+	}
+
+	getCurrentNodeParameter(
+		parameterPath: string,
+		options?: IGetNodeParameterOptions,
+	): NodeParameterValueType | object | undefined {
+		const nodeParameters = this.additionalData.currentNodeParameters;
+
+		if (parameterPath.charAt(0) === '&') {
+			parameterPath = `${this.path.split('.').slice(1, -1).join('.')}.${parameterPath.slice(1)}`;
+		}
+
+		let returnData = get(nodeParameters, parameterPath);
+
+		// This is outside the try/catch because it throws errors with proper messages
+		if (options?.extractValue) {
+			const nodeType = this.workflow.nodeTypes.getByNameAndVersion(
+				this.node.type,
+				this.node.typeVersion,
+			);
+			returnData = extractValue(
+				returnData,
+				parameterPath,
+				this.node,
+				nodeType,
+			) as NodeParameterValueType;
+		}
+
+		return returnData;
+	}
+
+	getCurrentNodeParameters() {
+		return this.additionalData.currentNodeParameters;
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts b/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts
new file mode 100644
index 0000000000..39456ff966
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/local-load-options-context.ts
@@ -0,0 +1,70 @@
+import lodash from 'lodash';
+import { ApplicationError, Workflow } from 'n8n-workflow';
+import type {
+	INodeParameterResourceLocator,
+	IWorkflowExecuteAdditionalData,
+	NodeParameterValueType,
+	ILocalLoadOptionsFunctions,
+	IWorkflowLoader,
+	IWorkflowNodeContext,
+	INodeTypes,
+} from 'n8n-workflow';
+
+import { LoadWorkflowNodeContext } from './workflow-node-context';
+
+export class LocalLoadOptionsContext implements ILocalLoadOptionsFunctions {
+	constructor(
+		private nodeTypes: INodeTypes,
+		private additionalData: IWorkflowExecuteAdditionalData,
+		private path: string,
+		private workflowLoader: IWorkflowLoader,
+	) {}
+
+	async getWorkflowNodeContext(nodeType: string): Promise<IWorkflowNodeContext | null> {
+		const { value: workflowId } = this.getCurrentNodeParameter(
+			'workflowId',
+		) as INodeParameterResourceLocator;
+
+		if (typeof workflowId !== 'string' || !workflowId) {
+			throw new ApplicationError(`No workflowId parameter defined on node of type "${nodeType}"!`);
+		}
+
+		const dbWorkflow = await this.workflowLoader.get(workflowId);
+
+		const selectedWorkflowNode = dbWorkflow.nodes.find((node) => node.type === nodeType);
+
+		if (selectedWorkflowNode) {
+			const selectedSingleNodeWorkflow = new Workflow({
+				nodes: [selectedWorkflowNode],
+				connections: {},
+				active: false,
+				nodeTypes: this.nodeTypes,
+			});
+
+			const workflowAdditionalData = {
+				...this.additionalData,
+				currentNodeParameters: selectedWorkflowNode.parameters,
+			};
+
+			return new LoadWorkflowNodeContext(
+				selectedSingleNodeWorkflow,
+				selectedWorkflowNode,
+				workflowAdditionalData,
+			);
+		}
+
+		return null;
+	}
+
+	getCurrentNodeParameter(parameterPath: string): NodeParameterValueType | object | undefined {
+		const nodeParameters = this.additionalData.currentNodeParameters;
+
+		if (parameterPath.startsWith('&')) {
+			parameterPath = `${this.path.split('.').slice(1, -1).join('.')}.${parameterPath.slice(1)}`;
+		}
+
+		const returnData = lodash.get(nodeParameters, parameterPath);
+
+		return returnData;
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts b/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts
new file mode 100644
index 0000000000..f5f3730244
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts
@@ -0,0 +1,427 @@
+import { Container } from '@n8n/di';
+import { get } from 'lodash';
+import type {
+	FunctionsBase,
+	ICredentialDataDecryptedObject,
+	ICredentialsExpressionResolveValues,
+	IExecuteData,
+	IGetNodeParameterOptions,
+	INode,
+	INodeCredentialDescription,
+	INodeCredentialsDetails,
+	INodeExecutionData,
+	INodeInputConfiguration,
+	INodeOutputConfiguration,
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
+	NodeConnectionType,
+	NodeParameterValueType,
+	NodeTypeAndVersion,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import {
+	ApplicationError,
+	deepCopy,
+	ExpressionError,
+	NodeHelpers,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import { HTTP_REQUEST_NODE_TYPE, HTTP_REQUEST_TOOL_NODE_TYPE } from '@/constants';
+import { Memoized } from '@/decorators';
+import { InstanceSettings } from '@/instance-settings';
+import { Logger } from '@/logging/logger';
+
+import { cleanupParameterData } from './utils/cleanup-parameter-data';
+import { ensureType } from './utils/ensure-type';
+import { extractValue } from './utils/extract-value';
+import { getAdditionalKeys } from './utils/get-additional-keys';
+import { validateValueAgainstSchema } from './utils/validate-value-against-schema';
+
+export abstract class NodeExecutionContext implements Omit<FunctionsBase, 'getCredentials'> {
+	protected readonly instanceSettings = Container.get(InstanceSettings);
+
+	constructor(
+		protected readonly workflow: Workflow,
+		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,
+	) {}
+
+	@Memoized
+	get logger() {
+		return Container.get(Logger);
+	}
+
+	getExecutionId() {
+		return this.additionalData.executionId!;
+	}
+
+	getNode(): INode {
+		return deepCopy(this.node);
+	}
+
+	getWorkflow() {
+		const { id, name, active } = this.workflow;
+		return { id, name, active };
+	}
+
+	getMode() {
+		return this.mode;
+	}
+
+	getWorkflowStaticData(type: string) {
+		return this.workflow.getStaticData(type, this.node);
+	}
+
+	getChildNodes(nodeName: string) {
+		const output: NodeTypeAndVersion[] = [];
+		const nodeNames = this.workflow.getChildNodes(nodeName);
+
+		for (const n of nodeNames) {
+			const node = this.workflow.nodes[n];
+			output.push({
+				name: node.name,
+				type: node.type,
+				typeVersion: node.typeVersion,
+				disabled: node.disabled ?? false,
+			});
+		}
+		return output;
+	}
+
+	getParentNodes(nodeName: string) {
+		const output: NodeTypeAndVersion[] = [];
+		const nodeNames = this.workflow.getParentNodes(nodeName);
+
+		for (const n of nodeNames) {
+			const node = this.workflow.nodes[n];
+			output.push({
+				name: node.name,
+				type: node.type,
+				typeVersion: node.typeVersion,
+				disabled: node.disabled ?? false,
+			});
+		}
+		return output;
+	}
+
+	@Memoized
+	get nodeType() {
+		const { type, typeVersion } = this.node;
+		return this.workflow.nodeTypes.getByNameAndVersion(type, typeVersion);
+	}
+
+	@Memoized
+	get nodeInputs() {
+		return NodeHelpers.getNodeInputs(this.workflow, this.node, this.nodeType.description).map(
+			(input) => (typeof input === 'string' ? { type: input } : input),
+		);
+	}
+
+	getNodeInputs(): INodeInputConfiguration[] {
+		return this.nodeInputs;
+	}
+
+	@Memoized
+	get nodeOutputs() {
+		return NodeHelpers.getNodeOutputs(this.workflow, this.node, this.nodeType.description).map(
+			(output) => (typeof output === 'string' ? { type: output } : output),
+		);
+	}
+
+	getConnectedNodes(connectionType: NodeConnectionType): INode[] {
+		return this.workflow
+			.getParentNodes(this.node.name, connectionType, 1)
+			.map((nodeName) => this.workflow.getNode(nodeName))
+			.filter((node) => !!node)
+			.filter((node) => node.disabled !== true);
+	}
+
+	getNodeOutputs(): INodeOutputConfiguration[] {
+		return this.nodeOutputs;
+	}
+
+	getKnownNodeTypes() {
+		return this.workflow.nodeTypes.getKnownTypes();
+	}
+
+	getRestApiUrl() {
+		return this.additionalData.restApiUrl;
+	}
+
+	getInstanceBaseUrl() {
+		return this.additionalData.instanceBaseUrl;
+	}
+
+	getInstanceId() {
+		return this.instanceSettings.instanceId;
+	}
+
+	getTimezone() {
+		return this.workflow.timezone;
+	}
+
+	getCredentialsProperties(type: string) {
+		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;
+	}
+
+	@Memoized
+	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/execution-engine/node-execution-context/poll-context.ts b/packages/core/src/execution-engine/node-execution-context/poll-context.ts
new file mode 100644
index 0000000000..8ee2c2a692
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/poll-context.ts
@@ -0,0 +1,60 @@
+import type {
+	ICredentialDataDecryptedObject,
+	INode,
+	IPollFunctions,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import {
+	getBinaryHelperFunctions,
+	getRequestHelperFunctions,
+	getSchedulingFunctions,
+	returnJsonArray,
+} from '@/node-execute-functions';
+
+import { NodeExecutionContext } from './node-execution-context';
+
+const throwOnEmit = () => {
+	throw new ApplicationError('Overwrite PollContext.__emit function');
+};
+
+const throwOnEmitError = () => {
+	throw new ApplicationError('Overwrite PollContext.__emitError function');
+};
+
+export class PollContext extends NodeExecutionContext implements IPollFunctions {
+	readonly helpers: IPollFunctions['helpers'];
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		private readonly activation: WorkflowActivateMode,
+		readonly __emit: IPollFunctions['__emit'] = throwOnEmit,
+		readonly __emitError: IPollFunctions['__emitError'] = throwOnEmitError,
+	) {
+		super(workflow, node, additionalData, mode);
+
+		this.helpers = {
+			createDeferredPromise,
+			returnJsonArray,
+			...getRequestHelperFunctions(workflow, node, additionalData),
+			...getBinaryHelperFunctions(additionalData, workflow.id),
+			...getSchedulingFunctions(workflow),
+		};
+	}
+
+	getActivationMode() {
+		return this.activation;
+	}
+
+	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
+		return await this._getCredentials<T>(type);
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts b/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts
new file mode 100644
index 0000000000..dc2ac37a91
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/supply-data-context.ts
@@ -0,0 +1,293 @@
+import get from 'lodash/get';
+import type {
+	AINodeConnectionType,
+	CloseFunction,
+	ExecutionBaseError,
+	IExecuteData,
+	IGetNodeParameterOptions,
+	INode,
+	INodeExecutionData,
+	IRunExecutionData,
+	ISupplyDataFunctions,
+	ITaskData,
+	ITaskDataConnections,
+	ITaskMetadata,
+	IWorkflowExecuteAdditionalData,
+	NodeConnectionType,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { createDeferredPromise } from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import {
+	assertBinaryData,
+	constructExecutionMetaData,
+	copyInputItems,
+	detectBinaryEncoding,
+	getBinaryDataBuffer,
+	getBinaryHelperFunctions,
+	getCheckProcessedHelperFunctions,
+	getFileSystemHelperFunctions,
+	getRequestHelperFunctions,
+	getSSHTunnelFunctions,
+	normalizeItems,
+	returnJsonArray,
+} from '@/node-execute-functions';
+
+import { BaseExecuteContext } from './base-execute-context';
+import { getInputConnectionData } from './utils/get-input-connection-data';
+
+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,
+		private readonly connectionType: NodeConnectionType,
+		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),
+			detectBinaryEncoding: (buffer: Buffer) => detectBinaryEncoding(buffer),
+
+			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(
+		connectionType: AINodeConnectionType,
+		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,
+			connectionType,
+			itemIndex,
+			this.abortSignal,
+		);
+	}
+
+	getInputData(inputIndex = 0, connectionType = this.connectionType) {
+		if (!this.inputData.hasOwnProperty(connectionType)) {
+			// Return empty array because else it would throw error when nothing is connected to input
+			return [];
+		}
+		return super.getInputItems(inputIndex, connectionType) ?? [];
+	}
+
+	/** @deprecated create a context object with inputData for every runIndex */
+	addInputData(
+		connectionType: AINodeConnectionType,
+		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;
+		}
+
+		this.addExecutionDataFunctions(
+			'input',
+			data,
+			connectionType,
+			nodeName,
+			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 };
+	}
+
+	/** @deprecated Switch to WorkflowExecute to store output on runExecutionData.resultData.runData */
+	addOutputData(
+		connectionType: AINodeConnectionType,
+		currentNodeRunIndex: number,
+		data: INodeExecutionData[][] | ExecutionBaseError,
+		metadata?: ITaskMetadata,
+	): void {
+		const nodeName = this.node.name;
+		this.addExecutionDataFunctions(
+			'output',
+			data,
+			connectionType,
+			nodeName,
+			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
+				}`,
+			);
+		});
+	}
+
+	async addExecutionDataFunctions(
+		type: 'input' | 'output',
+		data: INodeExecutionData[][] | ExecutionBaseError,
+		connectionType: AINodeConnectionType,
+		sourceNodeName: string,
+		currentNodeRunIndex: number,
+		metadata?: ITaskMetadata,
+	): Promise<void> {
+		const {
+			additionalData,
+			runExecutionData,
+			runIndex: sourceNodeRunIndex,
+			node: { name: nodeName },
+		} = this;
+
+		let taskData: ITaskData | undefined;
+		if (type === 'input') {
+			taskData = {
+				startTime: new Date().getTime(),
+				executionTime: 0,
+				executionStatus: 'running',
+				source: [null],
+			};
+		} else {
+			// At the moment we expect that there is always an input sent before the output
+			taskData = get(
+				runExecutionData,
+				['resultData', 'runData', nodeName, currentNodeRunIndex],
+				undefined,
+			);
+			if (taskData === undefined) {
+				return;
+			}
+			taskData.metadata = metadata;
+		}
+		taskData = taskData!;
+
+		if (data instanceof Error) {
+			taskData.executionStatus = 'error';
+			taskData.error = data;
+		} else {
+			if (type === 'output') {
+				taskData.executionStatus = 'success';
+			}
+			taskData.data = {
+				[connectionType]: data,
+			} as ITaskDataConnections;
+		}
+
+		if (type === 'input') {
+			if (!(data instanceof Error)) {
+				this.inputData[connectionType] = data;
+				// TODO: remove inputOverride
+				taskData.inputOverride = {
+					[connectionType]: data,
+				} as ITaskDataConnections;
+			}
+
+			if (!runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
+				runExecutionData.resultData.runData[nodeName] = [];
+			}
+
+			runExecutionData.resultData.runData[nodeName][currentNodeRunIndex] = taskData;
+			await additionalData.hooks?.executeHookFunctions('nodeExecuteBefore', [nodeName]);
+		} else {
+			// Outputs
+			taskData.executionTime = new Date().getTime() - taskData.startTime;
+
+			await additionalData.hooks?.executeHookFunctions('nodeExecuteAfter', [
+				nodeName,
+				taskData,
+				this.runExecutionData,
+			]);
+
+			if (get(runExecutionData, 'executionData.metadata', undefined) === undefined) {
+				runExecutionData.executionData!.metadata = {};
+			}
+
+			let sourceTaskData = runExecutionData.executionData?.metadata?.[sourceNodeName];
+
+			if (!sourceTaskData) {
+				runExecutionData.executionData!.metadata[sourceNodeName] = [];
+				sourceTaskData = runExecutionData.executionData!.metadata[sourceNodeName];
+			}
+
+			if (!sourceTaskData[sourceNodeRunIndex]) {
+				sourceTaskData[sourceNodeRunIndex] = {
+					subRun: [],
+				};
+			}
+
+			sourceTaskData[sourceNodeRunIndex].subRun!.push({
+				node: nodeName,
+				runIndex: currentNodeRunIndex,
+			});
+		}
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/trigger-context.ts b/packages/core/src/execution-engine/node-execution-context/trigger-context.ts
new file mode 100644
index 0000000000..845bad61f5
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/trigger-context.ts
@@ -0,0 +1,62 @@
+import type {
+	ICredentialDataDecryptedObject,
+	INode,
+	ITriggerFunctions,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowActivateMode,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import {
+	getBinaryHelperFunctions,
+	getRequestHelperFunctions,
+	getSchedulingFunctions,
+	getSSHTunnelFunctions,
+	returnJsonArray,
+} from '@/node-execute-functions';
+
+import { NodeExecutionContext } from './node-execution-context';
+
+const throwOnEmit = () => {
+	throw new ApplicationError('Overwrite TriggerContext.emit function');
+};
+
+const throwOnEmitError = () => {
+	throw new ApplicationError('Overwrite TriggerContext.emitError function');
+};
+
+export class TriggerContext extends NodeExecutionContext implements ITriggerFunctions {
+	readonly helpers: ITriggerFunctions['helpers'];
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		private readonly activation: WorkflowActivateMode,
+		readonly emit: ITriggerFunctions['emit'] = throwOnEmit,
+		readonly emitError: ITriggerFunctions['emitError'] = throwOnEmitError,
+	) {
+		super(workflow, node, additionalData, mode);
+
+		this.helpers = {
+			createDeferredPromise,
+			returnJsonArray,
+			...getSSHTunnelFunctions(),
+			...getRequestHelperFunctions(workflow, node, additionalData),
+			...getBinaryHelperFunctions(additionalData, workflow.id),
+			...getSchedulingFunctions(workflow),
+		};
+	}
+
+	getActivationMode() {
+		return this.activation;
+	}
+
+	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
+		return await this._getCredentials<T>(type);
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/cleanup-parameter-data.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/cleanup-parameter-data.test.ts
new file mode 100644
index 0000000000..a3b22fcdd2
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/cleanup-parameter-data.test.ts
@@ -0,0 +1,38 @@
+import toPlainObject from 'lodash/toPlainObject';
+import { DateTime } from 'luxon';
+import type { NodeParameterValue } from 'n8n-workflow';
+
+import { cleanupParameterData } from '../cleanup-parameter-data';
+
+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');
+	});
+});
diff --git a/packages/core/test/CreateNodeAsTool.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/create-node-as-tool.test.ts
similarity index 74%
rename from packages/core/test/CreateNodeAsTool.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/create-node-as-tool.test.ts
index 5c485b9837..450ec99247 100644
--- a/packages/core/test/CreateNodeAsTool.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/create-node-as-tool.test.ts
@@ -1,8 +1,8 @@
-import type { IExecuteFunctions, INodeParameters, INodeType } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { mock } from 'jest-mock-extended';
+import type { INodeType, ISupplyDataFunctions, INode } from 'n8n-workflow';
 import { z } from 'zod';
 
-import { createNodeAsTool } from '@/CreateNodeAsTool';
+import { createNodeAsTool } from '../create-node-as-tool';
 
 jest.mock('@langchain/core/tools', () => ({
 	DynamicStructuredTool: jest.fn().mockImplementation((config) => ({
@@ -14,28 +14,29 @@ jest.mock('@langchain/core/tools', () => ({
 }));
 
 describe('createNodeAsTool', () => {
-	let mockCtx: IExecuteFunctions;
-	let mockNode: INodeType;
-	let mockNodeParameters: INodeParameters;
+	const context = mock<ISupplyDataFunctions>({
+		getNodeParameter: jest.fn(),
+		addInputData: jest.fn(),
+		addOutputData: jest.fn(),
+		getNode: jest.fn(),
+	});
+	const handleToolInvocation = jest.fn();
+	const nodeType = mock<INodeType>({
+		description: {
+			name: 'TestNode',
+			description: 'Test node description',
+		},
+	});
+	const node = mock<INode>({ name: 'Test_Node' });
+	const options = { node, nodeType, handleToolInvocation };
 
 	beforeEach(() => {
-		// Setup mock objects
-		mockCtx = {
-			getNodeParameter: jest.fn(),
-			addInputData: jest.fn().mockReturnValue({ index: 0 }),
-			addOutputData: jest.fn(),
-			getNode: jest.fn().mockReturnValue({ name: 'Test_Node' }),
-		} as unknown as IExecuteFunctions;
+		jest.clearAllMocks();
+		(context.addInputData as jest.Mock).mockReturnValue({ index: 0 });
+		(context.getNode as jest.Mock).mockReturnValue(node);
+		(nodeType.execute as jest.Mock).mockResolvedValue([[{ json: { result: 'test' } }]]);
 
-		mockNode = {
-			description: {
-				name: 'TestNode',
-				description: 'Test node description',
-			},
-			execute: jest.fn().mockResolvedValue([[{ json: { result: 'test' } }]]),
-		} as unknown as INodeType;
-
-		mockNodeParameters = {
+		node.parameters = {
 			param1: "={{$fromAI('param1', 'Test parameter', 'string') }}",
 			param2: 'static value',
 			nestedParam: {
@@ -45,13 +46,11 @@ describe('createNodeAsTool', () => {
 			resource: 'testResource',
 			operation: 'testOperation',
 		};
-
-		jest.clearAllMocks();
 	});
 
 	describe('Tool Creation and Basic Properties', () => {
 		it('should create a DynamicStructuredTool with correct properties', () => {
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool).toBeDefined();
 			expect(tool.name).toBe('Test_Node');
@@ -62,10 +61,10 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should use toolDescription if provided', () => {
-			mockNodeParameters.descriptionType = 'manual';
-			mockNodeParameters.toolDescription = 'Custom tool description';
+			node.parameters.descriptionType = 'manual';
+			node.parameters.toolDescription = 'Custom tool description';
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.description).toBe('Custom tool description');
 		});
@@ -73,7 +72,7 @@ describe('createNodeAsTool', () => {
 
 	describe('Schema Creation and Parameter Handling', () => {
 		it('should create a schema based on fromAI arguments in nodeParameters', () => {
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema).toBeDefined();
 			expect(tool.schema.shape).toHaveProperty('param1');
@@ -82,14 +81,14 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should handle fromAI arguments correctly', () => {
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.subparam).toBeInstanceOf(z.ZodString);
 		});
 
 		it('should handle default values correctly', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				paramWithDefault:
 					"={{ $fromAI('paramWithDefault', 'Parameter with default', 'string', 'default value') }}",
 				numberWithDefault:
@@ -98,7 +97,7 @@ describe('createNodeAsTool', () => {
 					"={{ $fromAI('booleanWithDefault', 'Boolean with default', 'boolean', true) }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramWithDefault.description).toBe('Parameter with default');
 			expect(tool.schema.shape.numberWithDefault.description).toBe('Number with default');
@@ -106,7 +105,7 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should handle nested parameters correctly', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				topLevel: "={{ $fromAI('topLevel', 'Top level parameter', 'string') }}",
 				nested: {
 					level1: "={{ $fromAI('level1', 'Nested level 1', 'string') }}",
@@ -116,7 +115,7 @@ describe('createNodeAsTool', () => {
 				},
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.topLevel).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.level1).toBeInstanceOf(z.ZodString);
@@ -124,14 +123,14 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should handle array parameters correctly', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				arrayParam: [
 					"={{ $fromAI('item1', 'First item', 'string') }}",
 					"={{ $fromAI('item2', 'Second item', 'number') }}",
 				],
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.item1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.item2).toBeInstanceOf(z.ZodNumber);
@@ -140,45 +139,37 @@ describe('createNodeAsTool', () => {
 
 	describe('Error Handling and Edge Cases', () => {
 		it('should handle error during node execution', async () => {
-			mockNode.execute = jest.fn().mockRejectedValue(new Error('Execution failed'));
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			nodeType.execute = jest.fn().mockRejectedValue(new Error('Execution failed'));
+			const tool = createNodeAsTool(options).response;
+			handleToolInvocation.mockReturnValue('Error during node execution: some random issue.');
 
 			const result = await tool.func({ param1: 'test value' });
 
 			expect(result).toContain('Error during node execution:');
-			expect(mockCtx.addOutputData).toHaveBeenCalledWith(
-				NodeConnectionType.AiTool,
-				0,
-				expect.any(NodeOperationError),
-			);
 		});
 
 		it('should throw an error for invalid parameter names', () => {
-			mockNodeParameters.invalidParam = "$fromAI('invalid param', 'Invalid parameter', 'string')";
+			node.parameters.invalidParam = "$fromAI('invalid param', 'Invalid parameter', 'string')";
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
-				'Parameter key `invalid param` is invalid',
-			);
+			expect(() => createNodeAsTool(options)).toThrow('Parameter key `invalid param` is invalid');
 		});
 
 		it('should throw an error for $fromAI calls with unsupported types', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				invalidTypeParam:
 					"={{ $fromAI('invalidType', 'Param with unsupported type', 'unsupportedType') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
-				'Invalid type: unsupportedType',
-			);
+			expect(() => createNodeAsTool(options)).toThrow('Invalid type: unsupportedType');
 		});
 
 		it('should handle empty parameters and parameters with no fromAI calls', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				param1: 'static value 1',
 				param2: 'static value 2',
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape).toEqual({});
 		});
@@ -186,13 +177,13 @@ describe('createNodeAsTool', () => {
 
 	describe('Parameter Name and Description Handling', () => {
 		it('should accept parameter names with underscores and hyphens', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				validName1:
 					"={{ $fromAI('param_name-1', 'Valid name with underscore and hyphen', 'string') }}",
 				validName2: "={{ $fromAI('param_name_2', 'Another valid name', 'number') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape['param_name-1']).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape['param_name-1'].description).toBe(
@@ -204,22 +195,20 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should throw an error for parameter names with invalid special characters', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				invalidNameParam:
 					"={{ $fromAI('param@name!', 'Invalid name with special characters', 'string') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
-				'Parameter key `param@name!` is invalid',
-			);
+			expect(() => createNodeAsTool(options)).toThrow('Parameter key `param@name!` is invalid');
 		});
 
 		it('should throw an error for empty parameter name', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				invalidNameParam: "={{ $fromAI('', 'Invalid name with special characters', 'string') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+			expect(() => createNodeAsTool(options)).toThrow(
 				'You must specify a key when using $fromAI()',
 			);
 		});
@@ -227,50 +216,51 @@ describe('createNodeAsTool', () => {
 		it('should handle parameter names with exact and exceeding character limits', () => {
 			const longName = 'a'.repeat(64);
 			const tooLongName = 'a'.repeat(65);
-			mockNodeParameters = {
+			node.parameters = {
 				longNameParam: `={{ $fromAI('${longName}', 'Param with 64 character name', 'string') }}`,
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape[longName]).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape[longName].description).toBe('Param with 64 character name');
 
-			expect(() =>
-				createNodeAsTool(mockCtx, mockNode, {
-					tooLongNameParam: `={{ $fromAI('${tooLongName}', 'Param with 65 character name', 'string') }}`,
-				}),
-			).toThrow(`Parameter key \`${tooLongName}\` is invalid`);
+			node.parameters = {
+				tooLongNameParam: `={{ $fromAI('${tooLongName}', 'Param with 65 character name', 'string') }}`,
+			};
+			expect(() => createNodeAsTool(options)).toThrow(
+				`Parameter key \`${tooLongName}\` is invalid`,
+			);
 		});
 
 		it('should handle $fromAI calls with empty description', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				emptyDescriptionParam: "={{ $fromAI('emptyDescription', '', 'number') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.emptyDescription).toBeInstanceOf(z.ZodNumber);
 			expect(tool.schema.shape.emptyDescription.description).toBeUndefined();
 		});
 
 		it('should throw an error for calls with the same parameter but different descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				duplicateParam1: "={{ $fromAI('duplicate', 'First duplicate', 'string') }}",
 				duplicateParam2: "={{ $fromAI('duplicate', 'Second duplicate', 'number') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+			expect(() => createNodeAsTool(options)).toThrow(
 				"Duplicate key 'duplicate' found with different description or type",
 			);
 		});
 		it('should throw an error for calls with the same parameter but different types', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				duplicateParam1: "={{ $fromAI('duplicate', 'First duplicate', 'string') }}",
 				duplicateParam2: "={{ $fromAI('duplicate', 'First duplicate', 'number') }}",
 			};
 
-			expect(() => createNodeAsTool(mockCtx, mockNode, mockNodeParameters)).toThrow(
+			expect(() => createNodeAsTool(options)).toThrow(
 				"Duplicate key 'duplicate' found with different description or type",
 			);
 		});
@@ -278,7 +268,7 @@ describe('createNodeAsTool', () => {
 
 	describe('Complex Parsing Scenarios', () => {
 		it('should correctly parse $fromAI calls with varying spaces, capitalization, and within template literals', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				varyingSpacing1: "={{$fromAI('param1','Description1','string')}}",
 				varyingSpacing2: "={{  $fromAI (  'param2' , 'Description2' , 'number' )  }}",
 				varyingSpacing3: "={{ $FROMai('param3', 'Description3', 'boolean') }}",
@@ -288,7 +278,7 @@ describe('createNodeAsTool', () => {
 					"={{ `Value is: ${$fromAI('templatedParam', 'Templated param description', 'string')}` }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.param1.description).toBe('Description1');
@@ -307,12 +297,12 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should correctly parse multiple $fromAI calls interleaved with regular text', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				interleavedParams:
 					"={{ 'Start ' + $fromAI('param1', 'First param', 'string') + ' Middle ' + $fromAI('param2', 'Second param', 'number') + ' End' }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.param1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.param1.description).toBe('First param');
@@ -322,12 +312,12 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should correctly parse $fromAI calls with complex JSON default values', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				complexJsonDefault:
 					'={{ $fromAI(\'complexJson\', \'Param with complex JSON default\', \'json\', \'{"nested": {"key": "value"}, "array": [1, 2, 3]}\') }}',
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.complexJson._def.innerType).toBeInstanceOf(z.ZodRecord);
 			expect(tool.schema.shape.complexJson.description).toBe('Param with complex JSON default');
@@ -338,7 +328,7 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should ignore $fromAI calls embedded in non-string node parameters', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				numberParam: 42,
 				booleanParam: false,
 				objectParam: {
@@ -355,7 +345,7 @@ describe('createNodeAsTool', () => {
 				],
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.innerParam).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.innerParam.description).toBe('Inner param');
@@ -373,48 +363,48 @@ describe('createNodeAsTool', () => {
 
 	describe('Escaping and Special Characters', () => {
 		it('should handle escaped single quotes in parameter names and descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				escapedQuotesParam:
 					"={{ $fromAI('paramName', 'Description with \\'escaped\\' quotes', 'string') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.paramName.description).toBe("Description with 'escaped' quotes");
 		});
 
 		it('should handle escaped double quotes in parameter names and descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				escapedQuotesParam:
 					'={{ $fromAI("paramName", "Description with \\"escaped\\" quotes", "string") }}',
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.paramName.description).toBe('Description with "escaped" quotes');
 		});
 
 		it('should handle escaped backslashes in parameter names and descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				escapedBackslashesParam:
 					"={{ $fromAI('paramName', 'Description with \\\\ backslashes', 'string') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.paramName.description).toBe('Description with \\ backslashes');
 		});
 
 		it('should handle mixed escaped characters in parameter names and descriptions', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				mixedEscapesParam:
 					'={{ $fromAI(`paramName`, \'Description with \\\'mixed" characters\', "number") }}',
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramName).toBeInstanceOf(z.ZodNumber);
 			expect(tool.schema.shape.paramName.description).toBe('Description with \'mixed" characters');
@@ -423,12 +413,12 @@ describe('createNodeAsTool', () => {
 
 	describe('Edge Cases and Limitations', () => {
 		it('should ignore excess arguments in $fromAI calls beyond the fourth argument', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				excessArgsParam:
 					"={{ $fromAI('excessArgs', 'Param with excess arguments', 'string', 'default', 'extraArg1', 'extraArg2') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.excessArgs._def.innerType).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.excessArgs.description).toBe('Param with excess arguments');
@@ -436,12 +426,12 @@ describe('createNodeAsTool', () => {
 		});
 
 		it('should correctly parse $fromAI calls with nested parentheses', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				nestedParenthesesParam:
 					"={{ $fromAI('paramWithNested', 'Description with ((nested)) parentheses', 'string') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.paramWithNested).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.paramWithNested.description).toBe(
@@ -451,24 +441,24 @@ describe('createNodeAsTool', () => {
 
 		it('should handle $fromAI calls with very long descriptions', () => {
 			const longDescription = 'A'.repeat(1000);
-			mockNodeParameters = {
+			node.parameters = {
 				longParam: `={{ $fromAI('longParam', '${longDescription}', 'string') }}`,
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.longParam).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.longParam.description).toBe(longDescription);
 		});
 
 		it('should handle $fromAI calls with only some parameters', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				partialParam1: "={{ $fromAI('partial1') }}",
 				partialParam2: "={{ $fromAI('partial2', 'Description only') }}",
 				partialParam3: "={{ $fromAI('partial3', '', 'number') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.partial1).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.partial2).toBeInstanceOf(z.ZodString);
@@ -478,11 +468,11 @@ describe('createNodeAsTool', () => {
 
 	describe('Unicode and Internationalization', () => {
 		it('should handle $fromAI calls with unicode characters', () => {
-			mockNodeParameters = {
+			node.parameters = {
 				unicodeParam: "={{ $fromAI('unicodeParam', '🌈 Unicode parameter 你好', 'string') }}",
 			};
 
-			const tool = createNodeAsTool(mockCtx, mockNode, mockNodeParameters).response;
+			const tool = createNodeAsTool(options).response;
 
 			expect(tool.schema.shape.unicodeParam).toBeInstanceOf(z.ZodString);
 			expect(tool.schema.shape.unicodeParam.description).toBe('🌈 Unicode parameter 你好');
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/ensure-type.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/ensure-type.test.ts
new file mode 100644
index 0000000000..374b3d43bc
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/ensure-type.test.ts
@@ -0,0 +1,80 @@
+import { ExpressionError } from 'n8n-workflow';
+
+import { ensureType } from '../ensure-type';
+
+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"),
+		);
+	});
+});
diff --git a/packages/core/test/WorkflowExecutionMetadata.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/execution-metadata.test.ts
similarity index 99%
rename from packages/core/test/WorkflowExecutionMetadata.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/execution-metadata.test.ts
index 63d0892e6a..c673a2fcfe 100644
--- a/packages/core/test/WorkflowExecutionMetadata.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/execution-metadata.test.ts
@@ -1,13 +1,14 @@
 import type { IRunExecutionData } from 'n8n-workflow';
 
 import { InvalidExecutionMetadataError } from '@/errors/invalid-execution-metadata.error';
+
 import {
 	setWorkflowExecutionMetadata,
 	setAllWorkflowExecutionMetadata,
 	KV_LIMIT,
 	getWorkflowExecutionMetadata,
 	getAllWorkflowExecutionMetadata,
-} from '@/ExecutionMetadata';
+} from '../execution-metadata';
 
 describe('Execution Metadata functions', () => {
 	test('setWorkflowExecutionMetadata will set a value', () => {
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-additional-keys.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-additional-keys.test.ts
new file mode 100644
index 0000000000..b78de39a6d
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-additional-keys.test.ts
@@ -0,0 +1,146 @@
+import { mock } from 'jest-mock-extended';
+import { LoggerProxy } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IRunExecutionData,
+	IWorkflowExecuteAdditionalData,
+	SecretsHelpersBase,
+} from 'n8n-workflow';
+
+import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/constants';
+
+import { getAdditionalKeys } from '../get-additional-keys';
+
+describe('getAdditionalKeys', () => {
+	const secretsHelpers = mock<SecretsHelpersBase>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({
+		executionId: '123',
+		webhookWaitingBaseUrl: 'https://webhook.test',
+		formWaitingBaseUrl: 'https://form.test',
+		variables: { testVar: 'value' },
+		secretsHelpers,
+	});
+
+	const runExecutionData = mock<IRunExecutionData>({
+		resultData: {
+			runData: {},
+			metadata: {},
+		},
+	});
+
+	beforeAll(() => {
+		LoggerProxy.init(mock());
+		secretsHelpers.hasProvider.mockReturnValue(true);
+		secretsHelpers.hasSecret.mockReturnValue(true);
+		secretsHelpers.getSecret.mockReturnValue('secret-value');
+		secretsHelpers.listSecrets.mockReturnValue(['secret1']);
+		secretsHelpers.listProviders.mockReturnValue(['provider1']);
+	});
+
+	it('should use placeholder execution ID when none provided', () => {
+		const noIdData = { ...additionalData, executionId: undefined };
+		const result = getAdditionalKeys(noIdData, 'manual', null);
+
+		expect(result.$execution?.id).toBe(PLACEHOLDER_EMPTY_EXECUTION_ID);
+	});
+
+	it('should return production mode when not manual', () => {
+		const result = getAdditionalKeys(additionalData, 'internal', null);
+
+		expect(result.$execution?.mode).toBe('production');
+	});
+
+	it('should include customData methods when runExecutionData is provided', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', runExecutionData);
+
+		expect(result.$execution?.customData).toBeDefined();
+		expect(typeof result.$execution?.customData?.set).toBe('function');
+		expect(typeof result.$execution?.customData?.setAll).toBe('function');
+		expect(typeof result.$execution?.customData?.get).toBe('function');
+		expect(typeof result.$execution?.customData?.getAll).toBe('function');
+	});
+
+	it('should handle customData operations correctly', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', runExecutionData);
+		const customData = result.$execution?.customData;
+
+		customData?.set('testKey', 'testValue');
+		expect(customData?.get('testKey')).toBe('testValue');
+
+		customData?.setAll({ key1: 'value1', key2: 'value2' });
+		const allData = customData?.getAll();
+		expect(allData).toEqual({
+			testKey: 'testValue',
+			key1: 'value1',
+			key2: 'value2',
+		});
+	});
+
+	it('should include secrets when enabled', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null, { secretsEnabled: true });
+
+		expect(result.$secrets).toBeDefined();
+		expect((result.$secrets?.provider1 as IDataObject).secret1).toEqual('secret-value');
+	});
+
+	it('should not include secrets when disabled', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null, { secretsEnabled: false });
+
+		expect(result.$secrets).toBeUndefined();
+	});
+
+	it('should throw errors in manual mode', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', runExecutionData);
+
+		expect(() => {
+			result.$execution?.customData?.set('invalid*key', 'value');
+		}).toThrow();
+	});
+
+	it('should correctly set resume URLs', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null);
+
+		expect(result.$execution?.resumeUrl).toBe('https://webhook.test/123');
+		expect(result.$execution?.resumeFormUrl).toBe('https://form.test/123');
+		expect(result.$resumeWebhookUrl).toBe('https://webhook.test/123'); // Test deprecated property
+	});
+
+	it('should return test mode when manual', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null);
+
+		expect(result.$execution?.mode).toBe('test');
+	});
+
+	it('should return variables from additionalData', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null);
+		expect(result.$vars?.testVar).toEqual('value');
+	});
+
+	it('should handle errors in non-manual mode without throwing', () => {
+		const result = getAdditionalKeys(additionalData, 'internal', runExecutionData);
+		const customData = result.$execution?.customData;
+
+		expect(() => {
+			customData?.set('invalid*key', 'value');
+		}).not.toThrow();
+	});
+
+	it('should return undefined customData when runExecutionData is null', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', null);
+
+		expect(result.$execution?.customData).toBeUndefined();
+	});
+
+	it('should respect metadata KV limit', () => {
+		const result = getAdditionalKeys(additionalData, 'manual', runExecutionData);
+		const customData = result.$execution?.customData;
+
+		// Add 11 key-value pairs (exceeding the limit of 10)
+		for (let i = 0; i < 11; i++) {
+			customData?.set(`key${i}`, `value${i}`);
+		}
+
+		const allData = customData?.getAll() ?? {};
+		expect(Object.keys(allData)).toHaveLength(10);
+	});
+});
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-input-connection-data.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-input-connection-data.test.ts
new file mode 100644
index 0000000000..4e634a196e
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/get-input-connection-data.test.ts
@@ -0,0 +1,366 @@
+import type { Tool } from '@langchain/core/tools';
+import { mock } from 'jest-mock-extended';
+import type {
+	INode,
+	ITaskDataConnections,
+	IRunExecutionData,
+	INodeExecutionData,
+	IExecuteData,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	INodeType,
+	INodeTypes,
+} from 'n8n-workflow';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+import { ExecuteContext } from '../../execute-context';
+
+describe('getInputConnectionData', () => {
+	const agentNode = mock<INode>({
+		name: 'Test Agent',
+		type: 'test.agent',
+		parameters: {},
+	});
+	const agentNodeType = mock<INodeType>({
+		description: {
+			inputs: [],
+		},
+	});
+	const nodeTypes = mock<INodeTypes>();
+	const workflow = mock<Workflow>({
+		id: 'test-workflow',
+		active: false,
+		nodeTypes,
+	});
+	const runExecutionData = mock<IRunExecutionData>({
+		resultData: { runData: {} },
+	});
+	const connectionInputData = [] as INodeExecutionData[];
+	const inputData = {} as ITaskDataConnections;
+	const executeData = {} as IExecuteData;
+
+	const hooks = mock<Required<IWorkflowExecuteAdditionalData['hooks']>>();
+	const additionalData = mock<IWorkflowExecuteAdditionalData>({ hooks });
+
+	let executeContext: ExecuteContext;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+
+		executeContext = new ExecuteContext(
+			workflow,
+			agentNode,
+			additionalData,
+			'internal',
+			runExecutionData,
+			0,
+			connectionInputData,
+			inputData,
+			executeData,
+			[],
+		);
+
+		jest.spyOn(executeContext, 'getNode').mockReturnValue(agentNode);
+		nodeTypes.getByNameAndVersion
+			.calledWith(agentNode.type, expect.anything())
+			.mockReturnValue(agentNodeType);
+	});
+
+	describe.each([
+		NodeConnectionType.AiAgent,
+		NodeConnectionType.AiChain,
+		NodeConnectionType.AiDocument,
+		NodeConnectionType.AiEmbedding,
+		NodeConnectionType.AiLanguageModel,
+		NodeConnectionType.AiMemory,
+		NodeConnectionType.AiOutputParser,
+		NodeConnectionType.AiRetriever,
+		NodeConnectionType.AiTextSplitter,
+		NodeConnectionType.AiVectorStore,
+	] as const)('%s', (connectionType) => {
+		const response = mock();
+		const node = mock<INode>({
+			name: 'First Node',
+			type: 'test.type',
+			disabled: false,
+		});
+		const secondNode = mock<INode>({ name: 'Second Node', disabled: false });
+		const supplyData = jest.fn().mockResolvedValue({ response });
+		const nodeType = mock<INodeType>({ supplyData });
+
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion
+				.calledWith(node.type, expect.anything())
+				.mockReturnValue(nodeType);
+			workflow.getParentNodes
+				.calledWith(agentNode.name, connectionType)
+				.mockReturnValue([node.name]);
+			workflow.getNode.calledWith(node.name).mockReturnValue(node);
+			workflow.getNode.calledWith(secondNode.name).mockReturnValue(secondNode);
+		});
+
+		it('should throw when no inputs are defined', async () => {
+			agentNodeType.description.inputs = [];
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				'Node does not have input of type',
+			);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should return undefined when no nodes are connected and input is not required', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					maxConnections: 1,
+					required: false,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([]);
+
+			const result = await executeContext.getInputConnectionData(connectionType, 0);
+			expect(result).toBeUndefined();
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should throw when too many nodes are connected', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					maxConnections: 1,
+					required: true,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([node.name, secondNode.name]);
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				`Only 1 ${connectionType} sub-nodes are/is allowed to be connected`,
+			);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should throw when required node is not connected', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					required: true,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([]);
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				'must be connected and enabled',
+			);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should handle disabled nodes', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					required: true,
+				},
+			];
+
+			const disabledNode = mock<INode>({
+				name: 'Disabled Node',
+				type: 'test.type',
+				disabled: true,
+			});
+			workflow.getParentNodes.mockReturnValueOnce([disabledNode.name]);
+			workflow.getNode.calledWith(disabledNode.name).mockReturnValue(disabledNode);
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				'must be connected and enabled',
+			);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should handle node execution errors', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					required: true,
+				},
+			];
+
+			supplyData.mockRejectedValueOnce(new Error('supplyData error'));
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				`Error in sub-node ${node.name}`,
+			);
+			expect(supplyData).toHaveBeenCalled();
+		});
+
+		it('should propagate configuration errors', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					required: true,
+				},
+			];
+
+			const configError = new NodeOperationError(node, 'Config Error in node', {
+				functionality: 'configuration-node',
+			});
+			supplyData.mockRejectedValueOnce(configError);
+
+			await expect(executeContext.getInputConnectionData(connectionType, 0)).rejects.toThrow(
+				configError.message,
+			);
+			expect(nodeType.supplyData).toHaveBeenCalled();
+		});
+
+		it('should handle close functions', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: connectionType,
+					maxConnections: 1,
+					required: true,
+				},
+			];
+
+			const closeFunction = jest.fn();
+			supplyData.mockResolvedValueOnce({ response, closeFunction });
+
+			const result = await executeContext.getInputConnectionData(connectionType, 0);
+			expect(result).toBe(response);
+			expect(supplyData).toHaveBeenCalled();
+			// @ts-expect-error private property
+			expect(executeContext.closeFunctions).toContain(closeFunction);
+		});
+	});
+
+	describe(NodeConnectionType.AiTool, () => {
+		const mockTool = mock<Tool>();
+		const toolNode = mock<INode>({
+			name: 'Test Tool',
+			type: 'test.tool',
+			disabled: false,
+		});
+		const supplyData = jest.fn().mockResolvedValue({ response: mockTool });
+		const toolNodeType = mock<INodeType>({ supplyData });
+
+		const secondToolNode = mock<INode>({ name: 'test.secondTool', disabled: false });
+		const secondMockTool = mock<Tool>();
+		const secondToolNodeType = mock<INodeType>({
+			supplyData: jest.fn().mockResolvedValue({ response: secondMockTool }),
+		});
+
+		beforeEach(() => {
+			nodeTypes.getByNameAndVersion
+				.calledWith(toolNode.type, expect.anything())
+				.mockReturnValue(toolNodeType);
+			workflow.getParentNodes
+				.calledWith(agentNode.name, NodeConnectionType.AiTool)
+				.mockReturnValue([toolNode.name]);
+			workflow.getNode.calledWith(toolNode.name).mockReturnValue(toolNode);
+			workflow.getNode.calledWith(secondToolNode.name).mockReturnValue(secondToolNode);
+		});
+
+		it('should return empty array when no tools are connected and input is not required', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: false,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([]);
+
+			const result = await executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0);
+			expect(result).toEqual([]);
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should throw when required tool node is not connected', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+			workflow.getParentNodes.mockReturnValueOnce([]);
+
+			await expect(
+				executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0),
+			).rejects.toThrow('must be connected and enabled');
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should handle disabled tool nodes', async () => {
+			const disabledToolNode = mock<INode>({
+				name: 'Disabled Tool',
+				type: 'test.tool',
+				disabled: true,
+			});
+
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+
+			workflow.getParentNodes
+				.calledWith(agentNode.name, NodeConnectionType.AiTool)
+				.mockReturnValue([disabledToolNode.name]);
+			workflow.getNode.calledWith(disabledToolNode.name).mockReturnValue(disabledToolNode);
+
+			await expect(
+				executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0),
+			).rejects.toThrow('must be connected and enabled');
+			expect(supplyData).not.toHaveBeenCalled();
+		});
+
+		it('should handle multiple connected tools', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+
+			nodeTypes.getByNameAndVersion
+				.calledWith(secondToolNode.type, expect.anything())
+				.mockReturnValue(secondToolNodeType);
+
+			workflow.getParentNodes
+				.calledWith(agentNode.name, NodeConnectionType.AiTool)
+				.mockReturnValue([toolNode.name, secondToolNode.name]);
+
+			const result = await executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0);
+			expect(result).toEqual([mockTool, secondMockTool]);
+			expect(supplyData).toHaveBeenCalled();
+			expect(secondToolNodeType.supplyData).toHaveBeenCalled();
+		});
+
+		it('should handle tool execution errors', async () => {
+			supplyData.mockRejectedValueOnce(new Error('Tool execution error'));
+
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+
+			await expect(
+				executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0),
+			).rejects.toThrow(`Error in sub-node ${toolNode.name}`);
+			expect(supplyData).toHaveBeenCalled();
+		});
+
+		it('should return the tool when there are no issues', async () => {
+			agentNodeType.description.inputs = [
+				{
+					type: NodeConnectionType.AiTool,
+					required: true,
+				},
+			];
+
+			const result = await executeContext.getInputConnectionData(NodeConnectionType.AiTool, 0);
+			expect(result).toEqual([mockTool]);
+			expect(supplyData).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/core/test/Validation.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/validate-value-against-schema.test.ts
similarity index 78%
rename from packages/core/test/Validation.test.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/__tests__/validate-value-against-schema.test.ts
index 04ad3c134e..4f389856ad 100644
--- a/packages/core/test/Validation.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/validate-value-against-schema.test.ts
@@ -1,8 +1,8 @@
 import type { IDataObject, INode, INodeType } from 'n8n-workflow';
 
-import { validateValueAgainstSchema } from '@/NodeExecuteFunctions';
+import { validateValueAgainstSchema } from '../validate-value-against-schema';
 
-describe('Validation', () => {
+describe('validateValueAgainstSchema', () => {
 	test('should validate fixedCollection values parameter', () => {
 		const nodeType = {
 			description: {
@@ -246,4 +246,67 @@ describe('Validation', () => {
 		// value should be type number
 		expect(typeof result).toEqual('number');
 	});
+
+	describe('when the mode is in Fixed mode, and the node is a resource mapper', () => {
+		const nodeType = {
+			description: {
+				properties: [
+					{
+						name: 'operation',
+						type: 'resourceMapper',
+						typeOptions: {
+							resourceMapper: {
+								mode: 'add',
+							},
+						},
+					},
+				],
+			},
+		} as unknown as INodeType;
+
+		const node = {
+			parameters: {
+				operation: {
+					schema: [
+						{ id: 'num', type: 'number', required: true },
+						{ id: 'str', type: 'string', required: true },
+						{ id: 'obj', type: 'object', required: true },
+						{ id: 'arr', type: 'array', required: true },
+					],
+					attemptToConvertTypes: true,
+					mappingMode: '',
+					value: '',
+				},
+			},
+		} as unknown as INode;
+
+		const parameterName = 'operation.value';
+
+		describe('should correctly validate values for', () => {
+			test.each([
+				{ num: 0 },
+				{ num: 23 },
+				{ num: -0 },
+				{ num: -Infinity },
+				{ num: Infinity },
+				{ str: '' },
+				{ str: ' ' },
+				{ str: 'hello' },
+				{ arr: [] },
+				{ obj: {} },
+			])('%s', (value) => {
+				expect(() =>
+					validateValueAgainstSchema(node, nodeType, value, parameterName, 0, 0),
+				).not.toThrow();
+			});
+		});
+
+		describe('should throw an error for', () => {
+			test.each([{ num: NaN }, { num: undefined }, { num: null }])('%s', (value) => {
+				expect(() =>
+					validateValueAgainstSchema(node, nodeType, value, parameterName, 0, 0),
+				).toThrow();
+			});
+		});
+	});
 });
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/cleanup-parameter-data.ts b/packages/core/src/execution-engine/node-execution-context/utils/cleanup-parameter-data.ts
new file mode 100644
index 0000000000..59f27874ff
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/cleanup-parameter-data.ts
@@ -0,0 +1,31 @@
+import { DateTime } from 'luxon';
+import type { INodeParameters, NodeParameterValueType } from 'n8n-workflow';
+
+/**
+ * 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);
+				}
+			}
+		});
+	}
+}
diff --git a/packages/core/src/CreateNodeAsTool.ts b/packages/core/src/execution-engine/node-execution-context/utils/create-node-as-tool.ts
similarity index 78%
rename from packages/core/src/CreateNodeAsTool.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/create-node-as-tool.ts
index 1466f57d09..da34b377df 100644
--- a/packages/core/src/CreateNodeAsTool.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/create-node-as-tool.ts
@@ -1,6 +1,6 @@
 import { DynamicStructuredTool } from '@langchain/core/tools';
-import type { IExecuteFunctions, INodeParameters, INodeType } from 'n8n-workflow';
-import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { IDataObject, INode, INodeType } from 'n8n-workflow';
+import { jsonParse, NodeOperationError } from 'n8n-workflow';
 import { z } from 'zod';
 
 type AllowedTypes = 'string' | 'number' | 'boolean' | 'json';
@@ -11,6 +11,15 @@ interface FromAIArgument {
 	defaultValue?: string | number | boolean | Record<string, unknown>;
 }
 
+type ParserOptions = {
+	node: INode;
+	nodeType: INodeType;
+	handleToolInvocation: (toolArgs: IDataObject) => Promise<unknown>;
+};
+
+// This file is temporarily duplicated in `packages/@n8n/nodes-langchain/nodes/tools/ToolWorkflow/v2/utils/FromAIParser.ts`
+// Please apply any changes in both files
+
 /**
  * AIParametersParser
  *
@@ -18,15 +27,10 @@ interface FromAIArgument {
  * generating Zod schemas, and creating LangChain tools.
  */
 class AIParametersParser {
-	private ctx: IExecuteFunctions;
-
 	/**
 	 * Constructs an instance of AIParametersParser.
-	 * @param ctx The execution context.
 	 */
-	constructor(ctx: IExecuteFunctions) {
-		this.ctx = ctx;
-	}
+	constructor(private readonly options: ParserOptions) {}
 
 	/**
 	 * Generates a Zod schema based on the provided FromAIArgument placeholder.
@@ -157,14 +161,14 @@ class AIParametersParser {
 				} catch (error) {
 					// If parsing fails, throw an ApplicationError with details
 					throw new NodeOperationError(
-						this.ctx.getNode(),
+						this.options.node,
 						`Failed to parse $fromAI arguments: ${argsString}: ${error}`,
 					);
 				}
 			} else {
 				// Log an error if parentheses are unbalanced
 				throw new NodeOperationError(
-					this.ctx.getNode(),
+					this.options.node,
 					`Unbalanced parentheses while parsing $fromAI call: ${str.slice(startIndex)}`,
 				);
 			}
@@ -249,7 +253,7 @@ class AIParametersParser {
 		const type = cleanArgs?.[2] || 'string';
 
 		if (!['string', 'number', 'boolean', 'json'].includes(type.toLowerCase())) {
-			throw new NodeOperationError(this.ctx.getNode(), `Invalid type: ${type}`);
+			throw new NodeOperationError(this.options.node, `Invalid type: ${type}`);
 		}
 
 		return {
@@ -281,42 +285,21 @@ class AIParametersParser {
 	}
 
 	/**
-	 * Generates a description for a node based on the provided parameters.
-	 * @param node The node type.
-	 * @param nodeParameters The parameters of the node.
-	 * @returns A string description for the node.
+	 * Retrieves and validates the Zod schema for the tool.
+	 *
+	 * This method:
+	 * 1. Collects all $fromAI arguments from node parameters
+	 * 2. Validates parameter keys against naming rules
+	 * 3. Checks for duplicate keys and ensures consistency
+	 * 4. Generates a Zod schema from the validated arguments
+	 *
+	 * @throws {NodeOperationError} When parameter keys are invalid or when duplicate keys have inconsistent definitions
+	 * @returns {z.ZodObject} A Zod schema object representing the structure and validation rules for the node parameters
 	 */
-	private getDescription(node: INodeType, nodeParameters: INodeParameters): string {
-		const manualDescription = nodeParameters.toolDescription as string;
-
-		if (nodeParameters.descriptionType === 'auto') {
-			const resource = nodeParameters.resource as string;
-			const operation = nodeParameters.operation as string;
-			let description = node.description.description;
-			if (resource) {
-				description += `\n Resource: ${resource}`;
-			}
-			if (operation) {
-				description += `\n Operation: ${operation}`;
-			}
-			return description.trim();
-		}
-		if (nodeParameters.descriptionType === 'manual') {
-			return manualDescription ?? node.description.description;
-		}
-
-		return node.description.description;
-	}
-
-	/**
-	 * Creates a DynamicStructuredTool from a node.
-	 * @param node The node type.
-	 * @param nodeParameters The parameters of the node.
-	 * @returns A DynamicStructuredTool instance.
-	 */
-	public createTool(node: INodeType, nodeParameters: INodeParameters): DynamicStructuredTool {
+	private getSchema() {
+		const { node } = this.options;
 		const collectedArguments: FromAIArgument[] = [];
-		this.traverseNodeParameters(nodeParameters, collectedArguments);
+		this.traverseNodeParameters(node.parameters, collectedArguments);
 
 		// Validate each collected argument
 		const nameValidationRegex = /^[a-zA-Z0-9_-]{1,64}$/;
@@ -326,7 +309,7 @@ class AIParametersParser {
 				const isEmptyError = 'You must specify a key when using $fromAI()';
 				const isInvalidError = `Parameter key \`${argument.key}\` is invalid`;
 				const error = new Error(argument.key.length === 0 ? isEmptyError : isInvalidError);
-				throw new NodeOperationError(this.ctx.getNode(), error, {
+				throw new NodeOperationError(node, error, {
 					description:
 						'Invalid parameter key, must be between 1 and 64 characters long and only contain letters, numbers, underscores, and hyphens',
 				});
@@ -343,7 +326,7 @@ class AIParametersParser {
 				) {
 					// If not, throw an error for inconsistent duplicate keys
 					throw new NodeOperationError(
-						this.ctx.getNode(),
+						node,
 						`Duplicate key '${argument.key}' found with different description or type`,
 						{
 							description:
@@ -372,43 +355,56 @@ class AIParametersParser {
 			return acc;
 		}, {});
 
-		const schema = z.object(schemaObj).required();
-		const description = this.getDescription(node, nodeParameters);
-		const nodeName = this.ctx.getNode().name.replace(/ /g, '_');
-		const name = nodeName || node.description.name;
+		return z.object(schemaObj).required();
+	}
 
-		const tool = new DynamicStructuredTool({
+	/**
+	 * Generates a description for a node based on the provided parameters.
+	 * @param node The node type.
+	 * @param nodeParameters The parameters of the node.
+	 * @returns A string description for the node.
+	 */
+	private getDescription(): string {
+		const { node, nodeType } = this.options;
+		const manualDescription = node.parameters.toolDescription as string;
+
+		if (node.parameters.descriptionType === 'auto') {
+			const resource = node.parameters.resource as string;
+			const operation = node.parameters.operation as string;
+			let description = nodeType.description.description;
+			if (resource) {
+				description += `\n Resource: ${resource}`;
+			}
+			if (operation) {
+				description += `\n Operation: ${operation}`;
+			}
+			return description.trim();
+		}
+		if (node.parameters.descriptionType === 'manual') {
+			return manualDescription ?? nodeType.description.description;
+		}
+
+		return nodeType.description.description;
+	}
+
+	/**
+	 * Creates a DynamicStructuredTool from a node.
+	 * @returns A DynamicStructuredTool instance.
+	 */
+	createTool(): DynamicStructuredTool {
+		const { node, nodeType } = this.options;
+		const schema = this.getSchema();
+		const description = this.getDescription();
+		const nodeName = node.name.replace(/ /g, '_');
+		const name = nodeName || nodeType.description.name;
+
+		return new DynamicStructuredTool({
 			name,
 			description,
 			schema,
-			func: async (functionArgs: z.infer<typeof schema>) => {
-				const { index } = this.ctx.addInputData(NodeConnectionType.AiTool, [
-					[{ json: functionArgs }],
-				]);
-
-				try {
-					// Execute the node with the proxied context
-					const result = await node.execute?.bind(this.ctx)();
-
-					// Process and map the results
-					const mappedResults = result?.[0]?.flatMap((item) => item.json);
-
-					// Add output data to the context
-					this.ctx.addOutputData(NodeConnectionType.AiTool, index, [
-						[{ json: { response: mappedResults } }],
-					]);
-
-					// Return the stringified results
-					return JSON.stringify(mappedResults);
-				} catch (error) {
-					const nodeError = new NodeOperationError(this.ctx.getNode(), error as Error);
-					this.ctx.addOutputData(NodeConnectionType.AiTool, index, nodeError);
-					return 'Error during node execution: ' + nodeError.description;
-				}
-			},
+			func: async (toolArgs: z.infer<typeof schema>) =>
+				await this.options.handleToolInvocation(toolArgs),
 		});
-
-		return tool;
 	}
 }
 
@@ -416,20 +412,8 @@ class AIParametersParser {
  * Converts node into LangChain tool by analyzing node parameters,
  * identifying placeholders using the $fromAI function, and generating a Zod schema. It then creates
  * a DynamicStructuredTool that can be used in LangChain workflows.
- *
- * @param ctx The execution context.
- * @param node The node type.
- * @param nodeParameters The parameters of the node.
- * @returns An object containing the DynamicStructuredTool instance.
  */
-export function createNodeAsTool(
-	ctx: IExecuteFunctions,
-	node: INodeType,
-	nodeParameters: INodeParameters,
-) {
-	const parser = new AIParametersParser(ctx);
-
-	return {
-		response: parser.createTool(node, nodeParameters),
-	};
+export function createNodeAsTool(options: ParserOptions) {
+	const parser = new AIParametersParser(options);
+	return { response: parser.createTool() };
 }
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/ensure-type.ts b/packages/core/src/execution-engine/node-execution-context/utils/ensure-type.ts
new file mode 100644
index 0000000000..4869c73ba4
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/ensure-type.ts
@@ -0,0 +1,103 @@
+import type { EnsureTypeOptions } from 'n8n-workflow';
+import { ExpressionError } from 'n8n-workflow';
+
+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;
+}
diff --git a/packages/core/src/ExecutionMetadata.ts b/packages/core/src/execution-engine/node-execution-context/utils/execution-metadata.ts
similarity index 97%
rename from packages/core/src/ExecutionMetadata.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/execution-metadata.ts
index 8466933e05..5e7c4954d6 100644
--- a/packages/core/src/ExecutionMetadata.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/execution-metadata.ts
@@ -1,7 +1,7 @@
 import type { IRunExecutionData } from 'n8n-workflow';
 import { LoggerProxy as Logger } from 'n8n-workflow';
 
-import { InvalidExecutionMetadataError } from './errors/invalid-execution-metadata.error';
+import { InvalidExecutionMetadataError } from '@/errors/invalid-execution-metadata.error';
 
 export const KV_LIMIT = 10;
 
diff --git a/packages/core/src/ExtractValue.ts b/packages/core/src/execution-engine/node-execution-context/utils/extract-value.ts
similarity index 100%
rename from packages/core/src/ExtractValue.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/extract-value.ts
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/get-additional-keys.ts b/packages/core/src/execution-engine/node-execution-context/utils/get-additional-keys.ts
new file mode 100644
index 0000000000..7e18d0f2d1
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/get-additional-keys.ts
@@ -0,0 +1,75 @@
+import type {
+	IRunExecutionData,
+	IWorkflowDataProxyAdditionalKeys,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { LoggerProxy } from 'n8n-workflow';
+
+import { PLACEHOLDER_EMPTY_EXECUTION_ID } from '@/constants';
+
+import {
+	setWorkflowExecutionMetadata,
+	setAllWorkflowExecutionMetadata,
+	getWorkflowExecutionMetadata,
+	getAllWorkflowExecutionMetadata,
+} from './execution-metadata';
+import { getSecretsProxy } from './get-secrets-proxy';
+
+/** 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/execution-engine/node-execution-context/utils/get-input-connection-data.ts b/packages/core/src/execution-engine/node-execution-context/utils/get-input-connection-data.ts
new file mode 100644
index 0000000000..9f76d0e106
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/get-input-connection-data.ts
@@ -0,0 +1,184 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+import type {
+	CloseFunction,
+	IExecuteData,
+	IExecuteFunctions,
+	INodeExecutionData,
+	IRunExecutionData,
+	ITaskDataConnections,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	WorkflowExecuteMode,
+	SupplyData,
+	AINodeConnectionType,
+} from 'n8n-workflow';
+import {
+	NodeConnectionType,
+	NodeOperationError,
+	ExecutionBaseError,
+	ApplicationError,
+} from 'n8n-workflow';
+
+import { createNodeAsTool } from './create-node-as-tool';
+// eslint-disable-next-line import/no-cycle
+import { SupplyDataContext } from '../../node-execution-context';
+import type { ExecuteContext, WebhookContext } from '../../node-execution-context';
+
+export async function getInputConnectionData(
+	this: ExecuteContext | WebhookContext | SupplyDataContext,
+	workflow: Workflow,
+	runExecutionData: IRunExecutionData,
+	parentRunIndex: number,
+	connectionInputData: INodeExecutionData[],
+	parentInputData: ITaskDataConnections,
+	additionalData: IWorkflowExecuteAdditionalData,
+	executeData: IExecuteData,
+	mode: WorkflowExecuteMode,
+	closeFunctions: CloseFunction[],
+	connectionType: AINodeConnectionType,
+	itemIndex: number,
+	abortSignal?: AbortSignal,
+): Promise<unknown> {
+	const parentNode = this.getNode();
+
+	const inputConfiguration = this.nodeInputs.find((input) => input.type === connectionType);
+	if (inputConfiguration === undefined) {
+		throw new ApplicationError('Node does not have input of type', {
+			extra: { nodeName: parentNode.name, connectionType },
+		});
+	}
+
+	const connectedNodes = this.getConnectedNodes(connectionType);
+	if (connectedNodes.length === 0) {
+		if (inputConfiguration.required) {
+			throw new NodeOperationError(
+				parentNode,
+				`A ${inputConfiguration?.displayName ?? connectionType} sub-node must be connected and enabled`,
+			);
+		}
+		return inputConfiguration.maxConnections === 1 ? undefined : [];
+	}
+
+	if (
+		inputConfiguration.maxConnections !== undefined &&
+		connectedNodes.length > inputConfiguration.maxConnections
+	) {
+		throw new NodeOperationError(
+			parentNode,
+			`Only ${inputConfiguration.maxConnections} ${connectionType} sub-nodes are/is allowed to be connected`,
+		);
+	}
+
+	const nodes: SupplyData[] = [];
+	for (const connectedNode of connectedNodes) {
+		const connectedNodeType = workflow.nodeTypes.getByNameAndVersion(
+			connectedNode.type,
+			connectedNode.typeVersion,
+		);
+		const contextFactory = (runIndex: number, inputData: ITaskDataConnections) =>
+			new SupplyDataContext(
+				workflow,
+				connectedNode,
+				additionalData,
+				mode,
+				runExecutionData,
+				runIndex,
+				connectionInputData,
+				inputData,
+				connectionType,
+				executeData,
+				closeFunctions,
+				abortSignal,
+			);
+
+		if (!connectedNodeType.supplyData) {
+			if (connectedNodeType.description.outputs.includes(NodeConnectionType.AiTool)) {
+				/**
+				 * This keeps track of how many times this specific AI tool node has been invoked.
+				 * It is incremented on every invocation of the tool to keep the output of each invocation separate from each other.
+				 */
+				let toolRunIndex = 0;
+				const supplyData = createNodeAsTool({
+					node: connectedNode,
+					nodeType: connectedNodeType,
+					handleToolInvocation: async (toolArgs) => {
+						const runIndex = toolRunIndex++;
+						const context = contextFactory(runIndex, {});
+						context.addInputData(NodeConnectionType.AiTool, [[{ json: toolArgs }]]);
+
+						try {
+							// Execute the sub-node with the proxied context
+							const result = await connectedNodeType.execute?.call(
+								context as unknown as IExecuteFunctions,
+							);
+
+							// Process and map the results
+							const mappedResults = result?.[0]?.flatMap((item) => item.json);
+
+							// Add output data to the context
+							context.addOutputData(NodeConnectionType.AiTool, runIndex, [
+								[{ json: { response: mappedResults } }],
+							]);
+
+							// Return the stringified results
+							return JSON.stringify(mappedResults);
+						} catch (error) {
+							const nodeError = new NodeOperationError(connectedNode, error as Error);
+							context.addOutputData(NodeConnectionType.AiTool, runIndex, nodeError);
+							return 'Error during node execution: ' + nodeError.description;
+						}
+					},
+				});
+				nodes.push(supplyData);
+			} else {
+				throw new ApplicationError('Node does not have a `supplyData` method defined', {
+					extra: { nodeName: connectedNode.name },
+				});
+			}
+		} else {
+			const context = contextFactory(parentRunIndex, parentInputData);
+			try {
+				const supplyData = await connectedNodeType.supplyData.call(context, itemIndex);
+				if (supplyData.closeFunction) {
+					closeFunctions.push(supplyData.closeFunction);
+				}
+				nodes.push(supplyData);
+			} catch (error) {
+				// Propagate errors from sub-nodes
+				if (error instanceof ExecutionBaseError) {
+					if (error.functionality === 'configuration-node') throw error;
+				} else {
+					error = new NodeOperationError(connectedNode, error, {
+						itemIndex,
+					});
+				}
+
+				let currentNodeRunIndex = 0;
+				if (runExecutionData.resultData.runData.hasOwnProperty(parentNode.name)) {
+					currentNodeRunIndex = runExecutionData.resultData.runData[parentNode.name].length;
+				}
+
+				// Display the error on the node which is causing it
+				await context.addExecutionDataFunctions(
+					'input',
+					error,
+					connectionType,
+					parentNode.name,
+					currentNodeRunIndex,
+				);
+
+				// Display on the calling node which node has the error
+				throw new NodeOperationError(connectedNode, `Error in sub-node ${connectedNode.name}`, {
+					itemIndex,
+					functionality: 'configuration-node',
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+					description: error.message,
+				});
+			}
+		}
+	}
+
+	return inputConfiguration.maxConnections === 1
+		? (nodes || [])[0]?.response
+		: nodes.map((node) => node.response);
+}
diff --git a/packages/core/src/Secrets.ts b/packages/core/src/execution-engine/node-execution-context/utils/get-secrets-proxy.ts
similarity index 100%
rename from packages/core/src/Secrets.ts
rename to packages/core/src/execution-engine/node-execution-context/utils/get-secrets-proxy.ts
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/validate-value-against-schema.ts b/packages/core/src/execution-engine/node-execution-context/utils/validate-value-against-schema.ts
new file mode 100644
index 0000000000..58744adf03
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/utils/validate-value-against-schema.ts
@@ -0,0 +1,218 @@
+import type {
+	FieldType,
+	IDataObject,
+	INode,
+	INodeProperties,
+	INodePropertyCollection,
+	INodePropertyOptions,
+	INodeType,
+} from 'n8n-workflow';
+import {
+	ExpressionError,
+	isResourceMapperValue,
+	NodeHelpers,
+	validateFieldType,
+} from 'n8n-workflow';
+
+import type { ExtendedValidationResult } from '@/interfaces';
+
+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 === undefined || resolvedValue === null)
+		) {
+			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,
+				strict: !resourceMapperField.attemptToConvertTypes,
+				parseStrings: !!resourceMapperField.convertFieldsToString,
+			});
+
+			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;
+};
diff --git a/packages/core/src/execution-engine/node-execution-context/webhook-context.ts b/packages/core/src/execution-engine/node-execution-context/webhook-context.ts
new file mode 100644
index 0000000000..d5b55cffb6
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/webhook-context.ts
@@ -0,0 +1,180 @@
+import type { Request, Response } from 'express';
+import type {
+	AINodeConnectionType,
+	CloseFunction,
+	ICredentialDataDecryptedObject,
+	IDataObject,
+	IExecuteData,
+	INode,
+	INodeExecutionData,
+	IRunExecutionData,
+	ITaskDataConnections,
+	IWebhookData,
+	IWebhookFunctions,
+	IWorkflowExecuteAdditionalData,
+	WebhookType,
+	Workflow,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
+import { ApplicationError, createDeferredPromise } from 'n8n-workflow';
+
+// eslint-disable-next-line import/no-cycle
+import {
+	copyBinaryFile,
+	getBinaryHelperFunctions,
+	getNodeWebhookUrl,
+	getRequestHelperFunctions,
+	returnJsonArray,
+} from '@/node-execute-functions';
+
+import { NodeExecutionContext } from './node-execution-context';
+import { getInputConnectionData } from './utils/get-input-connection-data';
+
+export class WebhookContext extends NodeExecutionContext implements IWebhookFunctions {
+	readonly helpers: IWebhookFunctions['helpers'];
+
+	readonly nodeHelpers: IWebhookFunctions['nodeHelpers'];
+
+	constructor(
+		workflow: Workflow,
+		node: INode,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		private readonly webhookData: IWebhookData,
+		private readonly closeFunctions: CloseFunction[],
+		runExecutionData: IRunExecutionData | null,
+	) {
+		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,
+			returnJsonArray,
+			...getRequestHelperFunctions(workflow, node, additionalData),
+			...getBinaryHelperFunctions(additionalData, workflow.id),
+		};
+
+		this.nodeHelpers = {
+			copyBinaryFile: async (filePath, fileName, mimeType) =>
+				await copyBinaryFile(
+					this.workflow.id,
+					this.additionalData.executionId!,
+					filePath,
+					fileName,
+					mimeType,
+				),
+		};
+	}
+
+	async getCredentials<T extends object = ICredentialDataDecryptedObject>(type: string) {
+		return await this._getCredentials<T>(type);
+	}
+
+	getBodyData() {
+		return this.assertHttpRequest().body as IDataObject;
+	}
+
+	getHeaderData() {
+		return this.assertHttpRequest().headers;
+	}
+
+	getParamsData(): object {
+		return this.assertHttpRequest().params;
+	}
+
+	getQueryData(): object {
+		return this.assertHttpRequest().query;
+	}
+
+	getRequestObject(): Request {
+		return this.assertHttpRequest();
+	}
+
+	getResponseObject(): Response {
+		if (this.additionalData.httpResponse === undefined) {
+			throw new ApplicationError('Response is missing');
+		}
+		return this.additionalData.httpResponse;
+	}
+
+	private assertHttpRequest() {
+		const { httpRequest } = this.additionalData;
+		if (httpRequest === undefined) {
+			throw new ApplicationError('Request is missing');
+		}
+		return httpRequest;
+	}
+
+	getNodeWebhookUrl(name: WebhookType): string | undefined {
+		return getNodeWebhookUrl(
+			name,
+			this.workflow,
+			this.node,
+			this.additionalData,
+			this.mode,
+			this.additionalKeys,
+		);
+	}
+
+	getWebhookName() {
+		return this.webhookData.webhookDescription.name;
+	}
+
+	async getInputConnectionData(
+		connectionType: AINodeConnectionType,
+		itemIndex: number,
+	): Promise<unknown> {
+		// To be able to use expressions like "$json.sessionId" set the
+		// body data the webhook received to what is normally used for
+		// incoming node data.
+		const connectionInputData: INodeExecutionData[] = [
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			{ json: this.additionalData.httpRequest?.body || {} },
+		];
+		const runExecutionData: IRunExecutionData = {
+			resultData: {
+				runData: {},
+			},
+		};
+		const executeData: IExecuteData = {
+			data: {
+				main: [connectionInputData],
+			},
+			node: this.node,
+			source: null,
+		};
+
+		return await getInputConnectionData.call(
+			this,
+			this.workflow,
+			runExecutionData,
+			this.runIndex,
+			connectionInputData,
+			{} as ITaskDataConnections,
+			this.additionalData,
+			executeData,
+			this.mode,
+			this.closeFunctions,
+			connectionType,
+			itemIndex,
+		);
+	}
+}
diff --git a/packages/core/src/execution-engine/node-execution-context/workflow-node-context.ts b/packages/core/src/execution-engine/node-execution-context/workflow-node-context.ts
new file mode 100644
index 0000000000..18de159e4b
--- /dev/null
+++ b/packages/core/src/execution-engine/node-execution-context/workflow-node-context.ts
@@ -0,0 +1,36 @@
+import type {
+	IGetNodeParameterOptions,
+	INode,
+	IWorkflowExecuteAdditionalData,
+	Workflow,
+	IWorkflowNodeContext,
+} from 'n8n-workflow';
+
+import { NodeExecutionContext } from './node-execution-context';
+
+export class LoadWorkflowNodeContext extends NodeExecutionContext implements IWorkflowNodeContext {
+	// Note that this differs from and does not shadow the function with the
+	// same name in `NodeExecutionContext`, as it has the `itemIndex` parameter
+	readonly getNodeParameter: IWorkflowNodeContext['getNodeParameter'];
+
+	constructor(workflow: Workflow, node: INode, additionalData: IWorkflowExecuteAdditionalData) {
+		super(workflow, node, additionalData, 'internal');
+		{
+			// We need to cast due to the overloaded IWorkflowNodeContext::getNodeParameter function
+			// Which would require us to replicate all overload return types, as TypeScript offers
+			// no convenient solution to refer to a set of overloads.
+			this.getNodeParameter = ((
+				parameterName: string,
+				itemIndex: number,
+				fallbackValue?: unknown,
+				options?: IGetNodeParameterOptions,
+			) =>
+				this._getNodeParameter(
+					parameterName,
+					itemIndex,
+					fallbackValue,
+					options,
+				)) as IWorkflowNodeContext['getNodeParameter'];
+		}
+	}
+}
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/clean-run-data.test.ts
similarity index 76%
rename from packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/clean-run-data.test.ts
index 5daea46ef6..7de648e6fd 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/cleanRunData.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/clean-run-data.test.ts
@@ -1,8 +1,8 @@
 import type { IRunData } from 'n8n-workflow';
 
 import { createNodeData, toITaskData } from './helpers';
-import { cleanRunData } from '../cleanRunData';
-import { DirectedGraph } from '../DirectedGraph';
+import { cleanRunData } from '../clean-run-data';
+import { DirectedGraph } from '../directed-graph';
 
 describe('cleanRunData', () => {
 	// ┌─────┐    ┌─────┐   ┌─────┐
@@ -84,4 +84,31 @@ describe('cleanRunData', () => {
 		// TODO: Find out if this is a desirable result in milestone 2
 		expect(newRunData).toEqual({});
 	});
+
+	// ┌─────┐    ┌─────┐
+	// │node1├───►│node2│
+	// └─────┘    └─────┘
+	test('removes run data of nodes that are not in the subgraph', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const node2 = createNodeData({ name: 'Node2' });
+		const graph = new DirectedGraph()
+			.addNodes(node1, node2)
+			.addConnections({ from: node1, to: node2 });
+		// not part of the graph
+		const node3 = createNodeData({ name: 'Node3' });
+		const runData: IRunData = {
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+			[node2.name]: [toITaskData([{ data: { value: 2 } }])],
+			[node3.name]: [toITaskData([{ data: { value: 3 } }])],
+		};
+
+		// ACT
+		const newRunData = cleanRunData(runData, graph, new Set([node2]));
+
+		// ASSERT
+		expect(newRunData).toEqual({
+			[node1.name]: [toITaskData([{ data: { value: 1 } }])],
+		});
+	});
 });
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/directed-graph.test.ts
similarity index 92%
rename from packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/directed-graph.test.ts
index 9530ed2217..a825c144a9 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/DirectedGraph.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/directed-graph.test.ts
@@ -13,7 +13,7 @@ import type { INode } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { createNodeData, defaultWorkflowParameter } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
+import { DirectedGraph } from '../directed-graph';
 
 describe('DirectedGraph', () => {
 	//     ┌─────┐    ┌─────┐   ┌─────┐
@@ -42,6 +42,28 @@ describe('DirectedGraph', () => {
 		);
 	});
 
+	//    ┌─────┐    ┌─────┐──► null
+	//    │node1├───►│node2│   ┌─────┐
+	//    └─────┘    └─────┘──►│node3│
+	//                         └─────┘
+	//
+	test('linear workflow with null connections', () => {
+		// ARRANGE
+		const node1 = createNodeData({ name: 'Node1' });
+		const node2 = createNodeData({ name: 'Node2' });
+		const node3 = createNodeData({ name: 'Node3' });
+
+		// ACT
+		const graph = new DirectedGraph()
+			.addNodes(node1, node2, node3)
+			.addConnections({ from: node1, to: node2 }, { from: node2, to: node3, outputIndex: 1 });
+
+		// ASSERT
+		expect(DirectedGraph.fromWorkflow(graph.toWorkflow({ ...defaultWorkflowParameter }))).toEqual(
+			graph,
+		);
+	});
+
 	describe('getChildren', () => {
 		// ┌─────┐    ┌─────┐   ┌─────┐
 		// │node1├───►│node2├──►│node3│
@@ -450,4 +472,24 @@ describe('DirectedGraph', () => {
 			expect(graph).toEqual(expectedGraph);
 		});
 	});
+
+	describe('hasNode', () => {
+		test("returns node if it's part of the graph", () => {
+			// ARRANGE
+			const node = createNodeData({ name: 'node' });
+			const graph = new DirectedGraph().addNodes(node);
+
+			// ACT & ASSERT
+			expect(graph.hasNode(node.name)).toBe(true);
+		});
+
+		test('returns undefined if there is no node with that name in the graph', () => {
+			// ARRANGE
+			const node = createNodeData({ name: 'node' });
+			const graph = new DirectedGraph().addNodes(node);
+
+			// ACT & ASSERT
+			expect(graph.hasNode(node.name + 'foo')).toBe(false);
+		});
+	});
 });
diff --git a/packages/core/src/execution-engine/partial-execution-utils/__tests__/filter-disabled-nodes.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/filter-disabled-nodes.test.ts
new file mode 100644
index 0000000000..69348720f7
--- /dev/null
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/filter-disabled-nodes.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 '../directed-graph';
+import { filterDisabledNodes } from '../filter-disabled-nodes';
+
+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/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
similarity index 72%
rename from packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
index ab33ccf8ed..a0c86515c2 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/findStartNodes.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-start-nodes.test.ts
@@ -12,8 +12,8 @@
 import { type IPinData, type IRunData } from 'n8n-workflow';
 
 import { createNodeData, toITaskData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { findStartNodes, isDirty } from '../findStartNodes';
+import { DirectedGraph } from '../directed-graph';
+import { findStartNodes, isDirty } from '../find-start-nodes';
 
 describe('isDirty', () => {
 	test("if the node has pinned data it's not dirty", () => {
@@ -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,10 +430,138 @@ 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);
 		expect(startNodes).toContainEqual(node2);
 	});
+
+	describe('custom loop logic', () => {
+		test('if the last run of loop node has no data (null) on the done output, then the loop is the start node', () => {
+			// ARRANGE
+			const trigger = createNodeData({ name: 'trigger' });
+			const loop = createNodeData({ name: 'loop', type: 'n8n-nodes-base.splitInBatches' });
+			const inLoop = createNodeData({ name: 'inLoop' });
+			const afterLoop = createNodeData({ name: 'afterLoop' });
+			const graph = new DirectedGraph()
+				.addNodes(trigger, loop, inLoop, afterLoop)
+				.addConnections(
+					{ from: trigger, to: loop },
+					{ from: loop, outputIndex: 1, to: inLoop },
+					{ from: inLoop, to: loop },
+					{ from: loop, to: afterLoop },
+				);
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { name: 'trigger' } }])],
+				[loop.name]: [
+					// only output on the `loop` branch, but no output on the `done`
+					// branch
+					toITaskData([{ outputIndex: 1, data: { name: 'loop' } }]),
+				],
+				[inLoop.name]: [toITaskData([{ data: { name: 'inLoop' } }])],
+			};
+
+			// ACT
+			const startNodes = findStartNodes({
+				graph,
+				trigger,
+				destination: afterLoop,
+				runData,
+				pinData: {},
+			});
+
+			// ASSERT
+			expect(startNodes.size).toBe(1);
+			expect(startNodes).toContainEqual(loop);
+		});
+
+		test('if the last run of loop node has no data (empty array) on the done output, then the loop is the start  node', () => {
+			// ARRANGE
+			const trigger = createNodeData({ name: 'trigger' });
+			const loop = createNodeData({ name: 'loop', type: 'n8n-nodes-base.splitInBatches' });
+			const inLoop = createNodeData({ name: 'inLoop' });
+			const afterLoop = createNodeData({ name: 'afterLoop' });
+			const graph = new DirectedGraph()
+				.addNodes(trigger, loop, inLoop, afterLoop)
+				.addConnections(
+					{ from: trigger, to: loop },
+					{ from: loop, outputIndex: 1, to: inLoop },
+					{ from: inLoop, to: loop },
+					{ from: loop, to: afterLoop },
+				);
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { name: 'trigger' } }])],
+				[loop.name]: [
+					// This is handcrafted because `toITaskData` does not allow inserting
+					// an empty array like the first element of `main` below. But the
+					// execution engine creates ITaskData like this.
+					{
+						executionStatus: 'success',
+						executionTime: 0,
+						startTime: 0,
+						source: [],
+						data: { main: [[], [{ json: { name: 'loop' } }]] },
+					},
+				],
+				[inLoop.name]: [toITaskData([{ data: { name: 'inLoop' } }])],
+			};
+
+			// ACT
+			const startNodes = findStartNodes({
+				graph,
+				trigger,
+				destination: afterLoop,
+				runData,
+				pinData: {},
+			});
+
+			// ASSERT
+			expect(startNodes.size).toBe(1);
+			expect(startNodes).toContainEqual(loop);
+		});
+
+		test('if the loop has data on the done output in the last run it does not become a start node', () => {
+			// ARRANGE
+			const trigger = createNodeData({ name: 'trigger' });
+			const loop = createNodeData({ name: 'loop', type: 'n8n-nodes-base.splitInBatches' });
+			const inLoop = createNodeData({ name: 'inLoop' });
+			const afterLoop = createNodeData({ name: 'afterLoop' });
+			const graph = new DirectedGraph()
+				.addNodes(trigger, loop, inLoop, afterLoop)
+				.addConnections(
+					{ from: trigger, to: loop },
+					{ from: loop, outputIndex: 1, to: inLoop },
+					{ from: inLoop, to: loop },
+					{ from: loop, to: afterLoop },
+				);
+			const runData: IRunData = {
+				[trigger.name]: [toITaskData([{ data: { name: 'trigger' } }])],
+				[loop.name]: [
+					toITaskData([{ outputIndex: 1, data: { name: 'loop' } }]),
+					toITaskData([{ outputIndex: 0, data: { name: 'done' } }]),
+				],
+				[inLoop.name]: [toITaskData([{ data: { name: 'inLoop' } }])],
+			};
+
+			// ACT
+			const startNodes = findStartNodes({
+				graph,
+				trigger,
+				destination: afterLoop,
+				runData,
+				pinData: {},
+			});
+
+			// ASSERT
+			expect(startNodes.size).toBe(1);
+			expect(startNodes).toContainEqual(afterLoop);
+		});
+	});
 });
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
similarity index 71%
rename from packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
index fceb22da06..1a6382017a 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/findSubgraph.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/find-subgraph.test.ts
@@ -12,8 +12,8 @@
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { createNodeData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { findSubgraph } from '../findSubgraph';
+import { DirectedGraph } from '../directed-graph';
+import { findSubgraph } from '../find-subgraph';
 
 describe('findSubgraph', () => {
 	//                 ►►
@@ -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__/getSourceDataGroups.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/get-source-data-groups.test.ts
similarity index 99%
rename from packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/get-source-data-groups.test.ts
index d8c3485d65..872a452aa7 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/getSourceDataGroups.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/get-source-data-groups.test.ts
@@ -11,8 +11,8 @@ import type { IPinData } from 'n8n-workflow';
 import { NodeConnectionType, type IRunData } from 'n8n-workflow';
 
 import { createNodeData, toITaskData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { getSourceDataGroups } from '../getSourceDataGroups';
+import { DirectedGraph } from '../directed-graph';
+import { getSourceDataGroups } from '../get-source-data-groups';
 
 describe('getSourceDataGroups', () => {
 	//┌───────┐1
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/handleCycles.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/handle-cycles.test.ts
similarity index 98%
rename from packages/core/src/PartialExecutionUtils/__tests__/handleCycles.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/handle-cycles.test.ts
index def9fed0ff..06ed5daf47 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/handleCycles.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/handle-cycles.test.ts
@@ -10,8 +10,8 @@
 // PD denotes that the node has pinned data
 
 import { createNodeData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { handleCycles } from '../handleCycles';
+import { DirectedGraph } from '../directed-graph';
+import { handleCycles } from '../handle-cycles';
 
 describe('handleCycles', () => {
 	//                 ┌────┐          ┌─────────┐
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/helpers.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/helpers.ts
similarity index 94%
rename from packages/core/src/PartialExecutionUtils/__tests__/helpers.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/helpers.ts
index 72b1efa30c..74976bba3e 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/helpers.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/helpers.ts
@@ -5,13 +5,14 @@ interface StubNode {
 	name: string;
 	parameters?: INodeParameters;
 	disabled?: boolean;
+	type?: 'n8n-nodes-base.manualTrigger' | 'n8n-nodes-base.splitInBatches' | (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/__tests__/recreateNodeExecutionStack.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/recreate-node-execution-stack.test.ts
similarity index 99%
rename from packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/recreate-node-execution-stack.test.ts
index b78b9df135..0f20896e21 100644
--- a/packages/core/src/PartialExecutionUtils/__tests__/recreateNodeExecutionStack.test.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/__tests__/recreate-node-execution-stack.test.ts
@@ -18,15 +18,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, type IPinData, type IRunData } from 'n8n-workflow';
 
+import { createNodeData, toITaskData } from './helpers';
+import { DirectedGraph } from '../directed-graph';
+import { findSubgraph } from '../find-subgraph';
 import {
 	addWaitingExecution,
 	addWaitingExecutionSource,
 	recreateNodeExecutionStack,
-} from '@/PartialExecutionUtils/recreateNodeExecutionStack';
-
-import { createNodeData, toITaskData } from './helpers';
-import { DirectedGraph } from '../DirectedGraph';
-import { findSubgraph } from '../findSubgraph';
+} from '../recreate-node-execution-stack';
 
 describe('recreateNodeExecutionStack', () => {
 	//                   ►►
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/toIConnections.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/to-iconnections.test.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/__tests__/toIConnections.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/to-iconnections.test.ts
diff --git a/packages/core/src/PartialExecutionUtils/__tests__/toITaskData.test.ts b/packages/core/src/execution-engine/partial-execution-utils/__tests__/to-itask-data.test.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/__tests__/toITaskData.test.ts
rename to packages/core/src/execution-engine/partial-execution-utils/__tests__/to-itask-data.test.ts
diff --git a/packages/core/src/PartialExecutionUtils/cleanRunData.ts b/packages/core/src/execution-engine/partial-execution-utils/clean-run-data.ts
similarity index 66%
rename from packages/core/src/PartialExecutionUtils/cleanRunData.ts
rename to packages/core/src/execution-engine/partial-execution-utils/clean-run-data.ts
index bcd60c423b..78d08acd9b 100644
--- a/packages/core/src/PartialExecutionUtils/cleanRunData.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/clean-run-data.ts
@@ -1,6 +1,6 @@
 import type { INode, IRunData } from 'n8n-workflow';
 
-import type { DirectedGraph } from './DirectedGraph';
+import type { DirectedGraph } from './directed-graph';
 
 /**
  * Returns new run data that does not contain data for any node that is a child
@@ -23,5 +23,13 @@ export function cleanRunData(
 		}
 	}
 
+	// Remove run data for all nodes that are not part of the subgraph
+	for (const nodeName of Object.keys(newRunData)) {
+		if (!graph.hasNode(nodeName)) {
+			// remove run data for node that is not part of the graph
+			delete newRunData[nodeName];
+		}
+	}
+
 	return newRunData;
 }
diff --git a/packages/core/src/PartialExecutionUtils/DirectedGraph.ts b/packages/core/src/execution-engine/partial-execution-utils/directed-graph.ts
similarity index 98%
rename from packages/core/src/PartialExecutionUtils/DirectedGraph.ts
rename to packages/core/src/execution-engine/partial-execution-utils/directed-graph.ts
index 6f8b43a660..63d95367ab 100644
--- a/packages/core/src/PartialExecutionUtils/DirectedGraph.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/directed-graph.ts
@@ -42,6 +42,10 @@ export class DirectedGraph {
 
 	private connections: Map<DirectedGraphKey, GraphConnection> = new Map();
 
+	hasNode(nodeName: string) {
+		return this.nodes.has(nodeName);
+	}
+
 	getNodes() {
 		return new Map(this.nodes.entries());
 	}
@@ -448,7 +452,7 @@ export class DirectedGraph {
 
 			for (const [outputType, outputs] of Object.entries(iConnection)) {
 				for (const [outputIndex, conns] of outputs.entries()) {
-					for (const conn of conns) {
+					for (const conn of conns ?? []) {
 						// TODO: What's with the input type?
 						const { node: toNodeName, type: _inputType, index: inputIndex } = conn;
 						const to = workflow.getNode(toNodeName);
@@ -470,6 +474,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/execution-engine/partial-execution-utils/filter-disabled-nodes.ts b/packages/core/src/execution-engine/partial-execution-utils/filter-disabled-nodes.ts
new file mode 100644
index 0000000000..af9ffb3512
--- /dev/null
+++ b/packages/core/src/execution-engine/partial-execution-utils/filter-disabled-nodes.ts
@@ -0,0 +1,18 @@
+import { NodeConnectionType } from 'n8n-workflow';
+
+import type { DirectedGraph } from './directed-graph';
+
+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/execution-engine/partial-execution-utils/find-start-nodes.ts
similarity index 80%
rename from packages/core/src/PartialExecutionUtils/findStartNodes.ts
rename to packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts
index 5eb036bd88..d7b3fb522d 100644
--- a/packages/core/src/PartialExecutionUtils/findStartNodes.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/find-start-nodes.ts
@@ -1,7 +1,7 @@
-import type { INode, IPinData, IRunData } from 'n8n-workflow';
+import { NodeConnectionType, type INode, type IPinData, type IRunData } from 'n8n-workflow';
 
-import type { DirectedGraph } from './DirectedGraph';
-import { getIncomingData } from './getIncomingData';
+import type { DirectedGraph } from './directed-graph';
+import { getIncomingData, getIncomingDataFromAnyRun } from './get-incoming-data';
 
 /**
  * A node is dirty if either of the following is true:
@@ -73,6 +73,25 @@ function findStartNodesRecursive(
 		return startNodes;
 	}
 
+	// If the current node is a loop node, check if the `done` output has data on
+	// the last run. If it doesn't the loop wasn't fully executed and needs to be
+	// re-run from the start. Thus the loop node become the start node.
+	if (current.type === 'n8n-nodes-base.splitInBatches') {
+		const nodeRunData = getIncomingData(
+			runData,
+			current.name,
+			// last run
+			-1,
+			NodeConnectionType.Main,
+			0,
+		);
+
+		if (nodeRunData === null || nodeRunData.length === 0) {
+			startNodes.add(current);
+			return startNodes;
+		}
+	}
+
 	// If we detect a cycle stop following the branch, there is no start node on
 	// this branch.
 	if (seen.has(current)) {
@@ -82,19 +101,16 @@ function findStartNodesRecursive(
 	// Recurse with every direct child that is part of the sub graph.
 	const outGoingConnections = graph.getDirectChildConnections(current);
 	for (const outGoingConnection of outGoingConnections) {
-		const nodeRunData = getIncomingData(
+		const nodeRunData = getIncomingDataFromAnyRun(
 			runData,
 			outGoingConnection.from.name,
-			// NOTE: It's always 0 until I fix the bug that removes the run data for
-			// old runs. The FE only sends data for one run for each node.
-			0,
 			outGoingConnection.type,
 			outGoingConnection.outputIndex,
 		);
 
 		// If the node has multiple outputs, only follow the outputs that have run data.
 		const hasNoRunData =
-			nodeRunData === null || nodeRunData === undefined || nodeRunData.length === 0;
+			nodeRunData === null || nodeRunData === undefined || nodeRunData.data.length === 0;
 		if (hasNoRunData) {
 			continue;
 		}
@@ -135,14 +151,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/execution-engine/partial-execution-utils/find-subgraph.ts
similarity index 70%
rename from packages/core/src/PartialExecutionUtils/findSubgraph.ts
rename to packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts
index 4d3bc4cc3f..f333f4764e 100644
--- a/packages/core/src/PartialExecutionUtils/findSubgraph.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/find-subgraph.ts
@@ -1,7 +1,7 @@
 import { NodeConnectionType, type INode } from 'n8n-workflow';
 
-import type { GraphConnection } from './DirectedGraph';
-import { DirectedGraph } from './DirectedGraph';
+import type { GraphConnection } from './directed-graph';
+import { DirectedGraph } from './directed-graph';
 
 function findSubgraphRecursive(
 	graph: DirectedGraph,
@@ -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/findTriggerForPartialExecution.ts b/packages/core/src/execution-engine/partial-execution-utils/find-trigger-for-partial-execution.ts
similarity index 100%
rename from packages/core/src/PartialExecutionUtils/findTriggerForPartialExecution.ts
rename to packages/core/src/execution-engine/partial-execution-utils/find-trigger-for-partial-execution.ts
diff --git a/packages/core/src/PartialExecutionUtils/getIncomingData.ts b/packages/core/src/execution-engine/partial-execution-utils/get-incoming-data.ts
similarity index 65%
rename from packages/core/src/PartialExecutionUtils/getIncomingData.ts
rename to packages/core/src/execution-engine/partial-execution-utils/get-incoming-data.ts
index acac8ad22d..a6a66ee25b 100644
--- a/packages/core/src/PartialExecutionUtils/getIncomingData.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/get-incoming-data.ts
@@ -1,4 +1,3 @@
-import * as a from 'assert';
 import type { INodeExecutionData, IRunData, NodeConnectionType } from 'n8n-workflow';
 
 export function getIncomingData(
@@ -7,18 +6,8 @@ export function getIncomingData(
 	runIndex: number,
 	connectionType: NodeConnectionType,
 	outputIndex: number,
-): INodeExecutionData[] | null | undefined {
-	a.ok(runData[nodeName], `Can't find node with name '${nodeName}' in runData.`);
-	a.ok(
-		runData[nodeName][runIndex],
-		`Can't find a run for index '${runIndex}' for node name '${nodeName}'`,
-	);
-	a.ok(
-		runData[nodeName][runIndex].data,
-		`Can't find data for index '${runIndex}' for node name '${nodeName}'`,
-	);
-
-	return runData[nodeName][runIndex].data[connectionType][outputIndex];
+): INodeExecutionData[] | null {
+	return runData[nodeName]?.at(runIndex)?.data?.[connectionType].at(outputIndex) ?? null;
 }
 
 function getRunIndexLength(runData: IRunData, nodeName: string) {
diff --git a/packages/core/src/PartialExecutionUtils/getSourceDataGroups.ts b/packages/core/src/execution-engine/partial-execution-utils/get-source-data-groups.ts
similarity index 98%
rename from packages/core/src/PartialExecutionUtils/getSourceDataGroups.ts
rename to packages/core/src/execution-engine/partial-execution-utils/get-source-data-groups.ts
index d9a9940816..d96aba3062 100644
--- a/packages/core/src/PartialExecutionUtils/getSourceDataGroups.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/get-source-data-groups.ts
@@ -1,6 +1,6 @@
 import { type INode, type IPinData, type IRunData } from 'n8n-workflow';
 
-import type { GraphConnection, DirectedGraph } from './DirectedGraph';
+import type { GraphConnection, DirectedGraph } from './directed-graph';
 
 function sortByInputIndexThenByName(
 	connection1: GraphConnection,
diff --git a/packages/core/src/PartialExecutionUtils/handleCycles.ts b/packages/core/src/execution-engine/partial-execution-utils/handle-cycles.ts
similarity index 96%
rename from packages/core/src/PartialExecutionUtils/handleCycles.ts
rename to packages/core/src/execution-engine/partial-execution-utils/handle-cycles.ts
index 94a8ae8cbc..1e52b491ed 100644
--- a/packages/core/src/PartialExecutionUtils/handleCycles.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/handle-cycles.ts
@@ -1,7 +1,7 @@
 import type { INode } from 'n8n-workflow';
 import * as a from 'node:assert/strict';
 
-import type { DirectedGraph } from './DirectedGraph';
+import type { DirectedGraph } from './directed-graph';
 
 /**
  * Returns a new set of start nodes.
diff --git a/packages/core/src/execution-engine/partial-execution-utils/index.ts b/packages/core/src/execution-engine/partial-execution-utils/index.ts
new file mode 100644
index 0000000000..d363f52302
--- /dev/null
+++ b/packages/core/src/execution-engine/partial-execution-utils/index.ts
@@ -0,0 +1,8 @@
+export { DirectedGraph } from './directed-graph';
+export { findTriggerForPartialExecution } from './find-trigger-for-partial-execution';
+export { findStartNodes } from './find-start-nodes';
+export { findSubgraph } from './find-subgraph';
+export { recreateNodeExecutionStack } from './recreate-node-execution-stack';
+export { cleanRunData } from './clean-run-data';
+export { handleCycles } from './handle-cycles';
+export { filterDisabledNodes } from './filter-disabled-nodes';
diff --git a/packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts b/packages/core/src/execution-engine/partial-execution-utils/recreate-node-execution-stack.ts
similarity index 97%
rename from packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts
rename to packages/core/src/execution-engine/partial-execution-utils/recreate-node-execution-stack.ts
index 542d4b8fbd..95aced2515 100644
--- a/packages/core/src/PartialExecutionUtils/recreateNodeExecutionStack.ts
+++ b/packages/core/src/execution-engine/partial-execution-utils/recreate-node-execution-stack.ts
@@ -12,9 +12,9 @@ import {
 	type IWaitingForExecutionSource,
 } from 'n8n-workflow';
 
-import type { DirectedGraph } from './DirectedGraph';
-import { getIncomingDataFromAnyRun } from './getIncomingData';
-import { getSourceDataGroups } from './getSourceDataGroups';
+import type { DirectedGraph } from './directed-graph';
+import { getIncomingDataFromAnyRun } from './get-incoming-data';
+import { getSourceDataGroups } from './get-source-data-groups';
 
 export function addWaitingExecution(
 	waitingExecution: IWaitingForExecution,
diff --git a/packages/workflow/src/RoutingNode.ts b/packages/core/src/execution-engine/routing-node.ts
similarity index 96%
rename from packages/workflow/src/RoutingNode.ts
rename to packages/core/src/execution-engine/routing-node.ts
index 4b3ed7f597..1c041735d8 100644
--- a/packages/workflow/src/RoutingNode.ts
+++ b/packages/core/src/execution-engine/routing-node.ts
@@ -1,25 +1,18 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-
 import get from 'lodash/get';
 import merge from 'lodash/merge';
 import set from 'lodash/set';
-import url from 'node:url';
-
-import { NodeApiError } from './errors/node-api.error';
-import { NodeOperationError } from './errors/node-operation.error';
+import { NodeHelpers, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	IHttpRequestOptions,
 	IN8nHttpFullResponse,
 	INode,
-	INodeExecuteFunctions,
 	INodeExecutionData,
 	INodeParameters,
 	INodePropertyOptions,
@@ -42,10 +35,12 @@ import type {
 	JsonObject,
 	CloseFunction,
 	INodeCredentialDescription,
-} from './Interfaces';
-import * as NodeHelpers from './NodeHelpers';
-import { sleep } from './utils';
-import type { Workflow } from './Workflow';
+	IExecutePaginationFunctions,
+	Workflow,
+} from 'n8n-workflow';
+import url from 'node:url';
+
+import { ExecuteContext, ExecuteSingleContext } from './node-execution-context';
 
 export class RoutingNode {
 	additionalData: IWorkflowExecuteAdditionalData;
@@ -82,7 +77,6 @@ export class RoutingNode {
 		runIndex: number,
 		nodeType: INodeType,
 		executeData: IExecuteData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
 		credentialsDecrypted?: ICredentialsDecrypted,
 		abortSignal?: AbortSignal,
 	): Promise<INodeExecutionData[][] | null | undefined> {
@@ -90,16 +84,16 @@ export class RoutingNode {
 		const returnData: INodeExecutionData[] = [];
 
 		const closeFunctions: CloseFunction[] = [];
-		const executeFunctions = nodeExecuteFunctions.getExecuteFunctions(
+		const executeFunctions = new ExecuteContext(
 			this.workflow,
+			this.node,
+			this.additionalData,
+			this.mode,
 			this.runExecutionData,
 			runIndex,
 			this.connectionInputData,
 			inputData,
-			this.node,
-			this.additionalData,
 			executeData,
-			this.mode,
 			closeFunctions,
 			abortSignal,
 		);
@@ -135,6 +129,7 @@ export class RoutingNode {
 				credentials =
 					(await executeFunctions.getCredentials<ICredentialDataDecryptedObject>(
 						credentialDescription.name,
+						0,
 					)) || {};
 			} catch (error) {
 				if (credentialDescription.required) {
@@ -167,20 +162,22 @@ export class RoutingNode {
 				}
 			}
 
+			const thisArgs = new ExecuteSingleContext(
+				this.workflow,
+				this.node,
+				this.additionalData,
+				this.mode,
+				this.runExecutionData,
+				runIndex,
+				this.connectionInputData,
+				inputData,
+				itemIndex,
+				executeData,
+				abortSignal,
+			);
+
 			itemContext.push({
-				thisArgs: nodeExecuteFunctions.getExecuteSingleFunctions(
-					this.workflow,
-					this.runExecutionData,
-					runIndex,
-					this.connectionInputData,
-					inputData,
-					this.node,
-					itemIndex,
-					this.additionalData,
-					executeData,
-					this.mode,
-					abortSignal,
-				),
+				thisArgs,
 				requestData: {
 					options: {
 						qs: {},
@@ -307,6 +304,7 @@ export class RoutingNode {
 		}
 
 		const promisesResponses = await Promise.allSettled(requestPromises);
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		let responseData: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			responseData = promisesResponses.shift();
@@ -623,27 +621,28 @@ export class RoutingNode {
 			);
 		}
 
-		const executePaginationFunctions = {
-			...executeSingleFunctions,
-			makeRoutingRequest: async (requestOptions: DeclarativeRestApiSettings.ResultOptions) => {
-				return await this.rawRoutingRequest(
-					executeSingleFunctions,
-					requestOptions,
-					credentialType,
-					credentialsDecrypted,
-				).then(
-					async (data) =>
-						await this.postProcessResponseData(
-							executeSingleFunctions,
-							data,
-							requestData,
-							itemIndex,
-							runIndex,
-						),
-				);
-			},
+		const makeRoutingRequest = async (requestOptions: DeclarativeRestApiSettings.ResultOptions) => {
+			return await this.rawRoutingRequest(
+				executeSingleFunctions,
+				requestOptions,
+				credentialType,
+				credentialsDecrypted,
+			).then(
+				async (data) =>
+					await this.postProcessResponseData(
+						executeSingleFunctions,
+						data,
+						requestData,
+						itemIndex,
+						runIndex,
+					),
+			);
 		};
 
+		const executePaginationFunctions = Object.create(executeSingleFunctions, {
+			makeRoutingRequest: { value: makeRoutingRequest },
+		}) as IExecutePaginationFunctions;
+
 		if (requestData.paginate && requestOperations?.pagination) {
 			// Has pagination
 
diff --git a/packages/core/src/ScheduledTaskManager.ts b/packages/core/src/execution-engine/scheduled-task-manager.ts
similarity index 91%
rename from packages/core/src/ScheduledTaskManager.ts
rename to packages/core/src/execution-engine/scheduled-task-manager.ts
index 00396903a5..1a20700b00 100644
--- a/packages/core/src/ScheduledTaskManager.ts
+++ b/packages/core/src/execution-engine/scheduled-task-manager.ts
@@ -1,8 +1,8 @@
+import { Service } from '@n8n/di';
 import { CronJob } from 'cron';
 import type { CronExpression, Workflow } from 'n8n-workflow';
-import { Service } from 'typedi';
 
-import { InstanceSettings } from './InstanceSettings';
+import { InstanceSettings } from '@/instance-settings';
 
 @Service()
 export class ScheduledTaskManager {
diff --git a/packages/core/src/SSHClientsManager.ts b/packages/core/src/execution-engine/ssh-clients-manager.ts
similarity index 98%
rename from packages/core/src/SSHClientsManager.ts
rename to packages/core/src/execution-engine/ssh-clients-manager.ts
index 17046a26eb..a29c5facc7 100644
--- a/packages/core/src/SSHClientsManager.ts
+++ b/packages/core/src/execution-engine/ssh-clients-manager.ts
@@ -1,7 +1,7 @@
+import { Service } from '@n8n/di';
 import type { SSHCredentials } from 'n8n-workflow';
 import { createHash } from 'node:crypto';
 import { Client, type ConnectConfig } from 'ssh2';
-import { Service } from 'typedi';
 
 @Service()
 export class SSHClientsManager {
diff --git a/packages/core/src/execution-engine/triggers-and-pollers.ts b/packages/core/src/execution-engine/triggers-and-pollers.ts
new file mode 100644
index 0000000000..681d50641a
--- /dev/null
+++ b/packages/core/src/execution-engine/triggers-and-pollers.ts
@@ -0,0 +1,116 @@
+import { Service } from '@n8n/di';
+import { ApplicationError } from 'n8n-workflow';
+import type {
+	Workflow,
+	INode,
+	INodeExecutionData,
+	IPollFunctions,
+	IGetExecuteTriggerFunctions,
+	IWorkflowExecuteAdditionalData,
+	WorkflowExecuteMode,
+	WorkflowActivateMode,
+	ITriggerResponse,
+	IDeferredPromise,
+	IExecuteResponsePromiseData,
+	IRun,
+} from 'n8n-workflow';
+
+@Service()
+export class TriggersAndPollers {
+	/**
+	 * Runs the given trigger node so that it can trigger the workflow when the node has data.
+	 */
+	async runTrigger(
+		workflow: Workflow,
+		node: INode,
+		getTriggerFunctions: IGetExecuteTriggerFunctions,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		activation: WorkflowActivateMode,
+	): Promise<ITriggerResponse | undefined> {
+		const triggerFunctions = getTriggerFunctions(workflow, node, additionalData, mode, activation);
+
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		if (!nodeType.trigger) {
+			throw new ApplicationError('Node type does not have a trigger function defined', {
+				extra: { nodeName: node.name },
+				tags: { nodeType: node.type },
+			});
+		}
+
+		if (mode === 'manual') {
+			// In manual mode we do not just start the trigger function we also
+			// want to be able to get informed as soon as the first data got emitted
+			const triggerResponse = await nodeType.trigger.call(triggerFunctions);
+
+			// Add the manual trigger response which resolves when the first time data got emitted
+			triggerResponse!.manualTriggerResponse = new Promise((resolve, reject) => {
+				triggerFunctions.emit = (
+					(resolveEmit) =>
+					(
+						data: INodeExecutionData[][],
+						responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
+						donePromise?: IDeferredPromise<IRun>,
+					) => {
+						additionalData.hooks!.hookFunctions.sendResponse = [
+							async (response: IExecuteResponsePromiseData): Promise<void> => {
+								if (responsePromise) {
+									responsePromise.resolve(response);
+								}
+							},
+						];
+
+						if (donePromise) {
+							additionalData.hooks!.hookFunctions.workflowExecuteAfter?.unshift(
+								async (runData: IRun): Promise<void> => {
+									return donePromise.resolve(runData);
+								},
+							);
+						}
+
+						resolveEmit(data);
+					}
+				)(resolve);
+				triggerFunctions.emitError = (
+					(rejectEmit) =>
+					(error: Error, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>) => {
+						additionalData.hooks!.hookFunctions.sendResponse = [
+							async (): Promise<void> => {
+								if (responsePromise) {
+									responsePromise.reject(error);
+								}
+							},
+						];
+
+						rejectEmit(error);
+					}
+				)(reject);
+			});
+
+			return triggerResponse;
+		}
+		// In all other modes simply start the trigger
+		return await nodeType.trigger.call(triggerFunctions);
+	}
+
+	/**
+	 * Runs the given poller node so that it can trigger the workflow when the node has data.
+	 */
+	async runPoll(
+		workflow: Workflow,
+		node: INode,
+		pollFunctions: IPollFunctions,
+	): Promise<INodeExecutionData[][] | null> {
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		if (!nodeType.poll) {
+			throw new ApplicationError('Node type does not have a poll function defined', {
+				extra: { nodeName: node.name },
+				tags: { nodeType: node.type },
+			});
+		}
+
+		return await nodeType.poll.call(pollFunctions);
+	}
+}
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/execution-engine/workflow-execute.ts
similarity index 72%
rename from packages/core/src/WorkflowExecute.ts
rename to packages/core/src/execution-engine/workflow-execute.ts
index 23b88abd5b..2eb7a9e7fe 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/execution-engine/workflow-execute.ts
@@ -2,8 +2,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
+import { Container } from '@n8n/di';
 import * as assert from 'assert/strict';
 import { setMaxListeners } from 'events';
+import { omit } from 'lodash';
 import get from 'lodash/get';
 import type {
 	ExecutionBaseError,
@@ -35,6 +37,10 @@ import type {
 	CloseFunction,
 	StartNodeData,
 	NodeExecutionHint,
+	NodeInputConnections,
+	IRunNodeResponse,
+	IWorkflowIssues,
+	INodeIssues,
 } from 'n8n-workflow';
 import {
 	LoggerProxy as Logger,
@@ -44,11 +50,15 @@ import {
 	ApplicationError,
 	NodeExecutionOutput,
 	sleep,
-	ErrorReporterProxy,
+	ExecutionCancelledError,
+	Node,
 } from 'n8n-workflow';
 import PCancelable from 'p-cancelable';
 
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
+import { ErrorReporter } from '@/errors/error-reporter';
+import * as NodeExecuteFunctions from '@/node-execute-functions';
+
+import { ExecuteContext, PollContext } from './node-execution-context';
 import {
 	DirectedGraph,
 	findStartNodes,
@@ -57,7 +67,10 @@ import {
 	cleanRunData,
 	recreateNodeExecutionStack,
 	handleCycles,
-} from './PartialExecutionUtils';
+	filterDisabledNodes,
+} from './partial-execution-utils';
+import { RoutingNode } from './routing-node';
+import { TriggersAndPollers } from './triggers-and-pollers';
 
 export class WorkflowExecute {
 	private status: ExecutionStatus = 'new';
@@ -154,10 +167,6 @@ export class WorkflowExecute {
 		return this.processRunExecutionData(workflow);
 	}
 
-	static isAbortError(e?: ExecutionBaseError) {
-		return e?.message === 'AbortError';
-	}
-
 	forceInputNodeExecution(workflow: Workflow): boolean {
 		return workflow.settings.executionOrder !== 'v1';
 	}
@@ -209,6 +218,9 @@ export class WorkflowExecute {
 				// Get the data of the incoming connections
 				incomingSourceData = { main: [] };
 				for (const connections of incomingNodeConnections.main) {
+					if (!connections) {
+						continue;
+					}
 					for (let inputIndex = 0; inputIndex < connections.length; inputIndex++) {
 						connection = connections[inputIndex];
 
@@ -250,6 +262,9 @@ export class WorkflowExecute {
 				incomingNodeConnections = workflow.connectionsByDestinationNode[destinationNode];
 				if (incomingNodeConnections !== undefined) {
 					for (const connections of incomingNodeConnections.main) {
+						if (!connections) {
+							continue;
+						}
 						for (let inputIndex = 0; inputIndex < connections.length; inputIndex++) {
 							connection = connections[inputIndex];
 
@@ -322,8 +337,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.
@@ -347,23 +363,24 @@ export class WorkflowExecute {
 		}
 
 		// 2. Find the Subgraph
-		const graph = DirectedGraph.fromWorkflow(workflow);
-		const subgraph = findSubgraph({ graph, destination, trigger });
-		const filteredNodes = subgraph.getNodes();
+		let graph = DirectedGraph.fromWorkflow(workflow);
+		graph = findSubgraph({ graph: filterDisabledNodes(graph), destination, trigger });
+		const filteredNodes = graph.getNodes();
 
 		// 3. Find the Start Nodes
-		let startNodes = findStartNodes({ graph: subgraph, trigger, destination, runData });
+		runData = omit(runData, dirtyNodeNames);
+		let startNodes = findStartNodes({ graph, trigger, destination, runData, pinData });
 
 		// 4. Detect Cycles
 		// 5. Handle Cycles
 		startNodes = handleCycles(graph, startNodes, trigger);
 
 		// 6. Clean Run Data
-		const newRunData: IRunData = cleanRunData(runData, graph, startNodes);
+		runData = cleanRunData(runData, graph, startNodes);
 
 		// 7. Recreate Execution Stack
 		const { nodeExecutionStack, waitingExecution, waitingExecutionSource } =
-			recreateNodeExecutionStack(subgraph, new Set(startNodes), runData, pinData ?? {});
+			recreateNodeExecutionStack(graph, new Set(startNodes), runData, pinData ?? {});
 
 		// 8. Execute
 		this.status = 'running';
@@ -373,7 +390,7 @@ export class WorkflowExecute {
 				runNodeFilter: Array.from(filteredNodes.values()).map((node) => node.name),
 			},
 			resultData: {
-				runData: newRunData,
+				runData,
 				pinData,
 			},
 			executionData: {
@@ -385,7 +402,7 @@ export class WorkflowExecute {
 			},
 		};
 
-		return this.processRunExecutionData(subgraph.toWorkflow({ ...workflow }));
+		return this.processRunExecutionData(graph.toWorkflow({ ...workflow }));
 	}
 
 	/**
@@ -401,6 +418,17 @@ export class WorkflowExecute {
 		return await this.additionalData.hooks.executeHookFunctions(hookName, parameters);
 	}
 
+	/**
+	 * Merges temporary execution metadata into the final runData structure.
+	 * During workflow execution, metadata is collected in a temporary location
+	 * (executionData.metadata). This method moves that metadata to its final
+	 * location in the resultData.runData for each node.
+	 *
+	 * @remarks
+	 * - Metadata from multiple runs is preserved using run indices
+	 * - Existing metadata in runData is preserved and merged with new metadata
+	 * - If no metadata exists, the operation is a no-op
+	 */
 	moveNodeMetadata(): void {
 		const metadata = get(this.runExecutionData, 'executionData.metadata');
 
@@ -411,21 +439,37 @@ export class WorkflowExecute {
 			let metaRunData: ITaskMetadata;
 			for (const nodeName of Object.keys(metadata)) {
 				for ([index, metaRunData] of metadata[nodeName].entries()) {
-					runData[nodeName][index].metadata = metaRunData;
+					runData[nodeName][index].metadata = {
+						...(runData[nodeName][index].metadata ?? {}),
+						...metaRunData,
+					};
 				}
 			}
 		}
 	}
 
 	/**
-	 * Checks the incoming connection does not receive any data
+	 * Checks if all incoming connections to a node are empty (have no data).
+	 * This is used to determine if a node should be executed or skipped.
+	 *
+	 * @param runData - The execution data from all nodes in the workflow
+	 * @param inputConnections - Array of connections to check
+	 * @param runIndex - Index of the current execution run (nodes can execute multiple times)
+	 *
+	 * @returns `true` if all connections are empty (no data), `false` if any connection has data
+	 *
+	 * @remarks
+	 * A connection is considered empty when:
+	 * - The source node doesn't exist in runData
+	 * - The source node's data is undefined
+	 * - The source node's output array is empty
+	 * - The specified output index contains no items
 	 */
 	incomingConnectionIsEmpty(
 		runData: IRunData,
 		inputConnections: IConnection[],
 		runIndex: number,
 	): boolean {
-		// for (const inputConnection of workflow.connectionsByDestinationNode[nodeToAdd].main[0]) {
 		for (const inputConnection of inputConnections) {
 			const nodeIncomingData = get(runData, [
 				inputConnection.node,
@@ -441,24 +485,29 @@ export class WorkflowExecute {
 		return true;
 	}
 
+	/**
+	 * Prepares the waiting execution data structure for a node that needs to wait for data before it can execute.
+	 * This function initializes arrays to store data and metadata for each connection of the node.
+	 *
+	 * @param nodeName - The name of the node to prepare waiting execution for
+	 * @param numberOfConnections - Number of input connections the node has
+	 * @param runIndex - The index of the current run (for nodes that may run multiple times)
+	 */
 	prepareWaitingToExecution(nodeName: string, numberOfConnections: number, runIndex: number) {
-		if (!this.runExecutionData.executionData!.waitingExecutionSource) {
-			this.runExecutionData.executionData!.waitingExecutionSource = {};
-		}
+		const executionData = this.runExecutionData.executionData!;
 
-		this.runExecutionData.executionData!.waitingExecution[nodeName][runIndex] = {
-			main: [],
-		};
-		this.runExecutionData.executionData!.waitingExecutionSource[nodeName][runIndex] = {
-			main: [],
-		};
+		executionData.waitingExecution ??= {};
+		executionData.waitingExecutionSource ??= {};
+
+		const nodeWaiting = (executionData.waitingExecution[nodeName] ??= []);
+		const nodeWaitingSource = (executionData.waitingExecutionSource[nodeName] ??= []);
+
+		nodeWaiting[runIndex] = { main: [] };
+		nodeWaitingSource[runIndex] = { main: [] };
 
 		for (let i = 0; i < numberOfConnections; i++) {
-			this.runExecutionData.executionData!.waitingExecution[nodeName][runIndex].main.push(null);
-
-			this.runExecutionData.executionData!.waitingExecutionSource[nodeName][runIndex].main.push(
-				null,
-			);
+			nodeWaiting[runIndex].main.push(null);
+			nodeWaitingSource[runIndex].main.push(null);
 		}
 	}
 
@@ -638,7 +687,7 @@ export class WorkflowExecute {
 					}
 					for (const connectionDataCheck of workflow.connectionsBySourceNode[parentNodeName].main[
 						outputIndexParent
-					]) {
+					] ?? []) {
 						checkOutputNodes.push(connectionDataCheck.node);
 					}
 				}
@@ -657,7 +706,7 @@ export class WorkflowExecute {
 				) {
 					for (const inputData of workflow.connectionsByDestinationNode[connectionData.node].main[
 						inputIndex
-					]) {
+					] ?? []) {
 						if (inputData.node === parentNodeName) {
 							// Is the node we come from so its data will be available for sure
 							continue;
@@ -677,7 +726,7 @@ export class WorkflowExecute {
 							if (
 								!this.incomingConnectionIsEmpty(
 									this.runExecutionData.resultData.runData,
-									workflow.connectionsByDestinationNode[inputData.node].main[0],
+									workflow.connectionsByDestinationNode[inputData.node].main[0] ?? [],
 									runIndex,
 								)
 							) {
@@ -766,7 +815,7 @@ export class WorkflowExecute {
 						} else if (
 							this.incomingConnectionIsEmpty(
 								this.runExecutionData.resultData.runData,
-								workflow.connectionsByDestinationNode[nodeToAdd].main[0],
+								workflow.connectionsByDestinationNode[nodeToAdd].main[0] ?? [],
 								runIndex,
 							)
 						) {
@@ -872,6 +921,280 @@ export class WorkflowExecute {
 		}
 	}
 
+	/**
+	 * Checks if everything in the workflow is complete
+	 * and ready to be executed. If it returns null everything
+	 * is fine. If there are issues it returns the issues
+	 * which have been found for the different nodes.
+	 * TODO: Does currently not check for credential issues!
+	 */
+	checkReadyForExecution(
+		workflow: Workflow,
+		inputData: {
+			startNode?: string;
+			destinationNode?: string;
+			pinDataNodeNames?: string[];
+		} = {},
+	): IWorkflowIssues | null {
+		const workflowIssues: IWorkflowIssues = {};
+
+		let checkNodes: string[] = [];
+		if (inputData.destinationNode) {
+			// If a destination node is given we have to check all the nodes
+			// leading up to it
+			checkNodes = workflow.getParentNodes(inputData.destinationNode);
+			checkNodes.push(inputData.destinationNode);
+		} else if (inputData.startNode) {
+			// If a start node is given we have to check all nodes which
+			// come after it
+			checkNodes = workflow.getChildNodes(inputData.startNode);
+			checkNodes.push(inputData.startNode);
+		}
+
+		for (const nodeName of checkNodes) {
+			let nodeIssues: INodeIssues | null = null;
+			const node = workflow.nodes[nodeName];
+
+			if (node.disabled === true) {
+				continue;
+			}
+
+			const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+			if (nodeType === undefined) {
+				// Node type is not known
+				nodeIssues = {
+					typeUnknown: true,
+				};
+			} else {
+				nodeIssues = NodeHelpers.getNodeParametersIssues(
+					nodeType.description.properties,
+					node,
+					inputData.pinDataNodeNames,
+				);
+			}
+
+			if (nodeIssues !== null) {
+				workflowIssues[node.name] = nodeIssues;
+			}
+		}
+
+		if (Object.keys(workflowIssues).length === 0) {
+			return null;
+		}
+
+		return workflowIssues;
+	}
+
+	/** Executes the given node */
+	// eslint-disable-next-line complexity
+	async runNode(
+		workflow: Workflow,
+		executionData: IExecuteData,
+		runExecutionData: IRunExecutionData,
+		runIndex: number,
+		additionalData: IWorkflowExecuteAdditionalData,
+		mode: WorkflowExecuteMode,
+		abortSignal?: AbortSignal,
+	): Promise<IRunNodeResponse> {
+		const { node } = executionData;
+		let inputData = executionData.data;
+
+		if (node.disabled === true) {
+			// If node is disabled simply pass the data through
+			// return NodeRunHelpers.
+			if (inputData.hasOwnProperty('main') && inputData.main.length > 0) {
+				// If the node is disabled simply return the data from the first main input
+				if (inputData.main[0] === null) {
+					return { data: undefined };
+				}
+				return { data: [inputData.main[0]] };
+			}
+			return { data: undefined };
+		}
+
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+
+		let connectionInputData: INodeExecutionData[] = [];
+		if (nodeType.execute || (!nodeType.poll && !nodeType.trigger && !nodeType.webhook)) {
+			// Only stop if first input is empty for execute runs. For all others run anyways
+			// because then it is a trigger node. As they only pass data through and so the input-data
+			// becomes output-data it has to be possible.
+
+			if (inputData.main?.length > 0) {
+				// We always use the data of main input and the first input for execute
+				connectionInputData = inputData.main[0] as INodeExecutionData[];
+			}
+
+			const forceInputNodeExecution = workflow.settings.executionOrder !== 'v1';
+			if (!forceInputNodeExecution) {
+				// If the nodes do not get force executed data of some inputs may be missing
+				// for that reason do we use the data of the first one that contains any
+				for (const mainData of inputData.main) {
+					if (mainData?.length) {
+						connectionInputData = mainData;
+						break;
+					}
+				}
+			}
+
+			if (connectionInputData.length === 0) {
+				// No data for node so return
+				return { data: undefined };
+			}
+		}
+
+		if (
+			runExecutionData.resultData.lastNodeExecuted === node.name &&
+			runExecutionData.resultData.error !== undefined
+		) {
+			// The node did already fail. So throw an error here that it displays and logs it correctly.
+			// Does get used by webhook and trigger nodes in case they throw an error that it is possible
+			// to log the error and display in Editor-UI.
+			if (
+				runExecutionData.resultData.error.name === 'NodeOperationError' ||
+				runExecutionData.resultData.error.name === 'NodeApiError'
+			) {
+				throw runExecutionData.resultData.error;
+			}
+
+			const error = new Error(runExecutionData.resultData.error.message);
+			error.stack = runExecutionData.resultData.error.stack;
+			throw error;
+		}
+
+		if (node.executeOnce === true) {
+			// If node should be executed only once so use only the first input item
+			const newInputData: ITaskDataConnections = {};
+			for (const connectionType of Object.keys(inputData)) {
+				newInputData[connectionType] = inputData[connectionType].map((input) => {
+					// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
+					return input && input.slice(0, 1);
+				});
+			}
+			inputData = newInputData;
+		}
+
+		if (nodeType.execute) {
+			const closeFunctions: CloseFunction[] = [];
+			const context = new ExecuteContext(
+				workflow,
+				node,
+				additionalData,
+				mode,
+				runExecutionData,
+				runIndex,
+				connectionInputData,
+				inputData,
+				executionData,
+				closeFunctions,
+				abortSignal,
+			);
+
+			const data =
+				nodeType instanceof Node
+					? await nodeType.execute(context)
+					: await nodeType.execute.call(context);
+
+			const closeFunctionsResults = await Promise.allSettled(
+				closeFunctions.map(async (fn) => await fn()),
+			);
+
+			const closingErrors = closeFunctionsResults
+				.filter((result): result is PromiseRejectedResult => result.status === 'rejected')
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+				.map((result) => result.reason);
+
+			if (closingErrors.length > 0) {
+				if (closingErrors[0] instanceof Error) throw closingErrors[0];
+				throw new ApplicationError("Error on execution node's close function(s)", {
+					extra: { nodeName: node.name },
+					tags: { nodeType: node.type },
+					cause: closingErrors,
+				});
+			}
+
+			return { data };
+		} else if (nodeType.poll) {
+			if (mode === 'manual') {
+				// In manual mode run the poll function
+				const context = new PollContext(workflow, node, additionalData, mode, 'manual');
+				return { data: await nodeType.poll.call(context) };
+			}
+			// In any other mode pass data through as it already contains the result of the poll
+			return { data: inputData.main as INodeExecutionData[][] };
+		} else if (nodeType.trigger) {
+			if (mode === 'manual') {
+				// In manual mode start the trigger
+				const triggerResponse = await Container.get(TriggersAndPollers).runTrigger(
+					workflow,
+					node,
+					NodeExecuteFunctions.getExecuteTriggerFunctions,
+					additionalData,
+					mode,
+					'manual',
+				);
+
+				if (triggerResponse === undefined) {
+					return { data: null };
+				}
+
+				let closeFunction;
+				if (triggerResponse.closeFunction) {
+					// In manual mode we return the trigger closeFunction. That allows it to be called directly
+					// but we do not have to wait for it to finish. That is important for things like queue-nodes.
+					// There the full close will may be delayed till a message gets acknowledged after the execution.
+					// If we would not be able to wait for it to close would it cause problems with "own" mode as the
+					// process would be killed directly after it and so the acknowledge would not have been finished yet.
+					closeFunction = triggerResponse.closeFunction;
+
+					// Manual testing of Trigger nodes creates an execution. If the execution is cancelled, `closeFunction` should be called to cleanup any open connections/consumers
+					abortSignal?.addEventListener('abort', closeFunction);
+				}
+
+				if (triggerResponse.manualTriggerFunction !== undefined) {
+					// If a manual trigger function is defined call it and wait till it did run
+					await triggerResponse.manualTriggerFunction();
+				}
+
+				const response = await triggerResponse.manualTriggerResponse!;
+
+				if (response.length === 0) {
+					return { data: null, closeFunction };
+				}
+
+				return { data: response, closeFunction };
+			}
+			// For trigger nodes in any mode except "manual" do we simply pass the data through
+			return { data: inputData.main as INodeExecutionData[][] };
+		} else if (nodeType.webhook) {
+			// For webhook nodes always simply pass the data through
+			return { data: inputData.main as INodeExecutionData[][] };
+		} else {
+			// For nodes which have routing information on properties
+
+			const routingNode = new RoutingNode(
+				workflow,
+				node,
+				connectionInputData,
+				runExecutionData ?? null,
+				additionalData,
+				mode,
+			);
+
+			return {
+				data: await routingNode.runNode(
+					inputData,
+					runIndex,
+					nodeType,
+					executionData,
+					undefined,
+					abortSignal,
+				),
+			};
+		}
+	}
+
 	/**
 	 * Runs the given execution data.
 	 *
@@ -888,7 +1211,27 @@ export class WorkflowExecute {
 
 		this.status = 'running';
 
-		const startNode = this.runExecutionData.executionData!.nodeExecutionStack[0].node.name;
+		if (!this.runExecutionData.executionData) {
+			throw new ApplicationError('Failed to run workflow due to missing execution data', {
+				extra: {
+					workflowId: workflow.id,
+					executionid: this.additionalData.executionId,
+					mode: this.mode,
+				},
+			});
+		}
+
+		const startNode = this.runExecutionData.executionData.nodeExecutionStack.at(0)?.node.name;
+
+		if (!startNode) {
+			throw new ApplicationError('Failed to run workflow due to empty node execution stack', {
+				extra: {
+					workflowId: workflow.id,
+					executionId: this.additionalData.executionId,
+					mode: this.mode,
+				},
+			});
+		}
 
 		let destinationNode: string | undefined;
 		if (this.runExecutionData.startData && this.runExecutionData.startData.destinationNode) {
@@ -897,14 +1240,14 @@ export class WorkflowExecute {
 
 		const pinDataNodeNames = Object.keys(this.runExecutionData.resultData.pinData ?? {});
 
-		const workflowIssues = workflow.checkReadyForExecution({
+		const workflowIssues = this.checkReadyForExecution(workflow, {
 			startNode,
 			destinationNode,
 			pinDataNodeNames,
 		});
 		if (workflowIssues !== null) {
 			throw new WorkflowOperationError(
-				'The workflow has issues and can for that reason not be executed. Please fix them first.',
+				'The workflow has issues and cannot be executed for that reason. Please fix them first.',
 			);
 		}
 
@@ -916,7 +1259,6 @@ export class WorkflowExecute {
 		let nodeSuccessData: INodeExecutionData[][] | null | undefined;
 		let runIndex: number;
 		let startTime: number;
-		let taskData: ITaskData;
 
 		if (this.runExecutionData.startData === undefined) {
 			this.runExecutionData.startData = {};
@@ -924,7 +1266,7 @@ export class WorkflowExecute {
 
 		if (this.runExecutionData.waitTill) {
 			const lastNodeExecuted = this.runExecutionData.resultData.lastNodeExecuted as string;
-			this.runExecutionData.executionData!.nodeExecutionStack[0].node.disabled = true;
+			this.runExecutionData.executionData.nodeExecutionStack[0].node.disabled = true;
 			this.runExecutionData.waitTill = undefined;
 			this.runExecutionData.resultData.runData[lastNodeExecuted].pop();
 		}
@@ -949,7 +1291,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;
@@ -1008,8 +1350,8 @@ export class WorkflowExecute {
 
 					// Update the pairedItem information on items
 					const newTaskDataConnections: ITaskDataConnections = {};
-					for (const inputName of Object.keys(executionData.data)) {
-						newTaskDataConnections[inputName] = executionData.data[inputName].map(
+					for (const connectionType of Object.keys(executionData.data)) {
+						newTaskDataConnections[connectionType] = executionData.data[connectionType].map(
 							(input, inputIndex) => {
 								if (input === null) {
 									return input;
@@ -1063,7 +1405,7 @@ export class WorkflowExecute {
 					if (workflow.connectionsByDestinationNode.hasOwnProperty(executionNode.name)) {
 						// Check if the node has incoming connections
 						if (workflow.connectionsByDestinationNode[executionNode.name].hasOwnProperty('main')) {
-							let inputConnections: IConnection[][];
+							let inputConnections: NodeInputConnections;
 							let connectionIndex: number;
 
 							// eslint-disable-next-line prefer-const
@@ -1160,12 +1502,12 @@ export class WorkflowExecute {
 									workflowId: workflow.id,
 								});
 
-								let runNodeData = await workflow.runNode(
+								let runNodeData = await this.runNode(
+									workflow,
 									executionData,
 									this.runExecutionData,
 									runIndex,
 									this.additionalData,
-									NodeExecuteFunctions,
 									this.mode,
 									this.abortController.signal,
 								);
@@ -1177,12 +1519,12 @@ export class WorkflowExecute {
 								while (didContinueOnFail && tryIndex !== maxTries - 1) {
 									await sleep(waitBetweenTries);
 
-									runNodeData = await workflow.runNode(
+									runNodeData = await this.runNode(
+										workflow,
 										executionData,
 										this.runExecutionData,
 										runIndex,
 										this.additionalData,
-										NodeExecuteFunctions,
 										this.mode,
 										this.abortController.signal,
 									);
@@ -1191,124 +1533,13 @@ export class WorkflowExecute {
 								}
 
 								if (nodeSuccessData instanceof NodeExecutionOutput) {
-									const hints: NodeExecutionHint[] = nodeSuccessData.getHints();
+									const hints = (nodeSuccessData as NodeExecutionOutput).getHints();
 
 									executionHints.push(...hints);
 								}
 
 								if (nodeSuccessData && executionData.node.onError === 'continueErrorOutput') {
-									// If errorOutput is activated check all the output items for error data.
-									// If any is found, route them to the last output as that will be the
-									// error output.
-
-									const nodeType = workflow.nodeTypes.getByNameAndVersion(
-										executionData.node.type,
-										executionData.node.typeVersion,
-									);
-									const outputs = NodeHelpers.getNodeOutputs(
-										workflow,
-										executionData.node,
-										nodeType.description,
-									);
-									const outputTypes = NodeHelpers.getConnectionTypes(outputs);
-									const mainOutputTypes = outputTypes.filter(
-										(output) => output === NodeConnectionType.Main,
-									);
-
-									const errorItems: INodeExecutionData[] = [];
-									const closeFunctions: CloseFunction[] = [];
-									// Create a WorkflowDataProxy instance that we can get the data of the
-									// item which did error
-									const executeFunctions = NodeExecuteFunctions.getExecuteFunctions(
-										workflow,
-										this.runExecutionData,
-										runIndex,
-										[],
-										executionData.data,
-										executionData.node,
-										this.additionalData,
-										executionData,
-										this.mode,
-										closeFunctions,
-										this.abortController.signal,
-									);
-									const dataProxy = executeFunctions.getWorkflowDataProxy(0);
-
-									// Loop over all outputs except the error output as it would not contain data by default
-									for (
-										let outputIndex = 0;
-										outputIndex < mainOutputTypes.length - 1;
-										outputIndex++
-									) {
-										const successItems: INodeExecutionData[] = [];
-										const items = nodeSuccessData[outputIndex]?.length
-											? nodeSuccessData[outputIndex]
-											: [];
-
-										while (items.length) {
-											const item = items.pop();
-											if (item === undefined) {
-												continue;
-											}
-
-											let errorData: GenericValue | undefined;
-											if (item.error) {
-												errorData = item.error;
-												item.error = undefined;
-											} else if (item.json.error && Object.keys(item.json).length === 1) {
-												errorData = item.json.error;
-											} else if (
-												item.json.error &&
-												item.json.message &&
-												Object.keys(item.json).length === 2
-											) {
-												errorData = item.json.error;
-											}
-
-											if (errorData) {
-												const pairedItemData =
-													item.pairedItem && typeof item.pairedItem === 'object'
-														? Array.isArray(item.pairedItem)
-															? item.pairedItem[0]
-															: item.pairedItem
-														: undefined;
-
-												if (executionData!.source === null || pairedItemData === undefined) {
-													// Source data is missing for some reason so we can not figure out the item
-													errorItems.push(item);
-												} else {
-													const pairedItemInputIndex = pairedItemData.input || 0;
-
-													const sourceData =
-														executionData!.source[NodeConnectionType.Main][pairedItemInputIndex];
-
-													const constPairedItem = dataProxy.$getPairedItem(
-														sourceData!.previousNode,
-														sourceData,
-														pairedItemData,
-													);
-
-													if (constPairedItem === null) {
-														errorItems.push(item);
-													} else {
-														errorItems.push({
-															...item,
-															json: {
-																...constPairedItem.json,
-																...item.json,
-															},
-														});
-													}
-												}
-											} else {
-												successItems.push(item);
-											}
-										}
-
-										nodeSuccessData[outputIndex] = successItems;
-									}
-
-									nodeSuccessData[mainOutputTypes.length - 1] = errorItems;
+									this.handleNodeErrorOutput(workflow, executionData, nodeSuccessData, runIndex);
 								}
 
 								if (runNodeData.closeFunction) {
@@ -1323,53 +1554,7 @@ export class WorkflowExecute {
 								workflowId: workflow.id,
 							});
 
-							if (nodeSuccessData?.length) {
-								// Check if the output data contains pairedItem data and if not try
-								// to automatically fix it
-
-								const isSingleInputAndOutput =
-									executionData.data.main.length === 1 && executionData.data.main[0]?.length === 1;
-
-								const isSameNumberOfItems =
-									nodeSuccessData.length === 1 &&
-									executionData.data.main.length === 1 &&
-									executionData.data.main[0]?.length === nodeSuccessData[0].length;
-
-								checkOutputData: for (const outputData of nodeSuccessData) {
-									if (outputData === null) {
-										continue;
-									}
-									for (const [index, item] of outputData.entries()) {
-										if (item.pairedItem === undefined) {
-											// The pairedItem data is missing, so check if it can get automatically fixed
-											if (isSingleInputAndOutput) {
-												// The node has one input and one incoming item, so we know
-												// that all items must originate from that single
-												item.pairedItem = {
-													item: 0,
-												};
-											} else if (isSameNumberOfItems) {
-												// The number of oncoming and outcoming items is identical so we can
-												// make the reasonable assumption that each of the input items
-												// is the origin of the corresponding output items
-												item.pairedItem = {
-													item: index,
-												};
-											} else {
-												// In all other cases autofixing is not possible
-												break checkOutputData;
-											}
-										}
-									}
-								}
-							}
-
-							if (nodeSuccessData === undefined) {
-								// Node did not get executed
-								nodeSuccessData = null;
-							} else {
-								this.runExecutionData.resultData.lastNodeExecuted = executionData.node.name;
-							}
+							nodeSuccessData = this.assignPairedItems(nodeSuccessData, executionData);
 
 							if (nodeSuccessData === null || nodeSuccessData[0][0] === undefined) {
 								if (executionData.node.alwaysOutputData === true) {
@@ -1398,7 +1583,7 @@ export class WorkflowExecute {
 								}
 							}
 
-							if (nodeSuccessData === null && !this.runExecutionData.waitTill!) {
+							if (nodeSuccessData === null && !this.runExecutionData.waitTill) {
 								// If null gets returned it means that the node did succeed
 								// but did not have any data. So the branch should end
 								// (meaning the nodes afterwards should not be processed)
@@ -1418,7 +1603,7 @@ export class WorkflowExecute {
 								toReport = error;
 							}
 							if (toReport) {
-								ErrorReporterProxy.error(toReport, {
+								Container.get(ErrorReporter).error(toReport, {
 									extra: {
 										nodeName: executionNode.name,
 										nodeType: executionNode.type,
@@ -1446,12 +1631,13 @@ export class WorkflowExecute {
 						this.runExecutionData.resultData.runData[executionNode.name] = [];
 					}
 
-					taskData = {
+					const taskData: ITaskData = {
 						hints: executionHints,
 						startTime,
 						executionTime: new Date().getTime() - startTime,
 						source: !executionData.source ? [] : executionData.source.main,
-						executionStatus: 'success',
+						metadata: executionData.metadata,
+						executionStatus: this.runExecutionData.waitTill ? 'waiting' : 'success',
 					};
 
 					if (executionError !== undefined) {
@@ -1479,7 +1665,7 @@ export class WorkflowExecute {
 							// Add the execution data again so that it can get restarted
 							this.runExecutionData.executionData!.nodeExecutionStack.unshift(executionData);
 							// Only execute the nodeExecuteAfter hook if the node did not get aborted
-							if (!WorkflowExecute.isAbortError(executionError)) {
+							if (!this.isCancelled) {
 								await this.executeHook('nodeExecuteAfter', [
 									executionNode.name,
 									taskData,
@@ -1502,16 +1688,13 @@ export class WorkflowExecute {
 								lineResult.json.$json !== undefined
 							) {
 								// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-								// @ts-ignore
 								lineResult.error = lineResult.json.$error as NodeApiError | NodeOperationError;
 								lineResult.json = {
 									// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-									// @ts-ignore
 									error: (lineResult.json.$error as NodeApiError | NodeOperationError).message,
 								};
 							} else if (lineResult.error !== undefined) {
 								// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-								// @ts-ignore
 								lineResult.json = { error: lineResult.error.message };
 							}
 						}
@@ -1524,7 +1707,7 @@ export class WorkflowExecute {
 
 					this.runExecutionData.resultData.runData[executionNode.name].push(taskData);
 
-					if (this.runExecutionData.waitTill!) {
+					if (this.runExecutionData.waitTill) {
 						await this.executeHook('nodeExecuteAfter', [
 							executionNode.name,
 							taskData,
@@ -1582,7 +1765,7 @@ export class WorkflowExecute {
 								// Iterate over all the different connections of this output
 								for (connectionData of workflow.connectionsBySourceNode[executionNode.name].main[
 									outputIndex
-								]) {
+								] ?? []) {
 									if (!workflow.nodes.hasOwnProperty(connectionData.node)) {
 										throw new ApplicationError('Destination node not found', {
 											extra: {
@@ -1827,7 +2010,7 @@ export class WorkflowExecute {
 						return await this.processSuccessExecution(
 							startedAt,
 							workflow,
-							new WorkflowOperationError('Workflow has been canceled or timed out'),
+							new ExecutionCancelledError(this.additionalData.executionId ?? 'unknown'),
 							closeFunction,
 						);
 					}
@@ -1884,6 +2067,27 @@ export class WorkflowExecute {
 		});
 	}
 
+	/**
+	 * Processes the final state of a workflow execution and prepares the execution result.
+	 * This method handles different completion scenarios: success, waiting, error, and canceled states.
+	 * It also manages cleanup tasks like static data updates and trigger deactivation.
+	 *
+	 * @param startedAt - The timestamp when the workflow execution started
+	 * @param workflow - The workflow being executed
+	 * @param executionError - Optional error that occurred during execution
+	 * @param closeFunction - Optional promise that handles cleanup of triggers/webhooks
+	 *
+	 * @returns A promise that resolves to the complete workflow execution data (IRun)
+	 *
+	 * @remarks
+	 * The function performs these tasks in order:
+	 * 1. Generates full execution data
+	 * 2. Sets appropriate status based on execution outcome
+	 * 3. Handles any static data changes
+	 * 4. Moves node metadata to its final location
+	 * 5. Executes the 'workflowExecuteAfter' hook
+	 * 6. Performs cleanup via closeFunction if provided
+	 */
 	async processSuccessExecution(
 		startedAt: Date,
 		workflow: Workflow,
@@ -1905,7 +2109,7 @@ export class WorkflowExecute {
 			if (executionError.message?.includes('canceled')) {
 				fullRunData.status = 'canceled';
 			}
-		} else if (this.runExecutionData.waitTill!) {
+		} else if (this.runExecutionData.waitTill) {
 			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			Logger.debug(`Workflow execution will wait until ${this.runExecutionData.waitTill}`, {
 				workflowId: workflow.id,
@@ -1928,7 +2132,7 @@ export class WorkflowExecute {
 
 		this.moveNodeMetadata();
 		// Prevent from running the hook if the error is an abort error as it was already handled
-		if (!WorkflowExecute.isAbortError(executionError)) {
+		if (!this.isCancelled) {
 			await this.executeHook('workflowExecuteAfter', [fullRunData, newStaticData]);
 		}
 
@@ -1949,14 +2153,190 @@ export class WorkflowExecute {
 	}
 
 	getFullRunData(startedAt: Date): IRun {
-		const fullRunData: IRun = {
+		return {
 			data: this.runExecutionData,
 			mode: this.mode,
 			startedAt,
 			stoppedAt: new Date(),
 			status: this.status,
 		};
+	}
 
-		return fullRunData;
+	handleNodeErrorOutput(
+		workflow: Workflow,
+		executionData: IExecuteData,
+		nodeSuccessData: INodeExecutionData[][],
+		runIndex: number,
+	): void {
+		const nodeType = workflow.nodeTypes.getByNameAndVersion(
+			executionData.node.type,
+			executionData.node.typeVersion,
+		);
+		const outputs = NodeHelpers.getNodeOutputs(workflow, executionData.node, nodeType.description);
+		const outputTypes = NodeHelpers.getConnectionTypes(outputs);
+		const mainOutputTypes = outputTypes.filter((output) => output === NodeConnectionType.Main);
+
+		const errorItems: INodeExecutionData[] = [];
+		const closeFunctions: CloseFunction[] = [];
+		// Create a WorkflowDataProxy instance that we can get the data of the
+		// item which did error
+		const executeFunctions = new ExecuteContext(
+			workflow,
+			executionData.node,
+			this.additionalData,
+			this.mode,
+			this.runExecutionData,
+			runIndex,
+			[],
+			executionData.data,
+			executionData,
+			closeFunctions,
+			this.abortController.signal,
+		);
+
+		const dataProxy = executeFunctions.getWorkflowDataProxy(0);
+
+		// Loop over all outputs except the error output as it would not contain data by default
+		for (let outputIndex = 0; outputIndex < mainOutputTypes.length - 1; outputIndex++) {
+			const successItems: INodeExecutionData[] = [];
+			const items = nodeSuccessData[outputIndex]?.length ? nodeSuccessData[outputIndex] : [];
+
+			while (items.length) {
+				const item = items.shift();
+				if (item === undefined) {
+					continue;
+				}
+
+				let errorData: GenericValue | undefined;
+				if (item.error) {
+					errorData = item.error;
+					item.error = undefined;
+				} else if (item.json.error && Object.keys(item.json).length === 1) {
+					errorData = item.json.error;
+				} else if (item.json.error && item.json.message && Object.keys(item.json).length === 2) {
+					errorData = item.json.error;
+				}
+
+				if (errorData) {
+					const pairedItemData =
+						item.pairedItem && typeof item.pairedItem === 'object'
+							? Array.isArray(item.pairedItem)
+								? item.pairedItem[0]
+								: item.pairedItem
+							: undefined;
+
+					if (executionData.source === null || pairedItemData === undefined) {
+						// Source data is missing for some reason so we can not figure out the item
+						errorItems.push(item);
+					} else {
+						const pairedItemInputIndex = pairedItemData.input || 0;
+
+						const sourceData = executionData.source[NodeConnectionType.Main][pairedItemInputIndex];
+
+						const constPairedItem = dataProxy.$getPairedItem(
+							sourceData!.previousNode,
+							sourceData,
+							pairedItemData,
+						);
+
+						if (constPairedItem === null) {
+							errorItems.push(item);
+						} else {
+							errorItems.push({
+								...item,
+								json: {
+									...constPairedItem.json,
+									...item.json,
+								},
+							});
+						}
+					}
+				} else {
+					successItems.push(item);
+				}
+			}
+
+			nodeSuccessData[outputIndex] = successItems;
+		}
+
+		nodeSuccessData[mainOutputTypes.length - 1] = errorItems;
+	}
+
+	/**
+	 * Assigns pairedItem information to node output items by matching them with input items.
+	 * PairedItem data is used to track which output items were derived from which input items.
+	 *
+	 * @param nodeSuccessData - The output data from a node execution
+	 * @param executionData - The execution data containing input information
+	 *
+	 * @returns The node output data with pairedItem information assigned where possible
+	 *
+	 * @remarks
+	 * Auto-assignment of pairedItem happens in two scenarios:
+	 * 1. Single input/output: When node has exactly one input item and produces output(s),
+	 *    all outputs are marked as derived from that single input (item: 0)
+	 * 2. Matching items count: When number of input and output items match exactly,
+	 *    each output item is paired with the input item at the same index
+	 *
+	 * In all other cases, if pairedItem is missing, it remains undefined as automatic
+	 * assignment cannot be done reliably.
+	 */
+	assignPairedItems(
+		nodeSuccessData: INodeExecutionData[][] | null | undefined,
+		executionData: IExecuteData,
+	) {
+		if (nodeSuccessData?.length) {
+			// Check if the output data contains pairedItem data and if not try
+			// to automatically fix it
+
+			const isSingleInputAndOutput =
+				executionData.data.main.length === 1 && executionData.data.main[0]?.length === 1;
+
+			const isSameNumberOfItems =
+				nodeSuccessData.length === 1 &&
+				executionData.data.main.length === 1 &&
+				executionData.data.main[0]?.length === nodeSuccessData[0].length;
+
+			checkOutputData: for (const outputData of nodeSuccessData) {
+				if (outputData === null) {
+					continue;
+				}
+				for (const [index, item] of outputData.entries()) {
+					if (item.pairedItem === undefined) {
+						// The pairedItem data is missing, so check if it can get automatically fixed
+						if (isSingleInputAndOutput) {
+							// The node has one input and one incoming item, so we know
+							// that all items must originate from that single
+							item.pairedItem = {
+								item: 0,
+							};
+						} else if (isSameNumberOfItems) {
+							// The number of oncoming and outcoming items is identical so we can
+							// make the reasonable assumption that each of the input items
+							// is the origin of the corresponding output items
+							item.pairedItem = {
+								item: index,
+							};
+						} else {
+							// In all other cases autofixing is not possible
+							break checkOutputData;
+						}
+					}
+				}
+			}
+		}
+
+		if (nodeSuccessData === undefined) {
+			// Node did not get executed
+			nodeSuccessData = null;
+		} else {
+			this.runExecutionData.resultData.lastNodeExecuted = executionData.node.name;
+		}
+
+		return nodeSuccessData;
+	}
+
+	private get isCancelled() {
+		return this.abortController.signal.aborted;
 	}
 }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index ebe240b51e..12aa968fcc 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,22 +1,18 @@
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
+import * as NodeExecuteFunctions from './node-execute-functions';
 
-export * from './errors';
-export * from './ActiveWorkflows';
-export * from './BinaryData/BinaryData.service';
-export * from './BinaryData/types';
-export { Cipher } from './Cipher';
-export * from './ClassLoader';
-export * from './Constants';
-export * from './Credentials';
-export * from './DirectoryLoader';
-export * from './Interfaces';
-export { InstanceSettings, InstanceType } from './InstanceSettings';
-export * from './NodeExecuteFunctions';
-export * from './WorkflowExecute';
-export { NodeExecuteFunctions };
+export * from './binary-data';
+export * from './constants';
+export * from './credentials';
 export * from './data-deduplication-service';
+export * from './decorators';
+export * from './encryption';
 export * from './errors';
-export { ObjectStoreService } from './ObjectStore/ObjectStore.service.ee';
-export { BinaryData } from './BinaryData/types';
-export { isStoredMode as isValidNonDefaultMode } from './BinaryData/utils';
-export * from './ExecutionMetadata';
+export * from './execution-engine';
+export * from './instance-settings';
+export * from './logging';
+export * from './nodes-loader';
+export * from './utils';
+
+export * from './interfaces';
+export * from './node-execute-functions';
+export { NodeExecuteFunctions };
diff --git a/packages/core/src/instance-settings/__tests__/instance-settings.test.ts b/packages/core/src/instance-settings/__tests__/instance-settings.test.ts
new file mode 100644
index 0000000000..b57ed99f09
--- /dev/null
+++ b/packages/core/src/instance-settings/__tests__/instance-settings.test.ts
@@ -0,0 +1,281 @@
+import { mock } from 'jest-mock-extended';
+jest.mock('node:fs', () => mock<typeof fs>());
+import * as fs from 'node:fs';
+
+import { InstanceSettings } from '@/instance-settings';
+import { InstanceSettingsConfig } from '@/instance-settings/instance-settings-config';
+import { Logger } from '@/logging/logger';
+import { mockInstance } from '@test/utils';
+
+describe('InstanceSettings', () => {
+	const userFolder = '/test';
+	process.env.N8N_USER_FOLDER = userFolder;
+	const settingsFile = `${userFolder}/.n8n/config`;
+
+	const mockFs = mock(fs);
+	const logger = mockInstance(Logger);
+
+	const createInstanceSettings = (opts?: Partial<InstanceSettingsConfig>) =>
+		new InstanceSettings(
+			{
+				...new InstanceSettingsConfig(),
+				...opts,
+			},
+			logger,
+		);
+
+	beforeEach(() => {
+		jest.resetAllMocks();
+		mockFs.statSync.mockReturnValue({ mode: 0o600 } as fs.Stats);
+	});
+
+	describe('If the settings file exists', () => {
+		beforeEach(() => {
+			mockFs.existsSync.mockReturnValue(true);
+		});
+
+		it('should load settings from the file', () => {
+			mockFs.readFileSync.mockReturnValue(JSON.stringify({ encryptionKey: 'test_key' }));
+			const settings = createInstanceSettings();
+			expect(settings.encryptionKey).toEqual('test_key');
+			expect(settings.instanceId).toEqual(
+				'6ce26c63596f0cc4323563c529acfca0cccb0e57f6533d79a60a42c9ff862ae7',
+			);
+		});
+
+		it('should throw error if settings file is not valid JSON', () => {
+			mockFs.readFileSync.mockReturnValue('{"encryptionKey":"test_key"');
+			expect(() => createInstanceSettings()).toThrowError();
+		});
+
+		it('should throw if the env and file keys do not match', () => {
+			mockFs.readFileSync.mockReturnValue(JSON.stringify({ encryptionKey: 'key_1' }));
+			process.env.N8N_ENCRYPTION_KEY = 'key_2';
+			expect(() => createInstanceSettings()).toThrowError();
+		});
+
+		it('should check if the settings file has the correct permissions', () => {
+			process.env.N8N_ENCRYPTION_KEY = 'test_key';
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
+			mockFs.statSync.mockReturnValueOnce({ mode: 0o600 } as fs.Stats);
+			const settings = createInstanceSettings();
+			expect(settings.encryptionKey).toEqual('test_key');
+			expect(settings.instanceId).toEqual(
+				'6ce26c63596f0cc4323563c529acfca0cccb0e57f6533d79a60a42c9ff862ae7',
+			);
+			expect(mockFs.statSync).toHaveBeenCalledWith('/test/.n8n/config');
+		});
+
+		it('should check the permissions but not fix them if settings file has incorrect permissions by default', () => {
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
+			mockFs.statSync.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
+			createInstanceSettings();
+			expect(mockFs.statSync).toHaveBeenCalledWith('/test/.n8n/config');
+			expect(mockFs.chmodSync).not.toHaveBeenCalled();
+		});
+
+		it("should not check the permissions if 'N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS' is false", () => {
+			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
+			createInstanceSettings();
+			expect(mockFs.statSync).not.toHaveBeenCalled();
+			expect(mockFs.chmodSync).not.toHaveBeenCalled();
+		});
+
+		it("should fix the permissions of the settings file if 'N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS' is true", () => {
+			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'true';
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
+			mockFs.statSync.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
+			createInstanceSettings({
+				enforceSettingsFilePermissions: true,
+			});
+			expect(mockFs.statSync).toHaveBeenCalledWith('/test/.n8n/config');
+			expect(mockFs.chmodSync).toHaveBeenCalledWith('/test/.n8n/config', 0o600);
+		});
+	});
+
+	describe('If the settings file does not exist', () => {
+		beforeEach(() => {
+			mockFs.existsSync.mockReturnValue(false);
+			mockFs.mkdirSync.mockReturnValue('');
+			mockFs.writeFileSync.mockReturnValue();
+		});
+
+		it('should create a new settings file without explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is not set', () => {
+			process.env.N8N_ENCRYPTION_KEY = 'key_2';
+			const settings = createInstanceSettings();
+			expect(settings.encryptionKey).not.toEqual('test_key');
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+				'/test/.n8n/config',
+				expect.stringContaining('"encryptionKey":'),
+				{
+					encoding: 'utf-8',
+					mode: undefined,
+				},
+			);
+		});
+
+		it('should create a new settings file without explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false', () => {
+			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
+			process.env.N8N_ENCRYPTION_KEY = 'key_2';
+			const settings = createInstanceSettings();
+			expect(settings.encryptionKey).not.toEqual('test_key');
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+				'/test/.n8n/config',
+				expect.stringContaining('"encryptionKey":'),
+				{
+					encoding: 'utf-8',
+					mode: undefined,
+				},
+			);
+		});
+
+		it('should create a new settings file with explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true', () => {
+			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'true';
+			process.env.N8N_ENCRYPTION_KEY = 'key_2';
+			const settings = createInstanceSettings({
+				enforceSettingsFilePermissions: true,
+			});
+			expect(settings.encryptionKey).not.toEqual('test_key');
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+				'/test/.n8n/config',
+				expect.stringContaining('"encryptionKey":'),
+				{
+					encoding: 'utf-8',
+					mode: 0o600,
+				},
+			);
+		});
+
+		it('should pick up the encryption key from env var N8N_ENCRYPTION_KEY', () => {
+			process.env.N8N_ENCRYPTION_KEY = 'env_key';
+			const settings = createInstanceSettings();
+			expect(settings.encryptionKey).toEqual('env_key');
+			expect(settings.instanceId).toEqual(
+				'2c70e12b7a0646f92279f427c7b38e7334d8e5389cff167a1dc30e73f826b683',
+			);
+			expect(settings.encryptionKey).not.toEqual('test_key');
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+				'/test/.n8n/config',
+				expect.stringContaining('"encryptionKey":'),
+				{
+					encoding: 'utf-8',
+					mode: undefined,
+				},
+			);
+		});
+
+		it("should not set the permissions of the settings file if 'N8N_IGNORE_SETTINGS_FILE_PERMISSIONS' is true", () => {
+			process.env.N8N_ENCRYPTION_KEY = 'key_2';
+			process.env.N8N_IGNORE_SETTINGS_FILE_PERMISSIONS = 'true';
+			const settings = createInstanceSettings();
+			expect(settings.encryptionKey).not.toEqual('test_key');
+			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
+			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
+				'/test/.n8n/config',
+				expect.stringContaining('"encryptionKey":'),
+				{
+					encoding: 'utf-8',
+					mode: undefined,
+				},
+			);
+		});
+	});
+
+	describe('constructor', () => {
+		it('should generate a `hostId`', () => {
+			const encryptionKey = 'test_key';
+			process.env.N8N_ENCRYPTION_KEY = encryptionKey;
+			mockFs.existsSync.mockReturnValueOnce(true);
+			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey }));
+
+			const settings = createInstanceSettings();
+
+			const [instanceType, nanoid] = settings.hostId.split('-');
+			expect(instanceType).toEqual('main');
+			expect(nanoid).toHaveLength(16); // e.g. sDX6ZPc0bozv66zM
+		});
+	});
+
+	describe('isDocker', () => {
+		let settings: InstanceSettings;
+
+		beforeEach(() => {
+			mockFs.existsSync.calledWith(settingsFile).mockReturnValue(true);
+			mockFs.readFileSync
+				.calledWith(settingsFile)
+				.mockReturnValue(JSON.stringify({ encryptionKey: 'test_key' }));
+			settings = createInstanceSettings();
+		});
+
+		it('should return true if /.dockerenv exists', () => {
+			mockFs.existsSync.mockImplementation((path) => path === '/.dockerenv');
+			expect(settings.isDocker).toBe(true);
+			expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
+			expect(mockFs.readFileSync).not.toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+		});
+
+		it('should return true if /run/.containerenv exists', () => {
+			mockFs.existsSync.mockImplementation((path) => path === '/run/.containerenv');
+			expect(settings.isDocker).toBe(true);
+			expect(mockFs.existsSync).toHaveBeenCalledWith('/run/.containerenv');
+			expect(mockFs.readFileSync).not.toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+		});
+
+		test.each(['docker', 'kubepods', 'containerd'])(
+			'should return true if /proc/self/cgroup contains %s',
+			(str) => {
+				mockFs.existsSync.mockReturnValueOnce(false);
+				mockFs.readFileSync.calledWith('/proc/self/cgroup', 'utf8').mockReturnValueOnce(str);
+
+				expect(settings.isDocker).toBe(true);
+				expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
+				expect(mockFs.readFileSync).toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+			},
+		);
+
+		test.each(['docker', 'kubelet', 'containerd'])(
+			'should return true if /proc/self/mountinfo contains %s',
+			(str) => {
+				mockFs.existsSync.mockReturnValueOnce(false);
+				mockFs.readFileSync.calledWith('/proc/self/cgroup', 'utf8').mockReturnValueOnce('');
+				mockFs.readFileSync.calledWith('/proc/self/mountinfo', 'utf8').mockReturnValueOnce(str);
+
+				expect(settings.isDocker).toBe(true);
+				expect(mockFs.existsSync).toHaveBeenCalledWith('/.dockerenv');
+				expect(mockFs.readFileSync).toHaveBeenCalledWith('/proc/self/cgroup', 'utf8');
+				expect(mockFs.readFileSync).toHaveBeenCalledWith('/proc/self/mountinfo', 'utf8');
+			},
+		);
+
+		it('should return false if no docker indicators are found', () => {
+			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(false);
+			mockFs.readFileSync.calledWith('/proc/self/cgroup', 'utf8').mockReturnValueOnce('');
+			mockFs.readFileSync.calledWith('/proc/self/mountinfo', 'utf8').mockReturnValueOnce('');
+			expect(settings.isDocker).toBe(false);
+		});
+
+		it('should return false if reading any of these files throws an error', () => {
+			mockFs.existsSync.mockReturnValue(false);
+			mockFs.readFileSync.mockImplementation(() => {
+				throw new Error('File not found');
+			});
+
+			expect(settings.isDocker).toBe(false);
+		});
+
+		it('should cache the result of isDocker check', () => {
+			mockFs.existsSync.calledWith('/.dockerenv').mockReturnValueOnce(true);
+
+			expect(settings.isDocker).toBe(true);
+
+			mockFs.existsSync.mockClear();
+			expect(settings.isDocker).toBe(true);
+			expect(mockFs.existsSync).not.toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/core/src/instance-settings/index.ts b/packages/core/src/instance-settings/index.ts
new file mode 100644
index 0000000000..74b05f5d98
--- /dev/null
+++ b/packages/core/src/instance-settings/index.ts
@@ -0,0 +1 @@
+export { InstanceSettings, InstanceType } from './instance-settings';
diff --git a/packages/core/src/instance-settings/instance-settings-config.ts b/packages/core/src/instance-settings/instance-settings-config.ts
new file mode 100644
index 0000000000..dd28472a05
--- /dev/null
+++ b/packages/core/src/instance-settings/instance-settings-config.ts
@@ -0,0 +1,28 @@
+import { Config, Env } from '@n8n/config';
+import path from 'node:path';
+
+@Config
+export class InstanceSettingsConfig {
+	/**
+	 * Whether to enforce that n8n settings file doesn't have overly wide permissions.
+	 * If set to true, n8n will check the permissions of the settings file and
+	 * attempt change them to 0600 (only owner has rw access) if they are too wide.
+	 */
+	@Env('N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS')
+	enforceSettingsFilePermissions: boolean = false;
+
+	/**
+	 * The home folder path of the user.
+	 * If none can be found it falls back to the current working directory
+	 */
+	readonly userHome: string;
+
+	readonly n8nFolder: string;
+
+	constructor() {
+		const homeVarName = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
+		this.userHome = process.env.N8N_USER_FOLDER ?? process.env[homeVarName] ?? process.cwd();
+
+		this.n8nFolder = path.join(this.userHome, '.n8n');
+	}
+}
diff --git a/packages/core/src/InstanceSettings.ts b/packages/core/src/instance-settings/instance-settings.ts
similarity index 78%
rename from packages/core/src/InstanceSettings.ts
rename to packages/core/src/instance-settings/instance-settings.ts
index 7d38f21184..5f8a68596b 100644
--- a/packages/core/src/InstanceSettings.ts
+++ b/packages/core/src/instance-settings/instance-settings.ts
@@ -1,11 +1,14 @@
+import { Service } from '@n8n/di';
 import { createHash, randomBytes } from 'crypto';
-import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'fs';
 import { ApplicationError, jsonParse, ALPHABET, toResult } from 'n8n-workflow';
 import { customAlphabet } from 'nanoid';
+import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import path from 'path';
-import { Service } from 'typedi';
 
-import { InstanceSettingsConfig } from './InstanceSettingsConfig';
+import { Memoized } from '@/decorators';
+import { Logger } from '@/logging/logger';
+
+import { InstanceSettingsConfig } from './instance-settings-config';
 
 const nanoid = customAlphabet(ALPHABET, 16);
 
@@ -27,13 +30,11 @@ const inTest = process.env.NODE_ENV === 'test';
 
 @Service()
 export class InstanceSettings {
-	private readonly userHome = this.getUserHome();
-
 	/** The path to the n8n folder in which all n8n related data gets saved */
-	readonly n8nFolder = path.join(this.userHome, '.n8n');
+	readonly n8nFolder = this.config.n8nFolder;
 
 	/** The path to the folder where all generated static assets are copied to */
-	readonly staticCacheDir = path.join(this.userHome, '.cache/n8n/public');
+	readonly staticCacheDir = path.join(this.config.userHome, '.cache/n8n/public');
 
 	/** The path to the folder containing custom nodes and credentials */
 	readonly customExtensionDir = path.join(this.n8nFolder, 'custom');
@@ -57,7 +58,10 @@ export class InstanceSettings {
 
 	readonly instanceType: InstanceType;
 
-	constructor(private readonly config: InstanceSettingsConfig) {
+	constructor(
+		private readonly config: InstanceSettingsConfig,
+		private readonly logger: Logger,
+	) {
 		const command = process.argv[2];
 		this.instanceType = ['webhook', 'worker'].includes(command)
 			? (command as InstanceType)
@@ -86,6 +90,33 @@ export class InstanceSettings {
 	 */
 	readonly hostId: string;
 
+	private isMultiMainEnabled = false;
+
+	private isMultiMainLicensed = false;
+
+	/** Set whether multi-main mode is enabled. Does not imply licensed status. */
+	setMultiMainEnabled(newState: boolean) {
+		this.isMultiMainEnabled = newState;
+	}
+
+	setMultiMainLicensed(newState: boolean) {
+		this.isMultiMainLicensed = newState;
+	}
+
+	/** Whether this `main` instance is running in multi-main mode. */
+	get isMultiMain() {
+		return this.instanceType === 'main' && this.isMultiMainEnabled && this.isMultiMainLicensed;
+	}
+
+	/** Whether this `main` instance is running in single-main mode. */
+	get isSingleMain() {
+		return !this.isMultiMain;
+	}
+
+	get isWorker() {
+		return this.instanceType === 'worker';
+	}
+
 	get isLeader() {
 		return this.instanceRole === 'leader';
 	}
@@ -110,17 +141,35 @@ export class InstanceSettings {
 		return this.settings.tunnelSubdomain;
 	}
 
-	update(newSettings: WritableSettings) {
-		this.save({ ...this.settings, ...newSettings });
+	/**
+	 * Whether this instance is running inside a Docker/Podman/Kubernetes container.
+	 */
+	@Memoized
+	get isDocker() {
+		if (existsSync('/.dockerenv') || existsSync('/run/.containerenv')) return true;
+		try {
+			const cgroupV1 = readFileSync('/proc/self/cgroup', 'utf8');
+			if (
+				cgroupV1.includes('docker') ||
+				cgroupV1.includes('kubepods') ||
+				cgroupV1.includes('containerd')
+			)
+				return true;
+		} catch {}
+		try {
+			const cgroupV2 = readFileSync('/proc/self/mountinfo', 'utf8');
+			if (
+				cgroupV2.includes('docker') ||
+				cgroupV2.includes('kubelet') ||
+				cgroupV2.includes('containerd')
+			)
+				return true;
+		} catch {}
+		return false;
 	}
 
-	/**
-	 * The home folder path of the user.
-	 * If none can be found it falls back to the current working directory
-	 */
-	private getUserHome() {
-		const homeVarName = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
-		return process.env.N8N_USER_FOLDER ?? process.env[homeVarName] ?? process.cwd();
+	update(newSettings: WritableSettings) {
+		this.save({ ...this.settings, ...newSettings });
 	}
 
 	/**
@@ -158,7 +207,9 @@ export class InstanceSettings {
 		this.save(settings);
 
 		if (!inTest && !process.env.N8N_ENCRYPTION_KEY) {
-			console.info(`No encryption key found - Auto-generated and saved to: ${this.settingsFile}`);
+			this.logger.info(
+				`No encryption key found - Auto-generated and saved to: ${this.settingsFile}`,
+			);
 		}
 		this.ensureSettingsFilePermissions();
 
@@ -220,11 +271,11 @@ export class InstanceSettings {
 
 		const permissionsResult = toResult(() => {
 			const stats = statSync(this.settingsFile);
-			return stats.mode & 0o777;
+			return stats?.mode & 0o777;
 		});
 		// If we can't determine the permissions, log a warning and skip the check
 		if (!permissionsResult.ok) {
-			console.warn(
+			this.logger.warn(
 				`Could not ensure settings file permissions: ${permissionsResult.error.message}. To skip this check, set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`,
 			);
 			return;
@@ -237,7 +288,7 @@ export class InstanceSettings {
 
 		// If the permissions are incorrect and the flag is not set, log a warning
 		if (!this.enforceSettingsFilePermissions.isSet) {
-			console.warn(
+			this.logger.warn(
 				`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. This is ignored for now, but in the future n8n will attempt to change the permissions automatically. To automatically enforce correct permissions now set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true (recommended), or turn this check off set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`,
 			);
 			// The default is false so we skip the enforcement for now
@@ -245,7 +296,7 @@ export class InstanceSettings {
 		}
 
 		if (this.enforceSettingsFilePermissions.enforce) {
-			console.warn(
+			this.logger.warn(
 				`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. Changing permissions to 0600..`,
 			);
 			const chmodResult = toResult(() => chmodSync(this.settingsFile, 0o600));
@@ -253,7 +304,7 @@ export class InstanceSettings {
 				// Some filesystems don't support permissions. In this case we log the
 				// error and ignore it. We might want to prevent the app startup in the
 				// future in this case.
-				console.warn(
+				this.logger.warn(
 					`Could not enforce settings file permissions: ${chmodResult.error.message}. To skip this check, set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`,
 				);
 			}
diff --git a/packages/core/src/Interfaces.ts b/packages/core/src/interfaces.ts
similarity index 73%
rename from packages/core/src/Interfaces.ts
rename to packages/core/src/interfaces.ts
index 2963e46185..a00176eee9 100644
--- a/packages/core/src/Interfaces.ts
+++ b/packages/core/src/interfaces.ts
@@ -20,19 +20,4 @@ export interface IWorkflowData {
 	triggerResponses?: ITriggerResponse[];
 }
 
-export namespace n8n {
-	export interface PackageJson {
-		name: string;
-		version: string;
-		n8n?: {
-			credentials?: string[];
-			nodes?: string[];
-		};
-		author?: {
-			name?: string;
-			email?: string;
-		};
-	}
-}
-
 export type ExtendedValidationResult = ValidationResult & { fieldName?: string };
diff --git a/packages/cli/src/logging/__tests__/logger.service.test.ts b/packages/core/src/logging/__tests__/logger.test.ts
similarity index 93%
rename from packages/cli/src/logging/__tests__/logger.service.test.ts
rename to packages/core/src/logging/__tests__/logger.test.ts
index 2ffbf2120e..1a9ee8e7ef 100644
--- a/packages/cli/src/logging/__tests__/logger.service.test.ts
+++ b/packages/core/src/logging/__tests__/logger.test.ts
@@ -5,10 +5,11 @@ jest.mock('n8n-workflow', () => ({
 
 import type { GlobalConfig } from '@n8n/config';
 import { mock } from 'jest-mock-extended';
-import type { InstanceSettings } from 'n8n-core';
 import { LoggerProxy } from 'n8n-workflow';
 
-import { Logger } from '@/logging/logger.service';
+import type { InstanceSettingsConfig } from '@/instance-settings/instance-settings-config';
+
+import { Logger } from '../logger';
 
 describe('Logger', () => {
 	beforeEach(() => {
@@ -25,13 +26,13 @@ describe('Logger', () => {
 		});
 
 		test('if root, should initialize `LoggerProxy` with instance', () => {
-			const logger = new Logger(globalConfig, mock<InstanceSettings>(), { isRoot: true });
+			const logger = new Logger(globalConfig, mock<InstanceSettingsConfig>(), { isRoot: true });
 
 			expect(LoggerProxy.init).toHaveBeenCalledWith(logger);
 		});
 
 		test('if scoped, should not initialize `LoggerProxy`', () => {
-			new Logger(globalConfig, mock<InstanceSettings>(), { isRoot: false });
+			new Logger(globalConfig, mock<InstanceSettingsConfig>(), { isRoot: false });
 
 			expect(LoggerProxy.init).not.toHaveBeenCalled();
 		});
@@ -47,7 +48,7 @@ describe('Logger', () => {
 				},
 			});
 
-			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+			const logger = new Logger(globalConfig, mock<InstanceSettingsConfig>());
 
 			const { transports } = logger.getInternalLogger();
 
@@ -72,7 +73,7 @@ describe('Logger', () => {
 				},
 			});
 
-			const logger = new Logger(globalConfig, mock<InstanceSettings>({ n8nFolder: '/tmp' }));
+			const logger = new Logger(globalConfig, mock<InstanceSettingsConfig>({ n8nFolder: '/tmp' }));
 
 			const { transports } = logger.getInternalLogger();
 
@@ -94,7 +95,7 @@ describe('Logger', () => {
 				},
 			});
 
-			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+			const logger = new Logger(globalConfig, mock<InstanceSettingsConfig>());
 
 			const internalLogger = logger.getInternalLogger();
 
@@ -113,7 +114,7 @@ describe('Logger', () => {
 				},
 			});
 
-			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+			const logger = new Logger(globalConfig, mock<InstanceSettingsConfig>());
 
 			const internalLogger = logger.getInternalLogger();
 
@@ -132,7 +133,7 @@ describe('Logger', () => {
 				},
 			});
 
-			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+			const logger = new Logger(globalConfig, mock<InstanceSettingsConfig>());
 
 			const internalLogger = logger.getInternalLogger();
 
@@ -151,7 +152,7 @@ describe('Logger', () => {
 				},
 			});
 
-			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+			const logger = new Logger(globalConfig, mock<InstanceSettingsConfig>());
 
 			const internalLogger = logger.getInternalLogger();
 
@@ -170,7 +171,7 @@ describe('Logger', () => {
 				},
 			});
 
-			const logger = new Logger(globalConfig, mock<InstanceSettings>());
+			const logger = new Logger(globalConfig, mock<InstanceSettingsConfig>());
 
 			const internalLogger = logger.getInternalLogger();
 
diff --git a/packages/core/src/logging/index.ts b/packages/core/src/logging/index.ts
new file mode 100644
index 0000000000..a1332e91c6
--- /dev/null
+++ b/packages/core/src/logging/index.ts
@@ -0,0 +1 @@
+export { Logger } from './logger';
diff --git a/packages/cli/src/logging/logger.service.ts b/packages/core/src/logging/logger.ts
similarity index 77%
rename from packages/cli/src/logging/logger.service.ts
rename to packages/core/src/logging/logger.ts
index 46471c0611..82a47649ff 100644
--- a/packages/cli/src/logging/logger.service.ts
+++ b/packages/core/src/logging/logger.ts
@@ -1,22 +1,27 @@
 import type { LogScope } from '@n8n/config';
 import { GlobalConfig } from '@n8n/config';
+import { Service } from '@n8n/di';
 import callsites from 'callsites';
 import type { TransformableInfo } from 'logform';
-import { InstanceSettings } from 'n8n-core';
 import { LoggerProxy, LOG_LEVELS } from 'n8n-workflow';
+import type {
+	Logger as LoggerType,
+	LogLocationMetadata,
+	LogLevel,
+	LogMetadata,
+} from 'n8n-workflow';
 import path, { basename } from 'node:path';
 import pc from 'picocolors';
-import { Service } from 'typedi';
 import winston from 'winston';
 
 import { inDevelopment, inProduction } from '@/constants';
-import { isObjectLiteral } from '@/utils';
+import { InstanceSettingsConfig } from '@/instance-settings/instance-settings-config';
+import { isObjectLiteral } from '@/utils/is-object-literal';
 
-import { noOp } from './constants';
-import type { LogLocationMetadata, LogLevel, LogMetadata } from './types';
+const noOp = () => {};
 
 @Service()
-export class Logger {
+export class Logger implements LoggerType {
 	private internalLogger: winston.Logger;
 
 	private readonly level: LogLevel;
@@ -27,9 +32,12 @@ export class Logger {
 		return this.scopes.size > 0;
 	}
 
+	/** https://no-color.org/ */
+	private readonly noColor = process.env.NO_COLOR !== undefined && process.env.NO_COLOR !== '';
+
 	constructor(
 		private readonly globalConfig: GlobalConfig,
-		private readonly instanceSettings: InstanceSettings,
+		private readonly instanceSettingsConfig: InstanceSettingsConfig,
 		{ isRoot }: { isRoot?: boolean } = { isRoot: true },
 	) {
 		this.level = this.globalConfig.logging.level;
@@ -50,6 +58,8 @@ export class Logger {
 			if (outputs.includes('file')) this.setFileTransport();
 
 			this.scopes = new Set(scopes);
+		} else {
+			this.scopes = new Set();
 		}
 
 		if (isRoot) LoggerProxy.init(this);
@@ -62,7 +72,9 @@ export class Logger {
 	/** Create a logger that injects the given scopes into its log metadata. */
 	scoped(scopes: LogScope | LogScope[]) {
 		scopes = Array.isArray(scopes) ? scopes : [scopes];
-		const scopedLogger = new Logger(this.globalConfig, this.instanceSettings, { isRoot: false });
+		const scopedLogger = new Logger(this.globalConfig, this.instanceSettingsConfig, {
+			isRoot: false,
+		});
 		const childLogger = this.internalLogger.child({ scopes });
 
 		scopedLogger.setInternalLogger(childLogger);
@@ -108,10 +120,10 @@ export class Logger {
 	}
 
 	private scopeFilter() {
-		return winston.format((info: TransformableInfo & { metadata: LogMetadata }) => {
+		return winston.format((info: TransformableInfo) => {
 			if (!this.isScopingEnabled) return info;
 
-			const { scopes } = info.metadata;
+			const { scopes } = (info as unknown as { metadata: LogMetadata }).metadata;
 
 			const shouldIncludeScope =
 				scopes && scopes?.length > 0 && scopes.some((s) => this.scopes.has(s));
@@ -120,18 +132,22 @@ export class Logger {
 		})();
 	}
 
+	private color() {
+		return this.noColor ? winston.format.uncolorize() : winston.format.colorize({ all: true });
+	}
+
 	private debugDevConsoleFormat() {
 		return winston.format.combine(
 			winston.format.metadata(),
 			winston.format.timestamp({ format: () => this.devTsFormat() }),
-			winston.format.colorize({ all: true }),
+			this.color(),
 			this.scopeFilter(),
-			winston.format.printf(({ level: _level, message, timestamp, metadata: _metadata }) => {
-				const SEPARATOR = ' '.repeat(3);
-				const LOG_LEVEL_COLUMN_WIDTH = 15; // 5 columns + ANSI color codes
-				const level = _level.toLowerCase().padEnd(LOG_LEVEL_COLUMN_WIDTH, ' ');
-				const metadata = this.toPrintable(_metadata);
-				return [timestamp, level, message + ' ' + pc.dim(metadata)].join(SEPARATOR);
+			winston.format.printf(({ level: rawLevel, message, timestamp, metadata: rawMetadata }) => {
+				const separator = ' '.repeat(3);
+				const logLevelColumnWidth = this.noColor ? 5 : 15; // when colorizing, account for ANSI color codes
+				const level = rawLevel.toLowerCase().padEnd(logLevelColumnWidth, ' ');
+				const metadata = this.toPrintable(rawMetadata);
+				return [timestamp, level, message + ' ' + pc.dim(metadata)].join(separator);
 			}),
 		);
 	}
@@ -140,10 +156,11 @@ export class Logger {
 		return winston.format.combine(
 			winston.format.metadata(),
 			winston.format.timestamp(),
+			this.color(),
 			this.scopeFilter(),
-			winston.format.printf(({ level, message, timestamp, metadata }) => {
-				const _metadata = this.toPrintable(metadata);
-				return `${timestamp} | ${level.padEnd(5)} | ${message}${_metadata ? ' ' + _metadata : ''}`;
+			winston.format.printf(({ level, message, timestamp, metadata: rawMetadata }) => {
+				const metadata = this.toPrintable(rawMetadata);
+				return `${timestamp} | ${level.padEnd(5)} | ${message}${metadata ? ' ' + metadata : ''}`;
 			}),
 		);
 	}
@@ -180,7 +197,7 @@ export class Logger {
 		);
 
 		const filename = path.join(
-			this.instanceSettings.n8nFolder,
+			this.instanceSettingsConfig.n8nFolder,
 			this.globalConfig.logging.file.location,
 		);
 
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/node-execute-functions.ts
similarity index 52%
rename from packages/core/src/NodeExecuteFunctions.ts
rename to packages/core/src/node-execute-functions.ts
index 10c44efced..fc94dc3434 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/node-execute-functions.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 */
@@ -14,94 +13,59 @@ import type {
 	OAuth2CredentialData,
 } from '@n8n/client-oauth2';
 import { ClientOAuth2 } from '@n8n/client-oauth2';
-import type {
-	AxiosError,
-	AxiosHeaders,
-	AxiosPromise,
-	AxiosRequestConfig,
-	AxiosResponse,
-} from 'axios';
+import { Container } from '@n8n/di';
+import type { AxiosError, AxiosHeaders, AxiosRequestConfig, AxiosResponse } from 'axios';
 import axios from 'axios';
+import chardet from 'chardet';
 import crypto, { createHmac } from 'crypto';
-import type { Request, Response } from 'express';
 import FileType from 'file-type';
 import FormData from 'form-data';
 import { createReadStream } from 'fs';
 import { access as fsAccess, writeFile as fsWriteFile } from 'fs/promises';
-import { IncomingMessage, type IncomingHttpHeaders } from 'http';
+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,
-	FieldType,
 	FileSystemHelperFunctions,
-	FunctionsBase,
 	GenericValue,
 	IAdditionalCredentialOptions,
 	IAllExecuteFunctions,
 	IBinaryData,
-	IContextObject,
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
-	ICredentialsExpressionResolveValues,
 	IDataObject,
 	IExecuteData,
 	IExecuteFunctions,
-	IExecuteResponsePromiseData,
-	IExecuteSingleFunctions,
-	IExecuteWorkflowInfo,
-	IGetNodeParameterOptions,
-	IHookFunctions,
 	IHttpRequestOptions,
-	ILoadOptionsFunctions,
 	IN8nHttpFullResponse,
 	IN8nHttpResponse,
 	INode,
-	INodeCredentialDescription,
-	INodeCredentialsDetails,
 	INodeExecutionData,
-	INodeInputConfiguration,
-	INodeOutputConfiguration,
-	INodeProperties,
-	INodePropertyCollection,
-	INodePropertyOptions,
-	INodeType,
 	IOAuth2Options,
 	IPairedItemData,
 	IPollFunctions,
 	IRequestOptions,
 	IRunExecutionData,
-	ISourceData,
-	ITaskData,
 	ITaskDataConnections,
 	ITriggerFunctions,
-	IWebhookData,
 	IWebhookDescription,
-	IWebhookFunctions,
 	IWorkflowDataProxyAdditionalKeys,
-	IWorkflowDataProxyData,
 	IWorkflowExecuteAdditionalData,
 	NodeExecutionWithMetadata,
 	NodeHelperFunctions,
 	NodeParameterValueType,
-	NodeTypeAndVersion,
 	PaginationOptions,
 	RequestHelperFunctions,
 	Workflow,
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
-	CallbackManager,
-	INodeParameters,
-	EnsureTypeOptions,
 	SSHTunnelFunctions,
-	SchedulingFunctions,
 	DeduplicationHelperFunctions,
 	IDeduplicationOutput,
 	IDeduplicationOutputItems,
@@ -109,24 +73,17 @@ import type {
 	DeduplicationScope,
 	DeduplicationItemTypes,
 	ICheckProcessedContextData,
-	AiEvent,
-	ISupplyDataFunctions,
+	WebhookType,
+	SchedulingFunctions,
 } from 'n8n-workflow';
 import {
-	NodeConnectionType,
-	ExpressionError,
-	LoggerProxy as Logger,
 	NodeApiError,
 	NodeHelpers,
 	NodeOperationError,
 	NodeSslError,
-	WorkflowDataProxy,
-	createDeferredPromise,
 	deepCopy,
 	fileTypeFromMimeType,
 	isObjectEmpty,
-	isResourceMapperValue,
-	validateFieldType,
 	ExecutionBaseError,
 	jsonParse,
 	ApplicationError,
@@ -137,39 +94,29 @@ import clientOAuth1 from 'oauth-1.0a';
 import path from 'path';
 import { stringify } from 'qs';
 import { Readable } from 'stream';
-import Container from 'typedi';
 import url, { URL, URLSearchParams } from 'url';
 
-import { createAgentStartJob } from './Agent';
-import { BinaryDataService } from './BinaryData/BinaryData.service';
-import type { BinaryData } from './BinaryData/types';
-import { binaryToBuffer } from './BinaryData/utils';
+import { Logger } from '@/logging/logger';
+
+import { BinaryDataService } from './binary-data/binary-data.service';
+import type { BinaryData } from './binary-data/types';
+import { binaryToBuffer } from './binary-data/utils';
 import {
 	BINARY_DATA_STORAGE_PATH,
 	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';
+} from './constants';
 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 { ScheduledTaskManager } from './ScheduledTaskManager';
-import { getSecretsProxy } from './Secrets';
-import { SSHClientsManager } from './SSHClientsManager';
+// eslint-disable-next-line import/no-cycle
+import { PollContext, TriggerContext } from './execution-engine/node-execution-context';
+import { ScheduledTaskManager } from './execution-engine/scheduled-task-manager';
+import { SSHClientsManager } from './execution-engine/ssh-clients-manager';
+import { InstanceSettings } from './instance-settings';
+import type { IResponseError } from './interfaces';
 
 axios.defaults.timeout = 300000;
 // Prevent axios from adding x-form-www-urlencoded headers by default
@@ -215,7 +162,7 @@ const createFormDataObject = (data: Record<string, unknown>) => {
 	return formData;
 };
 
-const validateUrl = (url?: string): boolean => {
+export const validateUrl = (url?: string): boolean => {
 	if (!url) return false;
 
 	try {
@@ -255,7 +202,7 @@ async function generateContentLengthHeader(config: AxiosRequestConfig) {
 			'content-length': length,
 		};
 	} catch (error) {
-		Logger.error('Unable to calculate form data length', { error });
+		Container.get(Logger).error('Unable to calculate form data length', { error });
 	}
 }
 
@@ -705,14 +652,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;
 	}
@@ -725,22 +676,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;
 	}
@@ -755,11 +691,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) {
@@ -776,13 +716,33 @@ export function parseIncomingMessage(message: IncomingMessage) {
 	}
 }
 
-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 invokeAxios(
+	axiosConfig: AxiosRequestConfig,
+	authOptions: IRequestOptions['auth'] = {},
+) {
+	try {
+		return await axios(axiosConfig);
+	} catch (error) {
+		if (authOptions.sendImmediately !== false || !(error instanceof axios.AxiosError)) throw error;
+		// for digest-auth
+		const { response } = error;
+		if (response?.status !== 401 || !response.headers['www-authenticate']?.includes('nonce')) {
+			throw error;
+		}
+		const { auth } = axiosConfig;
+		delete axiosConfig.auth;
+		axiosConfig = digestAuthAxiosConfig(axiosConfig, response, auth);
+		return await axios(axiosConfig);
+	}
 }
 
 export async function proxyRequestToAxios(
@@ -805,29 +765,8 @@ export async function proxyRequestToAxios(
 
 	axiosConfig = Object.assign(axiosConfig, await parseRequestObject(configObject));
 
-	let requestFn: () => AxiosPromise;
-	if (configObject.auth?.sendImmediately === false) {
-		// for digest-auth
-		requestFn = async () => {
-			try {
-				return await axios(axiosConfig);
-			} catch (error) {
-				const { response } = error;
-				if (response?.status !== 401 || !response.headers['www-authenticate']?.includes('nonce')) {
-					throw error;
-				}
-				const { auth } = axiosConfig;
-				delete axiosConfig.auth;
-				axiosConfig = digestAuthAxiosConfig(axiosConfig, response, auth);
-				return await axios(axiosConfig);
-			}
-		};
-	} else {
-		requestFn = async () => await axios(axiosConfig);
-	}
-
 	try {
-		const response = await requestFn();
+		const response = await invokeAxios(axiosConfig, configObject.auth);
 		let body = response.data;
 		if (body instanceof IncomingMessage && axiosConfig.responseType === 'stream') {
 			parseIncomingMessage(body);
@@ -854,7 +793,7 @@ export async function proxyRequestToAxios(
 			error.config = error.request = undefined;
 			error.options = pick(config ?? {}, ['url', 'method', 'data', 'headers']);
 			if (response) {
-				Logger.debug('Request proxied to Axios failed', { status: response.status });
+				Container.get(Logger).debug('Request proxied to Axios failed', { status: response.status });
 				let responseData = response.data;
 
 				if (Buffer.isBuffer(responseData) || responseData instanceof Readable) {
@@ -912,6 +851,10 @@ function convertN8nRequestToAxios(n8nRequest: IHttpRequestOptions): AxiosRequest
 
 	axiosRequest.params = n8nRequest.qs;
 
+	if (n8nRequest.abortSignal) {
+		axiosRequest.signal = n8nRequest.abortSignal;
+	}
+
 	if (n8nRequest.baseURL !== undefined) {
 		axiosRequest.baseURL = n8nRequest.baseURL;
 	}
@@ -1010,12 +953,12 @@ export const removeEmptyBody = (requestOptions: IHttpRequestOptions | IRequestOp
 	}
 };
 
-async function httpRequest(
+export async function httpRequest(
 	requestOptions: IHttpRequestOptions,
 ): Promise<IN8nHttpFullResponse | IN8nHttpResponse> {
 	removeEmptyBody(requestOptions);
 
-	let axiosRequest = convertN8nRequestToAxios(requestOptions);
+	const axiosRequest = convertN8nRequestToAxios(requestOptions);
 	if (
 		axiosRequest.data === undefined ||
 		(axiosRequest.method !== undefined && axiosRequest.method.toUpperCase() === 'GET')
@@ -1023,23 +966,7 @@ async function httpRequest(
 		delete axiosRequest.data;
 	}
 
-	let result: AxiosResponse<any>;
-	try {
-		result = await axios(axiosRequest);
-	} catch (error) {
-		if (requestOptions.auth?.sendImmediately === false) {
-			const { response } = error;
-			if (response?.status !== 401 || !response.headers['www-authenticate']?.includes('nonce')) {
-				throw error;
-			}
-
-			const { auth } = axiosRequest;
-			delete axiosRequest.auth;
-			axiosRequest = digestAuthAxiosConfig(axiosRequest, response, auth);
-			result = await axios(axiosRequest);
-		}
-		throw error;
-	}
+	const result = await invokeAxios(axiosRequest, requestOptions.auth);
 
 	if (requestOptions.returnFullResponse) {
 		return {
@@ -1119,6 +1046,10 @@ export async function getBinaryDataBuffer(
 	return await Container.get(BinaryDataService).getAsBuffer(binaryData);
 }
 
+export function detectBinaryEncoding(buffer: Buffer): string {
+	return chardet.detect(buffer) as string;
+}
+
 /**
  * Store an incoming IBinaryData & related buffer using the configured binary data manager.
  *
@@ -1205,7 +1136,7 @@ export async function copyBinaryFile(
  * base64 and adds metadata.
  */
 // eslint-disable-next-line complexity
-async function prepareBinaryData(
+export async function prepareBinaryData(
 	binaryData: Buffer | Readable,
 	executionId: string,
 	workflowId: string,
@@ -1348,6 +1279,7 @@ export async function clearAllProcessedItems(
 		options,
 	);
 }
+
 export async function getProcessedDataCount(
 	scope: DeduplicationScope,
 	contextData: ICheckProcessedContextData,
@@ -1359,7 +1291,8 @@ export async function getProcessedDataCount(
 		options,
 	);
 }
-function applyPaginationRequestData(
+
+export function applyPaginationRequestData(
 	requestData: IRequestOptions,
 	paginationRequestData: PaginationOptions['request'],
 ): IRequestOptions {
@@ -1474,7 +1407,7 @@ export async function requestOAuth2(
 	if (isN8nRequest) {
 		return await this.helpers.httpRequest(newRequestOptions).catch(async (error: AxiosError) => {
 			if (error.response?.status === 401) {
-				Logger.debug(
+				this.logger.debug(
 					`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`,
 				);
 				const tokenRefreshOptions: IDataObject = {};
@@ -1493,7 +1426,7 @@ export async function requestOAuth2(
 
 				let newToken;
 
-				Logger.debug(
+				this.logger.debug(
 					`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`,
 				);
 				// if it's OAuth2 with client credentials grant type, get a new token
@@ -1504,7 +1437,7 @@ export async function requestOAuth2(
 					newToken = await token.refresh(tokenRefreshOptions as unknown as ClientOAuth2Options);
 				}
 
-				Logger.debug(
+				this.logger.debug(
 					`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`,
 				);
 
@@ -1567,7 +1500,7 @@ export async function requestOAuth2(
 						Authorization: '',
 					};
 				}
-				Logger.debug(
+				this.logger.debug(
 					`OAuth2 token for "${credentialsType}" used by node "${node.name}" expired. Should revalidate.`,
 				);
 
@@ -1580,7 +1513,7 @@ export async function requestOAuth2(
 				} else {
 					newToken = await token.refresh(tokenRefreshOptions as unknown as ClientOAuth2Options);
 				}
-				Logger.debug(
+				this.logger.debug(
 					`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been renewed.`,
 				);
 
@@ -1602,7 +1535,7 @@ export async function requestOAuth2(
 					credentials as unknown as ICredentialDataDecryptedObject,
 				);
 
-				Logger.debug(
+				this.logger.debug(
 					`OAuth2 token for "${credentialsType}" used by node "${node.name}" has been saved to database successfully.`,
 				);
 
@@ -1710,6 +1643,11 @@ export async function httpRequestWithAuthentication(
 ) {
 	removeEmptyBody(requestOptions);
 
+	// Cancel this request on execution cancellation
+	if ('getExecutionCancelSignal' in this) {
+		requestOptions.abortSignal = this.getExecutionCancelSignal();
+	}
+
 	let credentialsDecrypted: ICredentialDataDecryptedObject | undefined;
 	try {
 		const parentTypes = additionalData.credentialsHelper.getParentTypes(credentialsType);
@@ -2002,633 +1940,11 @@ 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: string,
+	name: WebhookType,
 	workflow: Workflow,
 	node: INode,
 	additionalData: IWorkflowExecuteAdditionalData,
@@ -2670,10 +1986,9 @@ export function getNodeWebhookUrl(
 
 /**
  * Returns the full webhook description of the webhook with the given name
- *
  */
 export function getWebhookDescription(
-	name: string,
+	name: WebhookType,
 	workflow: Workflow,
 	node: INode,
 ): IWebhookDescription | undefined {
@@ -2693,331 +2008,7 @@ export function getWebhookDescription(
 	return undefined;
 }
 
-// TODO: Change options to an object
-const addExecutionDataFunctions = async (
-	type: 'input' | 'output',
-	nodeName: string,
-	data: INodeExecutionData[][] | ExecutionBaseError,
-	runExecutionData: IRunExecutionData,
-	connectionType: NodeConnectionType,
-	additionalData: IWorkflowExecuteAdditionalData,
-	sourceNodeName: string,
-	sourceNodeRunIndex: number,
-	currentNodeRunIndex: number,
-): Promise<void> => {
-	if (connectionType === NodeConnectionType.Main) {
-		throw new ApplicationError('Setting type is not supported for main connection', {
-			extra: { type },
-		});
-	}
-
-	let taskData: ITaskData | undefined;
-	if (type === 'input') {
-		taskData = {
-			startTime: new Date().getTime(),
-			executionTime: 0,
-			executionStatus: 'running',
-			source: [null],
-		};
-	} else {
-		// At the moment we expect that there is always an input sent before the output
-		taskData = get(
-			runExecutionData,
-			['resultData', 'runData', nodeName, currentNodeRunIndex],
-			undefined,
-		);
-		if (taskData === undefined) {
-			return;
-		}
-	}
-	taskData = taskData!;
-
-	if (data instanceof Error) {
-		taskData.executionStatus = 'error';
-		taskData.error = data;
-	} else {
-		if (type === 'output') {
-			taskData.executionStatus = 'success';
-		}
-		taskData.data = {
-			[connectionType]: data,
-		} as ITaskDataConnections;
-	}
-
-	if (type === 'input') {
-		if (!(data instanceof Error)) {
-			taskData.inputOverride = {
-				[connectionType]: data,
-			} as ITaskDataConnections;
-		}
-
-		if (!runExecutionData.resultData.runData.hasOwnProperty(nodeName)) {
-			runExecutionData.resultData.runData[nodeName] = [];
-		}
-
-		runExecutionData.resultData.runData[nodeName][currentNodeRunIndex] = taskData;
-		if (additionalData.sendDataToUI) {
-			additionalData.sendDataToUI('nodeExecuteBefore', {
-				executionId: additionalData.executionId,
-				nodeName,
-			});
-		}
-	} else {
-		// Outputs
-		taskData.executionTime = new Date().getTime() - taskData.startTime;
-
-		if (additionalData.sendDataToUI) {
-			additionalData.sendDataToUI('nodeExecuteAfter', {
-				executionId: additionalData.executionId,
-				nodeName,
-				data: taskData,
-			});
-		}
-
-		if (get(runExecutionData, 'executionData.metadata', undefined) === undefined) {
-			runExecutionData.executionData!.metadata = {};
-		}
-
-		let sourceTaskData = get(runExecutionData, ['executionData', 'metadata', sourceNodeName]);
-
-		if (!sourceTaskData) {
-			runExecutionData.executionData!.metadata[sourceNodeName] = [];
-			sourceTaskData = runExecutionData.executionData!.metadata[sourceNodeName];
-		}
-
-		if (!sourceTaskData[sourceNodeRunIndex]) {
-			sourceTaskData[sourceNodeRunIndex] = {
-				subRun: [],
-			};
-		}
-
-		sourceTaskData[sourceNodeRunIndex]!.subRun!.push({
-			node: nodeName,
-			runIndex: currentNodeRunIndex,
-		});
-	}
-};
-
-async function getInputConnectionData(
-	this: IAllExecuteFunctions,
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	connectionInputData: INodeExecutionData[],
-	inputData: ITaskDataConnections,
-	additionalData: IWorkflowExecuteAdditionalData,
-	executeData: IExecuteData,
-	mode: WorkflowExecuteMode,
-	closeFunctions: CloseFunction[],
-	inputName: NodeConnectionType,
-	itemIndex: number,
-	abortSignal?: AbortSignal,
-): Promise<unknown> {
-	const node = this.getNode();
-	const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-	const inputs = NodeHelpers.getNodeInputs(workflow, node, nodeType.description);
-
-	let inputConfiguration = inputs.find((input) => {
-		if (typeof input === 'string') {
-			return input === inputName;
-		}
-		return input.type === inputName;
-	});
-
-	if (inputConfiguration === undefined) {
-		throw new ApplicationError('Node does not have input of type', {
-			extra: { nodeName: node.name, inputName },
-		});
-	}
-
-	if (typeof inputConfiguration === 'string') {
-		inputConfiguration = {
-			type: inputConfiguration,
-		} as INodeInputConfiguration;
-	}
-
-	const parentNodes = workflow.getParentNodes(node.name, inputName, 1);
-	if (parentNodes.length === 0) {
-		if (inputConfiguration.required) {
-			throw new NodeOperationError(
-				node,
-				`A ${inputConfiguration?.displayName ?? inputName} sub-node must be connected`,
-			);
-		}
-		return inputConfiguration.maxConnections === 1 ? undefined : [];
-	}
-
-	const constParentNodes = parentNodes
-		.map((nodeName) => {
-			return workflow.getNode(nodeName) as INode;
-		})
-		.filter((connectedNode) => connectedNode.disabled !== true)
-		.map(async (connectedNode) => {
-			const nodeType = workflow.nodeTypes.getByNameAndVersion(
-				connectedNode.type,
-				connectedNode.typeVersion,
-			);
-
-			// eslint-disable-next-line @typescript-eslint/no-use-before-define
-			const context = getSupplyDataFunctions(
-				workflow,
-				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) {
-						return createNodeAsTool(this, nodeType, this.getNode().parameters);
-					};
-				} else {
-					throw new ApplicationError('Node does not have a `supplyData` method defined', {
-						extra: { nodeName: connectedNode.name },
-					});
-				}
-			}
-
-			try {
-				const response = await nodeType.supplyData.call(context, itemIndex);
-				if (response.closeFunction) {
-					closeFunctions.push(response.closeFunction);
-				}
-				return response;
-			} catch (error) {
-				// Propagate errors from sub-nodes
-				if (error.functionality === 'configuration-node') throw error;
-				if (!(error instanceof ExecutionBaseError)) {
-					error = new NodeOperationError(connectedNode, error, {
-						itemIndex,
-					});
-				}
-
-				let currentNodeRunIndex = 0;
-				if (runExecutionData.resultData.runData.hasOwnProperty(node.name)) {
-					currentNodeRunIndex = runExecutionData.resultData.runData[node.name].length;
-				}
-
-				// Display the error on the node which is causing it
-				await addExecutionDataFunctions(
-					'input',
-					connectedNode.name,
-					error,
-					runExecutionData,
-					inputName,
-					additionalData,
-					node.name,
-					runIndex,
-					currentNodeRunIndex,
-				);
-
-				// Display on the calling node which node has the error
-				throw new NodeOperationError(connectedNode, `Error in sub-node ${connectedNode.name}`, {
-					itemIndex,
-					functionality: 'configuration-node',
-					description: error.message,
-				});
-			}
-		});
-
-	// Validate the inputs
-	const nodes = await Promise.all(constParentNodes);
-
-	if (inputConfiguration.required && nodes.length === 0) {
-		throw new NodeOperationError(
-			node,
-			`A ${inputConfiguration?.displayName ?? inputName} sub-node must be connected`,
-		);
-	}
-	if (
-		inputConfiguration.maxConnections !== undefined &&
-		nodes.length > inputConfiguration.maxConnections
-	) {
-		throw new NodeOperationError(
-			node,
-			`Only ${inputConfiguration.maxConnections} ${inputName} sub-nodes are/is allowed to be connected`,
-		);
-	}
-
-	return inputConfiguration.maxConnections === 1
-		? (nodes || [])[0]?.response
-		: 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);
-	},
-});
-
-const getRequestHelperFunctions = (
+export const getRequestHelperFunctions = (
 	workflow: Workflow,
 	node: INode,
 	additionalData: IWorkflowExecuteAdditionalData,
@@ -3079,7 +2070,7 @@ const getRequestHelperFunctions = (
 
 			const runIndex = 0;
 
-			const additionalKeys = {
+			const additionalKeys: IWorkflowDataProxyAdditionalKeys = {
 				$request: requestOptions,
 				$response: {} as IN8nHttpFullResponse,
 				$version: node.typeVersion,
@@ -3204,7 +2195,7 @@ const getRequestHelperFunctions = (
 				responseData.push(tempResponseData);
 
 				additionalKeys.$response = newResponse;
-				additionalKeys.$pageCount = additionalKeys.$pageCount + 1;
+				additionalKeys.$pageCount = (additionalKeys.$pageCount ?? 0) + 1;
 
 				const maxRequests = getResolvedValue(
 					paginationOptions.maxRequests,
@@ -3337,12 +2328,12 @@ const getRequestHelperFunctions = (
 	};
 };
 
-const getSSHTunnelFunctions = (): SSHTunnelFunctions => ({
+export const getSSHTunnelFunctions = (): SSHTunnelFunctions => ({
 	getSSHClient: async (credentials) =>
 		await Container.get(SSHClientsManager).getClient(credentials),
 });
 
-const getSchedulingFunctions = (workflow: Workflow): SchedulingFunctions => {
+export const getSchedulingFunctions = (workflow: Workflow): SchedulingFunctions => {
 	const scheduledTaskManager = Container.get(ScheduledTaskManager);
 	return {
 		registerCron: (cronExpression, onTick) =>
@@ -3416,7 +2407,7 @@ export function isFilePathBlocked(filePath: string): boolean {
 	return false;
 }
 
-const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions => ({
+export const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions => ({
 	async createReadStream(filePath) {
 		try {
 			await fsAccess(filePath);
@@ -3452,7 +2443,7 @@ const getFileSystemHelperFunctions = (node: INode): FileSystemHelperFunctions =>
 	},
 });
 
-const getNodeHelperFunctions = (
+export const getNodeHelperFunctions = (
 	{ executionId }: IWorkflowExecuteAdditionalData,
 	workflowId: string,
 ): NodeHelperFunctions => ({
@@ -3460,7 +2451,7 @@ const getNodeHelperFunctions = (
 		await copyBinaryFile(workflowId, executionId!, filePath, fileName, mimeType),
 });
 
-const getBinaryHelperFunctions = (
+export const getBinaryHelperFunctions = (
 	{ executionId }: IWorkflowExecuteAdditionalData,
 	workflowId: string,
 ): BinaryHelperFunctions => ({
@@ -3478,7 +2469,7 @@ const getBinaryHelperFunctions = (
 	},
 });
 
-const getCheckProcessedHelperFunctions = (
+export const getCheckProcessedHelperFunctions = (
 	workflow: Workflow,
 	node: INode,
 ): DeduplicationHelperFunctions => ({
@@ -3553,57 +2544,7 @@ export function getExecutePollFunctions(
 	mode: WorkflowExecuteMode,
 	activation: WorkflowActivateMode,
 ): IPollFunctions {
-	return ((workflow: Workflow, node: INode) => {
-		return {
-			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			__emit: (): void => {
-				throw new ApplicationError(
-					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emit function',
-				);
-			},
-			__emitError() {
-				throw new ApplicationError(
-					'Overwrite NodeExecuteFunctions.getExecutePollFunctions.__emitError function',
-				);
-			},
-			getMode: () => mode,
-			getActivationMode: () => activation,
-			getCredentials: async (type) =>
-				await getCredentials(workflow, node, type, additionalData, mode),
-			getNodeParameter: (
-				parameterName: string,
-				fallbackValue?: any,
-				options?: IGetNodeParameterOptions,
-			): NodeParameterValueType | object => {
-				const runExecutionData: IRunExecutionData | null = null;
-				const itemIndex = 0;
-				const runIndex = 0;
-				const connectionInputData: INodeExecutionData[] = [];
-
-				return getNodeParameter(
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					node,
-					parameterName,
-					itemIndex,
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					undefined,
-					fallbackValue,
-					options,
-				);
-			},
-			helpers: {
-				createDeferredPromise,
-				...getRequestHelperFunctions(workflow, node, additionalData),
-				...getBinaryHelperFunctions(additionalData, workflow.id),
-				...getSchedulingFunctions(workflow),
-				returnJsonArray,
-			},
-		};
-	})(workflow, node);
+	return new PollContext(workflow, node, additionalData, mode, activation);
 }
 
 /**
@@ -3617,819 +2558,12 @@ export function getExecuteTriggerFunctions(
 	mode: WorkflowExecuteMode,
 	activation: WorkflowActivateMode,
 ): ITriggerFunctions {
-	return ((workflow: Workflow, node: INode) => {
-		return {
-			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			emit: (): void => {
-				throw new ApplicationError(
-					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function',
-				);
-			},
-			emitError: (): void => {
-				throw new ApplicationError(
-					'Overwrite NodeExecuteFunctions.getExecuteTriggerFunctions.emit function',
-				);
-			},
-			getMode: () => mode,
-			getActivationMode: () => activation,
-			getCredentials: async (type) =>
-				await getCredentials(workflow, node, type, additionalData, mode),
-			getNodeParameter: (
-				parameterName: string,
-				fallbackValue?: any,
-				options?: IGetNodeParameterOptions,
-			): NodeParameterValueType | object => {
-				const runExecutionData: IRunExecutionData | null = null;
-				const itemIndex = 0;
-				const runIndex = 0;
-				const connectionInputData: INodeExecutionData[] = [];
-
-				return getNodeParameter(
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					node,
-					parameterName,
-					itemIndex,
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					undefined,
-					fallbackValue,
-					options,
-				);
-			},
-			helpers: {
-				createDeferredPromise,
-				...getSSHTunnelFunctions(),
-				...getRequestHelperFunctions(workflow, node, additionalData),
-				...getBinaryHelperFunctions(additionalData, workflow.id),
-				...getSchedulingFunctions(workflow),
-				returnJsonArray,
-			},
-		};
-	})(workflow, node);
-}
-
-/**
- * Returns the execute functions regular nodes have access to.
- */
-export function getExecuteFunctions(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	connectionInputData: INodeExecutionData[],
-	inputData: ITaskDataConnections,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	executeData: IExecuteData,
-	mode: WorkflowExecuteMode,
-	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,
-			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,
-			): Promise<any> {
-				return await additionalData
-					.executeWorkflow(workflowInfo, additionalData, {
-						parentWorkflowId: workflow.id?.toString(),
-						inputData,
-						parentWorkflowSettings: workflow.settings,
-						node,
-						parentCallbackManager,
-					})
-					.then(
-						async (result) =>
-							await Container.get(BinaryDataService).duplicateBinaryData(
-								workflow.id,
-								additionalData.executionId!,
-								result,
-							),
-					);
-			},
-			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,
-			): void {
-				addExecutionDataFunctions(
-					'output',
-					this.getNode().name,
-					data,
-					runExecutionData,
-					connectionType,
-					additionalData,
-					node.name,
-					runIndex,
-					currentNodeRunIndex,
-				).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,
-		) =>
-			await additionalData
-				.executeWorkflow(workflowInfo, additionalData, {
-					parentWorkflowId: workflow.id?.toString(),
-					inputData,
-					parentWorkflowSettings: workflow.settings,
-					node,
-					parentCallbackManager,
-				})
-				.then(
-					async (result) =>
-						await Container.get(BinaryDataService).duplicateBinaryData(
-							workflow.id,
-							additionalData.executionId!,
-							result,
-						),
-				),
-		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[][],
-		): void {
-			addExecutionDataFunctions(
-				'output',
-				this.getNode().name,
-				data,
-				runExecutionData,
-				connectionType,
-				additionalData,
-				node.name,
-				runIndex,
-				currentNodeRunIndex,
-			).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,
-		},
-	};
-}
-
-/**
- * Returns the execute functions regular nodes have access to when single-function is defined.
- */
-export function getExecuteSingleFunctions(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	connectionInputData: INodeExecutionData[],
-	inputData: ITaskDataConnections,
-	node: INode,
-	itemIndex: number,
-	additionalData: IWorkflowExecuteAdditionalData,
-	executeData: IExecuteData,
-	mode: WorkflowExecuteMode,
-	abortSignal?: AbortSignal,
-): IExecuteSingleFunctions {
-	return ((workflow, runExecutionData, connectionInputData, inputData, node, itemIndex) => {
-		return {
-			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			...executionCancellationFunctions(abortSignal),
-			continueOnFail: () => continueOnFail(node),
-			evaluateExpression: (expression: string, evaluateItemIndex: number | undefined) => {
-				evaluateItemIndex = evaluateItemIndex === undefined ? itemIndex : evaluateItemIndex;
-				return workflow.expression.resolveSimpleParameterValue(
-					`=${expression}`,
-					{},
-					runExecutionData,
-					runIndex,
-					evaluateItemIndex,
-					node.name,
-					connectionInputData,
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					executeData,
-				);
-			},
-			getContext(type: ContextType): IContextObject {
-				return NodeHelpers.getContext(runExecutionData, type, node);
-			},
-			getCredentials: async (type) =>
-				await getCredentials(
-					workflow,
-					node,
-					type,
-					additionalData,
-					mode,
-					executeData,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					itemIndex,
-				),
-			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 { json: {} };
-				}
-
-				// TODO: Check if nodeType has input with that index defined
-				if (inputData[inputName].length < inputIndex) {
-					throw new ApplicationError('Could not get input index', {
-						extra: { inputIndex, inputName },
-					});
-				}
-
-				const allItems = inputData[inputName][inputIndex];
-
-				if (allItems === null) {
-					throw new ApplicationError('Input index was not set', {
-						extra: { inputIndex, inputName },
-					});
-				}
-
-				if (allItems[itemIndex] === null) {
-					throw new ApplicationError('Value of input with given index was not set', {
-						extra: { inputIndex, inputName, itemIndex },
-					});
-				}
-
-				return allItems[itemIndex];
-			},
-			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] as ISourceData;
-			},
-			getItemIndex: () => itemIndex,
-			getMode: () => mode,
-			getExecuteData: () => executeData,
-			getNodeParameter: (
-				parameterName: string,
-				fallbackValue?: any,
-				options?: IGetNodeParameterOptions,
-			): NodeParameterValueType | object => {
-				return getNodeParameter(
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					node,
-					parameterName,
-					itemIndex,
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					executeData,
-					fallbackValue,
-					options,
-				);
-			},
-			getWorkflowDataProxy: (): IWorkflowDataProxyData => {
-				const dataProxy = new WorkflowDataProxy(
-					workflow,
-					runExecutionData,
-					runIndex,
-					itemIndex,
-					node.name,
-					connectionInputData,
-					{},
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					executeData,
-				);
-				return dataProxy.getDataProxy();
-			},
-			helpers: {
-				createDeferredPromise,
-				...getRequestHelperFunctions(
-					workflow,
-					node,
-					additionalData,
-					runExecutionData,
-					connectionInputData,
-				),
-				...getBinaryHelperFunctions(additionalData, workflow.id),
-
-				assertBinaryData: (propertyName, inputIndex = 0) =>
-					assertBinaryData(inputData, node, itemIndex, propertyName, inputIndex),
-				getBinaryDataBuffer: async (propertyName, inputIndex = 0) =>
-					await getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex),
-			},
-			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,
-				});
-			},
-		};
-	})(workflow, runExecutionData, connectionInputData, inputData, node, itemIndex);
+	return new TriggerContext(workflow, node, additionalData, mode, activation);
 }
 
 export function getCredentialTestFunctions(): ICredentialTestFunctions {
 	return {
+		logger: Container.get(Logger),
 		helpers: {
 			...getSSHTunnelFunctions(),
 			request: async (uriOrObject: string | object, options?: object) => {
@@ -4438,329 +2572,3 @@ export function getCredentialTestFunctions(): ICredentialTestFunctions {
 		},
 	};
 }
-
-/**
- * Returns the execute functions regular nodes have access to in load-options-function.
- */
-export function getLoadOptionsFunctions(
-	workflow: Workflow,
-	node: INode,
-	path: string,
-	additionalData: IWorkflowExecuteAdditionalData,
-): ILoadOptionsFunctions {
-	return ((workflow: Workflow, node: INode, path: string) => {
-		return {
-			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			getCredentials: async (type) =>
-				await getCredentials(workflow, node, type, additionalData, 'internal'),
-			getCurrentNodeParameter: (
-				parameterPath: string,
-				options?: IGetNodeParameterOptions,
-			): NodeParameterValueType | object | undefined => {
-				const nodeParameters = additionalData.currentNodeParameters;
-
-				if (parameterPath.charAt(0) === '&') {
-					parameterPath = `${path.split('.').slice(1, -1).join('.')}.${parameterPath.slice(1)}`;
-				}
-
-				let returnData = get(nodeParameters, parameterPath);
-
-				// This is outside the try/catch because it throws errors with proper messages
-				if (options?.extractValue) {
-					const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-					if (nodeType === undefined) {
-						throw new ApplicationError('Node type is not known so cannot return parameter value', {
-							tags: { nodeType: node.type },
-						});
-					}
-					returnData = extractValue(
-						returnData,
-						parameterPath,
-						node,
-						nodeType,
-					) as NodeParameterValueType;
-				}
-
-				return returnData;
-			},
-			getCurrentNodeParameters: () => additionalData.currentNodeParameters,
-			getNodeParameter: (
-				parameterName: string,
-				fallbackValue?: any,
-				options?: IGetNodeParameterOptions,
-			): NodeParameterValueType | object => {
-				const runExecutionData: IRunExecutionData | null = null;
-				const itemIndex = 0;
-				const runIndex = 0;
-				const mode = 'internal' as WorkflowExecuteMode;
-				const connectionInputData: INodeExecutionData[] = [];
-
-				return getNodeParameter(
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					node,
-					parameterName,
-					itemIndex,
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					undefined,
-					fallbackValue,
-					options,
-				);
-			},
-			helpers: {
-				...getSSHTunnelFunctions(),
-				...getRequestHelperFunctions(workflow, node, additionalData),
-			},
-		};
-	})(workflow, node, path);
-}
-
-/**
- * Returns the execute functions regular nodes have access to in hook-function.
- */
-export function getExecuteHookFunctions(
-	workflow: Workflow,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	mode: WorkflowExecuteMode,
-	activation: WorkflowActivateMode,
-	webhookData?: IWebhookData,
-): IHookFunctions {
-	return ((workflow: Workflow, node: INode) => {
-		return {
-			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			getCredentials: async (type) =>
-				await getCredentials(workflow, node, type, additionalData, mode),
-			getMode: () => mode,
-			getActivationMode: () => activation,
-			getNodeParameter: (
-				parameterName: string,
-				fallbackValue?: any,
-				options?: IGetNodeParameterOptions,
-			): NodeParameterValueType | object => {
-				const runExecutionData: IRunExecutionData | null = null;
-				const itemIndex = 0;
-				const runIndex = 0;
-				const connectionInputData: INodeExecutionData[] = [];
-
-				return getNodeParameter(
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					node,
-					parameterName,
-					itemIndex,
-					mode,
-					getAdditionalKeys(additionalData, mode, runExecutionData),
-					undefined,
-					fallbackValue,
-					options,
-				);
-			},
-			getNodeWebhookUrl: (name: string): string | undefined => {
-				return getNodeWebhookUrl(
-					name,
-					workflow,
-					node,
-					additionalData,
-					mode,
-					getAdditionalKeys(additionalData, mode, null),
-					webhookData?.isTest,
-				);
-			},
-			getWebhookName(): string {
-				if (webhookData === undefined) {
-					throw new ApplicationError('Only supported in webhook functions');
-				}
-				return webhookData.webhookDescription.name;
-			},
-			getWebhookDescription: (name) => getWebhookDescription(name, workflow, node),
-			helpers: getRequestHelperFunctions(workflow, node, additionalData),
-		};
-	})(workflow, node);
-}
-
-/**
- * Returns the execute functions regular nodes have access to when webhook-function is defined.
- */
-// TODO: check where it is used and make sure close functions are called
-export function getExecuteWebhookFunctions(
-	workflow: Workflow,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	mode: WorkflowExecuteMode,
-	webhookData: IWebhookData,
-	closeFunctions: CloseFunction[],
-	runExecutionData: IRunExecutionData | null,
-): IWebhookFunctions {
-	return ((workflow: Workflow, node: INode, runExecutionData: IRunExecutionData | null) => {
-		return {
-			...getCommonWorkflowFunctions(workflow, node, additionalData),
-			getBodyData(): IDataObject {
-				if (additionalData.httpRequest === undefined) {
-					throw new ApplicationError('Request is missing');
-				}
-				return additionalData.httpRequest.body;
-			},
-			getCredentials: async (type) =>
-				await getCredentials(workflow, node, type, additionalData, mode),
-			getHeaderData(): IncomingHttpHeaders {
-				if (additionalData.httpRequest === undefined) {
-					throw new ApplicationError('Request is missing');
-				}
-				return additionalData.httpRequest.headers;
-			},
-			async getInputConnectionData(
-				inputName: NodeConnectionType,
-				itemIndex: number,
-			): Promise<unknown> {
-				// To be able to use expressions like "$json.sessionId" set the
-				// body data the webhook received to what is normally used for
-				// incoming node data.
-				const connectionInputData: INodeExecutionData[] = [
-					{ json: additionalData.httpRequest?.body || {} },
-				];
-				const runExecutionData: IRunExecutionData = {
-					resultData: {
-						runData: {},
-					},
-				};
-				const executeData: IExecuteData = {
-					data: {
-						main: [connectionInputData],
-					},
-					node,
-					source: null,
-				};
-				const runIndex = 0;
-
-				return await getInputConnectionData.call(
-					this,
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					{} as ITaskDataConnections,
-					additionalData,
-					executeData,
-					mode,
-					closeFunctions,
-					inputName,
-					itemIndex,
-				);
-			},
-			getMode: () => mode,
-			evaluateExpression: (expression: string, evaluateItemIndex?: number) => {
-				const itemIndex = evaluateItemIndex === undefined ? 0 : evaluateItemIndex;
-				const runIndex = 0;
-
-				let connectionInputData: INodeExecutionData[] = [];
-				let executionData: IExecuteData | undefined;
-
-				if (runExecutionData?.executionData !== undefined) {
-					executionData = runExecutionData.executionData.nodeExecutionStack[0];
-
-					if (executionData !== undefined) {
-						connectionInputData = executionData.data.main[0]!;
-					}
-				}
-
-				const additionalKeys = getAdditionalKeys(additionalData, mode, runExecutionData);
-
-				return workflow.expression.resolveSimpleParameterValue(
-					`=${expression}`,
-					{},
-					runExecutionData,
-					runIndex,
-					itemIndex,
-					node.name,
-					connectionInputData,
-					mode,
-					additionalKeys,
-					executionData,
-				);
-			},
-			getNodeParameter: (
-				parameterName: string,
-				fallbackValue?: any,
-				options?: IGetNodeParameterOptions,
-			): NodeParameterValueType | object => {
-				const itemIndex = 0;
-				const runIndex = 0;
-
-				let connectionInputData: INodeExecutionData[] = [];
-				let executionData: IExecuteData | undefined;
-
-				if (runExecutionData?.executionData !== undefined) {
-					executionData = runExecutionData.executionData.nodeExecutionStack[0];
-
-					if (executionData !== undefined) {
-						connectionInputData = executionData.data.main[0]!;
-					}
-				}
-
-				const additionalKeys = getAdditionalKeys(additionalData, mode, runExecutionData);
-
-				return getNodeParameter(
-					workflow,
-					runExecutionData,
-					runIndex,
-					connectionInputData,
-					node,
-					parameterName,
-					itemIndex,
-					mode,
-					additionalKeys,
-					executionData,
-					fallbackValue,
-					options,
-				);
-			},
-			getParamsData(): object {
-				if (additionalData.httpRequest === undefined) {
-					throw new ApplicationError('Request is missing');
-				}
-				return additionalData.httpRequest.params;
-			},
-			getQueryData(): object {
-				if (additionalData.httpRequest === undefined) {
-					throw new ApplicationError('Request is missing');
-				}
-				return additionalData.httpRequest.query;
-			},
-			getRequestObject(): Request {
-				if (additionalData.httpRequest === undefined) {
-					throw new ApplicationError('Request is missing');
-				}
-				return additionalData.httpRequest;
-			},
-			getResponseObject(): Response {
-				if (additionalData.httpResponse === undefined) {
-					throw new ApplicationError('Response is missing');
-				}
-				return additionalData.httpResponse;
-			},
-			getNodeWebhookUrl: (name: string): string | undefined =>
-				getNodeWebhookUrl(
-					name,
-					workflow,
-					node,
-					additionalData,
-					mode,
-					getAdditionalKeys(additionalData, mode, null),
-				),
-			getWebhookName: () => webhookData.webhookDescription.name,
-			helpers: {
-				createDeferredPromise,
-				...getRequestHelperFunctions(workflow, node, additionalData),
-				...getBinaryHelperFunctions(additionalData, workflow.id),
-				returnJsonArray,
-			},
-			nodeHelpers: getNodeHelperFunctions(additionalData, workflow.id),
-		};
-	})(workflow, node, runExecutionData);
-}
diff --git a/packages/core/src/nodes-loader/__tests__/directory-loader.test.ts b/packages/core/src/nodes-loader/__tests__/directory-loader.test.ts
new file mode 100644
index 0000000000..cb66300257
--- /dev/null
+++ b/packages/core/src/nodes-loader/__tests__/directory-loader.test.ts
@@ -0,0 +1,758 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	ICredentialType,
+	INodeType,
+	INodeTypeDescription,
+	IVersionedNodeType,
+} from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
+import fs from 'node:fs';
+import fsPromises from 'node:fs/promises';
+
+jest.mock('node:fs');
+jest.mock('node:fs/promises');
+const mockFs = mock<typeof fs>();
+const mockFsPromises = mock<typeof fsPromises>();
+fs.readFileSync = mockFs.readFileSync;
+fsPromises.readFile = mockFsPromises.readFile;
+
+jest.mock('fast-glob', () => async (pattern: string) => {
+	return pattern.endsWith('.node.js')
+		? ['dist/Node1/Node1.node.js', 'dist/Node2/Node2.node.js']
+		: ['dist/Credential1.js'];
+});
+
+import { CustomDirectoryLoader } from '../custom-directory-loader';
+import { LazyPackageDirectoryLoader } from '../lazy-package-directory-loader';
+import * as classLoader from '../load-class-in-isolation';
+import { PackageDirectoryLoader } from '../package-directory-loader';
+
+describe('DirectoryLoader', () => {
+	const directory = '/not/a/real/path';
+	const packageJson = JSON.stringify({
+		name: 'n8n-nodes-testing',
+		n8n: {
+			credentials: ['dist/Credential1.js'],
+			nodes: ['dist/Node1/Node1.node.js', 'dist/Node2/Node2.node.js'],
+		},
+	});
+
+	const createNode = (name: string, credential?: string) =>
+		mock<INodeType>({
+			description: {
+				name,
+				version: 1,
+				icon: `file:${name}.svg`,
+				iconUrl: undefined,
+				credentials: credential ? [{ name: credential }] : [],
+				properties: [],
+			},
+		});
+
+	const createCredential = (name: string) =>
+		mock<ICredentialType>({
+			name,
+			icon: `file:${name}.svg`,
+			iconUrl: undefined,
+			extends: undefined,
+			properties: [],
+		});
+
+	let mockCredential1: ICredentialType, mockNode1: INodeType, mockNode2: INodeType;
+
+	beforeEach(() => {
+		mockCredential1 = createCredential('credential1');
+		mockNode1 = createNode('node1', 'credential1');
+		mockNode2 = createNode('node2');
+		jest.clearAllMocks();
+	});
+
+	//@ts-expect-error overwrite a readonly property
+	classLoader.loadClassInIsolation = jest.fn((_: string, className: string) => {
+		if (className === 'Node1') return mockNode1;
+		if (className === 'Node2') return mockNode2;
+		if (className === 'Credential1') return mockCredential1;
+		throw new Error(`${className} is invalid`);
+	});
+
+	describe('CustomDirectoryLoader', () => {
+		it('should load custom nodes and credentials', async () => {
+			const loader = new CustomDirectoryLoader(directory);
+			expect(loader.packageName).toEqual('CUSTOM');
+
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(false);
+			expect(mockFsPromises.readFile).not.toHaveBeenCalled();
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledTimes(3);
+
+			expect(loader.nodesByCredential).toEqual({ credential1: ['node1'] });
+			expect(loader.credentialTypes).toEqual({
+				credential1: { sourcePath: 'dist/Credential1.js', type: mockCredential1 },
+			});
+			expect(loader.nodeTypes).toEqual({
+				node1: { sourcePath: 'dist/Node1/Node1.node.js', type: mockNode1 },
+				node2: { sourcePath: 'dist/Node2/Node2.node.js', type: mockNode2 },
+			});
+			expect(mockCredential1.iconUrl).toBe('icons/CUSTOM/dist/credential1.svg');
+			expect(mockNode1.description.iconUrl).toBe('icons/CUSTOM/dist/Node1/node1.svg');
+			expect(mockNode2.description.iconUrl).toBe('icons/CUSTOM/dist/Node2/node2.svg');
+
+			expect(mockFs.readFileSync).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('PackageDirectoryLoader', () => {
+		it('should load nodes and credentials from an installed package', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			const loader = new PackageDirectoryLoader(directory);
+			expect(loader.packageName).toEqual('n8n-nodes-testing');
+
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(false);
+			expect(mockFsPromises.readFile).not.toHaveBeenCalled();
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledTimes(3);
+
+			expect(loader.nodesByCredential).toEqual({ credential1: ['node1'] });
+			expect(loader.credentialTypes).toEqual({
+				credential1: { sourcePath: 'dist/Credential1.js', type: mockCredential1 },
+			});
+			expect(loader.nodeTypes).toEqual({
+				node1: { sourcePath: 'dist/Node1/Node1.node.js', type: mockNode1 },
+				node2: { sourcePath: 'dist/Node2/Node2.node.js', type: mockNode2 },
+			});
+			expect(mockCredential1.iconUrl).toBe('icons/n8n-nodes-testing/dist/credential1.svg');
+			expect(mockNode1.description.iconUrl).toBe('icons/n8n-nodes-testing/dist/Node1/node1.svg');
+			expect(mockNode2.description.iconUrl).toBe('icons/n8n-nodes-testing/dist/Node2/node2.svg');
+		});
+
+		it('should throw error when package.json is missing', async () => {
+			mockFs.readFileSync.mockImplementationOnce(() => {
+				throw new Error('ENOENT');
+			});
+
+			expect(() => new PackageDirectoryLoader(directory)).toThrow();
+		});
+
+		it('should throw error when package.json is invalid', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue('invalid json');
+
+			expect(() => new PackageDirectoryLoader(directory)).toThrow('Failed to parse JSON');
+		});
+
+		it('should do nothing if package.json has no n8n field', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(
+				JSON.stringify({
+					name: 'n8n-nodes-testing',
+				}),
+			);
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(loader.nodeTypes).toEqual({});
+			expect(loader.credentialTypes).toEqual({});
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+
+		it('should hide httpRequestNode property when credential has supported nodes', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockCredential1.httpRequestNode = mock<ICredentialType['httpRequestNode']>({ hidden: false });
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(mockCredential1.httpRequestNode?.hidden).toBe(true);
+		});
+
+		it('should not modify httpRequestNode when credential has no supported nodes', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockCredential1.httpRequestNode = mock<ICredentialType['httpRequestNode']>({ hidden: false });
+			mockNode1.description.credentials = [];
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(mockCredential1.httpRequestNode?.hidden).toBe(false);
+		});
+
+		it('should inherit iconUrl from supported node when credential has no icon', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockCredential1.icon = undefined;
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(mockCredential1.supportedNodes).toEqual(['node1']);
+			expect(mockCredential1.iconUrl).toBe(mockNode1.description.iconUrl);
+		});
+	});
+
+	describe('LazyPackageDirectoryLoader', () => {
+		it('should skip loading nodes and credentials from a lazy-loadable package', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockFsPromises.readFile.mockResolvedValue('[]');
+
+			const loader = new LazyPackageDirectoryLoader(directory);
+			expect(loader.packageName).toEqual('n8n-nodes-testing');
+
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(true);
+			expect(mockFsPromises.readFile).toHaveBeenCalledTimes(4);
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+
+		it('should fall back to non-lazy loading if any json file fails to parse', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+			mockFsPromises.readFile.mockRejectedValue(new Error('Failed to read file'));
+
+			const loader = new LazyPackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(false);
+			expect(mockFsPromises.readFile).toHaveBeenCalled();
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledTimes(3);
+		});
+
+		it('should only load included nodes when includeNodes is set', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			mockFsPromises.readFile.mockImplementation(async (path) => {
+				if (typeof path !== 'string') throw new Error('Invalid path');
+
+				if (path.endsWith('known/nodes.json')) {
+					return JSON.stringify({
+						node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
+						node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
+					});
+				}
+				if (path.endsWith('known/credentials.json')) {
+					return JSON.stringify({});
+				}
+				if (path.endsWith('types/nodes.json')) {
+					return JSON.stringify([{ name: 'node1' }, { name: 'node2' }]);
+				}
+				if (path.endsWith('types/credentials.json')) {
+					return JSON.stringify([]);
+				}
+				throw new Error('File not found');
+			});
+
+			const loader = new LazyPackageDirectoryLoader(directory, [], ['n8n-nodes-testing.node1']);
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(true);
+			expect(loader.known.nodes).toEqual({
+				node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
+			});
+			expect(loader.types.nodes).toHaveLength(1);
+			expect(loader.types.nodes[0].name).toBe('node1');
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+
+		it('should load no nodes when includeNodes does not match any nodes', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			mockFsPromises.readFile.mockImplementation(async (path) => {
+				if (typeof path !== 'string') throw new Error('Invalid path');
+
+				if (path.endsWith('known/nodes.json')) {
+					return JSON.stringify({
+						node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
+						node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
+					});
+				}
+				if (path.endsWith('known/credentials.json')) {
+					return JSON.stringify({});
+				}
+				if (path.endsWith('types/nodes.json')) {
+					return JSON.stringify([{ name: 'node1' }, { name: 'node2' }]);
+				}
+				if (path.endsWith('types/credentials.json')) {
+					return JSON.stringify([]);
+				}
+				throw new Error('File not found');
+			});
+
+			const loader = new LazyPackageDirectoryLoader(
+				directory,
+				[],
+				['n8n-nodes-testing.nonexistent'],
+			);
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(true);
+			expect(loader.known.nodes).toEqual({});
+			expect(loader.types.nodes).toHaveLength(0);
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+
+		it('should exclude specified nodes when excludeNodes is set', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			mockFsPromises.readFile.mockImplementation(async (path) => {
+				if (typeof path !== 'string') throw new Error('Invalid path');
+
+				if (path.endsWith('known/nodes.json')) {
+					return JSON.stringify({
+						node1: { className: 'Node1', sourcePath: 'dist/Node1/Node1.node.js' },
+						node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
+					});
+				}
+				if (path.endsWith('known/credentials.json')) {
+					return JSON.stringify({});
+				}
+				if (path.endsWith('types/nodes.json')) {
+					return JSON.stringify([{ name: 'node1' }, { name: 'node2' }]);
+				}
+				if (path.endsWith('types/credentials.json')) {
+					return JSON.stringify([]);
+				}
+				throw new Error('File not found');
+			});
+
+			const loader = new LazyPackageDirectoryLoader(directory, ['n8n-nodes-testing.node1']);
+			await loader.loadAll();
+
+			expect(loader.isLazyLoaded).toBe(true);
+			expect(loader.known.nodes).toEqual({
+				node2: { className: 'Node2', sourcePath: 'dist/Node2/Node2.node.js' },
+			});
+			expect(loader.types.nodes).toHaveLength(1);
+			expect(loader.types.nodes[0].name).toBe('node2');
+			expect(classLoader.loadClassInIsolation).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('reset()', () => {
+		it('should reset all properties to their initial state', async () => {
+			mockFs.readFileSync.calledWith(`${directory}/package.json`).mockReturnValue(packageJson);
+
+			const loader = new PackageDirectoryLoader(directory);
+			await loader.loadAll();
+
+			// Verify loader has loaded data
+			expect(loader.nodeTypes).not.toEqual({});
+			expect(loader.credentialTypes).not.toEqual({});
+			expect(loader.types.nodes.length).toBeGreaterThan(0);
+			expect(loader.types.credentials.length).toBeGreaterThan(0);
+			expect(loader.loadedNodes.length).toBeGreaterThan(0);
+			expect(Object.keys(loader.known.nodes).length).toBeGreaterThan(0);
+			expect(Object.keys(loader.known.credentials).length).toBeGreaterThan(0);
+
+			// Reset the loader
+			loader.reset();
+
+			// Verify all properties are reset
+			expect(loader.nodeTypes).toEqual({});
+			expect(loader.credentialTypes).toEqual({});
+			expect(loader.types.nodes).toEqual([]);
+			expect(loader.types.credentials).toEqual([]);
+			expect(loader.loadedNodes).toEqual([]);
+			expect(loader.known.nodes).toEqual({});
+			expect(loader.known.credentials).toEqual({});
+		});
+	});
+
+	describe('getVersionedNodeTypeAll', () => {
+		it('should return array with single node for non-versioned node', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const node = createNode('node1');
+
+			const result = loader.getVersionedNodeTypeAll(node);
+
+			expect(result).toHaveLength(1);
+			expect(result[0]).toBe(node);
+		});
+
+		it('should return all versions of a versioned node', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const nodeV1 = createNode('test');
+			const nodeV2 = createNode('test');
+			nodeV1.description.version = 1;
+			nodeV2.description.version = 2;
+
+			const versionedNode = mock<IVersionedNodeType>({
+				description: { name: 'test', codex: {} },
+				currentVersion: 2,
+				nodeVersions: {
+					1: nodeV1,
+					2: nodeV2,
+				},
+			});
+
+			const result = loader.getVersionedNodeTypeAll(versionedNode);
+
+			expect(result).toHaveLength(2);
+			expect(result).toEqual([nodeV2, nodeV1]);
+			expect(result[0].description.name).toBe('test');
+			expect(result[1].description.name).toBe('test');
+		});
+	});
+
+	describe('getCredentialsForNode', () => {
+		it('should return empty array if node has no credentials', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const node = createNode('node1');
+
+			const result = loader.getCredentialsForNode(node);
+
+			expect(Array.isArray(result)).toBe(true);
+			expect(result.length).toEqual(0);
+		});
+
+		it('should return credentials for non-versioned node', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const node = createNode('node1', 'testCred');
+
+			const result = loader.getCredentialsForNode(node);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].name).toBe('testCred');
+		});
+
+		it('should return unique credentials from all versions of a versioned node', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const nodeV1 = createNode('test', 'cred1');
+			const nodeV2 = createNode('test', 'cred2');
+
+			const versionedNode = mock<IVersionedNodeType>({
+				description: { name: 'test' },
+				currentVersion: 2,
+				nodeVersions: {
+					1: nodeV1,
+					2: nodeV2,
+				},
+			});
+
+			const result = loader.getCredentialsForNode(versionedNode);
+
+			expect(result).toHaveLength(2);
+			expect(result[0].name).toBe('cred1');
+			expect(result[1].name).toBe('cred2');
+		});
+
+		it('should remove duplicate credentials from different versions', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const nodeV1 = createNode('test', 'cred1');
+			const nodeV2 = createNode('test', 'cred1'); // Same credential
+
+			const versionedNode = mock<IVersionedNodeType>({
+				description: { name: 'test' },
+				currentVersion: 2,
+				nodeVersions: {
+					1: nodeV1,
+					2: nodeV2,
+				},
+			});
+
+			const result = loader.getCredentialsForNode(versionedNode);
+
+			expect(result).toHaveLength(1);
+			expect(result[0].name).toBe('cred1');
+		});
+	});
+
+	describe('loadCredentialFromFile', () => {
+		it('should load credential and store it correctly', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			loader.loadCredentialFromFile(filePath);
+
+			expect(loader.credentialTypes).toEqual({
+				credential1: {
+					type: mockCredential1,
+					sourcePath: filePath,
+				},
+			});
+
+			expect(loader.known.credentials).toEqual({
+				credential1: {
+					className: mockCredential1.constructor.name,
+					sourcePath: filePath,
+					extends: undefined,
+					supportedNodes: undefined,
+				},
+			});
+
+			expect(loader.types.credentials).toEqual([mockCredential1]);
+		});
+
+		it('should update credential icon paths', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			const credWithIcon = createCredential('credentialWithIcon');
+			credWithIcon.icon = {
+				light: 'file:light.svg',
+				dark: 'file:dark.svg',
+			};
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(credWithIcon);
+
+			loader.loadCredentialFromFile(filePath);
+
+			expect(credWithIcon.iconUrl).toEqual({
+				light: 'icons/CUSTOM/dist/light.svg',
+				dark: 'icons/CUSTOM/dist/dark.svg',
+			});
+			expect(credWithIcon.icon).toBeUndefined();
+		});
+
+		it('should add toJSON method to credential type', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			const credWithAuth = createCredential('credWithAuth');
+			credWithAuth.authenticate = jest.fn();
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(credWithAuth);
+
+			loader.loadCredentialFromFile(filePath);
+
+			const serialized = deepCopy(credWithAuth);
+			expect(serialized.authenticate).toEqual({});
+		});
+
+		it('should store credential extends and supported nodes info', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			const extendingCred = createCredential('extendingCred');
+			extendingCred.extends = ['baseCredential'];
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(extendingCred);
+
+			// Set up nodesByCredential before loading
+			loader.nodesByCredential.extendingCred = ['node1', 'node2'];
+
+			loader.loadCredentialFromFile(filePath);
+
+			expect(loader.known.credentials.extendingCred).toEqual({
+				className: extendingCred.constructor.name,
+				sourcePath: filePath,
+				extends: ['baseCredential'],
+				supportedNodes: ['node1', 'node2'],
+			});
+		});
+
+		it('should throw error if credential class cannot be loaded', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/InvalidCred.js';
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockImplementationOnce(() => {
+				throw new TypeError('Class not found');
+			});
+
+			expect(() => loader.loadCredentialFromFile(filePath)).toThrow('Class could not be found');
+		});
+	});
+
+	describe('getCredential', () => {
+		it('should return existing loaded credential type', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			loader.loadCredentialFromFile(filePath);
+
+			const result = loader.getCredential('credential1');
+			expect(result).toEqual({
+				type: mockCredential1,
+				sourcePath: filePath,
+			});
+		});
+
+		it('should load credential from known credentials if not already loaded', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Credential1.js';
+
+			// Setup known credentials without loading
+			loader.known.credentials.credential1 = {
+				className: 'Credential1',
+				sourcePath: filePath,
+			};
+
+			const result = loader.getCredential('credential1');
+
+			expect(result).toEqual({
+				type: mockCredential1,
+				sourcePath: filePath,
+			});
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledWith(
+				expect.stringContaining(filePath),
+				'Credential1',
+			);
+		});
+
+		it('should throw UnrecognizedCredentialTypeError if credential type is not found', () => {
+			const loader = new CustomDirectoryLoader(directory);
+
+			expect(() => loader.getCredential('nonexistent')).toThrow(
+				'Unrecognized credential type: nonexistent',
+			);
+		});
+	});
+
+	describe('loadNodeFromFile', () => {
+		it('should load node and store it correctly', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.nodeTypes).toEqual({
+				node1: {
+					type: mockNode1,
+					sourcePath: filePath,
+				},
+			});
+
+			expect(loader.known.nodes).toEqual({
+				node1: {
+					className: mockNode1.constructor.name,
+					sourcePath: filePath,
+				},
+			});
+
+			expect(loader.types.nodes).toEqual([mockNode1.description]);
+			expect(loader.loadedNodes).toEqual([{ name: 'node1', version: 1 }]);
+		});
+
+		it('should update node icon paths', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			const nodeWithIcon = createNode('nodeWithIcon');
+			nodeWithIcon.description.icon = {
+				light: 'file:light.svg',
+				dark: 'file:dark.svg',
+			};
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(nodeWithIcon);
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(nodeWithIcon.description.iconUrl).toEqual({
+				light: 'icons/CUSTOM/dist/Node1/light.svg',
+				dark: 'icons/CUSTOM/dist/Node1/dark.svg',
+			});
+			expect(nodeWithIcon.description.icon).toBeUndefined();
+		});
+
+		it('should skip node if not in includeNodes', () => {
+			const loader = new CustomDirectoryLoader(directory, [], ['CUSTOM.other']);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.nodeTypes).toEqual({});
+			expect(loader.known.nodes).toEqual({});
+			expect(loader.types.nodes).toEqual([]);
+			expect(loader.loadedNodes).toEqual([]);
+		});
+
+		it('should handle versioned nodes correctly', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			const nodeV1 = createNode('test');
+			const nodeV2 = createNode('test');
+			nodeV1.description.version = 1;
+			nodeV2.description.version = 2;
+
+			const versionedNode = mock<IVersionedNodeType>({
+				description: { name: 'test', codex: {}, iconUrl: undefined, icon: undefined },
+				currentVersion: 2,
+				nodeVersions: {
+					1: nodeV1,
+					2: nodeV2,
+				},
+			});
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(versionedNode);
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.loadedNodes).toEqual([{ name: 'test', version: 2 }]);
+
+			const nodes = loader.types.nodes as INodeTypeDescription[];
+			expect(nodes).toHaveLength(2);
+			expect(nodes[0]?.version).toBe(2);
+			expect(nodes[1]?.version).toBe(1);
+		});
+
+		it('should store credential associations correctly', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			const nodeWithCreds = createNode('testNode', 'testCred');
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockReturnValueOnce(nodeWithCreds);
+
+			loader.loadNodeFromFile(filePath);
+
+			expect(loader.nodesByCredential).toEqual({
+				testCred: ['testNode'],
+			});
+		});
+
+		it('should throw error if node class cannot be loaded', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/InvalidNode/InvalidNode.node.js';
+
+			jest.spyOn(classLoader, 'loadClassInIsolation').mockImplementationOnce(() => {
+				throw new TypeError('Class not found');
+			});
+
+			expect(() => loader.loadNodeFromFile(filePath)).toThrow('Class could not be found');
+		});
+	});
+
+	describe('getNode', () => {
+		it('should return existing loaded node type', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			loader.loadNodeFromFile(filePath);
+
+			const result = loader.getNode('node1');
+			expect(result).toEqual({
+				type: mockNode1,
+				sourcePath: filePath,
+			});
+		});
+
+		it('should load node from known nodes if not already loaded', () => {
+			const loader = new CustomDirectoryLoader(directory);
+			const filePath = 'dist/Node1/Node1.node.js';
+
+			// Setup known nodes without loading
+			loader.known.nodes.node1 = {
+				className: 'Node1',
+				sourcePath: filePath,
+			};
+
+			const result = loader.getNode('node1');
+
+			expect(result).toEqual({
+				type: mockNode1,
+				sourcePath: filePath,
+			});
+			expect(classLoader.loadClassInIsolation).toHaveBeenCalledWith(
+				expect.stringContaining(filePath),
+				'Node1',
+			);
+		});
+
+		it('should throw UnrecognizedNodeTypeError if node type is not found', () => {
+			const loader = new CustomDirectoryLoader(directory);
+
+			expect(() => loader.getNode('nonexistent')).toThrow(
+				'Unrecognized node type: CUSTOM.nonexistent',
+			);
+		});
+	});
+});
diff --git a/packages/core/src/nodes-loader/__tests__/load-class-in-isolation.test.ts b/packages/core/src/nodes-loader/__tests__/load-class-in-isolation.test.ts
new file mode 100644
index 0000000000..656830fa87
--- /dev/null
+++ b/packages/core/src/nodes-loader/__tests__/load-class-in-isolation.test.ts
@@ -0,0 +1,52 @@
+import vm from 'vm';
+
+import { loadClassInIsolation } from '../load-class-in-isolation';
+
+describe('loadClassInIsolation', () => {
+	const filePath = '/path/to/TestClass.js';
+	const className = 'TestClass';
+
+	class TestClass {
+		getValue(): string {
+			return 'test value';
+		}
+	}
+
+	jest.spyOn(vm, 'createContext').mockReturnValue({});
+
+	const runInContext = jest.fn().mockImplementation(() => new TestClass());
+	const scriptSpy = jest.spyOn(vm, 'Script').mockImplementation(function (this: vm.Script) {
+		this.runInContext = runInContext;
+		return this;
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should create script with correct require statement', () => {
+		const instance = loadClassInIsolation<TestClass>(filePath, className);
+
+		expect(scriptSpy).toHaveBeenCalledWith(`new (require('${filePath}').${className})()`);
+		expect(instance.getValue()).toBe('test value');
+	});
+
+	it('should handle Windows-style paths', () => {
+		const originalPlatform = process.platform;
+		Object.defineProperty(process, 'platform', { value: 'win32' });
+
+		loadClassInIsolation('/path\\to\\TestClass.js', 'TestClass');
+
+		expect(scriptSpy).toHaveBeenCalledWith(`new (require('${filePath}').${className})()`);
+
+		Object.defineProperty(process, 'platform', { value: originalPlatform });
+	});
+
+	it('should throw error when script execution fails', () => {
+		runInContext.mockImplementationOnce(() => {
+			throw new Error('Script execution failed');
+		});
+
+		expect(() => loadClassInIsolation(filePath, className)).toThrow('Script execution failed');
+	});
+});
diff --git a/packages/core/src/nodes-loader/constants.ts b/packages/core/src/nodes-loader/constants.ts
new file mode 100644
index 0000000000..171be0352b
--- /dev/null
+++ b/packages/core/src/nodes-loader/constants.ts
@@ -0,0 +1,31 @@
+import type { INodeProperties } from 'n8n-workflow';
+import { cronNodeOptions } from 'n8n-workflow';
+
+export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
+
+export const commonPollingParameters: INodeProperties[] = [
+	{
+		displayName: 'Poll Times',
+		name: 'pollTimes',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Poll Time',
+		},
+		default: { item: [{ mode: 'everyMinute' }] },
+		description: 'Time at which polling should occur',
+		placeholder: 'Add Poll Time',
+		options: cronNodeOptions,
+	},
+];
+
+export const commonCORSParameters: INodeProperties[] = [
+	{
+		displayName: 'Allowed Origins (CORS)',
+		name: 'allowedOrigins',
+		type: 'string',
+		default: '*',
+		description:
+			'Comma-separated list of URLs allowed for cross-origin non-preflight requests. Use * (default) to allow all origins.',
+	},
+];
diff --git a/packages/core/src/nodes-loader/custom-directory-loader.ts b/packages/core/src/nodes-loader/custom-directory-loader.ts
new file mode 100644
index 0000000000..8e84440608
--- /dev/null
+++ b/packages/core/src/nodes-loader/custom-directory-loader.ts
@@ -0,0 +1,31 @@
+import glob from 'fast-glob';
+
+import { DirectoryLoader } from './directory-loader';
+
+/**
+ * Loader for source files of nodes and credentials located in a custom dir,
+ * e.g. `~/.n8n/custom`
+ */
+export class CustomDirectoryLoader extends DirectoryLoader {
+	packageName = 'CUSTOM';
+
+	override async loadAll() {
+		const nodes = await glob('**/*.node.js', {
+			cwd: this.directory,
+			absolute: true,
+		});
+
+		for (const nodePath of nodes) {
+			this.loadNodeFromFile(nodePath);
+		}
+
+		const credentials = await glob('**/*.credentials.js', {
+			cwd: this.directory,
+			absolute: true,
+		});
+
+		for (const credentialPath of credentials) {
+			this.loadCredentialFromFile(credentialPath);
+		}
+	}
+}
diff --git a/packages/core/src/nodes-loader/directory-loader.ts b/packages/core/src/nodes-loader/directory-loader.ts
new file mode 100644
index 0000000000..094aa8d1e0
--- /dev/null
+++ b/packages/core/src/nodes-loader/directory-loader.ts
@@ -0,0 +1,393 @@
+import { Container } from '@n8n/di';
+import uniqBy from 'lodash/uniqBy';
+import type {
+	CodexData,
+	DocumentationLink,
+	ICredentialType,
+	ICredentialTypeData,
+	INodeCredentialDescription,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeData,
+	INodeTypeDescription,
+	INodeTypeNameVersion,
+	IVersionedNodeType,
+	KnownNodesAndCredentials,
+} from 'n8n-workflow';
+import { ApplicationError, applyDeclarativeNodeOptionParameters } from 'n8n-workflow';
+import * as path from 'path';
+
+import { UnrecognizedCredentialTypeError } from '@/errors/unrecognized-credential-type.error';
+import { UnrecognizedNodeTypeError } from '@/errors/unrecognized-node-type.error';
+import { Logger } from '@/logging/logger';
+
+import { commonCORSParameters, commonPollingParameters, CUSTOM_NODES_CATEGORY } from './constants';
+import { loadClassInIsolation } from './load-class-in-isolation';
+
+function toJSON(this: ICredentialType) {
+	return {
+		...this,
+		authenticate: typeof this.authenticate === 'function' ? {} : this.authenticate,
+	};
+}
+
+type Codex = {
+	categories: string[];
+	subcategories: { [subcategory: string]: string[] };
+	resources: {
+		primaryDocumentation: DocumentationLink[];
+		credentialDocumentation: DocumentationLink[];
+	};
+	alias: string[];
+};
+
+export type Types = {
+	nodes: INodeTypeBaseDescription[];
+	credentials: ICredentialType[];
+};
+
+/**
+ * Base class for loading n8n nodes and credentials from a directory.
+ * Handles the common functionality for resolving paths, loading classes, and managing node and credential types.
+ */
+export abstract class DirectoryLoader {
+	isLazyLoaded = false;
+
+	// Another way of keeping track of the names and versions of a node. This
+	// seems to only be used by the installedPackages repository
+	loadedNodes: INodeTypeNameVersion[] = [];
+
+	// Stores the loaded descriptions and sourcepaths
+	nodeTypes: INodeTypeData = {};
+
+	credentialTypes: ICredentialTypeData = {};
+
+	// Stores the location and classnames of the nodes and credentials that are
+	// loaded; used to actually load the files in lazy-loading scenario.
+	known: KnownNodesAndCredentials = { nodes: {}, credentials: {} };
+
+	// Stores the different versions with their individual descriptions
+	types: Types = { nodes: [], credentials: [] };
+
+	readonly nodesByCredential: Record<string, string[]> = {};
+
+	protected readonly logger = Container.get(Logger);
+
+	constructor(
+		readonly directory: string,
+		protected excludeNodes: string[] = [],
+		protected includeNodes: string[] = [],
+	) {}
+
+	abstract packageName: string;
+
+	abstract loadAll(): Promise<void>;
+
+	reset() {
+		this.loadedNodes = [];
+		this.nodeTypes = {};
+		this.credentialTypes = {};
+		this.known = { nodes: {}, credentials: {} };
+		this.types = { nodes: [], credentials: [] };
+	}
+
+	protected resolvePath(file: string) {
+		return path.resolve(this.directory, file);
+	}
+
+	private loadClass<T>(sourcePath: string) {
+		const filePath = this.resolvePath(sourcePath);
+		const [className] = path.parse(sourcePath).name.split('.');
+		try {
+			return loadClassInIsolation<T>(filePath, className);
+		} catch (error) {
+			throw error instanceof TypeError
+				? new ApplicationError(
+						'Class could not be found. Please check if the class is named correctly.',
+						{ extra: { className } },
+					)
+				: error;
+		}
+	}
+
+	/** Loads a nodes class from a file, fixes icons, and augments the codex */
+	loadNodeFromFile(filePath: string) {
+		const tempNode = this.loadClass<INodeType | IVersionedNodeType>(filePath);
+		this.addCodex(tempNode, filePath);
+
+		const nodeType = tempNode.description.name;
+
+		if (this.includeNodes.length && !this.includeNodes.includes(nodeType)) {
+			return;
+		}
+
+		if (this.excludeNodes.includes(nodeType)) {
+			return;
+		}
+
+		this.fixIconPaths(tempNode.description, filePath);
+
+		let nodeVersion = 1;
+		if ('nodeVersions' in tempNode) {
+			for (const versionNode of Object.values(tempNode.nodeVersions)) {
+				this.fixIconPaths(versionNode.description, filePath);
+			}
+
+			for (const version of Object.values(tempNode.nodeVersions)) {
+				this.addLoadOptionsMethods(version);
+				this.applySpecialNodeParameters(version);
+			}
+
+			const currentVersionNode = tempNode.nodeVersions[tempNode.currentVersion];
+			this.addCodex(currentVersionNode, filePath);
+			nodeVersion = tempNode.currentVersion;
+
+			if (currentVersionNode.hasOwnProperty('executeSingle')) {
+				throw new ApplicationError(
+					'"executeSingle" has been removed. Please update the code of this node to use "execute" instead.',
+					{ extra: { nodeType } },
+				);
+			}
+		} else {
+			this.addLoadOptionsMethods(tempNode);
+			this.applySpecialNodeParameters(tempNode);
+
+			// Short renaming to avoid type issues
+			nodeVersion = Array.isArray(tempNode.description.version)
+				? tempNode.description.version.slice(-1)[0]
+				: tempNode.description.version;
+		}
+
+		this.known.nodes[nodeType] = {
+			className: tempNode.constructor.name,
+			sourcePath: filePath,
+		};
+
+		this.nodeTypes[nodeType] = {
+			type: tempNode,
+			sourcePath: filePath,
+		};
+
+		this.loadedNodes.push({
+			name: nodeType,
+			version: nodeVersion,
+		});
+
+		this.getVersionedNodeTypeAll(tempNode).forEach(({ description }) => {
+			this.types.nodes.push(description);
+		});
+
+		for (const credential of this.getCredentialsForNode(tempNode)) {
+			if (!this.nodesByCredential[credential.name]) {
+				this.nodesByCredential[credential.name] = [];
+			}
+			this.nodesByCredential[credential.name].push(nodeType);
+		}
+	}
+
+	getNode(nodeType: string) {
+		const {
+			nodeTypes,
+			known: { nodes: knownNodes },
+		} = this;
+		if (!(nodeType in nodeTypes) && nodeType in knownNodes) {
+			const { sourcePath } = knownNodes[nodeType];
+			this.loadNodeFromFile(sourcePath);
+		}
+
+		if (nodeType in nodeTypes) {
+			return nodeTypes[nodeType];
+		}
+
+		throw new UnrecognizedNodeTypeError(this.packageName, nodeType);
+	}
+
+	/** Loads a credential class from a file, and fixes icons */
+	loadCredentialFromFile(filePath: string): void {
+		const tempCredential = this.loadClass<ICredentialType>(filePath);
+		// Add serializer method "toJSON" to the class so that authenticate method (if defined)
+		// gets mapped to the authenticate attribute before it is sent to the client.
+		// The authenticate property is used by the client to decide whether or not to
+		// include the credential type in the predefined credentials (HTTP node)
+		Object.assign(tempCredential, { toJSON });
+
+		this.fixIconPaths(tempCredential, filePath);
+
+		const credentialType = tempCredential.name;
+		this.known.credentials[credentialType] = {
+			className: tempCredential.constructor.name,
+			sourcePath: filePath,
+			extends: tempCredential.extends,
+			supportedNodes: this.nodesByCredential[credentialType],
+		};
+
+		this.credentialTypes[credentialType] = {
+			type: tempCredential,
+			sourcePath: filePath,
+		};
+
+		this.types.credentials.push(tempCredential);
+	}
+
+	getCredential(credentialType: string) {
+		const {
+			credentialTypes,
+			known: { credentials: knownCredentials },
+		} = this;
+		if (!(credentialType in credentialTypes) && credentialType in knownCredentials) {
+			const { sourcePath } = knownCredentials[credentialType];
+			this.loadCredentialFromFile(sourcePath);
+		}
+
+		if (credentialType in credentialTypes) {
+			return credentialTypes[credentialType];
+		}
+
+		throw new UnrecognizedCredentialTypeError(credentialType);
+	}
+
+	/**
+	 * Returns an array of credential descriptions that are supported by a node.
+	 * For versioned nodes, combines and deduplicates credentials from all versions.
+	 */
+	getCredentialsForNode(object: IVersionedNodeType | INodeType): INodeCredentialDescription[] {
+		if ('nodeVersions' in object) {
+			const credentials = Object.values(object.nodeVersions).flatMap(
+				({ description }) => description.credentials ?? [],
+			);
+			return uniqBy(credentials, 'name');
+		}
+		return object.description.credentials ?? [];
+	}
+
+	/**
+	 * Returns an array of all versions of a node type.
+	 * For non-versioned nodes, returns an array with just that node.
+	 * For versioned nodes, returns all available versions.
+	 */
+	getVersionedNodeTypeAll(object: IVersionedNodeType | INodeType): INodeType[] {
+		if ('nodeVersions' in object) {
+			const nodeVersions = Object.values(object.nodeVersions).map((element) => {
+				element.description.name = object.description.name;
+				element.description.codex = object.description.codex;
+				return element;
+			});
+			return uniqBy(nodeVersions.reverse(), (node) => {
+				const { version } = node.description;
+				return Array.isArray(version) ? version.join(',') : version.toString();
+			});
+		}
+		return [object];
+	}
+
+	/**
+	 * Retrieves `categories`, `subcategories` and alias (if defined)
+	 * from the codex data for the node at the given file path.
+	 */
+	private getCodex(filePath: string): CodexData {
+		const codexFilePath = this.resolvePath(`${filePath}on`); // .js to .json
+
+		const {
+			categories,
+			subcategories,
+			resources: { primaryDocumentation, credentialDocumentation },
+			alias,
+		} = module.require(codexFilePath) as Codex;
+
+		return {
+			...(categories && { categories }),
+			...(subcategories && { subcategories }),
+			...(alias && { alias }),
+			resources: {
+				primaryDocumentation,
+				credentialDocumentation,
+			},
+		};
+	}
+
+	/**
+	 * Adds a node codex `categories` and `subcategories` (if defined)
+	 * to a node description `codex` property.
+	 */
+	private addCodex(node: INodeType | IVersionedNodeType, filePath: string) {
+		const isCustom = this.packageName === 'CUSTOM';
+		try {
+			let codex;
+
+			if (!isCustom) {
+				codex = node.description.codex;
+			}
+
+			if (codex === undefined) {
+				codex = this.getCodex(filePath);
+			}
+
+			if (isCustom) {
+				codex.categories = codex.categories
+					? codex.categories.concat(CUSTOM_NODES_CATEGORY)
+					: [CUSTOM_NODES_CATEGORY];
+			}
+
+			node.description.codex = codex;
+		} catch {
+			this.logger.debug(`No codex available for: ${node.description.name}`);
+
+			if (isCustom) {
+				node.description.codex = {
+					categories: [CUSTOM_NODES_CATEGORY],
+				};
+			}
+		}
+	}
+
+	private addLoadOptionsMethods(node: INodeType) {
+		if (node?.methods?.loadOptions) {
+			node.description.__loadOptionsMethods = Object.keys(node.methods.loadOptions);
+		}
+	}
+
+	private applySpecialNodeParameters(nodeType: INodeType): void {
+		const { properties, polling, supportsCORS } = nodeType.description;
+		if (polling) {
+			properties.unshift(...commonPollingParameters);
+		}
+		if (nodeType.webhook && supportsCORS) {
+			const optionsProperty = properties.find(({ name }) => name === 'options');
+			if (optionsProperty)
+				optionsProperty.options = [
+					...commonCORSParameters,
+					...(optionsProperty.options as INodePropertyOptions[]),
+				];
+			else properties.push(...commonCORSParameters);
+		}
+
+		applyDeclarativeNodeOptionParameters(nodeType);
+	}
+
+	private getIconPath(icon: string, filePath: string) {
+		const iconPath = path.join(path.dirname(filePath), icon.replace('file:', ''));
+		return `icons/${this.packageName}/${iconPath}`;
+	}
+
+	private fixIconPaths(
+		obj: INodeTypeDescription | INodeTypeBaseDescription | ICredentialType,
+		filePath: string,
+	) {
+		const { icon } = obj;
+		if (!icon) return;
+
+		if (typeof icon === 'string') {
+			if (icon.startsWith('file:')) {
+				obj.iconUrl = this.getIconPath(icon, filePath);
+				obj.icon = undefined;
+			}
+		} else if (icon.light.startsWith('file:') && icon.dark.startsWith('file:')) {
+			obj.iconUrl = {
+				light: this.getIconPath(icon.light, filePath),
+				dark: this.getIconPath(icon.dark, filePath),
+			};
+			obj.icon = undefined;
+		}
+	}
+}
diff --git a/packages/core/src/nodes-loader/index.ts b/packages/core/src/nodes-loader/index.ts
new file mode 100644
index 0000000000..f8fedca5be
--- /dev/null
+++ b/packages/core/src/nodes-loader/index.ts
@@ -0,0 +1,5 @@
+export { DirectoryLoader, type Types } from './directory-loader';
+export { CustomDirectoryLoader } from './custom-directory-loader';
+export { PackageDirectoryLoader } from './package-directory-loader';
+export { LazyPackageDirectoryLoader } from './lazy-package-directory-loader';
+export type { n8n } from './types';
diff --git a/packages/core/src/nodes-loader/lazy-package-directory-loader.ts b/packages/core/src/nodes-loader/lazy-package-directory-loader.ts
new file mode 100644
index 0000000000..5da6084e1a
--- /dev/null
+++ b/packages/core/src/nodes-loader/lazy-package-directory-loader.ts
@@ -0,0 +1,52 @@
+import { PackageDirectoryLoader } from './package-directory-loader';
+
+/**
+ * This loader extends PackageDirectoryLoader to load node and credentials lazily, if possible
+ */
+export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
+	override async loadAll() {
+		try {
+			this.known.nodes = await this.readJSON('dist/known/nodes.json');
+			this.known.credentials = await this.readJSON('dist/known/credentials.json');
+
+			this.types.nodes = await this.readJSON('dist/types/nodes.json');
+			this.types.credentials = await this.readJSON('dist/types/credentials.json');
+
+			if (this.includeNodes.length) {
+				const allowedNodes: typeof this.known.nodes = {};
+				for (const nodeType of this.includeNodes) {
+					if (nodeType in this.known.nodes) {
+						allowedNodes[nodeType] = this.known.nodes[nodeType];
+					}
+				}
+				this.known.nodes = allowedNodes;
+
+				this.types.nodes = this.types.nodes.filter((nodeType) =>
+					this.includeNodes.includes(nodeType.name),
+				);
+			}
+
+			if (this.excludeNodes.length) {
+				for (const nodeType of this.excludeNodes) {
+					delete this.known.nodes[nodeType];
+				}
+
+				this.types.nodes = this.types.nodes.filter(
+					(nodeType) => !this.excludeNodes.includes(nodeType.name),
+				);
+			}
+
+			this.logger.debug(`Lazy-loading nodes and credentials from ${this.packageJson.name}`, {
+				nodes: this.types.nodes?.length ?? 0,
+				credentials: this.types.credentials?.length ?? 0,
+			});
+
+			this.isLazyLoaded = true;
+
+			return; // We can load nodes and credentials lazily now
+		} catch {
+			this.logger.debug("Can't enable lazy-loading");
+			await super.loadAll();
+		}
+	}
+}
diff --git a/packages/core/src/ClassLoader.ts b/packages/core/src/nodes-loader/load-class-in-isolation.ts
similarity index 100%
rename from packages/core/src/ClassLoader.ts
rename to packages/core/src/nodes-loader/load-class-in-isolation.ts
diff --git a/packages/core/src/nodes-loader/package-directory-loader.ts b/packages/core/src/nodes-loader/package-directory-loader.ts
new file mode 100644
index 0000000000..4c46a684ec
--- /dev/null
+++ b/packages/core/src/nodes-loader/package-directory-loader.ts
@@ -0,0 +1,107 @@
+import { ApplicationError, jsonParse } from 'n8n-workflow';
+import { readFileSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
+
+import { DirectoryLoader } from './directory-loader';
+import type { n8n } from './types';
+
+/**
+ * Loader for source files of nodes and credentials located in a package dir,
+ * e.g. /nodes-base or community packages.
+ */
+export class PackageDirectoryLoader extends DirectoryLoader {
+	packageJson: n8n.PackageJson;
+
+	packageName: string;
+
+	constructor(directory: string, excludeNodes: string[] = [], includeNodes: string[] = []) {
+		super(directory, excludeNodes, includeNodes);
+
+		this.packageJson = this.readJSONSync('package.json');
+		this.packageName = this.packageJson.name;
+		this.excludeNodes = this.extractNodeTypes(excludeNodes);
+		this.includeNodes = this.extractNodeTypes(includeNodes);
+	}
+
+	private extractNodeTypes(fullNodeTypes: string[]) {
+		return fullNodeTypes
+			.map((fullNodeType) => fullNodeType.split('.'))
+			.filter(([packageName]) => packageName === this.packageName)
+			.map(([_, nodeType]) => nodeType);
+	}
+
+	override async loadAll() {
+		const { n8n } = this.packageJson;
+		if (!n8n) return;
+
+		const { nodes, credentials } = n8n;
+
+		if (Array.isArray(nodes)) {
+			for (const nodePath of nodes) {
+				this.loadNodeFromFile(nodePath);
+			}
+		}
+
+		if (Array.isArray(credentials)) {
+			for (const credentialPath of credentials) {
+				this.loadCredentialFromFile(credentialPath);
+			}
+		}
+
+		this.inferSupportedNodes();
+
+		this.logger.debug(`Loaded all credentials and nodes from ${this.packageName}`, {
+			credentials: credentials?.length ?? 0,
+			nodes: nodes?.length ?? 0,
+		});
+	}
+
+	private inferSupportedNodes() {
+		const knownCredentials = this.known.credentials;
+		for (const { type: credentialType } of Object.values(this.credentialTypes)) {
+			const supportedNodes = knownCredentials[credentialType.name].supportedNodes ?? [];
+			if (supportedNodes.length > 0 && credentialType.httpRequestNode) {
+				credentialType.httpRequestNode.hidden = true;
+			}
+
+			credentialType.supportedNodes = supportedNodes;
+
+			if (!credentialType.iconUrl && !credentialType.icon) {
+				for (const supportedNode of supportedNodes) {
+					const nodeDescription = this.nodeTypes[supportedNode]?.type.description;
+
+					if (!nodeDescription) continue;
+					if (nodeDescription.icon) {
+						credentialType.icon = nodeDescription.icon;
+						credentialType.iconColor = nodeDescription.iconColor;
+						break;
+					}
+					if (nodeDescription.iconUrl) {
+						credentialType.iconUrl = nodeDescription.iconUrl;
+						break;
+					}
+				}
+			}
+		}
+	}
+
+	private parseJSON<T>(fileString: string, filePath: string): T {
+		try {
+			return jsonParse<T>(fileString);
+		} catch (error) {
+			throw new ApplicationError('Failed to parse JSON', { extra: { filePath } });
+		}
+	}
+
+	protected readJSONSync<T>(file: string): T {
+		const filePath = this.resolvePath(file);
+		const fileString = readFileSync(filePath, 'utf8');
+		return this.parseJSON<T>(fileString, filePath);
+	}
+
+	protected async readJSON<T>(file: string): Promise<T> {
+		const filePath = this.resolvePath(file);
+		const fileString = await readFile(filePath, 'utf8');
+		return this.parseJSON<T>(fileString, filePath);
+	}
+}
diff --git a/packages/core/src/nodes-loader/types.ts b/packages/core/src/nodes-loader/types.ts
new file mode 100644
index 0000000000..e898c44b2d
--- /dev/null
+++ b/packages/core/src/nodes-loader/types.ts
@@ -0,0 +1,14 @@
+export namespace n8n {
+	export interface PackageJson {
+		name: string;
+		version: string;
+		n8n?: {
+			credentials?: string[];
+			nodes?: string[];
+		};
+		author?: {
+			name?: string;
+			email?: string;
+		};
+	}
+}
diff --git a/packages/core/src/utils/__tests__/is-object-literal.test.ts b/packages/core/src/utils/__tests__/is-object-literal.test.ts
new file mode 100644
index 0000000000..f6c3cfddd0
--- /dev/null
+++ b/packages/core/src/utils/__tests__/is-object-literal.test.ts
@@ -0,0 +1,35 @@
+import { isObjectLiteral } from '../is-object-literal';
+
+describe('isObjectLiteral', () => {
+	test.each([
+		['empty object literal', {}, true],
+		['object with properties', { foo: 'bar', num: 123 }, true],
+		['nested object literal', { nested: { foo: 'bar' } }, true],
+		['object with symbol key', { [Symbol.for('foo')]: 'bar' }, true],
+		['null', null, false],
+		['empty array', [], false],
+		['array with values', [1, 2, 3], false],
+		['number', 42, false],
+		['string', 'string', false],
+		['boolean', true, false],
+		['undefined', undefined, false],
+		['Date object', new Date(), false],
+		['RegExp object', new RegExp(''), false],
+		['Map object', new Map(), false],
+		['Set object', new Set(), false],
+		['arrow function', () => {}, false],
+		['regular function', function () {}, false],
+		['class instance', new (class TestClass {})(), false],
+		['object with custom prototype', Object.create({ customMethod: () => {} }), true],
+		['Object.create(null)', Object.create(null), false],
+		['Buffer', Buffer.from('test'), false],
+		['Serialized Buffer', Buffer.from('test').toJSON(), true],
+		['Promise', new Promise(() => {}), false],
+	])('should return %s for %s', (_, input, expected) => {
+		expect(isObjectLiteral(input)).toBe(expected);
+	});
+
+	it('should return false for Error objects', () => {
+		expect(isObjectLiteral(new Error())).toBe(false);
+	});
+});
diff --git a/packages/core/src/utils/__tests__/serialized-buffer.test.ts b/packages/core/src/utils/__tests__/serialized-buffer.test.ts
new file mode 100644
index 0000000000..19b7df496d
--- /dev/null
+++ b/packages/core/src/utils/__tests__/serialized-buffer.test.ts
@@ -0,0 +1,55 @@
+import type { SerializedBuffer } from '../serialized-buffer';
+import { toBuffer, isSerializedBuffer } from '../serialized-buffer';
+
+// Mock data for tests
+const validSerializedBuffer: SerializedBuffer = {
+	type: 'Buffer',
+	data: [65, 66, 67], // Corresponds to 'ABC' in ASCII
+};
+
+describe('toBuffer', () => {
+	it('should convert a SerializedBuffer to a Buffer', () => {
+		const buffer = toBuffer(validSerializedBuffer);
+		expect(buffer).toBeInstanceOf(Buffer);
+		expect(buffer.toString()).toBe('ABC');
+	});
+
+	it('should serialize stringified buffer to the same buffer', () => {
+		const serializedBuffer = JSON.stringify(Buffer.from('n8n on the rocks'));
+		const buffer = toBuffer(JSON.parse(serializedBuffer));
+		expect(buffer).toBeInstanceOf(Buffer);
+		expect(buffer.toString()).toBe('n8n on the rocks');
+	});
+});
+
+describe('isSerializedBuffer', () => {
+	it('should return true for a valid SerializedBuffer', () => {
+		expect(isSerializedBuffer(validSerializedBuffer)).toBe(true);
+	});
+
+	test.each([
+		[{ data: [1, 2, 3] }],
+		[{ data: [1, 2, 256] }],
+		[{ type: 'Buffer', data: 'notAnArray' }],
+		[{ data: 42 }],
+		[{ data: 'test' }],
+		[{ data: true }],
+		[null],
+		[undefined],
+		[42],
+		[{}],
+	])('should return false for %s', (value) => {
+		expect(isSerializedBuffer(value)).toBe(false);
+	});
+});
+
+describe('Integration: toBuffer and isSerializedBuffer', () => {
+	it('should correctly validate and convert a SerializedBuffer', () => {
+		if (isSerializedBuffer(validSerializedBuffer)) {
+			const buffer = toBuffer(validSerializedBuffer);
+			expect(buffer.toString()).toBe('ABC');
+		} else {
+			fail('Expected validSerializedBuffer to be a SerializedBuffer');
+		}
+	});
+});
diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts
new file mode 100644
index 0000000000..4973c13417
--- /dev/null
+++ b/packages/core/src/utils/index.ts
@@ -0,0 +1,2 @@
+export * from './serialized-buffer';
+export { isObjectLiteral } from './is-object-literal';
diff --git a/packages/core/src/utils/is-object-literal.ts b/packages/core/src/utils/is-object-literal.ts
new file mode 100644
index 0000000000..c0d29c83dc
--- /dev/null
+++ b/packages/core/src/utils/is-object-literal.ts
@@ -0,0 +1,18 @@
+type ObjectLiteral = { [key: string | symbol]: unknown };
+
+/**
+ * Checks if the provided value is a plain object literal (not null, not an array, not a class instance, and not a primitive).
+ * This function serves as a type guard.
+ *
+ * @param candidate - The value to check
+ * @returns {boolean} True if the value is an object literal, false otherwise
+ */
+export function isObjectLiteral(candidate: unknown): candidate is ObjectLiteral {
+	return (
+		typeof candidate === 'object' &&
+		candidate !== null &&
+		!Array.isArray(candidate) &&
+		// eslint-disable-next-line @typescript-eslint/ban-types
+		(Object.getPrototypeOf(candidate) as Object)?.constructor?.name === 'Object'
+	);
+}
diff --git a/packages/core/src/utils/serialized-buffer.ts b/packages/core/src/utils/serialized-buffer.ts
new file mode 100644
index 0000000000..e98e1a0883
--- /dev/null
+++ b/packages/core/src/utils/serialized-buffer.ts
@@ -0,0 +1,22 @@
+import { isObjectLiteral } from './is-object-literal';
+
+/** A nodejs Buffer gone through JSON.stringify */
+export type SerializedBuffer = {
+	type: 'Buffer';
+	data: number[]; // Array like Uint8Array, each item is uint8 (0-255)
+};
+
+/** Converts the given SerializedBuffer to nodejs Buffer */
+export function toBuffer(serializedBuffer: SerializedBuffer): Buffer {
+	return Buffer.from(serializedBuffer.data);
+}
+
+export function isSerializedBuffer(candidate: unknown): candidate is SerializedBuffer {
+	return (
+		isObjectLiteral(candidate) &&
+		'type' in candidate &&
+		'data' in candidate &&
+		candidate.type === 'Buffer' &&
+		Array.isArray(candidate.data)
+	);
+}
diff --git a/packages/core/test/InstanceSettings.test.ts b/packages/core/test/InstanceSettings.test.ts
deleted file mode 100644
index 22f8fadff8..0000000000
--- a/packages/core/test/InstanceSettings.test.ts
+++ /dev/null
@@ -1,198 +0,0 @@
-import fs from 'fs';
-
-import { InstanceSettings } from '../src/InstanceSettings';
-import { InstanceSettingsConfig } from '../src/InstanceSettingsConfig';
-
-describe('InstanceSettings', () => {
-	process.env.N8N_USER_FOLDER = '/test';
-
-	const existSpy = jest.spyOn(fs, 'existsSync');
-	const statSpy = jest.spyOn(fs, 'statSync');
-	const chmodSpy = jest.spyOn(fs, 'chmodSync');
-
-	const createSettingsInstance = (opts?: Partial<InstanceSettingsConfig>) =>
-		new InstanceSettings({
-			...new InstanceSettingsConfig(),
-			...opts,
-		});
-
-	beforeEach(() => {
-		jest.resetAllMocks();
-		statSpy.mockReturnValue({ mode: 0o600 } as fs.Stats);
-	});
-
-	describe('If the settings file exists', () => {
-		const readSpy = jest.spyOn(fs, 'readFileSync');
-		beforeEach(() => {
-			existSpy.mockReturnValue(true);
-		});
-
-		it('should load settings from the file', () => {
-			readSpy.mockReturnValue(JSON.stringify({ encryptionKey: 'test_key' }));
-			const settings = createSettingsInstance();
-			expect(settings.encryptionKey).toEqual('test_key');
-			expect(settings.instanceId).toEqual(
-				'6ce26c63596f0cc4323563c529acfca0cccb0e57f6533d79a60a42c9ff862ae7',
-			);
-		});
-
-		it('should throw error if settings file is not valid JSON', () => {
-			readSpy.mockReturnValue('{"encryptionKey":"test_key"');
-			expect(() => createSettingsInstance()).toThrowError();
-		});
-
-		it('should throw if the env and file keys do not match', () => {
-			readSpy.mockReturnValue(JSON.stringify({ encryptionKey: 'key_1' }));
-			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			expect(() => createSettingsInstance()).toThrowError();
-		});
-
-		it('should check if the settings file has the correct permissions', () => {
-			process.env.N8N_ENCRYPTION_KEY = 'test_key';
-			readSpy.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			statSpy.mockReturnValueOnce({ mode: 0o600 } as fs.Stats);
-			const settings = createSettingsInstance();
-			expect(settings.encryptionKey).toEqual('test_key');
-			expect(settings.instanceId).toEqual(
-				'6ce26c63596f0cc4323563c529acfca0cccb0e57f6533d79a60a42c9ff862ae7',
-			);
-			expect(statSpy).toHaveBeenCalledWith('/test/.n8n/config');
-		});
-
-		it('should check the permissions but not fix them if settings file has incorrect permissions by default', () => {
-			readSpy.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			statSpy.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
-			createSettingsInstance();
-			expect(statSpy).toHaveBeenCalledWith('/test/.n8n/config');
-			expect(chmodSpy).not.toHaveBeenCalled();
-		});
-
-		it("should not check the permissions if 'N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS' is false", () => {
-			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
-			readSpy.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			createSettingsInstance();
-			expect(statSpy).not.toHaveBeenCalled();
-			expect(chmodSpy).not.toHaveBeenCalled();
-		});
-
-		it("should fix the permissions of the settings file if 'N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS' is true", () => {
-			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'true';
-			readSpy.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			statSpy.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
-			createSettingsInstance({
-				enforceSettingsFilePermissions: true,
-			});
-			expect(statSpy).toHaveBeenCalledWith('/test/.n8n/config');
-			expect(chmodSpy).toHaveBeenCalledWith('/test/.n8n/config', 0o600);
-		});
-	});
-
-	describe('If the settings file does not exist', () => {
-		const mkdirSpy = jest.spyOn(fs, 'mkdirSync');
-		const writeFileSpy = jest.spyOn(fs, 'writeFileSync');
-		beforeEach(() => {
-			existSpy.mockReturnValue(false);
-			mkdirSpy.mockReturnValue('');
-			writeFileSpy.mockReturnValue();
-		});
-
-		it('should create a new settings file without explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is not set', () => {
-			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			const settings = createSettingsInstance();
-			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
-				'/test/.n8n/config',
-				expect.stringContaining('"encryptionKey":'),
-				{
-					encoding: 'utf-8',
-					mode: undefined,
-				},
-			);
-		});
-
-		it('should create a new settings file without explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false', () => {
-			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
-			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			const settings = createSettingsInstance();
-			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
-				'/test/.n8n/config',
-				expect.stringContaining('"encryptionKey":'),
-				{
-					encoding: 'utf-8',
-					mode: undefined,
-				},
-			);
-		});
-
-		it('should create a new settings file with explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true', () => {
-			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'true';
-			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			const settings = createSettingsInstance({
-				enforceSettingsFilePermissions: true,
-			});
-			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
-				'/test/.n8n/config',
-				expect.stringContaining('"encryptionKey":'),
-				{
-					encoding: 'utf-8',
-					mode: 0o600,
-				},
-			);
-		});
-
-		it('should pick up the encryption key from env var N8N_ENCRYPTION_KEY', () => {
-			process.env.N8N_ENCRYPTION_KEY = 'env_key';
-			const settings = createSettingsInstance();
-			expect(settings.encryptionKey).toEqual('env_key');
-			expect(settings.instanceId).toEqual(
-				'2c70e12b7a0646f92279f427c7b38e7334d8e5389cff167a1dc30e73f826b683',
-			);
-			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
-				'/test/.n8n/config',
-				expect.stringContaining('"encryptionKey":'),
-				{
-					encoding: 'utf-8',
-					mode: undefined,
-				},
-			);
-		});
-
-		it("should not set the permissions of the settings file if 'N8N_IGNORE_SETTINGS_FILE_PERMISSIONS' is true", () => {
-			process.env.N8N_ENCRYPTION_KEY = 'key_2';
-			process.env.N8N_IGNORE_SETTINGS_FILE_PERMISSIONS = 'true';
-			const settings = createSettingsInstance();
-			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mkdirSpy).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(writeFileSpy).toHaveBeenCalledWith(
-				'/test/.n8n/config',
-				expect.stringContaining('"encryptionKey":'),
-				{
-					encoding: 'utf-8',
-					mode: undefined,
-				},
-			);
-		});
-	});
-
-	describe('constructor', () => {
-		it('should generate a `hostId`', () => {
-			const encryptionKey = 'test_key';
-			process.env.N8N_ENCRYPTION_KEY = encryptionKey;
-			jest.spyOn(fs, 'existsSync').mockReturnValueOnce(true);
-			jest.spyOn(fs, 'readFileSync').mockReturnValueOnce(JSON.stringify({ encryptionKey }));
-
-			const settings = createSettingsInstance();
-
-			const [instanceType, nanoid] = settings.hostId.split('-');
-			expect(instanceType).toEqual('main');
-			expect(nanoid).toHaveLength(16); // e.g. sDX6ZPc0bozv66zM
-		});
-	});
-});
diff --git a/packages/core/test/WorkflowExecute.test.ts b/packages/core/test/WorkflowExecute.test.ts
deleted file mode 100644
index 6d1927fb88..0000000000
--- a/packages/core/test/WorkflowExecute.test.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-import type { IRun, WorkflowTestData } from 'n8n-workflow';
-import {
-	ApplicationError,
-	createDeferredPromise,
-	NodeExecutionOutput,
-	Workflow,
-} from 'n8n-workflow';
-
-import { WorkflowExecute } from '@/WorkflowExecute';
-
-import * as Helpers from './helpers';
-import { legacyWorkflowExecuteTests, v1WorkflowExecuteTests } from './helpers/constants';
-
-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 () => {
-				const workflowInstance = new Workflow({
-					id: 'test',
-					nodes: testData.input.workflowData.nodes,
-					connections: testData.input.workflowData.connections,
-					active: false,
-					nodeTypes,
-					settings: {
-						executionOrder: 'v0',
-					},
-				});
-
-				const waitPromise = createDeferredPromise<IRun>();
-				const nodeExecutionOrder: string[] = [];
-				const additionalData = Helpers.WorkflowExecuteAdditionalData(
-					waitPromise,
-					nodeExecutionOrder,
-				);
-
-				const workflowExecute = new WorkflowExecute(additionalData, executionMode);
-
-				const executionData = await workflowExecute.run(workflowInstance);
-
-				const result = await waitPromise.promise;
-
-				// Check if the data from WorkflowExecute is identical to data received
-				// by the webhooks
-				expect(executionData).toEqual(result);
-
-				// Check if the output data of the nodes is correct
-				for (const nodeName of Object.keys(testData.output.nodeData)) {
-					if (result.data.resultData.runData[nodeName] === undefined) {
-						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
-					}
-
-					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
-						if (nodeData.data === undefined) {
-							return null;
-						}
-						return nodeData.data.main[0]!.map((entry) => entry.json);
-					});
-
-					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
-				}
-
-				// Check if the nodes did execute in the correct order
-				expect(nodeExecutionOrder).toEqual(testData.output.nodeExecutionOrder);
-
-				// Check if other data has correct value
-				expect(result.finished).toEqual(true);
-				expect(result.data.executionData!.contextData).toEqual({});
-				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
-			});
-		}
-	});
-
-	describe('v1 execution order', () => {
-		const tests: WorkflowTestData[] = v1WorkflowExecuteTests;
-
-		const executionMode = 'manual';
-		const nodeTypes = Helpers.NodeTypes();
-
-		for (const testData of tests) {
-			test(testData.description, async () => {
-				const workflowInstance = new Workflow({
-					id: 'test',
-					nodes: testData.input.workflowData.nodes,
-					connections: testData.input.workflowData.connections,
-					active: false,
-					nodeTypes,
-					settings: {
-						executionOrder: 'v1',
-					},
-				});
-
-				const waitPromise = createDeferredPromise<IRun>();
-				const nodeExecutionOrder: string[] = [];
-				const additionalData = Helpers.WorkflowExecuteAdditionalData(
-					waitPromise,
-					nodeExecutionOrder,
-				);
-
-				const workflowExecute = new WorkflowExecute(additionalData, executionMode);
-
-				const executionData = await workflowExecute.run(workflowInstance);
-
-				const result = await waitPromise.promise;
-
-				// Check if the data from WorkflowExecute is identical to data received
-				// by the webhooks
-				expect(executionData).toEqual(result);
-
-				// Check if the output data of the nodes is correct
-				for (const nodeName of Object.keys(testData.output.nodeData)) {
-					if (result.data.resultData.runData[nodeName] === undefined) {
-						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
-					}
-
-					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
-						if (nodeData.data === undefined) {
-							return null;
-						}
-						const toMap = testData.output.testAllOutputs
-							? nodeData.data.main
-							: [nodeData.data.main[0]!];
-						return toMap.map((data) => data!.map((entry) => entry.json));
-					});
-
-					// expect(resultData).toEqual(testData.output.nodeData[nodeName]);
-					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
-				}
-
-				// Check if the nodes did execute in the correct order
-				expect(nodeExecutionOrder).toEqual(testData.output.nodeExecutionOrder);
-
-				// Check if other data has correct value
-				expect(result.finished).toEqual(true);
-				expect(result.data.executionData!.contextData).toEqual({});
-				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
-			});
-		}
-	});
-
-	//run tests on json files from specified directory, default 'workflows'
-	//workflows must have pinned data that would be used to test output after execution
-	describe('run test workflows', () => {
-		const tests: WorkflowTestData[] = Helpers.workflowToTests(__dirname);
-
-		const executionMode = 'manual';
-		const nodeTypes = Helpers.NodeTypes(Helpers.getNodeTypes(tests));
-
-		for (const testData of tests) {
-			test(testData.description, async () => {
-				const workflowInstance = new Workflow({
-					id: 'test',
-					nodes: testData.input.workflowData.nodes,
-					connections: testData.input.workflowData.connections,
-					active: false,
-					nodeTypes,
-					settings: testData.input.workflowData.settings,
-				});
-
-				const waitPromise = createDeferredPromise<IRun>();
-				const nodeExecutionOrder: string[] = [];
-				const additionalData = Helpers.WorkflowExecuteAdditionalData(
-					waitPromise,
-					nodeExecutionOrder,
-				);
-
-				const workflowExecute = new WorkflowExecute(additionalData, executionMode);
-
-				const executionData = await workflowExecute.run(workflowInstance);
-
-				const result = await waitPromise.promise;
-
-				// Check if the data from WorkflowExecute is identical to data received
-				// by the webhooks
-				expect(executionData).toEqual(result);
-
-				// Check if the output data of the nodes is correct
-				for (const nodeName of Object.keys(testData.output.nodeData)) {
-					if (result.data.resultData.runData[nodeName] === undefined) {
-						throw new ApplicationError('Data for node is missing', { extra: { nodeName } });
-					}
-
-					const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
-						if (nodeData.data === undefined) {
-							return null;
-						}
-						return nodeData.data.main[0];
-					});
-
-					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
-				}
-
-				// Check if other data has correct value
-				expect(result.finished).toEqual(true);
-				// expect(result.data.executionData!.contextData).toEqual({}); //Fails when test workflow Includes splitInbatches
-				expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
-			});
-		}
-	});
-
-	describe('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 } }]],
-			[{ message: 'TEXT HINT' }],
-		);
-
-		expect(nodeExecutionOutput).toBeInstanceOf(NodeExecutionOutput);
-		expect(nodeExecutionOutput[0][0].json.data).toEqual(123);
-		expect(nodeExecutionOutput.getHints()[0].message).toEqual('TEXT HINT');
-	});
-});
diff --git a/packages/core/test/helpers/constants.ts b/packages/core/test/helpers/constants.ts
index f3de1c667c..e67caadd1e 100644
--- a/packages/core/test/helpers/constants.ts
+++ b/packages/core/test/helpers/constants.ts
@@ -7,9 +7,11 @@ 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';
+import { SplitInBatches } from '../../../nodes-base/dist/nodes/SplitInBatches/SplitInBatches.node';
 import { Start } from '../../../nodes-base/dist/nodes/Start/Start.node';
 
 export const predefinedNodesTypes: INodeTypeData = {
@@ -33,6 +35,14 @@ export const predefinedNodesTypes: INodeTypeData = {
 		type: new Start(),
 		sourcePath: '',
 	},
+	'n8n-nodes-base.manualTrigger': {
+		type: new ManualTrigger(),
+		sourcePath: '',
+	},
+	'n8n-nodes-base.splitInBatches': {
+		type: new SplitInBatches(),
+		sourcePath: '',
+	},
 	'n8n-nodes-base.versionTest': {
 		sourcePath: '',
 		type: {
@@ -92,6 +102,89 @@ export const predefinedNodesTypes: INodeTypeData = {
 			},
 		},
 	},
+	'test.set': {
+		sourcePath: '',
+		type: {
+			description: {
+				displayName: 'Set',
+				name: 'set',
+				group: ['input'],
+				version: 1,
+				description: 'Sets a value',
+				defaults: {
+					name: 'Set',
+					color: '#0000FF',
+				},
+				inputs: [NodeConnectionType.Main],
+				outputs: [NodeConnectionType.Main],
+				properties: [
+					{
+						displayName: 'Value1',
+						name: 'value1',
+						type: 'string',
+						default: 'default-value1',
+					},
+					{
+						displayName: 'Value2',
+						name: 'value2',
+						type: 'string',
+						default: 'default-value2',
+					},
+				],
+			},
+		},
+	},
+	'test.setMulti': {
+		sourcePath: '',
+		type: {
+			description: {
+				displayName: 'Set Multi',
+				name: 'setMulti',
+				group: ['input'],
+				version: 1,
+				description: 'Sets multiple values',
+				defaults: {
+					name: 'Set Multi',
+					color: '#0000FF',
+				},
+				inputs: [NodeConnectionType.Main],
+				outputs: [NodeConnectionType.Main],
+				properties: [
+					{
+						displayName: 'Values',
+						name: 'values',
+						type: 'fixedCollection',
+						typeOptions: {
+							multipleValues: true,
+						},
+						default: {},
+						options: [
+							{
+								name: 'string',
+								displayName: 'String',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: 'propertyName',
+										placeholder: 'Name of the property to write data to.',
+									},
+									{
+										displayName: 'Value',
+										name: 'value',
+										type: 'string',
+										default: '',
+										placeholder: 'The string value to write in the property.',
+									},
+								],
+							},
+						],
+					},
+				],
+			},
+		},
+	},
 };
 
 export const legacyWorkflowExecuteTests: WorkflowTestData[] = [
diff --git a/packages/core/test/helpers/index.ts b/packages/core/test/helpers/index.ts
index 5f0858ea41..28cec2dff2 100644
--- a/packages/core/test/helpers/index.ts
+++ b/packages/core/test/helpers/index.ts
@@ -17,12 +17,14 @@ import type {
 import { ApplicationError, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
 import path from 'path';
 
+import { UnrecognizedNodeTypeError } from '@/errors';
+
 import { predefinedNodesTypes } from './constants';
 
 const BASE_DIR = path.resolve(__dirname, '../../..');
 
 class NodeTypesClass implements INodeTypes {
-	constructor(private nodeTypes: INodeTypeData = predefinedNodesTypes) {}
+	constructor(private nodeTypes: INodeTypeData) {}
 
 	getByName(nodeType: string): INodeType | IVersionedNodeType {
 		return this.nodeTypes[nodeType].type;
@@ -39,7 +41,7 @@ class NodeTypesClass implements INodeTypes {
 
 let nodeTypesInstance: NodeTypesClass | undefined;
 
-export function NodeTypes(nodeTypes?: INodeTypeData): INodeTypes {
+export function NodeTypes(nodeTypes: INodeTypeData = predefinedNodesTypes): INodeTypes {
 	if (nodeTypesInstance === undefined || nodeTypes !== undefined) {
 		nodeTypesInstance = new NodeTypesClass(nodeTypes);
 	}
@@ -83,8 +85,7 @@ const preparePinData = (pinData: IDataObject) => {
 	return returnData;
 };
 
-const readJsonFileSync = <T>(filePath: string) =>
-	JSON.parse(readFileSync(path.join(BASE_DIR, filePath), 'utf-8')) as T;
+const readJsonFileSync = <T>(filePath: string) => JSON.parse(readFileSync(filePath, 'utf-8')) as T;
 
 export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
 	if (!Array.isArray(testData)) {
@@ -98,16 +99,13 @@ export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
 	const nodeNames = nodes.map((n) => n.type);
 
 	const knownNodes = readJsonFileSync<Record<string, NodeLoadingDetails>>(
-		'nodes-base/dist/known/nodes.json',
+		path.join(BASE_DIR, 'nodes-base/dist/known/nodes.json'),
 	);
 
 	for (const nodeName of nodeNames) {
-		if (!nodeName.startsWith('n8n-nodes-base.')) {
-			throw new ApplicationError('Unknown node type', { tags: { nodeType: nodeName } });
-		}
 		const loadInfo = knownNodes[nodeName.replace('n8n-nodes-base.', '')];
 		if (!loadInfo) {
-			throw new ApplicationError('Unknown node type', { tags: { nodeType: nodeName } });
+			throw new UnrecognizedNodeTypeError('n8n-nodes-base', nodeName);
 		}
 		const sourcePath = loadInfo.sourcePath.replace(/^dist\//, './').replace(/\.js$/, '.ts');
 		const nodeSourcePath = path.join(BASE_DIR, 'nodes-base', sourcePath);
@@ -121,14 +119,14 @@ export function getNodeTypes(testData: WorkflowTestData[] | WorkflowTestData) {
 	return nodeTypes;
 }
 
-const getWorkflowFilenames = (dirname: string, testFolder = 'workflows') => {
+const getWorkflowFilepaths = (dirname: string, testFolder = 'workflows') => {
 	const workflows: string[] = [];
 
 	const filenames: string[] = readdirSync(`${dirname}${path.sep}${testFolder}`);
 
 	filenames.forEach((file) => {
 		if (file.endsWith('.json')) {
-			workflows.push(path.join('core', 'test', testFolder, file));
+			workflows.push(path.join(dirname, testFolder, file));
 		}
 	});
 
@@ -136,11 +134,11 @@ const getWorkflowFilenames = (dirname: string, testFolder = 'workflows') => {
 };
 
 export const workflowToTests = (dirname: string, testFolder = 'workflows') => {
-	const workflowFiles: string[] = getWorkflowFilenames(dirname, testFolder);
+	const workflowFilepaths: string[] = getWorkflowFilepaths(dirname, testFolder);
 
 	const testCases: WorkflowTestData[] = [];
 
-	for (const filePath of workflowFiles) {
+	for (const filePath of workflowFilepaths) {
 		const description = filePath.replace('.json', '');
 		const workflowData = readJsonFileSync<IWorkflowBase>(filePath);
 		if (workflowData.pinData === undefined) {
diff --git a/packages/core/test/setup-mocks.ts b/packages/core/test/setup-mocks.ts
index d2c9bc6e64..c36ff529c2 100644
--- a/packages/core/test/setup-mocks.ts
+++ b/packages/core/test/setup-mocks.ts
@@ -1 +1,6 @@
 import 'reflect-metadata';
+
+// WebCrypto Polyfill for older versions of Node.js 18
+if (!globalThis.crypto?.getRandomValues) {
+	globalThis.crypto = require('node:crypto').webcrypto;
+}
diff --git a/packages/core/test/utils.ts b/packages/core/test/utils.ts
index f1ed54dd03..49db471e7e 100644
--- a/packages/core/test/utils.ts
+++ b/packages/core/test/utils.ts
@@ -1,8 +1,8 @@
+import type { Constructable } from '@n8n/di';
+import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { Duplex } from 'stream';
 import type { DeepPartial } from 'ts-essentials';
-import type { Constructable } from 'typedi';
-import { Container } from 'typedi';
 
 export const mockInstance = <T>(
 	constructor: Constructable<T>,
diff --git a/packages/core/tsconfig.json b/packages/core/tsconfig.json
index 401bb177c4..0fbcc8b81a 100644
--- a/packages/core/tsconfig.json
+++ b/packages/core/tsconfig.json
@@ -4,7 +4,8 @@
 		"rootDir": ".",
 		"baseUrl": "src",
 		"paths": {
-			"@/*": ["./*"]
+			"@/*": ["./*"],
+			"@test/*": ["../test/*"]
 		},
 		"tsBuildInfoFile": "dist/typecheck.tsbuildinfo",
 		"emitDecoratorMetadata": true,
@@ -15,6 +16,8 @@
 	"include": ["src/**/*.ts", "test/**/*.ts"],
 	"references": [
 		{ "path": "../workflow/tsconfig.build.json" },
+		{ "path": "../@n8n/config/tsconfig.build.json" },
+		{ "path": "../@n8n/di/tsconfig.build.json" },
 		{ "path": "../@n8n/client-oauth2/tsconfig.build.json" }
 	]
 }
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 8aec0ab60f..e550447a33 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "1.55.0",
+  "version": "1.65.0",
   "main": "src/main.ts",
   "import": "src/main.ts",
   "scripts": {
@@ -11,7 +11,7 @@
     "test": "vitest run",
     "test:dev": "vitest",
     "build:storybook": "storybook build",
-    "storybook": "storybook dev -p 6006",
+    "storybook": "storybook dev -p 6006 --no-open",
     "chromatic": "chromatic",
     "format": "biome format --write .  && prettier --write . --ignore-path ../../.prettierignore",
     "format:check": "biome ci .  && prettier --check . --ignore-path ../../.prettierignore",
@@ -27,7 +27,7 @@
     "@types/markdown-it-emoji": "^2.0.2",
     "@types/markdown-it-link-attributes": "^3.0.5",
     "@types/sanitize-html": "^2.11.0",
-    "@vitejs/plugin-vue": "^5.1.4",
+    "@vitejs/plugin-vue": "catalog:frontend",
     "@vitest/coverage-v8": "catalog:frontend",
     "autoprefixer": "^10.4.19",
     "postcss": "^8.4.38",
@@ -45,6 +45,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/vue-fontawesome": "^3.0.3",
     "element-plus": "2.4.3",
+    "is-emoji-supported": "^0.0.5",
     "markdown-it": "^13.0.2",
     "markdown-it-emoji": "^2.0.2",
     "markdown-it-link-attributes": "^4.0.1",
@@ -55,5 +56,8 @@
     "vue-boring-avatars": "^1.3.0",
     "vue-router": "catalog:frontend",
     "xss": "catalog:"
+  },
+  "peerDependencies": {
+    "@vueuse/core": "*"
   }
 }
diff --git a/packages/design-system/src/__tests__/setup.ts b/packages/design-system/src/__tests__/setup.ts
index 981c9d5a60..5c091e2925 100644
--- a/packages/design-system/src/__tests__/setup.ts
+++ b/packages/design-system/src/__tests__/setup.ts
@@ -15,3 +15,8 @@ window.ResizeObserver =
 		observe: vi.fn(),
 		unobserve: vi.fn(),
 	}));
+
+// Globally mock is-emoji-supported
+vi.mock('is-emoji-supported', () => ({
+	isEmojiSupported: () => true,
+}));
diff --git a/packages/design-system/src/components/AskAssistantAvatar/__tests__/AskAssistantAvatar.spec.ts b/packages/design-system/src/components/AskAssistantAvatar/AskAssistantAvatar.test.ts
similarity index 89%
rename from packages/design-system/src/components/AskAssistantAvatar/__tests__/AskAssistantAvatar.spec.ts
rename to packages/design-system/src/components/AskAssistantAvatar/AskAssistantAvatar.test.ts
index f77e9d1e37..c6392f2305 100644
--- a/packages/design-system/src/components/AskAssistantAvatar/__tests__/AskAssistantAvatar.spec.ts
+++ b/packages/design-system/src/components/AskAssistantAvatar/AskAssistantAvatar.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import AssistantAvatar from '../AssistantAvatar.vue';
+import AssistantAvatar from './AssistantAvatar.vue';
 
 describe('AskAssistantAvatar', () => {
 	it('renders small avatar correctly', () => {
diff --git a/packages/design-system/src/components/AskAssistantAvatar/__tests__/__snapshots__/AskAssistantAvatar.spec.ts.snap b/packages/design-system/src/components/AskAssistantAvatar/__snapshots__/AskAssistantAvatar.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantAvatar/__tests__/__snapshots__/AskAssistantAvatar.spec.ts.snap
rename to packages/design-system/src/components/AskAssistantAvatar/__snapshots__/AskAssistantAvatar.test.ts.snap
diff --git a/packages/design-system/src/components/AskAssistantButton/__tests__/AskAssistantButton.spec.ts b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.test.ts
similarity index 88%
rename from packages/design-system/src/components/AskAssistantButton/__tests__/AskAssistantButton.spec.ts
rename to packages/design-system/src/components/AskAssistantButton/AskAssistantButton.test.ts
index 3edf52e279..a0e669352c 100644
--- a/packages/design-system/src/components/AskAssistantButton/__tests__/AskAssistantButton.spec.ts
+++ b/packages/design-system/src/components/AskAssistantButton/AskAssistantButton.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import AskAssistantButton from '../AskAssistantButton.vue';
+import AskAssistantButton from './AskAssistantButton.vue';
 
 describe('AskAssistantButton', () => {
 	it('renders default button correctly', () => {
diff --git a/packages/design-system/src/components/AskAssistantButton/__tests__/__snapshots__/AskAssistantButton.spec.ts.snap b/packages/design-system/src/components/AskAssistantButton/__snapshots__/AskAssistantButton.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantButton/__tests__/__snapshots__/AskAssistantButton.spec.ts.snap
rename to packages/design-system/src/components/AskAssistantButton/__snapshots__/AskAssistantButton.test.ts.snap
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/__tests__/AskAssistantChat.spec.ts b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
similarity index 99%
rename from packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
rename to packages/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
index 003755561e..9874965e82 100644
--- a/packages/design-system/src/components/AskAssistantChat/__tests__/AskAssistantChat.spec.ts
+++ b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.test.ts
@@ -2,7 +2,7 @@ import { render } from '@testing-library/vue';
 
 import { n8nHtml } from 'n8n-design-system/directives';
 
-import AskAssistantChat from '../AskAssistantChat.vue';
+import AskAssistantChat from './AskAssistantChat.vue';
 
 const stubs = ['n8n-avatar', 'n8n-button', 'n8n-icon', 'n8n-icon-button'];
 
diff --git a/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue b/packages/design-system/src/components/AskAssistantChat/AskAssistantChat.vue
index 78b4ccbf51..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"
@@ -317,6 +326,7 @@ async function onCopyButtonClick(content: string, e: MouseEvent) {
 			<textarea
 				ref="chatInput"
 				v-model="textInputValue"
+				class="ignore-key-press-node-creator ignore-key-press-canvas"
 				:disabled="sessionEnded"
 				:placeholder="t('assistantChat.inputPlaceholder')"
 				rows="1"
@@ -343,6 +353,8 @@ async function onCopyButtonClick(content: string, e: MouseEvent) {
 .container {
 	height: 100%;
 	position: relative;
+	display: grid;
+	grid-template-rows: auto 1fr auto;
 }
 
 p {
@@ -372,10 +384,6 @@ p {
 	background-color: var(--color-background-light);
 	border: var(--border-base);
 	border-top: 0;
-	height: 100%;
-	overflow-x: hidden;
-	overflow-y: auto;
-	padding-bottom: 250px; // make scrollable at the end
 	position: relative;
 
 	pre,
@@ -389,7 +397,13 @@ p {
 }
 
 .messages {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 100%;
 	padding: var(--spacing-xs);
+	overflow-y: auto;
 
 	& + & {
 		padding-top: 0;
@@ -400,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 {
@@ -532,13 +550,11 @@ code[class^='language-'] {
 }
 
 .inputWrapper {
-	position: absolute;
 	display: flex;
-	bottom: 0;
 	background-color: var(--color-foreground-xlight);
 	border: var(--border-base);
 	width: 100%;
-	padding-top: 1px;
+	border-top: 0;
 
 	textarea {
 		border: none;
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
new file mode 100644
index 0000000000..d9c3b68e3f
--- /dev/null
+++ b/packages/design-system/src/components/AskAssistantChat/__snapshots__/AskAssistantChat.test.ts.snap
@@ -0,0 +1,1950 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`AskAssistantChat > does not render retry button if no error is present 1`] = `
+<div>
+  <div
+    class="container"
+  >
+    <div
+      class="header"
+    >
+      <div
+        class="chatTitle"
+      >
+        <div
+          class="headerText"
+        >
+          <svg
+            fill="none"
+            height="18"
+            viewBox="0 0 24 24"
+            width="18"
+            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 large"
+          >
+            AI Assistant
+          </span>
+        </div>
+        <div
+          class="beta"
+        >
+          beta
+        </div>
+      </div>
+      <div
+        class="back"
+        data-test-id="close-chat-button"
+      >
+        <n8n-icon-stub
+          color="text-base"
+          icon="arrow-right"
+        />
+      </div>
+    </div>
+    <div
+      class="body"
+    >
+      <div
+        class="messages"
+      >
+        <div>
+          
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <div
+              class="roleName"
+            >
+              <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>
+        <!--v-if-->
+      </div>
+    </div>
+    <div
+      class="inputWrapper"
+      data-test-id="chat-input-wrapper"
+    >
+      <textarea
+        class="ignore-key-press-node-creator ignore-key-press-canvas"
+        data-test-id="chat-input"
+        placeholder="Enter your response..."
+        rows="1"
+        wrap="hard"
+      />
+      <n8n-icon-button-stub
+        class="sendButton"
+        data-test-id="send-message-button"
+        disabled="true"
+        icon="paper-plane"
+        size="large"
+        type="text"
+      />
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
+<div>
+  <div
+    class="container"
+  >
+    <div
+      class="header"
+    >
+      <div
+        class="chatTitle"
+      >
+        <div
+          class="headerText"
+        >
+          <svg
+            fill="none"
+            height="18"
+            viewBox="0 0 24 24"
+            width="18"
+            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 large"
+          >
+            AI Assistant
+          </span>
+        </div>
+        <div
+          class="beta"
+        >
+          beta
+        </div>
+      </div>
+      <div
+        class="back"
+        data-test-id="close-chat-button"
+      >
+        <n8n-icon-stub
+          color="text-base"
+          icon="arrow-right"
+        />
+      </div>
+    </div>
+    <div
+      class="body"
+    >
+      <div
+        class="messages"
+      >
+        <div>
+          
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <div
+              class="roleName"
+            >
+              <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"
+              >
+                <div
+                  class="title"
+                >
+                  Short solution description here that can spill over to two lines
+                </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 -->
+                       
+                    </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>
+                <div
+                  class="blockBody"
+                >
+                  <span
+                    class="rendered-content"
+                  >
+                    <p>
+                      Solution steps:
+                    </p>
+                    
+
+                    <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>
+                      
+
+                    </ol>
+                    
+
+                    <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"
+                  />
+                </div>
+              </div>
+            </div>
+            <div
+              class="quickReplies"
+            >
+              <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>
+    </div>
+    <div
+      class="inputWrapper"
+      data-test-id="chat-input-wrapper"
+    >
+      <textarea
+        class="ignore-key-press-node-creator ignore-key-press-canvas"
+        data-test-id="chat-input"
+        placeholder="Enter your response..."
+        rows="1"
+        wrap="hard"
+      />
+      <n8n-icon-button-stub
+        class="sendButton"
+        data-test-id="send-message-button"
+        disabled="true"
+        icon="paper-plane"
+        size="large"
+        type="text"
+      />
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AskAssistantChat > renders default placeholder chat correctly 1`] = `
+<div>
+  <div
+    class="container"
+  >
+    <div
+      class="header"
+    >
+      <div
+        class="chatTitle"
+      >
+        <div
+          class="headerText"
+        >
+          <svg
+            fill="none"
+            height="18"
+            viewBox="0 0 24 24"
+            width="18"
+            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 large"
+          >
+            AI Assistant
+          </span>
+        </div>
+        <div
+          class="beta"
+        >
+          beta
+        </div>
+      </div>
+      <div
+        class="back"
+        data-test-id="close-chat-button"
+      >
+        <n8n-icon-stub
+          color="text-base"
+          icon="arrow-right"
+        />
+      </div>
+    </div>
+    <div
+      class="body"
+    >
+      <div
+        class="placeholder"
+        data-test-id="placeholder-message"
+      >
+        <div
+          class="greeting"
+        >
+          Hi Kobi 👋
+        </div>
+        <div
+          class="info"
+        >
+          <p>
+            I can answer most questions about building workflows in n8n.
+          </p>
+          <p>
+            For specific tasks, you’ll see the 
+            <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>
+             button in the UI.
+          </p>
+          <p>
+            How can I help?
+          </p>
+        </div>
+      </div>
+    </div>
+    <div
+      class="inputWrapper"
+      data-test-id="chat-input-wrapper"
+    >
+      <textarea
+        class="ignore-key-press-node-creator ignore-key-press-canvas"
+        data-test-id="chat-input"
+        placeholder="Enter your response..."
+        rows="1"
+        wrap="hard"
+      />
+      <n8n-icon-button-stub
+        class="sendButton"
+        data-test-id="send-message-button"
+        disabled="true"
+        icon="paper-plane"
+        size="large"
+        type="text"
+      />
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
+<div>
+  <div
+    class="container"
+  >
+    <div
+      class="header"
+    >
+      <div
+        class="chatTitle"
+      >
+        <div
+          class="headerText"
+        >
+          <svg
+            fill="none"
+            height="18"
+            viewBox="0 0 24 24"
+            width="18"
+            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 large"
+          >
+            AI Assistant
+          </span>
+        </div>
+        <div
+          class="beta"
+        >
+          beta
+        </div>
+      </div>
+      <div
+        class="back"
+        data-test-id="close-chat-button"
+      >
+        <n8n-icon-stub
+          color="text-base"
+          icon="arrow-right"
+        />
+      </div>
+    </div>
+    <div
+      class="body"
+    >
+      <div
+        class="messages"
+      >
+        <div>
+          
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <div
+              class="roleName"
+            >
+              <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
+              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>
+    </div>
+    <div
+      class="inputWrapper disabledInput"
+      data-test-id="chat-input-wrapper"
+    >
+      <textarea
+        class="ignore-key-press-node-creator ignore-key-press-canvas"
+        data-test-id="chat-input"
+        disabled=""
+        placeholder="Enter your response..."
+        rows="1"
+        wrap="hard"
+      />
+      <n8n-icon-button-stub
+        class="sendButton"
+        data-test-id="send-message-button"
+        disabled="true"
+        icon="paper-plane"
+        size="large"
+        type="text"
+      />
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AskAssistantChat > renders error message correctly with retry button 1`] = `
+<div>
+  <div
+    class="container"
+  >
+    <div
+      class="header"
+    >
+      <div
+        class="chatTitle"
+      >
+        <div
+          class="headerText"
+        >
+          <svg
+            fill="none"
+            height="18"
+            viewBox="0 0 24 24"
+            width="18"
+            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 large"
+          >
+            AI Assistant
+          </span>
+        </div>
+        <div
+          class="beta"
+        >
+          beta
+        </div>
+      </div>
+      <div
+        class="back"
+        data-test-id="close-chat-button"
+      >
+        <n8n-icon-stub
+          color="text-base"
+          icon="arrow-right"
+        />
+      </div>
+    </div>
+    <div
+      class="body"
+    >
+      <div
+        class="messages"
+      >
+        <div>
+          
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <div
+              class="roleName"
+            >
+              <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="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>
+        <!--v-if-->
+      </div>
+    </div>
+    <div
+      class="inputWrapper"
+      data-test-id="chat-input-wrapper"
+    >
+      <textarea
+        class="ignore-key-press-node-creator ignore-key-press-canvas"
+        data-test-id="chat-input"
+        placeholder="Enter your response..."
+        rows="1"
+        wrap="hard"
+      />
+      <n8n-icon-button-stub
+        class="sendButton"
+        data-test-id="send-message-button"
+        disabled="true"
+        icon="paper-plane"
+        size="large"
+        type="text"
+      />
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AskAssistantChat > renders message with code snippet 1`] = `
+<div>
+  <div
+    class="container"
+  >
+    <div
+      class="header"
+    >
+      <div
+        class="chatTitle"
+      >
+        <div
+          class="headerText"
+        >
+          <svg
+            fill="none"
+            height="18"
+            viewBox="0 0 24 24"
+            width="18"
+            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 large"
+          >
+            AI Assistant
+          </span>
+        </div>
+        <div
+          class="beta"
+        >
+          beta
+        </div>
+      </div>
+      <div
+        class="back"
+        data-test-id="close-chat-button"
+      >
+        <n8n-icon-stub
+          color="text-base"
+          icon="arrow-right"
+        />
+      </div>
+    </div>
+    <div
+      class="body"
+    >
+      <div
+        class="messages"
+      >
+        <div>
+          
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <div
+              class="roleName"
+            >
+              <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>
+              <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>
+          
+        </div>
+        <!--v-if-->
+      </div>
+    </div>
+    <div
+      class="inputWrapper"
+      data-test-id="chat-input-wrapper"
+    >
+      <textarea
+        class="ignore-key-press-node-creator ignore-key-press-canvas"
+        data-test-id="chat-input"
+        placeholder="Enter your response..."
+        rows="1"
+        wrap="hard"
+      />
+      <n8n-icon-button-stub
+        class="sendButton"
+        data-test-id="send-message-button"
+        disabled="true"
+        icon="paper-plane"
+        size="large"
+        type="text"
+      />
+    </div>
+  </div>
+</div>
+`;
+
+exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
+<div>
+  <div
+    class="container"
+  >
+    <div
+      class="header"
+    >
+      <div
+        class="chatTitle"
+      >
+        <div
+          class="headerText"
+        >
+          <svg
+            fill="none"
+            height="18"
+            viewBox="0 0 24 24"
+            width="18"
+            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 large"
+          >
+            AI Assistant
+          </span>
+        </div>
+        <div
+          class="beta"
+        >
+          beta
+        </div>
+      </div>
+      <div
+        class="back"
+        data-test-id="close-chat-button"
+      >
+        <n8n-icon-stub
+          color="text-base"
+          icon="arrow-right"
+        />
+      </div>
+    </div>
+    <div
+      class="body"
+    >
+      <div
+        class="messages"
+      >
+        <div>
+          
+          <div
+            class="message"
+            data-test-id="chat-message-assistant"
+          >
+            <div
+              class="roleName"
+            >
+              <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-->
+              <span
+                class="blinking-cursor"
+              />
+            </div>
+            <!--v-if-->
+          </div>
+          
+        </div>
+        <!--v-if-->
+      </div>
+    </div>
+    <div
+      class="inputWrapper"
+      data-test-id="chat-input-wrapper"
+    >
+      <textarea
+        class="ignore-key-press-node-creator ignore-key-press-canvas"
+        data-test-id="chat-input"
+        placeholder="Enter your response..."
+        rows="1"
+        wrap="hard"
+      />
+      <n8n-icon-button-stub
+        class="sendButton"
+        data-test-id="send-message-button"
+        disabled="true"
+        icon="paper-plane"
+        size="large"
+        type="text"
+      />
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap b/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap
deleted file mode 100644
index c26913e405..0000000000
--- a/packages/design-system/src/components/AskAssistantChat/__tests__/__snapshots__/AskAssistantChat.spec.ts.snap
+++ /dev/null
@@ -1,1932 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`AskAssistantChat > does not render retry button if no error is present 1`] = `
-<div>
-  <div
-    class="container"
-  >
-    <div
-      class="header"
-    >
-      <div
-        class="chatTitle"
-      >
-        <div
-          class="headerText"
-        >
-          <svg
-            fill="none"
-            height="18"
-            viewBox="0 0 24 24"
-            width="18"
-            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 large"
-          >
-            AI Assistant
-          </span>
-        </div>
-        <div
-          class="beta"
-        >
-          beta
-        </div>
-      </div>
-      <div
-        class="back"
-        data-test-id="close-chat-button"
-      >
-        <n8n-icon-stub
-          color="text-base"
-          icon="arrow-right"
-        />
-      </div>
-    </div>
-    <div
-      class="body"
-    >
-      <div
-        class="messages"
-      >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <div
-            class="roleName"
-          >
-            <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>
-      <!--v-if-->
-    </div>
-    <div
-      class="inputWrapper"
-      data-test-id="chat-input-wrapper"
-    >
-      <textarea
-        data-test-id="chat-input"
-        placeholder="Enter your response..."
-        rows="1"
-        wrap="hard"
-      />
-      <n8n-icon-button-stub
-        class="sendButton"
-        data-test-id="send-message-button"
-        disabled="true"
-        icon="paper-plane"
-        size="large"
-        type="text"
-      />
-    </div>
-  </div>
-</div>
-`;
-
-exports[`AskAssistantChat > renders chat with messages correctly 1`] = `
-<div>
-  <div
-    class="container"
-  >
-    <div
-      class="header"
-    >
-      <div
-        class="chatTitle"
-      >
-        <div
-          class="headerText"
-        >
-          <svg
-            fill="none"
-            height="18"
-            viewBox="0 0 24 24"
-            width="18"
-            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 large"
-          >
-            AI Assistant
-          </span>
-        </div>
-        <div
-          class="beta"
-        >
-          beta
-        </div>
-      </div>
-      <div
-        class="back"
-        data-test-id="close-chat-button"
-      >
-        <n8n-icon-stub
-          color="text-base"
-          icon="arrow-right"
-        />
-      </div>
-    </div>
-    <div
-      class="body"
-    >
-      <div
-        class="messages"
-      >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <div
-            class="roleName"
-          >
-            <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"
-            >
-              <div
-                class="title"
-              >
-                Short solution description here that can spill over to two lines
-              </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 -->
-                     
-                  </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>
-              <div
-                class="blockBody"
-              >
-                <span
-                  class="rendered-content"
-                >
-                  <p>
-                    Solution steps:
-                  </p>
-                  
-
-                  <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>
-                    
-
-                  </ol>
-                  
-
-                  <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"
-                />
-              </div>
-            </div>
-          </div>
-          <div
-            class="quickReplies"
-          >
-            <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>
-    <div
-      class="inputWrapper"
-      data-test-id="chat-input-wrapper"
-    >
-      <textarea
-        data-test-id="chat-input"
-        placeholder="Enter your response..."
-        rows="1"
-        wrap="hard"
-      />
-      <n8n-icon-button-stub
-        class="sendButton"
-        data-test-id="send-message-button"
-        disabled="true"
-        icon="paper-plane"
-        size="large"
-        type="text"
-      />
-    </div>
-  </div>
-</div>
-`;
-
-exports[`AskAssistantChat > renders default placeholder chat correctly 1`] = `
-<div>
-  <div
-    class="container"
-  >
-    <div
-      class="header"
-    >
-      <div
-        class="chatTitle"
-      >
-        <div
-          class="headerText"
-        >
-          <svg
-            fill="none"
-            height="18"
-            viewBox="0 0 24 24"
-            width="18"
-            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 large"
-          >
-            AI Assistant
-          </span>
-        </div>
-        <div
-          class="beta"
-        >
-          beta
-        </div>
-      </div>
-      <div
-        class="back"
-        data-test-id="close-chat-button"
-      >
-        <n8n-icon-stub
-          color="text-base"
-          icon="arrow-right"
-        />
-      </div>
-    </div>
-    <div
-      class="body"
-    >
-      <!--v-if-->
-      <div
-        class="placeholder"
-        data-test-id="placeholder-message"
-      >
-        <div
-          class="greeting"
-        >
-          Hi Kobi 👋
-        </div>
-        <div
-          class="info"
-        >
-          <p>
-            I can answer most questions about building workflows in n8n.
-          </p>
-          <p>
-            For specific tasks, you’ll see the 
-            <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>
-             button in the UI.
-          </p>
-          <p>
-            How can I help?
-          </p>
-        </div>
-      </div>
-    </div>
-    <div
-      class="inputWrapper"
-      data-test-id="chat-input-wrapper"
-    >
-      <textarea
-        data-test-id="chat-input"
-        placeholder="Enter your response..."
-        rows="1"
-        wrap="hard"
-      />
-      <n8n-icon-button-stub
-        class="sendButton"
-        data-test-id="send-message-button"
-        disabled="true"
-        icon="paper-plane"
-        size="large"
-        type="text"
-      />
-    </div>
-  </div>
-</div>
-`;
-
-exports[`AskAssistantChat > renders end of session chat correctly 1`] = `
-<div>
-  <div
-    class="container"
-  >
-    <div
-      class="header"
-    >
-      <div
-        class="chatTitle"
-      >
-        <div
-          class="headerText"
-        >
-          <svg
-            fill="none"
-            height="18"
-            viewBox="0 0 24 24"
-            width="18"
-            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 large"
-          >
-            AI Assistant
-          </span>
-        </div>
-        <div
-          class="beta"
-        >
-          beta
-        </div>
-      </div>
-      <div
-        class="back"
-        data-test-id="close-chat-button"
-      >
-        <n8n-icon-stub
-          color="text-base"
-          icon="arrow-right"
-        />
-      </div>
-    </div>
-    <div
-      class="body"
-    >
-      <div
-        class="messages"
-      >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <div
-            class="roleName"
-          >
-            <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
-            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>
-    <div
-      class="inputWrapper disabledInput"
-      data-test-id="chat-input-wrapper"
-    >
-      <textarea
-        data-test-id="chat-input"
-        disabled=""
-        placeholder="Enter your response..."
-        rows="1"
-        wrap="hard"
-      />
-      <n8n-icon-button-stub
-        class="sendButton"
-        data-test-id="send-message-button"
-        disabled="true"
-        icon="paper-plane"
-        size="large"
-        type="text"
-      />
-    </div>
-  </div>
-</div>
-`;
-
-exports[`AskAssistantChat > renders error message correctly with retry button 1`] = `
-<div>
-  <div
-    class="container"
-  >
-    <div
-      class="header"
-    >
-      <div
-        class="chatTitle"
-      >
-        <div
-          class="headerText"
-        >
-          <svg
-            fill="none"
-            height="18"
-            viewBox="0 0 24 24"
-            width="18"
-            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 large"
-          >
-            AI Assistant
-          </span>
-        </div>
-        <div
-          class="beta"
-        >
-          beta
-        </div>
-      </div>
-      <div
-        class="back"
-        data-test-id="close-chat-button"
-      >
-        <n8n-icon-stub
-          color="text-base"
-          icon="arrow-right"
-        />
-      </div>
-    </div>
-    <div
-      class="body"
-    >
-      <div
-        class="messages"
-      >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <div
-            class="roleName"
-          >
-            <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="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>
-      <!--v-if-->
-    </div>
-    <div
-      class="inputWrapper"
-      data-test-id="chat-input-wrapper"
-    >
-      <textarea
-        data-test-id="chat-input"
-        placeholder="Enter your response..."
-        rows="1"
-        wrap="hard"
-      />
-      <n8n-icon-button-stub
-        class="sendButton"
-        data-test-id="send-message-button"
-        disabled="true"
-        icon="paper-plane"
-        size="large"
-        type="text"
-      />
-    </div>
-  </div>
-</div>
-`;
-
-exports[`AskAssistantChat > renders message with code snippet 1`] = `
-<div>
-  <div
-    class="container"
-  >
-    <div
-      class="header"
-    >
-      <div
-        class="chatTitle"
-      >
-        <div
-          class="headerText"
-        >
-          <svg
-            fill="none"
-            height="18"
-            viewBox="0 0 24 24"
-            width="18"
-            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 large"
-          >
-            AI Assistant
-          </span>
-        </div>
-        <div
-          class="beta"
-        >
-          beta
-        </div>
-      </div>
-      <div
-        class="back"
-        data-test-id="close-chat-button"
-      >
-        <n8n-icon-stub
-          color="text-base"
-          icon="arrow-right"
-        />
-      </div>
-    </div>
-    <div
-      class="body"
-    >
-      <div
-        class="messages"
-      >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <div
-            class="roleName"
-          >
-            <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>
-            <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>
-        
-      </div>
-      <!--v-if-->
-    </div>
-    <div
-      class="inputWrapper"
-      data-test-id="chat-input-wrapper"
-    >
-      <textarea
-        data-test-id="chat-input"
-        placeholder="Enter your response..."
-        rows="1"
-        wrap="hard"
-      />
-      <n8n-icon-button-stub
-        class="sendButton"
-        data-test-id="send-message-button"
-        disabled="true"
-        icon="paper-plane"
-        size="large"
-        type="text"
-      />
-    </div>
-  </div>
-</div>
-`;
-
-exports[`AskAssistantChat > renders streaming chat correctly 1`] = `
-<div>
-  <div
-    class="container"
-  >
-    <div
-      class="header"
-    >
-      <div
-        class="chatTitle"
-      >
-        <div
-          class="headerText"
-        >
-          <svg
-            fill="none"
-            height="18"
-            viewBox="0 0 24 24"
-            width="18"
-            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 large"
-          >
-            AI Assistant
-          </span>
-        </div>
-        <div
-          class="beta"
-        >
-          beta
-        </div>
-      </div>
-      <div
-        class="back"
-        data-test-id="close-chat-button"
-      >
-        <n8n-icon-stub
-          color="text-base"
-          icon="arrow-right"
-        />
-      </div>
-    </div>
-    <div
-      class="body"
-    >
-      <div
-        class="messages"
-      >
-        
-        <div
-          class="message"
-          data-test-id="chat-message-assistant"
-        >
-          <div
-            class="roleName"
-          >
-            <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-->
-            <span
-              class="blinking-cursor"
-            />
-          </div>
-          <!--v-if-->
-        </div>
-        
-      </div>
-      <!--v-if-->
-    </div>
-    <div
-      class="inputWrapper"
-      data-test-id="chat-input-wrapper"
-    >
-      <textarea
-        data-test-id="chat-input"
-        placeholder="Enter your response..."
-        rows="1"
-        wrap="hard"
-      />
-      <n8n-icon-button-stub
-        class="sendButton"
-        data-test-id="send-message-button"
-        disabled="true"
-        icon="paper-plane"
-        size="large"
-        type="text"
-      />
-    </div>
-  </div>
-</div>
-`;
diff --git a/packages/design-system/src/components/AskAssistantIcon/__tests__/AssistantIcon.spec.ts b/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.test.ts
similarity index 95%
rename from packages/design-system/src/components/AskAssistantIcon/__tests__/AssistantIcon.spec.ts
rename to packages/design-system/src/components/AskAssistantIcon/AssistantIcon.test.ts
index 0ad1b13d19..bc88be2a83 100644
--- a/packages/design-system/src/components/AskAssistantIcon/__tests__/AssistantIcon.spec.ts
+++ b/packages/design-system/src/components/AskAssistantIcon/AssistantIcon.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import AssistantIcon from '../AssistantIcon.vue';
+import AssistantIcon from './AssistantIcon.vue';
 
 describe('AssistantIcon', () => {
 	it('renders default icon correctly', () => {
diff --git a/packages/design-system/src/components/AskAssistantIcon/__tests__/__snapshots__/AssistantIcon.spec.ts.snap b/packages/design-system/src/components/AskAssistantIcon/__snapshots__/AssistantIcon.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantIcon/__tests__/__snapshots__/AssistantIcon.spec.ts.snap
rename to packages/design-system/src/components/AskAssistantIcon/__snapshots__/AssistantIcon.test.ts.snap
diff --git a/packages/design-system/src/components/AskAssistantLoadingMessage/__tests__/AskAssistantLoadingMessage.spec.ts b/packages/design-system/src/components/AskAssistantLoadingMessage/AskAssistantLoadingMessage.test.ts
similarity index 81%
rename from packages/design-system/src/components/AskAssistantLoadingMessage/__tests__/AskAssistantLoadingMessage.spec.ts
rename to packages/design-system/src/components/AskAssistantLoadingMessage/AskAssistantLoadingMessage.test.ts
index 218414391c..4284dcd313 100644
--- a/packages/design-system/src/components/AskAssistantLoadingMessage/__tests__/AskAssistantLoadingMessage.spec.ts
+++ b/packages/design-system/src/components/AskAssistantLoadingMessage/AskAssistantLoadingMessage.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import AssistantLoadingMessage from '../AssistantLoadingMessage.vue';
+import AssistantLoadingMessage from './AssistantLoadingMessage.vue';
 
 describe('AssistantLoadingMessage', () => {
 	it('renders loading message correctly', () => {
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/AskAssistantLoadingMessage/__tests__/__snapshots__/AskAssistantLoadingMessage.spec.ts.snap b/packages/design-system/src/components/AskAssistantLoadingMessage/__snapshots__/AskAssistantLoadingMessage.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantLoadingMessage/__tests__/__snapshots__/AskAssistantLoadingMessage.spec.ts.snap
rename to packages/design-system/src/components/AskAssistantLoadingMessage/__snapshots__/AskAssistantLoadingMessage.test.ts.snap
diff --git a/packages/design-system/src/components/AskAssistantText/__tests__/AssistantText.spec.ts b/packages/design-system/src/components/AskAssistantText/AssistantText.test.ts
similarity index 94%
rename from packages/design-system/src/components/AskAssistantText/__tests__/AssistantText.spec.ts
rename to packages/design-system/src/components/AskAssistantText/AssistantText.test.ts
index 30aa136674..1bbfeab8cb 100644
--- a/packages/design-system/src/components/AskAssistantText/__tests__/AssistantText.spec.ts
+++ b/packages/design-system/src/components/AskAssistantText/AssistantText.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import AssistantText from '../AssistantText.vue';
+import AssistantText from './AssistantText.vue';
 
 describe('AssistantText', () => {
 	it('renders default text correctly', () => {
diff --git a/packages/design-system/src/components/AskAssistantText/__tests__/__snapshots__/AssistantText.spec.ts.snap b/packages/design-system/src/components/AskAssistantText/__snapshots__/AssistantText.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/AskAssistantText/__tests__/__snapshots__/AssistantText.spec.ts.snap
rename to packages/design-system/src/components/AskAssistantText/__snapshots__/AssistantText.test.ts.snap
diff --git a/packages/design-system/src/components/BetaTag/__tests__/BetaTag.spec.ts b/packages/design-system/src/components/BetaTag/BetaTag.test.ts
similarity index 84%
rename from packages/design-system/src/components/BetaTag/__tests__/BetaTag.spec.ts
rename to packages/design-system/src/components/BetaTag/BetaTag.test.ts
index 7f92713ce8..b04d64329d 100644
--- a/packages/design-system/src/components/BetaTag/__tests__/BetaTag.spec.ts
+++ b/packages/design-system/src/components/BetaTag/BetaTag.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import BetaTag from '../BetaTag.vue';
+import BetaTag from './BetaTag.vue';
 
 describe('BetaTag', () => {
 	it('renders beta tag correctly', () => {
diff --git a/packages/design-system/src/components/BetaTag/__tests__/__snapshots__/BetaTag.spec.ts.snap b/packages/design-system/src/components/BetaTag/__snapshots__/BetaTag.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/BetaTag/__tests__/__snapshots__/BetaTag.spec.ts.snap
rename to packages/design-system/src/components/BetaTag/__snapshots__/BetaTag.test.ts.snap
diff --git a/packages/design-system/src/components/BlinkingCursor/__tests__/BlinkingCursor.spec.ts b/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.test.ts
similarity index 81%
rename from packages/design-system/src/components/BlinkingCursor/__tests__/BlinkingCursor.spec.ts
rename to packages/design-system/src/components/BlinkingCursor/BlinkingCursor.test.ts
index 65c4193e8d..13bac6c61d 100644
--- a/packages/design-system/src/components/BlinkingCursor/__tests__/BlinkingCursor.spec.ts
+++ b/packages/design-system/src/components/BlinkingCursor/BlinkingCursor.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import BlinkingCursor from '../BlinkingCursor.vue';
+import BlinkingCursor from './BlinkingCursor.vue';
 
 describe('BlinkingCursor', () => {
 	it('renders blinking cursor correctly', () => {
diff --git a/packages/design-system/src/components/BlinkingCursor/__tests__/__snapshots__/BlinkingCursor.spec.ts.snap b/packages/design-system/src/components/BlinkingCursor/__snapshots__/BlinkingCursor.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/BlinkingCursor/__tests__/__snapshots__/BlinkingCursor.spec.ts.snap
rename to packages/design-system/src/components/BlinkingCursor/__snapshots__/BlinkingCursor.test.ts.snap
diff --git a/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts b/packages/design-system/src/components/CodeDiff/CodeDiff.test.ts
similarity index 98%
rename from packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts
rename to packages/design-system/src/components/CodeDiff/CodeDiff.test.ts
index d23d49d6d1..e9a48ce737 100644
--- a/packages/design-system/src/components/CodeDiff/__tests__/CodeDiff.spec.ts
+++ b/packages/design-system/src/components/CodeDiff/CodeDiff.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import CodeDiff from '../CodeDiff.vue';
+import CodeDiff from './CodeDiff.vue';
 
 const stubs = ['n8n-button', 'n8n-icon'];
 
diff --git a/packages/design-system/src/components/CodeDiff/__tests__/__snapshots__/CodeDiff.spec.ts.snap b/packages/design-system/src/components/CodeDiff/__snapshots__/CodeDiff.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/CodeDiff/__tests__/__snapshots__/CodeDiff.spec.ts.snap
rename to packages/design-system/src/components/CodeDiff/__snapshots__/CodeDiff.test.ts.snap
diff --git a/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts b/packages/design-system/src/components/ConditionalRouterLink/ConditionalRouterLink.test.ts
similarity index 95%
rename from packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts
rename to packages/design-system/src/components/ConditionalRouterLink/ConditionalRouterLink.test.ts
index 250950d6d7..2689228c6b 100644
--- a/packages/design-system/src/components/ConditionalRouterLink/__tests__/ConditionalRouterLink.spec.ts
+++ b/packages/design-system/src/components/ConditionalRouterLink/ConditionalRouterLink.test.ts
@@ -2,7 +2,7 @@ import { render } from '@testing-library/vue';
 import { beforeAll, describe } from 'vitest';
 import { createRouter, createWebHistory } from 'vue-router';
 
-import CondtionalRouterLink from '../CondtionalRouterLink.vue';
+import CondtionalRouterLink from './CondtionalRouterLink.vue';
 
 const slots = {
 	default: 'Button',
diff --git a/packages/design-system/src/components/ConditionalRouterLink/__tests__/__snapshots__/ConditionalRouterLink.spec.ts.snap b/packages/design-system/src/components/ConditionalRouterLink/__snapshots__/ConditionalRouterLink.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/ConditionalRouterLink/__tests__/__snapshots__/ConditionalRouterLink.spec.ts.snap
rename to packages/design-system/src/components/ConditionalRouterLink/__snapshots__/ConditionalRouterLink.test.ts.snap
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts b/packages/design-system/src/components/N8nActionBox/ActionBox.test.ts
similarity index 92%
rename from packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
rename to packages/design-system/src/components/N8nActionBox/ActionBox.test.ts
index 8bbbee267f..f336b5167d 100644
--- a/packages/design-system/src/components/N8nActionBox/__tests__/ActionBox.spec.ts
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8NActionBox from '../ActionBox.vue';
+import N8NActionBox from './ActionBox.vue';
 
 describe('N8NActionBox', () => {
 	it('should render correctly', () => {
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index a43d7a6d7e..02de38143c 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -13,6 +13,7 @@ interface ActionBoxProps {
 	buttonText: string;
 	buttonType: ButtonType;
 	buttonDisabled?: boolean;
+	buttonIcon?: string;
 	description: string;
 	calloutText?: string;
 	calloutTheme?: CalloutTheme;
@@ -22,6 +23,7 @@ interface ActionBoxProps {
 defineOptions({ name: 'N8nActionBox' });
 withDefaults(defineProps<ActionBoxProps>(), {
 	calloutTheme: 'info',
+	buttonIcon: undefined,
 });
 </script>
 
@@ -51,6 +53,7 @@ withDefaults(defineProps<ActionBoxProps>(), {
 				:label="buttonText"
 				:type="buttonType"
 				:disabled="buttonDisabled"
+				:icon="buttonIcon"
 				size="large"
 				@click="$emit('click:button', $event)"
 			/>
diff --git a/packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap b/packages/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nActionBox/__tests__/__snapshots__/ActionBox.spec.ts.snap
rename to packages/design-system/src/components/N8nActionBox/__snapshots__/ActionBox.test.ts.snap
diff --git a/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.test.ts
similarity index 95%
rename from packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
rename to packages/design-system/src/components/N8nActionDropdown/ActionDropdown.test.ts
index 40c605f225..be6a810d14 100644
--- a/packages/design-system/src/components/N8nActionDropdown/__tests__/ActionDropdown.spec.ts
+++ b/packages/design-system/src/components/N8nActionDropdown/ActionDropdown.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nActionDropdown from '../ActionDropdown.vue';
+import N8nActionDropdown from './ActionDropdown.vue';
 
 describe('components', () => {
 	describe('N8nActionDropdown', () => {
diff --git a/packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap b/packages/design-system/src/components/N8nActionDropdown/__snapshots__/ActionDropdown.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nActionDropdown/__tests__/__snapshots__/ActionDropdown.spec.ts.snap
rename to packages/design-system/src/components/N8nActionDropdown/__snapshots__/ActionDropdown.test.ts.snap
diff --git a/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts b/packages/design-system/src/components/N8nAlert/Alert.test.ts
similarity index 93%
rename from packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
rename to packages/design-system/src/components/N8nAlert/Alert.test.ts
index fe1d5d3aeb..9324e1054a 100644
--- a/packages/design-system/src/components/N8nAlert/__tests__/Alert.spec.ts
+++ b/packages/design-system/src/components/N8nAlert/Alert.test.ts
@@ -1,7 +1,7 @@
 import { render, screen } from '@testing-library/vue';
 
-import N8nIcon from '../../N8nIcon';
-import N8nAlert from '../Alert.vue';
+import N8nAlert from './Alert.vue';
+import N8nIcon from '../N8nIcon';
 
 describe('components', () => {
 	describe('N8nAlert', () => {
diff --git a/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts b/packages/design-system/src/components/N8nAvatar/Avatar.test.ts
similarity index 94%
rename from packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts
rename to packages/design-system/src/components/N8nAvatar/Avatar.test.ts
index 3abc2b5b53..d4ea106390 100644
--- a/packages/design-system/src/components/N8nAvatar/__tests__/Avatar.test.ts
+++ b/packages/design-system/src/components/N8nAvatar/Avatar.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nAvatar from '../Avatar.vue';
+import N8nAvatar from './Avatar.vue';
 
 describe('components', () => {
 	describe('N8nAlert', () => {
diff --git a/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts b/packages/design-system/src/components/N8nBadge/Badge.test.ts
similarity index 96%
rename from packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
rename to packages/design-system/src/components/N8nBadge/Badge.test.ts
index 20d6a29d84..0b8c4defd4 100644
--- a/packages/design-system/src/components/N8nBadge/__tests__/Badge.spec.ts
+++ b/packages/design-system/src/components/N8nBadge/Badge.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nBadge from '../Badge.vue';
+import N8nBadge from './Badge.vue';
 
 describe('components', () => {
 	describe('N8nBadge', () => {
diff --git a/packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap b/packages/design-system/src/components/N8nBadge/__snapshots__/Badge.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nBadge/__tests__/__snapshots__/Badge.spec.ts.snap
rename to packages/design-system/src/components/N8nBadge/__snapshots__/Badge.test.ts.snap
diff --git a/packages/design-system/src/components/N8nBlockUi/__tests__/BlockUi.spec.ts b/packages/design-system/src/components/N8nBlockUi/BlockUi.test.ts
similarity index 91%
rename from packages/design-system/src/components/N8nBlockUi/__tests__/BlockUi.spec.ts
rename to packages/design-system/src/components/N8nBlockUi/BlockUi.test.ts
index 2238f07b22..fa83b44e7f 100644
--- a/packages/design-system/src/components/N8nBlockUi/__tests__/BlockUi.spec.ts
+++ b/packages/design-system/src/components/N8nBlockUi/BlockUi.test.ts
@@ -1,6 +1,6 @@
 import { render, screen } from '@testing-library/vue';
 
-import N8nBlockUi from '../BlockUi.vue';
+import N8nBlockUi from './BlockUi.vue';
 
 describe('components', () => {
 	describe('N8nBlockUi', () => {
diff --git a/packages/design-system/src/components/N8nButton/Button.scss b/packages/design-system/src/components/N8nButton/Button.scss
index bdafef35d9..af37c8b4fe 100644
--- a/packages/design-system/src/components/N8nButton/Button.scss
+++ b/packages/design-system/src/components/N8nButton/Button.scss
@@ -196,7 +196,7 @@
 
 @mixin n8n-button-danger {
 	--button-font-color: var(--color-button-danger-font);
-	--button-border-color: var(--color-danger);
+	--button-border-color: var(--color-button-danger-border);
 	--button-background-color: var(--color-danger);
 
 	--button-hover-font-color: var(--color-button-danger-font);
@@ -210,11 +210,11 @@
 	--button-focus-font-color: var(--color-button-danger-font);
 	--button-focus-border-color: var(--color-danger);
 	--button-focus-background-color: var(--color-danger);
-	--button-focus-outline-color: var(--color-danger-tint-1);
+	--button-focus-outline-color: var(--color-button-danger-focus-outline);
 
 	--button-disabled-font-color: var(--color-button-danger-disabled-font);
-	--button-disabled-border-color: var(--color-danger-tint-1);
-	--button-disabled-background-color: var(--color-danger-tint-1);
+	--button-disabled-border-color: var(--color-button-danger-disabled-border);
+	--button-disabled-background-color: var(--color-button-danger-disabled-background);
 
 	--button-loading-font-color: var(--color-button-danger-font);
 	--button-loading-border-color: var(--color-danger);
diff --git a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts b/packages/design-system/src/components/N8nButton/Button.test.ts
similarity index 97%
rename from packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
rename to packages/design-system/src/components/N8nButton/Button.test.ts
index 371599f877..5b224594b2 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
+++ b/packages/design-system/src/components/N8nButton/Button.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nButton from '../Button.vue';
+import N8nButton from './Button.vue';
 
 const slots = {
 	default: 'Button',
diff --git a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap b/packages/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
rename to packages/design-system/src/components/N8nButton/__snapshots__/Button.test.ts.snap
diff --git a/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts b/packages/design-system/src/components/N8nCallout/Callout.test.ts
similarity index 98%
rename from packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
rename to packages/design-system/src/components/N8nCallout/Callout.test.ts
index 782ce7c417..e308a73828 100644
--- a/packages/design-system/src/components/N8nCallout/__tests__/Callout.spec.ts
+++ b/packages/design-system/src/components/N8nCallout/Callout.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nCallout from '../Callout.vue';
+import N8nCallout from './Callout.vue';
 
 describe('components', () => {
 	describe('N8nCallout', () => {
diff --git a/packages/design-system/src/components/N8nCallout/Callout.vue b/packages/design-system/src/components/N8nCallout/Callout.vue
index 9d866715c1..6a796ba32a 100644
--- a/packages/design-system/src/components/N8nCallout/Callout.vue
+++ b/packages/design-system/src/components/N8nCallout/Callout.vue
@@ -23,6 +23,7 @@ interface CalloutProps {
 	iconless?: boolean;
 	slim?: boolean;
 	roundCorners?: boolean;
+	onlyBottomBorder?: boolean;
 }
 
 defineOptions({ name: 'N8nCallout' });
@@ -38,6 +39,7 @@ const classes = computed(() => [
 	$style[props.theme],
 	props.slim ? $style.slim : '',
 	props.roundCorners ? $style.round : '',
+	props.onlyBottomBorder ? $style.onlyBottomBorder : '',
 ]);
 
 const getIcon = computed(
@@ -95,6 +97,12 @@ const getIconSize = computed<IconSize>(() => {
 	border-radius: var(--border-radius-base);
 }
 
+.onlyBottomBorder {
+	border-top: 0;
+	border-left: 0;
+	border-right: 0;
+}
+
 .messageSection {
 	display: flex;
 	align-items: center;
diff --git a/packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap b/packages/design-system/src/components/N8nCallout/__snapshots__/Callout.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nCallout/__tests__/__snapshots__/Callout.spec.ts.snap
rename to packages/design-system/src/components/N8nCallout/__snapshots__/Callout.test.ts.snap
diff --git a/packages/design-system/src/components/N8nCard/__tests__/Card.spec.ts b/packages/design-system/src/components/N8nCard/Card.test.ts
similarity index 94%
rename from packages/design-system/src/components/N8nCard/__tests__/Card.spec.ts
rename to packages/design-system/src/components/N8nCard/Card.test.ts
index 3228a51e2b..544ce61c23 100644
--- a/packages/design-system/src/components/N8nCard/__tests__/Card.spec.ts
+++ b/packages/design-system/src/components/N8nCard/Card.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nCard from '../Card.vue';
+import N8nCard from './Card.vue';
 
 describe('components', () => {
 	describe('N8nCard', () => {
diff --git a/packages/design-system/src/components/N8nCard/Card.vue b/packages/design-system/src/components/N8nCard/Card.vue
index 589a7f6c36..d7a2893973 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,11 @@ 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, 'n8n-card-append']"
+		>
 			<slot name="append" />
 		</div>
 	</div>
@@ -45,7 +49,7 @@ const classes = computed(() => ({
 	border-radius: var(--border-radius-large);
 	border: var(--border-base);
 	background-color: var(--color-background-xlight);
-	padding: var(--spacing-s);
+	padding: var(--card--padding, var(--spacing-s));
 	display: flex;
 	flex-direction: row;
 	width: 100%;
@@ -101,5 +105,6 @@ const classes = computed(() => ({
 	display: flex;
 	align-items: center;
 	cursor: default;
+	width: var(--card--append--width, unset);
 }
 </style>
diff --git a/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap b/packages/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap
similarity index 83%
rename from packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.ts.snap
rename to packages/design-system/src/components/N8nCard/__snapshots__/Card.test.ts.snap
index c093867f14..53aed181b8 100644
--- a/packages/design-system/src/components/N8nCard/__tests__/__snapshots__/Card.spec.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/N8nCheckbox/__tests__/Checkbox.spec.ts b/packages/design-system/src/components/N8nCheckbox/Checkbox.test.ts
similarity index 95%
rename from packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts
rename to packages/design-system/src/components/N8nCheckbox/Checkbox.test.ts
index 43ef21a9c5..ed80d59e64 100644
--- a/packages/design-system/src/components/N8nCheckbox/__tests__/Checkbox.spec.ts
+++ b/packages/design-system/src/components/N8nCheckbox/Checkbox.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nCheckbox from '../Checkbox.vue';
+import N8nCheckbox from './Checkbox.vue';
 
 describe('components', () => {
 	describe('N8nCheckbox', () => {
diff --git a/packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap b/packages/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nCheckbox/__tests__/__snapshots__/Checkbox.spec.ts.snap
rename to packages/design-system/src/components/N8nCheckbox/__snapshots__/Checkbox.test.ts.snap
diff --git a/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.test.ts
similarity index 85%
rename from packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
rename to packages/design-system/src/components/N8nCircleLoader/CircleLoader.test.ts
index 76b76d5a30..afe5a6b8f0 100644
--- a/packages/design-system/src/components/N8nCircleLoader/__tests__/CircleLoader.spec.ts
+++ b/packages/design-system/src/components/N8nCircleLoader/CircleLoader.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8NCircleLoader from '../CircleLoader.vue';
+import N8NCircleLoader from './CircleLoader.vue';
 
 describe('N8NCircleLoader', () => {
 	it('should render correctly', () => {
diff --git a/packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap b/packages/design-system/src/components/N8nCircleLoader/__snapshots__/CircleLoader.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nCircleLoader/__tests__/__snapshots__/CircleLoader.spec.ts.snap
rename to packages/design-system/src/components/N8nCircleLoader/__snapshots__/CircleLoader.test.ts.snap
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts b/packages/design-system/src/components/N8nColorPicker/ColorPicker.test.ts
similarity index 91%
rename from packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
rename to packages/design-system/src/components/N8nColorPicker/ColorPicker.test.ts
index bf1253b8b9..62da81ee00 100644
--- a/packages/design-system/src/components/N8nColorPicker/__tests__/ColorPicker.spec.ts
+++ b/packages/design-system/src/components/N8nColorPicker/ColorPicker.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nColorPicker from '../ColorPicker.vue';
+import N8nColorPicker from './ColorPicker.vue';
 
 describe('components', () => {
 	describe('N8nColorPicker', () => {
diff --git a/packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap b/packages/design-system/src/components/N8nColorPicker/__snapshots__/ColorPicker.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nColorPicker/__tests__/__snapshots__/ColorPicker.spec.ts.snap
rename to packages/design-system/src/components/N8nColorPicker/__snapshots__/ColorPicker.test.ts.snap
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts b/packages/design-system/src/components/N8nDatatable/Datatable.test.ts
similarity index 96%
rename from packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
rename to packages/design-system/src/components/N8nDatatable/Datatable.test.ts
index c19fa3ca0d..de8659c71c 100644
--- a/packages/design-system/src/components/N8nDatatable/__tests__/Datatable.spec.ts
+++ b/packages/design-system/src/components/N8nDatatable/Datatable.test.ts
@@ -2,8 +2,8 @@ import { render } from '@testing-library/vue';
 
 import { removeDynamicAttributes } from 'n8n-design-system/utils';
 
-import { rows, columns } from './data';
-import N8nDatatable from '../Datatable.vue';
+import { rows, columns } from './__tests__/data';
+import N8nDatatable from './Datatable.vue';
 
 const stubs = [
 	'n8n-option',
diff --git a/packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap b/packages/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nDatatable/__tests__/__snapshots__/Datatable.spec.ts.snap
rename to packages/design-system/src/components/N8nDatatable/__snapshots__/Datatable.test.ts.snap
diff --git a/packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts b/packages/design-system/src/components/N8nFormBox/FormBox.test.ts
similarity index 91%
rename from packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts
rename to packages/design-system/src/components/N8nFormBox/FormBox.test.ts
index a309e1aa40..268c70c060 100644
--- a/packages/design-system/src/components/N8nFormBox/__tests__/FormBox.test.ts
+++ b/packages/design-system/src/components/N8nFormBox/FormBox.test.ts
@@ -1,5 +1,5 @@
-import { createComponentRenderer } from '../../../__tests__/render';
-import FormBox from '../FormBox.vue';
+import FormBox from './FormBox.vue';
+import { createComponentRenderer } from '../../__tests__/render';
 
 const render = createComponentRenderer(FormBox);
 
diff --git a/packages/design-system/src/components/N8nFormBox/__tests__/__snapshots__/FormBox.test.ts.snap b/packages/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nFormBox/__tests__/__snapshots__/FormBox.test.ts.snap
rename to packages/design-system/src/components/N8nFormBox/__snapshots__/FormBox.test.ts.snap
diff --git a/packages/design-system/src/components/N8nIconPicker/IconPicker.stories.ts b/packages/design-system/src/components/N8nIconPicker/IconPicker.stories.ts
new file mode 100644
index 0000000000..b03a0cc332
--- /dev/null
+++ b/packages/design-system/src/components/N8nIconPicker/IconPicker.stories.ts
@@ -0,0 +1,57 @@
+import { action } from '@storybook/addon-actions';
+import type { StoryFn } from '@storybook/vue3';
+
+import { TEST_ICONS } from './constants';
+import type { Icon } from './IconPicker.vue';
+import N8nIconPicker from './IconPicker.vue';
+
+export default {
+	title: 'Atoms/Icon Picker',
+	component: N8nIconPicker,
+	argTypes: {
+		buttonTooltip: {
+			control: 'text',
+		},
+		buttonSize: {
+			type: 'select',
+			options: ['small', 'large'],
+		},
+	},
+};
+
+function createTemplate(icon: Icon): StoryFn {
+	return (args, { argTypes }) => ({
+		components: { N8nIconPicker },
+		props: Object.keys(argTypes),
+		setup: () => ({ args }),
+		data: () => ({
+			icon,
+		}),
+		template:
+			'<div style="height: 500px"><n8n-icon-picker v-model="icon" v-bind="args" @update:model-value="onIconSelected" /></div>',
+		methods: {
+			onIconSelected: action('iconSelected'),
+		},
+	});
+}
+
+const DefaultTemplate = createTemplate({ type: 'icon', value: 'smile' });
+export const Default = DefaultTemplate.bind({});
+Default.args = {
+	buttonTooltip: 'Select an icon',
+	availableIcons: TEST_ICONS,
+};
+
+const CustomTooltipTemplate = createTemplate({ type: 'icon', value: 'layer-group' });
+export const WithCustomIconAndTooltip = CustomTooltipTemplate.bind({});
+WithCustomIconAndTooltip.args = {
+	availableIcons: [...TEST_ICONS],
+	buttonTooltip: 'Select something...',
+};
+
+const OnlyEmojiTemplate = createTemplate({ type: 'emoji', value: '🔥' });
+export const OnlyEmojis = OnlyEmojiTemplate.bind({});
+OnlyEmojis.args = {
+	buttonTooltip: 'Select an emoji',
+	availableIcons: [],
+};
diff --git a/packages/design-system/src/components/N8nIconPicker/IconPicker.test.ts b/packages/design-system/src/components/N8nIconPicker/IconPicker.test.ts
new file mode 100644
index 0000000000..f3295ba5e6
--- /dev/null
+++ b/packages/design-system/src/components/N8nIconPicker/IconPicker.test.ts
@@ -0,0 +1,183 @@
+import userEvent from '@testing-library/user-event';
+import { fireEvent, render } from '@testing-library/vue';
+import { createRouter, createWebHistory } from 'vue-router';
+
+import IconPicker from '.';
+import { TEST_ICONS } from './constants';
+
+// Create a proxy handler that returns a mock icon object for any icon name
+// and mock the entire icon library with the proxy
+vi.mock(
+	'@fortawesome/free-solid-svg-icons',
+	() =>
+		new Proxy(
+			{},
+			{
+				get: (_target, prop) => {
+					return { prefix: 'fas', iconName: prop.toString().replace('fa', '').toLowerCase() };
+				},
+			},
+		),
+);
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/icons',
+			name: 'icons',
+			redirect: '/icons',
+		},
+		{
+			path: '/emojis',
+			name: 'emojis',
+			component: { template: '<h1>emojis</h1>' },
+		},
+	],
+});
+
+// Component stubs
+const components = {
+	N8nIconButton: {
+		template: '<button :data-icon="icon" data-testid="icon-picker-button" />',
+		props: ['icon'],
+	},
+	N8nIcon: {
+		template:
+			'<div class="mock-icon" :data-icon="typeof icon === \'string\' ? icon : icon.iconName" />',
+		props: ['icon'],
+	},
+};
+
+describe('IconPicker', () => {
+	it('renders icons and emojis', async () => {
+		const { getByTestId, getAllByTestId } = render(IconPicker, {
+			props: {
+				modelValue: { type: 'icon', value: 'smile' },
+				buttonTooltip: 'Select an icon',
+				availableIcons: TEST_ICONS,
+			},
+			global: {
+				plugins: [router],
+				components,
+			},
+		});
+		const TEST_EMOJI_COUNT = 1962;
+
+		await fireEvent.click(getByTestId('icon-picker-button'));
+		// Tabs should be visible and icons should be selected by default
+		expect(getByTestId('icon-picker-tabs')).toBeVisible();
+		expect(getByTestId('tab-icons').className).toContain('activeTab');
+		expect(getByTestId('icon-picker-popup')).toBeVisible();
+		// All icons should be rendered
+		expect(getAllByTestId('icon-picker-icon')).toHaveLength(TEST_ICONS.length);
+		// Click on emojis tab
+		await fireEvent.click(getByTestId('tab-emojis'));
+		// Emojis tab should be active
+		expect(getByTestId('tab-emojis').className).toContain('activeTab');
+		// All emojis should be rendered
+		expect(getAllByTestId('icon-picker-emoji')).toHaveLength(TEST_EMOJI_COUNT);
+	});
+	it('renders icon picker with custom icon and tooltip', async () => {
+		const ICON = 'layer-group';
+		const TOOLTIP = 'Select something...';
+		const { getByTestId, getByRole } = render(IconPicker, {
+			props: {
+				modelValue: { type: 'icon', value: ICON },
+				availableIcons: [...TEST_ICONS],
+				buttonTooltip: TOOLTIP,
+			},
+			global: {
+				plugins: [router],
+				components,
+			},
+		});
+		await userEvent.hover(getByTestId('icon-picker-button'));
+		expect(getByRole('tooltip').textContent).toBe(TOOLTIP);
+		expect(getByTestId('icon-picker-button').dataset.icon).toBe(ICON);
+	});
+	it('renders emoji as default icon correctly', async () => {
+		const ICON = '🔥';
+		const TOOLTIP = 'Select something...';
+		const { getByTestId, getByRole } = render(IconPicker, {
+			props: {
+				modelValue: { type: 'emoji', value: ICON },
+				availableIcons: [...TEST_ICONS],
+				buttonTooltip: TOOLTIP,
+			},
+			global: {
+				plugins: [router],
+				components,
+			},
+		});
+		await userEvent.hover(getByTestId('icon-picker-button'));
+		expect(getByRole('tooltip').textContent).toBe(TOOLTIP);
+		expect(getByTestId('icon-picker-button')).toHaveTextContent(ICON);
+	});
+	it('renders icon picker with only emojis', () => {
+		const { queryByTestId } = render(IconPicker, {
+			props: {
+				modelValue: { type: 'icon', value: 'smile' },
+				buttonTooltip: 'Select an emoji',
+				availableIcons: [],
+			},
+			global: {
+				plugins: [router],
+				components,
+			},
+		});
+		expect(queryByTestId('tab-icons')).not.toBeInTheDocument();
+	});
+	it('is able to select an icon', async () => {
+		const { getByTestId, getAllByTestId, queryByTestId, emitted } = render(IconPicker, {
+			props: {
+				modelValue: { type: 'icon', value: 'smile' },
+				buttonTooltip: 'Select an icon',
+				availableIcons: TEST_ICONS,
+			},
+			global: {
+				plugins: [router],
+				components,
+			},
+		});
+		await fireEvent.click(getByTestId('icon-picker-button'));
+		// Select the first icon
+		await fireEvent.click(getAllByTestId('icon-picker-icon')[0]);
+		// Icon should be selected and popup should be closed
+		expect(getByTestId('icon-picker-button').dataset.icon).toBe(TEST_ICONS[0]);
+		expect(queryByTestId('icon-picker-popup')).toBeNull();
+		expect(emitted()).toHaveProperty('update:modelValue');
+		// Should emit the selected icon
+		expect((emitted()['update:modelValue'] as unknown[][])[0][0]).toEqual({
+			type: 'icon',
+			value: TEST_ICONS[0],
+		});
+	});
+	it('is able to select an emoji', async () => {
+		const { getByTestId, getAllByTestId, queryByTestId, emitted } = render(IconPicker, {
+			props: {
+				modelValue: { type: 'emoji', value: '🔥' },
+				buttonTooltip: 'Select an emoji',
+				availableIcons: TEST_ICONS,
+			},
+			global: {
+				plugins: [router],
+				components,
+			},
+		});
+		await fireEvent.click(getByTestId('icon-picker-button'));
+		await fireEvent.click(getByTestId('tab-emojis'));
+		expect(getByTestId('icon-picker-popup')).toBeVisible();
+		// Select the first emoji
+		await fireEvent.click(getAllByTestId('icon-picker-emoji')[0]);
+		// Emoji should be selected and popup should be closed
+		expect(getByTestId('icon-picker-button')).toHaveTextContent('😀');
+		expect(queryByTestId('icon-picker-popup')).toBeNull();
+		// Should emit the selected emoji
+		expect(emitted()).toHaveProperty('update:modelValue');
+		expect((emitted()['update:modelValue'] as unknown[][])[0][0]).toEqual({
+			type: 'emoji',
+			value: '😀',
+		});
+	});
+});
diff --git a/packages/design-system/src/components/N8nIconPicker/IconPicker.vue b/packages/design-system/src/components/N8nIconPicker/IconPicker.vue
new file mode 100644
index 0000000000..318d48c828
--- /dev/null
+++ b/packages/design-system/src/components/N8nIconPicker/IconPicker.vue
@@ -0,0 +1,215 @@
+<script lang="ts" setup>
+// vueuse is a peer dependency
+// eslint-disable import/no-extraneous-dependencies
+import { onClickOutside } from '@vueuse/core';
+import { isEmojiSupported } from 'is-emoji-supported';
+import { ref, defineProps, computed } from 'vue';
+
+import { useI18n } from '../../composables/useI18n';
+import N8nTooltip from '../N8nTooltip';
+
+/**
+ * Simple n8n icon picker component with support for font icons and emojis.
+ * In order to keep this component as dependency-free as possible, it only renders externally provided font icons.
+ * Emojis are rendered from `emojiRanges` array.
+ * If we want to introduce advanced features like search, we need to use libraries like `emojilib`.
+ */
+defineOptions({ name: 'N8nIconPicker' });
+
+const emojiRanges = [
+	[0x1f600, 0x1f64f], // Emoticons
+	[0x1f300, 0x1f5ff], // Symbols & Pictographs
+	[0x1f680, 0x1f6ff], // Transport & Map Symbols
+	[0x2600, 0x26ff], // Miscellaneous Symbols
+	[0x2700, 0x27bf], // Dingbats
+	[0x1f900, 0x1f9ff], // Supplemental Symbols
+	[0x1f1e6, 0x1f1ff], // Regional Indicator Symbols
+	[0x1f400, 0x1f4ff], // Additional pictographs
+];
+
+export type Icon = {
+	type: 'icon' | 'emoji';
+	value: string;
+};
+
+type Props = {
+	buttonTooltip: string;
+	availableIcons: string[];
+	buttonSize?: 'small' | 'large';
+};
+
+const { t } = useI18n();
+
+const props = withDefaults(defineProps<Props>(), {
+	availableIcons: () => [],
+	buttonSize: 'large',
+});
+
+const model = defineModel<Icon>({ default: { type: 'icon', value: 'smile' } });
+
+const hasAvailableIcons = computed(() => props.availableIcons.length > 0);
+
+const emojis = computed(() => {
+	const emojisArray: string[] = [];
+	emojiRanges.forEach(([start, end]) => {
+		for (let i = start; i <= end; i++) {
+			const emoji = String.fromCodePoint(i);
+			if (isEmojiSupported(emoji)) {
+				emojisArray.push(emoji);
+			}
+		}
+	});
+	return emojisArray;
+});
+
+const popupVisible = ref(false);
+const tabs = ref<Array<{ value: string; label: string }>>(
+	hasAvailableIcons.value
+		? [
+				{ value: 'icons', label: t('iconPicker.tabs.icons') },
+				{ value: 'emojis', label: t('iconPicker.tabs.emojis') },
+			]
+		: [{ value: 'emojis', label: t('iconPicker.tabs.emojis') }],
+);
+const selectedTab = ref<string>(tabs.value[0].value);
+
+const container = ref<HTMLDivElement>();
+
+onClickOutside(container, () => {
+	popupVisible.value = false;
+});
+
+const selectIcon = (value: Icon) => {
+	model.value = value;
+	popupVisible.value = false;
+};
+
+const togglePopup = () => {
+	popupVisible.value = !popupVisible.value;
+	if (popupVisible.value) {
+		selectedTab.value = tabs.value[0].value;
+	}
+};
+</script>
+
+<template>
+	<div
+		ref="container"
+		:class="$style.container"
+		:aria-expanded="popupVisible"
+		role="button"
+		aria-haspopup="true"
+	>
+		<div :class="$style['icon-picker-button']">
+			<N8nTooltip placement="right" data-test-id="icon-picker-tooltip">
+				<template #content>
+					{{ props.buttonTooltip ?? t('iconPicker.button.defaultToolTip') }}
+				</template>
+				<N8nIconButton
+					v-if="model.type === 'icon'"
+					:class="$style['icon-button']"
+					:icon="model.value ?? 'smile'"
+					:size="buttonSize"
+					:square="true"
+					type="tertiary"
+					data-test-id="icon-picker-button"
+					@click="togglePopup"
+				/>
+				<N8nButton
+					v-else-if="model.type === 'emoji'"
+					:class="$style['emoji-button']"
+					:size="buttonSize"
+					:square="true"
+					type="tertiary"
+					data-test-id="icon-picker-button"
+					@click="togglePopup"
+				>
+					{{ model.value }}
+				</N8nButton>
+			</N8nTooltip>
+		</div>
+		<div v-if="popupVisible" :class="$style.popup" data-test-id="icon-picker-popup">
+			<div :class="$style.tabs">
+				<N8nTabs v-model="selectedTab" :options="tabs" data-test-id="icon-picker-tabs" />
+			</div>
+			<div v-if="selectedTab === 'icons'" :class="$style.content">
+				<N8nIcon
+					v-for="icon in availableIcons"
+					:key="icon"
+					:icon="icon"
+					:class="$style.icon"
+					size="large"
+					data-test-id="icon-picker-icon"
+					@click="selectIcon({ type: 'icon', value: icon })"
+				/>
+			</div>
+			<div v-if="selectedTab === 'emojis'" :class="$style.content">
+				<span
+					v-for="emoji in emojis"
+					:key="emoji"
+					:class="$style.emoji"
+					data-test-id="icon-picker-emoji"
+					@click="selectIcon({ type: 'emoji', value: emoji })"
+				>
+					{{ emoji }}
+				</span>
+			</div>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	position: relative;
+}
+
+.popup {
+	position: absolute;
+	z-index: 1;
+	width: 426px;
+	max-height: 300px;
+	display: flex;
+	flex-direction: column;
+	margin-top: var(--spacing-4xs);
+	background-color: var(--color-background-xlight);
+	border-radius: var(--border-radius-base);
+	border: var(--border-base);
+	border-color: var(--color-foreground-dark);
+
+	.tabs {
+		padding: var(--spacing-2xs);
+		padding-bottom: var(--spacing-5xs);
+	}
+
+	.content {
+		display: flex;
+		flex-wrap: wrap;
+		padding: var(--spacing-2xs);
+		overflow-y: auto;
+	}
+
+	.icon,
+	.emoji {
+		cursor: pointer;
+		padding: var(--spacing-4xs);
+		border-radius: var(--border-radius-small);
+
+		&:hover {
+			background-color: var(--color-background-medium);
+		}
+	}
+
+	.icon {
+		color: var(--color-text-light);
+
+		&:hover {
+			color: var(--color-text-dark);
+		}
+	}
+
+	.emoji {
+		font-family: 'Segoe UI Emoji', 'Segoe UI Symbol', 'Segoe UI', 'Apple Color Emoji',
+			'Twemoji Mozilla', 'Noto Color Emoji', 'Android Emoji', sans-serif;
+	}
+}
+</style>
diff --git a/packages/design-system/src/components/N8nIconPicker/constants.ts b/packages/design-system/src/components/N8nIconPicker/constants.ts
new file mode 100644
index 0000000000..ca62c03773
--- /dev/null
+++ b/packages/design-system/src/components/N8nIconPicker/constants.ts
@@ -0,0 +1,163 @@
+export const TEST_ICONS = [
+	'angle-double-left',
+	'angle-down',
+	'angle-left',
+	'angle-right',
+	'angle-up',
+	'archive',
+	'arrow-left',
+	'arrow-right',
+	'arrow-up',
+	'arrow-down',
+	'at',
+	'ban',
+	'balance-scale-left',
+	'bars',
+	'bolt',
+	'book',
+	'box-open',
+	'bug',
+	'brain',
+	'calculator',
+	'calendar',
+	'chart-bar',
+	'check',
+	'check-circle',
+	'check-square',
+	'chevron-left',
+	'chevron-right',
+	'chevron-down',
+	'chevron-up',
+	'code',
+	'code-branch',
+	'cog',
+	'cogs',
+	'comment',
+	'comments',
+	'clipboard-list',
+	'clock',
+	'clone',
+	'cloud',
+	'cloud-download-alt',
+	'copy',
+	'cube',
+	'cut',
+	'database',
+	'dot-circle',
+	'grip-lines-vertical',
+	'grip-vertical',
+	'edit',
+	'ellipsis-h',
+	'ellipsis-v',
+	'envelope',
+	'equals',
+	'eye',
+	'exclamation-triangle',
+	'expand',
+	'expand-alt',
+	'external-link-alt',
+	'exchange-alt',
+	'file',
+	'file-alt',
+	'file-archive',
+	'file-code',
+	'file-download',
+	'file-export',
+	'file-import',
+	'file-pdf',
+	'filter',
+	'fingerprint',
+	'flask',
+	'folder-open',
+	'font',
+	'gift',
+	'globe',
+	'globe-americas',
+	'graduation-cap',
+	'hand-holding-usd',
+	'hand-scissors',
+	'handshake',
+	'hand-point-left',
+	'hashtag',
+	'hdd',
+	'history',
+	'home',
+	'hourglass',
+	'image',
+	'inbox',
+	'info',
+	'info-circle',
+	'key',
+	'language',
+	'layer-group',
+	'link',
+	'list',
+	'lightbulb',
+	'lock',
+	'map-signs',
+	'mouse-pointer',
+	'network-wired',
+	'palette',
+	'pause',
+	'pause-circle',
+	'pen',
+	'pencil-alt',
+	'play',
+	'play-circle',
+	'plug',
+	'plus',
+	'plus-circle',
+	'plus-square',
+	'project-diagram',
+	'question',
+	'question-circle',
+	'redo',
+	'remove-format',
+	'robot',
+	'rss',
+	'save',
+	'satellite-dish',
+	'search',
+	'search-minus',
+	'search-plus',
+	'server',
+	'screwdriver',
+	'smile',
+	'sign-in-alt',
+	'sign-out-alt',
+	'sliders-h',
+	'spinner',
+	'sticky-note',
+	'stop',
+	'stream',
+	'sun',
+	'sync',
+	'sync-alt',
+	'table',
+	'tags',
+	'tasks',
+	'terminal',
+	'th-large',
+	'thumbtack',
+	'thumbs-down',
+	'thumbs-up',
+	'times',
+	'times-circle',
+	'toolbox',
+	'tools',
+	'trash',
+	'undo',
+	'unlink',
+	'user',
+	'user-circle',
+	'user-friends',
+	'users',
+	'vector-square',
+	'video',
+	'tree',
+	'user-lock',
+	'gem',
+	'download',
+	'power-off',
+	'paper-plane',
+];
diff --git a/packages/design-system/src/components/N8nIconPicker/index.ts b/packages/design-system/src/components/N8nIconPicker/index.ts
new file mode 100644
index 0000000000..5045eca162
--- /dev/null
+++ b/packages/design-system/src/components/N8nIconPicker/index.ts
@@ -0,0 +1,2 @@
+import IconPicker from './IconPicker.vue';
+export default IconPicker;
diff --git a/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts b/packages/design-system/src/components/N8nInfoTip/InfoTip.test.ts
similarity index 93%
rename from packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
rename to packages/design-system/src/components/N8nInfoTip/InfoTip.test.ts
index ce3eb230fa..8f4e905138 100644
--- a/packages/design-system/src/components/N8nInfoTip/__tests__/InfoTip.spec.ts
+++ b/packages/design-system/src/components/N8nInfoTip/InfoTip.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nInfoTip from '../InfoTip.vue';
+import N8nInfoTip from './InfoTip.vue';
 
 const slots = {
 	default: ['Need help doing something?', '<a href="/docs" target="_blank">Open docs</a>'],
diff --git a/packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap b/packages/design-system/src/components/N8nInfoTip/__snapshots__/InfoTip.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nInfoTip/__tests__/__snapshots__/InfoTip.spec.ts.snap
rename to packages/design-system/src/components/N8nInfoTip/__snapshots__/InfoTip.test.ts.snap
diff --git a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts b/packages/design-system/src/components/N8nInput/Input.test.ts
similarity index 94%
rename from packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
rename to packages/design-system/src/components/N8nInput/Input.test.ts
index cea5a1f006..41b1d1636d 100644
--- a/packages/design-system/src/components/N8nInput/__tests__/Input.spec.ts
+++ b/packages/design-system/src/components/N8nInput/Input.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nInput from '../Input.vue';
+import N8nInput from './Input.vue';
 
 describe('N8nInput', () => {
 	it('should render correctly', () => {
diff --git a/packages/design-system/src/components/N8nInput/Input.vue b/packages/design-system/src/components/N8nInput/Input.vue
index 776b0bf7c8..7df719728a 100644
--- a/packages/design-system/src/components/N8nInput/Input.vue
+++ b/packages/design-system/src/components/N8nInput/Input.vue
@@ -32,7 +32,7 @@ const props = withDefaults(defineProps<InputProps>(), {
 	readonly: false,
 	clearable: false,
 	rows: 2,
-	maxlength: Infinity,
+	maxlength: undefined,
 	title: '',
 	name: () => uid('input'),
 	autocomplete: 'off',
@@ -81,6 +81,7 @@ defineExpose({ focus, blur, select });
 		:clearable="clearable"
 		:rows="rows"
 		:title="title"
+		:maxlength="maxlength"
 		v-bind="$attrs"
 	>
 		<template v-if="$slots.prepend" #prepend>
diff --git a/packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap b/packages/design-system/src/components/N8nInput/__snapshots__/Input.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nInput/__tests__/__snapshots__/Input.spec.ts.snap
rename to packages/design-system/src/components/N8nInput/__snapshots__/Input.test.ts.snap
diff --git a/packages/design-system/src/components/N8nInputLabel/__tests__/InputLabel.spec.ts b/packages/design-system/src/components/N8nInputLabel/InputLabel.test.ts
similarity index 93%
rename from packages/design-system/src/components/N8nInputLabel/__tests__/InputLabel.spec.ts
rename to packages/design-system/src/components/N8nInputLabel/InputLabel.test.ts
index ab46c89e12..841be5e147 100644
--- a/packages/design-system/src/components/N8nInputLabel/__tests__/InputLabel.spec.ts
+++ b/packages/design-system/src/components/N8nInputLabel/InputLabel.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import InputLabel from '../InputLabel.vue';
+import InputLabel from './InputLabel.vue';
 
 describe('component', () => {
 	describe('Text overflow behavior', () => {
diff --git a/packages/design-system/src/components/N8nInputLabel/__tests__/__snapshots__/InputLabel.spec.ts.snap b/packages/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nInputLabel/__tests__/__snapshots__/InputLabel.spec.ts.snap
rename to packages/design-system/src/components/N8nInputLabel/__snapshots__/InputLabel.test.ts.snap
diff --git a/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts b/packages/design-system/src/components/N8nMarkdown/Markdown.test.ts
similarity index 98%
rename from packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
rename to packages/design-system/src/components/N8nMarkdown/Markdown.test.ts
index d9671464d2..0e77779b5d 100644
--- a/packages/design-system/src/components/N8nMarkdown/__tests__/Markdown.spec.ts
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.test.ts
@@ -2,7 +2,7 @@ import { render, fireEvent } from '@testing-library/vue';
 
 import { n8nHtml } from 'n8n-design-system/directives';
 
-import N8nMarkdown from '../Markdown.vue';
+import N8nMarkdown from './Markdown.vue';
 
 describe('components', () => {
 	describe('N8nMarkdown', () => {
diff --git a/packages/design-system/src/components/N8nMarkdown/Markdown.vue b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
index 1074d584bf..fa65a8cdc6 100644
--- a/packages/design-system/src/components/N8nMarkdown/Markdown.vue
+++ b/packages/design-system/src/components/N8nMarkdown/Markdown.vue
@@ -251,17 +251,9 @@ const onCheckboxChange = (index: number) => {
 		}
 	}
 
-	pre {
-		margin-bottom: var(--spacing-s);
-		display: grid;
-	}
-
 	pre > code {
-		display: block;
-		padding: var(--spacing-s);
-		color: var(--color-text-dark);
 		background-color: var(--color-background-base);
-		overflow-x: auto;
+		color: var(--color-text-dark);
 	}
 
 	li > code,
@@ -356,9 +348,8 @@ input[type='checkbox'] + label {
 		}
 	}
 
-	code {
+	pre > code {
 		background-color: var(--color-sticky-code-background);
-		padding: 0 var(--spacing-4xs);
 		color: var(--color-sticky-code-font);
 	}
 
@@ -385,6 +376,20 @@ input[type='checkbox'] + label {
 	}
 }
 
+.sticky,
+.markdown {
+	pre {
+		margin-bottom: var(--spacing-s);
+		display: grid;
+	}
+
+	pre > code {
+		display: block;
+		padding: var(--spacing-s);
+		overflow-x: auto;
+	}
+}
+
 .spacer {
 	margin: var(--spacing-2xl);
 }
diff --git a/packages/design-system/src/components/N8nMenu/Menu.vue b/packages/design-system/src/components/N8nMenu/Menu.vue
index 596206977f..04d25f0864 100644
--- a/packages/design-system/src/components/N8nMenu/Menu.vue
+++ b/packages/design-system/src/components/N8nMenu/Menu.vue
@@ -132,6 +132,7 @@ const onSelect = (item: IMenuItem): void => {
 	display: flex;
 	flex-direction: column;
 	background-color: var(--menu-background, var(--color-background-xlight));
+	overflow: hidden;
 }
 
 .menuHeader {
diff --git a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
index e9a34c7e04..f22bcd8827 100644
--- a/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
+++ b/packages/design-system/src/components/N8nMenuItem/MenuItem.vue
@@ -123,12 +123,17 @@ const isItemActive = (item: IMenuItem): boolean => {
 					:disabled="item.disabled"
 					@click="handleSelect?.(item)"
 				>
-					<N8nIcon
-						v-if="item.icon"
-						:class="$style.icon"
-						:icon="item.icon"
-						:size="item.customIconSize || 'large'"
-					/>
+					<div v-if="item.icon">
+						<N8nIcon
+							v-if="typeof item.icon === 'string' || item.icon.type === 'icon'"
+							:class="$style.icon"
+							:icon="typeof item.icon === 'object' ? item.icon.value : item.icon"
+							:size="item.customIconSize || 'large'"
+						/>
+						<span v-else-if="item.icon.type === 'emoji'" :class="$style.icon">{{
+							item.icon.value
+						}}</span>
+					</div>
 					<span v-if="!compact" :class="$style.label">{{ item.label }}</span>
 					<span v-if="!item.icon && compact" :class="[$style.label, $style.compactLabel]">{{
 						getInitials(item.label)
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.test.ts b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.test.ts
new file mode 100644
index 0000000000..fe57291225
--- /dev/null
+++ b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.test.ts
@@ -0,0 +1,166 @@
+import userEvent from '@testing-library/user-event';
+import { configure, render, waitFor } from '@testing-library/vue';
+import { h } from 'vue';
+import { createRouter, createWebHistory } from 'vue-router';
+
+import NavigationDropdown from './NavigationDropdown.vue';
+
+configure({ testIdAttribute: 'data-test-id' });
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/',
+			name: 'home',
+			redirect: '/home',
+		},
+		{
+			path: '/projects',
+			name: 'projects',
+			component: { template: '<h1>projects</h1>' },
+		},
+	],
+});
+
+describe('N8nNavigationDropdown', () => {
+	beforeAll(async () => {
+		await router.push('/');
+
+		await router.isReady();
+	});
+
+	it('default slot should trigger first level', async () => {
+		const { getByTestId, queryByTestId } = render(NavigationDropdown, {
+			slots: { default: h('button', { 'data-test-id': 'test-trigger' }) },
+			props: { menu: [{ id: 'first', title: 'first', route: { name: 'projects' } }] },
+			global: {
+				plugins: [router],
+			},
+		});
+		expect(getByTestId('test-trigger')).toBeVisible();
+		expect(queryByTestId('navigation-menu-item')).not.toBeVisible();
+
+		await userEvent.click(getByTestId('test-trigger'));
+		await waitFor(() => expect(queryByTestId('navigation-menu-item')).toBeVisible());
+	});
+
+	it('redirect to route', async () => {
+		const { getByTestId, queryByTestId } = render(NavigationDropdown, {
+			slots: { default: h('button', { 'data-test-id': 'test-trigger' }) },
+			props: {
+				menu: [
+					{
+						id: 'first',
+						title: 'first',
+						submenu: [{ id: 'nested', title: 'nested', route: { name: 'projects' } }],
+					},
+				],
+			},
+			global: {
+				plugins: [router],
+			},
+		});
+
+		expect(getByTestId('test-trigger')).toBeVisible();
+		expect(queryByTestId('navigation-submenu')).not.toBeVisible();
+
+		await userEvent.click(getByTestId('test-trigger'));
+
+		await waitFor(() => expect(getByTestId('navigation-submenu')).toBeVisible());
+
+		await userEvent.click(getByTestId('navigation-submenu-item'));
+
+		expect(router.currentRoute.value.name).toBe('projects');
+	});
+
+	it('should render icons in submenu when provided', () => {
+		const { getByTestId } = render(NavigationDropdown, {
+			slots: { default: h('button', { 'data-test-id': 'test-trigger' }) },
+			props: {
+				menu: [
+					{
+						id: 'first',
+						title: 'first',
+						submenu: [{ id: 'nested', title: 'nested', route: { name: 'projects' }, icon: 'user' }],
+					},
+				],
+			},
+			global: {
+				plugins: [router],
+			},
+		});
+
+		expect(getByTestId('navigation-submenu-item').querySelector('.submenu__icon')).toBeTruthy();
+	});
+
+	it('should propagate events', async () => {
+		const { getByTestId, emitted } = render(NavigationDropdown, {
+			slots: { default: h('button', { 'data-test-id': 'test-trigger' }) },
+			props: {
+				menu: [
+					{
+						id: 'first',
+						title: 'first',
+						submenu: [{ id: 'nested', title: 'nested', route: { name: 'projects' }, icon: 'user' }],
+					},
+				],
+			},
+			global: {
+				plugins: [router],
+			},
+		});
+
+		await userEvent.click(getByTestId('navigation-submenu-item'));
+
+		expect(emitted('itemClick')).toStrictEqual([
+			[{ active: true, index: 'nested', indexPath: ['-1', 'first', 'nested'] }],
+		]);
+		expect(emitted('select')).toStrictEqual([['nested']]);
+	});
+
+	it('should open first level on click', async () => {
+		const { getByTestId, getByText } = render(NavigationDropdown, {
+			slots: { default: h('button', { 'data-test-id': 'test-trigger' }) },
+			props: {
+				menu: [
+					{
+						id: 'first',
+						title: 'first',
+					},
+				],
+			},
+		});
+		expect(getByText('first')).not.toBeVisible();
+		await userEvent.click(getByTestId('test-trigger'));
+		expect(getByText('first')).toBeVisible();
+	});
+
+	it('should toggle nested level on mouseenter / mouseleave', async () => {
+		const { getByTestId, getByText } = render(NavigationDropdown, {
+			slots: { default: h('button', { 'data-test-id': 'test-trigger' }) },
+			props: {
+				menu: [
+					{
+						id: 'first',
+						title: 'first',
+						submenu: [{ id: 'nested', title: 'nested' }],
+					},
+				],
+			},
+		});
+		expect(getByText('first')).not.toBeVisible();
+		await userEvent.click(getByTestId('test-trigger'));
+		expect(getByText('first')).toBeVisible();
+
+		expect(getByText('nested')).not.toBeVisible();
+		await userEvent.hover(getByTestId('navigation-submenu'));
+		await waitFor(() => expect(getByText('nested')).toBeVisible());
+
+		await userEvent.pointer([
+			{ target: getByTestId('navigation-submenu') },
+			{ target: getByTestId('test-trigger') },
+		]);
+		await waitFor(() => expect(getByText('nested')).not.toBeVisible());
+	});
+});
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
index 7657d73211..ce728a44ba 100644
--- a/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
+++ b/packages/design-system/src/components/N8nNavigationDropdown/NavigationDropdown.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ElMenu, ElSubMenu, ElMenuItem, type MenuItemRegistered } from 'element-plus';
+import { ref } from 'vue';
 import type { RouteLocationRaw } from 'vue-router';
 
 import ConditionalRouterLink from '../ConditionalRouterLink';
@@ -17,28 +18,64 @@ type Item = BaseItem & {
 	submenu?: BaseItem[];
 };
 
+defineOptions({
+	name: 'N8nNavigationDropdown',
+});
+
 defineProps<{
 	menu: Item[];
+	disabled?: boolean;
+	teleport?: boolean;
 }>();
 
+const menuRef = ref<typeof ElMenu | null>(null);
+const ROOT_MENU_INDEX = '-1';
+
 const emit = defineEmits<{
 	itemClick: [item: MenuItemRegistered];
 	select: [id: Item['id']];
 }>();
+
+const close = () => {
+	menuRef.value?.close(ROOT_MENU_INDEX);
+};
+
+const menuTrigger = ref<'click' | 'hover'>('click');
+const onOpen = (index: string) => {
+	if (index !== ROOT_MENU_INDEX) return;
+	menuTrigger.value = 'hover';
+};
+
+const onClose = (index: string) => {
+	if (index !== ROOT_MENU_INDEX) return;
+	menuTrigger.value = 'click';
+};
+
+defineExpose({
+	close,
+});
 </script>
 
 <template>
 	<ElMenu
+		ref="menuRef"
 		mode="horizontal"
+		unique-opened
+		:menu-trigger="menuTrigger"
 		:ellipsis="false"
 		:class="$style.dropdown"
 		@select="emit('select', $event)"
+		@keyup.escape="close"
+		@open="onOpen"
+		@close="onClose"
 	>
 		<ElSubMenu
-			index="-1"
+			:index="ROOT_MENU_INDEX"
 			:class="$style.trigger"
 			:popper-offset="-10"
 			:popper-class="$style.submenu"
+			:disabled
+			:teleported="teleport"
 		>
 			<template #title>
 				<slot />
@@ -46,10 +83,15 @@ const emit = defineEmits<{
 
 			<template v-for="item in menu" :key="item.id">
 				<template v-if="item.submenu">
-					<ElSubMenu :index="item.id" :popper-offset="-10" data-test-id="navigation-submenu">
+					<ElSubMenu
+						:popper-class="$style.nestedSubmenu"
+						:index="item.id"
+						:popper-offset="-10"
+						data-test-id="navigation-submenu"
+					>
 						<template #title>{{ item.title }}</template>
 						<template v-for="subitem in item.submenu" :key="subitem.id">
-							<ConditionalRouterLink :to="subitem.route">
+							<ConditionalRouterLink :to="(!subitem.disabled && subitem.route) || undefined">
 								<ElMenuItem
 									data-test-id="navigation-submenu-item"
 									:index="subitem.id"
@@ -58,18 +100,20 @@ const emit = defineEmits<{
 								>
 									<N8nIcon v-if="subitem.icon" :icon="subitem.icon" :class="$style.submenu__icon" />
 									{{ subitem.title }}
+									<slot :name="`item.append.${item.id}`" v-bind="{ item }" />
 								</ElMenuItem>
 							</ConditionalRouterLink>
 						</template>
 					</ElSubMenu>
 				</template>
-				<ConditionalRouterLink v-else :to="item.route">
+				<ConditionalRouterLink v-else :to="(!item.disabled && item.route) || undefined">
 					<ElMenuItem
 						:index="item.id"
 						:disabled="item.disabled"
 						data-test-id="navigation-menu-item"
 					>
 						{{ item.title }}
+						<slot :name="`item.append.${item.id}`" v-bind="{ item }" />
 					</ElMenuItem>
 				</ConditionalRouterLink>
 			</template>
@@ -81,32 +125,54 @@ const emit = defineEmits<{
 :global(.el-menu).dropdown {
 	border-bottom: 0;
 	background-color: transparent;
-}
 
-:global(.el-sub-menu).trigger {
-	:global(.el-sub-menu__title) {
-		height: auto;
-		line-height: initial;
-		border-bottom: 0 !important;
-		:global(.el-sub-menu__icon-arrow) {
-			display: none;
+	> :global(.el-sub-menu) {
+		> :global(.el-sub-menu__title) {
+			height: auto;
+			line-height: initial;
+			border-bottom: 0 !important;
+			padding: 0;
+			:global(.el-sub-menu__icon-arrow) {
+				display: none;
+			}
+		}
+
+		&:global(.is-active) {
+			:global(.el-sub-menu__title) {
+				border: 0;
+			}
 		}
 	}
+}
 
-	:global(.el-sub-menu__title:hover) {
-		background-color: transparent;
+.nestedSubmenu {
+	:global(.el-menu) {
+		max-height: 450px;
+		overflow: auto;
 	}
 }
 
 .submenu {
+	padding: 5px 0 !important;
+
 	:global(.el-menu--horizontal .el-menu .el-menu-item),
 	:global(.el-menu--horizontal .el-menu .el-sub-menu__title) {
 		color: var(--color-text-dark);
+		background-color: var(--color-menu-background);
 	}
 
 	:global(.el-menu--horizontal .el-menu .el-menu-item:not(.is-disabled):hover),
 	:global(.el-menu--horizontal .el-menu .el-sub-menu__title:not(.is-disabled):hover) {
-		background-color: var(--color-foreground-base);
+		background-color: var(--color-menu-hover-background);
+	}
+
+	:global(.el-popper) {
+		padding: 0 10px !important;
+	}
+
+	:global(.el-menu--popup) {
+		border: 1px solid var(--color-foreground-base);
+		border-radius: var(--border-radius-base);
 	}
 
 	:global(.el-menu--horizontal .el-menu .el-menu-item.is-disabled) {
diff --git a/packages/design-system/src/components/N8nNavigationDropdown/__tests__/NavigationDropdown.spec.ts b/packages/design-system/src/components/N8nNavigationDropdown/__tests__/NavigationDropdown.spec.ts
deleted file mode 100644
index 465f1f0c2b..0000000000
--- a/packages/design-system/src/components/N8nNavigationDropdown/__tests__/NavigationDropdown.spec.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import userEvent from '@testing-library/user-event';
-import { configure, render, waitFor } from '@testing-library/vue';
-import { h } from 'vue';
-import { createRouter, createWebHistory } from 'vue-router';
-
-import NavigationDropdown from '../NavigationDropdown.vue';
-
-configure({ testIdAttribute: 'data-test-id' });
-
-const router = createRouter({
-	history: createWebHistory(),
-	routes: [
-		{
-			path: '/',
-			name: 'home',
-			redirect: '/home',
-		},
-		{
-			path: '/projects',
-			name: 'projects',
-			component: { template: '<h1>projects</h1>' },
-		},
-	],
-});
-
-describe('N8nNavigationDropdown', () => {
-	beforeAll(async () => {
-		await router.push('/');
-
-		await router.isReady();
-	});
-	it('default slot should trigger first level', async () => {
-		const { getByTestId, queryByTestId } = render(NavigationDropdown, {
-			slots: { default: h('button', { ['data-test-id']: 'test-trigger' }) },
-			props: { menu: [{ id: 'aaa', title: 'aaa', route: { name: 'projects' } }] },
-			global: {
-				plugins: [router],
-			},
-		});
-		expect(getByTestId('test-trigger')).toBeVisible();
-		expect(queryByTestId('navigation-menu-item')).not.toBeVisible();
-
-		await userEvent.hover(getByTestId('test-trigger'));
-		await waitFor(() => expect(queryByTestId('navigation-menu-item')).toBeVisible());
-	});
-
-	it('redirect to route', async () => {
-		const { getByTestId, queryByTestId } = render(NavigationDropdown, {
-			slots: { default: h('button', { ['data-test-id']: 'test-trigger' }) },
-			props: {
-				menu: [
-					{
-						id: 'aaa',
-						title: 'aaa',
-						submenu: [{ id: 'bbb', title: 'bbb', route: { name: 'projects' } }],
-					},
-				],
-			},
-			global: {
-				plugins: [router],
-			},
-		});
-
-		expect(getByTestId('test-trigger')).toBeVisible();
-		expect(queryByTestId('navigation-submenu')).not.toBeVisible();
-
-		await userEvent.hover(getByTestId('test-trigger'));
-
-		await waitFor(() => expect(getByTestId('navigation-submenu')).toBeVisible());
-
-		await userEvent.click(getByTestId('navigation-submenu-item'));
-
-		expect(router.currentRoute.value.name).toBe('projects');
-	});
-
-	it('should render icons in submenu when provided', () => {
-		const { getByTestId } = render(NavigationDropdown, {
-			slots: { default: h('button', { ['data-test-id']: 'test-trigger' }) },
-			props: {
-				menu: [
-					{
-						id: 'aaa',
-						title: 'aaa',
-						submenu: [{ id: 'bbb', title: 'bbb', route: { name: 'projects' }, icon: 'user' }],
-					},
-				],
-			},
-			global: {
-				plugins: [router],
-			},
-		});
-
-		expect(getByTestId('navigation-submenu-item').querySelector('.submenu__icon')).toBeTruthy();
-	});
-
-	it('should propagate events', async () => {
-		const { getByTestId, emitted } = render(NavigationDropdown, {
-			slots: { default: h('button', { ['data-test-id']: 'test-trigger' }) },
-			props: {
-				menu: [
-					{
-						id: 'aaa',
-						title: 'aaa',
-						submenu: [{ id: 'bbb', title: 'bbb', route: { name: 'projects' }, icon: 'user' }],
-					},
-				],
-			},
-			global: {
-				plugins: [router],
-			},
-		});
-
-		await userEvent.click(getByTestId('navigation-submenu-item'));
-
-		expect(emitted('itemClick')).toStrictEqual([
-			[{ active: true, index: 'bbb', indexPath: ['-1', 'aaa', 'bbb'] }],
-		]);
-		expect(emitted('select')).toStrictEqual([['bbb']]);
-	});
-});
diff --git a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts b/packages/design-system/src/components/N8nNotice/Notice.test.ts
similarity index 97%
rename from packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
rename to packages/design-system/src/components/N8nNotice/Notice.test.ts
index 25c098b558..8ef26d1a9c 100644
--- a/packages/design-system/src/components/N8nNotice/__tests__/Notice.spec.ts
+++ b/packages/design-system/src/components/N8nNotice/Notice.test.ts
@@ -3,7 +3,7 @@ import { render } from '@testing-library/vue';
 import { N8nText } from 'n8n-design-system/components';
 import { n8nHtml } from 'n8n-design-system/directives';
 
-import N8nNotice from '../Notice.vue';
+import N8nNotice from './Notice.vue';
 
 describe('components', () => {
 	describe('N8nNotice', () => {
diff --git a/packages/design-system/src/components/N8nNotice/Notice.vue b/packages/design-system/src/components/N8nNotice/Notice.vue
index a69ef3f584..d2f7512292 100644
--- a/packages/design-system/src/components/N8nNotice/Notice.vue
+++ b/packages/design-system/src/components/N8nNotice/Notice.vue
@@ -10,6 +10,7 @@ interface NoticeProps {
 	theme?: 'success' | 'warning' | 'danger' | 'info';
 	content?: string;
 	fullContent?: string;
+	compact?: boolean;
 }
 
 const props = withDefaults(defineProps<NoticeProps>(), {
@@ -17,6 +18,7 @@ const props = withDefaults(defineProps<NoticeProps>(), {
 	theme: 'warning',
 	content: '',
 	fullContent: '',
+	compact: true,
 });
 
 const emit = defineEmits<{
@@ -68,7 +70,7 @@ const onClick = (event: MouseEvent) => {
 <template>
 	<div :id="id" :class="classes" role="alert" @click="onClick">
 		<div class="notice-content">
-			<N8nText size="small" :compact="true">
+			<N8nText size="small" :compact="compact">
 				<slot>
 					<span
 						:id="`${id}-content`"
diff --git a/packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap b/packages/design-system/src/components/N8nNotice/__snapshots__/Notice.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nNotice/__tests__/__snapshots__/Notice.spec.ts.snap
rename to packages/design-system/src/components/N8nNotice/__snapshots__/Notice.test.ts.snap
diff --git a/packages/design-system/src/components/N8nOption/Option.vue b/packages/design-system/src/components/N8nOption/Option.vue
index e7c44f475c..15ed301a85 100644
--- a/packages/design-system/src/components/N8nOption/Option.vue
+++ b/packages/design-system/src/components/N8nOption/Option.vue
@@ -1,12 +1,17 @@
 <script setup lang="ts">
 import { ElOption } from 'element-plus';
 
-const props = defineProps({
-	...ElOption.props,
-	value: { type: [String, Number], required: true },
-});
+/**
+ * @see https://element-plus.org/en-US/component/select.html#option-attributes
+ */
+type OptionProps = {
+	value: string | number | boolean | object;
+	label?: string | number;
+	disabled?: boolean;
+};
+const props = defineProps<OptionProps>();
 </script>
 
 <template>
-	<ElOption v-bind="{ ...$props, ...$attrs }" :value="props.value"><slot /></ElOption>
+	<ElOption v-bind="props"><slot /></ElOption>
 </template>
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
index 837260722b..b9f9a41ce2 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButtons.vue
@@ -1,14 +1,14 @@
-<script lang="ts" setup>
+<script lang="ts" setup generic="Value extends string">
 import RadioButton from './RadioButton.vue';
 
 interface RadioOption {
 	label: string;
-	value: string;
+	value: Value;
 	disabled?: boolean;
 }
 
 interface RadioButtonsProps {
-	modelValue?: string;
+	modelValue?: Value;
 	options?: RadioOption[];
 	/** @default medium */
 	size?: 'small' | 'medium';
@@ -22,11 +22,11 @@ const props = withDefaults(defineProps<RadioButtonsProps>(), {
 });
 
 const emit = defineEmits<{
-	'update:modelValue': [value: string, e: MouseEvent];
+	'update:modelValue': [value: Value, e: MouseEvent];
 }>();
 
 const onClick = (
-	option: { label: string; value: string; disabled?: boolean },
+	option: { label: string; value: Value; disabled?: boolean },
 	event: MouseEvent,
 ) => {
 	if (props.disabled || option.disabled) {
diff --git a/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.test.ts
similarity index 91%
rename from packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
rename to packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.test.ts
index 85c83db428..8324ef9aa2 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/__tests__/RecycleScroller.spec.ts
+++ b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nRecycleScroller from '../RecycleScroller.vue';
+import N8nRecycleScroller from './RecycleScroller.vue';
 
 const itemSize = 100;
 const itemKey = 'id';
diff --git a/packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap b/packages/design-system/src/components/N8nRecycleScroller/__snapshots__/RecycleScroller.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nRecycleScroller/__tests__/__snapshots__/RecycleScroller.spec.ts.snap
rename to packages/design-system/src/components/N8nRecycleScroller/__snapshots__/RecycleScroller.test.ts.snap
diff --git a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
index 3d32365c4b..f4804a37fc 100644
--- a/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
+++ b/packages/design-system/src/components/N8nResizeWrapper/ResizeWrapper.vue
@@ -1,5 +1,7 @@
 <script lang="ts" setup>
-import { computed, ref } from 'vue';
+import { computed, ref, useCssModule } from 'vue';
+
+import { directionsCursorMaps, type Direction, type ResizeData } from 'n8n-design-system/types';
 
 function closestNumber(value: number, divisor: number): number {
 	const q = value / divisor;
@@ -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;
@@ -43,6 +32,7 @@ interface ResizeProps {
 	scale?: number;
 	gridSize?: number;
 	supportedDirections?: Direction[];
+	outset?: boolean;
 }
 
 const props = withDefaults(defineProps<ResizeProps>(), {
@@ -53,18 +43,11 @@ const props = withDefaults(defineProps<ResizeProps>(), {
 	minWidth: 0,
 	scale: 1,
 	gridSize: 20,
+	outset: false,
 	supportedDirections: () => [],
 });
 
-export interface ResizeData {
-	height: number;
-	width: number;
-	dX: number;
-	dY: number;
-	x: number;
-	y: number;
-	direction: Direction;
-}
+const $style = useCssModule();
 
 const emit = defineEmits<{
 	resizestart: [];
@@ -91,6 +74,11 @@ const state = {
 	y: ref(0),
 };
 
+const classes = computed(() => ({
+	[$style.resize]: true,
+	[$style.outset]: props.outset,
+}));
+
 const mouseMove = (event: MouseEvent) => {
 	event.preventDefault();
 	event.stopPropagation();
@@ -168,7 +156,7 @@ const resizerMove = (event: MouseEvent) => {
 </script>
 
 <template>
-	<div :class="$style.resize">
+	<div :class="classes">
 		<div
 			v-for="direction in enabledDirections"
 			:key="direction"
@@ -182,6 +170,10 @@ const resizerMove = (event: MouseEvent) => {
 
 <style lang="scss" module>
 .resize {
+	--resizer--size: 12px;
+	--resizer--side-offset: -2px;
+	--resizer--corner-offset: -3px;
+
 	position: relative;
 	width: 100%;
 	height: 100%;
@@ -194,66 +186,71 @@ const resizerMove = (event: MouseEvent) => {
 }
 
 .right {
-	width: 12px;
+	width: var(--resizer--size);
 	height: 100%;
-	top: -2px;
-	right: -2px;
+	top: var(--resizer--side-offset);
+	right: var(--resizer--side-offset);
 	cursor: ew-resize;
 }
 
 .top {
 	width: 100%;
-	height: 12px;
-	top: -2px;
-	left: -2px;
+	height: var(--resizer--size);
+	top: var(--resizer--side-offset);
+	left: var(--resizer--side-offset);
 	cursor: ns-resize;
 }
 
 .bottom {
 	width: 100%;
-	height: 12px;
-	bottom: -2px;
-	left: -2px;
+	height: var(--resizer--size);
+	bottom: var(--resizer--side-offset);
+	left: var(--resizer--side-offset);
 	cursor: ns-resize;
 }
 
 .left {
-	width: 12px;
+	width: var(--resizer--size);
 	height: 100%;
-	top: -2px;
-	left: -2px;
+	top: var(--resizer--side-offset);
+	left: var(--resizer--side-offset);
 	cursor: ew-resize;
 }
 
 .topLeft {
-	width: 12px;
-	height: 12px;
-	top: -3px;
-	left: -3px;
+	width: var(--resizer--size);
+	height: var(--resizer--size);
+	top: var(--resizer--corner-offset);
+	left: var(--resizer--corner-offset);
 	cursor: nw-resize;
 }
 
 .topRight {
-	width: 12px;
-	height: 12px;
-	top: -3px;
-	right: -3px;
+	width: var(--resizer--size);
+	height: var(--resizer--size);
+	top: var(--resizer--corner-offset);
+	right: var(--resizer--corner-offset);
 	cursor: ne-resize;
 }
 
 .bottomLeft {
-	width: 12px;
-	height: 12px;
-	bottom: -3px;
-	left: -3px;
+	width: var(--resizer--size);
+	height: var(--resizer--size);
+	bottom: var(--resizer--corner-offset);
+	left: var(--resizer--corner-offset);
 	cursor: sw-resize;
 }
 
 .bottomRight {
-	width: 12px;
-	height: 12px;
-	bottom: -3px;
-	right: -3px;
+	width: var(--resizer--size);
+	height: var(--resizer--size);
+	bottom: var(--resizer--corner-offset);
+	right: var(--resizer--corner-offset);
 	cursor: se-resize;
 }
+
+.outset {
+	--resizer--side-offset: calc(-1 * var(--resizer--size) + 2px);
+	--resizer--corner-offset: calc(-1 * var(--resizer--size) + 3px);
+}
 </style>
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/components/N8nRoute/__tests__/Route.spec.ts b/packages/design-system/src/components/N8nRoute/Route.test.ts
similarity index 94%
rename from packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts
rename to packages/design-system/src/components/N8nRoute/Route.test.ts
index 430c8f1ae0..ea307826d4 100644
--- a/packages/design-system/src/components/N8nRoute/__tests__/Route.spec.ts
+++ b/packages/design-system/src/components/N8nRoute/Route.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nRoute from '../Route.vue';
+import N8nRoute from './Route.vue';
 
 describe('N8nRoute', () => {
 	it('should render internal router links', () => {
diff --git a/packages/design-system/src/components/N8nRoute/__tests__/__snapshots__/Route.spec.ts.snap b/packages/design-system/src/components/N8nRoute/__snapshots__/Route.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nRoute/__tests__/__snapshots__/Route.spec.ts.snap
rename to packages/design-system/src/components/N8nRoute/__snapshots__/Route.test.ts.snap
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts b/packages/design-system/src/components/N8nSelect/Select.test.ts
similarity index 95%
rename from packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
rename to packages/design-system/src/components/N8nSelect/Select.test.ts
index bba6055e46..9aafcf2bff 100644
--- a/packages/design-system/src/components/N8nSelect/__tests__/Select.spec.ts
+++ b/packages/design-system/src/components/N8nSelect/Select.test.ts
@@ -4,8 +4,8 @@ import { defineComponent, ref } from 'vue';
 
 import { removeDynamicAttributes } from 'n8n-design-system/utils';
 
-import N8nOption from '../../N8nOption/Option.vue';
-import N8nSelect from '../Select.vue';
+import N8nSelect from './Select.vue';
+import N8nOption from '../N8nOption/Option.vue';
 
 describe('components', () => {
 	describe('N8nSelect', () => {
diff --git a/packages/design-system/src/components/N8nSelect/Select.vue b/packages/design-system/src/components/N8nSelect/Select.vue
index 7cb4fafcc9..28c1fc049a 100644
--- a/packages/design-system/src/components/N8nSelect/Select.vue
+++ b/packages/design-system/src/components/N8nSelect/Select.vue
@@ -31,6 +31,10 @@ const props = defineProps({
 	multiple: {
 		type: Boolean,
 	},
+	multipleLimit: {
+		type: Number,
+		default: 0,
+	},
 	filterMethod: {
 		type: Function,
 	},
@@ -120,6 +124,7 @@ defineExpose({
 		<ElSelect
 			v-bind="{ ...$props, ...listeners }"
 			ref="innerSelect"
+			:multiple-limit="props.multipleLimit"
 			:model-value="props.modelValue ?? undefined"
 			:size="computedSize"
 			:popper-class="props.popperClass"
@@ -131,6 +136,12 @@ defineExpose({
 			<template v-if="$slots.suffix" #suffix>
 				<slot name="suffix" />
 			</template>
+			<template v-if="$slots.footer" #footer>
+				<slot name="footer" />
+			</template>
+			<template v-if="$slots.empty" #empty>
+				<slot name="empty" />
+			</template>
 			<slot></slot>
 		</ElSelect>
 	</div>
diff --git a/packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap b/packages/design-system/src/components/N8nSelect/__snapshots__/Select.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nSelect/__tests__/__snapshots__/Select.spec.ts.snap
rename to packages/design-system/src/components/N8nSelect/__snapshots__/Select.test.ts.snap
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.stories.ts b/packages/design-system/src/components/N8nSelectableList/SelectableList.stories.ts
new file mode 100644
index 0000000000..a4f5244143
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/SelectableList.stories.ts
@@ -0,0 +1,45 @@
+import type { StoryFn } from '@storybook/vue3';
+
+import N8nSelectableList from './SelectableList.vue';
+
+export default {
+	title: 'Modules/SelectableList',
+	component: N8nSelectableList,
+	argTypes: {},
+	parameters: {
+		backgrounds: { default: '--color-background-light' },
+	},
+};
+
+const Template: StoryFn = (args, { argTypes }) => ({
+	setup: () => ({
+		args: { ...args, modelValue: undefined },
+		model: args.modelValue,
+	}),
+	props: Object.keys(argTypes),
+	// Generics make this difficult to type
+	components: N8nSelectableList as never,
+	template:
+		'<n8n-selectable-list v-bind="args" v-model="model"><template #displayItem="{ name }">Slot content for {{name}}</template></n8n-selectable-list>',
+});
+
+export const SelectableList = Template.bind({});
+SelectableList.args = {
+	modelValue: {
+		propC: 'propC pre-existing initial value',
+	},
+	inputs: [
+		{
+			name: 'propC',
+			initialValue: 'propC default',
+		},
+		{
+			name: 'propB',
+			initialValue: 0,
+		},
+		{
+			name: 'propA',
+			initialValue: false,
+		},
+	],
+};
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.test.ts b/packages/design-system/src/components/N8nSelectableList/SelectableList.test.ts
new file mode 100644
index 0000000000..e7ba9d4206
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/SelectableList.test.ts
@@ -0,0 +1,107 @@
+import { fireEvent, render } from '@testing-library/vue';
+
+import N8nSelectableList from './SelectableList.vue';
+
+describe('N8nSelectableList', () => {
+	it('renders when empty', () => {
+		const wrapper = render(N8nSelectableList, {
+			props: {
+				modelValue: {},
+				inputs: [],
+			},
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders one clickable element that can be added and removed', async () => {
+		const wrapper = render(N8nSelectableList, {
+			props: {
+				modelValue: {},
+				inputs: [{ name: 'propA', initialValue: '' }],
+			},
+		});
+
+		expect(wrapper.getByTestId('selectable-list-selectable-propA')).toBeInTheDocument();
+
+		await fireEvent.click(wrapper.getByTestId('selectable-list-selectable-propA'));
+
+		expect(wrapper.queryByTestId('selectable-list-selectable-propA')).not.toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-slot-propA')).toBeInTheDocument();
+
+		await fireEvent.click(wrapper.getByTestId('selectable-list-remove-slot-propA'));
+
+		expect(wrapper.queryByTestId('selectable-list-slot-propA')).not.toBeInTheDocument();
+	});
+
+	it('renders multiple elements with some pre-selected', () => {
+		const wrapper = render(N8nSelectableList, {
+			props: {
+				modelValue: {
+					propC: false,
+					propA: 'propA value',
+				},
+				inputs: [
+					{ name: 'propD', initialValue: true },
+					{ name: 'propC', initialValue: true },
+					{ name: 'propB', initialValue: 3 },
+					{ name: 'propA', initialValue: '' },
+				],
+			},
+		});
+
+		expect(wrapper.queryByTestId('selectable-list-selectable-propA')).not.toBeInTheDocument();
+		expect(wrapper.queryByTestId('selectable-list-selectable-propC')).not.toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-slot-propA')).toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-selectable-propB')).toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-slot-propC')).toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-selectable-propD')).toBeInTheDocument();
+
+		// This asserts order - specifically that propA appears before propC
+		expect(
+			wrapper
+				.getByTestId('selectable-list-slot-propA')
+				.compareDocumentPosition(wrapper.getByTestId('selectable-list-slot-propC')),
+		).toEqual(4);
+
+		expect(
+			wrapper
+				.getByTestId('selectable-list-selectable-propB')
+				.compareDocumentPosition(wrapper.getByTestId('selectable-list-selectable-propD')),
+		).toEqual(4);
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders disabled collection and clicks do not modify', async () => {
+		const wrapper = render(N8nSelectableList, {
+			props: {
+				modelValue: {
+					propB: 'propB value',
+				},
+				disabled: true,
+				inputs: [
+					{ name: 'propA', initialValue: '' },
+					{ name: 'propB', initialValue: '' },
+					{ name: 'propC', initialValue: '' },
+				],
+			},
+		});
+
+		expect(wrapper.getByTestId('selectable-list-selectable-propA')).toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-slot-propB')).toBeInTheDocument();
+		expect(wrapper.queryByTestId('selectable-list-selectable-propB')).not.toBeInTheDocument();
+		expect(wrapper.getByTestId('selectable-list-selectable-propC')).toBeInTheDocument();
+
+		await fireEvent.click(wrapper.getByTestId('selectable-list-selectable-propA'));
+
+		expect(wrapper.getByTestId('selectable-list-selectable-propA')).toBeInTheDocument();
+		expect(wrapper.queryByTestId('selectable-list-slot-propA')).not.toBeInTheDocument();
+
+		await fireEvent.click(wrapper.getByTestId('selectable-list-remove-slot-propB'));
+
+		expect(wrapper.getByTestId('selectable-list-slot-propB')).toBeInTheDocument();
+		expect(wrapper.queryByTestId('selectable-list-selectable-propB')).not.toBeInTheDocument();
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/design-system/src/components/N8nSelectableList/SelectableList.vue b/packages/design-system/src/components/N8nSelectableList/SelectableList.vue
new file mode 100644
index 0000000000..e5ba985edf
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/SelectableList.vue
@@ -0,0 +1,139 @@
+<script setup lang="ts" generic="Value, Item extends { name: string; initialValue: Value }">
+import { computed } from 'vue';
+
+import { useI18n } from '../../composables/useI18n';
+
+const { t } = useI18n();
+
+defineSlots<{
+	// This slot is used to display a selectable item
+	addItem: (props: Item) => unknown;
+	// This slot is used to display a selected item
+	displayItem: (props: Item) => unknown;
+}>();
+
+type SelectableListProps = {
+	inputs: Item[];
+	disabled?: boolean;
+};
+
+const props = withDefaults(defineProps<SelectableListProps>(), {
+	inputs: () => [],
+	disabled: false,
+});
+
+// Record<inputs[k].name, initialValue>
+// Note that only the keys will stay up to date to reflect selected keys
+// Whereas the values will not automatically update if the related slot value is updated
+const selectedItems = defineModel<Record<string, Value>>({ required: true });
+
+const inputMap = computed(() => Object.fromEntries(props.inputs.map((x) => [x.name, x] as const)));
+
+const visibleSelectables = computed(() => {
+	return props.inputs
+		.filter((selectable) => !selectedItems.value.hasOwnProperty(selectable.name))
+		.sort(itemComparator);
+});
+
+const sortedSelectedItems = computed(() => {
+	return Object.entries(selectedItems.value)
+		.map(([name, initialValue]) => ({
+			...inputMap.value[name],
+			initialValue,
+		}))
+		.sort(itemComparator);
+});
+
+function addToSelectedItems(name: string) {
+	selectedItems.value[name] = inputMap.value[name].initialValue;
+}
+
+function removeFromSelectedItems(name: string) {
+	delete selectedItems.value[name];
+}
+
+function itemComparator(a: Item, b: Item) {
+	return a.name.localeCompare(b.name);
+}
+</script>
+
+<template>
+	<div>
+		<div :class="$style.selectableContainer">
+			<span
+				v-for="item in visibleSelectables"
+				:key="item.name"
+				:class="$style.selectableCell"
+				:data-test-id="`selectable-list-selectable-${item.name}`"
+				@click="!props.disabled && addToSelectedItems(item.name)"
+			>
+				<slot name="addItem" v-bind="item"
+					>{{ t('selectableList.addDefault') }} {{ item.name }}</slot
+				>
+			</span>
+		</div>
+		<div
+			v-for="item in sortedSelectedItems"
+			:key="item.name"
+			:class="$style.slotComboContainer"
+			:data-test-id="`selectable-list-slot-${item.name}`"
+		>
+			<N8nIcon
+				:class="$style.slotRemoveIcon"
+				size="xsmall"
+				:icon="disabled ? 'none' : 'trash'"
+				:data-test-id="`selectable-list-remove-slot-${item.name}`"
+				@click="!disabled && removeFromSelectedItems(item.name)"
+			/>
+			<div :class="$style.slotContainer">
+				<slot name="displayItem" v-bind="item" />
+			</div>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.slotComboContainer {
+	display: flex;
+	flex-direction: row;
+	flex-grow: 1;
+	gap: var(--spacing-2xs);
+}
+
+.slotContainer {
+	flex-grow: 1;
+}
+
+.selectableContainer {
+	width: 100%;
+	flex-wrap: wrap;
+	display: flex;
+}
+.selectableCell {
+	display: flex;
+	margin-right: var(--spacing-3xs);
+
+	min-width: max-content;
+	border-radius: var(--border-radius-base);
+	font-size: small;
+	background-color: var(--color-ndv-background);
+	color: var(--text-color-dark);
+
+	cursor: pointer;
+
+	:hover {
+		color: var(--color-primary);
+	}
+}
+
+.slotRemoveIcon {
+	color: var(--color-text-light);
+	height: 10px;
+	width: 10px;
+	margin-top: 3px;
+
+	:hover {
+		cursor: pointer;
+	}
+}
+</style>
diff --git a/packages/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap b/packages/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap
new file mode 100644
index 0000000000..747dbeb778
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/__snapshots__/SelectableList.test.ts.snap
@@ -0,0 +1,28 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`N8nSelectableList > renders disabled collection and clicks do not modify 1`] = `
+"<div>
+  <div class="selectableContainer"><span class="selectableCell" data-test-id="selectable-list-selectable-propA">+ Add a propA</span><span class="selectableCell" data-test-id="selectable-list-selectable-propC">+ Add a propC</span></div>
+  <div class="slotComboContainer" data-test-id="selectable-list-slot-propB"><span class="n8n-text compact size-xsmall regular n8n-icon slotRemoveIcon slotRemoveIcon n8n-icon slotRemoveIcon slotRemoveIcon" data-test-id="selectable-list-remove-slot-propB"><!----></span>
+    <div class="slotContainer"></div>
+  </div>
+</div>"
+`;
+
+exports[`N8nSelectableList > renders multiple elements with some pre-selected 1`] = `
+"<div>
+  <div class="selectableContainer"><span class="selectableCell" data-test-id="selectable-list-selectable-propB">+ Add a propB</span><span class="selectableCell" data-test-id="selectable-list-selectable-propD">+ Add a propD</span></div>
+  <div class="slotComboContainer" data-test-id="selectable-list-slot-propA"><span class="n8n-text compact size-xsmall regular n8n-icon slotRemoveIcon slotRemoveIcon n8n-icon slotRemoveIcon slotRemoveIcon" data-test-id="selectable-list-remove-slot-propA"><!----></span>
+    <div class="slotContainer"></div>
+  </div>
+  <div class="slotComboContainer" data-test-id="selectable-list-slot-propC"><span class="n8n-text compact size-xsmall regular n8n-icon slotRemoveIcon slotRemoveIcon n8n-icon slotRemoveIcon slotRemoveIcon" data-test-id="selectable-list-remove-slot-propC"><!----></span>
+    <div class="slotContainer"></div>
+  </div>
+</div>"
+`;
+
+exports[`N8nSelectableList > renders when empty 1`] = `
+"<div>
+  <div class="selectableContainer"></div>
+</div>"
+`;
diff --git a/packages/design-system/src/components/N8nSelectableList/index.ts b/packages/design-system/src/components/N8nSelectableList/index.ts
new file mode 100644
index 0000000000..6c2d0e1127
--- /dev/null
+++ b/packages/design-system/src/components/N8nSelectableList/index.ts
@@ -0,0 +1,3 @@
+import N8nSelectableList from './SelectableList.vue';
+
+export default N8nSelectableList;
diff --git a/packages/design-system/src/components/N8nTabs/Tabs.vue b/packages/design-system/src/components/N8nTabs/Tabs.vue
index 9b56e0cfe5..53e2a7da56 100644
--- a/packages/design-system/src/components/N8nTabs/Tabs.vue
+++ b/packages/design-system/src/components/N8nTabs/Tabs.vue
@@ -1,11 +1,11 @@
-<script lang="ts" setup>
+<script lang="ts" setup generic="Value extends string | number">
 import { onMounted, onUnmounted, ref } from 'vue';
 import type { RouteLocationRaw } from 'vue-router';
 
 import N8nIcon from '../N8nIcon';
 
 interface TabOptions {
-	value: string;
+	value: Value;
 	label?: string;
 	icon?: string;
 	href?: string;
@@ -15,7 +15,7 @@ interface TabOptions {
 }
 
 interface TabsProps {
-	modelValue?: string;
+	modelValue?: Value;
 	options?: TabOptions[];
 }
 
@@ -56,12 +56,12 @@ onUnmounted(() => {
 });
 
 const emit = defineEmits<{
-	tooltipClick: [tab: string, e: MouseEvent];
-	'update:modelValue': [tab: string];
+	tooltipClick: [tab: Value, e: MouseEvent];
+	'update:modelValue': [tab: Value];
 }>();
 
-const handleTooltipClick = (tab: string, event: MouseEvent) => emit('tooltipClick', tab, event);
-const handleTabClick = (tab: string) => emit('update:modelValue', tab);
+const handleTooltipClick = (tab: Value, event: MouseEvent) => emit('tooltipClick', tab, event);
+const handleTabClick = (tab: Value) => emit('update:modelValue', tab);
 
 const scroll = (left: number) => {
 	const container = tabs.value;
@@ -84,7 +84,7 @@ const scrollRight = () => scroll(50);
 		<div ref="tabs" :class="$style.tabs">
 			<div
 				v-for="option in options"
-				:id="option.value"
+				:id="option.value.toString()"
 				:key="option.value"
 				:class="{ [$style.alignRight]: option.align === 'right' }"
 			>
diff --git a/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts b/packages/design-system/src/components/N8nTooltip/Tooltip.test.ts
similarity index 95%
rename from packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts
rename to packages/design-system/src/components/N8nTooltip/Tooltip.test.ts
index 8fe4219d2d..230a239910 100644
--- a/packages/design-system/src/components/N8nTooltip/__tests__/Tooltip.spec.ts
+++ b/packages/design-system/src/components/N8nTooltip/Tooltip.test.ts
@@ -1,7 +1,7 @@
 import userEvent from '@testing-library/user-event';
 import { render } from '@testing-library/vue';
 
-import N8nTooltip from '../Tooltip.vue';
+import N8nTooltip from './Tooltip.vue';
 
 describe('components', () => {
 	describe('N8nTooltip', () => {
diff --git a/packages/design-system/src/components/N8nTree/Tree.stories.ts b/packages/design-system/src/components/N8nTree/Tree.stories.ts
index e0f9713065..733cc8602d 100644
--- a/packages/design-system/src/components/N8nTree/Tree.stories.ts
+++ b/packages/design-system/src/components/N8nTree/Tree.stories.ts
@@ -7,6 +7,7 @@ export default {
 	component: N8nTree,
 };
 
+// @ts-expect-error Storybook incorrect slot types
 export const Default: StoryFn = (args, { argTypes }) => ({
 	setup: () => ({ args }),
 	props: Object.keys(argTypes),
diff --git a/packages/design-system/src/components/N8nTree/__tests__/Tree.spec.ts b/packages/design-system/src/components/N8nTree/Tree.test.ts
similarity index 97%
rename from packages/design-system/src/components/N8nTree/__tests__/Tree.spec.ts
rename to packages/design-system/src/components/N8nTree/Tree.test.ts
index 1728a6f9fc..8266d03f6a 100644
--- a/packages/design-system/src/components/N8nTree/__tests__/Tree.spec.ts
+++ b/packages/design-system/src/components/N8nTree/Tree.test.ts
@@ -1,6 +1,6 @@
 import { render } from '@testing-library/vue';
 
-import N8nTree from '../Tree.vue';
+import N8nTree from './Tree.vue';
 
 describe('components', () => {
 	describe('N8nTree', () => {
diff --git a/packages/design-system/src/components/N8nTree/Tree.vue b/packages/design-system/src/components/N8nTree/Tree.vue
index b78c2fee02..756fd627ff 100644
--- a/packages/design-system/src/components/N8nTree/Tree.vue
+++ b/packages/design-system/src/components/N8nTree/Tree.vue
@@ -1,19 +1,16 @@
-<script lang="ts" setup>
+<script lang="ts" setup generic="Value extends unknown = unknown">
 import { computed, useCssModule } from 'vue';
 
 interface TreeProps {
-	value?: Record<string, unknown>;
+	value?: Record<string, Value>;
 	path?: Array<string | number>;
 	depth?: number;
 	nodeClass?: string;
 }
 
 defineSlots<{
-	[key: string]: (props: {
-		label?: string;
-		path?: Array<string | number>;
-		value?: unknown;
-	}) => never;
+	label(props: { label: string; path: Array<string | number> }): never;
+	value(props: { value: Value }): never;
 }>();
 
 defineOptions({ name: 'N8nTree' });
@@ -29,11 +26,11 @@ const classes = computed((): Record<string, boolean> => {
 	return { [props.nodeClass]: !!props.nodeClass, [$style.indent]: props.depth > 0 };
 });
 
-const isObject = (data: unknown): data is Record<string, unknown> => {
+const isObject = (data: unknown): data is Record<string, Value> => {
 	return typeof data === 'object' && data !== null;
 };
 
-const isSimple = (data: unknown): boolean => {
+const isSimple = (data: Value): boolean => {
 	if (data === null || data === undefined) {
 		return true;
 	}
@@ -70,16 +67,21 @@ const getPath = (key: string): Array<string | number> => {
 			<div v-else>
 				<slot v-if="$slots.label" name="label" :label="label" :path="getPath(label)" />
 				<span v-else>{{ label }}</span>
-				<n8n-tree
+				<N8nTree
+					v-if="isObject(value[label])"
 					:path="getPath(label)"
 					:depth="depth + 1"
-					:value="value[label] as Record<string, unknown>"
+					:value="value[label]"
 					:node-class="nodeClass"
 				>
-					<template v-for="(_, name) in $slots" #[name]="data">
-						<slot :name="name" v-bind="data"></slot>
+					<template v-if="$slots.label" #label="data">
+						<slot name="label" v-bind="data" />
 					</template>
-				</n8n-tree>
+
+					<template v-if="$slots.value" #value="data">
+						<slot name="value" v-bind="data" />
+					</template>
+				</N8nTree>
 			</div>
 		</div>
 	</div>
diff --git a/packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap b/packages/design-system/src/components/N8nTree/__snapshots__/Tree.test.ts.snap
similarity index 100%
rename from packages/design-system/src/components/N8nTree/__tests__/__snapshots__/Tree.spec.ts.snap
rename to packages/design-system/src/components/N8nTree/__snapshots__/Tree.test.ts.snap
diff --git a/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts b/packages/design-system/src/components/N8nUserStack/UserStack.test.ts
similarity index 98%
rename from packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts
rename to packages/design-system/src/components/N8nUserStack/UserStack.test.ts
index b08fe3d3d3..1b5ae600ae 100644
--- a/packages/design-system/src/components/N8nUserStack/__tests__/UserStack.spec.ts
+++ b/packages/design-system/src/components/N8nUserStack/UserStack.test.ts
@@ -2,7 +2,7 @@ import { render } from '@testing-library/vue';
 
 import { N8nAvatar, N8nUserInfo } from 'n8n-design-system/main';
 
-import UserStack from '../UserStack.vue';
+import UserStack from './UserStack.vue';
 
 describe('UserStack', () => {
 	it('should render flat user list', () => {
diff --git a/packages/design-system/src/components/index.ts b/packages/design-system/src/components/index.ts
index 2d06e5b8c6..6b584b8e8e 100644
--- a/packages/design-system/src/components/index.ts
+++ b/packages/design-system/src/components/index.ts
@@ -33,9 +33,11 @@ export { default as N8nNodeCreatorNode } from './N8nNodeCreatorNode';
 export { default as N8nNodeIcon } from './N8nNodeIcon';
 export { default as N8nNotice } from './N8nNotice';
 export { default as N8nOption } from './N8nOption';
+export { default as N8nSelectableList } from './N8nSelectableList';
 export { default as N8nPopover } from './N8nPopover';
 export { default as N8nPulse } from './N8nPulse';
 export { default as N8nRadioButtons } from './N8nRadioButtons';
+export { default as N8nRoute } from './N8nRoute';
 export { default as N8nRecycleScroller } from './N8nRecycleScroller';
 export { default as N8nResizeWrapper } from './N8nResizeWrapper';
 export { default as N8nSelect } from './N8nSelect';
@@ -54,3 +56,4 @@ export { default as N8nUserSelect } from './N8nUserSelect';
 export { default as N8nUsersList } from './N8nUsersList';
 export { default as N8nResizeObserver } from './ResizeObserver';
 export { N8nKeyboardShortcut } from './N8nKeyboardShortcut';
+export { default as N8nIconPicker } from './N8nIconPicker';
diff --git a/packages/design-system/src/composables/useDeviceSupport.test.ts b/packages/design-system/src/composables/useDeviceSupport.test.ts
index 0260dcacaf..4cfc5f3533 100644
--- a/packages/design-system/src/composables/useDeviceSupport.test.ts
+++ b/packages/design-system/src/composables/useDeviceSupport.test.ts
@@ -75,6 +75,38 @@ describe('useDeviceSupport()', () => {
 		});
 	});
 
+	describe('isMobileDevice', () => {
+		it('should be true for iOS user agent', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'iphone' });
+			const { isMobileDevice } = useDeviceSupport();
+			expect(isMobileDevice).toEqual(true);
+		});
+
+		it('should be true for Android user agent', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'android' });
+			const { isMobileDevice } = useDeviceSupport();
+			expect(isMobileDevice).toEqual(true);
+		});
+
+		it('should be false for non-mobile user agent', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'windows' });
+			const { isMobileDevice } = useDeviceSupport();
+			expect(isMobileDevice).toEqual(false);
+		});
+
+		it('should be true for iPad user agent', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'ipad' });
+			const { isMobileDevice } = useDeviceSupport();
+			expect(isMobileDevice).toEqual(true);
+		});
+
+		it('should be true for iPod user agent', () => {
+			Object.defineProperty(navigator, 'userAgent', { value: 'ipod' });
+			const { isMobileDevice } = useDeviceSupport();
+			expect(isMobileDevice).toEqual(true);
+		});
+	});
+
 	describe('isCtrlKeyPressed()', () => {
 		it('should return true for metaKey press on macOS', () => {
 			Object.defineProperty(navigator, 'userAgent', { value: 'macintosh' });
diff --git a/packages/design-system/src/composables/useDeviceSupport.ts b/packages/design-system/src/composables/useDeviceSupport.ts
index 8f713ffd30..6b00999216 100644
--- a/packages/design-system/src/composables/useDeviceSupport.ts
+++ b/packages/design-system/src/composables/useDeviceSupport.ts
@@ -12,12 +12,16 @@ export function useDeviceSupport() {
 			!window.matchMedia('(any-pointer: fine)').matches,
 	);
 	const userAgent = ref(navigator.userAgent.toLowerCase());
-	const isMacOs = ref(
-		userAgent.value.includes('macintosh') ||
+
+	const isIOs = ref(
+		userAgent.value.includes('iphone') ||
 			userAgent.value.includes('ipad') ||
-			userAgent.value.includes('iphone') ||
 			userAgent.value.includes('ipod'),
 	);
+	const isAndroidOs = ref(userAgent.value.includes('android'));
+	const isMacOs = ref(userAgent.value.includes('macintosh') || isIOs.value);
+	const isMobileDevice = ref(isIOs.value || isAndroidOs.value);
+
 	const controlKeyCode = ref(isMacOs.value ? 'Meta' : 'Control');
 
 	function isCtrlKeyPressed(e: MouseEvent | KeyboardEvent): boolean {
@@ -30,7 +34,10 @@ export function useDeviceSupport() {
 	return {
 		userAgent: userAgent.value,
 		isTouchDevice: isTouchDevice.value,
+		isAndroidOs: isAndroidOs.value,
+		isIOs: isIOs.value,
 		isMacOs: isMacOs.value,
+		isMobileDevice: isMobileDevice.value,
 		controlKeyCode: controlKeyCode.value,
 		isCtrlKeyPressed,
 	};
diff --git a/packages/design-system/src/css/_primitives.scss b/packages/design-system/src/css/_primitives.scss
index 71c6b4c10f..73d47a7fd4 100644
--- a/packages/design-system/src/css/_primitives.scss
+++ b/packages/design-system/src/css/_primitives.scss
@@ -16,6 +16,7 @@
 	--prim-gray-490: hsl(var(--prim-gray-h), 3%, 51%);
 	--prim-gray-420: hsl(var(--prim-gray-h), 4%, 58%);
 	--prim-gray-320: hsl(var(--prim-gray-h), 10%, 68%);
+	--prim-gray-320-alpha-010: hsla(var(--prim-gray-h), 10%, 68%, 0.1);
 	--prim-gray-200: hsl(var(--prim-gray-h), 18%, 80%);
 	--prim-gray-120: hsl(var(--prim-gray-h), 25%, 88%);
 	--prim-gray-70: hsl(var(--prim-gray-h), 32%, 93%);
diff --git a/packages/design-system/src/css/_tokens.dark.scss b/packages/design-system/src/css/_tokens.dark.scss
index 72963efcf5..051de41601 100644
--- a/packages/design-system/src/css/_tokens.dark.scss
+++ b/packages/design-system/src/css/_tokens.dark.scss
@@ -139,12 +139,20 @@
 	--color-infobox-examples-border-color: var(--prim-gray-670);
 
 	// Code
-	--color-code-tags-string: var(--prim-color-alt-f-tint-150);
-	--color-code-tags-primitive: var(--prim-color-alt-b-shade-100);
-	--color-code-tags-keyword: var(--prim-color-alt-g-tint-150);
-	--color-code-tags-operator: var(--prim-color-alt-h);
-	--color-code-tags-variable: var(--prim-color-primary-tint-100);
-	--color-code-tags-definition: var(--prim-color-alt-e);
+	--color-code-tags-string: #9ecbff;
+	--color-code-tags-regex: #9ecbff;
+	--color-code-tags-primitive: #79b8ff;
+	--color-code-tags-keyword: #f97583;
+	--color-code-tags-variable: #79b8ff;
+	--color-code-tags-parameter: #e1e4e8;
+	--color-code-tags-function: #b392f0;
+	--color-code-tags-constant: #79b8ff;
+	--color-code-tags-property: #79b8ff;
+	--color-code-tags-type: #b392f0;
+	--color-code-tags-class: #b392f0;
+	--color-code-tags-heading: #79b8ff;
+	--color-code-tags-invalid: #f97583;
+	--color-code-tags-comment: #6a737d;
 	--color-json-default: var(--prim-color-secondary-tint-200);
 	--color-json-null: var(--color-danger);
 	--color-json-boolean: var(--prim-color-alt-a);
@@ -155,15 +163,18 @@
 	--color-json-brackets-hover: var(--prim-color-alt-e);
 	--color-json-line: var(--prim-gray-200);
 	--color-json-highlight: var(--color-background-base);
-	--color-code-background: var(--prim-gray-800);
+	--color-code-background: var(--prim-gray-820);
 	--color-code-background-readonly: var(--prim-gray-740);
-	--color-code-lineHighlight: var(--prim-gray-740);
+	--color-code-lineHighlight: var(--prim-gray-320-alpha-010);
 	--color-code-foreground: var(--prim-gray-70);
 	--color-code-caret: var(--prim-gray-10);
-	--color-code-selection: var(--prim-color-alt-e-alpha-04);
-	--color-code-gutterBackground: var(--prim-gray-670);
-	--color-code-gutterForeground: var(--prim-gray-320);
-	--color-code-tags-comment: var(--prim-gray-200);
+	--color-code-selection: #3392ff44;
+	--color-code-selection-highlight: #17e5e633;
+	--color-code-gutter-background: var(--prim-gray-820);
+	--color-code-gutter-foreground: var(--prim-gray-320);
+	--color-code-gutter-foreground-active: var(--prim-gray-10);
+	--color-code-indentation-marker: var(--prim-gray-740);
+	--color-code-indentation-marker-active: var(--prim-gray-670);
 	--color-line-break: var(--prim-gray-420);
 	--color-code-line-break: var(--prim-color-secondary-tint-100);
 
@@ -188,6 +199,14 @@
 	--color-button-secondary-disabled-font: var(--prim-gray-0-alpha-030);
 	--color-button-secondary-disabled-border: var(--prim-gray-0-alpha-030);
 
+	// Button success, warning, danger
+	--color-button-danger-font: var(--prim-gray-0);
+	--color-button-danger-border: transparent;
+	--color-button-danger-focus-outline: var(--prim-color-alt-c-tint-250);
+	--color-button-danger-disabled-font: var(--prim-gray-0-alpha-025);
+	--color-button-danger-disabled-border: transparent;
+	--color-button-danger-disabled-background: var(--prim-color-alt-c-alpha-02);
+
 	// Text button
 	--color-text-button-secondary-font: var(--prim-gray-320);
 
@@ -208,6 +227,7 @@
 	--color-notification-background: var(--prim-gray-740);
 
 	// Execution
+	--execution-card-background: var(--color-foreground-light);
 	--execution-card-background-hover: var(--color-foreground-base);
 	--execution-selector-background: var(--prim-gray-740);
 	--execution-selector-text: var(--color-text-base);
@@ -462,6 +482,13 @@
 	--color-configurable-node-name: var(--color-text-dark);
 	--color-secondary-link: var(--prim-color-secondary-tint-200);
 	--color-secondary-link-hover: var(--prim-color-secondary-tint-100);
+	//Params
+	--color-icon-base: var(--color-text-light);
+	--color-icon-hover: var(--prim-color-primary);
+
+	--color-menu-background: var(--prim-gray-740);
+	--color-menu-hover-background: var(--prim-gray-670);
+	--color-menu-active-background: var(--prim-gray-670);
 }
 
 body[data-theme='dark'] {
diff --git a/packages/design-system/src/css/_tokens.scss b/packages/design-system/src/css/_tokens.scss
index 56d5142c87..50c98ac2ee 100644
--- a/packages/design-system/src/css/_tokens.scss
+++ b/packages/design-system/src/css/_tokens.scss
@@ -37,6 +37,8 @@
 	// Danger
 	--color-danger-shade-1: var(--prim-color-alt-c-shade-100);
 	--color-danger: var(--prim-color-alt-c);
+	--color-danger-light: var(--prim-color-alt-c-tint-150);
+	--color-danger-light-2: var(--prim-color-alt-c-tint-250);
 	--color-danger-tint-1: var(--prim-color-alt-c-tint-400);
 	--color-danger-tint-2: var(--prim-color-alt-c-tint-450);
 
@@ -183,12 +185,20 @@
 	--color-infobox-examples-border-color: var(--color-foreground-light);
 
 	// Code
-	--color-code-tags-string: var(--prim-color-alt-f);
-	--color-code-tags-primitive: var(--prim-color-alt-b-shade-100);
-	--color-code-tags-keyword: var(--prim-color-alt-g);
-	--color-code-tags-operator: var(--prim-color-alt-h);
-	--color-code-tags-variable: var(--prim-color-alt-c-shade-100);
-	--color-code-tags-definition: var(--prim-color-alt-e-shade-150);
+	--color-code-tags-string: #032f62;
+	--color-code-tags-regex: #032f62;
+	--color-code-tags-primitive: #005cc5;
+	--color-code-tags-keyword: #d73a49;
+	--color-code-tags-variable: #005cc5;
+	--color-code-tags-parameter: #24292e;
+	--color-code-tags-function: #6f42c1;
+	--color-code-tags-constant: #005cc5;
+	--color-code-tags-property: #005cc5;
+	--color-code-tags-type: #005cc5;
+	--color-code-tags-class: #6f42c1;
+	--color-code-tags-heading: #005cc5;
+	--color-code-tags-invalid: #cb2431;
+	--color-code-tags-comment: #6a737d;
 	--color-json-default: var(--prim-color-secondary-shade-100);
 	--color-json-null: var(--prim-color-alt-c);
 	--color-json-boolean: var(--prim-color-alt-a);
@@ -201,13 +211,16 @@
 	--color-json-highlight: var(--prim-gray-70);
 	--color-code-background: var(--prim-gray-0);
 	--color-code-background-readonly: var(--prim-gray-40);
-	--color-code-lineHighlight: var(--prim-gray-40);
+	--color-code-lineHighlight: var(--prim-gray-320-alpha-010);
 	--color-code-foreground: var(--prim-gray-670);
-	--color-code-caret: var(--prim-gray-420);
-	--color-code-selection: var(--prim-gray-120);
-	--color-code-gutterBackground: var(--prim-gray-0);
-	--color-code-gutterForeground: var(--prim-gray-320);
-	--color-code-tags-comment: var(--prim-gray-420);
+	--color-code-caret: var(--prim-gray-820);
+	--color-code-selection: #0366d625;
+	--color-code-selection-highlight: #34d05840;
+	--color-code-gutter-background: var(--prim-gray-0);
+	--color-code-gutter-foreground: var(--prim-gray-320);
+	--color-code-gutter-foreground-active: var(--prim-gray-670);
+	--color-code-indentation-marker: var(--prim-gray-70);
+	--color-code-indentation-marker-active: var(--prim-gray-200);
 	--color-line-break: var(--prim-gray-320);
 	--color-code-line-break: var(--prim-color-secondary-tint-200);
 
@@ -244,7 +257,11 @@
 	--color-button-warning-font: var(--color-text-xlight);
 	--color-button-warning-disabled-font: var(--prim-gray-0-alpha-075);
 	--color-button-danger-font: var(--color-text-xlight);
+	--color-button-danger-border: var(--color-danger);
+	--color-button-danger-focus-outline: var(--color-danger-tint-1);
 	--color-button-danger-disabled-font: var(--prim-gray-0-alpha-075);
+	--color-button-danger-disabled-border: var(--color-danger-tint-1);
+	--color-button-danger-disabled-background: var(--color-danger-tint-1);
 
 	// Text button
 	--color-text-button-secondary-font: var(--prim-gray-670);
@@ -272,6 +289,7 @@
 	--execution-card-border-waiting: var(--prim-color-secondary-tint-300);
 	--execution-card-border-running: var(--prim-color-alt-b-tint-250);
 	--execution-card-border-unknown: var(--prim-gray-120);
+	--execution-card-background: var(--color-foreground-xlight);
 	--execution-card-background-hover: var(--color-foreground-light);
 	--execution-card-text-waiting: var(--color-secondary);
 	--execution-selector-background: var(--color-background-dark);
@@ -533,6 +551,11 @@
 	--color-secondary-link: var(--color-secondary);
 	--color-secondary-link-hover: var(--color-secondary-shade-1);
 
+	// Menu
+	--color-menu-background: var(--prim-gray-0);
+	--color-menu-hover-background: var(--prim-gray-120);
+	--color-menu-active-background: var(--prim-gray-120);
+
 	// Generated Color Shades from 50 to 950
 	// Not yet used in design system
 	@each $color in ('neutral', 'success', 'warning', 'danger') {
@@ -583,6 +606,7 @@
 	--border-width-base: 1px;
 	--border-base: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
 
+	--font-size-4xs: 0.5rem;
 	--font-size-3xs: 0.625rem;
 	--font-size-2xs: 0.75rem;
 	--font-size-xs: 0.8125rem;
@@ -615,6 +639,10 @@
 	--spacing-3xl: 4rem;
 	--spacing-4xl: 8rem;
 	--spacing-5xl: 16rem;
+
+	//Params
+	--color-icon-base: var(--color-text-light);
+	--color-icon-hover: var(--prim-color-primary);
 }
 
 :root {
diff --git a/packages/design-system/src/css/index.scss b/packages/design-system/src/css/index.scss
index c37709df1b..98e244f43f 100644
--- a/packages/design-system/src/css/index.scss
+++ b/packages/design-system/src/css/index.scss
@@ -5,6 +5,7 @@
 @use './base.scss';
 @use './pagination.scss';
 @use './dialog.scss';
+@use './display.scss';
 // @use "./autocomplete.scss";
 @use './dropdown.scss';
 @use './dropdown-menu.scss';
diff --git a/packages/design-system/src/css/mixins/_breakpoints.scss b/packages/design-system/src/css/mixins/_breakpoints.scss
new file mode 100644
index 0000000000..405351eb21
--- /dev/null
+++ b/packages/design-system/src/css/mixins/_breakpoints.scss
@@ -0,0 +1,20 @@
+@use '../common/var';
+
+@mixin breakpoint($name) {
+	@if map-has-key(var.$breakpoints-spec, $name) {
+		$query: map-get(var.$breakpoints-spec, $name);
+		$media-query: '';
+
+		@each $key, $value in $query {
+			$media-query: '#{$media-query} and (#{$key}: #{$value})';
+		}
+
+		$media-query: unquote(str-slice($media-query, 6)); // Remove the initial ' and '
+
+		@media screen and #{$media-query} {
+			@content;
+		}
+	} @else {
+		@error "No breakpoint named `#{$name}` found in `$breakpoints-spec`.";
+	}
+}
diff --git a/packages/design-system/src/css/mixins/index.scss b/packages/design-system/src/css/mixins/index.scss
new file mode 100644
index 0000000000..bda8c57b75
--- /dev/null
+++ b/packages/design-system/src/css/mixins/index.scss
@@ -0,0 +1,6 @@
+@forward 'breakpoints';
+@forward 'button';
+@forward 'config';
+@forward 'function';
+@forward 'mixins';
+@forward 'utils';
diff --git a/packages/design-system/src/locale/lang/en.ts b/packages/design-system/src/locale/lang/en.ts
index e6163b2d38..3743bf92c6 100644
--- a/packages/design-system/src/locale/lang/en.ts
+++ b/packages/design-system/src/locale/lang/en.ts
@@ -2,6 +2,7 @@
 import type { N8nLocale } from 'n8n-design-system/types';
 
 export default {
+	'generic.retry': 'Retry',
 	'nds.auth.roles.owner': 'Owner',
 	'nds.userInfo.you': '(you)',
 	'nds.userSelect.selectUser': 'Select User',
@@ -47,4 +48,8 @@ export default {
 	'assistantChat.copy': 'Copy',
 	'assistantChat.copied': 'Copied',
 	'inlineAskAssistantButton.asked': 'Asked',
+	'iconPicker.button.defaultToolTip': 'Choose icon',
+	'iconPicker.tabs.icons': 'Icons',
+	'iconPicker.tabs.emojis': 'Emojis',
+	'selectableList.addDefault': '+ Add a',
 } as N8nLocale;
diff --git a/packages/design-system/src/styleguide/__tests__/ColorCircles.spec.ts b/packages/design-system/src/styleguide/ColorCircles.test.ts
similarity index 94%
rename from packages/design-system/src/styleguide/__tests__/ColorCircles.spec.ts
rename to packages/design-system/src/styleguide/ColorCircles.test.ts
index 0e8f7cb479..3f82ff2a18 100644
--- a/packages/design-system/src/styleguide/__tests__/ColorCircles.spec.ts
+++ b/packages/design-system/src/styleguide/ColorCircles.test.ts
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/vue';
 import { mock, mockClear } from 'vitest-mock-extended';
 
-import ColorCircles from '../ColorCircles.vue';
+import ColorCircles from './ColorCircles.vue';
 
 describe('ColorCircles', () => {
 	const mockCssDeclaration = mock<CSSStyleDeclaration>();
diff --git a/packages/design-system/src/styleguide/__tests__/Sizes.spec.ts b/packages/design-system/src/styleguide/Sizes.test.ts
similarity index 94%
rename from packages/design-system/src/styleguide/__tests__/Sizes.spec.ts
rename to packages/design-system/src/styleguide/Sizes.test.ts
index 9ac613c4d3..2a7f6d916f 100644
--- a/packages/design-system/src/styleguide/__tests__/Sizes.spec.ts
+++ b/packages/design-system/src/styleguide/Sizes.test.ts
@@ -1,7 +1,7 @@
 import { render } from '@testing-library/vue';
 import { mock, mockClear } from 'vitest-mock-extended';
 
-import Sizes from '../Sizes.vue';
+import Sizes from './Sizes.vue';
 
 describe('Sizes', () => {
 	const mockCssDeclaration = mock<CSSStyleDeclaration>();
diff --git a/packages/design-system/src/styleguide/__tests__/__snapshots__/ColorCircles.spec.ts.snap b/packages/design-system/src/styleguide/__snapshots__/ColorCircles.test.ts.snap
similarity index 100%
rename from packages/design-system/src/styleguide/__tests__/__snapshots__/ColorCircles.spec.ts.snap
rename to packages/design-system/src/styleguide/__snapshots__/ColorCircles.test.ts.snap
diff --git a/packages/design-system/src/styleguide/__tests__/__snapshots__/Sizes.spec.ts.snap b/packages/design-system/src/styleguide/__snapshots__/Sizes.test.ts.snap
similarity index 100%
rename from packages/design-system/src/styleguide/__tests__/__snapshots__/Sizes.spec.ts.snap
rename to packages/design-system/src/styleguide/__snapshots__/Sizes.test.ts.snap
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/menu.ts b/packages/design-system/src/types/menu.ts
index 258ff7d555..c042489586 100644
--- a/packages/design-system/src/types/menu.ts
+++ b/packages/design-system/src/types/menu.ts
@@ -5,7 +5,7 @@ import type { RouteLocationRaw, RouterLinkProps } from 'vue-router';
 export type IMenuItem = {
 	id: string;
 	label: string;
-	icon?: string;
+	icon?: string | { type: 'icon' | 'emoji'; value: string };
 	secondaryIcon?: {
 		name: string;
 		size?: 'xsmall' | 'small' | 'medium' | 'large';
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/design-system/src/utils/__tests__/event-bus.spec.ts b/packages/design-system/src/utils/event-bus.test.ts
similarity index 97%
rename from packages/design-system/src/utils/__tests__/event-bus.spec.ts
rename to packages/design-system/src/utils/event-bus.test.ts
index 2fb0735404..0d1500dc54 100644
--- a/packages/design-system/src/utils/__tests__/event-bus.spec.ts
+++ b/packages/design-system/src/utils/event-bus.test.ts
@@ -1,4 +1,4 @@
-import { createEventBus } from '../event-bus';
+import { createEventBus } from './event-bus';
 
 describe('createEventBus()', () => {
 	const eventBus = createEventBus();
diff --git a/packages/design-system/src/utils/labelUtil.spec.ts b/packages/design-system/src/utils/labelUtil.test.ts
similarity index 100%
rename from packages/design-system/src/utils/labelUtil.spec.ts
rename to packages/design-system/src/utils/labelUtil.test.ts
diff --git a/packages/design-system/src/utils/__tests__/markdown.spec.ts b/packages/design-system/src/utils/markdown.test.ts
similarity index 95%
rename from packages/design-system/src/utils/__tests__/markdown.spec.ts
rename to packages/design-system/src/utils/markdown.test.ts
index c712b94048..d2d3d0089f 100644
--- a/packages/design-system/src/utils/__tests__/markdown.spec.ts
+++ b/packages/design-system/src/utils/markdown.test.ts
@@ -1,4 +1,4 @@
-import { toggleCheckbox } from '../markdown';
+import { toggleCheckbox } from './markdown';
 
 describe('toggleCheckbox', () => {
 	it('should do nothing when there are no checkboxes', () => {
diff --git a/packages/design-system/src/utils/__tests__/valueByPath.spec.ts b/packages/design-system/src/utils/valueByPath.test.ts
similarity index 100%
rename from packages/design-system/src/utils/__tests__/valueByPath.spec.ts
rename to packages/design-system/src/utils/valueByPath.test.ts
diff --git a/packages/editor-ui/.browserslistrc b/packages/editor-ui/.browserslistrc
index 9dee646463..525ded22c2 100644
--- a/packages/editor-ui/.browserslistrc
+++ b/packages/editor-ui/.browserslistrc
@@ -1,3 +1,3 @@
-> 1%
-last 2 versions
-not ie <= 8
+defaults
+cover 95% in US
+cover 95% in alt-EU and last 2 years and not dead and fully supports es6-module and fully supports es6-module-dynamic-import
diff --git a/packages/editor-ui/index.html b/packages/editor-ui/index.html
index 8176735fdd..25bbde030f 100644
--- a/packages/editor-ui/index.html
+++ b/packages/editor-ui/index.html
@@ -5,6 +5,7 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge" />
 		<meta name="viewport" content="width=device-width,initial-scale=1.0" />
 		<link rel="icon" href="/favicon.ico" />
+		<style>@media (prefers-color-scheme: dark) { body { background-color: rgb(45, 46, 46) } }</style>
 		<script type="text/javascript">
 			window.BASE_PATH = '/{{BASE_PATH}}/';
 			window.REST_ENDPOINT = '{{REST_ENDPOINT}}';
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 5a4280252e..8f5bbe408b 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,12 +1,13 @@
 {
   "name": "n8n-editor-ui",
-  "version": "1.65.0",
+  "version": "1.75.0",
   "description": "Workflow Editor UI for n8n",
   "main": "index.js",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "build": "cross-env VUE_APP_PUBLIC_PATH=\"/{{BASE_PATH}}/\" NODE_OPTIONS=\"--max-old-space-size=8192\" vite build",
     "typecheck": "vue-tsc --noEmit",
+    "typecheck:watch": "vue-tsc --watch --noEmit",
     "dev": "pnpm serve",
     "lint": "eslint src --ext .js,.ts,.vue --quiet",
     "lintfix": "eslint src --ext .js,.ts,.vue --fix",
@@ -24,6 +25,7 @@
     "@codemirror/lang-python": "^6.1.6",
     "@codemirror/language": "^6.10.1",
     "@codemirror/lint": "^6.8.0",
+    "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.26.3",
     "@fontsource/open-sans": "^4.5.0",
@@ -38,10 +40,12 @@
     "@n8n/codemirror-lang": "workspace:*",
     "@n8n/codemirror-lang-sql": "^1.0.2",
     "@n8n/permissions": "workspace:*",
+    "@replit/codemirror-indentation-markers": "^6.5.3",
+    "@typescript/vfs": "^1.6.0",
     "@sentry/vue": "catalog:frontend",
-    "@vue-flow/background": "^1.3.0",
+    "@vue-flow/background": "^1.3.2",
     "@vue-flow/controls": "^1.1.2",
-    "@vue-flow/core": "^1.41.2",
+    "@vue-flow/core": "^1.41.6",
     "@vue-flow/minimap": "^1.5.0",
     "@vue-flow/node-resizer": "^1.4.0",
     "@vueuse/components": "^10.11.0",
@@ -51,12 +55,13 @@
     "change-case": "^5.4.4",
     "chart.js": "^4.4.0",
     "codemirror-lang-html-n8n": "^1.0.0",
+    "comlink": "^4.4.1",
     "dateformat": "^3.0.3",
     "email-providers": "^2.0.1",
     "esprima-next": "5.8.4",
     "fast-json-stable-stringify": "^2.1.0",
     "file-saver": "^2.0.2",
-    "flatted": "^3.2.4",
+    "flatted": "catalog:",
     "highlight.js": "catalog:frontend",
     "humanize-duration": "^3.27.2",
     "jsonpath": "^1.1.1",
@@ -69,23 +74,26 @@
     "qrcode.vue": "^3.3.4",
     "stream-browserify": "^3.0.0",
     "timeago.js": "^4.0.2",
+    "typescript": "^5.5.2",
     "uuid": "catalog:",
     "v3-infinite-loading": "^1.2.2",
     "vue": "catalog:frontend",
     "vue-agile": "^2.0.0",
     "vue-chartjs": "^5.2.0",
+    "vue-github-button": "^3.1.3",
     "vue-i18n": "^9.2.2",
     "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",
+    "vuedraggable": "4.1.0",
     "xss": "catalog:"
   },
   "devDependencies": {
     "@faker-js/faker": "^8.0.2",
     "@iconify/json": "^2.2.228",
     "@pinia/testing": "^0.1.6",
-    "@sentry/vite-plugin": "^2.22.5",
     "@types/dateformat": "^3.0.0",
     "@types/file-saver": "^2.0.1",
     "@types/humanize-duration": "^3.27.1",
@@ -93,12 +101,15 @@
     "@types/lodash-es": "^4.17.6",
     "@types/luxon": "^3.2.0",
     "@types/uuid": "catalog:",
+    "@vitejs/plugin-legacy": "^6.0.0",
+    "@vitejs/plugin-vue": "catalog:frontend",
     "@vitest/coverage-v8": "catalog:frontend",
-    "cross-env": "^7.0.3",
+    "browserslist-to-esbuild": "^2.1.1",
     "miragejs": "^0.1.48",
     "unplugin-icons": "^0.19.0",
     "unplugin-vue-components": "^0.27.2",
     "vite": "catalog:frontend",
+    "vite-svg-loader": "5.1.0",
     "vitest": "catalog:frontend",
     "vitest-mock-extended": "catalog:frontend",
     "vue-tsc": "catalog:frontend"
diff --git a/packages/editor-ui/public/static/logo/channel/beta-dark.svg b/packages/editor-ui/public/static/logo/channel/beta-dark.svg
deleted file mode 100644
index 7253fbe02b..0000000000
--- a/packages/editor-ui/public/static/logo/channel/beta-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="201" height="40" fill="none"><g clip-path="url(#a)"><mask id="b" width="143" height="40" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M143 0H0v40h143z"/></mask><g mask="url(#b)"><path fill="#EA4B71" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.004 8.004 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.748 2m-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#fff" d="M86.979 30.001h4.176v-8.843c0-2.904 1.763-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.981v9.039h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.26l-.36-1.925h-3.818zm31.584-10.997v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.251-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.795 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.264 0-1.86 1.272-3.263 3.393-3.263 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198m11.944 2.806h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.981v9.039h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.261l-.359-1.925h-3.818z"/></g><path fill="#EA4B71" d="M198 12.5h-41a3 3 0 0 0-3 3v13a3 3 0 0 0 3 3h41a3 3 0 0 0 3-3v-13a3 3 0 0 0-3-3"/><path fill="#fff" d="M164.496 21.334c.7.252 1.638.938 1.638 2.45 0 1.722-1.19 2.716-3.164 2.716h-4.004v-9.8h4.032c1.932 0 2.856 1.008 2.856 2.45 0 1.176-.644 1.764-1.358 2.1zm-3.724-3.15v2.534h1.946c.84 0 1.288-.504 1.288-1.274 0-.784-.504-1.26-1.26-1.26zm2.03 6.832c.952 0 1.442-.574 1.442-1.372 0-.826-.532-1.442-1.442-1.442h-2.03v2.814zm8.161-.126h4.9v1.61h-6.706v-9.8h6.566v1.61h-4.76v2.436h4.102v1.568h-4.102zm14.643-8.19v1.652h-2.772V26.5h-1.848v-8.148h-2.772V16.7zm8.189 9.8-.798-2.366h-3.668l-.798 2.366h-1.974l3.5-9.8h2.226l3.486 9.8zm-3.962-3.892h2.66l-1.274-3.78h-.112z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h201v40H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/beta.svg b/packages/editor-ui/public/static/logo/channel/beta.svg
deleted file mode 100644
index d4fb970c62..0000000000
--- a/packages/editor-ui/public/static/logo/channel/beta.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="201" height="40" fill="none"><g clip-path="url(#a)"><path fill="#EA4B71" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.004 8.004 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.748 2m-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#101330" d="M86.979 30.001h4.176v-8.843c0-2.904 1.763-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.981v9.039h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.26l-.36-1.925h-3.818zm31.584-10.997v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.251-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.795 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.264 0-1.86 1.272-3.263 3.393-3.263 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198m11.944 2.806h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.981v9.039h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.261l-.359-1.925h-3.818z"/></g><rect width="47" height="19" x="154" y="12.5" fill="#EA4B71" rx="3"/><path fill="#fff" d="M164.496 21.334c.7.252 1.638.938 1.638 2.45 0 1.722-1.19 2.716-3.164 2.716h-4.004v-9.8h4.032c1.932 0 2.856 1.008 2.856 2.45 0 1.176-.644 1.764-1.358 2.1zm-3.724-3.15v2.534h1.946c.84 0 1.288-.504 1.288-1.274 0-.784-.504-1.26-1.26-1.26zm2.03 6.832c.952 0 1.442-.574 1.442-1.372 0-.826-.532-1.442-1.442-1.442h-2.03v2.814zm8.161-.126h4.9v1.61h-6.706v-9.8h6.566v1.61h-4.76v2.436h4.102v1.568h-4.102zm14.643-8.19v1.652h-2.772V26.5h-1.848v-8.148h-2.772V16.7zm8.189 9.8-.798-2.366h-3.668l-.798 2.366h-1.974l3.5-9.8h2.226l3.486 9.8zm-3.962-3.892h2.66l-1.274-3.78h-.112z"/><defs><clipPath id="a"><path fill="#fff" d="M0 0h143v40H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/dev-dark.svg b/packages/editor-ui/public/static/logo/channel/dev-dark.svg
deleted file mode 100644
index 23c8b05711..0000000000
--- a/packages/editor-ui/public/static/logo/channel/dev-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="240" height="40" fill="none"><mask id="a" width="143" height="40" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M0 0h143v40H0z"/></mask><g mask="url(#a)"><path fill="#838383" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.005 8.005 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.749 2m-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#fff" d="M86.978 30h4.177v-8.842c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.98v9.04h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.25h-.26l-.36-1.924H86.98zm31.585-10.996v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.25-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.794 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.263 0-1.86 1.272-3.264 3.393-3.264 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198M126.428 30h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.98V30h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.25h-.261l-.359-1.924h-3.818z"/></g><path fill="#858585" d="M221.216 6.657h-61.5a4.5 4.5 0 0 0-4.5 4.5v19.5a4.5 4.5 0 0 0 4.5 4.5h61.5a4.5 4.5 0 0 0 4.5-4.5v-19.5a4.5 4.5 0 0 0-4.5-4.5"/><path fill="#fff" d="M183.47 20.765q0 2.597-.688 4.283-.677 1.686-1.847 2.634a7 7 0 0 1-2.658 1.317q-1.477.381-3.065.381h-4.603V12.322h4.308q1.637 0 3.163.345a6.9 6.9 0 0 1 2.745 1.243q1.218.898 1.932 2.56.714 1.65.713 4.295m-4.184 0q0-2.303-.504-3.483-.493-1.182-1.354-1.6-.85-.43-1.92-.43h-.862v11.211h.862q1.12 0 1.969-.48.85-.492 1.33-1.735t.48-3.483zm11.139-5.563V19.3h5.907v2.831h-5.907v4.357h7.126v2.892h-11.163V12.322h11.15l-.406 2.88zm15.901 11.028 3.213-13.908h4.135L208.75 29.38h-4.997l-4.899-17.058h4.284z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/dev.svg b/packages/editor-ui/public/static/logo/channel/dev.svg
deleted file mode 100644
index f8f2b2d437..0000000000
--- a/packages/editor-ui/public/static/logo/channel/dev.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="240" height="40" fill="none"><g clip-path="url(#a)"><path fill="#838383" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.004 8.004 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.748 2zm-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#101330" d="M86.978 30.001h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.981v9.039h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.26l-.36-1.925H86.98zm31.585-10.997v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.251-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.794 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.263 0-1.86 1.272-3.264 3.393-3.264 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198m11.944 2.806h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.981v9.039h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.261l-.359-1.925h-3.818z"/></g><rect width="70.5" height="28.5" x="155.216" y="6.657" fill="#858585" rx="4.5"/><defs><clipPath id="a"><path fill="#fff" d="M0 0h143v40H0z"/></clipPath></defs><path fill="#fff" d="M183.47 20.765q0 2.597-.688 4.283-.677 1.686-1.847 2.634-1.169.935-2.658 1.317-1.477.381-3.065.381h-4.603V12.322h4.308q1.637 0 3.163.345 1.539.332 2.745 1.243 1.218.898 1.932 2.56.714 1.649.714 4.295zm-4.184 0q0-2.302-.504-3.483-.493-1.182-1.354-1.6-.85-.43-1.92-.43h-.862v11.211h.862q1.12 0 1.969-.48.85-.492 1.33-1.735t.48-3.483zm11.139-5.563V19.3h5.907v2.831h-5.907v4.357h7.126v2.892h-11.163V12.322h11.15l-.406 2.88zm15.901 11.028 3.213-13.908h4.135L208.75 29.38h-4.997l-4.899-17.058h4.284z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/nightly-dark.svg b/packages/editor-ui/public/static/logo/channel/nightly-dark.svg
deleted file mode 100644
index a1b5661dcb..0000000000
--- a/packages/editor-ui/public/static/logo/channel/nightly-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="230" height="40" fill="none"><mask id="a" width="143" height="40" x="0" y="0" maskUnits="userSpaceOnUse" style="mask-type:luminance"><path fill="#fff" d="M0 0h143v40H0z"/></mask><g mask="url(#a)"><path fill="#EA4B71" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.005 8.005 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.749 2m-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#fff" d="M86.978 30h4.177v-8.842c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.98v9.04h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.25h-.26l-.36-1.924H86.98zm31.585-10.996v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.25-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.794 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.263 0-1.86 1.272-3.264 3.393-3.264 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198M126.428 30h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.98V30h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.25h-.261l-.359-1.924h-3.818z"/></g><path fill="#EA4B71" d="M214.852 12.5h-56.703A4.15 4.15 0 0 0 154 16.649v10.702a4.15 4.15 0 0 0 4.149 4.149h56.703a4.15 4.15 0 0 0 4.149-4.149V16.649a4.15 4.15 0 0 0-4.149-4.149"/><path fill="#fff" d="m162.985 26.312-2.496-7.624q.061.404.143 1.04.082.63.137 1.4.062.774.062 1.608v3.576h-1.908v-9.477h2.797l2.42 7.583a33 33 0 0 1-.226-1.661 20 20 0 0 1-.116-2.291v-3.63h1.908v9.476zm10.611-9.477v1.64h-1.955v6.189h1.955v1.648h-6.153v-1.648h1.955v-6.188h-1.955v-1.64zm5.477 9.71q-2.018 0-3.084-1.272-1.06-1.28-1.06-3.72 0-1.613.589-2.714.588-1.108 1.586-1.675.997-.568 2.229-.568 1.04 0 1.75.32.711.323 1.265.849l-1.176 1.217a3.5 3.5 0 0 0-.827-.567 2.1 2.1 0 0 0-.903-.185 1.96 1.96 0 0 0-1.135.342q-.492.334-.78 1.074-.286.73-.286 1.92 0 1.238.198 1.97.206.732.615 1.053.41.314 1.04.314.335 0 .629-.075.294-.082.547-.212V22.45h-1.19l-.219-1.573h3.528v4.71a6.8 6.8 0 0 1-1.531.699 5.8 5.8 0 0 1-1.785.259m9.005-.233v-3.993h-2.297v3.993h-2.243v-9.477h2.243v3.638h2.297v-3.638h2.243v9.477zm8.164-7.76v7.76h-2.243v-7.76h-2.66v-1.717h7.672l-.232 1.717zm4.266 7.76v-9.477h2.243v7.706h4.11l-.233 1.77zm12.157-3.555v3.555h-2.242V22.77l-3.09-5.935h2.454l1.798 4.082 1.812-4.082h2.359z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/channel/nightly.svg b/packages/editor-ui/public/static/logo/channel/nightly.svg
deleted file mode 100644
index bb4746df56..0000000000
--- a/packages/editor-ui/public/static/logo/channel/nightly.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="230" height="40" fill="none"><g clip-path="url(#a)"><path fill="#ea4b71" fill-rule="evenodd" d="M78.974 8a8 8 0 0 1-15.748 2h-11.17a4 4 0 0 0-3.945 3.342l-.329 1.973a7.98 7.98 0 0 1-2.6 4.685 7.98 7.98 0 0 1 2.6 4.685l.329 1.973A4 4 0 0 0 52.056 30h3.17a8 8 0 1 1 0 4h-3.17a8 8 0 0 1-7.89-6.685l-.33-1.973A4 4 0 0 0 39.891 22h-3.263a8.004 8.004 0 0 1-15.309 0h-4.691a8 8 0 1 1 .172-4h4.348A8.003 8.003 0 0 1 36.8 18h3.09a4 4 0 0 0 3.946-3.342l.33-1.973A8 8 0 0 1 52.055 6h11.17a8 8 0 0 1 15.748 2zm-4 0a4 4 0 1 1-8 0 4 4 0 0 1 8 0m-66 15.667a4 4 0 1 0 0-8 4 4 0 0 0 0 8m20 0a4 4 0 1 0 0-8 4 4 0 0 0 0 8m34 12.333a4 4 0 1 0 0-8 4 4 0 0 0 0 8" clip-rule="evenodd"/><path fill="#101330" d="M86.978 30.001h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.492 1.305 3.492 3.981v9.039h4.176v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.26l-.36-1.925H86.98zm31.585-10.997v-.196c1.436-.718 2.872-1.958 2.872-4.405 0-3.524-2.905-5.645-6.918-5.645-4.112 0-7.049 2.251-7.049 5.71 0 2.35 1.371 3.622 2.872 4.34v.196a5.54 5.54 0 0 0-3.655 5.286c0 3.557 2.937 6.037 7.799 6.037s7.701-2.48 7.701-6.037c0-2.936-1.958-4.666-3.622-5.286m-4.079-7.244c1.632 0 2.839 1.044 2.839 2.806s-1.24 2.807-2.839 2.807-2.937-1.045-2.937-2.807c0-1.794 1.273-2.806 2.937-2.806m0 15.435c-1.893 0-3.426-1.208-3.426-3.263 0-1.86 1.272-3.264 3.393-3.264 2.089 0 3.362 1.37 3.362 3.329 0 1.99-1.469 3.198-3.329 3.198m11.944 2.806h4.177v-8.843c0-2.904 1.762-4.177 3.753-4.177 1.958 0 3.491 1.305 3.491 3.981v9.039h4.177v-9.887c0-4.275-2.48-6.755-6.363-6.755-2.447 0-3.818.979-4.797 2.251h-.261l-.359-1.925h-3.818z"/></g><rect width="65.001" height="19" x="154" y="12.5" fill="#ea4b71" rx="4.149"/><defs><clipPath id="a"><path fill="#fff" d="M0 0h143v40H0z"/></clipPath></defs><path fill="#fff" d="m162.985 26.312-2.496-7.624q.061.404.143 1.04.082.629.137 1.401.062.773.062 1.607v3.576h-1.908v-9.477h2.797l2.42 7.583q-.11-.65-.226-1.661t-.116-2.291v-3.63h1.908v9.476Zm10.611-9.477v1.641h-1.955v6.188h1.955v1.648h-6.153v-1.648h1.955v-6.188h-1.955v-1.64zm5.477 9.71q-2.017 0-3.084-1.272-1.06-1.279-1.06-3.72 0-1.613.589-2.714.588-1.108 1.586-1.675.998-.568 2.229-.568 1.04 0 1.75.321.711.322 1.265.848l-1.176 1.217q-.43-.383-.827-.567-.397-.185-.903-.185-.636 0-1.135.342-.492.335-.78 1.074-.286.731-.286 1.92 0 1.238.198 1.97.205.732.615 1.053.41.314 1.04.314.335 0 .629-.075.294-.082.547-.212V22.45h-1.19l-.219-1.573h3.528v4.711q-.71.438-1.531.698-.814.26-1.785.26zm9.005-.233v-3.993h-2.297v3.993h-2.243v-9.477h2.243v3.638h2.297v-3.638h2.243v9.477Zm8.164-7.76v7.76h-2.243v-7.76h-2.66v-1.717h7.672l-.232 1.717zm4.266 7.76v-9.477h2.243v7.706h4.11l-.233 1.771Zm12.157-3.555v3.555h-2.242V22.77l-3.09-5.935h2.454l1.798 4.082 1.812-4.082h2.359z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/collapsed.svg b/packages/editor-ui/public/static/logo/collapsed.svg
deleted file mode 100644
index f65407694a..0000000000
--- a/packages/editor-ui/public/static/logo/collapsed.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="16" fill="none"><path fill="#EA4B71" fill-rule="evenodd" d="M28.013 6.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.579 1.337l-.131.79A3.2 3.2 0 0 1 18.496 8a3.2 3.2 0 0 1 1.04 1.874l.131.789A1.6 1.6 0 0 0 21.246 12h.467a3.201 3.201 0 0 1 6.3.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.157-2.674l-.131-.789A1.6 1.6 0 0 0 16.379 8.8h-1.267a3.201 3.201 0 0 1-6.199 0H7.112a3.201 3.201 0 0 1-6.3-.8 3.2 3.2 0 0 1 6.3-.8h1.801a3.201 3.201 0 0 1 6.199 0h1.267a1.6 1.6 0 0 0 1.579-1.337l.131-.79A3.2 3.2 0 0 1 21.246 2.4h3.667a3.201 3.201 0 0 1 6.3.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/expanded-dark.svg b/packages/editor-ui/public/static/logo/expanded-dark.svg
deleted file mode 100644
index d9a71faffe..0000000000
--- a/packages/editor-ui/public/static/logo/expanded-dark.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="58" height="16" fill="none"><g clip-path="url(#a)"><path fill="#EA4B71" fill-rule="evenodd" d="M27.2 6.4A3.2 3.2 0 0 1 24.1 4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 8a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 12h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789A1.6 1.6 0 0 0 15.567 8.8h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 8a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79A3.2 3.2 0 0 1 20.433 2.4h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2M12.8 8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"/><path fill="#fff" fill-rule="evenodd" d="M48.002 6.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"/><path fill="#fff" d="M51.367 11.2h1.624V7.758c0-1.13.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V7.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0h-1.624V4.848h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85h-1.624V7.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h58v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/logo/expanded.svg b/packages/editor-ui/public/static/logo/expanded.svg
deleted file mode 100644
index 337b52be1c..0000000000
--- a/packages/editor-ui/public/static/logo/expanded.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="58" height="16" fill="none"><path fill="#EA4B71" fill-rule="evenodd" d="M27.2 6.4A3.2 3.2 0 0 1 24.1 4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 8a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 12h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789A1.6 1.6 0 0 0 15.567 8.8h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 8a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79A3.2 3.2 0 0 1 20.433 2.4h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2M12.8 8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"/><path fill="#101330" fill-rule="evenodd" d="M48.002 6.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"/><path fill="#101330" d="M51.367 11.2h1.624V7.758c0-1.131.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V7.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0h-1.624V4.848h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85h-1.624V7.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"/></svg>
\ No newline at end of file
diff --git a/packages/editor-ui/public/static/quickstart_thumbnail.png b/packages/editor-ui/public/static/quickstart_thumbnail.png
deleted file mode 100644
index 2958955a2c..0000000000
Binary files a/packages/editor-ui/public/static/quickstart_thumbnail.png and /dev/null differ
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index 77d371855c..04223f8d92 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref, computed, watch, onMounted, onBeforeUnmount, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
+import { v4 as uuid } from 'uuid';
 import LoadingView from '@/views/LoadingView.vue';
 import BannerStack from '@/components/banners/BannerStack.vue';
 import AskAssistantChat from '@/components/AskAssistant/AskAssistantChat.vue';
@@ -8,7 +9,6 @@ import Modals from '@/components/Modals.vue';
 import Telemetry from '@/components/Telemetry.vue';
 import AskAssistantFloatingButton from '@/components/AskAssistant/AskAssistantFloatingButton.vue';
 import { loadLanguage } from '@/plugins/i18n';
-import { useExternalHooks } from '@/composables/useExternalHooks';
 import { APP_MODALS_ELEMENT_ID, HIRING_BANNER, VIEWS } from '@/constants';
 import { useRootStore } from '@/stores/root.store';
 import { useAssistantStore } from '@/stores/assistant.store';
@@ -18,6 +18,11 @@ import { useSettingsStore } from '@/stores/settings.store';
 import { useHistoryHelper } from '@/composables/useHistoryHelper';
 import { useStyles } from './composables/useStyles';
 
+// Polyfill crypto.randomUUID
+if (!('randomUUID' in crypto)) {
+	Object.defineProperty(crypto, 'randomUUID', { value: uuid });
+}
+
 const route = useRoute();
 const rootStore = useRootStore();
 const assistantStore = useAssistantStore();
@@ -34,19 +39,14 @@ const loading = ref(true);
 const defaultLocale = computed(() => rootStore.defaultLocale);
 const isDemoMode = computed(() => route.name === VIEWS.DEMO);
 const showAssistantButton = computed(() => assistantStore.canShowAssistantButtonsOnCanvas);
-
+const hasContentFooter = ref(false);
 const appGrid = ref<Element | null>(null);
 
 const assistantSidebarWidth = computed(() => assistantStore.chatWidth);
 
-watch(defaultLocale, (newLocale) => {
-	void loadLanguage(newLocale);
-});
-
 onMounted(async () => {
 	setAppZIndexes();
 	logHiringBanner();
-	void useExternalHooks().run('app.mount');
 	loading.value = false;
 	window.addEventListener('resize', updateGridWidth);
 	await updateGridWidth();
@@ -56,11 +56,6 @@ onBeforeUnmount(() => {
 	window.removeEventListener('resize', updateGridWidth);
 });
 
-// As assistant sidebar width changes, recalculate the total width regularly
-watch(assistantSidebarWidth, async () => {
-	await updateGridWidth();
-});
-
 const logHiringBanner = () => {
 	if (settingsStore.isHiringBannerEnabled && !isDemoMode.value) {
 		console.log(HIRING_BANNER);
@@ -73,6 +68,21 @@ const updateGridWidth = async () => {
 		uiStore.appGridWidth = appGrid.value.clientWidth;
 	}
 };
+
+// As assistant sidebar width changes, recalculate the total width regularly
+watch(assistantSidebarWidth, async () => {
+	await updateGridWidth();
+});
+
+watch(route, (r) => {
+	hasContentFooter.value = r.matched.some(
+		(matchedRoute) => matchedRoute.components?.footer !== undefined,
+	);
+});
+
+watch(defaultLocale, (newLocale) => {
+	void loadLanguage(newLocale);
+});
 </script>
 
 <template>
@@ -96,12 +106,17 @@ const updateGridWidth = async () => {
 				<router-view name="sidebar"></router-view>
 			</div>
 			<div id="content" :class="$style.content">
-				<router-view v-slot="{ Component }">
-					<keep-alive v-if="$route.meta.keepWorkflowAlive" include="NodeViewSwitcher" :max="1">
-						<component :is="Component" />
-					</keep-alive>
-					<component :is="Component" v-else />
-				</router-view>
+				<div :class="$style.contentWrapper">
+					<router-view v-slot="{ Component }">
+						<keep-alive v-if="$route.meta.keepWorkflowAlive" include="NodeViewSwitcher" :max="1">
+							<component :is="Component" />
+						</keep-alive>
+						<component :is="Component" v-else />
+					</router-view>
+				</div>
+				<div v-if="hasContentFooter" :class="$style.contentFooter">
+					<router-view name="footer" />
+				</div>
 			</div>
 			<div :id="APP_MODALS_ELEMENT_ID" :class="$style.modals">
 				<Modals />
@@ -119,7 +134,8 @@ const updateGridWidth = async () => {
 .container {
 	height: 100vh;
 	overflow: hidden;
-	display: flex;
+	display: grid;
+	grid-template-columns: 1fr auto;
 }
 
 // App grid is the main app layout including modals and other absolute positioned elements
@@ -127,21 +143,38 @@ const updateGridWidth = async () => {
 	position: relative;
 	display: grid;
 	height: 100vh;
-	flex-basis: 100%;
 	grid-template-areas:
 		'banners banners'
 		'sidebar header'
 		'sidebar content';
-	grid-auto-columns: minmax(0, max-content) 1fr;
-	grid-template-rows: auto fit-content($header-height) 1fr;
+	grid-template-columns: auto 1fr;
+	grid-template-rows: auto auto 1fr;
 }
 
 .banners {
 	grid-area: banners;
 	z-index: var(--z-index-top-banners);
 }
-
 .content {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	overflow: auto;
+	grid-area: content;
+}
+
+.contentFooter {
+	height: auto;
+	z-index: 10;
+	width: 100%;
+	display: none;
+
+	// Only show footer if there's content
+	&:has(*) {
+		display: block;
+	}
+}
+.contentWrapper {
 	display: flex;
 	grid-area: content;
 	position: relative;
@@ -159,11 +192,12 @@ const updateGridWidth = async () => {
 .header {
 	grid-area: header;
 	z-index: var(--z-index-app-header);
+	min-width: 0;
+	min-height: 0;
 }
 
 .sidebar {
 	grid-area: sidebar;
-	height: 100%;
 	z-index: var(--z-index-app-sidebar);
 }
 
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index e639f537df..6cdd045703 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -2,13 +2,14 @@ import type { Component } from 'vue';
 import type { NotificationOptions as ElementNotificationOptions } from 'element-plus';
 import type { Connection } from '@jsplumb/core';
 import type {
+	BannerName,
 	FrontendSettings,
 	Iso8601DateTimeString,
 	IUserManagementSettings,
 	IVersionNotificationSettings,
 } from '@n8n/api-types';
 import type { Scope } from '@n8n/permissions';
-import type { IMenuItem, NodeCreatorTag } from 'n8n-design-system';
+import type { NodeCreatorTag } from 'n8n-design-system';
 import type {
 	GenericValue,
 	IConnections,
@@ -26,9 +27,6 @@ import type {
 	IWorkflowSettings as IWorkflowSettingsWorkflow,
 	WorkflowExecuteMode,
 	PublicInstalledPackage,
-	INodeTypeNameVersion,
-	ILoadOptions,
-	INodeCredentials,
 	INodeListSearchItems,
 	NodeParameterValueType,
 	IDisplayOptions,
@@ -38,7 +36,6 @@ import type {
 	ITelemetryTrackProperties,
 	WorkflowSettings,
 	IUserSettings,
-	BannerName,
 	INodeExecutionData,
 	INodeProperties,
 	NodeConnectionType,
@@ -46,23 +43,21 @@ import type {
 	StartNodeData,
 	IPersonalizationSurveyAnswersV4,
 	AnnotationVote,
+	ITaskData,
 } from 'n8n-workflow';
 
 import type {
 	AI_NODE_CREATOR_VIEW,
 	CREDENTIAL_EDIT_MODAL_KEY,
 	SignInType,
-	FAKE_DOOR_FEATURES,
 	TRIGGER_NODE_CREATOR_VIEW,
 	REGULAR_NODE_CREATOR_VIEW,
 	AI_OTHERS_NODE_CREATOR_VIEW,
 	ROLE,
 } from '@/constants';
 import type { BulkCommand, Undoable } from '@/models/history';
-import type { PartialBy, TupleToUnion } from '@/utils/typeHelpers';
 
 import type { ProjectSharingData } from '@/types/projects.types';
-import type { BaseTextKey } from './plugins/i18n';
 
 export * from 'n8n-design-system/types';
 
@@ -184,6 +179,10 @@ export interface IAiDataContent {
 	metadata: {
 		executionTime: number;
 		startTime: number;
+		subExecution?: {
+			workflowId: string;
+			executionId: string;
+		};
 	};
 }
 
@@ -198,12 +197,21 @@ export interface IStartRunData {
 	startNodes?: StartNodeData[];
 	destinationNode?: string;
 	runData?: IRunData;
+	dirtyNodeNames?: string[];
+	triggerToStartFrom?: {
+		name: string;
+		data?: ITaskData;
+	};
 }
 
 export interface ITableData {
 	columns: string[];
 	data: GenericValue[][];
 	hasJson: { [key: string]: boolean };
+	metadata: {
+		hasExecutionIds: boolean;
+		data: Array<INodeExecutionData['metadata'] | undefined>;
+	};
 }
 
 // Simple version of n8n-workflow.Workflow
@@ -233,13 +241,26 @@ export interface IWorkflowDataUpdate {
 	meta?: WorkflowMetadata;
 }
 
+export interface IWorkflowDataCreate extends IWorkflowDataUpdate {
+	projectId?: string;
+}
+
+/**
+ * Workflow data with mandatory `templateId`
+ * This is used to identify sample workflows that we create for onboarding
+ */
+export interface WorkflowDataWithTemplateId extends Omit<IWorkflowDataCreate, 'meta'> {
+	meta: WorkflowMetadata & {
+		templateId: Required<WorkflowMetadata>['templateId'];
+	};
+}
+
 export interface IWorkflowToShare extends IWorkflowDataUpdate {
 	meta: WorkflowMetadata;
 }
 
 export interface NewWorkflowResponse {
 	name: string;
-	onboardingFlowEnabled?: boolean;
 	defaultSettings: IWorkflowSettings;
 }
 
@@ -266,7 +287,6 @@ export interface IWorkflowTemplate {
 
 export interface INewWorkflowData {
 	name: string;
-	onboardingFlowEnabled: boolean;
 }
 
 export interface WorkflowMetadata {
@@ -340,6 +360,7 @@ export interface ICredentialsResponse extends ICredentialsEncrypted {
 	currentUserHasAccess?: boolean;
 	scopes?: Scope[];
 	ownedBy?: Pick<IUserResponse, 'id' | 'firstName' | 'lastName' | 'email'>;
+	isManaged: boolean;
 }
 
 export interface ICredentialsBase {
@@ -359,6 +380,7 @@ export interface IExecutionBase {
 	retryOf?: string;
 	retrySuccessId?: string;
 	startedAt: Date;
+	createdAt: Date;
 	stoppedAt?: Date;
 	workflowId?: string; // To be able to filter executions easily //
 }
@@ -394,15 +416,10 @@ export interface IExecutionsListResponse {
 
 export interface IExecutionsCurrentSummaryExtended {
 	id: string;
-	finished?: boolean;
 	status: ExecutionStatus;
 	mode: WorkflowExecuteMode;
-	retryOf?: string | null;
-	retrySuccessId?: string | null;
 	startedAt: Date;
-	stoppedAt?: Date;
 	workflowId: string;
-	workflowName?: string;
 }
 
 export interface IExecutionsStopData {
@@ -628,7 +645,6 @@ export type WorkflowCallerPolicyDefaultOption = 'any' | 'none' | 'workflowsFromA
 
 export interface IWorkflowSettings extends IWorkflowSettingsWorkflow {
 	errorWorkflow?: string;
-	saveManualExecutions?: boolean;
 	timezone?: string;
 	executionTimeout?: number;
 	maxExecutionTimeout?: number;
@@ -704,6 +720,7 @@ export interface ActionTypeDescription extends SimplifiedNodeType {
 	displayOptions?: IDisplayOptions;
 	values?: IDataObject;
 	actionKey: string;
+	outputConnectionType?: NodeConnectionType;
 	codex: {
 		label: string;
 		categories: string[];
@@ -842,14 +859,12 @@ export interface IUsedCredential {
 }
 
 export interface WorkflowsState {
-	activeExecutions: IExecutionsCurrentSummaryExtended[];
 	activeWorkflows: string[];
 	activeWorkflowExecution: ExecutionSummary | null;
 	currentWorkflowExecutions: ExecutionSummary[];
 	activeExecutionId: string | null;
 	executingNode: string[];
 	executionWaitingForWebhook: boolean;
-	finishedExecutionsCount: number;
 	nodeMetadata: NodeMetadataMap;
 	subWorkflowExecutionError: Error | null;
 	usedCredentials: Record<string, IUsedCredential>;
@@ -890,51 +905,6 @@ export interface RootState {
 export interface NodeMetadataMap {
 	[nodeName: string]: INodeMetadata;
 }
-export interface IRootState {
-	activeExecutions: IExecutionsCurrentSummaryExtended[];
-	activeWorkflows: string[];
-	activeActions: string[];
-	activeCredentialType: string | null;
-	baseUrl: string;
-	defaultLocale: string;
-	endpointForm: string;
-	endpointFormTest: string;
-	endpointFormWaiting: string;
-	endpointWebhook: string;
-	endpointWebhookTest: string;
-	endpointWebhookWaiting: string;
-	executionId: string | null;
-	executingNode: string[];
-	executionWaitingForWebhook: boolean;
-	pushConnectionActive: boolean;
-	saveDataErrorExecution: string;
-	saveDataSuccessExecution: string;
-	saveManualExecutions: boolean;
-	timezone: string;
-	stateIsDirty: boolean;
-	executionTimeout: number;
-	maxExecutionTimeout: number;
-	versionCli: string;
-	oauthCallbackUrls: object;
-	n8nMetadata: object;
-	workflowExecutionData: IExecutionResponse | null;
-	workflowExecutionPairedItemMappings: { [itemId: string]: Set<string> };
-	lastSelectedNode: string | null;
-	lastSelectedNodeOutputIndex: number | null;
-	nodeViewOffsetPosition: XYPosition;
-	nodeViewMoveInProgress: boolean;
-	selectedNodes: INodeUi[];
-	pushRef: string;
-	urlBaseEditor: string;
-	urlBaseWebhook: string;
-	workflow: IWorkflowDb;
-	workflowsById: IWorkflowsMap;
-	sidebarMenuItems: IMenuItem[];
-	instanceId: string;
-	nodeMetadata: NodeMetadataMap;
-	subworkflowExecutionError: Error | null;
-	binaryDataMode: string;
-}
 
 export interface CommunityPackageMap {
 	[name: string]: PublicInstalledPackage;
@@ -1036,24 +1006,6 @@ export interface NotificationOptions extends Partial<ElementNotificationOptions>
 	message: string | ElementNotificationOptions['message'];
 }
 
-export type IFakeDoor = {
-	id: FAKE_DOOR_FEATURES;
-	featureName: BaseTextKey;
-	icon?: string;
-	infoText?: BaseTextKey;
-	actionBoxTitle: BaseTextKey;
-	actionBoxDescription: BaseTextKey;
-	actionBoxButtonLabel?: BaseTextKey;
-	linkURL: string;
-	uiLocations: IFakeDoorLocation[];
-};
-
-export type IFakeDoorLocation =
-	| 'settings'
-	| 'settings/users'
-	| 'credentialsModal'
-	| 'workflowShareModal';
-
 export type NodeFilterType =
 	| typeof REGULAR_NODE_CREATOR_VIEW
 	| typeof TRIGGER_NODE_CREATOR_VIEW
@@ -1149,11 +1101,6 @@ export interface IVersionsState {
 	currentVersion: IVersion | undefined;
 }
 
-export interface IWorkflowsState {
-	currentWorkflowExecutions: ExecutionSummary[];
-	activeWorkflowExecution: ExecutionSummary | null;
-	finishedExecutionsCount: number;
-}
 export interface IWorkflowsMap {
 	[name: string]: IWorkflowDb;
 }
@@ -1194,8 +1141,8 @@ export interface IInviteResponse {
 	error?: string;
 }
 
-export interface ITab {
-	value: string | number;
+export interface ITab<Value extends string | number = string | number> {
+	value: Value;
 	label?: string;
 	href?: string;
 	icon?: string;
@@ -1316,35 +1263,6 @@ export type NodeAuthenticationOption = {
 	displayOptions?: IDisplayOptions;
 };
 
-export declare namespace DynamicNodeParameters {
-	interface BaseRequest {
-		path: string;
-		nodeTypeAndVersion: INodeTypeNameVersion;
-		currentNodeParameters: INodeParameters;
-		methodName?: string;
-		credentials?: INodeCredentials;
-	}
-
-	interface OptionsRequest extends BaseRequest {
-		loadOptions?: ILoadOptions;
-	}
-
-	interface ResourceLocatorResultsRequest extends BaseRequest {
-		methodName: string;
-		filter?: string;
-		paginationToken?: string;
-	}
-
-	interface ResourceMapperFieldsRequest extends BaseRequest {
-		methodName: string;
-	}
-
-	interface ActionResultRequest extends BaseRequest {
-		handler: string;
-		payload: IDataObject | string | undefined;
-	}
-}
-
 export interface EnvironmentVariable {
 	id: string;
 	key: string;
@@ -1371,6 +1289,7 @@ export type ExecutionFilterType = {
 
 export type ExecutionsQueryFilter = {
 	status?: ExecutionStatus[];
+	projectId?: string;
 	workflowId?: string;
 	finished?: boolean;
 	waitTill?: boolean;
@@ -1381,91 +1300,11 @@ export type ExecutionsQueryFilter = {
 	vote?: ExecutionFilterVote;
 };
 
-export type SamlAttributeMapping = {
-	email: string;
-	firstName: string;
-	lastName: string;
-	userPrincipalName: string;
-};
-
-export type SamlLoginBinding = 'post' | 'redirect';
-
-export type SamlSignatureConfig = {
-	prefix: 'ds';
-	location: {
-		reference: '/samlp:Response/saml:Issuer';
-		action: 'after';
-	};
-};
-
-export type SamlPreferencesLoginEnabled = {
-	loginEnabled: boolean;
-};
-
-export type SamlPreferences = {
-	mapping?: SamlAttributeMapping;
-	metadata?: string;
-	metadataUrl?: string;
-	ignoreSSL?: boolean;
-	loginBinding?: SamlLoginBinding;
-	acsBinding?: SamlLoginBinding;
-	authnRequestsSigned?: boolean;
-	loginLabel?: string;
-	wantAssertionsSigned?: boolean;
-	wantMessageSigned?: boolean;
-	signatureConfig?: SamlSignatureConfig;
-} & PartialBy<SamlPreferencesLoginEnabled, 'loginEnabled'>;
-
 export type SamlPreferencesExtractedData = {
 	entityID: string;
 	returnUrl: string;
 };
 
-export type SshKeyTypes = ['ed25519', 'rsa'];
-
-export type SourceControlPreferences = {
-	connected: boolean;
-	repositoryUrl: string;
-	branchName: string;
-	branches: string[];
-	branchReadOnly: boolean;
-	branchColor: string;
-	publicKey?: string;
-	keyGeneratorType?: TupleToUnion<SshKeyTypes>;
-	currentBranch?: string;
-};
-
-export interface SourceControlStatus {
-	ahead: number;
-	behind: number;
-	conflicted: string[];
-	created: string[];
-	current: string;
-	deleted: string[];
-	detached: boolean;
-	files: Array<{
-		path: string;
-		index: string;
-		working_dir: string;
-	}>;
-	modified: string[];
-	not_added: string[];
-	renamed: string[];
-	staged: string[];
-	tracking: null;
-}
-
-export interface SourceControlAggregatedFile {
-	conflict: boolean;
-	file: string;
-	id: string;
-	location: string;
-	name: string;
-	status: string;
-	type: string;
-	updatedAt?: string;
-}
-
 export declare namespace Cloud {
 	export interface PlanData {
 		planId: number;
@@ -1538,6 +1377,7 @@ export interface ExternalSecretsProvider {
 export type CloudUpdateLinkSourceType =
 	| 'advanced-permissions'
 	| 'canvas-nav'
+	| 'concurrency'
 	| 'custom-data-filter'
 	| 'workflow_sharing'
 	| 'credential_sharing'
@@ -1560,6 +1400,7 @@ export type CloudUpdateLinkSourceType =
 export type UTMCampaign =
 	| 'upgrade-custom-data-filter'
 	| 'upgrade-canvas-nav'
+	| 'upgrade-concurrency'
 	| 'upgrade-workflow-sharing'
 	| 'upgrade-credentials-sharing'
 	| 'upgrade-api'
@@ -1650,3 +1491,42 @@ export type ApiKey = {
 	createdAt: string;
 	updatedAt: string;
 };
+
+export type InputPanel = {
+	nodeName?: string;
+	run?: number;
+	branch?: number;
+	data: {
+		isEmpty: boolean;
+	};
+};
+
+export type OutputPanel = {
+	branch?: number;
+	data: {
+		isEmpty: boolean;
+	};
+	editMode: {
+		enabled: boolean;
+		value: string;
+	};
+};
+
+export type Draggable = {
+	isDragging: boolean;
+	type: string;
+	data: string;
+	dimensions: DOMRect | null;
+	activeTarget: { id: string; stickyPosition: null | XYPosition } | null;
+};
+
+export type MainPanelType = 'regular' | 'dragless' | 'inputless' | 'unknown' | 'wide';
+
+export type MainPanelDimensions = Record<
+	MainPanelType,
+	{
+		relativeLeft: number;
+		relativeRight: number;
+		relativeWidth: number;
+	}
+>;
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__/data/projects.ts b/packages/editor-ui/src/__tests__/data/projects.ts
index 1870803cbf..d7c26b245e 100644
--- a/packages/editor-ui/src/__tests__/data/projects.ts
+++ b/packages/editor-ui/src/__tests__/data/projects.ts
@@ -10,6 +10,7 @@ import { ProjectTypes } from '@/types/projects.types';
 export const createProjectSharingData = (projectType?: ProjectType): ProjectSharingData => ({
 	id: faker.string.uuid(),
 	name: faker.lorem.words({ min: 1, max: 3 }),
+	icon: { type: 'icon', value: 'folder' },
 	type: projectType ?? ProjectTypes.Personal,
 	createdAt: faker.date.past().toISOString(),
 	updatedAt: faker.date.recent().toISOString(),
@@ -29,9 +30,10 @@ export function createTestProject(data: Partial<Project>): Project {
 	return {
 		id: faker.string.uuid(),
 		name: faker.lorem.words({ min: 1, max: 3 }),
+		icon: { type: 'icon', value: 'folder' },
 		createdAt: faker.date.past().toISOString(),
 		updatedAt: faker.date.recent().toISOString(),
-		type: 'team',
+		type: ProjectTypes.Team,
 		relations: [],
 		scopes: [],
 		...data,
diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts
index dd4fbed9d5..46e35a7d17 100644
--- a/packages/editor-ui/src/__tests__/defaults.ts
+++ b/packages/editor-ui/src/__tests__/defaults.ts
@@ -1,6 +1,7 @@
 import type { FrontendSettings } from '@n8n/api-types';
 
 export const defaultSettings: FrontendSettings = {
+	inE2ETests: false,
 	databaseType: 'sqlite',
 	isDocker: false,
 	pruning: {
@@ -63,8 +64,8 @@ export const defaultSettings: FrontendSettings = {
 	},
 	publicApi: { enabled: false, latestVersion: 0, path: '', swaggerUi: { enabled: false } },
 	pushBackend: 'websocket',
-	saveDataErrorExecution: 'DEFAULT',
-	saveDataSuccessExecution: 'DEFAULT',
+	saveDataErrorExecution: 'all',
+	saveDataSuccessExecution: 'all',
 	saveManualExecutions: false,
 	saveExecutionProgress: false,
 	sso: {
@@ -124,4 +125,10 @@ export const defaultSettings: FrontendSettings = {
 	aiAssistant: {
 		enabled: false,
 	},
+	aiCredits: {
+		enabled: false,
+		credits: 0,
+	},
+	betaFeatures: [],
+	easyAIWorkflowOnboarded: false,
 };
diff --git a/packages/editor-ui/src/__tests__/mocks.ts b/packages/editor-ui/src/__tests__/mocks.ts
index 993d5870a5..15688de9ff 100644
--- a/packages/editor-ui/src/__tests__/mocks.ts
+++ b/packages/editor-ui/src/__tests__/mocks.ts
@@ -54,26 +54,32 @@ export const mockNodeTypeDescription = ({
 	credentials = [],
 	inputs = [NodeConnectionType.Main],
 	outputs = [NodeConnectionType.Main],
+	codex = {},
+	properties = [],
 }: {
 	name?: INodeTypeDescription['name'];
 	version?: INodeTypeDescription['version'];
 	credentials?: INodeTypeDescription['credentials'];
 	inputs?: INodeTypeDescription['inputs'];
 	outputs?: INodeTypeDescription['outputs'];
+	codex?: INodeTypeDescription['codex'];
+	properties?: INodeTypeDescription['properties'];
 } = {}) =>
 	mock<INodeTypeDescription>({
 		name,
 		displayName: name,
+		description: '',
 		version,
 		defaults: {
 			name,
 		},
 		defaultVersion: Array.isArray(version) ? version[version.length - 1] : version,
-		properties: [],
+		properties: properties as [],
 		maxNodes: Infinity,
 		group: EXECUTABLE_TRIGGER_NODE_TYPES.includes(name) ? ['trigger'] : [],
 		inputs,
 		outputs,
+		codex,
 		credentials,
 		documentationUrl: 'https://docs',
 		webhooks: undefined,
diff --git a/packages/editor-ui/src/__tests__/render.ts b/packages/editor-ui/src/__tests__/render.ts
index e46b615993..08ef303f4f 100644
--- a/packages/editor-ui/src/__tests__/render.ts
+++ b/packages/editor-ui/src/__tests__/render.ts
@@ -1,6 +1,6 @@
 import type { Plugin } from 'vue';
 import { render } from '@testing-library/vue';
-import { i18nInstance, I18nPlugin } from '@/plugins/i18n';
+import { i18nInstance } from '@/plugins/i18n';
 import { GlobalComponentsPlugin } from '@/plugins/components';
 import { GlobalDirectivesPlugin } from '@/plugins/directives';
 import { FontAwesomePlugin } from '@/plugins/icons';
@@ -32,7 +32,6 @@ const defaultOptions = {
 			'vue-json-pretty': vueJsonPretty,
 		},
 		plugins: [
-			I18nPlugin,
 			i18nInstance,
 			PiniaVuePlugin,
 			FontAwesomePlugin,
@@ -81,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__/server/endpoints/sourceControl.ts b/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
index 46f86fa693..653fbc3b51 100644
--- a/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
+++ b/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts
@@ -2,7 +2,7 @@ import type { Server, Request } from 'miragejs';
 import { Response } from 'miragejs';
 import { jsonParse } from 'n8n-workflow';
 import type { AppSchema } from '@/__tests__/server/types';
-import type { SourceControlPreferences } from '@/Interface';
+import type { SourceControlPreferences } from '@/types/sourceControl.types';
 
 export function routesForSourceControl(server: Server) {
 	const sourceControlApiRoot = '/rest/source-control';
diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
index a9c13e7285..91b1aaaaf2 100644
--- a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
+++ b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts
@@ -1,16 +1,17 @@
+import type { SamlPreferences } from '@n8n/api-types';
 import type { Server, Request } from 'miragejs';
 import { Response } from 'miragejs';
-import type { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';
+import type { SamlPreferencesExtractedData } from '@/Interface';
 import { faker } from '@faker-js/faker';
 import type { AppSchema } from '@/__tests__/server/types';
 import { jsonParse } from 'n8n-workflow';
 
-let samlConfig: SamlPreferences & SamlPreferencesExtractedData = {
+let samlConfig = {
 	metadata: '<?xml version="1.0"?>',
 	metadataUrl: '',
 	entityID: faker.internet.url(),
 	returnUrl: faker.internet.url(),
-};
+} as SamlPreferences & SamlPreferencesExtractedData;
 
 export function routesForSSO(server: Server) {
 	server.get('/rest/sso/saml/config', () => {
diff --git a/packages/editor-ui/src/__tests__/server/factories/credential.ts b/packages/editor-ui/src/__tests__/server/factories/credential.ts
index 1cd28a06e6..5612d0d4d9 100644
--- a/packages/editor-ui/src/__tests__/server/factories/credential.ts
+++ b/packages/editor-ui/src/__tests__/server/factories/credential.ts
@@ -18,4 +18,7 @@ export const credentialFactory = Factory.extend<ICredentialsResponse>({
 	updatedAt() {
 		return '';
 	},
+	isManaged() {
+		return false;
+	},
 });
diff --git a/packages/editor-ui/src/__tests__/setup.ts b/packages/editor-ui/src/__tests__/setup.ts
index 35bfe7aafb..3ddee75f14 100644
--- a/packages/editor-ui/src/__tests__/setup.ts
+++ b/packages/editor-ui/src/__tests__/setup.ts
@@ -61,3 +61,25 @@ Object.defineProperty(window, 'matchMedia', {
 		dispatchEvent: vi.fn(),
 	})),
 });
+
+class Worker {
+	onmessage: (message: string) => void;
+
+	url: string;
+
+	constructor(url: string) {
+		this.url = url;
+		this.onmessage = () => {};
+	}
+
+	postMessage(message: string) {
+		this.onmessage(message);
+	}
+
+	addEventListener() {}
+}
+
+Object.defineProperty(window, 'Worker', {
+	writable: true,
+	value: Worker,
+});
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/ai.ts b/packages/editor-ui/src/api/ai.ts
index 378a58b4b1..04c08c78f2 100644
--- a/packages/editor-ui/src/api/ai.ts
+++ b/packages/editor-ui/src/api/ai.ts
@@ -1,4 +1,4 @@
-import type { IRestApiContext } from '@/Interface';
+import type { ICredentialsResponse, IRestApiContext } from '@/Interface';
 import type { AskAiRequest, ChatRequest, ReplaceCodeRequest } from '@/types/assistant.types';
 import { makeRestApiRequest, streamRequest } from '@/utils/apiUtils';
 import type { IDataObject } from 'n8n-workflow';
@@ -42,3 +42,12 @@ export async function generateCodeForPrompt(
 		forNode,
 	} as IDataObject);
 }
+
+export async function claimFreeAiCredits(
+	ctx: IRestApiContext,
+	{ projectId }: { projectId?: string },
+): Promise<ICredentialsResponse> {
+	return await makeRestApiRequest(ctx, 'POST', '/ai/free-credits', {
+		projectId,
+	} as IDataObject);
+}
diff --git a/packages/editor-ui/src/api/credentials.ts b/packages/editor-ui/src/api/credentials.ts
index 6ddb37c16a..18bb7b3f3d 100644
--- a/packages/editor-ui/src/api/credentials.ts
+++ b/packages/editor-ui/src/api/credentials.ts
@@ -32,6 +32,7 @@ export async function getAllCredentials(
 ): Promise<ICredentialsResponse[]> {
 	return await makeRestApiRequest(context, 'GET', '/credentials', {
 		...(includeScopes ? { includeScopes } : {}),
+		includeData: true,
 		...(filter ? { filter } : {}),
 	});
 }
diff --git a/packages/editor-ui/src/api/mfa.ts b/packages/editor-ui/src/api/mfa.ts
index 0cce31c96d..df5849fe2c 100644
--- a/packages/editor-ui/src/api/mfa.ts
+++ b/packages/editor-ui/src/api/mfa.ts
@@ -11,19 +11,23 @@ export async function getMfaQR(
 	return await makeRestApiRequest(context, 'GET', '/mfa/qr');
 }
 
-export async function enableMfa(context: IRestApiContext, data: { token: string }): Promise<void> {
+export async function enableMfa(
+	context: IRestApiContext,
+	data: { mfaCode: string },
+): Promise<void> {
 	return await makeRestApiRequest(context, 'POST', '/mfa/enable', data);
 }
 
-export async function verifyMfaToken(
+export async function verifyMfaCode(
 	context: IRestApiContext,
-	data: { token: string },
+	data: { mfaCode: string },
 ): Promise<void> {
 	return await makeRestApiRequest(context, 'POST', '/mfa/verify', data);
 }
 
 export type DisableMfaParams = {
-	token: string;
+	mfaCode?: string;
+	mfaRecoveryCode?: string;
 };
 
 export async function disableMfa(context: IRestApiContext, data: DisableMfaParams): Promise<void> {
diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/editor-ui/src/api/nodeTypes.ts
index f4d516aaef..01537a8717 100644
--- a/packages/editor-ui/src/api/nodeTypes.ts
+++ b/packages/editor-ui/src/api/nodeTypes.ts
@@ -1,5 +1,11 @@
+import type {
+	ActionResultRequestDto,
+	OptionsRequestDto,
+	ResourceLocatorRequestDto,
+	ResourceMapperFieldsRequestDto,
+} from '@n8n/api-types';
 import { makeRestApiRequest } from '@/utils/apiUtils';
-import type { DynamicNodeParameters, INodeTranslationHeaders, IRestApiContext } from '@/Interface';
+import type { INodeTranslationHeaders, IRestApiContext } from '@/Interface';
 import type {
 	INodeListSearchResult,
 	INodePropertyOptions,
@@ -30,14 +36,14 @@ export async function getNodesInformation(
 
 export async function getNodeParameterOptions(
 	context: IRestApiContext,
-	sendData: DynamicNodeParameters.OptionsRequest,
+	sendData: OptionsRequestDto,
 ): Promise<INodePropertyOptions[]> {
 	return await makeRestApiRequest(context, 'POST', '/dynamic-node-parameters/options', sendData);
 }
 
 export async function getResourceLocatorResults(
 	context: IRestApiContext,
-	sendData: DynamicNodeParameters.ResourceLocatorResultsRequest,
+	sendData: ResourceLocatorRequestDto,
 ): Promise<INodeListSearchResult> {
 	return await makeRestApiRequest(
 		context,
@@ -49,7 +55,7 @@ export async function getResourceLocatorResults(
 
 export async function getResourceMapperFields(
 	context: IRestApiContext,
-	sendData: DynamicNodeParameters.ResourceMapperFieldsRequest,
+	sendData: ResourceMapperFieldsRequestDto,
 ): Promise<ResourceMapperFields> {
 	return await makeRestApiRequest(
 		context,
@@ -59,9 +65,21 @@ export async function getResourceMapperFields(
 	);
 }
 
+export async function getLocalResourceMapperFields(
+	context: IRestApiContext,
+	sendData: ResourceMapperFieldsRequestDto,
+): Promise<ResourceMapperFields> {
+	return await makeRestApiRequest(
+		context,
+		'POST',
+		'/dynamic-node-parameters/local-resource-mapper-fields',
+		sendData,
+	);
+}
+
 export async function getNodeParameterActionResult(
 	context: IRestApiContext,
-	sendData: DynamicNodeParameters.ActionResultRequest,
+	sendData: ActionResultRequestDto,
 ): Promise<NodeParameterValueType> {
 	return await makeRestApiRequest(
 		context,
diff --git a/packages/editor-ui/src/api/projects.api.ts b/packages/editor-ui/src/api/projects.api.ts
index b3bae3fbf1..28e4f8abf7 100644
--- a/packages/editor-ui/src/api/projects.api.ts
+++ b/packages/editor-ui/src/api/projects.api.ts
@@ -1,21 +1,14 @@
 import type { IRestApiContext } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
-import type {
-	Project,
-	ProjectCreateRequest,
-	ProjectListItem,
-	ProjectUpdateRequest,
-	ProjectsCount,
-} from '@/types/projects.types';
+import type { Project, ProjectListItem, ProjectsCount } from '@/types/projects.types';
+import type { CreateProjectDto, UpdateProjectDto } from '@n8n/api-types';
 
 export const getAllProjects = async (context: IRestApiContext): Promise<ProjectListItem[]> => {
 	return await makeRestApiRequest(context, 'GET', '/projects');
 };
 
 export const getMyProjects = async (context: IRestApiContext): Promise<ProjectListItem[]> => {
-	return await makeRestApiRequest(context, 'GET', '/projects/my-projects', {
-		includeScopes: true,
-	});
+	return await makeRestApiRequest(context, 'GET', '/projects/my-projects');
 };
 
 export const getPersonalProject = async (context: IRestApiContext): Promise<Project> => {
@@ -28,17 +21,17 @@ export const getProject = async (context: IRestApiContext, id: string): Promise<
 
 export const createProject = async (
 	context: IRestApiContext,
-	req: ProjectCreateRequest,
+	payload: CreateProjectDto,
 ): Promise<Project> => {
-	return await makeRestApiRequest(context, 'POST', '/projects', req);
+	return await makeRestApiRequest(context, 'POST', '/projects', payload);
 };
 
 export const updateProject = async (
 	context: IRestApiContext,
-	req: ProjectUpdateRequest,
+	id: Project['id'],
+	payload: UpdateProjectDto,
 ): Promise<void> => {
-	const { id, name, relations } = req;
-	await makeRestApiRequest(context, 'PATCH', `/projects/${id}`, { name, relations });
+	await makeRestApiRequest(context, 'PATCH', `/projects/${id}`, payload);
 };
 
 export const deleteProject = async (
diff --git a/packages/editor-ui/src/api/sourceControl.ts b/packages/editor-ui/src/api/sourceControl.ts
index 615c7d6660..4553856928 100644
--- a/packages/editor-ui/src/api/sourceControl.ts
+++ b/packages/editor-ui/src/api/sourceControl.ts
@@ -1,11 +1,15 @@
-import type { IDataObject } from 'n8n-workflow';
 import type {
-	IRestApiContext,
-	SourceControlAggregatedFile,
+	PullWorkFolderRequestDto,
+	PushWorkFolderRequestDto,
+	SourceControlledFile,
+} from '@n8n/api-types';
+import type { IRestApiContext } from '@/Interface';
+import type {
 	SourceControlPreferences,
 	SourceControlStatus,
 	SshKeyTypes,
-} from '@/Interface';
+} from '@/types/sourceControl.types';
+
 import { makeRestApiRequest } from '@/utils/apiUtils';
 import type { TupleToUnion } from '@/utils/typeHelpers';
 
@@ -21,15 +25,15 @@ const createPreferencesRequestFn =
 
 export const pushWorkfolder = async (
 	context: IRestApiContext,
-	data: IDataObject,
+	data: PushWorkFolderRequestDto,
 ): Promise<void> => {
 	return await makeRestApiRequest(context, 'POST', `${sourceControlApiRoot}/push-workfolder`, data);
 };
 
 export const pullWorkfolder = async (
 	context: IRestApiContext,
-	data: IDataObject,
-): Promise<void> => {
+	data: PullWorkFolderRequestDto,
+): Promise<SourceControlledFile[]> => {
 	return await makeRestApiRequest(context, 'POST', `${sourceControlApiRoot}/pull-workfolder`, data);
 };
 
@@ -59,7 +63,7 @@ export const getAggregatedStatus = async (
 		preferLocalVersion: boolean;
 		verbose: boolean;
 	} = { direction: 'push', preferLocalVersion: true, verbose: false },
-): Promise<SourceControlAggregatedFile[]> => {
+): Promise<SourceControlledFile[]> => {
 	return await makeRestApiRequest(context, 'GET', `${sourceControlApiRoot}/get-status`, options);
 };
 
diff --git a/packages/editor-ui/src/api/sso.ts b/packages/editor-ui/src/api/sso.ts
index 95b0425e95..c990f19c06 100644
--- a/packages/editor-ui/src/api/sso.ts
+++ b/packages/editor-ui/src/api/sso.ts
@@ -1,10 +1,6 @@
+import type { SamlPreferences, SamlToggleDto } from '@n8n/api-types';
 import { makeRestApiRequest } from '@/utils/apiUtils';
-import type {
-	IRestApiContext,
-	SamlPreferencesLoginEnabled,
-	SamlPreferences,
-	SamlPreferencesExtractedData,
-} from '@/Interface';
+import type { IRestApiContext, SamlPreferencesExtractedData } from '@/Interface';
 
 export const initSSO = async (context: IRestApiContext): Promise<string> => {
 	return await makeRestApiRequest(context, 'GET', '/sso/saml/initsso');
@@ -22,14 +18,14 @@ export const getSamlConfig = async (
 
 export const saveSamlConfig = async (
 	context: IRestApiContext,
-	data: SamlPreferences,
+	data: Partial<SamlPreferences>,
 ): Promise<SamlPreferences | undefined> => {
 	return await makeRestApiRequest(context, 'POST', '/sso/saml/config', data);
 };
 
 export const toggleSamlConfig = async (
 	context: IRestApiContext,
-	data: SamlPreferencesLoginEnabled,
+	data: SamlToggleDto,
 ): Promise<void> => {
 	return await makeRestApiRequest(context, 'POST', '/sso/saml/config/toggle', data);
 };
diff --git a/packages/editor-ui/src/api/tags.ts b/packages/editor-ui/src/api/tags.ts
index 0e429b6433..d85f84cb5d 100644
--- a/packages/editor-ui/src/api/tags.ts
+++ b/packages/editor-ui/src/api/tags.ts
@@ -1,29 +1,26 @@
 import type { IRestApiContext, ITag } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
+import type { CreateOrUpdateTagRequestDto, RetrieveTagQueryDto } from '@n8n/api-types';
 
 type TagsApiEndpoint = '/tags' | '/annotation-tags';
 
-export interface ITagsApi {
-	getTags: (context: IRestApiContext, withUsageCount?: boolean) => Promise<ITag[]>;
-	createTag: (context: IRestApiContext, params: { name: string }) => Promise<ITag>;
-	updateTag: (context: IRestApiContext, id: string, params: { name: string }) => Promise<ITag>;
-	deleteTag: (context: IRestApiContext, id: string) => Promise<boolean>;
-}
-
-export function createTagsApi(endpoint: TagsApiEndpoint): ITagsApi {
+export function createTagsApi(endpoint: TagsApiEndpoint) {
 	return {
-		getTags: async (context: IRestApiContext, withUsageCount = false): Promise<ITag[]> => {
-			return await makeRestApiRequest(context, 'GET', endpoint, { withUsageCount });
+		getTags: async (context: IRestApiContext, data: RetrieveTagQueryDto): Promise<ITag[]> => {
+			return await makeRestApiRequest(context, 'GET', endpoint, data);
 		},
-		createTag: async (context: IRestApiContext, params: { name: string }): Promise<ITag> => {
-			return await makeRestApiRequest(context, 'POST', endpoint, params);
+		createTag: async (
+			context: IRestApiContext,
+			data: CreateOrUpdateTagRequestDto,
+		): Promise<ITag> => {
+			return await makeRestApiRequest(context, 'POST', endpoint, data);
 		},
 		updateTag: async (
 			context: IRestApiContext,
 			id: string,
-			params: { name: string },
+			data: CreateOrUpdateTagRequestDto,
 		): Promise<ITag> => {
-			return await makeRestApiRequest(context, 'PATCH', `${endpoint}/${id}`, params);
+			return await makeRestApiRequest(context, 'PATCH', `${endpoint}/${id}`, data);
 		},
 		deleteTag: async (context: IRestApiContext, id: string): Promise<boolean> => {
 			return await makeRestApiRequest(context, 'DELETE', `${endpoint}/${id}`);
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..1cc39e3bd5
--- /dev/null
+++ b/packages/editor-ui/src/api/testDefinition.ee.ts
@@ -0,0 +1,246 @@
+import type { IRestApiContext } from '@/Interface';
+import { makeRestApiRequest, request } 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;
+	annotationTag?: string | null;
+	mockedNodes?: Array<{ name: string; id: string }>;
+}
+
+interface CreateTestDefinitionParams {
+	name: string;
+	workflowId: string;
+	evaluationWorkflowId?: string | null;
+}
+
+export interface UpdateTestDefinitionParams {
+	name?: string;
+	evaluationWorkflowId?: string | null;
+	annotationTagId?: string | null;
+	description?: string | null;
+	mockedNodes?: Array<{ name: string; id: string }>;
+}
+
+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;
+}
+
+export interface TestRunRecord {
+	id: string;
+	testDefinitionId: string;
+	status: 'new' | 'running' | 'completed' | 'error' | 'cancelled';
+	metrics?: Record<string, number>;
+	createdAt: string;
+	updatedAt: string;
+	runAt: string;
+	completedAt: string;
+}
+
+interface GetTestRunParams {
+	testDefinitionId: string;
+	runId: string;
+}
+
+interface DeleteTestRunParams {
+	testDefinitionId: string;
+	runId: string;
+}
+
+const endpoint = '/evaluation/test-definitions';
+const getMetricsEndpoint = (testDefinitionId: string, metricId?: string) =>
+	`${endpoint}/${testDefinitionId}/metrics${metricId ? `/${metricId}` : ''}`;
+
+export async function getTestDefinitions(
+	context: IRestApiContext,
+	params?: { workflowId?: string },
+) {
+	let url = endpoint;
+	if (params?.workflowId) {
+		url += `?filter=${JSON.stringify({ workflowId: params.workflowId })}`;
+	}
+	return await makeRestApiRequest<{ count: number; testDefinitions: TestDefinitionRecord[] }>(
+		context,
+		'GET',
+		url,
+	);
+}
+
+export async function getTestDefinition(context: IRestApiContext, id: string) {
+	return await makeRestApiRequest<TestDefinitionRecord>(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}`);
+}
+
+// Metrics
+export interface TestMetricRecord {
+	id: string;
+	name: string;
+	testDefinitionId: string;
+	createdAt?: string;
+	updatedAt?: string;
+}
+
+export interface CreateTestMetricParams {
+	testDefinitionId: string;
+	name: string;
+}
+
+export interface UpdateTestMetricParams {
+	name: string;
+	id: string;
+	testDefinitionId: string;
+}
+
+export interface DeleteTestMetricParams {
+	testDefinitionId: string;
+	id: string;
+}
+
+export const getTestMetrics = async (context: IRestApiContext, testDefinitionId: string) => {
+	return await makeRestApiRequest<TestMetricRecord[]>(
+		context,
+		'GET',
+		getMetricsEndpoint(testDefinitionId),
+	);
+};
+
+export const getTestMetric = async (
+	context: IRestApiContext,
+	testDefinitionId: string,
+	id: string,
+) => {
+	return await makeRestApiRequest<TestMetricRecord>(
+		context,
+		'GET',
+		getMetricsEndpoint(testDefinitionId, id),
+	);
+};
+
+export const createTestMetric = async (
+	context: IRestApiContext,
+	params: CreateTestMetricParams,
+) => {
+	return await makeRestApiRequest<TestMetricRecord>(
+		context,
+		'POST',
+		getMetricsEndpoint(params.testDefinitionId),
+		{ name: params.name },
+	);
+};
+
+export const updateTestMetric = async (
+	context: IRestApiContext,
+	params: UpdateTestMetricParams,
+) => {
+	return await makeRestApiRequest<TestMetricRecord>(
+		context,
+		'PATCH',
+		getMetricsEndpoint(params.testDefinitionId, params.id),
+		{ name: params.name },
+	);
+};
+
+export const deleteTestMetric = async (
+	context: IRestApiContext,
+	params: DeleteTestMetricParams,
+) => {
+	return await makeRestApiRequest(
+		context,
+		'DELETE',
+		getMetricsEndpoint(params.testDefinitionId, params.id),
+	);
+};
+
+const getRunsEndpoint = (testDefinitionId: string, runId?: string) =>
+	`${endpoint}/${testDefinitionId}/runs${runId ? `/${runId}` : ''}`;
+
+// Get all test runs for a test definition
+export const getTestRuns = async (context: IRestApiContext, testDefinitionId: string) => {
+	return await makeRestApiRequest<TestRunRecord[]>(
+		context,
+		'GET',
+		getRunsEndpoint(testDefinitionId),
+	);
+};
+
+// Get specific test run
+export const getTestRun = async (context: IRestApiContext, params: GetTestRunParams) => {
+	return await makeRestApiRequest<TestRunRecord>(
+		context,
+		'GET',
+		getRunsEndpoint(params.testDefinitionId, params.runId),
+	);
+};
+
+// Start a new test run
+export const startTestRun = async (context: IRestApiContext, testDefinitionId: string) => {
+	const response = await request({
+		method: 'POST',
+		baseURL: context.baseUrl,
+		endpoint: `${endpoint}/${testDefinitionId}/run`,
+		headers: { 'push-ref': context.pushRef },
+	});
+	// CLI is returning the response without wrapping it in `data` key
+	return response as { success: boolean };
+};
+
+export const cancelTestRun = async (
+	context: IRestApiContext,
+	testDefinitionId: string,
+	testRunId: string,
+) => {
+	const response = await request({
+		method: 'POST',
+		baseURL: context.baseUrl,
+		endpoint: `${endpoint}/${testDefinitionId}/runs/${testRunId}/cancel`,
+		headers: { 'push-ref': context.pushRef },
+	});
+	// CLI is returning the response without wrapping it in `data` key
+	return response as { success: boolean };
+};
+
+// Delete a test run
+export const deleteTestRun = async (context: IRestApiContext, params: DeleteTestRunParams) => {
+	return await makeRestApiRequest<{ success: boolean }>(
+		context,
+		'DELETE',
+		getRunsEndpoint(params.testDefinitionId, params.runId),
+	);
+};
diff --git a/packages/editor-ui/src/api/ui.ts b/packages/editor-ui/src/api/ui.ts
index 5b27669e53..7716415c6a 100644
--- a/packages/editor-ui/src/api/ui.ts
+++ b/packages/editor-ui/src/api/ui.ts
@@ -1,6 +1,6 @@
 import type { IRestApiContext } from '@/Interface';
 import { makeRestApiRequest } from '@/utils/apiUtils';
-import type { BannerName } from 'n8n-workflow';
+import type { BannerName } from '@n8n/api-types';
 
 export async function dismissBannerPermanently(
 	context: IRestApiContext,
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index ea14cb6c79..bff4f65fac 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -21,7 +21,7 @@ export async function loginCurrentUser(
 
 export async function login(
 	context: IRestApiContext,
-	params: { email: string; password: string; mfaToken?: string; mfaRecoveryToken?: string },
+	params: { email: string; password: string; mfaCode?: string; mfaRecoveryToken?: string },
 ): Promise<CurrentUserResponse> {
 	return await makeRestApiRequest(context, 'POST', '/login', params);
 }
@@ -84,7 +84,7 @@ export async function validatePasswordToken(
 
 export async function changePassword(
 	context: IRestApiContext,
-	params: { token: string; password: string; mfaToken?: string },
+	params: { token: string; password: string; mfaCode?: string },
 ): Promise<void> {
 	await makeRestApiRequest(context, 'POST', '/change-password', params);
 }
diff --git a/packages/editor-ui/src/api/workflows.ts b/packages/editor-ui/src/api/workflows.ts
index c65c788ae2..e565a95c9e 100644
--- a/packages/editor-ui/src/api/workflows.ts
+++ b/packages/editor-ui/src/api/workflows.ts
@@ -22,7 +22,6 @@ export async function getNewWorkflow(context: IRestApiContext, data?: IDataObjec
 	);
 	return {
 		name: response.name,
-		onboardingFlowEnabled: response.onboardingFlowEnabled === true,
 		settings: response.defaultSettings,
 	};
 }
diff --git a/packages/editor-ui/src/components/AnnotationTagsContainer.ee.vue b/packages/editor-ui/src/components/AnnotationTagsContainer.ee.vue
deleted file mode 100644
index efc69968f5..0000000000
--- a/packages/editor-ui/src/components/AnnotationTagsContainer.ee.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<script lang="ts" setup>
-import { computed } from 'vue';
-import TagsContainer from './TagsContainer.vue';
-import { useAnnotationTagsStore } from '@/stores/tags.store';
-import type { ITag } from '@/Interface';
-
-interface Props {
-	tagIds: string[];
-	limit?: number;
-	clickable?: boolean;
-	responsive?: boolean;
-	hoverable?: boolean;
-}
-
-defineProps<Props>();
-
-const emit = defineEmits<{
-	click: [tagId: string];
-}>();
-
-const annotationTagsStore = useAnnotationTagsStore();
-
-const tagsById = computed<Record<string, ITag>>(() => annotationTagsStore.tagsById);
-
-function onClick(tagId: string) {
-	emit('click', tagId);
-}
-</script>
-
-<template>
-	<TagsContainer
-		:tag-ids="tagIds"
-		:tags-by-id="tagsById"
-		:limit="limit"
-		:clickable="clickable"
-		:responsive="responsive"
-		:hoverable="hoverable"
-		@click="onClick"
-	/>
-</template>
diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
index db4d8ee105..362859edee 100644
--- a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
+++ b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue
@@ -71,11 +71,10 @@ function onClose() {
 
 <template>
 	<SlideTransition>
-		<n8n-resize-wrapper
+		<N8nResizeWrapper
 			v-show="assistantStore.isAssistantOpen"
 			:supported-directions="['left']"
 			:width="assistantStore.chatWidth"
-			:class="$style.container"
 			data-test-id="ask-assistant-sidebar"
 			@resize="onResizeDebounced"
 		>
@@ -98,17 +97,11 @@ function onClose() {
 					@code-undo="undoCodeDiff"
 				/>
 			</div>
-		</n8n-resize-wrapper>
+		</N8nResizeWrapper>
 	</SlideTransition>
 </template>
 
 <style module>
-.container {
-	height: 100%;
-	flex-basis: content;
-	z-index: var(--z-index-ask-assistant-chat);
-}
-
 .wrapper {
 	height: 100%;
 }
diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue b/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
index 70f6ed84fd..6a9746c65e 100644
--- a/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
+++ b/packages/editor-ui/src/components/AskAssistant/AskAssistantFloatingButton.vue
@@ -2,6 +2,7 @@
 import { useI18n } from '@/composables/useI18n';
 import { useStyles } from '@/composables/useStyles';
 import { useAssistantStore } from '@/stores/assistant.store';
+import { useCanvasStore } from '@/stores/canvas.store';
 import AssistantAvatar from 'n8n-design-system/components/AskAssistantAvatar/AssistantAvatar.vue';
 import AskAssistantButton from 'n8n-design-system/components/AskAssistantButton/AskAssistantButton.vue';
 import { computed } from 'vue';
@@ -9,6 +10,7 @@ import { computed } from 'vue';
 const assistantStore = useAssistantStore();
 const i18n = useI18n();
 const { APP_Z_INDEXES } = useStyles();
+const canvasStore = useCanvasStore();
 
 const lastUnread = computed(() => {
 	const msg = assistantStore.lastUnread;
@@ -39,6 +41,7 @@ const onClick = () => {
 		v-if="assistantStore.canShowAssistantButtonsOnCanvas && !assistantStore.isAssistantOpen"
 		:class="$style.container"
 		data-test-id="ask-assistant-floating-button"
+		:style="{ '--canvas-panel-height-offset': `${canvasStore.panelHeight}px` }"
 	>
 		<n8n-tooltip
 			:z-index="APP_Z_INDEXES.ASK_ASSISTANT_FLOATING_BUTTON_TOOLTIP"
@@ -61,7 +64,7 @@ const onClick = () => {
 <style lang="scss" module>
 .container {
 	position: absolute;
-	bottom: var(--spacing-s);
+	bottom: calc(var(--canvas-panel-height-offset, 0px) + var(--spacing-s));
 	right: var(--spacing-s);
 	z-index: var(--z-index-ask-assistant-floating-button);
 }
diff --git a/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue b/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
index 27e0054d77..4113aeecf4 100644
--- a/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
+++ b/packages/editor-ui/src/components/AskAssistant/NewAssistantSessionModal.vue
@@ -66,9 +66,9 @@ const startNewSession = async () => {
 		</template>
 		<template #footer>
 			<div :class="$style.footer">
-				<n8n-button :label="$locale.baseText('generic.cancel')" type="secondary" @click="close" />
+				<n8n-button :label="i18n.baseText('generic.cancel')" type="secondary" @click="close" />
 				<n8n-button
-					:label="$locale.baseText('aiAssistant.newSessionModal.confirm')"
+					:label="i18n.baseText('aiAssistant.newSessionModal.confirm')"
 					@click="startNewSession"
 				/>
 			</div>
diff --git a/packages/editor-ui/src/components/AssignmentCollection/__tests__/Assignment.test.ts b/packages/editor-ui/src/components/AssignmentCollection/Assignment.test.ts
similarity index 97%
rename from packages/editor-ui/src/components/AssignmentCollection/__tests__/Assignment.test.ts
rename to packages/editor-ui/src/components/AssignmentCollection/Assignment.test.ts
index be96dc8dd9..164047d475 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/__tests__/Assignment.test.ts
+++ b/packages/editor-ui/src/components/AssignmentCollection/Assignment.test.ts
@@ -1,7 +1,7 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
-import Assignment from '../Assignment.vue';
+import Assignment from './Assignment.vue';
 import { defaultSettings } from '@/__tests__/defaults';
 import { STORES } from '@/constants';
 import { merge } from 'lodash-es';
diff --git a/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue b/packages/editor-ui/src/components/AssignmentCollection/Assignment.vue
index 0984d9c7e4..614ae3f590 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));
@@ -146,6 +152,14 @@ const onBlur = (): void => {
 		}"
 		data-test-id="assignment"
 	>
+		<N8nIconButton
+			v-if="!isReadOnly"
+			type="tertiary"
+			text
+			size="mini"
+			icon="grip-vertical"
+			:class="[$style.iconButton, $style.defaultTopPadding, 'drag-handle']"
+		></N8nIconButton>
 		<n8n-icon-button
 			v-if="!isReadOnly"
 			type="tertiary"
@@ -153,7 +167,7 @@ const onBlur = (): void => {
 			size="mini"
 			icon="trash"
 			data-test-id="assignment-remove"
-			:class="$style.remove"
+			:class="[$style.iconButton, $style.extraTopPadding]"
 			@click="onRemove"
 		></n8n-icon-button>
 
@@ -235,7 +249,7 @@ const onBlur = (): void => {
 	}
 
 	&:hover {
-		.remove {
+		.iconButton {
 			opacity: 1;
 		}
 	}
@@ -263,12 +277,19 @@ const onBlur = (): void => {
 	}
 }
 
-.remove {
+.iconButton {
 	position: absolute;
 	left: 0;
-	top: var(--spacing-l);
 	opacity: 0;
 	transition: opacity 100ms ease-in;
+	color: var(--icon-base-color);
+}
+.extraTopPadding {
+	top: calc(20px + var(--spacing-l));
+}
+
+.defaultTopPadding {
+	top: var(--spacing-l);
 }
 
 .status {
diff --git a/packages/editor-ui/src/components/AssignmentCollection/__tests__/AssignmentCollection.test.ts b/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.test.ts
similarity index 97%
rename from packages/editor-ui/src/components/AssignmentCollection/__tests__/AssignmentCollection.test.ts
rename to packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.test.ts
index 626df62a4a..534c734638 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/__tests__/AssignmentCollection.test.ts
+++ b/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.test.ts
@@ -4,7 +4,7 @@ import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
 import { fireEvent, within } from '@testing-library/vue';
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
-import AssignmentCollection from '../AssignmentCollection.vue';
+import AssignmentCollection from './AssignmentCollection.vue';
 import { STORES } from '@/constants';
 import { cleanupAppModals, createAppModals, SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
 
@@ -117,7 +117,7 @@ describe('AssignmentCollection.vue', () => {
 		await dropAssignment({ key: 'objectKey', value: {}, dropArea });
 		await dropAssignment({ key: 'arrayKey', value: [], dropArea });
 
-		let assignments = await findAllByTestId('assignment');
+		const assignments = await findAllByTestId('assignment');
 
 		expect(assignments.length).toBe(5);
 		expect(getAssignmentType(assignments[0])).toEqual('Boolean');
diff --git a/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue b/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
index fb13948302..0aebc16bb6 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
+++ b/packages/editor-ui/src/components/AssignmentCollection/AssignmentCollection.vue
@@ -15,6 +15,7 @@ import ParameterOptions from '../ParameterOptions.vue';
 import Assignment from './Assignment.vue';
 import { inputDataToAssignments, typeFromExpression } from './utils';
 import { propertyNameFromExpression } from '@/utils/mappingUtils';
+import Draggable from 'vuedraggable';
 
 interface Props {
 	parameter: INodeProperties;
@@ -98,10 +99,10 @@ function getIssues(index: number): string[] {
 	return issues.value[`${props.parameter.name}.${index}`] ?? [];
 }
 
-function optionSelected(action: 'clearAll' | 'addAll') {
+function optionSelected(action: string) {
 	if (action === 'clearAll') {
 		state.paramValue.assignments = [];
-	} else {
+	} else if (action === 'addAll' && inputData.value) {
 		const newAssignments = inputDataToAssignments(inputData.value);
 		state.paramValue.assignments = state.paramValue.assignments.concat(newAssignments);
 	}
@@ -133,19 +134,27 @@ function optionSelected(action: 'clearAll' | 'addAll') {
 		</n8n-input-label>
 		<div :class="$style.content">
 			<div :class="$style.assignments">
-				<div v-for="(assignment, index) of state.paramValue.assignments" :key="assignment.id">
-					<Assignment
-						:model-value="assignment"
-						:index="index"
-						:path="`${path}.${index}`"
-						:issues="getIssues(index)"
-						:class="$style.assignment"
-						:is-read-only="isReadOnly"
-						@update:model-value="(value) => onAssignmentUpdate(index, value)"
-						@remove="() => onAssignmentRemove(index)"
-					>
-					</Assignment>
-				</div>
+				<Draggable
+					v-model="state.paramValue.assignments"
+					item-key="id"
+					handle=".drag-handle"
+					:drag-class="$style.dragging"
+					:ghost-class="$style.ghost"
+				>
+					<template #item="{ index, element: assignment }">
+						<Assignment
+							:model-value="assignment"
+							:index="index"
+							:path="`${path}.${index}`"
+							:issues="getIssues(index)"
+							:class="$style.assignment"
+							:is-read-only="isReadOnly"
+							@update:model-value="(value) => onAssignmentUpdate(index, value)"
+							@remove="() => onAssignmentRemove(index)"
+						>
+						</Assignment>
+					</template>
+				</Draggable>
 			</div>
 			<div
 				v-if="!isReadOnly"
@@ -265,4 +274,18 @@ function optionSelected(action: 'clearAll' | 'addAll') {
 .icon {
 	font-size: var(--font-size-2xl);
 }
+.ghost,
+.dragging {
+	border-radius: var(--border-radius-base);
+	padding-right: var(--spacing-xs);
+	padding-bottom: var(--spacing-xs);
+}
+.ghost {
+	background-color: var(--color-background-base);
+	opacity: 0.5;
+}
+.dragging {
+	background-color: var(--color-background-xlight);
+	opacity: 0.7;
+}
 </style>
diff --git a/packages/editor-ui/src/components/AssignmentCollection/__tests__/TypeSelect.test.ts b/packages/editor-ui/src/components/AssignmentCollection/TypeSelect.test.ts
similarity index 96%
rename from packages/editor-ui/src/components/AssignmentCollection/__tests__/TypeSelect.test.ts
rename to packages/editor-ui/src/components/AssignmentCollection/TypeSelect.test.ts
index 78f4b683c6..19360f22d3 100644
--- a/packages/editor-ui/src/components/AssignmentCollection/__tests__/TypeSelect.test.ts
+++ b/packages/editor-ui/src/components/AssignmentCollection/TypeSelect.test.ts
@@ -1,7 +1,7 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
-import TypeSelect from '../TypeSelect.vue';
+import TypeSelect from './TypeSelect.vue';
 
 const DEFAULT_SETUP = {
 	pinia: createTestingPinia(),
diff --git a/packages/editor-ui/src/components/__tests__/BannersStack.test.ts b/packages/editor-ui/src/components/BannersStack.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/BannersStack.test.ts
rename to packages/editor-ui/src/components/BannersStack.test.ts
diff --git a/packages/editor-ui/src/components/BinaryDataDisplay.vue b/packages/editor-ui/src/components/BinaryDataDisplay.vue
index 9b7eb62e62..08aeda0190 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplay.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplay.vue
@@ -4,6 +4,7 @@ import type { IBinaryData, IRunData } from 'n8n-workflow';
 import BinaryDataDisplayEmbed from '@/components/BinaryDataDisplayEmbed.vue';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps<{
 	displayData: IBinaryData;
@@ -17,6 +18,8 @@ const emit = defineEmits<{
 const nodeHelpers = useNodeHelpers();
 const workflowsStore = useWorkflowsStore();
 
+const i18n = useI18n();
+
 const workflowRunData = computed<IRunData | null>(() => {
 	const workflowExecution = workflowsStore.getWorkflowExecution;
 	if (workflowExecution === null) {
@@ -74,15 +77,15 @@ function closeWindow() {
 		<n8n-button
 			size="small"
 			class="binary-data-window-back"
-			:title="$locale.baseText('binaryDataDisplay.backToOverviewPage')"
+			:title="i18n.baseText('binaryDataDisplay.backToOverviewPage')"
 			icon="arrow-left"
-			:label="$locale.baseText('binaryDataDisplay.backToList')"
+			:label="i18n.baseText('binaryDataDisplay.backToList')"
 			@click.stop="closeWindow"
 		/>
 
 		<div class="binary-data-window-wrapper">
 			<div v-if="!binaryData">
-				{{ $locale.baseText('binaryDataDisplay.noDataFoundToDisplay') }}
+				{{ i18n.baseText('binaryDataDisplay.noDataFoundToDisplay') }}
 			</div>
 			<BinaryDataDisplayEmbed v-else :binary-data="binaryData" />
 		</div>
diff --git a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
index fbb7a68736..2179c103d8 100644
--- a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
+++ b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue
@@ -5,6 +5,7 @@ import type { IBinaryData } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 import VueJsonPretty from 'vue-json-pretty';
 import RunDataHtml from '@/components/RunDataHtml.vue';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps<{
 	binaryData: IBinaryData;
@@ -17,6 +18,8 @@ const data = ref('');
 
 const workflowsStore = useWorkflowsStore();
 
+const i18n = useI18n();
+
 const embedClass = computed(() => {
 	return [props.binaryData.fileType ?? 'other'];
 });
@@ -57,11 +60,11 @@ onMounted(async () => {
 		<span v-else>
 			<video v-if="binaryData.fileType === 'video'" controls autoplay>
 				<source :src="embedSource" :type="binaryData.mimeType" />
-				{{ $locale.baseText('binaryDataDisplay.yourBrowserDoesNotSupport') }}
+				{{ i18n.baseText('binaryDataDisplay.yourBrowserDoesNotSupport') }}
 			</video>
 			<audio v-else-if="binaryData.fileType === 'audio'" controls autoplay>
 				<source :src="embedSource" :type="binaryData.mimeType" />
-				{{ $locale.baseText('binaryDataDisplay.yourBrowserDoesNotSupport') }}
+				{{ i18n.baseText('binaryDataDisplay.yourBrowserDoesNotSupport') }}
 			</audio>
 			<img v-else-if="binaryData.fileType === 'image'" :src="embedSource" />
 			<VueJsonPretty
diff --git a/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
similarity index 97%
rename from packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
rename to packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
index 28e80091e5..ba5070e335 100644
--- a/packages/editor-ui/src/components/__tests__/ButtonParameter.test.ts
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.test.ts
@@ -44,7 +44,8 @@ describe('ButtonParameter', () => {
 	beforeEach(() => {
 		vi.mocked(useNDVStore).mockReturnValue({
 			ndvInputData: [{}],
-			activeNode: { name: 'TestNode' },
+			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 47c86755b7..a28b68d3dd 100644
--- a/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
+++ b/packages/editor-ui/src/components/ButtonParameter/ButtonParameter.vue
@@ -1,21 +1,24 @@
 <script setup lang="ts">
-import { ApplicationError, type INodeProperties, type NodePropertyAction } from 'n8n-workflow';
+import { type INodeProperties, type NodePropertyAction } from 'n8n-workflow';
 import type { INodeUi, IUpdateInformation } from '@/Interface';
 import { ref, computed, onMounted } from 'vue';
 import { N8nButton, N8nInput, N8nTooltip } from 'n8n-design-system/components';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import { useNDVStore } from '@/stores/ndv.store';
-import { getSchemas, getParentNodes } from './utils';
-import { useRootStore } from '@/stores/root.store';
+import {
+	getParentNodes,
+	generateCodeForAiTransform,
+	type TextareaRowData,
+	getUpdatedTextareaValue,
+	getTextareaCursorPosition,
+} from './utils';
 import { useTelemetry } from '@/composables/useTelemetry';
-import { generateCodeForPrompt } from '@/api/ai';
+import { useUIStore } from '@/stores/ui.store';
 
-import { format } from 'prettier';
-import jsParser from 'prettier/plugins/babel';
-import * as estree from 'prettier/plugins/estree';
-import { useSettingsStore } from '@/stores/settings.store';
-import type { AskAiRequest } from '@/types/assistant.types';
+import { propertyNameFromExpression } from '../../utils/mappingUtils';
+
+const AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT = 'codeGeneratedForPrompt';
 
 const emit = defineEmits<{
 	valueChanged: [value: IUpdateInformation];
@@ -27,14 +30,14 @@ const props = defineProps<{
 	path: string;
 }>();
 
-const rootStore = useRootStore();
-const settingsStore = useSettingsStore();
+const { activeNode } = useNDVStore();
 
 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);
@@ -53,6 +56,11 @@ const isSubmitEnabled = computed(() => {
 
 	return true;
 });
+const promptUpdated = computed(() => {
+	const lastPrompt = activeNode?.parameters[AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT] as string;
+	if (!lastPrompt) return false;
+	return lastPrompt.trim() !== prompt.value.trim();
+});
 
 function startLoading() {
 	isLoading.value = true;
@@ -69,7 +77,6 @@ function getPath(parameter: string) {
 }
 
 async function onSubmit() {
-	const { activeNode } = useNDVStore();
 	const { showMessage } = useToast();
 	const action: string | NodePropertyAction | undefined =
 		props.parameter.typeOptions?.buttonConfig?.action;
@@ -93,46 +100,27 @@ async function onSubmit() {
 	startLoading();
 
 	try {
-		const schemas = getSchemas();
-
-		const payload: AskAiRequest.RequestPayload = {
-			question: prompt.value,
-			context: {
-				schema: schemas.parentNodesSchemas,
-				inputSchema: schemas.inputSchema!,
-				ndvPushRef: useNDVStore().pushRef,
-				pushRef: rootStore.pushRef,
-			},
-			forNode: 'transform',
-		};
 		switch (type) {
 			case 'askAiCodeGeneration':
-				let value;
-				if (settingsStore.isAskAiEnabled) {
-					const { restApiContext } = useRootStore();
-					const { code } = await generateCodeForPrompt(restApiContext, payload);
-					value = code;
-				} else {
-					throw new ApplicationError('AI code generation is not enabled');
-				}
-
-				if (value === undefined) return;
-
-				const formattedCode = await format(String(value), {
-					parser: 'babel',
-					plugins: [jsParser, estree],
-				});
-
-				const updateInformation = {
-					name: getPath(target as string),
-					value: formattedCode,
-				};
+				const updateInformation = await generateCodeForAiTransform(
+					prompt.value,
+					getPath(target as string),
+					5,
+				);
+				if (!updateInformation) return;
 
+				//updade code parameter
 				emit('valueChanged', updateInformation);
 
+				//update code generated for prompt parameter
+				emit('valueChanged', {
+					name: getPath(AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT),
+					value: prompt.value,
+				});
+
 				useTelemetry().trackAiTransform('generationFinished', {
 					prompt: prompt.value,
-					code: formattedCode,
+					code: updateInformation.value,
 				});
 				break;
 			default:
@@ -168,9 +156,50 @@ function onPromptInput(inputValue: string) {
 	});
 }
 
+function useDarkBackdrop(): string {
+	const theme = useUIStore().appliedTheme;
+
+	if (theme === 'light') {
+		return 'background-color: var(--color-background-xlight);';
+	} else {
+		return 'background-color: var(--color-background-light);';
+	}
+}
+
 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>
@@ -185,24 +214,38 @@ onMounted(() => {
 		>
 		</n8n-input-label>
 		<div :class="$style.inputContainer" :hidden="!hasInputField">
-			<div :class="$style.meta">
+			<div :class="$style.meta" :style="useDarkBackdrop()">
 				<span
 					v-if="inputFieldMaxLength"
 					v-show="prompt.length > 1"
 					:class="$style.counter"
 					v-text="`${prompt.length} / ${inputFieldMaxLength}`"
 				/>
+				<span
+					v-if="promptUpdated"
+					:class="$style['warning-text']"
+					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">
@@ -234,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);
@@ -255,9 +298,15 @@ onMounted(() => {
 	display: flex;
 	justify-content: space-between;
 	position: absolute;
-	bottom: var(--spacing-2xs);
+	padding-bottom: var(--spacing-2xs);
+	padding-top: var(--spacing-2xs);
+	margin: 1px;
+	margin-right: var(--spacing-s);
+	bottom: 0;
 	left: var(--spacing-xs);
 	right: var(--spacing-xs);
+	gap: 10px;
+	align-items: end;
 	z-index: 1;
 
 	* {
@@ -267,10 +316,22 @@ onMounted(() => {
 }
 .counter {
 	color: var(--color-text-light);
+	flex-shrink: 0;
 }
 .controls {
 	padding: var(--spacing-2xs) 0;
 	display: flex;
 	justify-content: flex-end;
 }
+.warning-text {
+	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..7453d41fb5
--- /dev/null
+++ b/packages/editor-ui/src/components/ButtonParameter/utils.test.ts
@@ -0,0 +1,156 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { generateCodeForAiTransform, reducePayloadSizeOrThrow } from './utils';
+import { createPinia, setActivePinia } from 'pinia';
+import { generateCodeForPrompt } from '@/api/ai';
+import type { AskAiRequest } from '@/types/assistant.types';
+import type { Schema } from '@/Interface';
+
+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);
+	});
+});
+
+const mockPayload = () =>
+	({
+		context: {
+			schema: [
+				{ nodeName: 'node1', data: 'some data' },
+				{ nodeName: 'node2', data: 'other data' },
+			],
+			inputSchema: {
+				schema: {
+					value: [
+						{ key: 'prop1', value: 'value1' },
+						{ key: 'prop2', value: 'value2' },
+					],
+				},
+			},
+		},
+		question: 'What is node1 and prop1?',
+	}) as unknown as AskAiRequest.RequestPayload;
+
+describe('reducePayloadSizeOrThrow', () => {
+	it('reduces schema size when tokens exceed the limit', () => {
+		const payload = mockPayload();
+		const error = new Error('Limit is 100 tokens, but 104 were provided');
+
+		reducePayloadSizeOrThrow(payload, error);
+
+		expect(payload.context.schema.length).toBe(1);
+		expect(payload.context.schema[0]).toEqual({ nodeName: 'node1', data: 'some data' });
+	});
+
+	it('removes unreferenced properties in input schema', () => {
+		const payload = mockPayload();
+		const error = new Error('Limit is 100 tokens, but 150 were provided');
+
+		reducePayloadSizeOrThrow(payload, error);
+
+		expect(payload.context.inputSchema.schema.value.length).toBe(1);
+		expect((payload.context.inputSchema.schema.value as Schema[])[0].key).toBe('prop1');
+	});
+
+	it('removes all parent nodes if needed', () => {
+		const payload = mockPayload();
+		const error = new Error('Limit is 100 tokens, but 150 were provided');
+
+		payload.question = '';
+
+		reducePayloadSizeOrThrow(payload, error);
+
+		expect(payload.context.schema.length).toBe(0);
+	});
+
+	it('throws error if tokens still exceed after reductions', () => {
+		const payload = mockPayload();
+		const error = new Error('Limit is 100 tokens, but 200 were provided');
+
+		expect(() => reducePayloadSizeOrThrow(payload, error)).toThrowError(error);
+	});
+
+	it('throws error if message format is invalid', () => {
+		const payload = mockPayload();
+		const error = new Error('Invalid token message format');
+
+		expect(() => reducePayloadSizeOrThrow(payload, error)).toThrowError(error);
+	});
+});
diff --git a/packages/editor-ui/src/components/ButtonParameter/utils.ts b/packages/editor-ui/src/components/ButtonParameter/utils.ts
index 14d3ca4d78..1044477bbb 100644
--- a/packages/editor-ui/src/components/ButtonParameter/utils.ts
+++ b/packages/editor-ui/src/components/ButtonParameter/utils.ts
@@ -1,9 +1,21 @@
 import type { Schema } from '@/Interface';
-import type { INodeExecutionData } from 'n8n-workflow';
+import { ApplicationError, type INodeExecutionData } from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useDataSchema } from '@/composables/useDataSchema';
 import { executionDataToJson } from '@/utils/nodeTypesUtils';
+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;
@@ -31,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);
@@ -44,3 +56,348 @@ export function getSchemas() {
 		parentNodesSchemas,
 	};
 }
+
+//------ Reduce payload ------
+
+const estimateNumberOfTokens = (item: unknown, averageTokenLength: number): number => {
+	if (typeof item === 'object') {
+		return Math.ceil(JSON.stringify(item).length / averageTokenLength);
+	}
+
+	return 0;
+};
+
+const calculateRemainingTokens = (error: Error) => {
+	// Expected message format:
+	//'This model's maximum context length is 8192 tokens. However, your messages resulted in 10514 tokens.'
+	const tokens = error.message.match(/\d+/g);
+
+	if (!tokens || tokens.length < 2) throw error;
+
+	const maxTokens = parseInt(tokens[0], 10);
+	const currentTokens = parseInt(tokens[1], 10);
+
+	return currentTokens - maxTokens;
+};
+
+const trimParentNodesSchema = (
+	payload: AskAiRequest.RequestPayload,
+	remainingTokensToReduce: number,
+	averageTokenLength: number,
+) => {
+	//check if parent nodes schema takes more tokens than available
+	let parentNodesTokenCount = estimateNumberOfTokens(payload.context.schema, averageTokenLength);
+
+	if (remainingTokensToReduce > parentNodesTokenCount) {
+		remainingTokensToReduce -= parentNodesTokenCount;
+		payload.context.schema = [];
+	}
+
+	//remove parent nodes not referenced in the prompt
+	if (payload.context.schema.length) {
+		const nodes = [...payload.context.schema];
+
+		for (let nodeIndex = 0; nodeIndex < nodes.length; nodeIndex++) {
+			if (payload.question.includes(nodes[nodeIndex].nodeName)) continue;
+
+			const nodeTokens = estimateNumberOfTokens(nodes[nodeIndex], averageTokenLength);
+			remainingTokensToReduce -= nodeTokens;
+			parentNodesTokenCount -= nodeTokens;
+			payload.context.schema.splice(nodeIndex, 1);
+
+			if (remainingTokensToReduce <= 0) break;
+		}
+	}
+
+	return [remainingTokensToReduce, parentNodesTokenCount];
+};
+
+const trimInputSchemaProperties = (
+	payload: AskAiRequest.RequestPayload,
+	remainingTokensToReduce: number,
+	averageTokenLength: number,
+	parentNodesTokenCount: number,
+) => {
+	if (remainingTokensToReduce <= 0) return remainingTokensToReduce;
+
+	//remove properties not referenced in the prompt from the input schema
+	if (Array.isArray(payload.context.inputSchema.schema.value)) {
+		const props = [...payload.context.inputSchema.schema.value];
+
+		for (let index = 0; index < props.length; index++) {
+			const key = props[index].key;
+
+			if (key && payload.question.includes(key)) continue;
+
+			const propTokens = estimateNumberOfTokens(props[index], averageTokenLength);
+			remainingTokensToReduce -= propTokens;
+			payload.context.inputSchema.schema.value.splice(index, 1);
+
+			if (remainingTokensToReduce <= 0) break;
+		}
+	}
+
+	//if tokensToReduce is still remaining, remove all parent nodes
+	if (remainingTokensToReduce > 0) {
+		payload.context.schema = [];
+		remainingTokensToReduce -= parentNodesTokenCount;
+	}
+
+	return remainingTokensToReduce;
+};
+
+/**
+ * Attempts to reduce the size of the payload to fit within token limits or throws an error if unsuccessful,
+ * payload would be modified in place
+ *
+ * @param {AskAiRequest.RequestPayload} payload - The request payload to be trimmed,
+ * 'schema' and 'inputSchema.schema' will be modified.
+ * @param {Error} error - The error to throw if the token reduction fails.
+ * @param {number} [averageTokenLength=4] - The average token length used for estimation.
+ * @throws {Error} - Throws the provided error if the payload cannot be reduced sufficiently.
+ */
+export function reducePayloadSizeOrThrow(
+	payload: AskAiRequest.RequestPayload,
+	error: Error,
+	averageTokenLength = 4,
+) {
+	try {
+		let remainingTokensToReduce = calculateRemainingTokens(error);
+
+		const [remaining, parentNodesTokenCount] = trimParentNodesSchema(
+			payload,
+			remainingTokensToReduce,
+			averageTokenLength,
+		);
+
+		remainingTokensToReduce = remaining;
+
+		remainingTokensToReduce = trimInputSchemaProperties(
+			payload,
+			remainingTokensToReduce,
+			averageTokenLength,
+			parentNodesTokenCount,
+		);
+
+		if (remainingTokensToReduce > 0) throw error;
+	} catch (e) {
+		throw e;
+	}
+}
+
+export async function generateCodeForAiTransform(prompt: string, path: string, retries = 1) {
+	const schemas = getSchemas();
+
+	const payload: AskAiRequest.RequestPayload = {
+		question: prompt,
+		context: {
+			schema: schemas.parentNodesSchemas,
+			inputSchema: schemas.inputSchema!,
+			ndvPushRef: useNDVStore().pushRef,
+			pushRef: useRootStore().pushRef,
+		},
+		forNode: 'transform',
+	};
+
+	let value;
+	if (useSettingsStore().isAskAiEnabled) {
+		const { restApiContext } = useRootStore();
+
+		let code = '';
+
+		while (retries > 0) {
+			try {
+				const { code: generatedCode } = await generateCodeForPrompt(restApiContext, payload);
+				code = generatedCode;
+				break;
+			} catch (e) {
+				if (e.message.includes('maximum context length')) {
+					reducePayloadSizeOrThrow(payload, e);
+					continue;
+				}
+
+				retries--;
+				if (!retries) throw e;
+			}
+		}
+
+		value = code;
+	} else {
+		throw new ApplicationError('AI code generation is not enabled');
+	}
+
+	if (value === undefined) return;
+
+	const formattedCode = await format(String(value), {
+		parser: 'babel',
+		plugins: [jsParser, estree],
+	});
+
+	const updateInformation = {
+		name: path,
+		value: formattedCode,
+	};
+
+	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
new file mode 100644
index 0000000000..47869583a4
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/CanvasChat.test.ts
@@ -0,0 +1,594 @@
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+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';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestWorkflowObject } from '@/__tests__/mocks';
+import { mockedStore } from '@/__tests__/utils';
+import { STORES } from '@/constants';
+import { ChatOptionsSymbol, ChatSymbol } from '@n8n/chat/constants';
+import { chatEventBus } from '@n8n/chat/event-buses';
+
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useCanvasStore } from '@/stores/canvas.store';
+import * as useChatMessaging from './composables/useChatMessaging';
+import * as useChatTrigger from './composables/useChatTrigger';
+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();
+	const showError = vi.fn();
+	return {
+		useToast: () => {
+			return {
+				showMessage,
+				showError,
+				clearAllStickyNotifications: vi.fn(),
+			};
+		},
+	};
+});
+// Test data
+const mockNodes: INodeUi[] = [
+	{
+		parameters: {
+			options: {
+				allowFileUploads: true,
+			},
+		},
+		id: 'chat-trigger-id',
+		name: 'When chat message received',
+		type: '@n8n/n8n-nodes-langchain.chatTrigger',
+		typeVersion: 1.1,
+		position: [740, 860],
+		webhookId: 'webhook-id',
+	},
+	{
+		parameters: {},
+		id: 'agent-id',
+		name: 'AI Agent',
+		type: '@n8n/n8n-nodes-langchain.agent',
+		typeVersion: 1.7,
+		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': {
+		main: [
+			[
+				{
+					node: 'AI Agent',
+					type: NodeConnectionType.Main,
+					index: 0,
+				},
+			],
+		],
+	},
+};
+
+const mockWorkflowExecution = {
+	data: {
+		resultData: {
+			runData: {
+				'AI Agent': [
+					{
+						data: {
+							main: [[{ json: { output: 'AI response message' } }]],
+						},
+					},
+				],
+			},
+			lastNodeExecuted: 'AI Agent',
+		},
+	},
+};
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [],
+});
+
+describe('CanvasChat', () => {
+	const renderComponent = createComponentRenderer(CanvasChat, {
+		global: {
+			provide: {
+				[ChatSymbol as symbol]: {},
+				[ChatOptionsSymbol as symbol]: {},
+			},
+			plugins: [router],
+		},
+	});
+
+	let workflowsStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
+	let canvasStore: ReturnType<typeof mockedStore<typeof useCanvasStore>>;
+	let nodeTypeStore: ReturnType<typeof mockedStore<typeof useNodeTypesStore>>;
+
+	beforeEach(() => {
+		const pinia = createTestingPinia({
+			initialState: {
+				[STORES.WORKFLOWS]: {
+					workflow: {
+						nodes: mockNodes,
+						connections: mockConnections,
+					},
+				},
+				[STORES.UI]: {
+					chatPanelOpen: true,
+				},
+			},
+		});
+
+		setActivePinia(pinia);
+
+		workflowsStore = mockedStore(useWorkflowsStore);
+		canvasStore = mockedStore(useCanvasStore);
+		nodeTypeStore = mockedStore(useNodeTypesStore);
+
+		// Setup default mocks
+		workflowsStore.getCurrentWorkflow.mockReturnValue(
+			createTestWorkflowObject({
+				nodes: mockNodes,
+				connections: mockConnections,
+			}),
+		);
+		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(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('rendering', () => {
+		it('should render chat when panel is open', () => {
+			const { getByTestId } = renderComponent();
+			expect(getByTestId('canvas-chat')).toBeInTheDocument();
+		});
+
+		it('should not render chat when panel is closed', async () => {
+			workflowsStore.isChatPanelOpen = false;
+			const { queryByTestId } = renderComponent();
+			await waitFor(() => {
+				expect(queryByTestId('canvas-chat')).not.toBeInTheDocument();
+			});
+		});
+
+		it('should show correct input placeholder', async () => {
+			const { findByTestId } = renderComponent();
+			expect(await findByTestId('chat-input')).toBeInTheDocument();
+		});
+	});
+
+	describe('message handling', () => {
+		beforeEach(() => {
+			vi.spyOn(chatEventBus, 'emit');
+			workflowsStore.runWorkflow.mockResolvedValue({ executionId: 'test-execution-id' });
+		});
+
+		it('should send message and show response', async () => {
+			const { findByTestId, findByText } = renderComponent();
+
+			// Send message
+			const input = await findByTestId('chat-input');
+			await userEvent.type(input, 'Hello AI!');
+			await userEvent.keyboard('{Enter}');
+
+			// 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();
+			});
+
+			// Verify workflow execution
+			expect(workflowsStore.runWorkflow).toHaveBeenCalledWith(
+				expect.objectContaining({
+					runData: {
+						'When chat message received': [
+							{
+								data: {
+									main: [
+										[
+											{
+												json: {
+													action: 'sendMessage',
+													chatInput: 'Hello AI!',
+													sessionId: expect.any(String),
+												},
+											},
+										],
+									],
+								},
+								executionStatus: 'success',
+								executionTime: 0,
+								source: [null],
+								startTime: expect.any(Number),
+							},
+						],
+					},
+				}),
+			);
+		});
+
+		it('should show loading state during message processing', async () => {
+			const { findByTestId, queryByTestId } = renderComponent();
+
+			// Send message
+			const input = await findByTestId('chat-input');
+			await userEvent.type(input, 'Test message');
+			await userEvent.keyboard('{Enter}');
+
+			await waitFor(() => expect(queryByTestId('chat-message-typing')).toBeInTheDocument());
+
+			workflowsStore.getWorkflowExecution = {
+				...(mockWorkflowExecution as unknown as IExecutionResponse),
+				status: 'success',
+			};
+			await waitFor(() => expect(queryByTestId('chat-message-typing')).not.toBeInTheDocument());
+		});
+
+		it('should handle workflow execution errors', async () => {
+			workflowsStore.runWorkflow.mockRejectedValueOnce(new Error());
+
+			const { findByTestId } = renderComponent();
+
+			const input = await findByTestId('chat-input');
+			await userEvent.type(input, 'Hello AI!');
+			await userEvent.keyboard('{Enter}');
+
+			const toast = useToast();
+			expect(toast.showError).toHaveBeenCalledWith(new Error(), 'Problem running workflow');
+		});
+	});
+
+	describe('session management', () => {
+		const mockMessages: ChatMessage[] = [
+			{
+				id: '1',
+				text: 'Existing message',
+				sender: 'user',
+				createdAt: new Date().toISOString(),
+			},
+		];
+
+		beforeEach(() => {
+			vi.spyOn(useChatMessaging, 'useChatMessaging').mockReturnValue({
+				getChatMessages: vi.fn().mockReturnValue(mockMessages),
+				sendMessage: vi.fn(),
+				extractResponseMessage: vi.fn(),
+				previousMessageIndex: ref(0),
+				isLoading: computed(() => false),
+			});
+		});
+
+		it('should allow copying session ID', async () => {
+			const clipboardSpy = vi.fn();
+			document.execCommand = clipboardSpy;
+			const { getByTestId } = renderComponent();
+
+			await userEvent.click(getByTestId('chat-session-id'));
+			const toast = useToast();
+			expect(clipboardSpy).toHaveBeenCalledWith('copy');
+			expect(toast.showMessage).toHaveBeenCalledWith({
+				message: '',
+				title: 'Copied to clipboard',
+				type: 'success',
+			});
+		});
+
+		it('should refresh session with confirmation when messages exist', async () => {
+			const { getByTestId, getByRole } = renderComponent();
+
+			const originalSessionId = getByTestId('chat-session-id').textContent;
+			await userEvent.click(getByTestId('refresh-session-button'));
+
+			const confirmButton = getByRole('dialog').querySelector('button.btn--confirm');
+
+			if (!confirmButton) throw new Error('Confirm button not found');
+			await userEvent.click(confirmButton);
+
+			expect(getByTestId('chat-session-id').textContent).not.toEqual(originalSessionId);
+		});
+	});
+
+	describe('resize functionality', () => {
+		it('should handle panel resizing', async () => {
+			const { container } = renderComponent();
+
+			const resizeWrapper = container.querySelector('.resizeWrapper');
+			if (!resizeWrapper) throw new Error('Resize wrapper not found');
+
+			await userEvent.pointer([
+				{ target: resizeWrapper, coords: { clientX: 0, clientY: 0 } },
+				{ coords: { clientX: 0, clientY: 100 } },
+			]);
+
+			expect(canvasStore.setPanelHeight).toHaveBeenCalled();
+		});
+
+		it('should persist resize dimensions', () => {
+			const mockStorage = {
+				getItem: vi.fn(),
+				setItem: vi.fn(),
+			};
+			Object.defineProperty(window, 'localStorage', { value: mockStorage });
+
+			renderComponent();
+
+			expect(mockStorage.getItem).toHaveBeenCalledWith('N8N_CANVAS_CHAT_HEIGHT');
+			expect(mockStorage.getItem).toHaveBeenCalledWith('N8N_CANVAS_CHAT_WIDTH');
+		});
+	});
+
+	describe('file handling', () => {
+		beforeEach(() => {
+			vi.spyOn(useChatMessaging, 'useChatMessaging').mockReturnValue({
+				getChatMessages: vi.fn().mockReturnValue([]),
+				sendMessage: vi.fn(),
+				extractResponseMessage: vi.fn(),
+				previousMessageIndex: ref(0),
+				isLoading: computed(() => false),
+			});
+
+			workflowsStore.isChatPanelOpen = true;
+			workflowsStore.allowFileUploads = true;
+		});
+
+		it('should enable file uploads when allowed by chat trigger node', async () => {
+			const allowFileUploads = ref(true);
+			const original = useChatTrigger.useChatTrigger;
+			vi.spyOn(useChatTrigger, 'useChatTrigger').mockImplementation((...args) => ({
+				...original(...args),
+				allowFileUploads: computed(() => allowFileUploads.value),
+			}));
+			const { getByTestId } = renderComponent();
+
+			const chatPanel = getByTestId('canvas-chat');
+			expect(chatPanel).toBeInTheDocument();
+
+			const fileInput = getByTestId('chat-attach-file-button');
+			expect(fileInput).toBeInTheDocument();
+
+			allowFileUploads.value = false;
+			await waitFor(() => {
+				expect(fileInput).not.toBeInTheDocument();
+			});
+		});
+	});
+
+	describe('message history handling', () => {
+		it('should properly navigate through message history with wrap-around', async () => {
+			const messages = ['Message 1', 'Message 2', 'Message 3'];
+			workflowsStore.getPastChatMessages = messages;
+
+			const { findByTestId } = renderComponent();
+			const input = await findByTestId('chat-input');
+
+			// First up should show most recent message
+			await userEvent.keyboard('{ArrowUp}');
+			expect(input).toHaveValue('Message 3');
+
+			// Second up should show second most recent
+			await userEvent.keyboard('{ArrowUp}');
+			expect(input).toHaveValue('Message 2');
+
+			// Third up should show oldest message
+			await userEvent.keyboard('{ArrowUp}');
+			expect(input).toHaveValue('Message 1');
+
+			// Fourth up should wrap around to most recent
+			await userEvent.keyboard('{ArrowUp}');
+			expect(input).toHaveValue('Message 3');
+
+			// Down arrow should go in reverse
+			await userEvent.keyboard('{ArrowDown}');
+			expect(input).toHaveValue('Message 1');
+		});
+
+		it('should reset message history navigation on new input', async () => {
+			workflowsStore.getPastChatMessages = ['Message 1', 'Message 2'];
+			const { findByTestId } = renderComponent();
+			const input = await findByTestId('chat-input');
+
+			// Navigate to oldest message
+			await userEvent.keyboard('{ArrowUp}'); // Most recent
+			await userEvent.keyboard('{ArrowUp}'); // Oldest
+			expect(input).toHaveValue('Message 1');
+
+			await userEvent.type(input, 'New message');
+			await userEvent.keyboard('{Enter}');
+
+			await userEvent.keyboard('{ArrowUp}');
+			expect(input).toHaveValue('Message 2');
+		});
+	});
+
+	describe('message reuse and repost', () => {
+		const sendMessageSpy = vi.fn();
+		beforeEach(() => {
+			const mockMessages: ChatMessage[] = [
+				{
+					id: '1',
+					text: 'Original message',
+					sender: 'user',
+					createdAt: new Date().toISOString(),
+				},
+				{
+					id: '2',
+					text: 'AI response',
+					sender: 'bot',
+					createdAt: new Date().toISOString(),
+				},
+			];
+			vi.spyOn(useChatMessaging, 'useChatMessaging').mockReturnValue({
+				getChatMessages: vi.fn().mockReturnValue(mockMessages),
+				sendMessage: sendMessageSpy,
+				extractResponseMessage: vi.fn(),
+				previousMessageIndex: ref(0),
+				isLoading: computed(() => false),
+			});
+			workflowsStore.messages = mockMessages;
+		});
+
+		it('should repost user message with new execution', async () => {
+			const { findByTestId } = renderComponent();
+			const repostButton = await findByTestId('repost-message-button');
+
+			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',
+											}),
+										}),
+									]),
+								]),
+							}),
+						}),
+					]),
+				}),
+			});
+		});
+
+		it('should show message options only for appropriate messages', async () => {
+			const { findByText, container } = renderComponent();
+
+			await findByText('Original message');
+			const userMessage = container.querySelector('.chat-message-from-user');
+			expect(
+				userMessage?.querySelector('[data-test-id="repost-message-button"]'),
+			).toBeInTheDocument();
+			expect(
+				userMessage?.querySelector('[data-test-id="reuse-message-button"]'),
+			).toBeInTheDocument();
+
+			await findByText('AI response');
+			const botMessage = container.querySelector('.chat-message-from-bot');
+			expect(
+				botMessage?.querySelector('[data-test-id="repost-message-button"]'),
+			).not.toBeInTheDocument();
+			expect(
+				botMessage?.querySelector('[data-test-id="reuse-message-button"]'),
+			).not.toBeInTheDocument();
+		});
+	});
+
+	describe('panel state synchronization', () => {
+		it('should update canvas height when chat or logs panel state changes', async () => {
+			renderComponent();
+
+			// Toggle logs panel
+			workflowsStore.isLogsPanelOpen = true;
+			await waitFor(() => {
+				expect(canvasStore.setPanelHeight).toHaveBeenCalled();
+			});
+
+			// Close chat panel
+			workflowsStore.isChatPanelOpen = false;
+			await waitFor(() => {
+				expect(canvasStore.setPanelHeight).toHaveBeenCalledWith(0);
+			});
+		});
+
+		it('should preserve panel state across component remounts', async () => {
+			const { unmount, rerender } = renderComponent();
+
+			// Set initial state
+			workflowsStore.isChatPanelOpen = true;
+			workflowsStore.isLogsPanelOpen = true;
+
+			// Unmount and remount
+			unmount();
+			await rerender({});
+
+			expect(workflowsStore.isChatPanelOpen).toBe(true);
+			expect(workflowsStore.isLogsPanelOpen).toBe(true);
+		});
+	});
+
+	describe('keyboard shortcuts', () => {
+		it('should handle Enter key with modifier to start new line', async () => {
+			const { findByTestId } = renderComponent();
+
+			const input = await findByTestId('chat-input');
+			await userEvent.type(input, 'Line 1');
+			await userEvent.keyboard('{Shift>}{Enter}{/Shift}');
+			await userEvent.type(input, 'Line 2');
+
+			expect(input).toHaveValue('Line 1\nLine 2');
+		});
+	});
+
+	describe('chat synchronization', () => {
+		it('should load initial chat history when first opening panel', async () => {
+			const getChatMessagesSpy = vi.fn().mockReturnValue(['Previous message']);
+			vi.spyOn(useChatMessaging, 'useChatMessaging').mockReturnValue({
+				...vi.fn()(),
+				getChatMessages: getChatMessagesSpy,
+			});
+
+			workflowsStore.isChatPanelOpen = false;
+			const { rerender } = renderComponent();
+
+			workflowsStore.isChatPanelOpen = true;
+			await rerender({});
+
+			expect(getChatMessagesSpy).toHaveBeenCalled();
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue b/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
new file mode 100644
index 0000000000..adfbc8cdd4
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/CanvasChat.vue
@@ -0,0 +1,387 @@
+<script setup lang="ts">
+import type { Ref } from 'vue';
+import { provide, watch, computed, ref, watchEffect } from 'vue';
+import { ChatOptionsSymbol, ChatSymbol } from '@n8n/chat/constants';
+import type { Router } from 'vue-router';
+import { useRouter } from 'vue-router';
+import { chatEventBus } from '@n8n/chat/event-buses';
+import { VIEWS } from '@/constants';
+import { v4 as uuid } from 'uuid';
+
+// Components
+import ChatMessagesPanel from './components/ChatMessagesPanel.vue';
+import ChatLogsPanel from './components/ChatLogsPanel.vue';
+
+// Composables
+import { useChatTrigger } from './composables/useChatTrigger';
+import { useChatMessaging } from './composables/useChatMessaging';
+import { useResize } from './composables/useResize';
+import { useI18n } from '@/composables/useI18n';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useRunWorkflow } from '@/composables/useRunWorkflow';
+
+// Types
+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 { useWorkflowsStore } from '@/stores/workflows.store';
+
+const workflowsStore = useWorkflowsStore();
+const canvasStore = useCanvasStore();
+const nodeTypesStore = useNodeTypesStore();
+const nodeHelpers = useNodeHelpers();
+const router = useRouter();
+
+// Component state
+const messages = ref<ChatMessage[]>([]);
+const currentSessionId = ref<string>(uuid().replace(/-/g, ''));
+const isDisabled = ref(false);
+const container = ref<HTMLElement>();
+
+// Computed properties
+const workflow = computed(() => workflowsStore.getCurrentWorkflow());
+
+const allConnections = computed(() => workflowsStore.allConnections);
+const isChatOpen = computed(() => {
+	const result = workflowsStore.isChatPanelOpen;
+	return result;
+});
+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,
+});
+
+const { runWorkflow } = useRunWorkflow({ router });
+
+// Initialize features with injected dependencies
+const {
+	chatTriggerNode,
+	connectedNode,
+	allowFileUploads,
+	allowedFilesMimeTypes,
+	setChatTriggerNode,
+	setConnectedNode,
+} = useChatTrigger({
+	workflow,
+	canvasNodes,
+	getNodeByName: workflowsStore.getNodeByName,
+	getNodeType: nodeTypesStore.getNodeType,
+});
+
+const { sendMessage, getChatMessages, isLoading } = useChatMessaging({
+	chatTrigger: chatTriggerNode,
+	connectedNode,
+	messages,
+	sessionId: currentSessionId,
+	workflow,
+	executionResultData: computed(() => workflowsStore.getWorkflowExecution?.data?.resultData),
+	getWorkflowResultDataByNodeName: workflowsStore.getWorkflowResultDataByNodeName,
+	onRunChatWorkflow,
+});
+
+const {
+	height,
+	chatWidth,
+	rootStyles,
+	logsWidth,
+	onResizeDebounced,
+	onResizeChatDebounced,
+	onWindowResize,
+} = useResize(container);
+
+// Extracted pure functions for better testability
+function createChatConfig(params: {
+	messages: Chat['messages'];
+	sendMessage: Chat['sendMessage'];
+	currentSessionId: Chat['currentSessionId'];
+	isLoading: Ref<boolean>;
+	isDisabled: Ref<boolean>;
+	allowFileUploads: Ref<boolean>;
+	locale: ReturnType<typeof useI18n>;
+}): { chatConfig: Chat; chatOptions: ChatOptions } {
+	const chatConfig: Chat = {
+		messages: params.messages,
+		sendMessage: params.sendMessage,
+		initialMessages: ref([]),
+		currentSessionId: params.currentSessionId,
+		waitingForResponse: params.isLoading,
+	};
+
+	const chatOptions: ChatOptions = {
+		i18n: {
+			en: {
+				title: '',
+				footer: '',
+				subtitle: '',
+				inputPlaceholder: params.locale.baseText('chat.window.chat.placeholder'),
+				getStarted: '',
+				closeButtonTooltip: '',
+			},
+		},
+		webhookUrl: '',
+		mode: 'window',
+		showWindowCloseButton: true,
+		disabled: params.isDisabled,
+		allowFileUploads: params.allowFileUploads,
+		allowedFilesMimeTypes,
+	};
+
+	return { chatConfig, chatOptions };
+}
+
+function displayExecution(params: { router: Router; workflowId: string; executionId: string }) {
+	const route = params.router.resolve({
+		name: VIEWS.EXECUTION_PREVIEW,
+		params: { name: params.workflowId, executionId: params.executionId },
+	});
+	window.open(route.href, '_blank');
+}
+
+function refreshSession(params: { messages: Ref<ChatMessage[]>; currentSessionId: Ref<string> }) {
+	workflowsStore.setWorkflowExecutionData(null);
+	nodeHelpers.updateNodesExecutionIssues();
+	params.messages.value = [];
+	params.currentSessionId.value = uuid().replace(/-/g, '');
+}
+
+// Event handlers
+const handleDisplayExecution = (executionId: string) => {
+	displayExecution({
+		router,
+		workflowId: workflow.value.id,
+		executionId,
+	});
+};
+
+const handleRefreshSession = () => {
+	refreshSession({
+		messages,
+		currentSessionId,
+	});
+};
+
+const closePanel = () => {
+	workflowsStore.setPanelOpen('chat', false);
+};
+
+// 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;
+	});
+
+	// 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
+const { chatConfig, chatOptions } = createChatConfig({
+	messages,
+	sendMessage,
+	currentSessionId,
+	isLoading,
+	isDisabled,
+	allowFileUploads,
+	locale: useI18n(),
+});
+
+// Provide chat context
+provide(ChatSymbol, chatConfig);
+provide(ChatOptionsSymbol, chatOptions);
+
+// Watchers
+watch(
+	() => isChatOpen.value,
+	(isOpen) => {
+		if (isOpen) {
+			setChatTriggerNode();
+			setConnectedNode();
+
+			if (messages.value.length === 0) {
+				messages.value = getChatMessages();
+			}
+
+			setTimeout(() => {
+				onWindowResize();
+				chatEventBus.emit('focusInput');
+			}, 0);
+		}
+	},
+	{ immediate: true },
+);
+
+watch(
+	() => allConnections.value,
+	() => {
+		if (canvasStore.isLoading) return;
+		setTimeout(() => {
+			if (!chatTriggerNode.value) {
+				setChatTriggerNode();
+			}
+			setConnectedNode();
+		}, 0);
+	},
+	{ deep: true },
+);
+
+watchEffect(() => {
+	canvasStore.setPanelHeight(isChatOpen.value || isLogsOpen.value ? height.value : 0);
+});
+</script>
+
+<template>
+	<N8nResizeWrapper
+		v-if="chatTriggerNode"
+		:is-resizing-enabled="isChatOpen || isLogsOpen"
+		:supported-directions="['top']"
+		:class="[$style.resizeWrapper, !isChatOpen && !isLogsOpen && $style.empty]"
+		:height="height"
+		:style="rootStyles"
+		@resize="onResizeDebounced"
+	>
+		<div ref="container" :class="[$style.container, 'ignore-key-press-canvas']" tabindex="0">
+			<div v-if="isChatOpen || isLogsOpen" :class="$style.chatResizer">
+				<n8n-resize-wrapper
+					v-if="isChatOpen"
+					:supported-directions="['right']"
+					:width="chatWidth"
+					:class="$style.chat"
+					@resize="onResizeChatDebounced"
+				>
+					<div :class="$style.inner">
+						<ChatMessagesPanel
+							data-test-id="canvas-chat"
+							:messages="messages"
+							:session-id="currentSessionId"
+							:past-chat-messages="previousChatMessages"
+							:show-close-button="!connectedNode"
+							@close="closePanel"
+							@refresh-session="handleRefreshSession"
+							@display-execution="handleDisplayExecution"
+							@send-message="sendMessage"
+						/>
+					</div>
+				</n8n-resize-wrapper>
+				<div v-if="isLogsOpen && connectedNode" :class="$style.logs">
+					<ChatLogsPanel
+						:key="`${resultData?.length ?? messages?.length}`"
+						:workflow="workflow"
+						data-test-id="canvas-chat-logs"
+						:node="connectedNode"
+						:slim="logsWidth < 700"
+						@close="closePanel"
+					/>
+				</div>
+			</div>
+		</div>
+	</N8nResizeWrapper>
+</template>
+
+<style lang="scss" module>
+.resizeWrapper {
+	height: var(--panel-height);
+	min-height: 4rem;
+	max-height: 90vh;
+	flex-basis: content;
+	border-top: 1px solid var(--color-foreground-base);
+
+	&.empty {
+		height: auto;
+		min-height: 0;
+		flex-basis: 0;
+	}
+}
+
+.container {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+}
+
+.chatResizer {
+	display: flex;
+	width: 100%;
+	height: 100%;
+	max-width: 100%;
+}
+
+.footer {
+	border-top: 1px solid var(--color-foreground-base);
+	width: 100%;
+	background-color: var(--color-background-light);
+	display: flex;
+	padding: var(--spacing-2xs);
+	gap: var(--spacing-2xs);
+}
+
+.chat {
+	width: var(--chat-width);
+	flex-shrink: 0;
+	border-right: 1px solid var(--color-foreground-base);
+	max-width: 100%;
+
+	&:only-child {
+		width: 100%;
+	}
+}
+
+.inner {
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+	height: 100%;
+	width: 100%;
+}
+
+.logs {
+	flex-grow: 1;
+	flex-shrink: 1;
+	background-color: var(--color-background-light);
+}
+</style>
diff --git a/packages/editor-ui/src/components/CanvasChat/components/ChatLogsPanel.vue b/packages/editor-ui/src/components/CanvasChat/components/ChatLogsPanel.vue
new file mode 100644
index 0000000000..856f06711a
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/components/ChatLogsPanel.vue
@@ -0,0 +1,91 @@
+<script setup lang="ts">
+import type { INode, Workflow } from 'n8n-workflow';
+import RunDataAi from '@/components/RunDataAi/RunDataAi.vue';
+import { useI18n } from '@/composables/useI18n';
+
+const emit = defineEmits<{
+	close: [];
+}>();
+
+defineProps<{
+	node: INode | null;
+	slim?: boolean;
+	workflow: Workflow;
+}>();
+
+const locale = useI18n();
+</script>
+
+<template>
+	<div :class="$style.logsWrapper" data-test-id="lm-chat-logs">
+		<header :class="$style.logsHeader">
+			<div class="meta">
+				{{ locale.baseText('chat.window.logs') }}
+				<span v-if="node">
+					{{
+						locale.baseText('chat.window.logsFromNode', { interpolate: { nodeName: node.name } })
+					}}
+				</span>
+			</div>
+			<n8n-icon-button
+				:class="$style.close"
+				outline
+				icon="times"
+				type="secondary"
+				size="mini"
+				@click="emit('close')"
+			/>
+		</header>
+		<div :class="$style.logs">
+			<RunDataAi
+				v-if="node"
+				:class="$style.runData"
+				:node="node"
+				:workflow="workflow"
+				:slim="slim"
+			/>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.logsHeader {
+	font-size: var(--font-size-s);
+	font-weight: var(--font-weight-bold);
+	height: 2.6875rem;
+	line-height: 18px;
+	text-align: left;
+	border-bottom: 1px solid var(--color-foreground-base);
+	padding: var(--spacing-xs);
+	background-color: var(--color-foreground-xlight);
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+
+	.close {
+		border: none;
+	}
+
+	span {
+		font-weight: 100;
+	}
+}
+.logsWrapper {
+	--node-icon-color: var(--color-text-base);
+
+	height: 100%;
+	overflow: hidden;
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+}
+
+.logsTitle {
+	margin: 0 var(--spacing-s) var(--spacing-s);
+}
+.logs {
+	padding: var(--spacing-s) 0;
+	flex-grow: 1;
+	overflow: auto;
+}
+</style>
diff --git a/packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue b/packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue
new file mode 100644
index 0000000000..99b0bb2939
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/components/ChatMessagesPanel.vue
@@ -0,0 +1,357 @@
+<script setup lang="ts">
+import type { ChatMessage, ChatMessageText } from '@n8n/chat/types';
+import { useI18n } from '@/composables/useI18n';
+import MessagesList from '@n8n/chat/components/MessagesList.vue';
+import MessageOptionTooltip from './MessageOptionTooltip.vue';
+import MessageOptionAction from './MessageOptionAction.vue';
+import { chatEventBus } from '@n8n/chat/event-buses';
+import type { ArrowKeyDownPayload } from '@n8n/chat/components/Input.vue';
+import ChatInput from '@n8n/chat/components/Input.vue';
+import { useMessage } from '@/composables/useMessage';
+import { MODAL_CONFIRM } from '@/constants';
+import { computed, ref } from 'vue';
+import { useClipboard } from '@/composables/useClipboard';
+import { useToast } from '@/composables/useToast';
+
+interface Props {
+	pastChatMessages: string[];
+	messages: ChatMessage[];
+	sessionId: string;
+	showCloseButton?: boolean;
+}
+
+const props = defineProps<Props>();
+
+const emit = defineEmits<{
+	displayExecution: [id: string];
+	sendMessage: [message: string];
+	refreshSession: [];
+	close: [];
+}>();
+
+const messageComposable = useMessage();
+const clipboard = useClipboard();
+const locale = useI18n();
+const toast = useToast();
+
+const previousMessageIndex = ref(0);
+
+const inputPlaceholder = computed(() => {
+	if (props.messages.length > 0) {
+		return locale.baseText('chat.window.chat.placeholder');
+	}
+	return locale.baseText('chat.window.chat.placeholderPristine');
+});
+/** Checks if message is a text message */
+function isTextMessage(message: ChatMessage): message is ChatMessageText {
+	return message.type === 'text' || !message.type;
+}
+
+/** Reposts the message */
+function repostMessage(message: ChatMessageText) {
+	void sendMessage(message.text);
+}
+
+/** Sets the message in input for reuse */
+function reuseMessage(message: ChatMessageText) {
+	chatEventBus.emit('setInputValue', message.text);
+}
+
+function sendMessage(message: string) {
+	previousMessageIndex.value = 0;
+	emit('sendMessage', message);
+}
+
+async function onRefreshSession() {
+	// If there are no messages, refresh the session without asking
+	if (props.messages.length === 0) {
+		emit('refreshSession');
+		return;
+	}
+
+	const confirmResult = await messageComposable.confirm(
+		locale.baseText('chat.window.session.reset.warning'),
+		{
+			title: locale.baseText('chat.window.session.reset.title'),
+			type: 'warning',
+			confirmButtonText: locale.baseText('chat.window.session.reset.confirm'),
+			showClose: true,
+		},
+	);
+	if (confirmResult === MODAL_CONFIRM) {
+		emit('refreshSession');
+	}
+}
+
+function onArrowKeyDown({ currentInputValue, key }: ArrowKeyDownPayload) {
+	const pastMessages = props.pastChatMessages;
+	const isCurrentInputEmptyOrMatch =
+		currentInputValue.length === 0 || pastMessages.includes(currentInputValue);
+
+	if (isCurrentInputEmptyOrMatch && (key === 'ArrowUp' || key === 'ArrowDown')) {
+		// Exit if no messages
+		if (pastMessages.length === 0) return;
+
+		// Temporarily blur to avoid cursor position issues
+		chatEventBus.emit('blurInput');
+
+		if (pastMessages.length === 1) {
+			previousMessageIndex.value = 0;
+		} else {
+			if (key === 'ArrowUp') {
+				if (currentInputValue.length === 0 && previousMessageIndex.value === 0) {
+					// Start with most recent message
+					previousMessageIndex.value = pastMessages.length - 1;
+				} else {
+					// Move backwards through history
+					previousMessageIndex.value =
+						previousMessageIndex.value === 0
+							? pastMessages.length - 1
+							: previousMessageIndex.value - 1;
+				}
+			} else if (key === 'ArrowDown') {
+				// Move forwards through history
+				previousMessageIndex.value =
+					previousMessageIndex.value === pastMessages.length - 1
+						? 0
+						: previousMessageIndex.value + 1;
+			}
+		}
+
+		// Get message at current index
+		const selectedMessage = pastMessages[previousMessageIndex.value];
+		chatEventBus.emit('setInputValue', selectedMessage);
+
+		// Refocus and move cursor to end
+		chatEventBus.emit('focusInput');
+	}
+
+	// Reset history navigation when typing new content that doesn't match history
+	if (!isCurrentInputEmptyOrMatch) {
+		previousMessageIndex.value = 0;
+	}
+}
+function copySessionId() {
+	void clipboard.copy(props.sessionId);
+	toast.showMessage({
+		title: locale.baseText('generic.copiedToClipboard'),
+		message: '',
+		type: 'success',
+	});
+}
+</script>
+
+<template>
+	<div :class="$style.chat" data-test-id="workflow-lm-chat-dialog">
+		<header :class="$style.chatHeader">
+			<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">
+					<template #content>
+						{{ sessionId }}
+					</template>
+					<span :class="$style.sessionId" data-test-id="chat-session-id" @click="copySessionId">{{
+						sessionId
+					}}</span>
+				</n8n-tooltip>
+				<n8n-icon-button
+					:class="$style.headerButton"
+					data-test-id="refresh-session-button"
+					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">
+			<MessagesList :messages="messages" :class="$style.messages">
+				<template #beforeMessage="{ message }">
+					<MessageOptionTooltip
+						v-if="message.sender === 'bot' && !message.id.includes('preload')"
+						placement="right"
+						data-test-id="execution-id-tooltip"
+					>
+						{{ locale.baseText('chat.window.chat.chatMessageOptions.executionId') }}:
+						<a href="#" @click="emit('displayExecution', message.id)">{{ message.id }}</a>
+					</MessageOptionTooltip>
+
+					<MessageOptionAction
+						v-if="isTextMessage(message) && message.sender === 'user'"
+						data-test-id="repost-message-button"
+						icon="redo"
+						:label="locale.baseText('chat.window.chat.chatMessageOptions.repostMessage')"
+						placement="left"
+						@click.once="repostMessage(message)"
+					/>
+
+					<MessageOptionAction
+						v-if="isTextMessage(message) && message.sender === 'user'"
+						data-test-id="reuse-message-button"
+						icon="copy"
+						:label="locale.baseText('chat.window.chat.chatMessageOptions.reuseMessage')"
+						placement="left"
+						@click="reuseMessage(message)"
+					/>
+				</template>
+			</MessagesList>
+		</main>
+
+		<div :class="$style.messagesInput">
+			<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>
+
+<style lang="scss" module>
+.chat {
+	--chat--spacing: var(--spacing-xs);
+	--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.3);
+	--chat--message--pre--background: var(--color-foreground-light);
+	--chat--textarea--height: 2.5rem;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	overflow: hidden;
+	background-color: var(--color-background-light);
+}
+.chatHeader {
+	font-size: var(--font-size-s);
+	font-weight: 400;
+	line-height: 18px;
+	text-align: left;
+	border-bottom: 1px solid var(--color-foreground-base);
+	padding: var(--chat--spacing);
+	background-color: var(--color-foreground-xlight);
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.chatTitle {
+	font-weight: 600;
+}
+.session {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-2xs);
+	color: var(--color-text-base);
+	max-width: 70%;
+}
+.sessionId {
+	display: inline-block;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+
+	cursor: pointer;
+}
+.headerButton {
+	max-height: 1.1rem;
+	border: none;
+}
+.chatBody {
+	display: flex;
+	height: 100%;
+	overflow: auto;
+}
+
+.messages {
+	border-radius: var(--border-radius-base);
+	height: 100%;
+	width: 100%;
+	overflow: auto;
+	padding-top: 1.5em;
+
+	&:not(:last-child) {
+		margin-right: 1em;
+	}
+}
+
+.messagesInput {
+	--input-border-color: var(--border-color-base);
+	--chat--input--border: none;
+
+	--chat--input--border-radius: 0.5rem;
+	--chat--input--send--button--background: transparent;
+	--chat--input--send--button--color: var(--color-primary);
+	--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);
+	--chat--input--background: transparent;
+	--chat--input--file--button--color: var(--color-button-secondary-font);
+	--chat--input--file--button--color-hover: var(--color-primary);
+
+	[data-theme='dark'] & {
+		--chat--input--text-color: var(--input-font-color, var(--color-text-dark));
+	}
+	@media (prefers-color-scheme: dark) {
+		--chat--input--text-color: var(--input-font-color, var(--color-text-dark));
+	}
+
+	padding: var(--spacing-5xs);
+	margin: 0 var(--chat--spacing) var(--chat--spacing);
+	flex-grow: 1;
+	display: flex;
+	background: var(--color-lm-chat-bot-background);
+	border-radius: var(--chat--input--border-radius);
+	transition: border-color 200ms ease-in-out;
+	border: var(--input-border-color, var(--border-color-base))
+		var(--input-border-style, var(--border-style-base))
+		var(--input-border-width, var(--border-width-base));
+
+	&:focus-within {
+		--input-border-color: #4538a3;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/CanvasChat/components/MessageOptionAction.vue b/packages/editor-ui/src/components/CanvasChat/components/MessageOptionAction.vue
new file mode 100644
index 0000000000..bc5a649a5f
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/components/MessageOptionAction.vue
@@ -0,0 +1,46 @@
+<script setup lang="ts">
+import type { PropType } from 'vue';
+
+defineProps({
+	label: {
+		type: String,
+		required: true,
+	},
+	icon: {
+		type: String,
+		required: true,
+	},
+	placement: {
+		type: String as PropType<'left' | 'right' | 'top' | 'bottom'>,
+		default: 'top',
+	},
+});
+</script>
+
+<template>
+	<div :class="$style.container">
+		<n8n-tooltip :placement="placement">
+			<template #content>
+				{{ label }}
+			</template>
+			<n8n-icon :class="$style.icon" :icon="icon" size="xsmall" @click="$attrs.onClick" />
+		</n8n-tooltip>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: inline-flex;
+	align-items: center;
+	margin: 0 var(--spacing-4xs);
+}
+
+.icon {
+	color: var(--color-foreground-dark);
+	cursor: pointer;
+
+	&:hover {
+		color: var(--color-primary);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/CanvasChat/components/MessageOptionTooltip.vue b/packages/editor-ui/src/components/CanvasChat/components/MessageOptionTooltip.vue
new file mode 100644
index 0000000000..5a346fd929
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/components/MessageOptionTooltip.vue
@@ -0,0 +1,40 @@
+<script setup lang="ts">
+import type { PropType } from 'vue';
+
+defineProps({
+	placement: {
+		type: String as PropType<'left' | 'right' | 'top' | 'bottom'>,
+		default: 'top',
+	},
+});
+</script>
+
+<template>
+	<div :class="$style.container">
+		<n8n-tooltip :placement="placement">
+			<template #content>
+				<slot />
+			</template>
+			<span :class="$style.icon">
+				<n8n-icon icon="info" size="xsmall" />
+			</span>
+		</n8n-tooltip>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: inline-flex;
+	align-items: center;
+	margin: 0 var(--spacing-4xs);
+}
+
+.icon {
+	color: var(--color-foreground-dark);
+	cursor: help;
+
+	&:hover {
+		color: var(--color-primary);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts b/packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts
new file mode 100644
index 0000000000..e30d4e4adb
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/composables/useChatMessaging.ts
@@ -0,0 +1,286 @@
+import type { ComputedRef, 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';
+import type {
+	ITaskData,
+	INodeExecutionData,
+	IBinaryKeyData,
+	IDataObject,
+	IBinaryData,
+	BinaryFileType,
+	Workflow,
+	IRunExecutionData,
+} from 'n8n-workflow';
+import { useToast } from '@/composables/useToast';
+import { useMessage } from '@/composables/useMessage';
+import { usePinnedData } from '@/composables/usePinnedData';
+import { get, isEmpty, last } from 'lodash-es';
+import { MANUAL_CHAT_TRIGGER_NODE_TYPE, MODAL_CONFIRM } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+import type { MemoryOutput } from '../types/chat';
+import type { IExecutionPushResponse, INodeUi } from '@/Interface';
+
+export type RunWorkflowChatPayload = {
+	triggerNode: string;
+	nodeData: ITaskData;
+	source: string;
+	message: string;
+};
+export interface ChatMessagingDependencies {
+	chatTrigger: Ref<INodeUi | null>;
+	connectedNode: Ref<INodeUi | null>;
+	messages: Ref<ChatMessage[]>;
+	sessionId: Ref<string>;
+	workflow: ComputedRef<Workflow>;
+	executionResultData: ComputedRef<IRunExecutionData['resultData'] | undefined>;
+	getWorkflowResultDataByNodeName: (nodeName: string) => ITaskData[] | null;
+	onRunChatWorkflow: (
+		payload: RunWorkflowChatPayload,
+	) => Promise<IExecutionPushResponse | undefined>;
+}
+
+export function useChatMessaging({
+	chatTrigger,
+	connectedNode,
+	messages,
+	sessionId,
+	workflow,
+	executionResultData,
+	getWorkflowResultDataByNodeName,
+	onRunChatWorkflow,
+}: ChatMessagingDependencies) {
+	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> {
+		const reader = new FileReader();
+		return await new Promise((resolve, reject) => {
+			reader.onload = () => {
+				const binaryData: IBinaryData = {
+					data: (reader.result as string).split('base64,')?.[1] ?? '',
+					mimeType: file.type,
+					fileName: file.name,
+					fileSize: `${file.size} bytes`,
+					fileExtension: file.name.split('.').pop() ?? '',
+					fileType: file.type.split('/')[0] as BinaryFileType,
+				};
+				resolve(binaryData);
+			};
+			reader.onerror = () => {
+				reject(new Error('Failed to convert file to binary data'));
+			};
+			reader.readAsDataURL(file);
+		});
+	}
+
+	/** Gets keyed files for the workflow input */
+	async function getKeyedFiles(files: File[]): Promise<IBinaryKeyData> {
+		const binaryData: IBinaryKeyData = {};
+
+		await Promise.all(
+			files.map(async (file, index) => {
+				const data = await convertFileToBinaryData(file);
+				const key = `data${index}`;
+
+				binaryData[key] = data;
+			}),
+		);
+
+		return binaryData;
+	}
+
+	/** Extracts file metadata */
+	function extractFileMeta(file: File): IDataObject {
+		return {
+			fileName: file.name,
+			fileSize: `${file.size} bytes`,
+			fileExtension: file.name.split('.').pop() ?? '',
+			fileType: file.type.split('/')[0],
+			mimeType: file.type,
+		};
+	}
+
+	/** Starts workflow execution with the message */
+	async function startWorkflowWithMessage(message: string, files?: File[]): Promise<void> {
+		const triggerNode = chatTrigger.value;
+
+		if (!triggerNode) {
+			showError(new Error('Chat Trigger Node could not be found!'), 'Trigger Node not found');
+			return;
+		}
+
+		let inputKey = 'chatInput';
+		if (triggerNode.type === MANUAL_CHAT_TRIGGER_NODE_TYPE && triggerNode.typeVersion < 1.1) {
+			inputKey = 'input';
+		}
+		if (triggerNode.type === CHAT_TRIGGER_NODE_TYPE) {
+			inputKey = 'chatInput';
+		}
+
+		const inputPayload: INodeExecutionData = {
+			json: {
+				sessionId: sessionId.value,
+				action: 'sendMessage',
+				[inputKey]: message,
+			},
+		};
+
+		if (files && files.length > 0) {
+			const filesMeta = files.map((file) => extractFileMeta(file));
+			const binaryData = await getKeyedFiles(files);
+
+			inputPayload.json.files = filesMeta;
+			inputPayload.binary = binaryData;
+		}
+		const nodeData: ITaskData = {
+			startTime: new Date().getTime(),
+			executionTime: 0,
+			executionStatus: 'success',
+			data: {
+				main: [[inputPayload]],
+			},
+			source: [null],
+		};
+		isLoading.value = true;
+		const response = await onRunChatWorkflow({
+			triggerNode: triggerNode.name,
+			nodeData,
+			source: 'RunData.ManualChatMessage',
+			message,
+		});
+		isLoading.value = false;
+		if (!response?.executionId) {
+			return;
+		}
+
+		processExecutionResultData(response.executionId);
+	}
+
+	function processExecutionResultData(executionId: string) {
+		const lastNodeExecuted = executionResultData.value?.lastNodeExecuted;
+
+		if (!lastNodeExecuted) return;
+
+		const nodeResponseDataArray = get(executionResultData.value.runData, lastNodeExecuted) ?? [];
+
+		const nodeResponseData = nodeResponseDataArray[nodeResponseDataArray.length - 1];
+
+		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);
+		}
+		isLoading.value = false;
+		messages.value.push({
+			text: responseMessage,
+			sender: 'bot',
+			createdAt: new Date().toISOString(),
+			id: executionId ?? uuid(),
+		});
+	}
+
+	/** Extracts response message from workflow output */
+	function extractResponseMessage(responseData?: IDataObject) {
+		if (!responseData || isEmpty(responseData)) {
+			return locale.baseText('chat.window.chat.response.empty');
+		}
+
+		// Paths where the response message might be located
+		const paths = ['output', 'text', 'response.text'];
+		const matchedPath = paths.find((path) => get(responseData, path));
+
+		if (!matchedPath) return JSON.stringify(responseData, null, 2);
+
+		const matchedOutput = get(responseData, matchedPath);
+		if (typeof matchedOutput === 'object') {
+			return '```json\n' + JSON.stringify(matchedOutput, null, 2) + '\n```';
+		}
+
+		return matchedOutput?.toString() ?? '';
+	}
+
+	/** Sends a message to the chat */
+	async function sendMessage(message: string, files?: File[]) {
+		previousMessageIndex.value = 0;
+		if (message.trim() === '' && (!files || files.length === 0)) {
+			showError(
+				new Error(locale.baseText('chat.window.chat.provideMessage')),
+				locale.baseText('chat.window.chat.emptyChatMessage'),
+			);
+			return;
+		}
+
+		const pinnedChatData = usePinnedData(chatTrigger.value);
+		if (pinnedChatData.hasData.value) {
+			const confirmResult = await useMessage().confirm(
+				locale.baseText('chat.window.chat.unpinAndExecute.description'),
+				locale.baseText('chat.window.chat.unpinAndExecute.title'),
+				{
+					confirmButtonText: locale.baseText('chat.window.chat.unpinAndExecute.confirm'),
+					cancelButtonText: locale.baseText('chat.window.chat.unpinAndExecute.cancel'),
+				},
+			);
+
+			if (!(confirmResult === MODAL_CONFIRM)) return;
+
+			pinnedChatData.unsetData('unpin-and-send-chat-message-modal');
+		}
+
+		const newMessage: ChatMessage & { sessionId: string } = {
+			text: message,
+			sender: 'user',
+			createdAt: new Date().toISOString(),
+			sessionId: sessionId.value,
+			id: uuid(),
+			files,
+		};
+		messages.value.push(newMessage);
+
+		await startWorkflowWithMessage(newMessage.text, files);
+	}
+
+	function getChatMessages(): ChatMessageText[] {
+		if (!connectedNode.value) return [];
+
+		const connectedMemoryInputs =
+			workflow.value.connectionsByDestinationNode?.[connectedNode.value.name]?.[
+				NodeConnectionType.AiMemory
+			];
+		if (!connectedMemoryInputs) return [];
+
+		const memoryConnection = (connectedMemoryInputs ?? []).find((i) => (i ?? []).length > 0)?.[0];
+
+		if (!memoryConnection) return [];
+
+		const nodeResultData = getWorkflowResultDataByNodeName(memoryConnection.node);
+
+		const memoryOutputData = (nodeResultData ?? [])
+			.map((data) => get(data, ['data', NodeConnectionType.AiMemory, 0, 0, 'json']) as MemoryOutput)
+			.find((data) => data && data.action === 'saveContext');
+
+		return (memoryOutputData?.chatHistory ?? []).map((message, index) => {
+			return {
+				createdAt: new Date().toISOString(),
+				text: message.kwargs.content,
+				id: `preload__${index}`,
+				sender: last(message.id) === 'HumanMessage' ? 'user' : 'bot',
+			};
+		});
+	}
+
+	return {
+		previousMessageIndex,
+		isLoading: computed(() => isLoading.value),
+		sendMessage,
+		extractResponseMessage,
+		getChatMessages,
+	};
+}
diff --git a/packages/editor-ui/src/components/CanvasChat/composables/useChatTrigger.ts b/packages/editor-ui/src/components/CanvasChat/composables/useChatTrigger.ts
new file mode 100644
index 0000000000..7d0cff0d8d
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/composables/useChatTrigger.ts
@@ -0,0 +1,138 @@
+import type { ComputedRef, MaybeRef } from 'vue';
+import { ref, computed, unref } from 'vue';
+import {
+	CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE,
+	NodeConnectionType,
+	NodeHelpers,
+} from 'n8n-workflow';
+import type { INodeTypeDescription, Workflow, INode, INodeParameters } from 'n8n-workflow';
+import {
+	AI_CATEGORY_AGENTS,
+	AI_CATEGORY_CHAINS,
+	AI_CODE_NODE_TYPE,
+	AI_SUBCATEGORY,
+	CHAT_TRIGGER_NODE_TYPE,
+	MANUAL_CHAT_TRIGGER_NODE_TYPE,
+} from '@/constants';
+import type { INodeUi } from '@/Interface';
+
+export interface ChatTriggerDependencies {
+	getNodeByName: (name: string) => INodeUi | null;
+	getNodeType: (type: string, version: number) => INodeTypeDescription | null;
+	canvasNodes: MaybeRef<INodeUi[]>;
+	workflow: ComputedRef<Workflow>;
+}
+
+export function useChatTrigger({
+	getNodeByName,
+	getNodeType,
+	canvasNodes,
+	workflow,
+}: ChatTriggerDependencies) {
+	const chatTriggerName = ref<string | null>(null);
+	const connectedNode = ref<INode | null>(null);
+
+	const chatTriggerNode = computed(() =>
+		chatTriggerName.value ? getNodeByName(chatTriggerName.value) : null,
+	);
+
+	const allowFileUploads = computed(() => {
+		return (
+			(chatTriggerNode.value?.parameters?.options as INodeParameters)?.allowFileUploads === true
+		);
+	});
+
+	const allowedFilesMimeTypes = computed(() => {
+		return (
+			(
+				chatTriggerNode.value?.parameters?.options as INodeParameters
+			)?.allowedFilesMimeTypes?.toString() ?? ''
+		);
+	});
+
+	/** Gets the chat trigger node from the workflow */
+	function setChatTriggerNode() {
+		const triggerNode = unref(canvasNodes).find((node) =>
+			[CHAT_TRIGGER_NODE_TYPE, MANUAL_CHAT_TRIGGER_NODE_TYPE].includes(node.type),
+		);
+
+		if (!triggerNode) {
+			return;
+		}
+		chatTriggerName.value = triggerNode.name;
+	}
+
+	/** Sets the connected node after finding the trigger */
+	function setConnectedNode() {
+		const triggerNode = chatTriggerNode.value;
+
+		if (!triggerNode) {
+			return;
+		}
+
+		const chatChildren = workflow.value.getChildNodes(triggerNode.name);
+
+		const chatRootNode = chatChildren
+			.reverse()
+			.map((nodeName: string) => getNodeByName(nodeName))
+			.filter((n): n is INodeUi => n !== null)
+			// Reverse the nodes to match the last node logs first
+			.reverse()
+			.find((storeNode: INodeUi): boolean => {
+				// Skip summarization nodes
+				if (storeNode.type === CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE) return false;
+				const nodeType = getNodeType(storeNode.type, storeNode.typeVersion);
+
+				if (!nodeType) return false;
+
+				// Check if node is an AI agent or chain based on its metadata
+				const isAgent =
+					nodeType.codex?.subcategories?.[AI_SUBCATEGORY]?.includes(AI_CATEGORY_AGENTS);
+				const isChain =
+					nodeType.codex?.subcategories?.[AI_SUBCATEGORY]?.includes(AI_CATEGORY_CHAINS);
+
+				// Handle custom AI Langchain Code nodes that could act as chains or agents
+				let isCustomChainOrAgent = false;
+				if (nodeType.name === AI_CODE_NODE_TYPE) {
+					// Get node connection types for inputs and outputs
+					const inputs = NodeHelpers.getNodeInputs(workflow.value, storeNode, nodeType);
+					const inputTypes = NodeHelpers.getConnectionTypes(inputs);
+
+					const outputs = NodeHelpers.getNodeOutputs(workflow.value, storeNode, nodeType);
+					const outputTypes = NodeHelpers.getConnectionTypes(outputs);
+
+					// Validate if node has required AI connection types
+					if (
+						inputTypes.includes(NodeConnectionType.AiLanguageModel) &&
+						inputTypes.includes(NodeConnectionType.Main) &&
+						outputTypes.includes(NodeConnectionType.Main)
+					) {
+						isCustomChainOrAgent = true;
+					}
+				}
+
+				// Skip if node is not an AI component
+				if (!isAgent && !isChain && !isCustomChainOrAgent) return false;
+
+				// Check if this node is connected to the trigger node
+				const parentNodes = workflow.value.getParentNodes(storeNode.name);
+				const isChatChild = parentNodes.some(
+					(parentNodeName) => parentNodeName === triggerNode.name,
+				);
+
+				// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+				const result = Boolean(isChatChild && (isAgent || isChain || isCustomChainOrAgent));
+				return result;
+			});
+		connectedNode.value = chatRootNode ?? null;
+	}
+
+	return {
+		allowFileUploads,
+		allowedFilesMimeTypes,
+		chatTriggerNode,
+		connectedNode: computed(() => connectedNode.value),
+		setChatTriggerNode,
+		setConnectedNode,
+	};
+}
diff --git a/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts b/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts
new file mode 100644
index 0000000000..273cf4cf03
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/composables/useResize.ts
@@ -0,0 +1,137 @@
+import type { Ref } from 'vue';
+import { ref, computed, onMounted, onBeforeUnmount, watchEffect } from 'vue';
+import { useDebounce } from '@/composables/useDebounce';
+import type { IChatResizeStyles } from '../types/chat';
+import { useStorage } from '@/composables/useStorage';
+import { type ResizeData } from 'n8n-design-system';
+
+const LOCAL_STORAGE_PANEL_HEIGHT = 'N8N_CANVAS_CHAT_HEIGHT';
+const LOCAL_STORAGE_PANEL_WIDTH = 'N8N_CANVAS_CHAT_WIDTH';
+
+// Percentage of container width for chat panel constraints
+const MAX_WIDTH_PERCENTAGE = 0.8;
+const MIN_WIDTH_PERCENTAGE = 0.3;
+
+// Percentage of window height for panel constraints
+const MIN_HEIGHT_PERCENTAGE = 0.3;
+const MAX_HEIGHT_PERCENTAGE = 0.75;
+
+export function useResize(container: Ref<HTMLElement | undefined>) {
+	const storage = {
+		height: useStorage(LOCAL_STORAGE_PANEL_HEIGHT),
+		width: useStorage(LOCAL_STORAGE_PANEL_WIDTH),
+	};
+
+	const dimensions = {
+		container: ref(0), // Container width
+		minHeight: ref(0),
+		maxHeight: ref(0),
+		chat: ref(0), // Chat panel width
+		logs: ref(0),
+		height: ref(0),
+	};
+
+	/** Computed styles for root element based on current dimensions */
+	const rootStyles = computed<IChatResizeStyles>(() => ({
+		'--panel-height': `${dimensions.height.value}px`,
+		'--chat-width': `${dimensions.chat.value}px`,
+	}));
+
+	const panelToContainerRatio = computed(() => {
+		const chatRatio = dimensions.chat.value / dimensions.container.value;
+		const containerRatio = dimensions.container.value / window.screen.width;
+		return {
+			chat: chatRatio.toFixed(2),
+			logs: (1 - chatRatio).toFixed(2),
+			container: containerRatio.toFixed(2),
+		};
+	});
+
+	/**
+	 * Constrains height to min/max bounds and updates panel height
+	 */
+	function onResize(newHeight: number) {
+		const { minHeight, maxHeight } = dimensions;
+		dimensions.height.value = Math.min(Math.max(newHeight, minHeight.value), maxHeight.value);
+	}
+
+	function onResizeDebounced(data: ResizeData) {
+		void useDebounce().callDebounced(onResize, { debounceTime: 10, trailing: true }, data.height);
+	}
+
+	/**
+	 * Constrains chat width to min/max percentage of container width
+	 */
+	function onResizeChat(width: number) {
+		const containerWidth = dimensions.container.value;
+		const maxWidth = containerWidth * MAX_WIDTH_PERCENTAGE;
+		const minWidth = containerWidth * MIN_WIDTH_PERCENTAGE;
+
+		dimensions.chat.value = Math.min(Math.max(width, minWidth), maxWidth);
+		dimensions.logs.value = dimensions.container.value - dimensions.chat.value;
+	}
+
+	function onResizeChatDebounced(data: ResizeData) {
+		void useDebounce().callDebounced(
+			onResizeChat,
+			{ debounceTime: 10, trailing: true },
+			data.width,
+		);
+	}
+	/**
+	 * Initializes dimensions from localStorage if available
+	 */
+	function restorePersistedDimensions() {
+		const persistedHeight = parseInt(storage.height.value ?? '0', 10);
+		const persistedWidth = parseInt(storage.width.value ?? '0', 10);
+
+		if (persistedHeight) onResize(persistedHeight);
+		if (persistedWidth) onResizeChat(persistedWidth);
+	}
+
+	/**
+	 * Updates container width and height constraints on window resize
+	 */
+	function onWindowResize() {
+		if (!container.value) return;
+
+		// Update container width and adjust chat panel if needed
+		dimensions.container.value = container.value.getBoundingClientRect().width;
+		onResizeChat(dimensions.chat.value);
+
+		// Update height constraints and adjust panel height if needed
+		dimensions.minHeight.value = window.innerHeight * MIN_HEIGHT_PERCENTAGE;
+		dimensions.maxHeight.value = window.innerHeight * MAX_HEIGHT_PERCENTAGE;
+		onResize(dimensions.height.value);
+	}
+
+	// Persist dimensions to localStorage when they change
+	watchEffect(() => {
+		const { chat, height } = dimensions;
+		if (chat.value > 0) storage.width.value = chat.value.toString();
+		if (height.value > 0) storage.height.value = height.value.toString();
+	});
+
+	// Initialize dimensions when container is available
+	watchEffect(() => {
+		if (container.value) {
+			onWindowResize();
+			restorePersistedDimensions();
+		}
+	});
+
+	// Window resize handling
+	onMounted(() => window.addEventListener('resize', onWindowResize));
+	onBeforeUnmount(() => window.removeEventListener('resize', onWindowResize));
+
+	return {
+		height: dimensions.height,
+		chatWidth: dimensions.chat,
+		logsWidth: dimensions.logs,
+		rootStyles,
+		onWindowResize,
+		onResizeDebounced,
+		onResizeChatDebounced,
+		panelToContainerRatio,
+	};
+}
diff --git a/packages/editor-ui/src/components/CanvasChat/types/chat.ts b/packages/editor-ui/src/components/CanvasChat/types/chat.ts
new file mode 100644
index 0000000000..6eb6e2c2ad
--- /dev/null
+++ b/packages/editor-ui/src/components/CanvasChat/types/chat.ts
@@ -0,0 +1,22 @@
+export interface LangChainMessage {
+	id: string[];
+	kwargs: {
+		content: string;
+	};
+}
+
+export interface MemoryOutput {
+	action: string;
+	chatHistory?: LangChainMessage[];
+}
+
+export interface IChatMessageResponse {
+	executionId?: string;
+	success: boolean;
+	error?: Error;
+}
+
+export interface IChatResizeStyles {
+	'--panel-height': string;
+	'--chat-width': string;
+}
diff --git a/packages/editor-ui/src/components/CanvasControls.vue b/packages/editor-ui/src/components/CanvasControls.vue
index 881ae623f5..223c1cc8de 100644
--- a/packages/editor-ui/src/components/CanvasControls.vue
+++ b/packages/editor-ui/src/components/CanvasControls.vue
@@ -4,11 +4,13 @@ import { storeToRefs } from 'pinia';
 import { useCanvasStore } from '@/stores/canvas.store';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
 import { useDeviceSupport } from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
 
 const canvasStore = useCanvasStore();
 const { zoomToFit, zoomIn, zoomOut, resetZoom } = canvasStore;
 const { nodeViewScale, isDemo } = storeToRefs(canvasStore);
 const deviceSupport = useDeviceSupport();
+const i18n = useI18n();
 
 const keyDown = (e: KeyboardEvent) => {
 	const isCtrlKeyPressed = deviceSupport.isCtrlKeyPressed(e);
@@ -41,7 +43,7 @@ onBeforeUnmount(() => {
 		}"
 	>
 		<KeyboardShortcutTooltip
-			:label="$locale.baseText('nodeView.zoomToFit')"
+			:label="i18n.baseText('nodeView.zoomToFit')"
 			:shortcut="{ keys: ['1'] }"
 		>
 			<n8n-icon-button
@@ -52,10 +54,7 @@ onBeforeUnmount(() => {
 				@click="zoomToFit"
 			/>
 		</KeyboardShortcutTooltip>
-		<KeyboardShortcutTooltip
-			:label="$locale.baseText('nodeView.zoomIn')"
-			:shortcut="{ keys: ['+'] }"
-		>
+		<KeyboardShortcutTooltip :label="i18n.baseText('nodeView.zoomIn')" :shortcut="{ keys: ['+'] }">
 			<n8n-icon-button
 				type="tertiary"
 				size="large"
@@ -64,10 +63,7 @@ onBeforeUnmount(() => {
 				@click="zoomIn"
 			/>
 		</KeyboardShortcutTooltip>
-		<KeyboardShortcutTooltip
-			:label="$locale.baseText('nodeView.zoomOut')"
-			:shortcut="{ keys: ['-'] }"
-		>
+		<KeyboardShortcutTooltip :label="i18n.baseText('nodeView.zoomOut')" :shortcut="{ keys: ['-'] }">
 			<n8n-icon-button
 				type="tertiary"
 				size="large"
@@ -77,7 +73,7 @@ onBeforeUnmount(() => {
 			/>
 		</KeyboardShortcutTooltip>
 		<KeyboardShortcutTooltip
-			:label="$locale.baseText('nodeView.resetZoom')"
+			:label="i18n.baseText('nodeView.resetZoom')"
 			:shortcut="{ keys: ['0'] }"
 		>
 			<n8n-icon-button
diff --git a/packages/editor-ui/src/components/__tests__/ChangePasswordModal.test.ts b/packages/editor-ui/src/components/ChangePasswordModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/ChangePasswordModal.test.ts
rename to packages/editor-ui/src/components/ChangePasswordModal.test.ts
diff --git a/packages/editor-ui/src/components/__tests__/ChatEmbedModal.test.ts b/packages/editor-ui/src/components/ChatEmbedModal.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/ChatEmbedModal.test.ts
rename to packages/editor-ui/src/components/ChatEmbedModal.test.ts
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index f46e8f3290..74bbddacc3 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -1,32 +1,24 @@
 <script setup lang="ts">
-import { javascript } from '@codemirror/lang-javascript';
-import { python } from '@codemirror/lang-python';
-import type { LanguageSupport } from '@codemirror/language';
-import type { Extension, Line } from '@codemirror/state';
-import { Compartment, EditorState } from '@codemirror/state';
 import type { ViewUpdate } from '@codemirror/view';
-import { EditorView } from '@codemirror/view';
 import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 import { format } from 'prettier';
 import jsParser from 'prettier/plugins/babel';
 import * as estree from 'prettier/plugins/estree';
-import { type Ref, computed, nextTick, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue';
 
 import { CODE_NODE_TYPE } from '@/constants';
 import { codeNodeEditorEventBus } from '@/event-bus';
 import { useRootStore } from '@/stores/root.store';
 
+import { useCodeEditor } from '@/composables/useCodeEditor';
+import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
+import { useTelemetry } from '@/composables/useTelemetry';
 import AskAI from './AskAI/AskAI.vue';
-import { readOnlyEditorExtensions, writableEditorExtensions } from './baseExtensions';
-import { useCompleter } from './completer';
 import { CODE_PLACEHOLDERS } from './constants';
 import { useLinter } from './linter';
-import { codeNodeEditorTheme } from './theme';
-import { useI18n } from '@/composables/useI18n';
-import { useTelemetry } from '@/composables/useTelemetry';
-import { dropInCodeEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 import { useSettingsStore } from '@/stores/settings.store';
+import { dropInCodeEditor } from '@/plugins/codemirror/dragAndDrop';
 
 type Props = {
 	mode: CodeExecutionMode;
@@ -36,6 +28,7 @@ type Props = {
 	language?: CodeNodeEditorLanguage;
 	isReadOnly?: boolean;
 	rows?: number;
+	id?: string;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -44,99 +37,57 @@ const props = withDefaults(defineProps<Props>(), {
 	language: 'javaScript',
 	isReadOnly: false,
 	rows: 4,
+	id: () => crypto.randomUUID(),
 });
 const emit = defineEmits<{
 	'update:modelValue': [value: string];
 }>();
 
 const message = useMessage();
-const editor = ref(null) as Ref<EditorView | null>;
-const languageCompartment = ref(new Compartment());
-const dragAndDropCompartment = ref(new Compartment());
-const linterCompartment = ref(new Compartment());
-const isEditorHovered = ref(false);
-const isEditorFocused = ref(false);
 const tabs = ref(['code', 'ask-ai']);
 const activeTab = ref('code');
-const hasChanges = ref(false);
 const isLoadingAIResponse = ref(false);
 const codeNodeEditorRef = ref<HTMLDivElement>();
 const codeNodeEditorContainerRef = ref<HTMLDivElement>();
-
-const { autocompletionExtension } = useCompleter(() => props.mode, editor);
-const { createLinter } = useLinter(() => props.mode, editor);
+const hasManualChanges = ref(false);
 
 const rootStore = useRootStore();
 const i18n = useI18n();
 const telemetry = useTelemetry();
 const settingsStore = useSettingsStore();
 
+const linter = useLinter(
+	() => props.mode,
+	() => props.language,
+);
+const extensions = computed(() => [linter.value]);
+const placeholder = computed(() => CODE_PLACEHOLDERS[props.language]?.[props.mode] ?? '');
+const dragAndDropEnabled = computed(() => {
+	return !props.isReadOnly;
+});
+
+const { highlightLine, readEditorValue, editor } = useCodeEditor({
+	id: props.id,
+	editorRef: codeNodeEditorRef,
+	language: () => props.language,
+	languageParams: () => ({ mode: props.mode }),
+	editorValue: () => props.modelValue,
+	placeholder,
+	extensions,
+	isReadOnly: () => props.isReadOnly,
+	theme: {
+		maxHeight: props.fillParent ? '100%' : '40vh',
+		minHeight: '20vh',
+		rows: props.rows,
+	},
+	onChange: onEditorUpdate,
+});
+
 onMounted(() => {
 	if (!props.isReadOnly) codeNodeEditorEventBus.on('highlightLine', highlightLine);
-
 	codeNodeEditorEventBus.on('codeDiffApplied', diffApplied);
 
-	const { isReadOnly, language } = props;
-	const extensions: Extension[] = [
-		...readOnlyEditorExtensions,
-		EditorState.readOnly.of(isReadOnly),
-		EditorView.editable.of(!isReadOnly),
-		codeNodeEditorTheme({
-			isReadOnly,
-			maxHeight: props.fillParent ? '100%' : '40vh',
-			minHeight: '20vh',
-			rows: props.rows,
-		}),
-	];
-
-	if (!isReadOnly) {
-		const linter = createLinter(language);
-		if (linter) {
-			extensions.push(linterCompartment.value.of(linter));
-		}
-
-		extensions.push(
-			...writableEditorExtensions,
-			dragAndDropCompartment.value.of(dragAndDropExtension.value),
-			EditorView.domEventHandlers({
-				focus: () => {
-					isEditorFocused.value = true;
-				},
-				blur: () => {
-					isEditorFocused.value = false;
-				},
-			}),
-
-			EditorView.updateListener.of((viewUpdate) => {
-				if (!viewUpdate.docChanged) return;
-
-				trackCompletion(viewUpdate);
-
-				const value = editor.value?.state.doc.toString();
-				if (value) {
-					emit('update:modelValue', value);
-				}
-				hasChanges.value = true;
-			}),
-		);
-	}
-
-	const [languageSupport, ...otherExtensions] = languageExtensions.value;
-	extensions.push(languageCompartment.value.of(languageSupport), ...otherExtensions);
-
-	const state = EditorState.create({
-		doc: props.modelValue ?? placeholder.value,
-		extensions,
-	});
-
-	editor.value = new EditorView({
-		parent: codeNodeEditorRef.value,
-		state,
-	});
-
-	// empty on first load, default param value
 	if (!props.modelValue) {
-		refreshPlaceholder();
 		emit('update:modelValue', placeholder.value);
 	}
 });
@@ -150,89 +101,12 @@ const askAiEnabled = computed(() => {
 	return settingsStore.isAskAiEnabled && props.language === 'javaScript';
 });
 
-const placeholder = computed(() => {
-	return CODE_PLACEHOLDERS[props.language]?.[props.mode] ?? '';
-});
-
-const dragAndDropEnabled = computed(() => {
-	return !props.isReadOnly && props.mode === 'runOnceForEachItem';
-});
-
-const dragAndDropExtension = computed(() => (dragAndDropEnabled.value ? mappingDropCursor() : []));
-
-// eslint-disable-next-line vue/return-in-computed-property
-const languageExtensions = computed<[LanguageSupport, ...Extension[]]>(() => {
-	switch (props.language) {
-		case 'javaScript':
-			return [javascript(), autocompletionExtension('javaScript')];
-		case 'python':
-			return [python(), autocompletionExtension('python')];
+watch([() => props.language, () => props.mode], (_, [prevLanguage, prevMode]) => {
+	if (readEditorValue().trim() === CODE_PLACEHOLDERS[prevLanguage]?.[prevMode]) {
+		emit('update:modelValue', placeholder.value);
 	}
 });
 
-watch(
-	() => props.modelValue,
-	(newValue) => {
-		if (!editor.value) {
-			return;
-		}
-		const current = editor.value.state.doc.toString();
-		if (current === newValue) {
-			return;
-		}
-		editor.value.dispatch({
-			changes: { from: 0, to: getCurrentEditorContent().length, insert: newValue },
-		});
-	},
-);
-
-watch(
-	() => props.mode,
-	(_newMode, previousMode: CodeExecutionMode) => {
-		reloadLinter();
-
-		if (getCurrentEditorContent().trim() === CODE_PLACEHOLDERS[props.language]?.[previousMode]) {
-			refreshPlaceholder();
-		}
-	},
-);
-
-watch(dragAndDropExtension, (extension) => {
-	editor.value?.dispatch({
-		effects: dragAndDropCompartment.value.reconfigure(extension),
-	});
-});
-
-watch(
-	() => props.language,
-	(_newLanguage, previousLanguage: CodeNodeEditorLanguage) => {
-		if (getCurrentEditorContent().trim() === CODE_PLACEHOLDERS[previousLanguage]?.[props.mode]) {
-			refreshPlaceholder();
-		}
-
-		const [languageSupport] = languageExtensions.value;
-		editor.value?.dispatch({
-			effects: languageCompartment.value.reconfigure(languageSupport),
-		});
-		reloadLinter();
-	},
-);
-watch(
-	askAiEnabled,
-	async (isEnabled) => {
-		if (isEnabled && !props.modelValue) {
-			emit('update:modelValue', placeholder.value);
-		}
-		await nextTick();
-		hasChanges.value = props.modelValue !== placeholder.value;
-	},
-	{ immediate: true },
-);
-
-function getCurrentEditorContent() {
-	return editor.value?.state.doc.toString() ?? '';
-}
-
 async function onBeforeTabLeave(_activeName: string, oldActiveName: string) {
 	// Confirm dialog if leaving ask-ai tab during loading
 	if (oldActiveName === 'ask-ai' && isLoadingAIResponse.value) {
@@ -243,69 +117,28 @@ async function onBeforeTabLeave(_activeName: string, oldActiveName: string) {
 			showCancelButton: true,
 		});
 
-		if (confirmModal === 'confirm') {
-			return true;
-		}
-
-		return false;
+		return confirmModal === 'confirm';
 	}
 
 	return true;
 }
 
-async function onReplaceCode(code: string) {
+async function onAiReplaceCode(code: string) {
 	const formattedCode = await format(code, {
 		parser: 'babel',
 		plugins: [jsParser, estree],
 	});
 
-	editor.value?.dispatch({
-		changes: { from: 0, to: getCurrentEditorContent().length, insert: formattedCode },
-	});
+	emit('update:modelValue', formattedCode);
 
 	activeTab.value = 'code';
-	hasChanges.value = false;
+	hasManualChanges.value = false;
 }
 
-function onMouseOver(event: MouseEvent) {
-	const fromElement = event.relatedTarget as HTMLElement;
-	const containerRef = codeNodeEditorContainerRef.value;
-
-	if (!containerRef?.contains(fromElement)) isEditorHovered.value = true;
-}
-
-function onMouseOut(event: MouseEvent) {
-	const fromElement = event.relatedTarget as HTMLElement;
-	const containerRef = codeNodeEditorContainerRef.value;
-
-	if (!containerRef?.contains(fromElement)) isEditorHovered.value = false;
-}
-
-function reloadLinter() {
-	if (!editor.value) return;
-
-	const linter = createLinter(props.language);
-	if (linter) {
-		editor.value.dispatch({
-			effects: linterCompartment.value.reconfigure(linter),
-		});
-	}
-}
-
-function refreshPlaceholder() {
-	if (!editor.value) return;
-
-	editor.value.dispatch({
-		changes: { from: 0, to: getCurrentEditorContent().length, insert: placeholder.value },
-	});
-}
-
-function getLine(lineNumber: number): Line | null {
-	try {
-		return editor.value?.state.doc.line(lineNumber) ?? null;
-	} catch {
-		return null;
-	}
+function onEditorUpdate(viewUpdate: ViewUpdate) {
+	trackCompletion(viewUpdate);
+	hasManualChanges.value = true;
+	emit('update:modelValue', readEditorValue());
 }
 
 function diffApplied() {
@@ -315,25 +148,6 @@ function diffApplied() {
 	});
 }
 
-function highlightLine(lineNumber: number | 'final') {
-	if (!editor.value) return;
-
-	if (lineNumber === 'final') {
-		editor.value.dispatch({
-			selection: { anchor: (props.modelValue ?? getCurrentEditorContent()).length },
-		});
-		return;
-	}
-
-	const line = getLine(lineNumber);
-
-	if (!line) return;
-
-	editor.value.dispatch({
-		selection: { anchor: line.from },
-	});
-}
-
 function trackCompletion(viewUpdate: ViewUpdate) {
 	const completionTx = viewUpdate.transactions.find((tx) => tx.isUserEvent('input.complete'));
 
@@ -342,7 +156,7 @@ function trackCompletion(viewUpdate: ViewUpdate) {
 	try {
 		// @ts-expect-error - undocumented fields
 		const { fromA, toB } = viewUpdate?.changedRanges[0];
-		const full = getCurrentEditorContent().slice(fromA, toB);
+		const full = viewUpdate.state.doc.slice(fromA, toB).toString();
 		const lastDotIndex = full.lastIndexOf('.');
 
 		let context = null;
@@ -379,16 +193,19 @@ function onAiLoadEnd() {
 async function onDrop(value: string, event: MouseEvent) {
 	if (!editor.value) return;
 
-	await dropInCodeEditor(toRaw(editor.value), event, value);
+	const valueToInsert =
+		props.mode === 'runOnceForAllItems'
+			? value.replace('$json', '$input.first().json').replace(/\$\((.*)\)\.item/, '$($1).first()')
+			: value;
+
+	await dropInCodeEditor(toRaw(editor.value), event, valueToInsert);
 }
 </script>
 
 <template>
 	<div
 		ref="codeNodeEditorContainerRef"
-		:class="['code-node-editor', $style['code-node-editor-container'], language]"
-		@mouseover="onMouseOver"
-		@mouseout="onMouseOut"
+		:class="['code-node-editor', $style['code-node-editor-container']]"
 	>
 		<el-tabs
 			v-if="askAiEnabled"
@@ -399,12 +216,17 @@ async function onDrop(value: string, event: MouseEvent) {
 			:class="$style.tabs"
 		>
 			<el-tab-pane
-				:label="$locale.baseText('codeNodeEditor.tabs.code')"
+				:label="i18n.baseText('codeNodeEditor.tabs.code')"
 				name="code"
 				data-test-id="code-node-tab-code"
 				:class="$style.fillHeight"
 			>
-				<DraggableTarget type="mapping" :disabled="!dragAndDropEnabled" @drop="onDrop">
+				<DraggableTarget
+					type="mapping"
+					:disabled="!dragAndDropEnabled"
+					:class="$style.fillHeight"
+					@drop="onDrop"
+				>
 					<template #default="{ activeDrop, droppable }">
 						<div
 							ref="codeNodeEditorRef"
@@ -421,15 +243,15 @@ async function onDrop(value: string, event: MouseEvent) {
 				<slot name="suffix" />
 			</el-tab-pane>
 			<el-tab-pane
-				:label="$locale.baseText('codeNodeEditor.tabs.askAi')"
+				:label="i18n.baseText('codeNodeEditor.tabs.askAi')"
 				name="ask-ai"
 				data-test-id="code-node-tab-ai"
 			>
 				<!-- Key the AskAI tab to make sure it re-mounts when changing tabs -->
 				<AskAI
 					:key="activeTab"
-					:has-changes="hasChanges"
-					@replace-code="onReplaceCode"
+					:has-changes="hasManualChanges"
+					@replace-code="onAiReplaceCode"
 					@started-loading="onAiLoadStart"
 					@finished-loading="onAiLoadEnd"
 				/>
@@ -437,7 +259,12 @@ async function onDrop(value: string, event: MouseEvent) {
 		</el-tabs>
 		<!-- If AskAi not enabled, there's no point in rendering tabs -->
 		<div v-else :class="$style.fillHeight">
-			<DraggableTarget type="mapping" :disabled="!dragAndDropEnabled" @drop="onDrop">
+			<DraggableTarget
+				type="mapping"
+				:disabled="!dragAndDropEnabled"
+				:class="$style.fillHeight"
+				@drop="onDrop"
+			>
 				<template #default="{ activeDrop, droppable }">
 					<div
 						ref="codeNodeEditorRef"
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts b/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
deleted file mode 100644
index a9b00a0b82..0000000000
--- a/packages/editor-ui/src/components/CodeNodeEditor/baseExtensions.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import {
-	dropCursor,
-	EditorView,
-	highlightActiveLine,
-	highlightActiveLineGutter,
-	highlightSpecialChars,
-	keymap,
-	lineNumbers,
-} from '@codemirror/view';
-import { bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
-import { history, toggleComment, deleteCharBackward } from '@codemirror/commands';
-import { lintGutter } from '@codemirror/lint';
-import { type Extension, Prec } from '@codemirror/state';
-
-import { codeInputHandler } from '@/plugins/codemirror/inputHandlers/code.inputHandler';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
-
-export const readOnlyEditorExtensions: readonly Extension[] = [
-	lineNumbers(),
-	EditorView.lineWrapping,
-	highlightSpecialChars(),
-];
-
-export const writableEditorExtensions: readonly Extension[] = [
-	history(),
-	lintGutter(),
-	foldGutter(),
-	codeInputHandler(),
-	dropCursor(),
-	indentOnInput(),
-	bracketMatching(),
-	highlightActiveLine(),
-	highlightActiveLineGutter(),
-	Prec.highest(
-		keymap.of([
-			...tabKeyMap(),
-			...enterKeyMap,
-			...autocompleteKeyMap,
-			...historyKeyMap,
-			{ key: 'Mod-/', run: toggleComment },
-			{ key: 'Backspace', run: deleteCharBackward, shift: deleteCharBackward },
-		]),
-	),
-];
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/__tests__/itemField.completions.test.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.test.ts
similarity index 96%
rename from packages/editor-ui/src/components/CodeNodeEditor/completions/__tests__/itemField.completions.test.ts
rename to packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.test.ts
index 98ba5e0f6f..7bcba353e4 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/__tests__/itemField.completions.test.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/itemField.completions.test.ts
@@ -1,6 +1,6 @@
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorSelection, EditorState } from '@codemirror/state';
-import { useItemFieldCompletions } from '../itemField.completions';
+import { useItemFieldCompletions } from './itemField.completions';
 
 describe('inputMethodCompletions', () => {
 	test('should return completions for $input.item.|', () => {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
index 7f2c890ca3..ce587796fd 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
@@ -176,7 +176,7 @@ function useJsonFieldCompletions() {
 			if (activeNode) {
 				const workflow = workflowsStore.getCurrentWorkflow();
 				const input = workflow.connectionsByDestinationNode[activeNode.name];
-				return input.main[0][0].node;
+				return input.main[0] ? input.main[0][0].node : null;
 			}
 		} catch (e) {
 			console.error(e);
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/constants.ts b/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
index d9dcaccabd..2f648e41d2 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/constants.ts
@@ -28,7 +28,7 @@ export const AUTOCOMPLETABLE_BUILT_IN_MODULES_JS = [
 
 export const DEFAULT_LINTER_SEVERITY: Diagnostic['severity'] = 'error';
 
-export const DEFAULT_LINTER_DELAY_IN_MS = 300;
+export const DEFAULT_LINTER_DELAY_IN_MS = 500;
 
 /**
  * Length of the start of the script wrapper, used as offset for the linter to find a location in source text.
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
index bf7615faaf..ff954d5bc7 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
@@ -1,10 +1,10 @@
 import type { Diagnostic } from '@codemirror/lint';
-import { linter } from '@codemirror/lint';
+import { linter as codeMirrorLinter } from '@codemirror/lint';
 import type { EditorView } from '@codemirror/view';
 import * as esprima from 'esprima-next';
 import type { Node, MemberExpression } from 'estree';
 import type { CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
-import { toValue, type MaybeRefOrGetter } from 'vue';
+import { computed, toValue, type MaybeRefOrGetter } from 'vue';
 
 import { useI18n } from '@/composables/useI18n';
 import {
@@ -17,17 +17,17 @@ import { walk } from './utils';
 
 export const useLinter = (
 	mode: MaybeRefOrGetter<CodeExecutionMode>,
-	editor: MaybeRefOrGetter<EditorView | null>,
+	language: MaybeRefOrGetter<CodeNodeEditorLanguage>,
 ) => {
 	const i18n = useI18n();
-
-	function createLinter(language: CodeNodeEditorLanguage) {
-		switch (language) {
+	const linter = computed(() => {
+		switch (toValue(language)) {
 			case 'javaScript':
-				return linter(lintSource, { delay: DEFAULT_LINTER_DELAY_IN_MS });
+				return codeMirrorLinter(lintSource, { delay: DEFAULT_LINTER_DELAY_IN_MS });
 		}
-		return undefined;
-	}
+
+		return [];
+	});
 
 	function lintSource(editorView: EditorView): Diagnostic[] {
 		const doc = editorView.state.doc.toString();
@@ -38,34 +38,7 @@ export const useLinter = (
 		try {
 			ast = esprima.parseScript(script, { range: true });
 		} catch (syntaxError) {
-			let line;
-
-			try {
-				const lineAtError = editorView.state.doc.line(syntaxError.lineNumber - 1).text;
-
-				// optional chaining operators currently unsupported by esprima-next
-				if (['?.', ']?'].some((operator) => lineAtError.includes(operator))) return [];
-			} catch {
-				return [];
-			}
-
-			try {
-				line = editorView.state.doc.line(syntaxError.lineNumber);
-
-				return [
-					{
-						from: line.from,
-						to: line.to,
-						severity: DEFAULT_LINTER_SEVERITY,
-						message: i18n.baseText('codeNodeEditor.linter.bothModes.syntaxError'),
-					},
-				];
-			} catch {
-				/**
-				 * For invalid (e.g. half-written) n8n syntax, esprima errors with an off-by-one line number for the final line. In future, we should add full linting for n8n syntax before parsing JS.
-				 */
-				return [];
-			}
+			return [];
 		}
 
 		if (ast === null) return [];
@@ -118,7 +91,7 @@ export const useLinter = (
 			walk(ast, isUnavailableVarInAllItems).forEach((node) => {
 				const [start, end] = getRange(node);
 
-				const varName = getText(node);
+				const varName = getText(editorView, node);
 
 				if (!varName) return;
 
@@ -178,9 +151,9 @@ export const useLinter = (
 					message: i18n.baseText('codeNodeEditor.linter.allItems.unavailableProperty'),
 					actions: [
 						{
-							name: 'Remove',
+							name: 'Fix',
 							apply(view) {
-								view.dispatch({ changes: { from: start - '.'.length, to: end } });
+								view.dispatch({ changes: { from: start, to: end, insert: 'first()' } });
 							},
 						},
 					],
@@ -250,7 +223,7 @@ export const useLinter = (
 			walk<TargetNode>(ast, isUnavailableMethodinEachItem).forEach((node) => {
 				const [start, end] = getRange(node.property);
 
-				const method = getText(node.property);
+				const method = getText(editorView, node.property);
 
 				if (!method) return;
 
@@ -444,7 +417,7 @@ export const useLinter = (
 
 					if (shadowStart && start > shadowStart) return; // skip shadow item
 
-					const varName = getText(node);
+					const varName = getText(editorView, node);
 
 					if (!varName) return;
 
@@ -489,7 +462,7 @@ export const useLinter = (
 				!['json', 'binary'].includes(node.property.name);
 
 			walk<TargetNode>(ast, isDirectAccessToItemSubproperty).forEach((node) => {
-				const varName = getText(node);
+				const varName = getText(editorView, node);
 
 				if (!varName) return;
 
@@ -559,6 +532,76 @@ export const useLinter = (
 			});
 		});
 
+		/**
+		 * Lint for `$(variable)` usage where variable is not a string, in both modes.
+		 *
+		 * $(nodeName) -> <no autofix>
+		 */
+		const isDollarSignWithVariable = (node: Node) =>
+			node.type === 'CallExpression' &&
+			node.callee.type === 'Identifier' &&
+			node.callee.name === '$' &&
+			node.arguments.length === 1 &&
+			((node.arguments[0].type !== 'Literal' && node.arguments[0].type !== 'TemplateLiteral') ||
+				(node.arguments[0].type === 'TemplateLiteral' && node.arguments[0].expressions.length > 0));
+
+		type TargetCallNode = RangeNode & {
+			callee: { name: string };
+			arguments: Array<{ type: string }>;
+		};
+
+		walk<TargetCallNode>(ast, isDollarSignWithVariable).forEach((node) => {
+			const [start, end] = getRange(node);
+
+			lintings.push({
+				from: start,
+				to: end,
+				severity: 'warning',
+				message: i18n.baseText('codeNodeEditor.linter.bothModes.dollarSignVariable'),
+			});
+		});
+
+		/**
+		 * Lint for $("myNode").item access in runOnceForAllItems mode
+		 *
+		 * $("myNode").item -> $("myNode").first()
+		 */
+		if (toValue(mode) === 'runOnceForEachItem') {
+			type DollarItemNode = RangeNode & {
+				property: { name: string; type: string } & RangeNode;
+			};
+
+			const isDollarNodeItemAccess = (node: Node) =>
+				node.type === 'MemberExpression' &&
+				!node.computed &&
+				node.object.type === 'CallExpression' &&
+				node.object.callee.type === 'Identifier' &&
+				node.object.callee.name === '$' &&
+				node.object.arguments.length === 1 &&
+				node.object.arguments[0].type === 'Literal' &&
+				node.property.type === 'Identifier' &&
+				node.property.name === 'item';
+
+			walk<DollarItemNode>(ast, isDollarNodeItemAccess).forEach((node) => {
+				const [start, end] = getRange(node.property);
+
+				lintings.push({
+					from: start,
+					to: end,
+					severity: 'warning',
+					message: i18n.baseText('codeNodeEditor.linter.eachItem.preferFirst'),
+					actions: [
+						{
+							name: 'Fix',
+							apply(view) {
+								view.dispatch({ changes: { from: start, to: end, insert: 'first()' } });
+							},
+						},
+					],
+				});
+			});
+		}
+
 		return lintings;
 	}
 
@@ -566,19 +609,15 @@ export const useLinter = (
 	//            helpers
 	// ----------------------------------
 
-	function getText(node: RangeNode) {
-		const editorValue = toValue(editor);
-
-		if (!editorValue) return null;
-
+	function getText(editorView: EditorView, node: RangeNode) {
 		const [start, end] = getRange(node);
 
-		return editorValue.state.doc.toString().slice(start, end);
+		return editorView.state.doc.toString().slice(start, end);
 	}
 
 	function getRange(node: RangeNode) {
 		return node.range.map((loc) => loc - OFFSET_FOR_SCRIPT_WRAPPER);
 	}
 
-	return { createLinter };
+	return linter;
 };
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
index e8e10aaad8..aa5977bc3e 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/theme.ts
@@ -32,16 +32,62 @@ interface ThemeSettings {
 	maxHeight?: string;
 	minHeight?: string;
 	rows?: number;
-	highlightColors?: 'default' | 'html';
 }
 
-export const codeNodeEditorTheme = ({
-	isReadOnly,
-	minHeight,
-	maxHeight,
-	rows,
-	highlightColors,
-}: ThemeSettings) => [
+const codeEditorSyntaxHighlighting = syntaxHighlighting(
+	HighlightStyle.define([
+		{ tag: tags.keyword, color: 'var(--color-code-tags-keyword)' },
+		{
+			tag: [
+				tags.deleted,
+				tags.character,
+				tags.macroName,
+				tags.definition(tags.name),
+				tags.definition(tags.variableName),
+				tags.atom,
+				tags.bool,
+			],
+			color: 'var(--color-code-tags-variable)',
+		},
+		{ tag: [tags.name, tags.propertyName], color: 'var(--color-code-tags-property)' },
+		{
+			tag: [tags.processingInstruction, tags.string, tags.inserted, tags.special(tags.string)],
+			color: 'var(--color-code-tags-string)',
+		},
+		{
+			tag: [tags.function(tags.variableName), tags.labelName],
+			color: 'var(--color-code-tags-function)',
+		},
+		{
+			tag: [tags.color, tags.constant(tags.name), tags.standard(tags.name)],
+			color: 'var(--color-code-tags-constant)',
+		},
+		{ tag: [tags.className], color: 'var(--color-code-tags-class)' },
+		{
+			tag: [tags.number, tags.changed, tags.annotation, tags.modifier, tags.self, tags.namespace],
+			color: 'var(--color-code-tags-primitive)',
+		},
+		{ tag: [tags.typeName], color: 'var(--color-code-tags-type)' },
+		{ tag: [tags.operator, tags.operatorKeyword], color: 'var(--color-code-tags-keyword)' },
+		{
+			tag: [tags.url, tags.escape, tags.regexp, tags.link],
+			color: 'var(--color-code-tags-keyword)',
+		},
+		{ tag: [tags.meta, tags.comment, tags.lineComment], color: 'var(--color-code-tags-comment)' },
+		{ tag: tags.strong, fontWeight: 'bold' },
+		{ tag: tags.emphasis, fontStyle: 'italic' },
+		{ tag: tags.link, textDecoration: 'underline' },
+		{ tag: tags.heading, fontWeight: 'bold', color: 'var(--color-code-tags-heading)' },
+		{ tag: tags.invalid, color: 'var(--color-code-tags-invalid)' },
+		{ tag: tags.strikethrough, textDecoration: 'line-through' },
+		{
+			tag: [tags.derefOperator, tags.special(tags.variableName), tags.variableName, tags.separator],
+			color: 'var(--color-code-foreground)',
+		},
+	]),
+);
+
+export const codeEditorTheme = ({ isReadOnly, minHeight, maxHeight, rows }: ThemeSettings) => [
 	EditorView.theme({
 		'&': {
 			'font-size': BASE_STYLING.fontSize,
@@ -54,13 +100,17 @@ export const codeNodeEditorTheme = ({
 		'.cm-content': {
 			fontFamily: BASE_STYLING.fontFamily,
 			caretColor: isReadOnly ? 'transparent' : 'var(--color-code-caret)',
+			lineHeight: 'var(--font-line-height-xloose)',
+			paddingTop: 'var(--spacing-2xs)',
+			paddingBottom: 'var(--spacing-s)',
 		},
 		'.cm-cursor, .cm-dropCursor': {
 			borderLeftColor: 'var(--color-code-caret)',
 		},
-		'&.cm-focused .cm-selectionBackgroundm .cm-selectionBackground, .cm-content ::selection': {
-			backgroundColor: 'var(--color-code-selection)',
-		},
+		'&.cm-focused > .cm-scroller .cm-selectionLayer > .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection':
+			{
+				background: 'var(--color-code-selection)',
+			},
 		'&.cm-editor': {
 			...(isReadOnly ? { backgroundColor: 'var(--color-code-background-readonly)' } : {}),
 			borderColor: 'var(--border-color-base)',
@@ -75,13 +125,19 @@ export const codeNodeEditorTheme = ({
 		'.cm-activeLineGutter': {
 			backgroundColor: 'var(--color-code-lineHighlight)',
 		},
+		'.cm-lineNumbers .cm-activeLineGutter': {
+			color: 'var(--color-code-gutter-foreground-active)',
+		},
 		'.cm-gutters': {
 			backgroundColor: isReadOnly
 				? 'var(--color-code-background-readonly)'
-				: 'var(--color-code-gutterBackground)',
-			color: 'var(--color-code-gutterForeground)',
+				: 'var(--color-code-gutter-background)',
+			color: 'var(--color-code-gutter-foreground)',
+			border: '0',
 			borderRadius: 'var(--border-radius-base)',
-			borderRightColor: 'var(--border-color-base)',
+		},
+		'.cm-gutterElement': {
+			padding: 0,
 		},
 		'.cm-tooltip': {
 			maxWidth: BASE_STYLING.tooltip.maxWidth,
@@ -92,11 +148,30 @@ export const codeNodeEditorTheme = ({
 			maxHeight: maxHeight ?? '100%',
 			...(isReadOnly
 				? {}
-				: { minHeight: rows && rows !== -1 ? `${Number(rows + 1) * 1.3}em` : 'auto' }),
+				: {
+						minHeight: rows && rows !== -1 ? `${Number(rows + 1) * 1.3}em` : 'auto',
+					}),
+		},
+		'.cm-lineNumbers .cm-gutterElement': {
+			padding: '0 var(--spacing-5xs) 0 var(--spacing-2xs)',
 		},
 		'.cm-gutter,.cm-content': {
 			minHeight: rows && rows !== -1 ? 'auto' : (minHeight ?? 'calc(35vh - var(--spacing-2xl))'),
 		},
+		'.cm-foldGutter': {
+			width: '16px',
+		},
+		'.cm-fold-marker': {
+			display: 'flex',
+			alignItems: 'center',
+			justifyContent: 'center',
+			height: '100%',
+			opacity: 0,
+			transition: 'opacity 0.3s ease',
+		},
+		'.cm-activeLineGutter .cm-fold-marker, .cm-gutters:hover .cm-fold-marker': {
+			opacity: 1,
+		},
 		'.cm-diagnosticAction': {
 			backgroundColor: BASE_STYLING.diagnosticButton.backgroundColor,
 			color: 'var(--color-primary)',
@@ -106,103 +181,81 @@ export const codeNodeEditorTheme = ({
 			cursor: BASE_STYLING.diagnosticButton.cursor,
 		},
 		'.cm-diagnostic-error': {
-			backgroundColor: 'var(--color-background-base)',
+			backgroundColor: 'var(--color-infobox-background)',
 		},
 		'.cm-diagnosticText': {
+			fontSize: 'var(--font-size-xs)',
 			color: 'var(--color-text-base)',
 		},
+		'.cm-diagnosticDocs': {
+			fontSize: 'var(--font-size-2xs)',
+		},
+		'.cm-foldPlaceholder': {
+			color: 'var(--color-text-base)',
+			backgroundColor: 'var(--color-background-base)',
+			border: 'var(--border-base)',
+		},
+		'.cm-selectionMatch': {
+			background: 'var(--color-code-selection-highlight)',
+		},
+		'.cm-selectionMatch-main': {
+			background: 'var(--color-code-selection-highlight)',
+		},
+		'.cm-matchingBracket': {
+			background: 'var(--color-code-selection)',
+		},
+		'.cm-completionMatchedText': {
+			textDecoration: 'none',
+			fontWeight: '600',
+			color: 'var(--color-autocomplete-item-selected)',
+		},
+		'.cm-faded > span': {
+			opacity: 0.6,
+		},
+		'.cm-panel.cm-search': {
+			padding: 'var(--spacing-4xs) var(--spacing-2xs)',
+		},
+		'.cm-panels': {
+			background: 'var(--color-background-light)',
+			color: 'var(--color-text-base)',
+		},
+		'.cm-panels-bottom': {
+			borderTop: 'var(--border-base)',
+		},
+		'.cm-textfield': {
+			color: 'var(--color-text-dark)',
+			background: 'var(--color-foreground-xlight)',
+			borderRadius: 'var(--border-radius-base)',
+			border: 'var(--border-base)',
+			fontSize: '90%',
+		},
+		'.cm-textfield:focus': {
+			outline: 'none',
+			borderColor: 'var(--color-secondary)',
+		},
+		'.cm-panel button': {
+			color: 'var(--color-text-base)',
+		},
+		'.cm-panel input[type="checkbox"]': {
+			border: 'var(--border-base)',
+			outline: 'none',
+		},
+		'.cm-panel input[type="checkbox"]:hover': {
+			border: 'var(--border-base)',
+			outline: 'none',
+		},
+		'.cm-panel.cm-search label': {
+			fontSize: '90%',
+		},
+		'.cm-button': {
+			outline: 'none',
+			border: 'var(--border-base)',
+			color: 'var(--color-text-dark)',
+			backgroundColor: 'var(--color-foreground-xlight)',
+			backgroundImage: 'none',
+			borderRadius: 'var(--border-radius-base)',
+			fontSize: '90%',
+		},
 	}),
-	highlightColors === 'html'
-		? syntaxHighlighting(
-				HighlightStyle.define([
-					{ tag: tags.keyword, color: '#c678dd' },
-					{
-						tag: [tags.name, tags.deleted, tags.character, tags.propertyName, tags.macroName],
-						color: '#e06c75',
-					},
-					{ tag: [tags.function(tags.variableName), tags.labelName], color: '#61afef' },
-					{
-						tag: [tags.color, tags.constant(tags.name), tags.standard(tags.name)],
-						color: '#d19a66',
-					},
-					{ tag: [tags.definition(tags.name), tags.separator], color: '#abb2bf' },
-					{
-						tag: [
-							tags.typeName,
-							tags.className,
-							tags.number,
-							tags.changed,
-							tags.annotation,
-							tags.modifier,
-							tags.self,
-							tags.namespace,
-						],
-						color: '#e06c75',
-					},
-					{
-						tag: [
-							tags.operator,
-							tags.operatorKeyword,
-							tags.url,
-							tags.escape,
-							tags.regexp,
-							tags.link,
-							tags.special(tags.string),
-						],
-						color: '#56b6c2',
-					},
-					{ tag: [tags.meta, tags.comment], color: '#7d8799' },
-					{ tag: tags.strong, fontWeight: 'bold' },
-					{ tag: tags.emphasis, fontStyle: 'italic' },
-					{ tag: tags.strikethrough, textDecoration: 'line-through' },
-					{ tag: tags.link, color: '#7d8799', textDecoration: 'underline' },
-					{ tag: tags.heading, fontWeight: 'bold', color: '#e06c75' },
-					{ tag: [tags.atom, tags.bool, tags.special(tags.variableName)], color: '#d19a66' },
-					{ tag: [tags.processingInstruction, tags.string, tags.inserted], color: '#98c379' },
-					{ tag: tags.invalid, color: 'red', 'font-weight': 'bold' },
-				]),
-			)
-		: syntaxHighlighting(
-				HighlightStyle.define([
-					{
-						tag: tags.comment,
-						color: 'var(--color-code-tags-comment)',
-					},
-					{
-						tag: [tags.string, tags.special(tags.brace)],
-						color: 'var(--color-code-tags-string)',
-					},
-					{
-						tag: [tags.number, tags.self, tags.bool, tags.null],
-						color: 'var(--color-code-tags-primitive)',
-					},
-					{
-						tag: tags.keyword,
-						color: 'var(--color-code-tags-keyword)',
-					},
-					{
-						tag: tags.operator,
-						color: 'var(--color-code-tags-operator)',
-					},
-					{
-						tag: [
-							tags.variableName,
-							tags.propertyName,
-							tags.attributeName,
-							tags.regexp,
-							tags.className,
-							tags.typeName,
-						],
-						color: 'var(--color-code-tags-variable)',
-					},
-					{
-						tag: [
-							tags.definition(tags.typeName),
-							tags.definition(tags.propertyName),
-							tags.function(tags.variableName),
-						],
-						color: 'var(--color-code-tags-definition)',
-					},
-				]),
-			),
+	codeEditorSyntaxHighlighting,
 ];
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/types.ts b/packages/editor-ui/src/components/CodeNodeEditor/types.ts
index 61f0871794..7403a52e7d 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/types.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/types.ts
@@ -1,12 +1,10 @@
 import type { EditorView } from '@codemirror/view';
-import type { I18nClass } from '@/plugins/i18n';
 import type { Workflow, CodeExecutionMode, CodeNodeEditorLanguage } from 'n8n-workflow';
 import type { Node } from 'estree';
 import type { DefineComponent } from 'vue';
 
 export type CodeNodeEditorMixin = InstanceType<
 	DefineComponent & {
-		$locale: I18nClass;
 		editor: EditorView | null;
 		mode: CodeExecutionMode;
 		language: CodeNodeEditorLanguage;
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/__tests__/CollaborationPane.test.ts b/packages/editor-ui/src/components/CollaborationPane.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/CollaborationPane.test.ts
rename to packages/editor-ui/src/components/CollaborationPane.test.ts
diff --git a/packages/editor-ui/src/components/__tests__/CollectionParameter.test.ts b/packages/editor-ui/src/components/CollectionParameter.test.ts
similarity index 94%
rename from packages/editor-ui/src/components/__tests__/CollectionParameter.test.ts
rename to packages/editor-ui/src/components/CollectionParameter.test.ts
index 8f1c0b0af2..4b0e25c063 100644
--- a/packages/editor-ui/src/components/__tests__/CollectionParameter.test.ts
+++ b/packages/editor-ui/src/components/CollectionParameter.test.ts
@@ -1,6 +1,6 @@
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
-import CollectionParameter from '../CollectionParameter.vue';
+import CollectionParameter from './CollectionParameter.vue';
 
 const renderComponent = createComponentRenderer(CollectionParameter, {
 	pinia: createTestingPinia(),
diff --git a/packages/editor-ui/src/components/CollectionParameter.vue b/packages/editor-ui/src/components/CollectionParameter.vue
index 57df73e4bd..18be0c5093 100644
--- a/packages/editor-ui/src/components/CollectionParameter.vue
+++ b/packages/editor-ui/src/components/CollectionParameter.vue
@@ -164,7 +164,7 @@ function valueChanged(parameterData: IUpdateInformation) {
 	<div class="collection-parameter" @keydown.stop>
 		<div class="collection-parameter-wrapper">
 			<div v-if="getProperties.length === 0" class="no-items-exist">
-				<n8n-text size="small">{{ $locale.baseText('collectionParameter.noProperties') }}</n8n-text>
+				<n8n-text size="small">{{ i18n.baseText('collectionParameter.noProperties') }}</n8n-text>
 			</div>
 
 			<Suspense>
diff --git a/packages/editor-ui/src/components/CommunityPackageCard.vue b/packages/editor-ui/src/components/CommunityPackageCard.vue
index 80618315dc..db58a6c6cd 100644
--- a/packages/editor-ui/src/components/CommunityPackageCard.vue
+++ b/packages/editor-ui/src/components/CommunityPackageCard.vue
@@ -1,65 +1,59 @@
-<script lang="ts">
+<script lang="ts" setup>
 import { useUIStore } from '@/stores/ui.store';
 import type { PublicInstalledPackage } from 'n8n-workflow';
-import { mapStores } from 'pinia';
-import { defineComponent } from 'vue';
 import { NPM_PACKAGE_DOCS_BASE_URL, COMMUNITY_PACKAGE_MANAGE_ACTIONS } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 
-export default defineComponent({
-	name: 'CommunityPackageCard',
-	props: {
-		communityPackage: {
-			type: Object as () => PublicInstalledPackage | null,
-			required: false,
-			default: null,
-		},
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			packageActions: [
-				{
-					label: this.$locale.baseText('settings.communityNodes.viewDocsAction.label'),
-					value: COMMUNITY_PACKAGE_MANAGE_ACTIONS.VIEW_DOCS,
-					type: 'external-link',
-				},
-				{
-					label: this.$locale.baseText('settings.communityNodes.uninstallAction.label'),
-					value: COMMUNITY_PACKAGE_MANAGE_ACTIONS.UNINSTALL,
-				},
-			],
-		};
-	},
-	computed: {
-		...mapStores(useUIStore),
-	},
-	methods: {
-		async onAction(value: string) {
-			if (!this.communityPackage) return;
-			switch (value) {
-				case COMMUNITY_PACKAGE_MANAGE_ACTIONS.VIEW_DOCS:
-					this.$telemetry.track('user clicked to browse the cnr package documentation', {
-						package_name: this.communityPackage.packageName,
-						package_version: this.communityPackage.installedVersion,
-					});
-					window.open(`${NPM_PACKAGE_DOCS_BASE_URL}${this.communityPackage.packageName}`, '_blank');
-					break;
-				case COMMUNITY_PACKAGE_MANAGE_ACTIONS.UNINSTALL:
-					this.uiStore.openCommunityPackageUninstallConfirmModal(this.communityPackage.packageName);
-					break;
-				default:
-					break;
-			}
-		},
-		onUpdateClick() {
-			if (!this.communityPackage) return;
-			this.uiStore.openCommunityPackageUpdateConfirmModal(this.communityPackage.packageName);
-		},
-	},
+interface Props {
+	communityPackage?: PublicInstalledPackage | null;
+	loading?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	communityPackage: null,
+	loading: false,
 });
+
+const { openCommunityPackageUpdateConfirmModal, openCommunityPackageUninstallConfirmModal } =
+	useUIStore();
+const i18n = useI18n();
+const telemetry = useTelemetry();
+
+const packageActions = [
+	{
+		label: i18n.baseText('settings.communityNodes.viewDocsAction.label'),
+		value: COMMUNITY_PACKAGE_MANAGE_ACTIONS.VIEW_DOCS,
+		type: 'external-link',
+	},
+	{
+		label: i18n.baseText('settings.communityNodes.uninstallAction.label'),
+		value: COMMUNITY_PACKAGE_MANAGE_ACTIONS.UNINSTALL,
+	},
+];
+
+async function onAction(value: string) {
+	if (!props.communityPackage) return;
+	switch (value) {
+		case COMMUNITY_PACKAGE_MANAGE_ACTIONS.VIEW_DOCS:
+			telemetry.track('user clicked to browse the cnr package documentation', {
+				package_name: props.communityPackage.packageName,
+				package_version: props.communityPackage.installedVersion,
+			});
+			window.open(`${NPM_PACKAGE_DOCS_BASE_URL}${props.communityPackage.packageName}`, '_blank');
+			break;
+		case COMMUNITY_PACKAGE_MANAGE_ACTIONS.UNINSTALL:
+			openCommunityPackageUninstallConfirmModal(props.communityPackage.packageName);
+			break;
+		default:
+			break;
+	}
+}
+
+function onUpdateClick() {
+	if (!props.communityPackage) return;
+	openCommunityPackageUpdateConfirmModal(props.communityPackage.packageName);
+}
 </script>
 
 <template>
@@ -76,7 +70,7 @@ export default defineComponent({
 				<div :class="$style.cardSubtitle">
 					<n8n-text :bold="true" size="small" color="text-light">
 						{{
-							$locale.baseText('settings.communityNodes.packageNodes.label', {
+							i18n.baseText('settings.communityNodes.packageNodes.label', {
 								adjustToNumber: communityPackage.installedNodes.length,
 							})
 						}}:&nbsp;
@@ -96,7 +90,7 @@ export default defineComponent({
 				<n8n-tooltip v-if="communityPackage.failedLoading === true" placement="top">
 					<template #content>
 						<div>
-							{{ $locale.baseText('settings.communityNodes.failedToLoad.tooltip') }}
+							{{ i18n.baseText('settings.communityNodes.failedToLoad.tooltip') }}
 						</div>
 					</template>
 					<n8n-icon icon="exclamation-triangle" color="danger" size="large" />
@@ -104,7 +98,7 @@ export default defineComponent({
 				<n8n-tooltip v-else-if="communityPackage.updateAvailable" placement="top">
 					<template #content>
 						<div>
-							{{ $locale.baseText('settings.communityNodes.updateAvailable.tooltip') }}
+							{{ i18n.baseText('settings.communityNodes.updateAvailable.tooltip') }}
 						</div>
 					</template>
 					<n8n-button outline label="Update" @click="onUpdateClick" />
@@ -112,7 +106,7 @@ export default defineComponent({
 				<n8n-tooltip v-else placement="top">
 					<template #content>
 						<div>
-							{{ $locale.baseText('settings.communityNodes.upToDate.tooltip') }}
+							{{ i18n.baseText('settings.communityNodes.upToDate.tooltip') }}
 						</div>
 					</template>
 					<n8n-icon icon="check-circle" color="text-light" size="large" />
diff --git a/packages/editor-ui/src/components/__tests__/CommunityPackageInstallModal.spec.ts b/packages/editor-ui/src/components/CommunityPackageInstallModal.test.ts
similarity index 95%
rename from packages/editor-ui/src/components/__tests__/CommunityPackageInstallModal.spec.ts
rename to packages/editor-ui/src/components/CommunityPackageInstallModal.test.ts
index a93ba7c878..bbf2701068 100644
--- a/packages/editor-ui/src/components/__tests__/CommunityPackageInstallModal.spec.ts
+++ b/packages/editor-ui/src/components/CommunityPackageInstallModal.test.ts
@@ -1,5 +1,5 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import CommunityPackageInstallModal from '../CommunityPackageInstallModal.vue';
+import CommunityPackageInstallModal from './CommunityPackageInstallModal.vue';
 import { createTestingPinia } from '@pinia/testing';
 import { COMMUNITY_PACKAGE_INSTALL_MODAL_KEY, STORES } from '@/constants';
 import userEvent from '@testing-library/user-event';
diff --git a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue b/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
index 420b193b30..bb4dd0bd4b 100644
--- a/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
+++ b/packages/editor-ui/src/components/CommunityPlusEnrollmentModal.vue
@@ -36,7 +36,7 @@ const validators = ref<{ [key: string]: IValidator }>({
 
 			if (!VALID_EMAIL_REGEX.test(value)) {
 				return {
-					messageKey: 'settings.users.invalidEmailError',
+					message: 'settings.users.invalidEmailError',
 					options: { interpolate: { email: value } },
 				};
 			}
diff --git a/packages/editor-ui/src/components/ContactPromptModal.vue b/packages/editor-ui/src/components/ContactPromptModal.vue
index d083234057..25bb8c8eba 100644
--- a/packages/editor-ui/src/components/ContactPromptModal.vue
+++ b/packages/editor-ui/src/components/ContactPromptModal.vue
@@ -1,7 +1,5 @@
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
+<script setup lang="ts">
+import { computed, ref } from 'vue';
 import type { IN8nPromptResponse, ModalKey } from '@/Interface';
 import { VALID_EMAIL_REGEX } from '@/constants';
 import Modal from '@/components/Modal.vue';
@@ -10,78 +8,69 @@ import { useRootStore } from '@/stores/root.store';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useToast } from '@/composables/useToast';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
+import { useTelemetry } from '@/composables/useTelemetry';
 
-export default defineComponent({
-	name: 'ContactPromptModal',
-	components: { Modal },
-	props: {
-		modalName: {
-			type: String as PropType<ModalKey>,
-			required: true,
-		},
-	},
-	setup() {
-		return {
-			...useToast(),
-		};
-	},
-	data() {
-		return {
-			email: '',
-			modalBus: createEventBus(),
-		};
-	},
-	computed: {
-		...mapStores(useRootStore, useSettingsStore, useNpsSurveyStore),
-		title(): string {
-			if (this.npsSurveyStore.promptsData?.title) {
-				return this.npsSurveyStore.promptsData.title;
-			}
+defineProps<{
+	modalName: ModalKey;
+}>();
 
-			return 'You’re a power user 💪';
-		},
-		description(): string {
-			if (this.npsSurveyStore.promptsData?.message) {
-				return this.npsSurveyStore.promptsData.message;
-			}
+const email = ref('');
+const modalBus = createEventBus();
 
-			return 'Your experience with n8n can help us improve — for you and our entire community.';
-		},
-		isEmailValid(): boolean {
-			return VALID_EMAIL_REGEX.test(String(this.email).toLowerCase());
-		},
-	},
-	methods: {
-		closeDialog(): void {
-			if (!this.isEmailValid) {
-				this.$telemetry.track('User closed email modal', {
-					instance_id: this.rootStore.instanceId,
-					email: null,
-				});
-			}
-		},
-		async send() {
-			if (this.isEmailValid) {
-				const response = (await this.settingsStore.submitContactInfo(
-					this.email,
-				)) as IN8nPromptResponse;
+const npsSurveyStore = useNpsSurveyStore();
+const rootStore = useRootStore();
+const settingsStore = useSettingsStore();
 
-				if (response.updated) {
-					this.$telemetry.track('User closed email modal', {
-						instance_id: this.rootStore.instanceId,
-						email: this.email,
-					});
-					this.showMessage({
-						title: 'Thanks!',
-						message: "It's people like you that help make n8n better",
-						type: 'success',
-					});
-				}
-				this.modalBus.emit('close');
-			}
-		},
-	},
+const toast = useToast();
+const telemetry = useTelemetry();
+
+const title = computed(() => {
+	if (npsSurveyStore.promptsData?.title) {
+		return npsSurveyStore.promptsData.title;
+	}
+
+	return 'You’re a power user 💪';
 });
+
+const description = computed(() => {
+	if (npsSurveyStore.promptsData?.message) {
+		return npsSurveyStore.promptsData.message;
+	}
+
+	return 'Your experience with n8n can help us improve — for you and our entire community.';
+});
+
+const isEmailValid = computed(() => {
+	return VALID_EMAIL_REGEX.test(String(email.value).toLowerCase());
+});
+
+const closeDialog = () => {
+	if (!isEmailValid.value) {
+		telemetry.track('User closed email modal', {
+			instance_id: rootStore.instanceId,
+			email: null,
+		});
+	}
+};
+
+const send = async () => {
+	if (isEmailValid.value) {
+		const response = (await settingsStore.submitContactInfo(email.value)) as IN8nPromptResponse;
+
+		if (response.updated) {
+			telemetry.track('User closed email modal', {
+				instance_id: rootStore.instanceId,
+				email: email.value,
+			});
+			toast.showMessage({
+				title: 'Thanks!',
+				message: "It's people like you that help make n8n better",
+				type: 'success',
+			});
+		}
+		modalBus.emit('close');
+	}
+};
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/__tests__/CopyInput.test.ts b/packages/editor-ui/src/components/CopyInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/CopyInput.test.ts
rename to packages/editor-ui/src/components/CopyInput.test.ts
diff --git a/packages/editor-ui/src/components/CredentialCard.test.ts b/packages/editor-ui/src/components/CredentialCard.test.ts
index 7b3abc6acb..e21edf0321 100644
--- a/packages/editor-ui/src/components/CredentialCard.test.ts
+++ b/packages/editor-ui/src/components/CredentialCard.test.ts
@@ -17,6 +17,7 @@ const createCredential = (overrides = {}): ICredentialsResponse => ({
 	type: '',
 	name: '',
 	sharedWithProjects: [],
+	isManaged: false,
 	homeProject: {} as ProjectSharingData,
 	...overrides,
 });
diff --git a/packages/editor-ui/src/components/CredentialCard.vue b/packages/editor-ui/src/components/CredentialCard.vue
index c39166f15a..4d4dd131f6 100644
--- a/packages/editor-ui/src/components/CredentialCard.vue
+++ b/packages/editor-ui/src/components/CredentialCard.vue
@@ -29,6 +29,7 @@ const props = withDefaults(
 	defineProps<{
 		data: ICredentialsResponse;
 		readOnly?: boolean;
+		needsSetup?: boolean;
 	}>(),
 	{
 		data: () => ({
@@ -39,6 +40,7 @@ const props = withDefaults(
 			name: '',
 			sharedWithProjects: [],
 			homeProject: {} as ProjectSharingData,
+			isManaged: false,
 		}),
 		readOnly: false,
 	},
@@ -145,6 +147,9 @@ function moveResource() {
 				<N8nBadge v-if="readOnly" class="ml-3xs" theme="tertiary" bold>
 					{{ locale.baseText('credentials.item.readonly') }}
 				</N8nBadge>
+				<N8nBadge v-if="needsSetup" class="ml-3xs" theme="warning">
+					{{ locale.baseText('credentials.item.needsSetup') }}
+				</N8nBadge>
 			</n8n-heading>
 		</template>
 		<div :class="$style.cardDescription">
@@ -161,6 +166,7 @@ function moveResource() {
 		<template #append>
 			<div :class="$style.cardActions" @click.stop>
 				<ProjectCardBadge
+					:class="$style.cardBadge"
 					:resource="data"
 					:resource-type="ResourceType.Credential"
 					:resource-type-label="resourceTypeLabel"
@@ -179,9 +185,10 @@ function moveResource() {
 
 <style lang="scss" module>
 .cardLink {
+	--card--padding: 0 0 0 var(--spacing-s);
+
 	transition: box-shadow 0.3s ease;
 	cursor: pointer;
-	padding: 0 0 0 var(--spacing-s);
 	align-items: stretch;
 
 	&:hover {
@@ -192,10 +199,6 @@ function moveResource() {
 .cardHeading {
 	font-size: var(--font-size-s);
 	padding: var(--spacing-s) 0 0;
-
-	span {
-		color: var(--color-text-light);
-	}
 }
 
 .cardDescription {
@@ -214,4 +217,22 @@ function moveResource() {
 	padding: 0 var(--spacing-s) 0 0;
 	cursor: default;
 }
+
+@include mixins.breakpoint('sm-and-down') {
+	.cardLink {
+		--card--padding: 0 var(--spacing-s) var(--spacing-s);
+		--card--append--width: 100%;
+
+		flex-wrap: wrap;
+	}
+
+	.cardActions {
+		width: 100%;
+		padding: 0;
+	}
+
+	.cardBadge {
+		margin-right: auto;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/CredentialConfig.test.ts b/packages/editor-ui/src/components/CredentialConfig.test.ts
new file mode 100644
index 0000000000..b84fcb3eae
--- /dev/null
+++ b/packages/editor-ui/src/components/CredentialConfig.test.ts
@@ -0,0 +1,56 @@
+import CredentialConfig from './CredentialEdit/CredentialConfig.vue';
+import { screen } from '@testing-library/vue';
+import type { ICredentialDataDecryptedObject, ICredentialType } from 'n8n-workflow';
+import { createTestingPinia } from '@pinia/testing';
+import type { RenderOptions } from '@/__tests__/render';
+import { createComponentRenderer } from '@/__tests__/render';
+import { STORES } from '@/constants';
+
+const defaultRenderOptions: RenderOptions = {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: {
+				settings: {
+					enterprise: {
+						sharing: false,
+						externalSecrets: false,
+					},
+				},
+			},
+		},
+	}),
+	props: {
+		isManaged: true,
+		mode: 'edit',
+		credentialType: {} as ICredentialType,
+		credentialProperties: [],
+		credentialData: {} as ICredentialDataDecryptedObject,
+		credentialPermissions: {
+			share: false,
+			move: false,
+			create: false,
+			read: false,
+			update: false,
+			delete: false,
+			list: false,
+		},
+	},
+};
+
+const renderComponent = createComponentRenderer(CredentialConfig, defaultRenderOptions);
+
+describe('CredentialConfig', () => {
+	it('should display a warning when isManaged is true', async () => {
+		renderComponent();
+		expect(
+			screen.queryByText('This is a managed credential and cannot be edited.'),
+		).toBeInTheDocument();
+	});
+
+	it('should not display a warning when isManaged is false', async () => {
+		renderComponent({ props: { isManaged: false } }, { merge: true });
+		expect(
+			screen.queryByText('This is a managed credential and cannot be edited.'),
+		).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
index cab337c2e5..0e686f0a73 100644
--- a/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/AuthTypeSelector.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
+import { useI18n } from '@/composables/useI18n';
 import type { IUpdateInformation, NodeAuthenticationOption } from '@/Interface';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
@@ -28,6 +29,8 @@ const emit = defineEmits<{
 const nodeTypesStore = useNodeTypesStore();
 const ndvStore = useNDVStore();
 
+const i18n = useI18n();
+
 const props = defineProps<Props>();
 
 const selected = ref('');
@@ -133,8 +136,8 @@ defineExpose({
 		</div>
 		<div>
 			<n8n-input-label
-				:label="$locale.baseText('credentialEdit.credentialConfig.authTypeSelectorLabel')"
-				:tooltip-text="$locale.baseText('credentialEdit.credentialConfig.authTypeSelectorTooltip')"
+				:label="i18n.baseText('credentialEdit.credentialConfig.authTypeSelectorLabel')"
+				:tooltip-text="i18n.baseText('credentialEdit.credentialConfig.authTypeSelectorTooltip')"
 				:required="true"
 			/>
 		</div>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index bac1079d75..45c1802852 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -55,6 +55,7 @@ type Props = {
 	isRetesting?: boolean;
 	requiredPropertiesFilled?: boolean;
 	showAuthTypeSelector?: boolean;
+	isManaged?: boolean;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -235,13 +236,16 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 </script>
 
 <template>
-	<div>
+	<n8n-callout v-if="isManaged" theme="warning" icon="exclamation-triangle">
+		{{ i18n.baseText('freeAi.credits.credentials.edit') }}
+	</n8n-callout>
+	<div v-else>
 		<div :class="$style.config" data-test-id="node-credentials-config-container">
 			<Banner
 				v-show="showValidationWarning"
 				theme="danger"
 				:message="
-					$locale.baseText(
+					i18n.baseText(
 						`credentialEdit.credentialConfig.pleaseCheckTheErrorsBelow${
 							credentialPermissions.update ? '' : '.sharee'
 						}`,
@@ -254,7 +258,7 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 				v-if="authError && !showValidationWarning"
 				theme="danger"
 				:message="
-					$locale.baseText(
+					i18n.baseText(
 						`credentialEdit.credentialConfig.couldntConnectWithTheseSettings${
 							credentialPermissions.update ? '' : '.sharee'
 						}`,
@@ -262,9 +266,9 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 					)
 				"
 				:details="authError"
-				:button-label="$locale.baseText('credentialEdit.credentialConfig.retry')"
+				:button-label="i18n.baseText('credentialEdit.credentialConfig.retry')"
 				button-loading-label="Retrying"
-				:button-title="$locale.baseText('credentialEdit.credentialConfig.retryCredentialTest')"
+				:button-title="i18n.baseText('credentialEdit.credentialConfig.retryCredentialTest')"
 				:button-loading="isRetesting"
 				@click="$emit('retest')"
 			/>
@@ -272,18 +276,16 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 			<Banner
 				v-show="showOAuthSuccessBanner && !showValidationWarning"
 				theme="success"
-				:message="$locale.baseText('credentialEdit.credentialConfig.accountConnected')"
-				:button-label="$locale.baseText('credentialEdit.credentialConfig.reconnect')"
-				:button-title="
-					$locale.baseText('credentialEdit.credentialConfig.reconnectOAuth2Credential')
-				"
+				:message="i18n.baseText('credentialEdit.credentialConfig.accountConnected')"
+				:button-label="i18n.baseText('credentialEdit.credentialConfig.reconnect')"
+				:button-title="i18n.baseText('credentialEdit.credentialConfig.reconnectOAuth2Credential')"
 				data-test-id="oauth-connect-success-banner"
 				@click="$emit('oauth')"
 			>
 				<template v-if="isGoogleOAuthType" #button>
 					<p
 						:class="$style.googleReconnectLabel"
-						v-text="`${$locale.baseText('credentialEdit.credentialConfig.reconnect')}:`"
+						v-text="`${i18n.baseText('credentialEdit.credentialConfig.reconnect')}:`"
 					/>
 					<GoogleAuthButton @click="$emit('oauth')" />
 				</template>
@@ -292,10 +294,10 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 			<Banner
 				v-show="testedSuccessfully && !showValidationWarning"
 				theme="success"
-				:message="$locale.baseText('credentialEdit.credentialConfig.connectionTestedSuccessfully')"
-				:button-label="$locale.baseText('credentialEdit.credentialConfig.retry')"
-				:button-loading-label="$locale.baseText('credentialEdit.credentialConfig.retrying')"
-				:button-title="$locale.baseText('credentialEdit.credentialConfig.retryCredentialTest')"
+				:message="i18n.baseText('credentialEdit.credentialConfig.connectionTestedSuccessfully')"
+				:button-label="i18n.baseText('credentialEdit.credentialConfig.retry')"
+				:button-loading-label="i18n.baseText('credentialEdit.credentialConfig.retrying')"
+				:button-title="i18n.baseText('credentialEdit.credentialConfig.retryCredentialTest')"
 				:button-loading="isRetesting"
 				data-test-id="credentials-config-container-test-success"
 				@click="$emit('retest')"
@@ -306,10 +308,10 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 					v-if="documentationUrl && credentialProperties.length && !showCredentialDocs"
 					theme="warning"
 				>
-					{{ $locale.baseText('credentialEdit.credentialConfig.needHelpFillingOutTheseFields') }}
+					{{ i18n.baseText('credentialEdit.credentialConfig.needHelpFillingOutTheseFields') }}
 					<span class="ml-4xs">
 						<n8n-link :to="documentationUrl" size="small" bold @click="onDocumentationUrlClick">
-							{{ $locale.baseText('credentialEdit.credentialConfig.openDocs') }}
+							{{ i18n.baseText('credentialEdit.credentialConfig.openDocs') }}
 						</n8n-link>
 					</span>
 				</n8n-notice>
@@ -331,16 +333,16 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 
 				<CopyInput
 					v-if="isOAuthType && !allOAuth2BasePropertiesOverridden"
-					:label="$locale.baseText('credentialEdit.credentialConfig.oAuthRedirectUrl')"
+					:label="i18n.baseText('credentialEdit.credentialConfig.oAuthRedirectUrl')"
 					:value="oAuthCallbackUrl"
-					:copy-button-text="$locale.baseText('credentialEdit.credentialConfig.clickToCopy')"
+					:copy-button-text="i18n.baseText('credentialEdit.credentialConfig.clickToCopy')"
 					:hint="
-						$locale.baseText('credentialEdit.credentialConfig.subtitle', {
+						i18n.baseText('credentialEdit.credentialConfig.subtitle', {
 							interpolate: { appName },
 						})
 					"
 					:toast-title="
-						$locale.baseText('credentialEdit.credentialConfig.redirectUrlCopiedToClipboard')
+						i18n.baseText('credentialEdit.credentialConfig.redirectUrlCopiedToClipboard')
 					"
 					:redact-value="true"
 				/>
@@ -349,7 +351,7 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 				<div>
 					<n8n-info-tip :bold="false">
 						{{
-							$locale.baseText('credentialEdit.credentialEdit.info.sharee', {
+							i18n.baseText('credentialEdit.credentialEdit.info.sharee', {
 								interpolate: { credentialOwnerName },
 							})
 						}}
@@ -379,15 +381,15 @@ watch(showOAuthSuccessBanner, (newValue, oldValue) => {
 			/>
 
 			<n8n-text v-if="isMissingCredentials" color="text-base" size="medium">
-				{{ $locale.baseText('credentialEdit.credentialConfig.missingCredentialType') }}
+				{{ i18n.baseText('credentialEdit.credentialConfig.missingCredentialType') }}
 			</n8n-text>
 
 			<EnterpriseEdition :features="[EnterpriseEditionFeature.ExternalSecrets]">
 				<template #fallback>
 					<n8n-info-tip class="mt-s">
-						{{ $locale.baseText('credentialEdit.credentialConfig.externalSecrets') }}
-						<n8n-link bold :to="$locale.baseText('settings.externalSecrets.docs')" size="small">
-							{{ $locale.baseText('credentialEdit.credentialConfig.externalSecrets.moreInfo') }}
+						{{ i18n.baseText('credentialEdit.credentialConfig.externalSecrets') }}
+						<n8n-link bold :to="i18n.baseText('settings.externalSecrets.docs')" size="small">
+							{{ i18n.baseText('credentialEdit.credentialConfig.externalSecrets.moreInfo') }}
 						</n8n-link>
 					</n8n-info-tip>
 				</template>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
index efbde8d1fb..0e2abb675a 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
@@ -22,7 +22,6 @@ import { NodeHelpers } from 'n8n-workflow';
 import CredentialConfig from '@/components/CredentialEdit/CredentialConfig.vue';
 import CredentialInfo from '@/components/CredentialEdit/CredentialInfo.vue';
 import CredentialSharing from '@/components/CredentialEdit/CredentialSharing.ee.vue';
-import FeatureComingSoon from '@/components/FeatureComingSoon.vue';
 import InlineNameEdit from '@/components/InlineNameEdit.vue';
 import Modal from '@/components/Modal.vue';
 import SaveButton from '@/components/SaveButton.vue';
@@ -37,7 +36,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type { ProjectSharingData } from '@/types/projects.types';
+import type { Project, ProjectSharingData } from '@/types/projects.types';
 import { assert } from '@/utils/assert';
 import type { IMenuItem } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system/utils';
@@ -89,6 +88,7 @@ const isDeleting = ref(false);
 const isSaving = ref(false);
 const isTesting = ref(false);
 const hasUnsavedChanges = ref(false);
+const isSaved = ref(false);
 const loading = ref(false);
 const showValidationWarning = ref(false);
 const testedSuccessfully = ref(false);
@@ -160,6 +160,11 @@ const credentialTypeName = computed(() => {
 	return `${props.activeId}`;
 });
 
+const isEditingManagedCredential = computed(() => {
+	if (!props.activeId) return false;
+	return credentialsStore.getCredentialById(props.activeId)?.isManaged ?? false;
+});
+
 const isCredentialTestable = computed(() => {
 	if (isOAuthType.value || !requiredPropertiesFilled.value) {
 		return false;
@@ -318,8 +323,8 @@ const defaultCredentialTypeName = computed(() => {
 
 const showSaveButton = computed(() => {
 	return (
-		(hasUnsavedChanges.value || !!credentialId.value) &&
-		(credentialPermissions.value.create || credentialPermissions.value.update)
+		(props.mode === 'new' || hasUnsavedChanges.value || isSaved.value) &&
+		(credentialPermissions.value.create ?? credentialPermissions.value.update)
 	);
 });
 
@@ -518,14 +523,13 @@ async function loadCurrentCredential() {
 
 function onTabSelect(tab: string) {
 	activeTab.value = tab;
-	const tabName: string = tab.replaceAll('coming-soon/', '');
 	const credType: string = credentialType.value ? credentialType.value.name : '';
 	const activeNode: INode | null = ndvStore.activeNode;
 
 	telemetry.track('User viewed credential tab', {
 		credential_type: credType,
 		node_type: activeNode ? activeNode.type : null,
-		tab: tabName,
+		tab,
 		workflow_id: workflowsStore.workflowId,
 		credential_id: credentialId.value,
 		sharing_enabled: EnterpriseEditionFeature.Sharing,
@@ -598,6 +602,10 @@ function scrollToBottom() {
 }
 
 async function retestCredential() {
+	if (isEditingManagedCredential.value) {
+		return;
+	}
+
 	if (!isCredentialTestable.value || !credentialTypeName.value) {
 		authError.value = '';
 		testedSuccessfully.value = false;
@@ -682,30 +690,7 @@ async function saveCredential(): Promise<ICredentialsResponse | null> {
 	const isNewCredential = props.mode === 'new' && !credentialId.value;
 
 	if (isNewCredential) {
-		credential = await createCredential(credentialDetails, projectsStore.currentProjectId);
-
-		let toastTitle = i18n.baseText('credentials.create.personal.toast.title');
-		let toastText = '';
-
-		if (!credentialDetails.sharedWithProjects) {
-			toastText = i18n.baseText('credentials.create.personal.toast.text');
-		}
-
-		if (projectsStore.currentProject) {
-			toastTitle = i18n.baseText('credentials.create.project.toast.title', {
-				interpolate: { projectName: projectsStore.currentProject.name ?? '' },
-			});
-
-			toastText = i18n.baseText('credentials.create.project.toast.text', {
-				interpolate: { projectName: projectsStore.currentProject.name ?? '' },
-			});
-		}
-
-		toast.showMessage({
-			title: toastTitle,
-			message: toastText,
-			type: 'success',
-		});
+		credential = await createCredential(credentialDetails, projectsStore.currentProject);
 	} else {
 		if (settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing]) {
 			credentialDetails.sharedWithProjects = credentialData.value
@@ -772,15 +757,53 @@ async function saveCredential(): Promise<ICredentialsResponse | null> {
 	return credential;
 }
 
+const createToastMessagingForNewCredentials = (
+	credentialDetails: ICredentialsDecrypted,
+	project?: Project | null,
+) => {
+	let toastTitle = i18n.baseText('credentials.create.personal.toast.title');
+	let toastText = '';
+
+	if (!credentialDetails.sharedWithProjects) {
+		toastText = i18n.baseText('credentials.create.personal.toast.text');
+	}
+
+	if (
+		projectsStore.currentProject &&
+		projectsStore.currentProject.id !== projectsStore.personalProject?.id
+	) {
+		toastTitle = i18n.baseText('credentials.create.project.toast.title', {
+			interpolate: { projectName: project?.name ?? '' },
+		});
+
+		toastText = i18n.baseText('credentials.create.project.toast.text', {
+			interpolate: { projectName: project?.name ?? '' },
+		});
+	}
+
+	return {
+		title: toastTitle,
+		message: toastText,
+	};
+};
+
 async function createCredential(
 	credentialDetails: ICredentialsDecrypted,
-	projectId?: string,
+	project?: Project | null,
 ): Promise<ICredentialsResponse | null> {
 	let credential;
 
 	try {
-		credential = await credentialsStore.createNewCredential(credentialDetails, projectId);
+		credential = await credentialsStore.createNewCredential(credentialDetails, project?.id);
 		hasUnsavedChanges.value = false;
+
+		const { title, message } = createToastMessagingForNewCredentials(credentialDetails, project);
+
+		toast.showMessage({
+			title,
+			message,
+			type: 'success',
+		});
 	} catch (error) {
 		toast.showError(
 			error,
@@ -828,6 +851,7 @@ async function updateCredential(
 			isSharedWithChanged.value = false;
 		}
 		hasUnsavedChanges.value = false;
+		isSaved.value = true;
 
 		if (credential) {
 			await externalHooks.run('credential.saved', {
@@ -879,6 +903,7 @@ async function deleteCredential() {
 		isDeleting.value = true;
 		await credentialsStore.deleteCredential({ id: credentialId.value });
 		hasUnsavedChanges.value = false;
+		isSaved.value = true;
 	} catch (error) {
 		toast.showError(
 			error,
@@ -1045,7 +1070,9 @@ function resetCredentialData(): void {
 					<InlineNameEdit
 						:model-value="credentialName"
 						:subtitle="credentialType ? credentialType.displayName : ''"
-						:readonly="!credentialPermissions.update || !credentialType"
+						:readonly="
+							!credentialPermissions.update || !credentialType || isEditingManagedCredential
+						"
 						type="Credential"
 						data-test-id="credential-name"
 						@update:model-value="onNameEdit"
@@ -1054,7 +1081,7 @@ function resetCredentialData(): void {
 				<div :class="$style.credActions">
 					<n8n-icon-button
 						v-if="currentCredential && credentialPermissions.delete"
-						:title="$locale.baseText('credentialEdit.credentialEdit.delete')"
+						:title="i18n.baseText('credentialEdit.credentialEdit.delete')"
 						icon="trash"
 						type="tertiary"
 						:disabled="isSaving"
@@ -1064,12 +1091,12 @@ function resetCredentialData(): void {
 					/>
 					<SaveButton
 						v-if="showSaveButton"
-						:saved="!hasUnsavedChanges && !isTesting"
+						:saved="!hasUnsavedChanges && !isTesting && !!credentialId"
 						:is-saving="isSaving || isTesting"
 						:saving-label="
 							isTesting
-								? $locale.baseText('credentialEdit.credentialEdit.testing')
-								: $locale.baseText('credentialEdit.credentialEdit.saving')
+								? i18n.baseText('credentialEdit.credentialEdit.testing')
+								: i18n.baseText('credentialEdit.credentialEdit.saving')
 						"
 						data-test-id="credential-save-button"
 						@click="saveCredential"
@@ -1079,7 +1106,7 @@ function resetCredentialData(): void {
 		</template>
 		<template #content>
 			<div :class="$style.container" data-test-id="credential-edit-dialog">
-				<div :class="$style.sidebar">
+				<div v-if="!isEditingManagedCredential" :class="$style.sidebar">
 					<n8n-menu
 						mode="tabs"
 						:items="sidebarItems"
@@ -1097,6 +1124,7 @@ function resetCredentialData(): void {
 						:credential-properties="credentialProperties"
 						:credential-data="credentialData"
 						:credential-id="credentialId"
+						:is-managed="isEditingManagedCredential"
 						:show-validation-warning="showValidationWarning"
 						:auth-error="authError"
 						:tested-successfully="testedSuccessfully"
@@ -1130,9 +1158,6 @@ function resetCredentialData(): void {
 				<div v-else-if="activeTab === 'details' && credentialType" :class="$style.mainContent">
 					<CredentialInfo :current-credential="currentCredential" />
 				</div>
-				<div v-else-if="activeTab.startsWith('coming-soon')" :class="$style.mainContent">
-					<FeatureComingSoon :feature-id="activeTab.split('/')[1]"></FeatureComingSoon>
-				</div>
 			</div>
 		</template>
 	</Modal>
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 1c2242195c..e54f247cea 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
 import { useI18n } from '@/composables/useI18n';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { EnterpriseEditionFeature } from '@/constants';
 import type { ICredentialsDecryptedResponse, ICredentialsResponse } from '@/Interface';
 import type { PermissionsRecord } from '@/permissions';
@@ -39,6 +40,8 @@ const settingsStore = useSettingsStore();
 const projectsStore = useProjectsStore();
 const rolesStore = useRolesStore();
 
+const pageRedirectionHelper = usePageRedirectionHelper();
+
 const sharedWithProjects = ref([...(props.credential?.sharedWithProjects ?? [])]);
 
 const isSharingEnabled = computed(
@@ -107,7 +110,7 @@ onMounted(async () => {
 });
 
 function goToUpgrade() {
-	void uiStore.goToUpgrade('credential_sharing', 'upgrade-credentials-sharing');
+	void pageRedirectionHelper.goToUpgrade('credential_sharing', 'upgrade-credentials-sharing');
 }
 </script>
 
diff --git a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
index 8a67505130..b0e7b6a4d1 100644
--- a/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/GoogleAuthButton.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
 import { useUIStore } from '@/stores/ui.store';
 import { useRootStore } from '@/stores/root.store';
+import { useI18n } from '@/composables/useI18n';
 
 const { baseUrl } = useRootStore();
 const type = useUIStore().appliedTheme === 'dark' ? '.dark.png' : '.png';
+const i18n = useI18n();
 const googleAuthButtons = {
 	'--google-auth-btn-normal': `url(${baseUrl}static/google-auth/normal${type}`,
 	'--google-auth-btn-focus': `url(${baseUrl}static/google-auth/focus${type}`,
@@ -15,7 +17,7 @@ const googleAuthButtons = {
 <template>
 	<button
 		:class="$style.googleAuthBtn"
-		:title="$locale.baseText('credentialEdit.oAuthButton.signInWithGoogle')"
+		:title="i18n.baseText('credentialEdit.oAuthButton.signInWithGoogle')"
 		:style="googleAuthButtons"
 	/>
 </template>
diff --git a/packages/editor-ui/src/components/CredentialEdit/__tests__/OauthButton.test.ts b/packages/editor-ui/src/components/CredentialEdit/OauthButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/CredentialEdit/__tests__/OauthButton.test.ts
rename to packages/editor-ui/src/components/CredentialEdit/OauthButton.test.ts
diff --git a/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue b/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue
index 427b15a4d5..2911cbcd90 100644
--- a/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/OauthButton.vue
@@ -1,9 +1,11 @@
 <script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
 import GoogleAuthButton from './GoogleAuthButton.vue';
 
 defineProps<{
 	isGoogleOAuthType: boolean;
 }>();
+const i18n = useI18n();
 </script>
 
 <template>
@@ -11,7 +13,7 @@ defineProps<{
 		<GoogleAuthButton v-if="isGoogleOAuthType" />
 		<n8n-button
 			v-else
-			:label="$locale.baseText('credentialEdit.oAuthButton.connectMyAccount')"
+			:label="i18n.baseText('credentialEdit.oAuthButton.connectMyAccount')"
 			size="large"
 		/>
 	</div>
diff --git a/packages/editor-ui/src/components/CredentialEdit/__tests__/CredentialEdit.test.ts b/packages/editor-ui/src/components/CredentialEdit/__tests__/CredentialEdit.test.ts
new file mode 100644
index 0000000000..0048baf52d
--- /dev/null
+++ b/packages/editor-ui/src/components/CredentialEdit/__tests__/CredentialEdit.test.ts
@@ -0,0 +1,126 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import CredentialEdit from '@/components/CredentialEdit/CredentialEdit.vue';
+import { createTestingPinia } from '@pinia/testing';
+import { CREDENTIAL_EDIT_MODAL_KEY, STORES } from '@/constants';
+import { cleanupAppModals, createAppModals, retry } from '@/__tests__/utils';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import type { ICredentialsResponse } from '@/Interface';
+
+vi.mock('@/permissions', () => ({
+	getResourcePermissions: vi.fn(() => ({
+		credential: {
+			create: true,
+			update: true,
+		},
+	})),
+}));
+
+const renderComponent = createComponentRenderer(CredentialEdit, {
+	pinia: createTestingPinia({
+		initialState: {
+			[STORES.UI]: {
+				modalsById: {
+					[CREDENTIAL_EDIT_MODAL_KEY]: { open: true },
+				},
+			},
+			[STORES.SETTINGS]: {
+				settings: {
+					enterprise: {
+						sharing: true,
+						externalSecrets: false,
+					},
+					templates: {
+						host: '',
+					},
+				},
+			},
+		},
+	}),
+});
+describe('CredentialEdit', () => {
+	beforeEach(() => {
+		createAppModals();
+	});
+
+	afterEach(() => {
+		cleanupAppModals();
+		vi.clearAllMocks();
+	});
+
+	test('shows the save button when credentialId is null', async () => {
+		const { queryByTestId } = renderComponent({
+			props: {
+				isTesting: false,
+				isSaving: false,
+				hasUnsavedChanges: false,
+				modalName: CREDENTIAL_EDIT_MODAL_KEY,
+				mode: 'new',
+			},
+		});
+		await retry(() => expect(queryByTestId('credential-save-button')).toBeInTheDocument());
+	});
+
+	test('hides the save button when credentialId exists and there are no unsaved changes', async () => {
+		const { queryByTestId } = renderComponent({
+			props: {
+				activeId: '123', // credentialId will be set to this value in edit mode
+				isTesting: false,
+				isSaving: false,
+				hasUnsavedChanges: false,
+				modalName: CREDENTIAL_EDIT_MODAL_KEY,
+				mode: 'edit',
+			},
+		});
+		await retry(() => expect(queryByTestId('credential-save-button')).not.toBeInTheDocument());
+	});
+
+	test('hides menu item when credential is managed', async () => {
+		const credentialsStore = useCredentialsStore();
+
+		credentialsStore.state.credentials = {
+			'123': {
+				isManaged: false,
+			} as ICredentialsResponse,
+		};
+
+		const { queryByText } = renderComponent({
+			props: {
+				activeId: '123', // credentialId will be set to this value in edit mode
+				isTesting: false,
+				isSaving: false,
+				hasUnsavedChanges: false,
+				modalName: CREDENTIAL_EDIT_MODAL_KEY,
+				mode: 'edit',
+			},
+		});
+
+		await retry(() => expect(queryByText('Details')).toBeInTheDocument());
+		await retry(() => expect(queryByText('Connection')).toBeInTheDocument());
+		await retry(() => expect(queryByText('Sharing')).toBeInTheDocument());
+	});
+
+	test('shows menu item when credential is not managed', async () => {
+		const credentialsStore = useCredentialsStore();
+
+		credentialsStore.state.credentials = {
+			'123': {
+				isManaged: true,
+			} as ICredentialsResponse,
+		};
+
+		const { queryByText } = renderComponent({
+			props: {
+				activeId: '123', // credentialId will be set to this value in edit mode
+				isTesting: false,
+				isSaving: false,
+				hasUnsavedChanges: false,
+				modalName: CREDENTIAL_EDIT_MODAL_KEY,
+				mode: 'edit',
+			},
+		});
+
+		await retry(() => expect(queryByText('Details')).not.toBeInTheDocument());
+		await retry(() => expect(queryByText('Connection')).not.toBeInTheDocument());
+		await retry(() => expect(queryByText('Sharing')).not.toBeInTheDocument());
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts b/packages/editor-ui/src/components/CredentialIcon.test.ts
similarity index 97%
rename from packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts
rename to packages/editor-ui/src/components/CredentialIcon.test.ts
index 79bcc4b882..32a8ef6d72 100644
--- a/packages/editor-ui/src/components/__tests__/CredentialIcon.test.ts
+++ b/packages/editor-ui/src/components/CredentialIcon.test.ts
@@ -7,7 +7,7 @@ import CredentialIcon from '@/components/CredentialIcon.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { useRootStore } from '@/stores/root.store';
-import { useNodeTypesStore } from '../../stores/nodeTypes.store';
+import { useNodeTypesStore } from '../stores/nodeTypes.store';
 
 describe('CredentialIcon', () => {
 	const renderComponent = createComponentRenderer(CredentialIcon, {
diff --git a/packages/editor-ui/src/components/CredentialsSelect.vue b/packages/editor-ui/src/components/CredentialsSelect.vue
index 41989fb690..36807f12a4 100644
--- a/packages/editor-ui/src/components/CredentialsSelect.vue
+++ b/packages/editor-ui/src/components/CredentialsSelect.vue
@@ -6,6 +6,7 @@ import NodeCredentials from '@/components/NodeCredentials.vue';
 import { useCredentialsStore } from '@/stores/credentials.store';
 import { N8nOption, N8nSelect } from 'n8n-design-system';
 import type { INodeUi, INodeUpdatePropertiesInformation } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
 
 type Props = {
 	activeCredentialType: string;
@@ -28,6 +29,8 @@ const emit = defineEmits<{
 
 const credentialsStore = useCredentialsStore();
 
+const i18n = useI18n();
+
 const innerSelectRef = ref<HTMLSelectElement>();
 
 const allCredentialTypes = computed(() => credentialsStore.allCredentialTypes);
@@ -119,7 +122,7 @@ defineExpose({ focus });
 				:size="inputSize"
 				filterable
 				:model-value="displayValue"
-				:placeholder="$locale.baseText('parameterInput.select')"
+				:placeholder="i18n.baseText('parameterInput.select')"
 				:title="displayTitle"
 				:disabled="isReadOnly"
 				data-test-id="credential-select"
diff --git a/packages/editor-ui/src/components/CredentialsSelectModal.vue b/packages/editor-ui/src/components/CredentialsSelectModal.vue
index ad05495ff8..80a1f9576d 100644
--- a/packages/editor-ui/src/components/CredentialsSelectModal.vue
+++ b/packages/editor-ui/src/components/CredentialsSelectModal.vue
@@ -9,9 +9,11 @@ import { createEventBus } from 'n8n-design-system/utils';
 import { onMounted, ref } from 'vue';
 import { CREDENTIAL_SELECT_MODAL_KEY } from '../constants';
 import Modal from './Modal.vue';
+import { useI18n } from '@/composables/useI18n';
 
 const externalHooks = useExternalHooks();
 const telemetry = useTelemetry();
+const i18n = useI18n();
 
 const modalBus = ref(createEventBus());
 const selected = ref('');
@@ -68,19 +70,19 @@ function openCredentialType() {
 	>
 		<template #header>
 			<h2 :class="$style.title">
-				{{ $locale.baseText('credentialSelectModal.addNewCredential') }}
+				{{ i18n.baseText('credentialSelectModal.addNewCredential') }}
 			</h2>
 		</template>
 		<template #content>
 			<div>
 				<div :class="$style.subtitle">
-					{{ $locale.baseText('credentialSelectModal.selectAnAppOrServiceToConnectTo') }}
+					{{ i18n.baseText('credentialSelectModal.selectAnAppOrServiceToConnectTo') }}
 				</div>
 				<N8nSelect
 					ref="selectRef"
 					filterable
 					default-first-option
-					:placeholder="$locale.baseText('credentialSelectModal.searchForApp')"
+					:placeholder="i18n.baseText('credentialSelectModal.searchForApp')"
 					size="xlarge"
 					:model-value="selected"
 					data-test-id="new-credential-type-select"
@@ -103,7 +105,7 @@ function openCredentialType() {
 		<template #footer>
 			<div :class="$style.footer">
 				<N8nButton
-					:label="$locale.baseText('credentialSelectModal.continue')"
+					:label="i18n.baseText('credentialSelectModal.continue')"
 					float="right"
 					size="large"
 					:disabled="!selected"
diff --git a/packages/editor-ui/src/components/DropArea/__tests__/DropArea.test.ts b/packages/editor-ui/src/components/DropArea/DropArea.test.ts
similarity index 96%
rename from packages/editor-ui/src/components/DropArea/__tests__/DropArea.test.ts
rename to packages/editor-ui/src/components/DropArea/DropArea.test.ts
index d9c8371d72..2ad454006a 100644
--- a/packages/editor-ui/src/components/DropArea/__tests__/DropArea.test.ts
+++ b/packages/editor-ui/src/components/DropArea/DropArea.test.ts
@@ -4,7 +4,7 @@ import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
 import { fireEvent } from '@testing-library/vue';
 import { createPinia, setActivePinia } from 'pinia';
-import DropArea from '../DropArea.vue';
+import DropArea from './DropArea.vue';
 
 const renderComponent = createComponentRenderer(DropArea, {
 	pinia: createTestingPinia(),
diff --git a/packages/editor-ui/src/components/EnterpriseEdition.ee.vue b/packages/editor-ui/src/components/EnterpriseEdition.ee.vue
index 1ee2f4eeba..e48376a73b 100644
--- a/packages/editor-ui/src/components/EnterpriseEdition.ee.vue
+++ b/packages/editor-ui/src/components/EnterpriseEdition.ee.vue
@@ -1,26 +1,25 @@
-<script lang="ts">
-import { type PropType, defineComponent } from 'vue';
+<script setup lang="ts">
+import { computed } from 'vue';
 import type { EnterpriseEditionFeatureValue } from '@/Interface';
-import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings.store';
 
-export default defineComponent({
-	name: 'EnterpriseEdition',
-	props: {
-		features: {
-			type: Array as PropType<EnterpriseEditionFeatureValue[]>,
-			default: () => [],
-		},
+const props = withDefaults(
+	defineProps<{
+		features: EnterpriseEditionFeatureValue[];
+	}>(),
+	{
+		features: () => [],
 	},
-	computed: {
-		...mapStores(useSettingsStore),
-		canAccess(): boolean {
-			return this.features.reduce((acc: boolean, feature) => {
-				return acc && !!this.settingsStore.isEnterpriseFeatureEnabled[feature];
-			}, true);
-		},
-	},
-});
+);
+
+const settingsStore = useSettingsStore();
+
+const canAccess = computed(() =>
+	props.features.reduce(
+		(acc: boolean, feature) => acc && !!settingsStore.isEnterpriseFeatureEnabled[feature],
+		true,
+	),
+);
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.test.ts b/packages/editor-ui/src/components/Error/NodeErrorView.test.ts
new file mode 100644
index 0000000000..af9960bc62
--- /dev/null
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.test.ts
@@ -0,0 +1,187 @@
+import { createComponentRenderer } from '@/__tests__/render';
+
+import NodeErrorView from '@/components/Error/NodeErrorView.vue';
+
+import { createTestingPinia } from '@pinia/testing';
+import type { NodeError } from 'n8n-workflow';
+import { useAssistantStore } from '@/stores/assistant.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { mockedStore } from '@/__tests__/utils';
+import userEvent from '@testing-library/user-event';
+import { useNDVStore } from '@/stores/ndv.store';
+
+const renderComponent = createComponentRenderer(NodeErrorView);
+
+let mockAiAssistantStore: ReturnType<typeof mockedStore<typeof useAssistantStore>>;
+let mockNodeTypeStore: ReturnType<typeof mockedStore<typeof useNodeTypesStore>>;
+let mockNdvStore: ReturnType<typeof mockedStore<typeof useNDVStore>>;
+
+describe('NodeErrorView.vue', () => {
+	let error: NodeError;
+
+	beforeEach(() => {
+		createTestingPinia();
+
+		mockAiAssistantStore = mockedStore(useAssistantStore);
+		mockNodeTypeStore = mockedStore(useNodeTypesStore);
+		mockNdvStore = mockedStore(useNDVStore);
+		//@ts-expect-error
+		error = {
+			name: 'NodeOperationError',
+			message: 'Test error message',
+			description: 'Test error description',
+			context: {
+				descriptionKey: 'noInputConnection',
+				nodeCause: 'Test node cause',
+				runIndex: '1',
+				itemIndex: '2',
+				parameter: 'testParameter',
+				data: { key: 'value' },
+				causeDetailed: 'Detailed cause',
+			},
+			node: {
+				parameters: {
+					mode: 'runOnceForAllItems',
+					language: 'javaScript',
+					jsCode: 'cons error = 9;',
+					notice: '',
+				},
+				id: 'd1ce5dc9-f9ae-4ac6-84e5-0696ba175dd9',
+				name: 'ErrorCode',
+				type: 'n8n-nodes-base.code',
+				typeVersion: 2,
+				position: [940, 240],
+			},
+			stack: 'Test stack trace',
+		};
+	});
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders an Error with a messages array', async () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				error: {
+					node: error.node,
+					messages: ['Unexpected identifier [line 1]'],
+				},
+			},
+		});
+
+		const errorMessage = getByTestId('node-error-message');
+
+		expect(errorMessage).toHaveTextContent('Unexpected identifier [line 1]');
+	});
+
+	it('renders an Error with a message string', async () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				error: {
+					node: error.node,
+					message: 'Unexpected identifier [line 1]',
+				},
+			},
+		});
+
+		const errorMessage = getByTestId('node-error-message');
+
+		expect(errorMessage).toHaveTextContent('Unexpected identifier [line 1]');
+	});
+
+	it('should not render AI assistant button when error happens in deprecated function node', async () => {
+		//@ts-expect-error
+		mockNodeTypeStore.getNodeType = vi.fn(() => ({
+			type: 'n8n-nodes-base.function',
+			typeVersion: 1,
+			hidden: true,
+		}));
+
+		mockAiAssistantStore.canShowAssistantButtonsOnCanvas = true;
+
+		const { queryByTestId } = renderComponent({
+			props: {
+				error: {
+					node: {
+						...error.node,
+						type: 'n8n-nodes-base.function',
+						typeVersion: 1,
+					},
+				},
+			},
+		});
+
+		const aiAssistantButton = queryByTestId('ask-assistant-button');
+
+		expect(aiAssistantButton).toBeNull();
+	});
+
+	it('renders error message', () => {
+		const { getByTestId } = renderComponent({
+			props: { error },
+		});
+		expect(getByTestId('node-error-message').textContent).toContain('Test error message');
+	});
+
+	it('renders error description', () => {
+		const { getByTestId } = renderComponent({
+			props: { error },
+		});
+		expect(getByTestId('node-error-description').innerHTML).toContain(
+			'This node has no input data. Please make sure this node is connected to another node.',
+		);
+	});
+
+	it('renders stack trace', () => {
+		const { getByText } = renderComponent({
+			props: { error },
+		});
+		expect(getByText('Test stack trace')).toBeTruthy();
+	});
+
+	it('renders open node button when the error is in sub node', () => {
+		const { getByTestId, queryByTestId } = renderComponent({
+			props: {
+				error: {
+					...error,
+					name: 'NodeOperationError',
+					functionality: 'configuration-node',
+				},
+			},
+		});
+
+		expect(getByTestId('node-error-view-open-node-button')).toHaveTextContent('Open errored node');
+
+		expect(queryByTestId('ask-assistant-button')).not.toBeInTheDocument();
+	});
+
+	it('does not renders open node button when the error is in sub node', () => {
+		mockAiAssistantStore.canShowAssistantButtonsOnCanvas = true;
+		const { getByTestId, queryByTestId } = renderComponent({
+			props: {
+				error,
+			},
+		});
+
+		expect(queryByTestId('node-error-view-open-node-button')).not.toBeInTheDocument();
+
+		expect(getByTestId('ask-assistant-button')).toBeInTheDocument();
+	});
+
+	it('open error node details when open error node is clicked', async () => {
+		const { getByTestId, emitted } = renderComponent({
+			props: {
+				error: {
+					...error,
+					name: 'NodeOperationError',
+					functionality: 'configuration-node',
+				},
+			},
+		});
+
+		await userEvent.click(getByTestId('node-error-view-open-node-button'));
+
+		expect(emitted().click).toHaveLength(1);
+		expect(mockNdvStore.activeNodeName).toBe(error.node.name);
+	});
+});
diff --git a/packages/editor-ui/src/components/Error/NodeErrorView.vue b/packages/editor-ui/src/components/Error/NodeErrorView.vue
index 76965f0632..f1b8a1f7c6 100644
--- a/packages/editor-ui/src/components/Error/NodeErrorView.vue
+++ b/packages/editor-ui/src/components/Error/NodeErrorView.vue
@@ -117,7 +117,7 @@ const prepareRawMessages = computed(() => {
 });
 
 const isAskAssistantAvailable = computed(() => {
-	if (!node.value) {
+	if (!node.value || isSubNodeError.value) {
 		return false;
 	}
 	const isCustomNode = node.value.type === undefined || isCommunityPackageName(node.value.type);
@@ -132,6 +132,13 @@ const assistantAlreadyAsked = computed(() => {
 	});
 });
 
+const isSubNodeError = computed(() => {
+	return (
+		props.error.name === 'NodeOperationError' &&
+		(props.error as NodeOperationError).functionality === 'configuration-node'
+	);
+});
+
 function nodeVersionTag(nodeType: NodeError['node']): string {
 	if (!nodeType || ('hidden' in nodeType && nodeType.hidden)) {
 		return i18n.baseText('nodeSettings.deprecated');
@@ -153,19 +160,6 @@ function prepareDescription(description: string): string {
 }
 
 function getErrorDescription(): string {
-	const isSubNodeError =
-		props.error.name === 'NodeOperationError' &&
-		(props.error as NodeOperationError).functionality === 'configuration-node';
-
-	if (isSubNodeError) {
-		return prepareDescription(
-			props.error.description +
-				i18n.baseText('pushConnection.executionError.openNode', {
-					interpolate: { node: props.error.node.name },
-				}),
-		);
-	}
-
 	if (props.error.context?.descriptionKey) {
 		const interpolate = {
 			nodeCause: props.error.context.nodeCause as string,
@@ -205,13 +199,10 @@ function addItemIndexSuffix(message: string): string {
 function getErrorMessage(): string {
 	let message = '';
 
-	const isSubNodeError =
-		props.error.name === 'NodeOperationError' &&
-		(props.error as NodeOperationError).functionality === 'configuration-node';
 	const isNonEmptyString = (value?: unknown): value is string =>
 		!!value && typeof value === 'string';
 
-	if (isSubNodeError) {
+	if (isSubNodeError.value) {
 		message = i18n.baseText('nodeErrorView.errorSubNode', {
 			interpolate: { node: props.error.node.name },
 		});
@@ -390,6 +381,10 @@ function nodeIsHidden() {
 	return nodeType?.hidden ?? false;
 }
 
+const onOpenErrorNodeDetailClick = () => {
+	ndvStore.activeNodeName = props.error.node.name;
+};
+
 async function onAskAssistantClick() {
 	const { message, lineNumber, description } = props.error;
 	const sessionInProgress = !assistantStore.isSessionEnded;
@@ -428,14 +423,25 @@ async function onAskAssistantClick() {
 				</div>
 			</div>
 			<div
-				v-if="error.description || error.context?.descriptionKey"
+				v-if="(error.description || error.context?.descriptionKey) && !isSubNodeError"
 				data-test-id="node-error-description"
 				class="node-error-view__header-description"
 				v-n8n-html="getErrorDescription()"
 			></div>
+
+			<div v-if="isSubNodeError">
+				<n8n-button
+					icon="arrow-right"
+					type="secondary"
+					:label="i18n.baseText('pushConnection.executionError.openNode')"
+					class="node-error-view__button"
+					data-test-id="node-error-view-open-node-button"
+					@click="onOpenErrorNodeDetailClick"
+				/>
+			</div>
 			<div
 				v-if="isAskAssistantAvailable"
-				class="node-error-view__assistant-button"
+				class="node-error-view__button"
 				data-test-id="node-error-view-ask-assistant-button"
 			>
 				<InlineAskAssistantButton :asked="assistantAlreadyAsked" @click="onAskAssistantClick" />
@@ -696,9 +702,14 @@ async function onAskAssistantClick() {
 		}
 	}
 
-	&__assistant-button {
+	&__button {
 		margin-left: var(--spacing-s);
 		margin-bottom: var(--spacing-xs);
+		flex-direction: row-reverse;
+		span {
+			margin-right: var(--spacing-5xs);
+			margin-left: var(--spacing-5xs);
+		}
 	}
 
 	&__debugging {
@@ -831,7 +842,7 @@ async function onAskAssistantClick() {
 	}
 }
 
-.node-error-view__assistant-button {
+.node-error-view__button {
 	margin-top: var(--spacing-xs);
 }
 </style>
diff --git a/packages/editor-ui/src/components/Error/__tests__/NodeErrorView.test.ts b/packages/editor-ui/src/components/Error/__tests__/NodeErrorView.test.ts
deleted file mode 100644
index 0813b2a781..0000000000
--- a/packages/editor-ui/src/components/Error/__tests__/NodeErrorView.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
-import NodeErrorView from '@/components/Error/NodeErrorView.vue';
-import { STORES } from '@/constants';
-import { createTestingPinia } from '@pinia/testing';
-import { type INode } from 'n8n-workflow';
-import { useAssistantStore } from '@/stores/assistant.store';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-
-const DEFAULT_SETUP = {
-	pinia: createTestingPinia({
-		initialState: {
-			[STORES.SETTINGS]: SETTINGS_STORE_DEFAULT_STATE,
-		},
-	}),
-};
-
-const renderComponent = createComponentRenderer(NodeErrorView, DEFAULT_SETUP);
-
-describe('NodeErrorView.vue', () => {
-	let mockNode: INode;
-	afterEach(() => {
-		mockNode = {
-			parameters: {
-				mode: 'runOnceForAllItems',
-				language: 'javaScript',
-				jsCode: 'cons error = 9;',
-				notice: '',
-			},
-			id: 'd1ce5dc9-f9ae-4ac6-84e5-0696ba175dd9',
-			name: 'Code',
-			type: 'n8n-nodes-base.code',
-			typeVersion: 2,
-			position: [940, 240],
-		};
-		vi.clearAllMocks();
-	});
-
-	it('renders an Error with a messages array', async () => {
-		const { getByTestId } = renderComponent({
-			props: {
-				error: {
-					node: mockNode,
-					messages: ['Unexpected identifier [line 1]'],
-				},
-			},
-		});
-
-		const errorMessage = getByTestId('node-error-message');
-
-		expect(errorMessage).toHaveTextContent('Unexpected identifier [line 1]');
-	});
-
-	it('renders an Error with a message string', async () => {
-		const { getByTestId } = renderComponent({
-			props: {
-				error: {
-					node: mockNode,
-					message: 'Unexpected identifier [line 1]',
-				},
-			},
-		});
-
-		const errorMessage = getByTestId('node-error-message');
-
-		expect(errorMessage).toHaveTextContent('Unexpected identifier [line 1]');
-	});
-
-	it('should not render AI assistant button when error happens in deprecated function node', async () => {
-		const aiAssistantStore = useAssistantStore(DEFAULT_SETUP.pinia);
-		const nodeTypeStore = useNodeTypesStore(DEFAULT_SETUP.pinia);
-
-		//@ts-expect-error
-		nodeTypeStore.getNodeType = vi.fn(() => ({
-			type: 'n8n-nodes-base.function',
-			typeVersion: 1,
-			hidden: true,
-		}));
-
-		//@ts-expect-error
-		aiAssistantStore.canShowAssistantButtonsOnCanvas = true;
-
-		const { queryByTestId } = renderComponent({
-			props: {
-				error: {
-					node: {
-						...mockNode,
-						type: 'n8n-nodes-base.function',
-						typeVersion: 1,
-					},
-				},
-			},
-		});
-
-		const aiAssistantButton = queryByTestId('ask-assistant-button');
-
-		expect(aiAssistantButton).toBeNull();
-	});
-});
diff --git a/packages/editor-ui/src/components/ExpressionEditModal.vue b/packages/editor-ui/src/components/ExpressionEditModal.vue
index 934876f75e..15fb08f88c 100644
--- a/packages/editor-ui/src/components/ExpressionEditModal.vue
+++ b/packages/editor-ui/src/components/ExpressionEditModal.vue
@@ -14,7 +14,7 @@ import type { INodeProperties } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 import { outputTheme } from './ExpressionEditorModal/theme';
 import ExpressionOutput from './InlineExpressionEditor/ExpressionOutput.vue';
-import RunDataSchema from './RunDataSchema.vue';
+import VirtualSchema from '@/components/VirtualSchema.vue';
 import OutputItemSelect from './InlineExpressionEditor/OutputItemSelect.vue';
 import { useI18n } from '@/composables/useI18n';
 import { useDebounce } from '@/composables/useDebounce';
@@ -22,6 +22,11 @@ import DraggableTarget from './DraggableTarget.vue';
 import { dropInExpressionEditor } from '@/plugins/codemirror/dragAndDrop';
 
 import { APP_MODALS_ELEMENT_ID } from '@/constants';
+import { N8nInput, N8nText } from 'n8n-design-system';
+import { N8nResizeWrapper, type ResizeData } from 'n8n-design-system';
+import { useThrottleFn } from '@vueuse/core';
+
+const DEFAULT_LEFT_SIDEBAR_WIDTH = 360;
 
 type Props = {
 	parameter: INodeProperties;
@@ -55,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();
@@ -121,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>
@@ -135,27 +147,36 @@ 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"
-				/>
-			</div>
+					<VirtualSchema
+						:class="$style.schema"
+						:search="appliedSearch"
+						:nodes="parentNodes"
+						:mapping-enabled="!isReadOnly"
+						:connection-type="NodeConnectionType.Main"
+						pane-type="input"
+					/>
+				</div>
+			</N8nResizeWrapper>
 
 			<div :class="$style.io">
 				<div :class="$style.input">
@@ -224,7 +245,6 @@ async function onDrop(expression: string, event: MouseEvent) {
 	margin-bottom: 0;
 
 	:global(.el-dialog__body) {
-		background-color: var(--color-expression-editor-modal-background);
 		height: 100%;
 		padding: var(--spacing-s);
 	}
@@ -237,7 +257,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 5816dab1cc..07e1346545 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -7,20 +7,14 @@ import { computed, onMounted, ref, watch } from 'vue';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
 import { n8nAutocompletion, n8nLang } from '@/plugins/codemirror/n8nLang';
 import { forceParse } from '@/utils/forceParse';
-import { completionStatus } from '@codemirror/autocomplete';
 import { inputTheme } from './theme';
 
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
 import { infoBoxTooltips } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Segment } from '@/types/expressions';
 import { removeExpressionPrefix } from '@/utils/expressions';
 import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 
 type Props = {
 	modelValue: string;
@@ -41,24 +35,7 @@ const emit = defineEmits<{
 const root = ref<HTMLElement>();
 const extensions = computed(() => [
 	inputTheme(props.isReadOnly),
-	Prec.highest(
-		keymap.of([
-			...tabKeyMap(),
-			...historyKeyMap,
-			...enterKeyMap,
-			...autocompleteKeyMap,
-			{
-				any: (view, event) => {
-					if (event.key === 'Escape' && completionStatus(view.state) === null) {
-						event.stopPropagation();
-						emit('close');
-					}
-
-					return false;
-				},
-			},
-		]),
-	),
+	Prec.highest(keymap.of(editorKeymap)),
 	n8nLang(),
 	n8nAutocompletion(),
 	mappingDropCursor(),
@@ -66,7 +43,7 @@ const extensions = computed(() => [
 	history(),
 	expressionInputHandler(),
 	EditorView.lineWrapping,
-	EditorView.domEventHandlers({ scroll: forceParse }),
+	EditorView.domEventHandlers({ scroll: (_, view) => forceParse(view) }),
 	infoBoxTooltips(),
 ]);
 const editorValue = ref<string>(removeExpressionPrefix(props.modelValue));
@@ -74,7 +51,7 @@ const { segments, readEditorValue, editor, hasFocus, focus } = useExpressionEdit
 	editorRef: root,
 	editorValue,
 	extensions,
-	isReadOnly: props.isReadOnly,
+	isReadOnly: computed(() => props.isReadOnly),
 	autocompleteTelemetry: { enabled: true, parameterPath: props.path },
 });
 
@@ -110,7 +87,15 @@ defineExpose({ editor });
 </template>
 
 <style lang="scss" module>
-:global(.cm-content) {
-	border-radius: var(--border-radius-base);
+.editor {
+	:global(.cm-content) {
+		border-radius: var(--border-radius-base);
+		&[aria-readonly='true'] {
+			--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;
+		}
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/__tests__/ExpressionEditorModalInput.test.ts b/packages/editor-ui/src/components/ExpressionEditorModalInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/ExpressionEditorModalInput.test.ts
rename to packages/editor-ui/src/components/ExpressionEditorModalInput.test.ts
diff --git a/packages/editor-ui/src/components/__tests__/ExpressionParameterInput.test.ts b/packages/editor-ui/src/components/ExpressionParameterInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/ExpressionParameterInput.test.ts
rename to packages/editor-ui/src/components/ExpressionParameterInput.test.ts
diff --git a/packages/editor-ui/src/components/FeatureComingSoon.vue b/packages/editor-ui/src/components/FeatureComingSoon.vue
deleted file mode 100644
index fd24a35196..0000000000
--- a/packages/editor-ui/src/components/FeatureComingSoon.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-import type { IFakeDoor } from '@/Interface';
-import { useRootStore } from '@/stores/root.store';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/stores/users.store';
-
-export default defineComponent({
-	name: 'FeatureComingSoon',
-	props: {
-		featureId: {
-			type: String,
-			required: true,
-		},
-		showTitle: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	computed: {
-		...mapStores(useRootStore, useSettingsStore, useUIStore, useUsersStore),
-		userId(): string {
-			return this.usersStore.currentUserId || '';
-		},
-		instanceId(): string {
-			return this.rootStore.instanceId;
-		},
-		featureInfo(): IFakeDoor | undefined {
-			return this.uiStore.fakeDoorsById[this.featureId];
-		},
-	},
-	methods: {
-		openLinkPage() {
-			if (this.featureInfo) {
-				window.open(
-					`${this.featureInfo.linkURL}&u=${this.instanceId}#${this.userId}&v=${this.rootStore.versionCli}`,
-					'_blank',
-				);
-				this.$telemetry.track('user clicked feature waiting list button', {
-					feature: this.featureId,
-				});
-			}
-		},
-	},
-});
-</script>
-
-<template>
-	<div v-if="featureInfo" :class="[$style.container]">
-		<div v-if="showTitle" class="mb-2xl">
-			<n8n-heading size="2xlarge">
-				{{ $locale.baseText(featureInfo.featureName) }}
-			</n8n-heading>
-		</div>
-		<div v-if="featureInfo.infoText" class="mb-l">
-			<n8n-info-tip theme="info" type="note">
-				<span v-n8n-html="$locale.baseText(featureInfo.infoText)"></span>
-			</n8n-info-tip>
-		</div>
-		<div :class="$style.actionBoxContainer">
-			<n8n-action-box
-				:description="$locale.baseText(featureInfo.actionBoxDescription)"
-				:button-text="
-					$locale.baseText(featureInfo.actionBoxButtonLabel || 'fakeDoor.actionBox.button.label')
-				"
-				@click:button="openLinkPage"
-			>
-				<template #heading>
-					<span v-n8n-html="$locale.baseText(featureInfo.actionBoxTitle)" />
-				</template>
-			</n8n-action-box>
-		</div>
-	</div>
-</template>
-
-<style lang="scss" module>
-.actionBoxContainer {
-	text-align: center;
-}
-</style>
diff --git a/packages/editor-ui/src/components/Feedback.spec.ts b/packages/editor-ui/src/components/Feedback.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/Feedback.spec.ts
rename to packages/editor-ui/src/components/Feedback.test.ts
diff --git a/packages/editor-ui/src/components/FilterConditions/Condition.vue b/packages/editor-ui/src/components/FilterConditions/Condition.vue
index 316b6827fa..be4d02224c 100644
--- a/packages/editor-ui/src/components/FilterConditions/Condition.vue
+++ b/packages/editor-ui/src/components/FilterConditions/Condition.vue
@@ -33,6 +33,7 @@ interface Props {
 	canRemove?: boolean;
 	readOnly?: boolean;
 	index?: number;
+	canDrag?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
@@ -41,6 +42,7 @@ const props = withDefaults(defineProps<Props>(), {
 	fixedLeftValue: false,
 	readOnly: false,
 	index: 0,
+	canDrag: true,
 });
 
 const emit = defineEmits<{
@@ -152,6 +154,15 @@ const onBlur = (): void => {
 		}"
 		data-test-id="filter-condition"
 	>
+		<N8nIconButton
+			v-if="canDrag && !readOnly"
+			type="tertiary"
+			text
+			size="mini"
+			icon="grip-vertical"
+			:title="i18n.baseText('filter.dragCondition')"
+			:class="[$style.iconButton, $style.defaultTopPadding, 'drag-handle']"
+		></N8nIconButton>
 		<n8n-icon-button
 			v-if="canRemove && !readOnly"
 			type="tertiary"
@@ -160,7 +171,7 @@ const onBlur = (): void => {
 			icon="trash"
 			data-test-id="filter-remove-condition"
 			:title="i18n.baseText('filter.removeCondition')"
-			:class="$style.remove"
+			:class="[$style.iconButton, $style.extraTopPadding]"
 			@click="onRemove"
 		></n8n-icon-button>
 		<InputTriple>
@@ -248,7 +259,7 @@ const onBlur = (): void => {
 	}
 
 	&:hover {
-		.remove {
+		.iconButton {
 			opacity: 1;
 		}
 	}
@@ -261,13 +272,21 @@ const onBlur = (): void => {
 
 .statusIcon {
 	padding-left: var(--spacing-4xs);
+	padding-right: var(--spacing-4xs);
 }
 
-.remove {
+.iconButton {
 	position: absolute;
 	left: 0;
-	top: var(--spacing-l);
 	opacity: 0;
 	transition: opacity 100ms ease-in;
+	color: var(--icon-base-color);
+}
+
+.defaultTopPadding {
+	top: var(--spacing-m);
+}
+.extraTopPadding {
+	top: calc(14px + var(--spacing-m));
 }
 </style>
diff --git a/packages/editor-ui/src/components/FilterConditions/__tests__/FilterConditions.test.ts b/packages/editor-ui/src/components/FilterConditions/FilterConditions.test.ts
similarity index 99%
rename from packages/editor-ui/src/components/FilterConditions/__tests__/FilterConditions.test.ts
rename to packages/editor-ui/src/components/FilterConditions/FilterConditions.test.ts
index 0f00c1bd3d..24cd1ef73c 100644
--- a/packages/editor-ui/src/components/FilterConditions/__tests__/FilterConditions.test.ts
+++ b/packages/editor-ui/src/components/FilterConditions/FilterConditions.test.ts
@@ -6,7 +6,7 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { createTestingPinia } from '@pinia/testing';
 import userEvent from '@testing-library/user-event';
 import { within, waitFor } from '@testing-library/vue';
-import { getFilterOperator } from '../utils';
+import { getFilterOperator } from './utils';
 import { get } from 'lodash-es';
 
 const DEFAULT_SETUP = {
diff --git a/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue b/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
index 6b58fb4290..41ef0f7430 100644
--- a/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
+++ b/packages/editor-ui/src/components/FilterConditions/FilterConditions.vue
@@ -23,6 +23,7 @@ import Condition from './Condition.vue';
 import CombinatorSelect from './CombinatorSelect.vue';
 import { resolveParameter } from '@/composables/useWorkflowHelpers';
 import { v4 as uuid } from 'uuid';
+import Draggable from 'vuedraggable';
 
 interface Props {
 	parameter: INodeProperties;
@@ -161,30 +162,41 @@ function getIssues(index: number): string[] {
 		</n8n-input-label>
 		<div :class="$style.content">
 			<div :class="$style.conditions">
-				<div v-for="(condition, index) of state.paramValue.conditions" :key="condition.id">
-					<CombinatorSelect
-						v-if="index !== 0"
-						:read-only="index !== 1 || readOnly"
-						:options="allowedCombinators"
-						:selected="state.paramValue.combinator"
-						:class="$style.combinator"
-						@combinator-change="onCombinatorChange"
-					/>
+				<Draggable
+					item-key="id"
+					v-model="state.paramValue.conditions"
+					handle=".drag-handle"
+					:drag-class="$style.dragging"
+					:ghost-class="$style.ghost"
+				>
+					<template #item="{ index, element: condition }">
+						<div>
+							<CombinatorSelect
+								v-if="index !== 0"
+								:read-only="index !== 1 || readOnly"
+								:options="allowedCombinators"
+								:selected="state.paramValue.combinator"
+								:class="$style.combinator"
+								@combinator-change="onCombinatorChange"
+							/>
 
-					<Condition
-						:condition="condition"
-						:index="index"
-						:options="state.paramValue.options"
-						:fixed-left-value="!!parameter.typeOptions?.filter?.leftValue"
-						:read-only="readOnly"
-						:can-remove="index !== 0 || state.paramValue.conditions.length > 1"
-						:path="`${path}.${index}`"
-						:issues="getIssues(index)"
-						:class="$style.condition"
-						@update="(value) => onConditionUpdate(index, value)"
-						@remove="() => onConditionRemove(index)"
-					></Condition>
-				</div>
+							<Condition
+								:condition="condition"
+								:index="index"
+								:options="state.paramValue.options"
+								:fixed-left-value="!!parameter.typeOptions?.filter?.leftValue"
+								:read-only="readOnly"
+								:can-remove="index !== 0 || state.paramValue.conditions.length > 1"
+								:can-drag="index !== 0 || state.paramValue.conditions.length > 1"
+								:path="`${path}.${index}`"
+								:issues="getIssues(index)"
+								:class="$style.condition"
+								@update="(value) => onConditionUpdate(index, value)"
+								@remove="() => onConditionRemove(index)"
+							></Condition>
+						</div>
+					</template>
+				</Draggable>
 			</div>
 			<div v-if="!singleCondition && !readOnly" :class="$style.addConditionWrapper">
 				<n8n-button
@@ -224,6 +236,7 @@ function getIssues(index: number): string[] {
 
 .condition {
 	padding-left: var(--spacing-l);
+	padding-bottom: var(--spacing-xs);
 }
 
 .single {
@@ -266,4 +279,20 @@ function getIssues(index: number): string[] {
 		outline: none;
 	}
 }
+.ghost,
+.dragging {
+	border-radius: var(--border-radius-base);
+	padding-right: var(--spacing-xs);
+}
+.ghost {
+	background-color: var(--color-background-base);
+	opacity: 0.5;
+}
+.dragging {
+	background-color: var(--color-background-xlight);
+	opacity: 0.7;
+}
+.dragging > .combinator {
+	display: none;
+}
 </style>
diff --git a/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts b/packages/editor-ui/src/components/FilterConditions/utils.test.ts
similarity index 98%
rename from packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts
rename to packages/editor-ui/src/components/FilterConditions/utils.test.ts
index aac05defc1..7cdfb76e23 100644
--- a/packages/editor-ui/src/components/FilterConditions/__tests__/utils.test.ts
+++ b/packages/editor-ui/src/components/FilterConditions/utils.test.ts
@@ -1,4 +1,4 @@
-import { getFilterOperator, handleOperatorChange, inferOperatorType } from '../utils';
+import { getFilterOperator, handleOperatorChange, inferOperatorType } from './utils';
 
 describe('FilterConditions > utils', () => {
 	describe('handleOperatorChange', () => {
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.test.ts b/packages/editor-ui/src/components/FixedCollectionParameter.test.ts
new file mode 100644
index 0000000000..9438a5a78a
--- /dev/null
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.test.ts
@@ -0,0 +1,110 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { cleanupAppModals, createAppModals, SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import FixedCollectionParameter, { type Props } from '@/components/FixedCollectionParameter.vue';
+import { STORES } from '@/constants';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { setActivePinia } from 'pinia';
+describe('FixedCollectionParameter.vue', () => {
+	const pinia = createTestingPinia({
+		initialState: {
+			[STORES.SETTINGS]: {
+				settings: SETTINGS_STORE_DEFAULT_STATE.settings,
+			},
+		},
+	});
+	setActivePinia(pinia);
+
+	const props: Props = {
+		parameter: {
+			displayName: 'Routing Rules',
+			name: 'rules',
+			placeholder: 'Add Routing Rule',
+			type: 'fixedCollection',
+			typeOptions: {
+				multipleValues: true,
+				sortable: true,
+			},
+			default: '',
+			options: [
+				{
+					name: 'values',
+					displayName: 'Values',
+					values: [
+						{
+							displayName: 'Output Name',
+							name: 'outputKey',
+							type: 'string',
+							default: 'Default Output Name',
+						},
+					],
+				},
+			],
+		},
+		path: 'parameters.rules',
+		nodeValues: {
+			parameters: {
+				rules: { values: [{ outputKey: 'Test Output Name' }] },
+			},
+		},
+		values: {
+			values: [{ outputKey: 'Test Output Name' }],
+		},
+		isReadOnly: false,
+	};
+	const renderComponent = createComponentRenderer(FixedCollectionParameter, { props });
+
+	beforeEach(() => {
+		createAppModals();
+	});
+
+	afterEach(() => {
+		cleanupAppModals();
+	});
+
+	it('renders the component', () => {
+		const { getByTestId } = renderComponent();
+		expect(getByTestId('fixed-collection-rules')).toBeInTheDocument();
+		expect(getByTestId('fixed-collection-add')).toBeInTheDocument();
+		expect(getByTestId('fixed-collection-delete')).toBeInTheDocument();
+		expect(getByTestId('parameter-item')).toBeInTheDocument();
+	});
+
+	it('computes placeholder text correctly', () => {
+		const { getByTestId } = renderComponent();
+		expect(getByTestId('fixed-collection-add')).toHaveTextContent('Add Routing Rule');
+	});
+
+	it('emits valueChanged event on option creation', async () => {
+		const { getByTestId, emitted } = renderComponent();
+		await userEvent.click(getByTestId('fixed-collection-add'));
+		expect(emitted('valueChanged')).toEqual([
+			[
+				{
+					name: 'parameters.rules.values',
+					value: [{ outputKey: 'Test Output Name' }, { outputKey: 'Default Output Name' }],
+				},
+			],
+		]);
+	});
+
+	it('emits valueChanged event on option deletion', async () => {
+		const { getByTestId, emitted } = renderComponent({
+			props: {
+				...props,
+				values: {
+					values: [{ outputKey: 'Test' }],
+				},
+			},
+		});
+		await userEvent.click(getByTestId('fixed-collection-delete'));
+		expect(emitted('valueChanged')).toEqual([
+			[
+				{
+					name: 'parameters.rules.values',
+					value: undefined,
+				},
+			],
+		]);
+	});
+});
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 98c5ef5971..59eacfdb10 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -1,226 +1,210 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
+<script lang="ts" setup>
 import type { IUpdateInformation } from '@/Interface';
 
-import type { INodeParameters, INodeProperties, INodePropertyCollection } from 'n8n-workflow';
+import type { INodeParameters, INodeProperties, NodeParameterValueType } from 'n8n-workflow';
 import { deepCopy, isINodePropertyCollectionList } from 'n8n-workflow';
 
 import { get } from 'lodash-es';
 
-export default defineComponent({
-	name: 'FixedCollectionParameter',
-	props: {
-		nodeValues: {
-			type: Object as PropType<INodeParameters>,
-			required: true,
-		},
-		parameter: {
-			type: Object as PropType<INodeProperties>,
-			required: true,
-		},
-		path: {
-			type: String,
-			required: true,
-		},
-		values: {
-			type: Object as PropType<Record<string, INodeParameters[]>>,
-			default: () => ({}),
-		},
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			selectedOption: undefined,
-			mutableValues: {} as Record<string, INodeParameters[]>,
-		};
-	},
-	computed: {
-		getPlaceholderText(): string {
-			const placeholder = this.$locale.nodeText().placeholder(this.parameter, this.path);
-			return placeholder ? placeholder : this.$locale.baseText('fixedCollectionParameter.choose');
-		},
-		getProperties(): INodePropertyCollection[] {
-			const returnProperties = [];
-			let tempProperties;
-			for (const name of this.propertyNames) {
-				tempProperties = this.getOptionProperties(name);
-				if (tempProperties !== undefined) {
-					returnProperties.push(tempProperties);
-				}
-			}
-			return returnProperties;
-		},
-		multipleValues(): boolean {
-			return !!this.parameter.typeOptions?.multipleValues;
-		},
-		parameterOptions(): INodePropertyCollection[] {
-			if (this.multipleValues && isINodePropertyCollectionList(this.parameter.options)) {
-				return this.parameter.options;
-			}
+import { computed, ref, watch, onBeforeMount } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import {
+	N8nIconButton,
+	N8nSelect,
+	N8nOption,
+	N8nInputLabel,
+	N8nText,
+	N8nButton,
+} from 'n8n-design-system';
+import ParameterInputList from './ParameterInputList.vue';
+import Draggable from 'vuedraggable';
 
-			return (this.parameter.options as INodePropertyCollection[]).filter((option) => {
-				return !this.propertyNames.includes(option.name);
-			});
-		},
-		propertyNames(): string[] {
-			return Object.keys(this.mutableValues || {});
-		},
-		sortable(): boolean {
-			return !!this.parameter.typeOptions?.sortable;
-		},
-	},
-	watch: {
-		values: {
-			handler(newValues: Record<string, INodeParameters[]>) {
-				this.mutableValues = deepCopy(newValues);
-			},
-			deep: true,
-		},
-	},
-	created() {
-		this.mutableValues = deepCopy(this.values);
-	},
-	methods: {
-		deleteOption(optionName: string, index?: number) {
-			const currentOptionsOfSameType = this.mutableValues[optionName];
-			if (!currentOptionsOfSameType || currentOptionsOfSameType.length > 1) {
-				// it's not the only option of this type, so just remove it.
-				this.$emit('valueChanged', {
-					name: this.getPropertyPath(optionName, index),
-					value: undefined,
-				});
-			} else {
-				// it's the only option, so remove the whole type
-				this.$emit('valueChanged', {
-					name: this.getPropertyPath(optionName),
-					value: undefined,
-				});
-			}
-		},
-		getPropertyPath(name: string, index?: number) {
-			return `${this.path}.${name}` + (index !== undefined ? `[${index}]` : '');
-		},
-		getOptionProperties(optionName: string): INodePropertyCollection | undefined {
-			if (isINodePropertyCollectionList(this.parameter.options)) {
-				for (const option of this.parameter.options) {
-					if (option.name === optionName) {
-						return option;
-					}
-				}
-			}
-			return undefined;
-		},
-		moveOptionDown(optionName: string, index: number) {
-			if (Array.isArray(this.mutableValues[optionName])) {
-				this.mutableValues[optionName].splice(
-					index + 1,
-					0,
-					this.mutableValues[optionName].splice(index, 1)[0],
-				);
-			}
+const locale = useI18n();
 
-			const parameterData = {
-				name: this.getPropertyPath(optionName),
-				value: this.mutableValues[optionName],
-				type: 'optionsOrderChanged',
-			};
+export type Props = {
+	nodeValues: INodeParameters;
+	parameter: INodeProperties;
+	path: string;
+	values?: Record<string, INodeParameters[]>;
+	isReadOnly?: boolean;
+};
 
-			this.$emit('valueChanged', parameterData);
-		},
-		moveOptionUp(optionName: string, index: number) {
-			if (Array.isArray(this.mutableValues[optionName])) {
-				this.mutableValues?.[optionName].splice(
-					index - 1,
-					0,
-					this.mutableValues[optionName].splice(index, 1)[0],
-				);
-			}
+type ValueChangedEvent = {
+	name: string;
+	value: NodeParameterValueType;
+	type?: 'optionsOrderChanged';
+};
 
-			const parameterData = {
-				name: this.getPropertyPath(optionName),
-				value: this.mutableValues[optionName],
-				type: 'optionsOrderChanged',
-			};
-
-			this.$emit('valueChanged', parameterData);
-		},
-		optionSelected(optionName: string) {
-			const option = this.getOptionProperties(optionName);
-			if (option === undefined) {
-				return;
-			}
-			const name = `${this.path}.${option.name}`;
-
-			const newParameterValue: INodeParameters = {};
-
-			for (const optionParameter of option.values) {
-				if (
-					optionParameter.type === 'fixedCollection' &&
-					optionParameter.typeOptions !== undefined &&
-					optionParameter.typeOptions.multipleValues === true
-				) {
-					newParameterValue[optionParameter.name] = {};
-				} else if (
-					optionParameter.typeOptions !== undefined &&
-					optionParameter.typeOptions.multipleValues === true
-				) {
-					// Multiple values are allowed so append option to array
-					const multiValue = get(this.nodeValues, [this.path, optionParameter.name], []);
-
-					if (Array.isArray(optionParameter.default)) {
-						multiValue.push(...deepCopy(optionParameter.default));
-					} else if (
-						optionParameter.default !== '' &&
-						typeof optionParameter.default !== 'object'
-					) {
-						multiValue.push(deepCopy(optionParameter.default));
-					}
-
-					newParameterValue[optionParameter.name] = multiValue;
-				} else {
-					// Add a new option
-					newParameterValue[optionParameter.name] = deepCopy(optionParameter.default);
-				}
-			}
-
-			let newValue;
-			if (this.multipleValues) {
-				newValue = get(this.nodeValues, name, []) as INodeParameters[];
-
-				newValue.push(newParameterValue);
-			} else {
-				newValue = newParameterValue;
-			}
-
-			const parameterData = {
-				name,
-				value: newValue,
-			};
-
-			this.$emit('valueChanged', parameterData);
-			this.selectedOption = undefined;
-		},
-		valueChanged(parameterData: IUpdateInformation) {
-			this.$emit('valueChanged', parameterData);
-		},
-	},
+const props = withDefaults(defineProps<Props>(), {
+	values: () => ({}),
+	isReadOnly: false,
 });
+
+const emit = defineEmits<{
+	valueChanged: [value: ValueChangedEvent];
+}>();
+
+const getPlaceholderText = computed(() => {
+	const placeholder = locale.nodeText().placeholder(props.parameter, props.path);
+	return placeholder ? placeholder : locale.baseText('fixedCollectionParameter.choose');
+});
+const mutableValues = ref({} as Record<string, INodeParameters[]>);
+const selectedOption = ref<string | null | undefined>(null);
+const propertyNames = computed(() => {
+	return new Set(Object.keys(mutableValues.value || {}));
+});
+const getProperties = computed(() => {
+	const returnProperties = [];
+	let tempProperties;
+	for (const name of propertyNames.value) {
+		tempProperties = getOptionProperties(name);
+		if (tempProperties !== undefined) {
+			returnProperties.push(tempProperties);
+		}
+	}
+	return returnProperties;
+});
+const multipleValues = computed(() => {
+	return !!props.parameter.typeOptions?.multipleValues;
+});
+const parameterOptions = computed(() => {
+	if (!isINodePropertyCollectionList(props.parameter.options)) return [];
+
+	if (multipleValues.value) {
+		return props.parameter.options;
+	}
+
+	return (props.parameter.options ?? []).filter((option) => {
+		return !propertyNames.value.has(option.name);
+	});
+});
+
+const sortable = computed(() => {
+	return !!props.parameter.typeOptions?.sortable;
+});
+
+watch(
+	() => props.values,
+	(newValues: Record<string, INodeParameters[]>) => {
+		mutableValues.value = deepCopy(newValues);
+	},
+	{ deep: true },
+);
+
+onBeforeMount(() => {
+	mutableValues.value = deepCopy(props.values);
+});
+
+const deleteOption = (optionName: string, index?: number) => {
+	const currentOptionsOfSameType = mutableValues.value[optionName];
+	if (!currentOptionsOfSameType || currentOptionsOfSameType.length > 1) {
+		// it's not the only option of this type, so just remove it.
+		emit('valueChanged', {
+			name: getPropertyPath(optionName, index),
+			value: undefined,
+		});
+	} else {
+		// it's the only option, so remove the whole type
+		emit('valueChanged', {
+			name: getPropertyPath(optionName),
+			value: undefined,
+		});
+	}
+};
+
+const getPropertyPath = (name: string, index?: number) => {
+	return `${props.path}.${name}` + (index !== undefined ? `[${index}]` : '');
+};
+
+const getOptionProperties = (optionName: string) => {
+	if (isINodePropertyCollectionList(props.parameter.options)) {
+		for (const option of props.parameter.options) {
+			if (option.name === optionName) {
+				return option;
+			}
+		}
+	}
+	return undefined;
+};
+
+const optionSelected = (optionName: string) => {
+	const option = getOptionProperties(optionName);
+	if (option === undefined) {
+		return;
+	}
+	const name = `${props.path}.${option.name}`;
+
+	const newParameterValue: INodeParameters = {};
+
+	for (const optionParameter of option.values) {
+		if (
+			optionParameter.type === 'fixedCollection' &&
+			optionParameter.typeOptions !== undefined &&
+			optionParameter.typeOptions.multipleValues === true
+		) {
+			newParameterValue[optionParameter.name] = {};
+		} else if (
+			optionParameter.typeOptions !== undefined &&
+			optionParameter.typeOptions.multipleValues === true
+		) {
+			// Multiple values are allowed so append option to array
+			const multiValue = get(props.nodeValues, [props.path, optionParameter.name], []);
+
+			if (Array.isArray(optionParameter.default)) {
+				multiValue.push(...deepCopy(optionParameter.default));
+			} else if (optionParameter.default !== '' && typeof optionParameter.default !== 'object') {
+				multiValue.push(deepCopy(optionParameter.default));
+			}
+
+			newParameterValue[optionParameter.name] = multiValue;
+		} else {
+			// Add a new option
+			newParameterValue[optionParameter.name] = deepCopy(optionParameter.default);
+		}
+	}
+
+	let newValue: NodeParameterValueType;
+	if (multipleValues.value) {
+		newValue = get(props.nodeValues, name, []) as INodeParameters[];
+
+		newValue.push(newParameterValue);
+	} else {
+		newValue = newParameterValue;
+	}
+
+	const parameterData = {
+		name,
+		value: newValue,
+	};
+
+	emit('valueChanged', parameterData);
+	selectedOption.value = undefined;
+};
+
+const valueChanged = (parameterData: IUpdateInformation) => {
+	emit('valueChanged', parameterData);
+};
+const onDragChange = (optionName: string) => {
+	const parameterData: ValueChangedEvent = {
+		name: getPropertyPath(optionName),
+		value: mutableValues.value[optionName],
+		type: 'optionsOrderChanged',
+	};
+
+	emit('valueChanged', parameterData);
+};
 </script>
 
 <template>
 	<div
 		class="fixed-collection-parameter"
-		:data-test-id="`fixed-collection-${parameter.name}`"
+		:data-test-id="`fixed-collection-${props.parameter?.name}`"
 		@keydown.stop
 	>
 		<div v-if="getProperties.length === 0" class="no-items-exist">
-			<n8n-text size="small">{{
-				$locale.baseText('fixedCollectionParameter.currentlyNoItemsExist')
-			}}</n8n-text>
+			<N8nText size="small">{{
+				locale.baseText('fixedCollectionParameter.currentlyNoItemsExist')
+			}}</N8nText>
 		</div>
 
 		<div
@@ -228,74 +212,78 @@ export default defineComponent({
 			:key="property.name"
 			class="fixed-collection-parameter-property"
 		>
-			<n8n-input-label
+			<N8nInputLabel
 				v-if="property.displayName !== '' && parameter.options && parameter.options.length !== 1"
-				:label="$locale.nodeText().inputLabelDisplayName(property, path)"
+				:label="locale.nodeText().inputLabelDisplayName(property, path)"
 				:underline="true"
 				size="small"
 				color="text-dark"
 			/>
 			<div v-if="multipleValues">
-				<div
-					v-for="(_, index) in mutableValues[property.name]"
-					:key="property.name + index"
-					class="parameter-item"
+				<Draggable
+					v-model="mutableValues[property.name]"
+					handle=".drag-handle"
+					drag-class="dragging"
+					ghost-class="ghost"
+					chosen-class="chosen"
+					@change="onDragChange(property.name)"
 				>
-					<div
-						:class="index ? 'border-top-dashed parameter-item-wrapper ' : 'parameter-item-wrapper'"
-					>
-						<div v-if="!isReadOnly" class="delete-option">
-							<n8n-icon-button
-								type="tertiary"
-								text
-								size="mini"
-								icon="trash"
-								:title="$locale.baseText('fixedCollectionParameter.deleteItem')"
-								@click="deleteOption(property.name, index)"
-							></n8n-icon-button>
-							<n8n-icon-button
-								v-if="sortable && index !== 0"
-								type="tertiary"
-								text
-								size="mini"
-								icon="angle-up"
-								:title="$locale.baseText('fixedCollectionParameter.moveUp')"
-								@click="moveOptionUp(property.name, index)"
-							></n8n-icon-button>
-							<n8n-icon-button
-								v-if="sortable && index !== mutableValues[property.name].length - 1"
-								type="tertiary"
-								text
-								size="mini"
-								icon="angle-down"
-								:title="$locale.baseText('fixedCollectionParameter.moveDown')"
-								@click="moveOptionDown(property.name, index)"
-							></n8n-icon-button>
+					<template #item="{ index }">
+						<div :key="property.name + '-' + index" class="parameter-item">
+							<div
+								:class="
+									index ? 'border-top-dashed parameter-item-wrapper ' : 'parameter-item-wrapper'
+								"
+							>
+								<div v-if="!isReadOnly" class="icon-button default-top-padding">
+									<N8nIconButton
+										v-if="sortable"
+										type="tertiary"
+										text
+										size="mini"
+										icon="grip-vertical"
+										:title="locale.baseText('fixedCollectionParameter.dragItem')"
+										class="drag-handle"
+									></N8nIconButton>
+								</div>
+								<div v-if="!isReadOnly" class="icon-button extra-top-padding">
+									<N8nIconButton
+										type="tertiary"
+										text
+										size="mini"
+										icon="trash"
+										data-test-id="fixed-collection-delete"
+										:title="locale.baseText('fixedCollectionParameter.deleteItem')"
+										@click="deleteOption(property.name, index)"
+									></N8nIconButton>
+								</div>
+								<Suspense>
+									<ParameterInputList
+										:parameters="property.values"
+										:node-values="nodeValues"
+										:path="getPropertyPath(property.name, index)"
+										:hide-delete="true"
+										:is-read-only="isReadOnly"
+										@value-changed="valueChanged"
+									/>
+								</Suspense>
+							</div>
 						</div>
-						<Suspense>
-							<ParameterInputList
-								:parameters="property.values"
-								:node-values="nodeValues"
-								:path="getPropertyPath(property.name, index)"
-								:hide-delete="true"
-								:is-read-only="isReadOnly"
-								@value-changed="valueChanged"
-							/>
-						</Suspense>
-					</div>
-				</div>
+					</template>
+				</Draggable>
 			</div>
 			<div v-else class="parameter-item">
 				<div class="parameter-item-wrapper">
-					<div v-if="!isReadOnly" class="delete-option">
-						<n8n-icon-button
+					<div v-if="!isReadOnly" class="icon-button">
+						<N8nIconButton
 							type="tertiary"
 							text
 							size="mini"
 							icon="trash"
-							:title="$locale.baseText('fixedCollectionParameter.deleteItem')"
+							data-test-id="fixed-collection-delete"
+							:title="locale.baseText('fixedCollectionParameter.deleteItem')"
 							@click="deleteOption(property.name)"
-						></n8n-icon-button>
+						></N8nIconButton>
 					</div>
 					<ParameterInputList
 						:parameters="property.values"
@@ -311,7 +299,7 @@ export default defineComponent({
 		</div>
 
 		<div v-if="parameterOptions.length > 0 && !isReadOnly" class="controls">
-			<n8n-button
+			<N8nButton
 				v-if="parameter.options && parameter.options.length === 1"
 				type="tertiary"
 				block
@@ -320,20 +308,20 @@ export default defineComponent({
 				@click="optionSelected(parameter.options[0].name)"
 			/>
 			<div v-else class="add-option">
-				<n8n-select
+				<N8nSelect
 					v-model="selectedOption"
 					:placeholder="getPlaceholderText"
 					size="small"
 					filterable
 					@update:model-value="optionSelected"
 				>
-					<n8n-option
+					<N8nOption
 						v-for="item in parameterOptions"
 						:key="item.name"
-						:label="$locale.nodeText().collectionOptionDisplayName(parameter, item, path)"
+						:label="locale.nodeText().collectionOptionDisplayName(parameter, item, path)"
 						:value="item.name"
-					></n8n-option>
-				</n8n-select>
+					></N8nOption>
+				</N8nSelect>
 			</div>
 		</div>
 	</div>
@@ -343,7 +331,7 @@ export default defineComponent({
 .fixed-collection-parameter {
 	padding-left: var(--spacing-s);
 
-	.delete-option {
+	.icon-button {
 		display: flex;
 		flex-direction: column;
 	}
@@ -378,21 +366,36 @@ export default defineComponent({
 
 .fixed-collection-parameter-property {
 	margin: var(--spacing-xs) 0;
+	margin-bottom: 0;
 }
 
-.parameter-item:hover > .parameter-item-wrapper > .delete-option {
+.parameter-item:hover > .parameter-item-wrapper > .icon-button {
 	opacity: 1;
 }
 
 .parameter-item {
 	position: relative;
-	padding: 0 0 0 1em;
+	padding: 0 0 var(--spacing-s) var(--spacing-s);
 
 	+ .parameter-item {
 		.parameter-item-wrapper {
-			.delete-option {
-				top: 14px;
+			.default-top-padding {
+				top: calc(1.2 * var(--spacing-s));
 			}
+			.extra-top-padding {
+				top: calc(2.2 * var(--spacing-s));
+			}
+		}
+	}
+}
+
+.parameter-item:first-of-type {
+	.parameter-item-wrapper {
+		.default-top-padding {
+			top: var(--spacing-3xs);
+		}
+		.extra-top-padding {
+			top: var(--spacing-l);
 		}
 	}
 }
@@ -404,4 +407,20 @@ export default defineComponent({
 .no-items-exist {
 	margin: var(--spacing-xs) 0;
 }
+.ghost,
+.dragging {
+	border-radius: var(--border-radius-base);
+	padding-right: var(--spacing-xs);
+}
+.ghost {
+	background-color: var(--color-background-base);
+	opacity: 0.5;
+}
+.dragging {
+	background-color: var(--color-background-xlight);
+	.parameter-item-wrapper {
+		border: none;
+	}
+	opacity: 0.7;
+}
 </style>
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts b/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
new file mode 100644
index 0000000000..dd459f5110
--- /dev/null
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.test.ts
@@ -0,0 +1,205 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import { fireEvent, screen } from '@testing-library/vue';
+import FreeAiCreditsCallout from '@/components/FreeAiCreditsCallout.vue';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useProjectsStore } from '@/stores/projects.store';
+import { useRootStore } from '@/stores/root.store';
+import { useToast } from '@/composables/useToast';
+import { renderComponent } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+vi.mock('@/composables/useToast', () => ({
+	useToast: vi.fn(),
+}));
+
+vi.mock('@/composables/useTelemetry', () => ({
+	useTelemetry: vi.fn(),
+}));
+
+vi.mock('@/stores/settings.store', () => ({
+	useSettingsStore: vi.fn(),
+}));
+
+vi.mock('@/stores/credentials.store', () => ({
+	useCredentialsStore: vi.fn(),
+}));
+
+vi.mock('@/stores/users.store', () => ({
+	useUsersStore: vi.fn(),
+}));
+
+vi.mock('@/stores/ndv.store', () => ({
+	useNDVStore: vi.fn(),
+}));
+
+vi.mock('@/stores/posthog.store', () => ({
+	usePostHog: vi.fn(),
+}));
+
+vi.mock('@/stores/projects.store', () => ({
+	useProjectsStore: vi.fn(),
+}));
+
+vi.mock('@/stores/root.store', () => ({
+	useRootStore: vi.fn(),
+}));
+
+const assertUserCannotClaimCredits = () => {
+	expect(screen.queryByText('Get 100 free OpenAI API credits')).not.toBeInTheDocument();
+	expect(screen.queryByRole('button', { name: 'Claim credits' })).not.toBeInTheDocument();
+};
+
+const assertUserCanClaimCredits = () => {
+	expect(screen.getByText('Get 100 free OpenAI API credits')).toBeInTheDocument();
+	expect(screen.queryByRole('button', { name: 'Claim credits' })).toBeInTheDocument();
+};
+
+const assertUserClaimedCredits = () => {
+	expect(
+		screen.getByText(
+			'Claimed 100 free OpenAI API credits! Please note these free credits are only for the following models:',
+		),
+	).toBeInTheDocument();
+
+	expect(
+		screen.getByText(
+			'gpt-4o-mini, text-embedding-3-small, dall-e-3, tts-1, whisper-1, and text-moderation-latest',
+		),
+	).toBeInTheDocument();
+};
+
+describe('FreeAiCreditsCallout', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+
+		(useSettingsStore as any).mockReturnValue({
+			isAiCreditsEnabled: true,
+			aiCreditsQuota: 100,
+		});
+
+		(useCredentialsStore as any).mockReturnValue({
+			allCredentials: [],
+			upsertCredential: vi.fn(),
+			claimFreeAiCredits: vi.fn(),
+		});
+
+		(useUsersStore as any).mockReturnValue({
+			currentUser: {
+				settings: {
+					userClaimedAiCredits: false,
+				},
+			},
+		});
+
+		(useNDVStore as any).mockReturnValue({
+			activeNode: { type: '@n8n/n8n-nodes-langchain.openAi' },
+		});
+
+		(usePostHog as any).mockReturnValue({
+			getVariant: vi.fn().mockReturnValue('variant'),
+		});
+
+		(useProjectsStore as any).mockReturnValue({
+			currentProject: { id: 'test-project-id' },
+		});
+
+		(useRootStore as any).mockReturnValue({
+			restApiContext: {},
+		});
+
+		(useToast as any).mockReturnValue({
+			showError: vi.fn(),
+		});
+
+		(useTelemetry as any).mockReturnValue({
+			track: vi.fn(),
+		});
+	});
+
+	it('should shows the claim callout when the user can claim credits', () => {
+		renderComponent(FreeAiCreditsCallout);
+
+		assertUserCanClaimCredits();
+	});
+
+	it('should show success callout when credit are claimed', async () => {
+		const credentialsStore = mockedStore(useCredentialsStore);
+
+		renderComponent(FreeAiCreditsCallout);
+
+		const claimButton = screen.getByRole('button', {
+			name: 'Claim credits',
+		});
+
+		await fireEvent.click(claimButton);
+
+		expect(credentialsStore.claimFreeAiCredits).toHaveBeenCalledWith('test-project-id');
+		expect(useTelemetry().track).toHaveBeenCalledWith('User claimed OpenAI credits');
+		assertUserClaimedCredits();
+	});
+
+	it('should not be able to claim credits is user already claimed credits', async () => {
+		(useUsersStore as any).mockReturnValue({
+			currentUser: {
+				settings: {
+					userClaimedAiCredits: true,
+				},
+			},
+		});
+
+		renderComponent(FreeAiCreditsCallout);
+
+		assertUserCannotClaimCredits();
+	});
+
+	it('should not be able to claim credits is user does not have ai credits enabled', async () => {
+		(useSettingsStore as any).mockReturnValue({
+			isAiCreditsEnabled: false,
+			aiCreditsQuota: 0,
+		});
+
+		renderComponent(FreeAiCreditsCallout);
+
+		assertUserCannotClaimCredits();
+	});
+
+	it('should not be able to claim credits if user it is not in experiment', async () => {
+		(usePostHog as any).mockReturnValue({
+			getVariant: vi.fn().mockReturnValue('control'),
+		});
+
+		renderComponent(FreeAiCreditsCallout);
+
+		assertUserCannotClaimCredits();
+	});
+
+	it('should not be able to claim credits if user already has OpenAiApi credential', async () => {
+		(useCredentialsStore as any).mockReturnValue({
+			allCredentials: [
+				{
+					type: 'openAiApi',
+				},
+			],
+			upsertCredential: vi.fn(),
+		});
+
+		renderComponent(FreeAiCreditsCallout);
+
+		assertUserCannotClaimCredits();
+	});
+
+	it('should not be able to claim credits if active node it is not a valid node', async () => {
+		(useNDVStore as any).mockReturnValue({
+			activeNode: { type: '@n8n/n8n-nodes.jira' },
+		});
+
+		renderComponent(FreeAiCreditsCallout);
+
+		assertUserCannotClaimCredits();
+	});
+});
diff --git a/packages/editor-ui/src/components/FreeAiCreditsCallout.vue b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
new file mode 100644
index 0000000000..97dd4eb9db
--- /dev/null
+++ b/packages/editor-ui/src/components/FreeAiCreditsCallout.vue
@@ -0,0 +1,126 @@
+<script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useToast } from '@/composables/useToast';
+import { AI_CREDITS_EXPERIMENT } from '@/constants';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { usePostHog } from '@/stores/posthog.store';
+import { useProjectsStore } from '@/stores/projects.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useUsersStore } from '@/stores/users.store';
+import { computed, ref } from 'vue';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
+
+const LANGCHAIN_NODES_PREFIX = '@n8n/n8n-nodes-langchain.';
+
+const N8N_NODES_PREFIX = '@n8n/n8n-nodes.';
+
+const NODES_WITH_OPEN_AI_API_CREDENTIAL = [
+	`${LANGCHAIN_NODES_PREFIX}openAi`,
+	`${LANGCHAIN_NODES_PREFIX}embeddingsOpenAi`,
+	`${LANGCHAIN_NODES_PREFIX}lmChatOpenAi`,
+	`${N8N_NODES_PREFIX}openAi`,
+];
+
+const showSuccessCallout = ref(false);
+const claimingCredits = ref(false);
+
+const settingsStore = useSettingsStore();
+const posthogStore = usePostHog();
+const credentialsStore = useCredentialsStore();
+const usersStore = useUsersStore();
+const ndvStore = useNDVStore();
+const projectsStore = useProjectsStore();
+const telemetry = useTelemetry();
+
+const i18n = useI18n();
+const toast = useToast();
+
+const userHasOpenAiCredentialAlready = computed(
+	() =>
+		!!credentialsStore.allCredentials.filter(
+			(credential) => credential.type === OPEN_AI_API_CREDENTIAL_TYPE,
+		).length,
+);
+
+const userHasClaimedAiCreditsAlready = computed(
+	() => !!usersStore.currentUser?.settings?.userClaimedAiCredits,
+);
+
+const activeNodeHasOpenAiApiCredential = computed(
+	() =>
+		ndvStore.activeNode?.type &&
+		NODES_WITH_OPEN_AI_API_CREDENTIAL.includes(ndvStore.activeNode.type),
+);
+
+const userCanClaimOpenAiCredits = computed(() => {
+	return (
+		settingsStore.isAiCreditsEnabled &&
+		activeNodeHasOpenAiApiCredential.value &&
+		posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) === AI_CREDITS_EXPERIMENT.variant &&
+		!userHasOpenAiCredentialAlready.value &&
+		!userHasClaimedAiCreditsAlready.value
+	);
+});
+
+const onClaimCreditsClicked = async () => {
+	claimingCredits.value = true;
+
+	try {
+		await credentialsStore.claimFreeAiCredits(projectsStore.currentProject?.id);
+
+		if (usersStore?.currentUser?.settings) {
+			usersStore.currentUser.settings.userClaimedAiCredits = true;
+		}
+
+		telemetry.track('User claimed OpenAI credits');
+
+		showSuccessCallout.value = true;
+	} catch (e) {
+		toast.showError(
+			e,
+			i18n.baseText('freeAi.credits.showError.claim.title'),
+			i18n.baseText('freeAi.credits.showError.claim.message'),
+		);
+	} finally {
+		claimingCredits.value = false;
+	}
+};
+</script>
+<template>
+	<div class="mt-xs">
+		<n8n-callout
+			v-if="userCanClaimOpenAiCredits && !showSuccessCallout"
+			theme="secondary"
+			icon="exclamation-circle"
+		>
+			{{
+				i18n.baseText('freeAi.credits.callout.claim.title', {
+					interpolate: { credits: settingsStore.aiCreditsQuota },
+				})
+			}}
+			<template #trailingContent>
+				<n8n-button
+					type="tertiary"
+					size="small"
+					:label="i18n.baseText('freeAi.credits.callout.claim.button.label')"
+					:loading="claimingCredits"
+					@click="onClaimCreditsClicked"
+				/>
+			</template>
+		</n8n-callout>
+		<n8n-callout v-else-if="showSuccessCallout" theme="success" icon="check-circle">
+			<n8n-text>
+				{{
+					i18n.baseText('freeAi.credits.callout.success.title.part1', {
+						interpolate: { credits: settingsStore.aiCreditsQuota },
+					})
+				}}</n8n-text
+			>&nbsp;
+			<n8n-text :bold="true">
+				{{ i18n.baseText('freeAi.credits.callout.success.title.part2') }}</n8n-text
+			>
+		</n8n-callout>
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/GoBackButton.vue b/packages/editor-ui/src/components/GoBackButton.vue
index 889067d5fa..0d16475c32 100644
--- a/packages/editor-ui/src/components/GoBackButton.vue
+++ b/packages/editor-ui/src/components/GoBackButton.vue
@@ -1,8 +1,10 @@
 <script setup lang="ts">
 import { useRouter } from 'vue-router';
 import { VIEWS } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
 
 const router = useRouter();
+const i18n = useI18n();
 
 const navigateTo = () => {
 	void router.push({ name: VIEWS.TEMPLATES });
@@ -12,7 +14,7 @@ const navigateTo = () => {
 <template>
 	<div :class="$style.wrapper" @click="navigateTo">
 		<font-awesome-icon :class="$style.icon" icon="arrow-left" />
-		<div :class="$style.text" v-text="$locale.baseText('template.buttons.goBackButton')" />
+		<div :class="$style.text" v-text="i18n.baseText('template.buttons.goBackButton')" />
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/__tests__/HtmlEditor.test.ts b/packages/editor-ui/src/components/HtmlEditor.test.ts
similarity index 97%
rename from packages/editor-ui/src/components/__tests__/HtmlEditor.test.ts
rename to packages/editor-ui/src/components/HtmlEditor.test.ts
index 7d5f80d428..5de134f652 100644
--- a/packages/editor-ui/src/components/__tests__/HtmlEditor.test.ts
+++ b/packages/editor-ui/src/components/HtmlEditor.test.ts
@@ -7,7 +7,7 @@ import HtmlEditor from '@/components/HtmlEditor/HtmlEditor.vue';
 import { userEvent } from '@testing-library/user-event';
 import { waitFor } from '@testing-library/vue';
 import { setActivePinia } from 'pinia';
-import { htmlEditorEventBus } from '../../event-bus';
+import { htmlEditorEventBus } from '../event-bus';
 
 const DEFAULT_SETUP = {
 	props: {
diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index 02fd40737e..c7202ef498 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -22,19 +22,14 @@ import htmlParser from 'prettier/plugins/html';
 import cssParser from 'prettier/plugins/postcss';
 import { computed, onBeforeUnmount, onMounted, ref, toRaw, toValue, watch } from 'vue';
 
-import { htmlEditorEventBus } from '@/event-bus';
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
+import { htmlEditorEventBus } from '@/event-bus';
 import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
 import { autoCloseTags, htmlLanguage } from 'codemirror-lang-html-n8n';
-import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
 import type { Range, Section } from './types';
 import { nonTakenRanges } from './utils';
 import { dropInExpressionEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
@@ -67,16 +62,13 @@ const extensions = computed(() => [
 	),
 	autoCloseTags,
 	expressionInputHandler(),
-	Prec.highest(
-		keymap.of([...tabKeyMap(), ...enterKeyMap, ...historyKeyMap, ...autocompleteKeyMap]),
-	),
+	Prec.highest(keymap.of(editorKeymap)),
 	indentOnInput(),
-	codeNodeEditorTheme({
+	codeEditorTheme({
 		isReadOnly: props.isReadOnly,
 		maxHeight: props.fullscreen ? '100%' : '40vh',
 		minHeight: '20vh',
 		rows: props.rows,
-		highlightColors: 'html',
 	}),
 	lineNumbers(),
 	highlightActiveLineGutter(),
@@ -91,6 +83,7 @@ const {
 	editor: editorRef,
 	segments,
 	readEditorValue,
+	isDirty,
 } = useExpressionEditor({
 	editorRef: htmlEditor,
 	editorValue,
@@ -238,6 +231,7 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
+	if (isDirty.value) emit('update:model-value', readEditorValue());
 	htmlEditorEventBus.off('format-html', formatHtml);
 });
 
@@ -254,7 +248,10 @@ async function onDrop(value: string, event: MouseEvent) {
 			<template #default="{ activeDrop, droppable }">
 				<div
 					ref="htmlEditor"
-					:class="{ [$style.activeDrop]: activeDrop, [$style.droppable]: droppable }"
+					:class="[
+						$style.fillHeight,
+						{ [$style.activeDrop]: activeDrop, [$style.droppable]: droppable },
+					]"
 					data-test-id="html-editor-container"
 				></div
 			></template>
@@ -272,6 +269,10 @@ async function onDrop(value: string, event: MouseEvent) {
 	}
 }
 
+.fillHeight {
+	height: 100%;
+}
+
 .droppable {
 	:global(.cm-editor) {
 		border-color: var(--color-ndv-droppable-parameter);
diff --git a/packages/editor-ui/src/components/ImportCurlParameter.vue b/packages/editor-ui/src/components/ImportCurlParameter.vue
index dae83eb053..8d5c517c08 100644
--- a/packages/editor-ui/src/components/ImportCurlParameter.vue
+++ b/packages/editor-ui/src/components/ImportCurlParameter.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import { useI18n } from '@/composables/useI18n';
 import { IMPORT_CURL_MODAL_KEY } from '@/constants';
 import { useUIStore } from '@/stores/ui.store';
 
@@ -7,6 +8,7 @@ defineProps<{
 }>();
 
 const uiStore = useUIStore();
+const i18n = useI18n();
 
 function onImportCurlClicked() {
 	uiStore.openModal(IMPORT_CURL_MODAL_KEY);
@@ -17,7 +19,7 @@ function onImportCurlClicked() {
 	<div :class="$style.importSection">
 		<n8n-button
 			type="secondary"
-			:label="$locale.baseText('importCurlParameter.label')"
+			:label="i18n.baseText('importCurlParameter.label')"
 			:disabled="isReadOnly"
 			size="mini"
 			@click="onImportCurlClicked"
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
index 1424b7d2e3..a0b88dff75 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/ExpressionOutput.vue
@@ -97,7 +97,7 @@ onMounted(() => {
 			extensions: [
 				EditorState.readOnly.of(true),
 				EditorView.lineWrapping,
-				EditorView.domEventHandlers({ scroll: forceParse }),
+				EditorView.domEventHandlers({ scroll: (_, view) => forceParse(view) }),
 				...props.extensions,
 			],
 		}),
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 19a869b2e6..72c430d24e 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -7,12 +7,7 @@ import { computed, ref, watch } from 'vue';
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
 import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion, n8nLang } from '@/plugins/codemirror/n8nLang';
 import { infoBoxTooltips } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Segment } from '@/types/expressions';
@@ -42,9 +37,7 @@ const emit = defineEmits<{
 
 const root = ref<HTMLElement>();
 const extensions = computed(() => [
-	Prec.highest(
-		keymap.of([...tabKeyMap(false), ...enterKeyMap, ...autocompleteKeyMap, ...historyKeyMap]),
-	),
+	Prec.highest(keymap.of(editorKeymap)),
 	n8nLang(),
 	n8nAutocompletion(),
 	inputTheme({ isReadOnly: props.isReadOnly, rows: props.rows }),
@@ -56,6 +49,7 @@ const extensions = computed(() => [
 	infoBoxTooltips(),
 ]);
 const editorValue = ref<string>(removeExpressionPrefix(props.modelValue));
+
 const {
 	editor: editorRef,
 	segments,
@@ -68,7 +62,7 @@ const {
 	editorRef: root,
 	editorValue,
 	extensions,
-	isReadOnly: props.isReadOnly,
+	isReadOnly: computed(() => props.isReadOnly),
 	autocompleteTelemetry: { enabled: true, parameterPath: props.path },
 	additionalData: props.additionalData,
 });
@@ -113,26 +107,24 @@ defineExpose({
 </script>
 
 <template>
-	<div
-		ref="root"
-		title=""
-		:class="$style.editor"
-		data-test-id="inline-expression-editor-input"
-	></div>
+	<div ref="root" title="" data-test-id="inline-expression-editor-input"></div>
 </template>
 
-<style lang="scss" module>
-.editor div[contenteditable='false'] {
-	background-color: var(--disabled-fill, var(--color-background-light));
-	cursor: not-allowed;
-}
-</style>
-
 <style lang="scss" scoped>
 :deep(.cm-editor) {
 	padding-left: 0;
 }
 :deep(.cm-content) {
 	padding-left: var(--spacing-2xs);
+
+	&[aria-readonly='true'] {
+		background-color: var(--disabled-fill, var(--color-background-light));
+		border-color: var(--disabled-border, var(--border-color-base));
+		color: var(--disabled-color, var(--color-text-base));
+		cursor: not-allowed;
+
+		border-top-left-radius: 0;
+		border-bottom-left-radius: 0;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionEditorOutput.test.ts b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
similarity index 96%
rename from packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionEditorOutput.test.ts
rename to packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
index 8728fecb8c..76d3f2452c 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionEditorOutput.test.ts
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.test.ts
@@ -1,6 +1,6 @@
 import { renderComponent } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
-import InlineExpressionEditorOutput from '../InlineExpressionEditorOutput.vue';
+import InlineExpressionEditorOutput from './InlineExpressionEditorOutput.vue';
 
 describe('InlineExpressionEditorOutput.vue', () => {
 	test('should render duplicate segments correctly', async () => {
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
index 634c8d340f..80f148b8d4 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue
@@ -16,12 +16,14 @@ interface InlineExpressionEditorOutputProps {
 	editorState?: EditorState;
 	selection?: SelectionRange;
 	visible?: boolean;
+	isReadOnly?: boolean;
 }
 
 withDefaults(defineProps<InlineExpressionEditorOutputProps>(), {
 	visible: false,
 	editorState: undefined,
 	selection: undefined,
+	isReadOnly: false,
 	unresolvedExpression: undefined,
 });
 
@@ -51,7 +53,7 @@ onBeforeUnmount(() => {
 			>
 			</ExpressionOutput>
 		</n8n-text>
-		<div :class="$style.footer">
+		<div :class="$style.footer" v-if="!isReadOnly">
 			<InlineExpressionTip
 				:editor-state="editorState"
 				:selection="selection"
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionTip.test.ts b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.test.ts
similarity index 93%
rename from packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionTip.test.ts
rename to packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.test.ts
index 604152c29d..5242a53290 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/__tests__/InlineExpressionTip.test.ts
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.test.ts
@@ -26,7 +26,8 @@ describe('InlineExpressionTip.vue', () => {
 	beforeEach(() => {
 		mockNdvState = {
 			hasInputData: true,
-			isNDVDataEmpty: vi.fn(() => true),
+			isInputPanelEmpty: true,
+			isOutputPanelEmpty: true,
 			setHighlightDraggables: vi.fn(),
 		};
 	});
@@ -42,7 +43,8 @@ describe('InlineExpressionTip.vue', () => {
 		test('should show the drag-n-drop tip', async () => {
 			mockNdvState = {
 				hasInputData: true,
-				isNDVDataEmpty: vi.fn(() => false),
+				isInputPanelEmpty: false,
+				isOutputPanelEmpty: false,
 				focusedMappableInput: 'Some Input',
 				setHighlightDraggables: vi.fn(),
 			};
@@ -62,7 +64,8 @@ describe('InlineExpressionTip.vue', () => {
 			mockNdvState = {
 				hasInputData: false,
 				isInputParentOfActiveNode: true,
-				isNDVDataEmpty: vi.fn(() => false),
+				isInputPanelEmpty: false,
+				isOutputPanelEmpty: false,
 				focusedMappableInput: 'Some Input',
 				setHighlightDraggables: vi.fn(),
 			};
@@ -77,7 +80,8 @@ describe('InlineExpressionTip.vue', () => {
 		test('should show the correct tip for objects', async () => {
 			mockNdvState = {
 				hasInputData: true,
-				isNDVDataEmpty: vi.fn(() => false),
+				isInputPanelEmpty: false,
+				isOutputPanelEmpty: false,
 				focusedMappableInput: 'Some Input',
 				setHighlightDraggables: vi.fn(),
 			};
@@ -106,7 +110,8 @@ describe('InlineExpressionTip.vue', () => {
 		test('should show the correct tip for primitives', async () => {
 			mockNdvState = {
 				hasInputData: true,
-				isNDVDataEmpty: vi.fn(() => false),
+				isInputPanelEmpty: false,
+				isOutputPanelEmpty: false,
 				focusedMappableInput: 'Some Input',
 				setHighlightDraggables: vi.fn(),
 			};
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
index 19258d2df9..9abd13dda6 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionTip.vue
@@ -30,7 +30,7 @@ const canAddDotToExpression = ref(false);
 const resolvedExpressionHasFields = ref(false);
 
 const canDragToFocusedInput = computed(
-	() => !ndvStore.isNDVDataEmpty('input') && ndvStore.focusedMappableInput,
+	() => !ndvStore.isInputPanelEmpty && ndvStore.focusedMappableInput,
 );
 
 const emptyExpression = computed(() => props.unresolvedExpression.trim().length === 0);
diff --git a/packages/editor-ui/src/components/InputNodeSelect.vue b/packages/editor-ui/src/components/InputNodeSelect.vue
index d0ec011e07..c219043ab9 100644
--- a/packages/editor-ui/src/components/InputNodeSelect.vue
+++ b/packages/editor-ui/src/components/InputNodeSelect.vue
@@ -86,7 +86,7 @@ function getMultipleNodesText(nodeName: string): string {
 		props.workflow.connectionsByDestinationNode[activeNode.value.name].main || [];
 	// Collect indexes of connected nodes
 	const connectedInputIndexes = activeNodeConnections.reduce((acc: number[], node, index) => {
-		if (node[0] && node[0].node === nodeName) return [...acc, index];
+		if (node?.[0] && node[0].node === nodeName) return [...acc, index];
 		return acc;
 	}, []);
 
diff --git a/packages/editor-ui/src/components/InputPanel.test.ts b/packages/editor-ui/src/components/InputPanel.test.ts
new file mode 100644
index 0000000000..0b4734068a
--- /dev/null
+++ b/packages/editor-ui/src/components/InputPanel.test.ts
@@ -0,0 +1,86 @@
+import { createTestNode, createTestWorkflow, createTestWorkflowObject } from '@/__tests__/mocks';
+import { createComponentRenderer } from '@/__tests__/render';
+import InputPanel, { type Props } from '@/components/InputPanel.vue';
+import { STORES } from '@/constants';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createTestingPinia } from '@pinia/testing';
+import { NodeConnectionType, type IConnections, type INodeExecutionData } from 'n8n-workflow';
+import { setActivePinia } from 'pinia';
+import { mockedStore } from '../__tests__/utils';
+import { waitFor } from '@testing-library/vue';
+
+vi.mock('vue-router', () => {
+	return {
+		useRouter: () => ({}),
+		useRoute: () => ({ meta: {} }),
+		RouterLink: vi.fn(),
+	};
+});
+
+const nodes = [
+	createTestNode({ id: 'node1', name: 'Node 1' }),
+	createTestNode({ id: 'node2', name: 'Node 2' }),
+	createTestNode({ name: 'Agent' }),
+	createTestNode({ name: 'Tool' }),
+];
+
+const render = (props: Partial<Props> = {}, pinData?: INodeExecutionData[]) => {
+	const connections: IConnections = {
+		[nodes[0].name]: {
+			[NodeConnectionType.Main]: [
+				[{ node: nodes[1].name, type: NodeConnectionType.Main, index: 0 }],
+			],
+		},
+		[nodes[1].name]: {
+			[NodeConnectionType.Main]: [
+				[{ node: nodes[2].name, type: NodeConnectionType.Main, index: 0 }],
+			],
+		},
+		[nodes[3].name]: {
+			[NodeConnectionType.AiMemory]: [
+				[{ node: nodes[2].name, type: NodeConnectionType.AiMemory, index: 0 }],
+			],
+		},
+	};
+
+	const pinia = createTestingPinia({
+		stubActions: false,
+		initialState: { [STORES.NDV]: { activeNodeName: props.currentNodeName ?? nodes[1].name } },
+	});
+	setActivePinia(pinia);
+
+	const workflow = createTestWorkflow({ nodes, connections });
+	useWorkflowsStore().setWorkflow(workflow);
+
+	if (pinData) {
+		mockedStore(useWorkflowsStore).pinDataByNodeName.mockReturnValue(pinData);
+	}
+
+	const workflowObject = createTestWorkflowObject({
+		nodes,
+		connections,
+	});
+
+	return createComponentRenderer(InputPanel, {
+		props: {
+			pushRef: 'pushRef',
+			runIndex: 0,
+			currentNodeName: nodes[1].name,
+			workflow: workflowObject,
+		},
+		global: {
+			stubs: {
+				InputPanelPinButton: { template: '<button data-test-id="ndv-pin-data"></button>' },
+			},
+		},
+	})({ props });
+};
+
+describe('InputPanel', () => {
+	it('should render', async () => {
+		const { container, queryByTestId } = render({}, [{ json: { name: 'Test' } }]);
+
+		await waitFor(() => expect(queryByTestId('ndv-data-size-warning')).not.toBeInTheDocument());
+		expect(container).toMatchSnapshot();
+	});
+});
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 1cc4da099d..2dab3ea97b 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -1,5 +1,5 @@
-<script lang="ts">
-import type { INodeUi } from '@/Interface';
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
 import {
 	CRON_NODE_TYPE,
 	INTERVAL_NODE_TYPE,
@@ -10,330 +10,329 @@ import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type {
-	IConnectedNode,
-	INodeInputConfiguration,
-	INodeOutputConfiguration,
-	INodeTypeDescription,
-	Workflow,
-} from 'n8n-workflow';
+import { waitingNodeTooltip } from '@/utils/executionUtils';
+import { uniqBy } from 'lodash-es';
+import type { INodeInputConfiguration, INodeOutputConfiguration, Workflow } from 'n8n-workflow';
 import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
-import { mapStores } from 'pinia';
-import { defineComponent, type PropType } from 'vue';
+import { computed, ref, watch } from 'vue';
 import InputNodeSelect from './InputNodeSelect.vue';
 import NodeExecuteButton from './NodeExecuteButton.vue';
 import RunData from './RunData.vue';
 import WireMeUp from './WireMeUp.vue';
-import { waitingNodeTooltip } from '@/utils/executionUtils';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { N8nRadioButtons, N8nTooltip, N8nText } from 'n8n-design-system';
+import { storeToRefs } from 'pinia';
 
 type MappingMode = 'debugging' | 'mapping';
 
-export default defineComponent({
-	name: 'InputPanel',
-	components: { RunData, NodeExecuteButton, WireMeUp, InputNodeSelect },
-	props: {
-		currentNodeName: {
-			type: String,
-		},
-		runIndex: {
-			type: Number,
-			required: true,
-		},
-		linkedRuns: {
-			type: Boolean,
-		},
-		workflow: {
-			type: Object as PropType<Workflow>,
-			required: true,
-		},
-		canLinkRuns: {
-			type: Boolean,
-		},
-		pushRef: {
-			type: String,
-		},
-		readOnly: {
-			type: Boolean,
-		},
-		isProductionExecutionPreview: {
-			type: Boolean,
-			default: false,
-		},
-		isPaneActive: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	emits: [
-		'itemHover',
-		'tableMounted',
-		'linkRun',
-		'unlinkRun',
-		'runChange',
-		'search',
-		'changeInputNode',
-		'execute',
-		'activatePane',
-	],
-	data() {
-		return {
-			showDraggableHintWithDelay: false,
-			draggableHintShown: false,
-			inputMode: 'debugging' as MappingMode,
-			mappedNode: null as string | null,
-			inputModes: [
-				{ value: 'mapping', label: this.$locale.baseText('ndv.input.mapping') },
-				{ value: 'debugging', label: this.$locale.baseText('ndv.input.debugging') },
-			],
-		};
-	},
-	computed: {
-		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore, useUIStore),
-		focusedMappableInput(): string {
-			return this.ndvStore.focusedMappableInput;
-		},
-		isUserOnboarded(): boolean {
-			return this.ndvStore.isMappingOnboarded;
-		},
-		isMappingMode(): boolean {
-			return this.isActiveNodeConfig && this.inputMode === 'mapping';
-		},
-		showDraggableHint(): boolean {
-			const toIgnore = [
-				START_NODE_TYPE,
-				MANUAL_TRIGGER_NODE_TYPE,
-				CRON_NODE_TYPE,
-				INTERVAL_NODE_TYPE,
-			];
-			if (!this.currentNode || toIgnore.includes(this.currentNode.type)) {
-				return false;
-			}
+export type Props = {
+	runIndex: number;
+	workflow: Workflow;
+	pushRef: string;
+	currentNodeName?: string;
+	canLinkRuns?: boolean;
+	linkedRuns?: boolean;
+	readOnly?: boolean;
+	isProductionExecutionPreview?: boolean;
+	isPaneActive?: boolean;
+};
 
-			return !!this.focusedMappableInput && !this.isUserOnboarded;
-		},
-		isActiveNodeConfig(): boolean {
-			let inputs = this.activeNodeType?.inputs ?? [];
-			let outputs = this.activeNodeType?.outputs ?? [];
-			if (this.activeNode !== null && this.workflow !== null) {
-				const node = this.workflow.getNode(this.activeNode.name);
-				inputs = NodeHelpers.getNodeInputs(this.workflow, node!, this.activeNodeType!);
-				outputs = NodeHelpers.getNodeOutputs(this.workflow, node!, this.activeNodeType!);
-			} else {
-				// If we can not figure out the node type we set no outputs
-				if (!Array.isArray(inputs)) {
-					inputs = [] as NodeConnectionType[];
-				}
-				if (!Array.isArray(outputs)) {
-					outputs = [] as NodeConnectionType[];
-				}
-			}
-
-			if (
-				inputs.length === 0 ||
-				(inputs.every((input) => this.filterOutConnectionType(input, NodeConnectionType.Main)) &&
-					outputs.find((output) => this.filterOutConnectionType(output, NodeConnectionType.Main)))
-			) {
-				return true;
-			}
-
-			return false;
-		},
-		isMappingEnabled(): boolean {
-			if (this.readOnly) return false;
-
-			// Mapping is only enabled in mapping mode for config nodes and if node to map is selected
-			if (this.isActiveNodeConfig) return this.isMappingMode && this.mappedNode !== null;
-
-			return true;
-		},
-		isExecutingPrevious(): boolean {
-			if (!this.workflowRunning) {
-				return false;
-			}
-			const triggeredNode = this.workflowsStore.executedNode;
-			const executingNode = this.workflowsStore.executingNode;
-
-			if (
-				this.activeNode &&
-				triggeredNode === this.activeNode.name &&
-				!this.workflowsStore.isNodeExecuting(this.activeNode.name)
-			) {
-				return true;
-			}
-
-			if (executingNode.length || triggeredNode) {
-				return !!this.parentNodes.find(
-					(node) => this.workflowsStore.isNodeExecuting(node.name) || node.name === triggeredNode,
-				);
-			}
-			return false;
-		},
-		workflowRunning(): boolean {
-			return this.uiStore.isActionActive['workflowRunning'];
-		},
-
-		activeNode(): INodeUi | null {
-			return this.ndvStore.activeNode;
-		},
-
-		rootNode(): string {
-			const workflow = this.workflow;
-			const rootNodes = workflow.getChildNodes(this.activeNode?.name ?? '', 'ALL_NON_MAIN');
-
-			return rootNodes[0];
-		},
-		rootNodesParents() {
-			const workflow = this.workflow;
-			const parentNodes = [...workflow.getParentNodes(this.rootNode, NodeConnectionType.Main)]
-				.reverse()
-				.map((parent): IConnectedNode => ({ name: parent, depth: 1, indicies: [] }));
-
-			return parentNodes;
-		},
-		currentNode(): INodeUi | null {
-			if (this.isActiveNodeConfig) {
-				// if we're mapping node we want to show the output of the mapped node
-				if (this.mappedNode) {
-					return this.workflowsStore.getNodeByName(this.mappedNode);
-				}
-
-				// in debugging mode data does get set manually and is only for debugging
-				// so we want to force the node to be the active node to make sure we show the correct data
-				return this.activeNode;
-			}
-
-			return this.workflowsStore.getNodeByName(this.currentNodeName ?? '');
-		},
-		connectedCurrentNodeOutputs(): number[] | undefined {
-			const search = this.parentNodes.find(({ name }) => name === this.currentNodeName);
-			if (search) {
-				return search.indicies;
-			}
-			return undefined;
-		},
-		parentNodes(): IConnectedNode[] {
-			if (!this.activeNode) {
-				return [];
-			}
-			const nodes = this.workflow.getParentNodesByDepth(this.activeNode.name);
-
-			return nodes.filter(
-				({ name }, i) =>
-					this.activeNode &&
-					name !== this.activeNode.name &&
-					nodes.findIndex((node) => node.name === name) === i,
-			);
-		},
-		currentNodeDepth(): number {
-			const node = this.parentNodes.find(
-				(parent) => this.currentNode && parent.name === this.currentNode.name,
-			);
-			return node ? node.depth : -1;
-		},
-		activeNodeType(): INodeTypeDescription | null {
-			if (!this.activeNode) return null;
-
-			return this.nodeTypesStore.getNodeType(this.activeNode.type, this.activeNode.typeVersion);
-		},
-		isMultiInputNode(): boolean {
-			return this.activeNodeType !== null && this.activeNodeType.inputs.length > 1;
-		},
-		waitingMessage(): string {
-			return waitingNodeTooltip();
-		},
-	},
-	watch: {
-		inputMode: {
-			handler(val) {
-				this.onRunIndexChange(-1);
-				if (val === 'mapping') {
-					this.onUnlinkRun();
-					this.mappedNode = this.rootNodesParents[0]?.name ?? null;
-				} else {
-					this.mappedNode = null;
-				}
-			},
-			immediate: true,
-		},
-		showDraggableHint(curr: boolean, prev: boolean) {
-			if (curr && !prev) {
-				setTimeout(() => {
-					if (this.draggableHintShown) {
-						return;
-					}
-					this.showDraggableHintWithDelay = this.showDraggableHint;
-					if (this.showDraggableHintWithDelay) {
-						this.draggableHintShown = true;
-
-						this.$telemetry.track('User viewed data mapping tooltip', {
-							type: 'unexecuted input pane',
-						});
-					}
-				}, 1000);
-			} else if (!curr) {
-				this.showDraggableHintWithDelay = false;
-			}
-		},
-	},
-	methods: {
-		filterOutConnectionType(
-			item: NodeConnectionType | INodeOutputConfiguration | INodeInputConfiguration,
-			type: NodeConnectionType,
-		) {
-			if (!item) return false;
-
-			return typeof item === 'string' ? item !== type : item.type !== type;
-		},
-		onInputModeChange(val: MappingMode) {
-			this.inputMode = val;
-		},
-		onMappedNodeSelected(val: string) {
-			this.mappedNode = val;
-
-			this.onRunIndexChange(0);
-			this.onUnlinkRun();
-		},
-		onNodeExecute() {
-			this.$emit('execute');
-			if (this.activeNode) {
-				this.$telemetry.track('User clicked ndv button', {
-					node_type: this.activeNode.type,
-					workflow_id: this.workflowsStore.workflowId,
-					push_ref: this.pushRef,
-					pane: 'input',
-					type: 'executePrevious',
-				});
-			}
-		},
-		onRunIndexChange(run: number) {
-			this.$emit('runChange', run);
-		},
-		onLinkRun() {
-			this.$emit('linkRun');
-		},
-		onUnlinkRun() {
-			this.$emit('unlinkRun');
-		},
-		onInputNodeChange(value: string) {
-			const index = this.parentNodes.findIndex((node) => node.name === value) + 1;
-			this.$emit('changeInputNode', value, index);
-		},
-		onConnectionHelpClick() {
-			if (this.activeNode) {
-				this.$telemetry.track('User clicked ndv link', {
-					node_type: this.activeNode.type,
-					workflow_id: this.workflowsStore.workflowId,
-					push_ref: this.pushRef,
-					pane: 'input',
-					type: 'not-connected-help',
-				});
-			}
-		},
-		activatePane() {
-			this.$emit('activatePane');
-		},
-	},
+const props = withDefaults(defineProps<Props>(), {
+	currentNodeName: '',
+	canLinkRuns: false,
+	readOnly: false,
+	isProductionExecutionPreview: false,
+	isPaneActive: false,
 });
+
+const emit = defineEmits<{
+	itemHover: [
+		{
+			outputIndex: number;
+			itemIndex: number;
+		} | null,
+	];
+	tableMounted: [
+		{
+			avgRowHeight: number;
+		},
+	];
+	linkRun: [];
+	unlinkRun: [];
+	runChange: [runIndex: number];
+	search: [search: string];
+	changeInputNode: [nodeName: string, index: number];
+	execute: [];
+	activatePane: [];
+}>();
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+
+const showDraggableHintWithDelay = ref(false);
+const draggableHintShown = ref(false);
+const inputMode = ref<MappingMode>('debugging');
+const mappedNode = ref<string | null>(null);
+const inputModes = [
+	{ value: 'mapping', label: i18n.baseText('ndv.input.mapping') },
+	{ value: 'debugging', label: i18n.baseText('ndv.input.debugging') },
+];
+
+const nodeTypesStore = useNodeTypesStore();
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
+const uiStore = useUIStore();
+
+const {
+	activeNode,
+	focusedMappableInput,
+	isMappingOnboarded: isUserOnboarded,
+} = storeToRefs(ndvStore);
+const isMappingMode = computed(() => isActiveNodeConfig.value && inputMode.value === 'mapping');
+const showDraggableHint = computed(() => {
+	const toIgnore = [START_NODE_TYPE, MANUAL_TRIGGER_NODE_TYPE, CRON_NODE_TYPE, INTERVAL_NODE_TYPE];
+	if (!currentNode.value || toIgnore.includes(currentNode.value.type)) {
+		return false;
+	}
+
+	return !!focusedMappableInput.value && !isUserOnboarded.value;
+});
+
+const isActiveNodeConfig = computed(() => {
+	let inputs = activeNodeType.value?.inputs ?? [];
+	let outputs = activeNodeType.value?.outputs ?? [];
+
+	if (props.workflow && activeNode.value) {
+		const node = props.workflow.getNode(activeNode.value.name);
+
+		if (node && activeNodeType.value) {
+			inputs = NodeHelpers.getNodeInputs(props.workflow, node, activeNodeType.value);
+			outputs = NodeHelpers.getNodeOutputs(props.workflow, node, activeNodeType.value);
+		}
+	}
+
+	// If we can not figure out the node type we set no outputs
+	if (!Array.isArray(inputs)) {
+		inputs = [];
+	}
+
+	if (!Array.isArray(outputs)) {
+		outputs = [];
+	}
+
+	return (
+		inputs.length === 0 ||
+		(inputs.every((input) => filterOutConnectionType(input, NodeConnectionType.Main)) &&
+			outputs.find((output) => filterOutConnectionType(output, NodeConnectionType.Main)))
+	);
+});
+
+const isMappingEnabled = computed(() => {
+	if (props.readOnly) return false;
+
+	// Mapping is only enabled in mapping mode for config nodes and if node to map is selected
+	if (isActiveNodeConfig.value) return isMappingMode.value && mappedNode.value !== null;
+
+	return true;
+});
+const isExecutingPrevious = computed(() => {
+	if (!workflowRunning.value) {
+		return false;
+	}
+	const triggeredNode = workflowsStore.executedNode;
+	const executingNode = workflowsStore.executingNode;
+
+	if (
+		activeNode.value &&
+		triggeredNode === activeNode.value.name &&
+		workflowsStore.isNodeExecuting(props.currentNodeName)
+	) {
+		return true;
+	}
+
+	if (executingNode.length || triggeredNode) {
+		return !!parentNodes.value.find(
+			(node) => workflowsStore.isNodeExecuting(node.name) || node.name === triggeredNode,
+		);
+	}
+	return false;
+});
+const workflowRunning = computed(() => uiStore.isActionActive.workflowRunning);
+
+const rootNode = computed(() => {
+	if (!activeNode.value) return null;
+
+	return props.workflow.getChildNodes(activeNode.value.name, 'ALL').at(0) ?? null;
+});
+
+const rootNodesParents = computed(() => {
+	if (!rootNode.value) return [];
+	return props.workflow.getParentNodesByDepth(rootNode.value);
+});
+
+const currentNode = computed(() => {
+	if (isActiveNodeConfig.value) {
+		// if we're mapping node we want to show the output of the mapped node
+		if (mappedNode.value) {
+			return workflowsStore.getNodeByName(mappedNode.value);
+		}
+
+		// in debugging mode data does get set manually and is only for debugging
+		// so we want to force the node to be the active node to make sure we show the correct data
+		return activeNode.value;
+	}
+
+	return workflowsStore.getNodeByName(props.currentNodeName ?? '');
+});
+
+const connectedCurrentNodeOutputs = computed(() => {
+	const search = parentNodes.value.find(({ name }) => name === props.currentNodeName);
+	return search?.indicies;
+});
+const parentNodes = computed(() => {
+	if (!activeNode.value) {
+		return [];
+	}
+
+	const parents = props.workflow
+		.getParentNodesByDepth(activeNode.value.name)
+		.filter((parent) => parent.name !== activeNode.value?.name);
+	return uniqBy(parents, (parent) => parent.name);
+});
+
+const currentNodeDepth = computed(() => {
+	const node = parentNodes.value.find(
+		(parent) => currentNode.value && parent.name === currentNode.value.name,
+	);
+	return node?.depth ?? -1;
+});
+
+const activeNodeType = computed(() => {
+	if (!activeNode.value) return null;
+	return nodeTypesStore.getNodeType(activeNode.value.type, activeNode.value.typeVersion);
+});
+
+const waitingMessage = computed(() => {
+	const parentNode = parentNodes.value[0];
+	return parentNode && waitingNodeTooltip(workflowsStore.getNodeByName(parentNode.name));
+});
+
+watch(
+	inputMode,
+	(mode) => {
+		onRunIndexChange(-1);
+		if (mode === 'mapping') {
+			onUnlinkRun();
+			mappedNode.value = rootNodesParents.value[0]?.name ?? null;
+		} else {
+			mappedNode.value = null;
+		}
+	},
+	{ immediate: true },
+);
+
+watch(showDraggableHint, (curr, prev) => {
+	if (curr && !prev) {
+		setTimeout(() => {
+			if (draggableHintShown.value) {
+				return;
+			}
+			showDraggableHintWithDelay.value = showDraggableHint.value;
+			if (showDraggableHintWithDelay.value) {
+				draggableHintShown.value = true;
+
+				telemetry.track('User viewed data mapping tooltip', {
+					type: 'unexecuted input pane',
+				});
+			}
+		}, 1000);
+	} else if (!curr) {
+		showDraggableHintWithDelay.value = false;
+	}
+});
+
+function filterOutConnectionType(
+	item: NodeConnectionType | INodeOutputConfiguration | INodeInputConfiguration,
+	type: NodeConnectionType,
+) {
+	if (!item) return false;
+
+	return typeof item === 'string' ? item !== type : item.type !== type;
+}
+
+function onInputModeChange(val: string) {
+	inputMode.value = val as MappingMode;
+}
+
+function onMappedNodeSelected(val: string) {
+	mappedNode.value = val;
+
+	onRunIndexChange(0);
+	onUnlinkRun();
+}
+
+function onNodeExecute() {
+	emit('execute');
+	if (activeNode.value) {
+		telemetry.track('User clicked ndv button', {
+			node_type: activeNode.value.type,
+			workflow_id: workflowsStore.workflowId,
+			push_ref: props.pushRef,
+			pane: 'input',
+			type: 'executePrevious',
+		});
+	}
+}
+
+function onRunIndexChange(run: number) {
+	emit('runChange', run);
+}
+
+function onLinkRun() {
+	emit('linkRun');
+}
+
+function onUnlinkRun() {
+	emit('unlinkRun');
+}
+
+function onSearch(search: string) {
+	emit('search', search);
+}
+
+function onItemHover(
+	item: {
+		outputIndex: number;
+		itemIndex: number;
+	} | null,
+) {
+	emit('itemHover', item);
+}
+
+function onTableMounted(event: { avgRowHeight: number }) {
+	emit('tableMounted', event);
+}
+
+function onInputNodeChange(value: string) {
+	const index = parentNodes.value.findIndex((node) => node.name === value) + 1;
+	emit('changeInputNode', value, index);
+}
+
+function onConnectionHelpClick() {
+	if (activeNode.value) {
+		telemetry.track('User clicked ndv link', {
+			node_type: activeNode.value.type,
+			workflow_id: workflowsStore.workflowId,
+			push_ref: props.pushRef,
+			pane: 'input',
+			type: 'not-connected-help',
+		});
+	}
+}
+
+function activatePane() {
+	emit('activatePane');
+}
 </script>
 
 <template>
@@ -341,13 +340,13 @@ export default defineComponent({
 		:node="currentNode"
 		:nodes="isMappingMode ? rootNodesParents : parentNodes"
 		:workflow="workflow"
-		:run-index="runIndex"
+		:run-index="isMappingMode ? 0 : runIndex"
 		:linked-runs="linkedRuns"
 		:can-link-runs="!mappedNode && canLinkRuns"
-		:too-much-data-title="$locale.baseText('ndv.input.tooMuchData.title')"
-		:no-data-in-branch-message="$locale.baseText('ndv.input.noOutputDataInBranch')"
+		:too-much-data-title="i18n.baseText('ndv.input.tooMuchData.title')"
+		:no-data-in-branch-message="i18n.baseText('ndv.input.noOutputDataInBranch')"
 		:is-executing="isExecutingPrevious"
-		:executing-message="$locale.baseText('ndv.input.executingPrevious')"
+		:executing-message="i18n.baseText('ndv.input.executingPrevious')"
 		:push-ref="pushRef"
 		:override-outputs="connectedCurrentNodeOutputs"
 		:mapping-enabled="isMappingEnabled"
@@ -357,18 +356,19 @@ export default defineComponent({
 		pane-type="input"
 		data-test-id="ndv-input-panel"
 		@activate-pane="activatePane"
-		@item-hover="$emit('itemHover', $event)"
+		@item-hover="onItemHover"
 		@link-run="onLinkRun"
 		@unlink-run="onUnlinkRun"
 		@run-change="onRunIndexChange"
-		@table-mounted="$emit('tableMounted', $event)"
-		@search="$emit('search', $event)"
+		@table-mounted="onTableMounted"
+		@search="onSearch"
 	>
 		<template #header>
 			<div :class="$style.titleSection">
-				<span :class="$style.title">{{ $locale.baseText('ndv.input') }}</span>
-				<n8n-radio-buttons
+				<span :class="$style.title">{{ i18n.baseText('ndv.input') }}</span>
+				<N8nRadioButtons
 					v-if="isActiveNodeConfig && !readOnly"
+					data-test-id="input-panel-mode"
 					:options="inputModes"
 					:model-value="inputMode"
 					@update:model-value="onInputModeChange"
@@ -404,14 +404,14 @@ export default defineComponent({
 				v-if="(isActiveNodeConfig && rootNode) || parentNodes.length"
 				:class="$style.noOutputData"
 			>
-				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
-					$locale.baseText('ndv.input.noOutputData.title')
-				}}</n8n-text>
-				<n8n-tooltip v-if="!readOnly" :visible="showDraggableHint && showDraggableHintWithDelay">
+				<N8nText tag="div" :bold="true" color="text-dark" size="large">{{
+					i18n.baseText('ndv.input.noOutputData.title')
+				}}</N8nText>
+				<N8nTooltip v-if="!readOnly" :visible="showDraggableHint && showDraggableHintWithDelay">
 					<template #content>
 						<div
 							v-n8n-html="
-								$locale.baseText('dataMapping.dragFromPreviousHint', {
+								i18n.baseText('dataMapping.dragFromPreviousHint', {
 									interpolate: { name: focusedMappableInput },
 								})
 							"
@@ -421,56 +421,56 @@ export default defineComponent({
 						type="secondary"
 						hide-icon
 						:transparent="true"
-						:node-name="isActiveNodeConfig ? rootNode : (currentNodeName ?? '')"
-						:label="$locale.baseText('ndv.input.noOutputData.executePrevious')"
+						:node-name="(isActiveNodeConfig ? rootNode : currentNodeName) ?? ''"
+						:label="i18n.baseText('ndv.input.noOutputData.executePrevious')"
 						telemetry-source="inputs"
 						data-test-id="execute-previous-node"
 						@execute="onNodeExecute"
 					/>
-				</n8n-tooltip>
-				<n8n-text v-if="!readOnly" tag="div" size="small">
-					{{ $locale.baseText('ndv.input.noOutputData.hint') }}
-				</n8n-text>
+				</N8nTooltip>
+				<N8nText v-if="!readOnly" tag="div" size="small">
+					{{ i18n.baseText('ndv.input.noOutputData.hint') }}
+				</N8nText>
 			</div>
 			<div v-else :class="$style.notConnected">
 				<div>
 					<WireMeUp />
 				</div>
-				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
-					$locale.baseText('ndv.input.notConnected.title')
-				}}</n8n-text>
-				<n8n-text tag="div">
-					{{ $locale.baseText('ndv.input.notConnected.message') }}
+				<N8nText tag="div" :bold="true" color="text-dark" size="large">{{
+					i18n.baseText('ndv.input.notConnected.title')
+				}}</N8nText>
+				<N8nText tag="div">
+					{{ i18n.baseText('ndv.input.notConnected.message') }}
 					<a
 						href="https://docs.n8n.io/workflows/connections/"
 						target="_blank"
 						@click="onConnectionHelpClick"
 					>
-						{{ $locale.baseText('ndv.input.notConnected.learnMore') }}
+						{{ i18n.baseText('ndv.input.notConnected.learnMore') }}
 					</a>
-				</n8n-text>
+				</N8nText>
 			</div>
 		</template>
 
 		<template #node-waiting>
-			<n8n-text :bold="true" color="text-dark" size="large">Waiting for input</n8n-text>
-			<n8n-text v-n8n-html="waitingMessage"></n8n-text>
+			<N8nText :bold="true" color="text-dark" size="large">Waiting for input</N8nText>
+			<N8nText v-n8n-html="waitingMessage"></N8nText>
 		</template>
 
 		<template #no-output-data>
-			<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
-				$locale.baseText('ndv.input.noOutputData')
-			}}</n8n-text>
+			<N8nText tag="div" :bold="true" color="text-dark" size="large">{{
+				i18n.baseText('ndv.input.noOutputData')
+			}}</N8nText>
 		</template>
 
 		<template #recovered-artificial-output-data>
 			<div :class="$style.recoveredOutputData">
-				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
-					$locale.baseText('executionDetails.executionFailed.recoveredNodeTitle')
-				}}</n8n-text>
-				<n8n-text>
-					{{ $locale.baseText('executionDetails.executionFailed.recoveredNodeMessage') }}
-				</n8n-text>
+				<N8nText tag="div" :bold="true" color="text-dark" size="large">{{
+					i18n.baseText('executionDetails.executionFailed.recoveredNodeTitle')
+				}}</N8nText>
+				<N8nText>
+					{{ i18n.baseText('executionDetails.executionFailed.recoveredNodeMessage') }}
+				</N8nText>
 			</div>
 		</template>
 	</RunData>
diff --git a/packages/editor-ui/src/components/InputTriple/__tests__/InputTriple.test.ts b/packages/editor-ui/src/components/InputTriple/InputTriple.test.ts
similarity index 95%
rename from packages/editor-ui/src/components/InputTriple/__tests__/InputTriple.test.ts
rename to packages/editor-ui/src/components/InputTriple/InputTriple.test.ts
index a29373ec25..a802317e0e 100644
--- a/packages/editor-ui/src/components/InputTriple/__tests__/InputTriple.test.ts
+++ b/packages/editor-ui/src/components/InputTriple/InputTriple.test.ts
@@ -1,5 +1,5 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import InputTriple from '../InputTriple.vue';
+import InputTriple from './InputTriple.vue';
 
 const renderComponent = createComponentRenderer(InputTriple);
 
diff --git a/packages/editor-ui/src/components/IntersectionObserved.vue b/packages/editor-ui/src/components/IntersectionObserved.vue
index 4fa53e311c..c68a8cd25f 100644
--- a/packages/editor-ui/src/components/IntersectionObserved.vue
+++ b/packages/editor-ui/src/components/IntersectionObserved.vue
@@ -1,34 +1,36 @@
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+<script setup lang="ts">
+import { nextTick } from 'vue';
+import { onBeforeUnmount, onMounted, ref } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
 
-export default defineComponent({
-	name: 'IntersectionObserved',
-	props: {
-		enabled: {
-			type: Boolean,
-			default: false,
-		},
-		eventBus: {
-			type: Object as PropType<EventBus>,
-			default: () => createEventBus(),
-		},
+const props = withDefaults(
+	defineProps<{
+		enabled: boolean;
+		eventBus: EventBus;
+	}>(),
+	{
+		enabled: false,
+		default: () => createEventBus(),
 	},
-	async mounted() {
-		if (!this.enabled) {
-			return;
-		}
+);
 
-		await this.$nextTick();
-		this.eventBus.emit('observe', this.$refs.observed);
-	},
-	beforeUnmount() {
-		if (this.enabled) {
-			this.eventBus.emit('unobserve', this.$refs.observed);
-		}
-	},
+const observed = ref<IntersectionObserver | null>(null);
+
+onMounted(async () => {
+	if (!props.enabled) {
+		return;
+	}
+
+	await nextTick();
+
+	props.eventBus.emit('observe', observed.value);
+});
+
+onBeforeUnmount(() => {
+	if (props.enabled) {
+		props.eventBus.emit('unobserve', observed.value);
+	}
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/IntersectionObserver.vue b/packages/editor-ui/src/components/IntersectionObserver.vue
index cebfb89b7f..bb3607dd64 100644
--- a/packages/editor-ui/src/components/IntersectionObserver.vue
+++ b/packages/editor-ui/src/components/IntersectionObserver.vue
@@ -1,67 +1,65 @@
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, ref } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
 
-export default defineComponent({
-	name: 'IntersectionObserver',
-	props: {
-		threshold: {
-			type: Number,
-			default: 0,
-		},
-		enabled: {
-			type: Boolean,
-			default: false,
-		},
-		eventBus: {
-			type: Object as PropType<EventBus>,
-			default: () => createEventBus(),
-		},
+const props = withDefaults(
+	defineProps<{
+		threshold: number;
+		enabled: boolean;
+		eventBus: EventBus;
+	}>(),
+	{
+		threshold: 0,
+		enabled: false,
+		default: () => createEventBus(),
 	},
-	data() {
-		return {
-			observer: null as IntersectionObserver | null,
-		};
-	},
-	mounted() {
-		if (!this.enabled) {
-			return;
-		}
+);
 
-		const options = {
-			root: this.$refs.root as Element,
-			rootMargin: '0px',
-			threshold: this.threshold,
-		};
+const emit = defineEmits<{
+	observed: [{ el: HTMLElement; isIntersecting: boolean }];
+}>();
 
-		const observer = new IntersectionObserver((entries) => {
-			entries.forEach(({ target, isIntersecting }) => {
-				this.$emit('observed', {
-					el: target,
-					isIntersecting,
-				});
+const observer = ref<IntersectionObserver | null>(null);
+const root = ref<HTMLElement | null>(null);
+
+onBeforeUnmount(() => {
+	if (props.enabled && observer.value) {
+		observer.value.disconnect();
+	}
+});
+
+onMounted(() => {
+	if (!props.enabled) {
+		return;
+	}
+
+	const options = {
+		root: root.value,
+		rootMargin: '0px',
+		threshold: props.threshold,
+	};
+
+	const intersectionObserver = new IntersectionObserver((entries) => {
+		entries.forEach(({ target, isIntersecting }) => {
+			emit('observed', {
+				el: target as HTMLElement,
+				isIntersecting,
 			});
-		}, options);
-
-		this.observer = observer;
-
-		this.eventBus.on('observe', (observed: Element) => {
-			if (observed) {
-				observer.observe(observed);
-			}
 		});
+	}, options);
 
-		this.eventBus.on('unobserve', (observed: Element) => {
-			observer.unobserve(observed);
-		});
-	},
-	beforeUnmount() {
-		if (this.enabled && this.observer) {
-			this.observer.disconnect();
+	observer.value = intersectionObserver;
+
+	props.eventBus.on('observe', (observed: Element) => {
+		if (observed) {
+			intersectionObserver.observe(observed);
 		}
-	},
+	});
+
+	props.eventBus.on('unobserve', (observed: Element) => {
+		intersectionObserver.unobserve(observed);
+	});
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index aa698371e6..c10c6c759f 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -1,6 +1,5 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
+<script lang="ts" setup>
+import { computed, onMounted, ref } from 'vue';
 import { useToast } from '@/composables/useToast';
 import Modal from './Modal.vue';
 import type { IFormInputs, IInviteResponse, IUser, InvitableRoleName } from '@/Interface';
@@ -12,12 +11,256 @@ import {
 } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUIStore } from '@/stores/ui.store';
 import { createFormEventBus, createEventBus } from 'n8n-design-system/utils';
 import { useClipboard } from '@/composables/useClipboard';
+import { useI18n } from '@/composables/useI18n';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const NAME_EMAIL_FORMAT_REGEX = /^.* <(.*)>$/;
 
+const usersStore = useUsersStore();
+const settingsStore = useSettingsStore();
+
+const clipboard = useClipboard();
+const { showMessage, showError } = useToast();
+const i18n = useI18n();
+const { goToUpgrade } = usePageRedirectionHelper();
+
+const formBus = createFormEventBus();
+const modalBus = createEventBus();
+const config = ref<IFormInputs | null>();
+const emails = ref('');
+const role = ref<InvitableRoleName>(ROLE.Member);
+const showInviteUrls = ref<IInviteResponse[] | null>(null);
+const loading = ref(false);
+
+onMounted(() => {
+	config.value = [
+		{
+			name: 'emails',
+			properties: {
+				label: i18n.baseText('settings.users.newEmailsToInvite'),
+				required: true,
+				validationRules: [{ name: 'VALID_EMAILS' }],
+				validators: {
+					VALID_EMAILS: {
+						validate: validateEmails,
+					},
+				},
+				placeholder: 'name1@email.com, name2@email.com, ...',
+				capitalize: true,
+				focusInitially: true,
+			},
+		},
+		{
+			name: 'role',
+			initialValue: ROLE.Member,
+			properties: {
+				label: i18n.baseText('auth.role'),
+				required: true,
+				type: 'select',
+				options: [
+					{
+						value: ROLE.Member,
+						label: i18n.baseText('auth.roles.member'),
+					},
+					{
+						value: ROLE.Admin,
+						label: i18n.baseText('auth.roles.admin'),
+						disabled: !isAdvancedPermissionsEnabled.value,
+					},
+				],
+				capitalize: true,
+			},
+		},
+	];
+});
+
+const emailsCount = computed((): number => {
+	return emails.value.split(',').filter((email: string) => !!email.trim()).length;
+});
+
+const buttonLabel = computed((): string => {
+	if (emailsCount.value > 1) {
+		return i18n.baseText(
+			`settings.users.inviteXUser${settingsStore.isSmtpSetup ? '' : '.inviteUrl'}`,
+			{
+				interpolate: { count: emailsCount.value.toString() },
+			},
+		);
+	}
+
+	return i18n.baseText(`settings.users.inviteUser${settingsStore.isSmtpSetup ? '' : '.inviteUrl'}`);
+});
+
+const enabledButton = computed((): boolean => {
+	return emailsCount.value >= 1;
+});
+
+const invitedUsers = computed((): IUser[] => {
+	return showInviteUrls.value
+		? usersStore.allUsers.filter((user) =>
+				showInviteUrls.value?.find((invite) => invite.user.id === user.id),
+			)
+		: [];
+});
+
+const isAdvancedPermissionsEnabled = computed((): boolean => {
+	return settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedPermissions];
+});
+
+const validateEmails = (value: string | number | boolean | null | undefined) => {
+	if (typeof value !== 'string') {
+		return false;
+	}
+
+	const emails = value.split(',');
+	for (let i = 0; i < emails.length; i++) {
+		const email = emails[i];
+		const parsed = getEmail(email);
+
+		if (!!parsed.trim() && !VALID_EMAIL_REGEX.test(String(parsed).trim().toLowerCase())) {
+			return {
+				messageKey: 'settings.users.invalidEmailError',
+				options: { interpolate: { email: parsed } },
+			};
+		}
+	}
+
+	return false;
+};
+
+function onInput(e: { name: string; value: InvitableRoleName }) {
+	if (e.name === 'emails') {
+		emails.value = e.value;
+	}
+	if (e.name === 'role') {
+		role.value = e.value;
+	}
+}
+
+async function onSubmit() {
+	try {
+		loading.value = true;
+
+		const emailList = emails.value
+			.split(',')
+			.map((email) => ({ email: getEmail(email), role: role.value }))
+			.filter((invite) => !!invite.email);
+
+		if (emailList.length === 0) {
+			throw new Error(i18n.baseText('settings.users.noUsersToInvite'));
+		}
+
+		const invited = await usersStore.inviteUsers(emailList);
+		const erroredInvites = invited.filter((invite) => invite.error);
+		const successfulEmailInvites = invited.filter(
+			(invite) => !invite.error && invite.user.emailSent,
+		);
+		const successfulUrlInvites = invited.filter(
+			(invite) => !invite.error && !invite.user.emailSent,
+		);
+
+		if (successfulEmailInvites.length) {
+			showMessage({
+				type: 'success',
+				title: i18n.baseText(
+					successfulEmailInvites.length > 1
+						? 'settings.users.usersInvited'
+						: 'settings.users.userInvited',
+				),
+				message: i18n.baseText('settings.users.emailInvitesSent', {
+					interpolate: {
+						emails: successfulEmailInvites.map(({ user }) => user.email).join(', '),
+					},
+				}),
+			});
+		}
+
+		if (successfulUrlInvites.length) {
+			if (successfulUrlInvites.length === 1) {
+				void clipboard.copy(successfulUrlInvites[0].user.inviteAcceptUrl);
+			}
+
+			showMessage({
+				type: 'success',
+				title: i18n.baseText(
+					successfulUrlInvites.length > 1
+						? 'settings.users.multipleInviteUrlsCreated'
+						: 'settings.users.inviteUrlCreated',
+				),
+				message: i18n.baseText(
+					successfulUrlInvites.length > 1
+						? 'settings.users.multipleInviteUrlsCreated.message'
+						: 'settings.users.inviteUrlCreated.message',
+					{
+						interpolate: {
+							emails: successfulUrlInvites.map(({ user }) => user.email).join(', '),
+						},
+					},
+				),
+			});
+		}
+
+		if (erroredInvites.length) {
+			setTimeout(() => {
+				showMessage({
+					type: 'error',
+					title: i18n.baseText('settings.users.usersEmailedError'),
+					message: i18n.baseText('settings.users.emailInvitesSentError', {
+						interpolate: { emails: erroredInvites.map(({ error }) => error).join(', ') },
+					}),
+				});
+			}, 0); // notifications stack on top of each other otherwise
+		}
+
+		if (successfulUrlInvites.length > 1) {
+			showInviteUrls.value = successfulUrlInvites;
+		} else {
+			modalBus.emit('close');
+		}
+	} catch (error) {
+		showError(error, i18n.baseText('settings.users.usersInvitedError'));
+	}
+	loading.value = false;
+}
+
+function showCopyInviteLinkToast(successfulUrlInvites: IInviteResponse[]) {
+	showMessage({
+		type: 'success',
+		title: i18n.baseText(
+			successfulUrlInvites.length > 1
+				? 'settings.users.multipleInviteUrlsCreated'
+				: 'settings.users.inviteUrlCreated',
+		),
+		message: i18n.baseText(
+			successfulUrlInvites.length > 1
+				? 'settings.users.multipleInviteUrlsCreated.message'
+				: 'settings.users.inviteUrlCreated.message',
+			{
+				interpolate: {
+					emails: successfulUrlInvites.map(({ user }) => user.email).join(', '),
+				},
+			},
+		),
+	});
+}
+
+function onSubmitClick() {
+	formBus.emit('submit');
+}
+
+function onCopyInviteLink(user: IUser) {
+	if (user.inviteAcceptUrl && showInviteUrls.value) {
+		void clipboard.copy(user.inviteAcceptUrl);
+		showCopyInviteLinkToast([]);
+	}
+}
+
+function goToUpgradeAdvancedPermissions() {
+	void goToUpgrade('advanced-permissions', 'upgrade-advanced-permissions');
+}
+
 function getEmail(email: string): string {
 	let parsed = email.trim();
 	if (NAME_EMAIL_FORMAT_REGEX.test(parsed)) {
@@ -28,266 +271,13 @@ function getEmail(email: string): string {
 	}
 	return parsed;
 }
-
-export default defineComponent({
-	name: 'InviteUsersModal',
-	components: { Modal },
-	props: {
-		modalName: {
-			type: String,
-		},
-	},
-	setup() {
-		const clipboard = useClipboard();
-
-		return {
-			clipboard,
-			...useToast(),
-		};
-	},
-	data() {
-		return {
-			config: null as IFormInputs | null,
-			formBus: createFormEventBus(),
-			modalBus: createEventBus(),
-			emails: '',
-			role: ROLE.Member as InvitableRoleName,
-			showInviteUrls: null as IInviteResponse[] | null,
-			loading: false,
-			INVITE_USER_MODAL_KEY,
-		};
-	},
-	mounted() {
-		this.config = [
-			{
-				name: 'emails',
-				properties: {
-					label: this.$locale.baseText('settings.users.newEmailsToInvite'),
-					required: true,
-					validationRules: [{ name: 'VALID_EMAILS' }],
-					validators: {
-						VALID_EMAILS: {
-							validate: this.validateEmails,
-						},
-					},
-					placeholder: 'name1@email.com, name2@email.com, ...',
-					capitalize: true,
-					focusInitially: true,
-				},
-			},
-			{
-				name: 'role',
-				initialValue: ROLE.Member,
-				properties: {
-					label: this.$locale.baseText('auth.role'),
-					required: true,
-					type: 'select',
-					options: [
-						{
-							value: ROLE.Member,
-							label: this.$locale.baseText('auth.roles.member'),
-						},
-						{
-							value: ROLE.Admin,
-							label: this.$locale.baseText('auth.roles.admin'),
-							disabled: !this.isAdvancedPermissionsEnabled,
-						},
-					],
-					capitalize: true,
-				},
-			},
-		];
-	},
-	computed: {
-		...mapStores(useUsersStore, useSettingsStore, useUIStore),
-		emailsCount(): number {
-			return this.emails.split(',').filter((email: string) => !!email.trim()).length;
-		},
-		buttonLabel(): string {
-			if (this.emailsCount > 1) {
-				return this.$locale.baseText(
-					`settings.users.inviteXUser${this.settingsStore.isSmtpSetup ? '' : '.inviteUrl'}`,
-					{
-						interpolate: { count: this.emailsCount.toString() },
-					},
-				);
-			}
-
-			return this.$locale.baseText(
-				`settings.users.inviteUser${this.settingsStore.isSmtpSetup ? '' : '.inviteUrl'}`,
-			);
-		},
-		enabledButton(): boolean {
-			return this.emailsCount >= 1;
-		},
-		invitedUsers(): IUser[] {
-			return this.showInviteUrls
-				? this.usersStore.allUsers.filter((user) =>
-						this.showInviteUrls!.find((invite) => invite.user.id === user.id),
-					)
-				: [];
-		},
-		isAdvancedPermissionsEnabled(): boolean {
-			return this.settingsStore.isEnterpriseFeatureEnabled[
-				EnterpriseEditionFeature.AdvancedPermissions
-			];
-		},
-	},
-	methods: {
-		validateEmails(value: string | number | boolean | null | undefined) {
-			if (typeof value !== 'string') {
-				return false;
-			}
-
-			const emails = value.split(',');
-			for (let i = 0; i < emails.length; i++) {
-				const email = emails[i];
-				const parsed = getEmail(email);
-
-				if (!!parsed.trim() && !VALID_EMAIL_REGEX.test(String(parsed).trim().toLowerCase())) {
-					return {
-						messageKey: 'settings.users.invalidEmailError',
-						options: { interpolate: { email: parsed } },
-					};
-				}
-			}
-
-			return false;
-		},
-		onInput(e: { name: string; value: InvitableRoleName }) {
-			if (e.name === 'emails') {
-				this.emails = e.value;
-			}
-			if (e.name === 'role') {
-				this.role = e.value;
-			}
-		},
-		async onSubmit() {
-			try {
-				this.loading = true;
-
-				const emails = this.emails
-					.split(',')
-					.map((email) => ({ email: getEmail(email), role: this.role }))
-					.filter((invite) => !!invite.email);
-
-				if (emails.length === 0) {
-					throw new Error(this.$locale.baseText('settings.users.noUsersToInvite'));
-				}
-
-				const invited = await this.usersStore.inviteUsers(emails);
-				const erroredInvites = invited.filter((invite) => invite.error);
-				const successfulEmailInvites = invited.filter(
-					(invite) => !invite.error && invite.user.emailSent,
-				);
-				const successfulUrlInvites = invited.filter(
-					(invite) => !invite.error && !invite.user.emailSent,
-				);
-
-				if (successfulEmailInvites.length) {
-					this.showMessage({
-						type: 'success',
-						title: this.$locale.baseText(
-							successfulEmailInvites.length > 1
-								? 'settings.users.usersInvited'
-								: 'settings.users.userInvited',
-						),
-						message: this.$locale.baseText('settings.users.emailInvitesSent', {
-							interpolate: {
-								emails: successfulEmailInvites.map(({ user }) => user.email).join(', '),
-							},
-						}),
-					});
-				}
-
-				if (successfulUrlInvites.length) {
-					if (successfulUrlInvites.length === 1) {
-						void this.clipboard.copy(successfulUrlInvites[0].user.inviteAcceptUrl);
-					}
-
-					this.showMessage({
-						type: 'success',
-						title: this.$locale.baseText(
-							successfulUrlInvites.length > 1
-								? 'settings.users.multipleInviteUrlsCreated'
-								: 'settings.users.inviteUrlCreated',
-						),
-						message: this.$locale.baseText(
-							successfulUrlInvites.length > 1
-								? 'settings.users.multipleInviteUrlsCreated.message'
-								: 'settings.users.inviteUrlCreated.message',
-							{
-								interpolate: {
-									emails: successfulUrlInvites.map(({ user }) => user.email).join(', '),
-								},
-							},
-						),
-					});
-				}
-
-				if (erroredInvites.length) {
-					setTimeout(() => {
-						this.showMessage({
-							type: 'error',
-							title: this.$locale.baseText('settings.users.usersEmailedError'),
-							message: this.$locale.baseText('settings.users.emailInvitesSentError', {
-								interpolate: { emails: erroredInvites.map(({ error }) => error).join(', ') },
-							}),
-						});
-					}, 0); // notifications stack on top of each other otherwise
-				}
-
-				if (successfulUrlInvites.length > 1) {
-					this.showInviteUrls = successfulUrlInvites;
-				} else {
-					this.modalBus.emit('close');
-				}
-			} catch (error) {
-				this.showError(error, this.$locale.baseText('settings.users.usersInvitedError'));
-			}
-			this.loading = false;
-		},
-		showCopyInviteLinkToast(successfulUrlInvites: IInviteResponse[]) {
-			this.showMessage({
-				type: 'success',
-				title: this.$locale.baseText(
-					successfulUrlInvites.length > 1
-						? 'settings.users.multipleInviteUrlsCreated'
-						: 'settings.users.inviteUrlCreated',
-				),
-				message: this.$locale.baseText(
-					successfulUrlInvites.length > 1
-						? 'settings.users.multipleInviteUrlsCreated.message'
-						: 'settings.users.inviteUrlCreated.message',
-					{
-						interpolate: {
-							emails: successfulUrlInvites.map(({ user }) => user.email).join(', '),
-						},
-					},
-				),
-			});
-		},
-		onSubmitClick() {
-			this.formBus.emit('submit');
-		},
-		onCopyInviteLink(user: IUser) {
-			if (user.inviteAcceptUrl && this.showInviteUrls) {
-				void this.clipboard.copy(user.inviteAcceptUrl);
-				this.showCopyInviteLinkToast([]);
-			}
-		},
-		goToUpgradeAdvancedPermissions() {
-			void this.uiStore.goToUpgrade('advanced-permissions', 'upgrade-advanced-permissions');
-		},
-	},
-});
 </script>
 
 <template>
 	<Modal
 		:name="INVITE_USER_MODAL_KEY"
 		:title="
-			$locale.baseText(
+			i18n.baseText(
 				showInviteUrls ? 'settings.users.copyInviteUrls' : 'settings.users.inviteNewUsers',
 			)
 		"
@@ -301,7 +291,7 @@ export default defineComponent({
 				<i18n-t keypath="settings.users.advancedPermissions.warning">
 					<template #link>
 						<n8n-link size="small" @click="goToUpgradeAdvancedPermissions">
-							{{ $locale.baseText('settings.users.advancedPermissions.warning.link') }}
+							{{ i18n.baseText('settings.users.advancedPermissions.warning.link') }}
 						</n8n-link>
 					</template>
 				</i18n-t>
@@ -311,7 +301,7 @@ export default defineComponent({
 					<template #actions="{ user }">
 						<n8n-tooltip>
 							<template #content>
-								{{ $locale.baseText('settings.users.inviteLink.copy') }}
+								{{ i18n.baseText('settings.users.inviteLink.copy') }}
 							</template>
 							<n8n-icon-button
 								icon="link"
diff --git a/packages/editor-ui/src/components/__tests__/JsEditor.test.ts b/packages/editor-ui/src/components/JsEditor.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/JsEditor.test.ts
rename to packages/editor-ui/src/components/JsEditor.test.ts
diff --git a/packages/editor-ui/src/components/JsEditor/JsEditor.vue b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
index 906a8476db..f8ef90cc3a 100644
--- a/packages/editor-ui/src/components/JsEditor/JsEditor.vue
+++ b/packages/editor-ui/src/components/JsEditor/JsEditor.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { history, toggleComment } from '@codemirror/commands';
+import { history } from '@codemirror/commands';
 import { javascript } from '@codemirror/lang-javascript';
 import { foldGutter, indentOnInput } from '@codemirror/language';
 import { lintGutter } from '@codemirror/lint';
@@ -16,14 +16,9 @@ import {
 } from '@codemirror/view';
 import { computed, onMounted, ref, watch } from 'vue';
 
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
-import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
 
 type Props = {
 	modelValue: string;
@@ -85,7 +80,7 @@ const extensions = computed(() => {
 		lineNumbers(),
 		EditorView.lineWrapping,
 		EditorState.readOnly.of(props.isReadOnly),
-		codeNodeEditorTheme({
+		codeEditorTheme({
 			isReadOnly: props.isReadOnly,
 			maxHeight: props.fillParent ? '100%' : '40vh',
 			minHeight: '20vh',
@@ -96,15 +91,7 @@ const extensions = computed(() => {
 	if (!props.isReadOnly) {
 		extensionsToApply.push(
 			history(),
-			Prec.highest(
-				keymap.of([
-					...tabKeyMap(),
-					...enterKeyMap,
-					...historyKeyMap,
-					...autocompleteKeyMap,
-					{ key: 'Mod-/', run: toggleComment },
-				]),
-			),
+			Prec.highest(keymap.of(editorKeymap)),
 			lintGutter(),
 			n8nAutocompletion(),
 			indentOnInput(),
diff --git a/packages/editor-ui/src/components/__tests__/JsonEditor.test.ts b/packages/editor-ui/src/components/JsonEditor.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/JsonEditor.test.ts
rename to packages/editor-ui/src/components/JsonEditor.test.ts
diff --git a/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
index a24bf2373f..4b2c92d87a 100644
--- a/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
+++ b/packages/editor-ui/src/components/JsonEditor/JsonEditor.vue
@@ -15,15 +15,10 @@ import {
 	lineNumbers,
 } from '@codemirror/view';
 
-import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
 import { mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 
 type Props = {
@@ -41,6 +36,7 @@ const emit = defineEmits<{
 const jsonEditorRef = ref<HTMLDivElement>();
 const editor = ref<EditorView | null>(null);
 const editorState = ref<EditorState | null>(null);
+const isDirty = ref(false);
 
 const extensions = computed(() => {
 	const extensionsToApply: Extension[] = [
@@ -48,7 +44,7 @@ const extensions = computed(() => {
 		lineNumbers(),
 		EditorView.lineWrapping,
 		EditorState.readOnly.of(props.isReadOnly),
-		codeNodeEditorTheme({
+		codeEditorTheme({
 			isReadOnly: props.isReadOnly,
 			maxHeight: props.fillParent ? '100%' : '40vh',
 			minHeight: '20vh',
@@ -58,9 +54,7 @@ const extensions = computed(() => {
 	if (!props.isReadOnly) {
 		extensionsToApply.push(
 			history(),
-			Prec.highest(
-				keymap.of([...tabKeyMap(), ...enterKeyMap, ...historyKeyMap, ...autocompleteKeyMap]),
-			),
+			Prec.highest(keymap.of(editorKeymap)),
 			createLinter(jsonParseLinter()),
 			lintGutter(),
 			n8nAutocompletion(),
@@ -72,6 +66,7 @@ const extensions = computed(() => {
 			bracketMatching(),
 			mappingDropCursor(),
 			EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
+				isDirty.value = true;
 				if (!viewUpdate.docChanged || !editor.value) return;
 				emit('update:modelValue', editor.value?.state.doc.toString());
 			}),
@@ -84,6 +79,12 @@ onMounted(() => {
 	createEditor();
 });
 
+onBeforeUnmount(() => {
+	if (!editor.value) return;
+	if (isDirty.value) emit('update:modelValue', editor.value.state.doc.toString());
+	editor.value.destroy();
+});
+
 watch(
 	() => props.modelValue,
 	(newValue: string) => {
diff --git a/packages/editor-ui/src/components/Logo.vue b/packages/editor-ui/src/components/Logo.vue
deleted file mode 100644
index 77e811f35c..0000000000
--- a/packages/editor-ui/src/components/Logo.vue
+++ /dev/null
@@ -1,28 +0,0 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-import { useRootStore } from '@/stores/root.store';
-import { useUIStore } from '@/stores/ui.store';
-
-export default defineComponent({
-	computed: {
-		...mapStores(useRootStore, useUIStore),
-		basePath(): string {
-			return this.rootStore.baseUrl;
-		},
-		logoPath(): string {
-			return this.basePath + this.uiStore.logo;
-		},
-	},
-});
-</script>
-
-<template>
-	<img :src="logoPath" :class="$style.img" alt="n8n.io" />
-</template>
-
-<style lang="scss" module>
-.img {
-	height: 32px;
-}
-</style>
diff --git a/packages/editor-ui/src/components/Logo/Logo.vue b/packages/editor-ui/src/components/Logo/Logo.vue
new file mode 100644
index 0000000000..6d643de718
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/Logo.vue
@@ -0,0 +1,120 @@
+<script setup lang="ts">
+import type { FrontendSettings } from '@n8n/api-types';
+import { computed, onMounted, useCssModule, useTemplateRef } from 'vue';
+import { useFavicon } from '@vueuse/core';
+
+import LogoIcon from './logo-icon.svg';
+import LogoText from './logo-text.svg';
+
+const props = defineProps<
+	(
+		| {
+				location: 'authView';
+		  }
+		| {
+				location: 'sidebar';
+				collapsed: boolean;
+		  }
+	) & {
+		releaseChannel: FrontendSettings['releaseChannel'];
+	}
+>();
+
+const { location, releaseChannel } = props;
+
+const showReleaseChannelTag = computed(() => {
+	if (releaseChannel === 'stable') return false;
+	if (location === 'authView') return true;
+	return !props.collapsed;
+});
+
+const showLogoText = computed(() => {
+	if (location === 'authView') return true;
+	return !props.collapsed;
+});
+
+const $style = useCssModule();
+const containerClasses = computed(() => {
+	if (location === 'authView') {
+		return [$style.logoContainer, $style.authView];
+	}
+	return [
+		$style.logoContainer,
+		$style.sidebar,
+		props.collapsed ? $style.sidebarCollapsed : $style.sidebarExpanded,
+	];
+});
+
+const svg = useTemplateRef<{ $el: Element }>('logo');
+onMounted(() => {
+	if (releaseChannel === 'stable' || !('createObjectURL' in URL)) return;
+
+	const logoEl = svg.value!.$el;
+
+	// Change the logo fill color inline, so that favicon can also use it
+	const logoColor = releaseChannel === 'dev' ? '#838383' : '#E9984B';
+	logoEl.querySelector('path')?.setAttribute('fill', logoColor);
+
+	// Reuse the SVG as favicon
+	const blob = new Blob([logoEl.outerHTML], { type: 'image/svg+xml' });
+	useFavicon(URL.createObjectURL(blob));
+});
+</script>
+
+<template>
+	<div :class="containerClasses" data-test-id="n8n-logo">
+		<LogoIcon :class="$style.logo" ref="logo" />
+		<LogoText v-if="showLogoText" :class="$style.logoText" />
+		<div v-if="showReleaseChannelTag" size="small" round :class="$style.releaseChannelTag">
+			{{ releaseChannel }}
+		</div>
+		<slot />
+	</div>
+</template>
+
+<style lang="scss" module>
+.logoContainer {
+	display: flex;
+	justify-content: center;
+}
+
+.logoText {
+	margin-left: var(--spacing-5xs);
+	path {
+		fill: var(--color-text-dark);
+	}
+}
+
+.releaseChannelTag {
+	color: var(--color-text-dark);
+	padding: var(--spacing-5xs) var(--spacing-4xs);
+	background-color: var(--color-background-base);
+	border: 1px solid var(--color-foreground-base);
+	border-radius: var(--border-radius-base);
+	font-size: var(--font-size-4xs);
+	font-weight: var(--font-weight-bold);
+	text-transform: capitalize;
+	line-height: var(--font-line-height-regular);
+	height: var(--spacing-s);
+	margin: 10px 0 0 3px;
+}
+
+.authView {
+	transform: scale(2);
+	margin-bottom: var(--spacing-xl);
+}
+
+.sidebar {
+	transform: scale(1.3);
+}
+
+.sidebarExpanded .logo {
+	margin-left: var(--spacing-xs);
+}
+
+.sidebarCollapsed .logo {
+	width: 40px;
+	height: 30px;
+	padding: 0 var(--spacing-4xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Logo/__tests__/Logo.test.ts b/packages/editor-ui/src/components/Logo/__tests__/Logo.test.ts
new file mode 100644
index 0000000000..49b8d1a22f
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/__tests__/Logo.test.ts
@@ -0,0 +1,38 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import Logo from '../Logo.vue';
+
+vi.stubGlobal('URL', {
+	createObjectURL: vi.fn(),
+});
+
+describe('Logo', () => {
+	const renderComponent = createComponentRenderer(Logo);
+
+	it('renders the logo for authView location', () => {
+		const wrapper = renderComponent({
+			props: { location: 'authView', releaseChannel: 'stable' },
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders the logo for sidebar location when sidebar is expanded', () => {
+		const wrapper = renderComponent({
+			props: { location: 'sidebar', collapsed: false, releaseChannel: 'stable' },
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders the logo for sidebar location when sidebar is collapsed', () => {
+		const wrapper = renderComponent({
+			props: { location: 'sidebar', collapsed: true, releaseChannel: 'stable' },
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('renders the releaseChannelTag for non-stable releaseChannel', async () => {
+		const wrapper = renderComponent({
+			props: { location: 'authView', releaseChannel: 'dev' },
+		});
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap b/packages/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap
new file mode 100644
index 0000000000..5947e5d0a5
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/__tests__/__snapshots__/Logo.test.ts.snap
@@ -0,0 +1,49 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`Logo > renders the logo for authView location 1`] = `
+"<div class="logoContainer authView" data-test-id="n8n-logo"><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" class="logo">
+    <path fill="#EA4B71" fill-rule="evenodd" d="M27.2 16.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 18a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 22h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789a1.6 1.6 0 0 0-1.578-1.337h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 18a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79a3.2 3.2 0 0 1 3.156-2.673h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"></path>
+  </svg><svg width="26" height="30" class="logoText">
+    <g fill="#101330">
+      <path fill-rule="evenodd" d="M15.002 16.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"></path>
+      <path d="M18.367 21.2h1.624v-3.442c0-1.131.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V17.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0H2.367v-6.352h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85H6.808V17.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"></path>
+    </g>
+  </svg>
+  <!--v-if-->
+</div>"
+`;
+
+exports[`Logo > renders the logo for sidebar location when sidebar is collapsed 1`] = `
+"<div class="logoContainer sidebar sidebarCollapsed" data-test-id="n8n-logo"><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" class="logo">
+    <path fill="#EA4B71" fill-rule="evenodd" d="M27.2 16.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 18a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 22h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789a1.6 1.6 0 0 0-1.578-1.337h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 18a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79a3.2 3.2 0 0 1 3.156-2.673h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"></path>
+  </svg>
+  <!--v-if-->
+  <!--v-if-->
+</div>"
+`;
+
+exports[`Logo > renders the logo for sidebar location when sidebar is expanded 1`] = `
+"<div class="logoContainer sidebar sidebarExpanded" data-test-id="n8n-logo"><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" class="logo">
+    <path fill="#EA4B71" fill-rule="evenodd" d="M27.2 16.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 18a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 22h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789a1.6 1.6 0 0 0-1.578-1.337h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 18a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79a3.2 3.2 0 0 1 3.156-2.673h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"></path>
+  </svg><svg width="26" height="30" class="logoText">
+    <g fill="#101330">
+      <path fill-rule="evenodd" d="M15.002 16.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"></path>
+      <path d="M18.367 21.2h1.624v-3.442c0-1.131.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V17.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0H2.367v-6.352h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85H6.808V17.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"></path>
+    </g>
+  </svg>
+  <!--v-if-->
+</div>"
+`;
+
+exports[`Logo > renders the releaseChannelTag for non-stable releaseChannel 1`] = `
+"<div class="logoContainer authView" data-test-id="n8n-logo"><svg xmlns="http://www.w3.org/2000/svg" width="30" height="30" class="logo">
+    <path fill="#838383" fill-rule="evenodd" d="M27.2 16.4a3.2 3.2 0 0 1-3.1-2.4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 18a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 22h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789a1.6 1.6 0 0 0-1.578-1.337h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 18a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79a3.2 3.2 0 0 1 3.156-2.673h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m9.6-1.6a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" clip-rule="evenodd"></path>
+  </svg><svg width="26" height="30" class="logoText">
+    <g fill="#101330">
+      <path fill-rule="evenodd" d="M15.002 16.918v-.076c.558-.28 1.116-.762 1.116-1.716 0-1.372-1.13-2.198-2.69-2.198-1.598 0-2.74.877-2.74 2.224 0 .915.533 1.41 1.116 1.69v.076a2.16 2.16 0 0 0-1.42 2.059c0 1.385 1.141 2.351 3.032 2.351 1.89 0 2.994-.966 2.994-2.351a2.16 2.16 0 0 0-1.408-2.059m-1.587-2.82c.635 0 1.104.406 1.104 1.092s-.482 1.093-1.103 1.093c-.622 0-1.142-.407-1.142-1.093 0-.699.495-1.093 1.142-1.093m0 6.01c-.735 0-1.332-.47-1.332-1.27 0-.725.495-1.272 1.32-1.272.812 0 1.307.534 1.307 1.297 0 .775-.571 1.245-1.294 1.245" clip-rule="evenodd"></path>
+      <path d="M18.367 21.2h1.624v-3.442c0-1.131.685-1.627 1.46-1.627.76 0 1.357.509 1.357 1.55v3.52h1.624V17.35c0-1.664-.964-2.63-2.474-2.63-.952 0-1.485.381-1.865.877h-.102l-.14-.75h-1.484zm-14.376 0H2.367v-6.352h1.485l.14.75h.1c.381-.496.914-.877 1.866-.877 1.51 0 2.474.966 2.474 2.63v3.85H6.808V17.68c0-1.041-.596-1.55-1.358-1.55-.774 0-1.459.496-1.459 1.627z"></path>
+    </g>
+  </svg>
+  <div size="small" round="" class="releaseChannelTag">dev</div>
+</div>"
+`;
diff --git a/packages/editor-ui/src/components/Logo/logo-icon.svg b/packages/editor-ui/src/components/Logo/logo-icon.svg
new file mode 100644
index 0000000000..90a0081f12
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/logo-icon.svg
@@ -0,0 +1,3 @@
+<svg xmlns='http://www.w3.org/2000/svg' width="30" height="30">
+  <path fill="#EA4B71" fill-rule="evenodd" clip-rule="evenodd" transform="translate(0, 10)" d="M27.2 6.4A3.2 3.2 0 0 1 24.1 4h-3.667a1.6 1.6 0 0 0-1.578 1.337l-.132.79A3.2 3.2 0 0 1 17.683 8a3.2 3.2 0 0 1 1.04 1.874l.132.789A1.6 1.6 0 0 0 20.433 12h.468a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-6.3.8h-.467a3.2 3.2 0 0 1-3.156-2.674l-.132-.789A1.6 1.6 0 0 0 15.567 8.8h-1.268a3.201 3.201 0 0 1-6.198 0H6.299A3.201 3.201 0 0 1 0 8a3.2 3.2 0 0 1 6.3-.8h1.8a3.201 3.201 0 0 1 6.2 0h1.267a1.6 1.6 0 0 0 1.578-1.337l.132-.79A3.2 3.2 0 0 1 20.433 2.4h3.668a3.201 3.201 0 0 1 6.299.8 3.2 3.2 0 0 1-3.2 3.2m0-1.6a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2m-24 4.8a1.6 1.6 0 1 0 0-3.2 1.6 1.6 0 0 0 0 3.2M12.8 8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0m12.8 4.8a1.6 1.6 0 1 1-3.2 0 1.6 1.6 0 0 1 3.2 0" />
+</svg>
diff --git a/packages/editor-ui/src/components/Logo/logo-text.svg b/packages/editor-ui/src/components/Logo/logo-text.svg
new file mode 100644
index 0000000000..6b8c963894
--- /dev/null
+++ b/packages/editor-ui/src/components/Logo/logo-text.svg
@@ -0,0 +1,6 @@
+<svg width="26" height="30">
+  <g fill="#101330" transform="translate(-33, 10)">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M 48.002,6.918 V 6.842 c 0.558,-0.28 1.116,-0.762 1.116,-1.716 0,-1.372 -1.13,-2.198 -2.69,-2.198 -1.598,0 -2.74,0.877 -2.74,2.224 0,0.915 0.533,1.41 1.116,1.69 v 0.076 a 2.16,2.16 0 0 0 -1.42,2.059 c 0,1.385 1.141,2.351 3.032,2.351 1.89,0 2.994,-0.966 2.994,-2.351 A 2.16,2.16 0 0 0 48.002,6.918 m -1.587,-2.82 c 0.635,0 1.104,0.406 1.104,1.092 0,0.686 -0.482,1.093 -1.103,1.093 -0.622,0 -1.142,-0.407 -1.142,-1.093 0,-0.699 0.495,-1.093 1.142,-1.093 m 0,6.01 c -0.735,0 -1.332,-0.47 -1.332,-1.27 0,-0.725 0.495,-1.272 1.32,-1.272 0.812,0 1.307,0.534 1.307,1.297 0,0.775 -0.571,1.245 -1.294,1.245" />
+    <path d="m 51.367,11.2 h 1.624 V 7.758 c 0,-1.131 0.685,-1.627 1.46,-1.627 0.76,0 1.357,0.509 1.357,1.55 v 3.52 h 1.624 V 7.35 c 0,-1.664 -0.964,-2.63 -2.474,-2.63 -0.952,0 -1.485,0.381 -1.865,0.877 h -0.102 l -0.14,-0.75 h -1.484 z m -14.376,0 H 35.367 V 4.848 h 1.485 l 0.14,0.75 h 0.1 c 0.381,-0.496 0.914,-0.877 1.866,-0.877 1.51,0 2.474,0.966 2.474,2.63 v 3.85 H 39.808 V 7.68 c 0,-1.041 -0.596,-1.55 -1.358,-1.55 -0.774,0 -1.459,0.496 -1.459,1.627 z" />
+  </g>
+</svg>
diff --git a/packages/editor-ui/src/components/MainHeader/MainHeader.vue b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
index 0625d2ff2c..7db2b3a478 100644
--- a/packages/editor-ui/src/components/MainHeader/MainHeader.vue
+++ b/packages/editor-ui/src/components/MainHeader/MainHeader.vue
@@ -5,10 +5,12 @@ import { useRouter, useRoute } from 'vue-router';
 import WorkflowDetails from '@/components/MainHeader/WorkflowDetails.vue';
 import TabBar from '@/components/MainHeader/TabBar.vue';
 import {
+	LOCAL_STORAGE_HIDE_GITHUB_STAR_BUTTON,
 	MAIN_HEADER_TABS,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	STICKY_NODE_TYPE,
 	VIEWS,
+	WORKFLOW_EVALUATION_EXPERIMENT,
 } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -16,7 +18,12 @@ import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
 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();
@@ -27,16 +34,48 @@ const uiStore = useUIStore();
 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 = 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') },
-]);
+// Track the routes that are used for the tabs
+// This is used to determine which tab to show when the route changes
+// TODO: It might be easier to manage this in the router config, by passing meta information to the routes
+// This would allow us to specify it just once on the root route, and then have the tabs be determined for children
+const testDefinitionRoutes: VIEWS[] = [
+	VIEWS.TEST_DEFINITION,
+	VIEWS.TEST_DEFINITION_EDIT,
+	VIEWS.TEST_DEFINITION_RUNS,
+	VIEWS.TEST_DEFINITION_RUNS_DETAIL,
+	VIEWS.TEST_DEFINITION_RUNS_COMPARE,
+];
+
+const workflowRoutes: VIEWS[] = [VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW, VIEWS.EXECUTION_DEBUG];
+
+const executionRoutes: VIEWS[] = [
+	VIEWS.EXECUTION_HOME,
+	VIEWS.WORKFLOW_EXECUTIONS,
+	VIEWS.EXECUTION_PREVIEW,
+];
+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(() =>
@@ -48,6 +87,12 @@ const workflowId = computed(() =>
 );
 const onWorkflowPage = computed(() => !!(route.meta.nodeView || route.meta.keepWorkflowAlive));
 const readOnly = computed(() => sourceControlStore.preferences.branchReadOnly);
+const isEnterprise = computed(
+	() => settingsStore.isQueueModeEnabled && settingsStore.isWorkerViewAvailable,
+);
+const showGitHubButton = computed(
+	() => !isEnterprise.value && !settingsStore.settings.inE2ETests && !githubButtonHidden.value,
+);
 
 watch(route, (to, from) => {
 	syncTabsWithRoute(to, from);
@@ -66,21 +111,30 @@ onMounted(async () => {
 	syncTabsWithRoute(route);
 });
 
+function isViewRoute(name: unknown): name is VIEWS {
+	return (
+		typeof name === 'string' &&
+		[testDefinitionRoutes, workflowRoutes, executionRoutes].flat().includes(name as VIEWS)
+	);
+}
+
 function syncTabsWithRoute(to: RouteLocation, from?: RouteLocation): void {
-	if (
-		to.name === VIEWS.EXECUTION_HOME ||
-		to.name === VIEWS.WORKFLOW_EXECUTIONS ||
-		to.name === VIEWS.EXECUTION_PREVIEW
-	) {
-		activeHeaderTab.value = MAIN_HEADER_TABS.EXECUTIONS;
-	} else if (
-		to.name === VIEWS.WORKFLOW ||
-		to.name === VIEWS.NEW_WORKFLOW ||
-		to.name === VIEWS.EXECUTION_DEBUG
-	) {
-		activeHeaderTab.value = MAIN_HEADER_TABS.WORKFLOW;
+	// Map route types to their corresponding tab in the header
+	const routeTabMapping = [
+		{ routes: testDefinitionRoutes, tab: MAIN_HEADER_TABS.TEST_DEFINITION },
+		{ routes: executionRoutes, tab: MAIN_HEADER_TABS.EXECUTIONS },
+		{ routes: workflowRoutes, tab: MAIN_HEADER_TABS.WORKFLOW },
+	];
+
+	// Update the active tab based on the current route
+	if (to.name && isViewRoute(to.name)) {
+		const matchingTab = routeTabMapping.find(({ routes }) => routes.includes(to.name as VIEWS));
+		if (matchingTab) {
+			activeHeaderTab.value = matchingTab.tab;
+		}
 	}
 
+	// Store the current workflow ID, but only if it's not a new workflow
 	if (to.params.name !== 'new' && typeof to.params.name === 'string') {
 		workflowToReturnTo.value = to.params.name;
 	}
@@ -106,6 +160,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;
 	}
@@ -158,10 +217,14 @@ async function navigateToExecutionsView(openInNewTab: boolean) {
 		await router.push(routeToNavigateTo);
 	}
 }
+
+function hideGithubButton() {
+	githubButtonHidden.value = true;
+}
 </script>
 
 <template>
-	<div>
+	<div class="container">
 		<div :class="{ 'main-header': true, expanded: !uiStore.sidebarMenuCollapsed }">
 			<div v-show="!hideMenuBar" class="top-menu">
 				<WorkflowDetails
@@ -174,11 +237,30 @@ async function navigateToExecutionsView(openInNewTab: boolean) {
 					:active="workflow.active"
 					:read-only="readOnly"
 				/>
-				<TabBar
-					v-if="onWorkflowPage"
-					:items="tabBarItems"
-					:model-value="activeHeaderTab"
-					@update:model-value="onTabSelected"
+			</div>
+			<TabBar
+				v-if="onWorkflowPage"
+				:items="tabBarItems"
+				:model-value="activeHeaderTab"
+				@update:model-value="onTabSelected"
+			/>
+		</div>
+		<div v-if="showGitHubButton" class="github-button hidden-sm-and-down">
+			<div class="github-button-container">
+				<GithubButton
+					href="https://github.com/n8n-io/n8n"
+					:data-color-scheme="uiStore.appliedTheme"
+					data-size="large"
+					data-show-count="true"
+					aria-label="Star n8n-io/n8n on GitHub"
+				>
+					Star
+				</GithubButton>
+				<N8nIcon
+					class="close-github-button"
+					icon="times-circle"
+					size="medium"
+					@click="hideGithubButton"
 				/>
 			</div>
 		</div>
@@ -186,9 +268,15 @@ async function navigateToExecutionsView(openInNewTab: boolean) {
 </template>
 
 <style lang="scss">
+.container {
+	display: flex;
+	position: relative;
+	width: 100%;
+	align-items: center;
+}
+
 .main-header {
 	background-color: var(--color-background-xlight);
-	height: $header-height;
 	width: 100%;
 	box-sizing: border-box;
 	border-bottom: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
@@ -199,8 +287,46 @@ async function navigateToExecutionsView(openInNewTab: boolean) {
 	display: flex;
 	align-items: center;
 	font-size: 0.9em;
-	height: $header-height;
 	font-weight: 400;
-	padding: 0 var(--spacing-m) 0 var(--spacing-xs);
+	padding: var(--spacing-xs) var(--spacing-m);
+	overflow: auto;
+}
+
+.github-button {
+	display: flex;
+	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);
+	background-color: var(--color-background-xlight);
+	border-bottom: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
+	border-left: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
+}
+
+.close-github-button {
+	display: none;
+	position: absolute;
+	right: 0;
+	top: 0;
+	transform: translate(50%, -46%);
+	color: var(--color-foreground-xdark);
+	background-color: var(--color-background-xlight);
+	border-radius: 100%;
+	cursor: pointer;
+
+	&:hover {
+		color: var(--prim-color-primary-shade-100);
+	}
+}
+.github-button-container {
+	position: relative;
+}
+
+.github-button:hover .close-github-button {
+	display: block;
 }
 </style>
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.spec.ts b/packages/editor-ui/src/components/MainHeader/TabBar.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/TabBar.spec.ts
rename to packages/editor-ui/src/components/MainHeader/TabBar.test.ts
diff --git a/packages/editor-ui/src/components/MainHeader/TabBar.vue b/packages/editor-ui/src/components/MainHeader/TabBar.vue
index 0e78f480a9..2512cfc149 100644
--- a/packages/editor-ui/src/components/MainHeader/TabBar.vue
+++ b/packages/editor-ui/src/components/MainHeader/TabBar.vue
@@ -40,15 +40,16 @@ function onUpdateModelValue(tab: MAIN_HEADER_TABS, event: MouseEvent): void {
 <style module lang="scss">
 .container {
 	position: absolute;
-	top: 47px;
+	bottom: 0;
 	left: 50%;
-	transform: translateX(-50%);
+	transform: translateX(-50%) translateY(50%);
 	min-height: 30px;
 	display: flex;
 	padding: var(--spacing-5xs);
 	background-color: var(--color-foreground-base);
 	border-radius: var(--border-radius-base);
 	transition: all 150ms ease-in-out;
+	z-index: 1;
 }
 
 @media screen and (max-width: 430px) {
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts
rename to packages/editor-ui/src/components/MainHeader/WorkflowDetails.test.ts
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 33a830af92..39fc08ceb2 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -56,6 +56,7 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { useNodeViewVersionSwitcher } from '@/composables/useNodeViewVersionSwitcher';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const props = defineProps<{
 	readOnly?: boolean;
@@ -79,6 +80,7 @@ const usersStore = useUsersStore();
 const workflowsStore = useWorkflowsStore();
 const projectsStore = useProjectsStore();
 const npsSurveyStore = useNpsSurveyStore();
+const i18n = useI18n();
 
 const router = useRouter();
 const route = useRoute();
@@ -89,6 +91,7 @@ const message = useMessage();
 const toast = useToast();
 const documentTitle = useDocumentTitle();
 const workflowHelpers = useWorkflowHelpers({ router });
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const isTagsEditEnabled = ref(false);
 const isNameEditEnabled = ref(false);
@@ -100,6 +103,7 @@ const tagsEventBus = createEventBus();
 const sourceControlModalEventBus = createEventBus();
 
 const {
+	isNewUser,
 	nodeViewVersion,
 	nodeViewSwitcherDiscovered,
 	isNodeViewDiscoveryTooltipVisible,
@@ -187,26 +191,32 @@ const workflowMenuItems = computed<ActionDropdownItem[]>(() => {
 		disabled: !onWorkflowPage.value || isNewWorkflow.value,
 	});
 
-	actions.push({
-		id: WORKFLOW_MENU_ACTIONS.SWITCH_NODE_VIEW_VERSION,
-		...(nodeViewVersion.value === '2'
-			? {}
-			: nodeViewSwitcherDiscovered.value
-				? {
-						badge: locale.baseText('menuActions.badge.alpha'),
-						badgeProps: {
-							theme: 'tertiary',
-						},
-					}
-				: {
-						badge: locale.baseText('menuActions.badge.new'),
-					}),
-		label:
-			nodeViewVersion.value === '2'
-				? locale.baseText('menuActions.switchToOldNodeViewVersion')
-				: locale.baseText('menuActions.switchToNewNodeViewVersion'),
-		disabled: !onWorkflowPage.value,
-	});
+	if (settingsStore.isCanvasV2Enabled) {
+		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.beta'),
+							badgeProps: {
+								theme: 'tertiary',
+							},
+						}
+					: {
+							badge: locale.baseText('menuActions.badge.new'),
+						}),
+			label:
+				nodeViewVersion.value === '2'
+					? locale.baseText('menuActions.switchToOldNodeViewVersion')
+					: locale.baseText('menuActions.switchToNewNodeViewVersion'),
+			disabled: !onWorkflowPage.value,
+		});
+	}
 
 	if ((workflowPermissions.value.delete && !props.readOnly) || isNewWorkflow.value) {
 		actions.push({
@@ -584,18 +594,22 @@ async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise<void
 }
 
 function goToUpgrade() {
-	void uiStore.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
+	void pageRedirectionHelper.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
 }
 
 function goToWorkflowHistoryUpgrade() {
-	void uiStore.goToUpgrade('workflow-history', 'upgrade-workflow-history');
+	void pageRedirectionHelper.goToUpgrade('workflow-history', 'upgrade-workflow-history');
 }
 
 function showCreateWorkflowSuccessToast(id?: string) {
 	if (!id || ['new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(id)) {
 		let toastTitle = locale.baseText('workflows.create.personal.toast.title');
 		let toastText = locale.baseText('workflows.create.personal.toast.text');
-		if (projectsStore.currentProject) {
+
+		if (
+			projectsStore.currentProject &&
+			projectsStore.currentProject.id !== projectsStore.personalProject?.id
+		) {
 			toastTitle = locale.baseText('workflows.create.project.toast.title', {
 				interpolate: { projectName: projectsStore.currentProject.name ?? '' },
 			});
@@ -642,7 +656,7 @@ function showCreateWorkflowSuccessToast(id?: string) {
 				ref="dropdown"
 				v-model="appliedTagIds"
 				:event-bus="tagsEventBus"
-				:placeholder="$locale.baseText('workflowDetails.chooseOrCreateATag')"
+				:placeholder="i18n.baseText('workflowDetails.chooseOrCreateATag')"
 				class="tags-edit"
 				data-test-id="workflow-tags-dropdown"
 				@blur="onTagsBlur"
@@ -654,7 +668,7 @@ function showCreateWorkflowSuccessToast(id?: string) {
 				"
 			>
 				<span class="add-tag clickable" data-test-id="new-tag-link" @click="onTagsEditEnable">
-					+ {{ $locale.baseText('workflowDetails.addTag') }}
+					+ {{ i18n.baseText('workflowDetails.addTag') }}
 				</span>
 			</div>
 			<WorkflowTagsContainer
@@ -685,13 +699,13 @@ function showCreateWorkflowSuccessToast(id?: string) {
 						data-test-id="workflow-share-button"
 						@click="onShareButtonClick"
 					>
-						{{ $locale.baseText('workflowDetails.share') }}
+						{{ i18n.baseText('workflowDetails.share') }}
 					</N8nButton>
 				</div>
 				<template #fallback>
 					<N8nTooltip>
 						<N8nButton type="secondary" :class="['mr-2xs', $style.disabledShareButton]">
-							{{ $locale.baseText('workflowDetails.share') }}
+							{{ i18n.baseText('workflowDetails.share') }}
 						</N8nButton>
 						<template #content>
 							<i18n-t
@@ -704,7 +718,7 @@ function showCreateWorkflowSuccessToast(id?: string) {
 								<template #action>
 									<a @click="goToUpgrade">
 										{{
-											$locale.baseText(
+											i18n.baseText(
 												uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable
 													.button as BaseTextKey,
 											)
@@ -725,7 +739,7 @@ function showCreateWorkflowSuccessToast(id?: string) {
 					"
 					:is-saving="isWorkflowSaving"
 					:with-shortcut="!readOnly && workflowPermissions.update"
-					:shortcut-tooltip="$locale.baseText('saveWorkflowButton.hint')"
+					:shortcut-tooltip="i18n.baseText('saveWorkflowButton.hint')"
 					data-test-id="workflow-save-button"
 					@click="onSaveButtonClick"
 				/>
@@ -753,9 +767,12 @@ function showCreateWorkflowSuccessToast(id?: string) {
 					/>
 					<template #content>
 						<div class="mb-4xs">
-							<N8nBadge>{{ $locale.baseText('menuActions.badge.alpha') }}</N8nBadge>
+							<N8nBadge>{{ i18n.baseText('menuActions.badge.beta') }}</N8nBadge>
 						</div>
-						{{ $locale.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"
@@ -774,11 +791,16 @@ $--header-spacing: 20px;
 
 .name-container {
 	margin-right: $--header-spacing;
+
+	:deep(.el-input) {
+		padding: 0;
+	}
 }
 
 .name {
 	color: $custom-font-dark;
 	font-size: 15px;
+	display: block;
 }
 
 .activator {
@@ -786,7 +808,6 @@ $--header-spacing: 20px;
 	font-weight: 400;
 	font-size: 13px;
 	line-height: $--text-line-height;
-	display: flex;
 	align-items: center;
 
 	> span {
@@ -824,22 +845,32 @@ $--header-spacing: 20px;
 	display: flex;
 	align-items: center;
 	gap: var(--spacing-m);
+	flex-wrap: nowrap;
+}
+
+@include mixins.breakpoint('xs-only') {
+	.name {
+		:deep(input) {
+			min-width: 180px;
+		}
+	}
 }
 </style>
 
 <style module lang="scss">
 .container {
 	position: relative;
-	top: -1px;
 	width: 100%;
 	display: flex;
 	align-items: center;
+	flex-wrap: nowrap;
 }
 
 .group {
 	display: flex;
 	gap: var(--spacing-xs);
 }
+
 .hiddenInput {
 	display: none;
 }
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 8e483cb79c..e5fb044a80 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
-import { computed, onBeforeUnmount, onMounted, ref, nextTick } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, nextTick, type Ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
-
 import { useBecomeTemplateCreatorStore } from '@/components/BecomeTemplateCreatorCta/becomeTemplateCreatorStore';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useRootStore } from '@/stores/root.store';
@@ -11,6 +10,7 @@ import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useVersionsStore } from '@/stores/versions.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
 
 import { hasPermission } from '@/utils/rbac/permissions';
 import { useDebounce } from '@/composables/useDebounce';
@@ -21,6 +21,12 @@ import { useUserHelpers } from '@/composables/useUserHelpers';
 
 import { ABOUT_MODAL_KEY, VERSIONS_MODAL_KEY, VIEWS } from '@/constants';
 import { useBugReporting } from '@/composables/useBugReporting';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+
+import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
+import { N8nNavigationDropdown, N8nTooltip, N8nLink, N8nIconButton } from 'n8n-design-system';
+import { onClickOutside, type VueInstance } from '@vueuse/core';
+import Logo from './Logo/Logo.vue';
 
 const becomeTemplateCreatorStore = useBecomeTemplateCreatorStore();
 const cloudPlanStore = useCloudPlanStore();
@@ -31,13 +37,15 @@ const uiStore = useUIStore();
 const usersStore = useUsersStore();
 const versionsStore = useVersionsStore();
 const workflowsStore = useWorkflowsStore();
+const sourceControlStore = useSourceControlStore();
 
 const { callDebounced } = useDebounce();
 const externalHooks = useExternalHooks();
-const locale = useI18n();
+const i18n = useI18n();
 const route = useRoute();
 const router = useRouter();
 const telemetry = useTelemetry();
+const pageRedirectionHelper = usePageRedirectionHelper();
 const { getReportingURL } = useBugReporting();
 
 useUserHelpers(router, route);
@@ -51,11 +59,11 @@ const fullyExpanded = ref(false);
 const userMenuItems = ref([
 	{
 		id: 'settings',
-		label: locale.baseText('settings'),
+		label: i18n.baseText('settings'),
 	},
 	{
 		id: 'logout',
-		label: locale.baseText('auth.signout'),
+		label: i18n.baseText('auth.signout'),
 	},
 ]);
 
@@ -71,7 +79,7 @@ const mainMenuItems = computed(() => [
 		// Link to in-app templates, available if custom templates are enabled
 		id: 'templates',
 		icon: 'box-open',
-		label: locale.baseText('mainSidebar.templates'),
+		label: i18n.baseText('mainSidebar.templates'),
 		position: 'bottom',
 		available: settingsStore.isTemplatesEnabled && templatesStore.hasCustomTemplatesHost,
 		route: { to: { name: VIEWS.TEMPLATES } },
@@ -80,7 +88,7 @@ const mainMenuItems = computed(() => [
 		// Link to website templates, available if custom templates are not enabled
 		id: 'templates',
 		icon: 'box-open',
-		label: locale.baseText('mainSidebar.templates'),
+		label: i18n.baseText('mainSidebar.templates'),
 		position: 'bottom',
 		available: settingsStore.isTemplatesEnabled && !templatesStore.hasCustomTemplatesHost,
 		link: {
@@ -91,28 +99,21 @@ const mainMenuItems = computed(() => [
 	{
 		id: 'variables',
 		icon: 'variable',
-		label: locale.baseText('mainSidebar.variables'),
+		label: i18n.baseText('mainSidebar.variables'),
 		customIconSize: 'medium',
 		position: 'bottom',
 		route: { to: { name: VIEWS.VARIABLES } },
 	},
-	{
-		id: 'executions',
-		icon: 'tasks',
-		label: locale.baseText('mainSidebar.executions'),
-		position: 'bottom',
-		route: { to: { name: VIEWS.EXECUTIONS } },
-	},
 	{
 		id: 'help',
 		icon: 'question',
-		label: locale.baseText('mainSidebar.help'),
+		label: i18n.baseText('mainSidebar.help'),
 		position: 'bottom',
 		children: [
 			{
 				id: 'quickstart',
 				icon: 'video',
-				label: locale.baseText('mainSidebar.helpMenuItems.quickstart'),
+				label: i18n.baseText('mainSidebar.helpMenuItems.quickstart'),
 				link: {
 					href: 'https://www.youtube.com/watch?v=1MwSoB0gnM4',
 					target: '_blank',
@@ -121,7 +122,7 @@ const mainMenuItems = computed(() => [
 			{
 				id: 'docs',
 				icon: 'book',
-				label: locale.baseText('mainSidebar.helpMenuItems.documentation'),
+				label: i18n.baseText('mainSidebar.helpMenuItems.documentation'),
 				link: {
 					href: 'https://docs.n8n.io?utm_source=n8n_app&utm_medium=app_sidebar',
 					target: '_blank',
@@ -130,7 +131,7 @@ const mainMenuItems = computed(() => [
 			{
 				id: 'forum',
 				icon: 'users',
-				label: locale.baseText('mainSidebar.helpMenuItems.forum'),
+				label: i18n.baseText('mainSidebar.helpMenuItems.forum'),
 				link: {
 					href: 'https://community.n8n.io?utm_source=n8n_app&utm_medium=app_sidebar',
 					target: '_blank',
@@ -139,7 +140,7 @@ const mainMenuItems = computed(() => [
 			{
 				id: 'examples',
 				icon: 'graduation-cap',
-				label: locale.baseText('mainSidebar.helpMenuItems.course'),
+				label: i18n.baseText('mainSidebar.helpMenuItems.course'),
 				link: {
 					href: 'https://docs.n8n.io/courses/',
 					target: '_blank',
@@ -148,7 +149,7 @@ const mainMenuItems = computed(() => [
 			{
 				id: 'report-bug',
 				icon: 'bug',
-				label: locale.baseText('mainSidebar.helpMenuItems.reportBug'),
+				label: i18n.baseText('mainSidebar.helpMenuItems.reportBug'),
 				link: {
 					href: getReportingURL(),
 					target: '_blank',
@@ -157,19 +158,16 @@ const mainMenuItems = computed(() => [
 			{
 				id: 'about',
 				icon: 'info',
-				label: locale.baseText('mainSidebar.aboutN8n'),
+				label: i18n.baseText('mainSidebar.aboutN8n'),
 				position: 'bottom',
 			},
 		],
 	},
 ]);
+const createBtn = ref<InstanceType<typeof N8nNavigationDropdown>>();
 
 const isCollapsed = computed(() => uiStore.sidebarMenuCollapsed);
 
-const logoPath = computed(
-	() => basePath.value + (isCollapsed.value ? 'static/logo/collapsed.svg' : uiStore.logo),
-);
-
 const hasVersionUpdates = computed(
 	() => settingsStore.settings.releaseChannel === 'stable' && versionsStore.hasVersionUpdates,
 );
@@ -187,12 +185,9 @@ onMounted(async () => {
 		});
 	}
 
-	await nextTick(() => {
-		uiStore.sidebarMenuCollapsed = window.innerWidth < 900;
-		fullyExpanded.value = !isCollapsed.value;
-	});
-
 	becomeTemplateCreatorStore.startMonitoringCta();
+
+	await nextTick(onResizeEnd);
 });
 
 onBeforeUnmount(() => {
@@ -220,7 +215,7 @@ const onUserActionToggle = (action: string) => {
 			onLogout();
 			break;
 		case 'settings':
-			void router.push({ name: VIEWS.PERSONAL_SETTINGS });
+			void router.push({ name: VIEWS.SETTINGS });
 			break;
 		default:
 			break;
@@ -260,7 +255,7 @@ const handleSelect = (key: string) => {
 			break;
 		}
 		case 'cloud-admin': {
-			void cloudPlanStore.redirectToDashboard();
+			void pageRedirectionHelper.goToDashboard();
 			break;
 		}
 		case 'quickstart':
@@ -275,22 +270,34 @@ const handleSelect = (key: string) => {
 	}
 };
 
-const onResize = (event: UIEvent) => {
-	void callDebounced(onResizeEnd, { debounceTime: 100 }, event);
-};
+function onResize() {
+	void callDebounced(onResizeEnd, { debounceTime: 250 });
+}
 
-const onResizeEnd = async (event: UIEvent) => {
-	const browserWidth = (event.target as Window).outerWidth;
-	await checkWidthAndAdjustSidebar(browserWidth);
-};
-
-const checkWidthAndAdjustSidebar = async (width: number) => {
-	if (width < 900) {
+async function onResizeEnd() {
+	if (window.outerWidth < 900) {
 		uiStore.sidebarMenuCollapsed = true;
-		await nextTick();
-		fullyExpanded.value = !isCollapsed.value;
+	} else {
+		uiStore.sidebarMenuCollapsed = uiStore.sidebarMenuCollapsedPreference;
 	}
-};
+
+	void nextTick(() => {
+		fullyExpanded.value = !isCollapsed.value;
+	});
+}
+
+const {
+	menu,
+	handleSelect: handleMenuSelect,
+	createProjectAppendSlotName,
+	createWorkflowsAppendSlotName,
+	createCredentialsAppendSlotName,
+	projectsLimitReachedMessage,
+	upgradeLabel,
+} = useGlobalEntityCreation();
+onClickOutside(createBtn as Ref<VueInstance>, () => {
+	createBtn.value?.close();
+});
 </script>
 
 <template>
@@ -307,14 +314,75 @@ const checkWidthAndAdjustSidebar = async (width: number) => {
 			:class="['clickable', $style.sideMenuCollapseButton]"
 			@click="toggleCollapse"
 		>
-			<n8n-icon v-if="isCollapsed" icon="chevron-right" size="xsmall" class="ml-5xs" />
-			<n8n-icon v-else icon="chevron-left" size="xsmall" class="mr-5xs" />
+			<N8nIcon v-if="isCollapsed" icon="chevron-right" size="xsmall" class="ml-5xs" />
+			<N8nIcon v-else icon="chevron-left" size="xsmall" class="mr-5xs" />
 		</div>
-		<n8n-menu :items="mainMenuItems" :collapsed="isCollapsed" @select="handleSelect">
+		<div :class="$style.logo">
+			<Logo
+				location="sidebar"
+				:collapsed="isCollapsed"
+				:release-channel="settingsStore.settings.releaseChannel"
+			>
+				<N8nTooltip
+					v-if="sourceControlStore.preferences.branchReadOnly && !isCollapsed"
+					placement="bottom"
+				>
+					<template #content>
+						<i18n-t keypath="readOnlyEnv.tooltip">
+							<template #link>
+								<N8nLink
+									to="https://docs.n8n.io/source-control-environments/setup/#step-4-connect-n8n-and-configure-your-instance"
+									size="small"
+								>
+									{{ i18n.baseText('readOnlyEnv.tooltip.link') }}
+								</N8nLink>
+							</template>
+						</i18n-t>
+					</template>
+					<N8nIcon icon="lock" size="xsmall" :class="$style.readOnlyEnvironmentIcon" />
+				</N8nTooltip>
+			</Logo>
+			<N8nNavigationDropdown
+				ref="createBtn"
+				data-test-id="universal-add"
+				:menu="menu"
+				@select="handleMenuSelect"
+			>
+				<N8nIconButton icon="plus" type="secondary" outline />
+				<template #[createWorkflowsAppendSlotName]>
+					<N8nTooltip
+						v-if="sourceControlStore.preferences.branchReadOnly"
+						placement="right"
+						:content="i18n.baseText('readOnlyEnv.cantAdd.workflow')"
+					>
+						<N8nIcon style="margin-left: auto; margin-right: 5px" icon="lock" size="xsmall" />
+					</N8nTooltip>
+				</template>
+				<template #[createCredentialsAppendSlotName]>
+					<N8nTooltip
+						v-if="sourceControlStore.preferences.branchReadOnly"
+						placement="right"
+						:content="i18n.baseText('readOnlyEnv.cantAdd.credential')"
+					>
+						<N8nIcon style="margin-left: auto; margin-right: 5px" icon="lock" size="xsmall" />
+					</N8nTooltip>
+				</template>
+				<template #[createProjectAppendSlotName]="{ item }">
+					<N8nTooltip v-if="item.disabled" placement="right" :content="projectsLimitReachedMessage">
+						<N8nButton
+							:size="'mini'"
+							style="margin-left: auto"
+							type="tertiary"
+							@click="handleMenuSelect(item.id)"
+						>
+							{{ upgradeLabel }}
+						</N8nButton>
+					</N8nTooltip>
+				</template>
+			</N8nNavigationDropdown>
+		</div>
+		<N8nMenu :items="mainMenuItems" :collapsed="isCollapsed" @select="handleSelect">
 			<template #header>
-				<div :class="$style.logo">
-					<img :src="logoPath" data-test-id="n8n-logo" :class="$style.icon" alt="n8n" />
-				</div>
 				<ProjectNavigation
 					:collapsed="isCollapsed"
 					:plan-name="cloudPlanStore.currentPlanData?.displayName"
@@ -335,14 +403,14 @@ const checkWidthAndAdjustSidebar = async (width: number) => {
 						<div :class="$style.giftContainer">
 							<GiftNotificationIcon />
 						</div>
-						<n8n-text
+						<N8nText
 							:class="{ ['ml-xs']: true, [$style.expanded]: fullyExpanded }"
 							color="text-base"
 						>
 							{{ nextVersions.length > 99 ? '99+' : nextVersions.length }} update{{
 								nextVersions.length > 1 ? 's' : ''
 							}}
-						</n8n-text>
+						</N8nText>
 					</div>
 					<MainSidebarSourceControl :is-collapsed="isCollapsed" />
 				</div>
@@ -351,35 +419,35 @@ const checkWidthAndAdjustSidebar = async (width: number) => {
 				<div ref="user" :class="$style.userArea">
 					<div class="ml-3xs" data-test-id="main-sidebar-user-menu">
 						<!-- This dropdown is only enabled when sidebar is collapsed -->
-						<el-dropdown placement="right-end" trigger="click" @command="onUserActionToggle">
+						<ElDropdown placement="right-end" trigger="click" @command="onUserActionToggle">
 							<div :class="{ [$style.avatar]: true, ['clickable']: isCollapsed }">
-								<n8n-avatar
+								<N8nAvatar
 									:first-name="usersStore.currentUser?.firstName"
 									:last-name="usersStore.currentUser?.lastName"
 									size="small"
 								/>
 							</div>
 							<template v-if="isCollapsed" #dropdown>
-								<el-dropdown-menu>
-									<el-dropdown-item command="settings">
-										{{ $locale.baseText('settings') }}
-									</el-dropdown-item>
-									<el-dropdown-item command="logout">
-										{{ $locale.baseText('auth.signout') }}
-									</el-dropdown-item>
-								</el-dropdown-menu>
+								<ElDropdownMenu>
+									<ElDropdownItem command="settings">
+										{{ i18n.baseText('settings') }}
+									</ElDropdownItem>
+									<ElDropdownItem command="logout">
+										{{ i18n.baseText('auth.signout') }}
+									</ElDropdownItem>
+								</ElDropdownMenu>
 							</template>
-						</el-dropdown>
+						</ElDropdown>
 					</div>
 					<div
 						:class="{ ['ml-2xs']: true, [$style.userName]: true, [$style.expanded]: fullyExpanded }"
 					>
-						<n8n-text size="small" :bold="true" color="text-dark">{{
+						<N8nText size="small" :bold="true" color="text-dark">{{
 							usersStore.currentUser?.fullName
-						}}</n8n-text>
+						}}</N8nText>
 					</div>
 					<div :class="{ [$style.userActions]: true, [$style.expanded]: fullyExpanded }">
-						<n8n-action-dropdown
+						<N8nActionDropdown
 							:items="userMenuItems"
 							placement="top-start"
 							data-test-id="user-menu"
@@ -388,7 +456,7 @@ const checkWidthAndAdjustSidebar = async (width: number) => {
 					</div>
 				</div>
 			</template>
-		</n8n-menu>
+		</N8nMenu>
 	</div>
 </template>
 
@@ -399,11 +467,18 @@ const checkWidthAndAdjustSidebar = async (width: number) => {
 	border-right: var(--border-width-base) var(--border-style-base) var(--color-foreground-base);
 	transition: width 150ms ease-in-out;
 	width: $sidebar-expanded-width;
+	padding-top: 54px;
+	background-color: var(--menu-background, var(--color-background-xlight));
+
 	.logo {
-		height: $header-height;
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
 		display: flex;
 		align-items: center;
 		padding: var(--spacing-xs);
+		justify-content: space-between;
 
 		img {
 			position: relative;
@@ -414,9 +489,11 @@ const checkWidthAndAdjustSidebar = async (width: number) => {
 
 	&.sideMenuCollapsed {
 		width: $sidebar-width;
+		padding-top: 100px;
 
-		.logo img {
-			left: 0;
+		.logo {
+			flex-direction: column;
+			gap: 12px;
 		}
 	}
 }
@@ -504,4 +581,14 @@ const checkWidthAndAdjustSidebar = async (width: number) => {
 		display: none;
 	}
 }
+
+.readOnlyEnvironmentIcon {
+	display: inline-block;
+	color: white;
+	background-color: var(--color-warning);
+	align-self: center;
+	padding: 2px;
+	border-radius: var(--border-radius-small);
+	margin: 5px 5px 0;
+}
 </style>
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
new file mode 100644
index 0000000000..dc3e805b05
--- /dev/null
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.test.ts
@@ -0,0 +1,260 @@
+import { describe, it, expect, vi } from 'vitest';
+import { waitFor } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createTestingPinia } from '@pinia/testing';
+import { merge } from 'lodash-es';
+import { SOURCE_CONTROL_PULL_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY, STORES } from '@/constants';
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useRBACStore } from '@/stores/rbac.store';
+import { createComponentRenderer } from '@/__tests__/render';
+
+let pinia: ReturnType<typeof createTestingPinia>;
+let sourceControlStore: ReturnType<typeof useSourceControlStore>;
+let uiStore: ReturnType<typeof useUIStore>;
+let rbacStore: ReturnType<typeof useRBACStore>;
+
+const showMessage = vi.fn();
+const showError = vi.fn();
+const showToast = vi.fn();
+vi.mock('@/composables/useToast', () => ({
+	useToast: () => ({ showMessage, showError, showToast }),
+}));
+
+const renderComponent = createComponentRenderer(MainSidebarSourceControl);
+
+describe('MainSidebarSourceControl', () => {
+	beforeEach(() => {
+		vi.resetAllMocks();
+		pinia = createTestingPinia({
+			initialState: {
+				[STORES.SETTINGS]: {
+					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
+				},
+			},
+		});
+
+		rbacStore = useRBACStore(pinia);
+		vi.spyOn(rbacStore, 'hasScope').mockReturnValue(true);
+
+		sourceControlStore = useSourceControlStore();
+		vi.spyOn(sourceControlStore, 'isEnterpriseSourceControlEnabled', 'get').mockReturnValue(true);
+
+		uiStore = useUIStore();
+	});
+
+	it('should render nothing when not instance owner', async () => {
+		vi.spyOn(rbacStore, 'hasScope').mockReturnValue(false);
+		const { container } = renderComponent({ pinia, props: { isCollapsed: false } });
+		expect(container).toBeEmptyDOMElement();
+	});
+
+	it('should render empty content when instance owner but not connected', async () => {
+		const { getByTestId } = renderComponent({ pinia, props: { isCollapsed: false } });
+		expect(getByTestId('main-sidebar-source-control')).toBeInTheDocument();
+		expect(getByTestId('main-sidebar-source-control')).toBeEmptyDOMElement();
+	});
+
+	describe('when connected', () => {
+		beforeEach(() => {
+			vi.spyOn(sourceControlStore, 'preferences', 'get').mockReturnValue({
+				branchName: 'main',
+				branches: [],
+				repositoryUrl: '',
+				branchReadOnly: false,
+				branchColor: '#5296D6',
+				connected: true,
+				publicKey: '',
+			});
+		});
+
+		it('should render the appropriate content', async () => {
+			const { getByTestId, queryByTestId } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+			expect(getByTestId('main-sidebar-source-control-connected')).toBeInTheDocument();
+			expect(queryByTestId('main-sidebar-source-control-setup')).not.toBeInTheDocument();
+		});
+
+		it('should show toast error if pull response http status code is not 409', async () => {
+			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockRejectedValueOnce({
+				response: { status: 400 },
+			});
+			const { getAllByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[0]);
+			await waitFor(() => expect(showError).toHaveBeenCalled());
+		});
+
+		it('should show confirm if pull response http status code is 409', async () => {
+			const status = {};
+			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockRejectedValueOnce({
+				response: { status: 409, data: { data: status } },
+			});
+			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
+
+			const { getAllByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[0]);
+			await waitFor(() =>
+				expect(openModalSpy).toHaveBeenCalledWith(
+					expect.objectContaining({
+						name: SOURCE_CONTROL_PULL_MODAL_KEY,
+						data: expect.objectContaining({
+							status,
+						}),
+					}),
+				),
+			);
+		});
+
+		it('should show toast when there are no changes', async () => {
+			vi.spyOn(sourceControlStore, 'getAggregatedStatus').mockResolvedValueOnce([]);
+
+			const { getAllByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[1]);
+			await waitFor(() =>
+				expect(showMessage).toHaveBeenCalledWith(
+					expect.objectContaining({ title: 'No changes to commit' }),
+				),
+			);
+		});
+
+		it('should open push modal when there are changes', async () => {
+			const status = [
+				{
+					id: '014da93897f146d2b880-baa374b9d02d',
+					name: 'vuelfow2',
+					type: 'workflow' as const,
+					status: 'created' as const,
+					location: 'local' as const,
+					conflict: false,
+					file: '/014da93897f146d2b880-baa374b9d02d.json',
+					updatedAt: '2025-01-09T13:12:24.580Z',
+				},
+			];
+			vi.spyOn(sourceControlStore, 'getAggregatedStatus').mockResolvedValueOnce(status);
+			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
+
+			const { getAllByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[1]);
+			await waitFor(() =>
+				expect(openModalSpy).toHaveBeenCalledWith(
+					expect.objectContaining({
+						name: SOURCE_CONTROL_PUSH_MODAL_KEY,
+						data: expect.objectContaining({
+							status,
+						}),
+					}),
+				),
+			);
+		});
+
+		it("should show user's feedback when pulling", async () => {
+			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockResolvedValueOnce([
+				{
+					id: '014da93897f146d2b880-baa374b9d02d',
+					name: 'vuelfow2',
+					type: 'workflow',
+					status: 'created',
+					location: 'remote',
+					conflict: false,
+					file: '/014da93897f146d2b880-baa374b9d02d.json',
+					updatedAt: '2025-01-09T13:12:24.580Z',
+				},
+				{
+					id: 'a102c0b9-28ac-43cb-950e-195723a56d54',
+					name: 'Gmail account',
+					type: 'credential',
+					status: 'created',
+					location: 'remote',
+					conflict: false,
+					file: '/a102c0b9-28ac-43cb-950e-195723a56d54.json',
+					updatedAt: '2025-01-09T13:12:24.586Z',
+				},
+				{
+					id: 'variables',
+					name: 'variables',
+					type: 'variables',
+					status: 'modified',
+					location: 'remote',
+					conflict: false,
+					file: '/variable_stubs.json',
+					updatedAt: '2025-01-09T13:12:24.588Z',
+				},
+				{
+					id: 'mappings',
+					name: 'tags',
+					type: 'tags',
+					status: 'modified',
+					location: 'remote',
+					conflict: false,
+					file: '/tags.json',
+					updatedAt: '2024-12-16T12:53:12.155Z',
+				},
+			]);
+
+			const { getAllByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[0]);
+			await waitFor(() => {
+				expect(showToast).toHaveBeenNthCalledWith(
+					1,
+					expect.objectContaining({
+						title: 'Finish setting up your new variables to use in workflows',
+					}),
+				);
+				expect(showToast).toHaveBeenNthCalledWith(
+					2,
+					expect.objectContaining({
+						title: 'Finish setting up your new credentials to use in workflows',
+					}),
+				);
+				expect(showToast).toHaveBeenNthCalledWith(
+					3,
+					expect.objectContaining({
+						message: '1 Workflow, 1 Credential, Variables, and Tags were pulled',
+					}),
+				);
+			});
+		});
+
+		it('should show feedback where there are no change to pull', async () => {
+			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockResolvedValueOnce([]);
+
+			const { getAllByRole } = renderComponent({
+				pinia,
+				props: { isCollapsed: false },
+			});
+
+			await userEvent.click(getAllByRole('button')[0]);
+			await waitFor(() => {
+				expect(showMessage).toHaveBeenCalledWith(
+					expect.objectContaining({
+						title: 'Up to date',
+					}),
+				);
+			});
+		});
+	});
+});
diff --git a/packages/editor-ui/src/components/MainSidebarSourceControl.vue b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
index 1b792b4cd5..af861e93c9 100644
--- a/packages/editor-ui/src/components/MainSidebarSourceControl.vue
+++ b/packages/editor-ui/src/components/MainSidebarSourceControl.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, nextTick, ref } from 'vue';
+import { computed, h, nextTick, ref } from 'vue';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useI18n } from '@/composables/useI18n';
 import { hasPermission } from '@/utils/rbac/permissions';
@@ -8,8 +8,11 @@ import { useLoadingService } from '@/composables/useLoadingService';
 import { useUIStore } from '@/stores/ui.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { SOURCE_CONTROL_PULL_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY } from '@/constants';
-import type { SourceControlAggregatedFile } from '../Interface';
 import { sourceControlEventBus } from '@/event-bus/source-control';
+import { groupBy } from 'lodash-es';
+import { RouterLink } from 'vue-router';
+import { VIEWS } from '@/constants';
+import type { SourceControlledFile } from '@n8n/api-types';
 
 defineProps<{
 	isCollapsed: boolean;
@@ -43,6 +46,15 @@ async function pushWorkfolder() {
 	try {
 		const status = await sourceControlStore.getAggregatedStatus();
 
+		if (!status.length) {
+			toast.showMessage({
+				title: 'No changes to commit',
+				message: 'Everything is up to date',
+				type: 'info',
+			});
+			return;
+		}
+
 		uiStore.openModalWithData({
 			name: SOURCE_CONTROL_PUSH_MODAL_KEY,
 			data: { eventBus, status },
@@ -55,49 +67,106 @@ async function pushWorkfolder() {
 	}
 }
 
+const variablesToast = {
+	title: i18n.baseText('settings.sourceControl.pull.upToDate.variables.title'),
+	message: h(RouterLink, { to: { name: VIEWS.VARIABLES } }, () =>
+		i18n.baseText('settings.sourceControl.pull.upToDate.variables.description'),
+	),
+	type: 'info' as const,
+	closeOnClick: true,
+	duration: 0,
+};
+
+const credentialsToast = {
+	title: i18n.baseText('settings.sourceControl.pull.upToDate.credentials.title'),
+	message: h(RouterLink, { to: { name: VIEWS.CREDENTIALS, query: { setupNeeded: 'true' } } }, () =>
+		i18n.baseText('settings.sourceControl.pull.upToDate.credentials.description'),
+	),
+	type: 'info' as const,
+	closeOnClick: true,
+	duration: 0,
+};
+
+const pullMessage = ({
+	credential,
+	tags,
+	variables,
+	workflow,
+}: Partial<Record<SourceControlledFile['type'], SourceControlledFile[]>>) => {
+	const messages: string[] = [];
+
+	if (workflow?.length) {
+		messages.push(
+			i18n.baseText('generic.workflow', {
+				adjustToNumber: workflow.length,
+				interpolate: { count: workflow.length },
+			}),
+		);
+	}
+
+	if (credential?.length) {
+		messages.push(
+			i18n.baseText('generic.credential', {
+				adjustToNumber: credential.length,
+				interpolate: { count: credential.length },
+			}),
+		);
+	}
+
+	if (variables?.length) {
+		messages.push(i18n.baseText('generic.variable_plural'));
+	}
+
+	if (tags?.length) {
+		messages.push(i18n.baseText('generic.tag_plural'));
+	}
+
+	return [
+		new Intl.ListFormat(i18n.locale, { style: 'long', type: 'conjunction' }).format(messages),
+		'were pulled',
+	].join(' ');
+};
+
 async function pullWorkfolder() {
 	loadingService.startLoading();
 	loadingService.setLoadingText(i18n.baseText('settings.sourceControl.loading.pull'));
 
 	try {
-		const status: SourceControlAggregatedFile[] =
-			((await sourceControlStore.pullWorkfolder(
-				false,
-			)) as unknown as SourceControlAggregatedFile[]) || [];
+		const status = await sourceControlStore.pullWorkfolder(false);
 
-		const statusWithoutLocallyCreatedWorkflows = status.filter((file) => {
-			return !(file.type === 'workflow' && file.status === 'created' && file.location === 'local');
-		});
-		if (statusWithoutLocallyCreatedWorkflows.length === 0) {
+		if (!status.length) {
 			toast.showMessage({
 				title: i18n.baseText('settings.sourceControl.pull.upToDate.title'),
 				message: i18n.baseText('settings.sourceControl.pull.upToDate.description'),
 				type: 'success',
 			});
-		} else {
-			toast.showMessage({
-				title: i18n.baseText('settings.sourceControl.pull.success.title'),
-				type: 'success',
-			});
-
-			const incompleteFileTypes = ['variables', 'credential'];
-			const hasVariablesOrCredentials = (status || []).some((file) => {
-				return incompleteFileTypes.includes(file.type);
-			});
-
-			if (hasVariablesOrCredentials) {
-				void nextTick(() => {
-					toast.showMessage({
-						message: i18n.baseText('settings.sourceControl.pull.oneLastStep.description'),
-						title: i18n.baseText('settings.sourceControl.pull.oneLastStep.title'),
-						type: 'info',
-						duration: 0,
-						showClose: true,
-						offset: 0,
-					});
-				});
-			}
+			return;
 		}
+
+		const { credential, tags, variables, workflow } = groupBy(status, 'type');
+
+		const toastMessages = [
+			...(variables?.length ? [variablesToast] : []),
+			...(credential?.length ? [credentialsToast] : []),
+			{
+				title: i18n.baseText('settings.sourceControl.pull.success.title'),
+				message: pullMessage({ credential, tags, variables, workflow }),
+				type: 'success' as const,
+			},
+		];
+
+		for (const message of toastMessages) {
+			/**
+			 * the toasts stack in a reversed way, resulting in
+			 * Success
+			 * Credentials
+			 * Variables
+			 */
+			//
+			toast.showToast(message);
+			await nextTick();
+		}
+
 		sourceControlEventBus.emit('pull');
 	} catch (error) {
 		const errorResponse = error.response;
diff --git a/packages/editor-ui/src/components/MfaSetupModal.vue b/packages/editor-ui/src/components/MfaSetupModal.vue
index 663108ffed..77f1d88648 100644
--- a/packages/editor-ui/src/components/MfaSetupModal.vue
+++ b/packages/editor-ui/src/components/MfaSetupModal.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import Modal from './Modal.vue';
 import {
-	MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH,
-	MFA_AUTHENTICATION_TOKEN_WINDOW_EXPIRED,
+	MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH,
+	MFA_AUTHENTICATION_CODE_WINDOW_EXPIRED,
 	MFA_SETUP_MODAL_KEY,
 } from '../constants';
 import { ref, onMounted } from 'vue';
@@ -39,7 +39,7 @@ const loadingQrCode = ref(true);
 
 const clipboard = useClipboard();
 const userStore = useUsersStore();
-const i18 = useI18n();
+const i18n = useI18n();
 const toast = useToast();
 
 // #endregion
@@ -53,26 +53,26 @@ const closeDialog = () => {
 };
 
 const onInput = (value: string) => {
-	if (value.length !== MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH) {
+	if (value.length !== MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH) {
 		infoTextErrorMessage.value = '';
 		return;
 	}
 	userStore
-		.verifyMfaToken({ token: value })
+		.verifyMfaCode({ mfaCode: value })
 		.then(() => {
 			showRecoveryCodes.value = true;
 			authenticatorCode.value = value;
 		})
 		.catch(() => {
-			infoTextErrorMessage.value = i18.baseText('mfa.setup.invalidCode');
+			infoTextErrorMessage.value = i18n.baseText('mfa.setup.invalidCode');
 		});
 };
 
 const onCopySecretToClipboard = () => {
 	void clipboard.copy(secret.value);
 	toast.showToast({
-		title: i18.baseText('mfa.setup.step1.toast.copyToClipboard.title'),
-		message: i18.baseText('mfa.setup.step1.toast.copyToClipboard.message'),
+		title: i18n.baseText('mfa.setup.step1.toast.copyToClipboard.title'),
+		message: i18n.baseText('mfa.setup.step1.toast.copyToClipboard.message'),
 		type: 'success',
 	});
 };
@@ -98,24 +98,24 @@ const onDownloadClick = () => {
 
 const onSetupClick = async () => {
 	try {
-		await userStore.enableMfa({ token: authenticatorCode.value });
+		await userStore.enableMfa({ mfaCode: authenticatorCode.value });
 		closeDialog();
 		toast.showMessage({
 			type: 'success',
-			title: i18.baseText('mfa.setup.step2.toast.setupFinished.message'),
+			title: i18n.baseText('mfa.setup.step2.toast.setupFinished.message'),
 		});
 	} catch (e) {
-		if (e.errorCode === MFA_AUTHENTICATION_TOKEN_WINDOW_EXPIRED) {
+		if (e.errorCode === MFA_AUTHENTICATION_CODE_WINDOW_EXPIRED) {
 			toast.showMessage({
 				type: 'error',
-				title: i18.baseText('mfa.setup.step2.toast.tokenExpired.error.message'),
+				title: i18n.baseText('mfa.setup.step2.toast.tokenExpired.error.message'),
 			});
 			return;
 		}
 
 		toast.showMessage({
 			type: 'error',
-			title: i18.baseText('mfa.setup.step2.toast.setupFinished.error.message'),
+			title: i18n.baseText('mfa.setup.step2.toast.setupFinished.error.message'),
 		});
 	}
 };
@@ -127,7 +127,7 @@ const getMfaQR = async () => {
 		secret.value = response.secret;
 		recoveryCodes.value = response.recoveryCodes;
 	} catch (error) {
-		toast.showError(error, i18.baseText('settings.api.view.error'));
+		toast.showError(error, i18n.baseText('settings.api.view.error'));
 	} finally {
 		loadingQrCode.value = false;
 	}
@@ -153,8 +153,8 @@ onMounted(async () => {
 		max-height="640px"
 		:title="
 			!showRecoveryCodes
-				? i18.baseText('mfa.setup.step1.title')
-				: i18.baseText('mfa.setup.step2.title')
+				? i18n.baseText('mfa.setup.step1.title')
+				: i18n.baseText('mfa.setup.step2.title')
 		"
 		:event-bus="modalBus"
 		:name="MFA_SETUP_MODAL_KEY_NAME"
@@ -165,21 +165,21 @@ onMounted(async () => {
 			<div v-if="!showRecoveryCodes" :class="[$style.container, $style.modalContent]">
 				<div :class="$style.textContainer">
 					<n8n-text size="large" color="text-dark" :bold="true">{{
-						i18.baseText('mfa.setup.step1.instruction1.title')
+						i18n.baseText('mfa.setup.step1.instruction1.title')
 					}}</n8n-text>
 				</div>
 				<div>
 					<n8n-text size="medium" :bold="false">
 						<i18n-t keypath="mfa.setup.step1.instruction1.subtitle" tag="span">
 							<template #part1>
-								{{ i18.baseText('mfa.setup.step1.instruction1.subtitle.part1') }}
+								{{ i18n.baseText('mfa.setup.step1.instruction1.subtitle.part1') }}
 							</template>
 							<template #part2>
 								<a
 									:class="$style.secret"
 									data-test-id="mfa-secret-button"
 									@click="onCopySecretToClipboard"
-									>{{ i18.baseText('mfa.setup.step1.instruction1.subtitle.part2') }}</a
+									>{{ i18n.baseText('mfa.setup.step1.instruction1.subtitle.part2') }}</a
 								>
 							</template>
 						</i18n-t>
@@ -190,7 +190,7 @@ onMounted(async () => {
 				</div>
 				<div :class="$style.textContainer">
 					<n8n-text size="large" color="text-dark" :bold="true">{{
-						i18.baseText('mfa.setup.step1.instruction2.title')
+						i18n.baseText('mfa.setup.step1.instruction2.title')
 					}}</n8n-text>
 				</div>
 				<div :class="[$style.form, infoTextErrorMessage ? $style.error : '']">
@@ -198,13 +198,13 @@ onMounted(async () => {
 						size="medium"
 						:bold="false"
 						:class="$style.labelTooltip"
-						:label="i18.baseText('mfa.setup.step1.input.label')"
+						:label="i18n.baseText('mfa.setup.step1.input.label')"
 					>
 						<n8n-input
 							v-model="authenticatorCode"
 							type="text"
 							:maxlength="6"
-							:placeholder="$locale.baseText('mfa.code.input.placeholder')"
+							:placeholder="i18n.baseText('mfa.code.input.placeholder')"
 							:required="true"
 							data-test-id="mfa-token-input"
 							@input="onInput"
@@ -218,7 +218,7 @@ onMounted(async () => {
 			<div v-else :class="$style.container">
 				<div>
 					<n8n-text size="medium" :bold="false">{{
-						i18.baseText('mfa.setup.step2.description')
+						i18n.baseText('mfa.setup.step2.description')
 					}}</n8n-text>
 				</div>
 				<div :class="$style.recoveryCodesContainer">
@@ -227,23 +227,23 @@ onMounted(async () => {
 					</div>
 				</div>
 				<n8n-info-tip :bold="false" :class="$style['edit-mode-footer-infotip']">
-					<i18n-t keypath="mfa.setup.step2.infobox.description" tag="span">
+					<i18nn-t keypath="mfa.setup.step2.infobox.description" tag="span">
 						<template #part1>
-							{{ i18.baseText('mfa.setup.step2.infobox.description.part1') }}
+							{{ i18n.baseText('mfa.setup.step2.infobox.description.part1') }}
 						</template>
 						<template #part2>
 							<n8n-text size="small" :bold="true" :class="$style.loseAccessText">
-								{{ i18.baseText('mfa.setup.step2.infobox.description.part2') }}
+								{{ i18n.baseText('mfa.setup.step2.infobox.description.part2') }}
 							</n8n-text>
 						</template>
-					</i18n-t>
+					</i18nn-t>
 				</n8n-info-tip>
 				<div>
 					<n8n-button
 						type="primary"
 						icon="download"
 						float="right"
-						:label="i18.baseText('mfa.setup.step2.button.download')"
+						:label="i18n.baseText('mfa.setup.step2.button.download')"
 						data-test-id="mfa-recovery-codes-button"
 						@click="onDownloadClick"
 					/>
@@ -256,7 +256,7 @@ onMounted(async () => {
 					<n8n-button
 						float="right"
 						:disabled="!recoveryCodesDownloaded"
-						:label="i18.baseText('mfa.setup.step2.button.save')"
+						:label="i18n.baseText('mfa.setup.step2.button.save')"
 						size="large"
 						data-test-id="mfa-save-button"
 						@click="onSetupClick"
@@ -267,7 +267,7 @@ onMounted(async () => {
 				<div>
 					<n8n-button
 						float="right"
-						:label="i18.baseText('mfa.setup.step1.button.continue')"
+						:label="i18n.baseText('mfa.setup.step1.button.continue')"
 						size="large"
 						:disabled="!readyToSubmit"
 						@click="onSaveClick"
diff --git a/packages/editor-ui/src/components/ModalDrawer.vue b/packages/editor-ui/src/components/ModalDrawer.vue
index c143abc201..e7b113e991 100644
--- a/packages/editor-ui/src/components/ModalDrawer.vue
+++ b/packages/editor-ui/src/components/ModalDrawer.vue
@@ -1,85 +1,74 @@
-<script lang="ts">
+<script setup lang="ts">
 import { useUIStore } from '@/stores/ui.store';
-import { mapStores } from 'pinia';
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
+import { onBeforeUnmount, onMounted } from 'vue';
 import type { EventBus } from 'n8n-design-system';
 import { ElDrawer } from 'element-plus';
 
-export default defineComponent({
-	name: 'ModalDrawer',
-	components: {
-		ElDrawer,
+const props = withDefaults(
+	defineProps<{
+		name: string;
+		beforeClose?: Function;
+		eventBus?: EventBus;
+		direction: 'ltr' | 'rtl' | 'ttb' | 'btt';
+		modal?: boolean;
+		width: string;
+		wrapperClosable?: boolean;
+		closeOnClickModal?: boolean;
+		zIndex?: number;
+	}>(),
+	{
+		modal: true,
+		wrapperClosable: true,
+		closeOnClickModal: false,
 	},
-	props: {
-		name: {
-			type: String,
-			required: true,
-		},
-		beforeClose: {
-			type: Function,
-		},
-		eventBus: {
-			type: Object as PropType<EventBus>,
-		},
-		direction: {
-			type: String as PropType<'ltr' | 'rtl' | 'ttb' | 'btt'>,
-			required: true,
-		},
-		modal: {
-			type: Boolean,
-			default: true,
-		},
-		width: {
-			type: String,
-		},
-		wrapperClosable: {
-			type: Boolean,
-			default: true,
-		},
-	},
-	mounted() {
-		window.addEventListener('keydown', this.onWindowKeydown);
-		this.eventBus?.on('close', this.close);
+);
 
-		const activeElement = document.activeElement as HTMLElement;
-		if (activeElement) {
-			activeElement.blur();
+const emit = defineEmits<{
+	enter: [];
+}>();
+
+const uiStore = useUIStore();
+
+const handleEnter = () => {
+	if (uiStore.isModalActiveById[props.name]) {
+		emit('enter');
+	}
+};
+
+const onWindowKeydown = (event: KeyboardEvent) => {
+	if (!uiStore.isModalActiveById[props.name]) {
+		return;
+	}
+
+	if (event && event.keyCode === 13) {
+		handleEnter();
+	}
+};
+
+const close = async () => {
+	if (props.beforeClose) {
+		const shouldClose = await props.beforeClose();
+		if (shouldClose === false) {
+			// must be strictly false to stop modal from closing
+			return;
 		}
-	},
-	beforeUnmount() {
-		this.eventBus?.off('close', this.close);
-		window.removeEventListener('keydown', this.onWindowKeydown);
-	},
-	computed: {
-		...mapStores(useUIStore),
-	},
-	methods: {
-		onWindowKeydown(event: KeyboardEvent) {
-			if (!this.uiStore.isModalActiveById[this.name]) {
-				return;
-			}
+	}
+	uiStore.closeModal(props.name);
+};
 
-			if (event && event.keyCode === 13) {
-				this.handleEnter();
-			}
-		},
-		handleEnter() {
-			if (this.uiStore.isModalActiveById[this.name]) {
-				this.$emit('enter');
-			}
-		},
-		async close() {
-			if (this.beforeClose) {
-				const shouldClose = await this.beforeClose();
-				if (shouldClose === false) {
-					// must be strictly false to stop modal from closing
-					return;
-				}
-			}
-			this.uiStore.closeModal(this.name);
-		},
-	},
+onMounted(() => {
+	window.addEventListener('keydown', onWindowKeydown);
+	props.eventBus?.on('close', close);
+
+	const activeElement = document.activeElement as HTMLElement;
+	if (activeElement) {
+		activeElement.blur();
+	}
+});
+
+onBeforeUnmount(() => {
+	props.eventBus?.off('close', close);
+	window.removeEventListener('keydown', onWindowKeydown);
 });
 </script>
 
@@ -91,6 +80,8 @@ export default defineComponent({
 		: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/ModalRoot.vue b/packages/editor-ui/src/components/ModalRoot.vue
index 13e6582f00..f8fa78ad0c 100644
--- a/packages/editor-ui/src/components/ModalRoot.vue
+++ b/packages/editor-ui/src/components/ModalRoot.vue
@@ -1,25 +1,23 @@
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+<script setup lang="ts">
 import { useUIStore } from '@/stores/ui.store';
-import { mapStores } from 'pinia';
-import type { ModalKey } from '@/Interface';
 
-export default defineComponent({
-	name: 'ModalRoot',
-	props: {
-		name: {
-			type: String as PropType<ModalKey>,
-			required: true,
-		},
-		keepAlive: {
-			type: Boolean,
-		},
-	},
-	computed: {
-		...mapStores(useUIStore),
-	},
-});
+defineProps<{
+	name: string;
+	keepAlive?: boolean;
+}>();
+
+defineSlots<{
+	default: {
+		modalName: string;
+		active: boolean;
+		open: boolean;
+		activeId: string;
+		mode: string;
+		data: Record<string, unknown>;
+	};
+}>();
+
+const uiStore = useUIStore();
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/Modals.vue b/packages/editor-ui/src/components/Modals.vue
index 4f431fee84..fc7b2d67f1 100644
--- a/packages/editor-ui/src/components/Modals.vue
+++ b/packages/editor-ui/src/components/Modals.vue
@@ -18,7 +18,6 @@ import {
 	NEW_ASSISTANT_SESSION_MODAL,
 	VERSIONS_MODAL_KEY,
 	WORKFLOW_ACTIVE_MODAL_KEY,
-	WORKFLOW_LM_CHAT_MODAL_KEY,
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_SHARE_MODAL_KEY,
 	IMPORT_CURL_MODAL_KEY,
@@ -51,7 +50,6 @@ import WorkflowTagsManager from '@/components/TagsManager/WorkflowTagsManager.vu
 import AnnotationTagsManager from '@/components/TagsManager/AnnotationTagsManager.ee.vue';
 import UpdatesPanel from '@/components/UpdatesPanel.vue';
 import NpsSurvey from '@/components/NpsSurvey.vue';
-import WorkflowLMChat from '@/components/WorkflowLMChat/WorkflowLMChat.vue';
 import WorkflowSettings from '@/components/WorkflowSettings.vue';
 import DeleteUserModal from '@/components/DeleteUserModal.vue';
 import ActivationModal from '@/components/ActivationModal.vue';
@@ -69,6 +67,7 @@ import ProjectMoveResourceModal from '@/components/Projects/ProjectMoveResourceM
 import NewAssistantSessionModal from '@/components/AskAssistant/NewAssistantSessionModal.vue';
 import PromptMfaCodeModal from './PromptMfaCodeModal/PromptMfaCodeModal.vue';
 import CommunityPlusEnrollmentModal from '@/components/CommunityPlusEnrollmentModal.vue';
+import type { EventBus } from 'n8n-design-system';
 </script>
 
 <template>
@@ -124,10 +123,6 @@ import CommunityPlusEnrollmentModal from '@/components/CommunityPlusEnrollmentMo
 			</template>
 		</ModalRoot>
 
-		<ModalRoot :name="WORKFLOW_LM_CHAT_MODAL_KEY">
-			<WorkflowLMChat />
-		</ModalRoot>
-
 		<ModalRoot :name="WORKFLOW_SETTINGS_MODAL_KEY">
 			<WorkflowSettings />
 		</ModalRoot>
@@ -183,7 +178,15 @@ import CommunityPlusEnrollmentModal from '@/components/CommunityPlusEnrollmentMo
 		</ModalRoot>
 
 		<ModalRoot :name="LOG_STREAM_MODAL_KEY">
-			<template #default="{ modalName, data }">
+			<template
+				#default="{
+					modalName,
+					data,
+				}: {
+					modalName: string;
+					data: { destination: Object; isNew: boolean; eventBus: EventBus };
+				}"
+			>
 				<EventDestinationSettingsModal
 					:modal-name="modalName"
 					:destination="data.destination"
diff --git a/packages/editor-ui/src/components/MultipleParameter.test.ts b/packages/editor-ui/src/components/MultipleParameter.test.ts
new file mode 100644
index 0000000000..9772d0f99d
--- /dev/null
+++ b/packages/editor-ui/src/components/MultipleParameter.test.ts
@@ -0,0 +1,44 @@
+import { createTestingPinia } from '@pinia/testing';
+
+import { createComponentRenderer } from '@/__tests__/render';
+import MultipleParameter from './MultipleParameter.vue';
+
+describe('MultipleParameter', () => {
+	const renderComponent = createComponentRenderer(MultipleParameter, {
+		props: {
+			path: 'parameters.additionalFields',
+			parameter: {
+				displayName: 'Additional Fields',
+				name: 'additionalFields',
+				type: 'collection',
+				options: [
+					{
+						displayName: 'Currency',
+						name: 'currency',
+						type: 'string',
+						default: 'USD',
+					},
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'number',
+					},
+				],
+			},
+			nodeValues: {
+				parameters: {
+					additionalFields: {},
+				},
+			},
+			values: [],
+			isReadOnly: false,
+		},
+		pinia: createTestingPinia({ initialState: {} }),
+	});
+
+	it('should render correctly', () => {
+		const wrapper = renderComponent();
+
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+});
diff --git a/packages/editor-ui/src/components/MultipleParameter.vue b/packages/editor-ui/src/components/MultipleParameter.vue
index a02b341983..19fae8fb87 100644
--- a/packages/editor-ui/src/components/MultipleParameter.vue
+++ b/packages/editor-ui/src/components/MultipleParameter.vue
@@ -1,133 +1,115 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
-import type { IUpdateInformation } from '@/Interface';
+<script setup lang="ts">
+import { ref, watch, computed } from 'vue';
+import { get } from 'lodash-es';
 import type { INodeParameters, INodeProperties } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
+
+import { useI18n } from '@/composables/useI18n';
+import type { IUpdateInformation } from '@/Interface';
 import CollectionParameter from '@/components/CollectionParameter.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
+import { N8nButton, N8nInputLabel, N8nText } from 'n8n-design-system';
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
-import { get } from 'lodash-es';
+defineOptions({ name: 'MultipleParameter' });
 
-export default defineComponent({
-	name: 'MultipleParameter',
-	components: {
-		CollectionParameter,
-		ParameterInputFull,
+const props = withDefaults(
+	defineProps<{
+		nodeValues: INodeParameters;
+		parameter: INodeProperties;
+		path: string;
+		values?: INodeParameters[];
+		isReadOnly?: boolean;
+	}>(),
+	{
+		values: () => [] as INodeParameters[],
+		isReadOnly: false,
 	},
-	props: {
-		nodeValues: {
-			type: Object as PropType<INodeParameters>,
-			required: true,
-		},
-		parameter: {
-			type: Object as PropType<INodeProperties>,
-			required: true,
-		},
-		path: {
-			type: String,
-			required: true,
-		},
-		values: {
-			type: Array as PropType<INodeParameters[]>,
-			default: () => [],
-		},
-		isReadOnly: {
-			type: Boolean,
-			default: false,
-		},
+);
+
+const emit = defineEmits<{
+	valueChanged: [parameterData: IUpdateInformation];
+}>();
+
+const i18n = useI18n();
+
+const mutableValues = ref<INodeParameters[]>(deepCopy(props.values));
+
+watch(
+	() => props.values,
+	(newValues) => {
+		mutableValues.value = deepCopy(newValues);
 	},
-	data() {
-		return {
-			mutableValues: [] as INodeParameters[],
-		};
-	},
-	computed: {
-		addButtonText(): string {
-			if (
-				!this.parameter.typeOptions ||
-				(this.parameter.typeOptions && !this.parameter.typeOptions.multipleValueButtonText)
-			) {
-				return this.$locale.baseText('multipleParameter.addItem');
-			}
+	{ deep: true },
+);
 
-			return this.$locale.nodeText().multipleValueButtonText(this.parameter);
-		},
-		hideDelete(): boolean {
-			return this.parameter.options?.length === 1;
-		},
-		sortable(): boolean {
-			return !!this.parameter.typeOptions?.sortable;
-		},
-	},
-	watch: {
-		values: {
-			handler(newValues: INodeParameters[]) {
-				this.mutableValues = deepCopy(newValues);
-			},
-			deep: true,
-		},
-	},
-	created() {
-		this.mutableValues = deepCopy(this.values);
-	},
-	methods: {
-		addItem() {
-			const name = this.getPath();
-			const currentValue = get(this.nodeValues, name, []) as INodeParameters[];
+const addButtonText = computed(() => {
+	if (!props.parameter.typeOptions?.multipleValueButtonText) {
+		return i18n.baseText('multipleParameter.addItem');
+	}
 
-			currentValue.push(deepCopy(this.parameter.default as INodeParameters));
-
-			const parameterData = {
-				name,
-				value: currentValue,
-			};
-
-			this.$emit('valueChanged', parameterData);
-		},
-		deleteItem(index: number) {
-			const parameterData = {
-				name: this.getPath(index),
-				value: undefined,
-			};
-
-			this.$emit('valueChanged', parameterData);
-		},
-		getPath(index?: number): string {
-			return this.path + (index !== undefined ? `[${index}]` : '');
-		},
-		moveOptionDown(index: number) {
-			this.mutableValues.splice(index + 1, 0, this.mutableValues.splice(index, 1)[0]);
-
-			const parameterData = {
-				name: this.path,
-				value: this.mutableValues,
-			};
-
-			this.$emit('valueChanged', parameterData);
-		},
-		moveOptionUp(index: number) {
-			this.mutableValues.splice(index - 1, 0, this.mutableValues.splice(index, 1)[0]);
-
-			const parameterData = {
-				name: this.path,
-				value: this.mutableValues,
-			};
-
-			this.$emit('valueChanged', parameterData);
-		},
-		valueChanged(parameterData: IUpdateInformation) {
-			this.$emit('valueChanged', parameterData);
-		},
-	},
+	return i18n.nodeText().multipleValueButtonText(props.parameter);
 });
+
+const hideDelete = computed(() => props.parameter.options?.length === 1);
+
+const sortable = computed(() => !!props.parameter.typeOptions?.sortable);
+
+const addItem = () => {
+	const name = getPath();
+	const currentValue = get(props.nodeValues, name, []) as INodeParameters[];
+
+	currentValue.push(deepCopy(props.parameter.default as INodeParameters));
+
+	const parameterData = {
+		name,
+		value: currentValue,
+	};
+
+	emit('valueChanged', parameterData);
+};
+
+const deleteItem = (index: number) => {
+	const parameterData = {
+		name: getPath(index),
+		value: undefined,
+	};
+
+	emit('valueChanged', parameterData);
+};
+
+const getPath = (index?: number) => {
+	return props.path + (index !== undefined ? `[${index}]` : '');
+};
+
+const moveOptionDown = (index: number) => {
+	mutableValues.value.splice(index + 1, 0, mutableValues.value.splice(index, 1)[0]);
+
+	emit('valueChanged', {
+		name: props.path,
+		value: mutableValues.value,
+	});
+};
+
+const moveOptionUp = (index: number) => {
+	mutableValues.value.splice(index - 1, 0, mutableValues.value.splice(index, 1)[0]);
+
+	emit('valueChanged', {
+		name: props.path,
+		value: mutableValues.value,
+	});
+};
+
+const valueChanged = (parameterData: IUpdateInformation) => {
+	emit('valueChanged', parameterData);
+};
 </script>
 
 <template>
 	<div class="duplicate-parameter" @keydown.stop>
-		<n8n-input-label
-			:label="$locale.nodeText().inputLabelDisplayName(parameter, path)"
-			:tooltip-text="$locale.nodeText().inputLabelDescription(parameter, path)"
+		<N8nInputLabel
+			:label="i18n.nodeText().inputLabelDisplayName(parameter, path)"
+			:tooltip-text="i18n.nodeText().inputLabelDescription(parameter, path)"
 			:underline="true"
 			size="small"
 			color="text-dark"
@@ -140,24 +122,24 @@ export default defineComponent({
 			:class="parameter.type"
 		>
 			<div v-if="!isReadOnly" class="delete-item clickable">
-				<font-awesome-icon
+				<FontAwesomeIcon
 					icon="trash"
-					:title="$locale.baseText('multipleParameter.deleteItem')"
+					:title="i18n.baseText('multipleParameter.deleteItem')"
 					@click="deleteItem(index)"
 				/>
 				<div v-if="sortable">
-					<font-awesome-icon
+					<FontAwesomeIcon
 						v-if="index !== 0"
 						icon="angle-up"
 						class="clickable"
-						:title="$locale.baseText('multipleParameter.moveUp')"
+						:title="i18n.baseText('multipleParameter.moveUp')"
 						@click="moveOptionUp(index)"
 					/>
-					<font-awesome-icon
+					<FontAwesomeIcon
 						v-if="index !== mutableValues.length - 1"
 						icon="angle-down"
 						class="clickable"
-						:title="$locale.baseText('multipleParameter.moveDown')"
+						:title="i18n.baseText('multipleParameter.moveDown')"
 						@click="moveOptionDown(index)"
 					/>
 				</div>
@@ -193,11 +175,11 @@ export default defineComponent({
 				v-if="(mutableValues && mutableValues.length === 0) || isReadOnly"
 				class="no-items-exist"
 			>
-				<n8n-text size="small">{{
-					$locale.baseText('multipleParameter.currentlyNoItemsExist')
-				}}</n8n-text>
+				<N8nText size="small">{{
+					i18n.baseText('multipleParameter.currentlyNoItemsExist')
+				}}</N8nText>
 			</div>
-			<n8n-button
+			<N8nButton
 				v-if="!isReadOnly"
 				type="tertiary"
 				block
diff --git a/packages/editor-ui/src/components/NDVDraggablePanels.vue b/packages/editor-ui/src/components/NDVDraggablePanels.vue
index 537c0dceac..fe49d1318c 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 { XYPosition } from '@/Interface';
+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;
@@ -20,7 +20,7 @@ const PANEL_WIDTH = 350;
 const PANEL_WIDTH_LARGE = 420;
 const MIN_WINDOW_WIDTH = 2 * (SIDE_MARGIN + SIDE_PANELS_MARGIN) + MIN_PANEL_WIDTH;
 
-const initialMainPanelWidth: { [key: string]: number } = {
+const initialMainPanelWidth: Record<MainPanelType, number> = {
 	regular: MAIN_NODE_PANEL_WIDTH,
 	dragless: MAIN_NODE_PANEL_WIDTH,
 	unknown: MAIN_NODE_PANEL_WIDTH,
@@ -34,7 +34,8 @@ interface Props {
 	nodeType: INodeTypeDescription | null;
 }
 
-const { callDebounced } = useDebounce();
+const throttledOnResize = useThrottleFn(onResize, 100);
+
 const ndvStore = useNDVStore();
 const uiStore = useUIStore();
 
@@ -106,22 +107,16 @@ watch(containerWidth, (width) => {
 	setPositions(mainPanelDimensions.value.relativeLeft);
 });
 
-const currentNodePaneType = computed((): string => {
+const currentNodePaneType = computed((): MainPanelType => {
 	if (!hasInputSlot.value) return 'inputless';
 	if (!props.isDraggable) return 'dragless';
 	if (props.nodeType === null) return 'unknown';
 	return props.nodeType.parameterPane ?? 'regular';
 });
 
-const mainPanelDimensions = computed(
-	(): {
-		relativeWidth: number;
-		relativeLeft: number;
-		relativeRight: number;
-	} => {
-		return ndvStore.getMainPanelDimensions(currentNodePaneType.value);
-	},
-);
+const mainPanelDimensions = computed(() => {
+	return ndvStore.mainPanelDimensions[currentNodePaneType.value];
+});
 
 const calculatedPositions = computed(
 	(): { inputPanelRelativeRight: number; outputPanelRelativeLeft: number } => {
@@ -298,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);
 	}
 }
 
@@ -374,13 +369,14 @@ 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"
+				outset
+				@resize="onResizeThrottle"
 				@resizeend="onResizeEnd"
 			>
 				<div :class="$style.dragButtonContainer">
@@ -397,7 +393,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/NDVSubConnections.spec.ts b/packages/editor-ui/src/components/NDVSubConnections.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/NDVSubConnections.spec.ts
rename to packages/editor-ui/src/components/NDVSubConnections.test.ts
diff --git a/packages/editor-ui/src/components/NDVSubConnections.vue b/packages/editor-ui/src/components/NDVSubConnections.vue
index 2ceaa11b5d..52546a88f6 100644
--- a/packages/editor-ui/src/components/NDVSubConnections.vue
+++ b/packages/editor-ui/src/components/NDVSubConnections.vue
@@ -14,6 +14,7 @@ import type {
 } from 'n8n-workflow';
 import { useDebounce } from '@/composables/useDebounce';
 import { OnClickOutside } from '@vueuse/components';
+import { useI18n } from '@/composables/useI18n';
 
 interface Props {
 	rootNode: INodeUi;
@@ -23,6 +24,7 @@ const props = defineProps<Props>();
 const workflowsStore = useWorkflowsStore();
 const nodeTypesStore = useNodeTypesStore();
 const nodeHelpers = useNodeHelpers();
+const i18n = useI18n();
 const { debounce } = useDebounce();
 const emit = defineEmits<{
 	switchSelectedNode: [nodeName: string];
@@ -245,7 +247,7 @@ defineExpose({
 										Add {{ connection.displayName }}
 										<template v-if="hasInputIssues(connection.type)">
 											<TitledList
-												:title="`${$locale.baseText('node.issues')}:`"
+												:title="`${i18n.baseText('node.issues')}:`"
 												:items="nodeInputIssues[connection.type]"
 											/>
 										</template>
@@ -285,7 +287,7 @@ defineExpose({
 											{{ node.node.name }}
 											<template v-if="node.issues">
 												<TitledList
-													:title="`${$locale.baseText('node.issues')}:`"
+													:title="`${i18n.baseText('node.issues')}:`"
 													:items="node.issues"
 												/>
 											</template>
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 5e2cc7e8ca..f20724bd5f 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -9,7 +9,6 @@ import {
 	SIMULATE_NODE_TYPE,
 	SIMULATE_TRIGGER_NODE_TYPE,
 	WAIT_NODE_TYPE,
-	WAIT_TIME_UNLIMITED,
 } from '@/constants';
 import type {
 	ExecutionSummary,
@@ -18,7 +17,12 @@ import type {
 	NodeOperationError,
 	Workflow,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeHelpers, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
+import {
+	NodeConnectionType,
+	NodeHelpers,
+	SEND_AND_WAIT_OPERATION,
+	WAIT_INDEFINITELY,
+} from 'n8n-workflow';
 import type { StyleValue } from 'vue';
 import { computed, onMounted, ref, watch } from 'vue';
 import xss from 'xss';
@@ -271,7 +275,7 @@ const nodeClass = computed(() => {
 const nodeExecutionStatus = computed(() => {
 	const nodeExecutionRunData = workflowsStore.getWorkflowRunData?.[props.name];
 	if (nodeExecutionRunData) {
-		return nodeExecutionRunData.filter(Boolean)[0]?.executionStatus ?? '';
+		return nodeExecutionRunData.filter(Boolean)?.[0]?.executionStatus ?? '';
 	}
 	return '';
 });
@@ -345,7 +349,7 @@ const waiting = computed(() => {
 				return i18n.baseText('node.theNodeIsWaitingFormCall');
 			}
 			const waitDate = new Date(workflowExecution.waitTill);
-			if (waitDate.toISOString() === WAIT_TIME_UNLIMITED) {
+			if (waitDate.getTime() === WAIT_INDEFINITELY.getTime()) {
 				return i18n.baseText('node.theNodeIsWaitingIndefinitelyForAnIncomingWebhookCall');
 			}
 			return i18n.baseText('node.nodeIsWaitingTill', {
diff --git a/packages/editor-ui/src/components/Node/NodeCreation.vue b/packages/editor-ui/src/components/Node/NodeCreation.vue
index dd00098932..216a038e3a 100644
--- a/packages/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreation.vue
@@ -13,6 +13,7 @@ import type { AddedNodesAndConnections, ToggleNodeCreatorOptions } from '@/Inter
 import { useActions } from './NodeCreator/composables/useActions';
 import { useThrottleFn } from '@vueuse/core';
 import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
+import { useI18n } from '@/composables/useI18n';
 
 type Props = {
 	nodeViewScale: number;
@@ -34,6 +35,7 @@ const emit = defineEmits<{
 }>();
 
 const uiStore = useUIStore();
+const i18n = useI18n();
 
 const { getAddedNodesAndConnections } = useActions();
 
@@ -101,7 +103,7 @@ onBeforeUnmount(() => {
 	<div v-if="!createNodeActive" :class="$style.nodeButtonsWrapper">
 		<div :class="$style.nodeCreatorButton" ref="wrapperRef" data-test-id="node-creator-plus-button">
 			<KeyboardShortcutTooltip
-				:label="$locale.baseText('nodeView.openNodesPanel')"
+				:label="i18n.baseText('nodeView.openNodesPanel')"
 				:shortcut="{ keys: ['Tab'] }"
 				placement="left"
 			>
@@ -119,7 +121,7 @@ onBeforeUnmount(() => {
 				@click="addStickyNote"
 			>
 				<KeyboardShortcutTooltip
-					:label="$locale.baseText('nodeView.addStickyHint')"
+					:label="i18n.baseText('nodeView.addStickyHint')"
 					:shortcut="{ keys: ['s'], shiftKey: true }"
 					placement="left"
 				>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.test.ts
similarity index 95%
rename from packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts
rename to packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.test.ts
index fa290aa550..4d64abb728 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/CategoryItem.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.test.ts
@@ -1,5 +1,5 @@
 import { screen } from '@testing-library/vue';
-import CategoryItem from '../ItemTypes/CategoryItem.vue';
+import CategoryItem from './ItemTypes/CategoryItem.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 
 const renderComponent = createComponentRenderer(CategoryItem);
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
index 9b4a8614d2..b982e4ecee 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemTypes/NodeItem.vue
@@ -9,7 +9,6 @@ import {
 } from '@/constants';
 
 import { isCommunityPackageName } from '@/utils/nodeTypesUtils';
-import { getNewNodePosition, NODE_SIZE } from '@/utils/nodeViewUtils';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import NodeIcon from '@/components/NodeIcon.vue';
 
@@ -93,15 +92,6 @@ const isTrigger = computed<boolean>(() => {
 });
 
 function onDragStart(event: DragEvent): void {
-	/**
-	 * Workaround for firefox, that doesn't attach the pageX and pageY coordinates to "ondrag" event.
-	 * All browsers attach the correct page coordinates to the "dragover" event.
-	 * @bug https://bugzilla.mozilla.org/show_bug.cgi?id=505521
-	 */
-	document.body.addEventListener('dragover', onDragOver);
-
-	const { pageX: x, pageY: y } = event;
-
 	if (event.dataTransfer) {
 		event.dataTransfer.effectAllowed = 'copy';
 		event.dataTransfer.dropEffect = 'copy';
@@ -113,22 +103,9 @@ function onDragStart(event: DragEvent): void {
 	}
 
 	dragging.value = true;
-	draggablePosition.value = { x, y };
-}
-
-function onDragOver(event: DragEvent): void {
-	if (!dragging.value || (event.pageX === 0 && event.pageY === 0)) {
-		return;
-	}
-
-	const [x, y] = getNewNodePosition([], [event.pageX - NODE_SIZE / 2, event.pageY - NODE_SIZE / 2]);
-
-	draggablePosition.value = { x, y };
 }
 
 function onDragEnd(): void {
-	document.body.removeEventListener('dragover', onDragOver);
-
 	dragging.value = false;
 	setTimeout(() => {
 		draggablePosition.value = { x: -100, y: -100 };
@@ -144,7 +121,7 @@ function onCommunityNodeTooltipClick(event: MouseEvent) {
 
 <template>
 	<!-- Node Item is draggable only if it doesn't contain actions -->
-	<n8n-node-creator-node
+	<N8nNodeCreatorNode
 		:draggable="!showActionArrow"
 		:class="$style.nodeItem"
 		:description="description"
@@ -176,12 +153,16 @@ function onCommunityNodeTooltipClick(event: MouseEvent) {
 			/>
 		</template>
 		<template #dragContent>
-			<div ref="draggableDataTransfer" :class="$style.draggableDataTransfer" />
-			<div v-show="dragging" :class="$style.draggable" :style="draggableStyle">
+			<div
+				ref="draggableDataTransfer"
+				v-show="dragging"
+				:class="$style.draggable"
+				:style="draggableStyle"
+			>
 				<NodeIcon :node-type="nodeType" :size="40" :shrink="false" @click.capture.stop />
 			</div>
 		</template>
-	</n8n-node-creator-node>
+	</N8nNodeCreatorNode>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/ItemsRenderer.test.ts
similarity index 99%
rename from packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
rename to packages/editor-ui/src/components/Node/NodeCreator/ItemsRenderer.test.ts
index f0737f328e..717e7a1eb1 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/ItemsRenderer.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemsRenderer.test.ts
@@ -8,7 +8,7 @@ import {
 	mockActionCreateElement,
 	mockViewCreateElement,
 	mockSectionCreateElement,
-} from './utils';
+} from './__tests__/utils';
 import ItemsRenderer from '@/components/Node/NodeCreator/Renderers/ItemsRenderer.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
index 0c2816e2d8..7952a489d0 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/ActionsMode.vue
@@ -1,16 +1,13 @@
 <script setup lang="ts">
-import { computed, onMounted, defineComponent, h } from 'vue';
-import type { PropType } from 'vue';
+import { computed, onMounted } from 'vue';
 import type {
 	INodeCreateElement,
-	NodeFilterType,
 	IUpdateInformation,
 	ActionCreateElement,
 	NodeCreateElement,
 } from '@/Interface';
 import {
 	HTTP_REQUEST_NODE_TYPE,
-	REGULAR_NODE_CREATOR_VIEW,
 	TRIGGER_NODE_CREATOR_VIEW,
 	CUSTOM_API_CALL_KEY,
 	OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE,
@@ -29,6 +26,8 @@ import CategorizedItemsRenderer from '../Renderers/CategorizedItemsRenderer.vue'
 import type { IDataObject } from 'n8n-workflow';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+import OrderSwitcher from './../OrderSwitcher.vue';
 
 const emit = defineEmits<{
 	nodeTypeSelected: [value: [actionKey: string, nodeName: string] | [nodeName: string]];
@@ -47,6 +46,8 @@ const {
 	actionsCategoryLocales,
 } = useActions();
 
+const nodeCreatorStore = useNodeCreatorStore();
+
 // We only inject labels if search is empty
 const parsedTriggerActions = computed(() =>
 	parseActions(actions.value, actionsCategoryLocales.value.triggers, false),
@@ -182,7 +183,7 @@ function trackActionsView() {
 	};
 
 	void useExternalHooks().run('nodeCreateList.onViewActions', trackingPayload);
-	telemetry?.trackNodesPanel('nodeCreateList.onViewActions', trackingPayload);
+	nodeCreatorStore.onViewActions(trackingPayload);
 }
 
 function resetSearch() {
@@ -206,29 +207,9 @@ function addHttpNode() {
 	void useExternalHooks().run('nodeCreateList.onActionsCustmAPIClicked', {
 		app_identifier,
 	});
-	telemetry?.trackNodesPanel('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
+	nodeCreatorStore.onActionsCustomAPIClicked({ app_identifier });
 }
 
-// Anonymous component to handle triggers and actions rendering order
-const OrderSwitcher = defineComponent({
-	props: {
-		rootView: {
-			type: String as PropType<NodeFilterType>,
-			required: true,
-		},
-	},
-	setup(props, { slots }) {
-		return () =>
-			h(
-				'div',
-				{},
-				props.rootView === REGULAR_NODE_CREATOR_VIEW
-					? [slots.actions?.(), slots.triggers?.()]
-					: [slots.triggers?.(), slots.actions?.()],
-			);
-	},
-});
-
 onMounted(() => {
 	trackActionsView();
 });
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
index 08f8d14cbb..d7ed3d87f0 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Modes/NodesMode.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { camelCase } from 'lodash-es';
 import { computed } from 'vue';
-import type { INodeCreateElement, NodeFilterType } from '@/Interface';
+import type { INodeCreateElement, NodeCreateElement, NodeFilterType } from '@/Interface';
 import {
 	TRIGGER_NODE_CREATOR_VIEW,
 	HTTP_REQUEST_NODE_TYPE,
@@ -23,9 +23,10 @@ import ItemsRenderer from '../Renderers/ItemsRenderer.vue';
 import CategorizedItemsRenderer from '../Renderers/CategorizedItemsRenderer.vue';
 import NoResults from '../Panel/NoResults.vue';
 import { useI18n } from '@/composables/useI18n';
-import { useTelemetry } from '@/composables/useTelemetry';
 import { getNodeIcon, getNodeIconColor, getNodeIconUrl } from '@/utils/nodeTypesUtils';
 import { useUIStore } from '@/stores/ui.store';
+import { useActions } from '../composables/useActions';
+import type { INodeParameters } from 'n8n-workflow';
 
 export interface Props {
 	rootView: 'trigger' | 'action';
@@ -36,18 +37,26 @@ const emit = defineEmits<{
 }>();
 
 const i18n = useI18n();
-const telemetry = useTelemetry();
 const uiStore = useUIStore();
 const rootStore = useRootStore();
 
-const { mergedNodes, actions } = useNodeCreatorStore();
+const { mergedNodes, actions, onSubcategorySelected } = useNodeCreatorStore();
 const { pushViewStack, popViewStack } = useViewStacks();
+const { setAddedNodeActionParameters } = useActions();
 
 const { registerKeyHook } = useKeyboardNavigation();
 
 const activeViewStack = computed(() => useViewStacks().activeViewStack);
 const globalSearchItemsDiff = computed(() => useViewStacks().globalSearchItemsDiff);
 
+function getFilteredActions(node: NodeCreateElement) {
+	const nodeActions = actions?.[node.key] || [];
+	if (activeViewStack.value.actionsFilter) {
+		return activeViewStack.value.actionsFilter(nodeActions);
+	}
+	return nodeActions;
+}
+
 function selectNodeType(nodeTypes: string[]) {
 	emit('nodeTypeSelected', nodeTypes);
 }
@@ -83,15 +92,27 @@ function onSelected(item: INodeCreateElement) {
 			sections: item.properties.sections,
 		});
 
-		telemetry.trackNodesPanel('nodeCreateList.onSubcategorySelected', {
+		onSubcategorySelected({
 			subcategory: item.key,
 		});
 	}
 
 	if (item.type === 'node') {
-		const nodeActions = actions?.[item.key] || [];
+		const nodeActions = getFilteredActions(item);
+
+		// If there is only one action, use it
+		if (nodeActions.length === 1) {
+			selectNodeType([item.key]);
+			setAddedNodeActionParameters({
+				name: nodeActions[0].defaults.name ?? item.properties.displayName,
+				key: item.key,
+				value: nodeActions[0].values as INodeParameters,
+			});
+			return;
+		}
+
 		// Only show actions if there are more than one or if the view is not an AI subcategory
-		if (nodeActions.length <= 1 || activeViewStack.value.hideActions) {
+		if (nodeActions.length === 0 || activeViewStack.value.hideActions) {
 			selectNodeType([item.key]);
 			return;
 		}
@@ -153,9 +174,6 @@ function onSelected(item: INodeCreateElement) {
 
 	if (item.type === 'link') {
 		window.open(item.properties.url, '_blank');
-		telemetry.trackNodesPanel('nodeCreateList.onLinkSelected', {
-			link: item.properties.url,
-		});
 	}
 }
 
@@ -163,7 +181,7 @@ function subcategoriesMapper(item: INodeCreateElement) {
 	if (item.type !== 'node') return item;
 
 	const hasTriggerGroup = item.properties.group.includes('trigger');
-	const nodeActions = actions?.[item.key] || [];
+	const nodeActions = getFilteredActions(item);
 	const hasActions = nodeActions.length > 0;
 
 	if (hasTriggerGroup && hasActions) {
@@ -184,7 +202,7 @@ function baseSubcategoriesFilter(item: INodeCreateElement): boolean {
 	if (item.type !== 'node') return false;
 
 	const hasTriggerGroup = item.properties.group.includes('trigger');
-	const nodeActions = actions?.[item.key] || [];
+	const nodeActions = getFilteredActions(item);
 	const hasActions = nodeActions.length > 0;
 
 	const isTriggerRootView = activeViewStack.value.rootView === TRIGGER_NODE_CREATOR_VIEW;
@@ -250,7 +268,7 @@ registerKeyHook('MainViewArrowLeft', {
 		<CategorizedItemsRenderer
 			v-if="globalSearchItemsDiff.length > 0"
 			:elements="globalSearchItemsDiff"
-			:category="$locale.baseText('nodeCreator.categoryNames.otherCategories')"
+			:category="i18n.baseText('nodeCreator.categoryNames.otherCategories')"
 			@selected="onSelected"
 		>
 		</CategorizedItemsRenderer>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index 82767f964d..fbdb7d0b7b 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -13,6 +13,7 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { useUIStore } from '@/stores/ui.store';
 import { DRAG_EVENT_DATA_KEY } from '@/constants';
 import { useAssistantStore } from '@/stores/assistant.store';
+import N8nIconButton from 'n8n-design-system/components/N8nIconButton/IconButton.vue';
 
 export interface Props {
 	active?: boolean;
@@ -145,6 +146,14 @@ onBeforeUnmount(() => {
 				[$style.active]: showScrim,
 			}"
 		/>
+		<N8nIconButton
+			v-if="active"
+			:class="$style.close"
+			type="secondary"
+			icon="times"
+			aria-label="Close Node Creator"
+			@click="emit('closeNodeCreator')"
+		/>
 		<SlideTransition>
 			<div
 				v-if="active"
@@ -168,13 +177,14 @@ onBeforeUnmount(() => {
 	font-weight: var(--font-weight-bold);
 }
 .nodeCreator {
+	--node-creator-width: #{$node-creator-width};
 	--node-icon-color: var(--color-text-base);
 	position: fixed;
 	top: $header-height;
 	bottom: 0;
 	right: 0;
 	z-index: var(--z-index-node-creator);
-	width: $node-creator-width;
+	width: var(--node-creator-width);
 	color: $node-creator-text-color;
 }
 
@@ -194,4 +204,24 @@ onBeforeUnmount(() => {
 		opacity: 0.7;
 	}
 }
+
+.close {
+	position: absolute;
+	z-index: calc(var(--z-index-node-creator) + 1);
+	top: var(--spacing-xs);
+	right: var(--spacing-xs);
+	background: transparent;
+	border: 0;
+	display: none;
+}
+
+@media screen and (max-width: #{$node-creator-width + $sidebar-width}) {
+	.nodeCreator {
+		--node-creator-width: calc(100vw - #{$sidebar-width});
+	}
+
+	.close {
+		display: inline-flex;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
similarity index 98%
rename from packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
rename to packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
index 62db84094e..c451f2c764 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/NodesListPanel.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodesListPanel.test.ts
@@ -4,8 +4,8 @@ import { createPinia } from 'pinia';
 import { screen, fireEvent } from '@testing-library/vue';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
-import { mockSimplifiedNodeType } from './utils';
-import NodesListPanel from '../Panel/NodesListPanel.vue';
+import { mockSimplifiedNodeType } from './__tests__/utils';
+import NodesListPanel from './Panel/NodesListPanel.vue';
 import { REGULAR_NODE_CREATOR_VIEW } from '@/constants';
 import type { NodeFilterType } from '@/Interface';
 import { createComponentRenderer } from '@/__tests__/render';
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/OrderSwitcher.vue b/packages/editor-ui/src/components/Node/NodeCreator/OrderSwitcher.vue
new file mode 100644
index 0000000000..4a8ca49afd
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/OrderSwitcher.vue
@@ -0,0 +1,21 @@
+<script setup lang="ts">
+import type { NodeFilterType } from '@/Interface';
+import { REGULAR_NODE_CREATOR_VIEW } from '@/constants';
+
+defineProps<{
+	rootView: NodeFilterType;
+}>();
+</script>
+
+<template>
+	<div>
+		<template v-if="rootView === REGULAR_NODE_CREATOR_VIEW">
+			<slot name="actions" />
+			<slot name="triggers" />
+		</template>
+		<template v-else>
+			<slot name="triggers" />
+			<slot name="actions" />
+		</template>
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
index e6dce65be3..e8d5977613 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NoResults.vue
@@ -7,6 +7,7 @@ import {
 import type { NodeFilterType } from '@/Interface';
 
 import NoResultsIcon from './NoResultsIcon.vue';
+import { useI18n } from '@/composables/useI18n';
 
 export interface Props {
 	showIcon?: boolean;
@@ -15,6 +16,7 @@ export interface Props {
 }
 
 defineProps<Props>();
+const i18n = useI18n();
 </script>
 
 <template>
@@ -27,34 +29,34 @@ defineProps<Props>();
 		</div>
 		<div :class="$style.title">
 			<slot name="title" />
-			<p v-text="$locale.baseText('nodeCreator.noResults.weDidntMakeThatYet')" />
+			<p v-text="i18n.baseText('nodeCreator.noResults.weDidntMakeThatYet')" />
 			<div
 				v-if="rootView === REGULAR_NODE_CREATOR_VIEW || rootView === TRIGGER_NODE_CREATOR_VIEW"
 				:class="$style.action"
 			>
-				{{ $locale.baseText('nodeCreator.noResults.dontWorryYouCanProbablyDoItWithThe') }}
+				{{ i18n.baseText('nodeCreator.noResults.dontWorryYouCanProbablyDoItWithThe') }}
 				<n8n-link v-if="rootView === REGULAR_NODE_CREATOR_VIEW" @click="$emit('addHttpNode')">
-					{{ $locale.baseText('nodeCreator.noResults.httpRequest') }}
+					{{ i18n.baseText('nodeCreator.noResults.httpRequest') }}
 				</n8n-link>
 
 				<n8n-link v-if="rootView === TRIGGER_NODE_CREATOR_VIEW" @click="$emit('addWebhookNode')">
-					{{ $locale.baseText('nodeCreator.noResults.webhook') }}
+					{{ i18n.baseText('nodeCreator.noResults.webhook') }}
 				</n8n-link>
-				{{ $locale.baseText('nodeCreator.noResults.node') }}
+				{{ i18n.baseText('nodeCreator.noResults.node') }}
 			</div>
 		</div>
 
 		<div v-if="showRequest" :class="$style.request">
-			<p v-text="$locale.baseText('nodeCreator.noResults.wantUsToMakeItFaster')" />
+			<p v-text="i18n.baseText('nodeCreator.noResults.wantUsToMakeItFaster')" />
 			<div>
 				<n8n-link :to="REQUEST_NODE_FORM_URL">
-					<span>{{ $locale.baseText('nodeCreator.noResults.requestTheNode') }}</span
+					<span>{{ i18n.baseText('nodeCreator.noResults.requestTheNode') }}</span
 					>&nbsp;
 					<span>
 						<font-awesome-icon
 							:class="$style.external"
 							icon="external-link-alt"
-							:title="$locale.baseText('nodeCreator.noResults.requestTheNode')"
+							:title="i18n.baseText('nodeCreator.noResults.requestTheNode')"
 						/>
 					</span>
 				</n8n-link>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
index 72e31851f9..e430ba0ed5 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Panel/NodesListPanel.vue
@@ -17,12 +17,15 @@ import SearchBar from './SearchBar.vue';
 import ActionsRenderer from '../Modes/ActionsMode.vue';
 import NodesRenderer from '../Modes/NodesMode.vue';
 import { useI18n } from '@/composables/useI18n';
+import { useDebounce } from '@/composables/useDebounce';
 
 const i18n = useI18n();
+const { callDebounced } = useDebounce();
 
 const { mergedNodes } = useNodeCreatorStore();
 const { pushViewStack, popViewStack, updateCurrentViewStack } = useViewStacks();
 const { setActiveItemIndex, attachKeydownEvent, detachKeydownEvent } = useKeyboardNavigation();
+const nodeCreatorStore = useNodeCreatorStore();
 
 const activeViewStack = computed(() => useViewStacks().activeViewStack);
 
@@ -55,6 +58,19 @@ function onSearch(value: string) {
 	if (activeViewStack.value.uuid) {
 		updateCurrentViewStack({ search: value });
 		void setActiveItemIndex(getDefaultActiveIndex(value));
+		if (value.length) {
+			callDebounced(
+				nodeCreatorStore.onNodeFilterChanged,
+				{ trailing: true, debounceTime: 2000 },
+				{
+					newValue: value,
+					filteredNodes: activeViewStack.value.items ?? [],
+					filterMode: activeViewStack.value.rootView ?? 'Regular',
+					subcategory: activeViewStack.value.subcategory,
+					title: activeViewStack.value.title,
+				},
+			);
+		}
 	}
 }
 
@@ -160,9 +176,7 @@ function onBackButton() {
 				v-if="activeViewStack.hasSearch"
 				:class="$style.searchBar"
 				:placeholder="
-					searchPlaceholder
-						? searchPlaceholder
-						: $locale.baseText('nodeCreator.searchBar.searchNodes')
+					searchPlaceholder ? searchPlaceholder : i18n.baseText('nodeCreator.searchBar.searchNodes')
 				"
 				:model-value="activeViewStack.search"
 				@update:model-value="onSearch"
@@ -246,7 +260,7 @@ function onBackButton() {
 	height: 100%;
 	background-color: $node-creator-background-color;
 	--color-background-node-icon-badge: var(--color-background-xlight);
-	width: 385px;
+	width: var(--node-creator-width);
 	display: flex;
 	flex-direction: column;
 
@@ -289,6 +303,7 @@ function onBackButton() {
 	line-height: 24px;
 	font-weight: var(--font-weight-bold);
 	font-size: var(--font-size-l);
+	margin: 0;
 
 	.hasBg & {
 		font-size: var(--font-size-s-m);
@@ -299,6 +314,7 @@ function onBackButton() {
 	margin-top: var(--spacing-4xs);
 	font-size: var(--font-size-s);
 	line-height: 19px;
+
 	color: var(--color-text-base);
 	font-weight: var(--font-weight-regular);
 }
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
index 93b542c72a..b493d53680 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/Renderers/CategorizedItemsRenderer.vue
@@ -8,7 +8,7 @@ import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
 import { useViewStacks } from '../composables/useViewStacks';
 import ItemsRenderer from './ItemsRenderer.vue';
 import CategoryItem from '../ItemTypes/CategoryItem.vue';
-import { useTelemetry } from '@/composables/useTelemetry';
+import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 
 export interface Props {
 	elements: INodeCreateElement[];
@@ -24,10 +24,10 @@ const props = withDefaults(defineProps<Props>(), {
 	elements: () => [],
 });
 
-const telemetry = useTelemetry();
 const { popViewStack } = useViewStacks();
 const { registerKeyHook } = useKeyboardNavigation();
 const { workflowId } = useWorkflowsStore();
+const nodeCreatorStore = useNodeCreatorStore();
 
 const activeItemId = computed(() => useKeyboardNavigation()?.activeItemId);
 const actionCount = computed(() => props.elements.filter(({ type }) => type === 'action').length);
@@ -38,10 +38,11 @@ function toggleExpanded() {
 }
 
 function setExpanded(isExpanded: boolean) {
+	const prev = expanded.value;
 	expanded.value = isExpanded;
 
-	if (expanded.value) {
-		telemetry.trackNodesPanel('nodeCreateList.onCategoryExpanded', {
+	if (expanded.value && !prev) {
+		nodeCreatorStore.onCategoryExpanded({
 			category_name: props.category,
 			workflow_id: workflowId,
 		});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
index e9f7917385..e92097bbdd 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActions.ts
@@ -19,7 +19,6 @@ import {
 	AI_CATEGORY_LANGUAGE_MODELS,
 	BASIC_CHAIN_NODE_TYPE,
 	CHAT_TRIGGER_NODE_TYPE,
-	MANUAL_CHAT_TRIGGER_NODE_TYPE,
 	MANUAL_TRIGGER_NODE_TYPE,
 	NODE_CREATOR_OPEN_SOURCES,
 	NO_OP_NODE_TYPE,
@@ -204,8 +203,6 @@ export const useActions = () => {
 		);
 	}
 	function shouldPrependChatTrigger(addedNodes: AddedNode[]): boolean {
-		const { allNodes } = useWorkflowsStore();
-
 		const COMPATIBLE_CHAT_NODES = [
 			QA_CHAIN_NODE_TYPE,
 			AGENT_NODE_TYPE,
@@ -214,13 +211,11 @@ export const useActions = () => {
 			OPEN_AI_NODE_MESSAGE_ASSISTANT_TYPE,
 		];
 
-		const isChatTriggerMissing =
-			allNodes.find((node) =>
-				[MANUAL_CHAT_TRIGGER_NODE_TYPE, CHAT_TRIGGER_NODE_TYPE].includes(node.type),
-			) === undefined;
 		const isCompatibleNode = addedNodes.some((node) => COMPATIBLE_CHAT_NODES.includes(node.type));
+		if (!isCompatibleNode) return false;
 
-		return isCompatibleNode && isChatTriggerMissing;
+		const { allNodes } = useWorkflowsStore();
+		return allNodes.filter((x) => x.type !== MANUAL_TRIGGER_NODE_TYPE).length === 0;
 	}
 
 	// AI-226: Prepend LLM Chain node when adding a language model
@@ -332,7 +327,11 @@ export const useActions = () => {
 		return storeWatcher;
 	}
 
-	function trackActionSelected(action: IUpdateInformation, telemetry: Telemetry, rootView: string) {
+	function trackActionSelected(
+		action: IUpdateInformation,
+		_telemetry: Telemetry,
+		rootView: string,
+	) {
 		const payload = {
 			node_type: action.key,
 			action: action.name,
@@ -340,7 +339,7 @@ export const useActions = () => {
 			resource: (action.value as INodeParameters).resource || '',
 		};
 		void useExternalHooks().run('nodeCreateList.addAction', payload);
-		telemetry?.trackNodesPanel('nodeCreateList.addAction', payload);
+		useNodeCreatorStore().onAddActions(payload);
 	}
 
 	return {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
index e428269dbe..24e7cad590 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useActionsGeneration.ts
@@ -1,5 +1,11 @@
 import type { ActionTypeDescription, ActionsRecord, SimplifiedNodeType } from '@/Interface';
-import { AI_SUBCATEGORY, CUSTOM_API_CALL_KEY, HTTP_REQUEST_NODE_TYPE } from '@/constants';
+import {
+	AI_CATEGORY_ROOT_NODES,
+	AI_CATEGORY_TOOLS,
+	AI_SUBCATEGORY,
+	CUSTOM_API_CALL_KEY,
+	HTTP_REQUEST_NODE_TYPE,
+} from '@/constants';
 import { memoize, startCase } from 'lodash-es';
 import type {
 	ICredentialType,
@@ -87,6 +93,7 @@ function operationsCategory(nodeTypeDescription: INodeTypeDescription): ActionTy
 		displayName: item.action ?? startCase(item.name),
 		description: item.description ?? '',
 		displayOptions: matchedProperty.displayOptions,
+		outputConnectionType: item.outputConnectionType,
 		values: {
 			[matchedProperty.name]: matchedProperty.type === 'multiOptions' ? [item.value] : item.value,
 		},
@@ -117,6 +124,7 @@ function modeCategory(nodeTypeDescription: INodeTypeDescription): ActionTypeDesc
 		displayName: item.action ?? startCase(item.name),
 		description: item.description ?? '',
 		displayOptions: matchedProperty.displayOptions,
+		outputConnectionType: item.outputConnectionType,
 		values: {
 			[matchedProperty.name]: item.value,
 		},
@@ -261,7 +269,11 @@ function resourceCategories(nodeTypeDescription: INodeTypeDescription): ActionTy
 export function useActionsGenerator() {
 	function generateNodeActions(node: INodeTypeDescription | undefined) {
 		if (!node) return [];
-		if (node.codex?.subcategories?.AI?.includes('Tools')) return [];
+		if (
+			node.codex?.subcategories?.AI?.includes(AI_CATEGORY_TOOLS) &&
+			!node.codex?.subcategories?.AI?.includes(AI_CATEGORY_ROOT_NODES)
+		)
+			return [];
 		return [
 			...triggersCategory(node),
 			...operationsCategory(node),
@@ -269,6 +281,7 @@ export function useActionsGenerator() {
 			...modeCategory(node),
 		];
 	}
+
 	function filterActions(actions: ActionTypeDescription[]) {
 		// Do not show single action nodes
 		if (actions.length <= 1) return [];
@@ -320,7 +333,6 @@ export function useActionsGenerator() {
 		const visibleNodeTypes = [...nodeTypes];
 		const actions: ActionsRecord<typeof mergedNodes> = {};
 		const mergedNodes: SimplifiedNodeType[] = [];
-
 		visibleNodeTypes
 			.filter((node) => !node.group.includes('trigger'))
 			.forEach((app) => {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
index 7026287946..6ffe169871 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useKeyboardNavigation.ts
@@ -62,6 +62,16 @@ export const useKeyboardNavigation = defineStore('nodeCreatorKeyboardNavigation'
 	}
 
 	async function onKeyDown(e: KeyboardEvent) {
+		// We generally want a global listener across the app
+		// But specific components may overrule this by adopting
+		// the 'ignore-key-press-node-creator' class
+		if (
+			e.target instanceof Element &&
+			e.target.classList.contains('ignore-key-press-node-creator')
+		) {
+			return;
+		}
+
 		const pressedKey = e.key;
 		if (!WATCHED_KEYS.includes(pressedKey)) return;
 		e.preventDefault();
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
index 3584a38723..c57d7f5464 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/composables/useViewStacks.ts
@@ -1,4 +1,5 @@
 import type {
+	ActionTypeDescription,
 	INodeCreateElement,
 	NodeCreateElement,
 	NodeFilterType,
@@ -6,6 +7,7 @@ import type {
 } from '@/Interface';
 import {
 	AI_CATEGORY_ROOT_NODES,
+	AI_CATEGORY_TOOLS,
 	AI_CODE_NODE_TYPE,
 	AI_NODE_CREATOR_VIEW,
 	AI_OTHERS_NODE_CREATOR_VIEW,
@@ -36,12 +38,8 @@ import { useI18n } from '@/composables/useI18n';
 import { useKeyboardNavigation } from './useKeyboardNavigation';
 
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import {
-	AI_TRANSFORM_NODE_TYPE,
-	type INodeInputFilter,
-	type NodeConnectionType,
-	type Themed,
-} from 'n8n-workflow';
+import { AI_TRANSFORM_NODE_TYPE } from 'n8n-workflow';
+import type { NodeConnectionType, INodeInputFilter, Themed } from 'n8n-workflow';
 import { useCanvasStore } from '@/stores/canvas.store';
 import { useSettingsStore } from '@/stores/settings.store';
 
@@ -71,6 +69,7 @@ interface ViewStack {
 	hideActions?: boolean;
 	baseFilter?: (item: INodeCreateElement) => boolean;
 	itemsMapper?: (item: INodeCreateElement) => INodeCreateElement;
+	actionsFilter?: (items: ActionTypeDescription[]) => ActionTypeDescription[];
 	panelClass?: string;
 	sections?: string[] | NodeViewItemSection[];
 }
@@ -207,8 +206,10 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 		return items.filter((node) => {
 			if (node.type !== 'node') return false;
 
-			return node.properties.codex?.subcategories?.[AI_SUBCATEGORY].includes(
-				AI_CATEGORY_ROOT_NODES,
+			const subcategories = node.properties.codex?.subcategories?.[AI_SUBCATEGORY] ?? [];
+			return (
+				subcategories.includes(AI_CATEGORY_ROOT_NODES) &&
+				!subcategories?.includes(AI_CATEGORY_TOOLS)
 			);
 		});
 	}
@@ -346,6 +347,13 @@ export const useViewStacks = defineStore('nodeCreatorViewStacks', () => {
 					subcategory: connectionType,
 				};
 			},
+			actionsFilter: (items: ActionTypeDescription[]) => {
+				// Filter out actions that are not compatible with the connection type
+				if (items.some((item) => item.outputConnectionType)) {
+					return items.filter((item) => item.outputConnectionType === connectionType);
+				}
+				return items;
+			},
 			hideActions: true,
 			preventBack: true,
 		});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActions.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
similarity index 65%
rename from packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActions.test.ts
rename to packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
index 14a03254e1..386ff58c6e 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActions.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/useActions.test.ts
@@ -3,8 +3,10 @@ import { createTestingPinia } from '@pinia/testing';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useActions } from '../composables/useActions';
+import { useActions } from './composables/useActions';
 import {
+	AGENT_NODE_TYPE,
+	GITHUB_TRIGGER_NODE_TYPE,
 	HTTP_REQUEST_NODE_TYPE,
 	MANUAL_TRIGGER_NODE_TYPE,
 	NODE_CREATOR_OPEN_SOURCES,
@@ -15,6 +17,7 @@ import {
 	TRIGGER_NODE_CREATOR_VIEW,
 	WEBHOOK_NODE_TYPE,
 } from '@/constants';
+import { CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow';
 
 describe('useActions', () => {
 	beforeAll(() => {
@@ -54,6 +57,9 @@ describe('useActions', () => {
 			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
 				{ type: SCHEDULE_TRIGGER_NODE_TYPE } as never,
 			]);
+			vi.spyOn(workflowsStore, 'getNodeTypes').mockReturnValue({
+				getByNameAndVersion: () => ({ description: { group: ['trigger'] } }),
+			} as never);
 			vi.spyOn(nodeCreatorStore, 'openSource', 'get').mockReturnValue(
 				NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
 			);
@@ -67,6 +73,100 @@ describe('useActions', () => {
 			});
 		});
 
+		test('should insert a ChatTrigger node when an AI Agent is added on an empty canvas', () => {
+			const workflowsStore = useWorkflowsStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([]);
+			vi.spyOn(workflowsStore, 'allNodes', 'get').mockReturnValue([]);
+
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(getAddedNodesAndConnections([{ type: AGENT_NODE_TYPE }])).toEqual({
+				connections: [
+					{
+						from: {
+							nodeIndex: 0,
+						},
+						to: {
+							nodeIndex: 1,
+						},
+					},
+				],
+				nodes: [
+					{ type: CHAT_TRIGGER_NODE_TYPE, isAutoAdd: true },
+					{ type: AGENT_NODE_TYPE, openDetail: true },
+				],
+			});
+		});
+
+		test('should insert a ChatTrigger node when an AI Agent is added with only a Manual Trigger present', () => {
+			const workflowsStore = useWorkflowsStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
+				{ type: MANUAL_TRIGGER_NODE_TYPE } as never,
+			]);
+			vi.spyOn(workflowsStore, 'allNodes', 'get').mockReturnValue([
+				{ type: MANUAL_TRIGGER_NODE_TYPE } as never,
+			]);
+
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(getAddedNodesAndConnections([{ type: AGENT_NODE_TYPE }])).toEqual({
+				connections: [
+					{
+						from: {
+							nodeIndex: 0,
+						},
+						to: {
+							nodeIndex: 1,
+						},
+					},
+				],
+				nodes: [
+					{ type: CHAT_TRIGGER_NODE_TYPE, isAutoAdd: true },
+					{ type: AGENT_NODE_TYPE, openDetail: true },
+				],
+			});
+		});
+
+		test('should not insert a ChatTrigger node when an AI Agent is added with a non-trigger node prseent', () => {
+			const workflowsStore = useWorkflowsStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
+				{ type: GITHUB_TRIGGER_NODE_TYPE } as never,
+			]);
+
+			vi.spyOn(workflowsStore, 'allNodes', 'get').mockReturnValue([
+				{ type: GITHUB_TRIGGER_NODE_TYPE } as never,
+				{ type: HTTP_REQUEST_NODE_TYPE } as never,
+			]);
+
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(getAddedNodesAndConnections([{ type: AGENT_NODE_TYPE }])).toEqual({
+				connections: [],
+				nodes: [{ type: AGENT_NODE_TYPE, openDetail: true }],
+			});
+		});
+
+		test('should not insert a ChatTrigger node when an AI Agent is added with a Chat Trigger already present', () => {
+			const workflowsStore = useWorkflowsStore();
+
+			vi.spyOn(workflowsStore, 'workflowTriggerNodes', 'get').mockReturnValue([
+				{ type: CHAT_TRIGGER_NODE_TYPE } as never,
+			]);
+			vi.spyOn(workflowsStore, 'allNodes', 'get').mockReturnValue([
+				{ type: CHAT_TRIGGER_NODE_TYPE } as never,
+			]);
+
+			const { getAddedNodesAndConnections } = useActions();
+
+			expect(getAddedNodesAndConnections([{ type: AGENT_NODE_TYPE }])).toEqual({
+				connections: [],
+				nodes: [{ type: AGENT_NODE_TYPE, openDetail: true }],
+			});
+		});
+
 		test('should insert a No Op node when a Loop Over Items Node is added', () => {
 			const workflowsStore = useWorkflowsStore();
 			const nodeCreatorStore = useNodeCreatorStore();
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActionsGeneration.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/useActionsGeneration.test.ts
similarity index 99%
rename from packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActionsGeneration.test.ts
rename to packages/editor-ui/src/components/Node/NodeCreator/useActionsGeneration.test.ts
index 171e2a0b48..679fd05284 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useActionsGeneration.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/useActionsGeneration.test.ts
@@ -1,5 +1,5 @@
 import { NodeConnectionType, type INodeProperties, type INodeTypeDescription } from 'n8n-workflow';
-import { useActionsGenerator } from '../composables/useActionsGeneration';
+import { useActionsGenerator } from './composables/useActionsGeneration';
 
 describe('useActionsGenerator', () => {
 	const { generateMergedNodesAndActions } = useActionsGenerator();
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/useKeyboardNavigation.test.ts
similarity index 97%
rename from packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
rename to packages/editor-ui/src/components/Node/NodeCreator/useKeyboardNavigation.test.ts
index b53190db39..d8d3b7f934 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/useKeyboardNavigation.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/useKeyboardNavigation.test.ts
@@ -1,6 +1,6 @@
 import userEvent from '@testing-library/user-event';
 import { defineComponent, computed } from 'vue';
-import { useKeyboardNavigation } from '../composables/useKeyboardNavigation';
+import { useKeyboardNavigation } from './composables/useKeyboardNavigation';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createPinia } from 'pinia';
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.test.ts
similarity index 95%
rename from packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts
rename to packages/editor-ui/src/components/Node/NodeCreator/utils.test.ts
index 6d8174dfaa..deabf36577 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/__tests__/utils.test.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.test.ts
@@ -1,6 +1,10 @@
 import type { SectionCreateElement } from '@/Interface';
-import { formatTriggerActionName, groupItemsInSections, sortNodeCreateElements } from '../utils';
-import { mockActionCreateElement, mockNodeCreateElement, mockSectionCreateElement } from './utils';
+import { formatTriggerActionName, groupItemsInSections, sortNodeCreateElements } from './utils';
+import {
+	mockActionCreateElement,
+	mockNodeCreateElement,
+	mockSectionCreateElement,
+} from './__tests__/utils';
 
 describe('NodeCreator - utils', () => {
 	describe('groupItemsInSections', () => {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
index ac1bc950e0..1f392b1cce 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/utils.ts
@@ -8,6 +8,7 @@ import type {
 } from '@/Interface';
 import {
 	AI_CATEGORY_AGENTS,
+	AI_CATEGORY_OTHER_TOOLS,
 	AI_SUBCATEGORY,
 	AI_TRANSFORM_NODE_TYPE,
 	CORE_NODES_CATEGORY,
@@ -169,6 +170,7 @@ export function groupItemsInSections(
 	result.sort((a, b) => {
 		if (a.key.toLowerCase().includes('recommended')) return -1;
 		if (b.key.toLowerCase().includes('recommended')) return 1;
+		if (b.key === AI_CATEGORY_OTHER_TOOLS) return -1;
 
 		return 0;
 	});
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
index 33d3626d7e..321a8a0adb 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
+++ b/packages/editor-ui/src/components/Node/NodeCreator/viewsData.ts
@@ -6,7 +6,7 @@ import {
 	EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
 	FORM_TRIGGER_NODE_TYPE,
 	MANUAL_TRIGGER_NODE_TYPE,
-	MANUAL_CHAT_TRIGGER_NODE_TYPE,
+	CHAT_TRIGGER_NODE_TYPE,
 	SCHEDULE_TRIGGER_NODE_TYPE,
 	REGULAR_NODE_CREATOR_VIEW,
 	TRANSFORM_DATA_SUBCATEGORY,
@@ -141,6 +141,11 @@ export function AIView(_nodes: SimplifiedNodeType[]): NodeView {
 	const chainNodes = getAiNodesBySubcategory(nodeTypesStore.allLatestNodeTypes, AI_CATEGORY_CHAINS);
 	const agentNodes = getAiNodesBySubcategory(nodeTypesStore.allLatestNodeTypes, AI_CATEGORY_AGENTS);
 
+	const websiteCategoryURLParams = templatesStore.websiteTemplateRepositoryParameters;
+	websiteCategoryURLParams.append('utm_user_role', 'AdvancedAI');
+	const websiteCategoryURL =
+		templatesStore.constructTemplateRepositoryURL(websiteCategoryURLParams);
+
 	return {
 		value: AI_NODE_CREATOR_VIEW,
 		title: i18n.baseText('nodeCreator.aiPanel.aiNodes'),
@@ -154,7 +159,7 @@ export function AIView(_nodes: SimplifiedNodeType[]): NodeView {
 					icon: 'box-open',
 					description: i18n.baseText('nodeCreator.aiPanel.linkItem.description'),
 					name: 'ai_templates_root',
-					url: templatesStore.getWebsiteCategoryURL(undefined, 'AdvancedAI'),
+					url: websiteCategoryURL,
 					tag: {
 						type: 'info',
 						text: i18n.baseText('nodeCreator.triggerHelperPanel.manualTriggerTag'),
@@ -401,14 +406,14 @@ export function TriggerView() {
 				},
 			},
 			{
-				key: MANUAL_CHAT_TRIGGER_NODE_TYPE,
+				key: CHAT_TRIGGER_NODE_TYPE,
 				type: 'node',
 				category: [CORE_NODES_CATEGORY],
 				properties: {
 					group: [],
-					name: MANUAL_CHAT_TRIGGER_NODE_TYPE,
-					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.manualChatTriggerDisplayName'),
-					description: i18n.baseText('nodeCreator.triggerHelperPanel.manualChatTriggerDescription'),
+					name: CHAT_TRIGGER_NODE_TYPE,
+					displayName: i18n.baseText('nodeCreator.triggerHelperPanel.chatTriggerDisplayName'),
+					description: i18n.baseText('nodeCreator.triggerHelperPanel.chatTriggerDescription'),
 					icon: 'fa:comments',
 				},
 			},
diff --git a/packages/editor-ui/src/components/NodeCredentials.test.ts b/packages/editor-ui/src/components/NodeCredentials.test.ts
new file mode 100644
index 0000000000..e9a461ebe2
--- /dev/null
+++ b/packages/editor-ui/src/components/NodeCredentials.test.ts
@@ -0,0 +1,259 @@
+import { describe, it } from 'vitest';
+import { screen } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { createTestingPinia } from '@pinia/testing';
+import NodeCredentials from './NodeCredentials.vue';
+import type { RenderOptions } from '@/__tests__/render';
+import { createComponentRenderer } from '@/__tests__/render';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { mockedStore } from '@/__tests__/utils';
+import type { INodeUi } from '@/Interface';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useUIStore } from '../stores/ui.store';
+
+const httpNode: INodeUi = {
+	parameters: {
+		curlImport: '',
+		method: 'GET',
+		url: '',
+		authentication: 'predefinedCredentialType',
+		nodeCredentialType: 'openAiApi',
+		provideSslCertificates: false,
+		sendQuery: false,
+		sendHeaders: false,
+		sendBody: false,
+		options: {},
+		infoMessage: '',
+	},
+	type: 'n8n-nodes-base.httpRequest',
+	typeVersion: 4.2,
+	position: [-200, -160],
+	id: '416988b5-e994-42c7-8576-6ef28a7619b2',
+	name: 'HTTP Request',
+	credentials: { openAiApi: { id: 'c8vqdPpPClh4TgIO', name: 'OpenAi account 2' } },
+	issues: { parameters: { url: ['Parameter "URL" is required.'] } },
+};
+
+const openAiNode: INodeUi = {
+	parameters: {
+		resource: 'text',
+		operation: 'message',
+		modelId: { __rl: true, mode: 'list', value: '' },
+		messages: { values: [{ content: '', role: 'user' }] },
+		simplify: true,
+		jsonOutput: false,
+		options: {},
+	},
+	type: '@n8n/n8n-nodes-langchain.openAi',
+	typeVersion: 1.8,
+	position: [440, 0],
+	id: '17241295-a277-4cdf-8c46-6c3f85b335e9',
+	name: 'OpenAI',
+	credentials: { openAiApi: { id: 'byDFnd7vN5GzMVD2', name: 'n8n free OpenAI API credits' } },
+	issues: { parameters: { modelId: ['Parameter "Model" is required.'] } },
+};
+
+describe('NodeCredentials', () => {
+	const defaultRenderOptions: RenderOptions = {
+		pinia: createTestingPinia(),
+		props: {
+			overrideCredType: 'openAiApi',
+			node: httpNode,
+			readonly: false,
+			showAll: false,
+			hideIssues: false,
+		},
+	};
+
+	const renderComponent = createComponentRenderer(NodeCredentials, defaultRenderOptions);
+
+	const credentialsStore = mockedStore(useCredentialsStore);
+	const ndvStore = mockedStore(useNDVStore);
+	const uiStore = mockedStore(useUIStore);
+
+	beforeAll(() => {
+		credentialsStore.state.credentialTypes = {
+			openAiApi: {
+				name: 'openAiApi',
+				displayName: 'OpenAi',
+				documentationUrl: 'openAi',
+				properties: [
+					{
+						displayName: 'API Key',
+						name: 'apiKey',
+						type: 'string',
+						typeOptions: { password: true },
+						required: true,
+						default: '',
+					},
+				],
+				authenticate: {
+					type: 'generic',
+					properties: {
+						headers: {
+							Authorization: '=Bearer {{$credentials.apiKey}}',
+							'OpenAI-Organization': '={{$credentials.organizationId}}',
+						},
+					},
+				},
+				test: { request: { baseURL: '={{$credentials?.url}}', url: '/models' } },
+				supportedNodes: ['openAi'],
+				iconUrl: {
+					light: 'icons/n8n-nodes-base/dist/nodes/OpenAi/openAi.svg',
+					dark: 'icons/n8n-nodes-base/dist/nodes/OpenAi/openAi.dark.svg',
+				},
+			},
+		};
+	});
+
+	it('should display available credentials in the dropdown', async () => {
+		ndvStore.activeNode = httpNode;
+		credentialsStore.state.credentials = {
+			c8vqdPpPClh4TgIO: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+		};
+
+		renderComponent();
+
+		const credentialsSelect = screen.getByTestId('node-credentials-select');
+
+		await userEvent.click(credentialsSelect);
+
+		expect(screen.queryByText('OpenAi account')).toBeInTheDocument();
+	});
+
+	it('should ignore managed credentials in the dropdown if active node is the HTTP node', async () => {
+		ndvStore.activeNode = httpNode;
+		credentialsStore.state.credentials = {
+			c8vqdPpPClh4TgIO: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+			SkXM3oUkQvvYS31c: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account 2',
+				type: 'openAiApi',
+				isManaged: true,
+				createdAt: '',
+				updatedAt: '',
+			},
+		};
+
+		renderComponent();
+
+		const credentialsSelect = screen.getByTestId('node-credentials-select');
+
+		await userEvent.click(credentialsSelect);
+
+		expect(screen.queryByText('OpenAi account')).toBeInTheDocument();
+		expect(screen.queryByText('OpenAi account 2')).not.toBeInTheDocument();
+	});
+
+	it('should not ignored managed credentials in the dropdown if active node is not the HTTP node', async () => {
+		ndvStore.activeNode = openAiNode;
+		credentialsStore.state.credentials = {
+			c8vqdPpPClh4TgIO: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+			SkXM3oUkQvvYS31c: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account 2',
+				type: 'openAiApi',
+				isManaged: true,
+				createdAt: '',
+				updatedAt: '',
+			},
+		};
+
+		renderComponent(
+			{
+				props: {
+					node: openAiNode,
+				},
+			},
+			{ merge: true },
+		);
+
+		const credentialsSelect = screen.getByTestId('node-credentials-select');
+
+		await userEvent.click(credentialsSelect);
+
+		expect(screen.queryByText('OpenAi account')).toBeInTheDocument();
+		expect(screen.queryByText('OpenAi account 2')).toBeInTheDocument();
+	});
+
+	it('should filter available credentials in the dropdown', async () => {
+		ndvStore.activeNode = httpNode;
+		credentialsStore.state.credentials = {
+			c8vqdPpPClh4TgIO: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+			test: {
+				id: 'test',
+				name: 'Test OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+		};
+
+		renderComponent();
+
+		const credentialsSelect = screen.getByTestId('node-credentials-select');
+
+		await userEvent.click(credentialsSelect);
+
+		expect(screen.queryByText('OpenAi account')).toBeInTheDocument();
+		expect(screen.queryByText('Test OpenAi account')).toBeInTheDocument();
+
+		const credentialSearch = credentialsSelect.querySelector('input') as HTMLElement;
+		await userEvent.type(credentialSearch, 'test');
+
+		expect(screen.queryByText('OpenAi account')).not.toBeInTheDocument();
+		expect(screen.queryByText('Test OpenAi account')).toBeInTheDocument();
+	});
+
+	it('should open the new credential modal when clicked', async () => {
+		ndvStore.activeNode = httpNode;
+		credentialsStore.state.credentials = {
+			c8vqdPpPClh4TgIO: {
+				id: 'c8vqdPpPClh4TgIO',
+				name: 'OpenAi account',
+				type: 'openAiApi',
+				isManaged: false,
+				createdAt: '',
+				updatedAt: '',
+			},
+		};
+
+		renderComponent();
+
+		const credentialsSelect = screen.getByTestId('node-credentials-select');
+
+		await userEvent.click(credentialsSelect);
+		await userEvent.click(screen.getByTestId('node-credentials-select-item-new'));
+
+		expect(uiStore.openNewCredential).toHaveBeenCalledWith('openAiApi', true);
+	});
+});
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 34657284c3..22e4c908af 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import type { ICredentialsResponse, INodeUi, INodeUpdatePropertiesInformation } from '@/Interface';
-import type {
-	INodeCredentialDescription,
-	INodeCredentialsDetails,
-	NodeParameterValueType,
+import {
+	HTTP_REQUEST_NODE_TYPE,
+	type ICredentialType,
+	type INodeCredentialDescription,
+	type INodeCredentialsDetails,
+	type NodeParameterValueType,
 } from 'n8n-workflow';
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useToast } from '@/composables/useToast';
@@ -30,6 +32,7 @@ import {
 	updateNodeAuthType,
 } from '@/utils/nodeTypesUtils';
 import {
+	N8nIcon,
 	N8nInput,
 	N8nInputLabel,
 	N8nOption,
@@ -37,6 +40,7 @@ import {
 	N8nText,
 	N8nTooltip,
 } from 'n8n-design-system';
+import { isEmpty } from '@/utils/typesUtils';
 
 interface CredentialDropdownOption extends ICredentialsResponse {
 	typeDisplayName: string;
@@ -65,7 +69,7 @@ const emit = defineEmits<{
 
 const telemetry = useTelemetry();
 const i18n = useI18n();
-const NEW_CREDENTIALS_TEXT = `- ${i18n.baseText('nodeCredentials.createNew')} -`;
+const NEW_CREDENTIALS_TEXT = i18n.baseText('nodeCredentials.createNew');
 
 const credentialsStore = useCredentialsStore();
 const nodeTypesStore = useNodeTypesStore();
@@ -74,11 +78,12 @@ const uiStore = useUIStore();
 const workflowsStore = useWorkflowsStore();
 
 const nodeHelpers = useNodeHelpers();
-
 const toast = useToast();
 
 const subscribedToCredentialType = ref('');
+const filter = ref('');
 const listeningForAuthChange = ref(false);
+const selectRefs = ref<Array<InstanceType<typeof N8nSelect>>>([]);
 
 const credentialTypesNode = computed(() =>
 	credentialTypesNodeDescription.value.map(
@@ -87,9 +92,9 @@ const credentialTypesNode = computed(() =>
 );
 
 const credentialTypesNodeDescriptionDisplayed = computed(() =>
-	credentialTypesNodeDescription.value.filter((credentialTypeDescription) =>
-		displayCredentials(credentialTypeDescription),
-	),
+	credentialTypesNodeDescription.value
+		.filter((credentialTypeDescription) => displayCredentials(credentialTypeDescription))
+		.map((type) => ({ type, options: getCredentialOptions(getAllRelatedCredentialTypes(type)) })),
 );
 const credentialTypesNodeDescription = computed(() => {
 	if (typeof props.overrideCredType !== 'string') return [];
@@ -149,6 +154,27 @@ watch(
 	{ immediate: true, deep: true },
 );
 
+// Select most recent credential by default
+watch(
+	credentialTypesNodeDescriptionDisplayed,
+	(types) => {
+		if (types.length === 0 || !isEmpty(selected.value)) return;
+
+		const allOptions = types.map((type) => type.options).flat();
+
+		if (allOptions.length === 0) return;
+
+		const mostRecentCredential = allOptions.reduce(
+			(mostRecent, current) =>
+				mostRecent && mostRecent.updatedAt > current.updatedAt ? mostRecent : current,
+			allOptions[0],
+		);
+
+		onCredentialSelected(mostRecentCredential.type, mostRecentCredential.id);
+	},
+	{ immediate: true },
+);
+
 onMounted(() => {
 	credentialsStore.$onAction(({ name, after, args }) => {
 		const listeningForActions = ['createNewCredential', 'updateCredential', 'deleteCredential'];
@@ -239,6 +265,11 @@ function getCredentialOptions(types: string[]): CredentialDropdownOption[] {
 			),
 		);
 	});
+
+	if (ndvStore.activeNode?.type === HTTP_REQUEST_NODE_TYPE) {
+		options = options.filter((option) => !option.isManaged);
+	}
+
 	return options;
 }
 
@@ -317,9 +348,8 @@ function onCredentialSelected(
 	credentialId: string | null | undefined,
 	showAuthOptions = false,
 ) {
-	const newCredentialOptionSelected = credentialId === NEW_CREDENTIALS_TEXT;
-	if (!credentialId || newCredentialOptionSelected) {
-		createNewCredential(credentialType, newCredentialOptionSelected, showAuthOptions);
+	if (!credentialId) {
+		createNewCredential(credentialType, false, showAuthOptions);
 		return;
 	}
 
@@ -474,6 +504,20 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 	}
 	return i18n.baseText('nodeCredentials.credentialsLabel');
 }
+
+function setFilter(newFilter = '') {
+	filter.value = newFilter;
+}
+
+function matches(needle: string, haystack: string) {
+	return haystack.toLocaleLowerCase().includes(needle);
+}
+
+async function onClickCreateCredential(type: ICredentialType | INodeCredentialDescription) {
+	selectRefs.value.forEach((select) => select.blur());
+	await nextTick();
+	createNewCredential(type.name, true, showMixedCredentials(type));
+}
 </script>
 
 <template>
@@ -481,12 +525,9 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 		v-if="credentialTypesNodeDescriptionDisplayed.length"
 		:class="['node-credentials', $style.container]"
 	>
-		<div
-			v-for="credentialTypeDescription in credentialTypesNodeDescriptionDisplayed"
-			:key="credentialTypeDescription.name"
-		>
+		<div v-for="{ type, options } in credentialTypesNodeDescriptionDisplayed" :key="type.name">
 			<N8nInputLabel
-				:label="getCredentialsFieldLabel(credentialTypeDescription)"
+				:label="getCredentialsFieldLabel(type)"
 				:bold="false"
 				size="small"
 				color="text-dark"
@@ -494,7 +535,7 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 			>
 				<div v-if="readonly">
 					<N8nInput
-						:model-value="getSelectedName(credentialTypeDescription.name)"
+						:model-value="getSelectedName(type.name)"
 						disabled
 						size="small"
 						data-test-id="node-credentials-select"
@@ -502,36 +543,24 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 				</div>
 				<div
 					v-else
-					:class="
-						getIssues(credentialTypeDescription.name).length && !hideIssues
-							? $style.hasIssues
-							: $style.input
-					"
+					:class="getIssues(type.name).length && !hideIssues ? $style.hasIssues : $style.input"
 					data-test-id="node-credentials-select"
 				>
 					<N8nSelect
-						:model-value="getSelectedId(credentialTypeDescription.name)"
-						:placeholder="
-							getSelectPlaceholder(
-								credentialTypeDescription.name,
-								getIssues(credentialTypeDescription.name),
-							)
-						"
+						ref="selectRefs"
+						:model-value="getSelectedId(type.name)"
+						:placeholder="getSelectPlaceholder(type.name, getIssues(type.name))"
 						size="small"
+						filterable
+						:filter-method="setFilter"
+						:popper-class="$style.selectPopper"
 						@update:model-value="
-							(value: string) =>
-								onCredentialSelected(
-									credentialTypeDescription.name,
-									value,
-									showMixedCredentials(credentialTypeDescription),
-								)
+							(value: string) => onCredentialSelected(type.name, value, showMixedCredentials(type))
 						"
 						@blur="emit('blur', 'credentials')"
 					>
 						<N8nOption
-							v-for="item in getCredentialOptions(
-								getAllRelatedCredentialTypes(credentialTypeDescription),
-							)"
+							v-for="item in options.filter((o) => matches(filter, o.name))"
 							:key="item.id"
 							:data-test-id="`node-credentials-select-item-${item.id}`"
 							:label="item.name"
@@ -542,43 +571,41 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 								<N8nText size="small">{{ item.typeDisplayName }}</N8nText>
 							</div>
 						</N8nOption>
-						<N8nOption
-							:key="NEW_CREDENTIALS_TEXT"
-							data-test-id="node-credentials-select-item-new"
-							:value="NEW_CREDENTIALS_TEXT"
-							:label="NEW_CREDENTIALS_TEXT"
-						>
-						</N8nOption>
+						<template #empty> </template>
+						<template #footer>
+							<div
+								data-test-id="node-credentials-select-item-new"
+								:class="['clickable', $style.newCredential]"
+								@click="onClickCreateCredential(type)"
+							>
+								<N8nIcon size="xsmall" icon="plus" />
+								<N8nText bold>{{ NEW_CREDENTIALS_TEXT }}</N8nText>
+							</div>
+						</template>
 					</N8nSelect>
 
-					<div
-						v-if="getIssues(credentialTypeDescription.name).length && !hideIssues"
-						:class="$style.warning"
-					>
+					<div v-if="getIssues(type.name).length && !hideIssues" :class="$style.warning">
 						<N8nTooltip placement="top">
 							<template #content>
 								<TitledList
-									:title="`${$locale.baseText('nodeCredentials.issues')}:`"
-									:items="getIssues(credentialTypeDescription.name)"
+									:title="`${i18n.baseText('nodeCredentials.issues')}:`"
+									:items="getIssues(type.name)"
 								/>
 							</template>
-							<font-awesome-icon icon="exclamation-triangle" />
+							<N8nIcon icon="exclamation-triangle" />
 						</N8nTooltip>
 					</div>
 
 					<div
-						v-if="
-							selected[credentialTypeDescription.name] &&
-							isCredentialExisting(credentialTypeDescription.name)
-						"
+						v-if="selected[type.name] && isCredentialExisting(type.name)"
 						:class="$style.edit"
 						data-test-id="credential-edit-button"
 					>
-						<font-awesome-icon
+						<N8nIcon
 							icon="pen"
 							class="clickable"
-							:title="$locale.baseText('nodeCredentials.updateCredential')"
-							@click="editCredential(credentialTypeDescription.name)"
+							:title="i18n.baseText('nodeCredentials.updateCredential')"
+							@click="editCredential(type.name)"
 						/>
 					</div>
 				</div>
@@ -596,10 +623,25 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 	}
 }
 
+.selectPopper {
+	:global(.el-select-dropdown__list) {
+		padding: 0;
+	}
+
+	:has(.newCredential:hover) :global(.hover) {
+		background-color: transparent;
+	}
+
+	&:not(:has(li)) .newCredential {
+		border-top: none;
+		box-shadow: none;
+		border-radius: var(--border-radius-base);
+	}
+}
+
 .warning {
-	min-width: 20px;
-	margin-left: 5px;
-	color: #ff8080;
+	margin-left: var(--spacing-4xs);
+	color: var(--color-danger-light);
 	font-size: var(--font-size-s);
 }
 
@@ -608,8 +650,7 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 	justify-content: center;
 	align-items: center;
 	color: var(--color-text-base);
-	min-width: 20px;
-	margin-left: 5px;
+	margin-left: var(--spacing-3xs);
 	font-size: var(--font-size-s);
 }
 
@@ -627,4 +668,21 @@ function getCredentialsFieldLabel(credentialType: INodeCredentialDescription): s
 	display: flex;
 	flex-direction: column;
 }
+
+.newCredential {
+	display: flex;
+	gap: var(--spacing-3xs);
+	align-items: center;
+	font-weight: var(--font-weight-bold);
+	padding: var(--spacing-xs) var(--spacing-m);
+	background-color: var(--color-background-light);
+
+	border-top: var(--border-base);
+	box-shadow: var(--box-shadow-light);
+	clip-path: inset(-12px 0 0 0); // Only show box shadow on top
+
+	&:hover {
+		color: var(--color-primary);
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts b/packages/editor-ui/src/components/NodeDetailsView.test.ts
similarity index 94%
rename from packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts
rename to packages/editor-ui/src/components/NodeDetailsView.test.ts
index 65caf45cc9..fe7ec2ce31 100644
--- a/packages/editor-ui/src/components/__tests__/NodeDetailsView.test.ts
+++ b/packages/editor-ui/src/components/NodeDetailsView.test.ts
@@ -16,6 +16,14 @@ import { setupServer } from '@/__tests__/server';
 import { defaultNodeDescriptions, mockNodes } from '@/__tests__/mocks';
 import { cleanupAppModals, createAppModals } from '@/__tests__/utils';
 
+vi.mock('vue-router', () => {
+	return {
+		useRouter: () => ({}),
+		useRoute: () => ({ meta: {} }),
+		RouterLink: vi.fn(),
+	};
+});
+
 async function createPiniaWithActiveNode() {
 	const node = mockNodes[0];
 	const workflow = mock<IWorkflowDb>({
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index 8294ff2f24..212fc4c91e 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -154,6 +154,29 @@ const parentNode = computed(() => {
 });
 
 const inputNodeName = computed<string | undefined>(() => {
+	const nodeOutputs =
+		activeNode.value && activeNodeType.value
+			? NodeHelpers.getNodeOutputs(props.workflowObject, activeNode.value, activeNodeType.value)
+			: [];
+
+	const nonMainOutputs = nodeOutputs.filter((output) => {
+		if (typeof output === 'string') return output !== NodeConnectionType.Main;
+
+		return output.type !== NodeConnectionType.Main;
+	});
+
+	const isSubNode = nonMainOutputs.length > 0;
+
+	if (isSubNode && activeNode.value) {
+		// For sub-nodes, we need to get their connected output node to determine the input
+		// because sub-nodes use specialized outputs (e.g. NodeConnectionType.AiTool)
+		// instead of the standard Main output type
+		const connectedOutputNode = props.workflowObject.getChildNodes(
+			activeNode.value.name,
+			'ALL_NON_MAIN',
+		)?.[0];
+		return connectedOutputNode;
+	}
 	return selectedInput.value || parentNode.value;
 });
 
@@ -364,7 +387,7 @@ const onWorkflowActivate = () => {
 	}, 1000);
 };
 
-const onOutputItemHover = (e: { itemIndex: number; outputIndex: number }) => {
+const onOutputItemHover = (e: { itemIndex: number; outputIndex: number } | null) => {
 	if (e === null || !activeNode.value || !isPairedItemHoveringEnabled.value) {
 		ndvStore.setHoveringItem(null);
 		return;
@@ -680,13 +703,13 @@ onBeforeUnmount(() => {
 		>
 			<template #content>
 				<div :class="$style.triggerWarning">
-					{{ $locale.baseText('ndv.backToCanvas.waitingForTriggerWarning') }}
+					{{ i18n.baseText('ndv.backToCanvas.waitingForTriggerWarning') }}
 				</div>
 			</template>
 			<div :class="$style.backToCanvas" data-test-id="back-to-canvas" @click="close">
 				<n8n-icon icon="arrow-left" color="text-xlight" size="medium" />
 				<n8n-text color="text-xlight" size="medium" :bold="true">
-					{{ $locale.baseText('ndv.backToCanvas') }}
+					{{ i18n.baseText('ndv.backToCanvas') }}
 				</n8n-text>
 			</div>
 		</n8n-tooltip>
@@ -793,7 +816,7 @@ onBeforeUnmount(() => {
 						@click="onFeatureRequestClick"
 					>
 						<font-awesome-icon icon="lightbulb" />
-						{{ $locale.baseText('ndv.featureRequest') }}
+						{{ i18n.baseText('ndv.featureRequest') }}
 					</a>
 				</template>
 			</NDVDraggablePanels>
diff --git a/packages/editor-ui/src/components/NodeExecuteButton.vue b/packages/editor-ui/src/components/NodeExecuteButton.vue
index bfd6e0e38d..b46c6b0a43 100644
--- a/packages/editor-ui/src/components/NodeExecuteButton.vue
+++ b/packages/editor-ui/src/components/NodeExecuteButton.vue
@@ -7,7 +7,12 @@ import {
 	FORM_TRIGGER_NODE_TYPE,
 	CHAT_TRIGGER_NODE_TYPE,
 } from '@/constants';
-import type { INodeTypeDescription } from 'n8n-workflow';
+import {
+	AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT,
+	AI_TRANSFORM_JS_CODE,
+	AI_TRANSFORM_NODE_TYPE,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
@@ -21,6 +26,8 @@ import { useUIStore } from '@/stores/ui.store';
 import { useRouter } from 'vue-router';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { type IUpdateInformation } from '../Interface';
+import { generateCodeForAiTransform } from '@/components/ButtonParameter/utils';
 
 const NODE_TEST_STEP_POPUP_COUNT_KEY = 'N8N_NODE_TEST_STEP_POPUP_COUNT';
 const MAX_POPUP_COUNT = 10;
@@ -47,6 +54,7 @@ const props = withDefaults(
 const emit = defineEmits<{
 	stopExecution: [];
 	execute: [];
+	valueChanged: [value: IUpdateInformation];
 }>();
 
 defineOptions({
@@ -54,9 +62,10 @@ defineOptions({
 });
 
 const lastPopupCountUpdate = ref(0);
+const codeGenerationInProgress = ref(false);
 
 const router = useRouter();
-const { runWorkflow, runWorkflowResolvePending, stopCurrentExecution } = useRunWorkflow({ router });
+const { runWorkflow, stopCurrentExecution } = useRunWorkflow({ router });
 
 const workflowsStore = useWorkflowsStore();
 const externalHooks = useExternalHooks();
@@ -76,7 +85,7 @@ const nodeType = computed((): INodeTypeDescription | null => {
 });
 
 const isNodeRunning = computed(() => {
-	if (!uiStore.isActionActive['workflowRunning']) return false;
+	if (!uiStore.isActionActive['workflowRunning'] || codeGenerationInProgress.value) return false;
 	const triggeredNode = workflowsStore.executedNode;
 	return (
 		workflowsStore.isNodeExecuting(node.value?.name ?? '') || triggeredNode === node.value?.name
@@ -142,6 +151,10 @@ const disabledHint = computed(() => {
 		return '';
 	}
 
+	if (codeGenerationInProgress.value) {
+		return i18n.baseText('ndv.execute.generatingCode');
+	}
+
 	if (isTriggerNode.value && node?.value?.disabled) {
 		return i18n.baseText('ndv.execute.nodeIsDisabled');
 	}
@@ -163,6 +176,9 @@ const disabledHint = computed(() => {
 });
 
 const tooltipText = computed(() => {
+	if (shouldGenerateCode.value) {
+		return i18n.baseText('ndv.execute.generateCodeAndTestNode.description');
+	}
 	if (disabledHint.value) return disabledHint.value;
 	if (props.tooltip && !isLoading.value && testStepButtonPopupCount() < MAX_POPUP_COUNT) {
 		return props.tooltip;
@@ -199,9 +215,37 @@ const buttonLabel = computed(() => {
 });
 
 const isLoading = computed(
-	() => isNodeRunning.value && !isListeningForEvents.value && !isListeningForWorkflowEvents.value,
+	() =>
+		codeGenerationInProgress.value ||
+		(isNodeRunning.value && !isListeningForEvents.value && !isListeningForWorkflowEvents.value),
 );
 
+const buttonIcon = computed(() => {
+	if (shouldGenerateCode.value) return 'terminal';
+	if (!isListeningForEvents.value && !props.hideIcon) return 'flask';
+	return undefined;
+});
+
+const shouldGenerateCode = computed(() => {
+	if (node.value?.type !== AI_TRANSFORM_NODE_TYPE) {
+		return false;
+	}
+	if (!node.value?.parameters?.instructions) {
+		return false;
+	}
+	if (!node.value?.parameters?.jsCode) {
+		return true;
+	}
+	if (
+		node.value?.parameters[AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT] &&
+		(node.value?.parameters?.instructions as string).trim() !==
+			(node.value?.parameters?.[AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT] as string).trim()
+	) {
+		return true;
+	}
+	return false;
+});
+
 async function stopWaitingForWebhook() {
 	try {
 		await workflowsStore.removeTestWebhook(workflowsStore.workflowId);
@@ -227,7 +271,53 @@ function onMouseOver() {
 }
 
 async function onClick() {
-	if (isChatNode.value || (isChatChild.value && ndvStore.isNDVDataEmpty('input'))) {
+	if (shouldGenerateCode.value) {
+		// Generate code if user hasn't clicked 'Generate Code' button
+		// and update parameters
+		codeGenerationInProgress.value = true;
+		try {
+			toast.showMessage({
+				title: i18n.baseText('ndv.execute.generateCode.title'),
+				message: i18n.baseText('ndv.execute.generateCode.message', {
+					interpolate: { nodeName: node.value?.name as string },
+				}),
+				type: 'success',
+			});
+			const prompt = node.value?.parameters?.instructions as string;
+			const updateInformation = await generateCodeForAiTransform(
+				prompt,
+				`parameters.${AI_TRANSFORM_JS_CODE}`,
+				5,
+			);
+			if (!updateInformation) return;
+
+			emit('valueChanged', updateInformation);
+
+			emit('valueChanged', {
+				name: `parameters.${AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT}`,
+				value: prompt,
+			});
+
+			useTelemetry().trackAiTransform('generationFinished', {
+				prompt,
+				code: updateInformation.value,
+			});
+		} catch (error) {
+			useTelemetry().trackAiTransform('generationFinished', {
+				prompt,
+				code: '',
+				hasError: true,
+			});
+			toast.showMessage({
+				type: 'error',
+				title: i18n.baseText('codeNodeEditor.askAi.generationFailed'),
+				message: error.message,
+			});
+		}
+		codeGenerationInProgress.value = false;
+	}
+
+	if (isChatNode.value || (isChatChild.value && ndvStore.isInputPanelEmpty)) {
 		ndvStore.setActiveNodeName(null);
 		nodeViewEventBus.emit('openChat');
 	} else if (isListeningForEvents.value) {
@@ -264,17 +354,10 @@ async function onClick() {
 			telemetry.track('User clicked execute node button', telemetryPayload);
 			await externalHooks.run('nodeExecuteButton.onClick', telemetryPayload);
 
-			if (workflowsStore.isWaitingExecution) {
-				await runWorkflowResolvePending({
-					destinationNode: props.nodeName,
-					source: 'RunData.ExecuteNodeButton',
-				});
-			} else {
-				await runWorkflow({
-					destinationNode: props.nodeName,
-					source: 'RunData.ExecuteNodeButton',
-				});
-			}
+			await runWorkflow({
+				destinationNode: props.nodeName,
+				source: 'RunData.ExecuteNodeButton',
+			});
 
 			emit('execute');
 		}
@@ -296,7 +379,7 @@ async function onClick() {
 					:label="buttonLabel"
 					:type="type"
 					:size="size"
-					:icon="!isListeningForEvents && !hideIcon ? 'flask' : undefined"
+					:icon="buttonIcon"
 					:transparent-background="transparent"
 					:title="
 						!isTriggerNode && !tooltipText ? i18n.baseText('ndv.execute.testNode.description') : ''
diff --git a/packages/editor-ui/src/components/NodeExecutionErrorMessage.test.ts b/packages/editor-ui/src/components/NodeExecutionErrorMessage.test.ts
new file mode 100644
index 0000000000..3bc51a18e9
--- /dev/null
+++ b/packages/editor-ui/src/components/NodeExecutionErrorMessage.test.ts
@@ -0,0 +1,91 @@
+import { describe, it, expect } from 'vitest';
+import NodeExecutionErrorMessage from '@/components/NodeExecutionErrorMessage.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+
+const renderComponent = createComponentRenderer(NodeExecutionErrorMessage);
+
+describe('NodeExecutionErrorMessage', () => {
+	it('renders the component', () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				nodeName: 'Test Node',
+				errorMessage: 'An error occurred',
+			},
+		});
+		expect(getByTestId('sanitized-error-message')).toHaveTextContent('An error occurred');
+	});
+
+	it('renders sanitized HTML in error message', () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				nodeName: 'Test Node',
+				errorMessage:
+					'Insufficient quota detected. <a href="https://docs.n8n.io/" target="_blank">Learn more</a>',
+			},
+		});
+		expect(getByTestId('sanitized-error-message')).toContainHTML(
+			'Insufficient quota detected. <a href="https://docs.n8n.io/" target="_blank">Learn more</a>',
+		);
+	});
+
+	it('renders the link with the correct text', () => {
+		const { getByText } = renderComponent({
+			props: {
+				nodeName: 'Test Node',
+				errorMessage: 'An error occurred',
+			},
+		});
+		expect(getByText('Open node')).toBeTruthy();
+	});
+
+	it('renders the link with the correct data attributes', () => {
+		const { getByText } = renderComponent({
+			props: {
+				nodeName: 'Test Node',
+				errorMessage: 'An error occurred',
+			},
+		});
+		const link = getByText('Open node');
+		expect(link.getAttribute('data-action')).toBe('openNodeDetail');
+		expect(link.getAttribute('data-action-parameter-node')).toBe('Test Node');
+	});
+
+	it('does not render error message when it is not provided', () => {
+		const { queryByText } = renderComponent({
+			props: {
+				nodeName: 'Test Node',
+			},
+		});
+		expect(queryByText('An error occurred')).not.toBeInTheDocument();
+	});
+
+	it('sanitizes malicious script in error message', () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				nodeName: 'Test Node',
+				errorMessage: '<img src=x onerror=alert(1)>',
+			},
+		});
+		expect(getByTestId('sanitized-error-message')).toContainHTML('<img src="x">');
+	});
+
+	it('sanitizes malicious script in error message with nested tags', () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				nodeName: 'Test Node',
+				errorMessage: '<div><img src=x onerror=alert(1)></div>',
+			},
+		});
+		expect(getByTestId('sanitized-error-message')).toContainHTML('<div><img src="x"></div>');
+	});
+
+	it('sanitizes malicious script in error message with script tag', () => {
+		const { container } = renderComponent({
+			props: {
+				nodeName: 'Test Node',
+				errorMessage: '<script>alert(1)</script>',
+			},
+		});
+		expect(container.querySelector('script')).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/NodeExecutionErrorMessage.vue b/packages/editor-ui/src/components/NodeExecutionErrorMessage.vue
index 5786495df4..26db3153ec 100644
--- a/packages/editor-ui/src/components/NodeExecutionErrorMessage.vue
+++ b/packages/editor-ui/src/components/NodeExecutionErrorMessage.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { useI18n } from '@/composables/useI18n';
+
 const i18n = useI18n();
 
 defineProps<{
@@ -10,7 +11,8 @@ defineProps<{
 
 <template>
 	<div>
-		{{ errorMessage }}<br />
+		<span v-n8n-html="errorMessage" data-test-id="sanitized-error-message"></span>
+		<br />
 		<a data-action="openNodeDetail" :data-action-parameter-node="nodeName">{{
 			i18n.baseText('node.executionError.openNode')
 		}}</a>
diff --git a/packages/editor-ui/src/components/NodeIcon.vue b/packages/editor-ui/src/components/NodeIcon.vue
index 45b57fd323..62631cca4a 100644
--- a/packages/editor-ui/src/components/NodeIcon.vue
+++ b/packages/editor-ui/src/components/NodeIcon.vue
@@ -122,7 +122,7 @@ const badge = computed(() => {
 		:disabled="disabled"
 		:size="size"
 		:circle="circle"
-		:node-type-name="nodeName ?? nodeType?.displayName ?? ''"
+		:node-type-name="nodeName ? nodeName : nodeType?.displayName"
 		:show-tooltip="showTooltip"
 		:tooltip-position="tooltipPosition"
 		:badge="badge"
diff --git a/packages/editor-ui/src/components/NodeList.vue b/packages/editor-ui/src/components/NodeList.vue
index 8e93ecbe5a..69553cae50 100644
--- a/packages/editor-ui/src/components/NodeList.vue
+++ b/packages/editor-ui/src/components/NodeList.vue
@@ -1,48 +1,40 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script setup lang="ts">
+import { computed } from 'vue';
 import NodeIcon from '@/components/NodeIcon.vue';
 import type { ITemplatesNode } from '@/Interface';
 import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
 
-export default defineComponent({
-	name: 'NodeList',
-	components: {
-		NodeIcon,
-	},
-	props: {
-		nodes: {
-			type: Array,
-		},
-		limit: {
-			type: Number,
-			default: 4,
-		},
-		size: {
-			type: String,
-			default: 'sm',
-		},
-	},
-	computed: {
-		filteredCoreNodes() {
-			return filterTemplateNodes(this.nodes as ITemplatesNode[]);
-		},
-		hiddenNodes(): number {
-			return this.filteredCoreNodes.length - this.countNodesToBeSliced(this.filteredCoreNodes);
-		},
-		slicedNodes(): ITemplatesNode[] {
-			return this.filteredCoreNodes.slice(0, this.countNodesToBeSliced(this.filteredCoreNodes));
-		},
-	},
-	methods: {
-		countNodesToBeSliced(nodes: ITemplatesNode[]): number {
-			if (nodes.length > this.limit) {
-				return this.limit - 1;
-			} else {
-				return this.limit;
-			}
-		},
+const props = withDefaults(
+	defineProps<{
+		nodes: ITemplatesNode[];
+		limit?: number;
+		size?: string;
+	}>(),
+	{
+		limit: 4,
+		size: 'sm',
 	},
+);
+
+const filteredCoreNodes = computed(() => {
+	return filterTemplateNodes(props.nodes);
 });
+
+const hiddenNodes = computed(() => {
+	return filteredCoreNodes.value.length - countNodesToBeSliced(filteredCoreNodes.value);
+});
+
+const slicedNodes = computed(() => {
+	return filteredCoreNodes.value.slice(0, countNodesToBeSliced(filteredCoreNodes.value));
+});
+
+const countNodesToBeSliced = (nodes: ITemplatesNode[]): number => {
+	if (nodes.length > props.limit) {
+		return props.limit - 1;
+	} else {
+		return props.limit;
+	}
+};
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 6ae5412b94..49cb19ca71 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -22,11 +22,7 @@ import type {
 	IUpdateInformation,
 } from '@/Interface';
 
-import {
-	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
-	CUSTOM_NODES_DOCS_URL,
-	SHOULD_CLEAR_NODE_OUTPUTS,
-} from '@/constants';
+import { COMMUNITY_NODES_INSTALLATION_DOCS_URL, CUSTOM_NODES_DOCS_URL } from '@/constants';
 
 import NodeTitle from '@/components/NodeTitle.vue';
 import ParameterInputList from '@/components/ParameterInputList.vue';
@@ -47,11 +43,12 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import type { EventBus } from 'n8n-design-system';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
-import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { importCurlEventBus, ndvEventBus } from '@/event-bus';
 import { ProjectTypes } from '@/types/projects.types';
+import { updateDynamicConnections } from '@/utils/nodeSettingsUtils';
+import FreeAiCreditsCallout from '@/components/FreeAiCreditsCallout.vue';
 
 const props = withDefaults(
 	defineProps<{
@@ -94,7 +91,6 @@ const telemetry = useTelemetry();
 const nodeHelpers = useNodeHelpers();
 const externalHooks = useExternalHooks();
 const i18n = useI18n();
-const { showMessage } = useToast();
 
 const nodeValid = ref(true);
 const openPanel = ref<'params' | 'settings'>('params');
@@ -124,7 +120,7 @@ const currentWorkflow = computed(() =>
 );
 const hasForeignCredential = computed(() => props.foreignCredentials.length > 0);
 const isHomeProjectTeam = computed(
-	() => currentWorkflow.value.homeProject?.type === ProjectTypes.Team,
+	() => currentWorkflow.value?.homeProject?.type === ProjectTypes.Team,
 );
 const isReadOnly = computed(
 	() => props.readOnly || (hasForeignCredential.value && !isHomeProjectTeam.value),
@@ -167,7 +163,7 @@ const executeButtonTooltip = computed(() => {
 		node.value &&
 		isLatestNodeVersion.value &&
 		props.inputSize > 1 &&
-		!NodeHelpers.isSingleExecution(node.value.type, node.value.parameters)
+		!nodeHelpers.isSingleExecution(node.value.type, node.value.parameters)
 	) {
 		return i18n.baseText('nodeSettings.executeButtonTooltip.times', {
 			interpolate: { inputSize: props.inputSize },
@@ -483,20 +479,6 @@ const valueChanged = (parameterData: IUpdateInformation) => {
 			return;
 		}
 
-		if (
-			parameterData.type &&
-			workflowsStore.nodeHasOutputConnection(_node.name) &&
-			SHOULD_CLEAR_NODE_OUTPUTS[nodeType.name]?.eventTypes.includes(parameterData.type) &&
-			SHOULD_CLEAR_NODE_OUTPUTS[nodeType.name]?.parameterPaths.includes(parameterData.name)
-		) {
-			workflowsStore.removeAllNodeConnection(_node, { preserveInputConnections: true });
-			showMessage({
-				type: 'warning',
-				title: i18n.baseText('nodeSettings.outputCleared.title'),
-				message: i18n.baseText('nodeSettings.outputCleared.message'),
-			});
-		}
-
 		// Get only the parameters which are different to the defaults
 		let nodeParameters = NodeHelpers.getNodeParameters(
 			nodeType.properties,
@@ -566,6 +548,14 @@ const valueChanged = (parameterData: IUpdateInformation) => {
 			value: nodeParameters,
 		};
 
+		const connections = workflowsStore.allConnections;
+
+		const updatedConnections = updateDynamicConnections(_node, connections, parameterData);
+
+		if (updatedConnections) {
+			workflowsStore.setConnections(updatedConnections, true);
+		}
+
 		workflowsStore.setNodeParameters(updateInformation);
 
 		void externalHooks.run('nodeSettings.valueChanged', {
@@ -974,6 +964,7 @@ onBeforeUnmount(() => {
 						telemetry-source="parameters"
 						@execute="onNodeExecute"
 						@stop-execution="onStopExecution"
+						@value-changed="valueChanged"
 					/>
 				</div>
 			</div>
@@ -991,7 +982,7 @@ onBeforeUnmount(() => {
 			</p>
 			<div class="missingNodeTitleContainer mt-s mb-xs">
 				<n8n-text size="large" color="text-dark" bold>
-					{{ $locale.baseText('nodeSettings.communityNodeUnknown.title') }}
+					{{ i18n.baseText('nodeSettings.communityNodeUnknown.title') }}
 				</n8n-text>
 			</div>
 			<div v-if="isCommunityNode" :class="$style.descriptionContainer">
@@ -1014,7 +1005,7 @@ onBeforeUnmount(() => {
 					:to="COMMUNITY_NODES_INSTALLATION_DOCS_URL"
 					@click="onMissingNodeLearnMoreLinkClick"
 				>
-					{{ $locale.baseText('nodeSettings.communityNodeUnknown.installLink.text') }}
+					{{ i18n.baseText('nodeSettings.communityNodeUnknown.installLink.text') }}
 				</n8n-link>
 			</div>
 			<i18n-t v-else keypath="nodeSettings.nodeTypeUnknown.description" tag="span">
@@ -1022,7 +1013,7 @@ onBeforeUnmount(() => {
 					<a
 						:href="CUSTOM_NODES_DOCS_URL"
 						target="_blank"
-						v-text="$locale.baseText('nodeSettings.nodeTypeUnknown.description.customNode')"
+						v-text="i18n.baseText('nodeSettings.nodeTypeUnknown.description.customNode')"
 					/>
 				</template>
 			</i18n-t>
@@ -1031,11 +1022,12 @@ onBeforeUnmount(() => {
 			<n8n-notice
 				v-if="hasForeignCredential && !isHomeProjectTeam"
 				:content="
-					$locale.baseText('nodeSettings.hasForeignCredential', {
+					i18n.baseText('nodeSettings.hasForeignCredential', {
 						interpolate: { owner: credentialOwnerName },
 					})
 				"
 			/>
+			<FreeAiCreditsCallout />
 			<div v-show="openPanel === 'params'">
 				<NodeWebhooks :node="node" :node-type-description="nodeType" />
 
@@ -1063,7 +1055,7 @@ onBeforeUnmount(() => {
 				</ParameterInputList>
 				<div v-if="parametersNoneSetting.length === 0" class="no-parameters">
 					<n8n-text>
-						{{ $locale.baseText('nodeSettings.thisNodeDoesNotHaveAnyParameters') }}
+						{{ i18n.baseText('nodeSettings.thisNodeDoesNotHaveAnyParameters') }}
 					</n8n-text>
 				</div>
 
@@ -1074,7 +1066,7 @@ onBeforeUnmount(() => {
 				>
 					<n8n-notice
 						:content="
-							$locale.baseText('nodeSettings.useTheHttpRequestNode', {
+							i18n.baseText('nodeSettings.useTheHttpRequestNode', {
 								interpolate: { nodeTypeDisplayName: nodeType?.displayName ?? '' },
 							})
 						"
@@ -1104,7 +1096,7 @@ onBeforeUnmount(() => {
 				/>
 				<div class="node-version" data-test-id="node-version">
 					{{
-						$locale.baseText('nodeSettings.nodeVersion', {
+						i18n.baseText('nodeSettings.nodeVersion', {
 							interpolate: {
 								node: nodeType?.displayName as string,
 								version: (node.typeVersion ?? latestVersion).toString(),
diff --git a/packages/editor-ui/src/components/NodeTitle.test.ts b/packages/editor-ui/src/components/NodeTitle.test.ts
new file mode 100644
index 0000000000..18650559ac
--- /dev/null
+++ b/packages/editor-ui/src/components/NodeTitle.test.ts
@@ -0,0 +1,95 @@
+import { describe, it, expect, vi } from 'vitest';
+import { createComponentRenderer } from '@/__tests__/render';
+import userEvent from '@testing-library/user-event';
+import { fireEvent } from '@testing-library/vue';
+
+import NodeTitle from '@/components/NodeTitle.vue';
+import { createTestingPinia } from '@pinia/testing';
+
+const renderComponent = createComponentRenderer(NodeTitle);
+
+describe('NodeTitle', () => {
+	beforeEach(() => {
+		createTestingPinia();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders the component', () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				modelValue: 'Test Node',
+			},
+		});
+		expect(getByTestId('node-title-container')).toBeInTheDocument();
+		expect(getByTestId('node-rename-input')).toBeInTheDocument();
+	});
+
+	it('displays the node title', () => {
+		const { getByText } = renderComponent({
+			props: {
+				modelValue: 'My Test Node',
+			},
+		});
+		expect(getByText('My Test Node')).toBeInTheDocument();
+	});
+
+	it('shows the edit input when clicked', async () => {
+		const { getByTestId } = renderComponent({
+			props: {
+				modelValue: 'Test Node',
+			},
+		});
+		await userEvent.click(getByTestId('node-title-container'));
+		expect(getByTestId('node-rename-input')).toHaveValue('Test Node');
+	});
+
+	it('emits update:model-value when renaming', async () => {
+		const { getByTestId, getByRole, emitted } = renderComponent({
+			props: {
+				modelValue: 'Test Node',
+			},
+		});
+		await userEvent.click(getByTestId('node-title-container'));
+		const renameInput = getByTestId('node-rename-input');
+		await userEvent.clear(renameInput);
+		await userEvent.type(renameInput, 'New Node Name');
+
+		expect(renameInput).toHaveValue('New Node Name');
+
+		await userEvent.click(getByRole('button', { name: 'Rename' }));
+		expect(emitted('update:model-value')).toEqual([['New Node Name']]);
+	});
+
+	it('cancels renaming when cancel button is clicked', async () => {
+		const { getByTestId, getByRole, emitted } = renderComponent({
+			props: {
+				modelValue: 'Test Node',
+			},
+		});
+		await userEvent.click(getByTestId('node-title-container'));
+		await userEvent.click(getByRole('button', { name: 'Cancel' }));
+		expect(emitted('update:model-value')).toBeUndefined();
+	});
+
+	it('does not call onRename when Enter is pressed on cancel button', async () => {
+		const { getByTestId, getByRole, emitted } = renderComponent({
+			props: {
+				modelValue: 'Test Node',
+			},
+		});
+		await userEvent.click(getByTestId('node-title-container'));
+		const renameInput = getByTestId('node-rename-input');
+		await userEvent.clear(renameInput);
+		await userEvent.type(renameInput, 'New Node Name');
+
+		expect(renameInput).toHaveValue('New Node Name');
+
+		const cancelButton = getByRole('button', { name: 'Cancel' });
+		await fireEvent.focus(cancelButton);
+		await fireEvent.keyDown(cancelButton, { key: 'Enter' });
+		expect(emitted('update:model-value')).toBeUndefined();
+	});
+});
diff --git a/packages/editor-ui/src/components/NodeTitle.vue b/packages/editor-ui/src/components/NodeTitle.vue
index 01324b0128..8445f8832f 100644
--- a/packages/editor-ui/src/components/NodeTitle.vue
+++ b/packages/editor-ui/src/components/NodeTitle.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import NodeIcon from '@/components/NodeIcon.vue';
+import { useI18n } from '@/composables/useI18n';
 import type { INodeTypeDescription } from 'n8n-workflow';
 import { computed, nextTick, ref } from 'vue';
 
@@ -21,6 +22,8 @@ const editName = ref(false);
 const newName = ref('');
 const input = ref<HTMLInputElement>();
 
+const i18n = useI18n();
+
 const editable = computed(() => !props.readOnly && window === window.parent);
 
 async function onEdit() {
@@ -54,20 +57,21 @@ function onRename() {
 				@keydown.esc="editName = false"
 			>
 				<n8n-text :bold="true" color="text-base" tag="div">{{
-					$locale.baseText('ndv.title.renameNode')
+					i18n.baseText('ndv.title.renameNode')
 				}}</n8n-text>
 				<n8n-input ref="input" v-model="newName" size="small" data-test-id="node-rename-input" />
 				<div :class="$style.editButtons">
 					<n8n-button
 						type="secondary"
 						size="small"
-						:label="$locale.baseText('ndv.title.cancel')"
+						:label="i18n.baseText('ndv.title.cancel')"
 						@click="editName = false"
+						@keydown.enter.stop
 					/>
 					<n8n-button
 						type="primary"
 						size="small"
-						:label="$locale.baseText('ndv.title.rename')"
+						:label="i18n.baseText('ndv.title.rename')"
 						@click="onRename"
 					/>
 				</div>
diff --git a/packages/editor-ui/src/components/NpsSurvey.vue b/packages/editor-ui/src/components/NpsSurvey.vue
index 41b69b110d..ce792ba20d 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');
@@ -94,7 +96,6 @@ async function send() {
 			message: Number(form.value.value) >= 8 ? i18n.baseText('prompts.npsSurvey.reviewUs') : '',
 			type: 'success',
 			duration: 15000,
-			dangerouslyUseHTMLString: true,
 		});
 
 		setTimeout(() => {
@@ -123,12 +124,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/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index bf3cbbe6eb..ac13a67c95 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -1,6 +1,11 @@
 <script setup lang="ts">
 import { ref, computed, onMounted, watch } from 'vue';
-import type { IRunData, IRunExecutionData, NodeError, Workflow } from 'n8n-workflow';
+import {
+	NodeConnectionType,
+	type IRunData,
+	type IRunExecutionData,
+	type Workflow,
+} from 'n8n-workflow';
 import RunData from './RunData.vue';
 import RunInfo from './RunInfo.vue';
 import { storeToRefs } from 'pinia';
@@ -15,10 +20,11 @@ import { usePinnedData } from '@/composables/usePinnedData';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
 import { waitingNodeTooltip } from '@/utils/executionUtils';
+import { N8nRadioButtons, N8nText } from 'n8n-design-system';
 
 // Types
 
-type RunDataRef = InstanceType<typeof RunData> | null;
+type RunDataRef = InstanceType<typeof RunData>;
 
 const OUTPUT_TYPE = {
 	REGULAR: 'regular',
@@ -35,7 +41,7 @@ type Props = {
 	isReadOnly?: boolean;
 	linkedRuns?: boolean;
 	canLinkRuns?: boolean;
-	pushRef?: string;
+	pushRef: string;
 	blockUI?: boolean;
 	isProductionExecutionPreview?: boolean;
 	isPaneActive?: boolean;
@@ -55,7 +61,7 @@ const emit = defineEmits<{
 	runChange: [number];
 	activatePane: [];
 	tableMounted: [{ avgRowHeight: number }];
-	itemHover: [{ itemIndex: number; outputIndex: number }];
+	itemHover: [item: { itemIndex: number; outputIndex: number } | null];
 	search: [string];
 	openSettings: [];
 }>();
@@ -77,7 +83,7 @@ const { isSubNodeType } = useNodeType({
 });
 const pinnedData = usePinnedData(activeNode, {
 	runIndex: props.runIndex,
-	displayMode: ndvStore.getPanelDisplayMode('output'),
+	displayMode: ndvStore.outputPanelDisplayMode,
 });
 
 // Data
@@ -87,7 +93,7 @@ const outputTypes = ref([
 	{ label: i18n.baseText('ndv.output.outType.regular'), value: OUTPUT_TYPE.REGULAR },
 	{ label: i18n.baseText('ndv.output.outType.logs'), value: OUTPUT_TYPE.LOGS },
 ]);
-const runDataRef = ref<RunDataRef>(null);
+const runDataRef = ref<RunDataRef>();
 
 // Computed
 
@@ -100,35 +106,37 @@ const isTriggerNode = computed(() => {
 });
 
 const hasAiMetadata = computed(() => {
+	if (isNodeRunning.value || !workflowRunData.value) {
+		return false;
+	}
+
 	if (node.value) {
-		const resultData = workflowsStore.getWorkflowResultDataByNodeName(node.value.name);
+		const connectedSubNodes = props.workflow.getParentNodes(node.value.name, 'ALL_NON_MAIN');
+		const resultData = connectedSubNodes.map(workflowsStore.getWorkflowResultDataByNodeName);
 
-		if (!resultData || !Array.isArray(resultData) || resultData.length === 0) {
-			return false;
-		}
-
-		return !!resultData[resultData.length - 1].metadata;
+		return resultData && Array.isArray(resultData) && resultData.length > 0;
 	}
 	return false;
 });
 
+const hasError = computed(() =>
+	Boolean(
+		workflowRunData.value &&
+			node.value &&
+			workflowRunData.value[node.value.name]?.[props.runIndex]?.error,
+	),
+);
+
 // Determine the initial output mode to logs if the node has an error and the logs are available
 const defaultOutputMode = computed<OutputType>(() => {
-	const hasError =
-		workflowRunData.value &&
-		node.value &&
-		(workflowRunData.value[node.value.name]?.[props.runIndex]?.error as NodeError);
-
-	return Boolean(hasError) && hasAiMetadata.value ? OUTPUT_TYPE.LOGS : OUTPUT_TYPE.REGULAR;
+	return hasError.value && hasAiMetadata.value ? OUTPUT_TYPE.LOGS : OUTPUT_TYPE.REGULAR;
 });
 
 const isNodeRunning = computed(() => {
 	return workflowRunning.value && !!node.value && workflowsStore.isNodeExecuting(node.value.name);
 });
 
-const workflowRunning = computed(() => {
-	return uiStore.isActionActive['workflowRunning'];
-});
+const workflowRunning = computed(() => uiStore.isActionActive.workflowRunning);
 
 const workflowExecution = computed(() => {
 	return workflowsStore.getWorkflowExecution;
@@ -209,6 +217,29 @@ const canPinData = computed(() => {
 	return pinnedData.isValidNodeType.value && !props.isReadOnly;
 });
 
+const allToolsWereUnusedNotice = computed(() => {
+	if (!node.value || runsCount.value === 0 || hasError.value) return undefined;
+
+	// With pinned data there's no clear correct answer for whether
+	// we should use historic or current parents, so we don't show the notice,
+	// as it likely ends up unactionable noise to the user
+	if (pinnedData.hasData.value) return undefined;
+
+	const toolsAvailable = props.workflow.getParentNodes(
+		node.value.name,
+		NodeConnectionType.AiTool,
+		1,
+	);
+	const toolsUsedInLatestRun = toolsAvailable.filter(
+		(tool) => !!workflowRunData.value?.[tool]?.[props.runIndex],
+	);
+	if (toolsAvailable.length > 0 && toolsUsedInLatestRun.length === 0) {
+		return i18n.baseText('ndv.output.noToolUsedInfo');
+	} else {
+		return undefined;
+	}
+});
+
 // Methods
 
 const insertTestData = () => {
@@ -252,8 +283,8 @@ const onRunIndexChange = (run: number) => {
 	emit('runChange', run);
 };
 
-const onUpdateOutputMode = (outputMode: OutputType) => {
-	if (outputMode === OUTPUT_TYPE.LOGS) {
+const onUpdateOutputMode = (newOutputMode: OutputType) => {
+	if (newOutputMode === OUTPUT_TYPE.LOGS) {
 		ndvEventBus.emit('setPositionByName', 'minLeft');
 	} else {
 		ndvEventBus.emit('setPositionByName', 'initial');
@@ -287,16 +318,18 @@ const activatePane = () => {
 		:run-index="runIndex"
 		:linked-runs="linkedRuns"
 		:can-link-runs="canLinkRuns"
-		:too-much-data-title="$locale.baseText('ndv.output.tooMuchData.title')"
-		:no-data-in-branch-message="$locale.baseText('ndv.output.noOutputDataInBranch')"
+		:too-much-data-title="i18n.baseText('ndv.output.tooMuchData.title')"
+		:no-data-in-branch-message="i18n.baseText('ndv.output.noOutputDataInBranch')"
 		:is-executing="isNodeRunning"
-		:executing-message="$locale.baseText('ndv.output.executing')"
+		:executing-message="i18n.baseText('ndv.output.executing')"
 		:push-ref="pushRef"
 		:block-u-i="blockUI"
 		:is-production-execution-preview="isProductionExecutionPreview"
 		:is-pane-active="isPaneActive"
+		:hide-pagination="outputMode === 'logs'"
 		pane-type="output"
 		:data-output-type="outputMode"
+		:callout-message="allToolsWereUnusedNotice"
 		@activate-pane="activatePane"
 		@run-change="onRunIndexChange"
 		@link-run="onLinkRun"
@@ -308,15 +341,15 @@ const activatePane = () => {
 		<template #header>
 			<div :class="$style.titleSection">
 				<template v-if="hasAiMetadata">
-					<n8n-radio-buttons
-						data-test-id="ai-output-mode-select"
+					<N8nRadioButtons
 						v-model="outputMode"
+						data-test-id="ai-output-mode-select"
 						:options="outputTypes"
 						@update:model-value="onUpdateOutputMode"
 					/>
 				</template>
 				<span v-else :class="$style.title">
-					{{ $locale.baseText(outputPanelEditMode.enabled ? 'ndv.output.edit' : 'ndv.output') }}
+					{{ i18n.baseText(outputPanelEditMode.enabled ? 'ndv.output.edit' : 'ndv.output') }}
 				</span>
 				<RunInfo
 					v-if="hasNodeRun && !pinnedData.hasData.value && runsCount === 1"
@@ -329,56 +362,54 @@ const activatePane = () => {
 		</template>
 
 		<template #node-not-run>
-			<n8n-text v-if="workflowRunning && !isTriggerNode" data-test-id="ndv-output-waiting">{{
-				$locale.baseText('ndv.output.waitingToRun')
-			}}</n8n-text>
-			<n8n-text v-if="!workflowRunning" data-test-id="ndv-output-run-node-hint">
+			<N8nText v-if="workflowRunning && !isTriggerNode" data-test-id="ndv-output-waiting">{{
+				i18n.baseText('ndv.output.waitingToRun')
+			}}</N8nText>
+			<N8nText v-if="!workflowRunning" data-test-id="ndv-output-run-node-hint">
 				<template v-if="isSubNodeType">
-					{{ $locale.baseText('ndv.output.runNodeHintSubNode') }}
+					{{ i18n.baseText('ndv.output.runNodeHintSubNode') }}
 				</template>
 				<template v-else>
-					{{ $locale.baseText('ndv.output.runNodeHint') }}
+					{{ i18n.baseText('ndv.output.runNodeHint') }}
 					<span v-if="canPinData" @click="insertTestData">
 						<br />
-						{{ $locale.baseText('generic.or') }}
-						<n8n-text tag="a" size="medium" color="primary">
-							{{ $locale.baseText('ndv.output.insertTestData') }}
-						</n8n-text>
+						{{ i18n.baseText('generic.or') }}
+						<N8nText tag="a" size="medium" color="primary">
+							{{ i18n.baseText('ndv.output.insertTestData') }}
+						</N8nText>
 					</span>
 				</template>
-			</n8n-text>
+			</N8nText>
 		</template>
 
 		<template #node-waiting>
-			<n8n-text :bold="true" color="text-dark" size="large">Waiting for input</n8n-text>
-			<n8n-text v-n8n-html="waitingNodeTooltip()"></n8n-text>
+			<N8nText :bold="true" color="text-dark" size="large">Waiting for input</N8nText>
+			<N8nText v-n8n-html="waitingNodeTooltip(node)"></N8nText>
 		</template>
 
 		<template #no-output-data>
-			<n8n-text :bold="true" color="text-dark" size="large">{{
-				$locale.baseText('ndv.output.noOutputData.title')
-			}}</n8n-text>
-			<n8n-text>
-				{{ $locale.baseText('ndv.output.noOutputData.message') }}
-				<a @click="openSettings">{{
-					$locale.baseText('ndv.output.noOutputData.message.settings')
-				}}</a>
-				{{ $locale.baseText('ndv.output.noOutputData.message.settingsOption') }}
-			</n8n-text>
+			<N8nText :bold="true" color="text-dark" size="large">{{
+				i18n.baseText('ndv.output.noOutputData.title')
+			}}</N8nText>
+			<N8nText>
+				{{ i18n.baseText('ndv.output.noOutputData.message') }}
+				<a @click="openSettings">{{ i18n.baseText('ndv.output.noOutputData.message.settings') }}</a>
+				{{ i18n.baseText('ndv.output.noOutputData.message.settingsOption') }}
+			</N8nText>
 		</template>
 
 		<template v-if="outputMode === 'logs' && node" #content>
-			<RunDataAi :node="node" :run-index="runIndex" />
+			<RunDataAi :node="node" :run-index="runIndex" :workflow="workflow" />
 		</template>
 
 		<template #recovered-artificial-output-data>
 			<div :class="$style.recoveredOutputData">
-				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
-					$locale.baseText('executionDetails.executionFailed.recoveredNodeTitle')
-				}}</n8n-text>
-				<n8n-text>
-					{{ $locale.baseText('executionDetails.executionFailed.recoveredNodeMessage') }}
-				</n8n-text>
+				<N8nText tag="div" :bold="true" color="text-dark" size="large">{{
+					i18n.baseText('executionDetails.executionFailed.recoveredNodeTitle')
+				}}</N8nText>
+				<N8nText>
+					{{ i18n.baseText('executionDetails.executionFailed.recoveredNodeMessage') }}
+				</N8nText>
 			</div>
 		</template>
 
diff --git a/packages/editor-ui/src/components/PanelDragButton.vue b/packages/editor-ui/src/components/PanelDragButton.vue
index cffd9ce15f..c203e9e335 100644
--- a/packages/editor-ui/src/components/PanelDragButton.vue
+++ b/packages/editor-ui/src/components/PanelDragButton.vue
@@ -1,32 +1,29 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script setup lang="ts">
 import Draggable from './Draggable.vue';
 import type { XYPosition } from '@/Interface';
 
-export default defineComponent({
-	components: {
-		Draggable,
-	},
-	props: {
-		canMoveRight: {
-			type: Boolean,
-		},
-		canMoveLeft: {
-			type: Boolean,
-		},
-	},
-	methods: {
-		onDrag(e: XYPosition) {
-			this.$emit('drag', e);
-		},
-		onDragStart() {
-			this.$emit('dragstart');
-		},
-		onDragEnd() {
-			this.$emit('dragend');
-		},
-	},
-});
+defineProps<{
+	canMoveRight: boolean;
+	canMoveLeft: boolean;
+}>();
+
+const emit = defineEmits<{
+	drag: [e: XYPosition];
+	dragstart: [];
+	dragend: [];
+}>();
+
+const onDrag = (e: XYPosition) => {
+	emit('drag', e);
+};
+
+const onDragEnd = () => {
+	emit('dragend');
+};
+
+const onDragStart = () => {
+	emit('dragstart');
+};
 </script>
 
 <template>
@@ -38,7 +35,7 @@ export default defineComponent({
 		@dragend="onDragEnd"
 	>
 		<template #default="{ isDragging }">
-			<div :class="{ [$style.dragButton]: true }">
+			<div :class="{ [$style.dragButton]: true }" data-test-id="panel-drag-button">
 				<span
 					v-if="canMoveLeft"
 					:class="{ [$style.leftArrow]: true, [$style.visible]: isDragging }"
diff --git a/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts b/packages/editor-ui/src/components/ParameterInput.test.ts
similarity index 91%
rename from packages/editor-ui/src/components/__tests__/ParameterInput.test.ts
rename to packages/editor-ui/src/components/ParameterInput.test.ts
index 3deee4ef26..4ee22ec0dd 100644
--- a/packages/editor-ui/src/components/__tests__/ParameterInput.test.ts
+++ b/packages/editor-ui/src/components/ParameterInput.test.ts
@@ -6,13 +6,34 @@ import { createTestingPinia } from '@pinia/testing';
 import { faker } from '@faker-js/faker';
 import { waitFor } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import type { useNodeTypesStore } from '../../stores/nodeTypes.store';
+import type { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { cleanupAppModals, createAppModals } from '@/__tests__/utils';
 
 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),
@@ -54,7 +75,8 @@ describe('ParameterInput.vue', () => {
 				type: 'test',
 				typeVersion: 1,
 			},
-			isNDVDataEmpty: vi.fn(() => false),
+			isInputPanelEmpty: false,
+			isOutputPanelEmpty: false,
 		};
 		mockNodeTypesState = {
 			allNodeTypes: [],
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index c69458f269..7d0aa44441 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -61,7 +61,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { isCredentialOnlyNodeType } from '@/utils/credentialOnlyNodes';
-import { N8nInput, N8nSelect } from 'n8n-design-system';
+import { N8nIcon, N8nInput, N8nInputNumber, N8nOption, N8nSelect } from 'n8n-design-system';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useRouter } from 'vue-router';
@@ -365,7 +365,7 @@ const getIssues = computed<string[]>(() => {
 			if (Array.isArray(displayValue.value)) {
 				checkValues = checkValues.concat(displayValue.value);
 			} else {
-				checkValues.push(displayValue.value as string);
+				checkValues.push(displayValue.value);
 			}
 		}
 
@@ -476,6 +476,10 @@ const shortPath = computed<string>(() => {
 	return short.join('.');
 });
 
+const parameterId = computed(() => {
+	return `${node.value?.id ?? crypto.randomUUID()}${props.path}`;
+});
+
 const isResourceLocatorParameter = computed<boolean>(() => {
 	return props.parameter.type === 'resourceLocator' || props.parameter.type === 'workflowSelector';
 });
@@ -523,7 +527,7 @@ const isHtmlNode = computed(() => !!node.value && node.value.type === HTML_NODE_
 const isInputTypeString = computed(() => props.parameter.type === 'string');
 const isInputTypeNumber = computed(() => props.parameter.type === 'number');
 
-const isInputDataEmpty = computed(() => ndvStore.isNDVDataEmpty('input'));
+const isInputDataEmpty = computed(() => ndvStore.isInputPanelEmpty);
 const isDropDisabled = computed(
 	() =>
 		props.parameter.noDataExpression ||
@@ -856,6 +860,8 @@ async function optionSelected(command: string) {
 			(!props.modelValue || props.modelValue === '[Object: null]')
 		) {
 			valueChanged('={{ 0 }}');
+		} else if (props.parameter.type === 'multiOptions') {
+			valueChanged(`={{ ${JSON.stringify(props.modelValue)} }}`);
 		} else if (
 			props.parameter.type === 'number' ||
 			props.parameter.type === 'boolean' ||
@@ -983,7 +989,7 @@ watch(remoteParameterOptionsLoading, () => {
 
 // Focus input field when changing from fixed value to expression
 watch(isModelValueExpression, async (isExpression, wasExpression) => {
-	if (isExpression && !wasExpression) {
+	if (!props.isReadOnly && isExpression && !wasExpression) {
 		await nextTick();
 		inputField.value?.focus();
 	}
@@ -1023,7 +1029,7 @@ onUpdated(async () => {
 			@update:model-value="expressionUpdated"
 		></ExpressionEditModal>
 
-		<div class="parameter-input ignore-key-press" :style="parameterInputWrapperStyle">
+		<div class="parameter-input ignore-key-press-canvas" :style="parameterInputWrapperStyle">
 			<ResourceLocator
 				v-if="parameter.type === 'resourceLocator'"
 				ref="resourceLocator"
@@ -1059,6 +1065,7 @@ onUpdated(async () => {
 				:expression-edit-dialog-visible="expressionEditDialogVisible"
 				:path="path"
 				:parameter-issues="getIssues"
+				:is-read-only="isReadOnly"
 				@update:model-value="valueChanged"
 				@modal-opener-click="openExpressionEditorModal"
 				@focus="setFocus"
@@ -1089,18 +1096,20 @@ onUpdated(async () => {
 				"
 			>
 				<el-dialog
+					width="calc(100% - var(--spacing-3xl))"
+					:class="$style.modal"
 					:model-value="codeEditDialogVisible"
 					:append-to="`#${APP_MODALS_ELEMENT_ID}`"
-					width="80%"
-					:title="`${i18n.baseText('codeEdit.edit')} ${$locale
+					:title="`${i18n.baseText('codeEdit.edit')} ${i18n
 						.nodeText()
 						.inputLabelDisplayName(parameter, path)}`"
 					:before-close="closeCodeEditDialog"
 					data-test-id="code-editor-fullscreen"
 				>
-					<div :key="codeEditDialogVisible.toString()" class="ignore-key-press code-edit-dialog">
+					<div class="ignore-key-press-canvas code-edit-dialog">
 						<CodeNodeEditor
-							v-if="editorType === 'codeNodeEditor'"
+							v-if="editorType === 'codeNodeEditor' && codeEditDialogVisible"
+							:id="parameterId"
 							:mode="codeEditorMode"
 							:model-value="modelValueString"
 							:default-value="parameter.default"
@@ -1110,7 +1119,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<HtmlEditor
-							v-else-if="editorType === 'htmlEditor'"
+							v-else-if="editorType === 'htmlEditor' && codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1120,7 +1129,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<SqlEditor
-							v-else-if="editorType === 'sqlEditor'"
+							v-else-if="editorType === 'sqlEditor' && codeEditDialogVisible"
 							:model-value="modelValueString"
 							:dialect="getArgument('sqlDialect')"
 							:is-read-only="isReadOnly"
@@ -1129,7 +1138,7 @@ onUpdated(async () => {
 							@update:model-value="valueChangedDebounced"
 						/>
 						<JsEditor
-							v-else-if="editorType === 'jsEditor'"
+							v-else-if="editorType === 'jsEditor' && codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1139,7 +1148,7 @@ onUpdated(async () => {
 						/>
 
 						<JsonEditor
-							v-else-if="parameter.type === 'json'"
+							v-else-if="parameter.type === 'json' && codeEditDialogVisible"
 							:model-value="modelValueString"
 							:is-read-only="isReadOnly"
 							:rows="editorRows"
@@ -1160,8 +1169,8 @@ onUpdated(async () => {
 				></TextEdit>
 
 				<CodeNodeEditor
-					v-if="editorType === 'codeNodeEditor' && isCodeNode"
-					:key="'code-' + codeEditDialogVisible.toString()"
+					v-if="editorType === 'codeNodeEditor' && isCodeNode && !codeEditDialogVisible"
+					:id="parameterId"
 					:mode="codeEditorMode"
 					:model-value="modelValueString"
 					:default-value="parameter.default"
@@ -1172,21 +1181,20 @@ onUpdated(async () => {
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
-						<n8n-icon
+						<N8nIcon
 							v-if="!editorIsReadOnly"
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
 							class="textarea-modal-opener"
-							:title="$locale.baseText('parameterInput.openEditWindow')"
+							:title="i18n.baseText('parameterInput.openEditWindow')"
 							@click="displayEditDialog()"
 						/>
 					</template>
 				</CodeNodeEditor>
 
 				<HtmlEditor
-					v-else-if="editorType === 'htmlEditor'"
-					:key="'html-' + codeEditDialogVisible.toString()"
+					v-else-if="editorType === 'htmlEditor' && !codeEditDialogVisible"
 					:model-value="modelValueString"
 					:is-read-only="isReadOnly"
 					:rows="editorRows"
@@ -1195,12 +1203,12 @@ onUpdated(async () => {
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
-						<n8n-icon
+						<N8nIcon
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
 							class="textarea-modal-opener"
-							:title="$locale.baseText('parameterInput.openEditWindow')"
+							:title="i18n.baseText('parameterInput.openEditWindow')"
 							@click="displayEditDialog()"
 						/>
 					</template>
@@ -1208,7 +1216,6 @@ onUpdated(async () => {
 
 				<SqlEditor
 					v-else-if="editorType === 'sqlEditor'"
-					:key="'sql-' + codeEditDialogVisible.toString()"
 					:model-value="modelValueString"
 					:dialect="getArgument('sqlDialect')"
 					:is-read-only="isReadOnly"
@@ -1216,12 +1223,12 @@ onUpdated(async () => {
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
-						<n8n-icon
+						<N8nIcon
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
 							class="textarea-modal-opener"
-							:title="$locale.baseText('parameterInput.openEditWindow')"
+							:title="i18n.baseText('parameterInput.openEditWindow')"
 							@click="displayEditDialog()"
 						/>
 					</template>
@@ -1229,7 +1236,6 @@ onUpdated(async () => {
 
 				<JsEditor
 					v-else-if="editorType === 'jsEditor'"
-					:key="'js-' + codeEditDialogVisible.toString()"
 					:model-value="modelValueString"
 					:is-read-only="isReadOnly || editorIsReadOnly"
 					:rows="editorRows"
@@ -1237,33 +1243,32 @@ onUpdated(async () => {
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
-						<n8n-icon
+						<N8nIcon
 							v-if="!editorIsReadOnly"
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
 							class="textarea-modal-opener"
-							:title="$locale.baseText('parameterInput.openEditWindow')"
+							:title="i18n.baseText('parameterInput.openEditWindow')"
 							@click="displayEditDialog()"
 						/>
 					</template>
 				</JsEditor>
 
 				<JsonEditor
-					v-else-if="parameter.type === 'json'"
-					:key="'json-' + codeEditDialogVisible.toString()"
+					v-else-if="parameter.type === 'json' && !codeEditDialogVisible"
 					:model-value="modelValueString"
 					:is-read-only="isReadOnly"
 					:rows="editorRows"
 					@update:model-value="valueChangedDebounced"
 				>
 					<template #suffix>
-						<n8n-icon
+						<N8nIcon
 							data-test-id="code-editor-fullscreen-button"
 							icon="external-link-alt"
 							size="xsmall"
 							class="textarea-modal-opener"
-							:title="$locale.baseText('parameterInput.openEditWindow')"
+							:title="i18n.baseText('parameterInput.openEditWindow')"
 							@click="displayEditDialog()"
 						/>
 					</template>
@@ -1272,6 +1277,7 @@ onUpdated(async () => {
 				<div v-else-if="editorType" class="readonly-code clickable" @click="displayEditDialog()">
 					<CodeNodeEditor
 						v-if="!codeEditDialogVisible"
+						:id="parameterId"
 						:mode="codeEditorMode"
 						:model-value="modelValueString"
 						:language="editorLanguage"
@@ -1302,7 +1308,7 @@ onUpdated(async () => {
 					@blur="onBlur"
 				>
 					<template #suffix>
-						<n8n-icon
+						<N8nIcon
 							v-if="!isReadOnly && !isSecretParameter"
 							icon="external-link-alt"
 							size="xsmall"
@@ -1422,11 +1428,12 @@ onUpdated(async () => {
 				@focus="setFocus"
 				@blur="onBlur"
 			>
-				<n8n-option
+				<N8nOption
 					v-for="option in parameterOptions"
-					:key="option.value"
+					:key="option.value.toString()"
 					:value="option.value"
 					:label="getOptionsOptionDisplayName(option)"
+					data-test-id="parameter-input-item"
 				>
 					<div class="list-option">
 						<div
@@ -1441,7 +1448,7 @@ onUpdated(async () => {
 							v-n8n-html="getOptionsOptionDescription(option)"
 						></div>
 					</div>
-				</n8n-option>
+				</N8nOption>
 			</N8nSelect>
 
 			<N8nSelect
@@ -1460,9 +1467,9 @@ onUpdated(async () => {
 				@focus="setFocus"
 				@blur="onBlur"
 			>
-				<n8n-option
+				<N8nOption
 					v-for="option in parameterOptions"
-					:key="option.value"
+					:key="option.value.toString()"
 					:value="option.value"
 					:label="getOptionsOptionDisplayName(option)"
 				>
@@ -1474,7 +1481,7 @@ onUpdated(async () => {
 							v-n8n-html="getOptionsOptionDescription(option)"
 						></div>
 					</div>
-				</n8n-option>
+				</N8nOption>
 			</N8nSelect>
 
 			<!-- temporary state of booleans while data is mapped -->
@@ -1494,7 +1501,7 @@ onUpdated(async () => {
 				:disabled="isReadOnly"
 				@update:model-value="valueChanged"
 			/>
-			<div v-if="showDragnDropTip" :class="$style.tip">
+			<div v-if="!isReadOnly && showDragnDropTip" :class="$style.tip">
 				<InlineExpressionTip />
 			</div>
 		</div>
@@ -1623,8 +1630,8 @@ onUpdated(async () => {
 
 .textarea-modal-opener {
 	position: absolute;
-	right: 0;
-	bottom: 0;
+	right: 1px;
+	bottom: 1px;
 	background-color: var(--color-code-background);
 	padding: 3px;
 	line-height: 9px;
@@ -1632,6 +1639,8 @@ onUpdated(async () => {
 	border-top-left-radius: var(--border-radius-base);
 	border-bottom-right-radius: var(--border-radius-base);
 	cursor: pointer;
+	border-right: none;
+	border-bottom: none;
 
 	svg {
 		width: 9px !important;
@@ -1653,7 +1662,7 @@ onUpdated(async () => {
 }
 
 .code-edit-dialog {
-	height: 70vh;
+	height: 100%;
 
 	.code-node-editor {
 		height: 100%;
@@ -1661,7 +1670,25 @@ onUpdated(async () => {
 }
 </style>
 
-<style lang="scss" module>
+<style lang="css" module>
+.modal {
+	--dialog-close-top: var(--spacing-m);
+	display: flex;
+	flex-direction: column;
+	overflow: clip;
+	height: calc(100% - var(--spacing-4xl));
+	margin-bottom: 0;
+
+	:global(.el-dialog__header) {
+		padding-bottom: 0;
+	}
+
+	:global(.el-dialog__body) {
+		height: calc(100% - var(--spacing-3xl));
+		padding: var(--spacing-s);
+	}
+}
+
 .tipVisible {
 	--input-border-bottom-left-radius: 0;
 	--input-border-bottom-right-radius: 0;
diff --git a/packages/editor-ui/src/components/ParameterInputExpanded.vue b/packages/editor-ui/src/components/ParameterInputExpanded.vue
index cdae28fe53..67e2e867f1 100644
--- a/packages/editor-ui/src/components/ParameterInputExpanded.vue
+++ b/packages/editor-ui/src/components/ParameterInputExpanded.vue
@@ -110,8 +110,8 @@ function onDocumentationUrlClick(): void {
 
 <template>
 	<n8n-input-label
-		:label="$locale.credText().inputLabelDisplayName(parameter)"
-		:tooltip-text="$locale.credText().inputLabelDescription(parameter)"
+		:label="i18n.credText().inputLabelDisplayName(parameter)"
+		:tooltip-text="i18n.credText().inputLabelDescription(parameter)"
 		:required="parameter.required"
 		:show-tooltip="focused"
 		:show-options="menuExpanded"
@@ -149,7 +149,7 @@ function onDocumentationUrlClick(): void {
 		/>
 		<div v-if="showRequiredErrors" :class="$style.errors">
 			<n8n-text color="danger" size="small">
-				{{ $locale.baseText('parameterInputExpanded.thisFieldIsRequired') }}
+				{{ i18n.baseText('parameterInputExpanded.thisFieldIsRequired') }}
 				<n8n-link
 					v-if="documentationUrl"
 					:to="documentationUrl"
@@ -157,7 +157,7 @@ function onDocumentationUrlClick(): void {
 					:underline="true"
 					@click="onDocumentationUrlClick"
 				>
-					{{ $locale.baseText('parameterInputExpanded.openDocs') }}
+					{{ i18n.baseText('parameterInputExpanded.openDocs') }}
 				</n8n-link>
 			</n8n-text>
 		</div>
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index bd16fd6813..332011b9ea 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import type { IUpdateInformation } from '@/Interface';
 
 import DraggableTarget from '@/components/DraggableTarget.vue';
@@ -13,6 +13,7 @@ import { hasExpressionMapping, hasOnlyListMode, isValueExpression } from '@/util
 import { isResourceLocatorValue } from '@/utils/typeGuards';
 import { createEventBus } from 'n8n-design-system/utils';
 import type { INodeProperties, IParameterLabel, NodeParameterValueType } from 'n8n-workflow';
+import { N8nInputLabel } from 'n8n-design-system';
 
 type Props = {
 	parameter: INodeProperties;
@@ -166,7 +167,6 @@ function onDrop(newParamValue: string) {
 					title: i18n.baseText('dataMapping.success.title'),
 					message: i18n.baseText('dataMapping.success.moreInfo'),
 					type: 'success',
-					dangerouslyUseHTMLString: true,
 				});
 
 				ndvStore.setMappingOnboarded();
@@ -188,10 +188,21 @@ function onDrop(newParamValue: string) {
 		forceShowExpression.value = false;
 	}, 200);
 }
+
+// When switching to read-only mode, reset the value to the default value
+watch(
+	() => props.isReadOnly,
+	(isReadOnly) => {
+		// Patch fix, see https://linear.app/n8n/issue/ADO-2974/resource-mapper-values-are-emptied-when-refreshing-the-columns
+		if (isReadOnly && props.parameter.disabledOptions !== undefined) {
+			valueChanged({ name: props.path, value: props.parameter.default });
+		}
+	},
+);
 </script>
 
 <template>
-	<n8n-input-label
+	<N8nInputLabel
 		:class="[$style.wrapper]"
 		:label="hideLabel ? '' : i18n.nodeText().inputLabelDisplayName(parameter, path)"
 		:tooltip-text="hideLabel ? '' : i18n.nodeText().inputLabelDescription(parameter, path)"
@@ -262,7 +273,7 @@ function onDrop(newParamValue: string) {
 				@menu-expanded="onMenuExpanded"
 			/>
 		</div>
-	</n8n-input-label>
+	</N8nInputLabel>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 78932fb9b0..11fe4e1f42 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -35,6 +35,8 @@ import {
 import { get, set } from 'lodash-es';
 import { useRouter } from 'vue-router';
 import { captureException } from '@sentry/vue';
+import { N8nNotice, N8nIconButton, N8nInputLabel, N8nText, N8nIcon } from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
 
 const LazyFixedCollectionParameter = defineAsyncComponent(
 	async () => await import('./FixedCollectionParameter.vue'),
@@ -68,6 +70,7 @@ const nodeHelpers = useNodeHelpers();
 const asyncLoadingError = ref(false);
 const router = useRouter();
 const workflowHelpers = useWorkflowHelpers({ router });
+const i18n = useI18n();
 
 onErrorCaptured((e, component) => {
 	if (
@@ -321,7 +324,10 @@ function mustHideDuringCustomApiCall(
 	return !MUST_REMAIN_VISIBLE.includes(parameter.name);
 }
 
-function displayNodeParameter(parameter: INodeProperties): boolean {
+function displayNodeParameter(
+	parameter: INodeProperties,
+	displayKey: 'displayOptions' | 'disabledOptions' = 'displayOptions',
+): boolean {
 	if (parameter.type === 'hidden') {
 		return false;
 	}
@@ -342,7 +348,7 @@ function displayNodeParameter(parameter: INodeProperties): boolean {
 		return false;
 	}
 
-	if (parameter.displayOptions === undefined) {
+	if (parameter[displayKey] === undefined) {
 		// If it is not defined no need to do a proper check
 		return true;
 	}
@@ -401,13 +407,19 @@ function displayNodeParameter(parameter: INodeProperties): boolean {
 		if (props.path) {
 			rawValues = deepCopy(props.nodeValues);
 			set(rawValues, props.path, nodeValues);
-			return nodeHelpers.displayParameter(rawValues, parameter, props.path, node.value);
+			return nodeHelpers.displayParameter(rawValues, parameter, props.path, node.value, displayKey);
 		} else {
-			return nodeHelpers.displayParameter(nodeValues, parameter, '', node.value);
+			return nodeHelpers.displayParameter(nodeValues, parameter, '', node.value, displayKey);
 		}
 	}
 
-	return nodeHelpers.displayParameter(props.nodeValues, parameter, props.path, node.value);
+	return nodeHelpers.displayParameter(
+		props.nodeValues,
+		parameter,
+		props.path,
+		node.value,
+		displayKey,
+	);
 }
 
 function valueChanged(parameterData: IUpdateInformation): void {
@@ -498,10 +510,10 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 				@value-changed="valueChanged"
 			/>
 
-			<n8n-notice
+			<N8nNotice
 				v-else-if="parameter.type === 'notice'"
 				:class="['parameter-item', parameter.typeOptions?.containerClass ?? '']"
-				:content="$locale.nodeText().inputLabelDisplayName(parameter, path)"
+				:content="i18n.nodeText().inputLabelDisplayName(parameter, path)"
 				@action="onNoticeAction"
 			/>
 
@@ -519,19 +531,9 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 				v-else-if="['collection', 'fixedCollection'].includes(parameter.type)"
 				class="multi-parameter"
 			>
-				<n8n-icon-button
-					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
-					type="tertiary"
-					text
-					size="mini"
-					icon="trash"
-					class="delete-option"
-					:title="$locale.baseText('parameterInputList.delete')"
-					@click="deleteOption(parameter.name)"
-				></n8n-icon-button>
-				<n8n-input-label
-					:label="$locale.nodeText().inputLabelDisplayName(parameter, path)"
-					:tooltip-text="$locale.nodeText().inputLabelDescription(parameter, path)"
+				<N8nInputLabel
+					:label="i18n.nodeText().inputLabelDisplayName(parameter, path)"
+					:tooltip-text="i18n.nodeText().inputLabelDescription(parameter, path)"
 					size="small"
 					:underline="true"
 					color="text-dark"
@@ -558,16 +560,26 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 						/>
 					</template>
 					<template #fallback>
-						<n8n-text size="small" class="async-notice">
-							<n8n-icon icon="sync-alt" size="xsmall" :spin="true" />
-							{{ $locale.baseText('parameterInputList.loadingFields') }}
-						</n8n-text>
+						<N8nText size="small" class="async-notice">
+							<N8nIcon icon="sync-alt" size="xsmall" :spin="true" />
+							{{ i18n.baseText('parameterInputList.loadingFields') }}
+						</N8nText>
 					</template>
 				</Suspense>
-				<n8n-text v-else size="small" color="danger" class="async-notice">
-					<n8n-icon icon="exclamation-triangle" size="xsmall" />
-					{{ $locale.baseText('parameterInputList.loadingError') }}
-				</n8n-text>
+				<N8nText v-else size="small" color="danger" class="async-notice">
+					<N8nIcon icon="exclamation-triangle" size="xsmall" />
+					{{ i18n.baseText('parameterInputList.loadingError') }}
+				</N8nText>
+				<N8nIconButton
+					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
+					type="tertiary"
+					text
+					size="mini"
+					icon="trash"
+					class="icon-button"
+					:title="i18n.baseText('parameterInputList.delete')"
+					@click="deleteOption(parameter.name)"
+				></N8nIconButton>
 			</div>
 			<ResourceMapper
 				v-else-if="parameter.type === 'resourceMapper'"
@@ -602,16 +614,16 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 				v-else-if="displayNodeParameter(parameter) && credentialsParameterIndex !== index"
 				class="parameter-item"
 			>
-				<n8n-icon-button
+				<N8nIconButton
 					v-if="hideDelete !== true && !isReadOnly && !parameter.isNodeSetting"
 					type="tertiary"
 					text
 					size="mini"
 					icon="trash"
-					class="delete-option"
-					:title="$locale.baseText('parameterInputList.delete')"
+					class="icon-button"
+					:title="i18n.baseText('parameterInputList.delete')"
 					@click="deleteOption(parameter.name)"
-				></n8n-icon-button>
+				></N8nIconButton>
 
 				<ParameterInputFull
 					:parameter="parameter"
@@ -619,7 +631,10 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 					:value="getParameterValue(parameter.name)"
 					:display-options="shouldShowOptions(parameter)"
 					:path="getPath(parameter.name)"
-					:is-read-only="isReadOnly"
+					:is-read-only="
+						isReadOnly ||
+						(parameter.disabledOptions && displayNodeParameter(parameter, 'disabledOptions'))
+					"
 					:hide-label="false"
 					:node-values="nodeValues"
 					@update="valueChanged"
@@ -635,12 +650,19 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 
 <style lang="scss">
 .parameter-input-list-wrapper {
-	.delete-option {
+	--disabled-fill: var(--color-background-base);
+	.icon-button {
 		position: absolute;
 		opacity: 0;
 		top: 0;
-		left: calc(-1 * var(--spacing-2xs));
+		left: calc(-0.5 * var(--spacing-2xs));
 		transition: opacity 100ms ease-in;
+		Button {
+			color: var(--color-icon-base);
+		}
+	}
+	.icon-button > Button:hover {
+		color: var(--color-icon-hover);
 	}
 
 	.indent > div {
@@ -660,8 +682,8 @@ function getParameterValue<T extends NodeParameterValueType = NodeParameterValue
 		position: relative;
 		margin: var(--spacing-xs) 0;
 	}
-	.parameter-item:hover > .delete-option,
-	.multi-parameter:hover > .delete-option {
+	.parameter-item:hover > .icon-button,
+	.multi-parameter:hover > .icon-button {
 		opacity: 1;
 	}
 
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index 5158d1b59a..f0db8cc457 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;
@@ -131,8 +132,11 @@ const evaluatedExpression = computed<Result<unknown, Error>>(() => {
 		}
 
 		if (props.isForCredential) opts.additionalKeys = resolvedAdditionalExpressionData.value;
-
-		return { ok: true, result: workflowHelpers.resolveExpression(value, undefined, opts) };
+		const stringifyObject = props.parameter.type !== 'multiOptions';
+		return {
+			ok: true,
+			result: workflowHelpers.resolveExpression(value, undefined, opts, stringifyObject),
+		};
 	} catch (error) {
 		return { ok: false, error };
 	}
@@ -144,7 +148,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/ParameterIssues.vue b/packages/editor-ui/src/components/ParameterIssues.vue
index e786e9895a..6c023727d4 100644
--- a/packages/editor-ui/src/components/ParameterIssues.vue
+++ b/packages/editor-ui/src/components/ParameterIssues.vue
@@ -1,34 +1,32 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script setup lang="ts">
 import TitledList from '@/components/TitledList.vue';
+import { useI18n } from '@/composables/useI18n';
+import { N8nTooltip, N8nIcon } from 'n8n-design-system';
 
-export default defineComponent({
-	name: 'ParameterIssues',
-	components: {
-		TitledList,
-	},
-	props: ['issues'],
-});
+defineProps<{
+	issues: string[];
+}>();
+
+const i18n = useI18n();
 </script>
 
 <template>
 	<div v-if="issues.length" :class="$style['parameter-issues']" data-test-id="parameter-issues">
-		<n8n-tooltip placement="top">
+		<N8nTooltip placement="top">
 			<template #content>
-				<TitledList :title="`${$locale.baseText('parameterInput.issues')}:`" :items="issues" />
+				<TitledList :title="`${i18n.baseText('parameterInput.issues')}:`" :items="issues" />
 			</template>
-			<font-awesome-icon icon="exclamation-triangle" />
-		</n8n-tooltip>
+			<N8nIcon icon="exclamation-triangle" />
+		</N8nTooltip>
 	</div>
 </template>
 
 <style module lang="scss">
 .parameter-issues {
-	width: 20px;
 	text-align: right;
 	float: right;
-	color: #ff8080;
+	color: var(--color-danger-light);
 	font-size: var(--font-size-s);
-	padding-left: var(--spacing-4xs);
+	padding-left: var(--spacing-3xs);
 }
 </style>
diff --git a/packages/editor-ui/src/components/ParameterOptions.test.ts b/packages/editor-ui/src/components/ParameterOptions.test.ts
new file mode 100644
index 0000000000..4ae7f8e226
--- /dev/null
+++ b/packages/editor-ui/src/components/ParameterOptions.test.ts
@@ -0,0 +1,135 @@
+import { renderComponent } from '@/__tests__/render';
+import userEvent from '@testing-library/user-event';
+import { within } from '@testing-library/vue';
+import { waitFor } from '@testing-library/vue';
+import ParameterOptions from './ParameterOptions.vue';
+import { setActivePinia, createPinia } from 'pinia';
+
+const DEFAULT_PARAMETER = {
+	displayName: 'Fields to Set',
+	name: 'assignments',
+	type: 'assignmentCollection',
+	default: {},
+};
+
+describe('ParameterOptions', () => {
+	let pinia: ReturnType<typeof createPinia>;
+
+	beforeEach(async () => {
+		pinia = createPinia();
+		setActivePinia(pinia);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders default options properly', () => {
+		const { getByTestId } = renderComponent(ParameterOptions, {
+			props: {
+				parameter: DEFAULT_PARAMETER,
+				isReadOnly: false,
+			},
+		});
+		expect(getByTestId('parameter-options-container')).toBeInTheDocument();
+		expect(getByTestId('action-toggle')).toBeInTheDocument();
+		expect(getByTestId('radio-button-fixed')).toBeInTheDocument();
+		expect(getByTestId('radio-button-expression')).toBeInTheDocument();
+	});
+
+	it("doesn't render expression with showExpression set to false", () => {
+		const { getByTestId, queryByTestId, container } = renderComponent(ParameterOptions, {
+			props: {
+				parameter: DEFAULT_PARAMETER,
+				isReadOnly: false,
+				showExpressionSelector: false,
+				value: 'manual',
+			},
+		});
+		expect(getByTestId('parameter-options-container')).toBeInTheDocument();
+		expect(getByTestId('action-toggle')).toBeInTheDocument();
+		expect(queryByTestId('radio-button-fixed')).not.toBeInTheDocument();
+		expect(queryByTestId('radio-button-expression')).not.toBeInTheDocument();
+		expect(container.querySelector('.noExpressionSelector')).toBeInTheDocument();
+	});
+
+	it('should render loading state', () => {
+		const CUSTOM_LOADING_MESSAGE = 'Loading...';
+		const { getByTestId, getByText } = renderComponent(ParameterOptions, {
+			props: {
+				parameter: DEFAULT_PARAMETER,
+				isReadOnly: false,
+				showExpressionSelector: false,
+				value: 'manual',
+				loading: true,
+				loadingMessage: CUSTOM_LOADING_MESSAGE,
+			},
+		});
+		expect(getByTestId('parameter-options-loader')).toBeInTheDocument();
+		expect(getByText(CUSTOM_LOADING_MESSAGE)).toBeInTheDocument();
+	});
+
+	it('should render horizontal icon', () => {
+		const { container } = renderComponent(ParameterOptions, {
+			props: {
+				parameter: DEFAULT_PARAMETER,
+				value: 'manual',
+				isReadOnly: false,
+				iconOrientation: 'horizontal',
+			},
+		});
+		expect(container.querySelector('[data-icon="ellipsis-h"]')).toBeInTheDocument();
+	});
+
+	it('should render custom actions', async () => {
+		const CUSTOM_ACTIONS = [
+			{ label: 'Action 1', value: 'action1' },
+			{ label: 'Action 2', value: 'action2' },
+		];
+		const { getByTestId } = renderComponent(ParameterOptions, {
+			props: {
+				parameter: DEFAULT_PARAMETER,
+				value: 'manual',
+				isReadOnly: false,
+				customActions: CUSTOM_ACTIONS,
+			},
+		});
+		const actionToggle = getByTestId('action-toggle');
+		const actionToggleButton = within(actionToggle).getByRole('button');
+		expect(actionToggleButton).toBeVisible();
+		await userEvent.click(actionToggle);
+		const actionToggleId = actionToggleButton.getAttribute('aria-controls');
+		const actionDropdown = document.getElementById(actionToggleId as string) as HTMLElement;
+		expect(actionDropdown).toBeInTheDocument();
+		// All custom actions should be rendered
+		CUSTOM_ACTIONS.forEach((action) => {
+			expect(within(actionDropdown).getByText(action.label)).toBeInTheDocument();
+		});
+	});
+
+	it('should emit update:modelValue when changing to expression', async () => {
+		const { emitted, getByTestId } = renderComponent(ParameterOptions, {
+			props: {
+				parameter: DEFAULT_PARAMETER,
+				value: 'manual',
+				isReadOnly: false,
+			},
+		});
+		expect(getByTestId('radio-button-expression')).toBeInTheDocument();
+		await userEvent.click(getByTestId('radio-button-expression'));
+		await waitFor(() => expect(emitted('update:modelValue')).toEqual([['addExpression']]));
+	});
+
+	it('should emit update:modelValue when changing to fixed', async () => {
+		const { emitted, getByTestId } = renderComponent(ParameterOptions, {
+			props: {
+				parameter: DEFAULT_PARAMETER,
+				value: '=manual',
+				isReadOnly: false,
+			},
+		});
+		expect(getByTestId('radio-button-fixed')).toBeInTheDocument();
+		await userEvent.click(getByTestId('radio-button-fixed'));
+		await waitFor(() => expect(emitted('update:modelValue')).toEqual([['removeExpression']]));
+	});
+});
diff --git a/packages/editor-ui/src/components/ParameterOptions.vue b/packages/editor-ui/src/components/ParameterOptions.vue
index bfe9939805..d9ed1ff4c2 100644
--- a/packages/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/editor-ui/src/components/ParameterOptions.vue
@@ -1,169 +1,145 @@
-<script lang="ts">
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
 import type { INodeProperties, NodeParameterValueType } from 'n8n-workflow';
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
 import { isResourceLocatorValue } from '@/utils/typeGuards';
 import { isValueExpression } from '@/utils/nodeTypesUtils';
-import { i18n } from '@/plugins/i18n';
+import { computed } from 'vue';
+import { useNDVStore } from '@/stores/ndv.store';
+import { AI_TRANSFORM_NODE_TYPE } from '@/constants';
 
-export default defineComponent({
-	name: 'ParameterOptions',
-	props: {
-		parameter: {
-			type: Object as PropType<INodeProperties>,
-			required: true,
-		},
-		isReadOnly: {
-			type: Boolean,
-		},
-		value: {
-			type: [Object, String, Number, Boolean, Array] as PropType<NodeParameterValueType>,
-		},
-		showOptions: {
-			type: Boolean,
-			default: true,
-		},
-		showExpressionSelector: {
-			type: Boolean,
-			default: true,
-		},
-		customActions: {
-			type: Array as PropType<Array<{ label: string; value: string; disabled?: boolean }>>,
-			default: () => [],
-		},
-		iconOrientation: {
-			type: String,
-			default: 'vertical',
-			validator: (value: string): boolean => ['horizontal', 'vertical'].includes(value),
-		},
-		loading: {
-			type: Boolean,
-			default: false,
-		},
-		loadingMessage: {
-			type: String,
-			default() {
-				return i18n.baseText('genericHelpers.loading');
-			},
-		},
-	},
-	emits: ['update:modelValue', 'menu-expanded'],
-	computed: {
-		isDefault(): boolean {
-			return this.parameter.default === this.value;
-		},
-		isValueExpression(): boolean {
-			return isValueExpression(this.parameter, this.value);
-		},
-		isHtmlEditor(): boolean {
-			return this.getArgument('editor') === 'htmlEditor';
-		},
-		shouldShowExpressionSelector(): boolean {
-			return this.parameter.noDataExpression !== true && this.showExpressionSelector;
-		},
-		shouldShowOptions(): boolean {
-			if (this.isReadOnly) {
-				return false;
-			}
+interface Props {
+	parameter: INodeProperties;
+	isReadOnly: boolean;
+	value: NodeParameterValueType;
+	showOptions?: boolean;
+	showExpressionSelector?: boolean;
+	customActions?: Array<{ label: string; value: string; disabled?: boolean }>;
+	iconOrientation?: 'horizontal' | 'vertical';
+	loading?: boolean;
+	loadingMessage?: string;
+}
 
-			if (this.parameter.type === 'collection' || this.parameter.type === 'credentialsSelect') {
-				return false;
-			}
-
-			if (['codeNodeEditor', 'sqlEditor'].includes(this.parameter.typeOptions?.editor ?? '')) {
-				return false;
-			}
-
-			if (this.showOptions) {
-				return true;
-			}
-
-			return false;
-		},
-		selectedView() {
-			if (this.isValueExpression) {
-				return 'expression';
-			}
-
-			return 'fixed';
-		},
-		hasRemoteMethod(): boolean {
-			return !!this.getArgument('loadOptionsMethod') || !!this.getArgument('loadOptions');
-		},
-		actions(): Array<{ label: string; value: string; disabled?: boolean }> {
-			if (Array.isArray(this.customActions) && this.customActions.length > 0) {
-				return this.customActions;
-			}
-
-			if (this.isHtmlEditor && !this.isValueExpression) {
-				return [
-					{
-						label: this.$locale.baseText('parameterInput.formatHtml'),
-						value: 'formatHtml',
-					},
-				];
-			}
-
-			const actions = [
-				{
-					label: this.$locale.baseText('parameterInput.resetValue'),
-					value: 'resetValue',
-					disabled: this.isDefault,
-				},
-			];
-
-			if (
-				this.hasRemoteMethod ||
-				(this.parameter.type === 'resourceLocator' &&
-					isResourceLocatorValue(this.value) &&
-					this.value.mode === 'list')
-			) {
-				return [
-					{
-						label: this.$locale.baseText('parameterInput.refreshList'),
-						value: 'refreshOptions',
-					},
-					...actions,
-				];
-			}
-
-			return actions;
-		},
-	},
-	methods: {
-		onMenuToggle(visible: boolean) {
-			this.$emit('menu-expanded', visible);
-		},
-		onViewSelected(selected: string) {
-			if (selected === 'expression') {
-				this.$emit(
-					'update:modelValue',
-					this.isValueExpression ? 'openExpression' : 'addExpression',
-				);
-			}
-
-			if (selected === 'fixed' && this.isValueExpression) {
-				this.$emit('update:modelValue', 'removeExpression');
-			}
-		},
-		getArgument(argumentName: string): string | number | boolean | undefined {
-			if (this.parameter.typeOptions === undefined) {
-				return undefined;
-			}
-
-			if (this.parameter.typeOptions[argumentName] === undefined) {
-				return undefined;
-			}
-
-			return this.parameter.typeOptions[argumentName];
-		},
-	},
+const props = withDefaults(defineProps<Props>(), {
+	showOptions: true,
+	showExpressionSelector: true,
+	customActions: () => [],
+	iconOrientation: 'vertical',
+	loading: false,
+	loadingMessage: () => useI18n().baseText('genericHelpers.loading'),
 });
+
+const emit = defineEmits<{
+	'update:modelValue': [value: string];
+	'menu-expanded': [visible: boolean];
+}>();
+
+const i18n = useI18n();
+
+const isDefault = computed(() => props.parameter.default === props.value);
+const isValueAnExpression = computed(() => isValueExpression(props.parameter, props.value));
+const isHtmlEditor = computed(() => getArgument('editor') === 'htmlEditor');
+const shouldShowExpressionSelector = computed(
+	() => !props.parameter.noDataExpression && props.showExpressionSelector && !props.isReadOnly,
+);
+const shouldShowOptions = computed(() => {
+	if (props.isReadOnly) {
+		return false;
+	}
+
+	if (props.parameter.type === 'collection' || props.parameter.type === 'credentialsSelect') {
+		return false;
+	}
+
+	if (['codeNodeEditor', 'sqlEditor'].includes(props.parameter.typeOptions?.editor ?? '')) {
+		return false;
+	}
+
+	if (props.showOptions) {
+		return true;
+	}
+
+	return false;
+});
+const selectedView = computed(() => (isValueAnExpression.value ? 'expression' : 'fixed'));
+const activeNode = computed(() => useNDVStore().activeNode);
+const hasRemoteMethod = computed(
+	() =>
+		!!props.parameter.typeOptions?.loadOptionsMethod || !!props.parameter.typeOptions?.loadOptions,
+);
+const resetValueLabel = computed(() => {
+	if (activeNode.value && [AI_TRANSFORM_NODE_TYPE].includes(activeNode.value.type)) {
+		return i18n.baseText('parameterInput.clearContents');
+	}
+
+	return i18n.baseText('parameterInput.resetValue');
+});
+
+const actions = computed(() => {
+	if (Array.isArray(props.customActions) && props.customActions.length > 0) {
+		return props.customActions;
+	}
+
+	if (isHtmlEditor.value && !isValueAnExpression.value) {
+		return [
+			{
+				label: i18n.baseText('parameterInput.formatHtml'),
+				value: 'formatHtml',
+			},
+		];
+	}
+
+	const parameterActions = [
+		{
+			label: resetValueLabel.value,
+			value: 'resetValue',
+			disabled: isDefault.value,
+		},
+	];
+
+	if (
+		hasRemoteMethod.value ||
+		(props.parameter.type === 'resourceLocator' &&
+			isResourceLocatorValue(props.value) &&
+			props.value.mode === 'list')
+	) {
+		return [
+			{
+				label: i18n.baseText('parameterInput.refreshList'),
+				value: 'refreshOptions',
+			},
+			...parameterActions,
+		];
+	}
+
+	return parameterActions;
+});
+
+const onMenuToggle = (visible: boolean) => emit('menu-expanded', visible);
+const onViewSelected = (selected: string) => {
+	if (selected === 'expression') {
+		emit('update:modelValue', isValueAnExpression.value ? 'openExpression' : 'addExpression');
+	}
+
+	if (selected === 'fixed' && isValueAnExpression.value) {
+		emit('update:modelValue', 'removeExpression');
+	}
+};
+const getArgument = (argumentName: string) => {
+	if (props.parameter.typeOptions === undefined) {
+		return undefined;
+	}
+
+	if (props.parameter.typeOptions[argumentName] === undefined) {
+		return undefined;
+	}
+
+	return props.parameter.typeOptions[argumentName];
+};
 </script>
 
 <template>
-	<div :class="$style.container">
-		<div v-if="loading" :class="$style.loader">
+	<div :class="$style.container" data-test-id="parameter-options-container">
+		<div v-if="loading" :class="$style.loader" data-test-id="parameter-options-loader">
 			<n8n-text v-if="loading" size="small">
 				<n8n-icon icon="sync-alt" size="xsmall" :spin="true" />
 				{{ loadingMessage }}
@@ -193,8 +169,8 @@ export default defineComponent({
 				:model-value="selectedView"
 				:disabled="isReadOnly"
 				:options="[
-					{ label: $locale.baseText('parameterInput.fixed'), value: 'fixed' },
-					{ label: $locale.baseText('parameterInput.expression'), value: 'expression' },
+					{ label: i18n.baseText('parameterInput.fixed'), value: 'fixed' },
+					{ label: i18n.baseText('parameterInput.expression'), value: 'expression' },
 				]"
 				@update:model-value="onViewSelected"
 			/>
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 53e40f1cfb..a4ff73147a 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -79,7 +79,6 @@ import {
 	REPORTED_SOURCE_OTHER,
 	REPORTED_SOURCE_OTHER_KEY,
 	VIEWS,
-	MORE_ONBOARDING_OPTIONS_EXPERIMENT,
 	COMMUNITY_PLUS_ENROLLMENT_MODAL,
 } from '@/constants';
 import { useToast } from '@/composables/useToast';
@@ -552,12 +551,9 @@ const onSave = () => {
 };
 
 const closeCallback = () => {
-	const isPartOfOnboardingExperiment =
-		posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
-		MORE_ONBOARDING_OPTIONS_EXPERIMENT.control;
 	// In case the redirect to homepage for new users didn't happen
 	// we try again after closing the modal
-	if (route.name !== VIEWS.HOMEPAGE && !isPartOfOnboardingExperiment) {
+	if (route.name !== VIEWS.HOMEPAGE) {
 		void router.replace({ name: VIEWS.HOMEPAGE });
 	}
 };
@@ -605,8 +601,8 @@ const onSubmit = async (values: IPersonalizationLatestVersion) => {
 <template>
 	<Modal
 		:name="PERSONALIZATION_MODAL_KEY"
-		:title="$locale.baseText('personalizationModal.customizeN8n')"
-		:subtitle="$locale.baseText('personalizationModal.theseQuestionsHelpUs')"
+		:title="i18n.baseText('personalizationModal.customizeN8n')"
+		:subtitle="i18n.baseText('personalizationModal.theseQuestionsHelpUs')"
 		:center-title="true"
 		:show-close="false"
 		:event-bus="modalBus"
@@ -633,7 +629,7 @@ const onSubmit = async (values: IPersonalizationLatestVersion) => {
 			<div>
 				<n8n-button
 					:loading="isSaving"
-					:label="$locale.baseText('personalizationModal.getStarted')"
+					:label="i18n.baseText('personalizationModal.getStarted')"
 					float="right"
 					@click="onSave"
 				/>
diff --git a/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue b/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
index ce3a238c37..fcfd437052 100644
--- a/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectCardBadge.vue
@@ -126,7 +126,7 @@ const badgeTooltip = computed(() => {
 </script>
 <template>
 	<N8nTooltip :disabled="!badgeTooltip" placement="top">
-		<div class="mr-xs">
+		<div :class="$style.wrapper" v-bind="$attrs">
 			<N8nBadge
 				v-if="badgeText"
 				:class="$style.badge"
@@ -153,6 +153,10 @@ const badgeTooltip = computed(() => {
 </template>
 
 <style lang="scss" module>
+.wrapper {
+	margin-right: var(--spacing-xs);
+}
+
 .badge {
 	padding: var(--spacing-4xs) var(--spacing-2xs);
 	background-color: var(--color-background-xlight);
diff --git a/packages/editor-ui/src/components/Projects/ProjectCreateResource.vue b/packages/editor-ui/src/components/Projects/ProjectCreateResource.vue
new file mode 100644
index 0000000000..5d4007980e
--- /dev/null
+++ b/packages/editor-ui/src/components/Projects/ProjectCreateResource.vue
@@ -0,0 +1,56 @@
+<script lang="ts" setup>
+import { N8nIconButton, N8nActionToggle } from 'n8n-design-system';
+
+type Action = {
+	label: string;
+	value: string;
+	disabled: boolean;
+};
+defineProps<{
+	actions: Action[];
+	disabled?: boolean;
+}>();
+
+const emit = defineEmits<{
+	action: [id: string];
+}>();
+</script>
+
+<template>
+	<div :class="[$style.buttonGroup]">
+		<slot></slot>
+		<N8nActionToggle
+			data-test-id="add-resource"
+			:actions="actions"
+			placement="bottom-end"
+			:teleported="false"
+			@action="emit('action', $event)"
+		>
+			<N8nIconButton :disabled="disabled" :class="[$style.buttonGroupDropdown]" icon="angle-down" />
+		</N8nActionToggle>
+	</div>
+</template>
+
+<style lang="scss" module>
+.buttonGroup {
+	display: inline-flex;
+
+	:global(> .button) {
+		border-right: 1px solid var(--button-font-color, var(--color-button-primary-font));
+
+		&:not(:first-child) {
+			border-radius: 0;
+		}
+
+		&:first-child {
+			border-top-right-radius: 0;
+			border-bottom-right-radius: 0;
+		}
+	}
+}
+
+.buttonGroupDropdown {
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+}
+</style>
diff --git a/packages/editor-ui/src/components/Projects/ProjectHeader.test.ts b/packages/editor-ui/src/components/Projects/ProjectHeader.test.ts
new file mode 100644
index 0000000000..09b652dab9
--- /dev/null
+++ b/packages/editor-ui/src/components/Projects/ProjectHeader.test.ts
@@ -0,0 +1,199 @@
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import { createTestProject } from '@/__tests__/data/projects';
+import * as router from 'vue-router';
+import type { RouteLocationNormalizedLoadedGeneric } from 'vue-router';
+import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
+import { useProjectsStore } from '@/stores/projects.store';
+import type { Project } from '@/types/projects.types';
+import { ProjectTypes } from '@/types/projects.types';
+import { VIEWS } from '@/constants';
+import userEvent from '@testing-library/user-event';
+import { waitFor, within } from '@testing-library/vue';
+
+const mockPush = vi.fn();
+vi.mock('vue-router', async () => {
+	const actual = await vi.importActual('vue-router');
+	const params = {};
+	const location = {};
+	return {
+		...actual,
+		useRouter: () => ({
+			push: mockPush,
+		}),
+		useRoute: () => ({
+			params,
+			location,
+		}),
+	};
+});
+
+const projectTabsSpy = vi.fn().mockReturnValue({
+	render: vi.fn(),
+});
+
+const renderComponent = createComponentRenderer(ProjectHeader, {
+	global: {
+		stubs: {
+			ProjectTabs: projectTabsSpy,
+		},
+	},
+});
+
+let route: ReturnType<typeof router.useRoute>;
+let projectsStore: ReturnType<typeof mockedStore<typeof useProjectsStore>>;
+
+describe('ProjectHeader', () => {
+	beforeEach(() => {
+		createTestingPinia();
+		route = router.useRoute();
+		projectsStore = mockedStore(useProjectsStore);
+
+		projectsStore.teamProjectsLimit = -1;
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should render the correct icon', async () => {
+		const { container, rerender } = renderComponent();
+
+		expect(container.querySelector('.fa-home')).toBeVisible();
+
+		projectsStore.currentProject = { type: ProjectTypes.Personal } as Project;
+		await rerender({});
+		expect(container.querySelector('.fa-user')).toBeVisible();
+
+		const projectName = 'My Project';
+		projectsStore.currentProject = { name: projectName } as Project;
+		await rerender({});
+		expect(container.querySelector('.fa-layer-group')).toBeVisible();
+	});
+
+	it('should render the correct title and subtitle', async () => {
+		const { getByText, queryByText, rerender } = renderComponent();
+		const subtitle = 'All the workflows, credentials and executions you have access to';
+
+		expect(getByText('Overview')).toBeVisible();
+		expect(getByText(subtitle)).toBeVisible();
+
+		projectsStore.currentProject = { type: ProjectTypes.Personal } as Project;
+		await rerender({});
+		expect(getByText('Personal')).toBeVisible();
+		expect(queryByText(subtitle)).not.toBeInTheDocument();
+
+		const projectName = 'My Project';
+		projectsStore.currentProject = { name: projectName } as Project;
+		await rerender({});
+		expect(getByText(projectName)).toBeVisible();
+		expect(queryByText(subtitle)).not.toBeInTheDocument();
+	});
+
+	it('should overwrite default subtitle with slot', () => {
+		const defaultSubtitle = 'All the workflows, credentials and executions you have access to';
+		const subtitle = 'Custom subtitle';
+
+		const { getByText, queryByText } = renderComponent({
+			slots: {
+				subtitle,
+			},
+		});
+
+		expect(getByText(subtitle)).toBeVisible();
+		expect(queryByText(defaultSubtitle)).not.toBeInTheDocument();
+	});
+
+	it('should render ProjectTabs Settings if project is team project and user has update scope', () => {
+		route.params.projectId = '123';
+		projectsStore.currentProject = createTestProject({ scopes: ['project:update'] });
+		renderComponent();
+
+		expect(projectTabsSpy).toHaveBeenCalledWith(
+			{
+				'show-settings': true,
+			},
+			null,
+		);
+	});
+
+	it('should render ProjectTabs without Settings if no project update permission', () => {
+		route.params.projectId = '123';
+		projectsStore.currentProject = createTestProject({ scopes: ['project:read'] });
+		renderComponent();
+
+		expect(projectTabsSpy).toHaveBeenCalledWith(
+			{
+				'show-settings': false,
+			},
+			null,
+		);
+	});
+
+	it('should render ProjectTabs without Settings if project is not team project', () => {
+		route.params.projectId = '123';
+		projectsStore.currentProject = createTestProject({
+			type: ProjectTypes.Personal,
+			scopes: ['project:update'],
+		});
+		renderComponent();
+
+		expect(projectTabsSpy).toHaveBeenCalledWith(
+			{
+				'show-settings': false,
+			},
+			null,
+		);
+	});
+
+	it('should create a workflow', async () => {
+		const project = createTestProject({
+			scopes: ['workflow:create'],
+		});
+		projectsStore.currentProject = project;
+
+		const { getByTestId } = renderComponent();
+
+		await userEvent.click(getByTestId('add-resource-workflow'));
+
+		expect(mockPush).toHaveBeenCalledWith({
+			name: VIEWS.NEW_WORKFLOW,
+			query: { projectId: project.id },
+		});
+	});
+
+	describe('dropdown', () => {
+		it('should create a credential', async () => {
+			const project = createTestProject({
+				scopes: ['credential:create'],
+			});
+			projectsStore.currentProject = project;
+
+			const { getByTestId } = renderComponent();
+
+			await userEvent.click(within(getByTestId('add-resource')).getByRole('button'));
+
+			await waitFor(() => expect(getByTestId('action-credential')).toBeVisible());
+
+			await userEvent.click(getByTestId('action-credential'));
+
+			expect(mockPush).toHaveBeenCalledWith({
+				name: VIEWS.PROJECTS_CREDENTIALS,
+				params: {
+					projectId: project.id,
+					credentialId: 'create',
+				},
+			});
+		});
+	});
+
+	it('should not render creation button in setting page', async () => {
+		projectsStore.currentProject = createTestProject({ type: ProjectTypes.Personal });
+		vi.spyOn(router, 'useRoute').mockReturnValueOnce({
+			name: VIEWS.PROJECT_SETTINGS,
+		} as RouteLocationNormalizedLoadedGeneric);
+		const { queryByTestId } = renderComponent();
+		expect(queryByTestId('add-resource-buttons')).not.toBeInTheDocument();
+	});
+});
diff --git a/packages/editor-ui/src/components/Projects/ProjectHeader.vue b/packages/editor-ui/src/components/Projects/ProjectHeader.vue
new file mode 100644
index 0000000000..80a45bfeb6
--- /dev/null
+++ b/packages/editor-ui/src/components/Projects/ProjectHeader.vue
@@ -0,0 +1,179 @@
+<script setup lang="ts">
+import { computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { N8nButton, N8nTooltip } from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
+import { type ProjectIcon, ProjectTypes } from '@/types/projects.types';
+import { useProjectsStore } from '@/stores/projects.store';
+import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
+import { getResourcePermissions } from '@/permissions';
+import { VIEWS } from '@/constants';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import ProjectCreateResource from '@/components/Projects/ProjectCreateResource.vue';
+
+const route = useRoute();
+const router = useRouter();
+const i18n = useI18n();
+const projectsStore = useProjectsStore();
+const sourceControlStore = useSourceControlStore();
+
+const headerIcon = computed((): ProjectIcon => {
+	if (projectsStore.currentProject?.type === ProjectTypes.Personal) {
+		return { type: 'icon', value: 'user' };
+	} else if (projectsStore.currentProject?.name) {
+		return projectsStore.currentProject.icon ?? { type: 'icon', value: 'layer-group' };
+	} else {
+		return { type: 'icon', value: 'home' };
+	}
+});
+
+const projectName = computed(() => {
+	if (!projectsStore.currentProject) {
+		return i18n.baseText('projects.menu.overview');
+	} else if (projectsStore.currentProject.type === ProjectTypes.Personal) {
+		return i18n.baseText('projects.menu.personal');
+	} else {
+		return projectsStore.currentProject.name;
+	}
+});
+
+const projectPermissions = computed(
+	() => getResourcePermissions(projectsStore.currentProject?.scopes).project,
+);
+
+const showSettings = computed(
+	() =>
+		!!route?.params?.projectId &&
+		!!projectPermissions.value.update &&
+		projectsStore.currentProject?.type === ProjectTypes.Team,
+);
+
+const homeProject = computed(() => projectsStore.currentProject ?? projectsStore.personalProject);
+
+const ACTION_TYPES = {
+	WORKFLOW: 'workflow',
+	CREDENTIAL: 'credential',
+} as const;
+type ActionTypes = (typeof ACTION_TYPES)[keyof typeof ACTION_TYPES];
+
+const createWorkflowButton = computed(() => ({
+	value: ACTION_TYPES.WORKFLOW,
+	label: 'Create Workflow',
+	icon: sourceControlStore.preferences.branchReadOnly ? 'lock' : undefined,
+	size: 'mini' as const,
+	disabled:
+		sourceControlStore.preferences.branchReadOnly ||
+		!getResourcePermissions(homeProject.value?.scopes).workflow.create,
+}));
+const menu = computed(() => [
+	{
+		value: ACTION_TYPES.CREDENTIAL,
+		label: 'Create credential',
+		disabled:
+			sourceControlStore.preferences.branchReadOnly ||
+			!getResourcePermissions(homeProject.value?.scopes).credential.create,
+	},
+]);
+
+const actions: Record<ActionTypes, (projectId: string) => void> = {
+	[ACTION_TYPES.WORKFLOW]: (projectId: string) => {
+		void router.push({
+			name: VIEWS.NEW_WORKFLOW,
+			query: {
+				projectId,
+			},
+		});
+	},
+	[ACTION_TYPES.CREDENTIAL]: (projectId: string) => {
+		void router.push({
+			name: VIEWS.PROJECTS_CREDENTIALS,
+			params: {
+				projectId,
+				credentialId: 'create',
+			},
+		});
+	},
+} as const;
+
+const onSelect = (action: string) => {
+	const executableAction = actions[action as ActionTypes];
+	if (!homeProject.value) {
+		return;
+	}
+	executableAction(homeProject.value.id);
+};
+</script>
+
+<template>
+	<div>
+		<div :class="$style.projectHeader">
+			<div :class="$style.projectDetails">
+				<ProjectIcon :icon="headerIcon" :border-less="true" size="medium" />
+				<div :class="$style.headerActions">
+					<N8nHeading bold tag="h2" size="xlarge">{{ projectName }}</N8nHeading>
+					<N8nText color="text-light">
+						<slot name="subtitle">
+							<span v-if="!projectsStore.currentProject">{{
+								i18n.baseText('projects.header.subtitle')
+							}}</span>
+						</slot>
+					</N8nText>
+				</div>
+			</div>
+			<div v-if="route.name !== VIEWS.PROJECT_SETTINGS" :class="[$style.headerActions]">
+				<N8nTooltip
+					:disabled="!sourceControlStore.preferences.branchReadOnly"
+					:content="i18n.baseText('readOnlyEnv.cantAdd.any')"
+				>
+					<ProjectCreateResource
+						data-test-id="add-resource-buttons"
+						:actions="menu"
+						:disabled="sourceControlStore.preferences.branchReadOnly"
+						@action="onSelect"
+					>
+						<N8nButton
+							data-test-id="add-resource-workflow"
+							v-bind="createWorkflowButton"
+							@click="onSelect(ACTION_TYPES.WORKFLOW)"
+						/>
+					</ProjectCreateResource>
+				</N8nTooltip>
+			</div>
+		</div>
+		<div :class="$style.actions">
+			<ProjectTabs :show-settings="showSettings" />
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.projectHeader,
+.projectDescription {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding-bottom: var(--spacing-m);
+	min-height: var(--spacing-3xl);
+}
+
+.projectDetails {
+	display: flex;
+	align-items: center;
+}
+
+.actions {
+	padding: var(--spacing-2xs) 0 var(--spacing-l);
+}
+
+@include mixins.breakpoint('xs-only') {
+	.projectHeader {
+		flex-direction: column;
+		align-items: flex-start;
+		gap: var(--spacing-xs);
+	}
+
+	.headerActions {
+		margin-left: auto;
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/Projects/ProjectIcon.vue b/packages/editor-ui/src/components/Projects/ProjectIcon.vue
new file mode 100644
index 0000000000..ae3c47b4e3
--- /dev/null
+++ b/packages/editor-ui/src/components/Projects/ProjectIcon.vue
@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import type { ProjectIcon } from '@/types/projects.types';
+
+type Props = {
+	icon: ProjectIcon;
+	size?: 'small' | 'medium' | 'large';
+	round?: boolean;
+	borderLess?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	size: 'medium',
+	round: false,
+	borderLess: false,
+});
+</script>
+<template>
+	<div
+		:class="[
+			$style.container,
+			$style[props.size],
+			{ [$style.round]: props.round, [$style.borderless]: props.borderLess },
+		]"
+	>
+		<N8nIcon
+			v-if="props.icon.type === 'icon'"
+			:icon="props.icon.value"
+			color="text-light"
+		></N8nIcon>
+		<N8nText v-else-if="icon.type === 'emoji'" color="text-light" :class="$style.emoji">
+			{{ icon.value }}
+		</N8nText>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	border: var(--border-width-base) var(--border-style-base) var(--color-foreground-light);
+	border-radius: var(--border-radius-base);
+
+	&.round {
+		border-radius: 50%;
+	}
+
+	&.borderless {
+		border: none;
+	}
+}
+
+.small {
+	min-width: var(--spacing-l);
+	height: var(--spacing-l);
+
+	.emoji {
+		font-size: var(--font-size-2xs);
+	}
+}
+
+.medium {
+	min-width: var(--spacing-xl);
+	height: var(--spacing-xl);
+
+	.emoji {
+		font-size: var(--font-size-xs);
+	}
+}
+
+.large {
+	// Making this in line with user avatar size
+	min-width: 40px;
+	height: 40px;
+
+	.emoji {
+		font-size: var(--font-size-s);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
index b70d843b6d..795c38e5e5 100644
--- a/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectMoveResourceModal.test.ts
@@ -33,6 +33,7 @@ describe('ProjectMoveResourceModal', () => {
 			{
 				id: '1',
 				name: 'My Project',
+				icon: { type: 'icon', value: 'folder' },
 				type: 'personal',
 				role: 'project:personalOwner',
 				createdAt: '2021-01-01T00:00:00.000Z',
diff --git a/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts b/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts
index d6a760b1d9..c22a4eb0ff 100644
--- a/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectNavigation.test.ts
@@ -1,15 +1,10 @@
-import { createComponentRenderer } from '@/__tests__/render';
+import { createRouter, createMemoryHistory } from 'vue-router';
 import { createTestingPinia } from '@pinia/testing';
-import userEvent from '@testing-library/user-event';
-import { createRouter, createMemoryHistory, useRouter } from 'vue-router';
-import { createProjectListItem } from '@/__tests__/data/projects';
-import ProjectsNavigation from '@/components/Projects//ProjectNavigation.vue';
-import { useProjectsStore } from '@/stores/projects.store';
-import { useUIStore } from '@/stores/ui.store';
+import { createComponentRenderer } from '@/__tests__/render';
 import { mockedStore } from '@/__tests__/utils';
-import type { Project } from '@/types/projects.types';
-import { VIEWS } from '@/constants';
-import { useToast } from '@/composables/useToast';
+import { createProjectListItem } from '@/__tests__/data/projects';
+import ProjectsNavigation from '@/components/Projects/ProjectNavigation.vue';
+import { useProjectsStore } from '@/stores/projects.store';
 
 vi.mock('vue-router', async () => {
 	const actual = await vi.importActual('vue-router');
@@ -36,6 +31,19 @@ vi.mock('@/composables/useToast', () => {
 	};
 });
 
+vi.mock('@/composables/usePageRedirectionHelper', () => {
+	const goToUpgrade = vi.fn();
+	return {
+		usePageRedirectionHelper: () => ({
+			goToUpgrade,
+		}),
+	};
+});
+
+vi.mock('is-emoji-supported', () => ({
+	isEmojiSupported: () => true,
+}));
+
 const renderComponent = createComponentRenderer(ProjectsNavigation, {
 	global: {
 		plugins: [
@@ -53,10 +61,7 @@ const renderComponent = createComponentRenderer(ProjectsNavigation, {
 	},
 });
 
-let router: ReturnType<typeof useRouter>;
-let toast: ReturnType<typeof useToast>;
 let projectsStore: ReturnType<typeof mockedStore<typeof useProjectsStore>>;
-let uiStore: ReturnType<typeof mockedStore<typeof useUIStore>>;
 
 const personalProjects = Array.from({ length: 3 }, createProjectListItem);
 const teamProjects = Array.from({ length: 3 }, () => createProjectListItem('team'));
@@ -65,11 +70,7 @@ describe('ProjectsNavigation', () => {
 	beforeEach(() => {
 		createTestingPinia();
 
-		router = useRouter();
-		toast = useToast();
-
 		projectsStore = mockedStore(useProjectsStore);
-		uiStore = mockedStore(useUIStore);
 	});
 
 	it('should not throw an error', () => {
@@ -83,72 +84,8 @@ describe('ProjectsNavigation', () => {
 		}).not.toThrow();
 	});
 
-	it('should not show "Add project" button when conditions are not met', async () => {
-		projectsStore.teamProjectsLimit = 0;
-		projectsStore.hasPermissionToCreateProjects = false;
-
-		const { queryByText } = renderComponent({
-			props: {
-				collapsed: false,
-			},
-		});
-
-		expect(queryByText('Add project')).not.toBeInTheDocument();
-	});
-
-	it('should show "Add project" button when conditions met', async () => {
-		projectsStore.teamProjectsLimit = -1;
-		projectsStore.hasPermissionToCreateProjects = true;
-		projectsStore.createProject.mockResolvedValue({
-			id: '1',
-			name: 'My project 1',
-		} as Project);
-
-		const { getByText } = renderComponent({
-			props: {
-				collapsed: false,
-			},
-		});
-
-		expect(getByText('Add project')).toBeVisible();
-		await userEvent.click(getByText('Add project'));
-
-		expect(projectsStore.createProject).toHaveBeenCalledWith({
-			name: 'My project',
-		});
-		expect(router.push).toHaveBeenCalledWith({
-			name: VIEWS.PROJECT_SETTINGS,
-			params: { projectId: '1' },
-		});
-		expect(toast.showMessage).toHaveBeenCalledWith({
-			title: 'Project My project 1 saved successfully',
-			type: 'success',
-		});
-	});
-
-	it('should show "Add project" button tooltip when project creation limit reached', async () => {
-		projectsStore.teamProjectsLimit = 3;
-		projectsStore.hasPermissionToCreateProjects = true;
-		projectsStore.canCreateProjects = false;
-
-		const { getByText } = renderComponent({
-			props: {
-				collapsed: false,
-				planName: 'Free',
-			},
-		});
-
-		expect(getByText('Add project')).toBeVisible();
-		await userEvent.hover(getByText('Add project'));
-
-		expect(getByText(/You have reached the Free plan limit of 3/)).toBeVisible();
-		await userEvent.click(getByText('View plans'));
-
-		expect(uiStore.goToUpgrade).toHaveBeenCalledWith('rbac', 'upgrade-rbac');
-	});
-
 	it('should show "Projects" title and Personal project when the feature is enabled', async () => {
-		projectsStore.isTeamProjectFeatureEnabled = true;
+		projectsStore.teamProjectsLimit = -1;
 		projectsStore.myProjects = [...personalProjects, ...teamProjects];
 
 		const { getByRole, getAllByTestId, getByTestId } = renderComponent({
@@ -164,7 +101,7 @@ describe('ProjectsNavigation', () => {
 	});
 
 	it('should not show "Projects" title when the menu is collapsed', async () => {
-		projectsStore.isTeamProjectFeatureEnabled = true;
+		projectsStore.teamProjectsLimit = -1;
 
 		const { queryByRole } = renderComponent({
 			props: {
@@ -176,7 +113,7 @@ describe('ProjectsNavigation', () => {
 	});
 
 	it('should not show "Projects" title when the feature is not enabled', async () => {
-		projectsStore.isTeamProjectFeatureEnabled = false;
+		projectsStore.teamProjectsLimit = 0;
 
 		const { queryByRole } = renderComponent({
 			props: {
@@ -187,8 +124,8 @@ describe('ProjectsNavigation', () => {
 		expect(queryByRole('heading', { level: 3, name: 'Projects' })).not.toBeInTheDocument();
 	});
 
-	it('should not show project icons when the menu is collapsed', async () => {
-		projectsStore.isTeamProjectFeatureEnabled = true;
+	it('should show project icons when the menu is collapsed', async () => {
+		projectsStore.teamProjectsLimit = -1;
 
 		const { getByTestId } = renderComponent({
 			props: {
@@ -197,6 +134,45 @@ describe('ProjectsNavigation', () => {
 		});
 
 		expect(getByTestId('project-personal-menu-item')).toBeVisible();
-		expect(getByTestId('project-personal-menu-item').querySelector('svg')).not.toBeInTheDocument();
+		expect(getByTestId('project-personal-menu-item').querySelector('svg')).toBeInTheDocument();
+	});
+
+	it('should not show add first project button if there are projects already', async () => {
+		projectsStore.teamProjectsLimit = -1;
+		projectsStore.myProjects = [...teamProjects];
+
+		const { queryByTestId } = renderComponent({
+			props: {
+				collapsed: false,
+			},
+		});
+
+		expect(queryByTestId('add-first-project-button')).not.toBeInTheDocument();
+	});
+
+	it('should not show project plus button and add first project button if user cannot create projects', async () => {
+		projectsStore.teamProjectsLimit = 0;
+
+		const { queryByTestId } = renderComponent({
+			props: {
+				collapsed: false,
+			},
+		});
+
+		expect(queryByTestId('project-plus-button')).not.toBeInTheDocument();
+		expect(queryByTestId('add-first-project-button')).not.toBeInTheDocument();
+	});
+
+	it('should show project plus button and add first project button if user can create projects', async () => {
+		projectsStore.teamProjectsLimit = -1;
+
+		const { getByTestId } = renderComponent({
+			props: {
+				collapsed: false,
+			},
+		});
+
+		expect(getByTestId('project-plus-button')).toBeVisible();
+		expect(getByTestId('add-first-project-button')).toBeVisible();
 	});
 });
diff --git a/packages/editor-ui/src/components/Projects/ProjectNavigation.vue b/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
index aa4fa6ab7c..57a4cac2a0 100644
--- a/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectNavigation.vue
@@ -1,14 +1,11 @@
 <script lang="ts" setup>
-import { ref, computed, onMounted, nextTick } from 'vue';
-import { useRouter } from 'vue-router';
+import { computed } from 'vue';
 import type { IMenuItem } from 'n8n-design-system/types';
 import { useI18n } from '@/composables/useI18n';
 import { VIEWS } from '@/constants';
 import { useProjectsStore } from '@/stores/projects.store';
 import type { ProjectListItem } from '@/types/projects.types';
-import { useToast } from '@/composables/useToast';
-import { useUIStore } from '@/stores/ui.store';
-import { sortByProperty } from '@/utils/sortUtils';
+import { useGlobalEntityCreation } from '@/composables/useGlobalEntityCreation';
 
 type Props = {
 	collapsed: boolean;
@@ -17,35 +14,26 @@ type Props = {
 
 const props = defineProps<Props>();
 
-const router = useRouter();
 const locale = useI18n();
-const toast = useToast();
 const projectsStore = useProjectsStore();
-const uiStore = useUIStore();
+const globalEntityCreation = useGlobalEntityCreation();
+
+const isCreatingProject = computed(() => globalEntityCreation.isCreatingProject.value);
+const displayProjects = computed(() => globalEntityCreation.displayProjects.value);
 
-const isCreatingProject = ref(false);
-const isComponentMounted = ref(false);
 const home = computed<IMenuItem>(() => ({
 	id: 'home',
-	label: locale.baseText('projects.menu.home'),
+	label: locale.baseText('projects.menu.overview'),
 	icon: 'home',
 	route: {
 		to: { name: VIEWS.HOMEPAGE },
 	},
 }));
-const addProject = computed<IMenuItem>(() => ({
-	id: 'addProject',
-	label: locale.baseText('projects.menu.addProject'),
-	icon: 'plus',
-	disabled:
-		!isComponentMounted.value || isCreatingProject.value || !projectsStore.canCreateProjects,
-	isLoading: isCreatingProject.value,
-}));
 
 const getProjectMenuItem = (project: ProjectListItem) => ({
 	id: project.id,
 	label: project.name,
-	icon: props.collapsed ? undefined : 'layer-group',
+	icon: project.icon,
 	route: {
 		to: {
 			name: VIEWS.PROJECTS_WORKFLOWS,
@@ -57,7 +45,7 @@ const getProjectMenuItem = (project: ProjectListItem) => ({
 const personalProject = computed<IMenuItem>(() => ({
 	id: projectsStore.personalProject?.id ?? '',
 	label: locale.baseText('projects.menu.personal'),
-	icon: props.collapsed ? undefined : 'user',
+	icon: 'user',
 	route: {
 		to: {
 			name: VIEWS.PROJECTS_WORKFLOWS,
@@ -66,46 +54,9 @@ const personalProject = computed<IMenuItem>(() => ({
 	},
 }));
 
-const addProjectClicked = async () => {
-	isCreatingProject.value = true;
-
-	try {
-		const newProject = await projectsStore.createProject({
-			name: locale.baseText('projects.settings.newProjectName'),
-		});
-		await router.push({ name: VIEWS.PROJECT_SETTINGS, params: { projectId: newProject.id } });
-		toast.showMessage({
-			title: locale.baseText('projects.settings.save.successful.title', {
-				interpolate: { projectName: newProject.name ?? '' },
-			}),
-			type: 'success',
-		});
-	} catch (error) {
-		toast.showError(error, locale.baseText('projects.error.title'));
-	} finally {
-		isCreatingProject.value = false;
-	}
-};
-
-const displayProjects = computed(() =>
-	sortByProperty(
-		'name',
-		projectsStore.myProjects.filter((p) => p.type === 'team'),
-	),
+const showAddFirstProject = computed(
+	() => projectsStore.isTeamProjectFeatureEnabled && !displayProjects.value.length,
 );
-
-const canCreateProjects = computed(
-	() => projectsStore.hasPermissionToCreateProjects && projectsStore.isTeamProjectFeatureEnabled,
-);
-
-const goToUpgrade = async () => {
-	await uiStore.goToUpgrade('rbac', 'upgrade-rbac');
-};
-
-onMounted(async () => {
-	await nextTick();
-	isComponentMounted.value = true;
-});
 </script>
 
 <template>
@@ -122,11 +73,20 @@ onMounted(async () => {
 		<hr v-if="projectsStore.isTeamProjectFeatureEnabled" class="mt-m mb-m" />
 		<N8nText
 			v-if="!props.collapsed && projectsStore.isTeamProjectFeatureEnabled"
-			:class="$style.projectsLabel"
+			:class="[$style.projectsLabel]"
 			tag="h3"
 			bold
 		>
 			<span>{{ locale.baseText('projects.menu.title') }}</span>
+			<N8nButton
+				v-if="projectsStore.canCreateProjects"
+				icon="plus"
+				text
+				data-test-id="project-plus-button"
+				:disabled="isCreatingProject"
+				:class="$style.plusBtn"
+				@click="globalEntityCreation.createProject"
+			/>
 		</N8nText>
 		<ElMenu
 			v-if="projectsStore.isTeamProjectFeatureEnabled"
@@ -153,39 +113,22 @@ onMounted(async () => {
 				data-test-id="project-menu-item"
 			/>
 		</ElMenu>
-		<N8nTooltip
-			v-if="canCreateProjects"
-			placement="right"
-			:disabled="projectsStore.canCreateProjects"
+		<N8nButton
+			v-if="showAddFirstProject"
+			:class="[
+				$style.addFirstProjectBtn,
+				{
+					[$style.collapsed]: props.collapsed,
+				},
+			]"
+			:disabled="isCreatingProject"
+			type="secondary"
+			icon="plus"
+			data-test-id="add-first-project-button"
+			@click="globalEntityCreation.createProject"
 		>
-			<ElMenu :collapse="props.collapsed" class="pl-xs pr-xs mb-m">
-				<N8nMenuItem
-					:item="addProject"
-					:compact="props.collapsed"
-					:handle-select="addProjectClicked"
-					mode="tabs"
-					data-test-id="add-project-menu-item"
-				/>
-			</ElMenu>
-			<template #content>
-				<i18n-t keypath="projects.create.limitReached">
-					<template #planName>{{ props.planName }}</template>
-					<template #limit>
-						{{
-							locale.baseText('projects.create.limit', {
-								adjustToNumber: projectsStore.teamProjectsLimit,
-								interpolate: { num: String(projectsStore.teamProjectsLimit) },
-							})
-						}}
-					</template>
-					<template #link>
-						<a :class="$style.upgradeLink" href="#" @click="goToUpgrade">
-							{{ locale.baseText('projects.create.limitReached.link') }}
-						</a>
-					</template>
-				</i18n-t>
-			</template>
-		</N8nTooltip>
+			{{ locale.baseText('projects.menu.addFirstProject') }}
+		</N8nButton>
 		<hr v-if="projectsStore.isTeamProjectFeatureEnabled" class="mb-m" />
 	</div>
 </template>
@@ -197,6 +140,11 @@ onMounted(async () => {
 	width: 100%;
 	overflow: hidden;
 	align-items: start;
+	&:hover {
+		.plusBtn {
+			display: block;
+		}
+	}
 }
 
 .projectItems {
@@ -215,12 +163,39 @@ onMounted(async () => {
 }
 
 .projectsLabel {
-	margin: 0 var(--spacing-xs) var(--spacing-s);
+	display: flex;
+	justify-content: space-between;
+	margin: 0 0 var(--spacing-s) var(--spacing-xs);
 	padding: 0 var(--spacing-s);
 	text-overflow: ellipsis;
 	overflow: hidden;
 	box-sizing: border-box;
 	color: var(--color-text-base);
+
+	&.collapsed {
+		padding: 0;
+		margin-left: 0;
+		justify-content: center;
+	}
+}
+
+.plusBtn {
+	margin: 0;
+	padding: 0;
+	color: var(--color-text-lighter);
+	display: none;
+}
+
+.addFirstProjectBtn {
+	font-size: var(--font-size-xs);
+	padding: var(--spacing-3xs);
+	margin: 0 var(--spacing-m) var(--spacing-m);
+
+	&.collapsed {
+		> span:last-child {
+			display: none;
+		}
+	}
 }
 </style>
 
diff --git a/packages/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue b/packages/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue
index 6a125181eb..4176c2e0c0 100644
--- a/packages/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectRoleUpgradeDialog.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { useI18n } from '@/composables/useI18n';
-import { useUIStore } from '@/stores/ui.store';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 type Props = {
 	limit: number;
@@ -9,11 +9,11 @@ type Props = {
 
 const props = defineProps<Props>();
 const visible = defineModel<boolean>();
-const uiStore = useUIStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
 const locale = useI18n();
 
 const goToUpgrade = async () => {
-	await uiStore.goToUpgrade('rbac', 'upgrade-rbac');
+	await pageRedirectionHelper.goToUpgrade('rbac', 'upgrade-rbac');
 	visible.value = false;
 };
 </script>
diff --git a/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue b/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
index 55e330dc5f..b01fe412dc 100644
--- a/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectSharingInfo.vue
@@ -19,11 +19,19 @@ const processedName = computed(() => {
 		email,
 	};
 });
+
+const projectIcon = computed(() => {
+	if (props.project.icon) {
+		return props.project.icon;
+	}
+	return null;
+});
 </script>
 <template>
 	<div :class="$style.projectInfo" data-test-id="project-sharing-info">
 		<div>
-			<N8nAvatar :first-name="processedName.firstName" :last-name="processedName.lastName" />
+			<ProjectIcon v-if="projectIcon" :icon="projectIcon" size="large" :round="true" />
+			<N8nAvatar v-else :first-name="processedName.firstName" :last-name="processedName.lastName" />
 			<div :class="$style.text">
 				<p v-if="processedName.firstName || processedName.lastName">
 					{{ processedName.firstName }} {{ processedName.lastName }}
diff --git a/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts b/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
index 45e4a74e1d..c77d7b42cf 100644
--- a/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
+++ b/packages/editor-ui/src/components/Projects/ProjectTabs.test.ts
@@ -1,22 +1,14 @@
-import { createPinia, setActivePinia } from 'pinia';
-import { useRoute } from 'vue-router';
 import { createComponentRenderer } from '@/__tests__/render';
-import { createTestProject } from '@/__tests__/data/projects';
 import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
-import { useProjectsStore } from '@/stores/projects.store';
-import { ProjectTypes } from '@/types/projects.types';
 
-vi.mock('vue-router', () => {
+vi.mock('vue-router', async () => {
+	const actual = await vi.importActual('vue-router');
 	const params = {};
-	const push = vi.fn();
 	return {
+		...actual,
 		useRoute: () => ({
 			params,
 		}),
-		useRouter: () => ({
-			push,
-		}),
-		RouterLink: vi.fn(),
 	};
 });
 const renderComponent = createComponentRenderer(ProjectTabs, {
@@ -29,54 +21,22 @@ const renderComponent = createComponentRenderer(ProjectTabs, {
 	},
 });
 
-let route: ReturnType<typeof useRoute>;
-let projectsStore: ReturnType<typeof useProjectsStore>;
-
 describe('ProjectTabs', () => {
-	beforeEach(() => {
-		const pinia = createPinia();
-		setActivePinia(pinia);
-		route = useRoute();
-		projectsStore = useProjectsStore();
-	});
-
 	it('should render home tabs', async () => {
 		const { getByText, queryByText } = renderComponent();
 
 		expect(getByText('Workflows')).toBeInTheDocument();
 		expect(getByText('Credentials')).toBeInTheDocument();
+		expect(getByText('Executions')).toBeInTheDocument();
 		expect(queryByText('Project settings')).not.toBeInTheDocument();
 	});
 
-	it('should render project tab Settings if user has permissions and current project is of type Team', () => {
-		route.params.projectId = '123';
-		projectsStore.setCurrentProject(createTestProject({ scopes: ['project:update'] }));
-		const { getByText } = renderComponent();
+	it('should render project tab Settings', () => {
+		const { getByText } = renderComponent({ props: { showSettings: true } });
 
 		expect(getByText('Workflows')).toBeInTheDocument();
 		expect(getByText('Credentials')).toBeInTheDocument();
+		expect(getByText('Executions')).toBeInTheDocument();
 		expect(getByText('Project settings')).toBeInTheDocument();
 	});
-
-	it('should render project tabs without Settings if no permission', () => {
-		route.params.projectId = '123';
-		projectsStore.setCurrentProject(createTestProject({ scopes: ['project:read'] }));
-		const { queryByText, getByText } = renderComponent();
-
-		expect(getByText('Workflows')).toBeInTheDocument();
-		expect(getByText('Credentials')).toBeInTheDocument();
-		expect(queryByText('Project settings')).not.toBeInTheDocument();
-	});
-
-	it('should render project tabs without Settings if project is the Personal project', () => {
-		route.params.projectId = '123';
-		projectsStore.setCurrentProject(
-			createTestProject({ type: ProjectTypes.Personal, scopes: ['project:update'] }),
-		);
-		const { queryByText, getByText } = renderComponent();
-
-		expect(getByText('Workflows')).toBeInTheDocument();
-		expect(getByText('Credentials')).toBeInTheDocument();
-		expect(queryByText('Project settings')).not.toBeInTheDocument();
-	});
 });
diff --git a/packages/editor-ui/src/components/Projects/ProjectTabs.vue b/packages/editor-ui/src/components/Projects/ProjectTabs.vue
index 3426f9de5f..f917a360f3 100644
--- a/packages/editor-ui/src/components/Projects/ProjectTabs.vue
+++ b/packages/editor-ui/src/components/Projects/ProjectTabs.vue
@@ -4,19 +4,15 @@ import type { RouteRecordName } from 'vue-router';
 import { useRoute } from 'vue-router';
 import { VIEWS } from '@/constants';
 import { useI18n } from '@/composables/useI18n';
-import { useProjectsStore } from '@/stores/projects.store';
-import { getResourcePermissions } from '@/permissions';
-import { ProjectTypes } from '@/types/projects.types';
+
+const props = defineProps<{
+	showSettings?: boolean;
+}>();
 
 const locale = useI18n();
 const route = useRoute();
 
-const projectsStore = useProjectsStore();
-
 const selectedTab = ref<RouteRecordName | null | undefined>('');
-const projectPermissions = computed(
-	() => getResourcePermissions(projectsStore.currentProject?.scopes).project,
-);
 const options = computed(() => {
 	const projectId = route?.params?.projectId;
 	const to = projectId
@@ -29,6 +25,10 @@ const options = computed(() => {
 					name: VIEWS.PROJECTS_CREDENTIALS,
 					params: { projectId },
 				},
+				executions: {
+					name: VIEWS.PROJECTS_EXECUTIONS,
+					params: { projectId },
+				},
 			}
 		: {
 				workflows: {
@@ -37,6 +37,9 @@ const options = computed(() => {
 				credentials: {
 					name: VIEWS.CREDENTIALS,
 				},
+				executions: {
+					name: VIEWS.EXECUTIONS,
+				},
 			};
 	const tabs = [
 		{
@@ -49,13 +52,14 @@ const options = computed(() => {
 			value: to.credentials.name,
 			to: to.credentials,
 		},
+		{
+			label: locale.baseText('mainSidebar.executions'),
+			value: to.executions.name,
+			to: to.executions,
+		},
 	];
 
-	if (
-		projectId &&
-		projectPermissions.value.update &&
-		projectsStore.currentProject?.type === ProjectTypes.Team
-	) {
+	if (props.showSettings) {
 		tabs.push({
 			label: locale.baseText('projects.settings'),
 			value: VIEWS.PROJECT_SETTINGS,
@@ -75,13 +79,5 @@ watch(
 </script>
 
 <template>
-	<div :class="$style.projectTabs">
-		<N8nTabs v-model="selectedTab" :options="options" data-test-id="project-tabs" />
-	</div>
+	<N8nTabs v-model="selectedTab" :options="options" data-test-id="project-tabs" />
 </template>
-
-<style module lang="scss">
-.projectTabs {
-	padding: var(--spacing-2xs) 0 var(--spacing-l);
-}
-</style>
diff --git a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue b/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
index 5fdfc205cd..fb15cee54a 100644
--- a/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
+++ b/packages/editor-ui/src/components/PromptMfaCodeModal/PromptMfaCodeModal.vue
@@ -6,6 +6,7 @@ import { useI18n } from '@/composables/useI18n';
 import { promptMfaCodeBus } from '@/event-bus';
 import type { IFormInputs } from '@/Interface';
 import { createFormEventBus } from 'n8n-design-system';
+import { validate as validateUuid } from 'uuid';
 
 const i18n = useI18n();
 
@@ -14,11 +15,11 @@ const readyToSubmit = ref(false);
 
 const formFields: IFormInputs = [
 	{
-		name: 'mfaCode',
+		name: 'mfaCodeOrMfaRecoveryCode',
 		initialValue: '',
 		properties: {
-			label: i18n.baseText('mfa.code.input.label'),
-			placeholder: i18n.baseText('mfa.code.input.placeholder'),
+			label: i18n.baseText('mfa.code.recovery.input.label'),
+			placeholder: i18n.baseText('mfa.code.recovery.input.placeholder'),
 			focusInitially: true,
 			capitalize: true,
 			required: true,
@@ -26,9 +27,15 @@ const formFields: IFormInputs = [
 	},
 ];
 
-function onSubmit(values: { mfaCode: string }) {
+function onSubmit(values: { mfaCodeOrMfaRecoveryCode: string }) {
+	if (validateUuid(values.mfaCodeOrMfaRecoveryCode)) {
+		promptMfaCodeBus.emit('close', {
+			mfaRecoveryCode: values.mfaCodeOrMfaRecoveryCode,
+		});
+		return;
+	}
 	promptMfaCodeBus.emit('close', {
-		mfaCode: values.mfaCode,
+		mfaCode: values.mfaCodeOrMfaRecoveryCode,
 	});
 }
 
@@ -43,7 +50,7 @@ function onFormReady(isReady: boolean) {
 
 <template>
 	<Modal
-		width="460px"
+		width="500px"
 		height="300px"
 		max-height="640px"
 		:title="i18n.baseText('mfa.prompt.code.modal.title')"
@@ -54,7 +61,7 @@ function onFormReady(isReady: boolean) {
 		<template #content>
 			<div :class="[$style.formContainer]">
 				<n8n-form-inputs
-					data-test-id="mfa-code-form"
+					data-test-id="mfa-code-or-recovery-code-input"
 					:inputs="formFields"
 					:event-bus="formBus"
 					@submit="onSubmit"
diff --git a/packages/editor-ui/src/components/PushConnectionTracker.vue b/packages/editor-ui/src/components/PushConnectionTracker.vue
index 1be8fb5b6a..66175c2af4 100644
--- a/packages/editor-ui/src/components/PushConnectionTracker.vue
+++ b/packages/editor-ui/src/components/PushConnectionTracker.vue
@@ -1,26 +1,23 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
+<script setup lang="ts">
+import { computed } from 'vue';
 import { useRootStore } from '@/stores/root.store';
+import { useI18n } from '@/composables/useI18n';
 
-export default defineComponent({
-	name: 'PushConnectionTracker',
-	computed: {
-		...mapStores(useRootStore),
-	},
-});
+const rootStore = useRootStore();
+const pushConnectionActive = computed(() => rootStore.pushConnectionActive);
+const i18n = useI18n();
 </script>
 
 <template>
 	<span>
-		<div v-if="!rootStore.pushConnectionActive" class="push-connection-lost primary-color">
+		<div v-if="!pushConnectionActive" class="push-connection-lost primary-color">
 			<n8n-tooltip placement="bottom-end">
 				<template #content>
-					<div v-n8n-html="$locale.baseText('pushConnectionTracker.cannotConnectToServer')"></div>
+					<div v-n8n-html="i18n.baseText('pushConnectionTracker.cannotConnectToServer')"></div>
 				</template>
 				<span>
 					<font-awesome-icon icon="exclamation-triangle" />&nbsp;
-					{{ $locale.baseText('pushConnectionTracker.connectionLost') }}
+					{{ i18n.baseText('pushConnectionTracker.connectionLost') }}
 				</span>
 			</n8n-tooltip>
 		</div>
diff --git a/packages/editor-ui/src/components/RBAC.vue b/packages/editor-ui/src/components/RBAC.vue
deleted file mode 100644
index 741f2771c7..0000000000
--- a/packages/editor-ui/src/components/RBAC.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<script lang="ts">
-import type { PropType } from 'vue';
-import { computed, defineComponent } from 'vue';
-import { useRBACStore } from '@/stores/rbac.store';
-import type { ScopeMode, Scope, Resource } from '@n8n/permissions';
-import {
-	inferProjectIdFromRoute,
-	inferResourceIdFromRoute,
-	inferResourceTypeFromRoute,
-} from '@/utils/rbacUtils';
-import { useRoute } from 'vue-router';
-
-export default defineComponent({
-	props: {
-		scope: {
-			type: [String, Array] as PropType<Scope | Scope[]>,
-			required: true,
-		},
-		mode: {
-			type: String as PropType<ScopeMode>,
-			default: 'allOf',
-		},
-		resourceType: {
-			type: String as PropType<Resource>,
-			default: undefined,
-		},
-		resourceId: {
-			type: String,
-			default: undefined,
-		},
-		projectId: {
-			type: String,
-			default: undefined,
-		},
-	},
-	setup(props, { slots }) {
-		const rbacStore = useRBACStore();
-		const route = useRoute();
-
-		const hasScope = computed(() => {
-			const projectId = props.projectId ?? inferProjectIdFromRoute(route);
-			const resourceType = props.resourceType ?? inferResourceTypeFromRoute(route);
-			const resourceId = resourceType
-				? (props.resourceId ?? inferResourceIdFromRoute(route))
-				: undefined;
-
-			return rbacStore.hasScope(
-				props.scope,
-				{
-					projectId,
-					resourceType,
-					resourceId,
-				},
-				{ mode: props.mode },
-			);
-		});
-
-		return () => (hasScope.value ? slots.default?.() : slots.fallback?.());
-	},
-});
-</script>
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index 19e7ef34c4..6c36ad5601 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { DynamicNodeParameters, IResourceLocatorResultExpanded } from '@/Interface';
+import type { ResourceLocatorRequestDto } from '@n8n/api-types';
+import type { IResourceLocatorResultExpanded } from '@/Interface';
 import DraggableTarget from '@/components/DraggableTarget.vue';
 import ExpressionParameterInput from '@/components/ExpressionParameterInput.vue';
 import ParameterIssues from '@/components/ParameterIssues.vue';
@@ -31,7 +32,16 @@ import type {
 	INodePropertyModeTypeOptions,
 	NodeParameterValue,
 } from 'n8n-workflow';
-import { computed, nextTick, onBeforeUnmount, onMounted, type Ref, ref, watch } from 'vue';
+import {
+	computed,
+	nextTick,
+	onBeforeUnmount,
+	onMounted,
+	type Ref,
+	ref,
+	useCssModule,
+	watch,
+} from 'vue';
 import { useRouter } from 'vue-router';
 import ResourceLocatorDropdown from './ResourceLocatorDropdown.vue';
 import { useTelemetry } from '@/composables/useTelemetry';
@@ -89,6 +99,7 @@ const workflowHelpers = useWorkflowHelpers({ router });
 const { callDebounced } = useDebounce();
 const i18n = useI18n();
 const telemetry = useTelemetry();
+const $style = useCssModule();
 
 const resourceDropdownVisible = ref(false);
 const resourceDropdownHiding = ref(false);
@@ -563,7 +574,7 @@ async function loadResources() {
 		) as INodeParameters;
 		const loadOptionsMethod = getPropertyArgument(currentMode.value, 'searchListMethod') as string;
 
-		const requestParams: DynamicNodeParameters.ResourceLocatorResultsRequest = {
+		const requestParams: ResourceLocatorRequestDto = {
 			nodeTypeAndVersion: {
 				name: props.node.type,
 				version: props.node.typeVersion,
@@ -655,7 +666,13 @@ function onListItemSelected(value: NodeParameterValue) {
 	hideResourceDropdown();
 }
 
-function onInputBlur() {
+function onInputBlur(event: FocusEvent) {
+	// Do not blur if focus is within the dropdown
+	const newTarget = event.relatedTarget;
+	if (newTarget instanceof HTMLElement && dropdownRef.value?.isWithinDropdown(newTarget)) {
+		return;
+	}
+
 	if (!isSearchable.value || currentQueryError.value) {
 		hideResourceDropdown();
 	}
@@ -689,15 +706,15 @@ function onInputBlur() {
 			<template #error>
 				<div :class="$style.error" data-test-id="rlc-error-container">
 					<n8n-text color="text-dark" align="center" tag="div">
-						{{ $locale.baseText('resourceLocator.mode.list.error.title') }}
+						{{ i18n.baseText('resourceLocator.mode.list.error.title') }}
 					</n8n-text>
 					<n8n-text v-if="hasCredential || credentialsNotSet" size="small" color="text-base">
-						{{ $locale.baseText('resourceLocator.mode.list.error.description.part1') }}
+						{{ i18n.baseText('resourceLocator.mode.list.error.description.part1') }}
 						<a v-if="credentialsNotSet" @click="createNewCredential">{{
-							$locale.baseText('resourceLocator.mode.list.error.description.part2.noCredentials')
+							i18n.baseText('resourceLocator.mode.list.error.description.part2.noCredentials')
 						}}</a>
 						<a v-else-if="hasCredential" @click="openCredential">{{
-							$locale.baseText('resourceLocator.mode.list.error.description.part2.hasCredentials')
+							i18n.baseText('resourceLocator.mode.list.error.description.part2.hasCredentials')
 						}}</a>
 					</n8n-text>
 				</div>
@@ -714,7 +731,7 @@ function onInputBlur() {
 						:model-value="selectedMode"
 						:size="inputSize"
 						:disabled="isReadOnly"
-						:placeholder="$locale.baseText('resourceLocator.modeSelector.placeholder')"
+						:placeholder="i18n.baseText('resourceLocator.modeSelector.placeholder')"
 						data-test-id="rlc-mode-selector"
 						@update:model-value="onModeSelected"
 					>
@@ -726,7 +743,7 @@ function onInputBlur() {
 							:disabled="isValueExpression && mode.name === 'list'"
 							:title="
 								isValueExpression && mode.name === 'list'
-									? $locale.baseText('resourceLocator.mode.list.disabled.title')
+									? i18n.baseText('resourceLocator.mode.list.disabled.title')
 									: ''
 							"
 						>
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
index 01c7b4071d..d726461af9 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocatorDropdown.vue
@@ -1,10 +1,11 @@
 <script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
 import type { IResourceLocatorResultExpanded } from '@/Interface';
 import { N8nLoading } from 'n8n-design-system';
 import type { EventBus } from 'n8n-design-system/utils';
 import { createEventBus } from 'n8n-design-system/utils';
 import type { NodeParameterValue } from 'n8n-workflow';
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { computed, onBeforeUnmount, onMounted, ref, useCssModule, watch } from 'vue';
 
 const SEARCH_BAR_HEIGHT_PX = 40;
 const SCROLL_MARGIN_PX = 10;
@@ -21,6 +22,9 @@ type Props = {
 	filterRequired?: boolean;
 	width?: number;
 	eventBus?: EventBus;
+	allowNewResources?: {
+		label?: string;
+	};
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -34,6 +38,7 @@ const props = withDefaults(defineProps<Props>(), {
 	errorView: false,
 	filterRequired: false,
 	width: undefined,
+	allowNewResources: () => ({}),
 	eventBus: () => createEventBus(),
 });
 
@@ -41,8 +46,12 @@ const emit = defineEmits<{
 	'update:modelValue': [value: NodeParameterValue];
 	loadMore: [];
 	filter: [filter: string];
+	addResourceClick: [];
 }>();
 
+const i18n = useI18n();
+const $style = useCssModule();
+
 const hoverIndex = ref(0);
 const showHoverUrl = ref(false);
 const searchRef = ref<HTMLInputElement>();
@@ -145,7 +154,12 @@ function onKeyDown(e: KeyboardEvent) {
 			}
 		}
 	} else if (e.key === 'Enter') {
-		emit('update:modelValue', sortedResources.value[hoverIndex.value].value);
+		const selected = sortedResources.value[hoverIndex.value]?.value;
+
+		// Selected resource can be empty when loading or empty results
+		if (selected) {
+			emit('update:modelValue', selected);
+		}
 	}
 }
 
@@ -185,6 +199,12 @@ function onResultsEnd() {
 		}
 	}
 }
+
+function isWithinDropdown(element: HTMLElement) {
+	return Boolean(element.closest('.' + $style.popover));
+}
+
+defineExpose({ isWithinDropdown });
 </script>
 
 <template>
@@ -204,7 +224,7 @@ function onResultsEnd() {
 				ref="searchRef"
 				:model-value="filter"
 				:clearable="true"
-				:placeholder="$locale.baseText('resourceLocator.search.placeholder')"
+				:placeholder="i18n.baseText('resourceLocator.search.placeholder')"
 				data-test-id="rlc-search"
 				@update:model-value="onFilterInput"
 			>
@@ -214,13 +234,13 @@ function onResultsEnd() {
 			</N8nInput>
 		</div>
 		<div v-if="filterRequired && !filter && !errorView && !loading" :class="$style.searchRequired">
-			{{ $locale.baseText('resourceLocator.mode.list.searchRequired') }}
+			{{ i18n.baseText('resourceLocator.mode.list.searchRequired') }}
 		</div>
 		<div
-			v-else-if="!errorView && sortedResources.length === 0 && !loading"
+			v-else-if="!errorView && !allowNewResources.label && sortedResources.length === 0 && !loading"
 			:class="$style.messageContainer"
 		>
-			{{ $locale.baseText('resourceLocator.mode.list.noResults') }}
+			{{ i18n.baseText('resourceLocator.mode.list.noResults') }}
 		</div>
 		<div
 			v-else-if="!errorView"
@@ -228,6 +248,24 @@ function onResultsEnd() {
 			:class="$style.container"
 			@scroll="onResultsEnd"
 		>
+			<div
+				v-if="allowNewResources.label"
+				key="addResourceKey"
+				ref="itemsRef"
+				data-test-id="rlc-item"
+				:class="{
+					[$style.resourceItem]: true,
+					[$style.hovering]: hoverIndex === 0,
+				}"
+				@mouseenter="() => onItemHover(0)"
+				@mouseleave="() => onItemHoverLeave()"
+				@click="() => emit('addResourceClick')"
+			>
+				<div :class="$style.resourceNameContainer">
+					<span :class="$style.addResourceText">{{ allowNewResources.label }}</span>
+					<font-awesome-icon :class="$style.addResourceIcon" :icon="['fa', 'plus']" />
+				</div>
+			</div>
 			<div
 				v-for="(result, i) in sortedResources"
 				:key="result.value.toString()"
@@ -235,11 +273,11 @@ function onResultsEnd() {
 				:class="{
 					[$style.resourceItem]: true,
 					[$style.selected]: result.value === modelValue,
-					[$style.hovering]: hoverIndex === i,
+					[$style.hovering]: hoverIndex === i + 1,
 				}"
 				data-test-id="rlc-item"
 				@click="() => onItemClick(result.value)"
-				@mouseenter="() => onItemHover(i)"
+				@mouseenter="() => onItemHover(i + 1)"
 				@mouseleave="() => onItemHoverLeave()"
 			>
 				<div :class="$style.resourceNameContainer">
@@ -247,9 +285,9 @@ function onResultsEnd() {
 				</div>
 				<div :class="$style.urlLink">
 					<font-awesome-icon
-						v-if="showHoverUrl && result.url && hoverIndex === i"
+						v-if="showHoverUrl && result.url && hoverIndex === i + 1"
 						icon="external-link-alt"
-						:title="result.linkAlt || $locale.baseText('resourceLocator.mode.list.openUrl')"
+						:title="result.linkAlt || i18n.baseText('resourceLocator.mode.list.openUrl')"
 						@click="openUrl($event, result.url)"
 					/>
 				</div>
@@ -376,4 +414,14 @@ function onResultsEnd() {
 .searchIcon {
 	color: var(--color-text-light);
 }
+
+.addResourceText {
+	font-weight: bold;
+}
+
+.addResourceIcon {
+	color: var(--color-text-light);
+
+	margin-left: var(--spacing-2xs);
+}
 </style>
diff --git a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts b/packages/editor-ui/src/components/ResourceMapper.test.ts
similarity index 93%
rename from packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
rename to packages/editor-ui/src/components/ResourceMapper.test.ts
index a9e42dddfd..fdc06099cf 100644
--- a/packages/editor-ui/src/components/__tests__/ResourceMapper.test.ts
+++ b/packages/editor-ui/src/components/ResourceMapper.test.ts
@@ -2,7 +2,7 @@ import {
 	DEFAULT_SETUP,
 	MAPPING_COLUMNS_RESPONSE,
 	UPDATED_SCHEMA,
-} from './utils/ResourceMapper.utils';
+} from './__tests__/utils/ResourceMapper.utils';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { cleanupAppModals, createAppModals, waitAllPromises } from '@/__tests__/utils';
 import ResourceMapper from '@/components/ResourceMapper/ResourceMapper.vue';
@@ -74,6 +74,27 @@ describe('ResourceMapper.vue', () => {
 		expect(queryByTestId('matching-column-select')).not.toBeInTheDocument();
 	});
 
+	it('renders map mode properly', async () => {
+		const { getByTestId, queryByTestId } = renderComponent(
+			{
+				props: {
+					parameter: {
+						typeOptions: {
+							resourceMapper: {
+								mode: 'map',
+							},
+						},
+					},
+				},
+			},
+			{ merge: true },
+		);
+		await waitAllPromises();
+		expect(getByTestId('resource-mapper-container')).toBeInTheDocument();
+		// This mode doesn't render matching column selector
+		expect(queryByTestId('matching-column-select')).not.toBeInTheDocument();
+	});
+
 	it('renders multi-key match selector properly', async () => {
 		const { container, getByTestId } = renderComponent(
 			{
@@ -201,7 +222,7 @@ describe('ResourceMapper.vue', () => {
 		expect(
 			getByText('Look for incoming data that matches the foos in the service'),
 		).toBeInTheDocument();
-		expect(getByText('Foos to Match On')).toBeInTheDocument();
+		expect(getByText('Foos to match on')).toBeInTheDocument();
 		expect(
 			getByText(
 				'The foos to use when matching rows in the service to the input items of this node. Usually an ID.',
diff --git a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
index aa2b17dc76..546e33cdc3 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MappingFields.vue
@@ -21,7 +21,15 @@ import {
 	parseResourceMapperFieldName,
 } from '@/utils/nodeTypesUtils';
 import { useNodeSpecificationValues } from '@/composables/useNodeSpecificationValues';
-import { N8nIconButton, N8nInputLabel, N8nOption, N8nSelect, N8nTooltip } from 'n8n-design-system';
+import {
+	N8nIcon,
+	N8nIconButton,
+	N8nInputLabel,
+	N8nOption,
+	N8nSelect,
+	N8nTooltip,
+} from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
 
 interface Props {
 	parameter: INodeProperties;
@@ -36,11 +44,13 @@ interface Props {
 	refreshInProgress: boolean;
 	teleported?: boolean;
 	isReadOnly?: boolean;
+	isDataStale?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
 	teleported: true,
 	isReadOnly: false,
+	isDataStale: false,
 });
 const FORCE_TEXT_INPUT_FOR_TYPES: FieldType[] = ['time', 'object', 'array'];
 
@@ -52,6 +62,8 @@ const {
 	pluralFieldWordCapitalized,
 } = useNodeSpecificationValues(props.parameter.typeOptions);
 
+const i18n = useI18n();
+
 const emit = defineEmits<{
 	fieldValueChanged: [value: IUpdateInformation];
 	removeField: [field: string];
@@ -304,13 +316,35 @@ defineExpose({
 					:loading="props.refreshInProgress"
 					:loading-message="fetchingFieldsLabel"
 					:is-read-only="isReadOnly"
+					:value="props.paramValue"
 					@update:model-value="onParameterActionSelected"
 				/>
+				<div v-if="props.isDataStale && !props.refreshInProgress" :class="$style.staleDataWarning">
+					<N8nTooltip>
+						<template #content>
+							<span>{{
+								locale.baseText('resourceMapper.staleDataWarning.tooltip', {
+									interpolate: { fieldWord: pluralFieldWordCapitalized },
+								})
+							}}</span>
+						</template>
+						<N8nIcon icon="exclamation-triangle" size="small" color="warning" />
+					</N8nTooltip>
+					<N8nIconButton
+						icon="refresh"
+						type="tertiary"
+						size="small"
+						:text="true"
+						:title="locale.baseText('generic.refresh')"
+						:disabled="props.refreshInProgress"
+						@click="onParameterActionSelected('refreshFieldList')"
+					/>
+				</div>
 			</template>
 		</N8nInputLabel>
 		<div v-if="orderedFields.length === 0" class="mt-3xs mb-xs">
 			<N8nText size="small">{{
-				$locale.baseText('fixedCollectionParameter.currentlyNoItemsExist')
+				i18n.baseText('fixedCollectionParameter.currentlyNoItemsExist')
 			}}</N8nText>
 		</div>
 		<div
@@ -356,7 +390,7 @@ defineExpose({
 					:title="
 						locale.baseText('resourceMapper.removeField', {
 							interpolate: {
-								fieldWord: singularFieldWordCapitalized,
+								fieldWord: singularFieldWord,
 							},
 						})
 					"
@@ -387,7 +421,7 @@ defineExpose({
 			<N8nSelect
 				:placeholder="
 					locale.baseText('resourceMapper.addFieldToSend', {
-						interpolate: { fieldWord: singularFieldWordCapitalized },
+						interpolate: { fieldWord: singularFieldWord },
 					})
 				"
 				size="small"
@@ -438,4 +472,11 @@ defineExpose({
 	margin-top: var(--spacing-l);
 	padding: 0 0 0 var(--spacing-s);
 }
+
+.staleDataWarning {
+	display: flex;
+	height: var(--spacing-m);
+	align-items: baseline;
+	gap: var(--spacing-5xs);
+}
 </style>
diff --git a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
index 7a40e24400..e663190c95 100644
--- a/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/MatchingColumnsSelect.vue
@@ -187,6 +187,7 @@ defineExpose({
 					:loading="props.refreshInProgress"
 					:loading-message="fetchingFieldsLabel"
 					:is-read-only="isReadOnly"
+					:value="state.selected"
 					@update:model-value="onParameterActionSelected"
 				/>
 			</template>
diff --git a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
index 78fb095235..c4ef8d8161 100644
--- a/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
+++ b/packages/editor-ui/src/components/ResourceMapper/ResourceMapper.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import type { IUpdateInformation, DynamicNodeParameters } from '@/Interface';
+import type { ResourceMapperFieldsRequestDto } from '@n8n/api-types';
+import type { IUpdateInformation } from '@/Interface';
 import { resolveRequiredParameters } from '@/composables/useWorkflowHelpers';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import type {
@@ -7,7 +8,9 @@ import type {
 	INodeParameters,
 	INodeProperties,
 	INodeTypeDescription,
+	NodeParameterValueType,
 	ResourceMapperField,
+	ResourceMapperFields,
 	ResourceMapperValue,
 } from 'n8n-workflow';
 import { NodeHelpers } from 'n8n-workflow';
@@ -15,11 +18,17 @@ import { computed, onMounted, reactive, watch } from 'vue';
 import MappingModeSelect from './MappingModeSelect.vue';
 import MatchingColumnsSelect from './MatchingColumnsSelect.vue';
 import MappingFields from './MappingFields.vue';
-import { fieldCannotBeDeleted, parseResourceMapperFieldName } from '@/utils/nodeTypesUtils';
+import {
+	fieldCannotBeDeleted,
+	isResourceMapperFieldListStale,
+	parseResourceMapperFieldName,
+} from '@/utils/nodeTypesUtils';
 import { isFullExecutionResponse, isResourceMapperValue } from '@/utils/typeGuards';
 import { i18n as locale } from '@/plugins/i18n';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useDocumentVisibility } from '@/composables/useDocumentVisibility';
+import { N8nButton, N8nCallout } from 'n8n-design-system';
 
 type Props = {
 	parameter: INodeProperties;
@@ -42,6 +51,8 @@ const props = withDefaults(defineProps<Props>(), {
 	isReadOnly: false,
 });
 
+const { onDocumentVisible } = useDocumentVisibility();
+
 const emit = defineEmits<{
 	valueChanged: [value: IUpdateInformation];
 }>();
@@ -52,11 +63,17 @@ const state = reactive({
 		value: {},
 		matchingColumns: [] as string[],
 		schema: [] as ResourceMapperField[],
+		attemptToConvertTypes: false,
+		// This should always be true if `showTypeConversionOptions` is provided
+		// It's used to avoid accepting any value as string without casting it
+		// Which is the legacy behavior without these type options.
+		convertFieldsToString: false,
 	} as ResourceMapperValue,
 	parameterValues: {} as INodeParameters,
 	loading: false,
 	refreshInProgress: false, // Shows inline loader when refreshing fields
 	loadingError: false,
+	hasStaleFields: false,
 });
 
 // Reload fields to map when dependent parameters change
@@ -76,6 +93,21 @@ watch(
 	},
 );
 
+onDocumentVisible(async () => {
+	await checkStaleFields();
+});
+
+async function checkStaleFields(): Promise<void> {
+	const fetchedFields = await fetchFields();
+	if (fetchedFields) {
+		const isSchemaStale = isResourceMapperFieldListStale(
+			state.paramValue.schema,
+			fetchedFields.fields,
+		);
+		state.hasStaleFields = isSchemaStale;
+	}
+}
+
 // Reload fields to map when node is executed
 watch(
 	() => workflowsStore.getWorkflowExecution,
@@ -97,6 +129,10 @@ onMounted(async () => {
 			...state.parameterValues,
 			parameters: props.node.parameters,
 		};
+
+		if (showTypeConversionOptions.value) {
+			state.paramValue.convertFieldsToString = true;
+		}
 	}
 	const params = state.parameterValues.parameters as INodeParameters;
 	const parameterName = props.parameter.name;
@@ -138,6 +174,8 @@ onMounted(async () => {
 	if (!hasSchema) {
 		// Only fetch a schema if it's not already set
 		await initFetching();
+	} else {
+		await checkStaleFields();
 	}
 	// Set default values if this is the first time the parameter is being set
 	if (!state.paramValue.value) {
@@ -161,11 +199,19 @@ const showMappingModeSelect = computed<boolean>(() => {
 	return props.parameter.typeOptions?.resourceMapper?.supportAutoMap !== false;
 });
 
+const showTypeConversionOptions = computed<boolean>(() => {
+	return props.parameter.typeOptions?.resourceMapper?.showTypeConversionOptions === true;
+});
+
+const hasFields = computed<boolean>(() => {
+	return state.paramValue.schema.length > 0;
+});
+
 const showMatchingColumnsSelector = computed<boolean>(() => {
 	return (
 		!state.loading &&
-		props.parameter.typeOptions?.resourceMapper?.mode !== 'add' &&
-		state.paramValue.schema.length > 0
+		['upsert', 'update'].includes(props.parameter.typeOptions?.resourceMapper?.mode ?? '') &&
+		hasFields.value
 	);
 });
 
@@ -174,7 +220,7 @@ const showMappingFields = computed<boolean>(() => {
 		state.paramValue.mappingMode === 'defineBelow' &&
 		!state.loading &&
 		!state.loadingError &&
-		state.paramValue.schema.length > 0 &&
+		hasFields.value &&
 		hasAvailableMatchingColumns.value
 	);
 });
@@ -190,7 +236,11 @@ const matchingColumns = computed<string[]>(() => {
 });
 
 const hasAvailableMatchingColumns = computed<boolean>(() => {
-	if (resourceMapperMode.value !== 'add') {
+	// 'map' mode doesn't require matching columns
+	if (resourceMapperMode.value === 'map') {
+		return true;
+	}
+	if (resourceMapperMode.value !== 'add' && resourceMapperMode.value !== 'upsert') {
 		return (
 			state.paramValue.schema.filter(
 				(field) =>
@@ -227,10 +277,11 @@ async function initFetching(inlineLoading = false): Promise<void> {
 		state.loading = true;
 	}
 	try {
-		await loadFieldsToMap();
+		await loadAndSetFieldsToMap();
 		if (!state.paramValue.matchingColumns || state.paramValue.matchingColumns.length === 0) {
 			onMatchingColumnsChanged(defaultSelectedMatchingColumns.value);
 		}
+		state.hasStaleFields = false;
 	} catch (error) {
 		state.loadingError = true;
 	} finally {
@@ -239,19 +290,13 @@ async function initFetching(inlineLoading = false): Promise<void> {
 	}
 }
 
-async function loadFieldsToMap(): Promise<void> {
+const createRequestParams = (methodName: string) => {
 	if (!props.node) {
 		return;
 	}
-
-	const methodName = props.parameter.typeOptions?.resourceMapper?.resourceMapperMethod;
-	if (typeof methodName !== 'string') {
-		return;
-	}
-
-	const requestParams: DynamicNodeParameters.ResourceMapperFieldsRequest = {
+	const requestParams: ResourceMapperFieldsRequestDto = {
 		nodeTypeAndVersion: {
-			name: props.node?.type,
+			name: props.node.type,
 			version: props.node.typeVersion,
 		},
 		currentNodeParameters: resolveRequiredParameters(
@@ -262,7 +307,38 @@ async function loadFieldsToMap(): Promise<void> {
 		methodName,
 		credentials: props.node.credentials,
 	};
-	const fetchedFields = await nodeTypesStore.getResourceMapperFields(requestParams);
+
+	return requestParams;
+};
+
+async function fetchFields(): Promise<ResourceMapperFields | null> {
+	const { resourceMapperMethod, localResourceMapperMethod } =
+		props.parameter.typeOptions?.resourceMapper ?? {};
+
+	let fetchedFields = null;
+
+	if (typeof resourceMapperMethod === 'string') {
+		const requestParams = createRequestParams(
+			resourceMapperMethod,
+		) as ResourceMapperFieldsRequestDto;
+		fetchedFields = await nodeTypesStore.getResourceMapperFields(requestParams);
+	} else if (typeof localResourceMapperMethod === 'string') {
+		const requestParams = createRequestParams(
+			localResourceMapperMethod,
+		) as ResourceMapperFieldsRequestDto;
+
+		fetchedFields = await nodeTypesStore.getLocalResourceMapperFields(requestParams);
+	}
+	return fetchedFields;
+}
+
+async function loadAndSetFieldsToMap(): Promise<void> {
+	if (!props.node) {
+		return;
+	}
+
+	const fetchedFields = await fetchFields();
+
 	if (fetchedFields !== null) {
 		const newSchema = fetchedFields.fields.map((field) => {
 			const existingField = state.paramValue.schema.find((f) => f.id === field.id);
@@ -417,14 +493,20 @@ function addField(name: string): void {
 	if (name === 'removeAllFields') {
 		return removeAllFields();
 	}
+	const schema = state.paramValue.schema;
+	const field = schema.find((f) => f.id === name);
+
 	state.paramValue.value = {
 		...state.paramValue.value,
-		[name]: null,
+		// We only supply boolean defaults since it's a switch that cannot be null in `Fixed` mode
+		// Other defaults may break backwards compatibility as we'd remove the implicit passthrough
+		// mode you get when the field exists, but is empty in `Fixed` mode.
+		[name]: field?.type === 'boolean' ? false : null,
 	};
-	const field = state.paramValue.schema.find((f) => f.id === name);
+
 	if (field) {
 		field.removed = false;
-		state.paramValue.schema.splice(state.paramValue.schema.indexOf(field), 1, field);
+		schema.splice(schema.indexOf(field), 1, field);
 	}
 	emitValueChanged();
 }
@@ -531,11 +613,26 @@ defineExpose({
 			:teleported="teleported"
 			:refresh-in-progress="state.refreshInProgress"
 			:is-read-only="isReadOnly"
+			:is-data-stale="state.hasStaleFields"
 			@field-value-changed="fieldValueChanged"
 			@remove-field="removeField"
 			@add-field="addField"
 			@refresh-field-list="initFetching(true)"
 		/>
+		<N8nCallout v-else-if="state.hasStaleFields" theme="info" :iconless="true">
+			{{ locale.baseText('resourceMapper.staleDataWarning.notice') }}
+			<template #trailingContent>
+				<N8nButton
+					size="mini"
+					icon="refresh"
+					type="secondary"
+					:loading="state.refreshInProgress"
+					@click="initFetching(true)"
+				>
+					{{ locale.baseText('generic.refresh') }}
+				</N8nButton>
+			</template>
+		</N8nCallout>
 		<N8nNotice
 			v-if="state.paramValue.mappingMode === 'autoMapInputData' && hasAvailableMatchingColumns"
 		>
@@ -548,5 +645,32 @@ defineExpose({
 				})
 			}}
 		</N8nNotice>
+		<div v-if="showTypeConversionOptions && hasFields" :class="$style.typeConversionOptions">
+			<ParameterInputFull
+				:parameter="{
+					name: 'attemptToConvertTypes',
+					type: 'boolean',
+					displayName: locale.baseText('resourceMapper.attemptToConvertTypes.displayName'),
+					default: false,
+					description: locale.baseText('resourceMapper.attemptToConvertTypes.description'),
+				}"
+				:path="props.path + '.attemptToConvertTypes'"
+				:value="state.paramValue.attemptToConvertTypes"
+				@update="
+					(x: IUpdateInformation<NodeParameterValueType>) => {
+						state.paramValue.attemptToConvertTypes = x.value as boolean;
+						emitValueChanged();
+					}
+				"
+			/>
+		</div>
 	</div>
 </template>
+
+<style module lang="scss">
+.typeConversionOptions {
+	display: grid;
+	padding: var(--spacing-m);
+	gap: var(--spacing-2xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/RunData.test.ts b/packages/editor-ui/src/components/RunData.test.ts
new file mode 100644
index 0000000000..26a58b06ac
--- /dev/null
+++ b/packages/editor-ui/src/components/RunData.test.ts
@@ -0,0 +1,509 @@
+import { createTestWorkflowObject, defaultNodeDescriptions } from '@/__tests__/mocks';
+import { createComponentRenderer } from '@/__tests__/render';
+import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
+import RunData from '@/components/RunData.vue';
+import { SET_NODE_TYPE, STORES } from '@/constants';
+import type { INodeUi, IRunDataDisplayMode, NodePanelType } from '@/Interface';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { waitFor } from '@testing-library/vue';
+import type { INodeExecutionData, ITaskData, ITaskMetadata } from 'n8n-workflow';
+import { setActivePinia } from 'pinia';
+import { useNodeTypesStore } from '../stores/nodeTypes.store';
+
+const MOCK_EXECUTION_URL = 'execution.url/123';
+
+const { trackOpeningRelatedExecution, resolveRelatedExecutionUrl } = vi.hoisted(() => ({
+	trackOpeningRelatedExecution: vi.fn(),
+	resolveRelatedExecutionUrl: vi.fn(),
+}));
+
+vi.mock('vue-router', () => {
+	return {
+		useRouter: () => ({}),
+		useRoute: () => ({ meta: {} }),
+		RouterLink: vi.fn(),
+	};
+});
+
+vi.mock('@/composables/useExecutionHelpers', () => ({
+	useExecutionHelpers: () => ({
+		trackOpeningRelatedExecution,
+		resolveRelatedExecutionUrl,
+	}),
+}));
+
+const nodes = [
+	{
+		id: '1',
+		typeVersion: 3,
+		name: 'Test Node',
+		position: [0, 0],
+		type: SET_NODE_TYPE,
+		parameters: {},
+	},
+] as INodeUi[];
+
+describe('RunData', () => {
+	beforeAll(() => {
+		resolveRelatedExecutionUrl.mockReturnValue('execution.url/123');
+	});
+
+	it("should render pin button in output panel disabled when there's binary data", () => {
+		const { getByTestId } = render({
+			defaultRunItems: [
+				{
+					json: {},
+					binary: {
+						data: {
+							fileName: 'test.xyz',
+							mimeType: 'application/octet-stream',
+							data: '',
+						},
+					},
+				},
+			],
+			displayMode: 'binary',
+		});
+
+		expect(getByTestId('ndv-pin-data')).toBeInTheDocument();
+		expect(getByTestId('ndv-pin-data')).toHaveAttribute('disabled');
+	});
+
+	it("should not render pin button in input panel when there's binary data", () => {
+		const { queryByTestId } = render({
+			defaultRunItems: [
+				{
+					json: {},
+					binary: {
+						data: {
+							fileName: 'test.xyz',
+							mimeType: 'application/octet-stream',
+							data: '',
+						},
+					},
+				},
+			],
+			displayMode: 'binary',
+			paneType: 'input',
+		});
+
+		expect(queryByTestId('ndv-pin-data')).not.toBeInTheDocument();
+	});
+
+	it('should render data correctly even when "item.json" has another "json" key', async () => {
+		const { getByText, getAllByTestId, getByTestId } = render({
+			defaultRunItems: [
+				{
+					json: {
+						id: 1,
+						name: 'Test 1',
+						json: {
+							data: 'Json data 1',
+						},
+					},
+				},
+				{
+					json: {
+						id: 2,
+						name: 'Test 2',
+						json: {
+							data: 'Json data 2',
+						},
+					},
+				},
+			],
+			displayMode: 'schema',
+		});
+
+		await userEvent.click(getByTestId('ndv-pin-data'));
+		await waitFor(() => getAllByTestId('run-data-schema-item'), { timeout: 1000 });
+		expect(getByText('Test 1')).toBeInTheDocument();
+		expect(getByText('Json data 1')).toBeInTheDocument();
+	});
+
+	it('should render view and download buttons for PDFs', async () => {
+		const { getByTestId } = render({
+			defaultRunItems: [
+				{
+					json: {},
+					binary: {
+						data: {
+							fileName: 'test.pdf',
+							fileType: 'pdf',
+							mimeType: 'application/pdf',
+							data: '',
+						},
+					},
+				},
+			],
+			displayMode: 'binary',
+		});
+
+		await waitFor(() => {
+			expect(getByTestId('ndv-view-binary-data')).toBeInTheDocument();
+			expect(getByTestId('ndv-download-binary-data')).toBeInTheDocument();
+			expect(getByTestId('ndv-binary-data_0')).toBeInTheDocument();
+		});
+	});
+
+	it('should not render a view button for unknown content-type', async () => {
+		const { getByTestId, queryByTestId } = render({
+			defaultRunItems: [
+				{
+					json: {},
+					binary: {
+						data: {
+							fileName: 'test.xyz',
+							mimeType: 'application/octet-stream',
+							data: '',
+						},
+					},
+				},
+			],
+			displayMode: 'binary',
+		});
+
+		await waitFor(() => {
+			expect(queryByTestId('ndv-view-binary-data')).not.toBeInTheDocument();
+			expect(getByTestId('ndv-download-binary-data')).toBeInTheDocument();
+			expect(getByTestId('ndv-binary-data_0')).toBeInTheDocument();
+		});
+	});
+
+	it('should not render pin data button when there is no output data', async () => {
+		const { queryByTestId } = render({ defaultRunItems: [], displayMode: 'table' });
+		expect(queryByTestId('ndv-pin-data')).not.toBeInTheDocument();
+	});
+
+	it('should disable pin data button when data is pinned', async () => {
+		const { getByTestId } = render({
+			defaultRunItems: [],
+			displayMode: 'table',
+			pinnedData: [{ json: { name: 'Test' } }],
+		});
+		const pinDataButton = getByTestId('ndv-pin-data');
+		expect(pinDataButton).toBeDisabled();
+	});
+
+	it('should render callout when data is pinned in output panel', async () => {
+		const { getByTestId } = render({
+			defaultRunItems: [],
+			displayMode: 'table',
+			pinnedData: [{ json: { name: 'Test' } }],
+			paneType: 'output',
+		});
+		const pinnedDataCallout = getByTestId('ndv-pinned-data-callout');
+		expect(pinnedDataCallout).toBeInTheDocument();
+	});
+
+	it('should not render callout when data is pinned in input panel', async () => {
+		const { queryByTestId } = render({
+			defaultRunItems: [],
+			displayMode: 'table',
+			pinnedData: [{ json: { name: 'Test' } }],
+			paneType: 'input',
+		});
+		const pinnedDataCallout = queryByTestId('ndv-pinned-data-callout');
+		expect(pinnedDataCallout).not.toBeInTheDocument();
+	});
+
+	it('should enable pin data button when data is not pinned', async () => {
+		const { getByTestId } = render({
+			defaultRunItems: [{ json: { name: 'Test' } }],
+			displayMode: 'table',
+		});
+		const pinDataButton = getByTestId('ndv-pin-data');
+		expect(pinDataButton).toBeEnabled();
+	});
+
+	it('should not render pagination on binary tab', async () => {
+		const { queryByTestId } = render({
+			defaultRunItems: Array.from({ length: 11 }).map((_, i) => ({
+				json: {
+					data: {
+						id: i,
+						name: `Test ${i}`,
+					},
+				},
+				binary: {
+					data: {
+						a: 'b',
+						data: '',
+						mimeType: '',
+					},
+				},
+			})),
+			displayMode: 'binary',
+		});
+		expect(queryByTestId('ndv-data-pagination')).not.toBeInTheDocument();
+	});
+
+	it('should render pagination with binary data on non-binary tab', async () => {
+		const { getByTestId } = render({
+			defaultRunItems: Array.from({ length: 11 }).map((_, i) => ({
+				json: {
+					data: {
+						id: i,
+						name: `Test ${i}`,
+					},
+				},
+				binary: {
+					data: {
+						a: 'b',
+						data: '',
+						mimeType: '',
+					},
+				},
+			})),
+			displayMode: 'json',
+		});
+		expect(getByTestId('ndv-data-pagination')).toBeInTheDocument();
+	});
+
+	it('should render sub-execution link in header', async () => {
+		const metadata: ITaskMetadata = {
+			subExecution: {
+				workflowId: 'xyz',
+				executionId: '123',
+			},
+			subExecutionsCount: 1,
+		};
+		const { getByTestId } = render({
+			defaultRunItems: [
+				{
+					json: {},
+				},
+			],
+			displayMode: 'table',
+			paneType: 'output',
+			metadata,
+		});
+
+		expect(getByTestId('related-execution-link')).toBeInTheDocument();
+		expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution');
+		expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
+		expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
+
+		expect(getByTestId('ndv-items-count')).toHaveTextContent('1 item, 1 sub-execution');
+
+		getByTestId('related-execution-link').click();
+		expect(trackOpeningRelatedExecution).toHaveBeenCalledWith(metadata, 'table');
+	});
+
+	it('should render parent-execution link in header', async () => {
+		const metadata: ITaskMetadata = {
+			parentExecution: {
+				workflowId: 'xyz',
+				executionId: '123',
+			},
+		};
+		const { getByTestId } = render({
+			defaultRunItems: [
+				{
+					json: {},
+				},
+			],
+			displayMode: 'table',
+			paneType: 'output',
+			metadata,
+		});
+
+		expect(getByTestId('related-execution-link')).toBeInTheDocument();
+		expect(getByTestId('related-execution-link')).toHaveTextContent('View parent execution');
+		expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
+		expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
+
+		expect(getByTestId('ndv-items-count')).toHaveTextContent('1 item');
+
+		getByTestId('related-execution-link').click();
+		expect(trackOpeningRelatedExecution).toHaveBeenCalledWith(metadata, 'table');
+	});
+
+	it('should render sub-execution link in header with multiple items', async () => {
+		const metadata: ITaskMetadata = {
+			subExecution: {
+				workflowId: 'xyz',
+				executionId: '123',
+			},
+			subExecutionsCount: 3,
+		};
+		const { getByTestId } = render({
+			defaultRunItems: [
+				{
+					json: {},
+				},
+				{
+					json: {},
+				},
+			],
+			displayMode: 'json',
+			paneType: 'output',
+			metadata,
+		});
+
+		expect(getByTestId('related-execution-link')).toBeInTheDocument();
+		expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution 123');
+		expect(resolveRelatedExecutionUrl).toHaveBeenCalledWith(metadata);
+		expect(getByTestId('related-execution-link')).toHaveAttribute('href', MOCK_EXECUTION_URL);
+
+		expect(getByTestId('ndv-items-count')).toHaveTextContent('2 items, 3 sub-executions');
+
+		getByTestId('related-execution-link').click();
+		expect(trackOpeningRelatedExecution).toHaveBeenCalledWith(metadata, 'json');
+	});
+
+	it('should render sub-execution link in header with multiple runs', async () => {
+		const metadata: ITaskMetadata = {
+			subExecution: {
+				workflowId: 'xyz',
+				executionId: '123',
+			},
+			subExecutionsCount: 3,
+		};
+		const { getByTestId, queryByTestId } = render({
+			runs: [
+				{
+					startTime: new Date().getTime(),
+					executionTime: new Date().getTime(),
+					data: {
+						main: [[{ json: {} }]],
+					},
+					source: [null],
+					metadata,
+				},
+				{
+					startTime: new Date().getTime(),
+					executionTime: new Date().getTime(),
+					data: {
+						main: [[{ json: {} }]],
+					},
+					source: [null],
+					metadata,
+				},
+			],
+			displayMode: 'json',
+			paneType: 'output',
+			metadata,
+		});
+
+		expect(getByTestId('related-execution-link')).toBeInTheDocument();
+		expect(getByTestId('related-execution-link')).toHaveTextContent('View sub-execution 123');
+
+		expect(queryByTestId('ndv-items-count')).not.toBeInTheDocument();
+		expect(getByTestId('run-selector')).toBeInTheDocument();
+
+		getByTestId('related-execution-link').click();
+		expect(trackOpeningRelatedExecution).toHaveBeenCalledWith(metadata, 'json');
+	});
+
+	const render = ({
+		defaultRunItems,
+		displayMode,
+		pinnedData,
+		paneType = 'output',
+		metadata,
+		runs,
+	}: {
+		defaultRunItems?: INodeExecutionData[];
+		displayMode: IRunDataDisplayMode;
+		pinnedData?: INodeExecutionData[];
+		paneType?: NodePanelType;
+		metadata?: ITaskMetadata;
+		runs?: ITaskData[];
+	}) => {
+		const defaultRun: ITaskData = {
+			startTime: new Date().getTime(),
+			executionTime: new Date().getTime(),
+			data: {
+				main: [defaultRunItems ?? [{ json: {} }]],
+			},
+			source: [null],
+			metadata,
+		};
+
+		const pinia = createTestingPinia({
+			stubActions: false,
+			initialState: {
+				[STORES.SETTINGS]: SETTINGS_STORE_DEFAULT_STATE,
+				[STORES.NDV]: {
+					outputPanelDisplayMode: displayMode,
+					activeNodeName: 'Test Node',
+				},
+				[STORES.WORKFLOWS]: {
+					workflow: {
+						nodes,
+					},
+					workflowExecutionData: {
+						id: '1',
+						finished: true,
+						mode: 'trigger',
+						startedAt: new Date(),
+						workflowData: {
+							id: '1',
+							name: 'Test Workflow',
+							versionId: '1',
+							createdAt: new Date().toISOString(),
+							updatedAt: new Date().toISOString(),
+							active: false,
+							nodes: [],
+							connections: {},
+						},
+						data: {
+							resultData: {
+								runData: {
+									'Test Node': runs ?? [defaultRun],
+								},
+							},
+						},
+					},
+				},
+			},
+		});
+
+		setActivePinia(pinia);
+
+		const workflowsStore = useWorkflowsStore();
+		const nodeTypesStore = useNodeTypesStore();
+
+		nodeTypesStore.setNodeTypes(defaultNodeDescriptions);
+		vi.mocked(workflowsStore).getNodeByName.mockReturnValue(nodes[0]);
+
+		if (pinnedData) {
+			vi.mocked(workflowsStore).pinDataByNodeName.mockReturnValue(pinnedData);
+		}
+
+		return createComponentRenderer(RunData, {
+			props: {
+				node: {
+					name: 'Test Node',
+				},
+				workflow: createTestWorkflowObject({
+					nodes,
+				}),
+			},
+			global: {
+				stubs: {
+					RunDataPinButton: { template: '<button data-test-id="ndv-pin-data"></button>' },
+				},
+			},
+		})({
+			props: {
+				node: {
+					id: '1',
+					name: 'Test Node',
+					type: SET_NODE_TYPE,
+					position: [0, 0],
+				},
+				nodes: [{ name: 'Test Node', indicies: [], depth: 1 }],
+				runIndex: 0,
+				paneType,
+				isExecuting: false,
+				mappingEnabled: true,
+				distanceFromActive: 0,
+			},
+			pinia,
+		});
+	};
+});
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 1c2d0b78a6..4afe97682c 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -1,27 +1,24 @@
-<script lang="ts">
-import { defineAsyncComponent, defineComponent, toRef } from 'vue';
-import type { PropType } from 'vue';
-import { mapStores } from 'pinia';
+<script setup lang="ts">
 import { useStorage } from '@/composables/useStorage';
 import { saveAs } from 'file-saver';
-import type {
-	IBinaryData,
-	IBinaryKeyData,
-	IDataObject,
-	INodeExecutionData,
-	INodeOutputConfiguration,
-	INodeTypeDescription,
-	IRunData,
-	IRunExecutionData,
-	NodeHint,
-	NodeError,
-	Workflow,
-	IConnectedNode,
+import {
+	type IBinaryData,
+	type IConnectedNode,
+	type IDataObject,
+	type INodeExecutionData,
+	type INodeOutputConfiguration,
+	type IRunData,
+	type IRunExecutionData,
+	type ITaskMetadata,
+	type NodeError,
+	type NodeHint,
+	type Workflow,
+	TRIMMED_TASK_DATA_CONNECTIONS_KEY,
 } from 'n8n-workflow';
-import { NodeHelpers, NodeConnectionType } from 'n8n-workflow';
+import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+import { computed, defineAsyncComponent, onBeforeUnmount, onMounted, ref, toRef, watch } from 'vue';
 
 import type {
-	IExecutionResponse,
 	INodeUi,
 	INodeUpdatePropertiesInformation,
 	IRunDataDisplayMode,
@@ -30,40 +27,60 @@ import type {
 } from '@/Interface';
 
 import {
-	DATA_PINNING_DOCS_URL,
 	DATA_EDITING_DOCS_URL,
-	NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND,
-	LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG,
+	DATA_PINNING_DOCS_URL,
+	HTML_NODE_TYPE,
 	LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG,
+	LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG,
 	MAX_DISPLAY_DATA_SIZE,
 	MAX_DISPLAY_DATA_SIZE_SCHEMA_VIEW,
-	MAX_DISPLAY_ITEMS_AUTO_ALL,
+	NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND,
 	TEST_PIN_DATA,
-	HTML_NODE_TYPE,
 } from '@/constants';
 
 import BinaryDataDisplay from '@/components/BinaryDataDisplay.vue';
 import NodeErrorView from '@/components/Error/NodeErrorView.vue';
 import JsonEditor from '@/components/JsonEditor/JsonEditor.vue';
 
-import type { PinDataSource, UnpinDataSource } from '@/composables/usePinnedData';
-import { usePinnedData } from '@/composables/usePinnedData';
-import { dataPinningEventBus } from '@/event-bus';
-import { clearJsonKey, isEmpty } from '@/utils/typesUtils';
-import { executionDataToJson } from '@/utils/nodeTypesUtils';
-import { searchInObject } from '@/utils/objectUtils';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useNDVStore } from '@/stores/ndv.store';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import RunDataPinButton from '@/components/RunDataPinButton.vue';
+import { useExternalHooks } from '@/composables/useExternalHooks';
+import { useI18n } from '@/composables/useI18n';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useNodeType } from '@/composables/useNodeType';
+import type { PinDataSource, UnpinDataSource } from '@/composables/usePinnedData';
+import { usePinnedData } from '@/composables/usePinnedData';
+import { useTelemetry } from '@/composables/useTelemetry';
 import { useToast } from '@/composables/useToast';
-import { isEqual, isObject } from 'lodash-es';
-import { useExternalHooks } from '@/composables/useExternalHooks';
-import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { dataPinningEventBus } from '@/event-bus';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRootStore } from '@/stores/root.store';
-import RunDataPinButton from '@/components/RunDataPinButton.vue';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
 import { getGenericHints } from '@/utils/nodeViewUtils';
+import { searchInObject } from '@/utils/objectUtils';
+import { clearJsonKey, isEmpty } from '@/utils/typesUtils';
+import { isEqual, isObject } from 'lodash-es';
+import {
+	N8nBlockUi,
+	N8nButton,
+	N8nCallout,
+	N8nIconButton,
+	N8nInfoTip,
+	N8nLink,
+	N8nOption,
+	N8nRadioButtons,
+	N8nSelect,
+	N8nSpinner,
+	N8nTabs,
+	N8nText,
+	N8nTooltip,
+} from 'n8n-design-system';
+import { storeToRefs } from 'pinia';
+import { useRoute } from 'vue-router';
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import { useUIStore } from '@/stores/ui.store';
 
 const LazyRunDataTable = defineAsyncComponent(
 	async () => await import('@/components/RunDataTable.vue'),
@@ -71,8 +88,9 @@ const LazyRunDataTable = defineAsyncComponent(
 const LazyRunDataJson = defineAsyncComponent(
 	async () => await import('@/components/RunDataJson.vue'),
 );
+
 const LazyRunDataSchema = defineAsyncComponent(
-	async () => await import('@/components/RunDataSchema.vue'),
+	async () => await import('@/components/VirtualSchema.vue'),
 );
 const LazyRunDataHtml = defineAsyncComponent(
 	async () => await import('@/components/RunDataHtml.vue'),
@@ -85,1140 +103,1195 @@ export type EnterEditModeArgs = {
 	origin: 'editIconButton' | 'insertTestDataLink';
 };
 
-export default defineComponent({
-	name: 'RunData',
-	components: {
-		BinaryDataDisplay,
-		NodeErrorView,
-		JsonEditor,
-		LazyRunDataTable,
-		LazyRunDataJson,
-		LazyRunDataSchema,
-		LazyRunDataHtml,
-		LazyRunDataSearch,
-		RunDataPinButton,
-	},
-	props: {
-		node: {
-			type: Object as PropType<INodeUi | null>,
-			default: null,
-		},
-		nodes: {
-			type: Array as PropType<IConnectedNode[]>,
-			default: () => [],
-		},
-		workflow: {
-			type: Object as PropType<Workflow>,
-			required: true,
-		},
-		runIndex: {
-			type: Number,
-			required: true,
-		},
-		linkedRuns: {
-			type: Boolean,
-		},
-		canLinkRuns: {
-			type: Boolean,
-		},
-		tooMuchDataTitle: {
-			type: String,
-		},
-		noDataInBranchMessage: {
-			type: String,
-		},
-		isExecuting: {
-			type: Boolean,
-		},
-		executingMessage: {
-			type: String,
-		},
-		pushRef: {
-			type: String,
-		},
-		paneType: {
-			type: String as PropType<NodePanelType>,
-			required: true,
-		},
-		overrideOutputs: {
-			type: Array as PropType<number[]>,
-		},
-		mappingEnabled: {
-			type: Boolean,
-		},
-		distanceFromActive: {
-			type: Number,
-			default: 0,
-		},
-		blockUI: {
-			type: Boolean,
-			default: false,
-		},
-		isProductionExecutionPreview: {
-			type: Boolean,
-			default: false,
-		},
-		isPaneActive: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	setup(props) {
-		const ndvStore = useNDVStore();
-		const nodeHelpers = useNodeHelpers();
-		const externalHooks = useExternalHooks();
-		const node = toRef(props, 'node');
-		const pinnedData = usePinnedData(node, {
-			runIndex: props.runIndex,
-			displayMode: ndvStore.getPanelDisplayMode(props.paneType),
-		});
-		const { isSubNodeType } = useNodeType({
-			node,
-		});
-
-		return {
-			...useToast(),
-			externalHooks,
-			nodeHelpers,
-			pinnedData,
-			isSubNodeType,
-		};
-	},
-	data() {
-		return {
-			connectionType: NodeConnectionType.Main as NodeConnectionType,
-			binaryDataPreviewActive: false,
-			dataSize: 0,
-			showData: false,
-			userEnabledShowData: false,
-			outputIndex: 0,
-			binaryDataDisplayVisible: false,
-			binaryDataDisplayData: null as IBinaryData | null,
-
-			MAX_DISPLAY_DATA_SIZE,
-			MAX_DISPLAY_DATA_SIZE_SCHEMA_VIEW,
-			MAX_DISPLAY_ITEMS_AUTO_ALL,
-			currentPage: 1,
-			pageSize: 10,
-			pageSizes: [1, 10, 25, 50, 100],
-
-			pinDataDiscoveryTooltipVisible: false,
-			isControlledPinDataTooltip: false,
-			search: '',
-		};
-	},
-	computed: {
-		...mapStores(
-			useNodeTypesStore,
-			useNDVStore,
-			useWorkflowsStore,
-			useSourceControlStore,
-			useRootStore,
-		),
-		isReadOnlyRoute() {
-			return this.$route?.meta?.readOnlyCanvas === true;
-		},
-		isWaitNodeWaiting() {
-			return (
-				this.workflowExecution?.status === 'waiting' &&
-				this.workflowExecution.data?.waitTill &&
-				this.workflowExecution?.data?.resultData?.lastNodeExecuted === this.node?.name
-			);
-		},
-		activeNode(): INodeUi | null {
-			return this.ndvStore.activeNode;
-		},
-		dataPinningDocsUrl(): string {
-			return DATA_PINNING_DOCS_URL;
-		},
-		dataEditingDocsUrl(): string {
-			return DATA_EDITING_DOCS_URL;
-		},
-		displayMode(): IRunDataDisplayMode {
-			return this.ndvStore.getPanelDisplayMode(this.paneType);
-		},
-		nodeType(): INodeTypeDescription | null {
-			if (this.node) {
-				return this.nodeTypesStore.getNodeType(this.node.type, this.node.typeVersion);
-			}
-			return null;
-		},
-		isSchemaView(): boolean {
-			return this.displayMode === 'schema';
-		},
-		displaysMultipleNodes(): boolean {
-			return this.isSchemaView && this.paneType === 'input' && this.nodes.length > 0;
-		},
-		isTriggerNode(): boolean {
-			if (this.node === null) {
-				return false;
-			}
-			return this.nodeTypesStore.isTriggerNode(this.node.type);
-		},
-		showPinButton(): boolean {
-			if (!this.rawInputData.length && !this.pinnedData.hasData.value) {
-				return false;
-			}
-
-			if (this.editMode.enabled) {
-				return false;
-			}
-
-			if (this.binaryData?.length) {
-				return this.isPaneTypeOutput;
-			}
-
-			return this.canPinData;
-		},
-		pinButtonDisabled(): boolean {
-			return (
-				this.pinnedData.hasData.value ||
-				!this.rawInputData.length ||
-				!!this.binaryData?.length ||
-				this.isReadOnlyRoute ||
-				this.readOnlyEnv
-			);
-		},
-		canPinData(): boolean {
-			if (this.node === null) {
-				return false;
-			}
-
-			const canPinNode = usePinnedData(this.node).canPinNode(false);
-
-			return (
-				canPinNode &&
-				!this.isPaneTypeInput &&
-				this.pinnedData.isValidNodeType.value &&
-				!(this.binaryData && this.binaryData.length > 0)
-			);
-		},
-		displayModes(): Array<{ label: string; value: string }> {
-			const defaults = [
-				{ label: this.$locale.baseText('runData.table'), value: 'table' },
-				{ label: this.$locale.baseText('runData.json'), value: 'json' },
-			];
-
-			if (this.binaryData.length) {
-				defaults.push({ label: this.$locale.baseText('runData.binary'), value: 'binary' });
-			}
-
-			const schemaView = { label: this.$locale.baseText('runData.schema'), value: 'schema' };
-			if (this.isPaneTypeInput) {
-				defaults.unshift(schemaView);
-			} else {
-				defaults.push(schemaView);
-			}
-
-			if (
-				this.isPaneTypeOutput &&
-				this.activeNode?.type === HTML_NODE_TYPE &&
-				this.activeNode.parameters.operation === 'generateHtmlTemplate'
-			) {
-				defaults.unshift({ label: 'HTML', value: 'html' });
-			}
-
-			return defaults;
-		},
-		hasNodeRun(): boolean {
-			return Boolean(
-				!this.isExecuting &&
-					this.node &&
-					((this.workflowRunData && this.workflowRunData.hasOwnProperty(this.node.name)) ||
-						this.pinnedData.hasData.value),
-			);
-		},
-		isArtificialRecoveredEventItem(): boolean {
-			return !!this.rawInputData?.[0]?.json?.isArtificialRecoveredEventItem;
-		},
-		subworkflowExecutionError(): NodeError {
-			return {
-				node: this.node,
-				messages: [this.workflowsStore.subWorkflowExecutionError?.message ?? ''],
-			} as NodeError;
-		},
-		hasSubworkflowExecutionError(): boolean {
-			return Boolean(this.workflowsStore.subWorkflowExecutionError);
-		},
-		workflowRunErrorAsNodeError(): NodeError | null {
-			if (!this.node) {
-				return null;
-			}
-
-			// If the node is a sub-node, we need to get the parent node error to check for input errors
-			if (this.isSubNodeType && this.paneType === 'input') {
-				const parentNode = this.workflow.getChildNodes(this.node?.name ?? '', 'ALL_NON_MAIN')[0];
-				return this.workflowRunData?.[parentNode]?.[this.runIndex]?.error as NodeError;
-			}
-			return this.workflowRunData?.[this.node?.name]?.[this.runIndex]?.error as NodeError;
-		},
-		hasRunError(): boolean {
-			return Boolean(this.node && this.workflowRunErrorAsNodeError);
-		},
-		executionHints(): NodeHint[] {
-			if (this.hasNodeRun) {
-				const hints = this.node && this.workflowRunData?.[this.node.name]?.[this.runIndex]?.hints;
-
-				if (hints) return hints;
-			}
-
-			return [];
-		},
-		workflowExecution(): IExecutionResponse | null {
-			return this.workflowsStore.getWorkflowExecution;
-		},
-		workflowRunData(): IRunData | null {
-			if (this.workflowExecution === null) {
-				return null;
-			}
-			const executionData: IRunExecutionData | undefined = this.workflowExecution.data;
-			if (executionData?.resultData) {
-				return executionData.resultData.runData;
-			}
-			return null;
-		},
-		dataCount(): number {
-			return this.getDataCount(this.runIndex, this.currentOutputIndex);
-		},
-		unfilteredDataCount(): number {
-			return this.pinnedData.data.value
-				? this.pinnedData.data.value.length
-				: this.rawInputData.length;
-		},
-		dataSizeInMB(): string {
-			return (this.dataSize / (1024 * 1024)).toFixed(1);
-		},
-		maxOutputIndex(): number {
-			if (this.node === null || this.runIndex === undefined) {
-				return 0;
-			}
-
-			const runData: IRunData | null = this.workflowRunData;
-
-			if (runData === null || !runData.hasOwnProperty(this.node.name)) {
-				return 0;
-			}
-
-			if (runData[this.node.name].length < this.runIndex) {
-				return 0;
-			}
-
-			if (runData[this.node.name][this.runIndex]) {
-				const taskData = runData[this.node.name][this.runIndex].data;
-				if (taskData?.main) {
-					return taskData.main.length - 1;
-				}
-			}
-
-			return 0;
-		},
-		currentPageOffset(): number {
-			return this.pageSize * (this.currentPage - 1);
-		},
-		maxRunIndex(): number {
-			if (this.node === null) {
-				return 0;
-			}
-
-			const runData: IRunData | null = this.workflowRunData;
-
-			if (runData === null || !runData.hasOwnProperty(this.node.name)) {
-				return 0;
-			}
-
-			if (runData[this.node.name].length) {
-				return runData[this.node.name].length - 1;
-			}
-
-			return 0;
-		},
-		rawInputData(): INodeExecutionData[] {
-			return this.getRawInputData(this.runIndex, this.currentOutputIndex, this.connectionType);
-		},
-		unfilteredInputData(): INodeExecutionData[] {
-			return this.getPinDataOrLiveData(this.rawInputData);
-		},
-		inputData(): INodeExecutionData[] {
-			return this.getFilteredData(this.unfilteredInputData);
-		},
-		inputDataPage(): INodeExecutionData[] {
-			const offset = this.pageSize * (this.currentPage - 1);
-			return this.inputData.slice(offset, offset + this.pageSize);
-		},
-		jsonData(): IDataObject[] {
-			return executionDataToJson(this.inputData);
-		},
-		binaryData(): IBinaryKeyData[] {
-			if (!this.node) {
-				return [];
-			}
-
-			const binaryData = this.nodeHelpers.getBinaryData(
-				this.workflowRunData,
-				this.node.name,
-				this.runIndex,
-				this.currentOutputIndex,
-			);
-			return binaryData.filter((data) => Boolean(data && Object.keys(data).length));
-		},
-		inputHtml(): string {
-			return String(this.inputData[0]?.json?.html ?? '');
-		},
-		currentOutputIndex(): number {
-			if (this.overrideOutputs?.length && !this.overrideOutputs.includes(this.outputIndex)) {
-				return this.overrideOutputs[0];
-			}
-
-			return this.outputIndex;
-		},
-		branches(): ITab[] {
-			const capitalize = (name: string) => name.charAt(0).toLocaleUpperCase() + name.slice(1);
-
-			const branches: ITab[] = [];
-
-			for (let i = 0; i <= this.maxOutputIndex; i++) {
-				if (this.overrideOutputs && !this.overrideOutputs.includes(i)) {
-					continue;
-				}
-				const totalItemsCount = this.getRawInputData(this.runIndex, i).length;
-				const itemsCount = this.getDataCount(this.runIndex, i);
-				const items = this.search
-					? this.$locale.baseText('ndv.search.items', {
-							adjustToNumber: totalItemsCount,
-							interpolate: { matched: itemsCount, total: totalItemsCount },
-						})
-					: this.$locale.baseText('ndv.output.items', {
-							adjustToNumber: itemsCount,
-							interpolate: { count: itemsCount },
-						});
-				let outputName = this.getOutputName(i);
-
-				if (`${outputName}` === `${i}`) {
-					outputName = `${this.$locale.baseText('ndv.output')} ${outputName}`;
-				} else {
-					const appendBranchWord = NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND.includes(
-						this.node?.type ?? '',
-					)
-						? ''
-						: ` ${this.$locale.baseText('ndv.output.branch')}`;
-					outputName = capitalize(`${this.getOutputName(i)}${appendBranchWord}`);
-				}
-				branches.push({
-					label:
-						(this.search && itemsCount) || totalItemsCount
-							? `${outputName} (${items})`
-							: outputName,
-					value: i,
-				});
-			}
-			return branches;
-		},
-		editMode(): { enabled: boolean; value: string } {
-			return this.isPaneTypeInput
-				? { enabled: false, value: '' }
-				: this.ndvStore.outputPanelEditMode;
-		},
-		isPaneTypeInput(): boolean {
-			return this.paneType === 'input';
-		},
-		isPaneTypeOutput(): boolean {
-			return this.paneType === 'output';
-		},
-		readOnlyEnv(): boolean {
-			return this.sourceControlStore.preferences.branchReadOnly;
-		},
-		showIOSearch(): boolean {
-			return this.hasNodeRun && !this.hasRunError && this.unfilteredInputData.length > 0;
-		},
-		inputSelectLocation() {
-			if (this.isSchemaView) return 'none';
-			if (!this.hasNodeRun) return 'header';
-			if (this.maxRunIndex > 0) return 'runs';
-			if (this.maxOutputIndex > 0 && this.branches.length > 1) {
-				return 'outputs';
-			}
-
-			return 'items';
-		},
-		showIoSearchNoMatchContent(): boolean {
-			return this.hasNodeRun && !this.inputData.length && !!this.search;
-		},
-		parentNodeOutputData(): INodeExecutionData[] {
-			const parentNode = this.workflow.getParentNodesByDepth(this.node?.name ?? '')[0];
-			let parentNodeData: INodeExecutionData[] = [];
-
-			if (parentNode?.name) {
-				parentNodeData = this.nodeHelpers.getNodeInputData(
-					this.workflow.getNode(parentNode?.name),
-					this.runIndex,
-					this.outputIndex,
-					'input',
-					this.connectionType,
-				);
-			}
-
-			return parentNodeData;
-		},
-		parentNodePinnedData(): INodeExecutionData[] {
-			const parentNode = this.workflow.getParentNodesByDepth(this.node?.name ?? '')[0];
-			return this.workflow.pinData?.[parentNode?.name || ''] || [];
-		},
-	},
-	watch: {
-		node(newNode: INodeUi, prevNode: INodeUi) {
-			if (newNode?.id === prevNode?.id) return;
-			this.init();
-		},
-		hasNodeRun() {
-			if (this.paneType === 'output') this.setDisplayMode();
-		},
-		inputDataPage: {
-			handler(data: INodeExecutionData[]) {
-				if (this.paneType && data) {
-					this.ndvStore.setNDVPanelDataIsEmpty({
-						panel: this.paneType as 'input' | 'output',
-						isEmpty: data.every((item) => isEmpty(item.json)),
-					});
-				}
-			},
-			immediate: true,
-			deep: true,
-		},
-		jsonData(data: IDataObject[], prevData: IDataObject[]) {
-			if (isEqual(data, prevData)) return;
-			this.refreshDataSize();
-			if (this.dataCount) {
-				this.resetCurrentPageIfTooFar();
-			}
-			this.showPinDataDiscoveryTooltip(data);
-		},
-		binaryData(newData: IBinaryKeyData[], prevData: IBinaryKeyData[]) {
-			if (newData.length && !prevData.length && this.displayMode !== 'binary') {
-				this.switchToBinary();
-			} else if (!newData.length && this.displayMode === 'binary') {
-				this.onDisplayModeChange('table');
-			}
-		},
-		currentOutputIndex(branchIndex: number) {
-			this.ndvStore.setNDVBranchIndex({
-				pane: this.paneType as 'input' | 'output',
-				branchIndex,
-			});
-		},
-		search(newSearch: string) {
-			this.$emit('search', newSearch);
-		},
-	},
-	mounted() {
-		this.init();
-
-		if (!this.isPaneTypeInput) {
-			this.showPinDataDiscoveryTooltip(this.jsonData);
-		}
-		this.ndvStore.setNDVBranchIndex({
-			pane: this.paneType as 'input' | 'output',
-			branchIndex: this.currentOutputIndex,
-		});
-
-		if (this.paneType === 'output') {
-			this.setDisplayMode();
-			this.activatePane();
-		}
-
-		if (this.hasRunError && this.node) {
-			const error = this.workflowRunData?.[this.node.name]?.[this.runIndex]?.error;
-			const errorsToTrack = ['unknown error'];
-
-			if (error && errorsToTrack.some((e) => error.message?.toLowerCase().includes(e))) {
-				this.$telemetry.track(
-					'User encountered an error',
-					{
-						node: this.node.type,
-						errorMessage: error.message,
-						nodeVersion: this.node.typeVersion,
-						n8nVersion: this.rootStore.versionCli,
-					},
-					{
-						withPostHog: true,
-					},
-				);
-			}
-		}
-	},
-	beforeUnmount() {
-		this.hidePinDataDiscoveryTooltip();
-	},
-	methods: {
-		getResolvedNodeOutputs() {
-			if (this.node && this.nodeType) {
-				const workflowNode = this.workflow.getNode(this.node.name);
-
-				if (workflowNode) {
-					const outputs = NodeHelpers.getNodeOutputs(this.workflow, workflowNode, this.nodeType);
-					return outputs;
-				}
-			}
-			return [];
-		},
-		shouldHintBeDisplayed(hint: NodeHint): boolean {
-			const { location, whenToDisplay } = hint;
-
-			if (location) {
-				if (location === 'ndv' && !['input', 'output'].includes(this.paneType)) {
-					return false;
-				}
-				if (location === 'inputPane' && this.paneType !== 'input') {
-					return false;
-				}
-
-				if (location === 'outputPane' && this.paneType !== 'output') {
-					return false;
-				}
-			}
-
-			if (whenToDisplay === 'afterExecution' && !this.hasNodeRun) {
-				return false;
-			}
-
-			if (whenToDisplay === 'beforeExecution' && this.hasNodeRun) {
-				return false;
-			}
-
-			return true;
-		},
-		getNodeHints(): NodeHint[] {
-			try {
-				if (this.node && this.nodeType) {
-					const workflowNode = this.workflow.getNode(this.node.name);
-
-					if (workflowNode) {
-						const executionHints = this.executionHints;
-
-						const nodeHints = NodeHelpers.getNodeHints(this.workflow, workflowNode, this.nodeType, {
-							runExecutionData: this.workflowExecution?.data ?? null,
-							runIndex: this.runIndex,
-							connectionInputData: this.parentNodeOutputData,
-						});
-
-						const hasMultipleInputItems =
-							this.parentNodeOutputData.length > 1 || this.parentNodePinnedData.length > 1;
-
-						const nodeOutputData =
-							this.workflowRunData?.[this.node.name]?.[this.runIndex]?.data?.main?.[0] || [];
-
-						const genericHints = getGenericHints({
-							workflowNode,
-							node: this.node,
-							nodeType: this.nodeType,
-							nodeOutputData,
-							workflow: this.workflow,
-							hasNodeRun: this.hasNodeRun,
-							hasMultipleInputItems,
-						});
-
-						return executionHints
-							.concat(nodeHints, genericHints)
-							.filter(this.shouldHintBeDisplayed);
-					}
-				}
-			} catch (error) {
-				console.error('Error while getting node hints', error);
-			}
-
-			return [];
-		},
-		onItemHover(itemIndex: number | null) {
-			if (itemIndex === null) {
-				this.$emit('itemHover', null);
-
-				return;
-			}
-			this.$emit('itemHover', {
-				outputIndex: this.currentOutputIndex,
-				itemIndex,
-			});
-		},
-		onClickDataPinningDocsLink() {
-			this.$telemetry.track('User clicked ndv link', {
-				workflow_id: this.workflowsStore.workflowId,
-				push_ref: this.pushRef,
-				node_type: this.activeNode?.type,
-				pane: 'output',
-				type: 'data-pinning-docs',
-			});
-		},
-		showPinDataDiscoveryTooltip(value: IDataObject[]) {
-			if (!this.isTriggerNode) {
-				return;
-			}
-
-			const pinDataDiscoveryFlag = useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG).value;
-
-			if (value && value.length > 0 && !this.isReadOnlyRoute && !pinDataDiscoveryFlag) {
-				this.pinDataDiscoveryComplete();
-
-				setTimeout(() => {
-					this.isControlledPinDataTooltip = true;
-					this.pinDataDiscoveryTooltipVisible = true;
-					dataPinningEventBus.emit('data-pinning-discovery', { isTooltipVisible: true });
-				}, 500); // Wait for NDV to open
-			}
-		},
-		hidePinDataDiscoveryTooltip() {
-			if (this.pinDataDiscoveryTooltipVisible) {
-				this.isControlledPinDataTooltip = false;
-				this.pinDataDiscoveryTooltipVisible = false;
-				dataPinningEventBus.emit('data-pinning-discovery', { isTooltipVisible: false });
-			}
-		},
-		pinDataDiscoveryComplete() {
-			useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG).value = 'true';
-			useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG).value = 'true';
-		},
-		enterEditMode({ origin }: EnterEditModeArgs) {
-			const inputData = this.pinnedData.data.value
-				? clearJsonKey(this.pinnedData.data.value)
-				: executionDataToJson(this.rawInputData);
-
-			const inputDataLength = Array.isArray(inputData)
-				? inputData.length
-				: Object.keys(inputData ?? {}).length;
-
-			const data = inputDataLength > 0 ? inputData : TEST_PIN_DATA;
-
-			this.ndvStore.setOutputPanelEditModeEnabled(true);
-			this.ndvStore.setOutputPanelEditModeValue(JSON.stringify(data, null, 2));
-
-			this.$telemetry.track('User opened ndv edit state', {
-				node_type: this.activeNode?.type,
-				click_type: origin === 'editIconButton' ? 'button' : 'link',
-				push_ref: this.pushRef,
-				run_index: this.runIndex,
-				is_output_present: this.hasNodeRun || this.pinnedData.hasData.value,
-				view: !this.hasNodeRun && !this.pinnedData.hasData.value ? 'undefined' : this.displayMode,
-				is_data_pinned: this.pinnedData.hasData.value,
-			});
-		},
-		onClickCancelEdit() {
-			this.ndvStore.setOutputPanelEditModeEnabled(false);
-			this.ndvStore.setOutputPanelEditModeValue('');
-			this.onExitEditMode({ type: 'cancel' });
-		},
-		onClickSaveEdit() {
-			if (!this.node) {
-				return;
-			}
-
-			const { value } = this.editMode;
-
-			this.clearAllStickyNotifications();
-
-			try {
-				const clearedValue = clearJsonKey(value) as INodeExecutionData[];
-				try {
-					this.pinnedData.setData(clearedValue, 'save-edit');
-				} catch (error) {
-					// setData function already shows toasts on error, so just return here
-					return;
-				}
-			} catch (error) {
-				this.showError(error, this.$locale.baseText('ndv.pinData.error.syntaxError.title'));
-				return;
-			}
-
-			this.ndvStore.setOutputPanelEditModeEnabled(false);
-
-			this.onExitEditMode({ type: 'save' });
-		},
-		onExitEditMode({ type }: { type: 'save' | 'cancel' }) {
-			this.$telemetry.track('User closed ndv edit state', {
-				node_type: this.activeNode?.type,
-				push_ref: this.pushRef,
-				run_index: this.runIndex,
-				view: this.displayMode,
-				type,
-			});
-		},
-		async onTogglePinData({ source }: { source: PinDataSource | UnpinDataSource }) {
-			if (!this.node) {
-				return;
-			}
-
-			if (source === 'pin-icon-click') {
-				const telemetryPayload = {
-					node_type: this.activeNode?.type,
-					push_ref: this.pushRef,
-					run_index: this.runIndex,
-					view: !this.hasNodeRun && !this.pinnedData.hasData.value ? 'none' : this.displayMode,
-				};
-
-				void this.externalHooks.run('runData.onTogglePinData', telemetryPayload);
-				this.$telemetry.track('User clicked pin data icon', telemetryPayload);
-			}
-
-			this.nodeHelpers.updateNodeParameterIssues(this.node);
-
-			if (this.pinnedData.hasData.value) {
-				this.pinnedData.unsetData(source);
-				return;
-			}
-
-			try {
-				this.pinnedData.setData(this.rawInputData, 'pin-icon-click');
-			} catch (error) {
-				console.error(error);
-				return;
-			}
-
-			if (this.maxRunIndex > 0) {
-				this.showToast({
-					title: this.$locale.baseText('ndv.pinData.pin.multipleRuns.title', {
-						interpolate: {
-							index: `${this.runIndex}`,
-						},
-					}),
-					message: this.$locale.baseText('ndv.pinData.pin.multipleRuns.description'),
-					type: 'success',
-					duration: 2000,
-				});
-			}
-
-			this.hidePinDataDiscoveryTooltip();
-			this.pinDataDiscoveryComplete();
-		},
-		switchToBinary() {
-			this.onDisplayModeChange('binary');
-		},
-		onBranchChange(value: number) {
-			this.outputIndex = value;
-
-			this.$telemetry.track('User changed ndv branch', {
-				push_ref: this.pushRef,
-				branch_index: value,
-				node_type: this.activeNode?.type,
-				node_type_input_selection: this.nodeType ? this.nodeType.name : '',
-				pane: this.paneType,
-			});
-		},
-		showTooMuchData() {
-			this.showData = true;
-			this.userEnabledShowData = true;
-			this.$telemetry.track('User clicked ndv button', {
-				node_type: this.activeNode?.type,
-				workflow_id: this.workflowsStore.workflowId,
-				push_ref: this.pushRef,
-				pane: this.paneType,
-				type: 'showTooMuchData',
-			});
-		},
-		toggleLinkRuns() {
-			this.linkedRuns ? this.unlinkRun() : this.linkRun();
-		},
-		linkRun() {
-			this.$emit('linkRun');
-		},
-		unlinkRun() {
-			this.$emit('unlinkRun');
-		},
-		onCurrentPageChange(value: number) {
-			this.currentPage = value;
-			this.$telemetry.track('User changed ndv page', {
-				node_type: this.activeNode?.type,
-				workflow_id: this.workflowsStore.workflowId,
-				push_ref: this.pushRef,
-				pane: this.paneType,
-				page_selected: this.currentPage,
-				page_size: this.pageSize,
-				items_total: this.dataCount,
-			});
-		},
-		resetCurrentPageIfTooFar() {
-			const maxPage = Math.ceil(this.dataCount / this.pageSize);
-			if (maxPage < this.currentPage) {
-				this.currentPage = maxPage;
-			}
-		},
-		onPageSizeChange(pageSize: number) {
-			this.pageSize = pageSize;
-
-			this.resetCurrentPageIfTooFar();
-
-			this.$telemetry.track('User changed ndv page size', {
-				node_type: this.activeNode?.type,
-				workflow_id: this.workflowsStore.workflowId,
-				push_ref: this.pushRef,
-				pane: this.paneType,
-				page_selected: this.currentPage,
-				page_size: this.pageSize,
-				items_total: this.dataCount,
-			});
-		},
-		onDisplayModeChange(displayMode: IRunDataDisplayMode) {
-			const previous = this.displayMode;
-			this.ndvStore.setPanelDisplayMode({ pane: this.paneType, mode: displayMode });
-
-			if (!this.userEnabledShowData) this.updateShowData();
-
-			const dataContainerRef = this.$refs.dataContainer as Element | undefined;
-			if (dataContainerRef) {
-				const dataDisplay = dataContainerRef.children[0];
-
-				if (dataDisplay) {
-					dataDisplay.scrollTo(0, 0);
-				}
-			}
-
-			this.closeBinaryDataDisplay();
-			void this.externalHooks.run('runData.displayModeChanged', {
-				newValue: displayMode,
-				oldValue: previous,
-			});
-			if (this.activeNode) {
-				this.$telemetry.track('User changed ndv item view', {
-					previous_view: previous,
-					new_view: displayMode,
-					node_type: this.activeNode.type,
-					workflow_id: this.workflowsStore.workflowId,
-					push_ref: this.pushRef,
-					pane: this.paneType,
-				});
-			}
-		},
-		getRunLabel(option: number) {
-			let itemsCount = 0;
-			for (let i = 0; i <= this.maxOutputIndex; i++) {
-				itemsCount += this.getPinDataOrLiveData(this.getRawInputData(option - 1, i)).length;
-			}
-			const items = this.$locale.baseText('ndv.output.items', {
-				adjustToNumber: itemsCount,
-				interpolate: { count: itemsCount },
-			});
-			const itemsLabel = itemsCount > 0 ? ` (${items})` : '';
-			return option + this.$locale.baseText('ndv.output.of') + (this.maxRunIndex + 1) + itemsLabel;
-		},
-		getRawInputData(
-			runIndex: number,
-			outputIndex: number,
-			connectionType: NodeConnectionType = NodeConnectionType.Main,
-		): INodeExecutionData[] {
-			let inputData: INodeExecutionData[] = [];
-
-			if (this.node) {
-				inputData = this.nodeHelpers.getNodeInputData(
-					this.node,
-					runIndex,
-					outputIndex,
-					this.paneType,
-					connectionType,
-				);
-			}
-
-			if (inputData.length === 0 || !Array.isArray(inputData)) {
-				return [];
-			}
-
-			return inputData;
-		},
-		getPinDataOrLiveData(inputData: INodeExecutionData[]): INodeExecutionData[] {
-			if (this.pinnedData.data.value && !this.isProductionExecutionPreview) {
-				return Array.isArray(this.pinnedData.data.value)
-					? this.pinnedData.data.value.map((value) => ({
-							json: value,
-						}))
-					: [
-							{
-								json: this.pinnedData.data.value,
-							},
-						];
-			}
-			return inputData;
-		},
-		getFilteredData(inputData: INodeExecutionData[]): INodeExecutionData[] {
-			if (!this.search || this.isSchemaView) {
-				return inputData;
-			}
-
-			this.currentPage = 1;
-			return inputData.filter(({ json }) => searchInObject(json, this.search));
-		},
-		getDataCount(
-			runIndex: number,
-			outputIndex: number,
-			connectionType: NodeConnectionType = NodeConnectionType.Main,
-		) {
-			if (!this.node) {
-				return 0;
-			}
-
-			if (this.workflowRunData?.[this.node.name]?.[runIndex]?.hasOwnProperty('error')) {
-				return 1;
-			}
-
-			const rawInputData = this.getRawInputData(runIndex, outputIndex, connectionType);
-			const pinOrLiveData = this.getPinDataOrLiveData(rawInputData);
-			return this.getFilteredData(pinOrLiveData).length;
-		},
-		init() {
-			// Reset the selected output index every time another node gets selected
-			this.outputIndex = 0;
-			this.refreshDataSize();
-			this.closeBinaryDataDisplay();
-			let outputTypes: NodeConnectionType[] = [];
-			if (this.nodeType !== null && this.node !== null) {
-				const outputs = this.getResolvedNodeOutputs();
-				outputTypes = NodeHelpers.getConnectionTypes(outputs);
-			}
-			this.connectionType = outputTypes.length === 0 ? NodeConnectionType.Main : outputTypes[0];
-			if (this.binaryData.length > 0) {
-				this.ndvStore.setPanelDisplayMode({
-					pane: this.paneType as 'input' | 'output',
-					mode: 'binary',
-				});
-			} else if (this.displayMode === 'binary') {
-				this.ndvStore.setPanelDisplayMode({
-					pane: this.paneType as 'input' | 'output',
-					mode: 'table',
-				});
-			}
-		},
-		closeBinaryDataDisplay() {
-			this.binaryDataDisplayVisible = false;
-			this.binaryDataDisplayData = null;
-		},
-		clearExecutionData() {
-			this.workflowsStore.setWorkflowExecutionData(null);
-			this.nodeHelpers.updateNodesExecutionIssues();
-		},
-		isViewable(index: number, key: string | number): boolean {
-			const { fileType } = this.binaryData[index][key];
-			return (
-				!!fileType && ['image', 'audio', 'video', 'text', 'json', 'pdf', 'html'].includes(fileType)
-			);
-		},
-		isDownloadable(index: number, key: string | number): boolean {
-			const { mimeType, fileName } = this.binaryData[index][key];
-			return !!(mimeType && fileName);
-		},
-		async downloadBinaryData(index: number, key: string | number) {
-			const { id, data, fileName, fileExtension, mimeType } = this.binaryData[index][key];
-
-			if (id) {
-				const url = this.workflowsStore.getBinaryUrl(id, 'download', fileName ?? '', mimeType);
-				saveAs(url, [fileName, fileExtension].join('.'));
-				return;
-			} else {
-				const bufferString = 'data:' + mimeType + ';base64,' + data;
-				const blob = await fetch(bufferString).then(async (d) => await d.blob());
-				saveAs(blob, fileName);
-			}
-		},
-		async downloadJsonData() {
-			const fileName = (this.node?.name ?? '').replace(/[^\w\d]/g, '_');
-			const blob = new Blob([JSON.stringify(this.rawInputData, null, 2)], {
-				type: 'application/json',
-			});
-
-			saveAs(blob, `${fileName}.json`);
-		},
-		displayBinaryData(index: number, key: string | number) {
-			const { data, mimeType } = this.binaryData[index][key];
-			this.binaryDataDisplayVisible = true;
-
-			this.binaryDataDisplayData = {
-				node: this.node?.name,
-				runIndex: this.runIndex,
-				outputIndex: this.currentOutputIndex,
-				index,
-				key,
-				data,
-				mimeType,
-			};
-		},
-		getOutputName(outputIndex: number) {
-			if (this.node === null) {
-				return outputIndex + 1;
-			}
-
-			const nodeType = this.nodeType;
-			const outputs = this.getResolvedNodeOutputs();
-			const outputConfiguration = outputs?.[outputIndex] as INodeOutputConfiguration;
-
-			if (outputConfiguration && isObject(outputConfiguration)) {
-				return outputConfiguration?.displayName;
-			}
-			if (!nodeType?.outputNames || nodeType.outputNames.length <= outputIndex) {
-				return outputIndex + 1;
-			}
-
-			return nodeType.outputNames[outputIndex];
-		},
-		refreshDataSize() {
-			// Hide by default the data from being displayed
-			this.showData = false;
-			const jsonItems = this.inputDataPage.map((item) => item.json);
-			const byteSize = new Blob([JSON.stringify(jsonItems)]).size;
-			this.dataSize = byteSize;
-			this.updateShowData();
-		},
-		updateShowData() {
-			// Display data if it is reasonably small (< 1MB)
-			this.showData =
-				(this.isSchemaView && this.dataSize < this.MAX_DISPLAY_DATA_SIZE_SCHEMA_VIEW) ||
-				this.dataSize < this.MAX_DISPLAY_DATA_SIZE;
-		},
-		onRunIndexChange(run: number) {
-			this.$emit('runChange', run);
-		},
-		enableNode() {
-			if (this.node) {
-				const updateInformation = {
-					name: this.node.name,
-					properties: {
-						disabled: !this.node.disabled,
-					} as IDataObject,
-				} as INodeUpdatePropertiesInformation;
-
-				this.workflowsStore.updateNodeProperties(updateInformation);
-			}
-		},
-		setDisplayMode() {
-			if (!this.activeNode) return;
-
-			const shouldDisplayHtml =
-				this.activeNode.type === HTML_NODE_TYPE &&
-				this.activeNode.parameters.operation === 'generateHtmlTemplate';
-
-			if (shouldDisplayHtml) {
-				this.ndvStore.setPanelDisplayMode({
-					pane: 'output',
-					mode: 'html',
-				});
-			}
-		},
-		activatePane() {
-			this.$emit('activatePane');
-		},
-		onSearchClear() {
-			this.search = '';
-			document.dispatchEvent(new KeyboardEvent('keyup', { key: '/' }));
-		},
-	},
+type Props = {
+	workflow: Workflow;
+	runIndex: number;
+	tooMuchDataTitle: string;
+	executingMessage: string;
+	pushRef: string;
+	paneType: NodePanelType;
+	noDataInBranchMessage: string;
+	node?: INodeUi | null;
+	nodes?: IConnectedNode[];
+	linkedRuns?: boolean;
+	canLinkRuns?: boolean;
+	isExecuting?: boolean;
+	overrideOutputs?: number[];
+	mappingEnabled?: boolean;
+	distanceFromActive?: number;
+	blockUI?: boolean;
+	isProductionExecutionPreview?: boolean;
+	isPaneActive?: boolean;
+	hidePagination?: boolean;
+	calloutMessage?: string;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	node: null,
+	nodes: () => [],
+	overrideOutputs: undefined,
+	distanceFromActive: 0,
+	blockUI: false,
+	isPaneActive: false,
+	isProductionExecutionPreview: false,
+	mappingEnabled: false,
+	isExecuting: false,
+	hidePagination: false,
+	calloutMessage: undefined,
 });
+const emit = defineEmits<{
+	search: [search: string];
+	runChange: [runIndex: number];
+	itemHover: [
+		item: {
+			outputIndex: number;
+			itemIndex: number;
+		} | null,
+	];
+	linkRun: [];
+	unlinkRun: [];
+	activatePane: [];
+	tableMounted: [
+		{
+			avgRowHeight: number;
+		},
+	];
+}>();
+
+const connectionType = ref<NodeConnectionType>(NodeConnectionType.Main);
+const dataSize = ref(0);
+const showData = ref(false);
+const userEnabledShowData = ref(false);
+const outputIndex = ref(0);
+const binaryDataDisplayVisible = ref(false);
+const binaryDataDisplayData = ref<IBinaryData | null>(null);
+const currentPage = ref(1);
+const pageSize = ref(10);
+const pageSizes = [1, 10, 25, 50, 100];
+
+const pinDataDiscoveryTooltipVisible = ref(false);
+const isControlledPinDataTooltip = ref(false);
+const search = ref('');
+
+const dataContainerRef = ref<HTMLDivElement>();
+
+const nodeTypesStore = useNodeTypesStore();
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
+const sourceControlStore = useSourceControlStore();
+const rootStore = useRootStore();
+const uiStore = useUIStore();
+
+const toast = useToast();
+const route = useRoute();
+const nodeHelpers = useNodeHelpers();
+const externalHooks = useExternalHooks();
+const telemetry = useTelemetry();
+const i18n = useI18n();
+const { trackOpeningRelatedExecution, resolveRelatedExecutionUrl } = useExecutionHelpers();
+
+const node = toRef(props, 'node');
+
+const pinnedData = usePinnedData(node, {
+	runIndex: props.runIndex,
+	displayMode:
+		props.paneType === 'input' ? ndvStore.inputPanelDisplayMode : ndvStore.outputPanelDisplayMode,
+});
+const { isSubNodeType } = useNodeType({
+	node,
+});
+
+const displayMode = computed(() =>
+	props.paneType === 'input' ? ndvStore.inputPanelDisplayMode : ndvStore.outputPanelDisplayMode,
+);
+
+const isReadOnlyRoute = computed(() => route.meta.readOnlyCanvas === true);
+const isWaitNodeWaiting = computed(() => {
+	return (
+		node.value?.name &&
+		workflowExecution.value?.data?.resultData?.runData?.[node.value?.name]?.[props.runIndex]
+			?.executionStatus === 'waiting'
+	);
+});
+
+const { activeNode } = storeToRefs(ndvStore);
+const nodeType = computed(() => {
+	if (!node.value) return null;
+
+	return nodeTypesStore.getNodeType(node.value.type, node.value.typeVersion);
+});
+
+const isSchemaView = computed(() => displayMode.value === 'schema');
+const isSearchInSchemaView = computed(() => isSchemaView.value && !!search.value);
+const displaysMultipleNodes = computed(
+	() => isSchemaView.value && props.paneType === 'input' && props.nodes.length > 0,
+);
+
+const isTriggerNode = computed(() => !!node.value && nodeTypesStore.isTriggerNode(node.value.type));
+
+const canPinData = computed(
+	() =>
+		!!node.value &&
+		pinnedData.canPinNode(false, currentOutputIndex.value) &&
+		!isPaneTypeInput.value &&
+		pinnedData.isValidNodeType.value &&
+		!(binaryData.value && binaryData.value.length > 0),
+);
+const displayModes = computed(() => {
+	const defaults: Array<{ label: string; value: IRunDataDisplayMode }> = [
+		{ label: i18n.baseText('runData.table'), value: 'table' },
+		{ label: i18n.baseText('runData.json'), value: 'json' },
+	];
+
+	if (binaryData.value.length) {
+		defaults.push({ label: i18n.baseText('runData.binary'), value: 'binary' });
+	}
+
+	const schemaView = { label: i18n.baseText('runData.schema'), value: 'schema' } as const;
+	if (isPaneTypeInput.value) {
+		defaults.unshift(schemaView);
+	} else {
+		defaults.push(schemaView);
+	}
+
+	if (
+		isPaneTypeOutput.value &&
+		activeNode.value?.type === HTML_NODE_TYPE &&
+		activeNode.value.parameters.operation === 'generateHtmlTemplate'
+	) {
+		defaults.unshift({ label: 'HTML', value: 'html' });
+	}
+
+	return defaults;
+});
+
+const hasNodeRun = computed(() =>
+	Boolean(
+		!props.isExecuting &&
+			node.value &&
+			((workflowRunData.value && workflowRunData.value.hasOwnProperty(node.value.name)) ||
+				pinnedData.hasData.value),
+	),
+);
+
+const isArtificialRecoveredEventItem = computed(
+	() => rawInputData.value?.[0]?.json?.isArtificialRecoveredEventItem,
+);
+
+const isTrimmedManualExecutionDataItem = computed(
+	() => rawInputData.value?.[0]?.json?.[TRIMMED_TASK_DATA_CONNECTIONS_KEY],
+);
+
+const subworkflowExecutionError = computed(() => {
+	if (!node.value) return null;
+	return {
+		node: node.value,
+		messages: [workflowsStore.subWorkflowExecutionError?.message ?? ''],
+	} as NodeError;
+});
+
+const hasSubworkflowExecutionError = computed(() =>
+	Boolean(workflowsStore.subWorkflowExecutionError),
+);
+const workflowRunErrorAsNodeError = computed(() => {
+	if (!node.value) {
+		return null;
+	}
+
+	// If the node is a sub-node, we need to get the parent node error to check for input errors
+	if (isSubNodeType.value && props.paneType === 'input') {
+		const parentNode = props.workflow.getChildNodes(node.value?.name ?? '', 'ALL_NON_MAIN')[0];
+		return workflowRunData.value?.[parentNode]?.[props.runIndex]?.error as NodeError;
+	}
+	return workflowRunData.value?.[node.value?.name]?.[props.runIndex]?.error as NodeError;
+});
+
+const hasRunError = computed(() => Boolean(node.value && workflowRunErrorAsNodeError.value));
+
+const executionHints = computed(() => {
+	if (hasNodeRun.value) {
+		const hints = node.value && workflowRunData.value?.[node.value.name]?.[props.runIndex]?.hints;
+
+		if (hints) return hints;
+	}
+
+	return [];
+});
+
+const workflowExecution = computed(() => workflowsStore.getWorkflowExecution);
+const workflowRunData = computed(() => {
+	if (workflowExecution.value === null) {
+		return null;
+	}
+	const executionData: IRunExecutionData | undefined = workflowExecution.value.data;
+	if (executionData?.resultData) {
+		return executionData.resultData.runData;
+	}
+	return null;
+});
+const dataCount = computed(() =>
+	getDataCount(props.runIndex, currentOutputIndex.value, connectionType.value),
+);
+
+const unfilteredDataCount = computed(() =>
+	pinnedData.data.value ? pinnedData.data.value.length : rawInputData.value.length,
+);
+const dataSizeInMB = computed(() => (dataSize.value / (1024 * 1024)).toFixed(1));
+const maxOutputIndex = computed(() => {
+	if (node.value === null || props.runIndex === undefined) {
+		return 0;
+	}
+
+	const runData: IRunData | null = workflowRunData.value;
+
+	if (runData === null || !runData.hasOwnProperty(node.value.name)) {
+		return 0;
+	}
+
+	if (runData[node.value.name].length < props.runIndex) {
+		return 0;
+	}
+
+	if (runData[node.value.name][props.runIndex]) {
+		const taskData = runData[node.value.name][props.runIndex].data;
+		if (taskData?.main) {
+			return taskData.main.length - 1;
+		}
+	}
+
+	return 0;
+});
+const currentPageOffset = computed(() => pageSize.value * (currentPage.value - 1));
+const maxRunIndex = computed(() => {
+	if (!node.value) {
+		return 0;
+	}
+
+	const runData: IRunData | null = workflowRunData.value;
+
+	if (runData === null || !runData.hasOwnProperty(node.value.name)) {
+		return 0;
+	}
+
+	if (runData[node.value.name].length) {
+		return runData[node.value.name].length - 1;
+	}
+
+	return 0;
+});
+
+const rawInputData = computed(() =>
+	getRawInputData(props.runIndex, currentOutputIndex.value, connectionType.value),
+);
+
+const unfilteredInputData = computed(() => getPinDataOrLiveData(rawInputData.value));
+const inputData = computed(() => getFilteredData(unfilteredInputData.value));
+const inputDataPage = computed(() => {
+	const offset = pageSize.value * (currentPage.value - 1);
+	return inputData.value.slice(offset, offset + pageSize.value);
+});
+const jsonData = computed(() => executionDataToJson(inputData.value));
+const binaryData = computed(() => {
+	if (!node.value) {
+		return [];
+	}
+
+	return nodeHelpers
+		.getBinaryData(workflowRunData.value, node.value.name, props.runIndex, currentOutputIndex.value)
+		.filter((data) => Boolean(data && Object.keys(data).length));
+});
+const inputHtml = computed(() => String(inputData.value[0]?.json?.html ?? ''));
+const currentOutputIndex = computed(() => {
+	if (props.overrideOutputs?.length && !props.overrideOutputs.includes(outputIndex.value)) {
+		return props.overrideOutputs[0];
+	}
+
+	// In some cases nodes may switch their outputCount while the user still
+	// has a higher outputIndex selected. We could adjust outputIndex directly,
+	// but that loses data as we can keep the user selection if the branch reappears.
+	return Math.min(outputIndex.value, maxOutputIndex.value);
+});
+const branches = computed(() => {
+	const capitalize = (name: string) => name.charAt(0).toLocaleUpperCase() + name.slice(1);
+
+	const result: Array<ITab<number>> = [];
+
+	for (let i = 0; i <= maxOutputIndex.value; i++) {
+		if (props.overrideOutputs && !props.overrideOutputs.includes(i)) {
+			continue;
+		}
+		const totalItemsCount = getRawInputData(props.runIndex, i).length;
+		const itemsCount = getDataCount(props.runIndex, i);
+		const items = search.value
+			? i18n.baseText('ndv.search.items', {
+					adjustToNumber: totalItemsCount,
+					interpolate: { matched: itemsCount, total: totalItemsCount },
+				})
+			: i18n.baseText('ndv.output.items', {
+					adjustToNumber: itemsCount,
+					interpolate: { count: itemsCount },
+				});
+		let outputName = getOutputName(i);
+
+		if (`${outputName}` === `${i}`) {
+			outputName = `${i18n.baseText('ndv.output')} ${outputName}`;
+		} else {
+			const appendBranchWord = NODE_TYPES_EXCLUDED_FROM_OUTPUT_NAME_APPEND.includes(
+				node.value?.type ?? '',
+			)
+				? ''
+				: ` ${i18n.baseText('ndv.output.branch')}`;
+			outputName = capitalize(`${getOutputName(i)}${appendBranchWord}`);
+		}
+		result.push({
+			label:
+				(search.value && itemsCount) || totalItemsCount ? `${outputName} (${items})` : outputName,
+			value: i,
+		});
+	}
+	return result;
+});
+
+const editMode = computed(() => {
+	return isPaneTypeInput.value ? { enabled: false, value: '' } : ndvStore.outputPanelEditMode;
+});
+
+const isPaneTypeInput = computed(() => props.paneType === 'input');
+const isPaneTypeOutput = computed(() => props.paneType === 'output');
+
+const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
+const showIOSearch = computed(
+	() => hasNodeRun.value && !hasRunError.value && unfilteredInputData.value.length > 0,
+);
+const inputSelectLocation = computed(() => {
+	if (isSchemaView.value) return 'none';
+	if (!hasNodeRun.value) return 'header';
+	if (maxRunIndex.value > 0) return 'runs';
+	if (maxOutputIndex.value > 0 && branches.value.length > 1) {
+		return 'outputs';
+	}
+
+	return 'items';
+});
+
+const showIoSearchNoMatchContent = computed(
+	() => hasNodeRun.value && !inputData.value.length && !!search.value,
+);
+
+const parentNodeOutputData = computed(() => {
+	const parentNode = props.workflow.getParentNodesByDepth(node.value?.name ?? '')[0];
+	let parentNodeData: INodeExecutionData[] = [];
+
+	if (parentNode?.name) {
+		parentNodeData = nodeHelpers.getNodeInputData(
+			props.workflow.getNode(parentNode?.name),
+			props.runIndex,
+			outputIndex.value,
+			'input',
+			connectionType.value,
+		);
+	}
+
+	return parentNodeData;
+});
+
+const parentNodePinnedData = computed(() => {
+	const parentNode = props.workflow.getParentNodesByDepth(node.value?.name ?? '')[0];
+	return props.workflow.pinData?.[parentNode?.name || ''] ?? [];
+});
+
+const showPinButton = computed(() => {
+	if (!rawInputData.value.length && !pinnedData.hasData.value) {
+		return false;
+	}
+	if (editMode.value.enabled) {
+		return false;
+	}
+	if (binaryData.value?.length) {
+		return isPaneTypeOutput.value;
+	}
+	return canPinData.value;
+});
+
+const pinButtonDisabled = computed(
+	() =>
+		pinnedData.hasData.value ||
+		!rawInputData.value.length ||
+		!!binaryData.value?.length ||
+		isReadOnlyRoute.value ||
+		readOnlyEnv.value,
+);
+
+const activeTaskMetadata = computed((): ITaskMetadata | null => {
+	if (!node.value) {
+		return null;
+	}
+
+	return workflowRunData.value?.[node.value.name]?.[props.runIndex]?.metadata ?? null;
+});
+
+const hasReleatedExectuion = computed((): boolean => {
+	return Boolean(
+		activeTaskMetadata.value?.subExecution || activeTaskMetadata.value?.parentExecution,
+	);
+});
+
+const hasInputOverwrite = computed((): boolean => {
+	if (!node.value) {
+		return false;
+	}
+	const taskData = nodeHelpers.getNodeTaskData(node.value, props.runIndex);
+	return Boolean(taskData?.inputOverride);
+});
+
+watch(node, (newNode, prevNode) => {
+	if (newNode?.id === prevNode?.id) return;
+	init();
+});
+
+watch(hasNodeRun, () => {
+	if (props.paneType === 'output') setDisplayMode();
+	else {
+		// InputPanel relies on the outputIndex to check if we have data
+		outputIndex.value = determineInitialOutputIndex();
+	}
+});
+
+watch(
+	inputDataPage,
+	(data: INodeExecutionData[]) => {
+		if (props.paneType && data) {
+			ndvStore.setNDVPanelDataIsEmpty({
+				panel: props.paneType,
+				isEmpty: data.every((item) => isEmpty(item.json)),
+			});
+		}
+	},
+	{ immediate: true, deep: true },
+);
+
+watch(jsonData, (data: IDataObject[], prevData: IDataObject[]) => {
+	if (isEqual(data, prevData)) return;
+	refreshDataSize();
+	if (dataCount.value) {
+		resetCurrentPageIfTooFar();
+	}
+	showPinDataDiscoveryTooltip(data);
+});
+
+watch(binaryData, (newData, prevData) => {
+	if (newData.length && !prevData.length && displayMode.value !== 'binary') {
+		switchToBinary();
+	} else if (!newData.length && displayMode.value === 'binary') {
+		onDisplayModeChange('table');
+	}
+});
+
+watch(currentOutputIndex, (branchIndex: number) => {
+	ndvStore.setNDVBranchIndex({
+		pane: props.paneType,
+		branchIndex,
+	});
+});
+
+watch(search, (newSearch) => {
+	emit('search', newSearch);
+});
+
+onMounted(() => {
+	init();
+
+	if (!isPaneTypeInput.value) {
+		showPinDataDiscoveryTooltip(jsonData.value);
+	}
+	ndvStore.setNDVBranchIndex({
+		pane: props.paneType,
+		branchIndex: currentOutputIndex.value,
+	});
+
+	if (props.paneType === 'output') {
+		setDisplayMode();
+		activatePane();
+	}
+
+	if (hasRunError.value && node.value) {
+		const error = workflowRunData.value?.[node.value.name]?.[props.runIndex]?.error;
+		const errorsToTrack = ['unknown error'];
+
+		if (error && errorsToTrack.some((e) => error.message?.toLowerCase().includes(e))) {
+			telemetry.track(
+				'User encountered an error',
+				{
+					node: node.value.type,
+					errorMessage: error.message,
+					nodeVersion: node.value.typeVersion,
+					n8nVersion: rootStore.versionCli,
+				},
+				{
+					withPostHog: true,
+				},
+			);
+		}
+	}
+});
+
+onBeforeUnmount(() => {
+	hidePinDataDiscoveryTooltip();
+});
+
+function getResolvedNodeOutputs() {
+	if (node.value && nodeType.value) {
+		const workflowNode = props.workflow.getNode(node.value.name);
+
+		if (workflowNode) {
+			const outputs = NodeHelpers.getNodeOutputs(props.workflow, workflowNode, nodeType.value);
+			return outputs;
+		}
+	}
+	return [];
+}
+function shouldHintBeDisplayed(hint: NodeHint): boolean {
+	const { location, whenToDisplay } = hint;
+
+	if (location) {
+		if (location === 'ndv' && !['input', 'output'].includes(props.paneType)) {
+			return false;
+		}
+		if (location === 'inputPane' && props.paneType !== 'input') {
+			return false;
+		}
+
+		if (location === 'outputPane' && props.paneType !== 'output') {
+			return false;
+		}
+	}
+
+	if (whenToDisplay === 'afterExecution' && !hasNodeRun.value) {
+		return false;
+	}
+
+	if (whenToDisplay === 'beforeExecution' && hasNodeRun.value) {
+		return false;
+	}
+
+	return true;
+}
+function getNodeHints(): NodeHint[] {
+	try {
+		if (node.value && nodeType.value) {
+			const workflowNode = props.workflow.getNode(node.value.name);
+
+			if (workflowNode) {
+				const nodeHints = NodeHelpers.getNodeHints(props.workflow, workflowNode, nodeType.value, {
+					runExecutionData: workflowExecution.value?.data ?? null,
+					runIndex: props.runIndex,
+					connectionInputData: parentNodeOutputData.value,
+				});
+
+				const hasMultipleInputItems =
+					parentNodeOutputData.value.length > 1 || parentNodePinnedData.value.length > 1;
+
+				const nodeOutputData =
+					workflowRunData.value?.[node.value.name]?.[props.runIndex]?.data?.main?.[0] ?? [];
+
+				const genericHints = getGenericHints({
+					workflowNode,
+					node: node.value,
+					nodeType: nodeType.value,
+					nodeOutputData,
+					workflow: props.workflow,
+					hasNodeRun: hasNodeRun.value,
+					hasMultipleInputItems,
+				});
+
+				return executionHints.value.concat(nodeHints, genericHints).filter(shouldHintBeDisplayed);
+			}
+		}
+	} catch (error) {
+		console.error('Error while getting node hints', error);
+	}
+
+	return [];
+}
+
+function onItemHover(itemIndex: number | null) {
+	if (itemIndex === null) {
+		emit('itemHover', null);
+
+		return;
+	}
+	emit('itemHover', {
+		outputIndex: currentOutputIndex.value,
+		itemIndex,
+	});
+}
+
+function onClickDataPinningDocsLink() {
+	telemetry.track('User clicked ndv link', {
+		workflow_id: workflowsStore.workflowId,
+		push_ref: props.pushRef,
+		node_type: activeNode.value?.type,
+		pane: 'output',
+		type: 'data-pinning-docs',
+	});
+}
+
+function showPinDataDiscoveryTooltip(value: IDataObject[]) {
+	if (!isTriggerNode.value) {
+		return;
+	}
+
+	const pinDataDiscoveryFlag = useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG).value;
+
+	if (value && value.length > 0 && !isReadOnlyRoute.value && !pinDataDiscoveryFlag) {
+		pinDataDiscoveryComplete();
+
+		setTimeout(() => {
+			isControlledPinDataTooltip.value = true;
+			pinDataDiscoveryTooltipVisible.value = true;
+			dataPinningEventBus.emit('data-pinning-discovery', { isTooltipVisible: true });
+		}, 500); // Wait for NDV to open
+	}
+}
+
+function hidePinDataDiscoveryTooltip() {
+	if (pinDataDiscoveryTooltipVisible.value) {
+		isControlledPinDataTooltip.value = false;
+		pinDataDiscoveryTooltipVisible.value = false;
+		dataPinningEventBus.emit('data-pinning-discovery', { isTooltipVisible: false });
+	}
+}
+
+function pinDataDiscoveryComplete() {
+	useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG).value = 'true';
+	useStorage(LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG).value = 'true';
+}
+
+function enterEditMode({ origin }: EnterEditModeArgs) {
+	const inputData = pinnedData.data.value
+		? clearJsonKey(pinnedData.data.value)
+		: executionDataToJson(rawInputData.value);
+
+	const inputDataLength = Array.isArray(inputData)
+		? inputData.length
+		: Object.keys(inputData ?? {}).length;
+
+	const data = inputDataLength > 0 ? inputData : TEST_PIN_DATA;
+
+	ndvStore.setOutputPanelEditModeEnabled(true);
+	ndvStore.setOutputPanelEditModeValue(JSON.stringify(data, null, 2));
+
+	telemetry.track('User opened ndv edit state', {
+		node_type: activeNode.value?.type,
+		click_type: origin === 'editIconButton' ? 'button' : 'link',
+		push_ref: props.pushRef,
+		run_index: props.runIndex,
+		is_output_present: hasNodeRun.value || pinnedData.hasData.value,
+		view: !hasNodeRun.value && !pinnedData.hasData.value ? 'undefined' : displayMode.value,
+		is_data_pinned: pinnedData.hasData.value,
+	});
+}
+
+function onClickCancelEdit() {
+	ndvStore.setOutputPanelEditModeEnabled(false);
+	ndvStore.setOutputPanelEditModeValue('');
+	onExitEditMode({ type: 'cancel' });
+}
+
+function onClickSaveEdit() {
+	if (!node.value) {
+		return;
+	}
+
+	const { value } = editMode.value;
+
+	toast.clearAllStickyNotifications();
+
+	try {
+		const clearedValue = clearJsonKey(value) as INodeExecutionData[];
+		try {
+			pinnedData.setData(clearedValue, 'save-edit');
+		} catch (error) {
+			// setData function already shows toasts on error, so just return here
+			return;
+		}
+	} catch (error) {
+		toast.showError(error, i18n.baseText('ndv.pinData.error.syntaxError.title'));
+		return;
+	}
+
+	ndvStore.setOutputPanelEditModeEnabled(false);
+
+	onExitEditMode({ type: 'save' });
+}
+
+function onExitEditMode({ type }: { type: 'save' | 'cancel' }) {
+	telemetry.track('User closed ndv edit state', {
+		node_type: activeNode.value?.type,
+		push_ref: props.pushRef,
+		run_index: props.runIndex,
+		view: displayMode.value,
+		type,
+	});
+}
+
+async function onTogglePinData({ source }: { source: PinDataSource | UnpinDataSource }) {
+	if (!node.value) {
+		return;
+	}
+
+	if (source === 'pin-icon-click') {
+		const telemetryPayload = {
+			node_type: activeNode.value?.type,
+			push_ref: props.pushRef,
+			run_index: props.runIndex,
+			view: !hasNodeRun.value && !pinnedData.hasData.value ? 'none' : displayMode.value,
+		};
+
+		void externalHooks.run('runData.onTogglePinData', telemetryPayload);
+		telemetry.track('User clicked pin data icon', telemetryPayload);
+	}
+
+	nodeHelpers.updateNodeParameterIssues(node.value);
+
+	if (pinnedData.hasData.value) {
+		pinnedData.unsetData(source);
+		return;
+	}
+
+	try {
+		pinnedData.setData(rawInputData.value, 'pin-icon-click');
+	} catch (error) {
+		console.error(error);
+		return;
+	}
+
+	if (maxRunIndex.value > 0) {
+		toast.showToast({
+			title: i18n.baseText('ndv.pinData.pin.multipleRuns.title', {
+				interpolate: {
+					index: `${props.runIndex}`,
+				},
+			}),
+			message: i18n.baseText('ndv.pinData.pin.multipleRuns.description'),
+			type: 'success',
+			duration: 2000,
+		});
+	}
+
+	hidePinDataDiscoveryTooltip();
+	pinDataDiscoveryComplete();
+}
+
+function switchToBinary() {
+	onDisplayModeChange('binary');
+}
+
+function onBranchChange(value: number) {
+	outputIndex.value = value;
+
+	telemetry.track('User changed ndv branch', {
+		push_ref: props.pushRef,
+		branch_index: value,
+		node_type: activeNode.value?.type,
+		node_type_input_selection: nodeType.value ? nodeType.value.name : '',
+		pane: props.paneType,
+	});
+}
+
+function showTooMuchData() {
+	showData.value = true;
+	userEnabledShowData.value = true;
+	telemetry.track('User clicked ndv button', {
+		node_type: activeNode.value?.type,
+		workflow_id: workflowsStore.workflowId,
+		push_ref: props.pushRef,
+		pane: props.paneType,
+		type: 'showTooMuchData',
+	});
+}
+
+function toggleLinkRuns() {
+	if (props.linkedRuns) {
+		unlinkRun();
+	} else {
+		linkRun();
+	}
+}
+
+function linkRun() {
+	emit('linkRun');
+}
+
+function unlinkRun() {
+	emit('unlinkRun');
+}
+
+function onCurrentPageChange(value: number) {
+	currentPage.value = value;
+	telemetry.track('User changed ndv page', {
+		node_type: activeNode.value?.type,
+		workflow_id: workflowsStore.workflowId,
+		push_ref: props.pushRef,
+		pane: props.paneType,
+		page_selected: currentPage.value,
+		page_size: pageSize.value,
+		items_total: dataCount.value,
+	});
+}
+
+function resetCurrentPageIfTooFar() {
+	const maxPage = Math.ceil(dataCount.value / pageSize.value);
+	if (maxPage < currentPage.value) {
+		currentPage.value = maxPage;
+	}
+}
+
+function onPageSizeChange(newPageSize: number) {
+	pageSize.value = newPageSize;
+
+	resetCurrentPageIfTooFar();
+
+	telemetry.track('User changed ndv page size', {
+		node_type: activeNode.value?.type,
+		workflow_id: workflowsStore.workflowId,
+		push_ref: props.pushRef,
+		pane: props.paneType,
+		page_selected: currentPage.value,
+		page_size: pageSize.value,
+		items_total: dataCount.value,
+	});
+}
+
+function onDisplayModeChange(newDisplayMode: IRunDataDisplayMode) {
+	const previous = displayMode.value;
+	ndvStore.setPanelDisplayMode({ pane: props.paneType, mode: newDisplayMode });
+
+	if (!userEnabledShowData.value) updateShowData();
+
+	if (dataContainerRef.value) {
+		const dataDisplay = dataContainerRef.value.children[0];
+
+		if (dataDisplay) {
+			dataDisplay.scrollTo(0, 0);
+		}
+	}
+
+	closeBinaryDataDisplay();
+	void externalHooks.run('runData.displayModeChanged', {
+		newValue: newDisplayMode,
+		oldValue: previous,
+	});
+	if (activeNode.value) {
+		telemetry.track('User changed ndv item view', {
+			previous_view: previous,
+			new_view: newDisplayMode,
+			node_type: activeNode.value.type,
+			workflow_id: workflowsStore.workflowId,
+			push_ref: props.pushRef,
+			pane: props.paneType,
+		});
+	}
+}
+
+function getRunLabel(option: number) {
+	if (!node.value) {
+		return;
+	}
+
+	let itemsCount = 0;
+	for (let i = 0; i <= maxOutputIndex.value; i++) {
+		itemsCount += getPinDataOrLiveData(getRawInputData(option - 1, i)).length;
+	}
+	const items = i18n.baseText('ndv.output.items', {
+		adjustToNumber: itemsCount,
+		interpolate: { count: itemsCount },
+	});
+
+	const metadata = workflowRunData.value?.[node.value.name]?.[option - 1]?.metadata ?? null;
+	const subexecutions = metadata?.subExecutionsCount
+		? i18n.baseText('ndv.output.andSubExecutions', {
+				adjustToNumber: metadata.subExecutionsCount,
+				interpolate: {
+					count: metadata.subExecutionsCount,
+				},
+			})
+		: '';
+
+	const itemsLabel = itemsCount > 0 ? ` (${items}${subexecutions})` : '';
+	return option + i18n.baseText('ndv.output.of') + (maxRunIndex.value + 1) + itemsLabel;
+}
+
+function getRawInputData(
+	runIndex: number,
+	outputIndex: number,
+	connectionType: NodeConnectionType = NodeConnectionType.Main,
+): INodeExecutionData[] {
+	let inputData: INodeExecutionData[] = [];
+
+	if (node.value) {
+		inputData = nodeHelpers.getNodeInputData(
+			node.value,
+			runIndex,
+			outputIndex,
+			props.paneType,
+			connectionType,
+		);
+	}
+
+	if (inputData.length === 0 || !Array.isArray(inputData)) {
+		return [];
+	}
+
+	return inputData;
+}
+
+function getPinDataOrLiveData(data: INodeExecutionData[]): INodeExecutionData[] {
+	if (pinnedData.data.value && !props.isProductionExecutionPreview) {
+		return Array.isArray(pinnedData.data.value)
+			? pinnedData.data.value.map((value) => ({
+					json: value,
+				}))
+			: [
+					{
+						json: pinnedData.data.value,
+					},
+				];
+	}
+	return data;
+}
+
+function getFilteredData(data: INodeExecutionData[]): INodeExecutionData[] {
+	if (!search.value || isSchemaView.value) {
+		return data;
+	}
+
+	currentPage.value = 1;
+	return data.filter(({ json }) => searchInObject(json, search.value));
+}
+
+function getDataCount(
+	runIndex: number,
+	outputIndex: number,
+	connectionType: NodeConnectionType = NodeConnectionType.Main,
+) {
+	if (!node.value) {
+		return 0;
+	}
+
+	if (workflowRunData.value?.[node.value.name]?.[runIndex]?.hasOwnProperty('error')) {
+		return 1;
+	}
+
+	const rawInputData = getRawInputData(runIndex, outputIndex, connectionType);
+	const pinOrLiveData = getPinDataOrLiveData(rawInputData);
+	return getFilteredData(pinOrLiveData).length;
+}
+
+function determineInitialOutputIndex() {
+	for (let i = 0; i <= maxOutputIndex.value; i++) {
+		if (getRawInputData(props.runIndex, i).length) {
+			return i;
+		}
+	}
+
+	return 0;
+}
+
+function init() {
+	// Reset the selected output index every time another node gets selected
+	outputIndex.value = determineInitialOutputIndex();
+	refreshDataSize();
+	closeBinaryDataDisplay();
+	let outputTypes: NodeConnectionType[] = [];
+	if (node.value && nodeType.value) {
+		const outputs = getResolvedNodeOutputs();
+		outputTypes = NodeHelpers.getConnectionTypes(outputs);
+	}
+	connectionType.value = outputTypes.length === 0 ? NodeConnectionType.Main : outputTypes[0];
+	if (binaryData.value.length > 0) {
+		ndvStore.setPanelDisplayMode({
+			pane: props.paneType,
+			mode: 'binary',
+		});
+	} else if (displayMode.value === 'binary') {
+		ndvStore.setPanelDisplayMode({
+			pane: props.paneType,
+			mode: 'table',
+		});
+	}
+}
+
+function closeBinaryDataDisplay() {
+	binaryDataDisplayVisible.value = false;
+	binaryDataDisplayData.value = null;
+}
+
+function isViewable(index: number, key: string | number): boolean {
+	const { fileType } = binaryData.value[index][key];
+	return (
+		!!fileType && ['image', 'audio', 'video', 'text', 'json', 'pdf', 'html'].includes(fileType)
+	);
+}
+
+function isDownloadable(index: number, key: string | number): boolean {
+	const { mimeType, fileName } = binaryData.value[index][key];
+	return !!(mimeType && fileName);
+}
+
+async function downloadBinaryData(index: number, key: string | number) {
+	const { id, data, fileName, fileExtension, mimeType } = binaryData.value[index][key];
+
+	if (id) {
+		const url = workflowsStore.getBinaryUrl(id, 'download', fileName ?? '', mimeType);
+		saveAs(url, [fileName, fileExtension].join('.'));
+		return;
+	} else {
+		const bufferString = 'data:' + mimeType + ';base64,' + data;
+		const blob = await fetch(bufferString).then(async (d) => await d.blob());
+		saveAs(blob, fileName);
+	}
+}
+
+async function downloadJsonData() {
+	const fileName = (node.value?.name ?? '').replace(/[^\w\d]/g, '_');
+	const blob = new Blob([JSON.stringify(rawInputData.value, null, 2)], {
+		type: 'application/json',
+	});
+
+	saveAs(blob, `${fileName}.json`);
+}
+
+function displayBinaryData(index: number, key: string | number) {
+	const { data, mimeType } = binaryData.value[index][key];
+	binaryDataDisplayVisible.value = true;
+
+	binaryDataDisplayData.value = {
+		node: node.value?.name,
+		runIndex: props.runIndex,
+		outputIndex: currentOutputIndex.value,
+		index,
+		key,
+		data,
+		mimeType,
+	};
+}
+
+function getOutputName(outputIndex: number) {
+	if (node.value === null) {
+		return outputIndex + 1;
+	}
+
+	const outputs = getResolvedNodeOutputs();
+	const outputConfiguration = outputs?.[outputIndex] as INodeOutputConfiguration;
+
+	if (outputConfiguration && isObject(outputConfiguration)) {
+		return outputConfiguration?.displayName;
+	}
+	if (!nodeType.value?.outputNames || nodeType.value.outputNames.length <= outputIndex) {
+		return outputIndex + 1;
+	}
+
+	return nodeType.value.outputNames[outputIndex];
+}
+
+function refreshDataSize() {
+	// Hide by default the data from being displayed
+	showData.value = false;
+	const jsonItems = inputDataPage.value.map((item) => item.json);
+	const byteSize = new Blob([JSON.stringify(jsonItems)]).size;
+	dataSize.value = byteSize;
+	updateShowData();
+}
+
+function updateShowData() {
+	// Display data if it is reasonably small (< 1MB)
+	showData.value =
+		(isSchemaView.value && dataSize.value < MAX_DISPLAY_DATA_SIZE_SCHEMA_VIEW) ||
+		dataSize.value < MAX_DISPLAY_DATA_SIZE;
+}
+
+function onRunIndexChange(run: number) {
+	emit('runChange', run);
+}
+
+function enableNode() {
+	if (node.value) {
+		const updateInformation = {
+			name: node.value.name,
+			properties: {
+				disabled: !node.value.disabled,
+			} as IDataObject,
+		} as INodeUpdatePropertiesInformation;
+
+		workflowsStore.updateNodeProperties(updateInformation);
+	}
+}
+
+function setDisplayMode() {
+	if (!activeNode.value) return;
+
+	const shouldDisplayHtml =
+		activeNode.value.type === HTML_NODE_TYPE &&
+		activeNode.value.parameters.operation === 'generateHtmlTemplate';
+
+	if (shouldDisplayHtml) {
+		ndvStore.setPanelDisplayMode({
+			pane: 'output',
+			mode: 'html',
+		});
+	}
+}
+
+function activatePane() {
+	emit('activatePane');
+}
+
+function onSearchClear() {
+	search.value = '';
+	document.dispatchEvent(new KeyboardEvent('keyup', { key: '/' }));
+}
+
+function getExecutionLinkLabel(task: ITaskMetadata): string | undefined {
+	if (task.parentExecution) {
+		return i18n.baseText('runData.openParentExecution', {
+			interpolate: { id: task.parentExecution.executionId },
+		});
+	}
+
+	if (task.subExecution) {
+		if (activeTaskMetadata.value?.subExecutionsCount === 1) {
+			return i18n.baseText('runData.openSubExecutionSingle');
+		} else {
+			return i18n.baseText('runData.openSubExecutionWithId', {
+				interpolate: { id: task.subExecution.executionId },
+			});
+		}
+	}
+
+	return;
+}
+
+defineExpose({ enterEditMode });
 </script>
 
 <template>
 	<div :class="['run-data', $style.container]" @mouseover="activatePane">
-		<n8n-callout
+		<N8nCallout
 			v-if="
-				canPinData && pinnedData.hasData.value && !editMode.enabled && !isProductionExecutionPreview
+				!isPaneTypeInput &&
+				pinnedData.hasData.value &&
+				!editMode.enabled &&
+				!isProductionExecutionPreview
 			"
 			theme="secondary"
 			icon="thumbtack"
 			:class="$style.pinnedDataCallout"
+			data-test-id="ndv-pinned-data-callout"
 		>
-			{{ $locale.baseText('runData.pindata.thisDataIsPinned') }}
+			{{ i18n.baseText('runData.pindata.thisDataIsPinned') }}
 			<span v-if="!isReadOnlyRoute && !readOnlyEnv" class="ml-4xs">
-				<n8n-link
+				<N8nLink
 					theme="secondary"
 					size="small"
 					underline
@@ -1226,22 +1299,22 @@ export default defineComponent({
 					data-test-id="ndv-unpin-data"
 					@click.stop="onTogglePinData({ source: 'banner-link' })"
 				>
-					{{ $locale.baseText('runData.pindata.unpin') }}
-				</n8n-link>
+					{{ i18n.baseText('runData.pindata.unpin') }}
+				</N8nLink>
 			</span>
 			<template #trailingContent>
-				<n8n-link
-					:to="dataPinningDocsUrl"
+				<N8nLink
+					:to="DATA_PINNING_DOCS_URL"
 					size="small"
 					theme="secondary"
 					bold
 					underline
 					@click="onClickDataPinningDocsLink"
 				>
-					{{ $locale.baseText('runData.pindata.learnMore') }}
-				</n8n-link>
+					{{ i18n.baseText('runData.pindata.learnMore') }}
+				</N8nLink>
 			</template>
-		</n8n-callout>
+		</N8nCallout>
 
 		<BinaryDataDisplay
 			v-if="binaryDataDisplayData"
@@ -1254,7 +1327,7 @@ export default defineComponent({
 			<slot name="header"></slot>
 
 			<div
-				v-show="!hasRunError"
+				v-show="!hasRunError && !isTrimmedManualExecutionDataItem"
 				:class="$style.displayModes"
 				data-test-id="run-data-pane-header"
 				@click.stop
@@ -1271,7 +1344,7 @@ export default defineComponent({
 					/>
 				</Suspense>
 
-				<n8n-radio-buttons
+				<N8nRadioButtons
 					v-show="
 						hasNodeRun && (inputData.length || binaryData.length || search) && !editMode.enabled
 					"
@@ -1281,10 +1354,10 @@ export default defineComponent({
 					@update:model-value="onDisplayModeChange"
 				/>
 
-				<n8n-icon-button
+				<N8nIconButton
 					v-if="canPinData && !isReadOnlyRoute && !readOnlyEnv"
 					v-show="!editMode.enabled"
-					:title="$locale.baseText('runData.editOutput')"
+					:title="i18n.baseText('runData.editOutput')"
 					:circle="false"
 					:disabled="node?.disabled"
 					icon="pencil-alt"
@@ -1301,21 +1374,21 @@ export default defineComponent({
 						pinDataDiscoveryTooltipContent:
 							isControlledPinDataTooltip && pinDataDiscoveryTooltipVisible,
 					}"
-					:data-pinning-docs-url="dataPinningDocsUrl"
+					:data-pinning-docs-url="DATA_PINNING_DOCS_URL"
 					:pinned-data="pinnedData"
 					@toggle-pin-data="onTogglePinData({ source: 'pin-icon-click' })"
 				/>
 
 				<div v-show="editMode.enabled" :class="$style.editModeActions">
-					<n8n-button
+					<N8nButton
 						type="tertiary"
-						:label="$locale.baseText('runData.editor.cancel')"
+						:label="i18n.baseText('runData.editor.cancel')"
 						@click="onClickCancelEdit"
 					/>
-					<n8n-button
+					<N8nButton
 						class="ml-2xs"
 						type="primary"
-						:label="$locale.baseText('runData.editor.save')"
+						:label="i18n.baseText('runData.editor.save')"
 						@click="onClickSaveEdit"
 					/>
 				</div>
@@ -1331,54 +1404,76 @@ export default defineComponent({
 			v-show="!editMode.enabled"
 			:class="$style.runSelector"
 		>
-			<slot v-if="inputSelectLocation === 'runs'" name="input-select"></slot>
+			<div :class="$style.runSelectorInner">
+				<slot v-if="inputSelectLocation === 'runs'" name="input-select"></slot>
 
-			<n8n-select
-				:model-value="runIndex"
-				:class="$style.runSelectorInner"
-				size="small"
-				teleported
-				data-test-id="run-selector"
-				@update:model-value="onRunIndexChange"
-				@click.stop
-			>
-				<template #prepend>{{ $locale.baseText('ndv.output.run') }}</template>
-				<n8n-option
-					v-for="option in maxRunIndex + 1"
-					:key="option"
-					:label="getRunLabel(option)"
-					:value="option - 1"
-				></n8n-option>
-			</n8n-select>
-
-			<n8n-tooltip v-if="canLinkRuns" placement="right">
-				<template #content>
-					{{ $locale.baseText(linkedRuns ? 'runData.unlinking.hint' : 'runData.linking.hint') }}
-				</template>
-				<n8n-icon-button
-					:icon="linkedRuns ? 'unlink' : 'link'"
-					class="linkRun"
-					text
-					type="tertiary"
+				<N8nSelect
+					:model-value="runIndex"
+					:class="$style.runSelectorSelect"
 					size="small"
-					data-test-id="link-run"
-					@click="toggleLinkRuns"
-				/>
-			</n8n-tooltip>
+					teleported
+					data-test-id="run-selector"
+					@update:model-value="onRunIndexChange"
+					@click.stop
+				>
+					<template #prepend>{{ i18n.baseText('ndv.output.run') }}</template>
+					<N8nOption
+						v-for="option in maxRunIndex + 1"
+						:key="option"
+						:label="getRunLabel(option)"
+						:value="option - 1"
+					></N8nOption>
+				</N8nSelect>
 
-			<slot name="run-info"></slot>
+				<N8nTooltip v-if="canLinkRuns" placement="right">
+					<template #content>
+						{{ i18n.baseText(linkedRuns ? 'runData.unlinking.hint' : 'runData.linking.hint') }}
+					</template>
+					<N8nIconButton
+						:icon="linkedRuns ? 'unlink' : 'link'"
+						class="linkRun"
+						text
+						type="tertiary"
+						size="small"
+						data-test-id="link-run"
+						@click="toggleLinkRuns"
+					/>
+				</N8nTooltip>
+
+				<slot name="run-info"></slot>
+			</div>
+
+			<a
+				v-if="
+					activeTaskMetadata && hasReleatedExectuion && !(paneType === 'input' && hasInputOverwrite)
+				"
+				:class="$style.relatedExecutionInfo"
+				data-test-id="related-execution-link"
+				:href="resolveRelatedExecutionUrl(activeTaskMetadata)"
+				target="_blank"
+				@click.stop="trackOpeningRelatedExecution(activeTaskMetadata, displayMode)"
+			>
+				<N8nIcon icon="external-link-alt" size="xsmall" />
+				{{ getExecutionLinkLabel(activeTaskMetadata) }}
+			</a>
 		</div>
 
 		<slot v-if="!displaysMultipleNodes" name="before-data" />
 
-		<n8n-callout
+		<div v-if="props.calloutMessage" :class="$style.hintCallout">
+			<N8nCallout theme="secondary" data-test-id="run-data-callout">
+				<N8nText v-n8n-html="props.calloutMessage" size="small"></N8nText>
+			</N8nCallout>
+		</div>
+
+		<N8nCallout
 			v-for="hint in getNodeHints()"
 			:key="hint.message"
 			:class="$style.hintCallout"
 			:theme="hint.type || 'info'"
 		>
-			<n8n-text size="small" v-n8n-html="hint.message"></n8n-text>
-		</n8n-callout>
+			<N8nText v-n8n-html="hint.message" size="small"></N8nText>
+		</N8nCallout>
 
 		<div
 			v-if="maxOutputIndex > 0 && branches.length > 1 && !displaysMultipleNodes"
@@ -1388,7 +1483,7 @@ export default defineComponent({
 			<slot v-if="inputSelectLocation === 'outputs'" name="input-select"></slot>
 
 			<div :class="$style.tabs">
-				<n8n-tabs
+				<N8nTabs
 					:model-value="currentOutputIndex"
 					:options="branches"
 					@update:model-value="onBranchChange"
@@ -1400,6 +1495,7 @@ export default defineComponent({
 			v-else-if="
 				!hasRunError &&
 				hasNodeRun &&
+				!isSearchInSchemaView &&
 				((dataCount > 0 && maxRunIndex === 0) || search) &&
 				!isArtificialRecoveredEventItem &&
 				!displaysMultipleNodes
@@ -1410,32 +1506,60 @@ export default defineComponent({
 		>
 			<slot v-if="inputSelectLocation === 'items'" name="input-select"></slot>
 
-			<n8n-text v-if="search" :class="$style.itemsText">
+			<N8nText v-if="search" :class="$style.itemsText">
 				{{
-					$locale.baseText('ndv.search.items', {
+					i18n.baseText('ndv.search.items', {
 						adjustToNumber: unfilteredDataCount,
 						interpolate: { matched: dataCount, total: unfilteredDataCount },
 					})
 				}}
-			</n8n-text>
-			<n8n-text v-else :class="$style.itemsText">
-				{{
-					$locale.baseText('ndv.output.items', {
-						adjustToNumber: dataCount,
-						interpolate: { count: dataCount },
-					})
-				}}
-			</n8n-text>
+			</N8nText>
+			<N8nText v-else :class="$style.itemsText">
+				<span>
+					{{
+						i18n.baseText('ndv.output.items', {
+							adjustToNumber: dataCount,
+							interpolate: { count: dataCount },
+						})
+					}}
+				</span>
+				<span v-if="activeTaskMetadata?.subExecutionsCount">
+					{{
+						i18n.baseText('ndv.output.andSubExecutions', {
+							adjustToNumber: activeTaskMetadata.subExecutionsCount,
+							interpolate: { count: activeTaskMetadata.subExecutionsCount },
+						})
+					}}
+				</span>
+			</N8nText>
+
+			<a
+				v-if="
+					activeTaskMetadata && hasReleatedExectuion && !(paneType === 'input' && hasInputOverwrite)
+				"
+				:class="$style.relatedExecutionInfo"
+				data-test-id="related-execution-link"
+				:href="resolveRelatedExecutionUrl(activeTaskMetadata)"
+				target="_blank"
+				@click.stop="trackOpeningRelatedExecution(activeTaskMetadata, displayMode)"
+			>
+				<N8nIcon icon="external-link-alt" size="xsmall" />
+				{{ getExecutionLinkLabel(activeTaskMetadata) }}
+			</a>
 		</div>
 
-		<div ref="dataContainer" :class="$style.dataContainer" data-test-id="ndv-data-container">
-			<div v-if="isExecuting" :class="$style.center" data-test-id="ndv-executing">
-				<div :class="$style.spinner"><n8n-spinner type="ring" /></div>
-				<n8n-text>{{ executingMessage }}</n8n-text>
+		<div ref="dataContainerRef" :class="$style.dataContainer" data-test-id="ndv-data-container">
+			<div
+				v-if="isExecuting && !isWaitNodeWaiting"
+				:class="$style.center"
+				data-test-id="ndv-executing"
+			>
+				<div :class="$style.spinner"><N8nSpinner type="ring" /></div>
+				<N8nText>{{ executingMessage }}</N8nText>
 			</div>
 
 			<div v-else-if="editMode.enabled" :class="$style.editMode">
-				<div :class="[$style.editModeBody, 'ignore-key-press']">
+				<div :class="[$style.editModeBody, 'ignore-key-press-canvas']">
 					<JsonEditor
 						:model-value="editMode.value"
 						:fill-parent="true"
@@ -1443,17 +1567,19 @@ export default defineComponent({
 					/>
 				</div>
 				<div :class="$style.editModeFooter">
-					<n8n-info-tip :bold="false" :class="$style.editModeFooterInfotip">
-						{{ $locale.baseText('runData.editor.copyDataInfo') }}
-						<n8n-link :to="dataEditingDocsUrl" size="small">
-							{{ $locale.baseText('generic.learnMore') }}
-						</n8n-link>
-					</n8n-info-tip>
+					<N8nInfoTip :bold="false" :class="$style.editModeFooterInfotip">
+						{{ i18n.baseText('runData.editor.copyDataInfo') }}
+						<N8nLink :to="DATA_EDITING_DOCS_URL" size="small">
+							{{ i18n.baseText('generic.learnMore') }}
+						</N8nLink>
+					</N8nInfoTip>
 				</div>
 			</div>
 
 			<div
-				v-else-if="paneType === 'output' && hasSubworkflowExecutionError"
+				v-else-if="
+					paneType === 'output' && hasSubworkflowExecutionError && subworkflowExecutionError
+				"
 				:class="$style.stretchVertically"
 			>
 				<NodeErrorView :error="subworkflowExecutionError" :class="$style.errorDisplay" />
@@ -1474,12 +1600,31 @@ export default defineComponent({
 				v-else-if="paneType === 'input' && !displaysMultipleNodes && node?.disabled"
 				:class="$style.center"
 			>
-				<n8n-text>
-					{{ $locale.baseText('ndv.input.disabled', { interpolate: { nodeName: node.name } }) }}
-					<n8n-link @click="enableNode">
-						{{ $locale.baseText('ndv.input.disabled.cta') }}
-					</n8n-link>
-				</n8n-text>
+				<N8nText>
+					{{ i18n.baseText('ndv.input.disabled', { interpolate: { nodeName: node.name } }) }}
+					<N8nLink @click="enableNode">
+						{{ i18n.baseText('ndv.input.disabled.cta') }}
+					</N8nLink>
+				</N8nText>
+			</div>
+
+			<div
+				v-else-if="isTrimmedManualExecutionDataItem && uiStore.isProcessingExecutionResults"
+				:class="$style.center"
+			>
+				<div :class="$style.spinner"><N8nSpinner type="ring" /></div>
+				<N8nText color="text-dark" size="large">
+					{{ i18n.baseText('runData.trimmedData.loading') }}
+				</N8nText>
+			</div>
+
+			<div v-else-if="isTrimmedManualExecutionDataItem" :class="$style.center">
+				<N8nText bold color="text-dark" size="large">
+					{{ i18n.baseText('runData.trimmedData.title') }}
+				</N8nText>
+				<N8nText>
+					{{ i18n.baseText('runData.trimmedData.message') }}
+				</N8nText>
 			</div>
 
 			<div v-else-if="hasNodeRun && isArtificialRecoveredEventItem" :class="$style.center">
@@ -1487,13 +1632,13 @@ export default defineComponent({
 			</div>
 
 			<div v-else-if="hasNodeRun && hasRunError" :class="$style.stretchVertically">
-				<n8n-text v-if="isPaneTypeInput" :class="$style.center" size="large" tag="p" bold>
+				<N8nText v-if="isPaneTypeInput" :class="$style.center" size="large" tag="p" bold>
 					{{
-						$locale.baseText('nodeErrorView.inputPanel.previousNodeError.title', {
+						i18n.baseText('nodeErrorView.inputPanel.previousNodeError.title', {
 							interpolate: { nodeName: node?.name ?? '' },
 						})
 					}}
-				</n8n-text>
+				</N8nText>
 				<div v-else-if="$slots['content']">
 					<NodeErrorView
 						v-if="workflowRunErrorAsNodeError"
@@ -1517,49 +1662,51 @@ export default defineComponent({
 				:class="$style.center"
 			>
 				<div v-if="search">
-					<n8n-text tag="h3" size="large">{{
-						$locale.baseText('ndv.search.noMatch.title')
-					}}</n8n-text>
-					<n8n-text>
+					<N8nText tag="h3" size="large">{{ i18n.baseText('ndv.search.noMatch.title') }}</N8nText>
+					<N8nText>
 						<i18n-t keypath="ndv.search.noMatch.description" tag="span">
 							<template #link>
 								<a href="#" @click="onSearchClear">
-									{{ $locale.baseText('ndv.search.noMatch.description.link') }}
+									{{ i18n.baseText('ndv.search.noMatch.description.link') }}
 								</a>
 							</template>
 						</i18n-t>
-					</n8n-text>
+					</N8nText>
 				</div>
-				<n8n-text v-else>
+				<N8nText v-else>
 					{{ noDataInBranchMessage }}
-				</n8n-text>
+				</N8nText>
 			</div>
 
 			<div v-else-if="hasNodeRun && !inputData.length && !search" :class="$style.center">
 				<slot name="no-output-data">xxx</slot>
 			</div>
 
-			<div v-else-if="hasNodeRun && !showData" :class="$style.center">
-				<n8n-text :bold="true" color="text-dark" size="large">{{ tooMuchDataTitle }}</n8n-text>
-				<n8n-text align="center" tag="div"
+			<div
+				v-else-if="hasNodeRun && !showData"
+				data-test-id="ndv-data-size-warning"
+				:class="$style.center"
+			>
+				<N8nText :bold="true" color="text-dark" size="large">{{ tooMuchDataTitle }}</N8nText>
+				<N8nText align="center" tag="div"
 					><span
 						v-n8n-html="
-							$locale.baseText('ndv.output.tooMuchData.message', {
+							i18n.baseText('ndv.output.tooMuchData.message', {
 								interpolate: { size: dataSizeInMB },
 							})
 						"
 					></span
-				></n8n-text>
+				></N8nText>
 
-				<n8n-button
+				<N8nButton
 					outline
-					:label="$locale.baseText('ndv.output.tooMuchData.showDataAnyway')"
+					:label="i18n.baseText('ndv.output.tooMuchData.showDataAnyway')"
 					@click="showTooMuchData"
 				/>
 
-				<n8n-button
+				<N8nButton
 					size="small"
-					:label="$locale.baseText('runData.downloadBinaryData')"
+					:label="i18n.baseText('runData.downloadBinaryData')"
 					@click="downloadJsonData()"
 				/>
 			</div>
@@ -1577,27 +1724,25 @@ export default defineComponent({
 				"
 				:class="$style.center"
 			>
-				<n8n-text>
-					{{ $locale.baseText('runData.switchToBinary.info') }}
+				<N8nText>
+					{{ i18n.baseText('runData.switchToBinary.info') }}
 					<a @click="switchToBinary">
-						{{ $locale.baseText('runData.switchToBinary.binary') }}
+						{{ i18n.baseText('runData.switchToBinary.binary') }}
 					</a>
-				</n8n-text>
+				</N8nText>
 			</div>
 
 			<div v-else-if="showIoSearchNoMatchContent" :class="$style.center">
-				<n8n-text tag="h3" size="large">{{
-					$locale.baseText('ndv.search.noMatch.title')
-				}}</n8n-text>
-				<n8n-text>
+				<N8nText tag="h3" size="large">{{ i18n.baseText('ndv.search.noMatch.title') }}</N8nText>
+				<N8nText>
 					<i18n-t keypath="ndv.search.noMatch.description" tag="span">
 						<template #link>
 							<a href="#" @click="onSearchClear">
-								{{ $locale.baseText('ndv.search.noMatch.description.link') }}
+								{{ i18n.baseText('ndv.search.noMatch.description.link') }}
 							</a>
 						</template>
 					</i18n-t>
-				</n8n-text>
+				</N8nText>
 			</div>
 
 			<Suspense v-else-if="hasNodeRun && displayMode === 'table' && node">
@@ -1611,7 +1756,7 @@ export default defineComponent({
 					:total-runs="maxRunIndex"
 					:has-default-hover-state="paneType === 'input' && !search"
 					:search="search"
-					@mounted="$emit('tableMounted', $event)"
+					@mounted="emit('tableMounted', $event)"
 					@active-row-changed="onItemHover"
 					@display-mode-change="onDisplayModeChange"
 				/>
@@ -1654,9 +1799,7 @@ export default defineComponent({
 			</Suspense>
 
 			<div v-else-if="displayMode === 'binary' && binaryData.length === 0" :class="$style.center">
-				<n8n-text align="center" tag="div">{{
-					$locale.baseText('runData.noBinaryDataFound')
-				}}</n8n-text>
+				<N8nText align="center" tag="div">{{ i18n.baseText('runData.noBinaryDataFound') }}</N8nText>
 			</div>
 
 			<div v-else-if="displayMode === 'binary'" :class="$style.dataDisplay">
@@ -1679,58 +1822,58 @@ export default defineComponent({
 								</div>
 								<div v-if="binaryData.fileName">
 									<div>
-										<n8n-text size="small" :bold="true"
-											>{{ $locale.baseText('runData.fileName') }}:
-										</n8n-text>
+										<N8nText size="small" :bold="true"
+											>{{ i18n.baseText('runData.fileName') }}:
+										</N8nText>
 									</div>
 									<div :class="$style.binaryValue">{{ binaryData.fileName }}</div>
 								</div>
 								<div v-if="binaryData.directory">
 									<div>
-										<n8n-text size="small" :bold="true"
-											>{{ $locale.baseText('runData.directory') }}:
-										</n8n-text>
+										<N8nText size="small" :bold="true"
+											>{{ i18n.baseText('runData.directory') }}:
+										</N8nText>
 									</div>
 									<div :class="$style.binaryValue">{{ binaryData.directory }}</div>
 								</div>
 								<div v-if="binaryData.fileExtension">
 									<div>
-										<n8n-text size="small" :bold="true"
-											>{{ $locale.baseText('runData.fileExtension') }}:</n8n-text
+										<N8nText size="small" :bold="true"
+											>{{ i18n.baseText('runData.fileExtension') }}:</N8nText
 										>
 									</div>
 									<div :class="$style.binaryValue">{{ binaryData.fileExtension }}</div>
 								</div>
 								<div v-if="binaryData.mimeType">
 									<div>
-										<n8n-text size="small" :bold="true"
-											>{{ $locale.baseText('runData.mimeType') }}:
-										</n8n-text>
+										<N8nText size="small" :bold="true"
+											>{{ i18n.baseText('runData.mimeType') }}:
+										</N8nText>
 									</div>
 									<div :class="$style.binaryValue">{{ binaryData.mimeType }}</div>
 								</div>
 								<div v-if="binaryData.fileSize">
 									<div>
-										<n8n-text size="small" :bold="true"
-											>{{ $locale.baseText('runData.fileSize') }}:
-										</n8n-text>
+										<N8nText size="small" :bold="true"
+											>{{ i18n.baseText('runData.fileSize') }}:
+										</N8nText>
 									</div>
 									<div :class="$style.binaryValue">{{ binaryData.fileSize }}</div>
 								</div>
 
 								<div :class="$style.binaryButtonContainer">
-									<n8n-button
+									<N8nButton
 										v-if="isViewable(index, key)"
 										size="small"
-										:label="$locale.baseText('runData.showBinaryData')"
+										:label="i18n.baseText('runData.showBinaryData')"
 										data-test-id="ndv-view-binary-data"
 										@click="displayBinaryData(index, key)"
 									/>
-									<n8n-button
+									<N8nButton
 										v-if="isDownloadable(index, key)"
 										size="small"
 										type="secondary"
-										:label="$locale.baseText('runData.downloadBinaryData')"
+										:label="i18n.baseText('runData.downloadBinaryData')"
 										data-test-id="ndv-download-binary-data"
 										@click="downloadBinaryData(index, key)"
 									/>
@@ -1743,6 +1886,7 @@ export default defineComponent({
 		</div>
 		<div
 			v-if="
+				hidePagination === false &&
 				hasNodeRun &&
 				!hasRunError &&
 				displayMode !== 'binary' &&
@@ -1767,20 +1911,19 @@ export default defineComponent({
 			</el-pagination>
 
 			<div :class="$style.pageSizeSelector">
-				<n8n-select
+				<N8nSelect
 					size="mini"
 					:model-value="pageSize"
 					teleported
 					@update:model-value="onPageSizeChange"
 				>
-					<template #prepend>{{ $locale.baseText('ndv.output.pageSize') }}</template>
-					<n8n-option v-for="size in pageSizes" :key="size" :label="size" :value="size">
-					</n8n-option>
-					<n8n-option :label="$locale.baseText('ndv.output.all')" :value="dataCount"> </n8n-option>
-				</n8n-select>
+					<template #prepend>{{ i18n.baseText('ndv.output.pageSize') }}</template>
+					<N8nOption v-for="size in pageSizes" :key="size" :label="size" :value="size"> </N8nOption>
+					<N8nOption :label="i18n.baseText('ndv.output.all')" :value="dataCount"> </N8nOption>
+				</N8nSelect>
 			</div>
 		</div>
-		<n8n-block-ui :show="blockUI" :class="$style.uiBlocker" />
+		<N8nBlockUi :show="blockUI" :class="$style.uiBlocker" />
 	</div>
 </template>
 
@@ -1830,6 +1973,7 @@ export default defineComponent({
 	overflow-x: auto;
 	overflow-y: hidden;
 	min-height: calc(30px + var(--spacing-s));
+	scrollbar-width: thin;
 
 	> *:first-child {
 		flex-grow: 1;
@@ -1891,6 +2035,7 @@ export default defineComponent({
 	padding-left: var(--spacing-s);
 	padding-right: var(--spacing-s);
 	padding-bottom: var(--spacing-s);
+	flex-flow: wrap;
 
 	.itemsText {
 		flex-shrink: 0;
@@ -1912,24 +2057,31 @@ export default defineComponent({
 }
 
 .runSelector {
+	display: flex;
+	align-items: center;
+	flex-flow: wrap;
 	padding-left: var(--spacing-s);
 	padding-right: var(--spacing-s);
-	padding-bottom: var(--spacing-s);
-	display: flex;
-	gap: var(--spacing-4xs);
-	align-items: center;
+	margin-bottom: var(--spacing-s);
+	gap: var(--spacing-3xs);
 
 	:global(.el-input--suffix .el-input__inner) {
 		padding-right: var(--spacing-l);
 	}
 }
 
-.search {
-	margin-left: auto;
+.runSelectorInner {
+	display: flex;
+	gap: var(--spacing-4xs);
+	align-items: center;
 }
 
-.runSelectorInner {
-	max-width: 172px;
+.runSelectorSelect {
+	max-width: 205px;
+}
+
+.search {
+	margin-left: auto;
 }
 
 .pagination {
@@ -2089,6 +2241,15 @@ export default defineComponent({
 .schema {
 	padding: 0 var(--spacing-s);
 }
+
+.relatedExecutionInfo {
+	font-size: var(--font-size-s);
+	margin-left: var(--spacing-3xs);
+
+	svg {
+		padding-bottom: 2px;
+	}
+}
 </style>
 
 <style lang="scss" scoped>
diff --git a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
index 9458f75380..a3d6cab8e8 100644
--- a/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
+++ b/packages/editor-ui/src/components/RunDataAi/AiRunContentBlock.vue
@@ -24,7 +24,7 @@ const contentParsers = useAiContentParsers();
 
 // eslint-disable-next-line @typescript-eslint/no-use-before-define
 const isExpanded = ref(getInitialExpandedState());
-const isShowRaw = ref(false);
+const renderType = ref<'rendered' | 'json'>('rendered');
 const contentParsed = ref(false);
 const parsedRun = ref(undefined as ParsedAiContent | undefined);
 function getInitialExpandedState() {
@@ -134,6 +134,10 @@ function onCopyToClipboard(content: IDataObject | IDataObject[]) {
 	} catch (err) {}
 }
 
+function onRenderTypeChange(value: 'rendered' | 'json') {
+	renderType.value = value;
+}
+
 onMounted(() => {
 	parsedRun.value = parseAiRunData(props.runData);
 	if (parsedRun.value) {
@@ -146,16 +150,19 @@ onMounted(() => {
 	<div :class="$style.block">
 		<header :class="$style.blockHeader" @click="onBlockHeaderClick">
 			<button :class="$style.blockToggle">
-				<font-awesome-icon :icon="isExpanded ? 'angle-down' : 'angle-up'" size="lg" />
+				<font-awesome-icon :icon="isExpanded ? 'angle-down' : 'angle-right'" size="lg" />
 			</button>
 			<p :class="$style.blockTitle">{{ capitalize(runData.inOut) }}</p>
-			<!-- @click.stop to prevent event from bubbling to blockHeader and toggling expanded state when clicking on rawSwitch -->
-			<el-switch
-				v-if="contentParsed && !error"
-				v-model="isShowRaw"
+			<n8n-radio-buttons
+				v-if="contentParsed && !error && isExpanded"
+				size="small"
+				:model-value="renderType"
 				:class="$style.rawSwitch"
-				active-text="RAW JSON"
-				@click.stop
+				:options="[
+					{ label: 'Rendered', value: 'rendered' },
+					{ label: 'JSON', value: 'json' },
+				]"
+				@update:model-value="onRenderTypeChange"
 			/>
 		</header>
 		<main
@@ -172,7 +179,7 @@ onMounted(() => {
 				:class="$style.contentText"
 				:data-content-type="parsedContent?.type"
 			>
-				<template v-if="parsedContent && !isShowRaw">
+				<template v-if="parsedContent && renderType === 'rendered'">
 					<template v-if="parsedContent.type === 'json'">
 						<VueMarkdown
 							:source="jsonToMarkdown(parsedContent.data as JsonMarkdown)"
@@ -200,7 +207,7 @@ onMounted(() => {
 							size="small"
 							:class="$style.copyToClipboard"
 							type="secondary"
-							:title="$locale.baseText('nodeErrorView.copyToClipboard')"
+							:title="i18n.baseText('nodeErrorView.copyToClipboard')"
 							icon="copy"
 							@click="onCopyToClipboard(raw)"
 						/>
@@ -226,17 +233,17 @@ onMounted(() => {
 		white-space: pre-wrap;
 
 		h1 {
-			font-size: var(--font-size-xl);
+			font-size: var(--font-size-l);
 			line-height: var(--font-line-height-xloose);
 		}
 
 		h2 {
-			font-size: var(--font-size-l);
+			font-size: var(--font-size-m);
 			line-height: var(--font-line-height-loose);
 		}
 
 		h3 {
-			font-size: var(--font-size-m);
+			font-size: var(--font-size-s);
 			line-height: var(--font-line-height-regular);
 		}
 
@@ -252,17 +259,17 @@ onMounted(() => {
 }
 .contentText {
 	padding-top: var(--spacing-s);
-	font-size: var(--font-size-xs);
-	// max-height: 100%;
+	padding-left: var(--spacing-m);
+	padding-right: var(--spacing-m);
+	font-size: var(--font-size-s);
 }
 .block {
-	border: 1px solid var(--color-foreground-base);
-	background: var(--color-background-xlight);
-	padding: var(--spacing-xs);
-	border-radius: 4px;
-	margin-bottom: var(--spacing-2xs);
+	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);
 }
-.blockContent {
+:root .blockContent {
 	height: 0;
 	overflow: hidden;
 
@@ -271,14 +278,17 @@ onMounted(() => {
 	}
 }
 .runText {
-	line-height: var(--font-line-height-regular);
+	line-height: var(--font-line-height-xloose);
 	white-space: pre-line;
 }
 .rawSwitch {
+	opacity: 0;
+	height: fit-content;
 	margin-left: auto;
+	margin-right: var(--spacing-2xs);
 
-	& * {
-		font-size: var(--font-size-2xs);
+	.block:hover & {
+		opacity: 1;
 	}
 }
 .blockHeader {
@@ -287,21 +297,25 @@ onMounted(() => {
 	cursor: pointer;
 	/* This hack is needed to make the whole surface of header clickable  */
 	margin: calc(-1 * var(--spacing-xs));
-	padding: var(--spacing-xs);
+	padding: var(--spacing-2xs) var(--spacing-xs);
+	align-items: center;
 
 	& * {
 		user-select: none;
 	}
 }
 .blockTitle {
-	font-size: var(--font-size-2xs);
+	font-size: var(--font-size-s);
 	color: var(--color-text-dark);
+	margin: 0;
+	padding-bottom: var(--spacing-4xs);
 }
 .blockToggle {
 	border: none;
 	background: none;
 	padding: 0;
 	color: var(--color-text-base);
+	margin-top: calc(-1 * var(--spacing-3xs));
 }
 .error {
 	padding: var(--spacing-s) 0;
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
index 48f4c2448e..2f90ca0faa 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAi.vue
@@ -1,14 +1,14 @@
 <script lang="ts" setup>
 import type { Ref } from 'vue';
 import { computed, ref, watch } from 'vue';
-import type { ITaskSubRunMetadata, ITaskDataConnections } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
+import type { ITaskDataConnections, NodeConnectionType, Workflow, ITaskData } from 'n8n-workflow';
 import type { IAiData, IAiDataContent, INodeUi } from '@/Interface';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import NodeIcon from '@/components/NodeIcon.vue';
 import RunDataAiContent from './RunDataAiContent.vue';
 import { ElTree } from 'element-plus';
+import { useI18n } from '@/composables/useI18n';
 
 interface AIResult {
 	node: string;
@@ -26,31 +26,25 @@ interface TreeNode {
 export interface Props {
 	node: INodeUi;
 	runIndex?: number;
-	hideTitle?: boolean;
 	slim?: boolean;
+	workflow: Workflow;
 }
 const props = withDefaults(defineProps<Props>(), { runIndex: 0 });
 const workflowsStore = useWorkflowsStore();
 const nodeTypesStore = useNodeTypesStore();
 const selectedRun: Ref<IAiData[]> = ref([]);
 
+const i18n = useI18n();
+
 function isTreeNodeSelected(node: TreeNode) {
 	return selectedRun.value.some((run) => run.node === node.node && run.runIndex === node.runIndex);
 }
 
 function getReferencedData(
-	reference: ITaskSubRunMetadata,
+	taskData: ITaskData,
 	withInput: boolean,
 	withOutput: boolean,
 ): IAiDataContent[] {
-	const resultData = workflowsStore.getWorkflowResultDataByNodeName(reference.node);
-
-	if (!resultData?.[reference.runIndex]) {
-		return [];
-	}
-
-	const taskData = resultData[reference.runIndex];
-
 	if (!taskData) {
 		return [];
 	}
@@ -70,6 +64,7 @@ function getReferencedData(
 				metadata: {
 					executionTime: taskData.executionTime,
 					startTime: taskData.startTime,
+					subExecution: taskData.metadata?.subExecution,
 				},
 			});
 		});
@@ -98,18 +93,18 @@ function onItemClick(data: TreeNode) {
 
 		return;
 	}
+
+	const selectedNodeRun = workflowsStore.getWorkflowResultDataByNodeName(data.node)?.[
+		data.runIndex
+	];
+	if (!selectedNodeRun) {
+		return;
+	}
 	selectedRun.value = [
 		{
 			node: data.node,
 			runIndex: data.runIndex,
-			data: getReferencedData(
-				{
-					node: data.node,
-					runIndex: data.runIndex,
-				},
-				true,
-				true,
-			),
+			data: getReferencedData(selectedNodeRun, true, true),
 		},
 	];
 }
@@ -145,21 +140,20 @@ const createNode = (
 });
 
 function getTreeNodeData(nodeName: string, currentDepth: number): TreeNode[] {
-	const { connectionsByDestinationNode } = workflowsStore.getCurrentWorkflow();
-	const connections = connectionsByDestinationNode[nodeName];
-	// eslint-disable-next-line @typescript-eslint/no-use-before-define
+	const connections = props.workflow.connectionsByDestinationNode[nodeName];
 	const resultData = aiData.value?.filter((data) => data.node === nodeName) ?? [];
 
 	if (!connections) {
 		return resultData.map((d) => createNode(nodeName, currentDepth, d));
 	}
 
-	const nonMainConnectionsKeys = Object.keys(connections).filter(
-		(key) => key !== NodeConnectionType.Main,
-	);
-	const children = nonMainConnectionsKeys.flatMap((key) =>
-		connections[key][0].flatMap((node) => getTreeNodeData(node.node, currentDepth + 1)),
-	);
+	// Get the first level of children
+	const connectedSubNodes = props.workflow.getParentNodes(nodeName, 'ALL_NON_MAIN', 1);
+
+	const children = connectedSubNodes
+		// Only include sub-nodes which have data
+		.filter((name) => aiData.value?.find((data) => data.node === name))
+		.flatMap((name) => getTreeNodeData(name, currentDepth + 1));
 
 	children.sort((a, b) => a.startTime - b.startTime);
 
@@ -170,29 +164,32 @@ function getTreeNodeData(nodeName: string, currentDepth: number): TreeNode[] {
 	return [createNode(nodeName, currentDepth, undefined, children)];
 }
 
-const aiData = computed<AIResult[] | undefined>(() => {
-	const resultData = workflowsStore.getWorkflowResultDataByNodeName(props.node.name);
+const aiData = computed<AIResult[]>(() => {
+	const result: AIResult[] = [];
+	const connectedSubNodes = props.workflow.getParentNodes(props.node.name, 'ALL_NON_MAIN');
 
-	if (!resultData || !Array.isArray(resultData)) {
-		return;
-	}
+	connectedSubNodes.forEach((nodeName) => {
+		const nodeRunData = workflowsStore.getWorkflowResultDataByNodeName(nodeName) ?? [];
 
-	const subRun = resultData[props.runIndex].metadata?.subRun;
-	if (!Array.isArray(subRun)) {
-		return;
-	}
-	// Extend the subRun with the data and sort by adding execution time + startTime and comparing them
-	const subRunWithData = subRun.flatMap((run) =>
-		getReferencedData(run, false, true).map((data) => ({ ...run, data })),
-	);
+		nodeRunData.forEach((run, runIndex) => {
+			const referenceData = {
+				data: getReferencedData(run, false, true)[0],
+				node: nodeName,
+				runIndex,
+			};
 
-	subRunWithData.sort((a, b) => {
-		const aTime = a.data?.metadata?.startTime || 0;
-		const bTime = b.data?.metadata?.startTime || 0;
+			result.push(referenceData);
+		});
+	});
+
+	// Sort the data by start time
+	result.sort((a, b) => {
+		const aTime = a.data?.metadata?.startTime ?? 0;
+		const bTime = b.data?.metadata?.startTime ?? 0;
 		return aTime - bTime;
 	});
 
-	return subRunWithData;
+	return result;
 });
 
 const executionTree = computed<TreeNode[]>(() => {
@@ -206,66 +203,73 @@ watch(() => props.runIndex, selectFirst, { immediate: true });
 </script>
 
 <template>
-	<div v-if="aiData" :class="$style.container">
-		<div :class="{ [$style.tree]: true, [$style.slim]: slim }">
-			<ElTree
-				:data="executionTree"
-				:props="{ label: 'node' }"
-				default-expand-all
-				:indent="12"
-				:expand-on-click-node="false"
-				data-test-id="lm-chat-logs-tree"
-				@node-click="onItemClick"
-			>
-				<template #default="{ node, data }">
-					<div
-						:class="{
-							[$style.treeNode]: true,
-							[$style.isSelected]: isTreeNodeSelected(data),
-						}"
-						:data-tree-depth="data.depth"
-						:style="{ '--item-depth': data.depth }"
-					>
-						<button
-							v-if="data.children.length"
-							:class="$style.treeToggle"
-							@click="toggleTreeItem(node)"
+	<div :class="$style.container">
+		<template v-if="aiData.length > 0">
+			<div :class="{ [$style.tree]: true, [$style.slim]: slim }">
+				<ElTree
+					:data="executionTree"
+					:props="{ label: 'node' }"
+					default-expand-all
+					:indent="12"
+					:expand-on-click-node="false"
+					data-test-id="lm-chat-logs-tree"
+					@node-click="onItemClick"
+				>
+					<template #default="{ node, data }">
+						<div
+							:class="{
+								[$style.treeNode]: true,
+								[$style.isSelected]: isTreeNodeSelected(data),
+							}"
+							:data-tree-depth="data.depth"
+							:style="{ '--item-depth': data.depth }"
 						>
-							<font-awesome-icon :icon="node.expanded ? 'angle-down' : 'angle-up'" />
-						</button>
-						<n8n-tooltip :disabled="!slim" placement="right">
-							<template #content>
-								{{ node.label }}
-							</template>
-							<span :class="$style.leafLabel">
-								<NodeIcon :node-type="getNodeType(data.node)!" :size="17" />
-								<span v-if="!slim" v-text="node.label" />
-							</span>
-						</n8n-tooltip>
-					</div>
-				</template>
-			</ElTree>
-		</div>
-		<div :class="$style.runData">
-			<div v-if="selectedRun.length === 0" :class="$style.empty">
-				<n8n-text size="large">
-					{{
-						$locale.baseText('ndv.output.ai.empty', {
-							interpolate: {
-								node: props.node.name,
-							},
-						})
-					}}
-				</n8n-text>
+							<button
+								v-if="data.children.length"
+								:class="$style.treeToggle"
+								@click="toggleTreeItem(node)"
+							>
+								<font-awesome-icon :icon="node.expanded ? 'angle-down' : 'angle-right'" />
+							</button>
+							<n8n-tooltip :disabled="!slim" placement="right">
+								<template #content>
+									{{ node.label }}
+								</template>
+								<span :class="$style.leafLabel">
+									<NodeIcon
+										:node-type="getNodeType(data.node)!"
+										:size="17"
+										:class="$style.nodeIcon"
+									/>
+									<span v-if="!slim" v-text="node.label" />
+								</span>
+							</n8n-tooltip>
+						</div>
+					</template>
+				</ElTree>
 			</div>
-			<div
-				v-for="(data, index) in selectedRun"
-				:key="`${data.node}__${data.runIndex}__index`"
-				data-test-id="lm-chat-logs-entry"
-			>
-				<RunDataAiContent :input-data="data" :content-index="index" />
+			<div :class="$style.runData">
+				<div v-if="selectedRun.length === 0" :class="$style.empty">
+					<n8n-text size="large">
+						{{
+							i18n.baseText('ndv.output.ai.empty', {
+								interpolate: {
+									node: props.node.name,
+								},
+							})
+						}}
+					</n8n-text>
+				</div>
+				<div
+					v-for="(data, index) in selectedRun"
+					:key="`${data.node}__${data.runIndex}__index`"
+					data-test-id="lm-chat-logs-entry"
+				>
+					<RunDataAiContent :input-data="data" :content-index="index" />
+				</div>
 			</div>
-		</div>
+		</template>
+		<div v-else :class="$style.noData">{{ i18n.baseText('ndv.output.ai.waiting') }}</div>
 	</div>
 </template>
 
@@ -282,6 +286,13 @@ watch(() => props.runIndex, selectFirst, { immediate: true });
 	align-items: center;
 	gap: var(--spacing-3xs);
 }
+.noData {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+	color: var(--color-text-light);
+}
 .empty {
 	padding: var(--spacing-l);
 }
@@ -291,9 +302,9 @@ watch(() => props.runIndex, selectFirst, { immediate: true });
 }
 .tree {
 	flex-shrink: 0;
-	min-width: 12.8rem;
+	min-width: 8rem;
 	height: 100%;
-	border-right: 1px solid var(--color-foreground-base);
+
 	padding-right: var(--spacing-xs);
 	padding-left: var(--spacing-2xs);
 	&.slim {
@@ -332,6 +343,11 @@ watch(() => props.runIndex, selectFirst, { immediate: true });
 		margin-left: var(--spacing-xs);
 	}
 }
+.nodeIcon {
+	padding: var(--spacing-3xs) var(--spacing-3xs);
+	border-radius: var(--border-radius-base);
+	margin-right: var(--spacing-4xs);
+}
 .isSelected {
 	background-color: var(--color-foreground-base);
 }
@@ -339,13 +355,16 @@ watch(() => props.runIndex, selectFirst, { immediate: true });
 	display: inline-flex;
 	border-radius: var(--border-radius-base);
 	align-items: center;
-	gap: var(--spacing-3xs);
-	padding: var(--spacing-4xs) var(--spacing-3xs);
-	font-size: var(--font-size-xs);
+	padding-right: var(--spacing-3xs);
+	margin: var(--spacing-4xs) 0;
+	font-size: var(--font-size-2xs);
 	color: var(--color-text-dark);
 	margin-bottom: var(--spacing-3xs);
 	cursor: pointer;
 
+	&.isSelected {
+		font-weight: var(--font-weight-bold);
+	}
 	&:hover {
 		background-color: var(--color-foreground-base);
 	}
@@ -361,6 +380,7 @@ watch(() => props.runIndex, selectFirst, { immediate: true });
 		height: 0.125rem;
 		left: 0.75rem;
 		width: calc(var(--item-depth) * 0.625rem);
+		margin-top: var(--spacing-3xs);
 	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
index c545a8f287..adacd5f30e 100644
--- a/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
+++ b/packages/editor-ui/src/components/RunDataAi/RunDataAiContent.vue
@@ -11,6 +11,8 @@ import type {
 import { computed } from 'vue';
 import NodeIcon from '@/components/NodeIcon.vue';
 import AiRunContentBlock from './AiRunContentBlock.vue';
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
+import { useI18n } from '@/composables/useI18n';
 
 interface RunMeta {
 	startTimeMs: number;
@@ -18,6 +20,10 @@ interface RunMeta {
 	node: INodeTypeDescription | null;
 	type: 'input' | 'output';
 	connectionType: NodeConnectionType;
+	subExecution?: {
+		workflowId: string;
+		executionId: string;
+	};
 }
 const props = defineProps<{
 	inputData: IAiData;
@@ -27,6 +33,9 @@ const props = defineProps<{
 const nodeTypesStore = useNodeTypesStore();
 const workflowsStore = useWorkflowsStore();
 
+const { trackOpeningRelatedExecution, resolveRelatedExecutionUrl } = useExecutionHelpers();
+const i18n = useI18n();
+
 type TokenUsageData = {
 	completionTokens: number;
 	promptTokens: number;
@@ -75,6 +84,7 @@ function extractRunMeta(run: IAiDataContent) {
 		node: nodeType,
 		type: run.inOut,
 		connectionType: run.type,
+		subExecution: run.metadata?.subExecution,
 	};
 
 	return runMeta;
@@ -123,7 +133,7 @@ const outputError = computed(() => {
 								{{ new Date(runMeta?.startTimeMs).toLocaleString() }}
 							</template>
 							{{
-								$locale.baseText('runData.aiContentBlock.startedAt', {
+								i18n.baseText('runData.aiContentBlock.startedAt', {
 									interpolate: {
 										startTime: new Date(runMeta?.startTimeMs).toLocaleTimeString(),
 									},
@@ -131,9 +141,19 @@ const outputError = computed(() => {
 							}}
 						</n8n-tooltip>
 					</li>
+					<li v-if="runMeta?.subExecution">
+						<a
+							:href="resolveRelatedExecutionUrl(runMeta)"
+							target="_blank"
+							@click.stop="trackOpeningRelatedExecution(runMeta, 'ai')"
+						>
+							<N8nIcon icon="external-link-alt" size="xsmall" />
+							{{ i18n.baseText('runData.openSubExecutionSingle') }}
+						</a>
+					</li>
 					<li v-if="(consumedTokensSum?.totalTokens ?? 0) > 0" :class="$style.tokensUsage">
 						{{
-							$locale.baseText('runData.aiContentBlock.tokens', {
+							i18n.baseText('runData.aiContentBlock.tokens', {
 								interpolate: {
 									count: formatTokenUsageCount(consumedTokensSum?.totalTokens ?? 0),
 								},
@@ -142,9 +162,9 @@ const outputError = computed(() => {
 						<n8n-info-tip type="tooltip" theme="info-light" tooltip-placement="right">
 							<div>
 								<n8n-text :bold="true" size="small">
-									{{ $locale.baseText('runData.aiContentBlock.tokens.prompt') }}
+									{{ i18n.baseText('runData.aiContentBlock.tokens.prompt') }}
 									{{
-										$locale.baseText('runData.aiContentBlock.tokens', {
+										i18n.baseText('runData.aiContentBlock.tokens', {
 											interpolate: {
 												count: formatTokenUsageCount(consumedTokensSum?.promptTokens ?? 0),
 											},
@@ -153,9 +173,9 @@ const outputError = computed(() => {
 								</n8n-text>
 								<br />
 								<n8n-text :bold="true" size="small">
-									{{ $locale.baseText('runData.aiContentBlock.tokens.completion') }}
+									{{ i18n.baseText('runData.aiContentBlock.tokens.completion') }}
 									{{
-										$locale.baseText('runData.aiContentBlock.tokens', {
+										i18n.baseText('runData.aiContentBlock.tokens', {
 											interpolate: {
 												count: formatTokenUsageCount(consumedTokensSum?.completionTokens ?? 0),
 											},
diff --git a/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts b/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
index c7e204548e..2f02d6b0cc 100644
--- a/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
+++ b/packages/editor-ui/src/components/RunDataAi/useAiContentParsers.ts
@@ -134,13 +134,6 @@ const outputTypeParsers: {
 						} else if (content.id.includes('SystemMessage')) {
 							message = `**System Message:** ${message}`;
 						}
-						if (
-							execData.action &&
-							typeof execData.action !== 'object' &&
-							execData.action !== 'getMessages'
-						) {
-							message = `## Action: ${execData.action}\n\n${message}`;
-						}
 
 						return message;
 					}
@@ -148,6 +141,9 @@ const outputTypeParsers: {
 				})
 				.join('\n\n');
 
+			if (responseText.length === 0) {
+				return fallbackParser(execData);
+			}
 			return {
 				type: 'markdown',
 				data: responseText,
diff --git a/packages/editor-ui/src/components/__tests__/RunDataJson.test.ts b/packages/editor-ui/src/components/RunDataJson.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/RunDataJson.test.ts
rename to packages/editor-ui/src/components/RunDataJson.test.ts
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index ab7c2a2706..66afeb8eb2 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -23,15 +23,15 @@ const LazyRunDataJsonActions = defineAsyncComponent(
 const props = withDefaults(
 	defineProps<{
 		editMode: { enabled?: boolean; value?: string };
-		pushRef?: string;
-		paneType?: string;
+		pushRef: string;
+		paneType: string;
 		node: INodeUi;
 		inputData: INodeExecutionData[];
 		mappingEnabled?: boolean;
 		distanceFromActive: number;
-		runIndex?: number;
-		totalRuns?: number;
-		search?: string;
+		runIndex: number | undefined;
+		totalRuns: number | undefined;
+		search: string | undefined;
 	}>(),
 	{
 		editMode: () => ({}),
@@ -258,6 +258,7 @@ const getListItemName = (path: string) => {
 	> span {
 		padding: 0 var(--spacing-5xs) 0 var(--spacing-5xs);
 		margin-left: var(--spacing-5xs);
+		white-space: pre-wrap;
 	}
 }
 
diff --git a/packages/editor-ui/src/components/RunDataJsonActions.vue b/packages/editor-ui/src/components/RunDataJsonActions.vue
index 41e01e1ff6..e5b11b6ca2 100644
--- a/packages/editor-ui/src/components/RunDataJsonActions.vue
+++ b/packages/editor-ui/src/components/RunDataJsonActions.vue
@@ -1,7 +1,4 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
-import { mapStores, storeToRefs } from 'pinia';
+<script lang="ts" setup>
 import jp from 'jsonpath';
 import type { INodeUi } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
@@ -14,192 +11,168 @@ import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 import { nonExistingJsonPath } from '@/constants';
 import { useClipboard } from '@/composables/useClipboard';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { usePinnedData } from '@/composables/usePinnedData';
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 type JsonPathData = {
 	path: string;
 	startPath: string;
 };
 
-export default defineComponent({
-	name: 'RunDataJsonActions',
-	props: {
-		node: {
-			type: Object as PropType<INodeUi>,
-			required: true,
-		},
-		paneType: {
-			type: String,
-		},
-		pushRef: {
-			type: String,
-		},
-		currentOutputIndex: {
-			type: Number,
-		},
-		runIndex: {
-			type: Number,
-		},
-		displayMode: {
-			type: String,
-		},
-		distanceFromActive: {
-			type: Number,
-		},
-		selectedJsonPath: {
-			type: String,
-			default: nonExistingJsonPath,
-		},
-		jsonData: {
-			type: Array as PropType<IDataObject[]>,
-			required: true,
-		},
+const props = withDefaults(
+	defineProps<{
+		node: INodeUi;
+		paneType: string;
+		pushRef: string;
+		displayMode: string;
+		distanceFromActive: number;
+		selectedJsonPath: string;
+		jsonData: IDataObject[];
+		currentOutputIndex?: number;
+		runIndex?: number;
+	}>(),
+	{
+		selectedJsonPath: nonExistingJsonPath,
 	},
-	setup() {
-		const ndvStore = useNDVStore();
-		const i18n = useI18n();
-		const nodeHelpers = useNodeHelpers();
-		const clipboard = useClipboard();
-		const { activeNode } = storeToRefs(ndvStore);
-		const pinnedData = usePinnedData(activeNode);
+);
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
 
-		return {
-			i18n,
-			nodeHelpers,
-			clipboard,
-			pinnedData,
-			...useToast(),
-		};
-	},
-	computed: {
-		...mapStores(useNodeTypesStore, useNDVStore, useWorkflowsStore, useSourceControlStore),
-		isReadOnlyRoute() {
-			return this.$route?.meta?.readOnlyCanvas === true;
-		},
-		activeNode(): INodeUi | null {
-			return this.ndvStore.activeNode;
-		},
-		noSelection() {
-			return this.selectedJsonPath === nonExistingJsonPath;
-		},
-		normalisedJsonPath(): string {
-			return this.noSelection ? '[""]' : this.selectedJsonPath;
-		},
-	},
-	methods: {
-		getJsonValue(): string {
-			let selectedValue = jp.query(this.jsonData, `$${this.normalisedJsonPath}`)[0];
-			if (this.noSelection) {
-				const inExecutionsFrame =
-					window !== window.parent && window.parent.location.pathname.includes('/executions');
+const i18n = useI18n();
+const nodeHelpers = useNodeHelpers();
+const clipboard = useClipboard();
+const { activeNode } = ndvStore;
+const pinnedData = usePinnedData(activeNode);
+const { showToast } = useToast();
+const telemetry = useTelemetry();
 
-				if (this.pinnedData.hasData.value && !inExecutionsFrame) {
-					selectedValue = clearJsonKey(this.pinnedData.data.value as object);
-				} else {
-					selectedValue = executionDataToJson(
-						this.nodeHelpers.getNodeInputData(this.node, this.runIndex, this.currentOutputIndex),
-					);
-				}
-			}
+const route = useRoute();
 
-			let value = '';
-			if (typeof selectedValue === 'object') {
-				value = JSON.stringify(selectedValue, null, 2);
-			} else {
-				value = selectedValue.toString();
-			}
-
-			return value;
-		},
-		getJsonItemPath(): JsonPathData {
-			const newPath = convertPath(this.normalisedJsonPath);
-			let startPath = '';
-			let path = '';
-
-			const pathParts = newPath.split(']');
-			const index = pathParts[0].slice(1);
-			path = pathParts.slice(1).join(']');
-			startPath = `$item(${index}).$node["${this.node.name}"].json`;
-
-			return { path, startPath };
-		},
-		getJsonParameterPath(): JsonPathData {
-			const newPath = convertPath(this.normalisedJsonPath);
-			const path = newPath.split(']').slice(1).join(']');
-			let startPath = `$node["${this.node.name}"].json`;
-
-			if (this.distanceFromActive === 1) {
-				startPath = '$json';
-			}
-
-			return { path, startPath };
-		},
-		handleCopyClick(commandData: { command: string }) {
-			let value: string;
-			if (commandData.command === 'value') {
-				value = this.getJsonValue();
-
-				this.showToast({
-					title: this.i18n.baseText('runData.copyValue.toast'),
-					message: '',
-					type: 'success',
-					duration: 2000,
-				});
-			} else {
-				let startPath = '';
-				let path = '';
-				if (commandData.command === 'itemPath') {
-					const jsonItemPath = this.getJsonItemPath();
-					startPath = jsonItemPath.startPath;
-					path = jsonItemPath.path;
-
-					this.showToast({
-						title: this.i18n.baseText('runData.copyItemPath.toast'),
-						message: '',
-						type: 'success',
-						duration: 2000,
-					});
-				} else if (commandData.command === 'parameterPath') {
-					const jsonParameterPath = this.getJsonParameterPath();
-					startPath = jsonParameterPath.startPath;
-					path = jsonParameterPath.path;
-
-					this.showToast({
-						title: this.i18n.baseText('runData.copyParameterPath.toast'),
-						message: '',
-						type: 'success',
-						duration: 2000,
-					});
-				}
-				if (!path.startsWith('[') && !path.startsWith('.') && path) {
-					path += '.';
-				}
-				value = `{{ ${startPath + path} }}`;
-			}
-
-			const copyType = {
-				value: 'selection',
-				itemPath: 'item_path',
-				parameterPath: 'parameter_path',
-			}[commandData.command];
-
-			this.$telemetry.track('User copied ndv data', {
-				node_type: this.activeNode?.type,
-				push_ref: this.pushRef,
-				run_index: this.runIndex,
-				view: 'json',
-				copy_type: copyType,
-				workflow_id: this.workflowsStore.workflowId,
-				pane: this.paneType,
-				in_execution_log: this.isReadOnlyRoute,
-			});
-
-			void this.clipboard.copy(value);
-		},
-	},
+const isReadOnlyRoute = computed(() => {
+	return route?.meta?.readOnlyCanvas === true;
 });
+
+const noSelection = computed(() => {
+	return props.selectedJsonPath === nonExistingJsonPath;
+});
+const normalisedJsonPath = computed((): string => {
+	return noSelection.value ? '[""]' : props.selectedJsonPath;
+});
+
+function getJsonValue(): string {
+	let selectedValue = jp.query(props.jsonData, `$${normalisedJsonPath.value}`)[0];
+	if (noSelection.value) {
+		const inExecutionsFrame =
+			window !== window.parent && window.parent.location.pathname.includes('/executions');
+
+		if (pinnedData.hasData.value && !inExecutionsFrame) {
+			selectedValue = clearJsonKey(pinnedData.data.value as object);
+		} else {
+			selectedValue = executionDataToJson(
+				nodeHelpers.getNodeInputData(props.node, props.runIndex, props.currentOutputIndex),
+			);
+		}
+	}
+
+	let value = '';
+	if (typeof selectedValue === 'object') {
+		value = JSON.stringify(selectedValue, null, 2);
+	} else {
+		value = selectedValue.toString();
+	}
+
+	return value;
+}
+
+function getJsonItemPath(): JsonPathData {
+	const newPath = convertPath(normalisedJsonPath.value);
+	let startPath = '';
+	let path = '';
+
+	const pathParts = newPath.split(']');
+	const index = pathParts[0].slice(1);
+	path = pathParts.slice(1).join(']');
+	startPath = `$item(${index}).$node["${props.node.name}"].json`;
+
+	return { path, startPath };
+}
+
+function getJsonParameterPath(): JsonPathData {
+	const newPath = convertPath(normalisedJsonPath.value);
+	const path = newPath.split(']').slice(1).join(']');
+	let startPath = `$node["${props.node.name}"].json`;
+
+	if (props.distanceFromActive === 1) {
+		startPath = '$json';
+	}
+
+	return { path, startPath };
+}
+
+function handleCopyClick(commandData: { command: string }) {
+	let value: string;
+	if (commandData.command === 'value') {
+		value = getJsonValue();
+
+		showToast({
+			title: i18n.baseText('runData.copyValue.toast'),
+			message: '',
+			type: 'success',
+			duration: 2000,
+		});
+	} else {
+		let startPath = '';
+		let path = '';
+		if (commandData.command === 'itemPath') {
+			const jsonItemPath = getJsonItemPath();
+			startPath = jsonItemPath.startPath;
+			path = jsonItemPath.path;
+
+			showToast({
+				title: i18n.baseText('runData.copyItemPath.toast'),
+				message: '',
+				type: 'success',
+				duration: 2000,
+			});
+		} else if (commandData.command === 'parameterPath') {
+			const jsonParameterPath = getJsonParameterPath();
+			startPath = jsonParameterPath.startPath;
+			path = jsonParameterPath.path;
+
+			showToast({
+				title: i18n.baseText('runData.copyParameterPath.toast'),
+				message: '',
+				type: 'success',
+				duration: 2000,
+			});
+		}
+		if (!path.startsWith('[') && !path.startsWith('.') && path) {
+			path += '.';
+		}
+		value = `{{ ${startPath + path} }}`;
+	}
+
+	const copyType = {
+		value: 'selection',
+		itemPath: 'item_path',
+		parameterPath: 'parameter_path',
+	}[commandData.command];
+
+	telemetry.track('User copied ndv data', {
+		node_type: activeNode?.type,
+		push_ref: props.pushRef,
+		run_index: props.runIndex,
+		view: 'json',
+		copy_type: copyType,
+		workflow_id: workflowsStore.workflowId,
+		pane: props.paneType,
+		in_execution_log: isReadOnlyRoute.value,
+	});
+
+	void clipboard.copy(value);
+}
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/__tests__/RunDataPinButton.test.ts b/packages/editor-ui/src/components/RunDataPinButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/RunDataPinButton.test.ts
rename to packages/editor-ui/src/components/RunDataPinButton.test.ts
diff --git a/packages/editor-ui/src/components/RunDataPinButton.vue b/packages/editor-ui/src/components/RunDataPinButton.vue
index 8eadc720e6..ff01e78645 100644
--- a/packages/editor-ui/src/components/RunDataPinButton.vue
+++ b/packages/editor-ui/src/components/RunDataPinButton.vue
@@ -2,6 +2,7 @@
 import { computed } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import type { usePinnedData } from '@/composables/usePinnedData';
+import { N8nIconButton, N8nLink, N8nText, N8nTooltip } from 'n8n-design-system';
 
 const locale = useI18n();
 
@@ -27,7 +28,7 @@ const visible = computed(() =>
 </script>
 
 <template>
-	<n8n-tooltip placement="bottom-end" :visible="visible">
+	<N8nTooltip placement="bottom-end" :visible="visible">
 		<template #content>
 			<div v-if="props.tooltipContentsVisibility.binaryDataTooltipContent">
 				{{ locale.baseText('ndv.pinData.pin.binary') }}
@@ -37,16 +38,16 @@ const visible = computed(() =>
 			</div>
 			<div v-else>
 				<strong>{{ locale.baseText('ndv.pinData.pin.title') }}</strong>
-				<n8n-text size="small" tag="p">
+				<N8nText size="small" tag="p">
 					{{ locale.baseText('ndv.pinData.pin.description') }}
 
-					<n8n-link :to="props.dataPinningDocsUrl" size="small">
+					<N8nLink :to="props.dataPinningDocsUrl" size="small">
 						{{ locale.baseText('ndv.pinData.pin.link') }}
-					</n8n-link>
-				</n8n-text>
+					</N8nLink>
+				</N8nText>
 			</div>
 		</template>
-		<n8n-icon-button
+		<N8nIconButton
 			:class="$style.pinDataButton"
 			type="tertiary"
 			:active="props.pinnedData.hasData.value"
@@ -55,7 +56,7 @@ const visible = computed(() =>
 			data-test-id="ndv-pin-data"
 			@click="emit('togglePinData')"
 		/>
-	</n8n-tooltip>
+	</N8nTooltip>
 </template>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/RunDataSchema.vue b/packages/editor-ui/src/components/RunDataSchema.vue
deleted file mode 100644
index d4b5f01e18..0000000000
--- a/packages/editor-ui/src/components/RunDataSchema.vue
+++ /dev/null
@@ -1,644 +0,0 @@
-<script lang="ts" setup>
-import { computed, ref, watch } from 'vue';
-import { snakeCase } from 'lodash-es';
-import type { INodeUi, Schema } from '@/Interface';
-import RunDataSchemaItem from '@/components/RunDataSchemaItem.vue';
-import NodeIcon from '@/components/NodeIcon.vue';
-import Draggable from '@/components/Draggable.vue';
-import { useNDVStore } from '@/stores/ndv.store';
-import { telemetry } from '@/plugins/telemetry';
-import {
-	NodeConnectionType,
-	type IConnectedNode,
-	type IDataObject,
-	type INodeTypeDescription,
-} from 'n8n-workflow';
-import { useExternalHooks } from '@/composables/useExternalHooks';
-import { i18n } from '@/plugins/i18n';
-import MappingPill from './MappingPill.vue';
-import { useDataSchema } 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 { useDebounce } from '@/composables/useDebounce';
-
-type Props = {
-	nodes?: IConnectedNode[];
-	node?: INodeUi | null;
-	data?: IDataObject[];
-	mappingEnabled?: boolean;
-	runIndex?: number;
-	outputIndex?: number;
-	totalRuns?: number;
-	paneType: 'input' | 'output';
-	connectionType?: NodeConnectionType;
-	search?: string;
-};
-
-type SchemaNode = {
-	node: INodeUi;
-	nodeType: INodeTypeDescription;
-	depth: number;
-	loading: boolean;
-	open: boolean;
-	connectedOutputIndexes: number[];
-	itemsCount: number | null;
-	schema: Schema | null;
-};
-
-const props = withDefaults(defineProps<Props>(), {
-	nodes: () => [],
-	distanceFromActive: 1,
-	node: null,
-	data: undefined,
-	runIndex: 0,
-	outputIndex: 0,
-	totalRuns: 1,
-	connectionType: NodeConnectionType.Main,
-	search: '',
-	mappingEnabled: false,
-});
-
-const draggingPath = ref<string>('');
-const nodesOpen = ref<Partial<Record<string, boolean>>>({});
-const nodesData = ref<Partial<Record<string, { schema: Schema; itemsCount: number }>>>({});
-const nodesLoading = ref<Partial<Record<string, boolean>>>({});
-const disableScrollInView = ref(false);
-
-const ndvStore = useNDVStore();
-const nodeTypesStore = useNodeTypesStore();
-const workflowsStore = useWorkflowsStore();
-const { getSchemaForExecutionData, filterSchema } = useDataSchema();
-const { getNodeInputData } = useNodeHelpers();
-const { debounce } = useDebounce();
-
-const emit = defineEmits<{
-	'clear:search': [];
-}>();
-
-const nodeSchema = computed(() =>
-	filterSchema(getSchemaForExecutionData(props.data ?? []), props.search),
-);
-const nodes = computed(() => {
-	return props.nodes
-		.map((node) => {
-			const fullNode = workflowsStore.getNodeByName(node.name);
-
-			if (!fullNode) return null;
-
-			const nodeType = nodeTypesStore.getNodeType(fullNode.type, fullNode.typeVersion);
-			const { itemsCount, schema } = nodesData.value[node.name] ?? {
-				itemsCount: null,
-				schema: null,
-			};
-
-			return {
-				node: fullNode,
-				connectedOutputIndexes: node.indicies.length > 0 ? node.indicies : [0],
-				depth: node.depth,
-				itemsCount,
-				nodeType,
-				schema: schema ? filterSchema(schema, props.search) : null,
-				loading: nodesLoading.value[node.name],
-				open: nodesOpen.value[node.name],
-			};
-		})
-		.filter((node): node is SchemaNode => !!(node?.node && node.nodeType));
-});
-
-const filteredNodes = computed(() =>
-	nodes.value.filter((node) => !props.search || !isDataEmpty(node.schema)),
-);
-
-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 isDataEmpty = (schema: Schema | null) => {
-	if (!schema) return true;
-	// Utilize the generated schema instead of looping over the entire data again
-	// The schema for empty data is { type: 'object' | 'array', value: [] }
-	const isObjectOrArray = schema.type === 'object' || schema.type === 'array';
-	const isEmpty = Array.isArray(schema.value) && schema.value.length === 0;
-
-	return isObjectOrArray && isEmpty;
-};
-
-const highlight = computed(() => ndvStore.highlightDraggables);
-const allNodesOpen = computed(() => nodes.value.every((node) => node.open));
-const noNodesOpen = computed(() => nodes.value.every((node) => !node.open));
-
-const loadNodeData = async ({ node, connectedOutputIndexes }: SchemaNode) => {
-	const pinData = workflowsStore.pinDataByNodeName(node.name);
-	const data =
-		pinData ??
-		connectedOutputIndexes
-			.map((outputIndex) =>
-				executionDataToJson(
-					getNodeInputData(node, props.runIndex, outputIndex, props.paneType, props.connectionType),
-				),
-			)
-			.flat();
-
-	nodesData.value[node.name] = {
-		schema: getSchemaForExecutionData(data),
-		itemsCount: data.length,
-	};
-};
-
-const toggleOpenNode = async (schemaNode: SchemaNode, exclusive = false) => {
-	const { node, schema, open } = schemaNode;
-	disableScrollInView.value = false;
-	if (open) {
-		nodesOpen.value[node.name] = false;
-		return;
-	}
-
-	if (!schema) {
-		nodesLoading.value[node.name] = true;
-		await loadNodeData(schemaNode);
-		nodesLoading.value[node.name] = false;
-	}
-
-	if (exclusive) {
-		nodesOpen.value = { [node.name]: true };
-	} else {
-		nodesOpen.value[node.name] = true;
-	}
-};
-
-const openAllNodes = async () => {
-	const nodesToLoad = nodes.value.filter((node) => !node.schema);
-	await Promise.all(nodesToLoad.map(loadNodeData));
-	nodesOpen.value = Object.fromEntries(nodes.value.map(({ node }) => [node.name, true]));
-};
-
-const onDragStart = (el: HTMLElement) => {
-	if (el?.dataset?.path) {
-		draggingPath.value = el.dataset.path;
-	}
-
-	ndvStore.resetMappingTelemetry();
-};
-
-const onDragEnd = (el: HTMLElement, node: INodeUi, depth: number) => {
-	draggingPath.value = '';
-
-	setTimeout(() => {
-		const mappingTelemetry = ndvStore.mappingTelemetry;
-		const telemetryPayload = {
-			src_node_type: node.type,
-			src_field_name: el.dataset.name ?? '',
-			src_nodes_back: depth,
-			src_run_index: props.runIndex,
-			src_runs_total: props.totalRuns,
-			src_field_nest_level: el.dataset.depth ?? 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 });
-	}, 1000); // ensure dest data gets set if drop
-};
-
-const onTransitionStart = debounce(
-	(event: TransitionEvent, nodeName: string) => {
-		if (
-			nodesOpen.value[nodeName] &&
-			event.target instanceof HTMLElement &&
-			!disableScrollInView.value
-		) {
-			event.target.scrollIntoView({
-				behavior: 'smooth',
-				block: 'nearest',
-				inline: 'nearest',
-			});
-		}
-	},
-	{ debounceTime: 100, trailing: true },
-);
-
-watch(
-	() => props.nodes,
-	() => {
-		if (noNodesOpen.value && nodes.value.length > 0) {
-			void toggleOpenNode(nodes.value[0]);
-		}
-	},
-	{ immediate: true },
-);
-
-watch(
-	() => props.search,
-	(search, prevSearch) => {
-		if (!prevSearch?.trim() && search.trim() && !allNodesOpen.value) {
-			disableScrollInView.value = true;
-			void openAllNodes();
-		}
-
-		if (prevSearch?.trim() && !search.trim() && allNodesOpen.value && nodes.value.length > 0) {
-			nodesOpen.value = { [nodes.value[0].node.name]: true };
-		}
-	},
-	{ immediate: true },
-);
-</script>
-
-<template>
-	<div
-		v-if="paneType === 'input' && nodes.length > 0"
-		:class="[$style.schemaWrapper, { highlightSchema: highlight }]"
-	>
-		<div v-if="search && nodes.length > 0 && filteredNodes.length === 0" :class="$style.noMatch">
-			<n8n-text tag="h3" size="large">{{
-				$locale.baseText('ndv.search.noNodeMatch.title')
-			}}</n8n-text>
-			<n8n-text>
-				<i18n-t keypath="ndv.search.noMatch.description" tag="span">
-					<template #link>
-						<a href="#" @click="emit('clear:search')">
-							{{ $locale.baseText('ndv.search.noMatch.description.link') }}
-						</a>
-					</template>
-				</i18n-t>
-			</n8n-text>
-		</div>
-
-		<div
-			v-for="currentNode in filteredNodes"
-			:key="currentNode.node.id"
-			data-test-id="run-data-schema-node"
-			:class="[$style.node, { [$style.open]: currentNode.open }]"
-		>
-			<div
-				:class="[
-					$style.header,
-					{
-						[$style.trigger]: currentNode.nodeType.group.includes('trigger'),
-					},
-				]"
-				data-test-id="run-data-schema-node-header"
-			>
-				<div :class="$style.expand" @click="toggleOpenNode(currentNode)">
-					<font-awesome-icon icon="angle-right" :class="$style.expandIcon" />
-				</div>
-
-				<div
-					:class="$style.titleContainer"
-					data-test-id="run-data-schema-node-name"
-					@click="toggleOpenNode(currentNode, true)"
-				>
-					<div :class="$style.nodeIcon">
-						<NodeIcon :node-type="currentNode.nodeType" :size="12" />
-					</div>
-
-					<div :class="$style.title">
-						{{ currentNode.node.name }}
-						<span v-if="nodeAdditionalInfo(currentNode.node)" :class="$style.subtitle">{{
-							nodeAdditionalInfo(currentNode.node)
-						}}</span>
-					</div>
-					<font-awesome-icon
-						v-if="currentNode.nodeType.group.includes('trigger')"
-						:class="$style.triggerIcon"
-						icon="bolt"
-						size="xs"
-					/>
-				</div>
-
-				<Transition name="items">
-					<div
-						v-if="currentNode.itemsCount && currentNode.open"
-						:class="$style.items"
-						data-test-id="run-data-schema-node-item-count"
-					>
-						{{
-							i18n.baseText('ndv.output.items', {
-								interpolate: { count: currentNode.itemsCount },
-							})
-						}}
-					</div>
-				</Transition>
-			</div>
-
-			<Draggable
-				type="mapping"
-				target-data-key="mappable"
-				:disabled="!mappingEnabled"
-				@dragstart="onDragStart"
-				@dragend="(el: HTMLElement) => onDragEnd(el, currentNode.node, currentNode.depth)"
-			>
-				<template #preview="{ canDrop, el }">
-					<MappingPill v-if="el" :html="el.outerHTML" :can-drop="canDrop" />
-				</template>
-
-				<Transition name="schema">
-					<div
-						v-if="currentNode.schema || search"
-						:class="[$style.schema, $style.animated]"
-						data-test-id="run-data-schema-node-schema"
-						@transitionstart="(event) => onTransitionStart(event, currentNode.node.name)"
-					>
-						<div :class="$style.innerSchema" @transitionstart.stop>
-							<div
-								v-if="currentNode.node.disabled"
-								:class="$style.notice"
-								data-test-id="run-data-schema-disabled"
-							>
-								{{ i18n.baseText('dataMapping.schemaView.disabled') }}
-							</div>
-
-							<div
-								v-else-if="isDataEmpty(currentNode.schema)"
-								:class="$style.notice"
-								data-test-id="run-data-schema-empty"
-							>
-								{{ i18n.baseText('dataMapping.schemaView.emptyData') }}
-							</div>
-
-							<RunDataSchemaItem
-								v-else-if="currentNode.schema"
-								:schema="currentNode.schema"
-								:level="0"
-								:parent="null"
-								:pane-type="paneType"
-								:sub-key="snakeCase(currentNode.node.name)"
-								:mapping-enabled="mappingEnabled"
-								:dragging-path="draggingPath"
-								:distance-from-active="currentNode.depth"
-								:node="currentNode.node"
-								:search="search"
-							/>
-						</div>
-					</div>
-				</Transition>
-			</Draggable>
-		</div>
-	</div>
-
-	<div v-else :class="[$style.schemaWrapper, { highlightSchema: highlight }]">
-		<div v-if="isDataEmpty(nodeSchema) && search" :class="$style.noMatch">
-			<n8n-text tag="h3" size="large">{{
-				$locale.baseText('ndv.search.noNodeMatch.title')
-			}}</n8n-text>
-			<n8n-text>
-				<i18n-t keypath="ndv.search.noMatch.description" tag="span">
-					<template #link>
-						<a href="#" @click="emit('clear:search')">
-							{{ $locale.baseText('ndv.search.noMatch.description.link') }}
-						</a>
-					</template>
-				</i18n-t>
-			</n8n-text>
-		</div>
-
-		<div v-else :class="$style.schema" data-test-id="run-data-schema-node-schema">
-			<n8n-info-tip
-				v-if="isDataEmpty(nodeSchema)"
-				:class="$style.tip"
-				data-test-id="run-data-schema-empty"
-			>
-				{{ i18n.baseText('dataMapping.schemaView.emptyData') }}
-			</n8n-info-tip>
-
-			<RunDataSchemaItem
-				v-else-if="nodeSchema"
-				:schema="nodeSchema"
-				:level="0"
-				:parent="null"
-				:pane-type="paneType"
-				:sub-key="`output_${nodeSchema.type}-0-0`"
-				:mapping-enabled="mappingEnabled"
-				:dragging-path="draggingPath"
-				:node="node"
-				:search="search"
-			/>
-		</div>
-	</div>
-</template>
-
-<style lang="scss" module>
-@import '@/styles/variables';
-
-.schemaWrapper {
-	--header-height: 38px;
-	--title-spacing-left: 38px;
-	display: flex;
-	flex-direction: column;
-	container: schema / inline-size;
-
-	&.animating {
-		overflow: hidden;
-		height: 100%;
-	}
-}
-
-.node {
-	.schema {
-		padding-left: var(--title-spacing-left);
-		scroll-margin-top: var(--header-height);
-	}
-
-	.notice {
-		padding-left: var(--spacing-l);
-	}
-}
-
-.schema {
-	display: grid;
-	grid-template-rows: 1fr;
-
-	&.animated {
-		grid-template-rows: 0fr;
-		transform: translateX(-8px);
-		opacity: 0;
-
-		transition:
-			grid-template-rows 0.2s $ease-out-expo,
-			opacity 0.2s $ease-out-expo 0s,
-			transform 0.2s $ease-out-expo 0s;
-	}
-}
-
-.notice {
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-light);
-}
-
-.innerSchema {
-	min-height: 0;
-	min-width: 0;
-
-	> div {
-		margin-bottom: var(--spacing-xs);
-	}
-}
-
-.titleContainer {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-2xs);
-	flex-basis: 100%;
-	cursor: pointer;
-}
-
-.subtitle {
-	margin-left: auto;
-	padding-left: var(--spacing-2xs);
-	color: var(--color-text-light);
-	font-weight: var(--font-weight-regular);
-}
-
-.header {
-	display: flex;
-	align-items: center;
-	position: sticky;
-	top: 0;
-	z-index: 1;
-	padding-bottom: var(--spacing-2xs);
-	background: var(--color-run-data-background);
-}
-
-.expand {
-	--expand-toggle-size: 30px;
-	width: var(--expand-toggle-size);
-	height: var(--expand-toggle-size);
-	flex-shrink: 0;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	cursor: pointer;
-
-	&:hover,
-	&:active {
-		color: var(--color-text-dark);
-	}
-}
-
-.expandIcon {
-	transition: transform 0.2s $ease-out-expo;
-}
-
-.open {
-	.expandIcon {
-		transform: rotate(90deg);
-	}
-
-	.schema {
-		transition:
-			grid-template-rows 0.2s $ease-out-expo,
-			opacity 0.2s $ease-out-expo,
-			transform 0.2s $ease-out-expo;
-		grid-template-rows: 1fr;
-		opacity: 1;
-		transform: translateX(0);
-	}
-}
-
-.nodeIcon {
-	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);
-}
-
-.noMatch {
-	display: flex;
-	flex-grow: 1;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	padding: var(--spacing-s) var(--spacing-s) var(--spacing-xl) var(--spacing-s);
-	text-align: center;
-
-	> * {
-		max-width: 316px;
-		margin-bottom: var(--spacing-2xs);
-	}
-}
-
-.title {
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-dark);
-}
-
-.items {
-	flex-shrink: 0;
-	font-size: var(--font-size-2xs);
-	color: var(--color-text-light);
-	margin-left: var(--spacing-2xs);
-
-	transition:
-		opacity 0.2s $ease-out-expo,
-		transform 0.2s $ease-out-expo;
-}
-
-.triggerIcon {
-	margin-left: var(--spacing-2xs);
-	color: var(--color-primary);
-}
-
-.trigger {
-	.nodeIcon {
-		border-radius: 16px 4px 4px 16px;
-	}
-}
-
-@container schema (max-width: 24em) {
-	.depth {
-		display: none;
-	}
-}
-</style>
-
-<style lang="scss" scoped>
-@import '@/styles/variables';
-
-.items-enter-from,
-.items-leave-to {
-	transform: translateX(-4px);
-	opacity: 0;
-}
-
-.items-enter-to,
-.items-leave-from {
-	transform: translateX(0);
-	opacity: 1;
-}
-
-.schema-enter-from,
-.schema-leave-to {
-	grid-template-rows: 0fr;
-	transform: translateX(-8px);
-	opacity: 0;
-}
-
-.schema-enter-to,
-.schema-leave-from {
-	transform: translateX(0);
-	grid-template-rows: 1fr;
-	opacity: 1;
-}
-</style>
diff --git a/packages/editor-ui/src/components/RunDataSchemaItem.vue b/packages/editor-ui/src/components/RunDataSchemaItem.vue
deleted file mode 100644
index 18b1419329..0000000000
--- a/packages/editor-ui/src/components/RunDataSchemaItem.vue
+++ /dev/null
@@ -1,332 +0,0 @@
-<script lang="ts" setup>
-import { computed } from 'vue';
-import type { INodeUi, Schema } from '@/Interface';
-import { checkExhaustive } from '@/utils/typeGuards';
-import { shorten } from '@/utils/typesUtils';
-import { getMappedExpression } from '@/utils/mappingUtils';
-import TextWithHighlights from './TextWithHighlights.vue';
-
-type Props = {
-	schema: Schema;
-	level: number;
-	parent: Schema | null;
-	subKey: string;
-	paneType: 'input' | 'output';
-	mappingEnabled: boolean;
-	draggingPath: string;
-	distanceFromActive?: number;
-	node: INodeUi | null;
-	search: string;
-};
-
-const props = defineProps<Props>();
-
-const isSchemaValueArray = computed(() => Array.isArray(props.schema.value));
-const schemaArray = computed(
-	() => (isSchemaValueArray.value ? props.schema.value : []) as Schema[],
-);
-const isSchemaParentTypeArray = computed(() => props.parent?.type === 'array');
-
-const key = computed((): string | undefined => {
-	return isSchemaParentTypeArray.value ? `[${props.schema.key}]` : props.schema.key;
-});
-const schemaName = computed(() =>
-	isSchemaParentTypeArray.value ? `${props.schema.type}[${props.schema.key}]` : props.schema.key,
-);
-
-const text = computed(() =>
-	Array.isArray(props.schema.value) ? '' : shorten(props.schema.value, 600, 0),
-);
-
-const dragged = computed(() => props.draggingPath === props.schema.path);
-
-const getJsonParameterPath = (path: string): string =>
-	getMappedExpression({
-		nodeName: props.node!.name,
-		distanceFromActive: props.distanceFromActive ?? 1,
-		path,
-	});
-
-const getIconBySchemaType = (type: Schema['type']): string => {
-	switch (type) {
-		case 'object':
-			return 'cube';
-		case 'array':
-			return 'list';
-		case 'string':
-		case 'null':
-			return 'font';
-		case 'number':
-			return 'hashtag';
-		case 'boolean':
-			return 'check-square';
-		case 'function':
-			return 'code';
-		case 'bigint':
-			return 'calculator';
-		case 'symbol':
-			return 'sun';
-		case 'undefined':
-			return 'ban';
-		default:
-			checkExhaustive(type);
-			return '';
-	}
-};
-</script>
-
-<template>
-	<div :class="$style.item" data-test-id="run-data-schema-item">
-		<div :class="$style.itemContent">
-			<div
-				v-if="level > 0 || (level === 0 && !isSchemaValueArray)"
-				:title="schema.type"
-				:class="{
-					[$style.pill]: true,
-					[$style.mappable]: mappingEnabled,
-					[$style.highlight]: dragged,
-				}"
-			>
-				<span
-					:class="$style.label"
-					:data-value="getJsonParameterPath(schema.path)"
-					:data-name="schemaName"
-					:data-path="schema.path"
-					:data-depth="level"
-					data-target="mappable"
-				>
-					<font-awesome-icon :icon="getIconBySchemaType(schema.type)" size="sm" />
-					<TextWithHighlights
-						v-if="isSchemaParentTypeArray"
-						:content="props.parent?.key"
-						:search="props.search"
-					/>
-					<TextWithHighlights
-						v-if="key"
-						:class="{ [$style.arrayIndex]: isSchemaParentTypeArray }"
-						:content="key"
-						:search="props.search"
-					/>
-				</span>
-			</div>
-
-			<span v-if="text" :class="$style.text" data-test-id="run-data-schema-item-value">
-				<template v-for="(line, index) in text.split('\n')" :key="`line-${index}`">
-					<span v-if="index > 0" :class="$style.newLine">\n</span>
-					<TextWithHighlights :content="line" :search="props.search" />
-				</template>
-			</span>
-		</div>
-
-		<input v-if="level > 0 && isSchemaValueArray" :id="subKey" type="checkbox" inert checked />
-		<label v-if="level > 0 && isSchemaValueArray" :class="$style.toggle" :for="subKey">
-			<font-awesome-icon icon="angle-right" />
-		</label>
-
-		<div v-if="isSchemaValueArray" :class="$style.sub">
-			<div :class="$style.innerSub">
-				<run-data-schema-item
-					v-for="s in schemaArray"
-					:key="s.key ?? s.type"
-					:schema="s"
-					:level="level + 1"
-					:parent="schema"
-					:pane-type="paneType"
-					:sub-key="`${subKey}-${s.key ?? s.type}`"
-					:mapping-enabled="mappingEnabled"
-					:dragging-path="draggingPath"
-					:distance-from-active="distanceFromActive"
-					:node="node"
-					:search="search"
-				/>
-			</div>
-		</div>
-	</div>
-</template>
-
-<style lang="scss" module>
-@import '@/styles/variables';
-
-.item {
-	display: flex;
-	flex-wrap: wrap;
-	align-items: center;
-	line-height: var(--font-line-height-loose);
-	position: relative;
-	column-gap: var(--spacing-2xs);
-
-	+ .item {
-		margin-top: var(--spacing-2xs);
-	}
-
-	.item {
-		padding-left: var(--spacing-l);
-	}
-
-	input {
-		display: none;
-
-		~ .sub {
-			transition:
-				grid-template-rows 0.2s $ease-out-expo,
-				opacity 0.2s $ease-out-expo,
-				transform 0.2s $ease-out-expo;
-			transform: translateX(-8px);
-			opacity: 0;
-			margin-bottom: 0;
-
-			.innerSub {
-				min-height: 0;
-			}
-		}
-
-		&:checked {
-			~ .toggle svg {
-				transform: rotate(90deg);
-			}
-
-			~ .sub {
-				transform: translateX(0);
-				opacity: 1;
-				grid-template-rows: 1fr;
-			}
-		}
-	}
-}
-
-.itemContent {
-	display: flex;
-	gap: var(--spacing-2xs);
-	align-items: baseline;
-	flex-grow: 1;
-	min-width: 0;
-}
-
-.sub {
-	display: grid;
-	grid-template-rows: 0fr;
-	overflow: hidden;
-	flex-basis: 100%;
-	scroll-margin: 64px;
-}
-
-.innerSub {
-	display: inline-flex;
-	flex-direction: column;
-	order: -1;
-	min-width: 0;
-
-	.innerSub > div:first-child {
-		margin-top: var(--spacing-2xs);
-	}
-}
-
-:global(.highlightSchema) {
-	.pill.mappable {
-		&,
-		&:hover,
-		span,
-		&:hover span span {
-			color: var(--color-primary);
-			border-color: var(--color-primary-tint-1);
-			background-color: var(--color-primary-tint-3);
-
-			svg {
-				path {
-					fill: var(--color-primary);
-				}
-			}
-		}
-	}
-}
-
-.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%;
-
-	path {
-		fill: var(--color-text-light);
-	}
-
-	&.mappable {
-		cursor: grab;
-
-		&:hover {
-			&,
-			span span {
-				background-color: var(--color-background-light);
-				border-color: var(--color-foreground-base);
-			}
-		}
-	}
-}
-
-.label {
-	display: flex;
-	min-width: 0;
-	align-items: center;
-
-	> span {
-		display: flex;
-		align-items: center;
-
-		margin-left: var(--spacing-3xs);
-		padding-left: var(--spacing-3xs);
-		border-left: 1px solid var(--color-foreground-light);
-
-		overflow: hidden;
-
-		span {
-			overflow: hidden;
-			text-overflow: ellipsis;
-			white-space: nowrap;
-		}
-
-		&.arrayIndex {
-			border: 0;
-			padding-left: 0;
-			margin-left: 0;
-		}
-	}
-}
-
-.text {
-	display: block;
-	font-weight: var(--font-weight-normal);
-	font-size: var(--font-size-2xs);
-	overflow: hidden;
-	word-break: break-word;
-
-	.newLine {
-		font-family: var(--font-family-monospace);
-		color: var(--color-line-break);
-		padding-right: 2px;
-	}
-}
-
-.toggle {
-	display: flex;
-	position: absolute;
-	padding: var(--spacing-4xs) var(--spacing-2xs);
-	left: 0;
-	top: 0;
-	justify-content: center;
-	align-items: center;
-	cursor: pointer;
-	user-select: none;
-	font-weight: normal;
-	font-size: var(--font-size-s);
-	overflow: hidden;
-
-	svg {
-		transition: transform 0.2s $ease-out-expo;
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts b/packages/editor-ui/src/components/RunDataSearch.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/RunDataSearch.test.ts
rename to packages/editor-ui/src/components/RunDataSearch.test.ts
diff --git a/packages/editor-ui/src/components/RunDataSearch.vue b/packages/editor-ui/src/components/RunDataSearch.vue
index 3fa79458ca..e5c7d1362c 100644
--- a/packages/editor-ui/src/components/RunDataSearch.vue
+++ b/packages/editor-ui/src/components/RunDataSearch.vue
@@ -31,7 +31,7 @@ const { debounce } = useDebounce();
 
 const inputRef = ref<HTMLInputElement | null>(null);
 const search = ref(props.modelValue ?? '');
-const opened = ref(false);
+const opened = ref(!!search.value);
 const placeholder = computed(() => {
 	if (props.paneType === 'output') {
 		return locale.baseText('ndv.search.placeholder.output');
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 59c0879224..925c57cfee 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -1,389 +1,414 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
-import { mapStores } from 'pinia';
-import type { INodeUi, ITableData, NDVState } from '@/Interface';
-import { shorten } from '@/utils/typesUtils';
-import { getPairedItemId } from '@/utils/pairedItemUtils';
-import type { GenericValue, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import Draggable from './Draggable.vue';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useNDVStore } from '@/stores/ndv.store';
-import MappingPill from './MappingPill.vue';
-import { getMappedExpression } from '@/utils/mappingUtils';
+<script setup lang="ts">
 import { useExternalHooks } from '@/composables/useExternalHooks';
+import type { INodeUi, IRunDataDisplayMode, ITableData } from '@/Interface';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { getMappedExpression } from '@/utils/mappingUtils';
+import { getPairedItemId } from '@/utils/pairedItemUtils';
+import { shorten } from '@/utils/typesUtils';
+import type { GenericValue, IDataObject, INodeExecutionData } from 'n8n-workflow';
+import { computed, onMounted, ref, watch } from 'vue';
+import Draggable from './Draggable.vue';
+import MappingPill from './MappingPill.vue';
 import TextWithHighlights from './TextWithHighlights.vue';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { N8nIconButton, N8nInfoTip, N8nTooltip, N8nTree } from 'n8n-design-system';
+import { storeToRefs } from 'pinia';
+import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
 
 const MAX_COLUMNS_LIMIT = 40;
 
 type DraggableRef = InstanceType<typeof Draggable>;
 
-export default defineComponent({
-	name: 'RunDataTable',
-	components: { Draggable, MappingPill, TextWithHighlights },
-	props: {
-		node: {
-			type: Object as PropType<INodeUi>,
-			required: true,
-		},
-		inputData: {
-			type: Array as PropType<INodeExecutionData[]>,
-			required: true,
-		},
-		mappingEnabled: {
-			type: Boolean,
-		},
-		distanceFromActive: {
-			type: Number,
-			required: true,
-		},
-		runIndex: {
-			type: Number,
-		},
-		outputIndex: {
-			type: Number,
-		},
-		totalRuns: {
-			type: Number,
-		},
-		pageOffset: {
-			type: Number,
-			required: true,
-		},
-		hasDefaultHoverState: {
-			type: Boolean,
-		},
-		search: {
-			type: String,
-		},
-	},
-	setup() {
-		const externalHooks = useExternalHooks();
-		return {
-			externalHooks,
-		};
-	},
-	data() {
-		return {
-			activeColumn: -1,
-			forceShowGrip: false,
-			draggedColumn: false,
-			draggingPath: null as null | string,
-			hoveringPath: null as null | string,
-			mappingHintVisible: false,
-			activeRow: null as number | null,
-			columnLimit: MAX_COLUMNS_LIMIT,
-			columnLimitExceeded: false,
-		};
-	},
-	mounted() {
-		if (this.tableData && this.tableData.columns && this.$refs.draggable) {
-			const tbody = (this.$refs.draggable as DraggableRef).$refs.wrapper as HTMLElement;
-			if (tbody) {
-				this.$emit('mounted', {
-					avgRowHeight: tbody.offsetHeight / this.tableData.data.length,
-				});
-			}
+type Props = {
+	node: INodeUi;
+	inputData: INodeExecutionData[];
+	distanceFromActive: number;
+	pageOffset: number;
+	runIndex?: number;
+	outputIndex?: number;
+	totalRuns?: number;
+	mappingEnabled?: boolean;
+	hasDefaultHoverState?: boolean;
+	search?: string;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+	runIndex: 0,
+	outputIndex: 0,
+	totalRuns: 0,
+	mappingEnabled: false,
+	hasDefaultHoverState: false,
+	search: '',
+});
+const emit = defineEmits<{
+	activeRowChanged: [row: number | null];
+	displayModeChange: [mode: IRunDataDisplayMode];
+	mounted: [data: { avgRowHeight: number }];
+}>();
+
+const externalHooks = useExternalHooks();
+const activeColumn = ref(-1);
+const forceShowGrip = ref(false);
+const draggedColumn = ref(false);
+const draggingPath = ref<string | null>(null);
+const hoveringPath = ref<string | null>(null);
+const activeRow = ref<number | null>(null);
+const columnLimit = ref(MAX_COLUMNS_LIMIT);
+const columnLimitExceeded = ref(false);
+const draggableRef = ref<DraggableRef>();
+
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
+
+const i18n = useI18n();
+const telemetry = useTelemetry();
+const { trackOpeningRelatedExecution, resolveRelatedExecutionUrl } = useExecutionHelpers();
+
+const {
+	hoveringItem,
+	focusedMappableInput,
+	highlightDraggables: highlight,
+} = storeToRefs(ndvStore);
+const pairedItemMappings = computed(() => workflowsStore.workflowExecutionPairedItemMappings);
+const tableData = computed(() => convertToTable(props.inputData));
+
+onMounted(() => {
+	if (tableData.value?.columns && draggableRef.value) {
+		const tbody = draggableRef.value.$refs.wrapper as HTMLElement;
+		if (tbody) {
+			emit('mounted', {
+				avgRowHeight: tbody.offsetHeight / tableData.value.data.length,
+			});
 		}
-	},
-	computed: {
-		...mapStores(useNDVStore, useWorkflowsStore),
-		hoveringItem(): NDVState['hoveringItem'] {
-			return this.ndvStore.hoveringItem;
-		},
-		pairedItemMappings(): { [itemId: string]: Set<string> } {
-			return this.workflowsStore.workflowExecutionPairedItemMappings;
-		},
-		tableData(): ITableData {
-			return this.convertToTable(this.inputData);
-		},
-		focusedMappableInput(): string {
-			return this.ndvStore.focusedMappableInput;
-		},
-		highlight(): boolean {
-			return this.ndvStore.highlightDraggables;
-		},
-	},
-	methods: {
-		shorten,
-		isHoveringRow(row: number): boolean {
-			if (row === this.activeRow) {
-				return true;
-			}
+	}
+});
 
-			const itemIndex = this.pageOffset + row;
-			if (
-				itemIndex === 0 &&
-				!this.hoveringItem &&
-				this.hasDefaultHoverState &&
-				this.distanceFromActive === 1
-			) {
-				return true;
-			}
-			const itemNodeId = getPairedItemId(
-				this.node?.name ?? '',
-				this.runIndex || 0,
-				this.outputIndex || 0,
-				itemIndex,
-			);
-			if (!this.hoveringItem || !this.pairedItemMappings[itemNodeId]) {
-				return false;
-			}
+function isHoveringRow(row: number): boolean {
+	if (row === activeRow.value) {
+		return true;
+	}
 
-			const hoveringItemId = getPairedItemId(
-				this.hoveringItem.nodeName,
-				this.hoveringItem.runIndex,
-				this.hoveringItem.outputIndex,
-				this.hoveringItem.itemIndex,
-			);
-			return this.pairedItemMappings[itemNodeId].has(hoveringItemId);
-		},
-		onMouseEnterCell(e: MouseEvent) {
-			const target = e.target;
-			if (target && this.mappingEnabled) {
-				const col = (target as HTMLElement).dataset.col;
-				if (col && !isNaN(parseInt(col, 10))) {
-					this.activeColumn = parseInt(col, 10);
-				}
+	const itemIndex = props.pageOffset + row;
+	if (
+		itemIndex === 0 &&
+		!hoveringItem.value &&
+		props.hasDefaultHoverState &&
+		props.distanceFromActive === 1
+	) {
+		return true;
+	}
+	const itemNodeId = getPairedItemId(
+		props.node?.name ?? '',
+		props.runIndex || 0,
+		props.outputIndex || 0,
+		itemIndex,
+	);
+	if (!hoveringItem.value || !pairedItemMappings.value[itemNodeId]) {
+		return false;
+	}
+
+	const hoveringItemId = getPairedItemId(
+		hoveringItem.value.nodeName,
+		hoveringItem.value.runIndex,
+		hoveringItem.value.outputIndex,
+		hoveringItem.value.itemIndex,
+	);
+	return pairedItemMappings.value[itemNodeId].has(hoveringItemId);
+}
+
+function showExecutionLink(index: number) {
+	if (index === activeRow.value) {
+		return true;
+	}
+
+	if (activeRow.value === null) {
+		return index === 0;
+	}
+
+	return false;
+}
+
+function onMouseEnterCell(e: MouseEvent) {
+	const target = e.target;
+	if (target && props.mappingEnabled) {
+		const col = (target as HTMLElement).dataset.col;
+		if (col && !isNaN(parseInt(col, 10))) {
+			activeColumn.value = parseInt(col, 10);
+		}
+	}
+
+	if (target) {
+		const row = (target as HTMLElement).dataset.row;
+		if (row && !isNaN(parseInt(row, 10))) {
+			activeRow.value = parseInt(row, 10);
+			emit('activeRowChanged', props.pageOffset + activeRow.value);
+		}
+	}
+}
+
+function onMouseLeaveCell() {
+	activeColumn.value = -1;
+	activeRow.value = null;
+	emit('activeRowChanged', null);
+}
+
+function onMouseEnterKey(path: Array<string | number>, colIndex: number) {
+	hoveringPath.value = getCellExpression(path, colIndex);
+}
+
+function onMouseLeaveKey() {
+	hoveringPath.value = null;
+}
+
+function isHovering(path: Array<string | number>, colIndex: number) {
+	const expr = getCellExpression(path, colIndex);
+
+	return hoveringPath.value === expr;
+}
+
+function getExpression(column: string) {
+	if (!props.node) {
+		return '';
+	}
+
+	return getMappedExpression({
+		nodeName: props.node.name,
+		distanceFromActive: props.distanceFromActive,
+		path: [column],
+	});
+}
+
+function getPathNameFromTarget(el?: HTMLElement) {
+	if (!el) {
+		return '';
+	}
+	return el.dataset.name;
+}
+
+function getCellPathName(path: Array<string | number>, colIndex: number) {
+	const lastKey = path[path.length - 1];
+	if (typeof lastKey === 'string') {
+		return lastKey;
+	}
+	if (path.length > 1) {
+		const prevKey = path[path.length - 2];
+		return `${prevKey}[${lastKey}]`;
+	}
+	const column = tableData.value.columns[colIndex];
+	return `${column}[${lastKey}]`;
+}
+
+function getCellExpression(path: Array<string | number>, colIndex: number) {
+	if (!props.node) {
+		return '';
+	}
+	const column = tableData.value.columns[colIndex];
+	return getMappedExpression({
+		nodeName: props.node.name,
+		distanceFromActive: props.distanceFromActive,
+		path: [column, ...path],
+	});
+}
+
+function isEmpty(value: unknown): boolean {
+	return (
+		value === '' ||
+		(Array.isArray(value) && value.length === 0) ||
+		(typeof value === 'object' && value !== null && Object.keys(value).length === 0) ||
+		value === null ||
+		value === undefined
+	);
+}
+
+function getValueToRender(value: unknown): string {
+	if (value === '') {
+		return i18n.baseText('runData.emptyString');
+	}
+	if (typeof value === 'string') {
+		return value;
+	}
+	if (Array.isArray(value) && value.length === 0) {
+		return i18n.baseText('runData.emptyArray');
+	}
+	if (typeof value === 'object' && value !== null && Object.keys(value).length === 0) {
+		return i18n.baseText('runData.emptyObject');
+	}
+	if (value === null || value === undefined) {
+		return `[${value}]`;
+	}
+	if (value === true || value === false || typeof value === 'number') {
+		return value.toString();
+	}
+	return JSON.stringify(value);
+}
+
+function onDragStart() {
+	draggedColumn.value = true;
+	ndvStore.resetMappingTelemetry();
+}
+
+function onCellDragStart(el: HTMLElement) {
+	if (el?.dataset.value) {
+		draggingPath.value = el.dataset.value;
+	}
+
+	onDragStart();
+}
+
+function onCellDragEnd(el: HTMLElement) {
+	draggingPath.value = null;
+
+	onDragEnd(el.dataset.name ?? '', 'tree', el.dataset.depth ?? '0');
+}
+
+function isDraggingKey(path: Array<string | number>, colIndex: number) {
+	if (!draggingPath.value) {
+		return;
+	}
+
+	return draggingPath.value === getCellExpression(path, colIndex);
+}
+
+function onDragEnd(column: string, src: string, depth = '0') {
+	setTimeout(() => {
+		const mappingTelemetry = ndvStore.mappingTelemetry;
+		const telemetryPayload = {
+			src_node_type: props.node.type,
+			src_field_name: column,
+			src_nodes_back: props.distanceFromActive,
+			src_run_index: props.runIndex,
+			src_runs_total: props.totalRuns,
+			src_field_nest_level: parseInt(depth, 10),
+			src_view: 'table',
+			src_element: src,
+			success: false,
+			...mappingTelemetry,
+		};
+
+		void externalHooks.run('runDataTable.onDragEnd', telemetryPayload);
+
+		telemetry.track('User dragged data for mapping', telemetryPayload, {
+			withPostHog: true,
+		});
+	}, 1000); // ensure dest data gets set if drop
+}
+
+function isSimple(data: GenericValue): data is string | number | boolean | null | undefined {
+	return (
+		typeof data !== 'object' ||
+		data === null ||
+		(Array.isArray(data) && data.length === 0) ||
+		(typeof data === 'object' && Object.keys(data).length === 0)
+	);
+}
+
+function isObject(data: GenericValue): data is Record<string, unknown> {
+	return !isSimple(data);
+}
+
+function hasJsonInColumn(colIndex: number): boolean {
+	return tableData.value.hasJson[tableData.value.columns[colIndex]];
+}
+
+function convertToTable(inputData: INodeExecutionData[]): ITableData {
+	const resultTableData: GenericValue[][] = [];
+	const tableColumns: string[] = [];
+	let leftEntryColumns: string[], entryRows: GenericValue[];
+	// Go over all entries
+	let entry: IDataObject;
+
+	const metadata: ITableData['metadata'] = {
+		hasExecutionIds: false,
+		data: [],
+	};
+	const hasJson: { [key: string]: boolean } = {};
+	inputData.forEach((data) => {
+		if (!data.hasOwnProperty('json')) {
+			return;
+		}
+		entry = data.json;
+
+		// Go over all keys of entry
+		entryRows = [];
+		const entryColumns = Object.keys(entry || {});
+
+		if (entryColumns.length > MAX_COLUMNS_LIMIT) {
+			columnLimitExceeded.value = true;
+			leftEntryColumns = entryColumns.slice(0, MAX_COLUMNS_LIMIT);
+		} else {
+			leftEntryColumns = entryColumns;
+		}
+
+		if (data.metadata?.subExecution) {
+			metadata.data.push(data.metadata);
+			metadata.hasExecutionIds = true;
+		} else {
+			metadata.data.push(undefined);
+		}
+
+		// Go over all the already existing column-keys
+		tableColumns.forEach((key) => {
+			if (entry.hasOwnProperty(key)) {
+				// Entry does have key so add its value
+				entryRows.push(entry[key]);
+				// Remove key so that we know that it got added
+				leftEntryColumns.splice(leftEntryColumns.indexOf(key), 1);
+
+				hasJson[key] =
+					hasJson[key] ||
+					(typeof entry[key] === 'object' && Object.keys(entry[key] ?? {}).length > 0) ||
+					false;
+			} else {
+				// Entry does not have key so add undefined
+				entryRows.push(undefined);
 			}
+		});
 
-			if (target) {
-				const row = (target as HTMLElement).dataset.row;
-				if (row && !isNaN(parseInt(row, 10))) {
-					this.activeRow = parseInt(row, 10);
-					this.$emit('activeRowChanged', this.pageOffset + this.activeRow);
-				}
-			}
-		},
-		onMouseLeaveCell() {
-			this.activeColumn = -1;
-			this.activeRow = null;
-			this.$emit('activeRowChanged', null);
-		},
-		onMouseEnterKey(path: string[], colIndex: number) {
-			this.hoveringPath = this.getCellExpression(path, colIndex);
-		},
-		onMouseLeaveKey() {
-			this.hoveringPath = null;
-		},
-		isHovering(path: string[], colIndex: number) {
-			const expr = this.getCellExpression(path, colIndex);
+		// Go over all the columns the entry has but did not exist yet
+		leftEntryColumns.forEach((key) => {
+			// Add the key for all runs in the future
+			tableColumns.push(key);
+			// Add the value
+			entryRows.push(entry[key]);
+			hasJson[key] =
+				hasJson[key] ||
+				(typeof entry[key] === 'object' && Object.keys(entry[key] ?? {}).length > 0) ||
+				false;
+		});
 
-			return this.hoveringPath === expr;
-		},
-		getExpression(column: string) {
-			if (!this.node) {
-				return '';
-			}
+		// Add the data of the entry
+		resultTableData.push(entryRows);
+	});
 
-			return getMappedExpression({
-				nodeName: this.node.name,
-				distanceFromActive: this.distanceFromActive,
-				path: [column],
-			});
-		},
-		getPathNameFromTarget(el?: HTMLElement) {
-			if (!el) {
-				return '';
-			}
-			return el.dataset.name;
-		},
-		getCellPathName(path: Array<string | number>, colIndex: number) {
-			const lastKey = path[path.length - 1];
-			if (typeof lastKey === 'string') {
-				return lastKey;
-			}
-			if (path.length > 1) {
-				const prevKey = path[path.length - 2];
-				return `${prevKey}[${lastKey}]`;
-			}
-			const column = this.tableData.columns[colIndex];
-			return `${column}[${lastKey}]`;
-		},
-		getCellExpression(path: Array<string | number>, colIndex: number) {
-			if (!this.node) {
-				return '';
-			}
-			const column = this.tableData.columns[colIndex];
-			return getMappedExpression({
-				nodeName: this.node.name,
-				distanceFromActive: this.distanceFromActive,
-				path: [column, ...path],
-			});
-		},
-		isEmpty(value: unknown): boolean {
-			return (
-				value === '' ||
-				(Array.isArray(value) && value.length === 0) ||
-				(typeof value === 'object' && value !== null && Object.keys(value).length === 0) ||
-				value === null ||
-				value === undefined
-			);
-		},
-		getValueToRender(value: unknown): string {
-			if (value === '') {
-				return this.$locale.baseText('runData.emptyString');
-			}
-			if (typeof value === 'string') {
-				return value;
-			}
-			if (Array.isArray(value) && value.length === 0) {
-				return this.$locale.baseText('runData.emptyArray');
-			}
-			if (typeof value === 'object' && value !== null && Object.keys(value).length === 0) {
-				return this.$locale.baseText('runData.emptyObject');
-			}
-			if (value === null || value === undefined) {
-				return `[${value}]`;
-			}
-			if (value === true || value === false || typeof value === 'number') {
-				return value.toString();
-			}
-			return JSON.stringify(value);
-		},
-		onDragStart() {
-			this.draggedColumn = true;
-			this.ndvStore.resetMappingTelemetry();
-		},
-		onCellDragStart(el: HTMLElement) {
-			if (el?.dataset.value) {
-				this.draggingPath = el.dataset.value;
-			}
+	// Make sure that all entry-rows have the same length
+	resultTableData.forEach((rows) => {
+		if (tableColumns.length > rows.length) {
+			// Has fewer entries so add the missing ones
+			rows.push(...new Array(tableColumns.length - rows.length));
+		}
+	});
 
-			this.onDragStart();
+	return {
+		hasJson,
+		columns: tableColumns,
+		data: resultTableData,
+		metadata,
+	};
+}
+
+function switchToJsonView() {
+	emit('displayModeChange', 'json');
+}
+
+watch(focusedMappableInput, (curr) => {
+	setTimeout(
+		() => {
+			forceShowGrip.value = !!focusedMappableInput.value;
 		},
-		onCellDragEnd(el: HTMLElement) {
-			this.draggingPath = null;
-
-			this.onDragEnd(el.dataset.name || '', 'tree', el.dataset.depth || '0');
-		},
-		isDraggingKey(path: Array<string | number>, colIndex: number) {
-			if (!this.draggingPath) {
-				return;
-			}
-
-			return this.draggingPath === this.getCellExpression(path, colIndex);
-		},
-		onDragEnd(column: string, src: string, depth = '0') {
-			setTimeout(() => {
-				const mappingTelemetry = this.ndvStore.mappingTelemetry;
-				const telemetryPayload = {
-					src_node_type: this.node.type,
-					src_field_name: column,
-					src_nodes_back: this.distanceFromActive,
-					src_run_index: this.runIndex,
-					src_runs_total: this.totalRuns,
-					src_field_nest_level: parseInt(depth, 10),
-					src_view: 'table',
-					src_element: src,
-					success: false,
-					...mappingTelemetry,
-				};
-
-				void this.externalHooks.run('runDataTable.onDragEnd', telemetryPayload);
-
-				this.$telemetry.track('User dragged data for mapping', telemetryPayload, {
-					withPostHog: true,
-				});
-			}, 1000); // ensure dest data gets set if drop
-		},
-		isSimple(data: unknown): boolean {
-			return (
-				typeof data !== 'object' ||
-				data === null ||
-				(Array.isArray(data) && data.length === 0) ||
-				(typeof data === 'object' && Object.keys(data).length === 0)
-			);
-		},
-		hasJsonInColumn(colIndex: number): boolean {
-			return this.tableData.hasJson[this.tableData.columns[colIndex]];
-		},
-		convertToTable(inputData: INodeExecutionData[]): ITableData {
-			const tableData: GenericValue[][] = [];
-			const tableColumns: string[] = [];
-			let leftEntryColumns: string[], entryRows: GenericValue[];
-			// Go over all entries
-			let entry: IDataObject;
-			const hasJson: { [key: string]: boolean } = {};
-			inputData.forEach((data) => {
-				if (!data.hasOwnProperty('json')) {
-					return;
-				}
-				entry = data.json;
-
-				// Go over all keys of entry
-				entryRows = [];
-				const entryColumns = Object.keys(entry || {});
-
-				if (entryColumns.length > MAX_COLUMNS_LIMIT) {
-					this.columnLimitExceeded = true;
-					leftEntryColumns = entryColumns.slice(0, MAX_COLUMNS_LIMIT);
-				} else {
-					leftEntryColumns = entryColumns;
-				}
-
-				// Go over all the already existing column-keys
-				tableColumns.forEach((key) => {
-					if (entry.hasOwnProperty(key)) {
-						// Entry does have key so add its value
-						entryRows.push(entry[key]);
-						// Remove key so that we know that it got added
-						leftEntryColumns.splice(leftEntryColumns.indexOf(key), 1);
-
-						hasJson[key] =
-							hasJson[key] ||
-							(typeof entry[key] === 'object' && Object.keys(entry[key] || {}).length > 0) ||
-							false;
-					} else {
-						// Entry does not have key so add undefined
-						entryRows.push(undefined);
-					}
-				});
-
-				// Go over all the columns the entry has but did not exist yet
-				leftEntryColumns.forEach((key) => {
-					// Add the key for all runs in the future
-					tableColumns.push(key);
-					// Add the value
-					entryRows.push(entry[key]);
-					hasJson[key] =
-						hasJson[key] ||
-						(typeof entry[key] === 'object' && Object.keys(entry[key] || {}).length > 0) ||
-						false;
-				});
-
-				// Add the data of the entry
-				tableData.push(entryRows);
-			});
-
-			// Make sure that all entry-rows have the same length
-			tableData.forEach((entryRows) => {
-				if (tableColumns.length > entryRows.length) {
-					// Has fewer entries so add the missing ones
-					entryRows.push(...new Array(tableColumns.length - entryRows.length));
-				}
-			});
-
-			return {
-				hasJson,
-				columns: tableColumns,
-				data: tableData,
-			};
-		},
-		switchToJsonView() {
-			this.$emit('displayModeChange', 'json');
-		},
-	},
-	watch: {
-		focusedMappableInput(curr: boolean) {
-			setTimeout(
-				() => {
-					this.forceShowGrip = !!this.focusedMappableInput;
-				},
-				curr ? 300 : 150,
-			);
-		},
-	},
+		curr ? 300 : 150,
+	);
 });
 </script>
 
@@ -392,6 +417,9 @@ export default defineComponent({
 		<table v-if="tableData.columns && tableData.columns.length === 0" :class="$style.table">
 			<thead>
 				<tr>
+					<th v-if="tableData.metadata.hasExecutionIds" :class="$style.executionLinkRowHeader">
+						<!-- column for execution link -->
+					</th>
 					<th :class="$style.emptyCell"></th>
 					<th :class="$style.tableRightMargin"></th>
 				</tr>
@@ -402,13 +430,44 @@ export default defineComponent({
 					:key="index1"
 					:class="{ [$style.hoveringRow]: isHoveringRow(index1) }"
 				>
+					<td
+						v-if="tableData.metadata.hasExecutionIds"
+						:data-row="index1"
+						:class="$style.executionLinkCell"
+						@mouseenter="onMouseEnterCell"
+						@mouseleave="onMouseLeaveCell"
+					>
+						<N8nTooltip
+							:content="
+								i18n.baseText('runData.table.viewSubExecution', {
+									interpolate: {
+										id: `${tableData.metadata.data[index1]?.subExecution.executionId}`,
+									},
+								})
+							"
+							placement="left"
+							:hide-after="0"
+						>
+							<N8nIconButton
+								v-if="tableData.metadata.data[index1]"
+								v-show="showExecutionLink(index1)"
+								type="secondary"
+								icon="external-link-alt"
+								data-test-id="debug-sub-execution"
+								size="mini"
+								:href="resolveRelatedExecutionUrl(tableData.metadata.data[index1])"
+								target="_blank"
+								@click="trackOpeningRelatedExecution(tableData.metadata.data[index1], 'table')"
+							/>
+						</N8nTooltip>
+					</td>
 					<td
 						:data-row="index1"
 						:data-col="0"
 						@mouseenter="onMouseEnterCell"
 						@mouseleave="onMouseLeaveCell"
 					>
-						<n8n-info-tip>{{ $locale.baseText('runData.emptyItemHint') }}</n8n-info-tip>
+						<N8nInfoTip>{{ i18n.baseText('runData.emptyItemHint') }}</N8nInfoTip>
 					</td>
 					<td :class="$style.tableRightMargin"></td>
 				</tr>
@@ -417,12 +476,15 @@ export default defineComponent({
 		<table v-else :class="$style.table">
 			<thead>
 				<tr>
+					<th v-if="tableData.metadata.hasExecutionIds" :class="$style.executionLinkRowHeader">
+						<!-- column for execution link -->
+					</th>
 					<th v-for="(column, i) in tableData.columns || []" :key="column">
-						<n8n-tooltip placement="bottom-start" :disabled="!mappingEnabled" :show-after="1000">
+						<N8nTooltip placement="bottom-start" :disabled="!mappingEnabled" :show-after="1000">
 							<template #content>
 								<div>
 									<img src="/static/data-mapping-gif.gif" />
-									{{ $locale.baseText('dataMapping.dragColumnToFieldHint') }}
+									{{ i18n.baseText('dataMapping.dragColumnToFieldHint') }}
 								</div>
 							</template>
 							<Draggable
@@ -455,17 +517,17 @@ export default defineComponent({
 									</div>
 								</template>
 							</Draggable>
-						</n8n-tooltip>
+						</N8nTooltip>
 					</th>
 					<th v-if="columnLimitExceeded" :class="$style.header">
-						<n8n-tooltip placement="bottom-end">
+						<N8nTooltip placement="bottom-end">
 							<template #content>
 								<div>
 									<i18n-t tag="span" keypath="dataMapping.tableView.tableColumnsExceeded.tooltip">
 										<template #columnLimit>{{ columnLimit }}</template>
 										<template #link>
 											<a @click="switchToJsonView">{{
-												$locale.baseText('dataMapping.tableView.tableColumnsExceeded.tooltip.link')
+												i18n.baseText('dataMapping.tableView.tableColumnsExceeded.tooltip.link')
 											}}</a>
 										</template>
 									</i18n-t>
@@ -476,15 +538,15 @@ export default defineComponent({
 									:class="$style['warningTooltip']"
 									icon="exclamation-triangle"
 								></font-awesome-icon>
-								{{ $locale.baseText('dataMapping.tableView.tableColumnsExceeded') }}
+								{{ i18n.baseText('dataMapping.tableView.tableColumnsExceeded') }}
 							</span>
-						</n8n-tooltip>
+						</N8nTooltip>
 					</th>
 					<th :class="$style.tableRightMargin"></th>
 				</tr>
 			</thead>
 			<Draggable
-				ref="draggable"
+				ref="draggableRef"
 				tag="tbody"
 				type="mapping"
 				target-data-key="mappable"
@@ -504,6 +566,40 @@ export default defineComponent({
 					:class="{ [$style.hoveringRow]: isHoveringRow(index1) }"
 					:data-test-id="isHoveringRow(index1) ? 'hovering-item' : undefined"
 				>
+					<td
+						v-if="tableData.metadata.hasExecutionIds"
+						:data-row="index1"
+						:class="$style.executionLinkCell"
+						@mouseenter="onMouseEnterCell"
+						@mouseleave="onMouseLeaveCell"
+					>
+						<N8nTooltip
+							:content="
+								i18n.baseText('runData.table.viewSubExecution', {
+									interpolate: {
+										id: `${tableData.metadata.data[index1]?.subExecution.executionId}`,
+									},
+								})
+							"
+							placement="left"
+							:hide-after="0"
+						>
+							<a
+								v-if="tableData.metadata.data[index1]"
+								v-show="showExecutionLink(index1)"
+								:href="resolveRelatedExecutionUrl(tableData.metadata.data[index1])"
+								target="_blank"
+								@click="trackOpeningRelatedExecution(tableData.metadata.data[index1], 'table')"
+							>
+								<N8nIconButton
+									type="secondary"
+									icon="external-link-alt"
+									data-test-id="debug-sub-execution"
+									size="mini"
+								/>
+							</a>
+						</N8nTooltip>
+					</td>
 					<td
 						v-for="(data, index2) in row"
 						:key="index2"
@@ -519,7 +615,7 @@ export default defineComponent({
 							:search="search"
 							:class="{ [$style.value]: true, [$style.empty]: isEmpty(data) }"
 						/>
-						<n8n-tree v-else :node-class="$style.nodeClass" :value="data">
+						<N8nTree v-else-if="isObject(data)" :node-class="$style.nodeClass" :value="data">
 							<template #label="{ label, path }">
 								<span
 									:class="{
@@ -534,9 +630,10 @@ export default defineComponent({
 									:data-depth="path.length"
 									@mouseenter="() => onMouseEnterKey(path, index2)"
 									@mouseleave="onMouseLeaveKey"
-									>{{ label || $locale.baseText('runData.unnamedField') }}</span
+									>{{ label || i18n.baseText('runData.unnamedField') }}</span
 								>
 							</template>
+
 							<template #value="{ value }">
 								<TextWithHighlights
 									:content="getValueToRender(value)"
@@ -544,7 +641,7 @@ export default defineComponent({
 									:class="{ [$style.nestedValue]: true, [$style.empty]: isEmpty(value) }"
 								/>
 							</template>
-						</n8n-tree>
+						</N8nTree>
 					</td>
 					<td v-if="columnLimitExceeded"></td>
 					<td :class="$style.tableRightMargin"></td>
@@ -737,4 +834,12 @@ export default defineComponent({
 .warningTooltip {
 	color: var(--color-warning);
 }
+
+.executionLinkCell {
+	padding: var(--spacing-3xs) !important;
+}
+
+.executionLinkRowHeader {
+	width: var(--spacing-m);
+}
 </style>
diff --git a/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts b/packages/editor-ui/src/components/SQLEditor.test.ts
similarity index 87%
rename from packages/editor-ui/src/components/__tests__/SQLEditor.test.ts
rename to packages/editor-ui/src/components/SQLEditor.test.ts
index 234a7acc1b..1792669617 100644
--- a/packages/editor-ui/src/components/__tests__/SQLEditor.test.ts
+++ b/packages/editor-ui/src/components/SQLEditor.test.ts
@@ -25,6 +25,7 @@ async function focusEditor(container: Element) {
 	await waitFor(() => expect(container.querySelector('.cm-line')).toBeInTheDocument());
 	await userEvent.click(container.querySelector('.cm-line') as Element);
 }
+
 const nodes = [
 	{
 		id: '1',
@@ -172,4 +173,23 @@ describe('SqlEditor.vue', () => {
 			getByTestId(EXPRESSION_OUTPUT_TEST_ID).getElementsByClassName('cm-line').length,
 		);
 	});
+
+	it('should keep rendered output visible when clicking', async () => {
+		const { getByTestId, queryByTestId, container, baseElement } = renderComponent(SqlEditor, {
+			...DEFAULT_SETUP,
+			props: {
+				...DEFAULT_SETUP.props,
+				modelValue: 'SELECT * FROM users',
+			},
+		});
+
+		// Does not hide output when clicking inside the output
+		await focusEditor(container);
+		await userEvent.click(getByTestId(EXPRESSION_OUTPUT_TEST_ID));
+		await waitFor(() => expect(queryByTestId(EXPRESSION_OUTPUT_TEST_ID)).toBeInTheDocument());
+
+		// Does hide output when clicking outside the container
+		await userEvent.click(baseElement);
+		await waitFor(() => expect(queryByTestId(EXPRESSION_OUTPUT_TEST_ID)).not.toBeInTheDocument());
+	});
 });
diff --git a/packages/editor-ui/src/components/__tests__/SSOLogin.test.ts b/packages/editor-ui/src/components/SSOLogin.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/SSOLogin.test.ts
rename to packages/editor-ui/src/components/SSOLogin.test.ts
diff --git a/packages/editor-ui/src/components/SaveButton.vue b/packages/editor-ui/src/components/SaveButton.vue
index 10471b86a7..c033212b80 100644
--- a/packages/editor-ui/src/components/SaveButton.vue
+++ b/packages/editor-ui/src/components/SaveButton.vue
@@ -36,7 +36,7 @@ const shortcutTooltipLabel = computed(() => {
 
 <template>
 	<span :class="$style.container" data-test-id="save-button">
-		<span v-if="saved" :class="$style.saved">{{ $locale.baseText('saveButton.saved') }}</span>
+		<span v-if="saved" :class="$style.saved">{{ i18n.baseText('saveButton.saved') }}</span>
 		<template v-else>
 			<KeyboardShortcutTooltip
 				v-if="withShortcut"
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
index e98b139b21..d5465c7fc6 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue
@@ -1,134 +1,135 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { EnterpriseEditionFeature, MODAL_CONFIRM } from '@/constants';
+<script lang="ts" setup>
+import { computed, onBeforeMount, onMounted, ref } from 'vue';
+import { MODAL_CONFIRM } from '@/constants';
 import { useMessage } from '@/composables/useMessage';
 import { useLogStreamingStore } from '@/stores/logStreaming.store';
-import type { PropType } from 'vue';
-import { mapStores } from 'pinia';
 import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow';
 import type { BaseTextKey } from '@/plugins/i18n';
 import type { EventBus } from 'n8n-design-system';
+import { useI18n } from '@/composables/useI18n';
+import { assert } from '@/utils/assert';
 
-export const DESTINATION_LIST_ITEM_ACTIONS = {
+const DESTINATION_LIST_ITEM_ACTIONS = {
 	OPEN: 'open',
 	DELETE: 'delete',
 };
 
-export default defineComponent({
-	components: {},
-	setup() {
-		return {
-			...useMessage(),
-		};
-	},
-	data() {
-		return {
-			EnterpriseEditionFeature,
-			nodeParameters: {} as MessageEventBusDestinationOptions,
-		};
-	},
-	props: {
-		eventBus: {
-			type: Object as PropType<EventBus>,
-		},
-		destination: {
-			type: Object,
-			required: true,
-			default: deepCopy(defaultMessageEventBusDestinationOptions),
-		},
-		readonly: Boolean,
-	},
-	mounted() {
-		this.nodeParameters = Object.assign(
-			deepCopy(defaultMessageEventBusDestinationOptions),
-			this.destination,
-		);
-		this.eventBus?.on('destinationWasSaved', this.onDestinationWasSaved);
-	},
-	beforeUnmount() {
-		this.eventBus?.off('destinationWasSaved', this.onDestinationWasSaved);
-	},
-	computed: {
-		...mapStores(useLogStreamingStore),
-		actions(): Array<{ label: string; value: string }> {
-			const actions = [
-				{
-					label: this.$locale.baseText('workflows.item.open'),
-					value: DESTINATION_LIST_ITEM_ACTIONS.OPEN,
-				},
-			];
-			if (!this.readonly) {
-				actions.push({
-					label: this.$locale.baseText('workflows.item.delete'),
-					value: DESTINATION_LIST_ITEM_ACTIONS.DELETE,
-				});
-			}
-			return actions;
-		},
-		typeLabelName(): BaseTextKey {
-			return `settings.log-streaming.${this.destination.__type}` as BaseTextKey;
-		},
-	},
-	methods: {
-		onDestinationWasSaved() {
-			const updatedDestination = this.logStreamingStore.getDestination(this.destination.id);
-			if (updatedDestination) {
-				this.nodeParameters = Object.assign(
-					deepCopy(defaultMessageEventBusDestinationOptions),
-					this.destination,
-				);
-			}
-		},
-		async onClick(event: Event) {
-			const cardActions = this.$refs.cardActions as HTMLDivElement | null;
-			const target = event.target as HTMLDivElement | null;
-			if (
-				cardActions === target ||
-				cardActions?.contains(target) ||
-				target?.contains(cardActions)
-			) {
-				return;
-			}
+const { confirm } = useMessage();
+const i18n = useI18n();
+const logStreamingStore = useLogStreamingStore();
 
-			this.$emit('edit', this.destination.id);
-		},
-		onEnabledSwitched(state: boolean) {
-			this.nodeParameters.enabled = state;
-			void this.saveDestination();
-		},
-		async saveDestination() {
-			await this.logStreamingStore.saveDestination(this.nodeParameters);
-		},
-		async onAction(action: string) {
-			if (action === DESTINATION_LIST_ITEM_ACTIONS.OPEN) {
-				this.$emit('edit', this.destination.id);
-			} else if (action === DESTINATION_LIST_ITEM_ACTIONS.DELETE) {
-				const deleteConfirmed = await this.confirm(
-					this.$locale.baseText('settings.log-streaming.destinationDelete.message', {
-						interpolate: { destinationName: this.destination.label },
-					}),
-					this.$locale.baseText('settings.log-streaming.destinationDelete.headline'),
-					{
-						type: 'warning',
-						confirmButtonText: this.$locale.baseText(
-							'settings.log-streaming.destinationDelete.confirmButtonText',
-						),
-						cancelButtonText: this.$locale.baseText(
-							'settings.log-streaming.destinationDelete.cancelButtonText',
-						),
-					},
-				);
+const nodeParameters = ref<MessageEventBusDestinationOptions>({});
+const cardActions = ref<HTMLDivElement | null>(null);
 
-				if (deleteConfirmed !== MODAL_CONFIRM) {
-					return;
-				}
-
-				this.$emit('remove', this.destination.id);
-			}
-		},
+const props = withDefaults(
+	defineProps<{
+		eventBus: EventBus;
+		destination: MessageEventBusDestinationOptions;
+		readonly: boolean;
+	}>(),
+	{
+		destination: () => deepCopy(defaultMessageEventBusDestinationOptions),
 	},
+);
+
+const emit = defineEmits<{
+	edit: [id: string | undefined];
+	remove: [id: string | undefined];
+}>();
+
+onMounted(() => {
+	nodeParameters.value = Object.assign(
+		deepCopy(defaultMessageEventBusDestinationOptions),
+		props.destination,
+	);
+	props.eventBus?.on('destinationWasSaved', onDestinationWasSaved);
 });
+
+onBeforeMount(() => {
+	props.eventBus?.off('destinationWasSaved', onDestinationWasSaved);
+});
+
+const actions = computed((): Array<{ label: string; value: string }> => {
+	const actionList = [
+		{
+			label: i18n.baseText('workflows.item.open'),
+			value: DESTINATION_LIST_ITEM_ACTIONS.OPEN,
+		},
+	];
+	if (!props.readonly) {
+		actionList.push({
+			label: i18n.baseText('workflows.item.delete'),
+			value: DESTINATION_LIST_ITEM_ACTIONS.DELETE,
+		});
+	}
+	return actionList;
+});
+
+const typeLabelName = computed((): BaseTextKey => {
+	return `settings.log-streaming.${props.destination.__type}` as BaseTextKey;
+});
+
+function onDestinationWasSaved() {
+	assert(props.destination.id);
+	const updatedDestination = logStreamingStore.getDestination(props.destination.id);
+	if (updatedDestination) {
+		nodeParameters.value = Object.assign(
+			deepCopy(defaultMessageEventBusDestinationOptions),
+			props.destination,
+		);
+	}
+}
+
+async function onClick(event: Event) {
+	const target = event.target as HTMLDivElement | null;
+	if (
+		cardActions.value === target ||
+		cardActions.value?.contains(target) ||
+		target?.contains(cardActions.value)
+	) {
+		return;
+	}
+
+	emit('edit', props.destination.id);
+}
+
+function onEnabledSwitched(state: boolean) {
+	nodeParameters.value.enabled = state;
+	void saveDestination();
+}
+
+async function saveDestination() {
+	await logStreamingStore.saveDestination(nodeParameters.value);
+}
+
+async function onAction(action: string) {
+	if (action === DESTINATION_LIST_ITEM_ACTIONS.OPEN) {
+		emit('edit', props.destination.id);
+	} else if (action === DESTINATION_LIST_ITEM_ACTIONS.DELETE) {
+		const deleteConfirmed = await confirm(
+			i18n.baseText('settings.log-streaming.destinationDelete.message', {
+				interpolate: { destinationName: props.destination.label ?? '' },
+			}),
+			i18n.baseText('settings.log-streaming.destinationDelete.headline'),
+			{
+				type: 'warning',
+				confirmButtonText: i18n.baseText(
+					'settings.log-streaming.destinationDelete.confirmButtonText',
+				),
+				cancelButtonText: i18n.baseText(
+					'settings.log-streaming.destinationDelete.cancelButtonText',
+				),
+			},
+		);
+
+		if (deleteConfirmed !== MODAL_CONFIRM) {
+			return;
+		}
+
+		emit('remove', props.destination.id);
+	}
+}
 </script>
 
 <template>
@@ -140,7 +141,7 @@ export default defineComponent({
 				</n8n-heading>
 				<div :class="$style.cardDescription">
 					<n8n-text color="text-light" size="small">
-						<span>{{ $locale.baseText(typeLabelName) }}</span>
+						<span>{{ i18n.baseText(typeLabelName) }}</span>
 					</n8n-text>
 				</div>
 			</div>
@@ -149,10 +150,10 @@ export default defineComponent({
 			<div ref="cardActions" :class="$style.cardActions">
 				<div :class="$style.activeStatusText" data-test-id="destination-activator-status">
 					<n8n-text v-if="nodeParameters.enabled" :color="'success'" size="small" bold>
-						{{ $locale.baseText('workflowActivator.active') }}
+						{{ i18n.baseText('workflowActivator.active') }}
 					</n8n-text>
 					<n8n-text v-else color="text-base" size="small" bold>
-						{{ $locale.baseText('workflowActivator.inactive') }}
+						{{ i18n.baseText('workflowActivator.inactive') }}
 					</n8n-text>
 				</div>
 
@@ -162,8 +163,8 @@ export default defineComponent({
 					:model-value="nodeParameters.enabled"
 					:title="
 						nodeParameters.enabled
-							? $locale.baseText('workflowActivator.deactivateWorkflow')
-							: $locale.baseText('workflowActivator.activateWorkflow')
+							? i18n.baseText('workflowActivator.deactivateWorkflow')
+							: i18n.baseText('workflowActivator.activateWorkflow')
 					"
 					active-color="#13ce66"
 					inactive-color="#8899AA"
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index c3580ade82..8955090674 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -1,17 +1,15 @@
-<script lang="ts">
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
 import { get, set, unset } from 'lodash-es';
-import { mapStores } from 'pinia';
-import { useLogStreamingStore } from '@/stores/logStreaming.store';
-import { useNDVStore } from '@/stores/ndv.store';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import ParameterInputList from '@/components/ParameterInputList.vue';
-import type { IMenuItem, INodeUi, IUpdateInformation, ModalKey } from '@/Interface';
 import type {
 	IDataObject,
 	NodeParameterValue,
 	MessageEventBusDestinationOptions,
 	INodeParameters,
 	NodeParameterValueType,
+	MessageEventBusDestinationSentryOptions,
+	MessageEventBusDestinationSyslogOptions,
+	MessageEventBusDestinationWebhookOptions,
 } from 'n8n-workflow';
 import {
 	deepCopy,
@@ -22,338 +20,337 @@ import {
 	defaultMessageEventBusDestinationSyslogOptions,
 	defaultMessageEventBusDestinationSentryOptions,
 } from 'n8n-workflow';
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
+import type { EventBus } from 'n8n-design-system';
+import { createEventBus } from 'n8n-design-system/utils';
+
+import { useLogStreamingStore } from '@/stores/logStreaming.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import ParameterInputList from '@/components/ParameterInputList.vue';
+import type { IMenuItem, IUpdateInformation, ModalKey } from '@/Interface';
 import { LOG_STREAM_MODAL_KEY, MODAL_CONFIRM } from '@/constants';
 import Modal from '@/components/Modal.vue';
+import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
 import { useUIStore } from '@/stores/ui.store';
 import { hasPermission } from '@/utils/rbac/permissions';
 import { destinationToFakeINodeUi } from '@/components/SettingsLogStreaming/Helpers.ee';
+import type { BaseTextKey } from '@/plugins/i18n';
+import InlineNameEdit from '@/components/InlineNameEdit.vue';
+import SaveButton from '@/components/SaveButton.vue';
+import EventSelection from '@/components/SettingsLogStreaming/EventSelection.ee.vue';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { useRootStore } from '@/stores/root.store';
+
 import {
 	webhookModalDescription,
 	sentryModalDescription,
 	syslogModalDescription,
 } from './descriptions.ee';
-import type { BaseTextKey } from '@/plugins/i18n';
-import InlineNameEdit from '@/components/InlineNameEdit.vue';
-import SaveButton from '@/components/SaveButton.vue';
-import EventSelection from '@/components/SettingsLogStreaming/EventSelection.ee.vue';
-import type { EventBus } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system/utils';
-import { useTelemetry } from '@/composables/useTelemetry';
-import { useRootStore } from '@/stores/root.store';
 
-export default defineComponent({
-	name: 'EventDestinationSettingsModal',
-	components: {
-		Modal,
-		ParameterInputList,
-		InlineNameEdit,
-		SaveButton,
-		EventSelection,
+defineOptions({ name: 'EventDestinationSettingsModal' });
+
+const props = withDefaults(
+	defineProps<{
+		modalName: ModalKey;
+		destination?: MessageEventBusDestinationOptions;
+		isNew?: boolean;
+		eventBus?: EventBus;
+	}>(),
+	{
+		destination: () => deepCopy(defaultMessageEventBusDestinationOptions),
+		isNew: false,
 	},
-	props: {
-		modalName: {
-			type: String as PropType<ModalKey>,
-			required: true,
-		},
-		destination: {
-			type: Object,
-			default: () => deepCopy(defaultMessageEventBusDestinationOptions),
-		},
-		isNew: Boolean,
-		eventBus: {
-			type: Object as PropType<EventBus>,
-		},
-	},
-	setup() {
-		return {
-			...useMessage(),
-		};
-	},
-	data() {
-		return {
-			unchanged: !this.isNew,
-			activeTab: 'settings',
-			hasOnceBeenSaved: !this.isNew,
-			isSaving: false,
-			isDeleting: false,
-			loading: false,
-			showRemoveConfirm: false,
-			typeSelectValue: '',
-			typeSelectPlaceholder: 'Destination Type',
-			nodeParameters: deepCopy(defaultMessageEventBusDestinationOptions) as INodeParameters,
-			webhookDescription: webhookModalDescription,
-			sentryDescription: sentryModalDescription,
-			syslogDescription: syslogModalDescription,
-			modalBus: createEventBus(),
-			headerLabel: this.destination.label,
-			testMessageSent: false,
-			testMessageResult: false,
-			LOG_STREAM_MODAL_KEY,
-		};
-	},
-	computed: {
-		...mapStores(useUIStore, useLogStreamingStore, useNDVStore, useWorkflowsStore),
-		typeSelectOptions(): Array<{ value: string; label: BaseTextKey }> {
-			const options: Array<{ value: string; label: BaseTextKey }> = [];
-			for (const t of messageEventBusDestinationTypeNames) {
-				if (t === MessageEventBusDestinationTypeNames.abstract) {
-					continue;
-				}
-				options.push({
-					value: t,
-					label: `settings.log-streaming.${t}` as BaseTextKey,
-				});
-			}
-			return options;
-		},
-		isTypeAbstract(): boolean {
-			return this.nodeParameters.__type === MessageEventBusDestinationTypeNames.abstract;
-		},
-		isTypeWebhook(): boolean {
-			return this.nodeParameters.__type === MessageEventBusDestinationTypeNames.webhook;
-		},
-		isTypeSyslog(): boolean {
-			return this.nodeParameters.__type === MessageEventBusDestinationTypeNames.syslog;
-		},
-		isTypeSentry(): boolean {
-			return this.nodeParameters.__type === MessageEventBusDestinationTypeNames.sentry;
-		},
-		node(): INodeUi {
-			return destinationToFakeINodeUi(this.nodeParameters);
-		},
-		typeLabelName(): BaseTextKey {
-			return `settings.log-streaming.${this.nodeParameters.__type}` as BaseTextKey;
-		},
-		sidebarItems(): IMenuItem[] {
-			const items: IMenuItem[] = [
-				{
-					id: 'settings',
-					label: this.$locale.baseText('settings.log-streaming.tab.settings'),
-					position: 'top',
-				},
-			];
-			if (!this.isTypeAbstract) {
-				items.push({
-					id: 'events',
-					label: this.$locale.baseText('settings.log-streaming.tab.events'),
-					position: 'top',
-				});
-			}
-			return items;
-		},
-		canManageLogStreaming(): boolean {
-			return hasPermission(['rbac'], { rbac: { scope: 'logStreaming:manage' } });
-		},
-	},
-	mounted() {
-		this.setupNode(
-			Object.assign(deepCopy(defaultMessageEventBusDestinationOptions), this.destination),
-		);
-		this.workflowsStore.$onAction(
-			({
-				name, // name of the action
-				args, // array of parameters passed to the action
-			}) => {
-				if (name === 'updateNodeProperties') {
-					for (const arg of args) {
-						if (arg.name === this.destination.id) {
-							if ('credentials' in arg.properties) {
-								this.unchanged = false;
-								this.nodeParameters.credentials = arg.properties
-									.credentials as NodeParameterValueType;
-							}
-						}
-					}
-				}
-			},
-		);
-	},
-	methods: {
-		onInput() {
-			this.unchanged = false;
-			this.testMessageSent = false;
-		},
-		onTabSelect(tab: string) {
-			this.activeTab = tab;
-		},
-		onLabelChange(value: string) {
-			this.onInput();
-			this.headerLabel = value;
-			this.nodeParameters.label = value;
-		},
-		setupNode(options: MessageEventBusDestinationOptions) {
-			this.workflowsStore.removeNode(this.node);
-			this.ndvStore.activeNodeName = options.id ?? 'thisshouldnothappen';
-			this.workflowsStore.addNode(destinationToFakeINodeUi(options));
-			this.nodeParameters = options as INodeParameters;
-			this.logStreamingStore.items[this.destination.id].destination = options;
-		},
-		onTypeSelectInput(destinationType: MessageEventBusDestinationTypeNames) {
-			this.typeSelectValue = destinationType;
-		},
-		async onContinueAddClicked() {
-			let newDestination;
-			switch (this.typeSelectValue) {
-				case MessageEventBusDestinationTypeNames.syslog:
-					newDestination = Object.assign(deepCopy(defaultMessageEventBusDestinationSyslogOptions), {
-						id: this.destination.id,
-					});
-					break;
-				case MessageEventBusDestinationTypeNames.sentry:
-					newDestination = Object.assign(deepCopy(defaultMessageEventBusDestinationSentryOptions), {
-						id: this.destination.id,
-					});
-					break;
-				case MessageEventBusDestinationTypeNames.webhook:
-					newDestination = Object.assign(
-						deepCopy(defaultMessageEventBusDestinationWebhookOptions),
-						{ id: this.destination.id },
-					);
-					break;
-			}
+);
+const { modalName, destination, isNew, eventBus } = props;
 
-			if (newDestination) {
-				this.headerLabel = newDestination?.label ?? this.headerLabel;
-				this.setupNode(newDestination);
-			}
-		},
-		valueChanged(parameterData: IUpdateInformation) {
-			this.unchanged = false;
-			this.testMessageSent = false;
-			const newValue: NodeParameterValue = parameterData.value as string | number;
-			const parameterPath = parameterData.name?.startsWith('parameters.')
-				? parameterData.name.split('.').slice(1).join('.')
-				: parameterData.name || '';
+const i18n = useI18n();
+const { confirm } = useMessage();
+const telemetry = useTelemetry();
+const logStreamingStore = useLogStreamingStore();
+const ndvStore = useNDVStore();
+const workflowsStore = useWorkflowsStore();
+const uiStore = useUIStore();
 
-			const nodeParameters = deepCopy(this.nodeParameters);
+const unchanged = ref(!isNew);
+const activeTab = ref('settings');
+const hasOnceBeenSaved = ref(!isNew);
+const isSaving = ref(false);
+const isDeleting = ref(false);
+const loading = ref(false);
+const typeSelectValue = ref('');
+const typeSelectPlaceholder = ref('Destination Type');
+const nodeParameters = ref(deepCopy(defaultMessageEventBusDestinationOptions) as INodeParameters);
+const webhookDescription = ref(webhookModalDescription);
+const sentryDescription = ref(sentryModalDescription);
+const syslogDescription = ref(syslogModalDescription);
+const modalBus = ref(createEventBus());
+const headerLabel = ref(destination.label!);
+const testMessageSent = ref(false);
+const testMessageResult = ref(false);
 
-			// Check if the path is supposed to change an array and if so get
-			// the needed data like path and index
-			const parameterPathArray = parameterPath.match(/(.*)\[(\d+)\]$/);
-
-			// Apply the new value
-			if (parameterData.value === undefined && parameterPathArray !== null) {
-				// Delete array item
-				const path = parameterPathArray[1] as keyof MessageEventBusDestinationOptions;
-				const index = parameterPathArray[2];
-				const data = get(nodeParameters, path);
-
-				if (Array.isArray(data)) {
-					data.splice(parseInt(index, 10), 1);
-					nodeParameters[path] = data as never;
-				}
-			} else {
-				if (newValue === undefined) {
-					unset(nodeParameters, parameterPath);
-				} else {
-					set(nodeParameters, parameterPath, newValue);
-				}
-			}
-
-			this.nodeParameters = deepCopy(nodeParameters);
-			this.workflowsStore.updateNodeProperties({
-				name: this.node.name,
-				properties: { parameters: this.nodeParameters as unknown as IDataObject, position: [0, 0] },
-			});
-			if (this.hasOnceBeenSaved) {
-				this.logStreamingStore.updateDestination(this.nodeParameters);
-			}
-		},
-		async sendTestEvent() {
-			this.testMessageResult = await this.logStreamingStore.sendTestMessage(this.nodeParameters);
-			this.testMessageSent = true;
-		},
-		async removeThis() {
-			const deleteConfirmed = await this.confirm(
-				this.$locale.baseText('settings.log-streaming.destinationDelete.message', {
-					interpolate: { destinationName: this.destination.label },
-				}),
-				this.$locale.baseText('settings.log-streaming.destinationDelete.headline'),
-				{
-					type: 'warning',
-					confirmButtonText: this.$locale.baseText(
-						'settings.log-streaming.destinationDelete.confirmButtonText',
-					),
-					cancelButtonText: this.$locale.baseText(
-						'settings.log-streaming.destinationDelete.cancelButtonText',
-					),
-				},
-			);
-
-			if (deleteConfirmed !== MODAL_CONFIRM) {
-				return;
-			} else {
-				this.callEventBus('remove', this.destination.id);
-				this.uiStore.closeModal(LOG_STREAM_MODAL_KEY);
-				this.uiStore.stateIsDirty = false;
-			}
-		},
-		onModalClose() {
-			if (!this.hasOnceBeenSaved) {
-				this.workflowsStore.removeNode(this.node);
-				if (this.nodeParameters.id && typeof this.nodeParameters.id !== 'object') {
-					this.logStreamingStore.removeDestination(this.nodeParameters.id.toString());
-				}
-			}
-			this.ndvStore.activeNodeName = null;
-			this.callEventBus('closing', this.destination.id);
-			this.uiStore.stateIsDirty = false;
-		},
-		async saveDestination() {
-			if (this.unchanged || !this.destination.id) {
-				return;
-			}
-			const saveResult = await this.logStreamingStore.saveDestination(this.nodeParameters);
-			if (saveResult) {
-				this.hasOnceBeenSaved = true;
-				this.testMessageSent = false;
-				this.unchanged = true;
-				this.callEventBus('destinationWasSaved', this.destination.id);
-				this.uiStore.stateIsDirty = false;
-
-				const destinationType = (
-					this.nodeParameters.__type && typeof this.nodeParameters.__type !== 'object'
-						? `${this.nodeParameters.__type}`
-						: 'unknown'
-				)
-					.replace('$$MessageEventBusDestination', '')
-					.toLowerCase();
-
-				const isComplete = () => {
-					if (this.isTypeWebhook) {
-						return this.destination.host !== '';
-					} else if (this.isTypeSentry) {
-						return this.destination.dsn !== '';
-					} else if (this.isTypeSyslog) {
-						return (
-							this.destination.host !== '' &&
-							this.destination.port !== undefined &&
-							this.destination.protocol !== '' &&
-							this.destination.facility !== undefined &&
-							this.destination.app_name !== ''
-						);
-					}
-					return false;
-				};
-
-				useTelemetry().track('User updated log streaming destination', {
-					instance_id: useRootStore().instanceId,
-					destination_type: destinationType,
-					is_complete: isComplete(),
-					is_active: this.destination.enabled,
-				});
-			}
-		},
-		callEventBus(event: string, data: unknown) {
-			if (this.eventBus) {
-				this.eventBus.emit(event, data);
-			}
-		},
-	},
+const typeSelectOptions = computed(() => {
+	const options: Array<{ value: string; label: BaseTextKey }> = [];
+	for (const t of messageEventBusDestinationTypeNames) {
+		if (t === MessageEventBusDestinationTypeNames.abstract) {
+			continue;
+		}
+		options.push({
+			value: t,
+			label: `settings.log-streaming.${t}` as BaseTextKey,
+		});
+	}
+	return options;
 });
+
+const isTypeAbstract = computed(
+	() => nodeParameters.value.__type === MessageEventBusDestinationTypeNames.abstract,
+);
+
+const isTypeWebhook = computed(
+	() => nodeParameters.value.__type === MessageEventBusDestinationTypeNames.webhook,
+);
+
+const isTypeSyslog = computed(
+	() => nodeParameters.value.__type === MessageEventBusDestinationTypeNames.syslog,
+);
+
+const isTypeSentry = computed(
+	() => nodeParameters.value.__type === MessageEventBusDestinationTypeNames.sentry,
+);
+
+const node = computed(() => destinationToFakeINodeUi(nodeParameters.value));
+
+const typeLabelName = computed(
+	() => `settings.log-streaming.${nodeParameters.value.__type}` as BaseTextKey,
+);
+
+const sidebarItems = computed(() => {
+	const items: IMenuItem[] = [
+		{
+			id: 'settings',
+			label: i18n.baseText('settings.log-streaming.tab.settings'),
+			position: 'top',
+		},
+	];
+	if (!isTypeAbstract.value) {
+		items.push({
+			id: 'events',
+			label: i18n.baseText('settings.log-streaming.tab.events'),
+			position: 'top',
+		});
+	}
+	return items;
+});
+
+const canManageLogStreaming = computed(() =>
+	hasPermission(['rbac'], { rbac: { scope: 'logStreaming:manage' } }),
+);
+
+onMounted(() => {
+	setupNode(Object.assign(deepCopy(defaultMessageEventBusDestinationOptions), destination));
+	workflowsStore.$onAction(({ name, args }) => {
+		if (name === 'updateNodeProperties') {
+			for (const arg of args) {
+				if (arg.name === destination.id) {
+					if ('credentials' in arg.properties) {
+						unchanged.value = false;
+						nodeParameters.value.credentials = arg.properties.credentials as NodeParameterValueType;
+					}
+				}
+			}
+		}
+	});
+});
+
+function onInput() {
+	unchanged.value = false;
+	testMessageSent.value = false;
+}
+
+function onTabSelect(tab: string) {
+	activeTab.value = tab;
+}
+
+function onLabelChange(value: string) {
+	onInput();
+	headerLabel.value = value;
+	nodeParameters.value.label = value;
+}
+
+function setupNode(options: MessageEventBusDestinationOptions) {
+	workflowsStore.removeNode(node.value);
+	ndvStore.activeNodeName = options.id ?? 'thisshouldnothappen';
+	workflowsStore.addNode(destinationToFakeINodeUi(options));
+	nodeParameters.value = options as INodeParameters;
+	logStreamingStore.items[destination.id!].destination = options;
+}
+
+function onTypeSelectInput(destinationType: MessageEventBusDestinationTypeNames) {
+	typeSelectValue.value = destinationType;
+}
+
+async function onContinueAddClicked() {
+	let newDestination;
+	switch (typeSelectValue.value) {
+		case MessageEventBusDestinationTypeNames.syslog:
+			newDestination = Object.assign(deepCopy(defaultMessageEventBusDestinationSyslogOptions), {
+				id: destination.id,
+			});
+			break;
+		case MessageEventBusDestinationTypeNames.sentry:
+			newDestination = Object.assign(deepCopy(defaultMessageEventBusDestinationSentryOptions), {
+				id: destination.id,
+			});
+			break;
+		case MessageEventBusDestinationTypeNames.webhook:
+			newDestination = Object.assign(deepCopy(defaultMessageEventBusDestinationWebhookOptions), {
+				id: destination.id,
+			});
+			break;
+	}
+
+	if (newDestination) {
+		headerLabel.value = newDestination?.label ?? headerLabel.value;
+		setupNode(newDestination);
+	}
+}
+
+function valueChanged(parameterData: IUpdateInformation) {
+	unchanged.value = false;
+	testMessageSent.value = false;
+	const newValue: NodeParameterValue = parameterData.value as string | number;
+	const parameterPath = parameterData.name?.startsWith('parameters.')
+		? parameterData.name.split('.').slice(1).join('.')
+		: parameterData.name || '';
+
+	const nodeParametersCopy = deepCopy(nodeParameters.value);
+
+	if (parameterData.value === undefined && parameterPath.match(/(.*)\[(\d+)\]$/)) {
+		const path = parameterPath.match(
+			/(.*)\[(\d+)\]$/,
+		)?.[1] as keyof MessageEventBusDestinationOptions;
+		const index = parseInt(parameterPath.match(/(.*)\[(\d+)\]$/)?.[2] ?? '0', 10);
+		const data = get(nodeParametersCopy, path);
+
+		if (Array.isArray(data)) {
+			data.splice(index, 1);
+			nodeParametersCopy[path] = data as never;
+		}
+	} else {
+		if (newValue === undefined) {
+			unset(nodeParametersCopy, parameterPath);
+		} else {
+			set(nodeParametersCopy, parameterPath, newValue);
+		}
+	}
+
+	nodeParameters.value = deepCopy(nodeParametersCopy);
+	workflowsStore.updateNodeProperties({
+		name: node.value.name,
+		properties: { parameters: nodeParameters.value as unknown as IDataObject, position: [0, 0] },
+	});
+	if (hasOnceBeenSaved.value) {
+		logStreamingStore.updateDestination(nodeParameters.value);
+	}
+}
+
+async function sendTestEvent() {
+	testMessageResult.value = await logStreamingStore.sendTestMessage(nodeParameters.value);
+	testMessageSent.value = true;
+}
+
+async function removeThis() {
+	const deleteConfirmed = await confirm(
+		i18n.baseText('settings.log-streaming.destinationDelete.message', {
+			interpolate: { destinationName: destination.label! },
+		}),
+		i18n.baseText('settings.log-streaming.destinationDelete.headline'),
+		{
+			type: 'warning',
+			confirmButtonText: i18n.baseText(
+				'settings.log-streaming.destinationDelete.confirmButtonText',
+			),
+			cancelButtonText: i18n.baseText('settings.log-streaming.destinationDelete.cancelButtonText'),
+		},
+	);
+
+	if (deleteConfirmed !== MODAL_CONFIRM) {
+		return;
+	} else {
+		callEventBus('remove', destination.id);
+		uiStore.closeModal(LOG_STREAM_MODAL_KEY);
+		uiStore.stateIsDirty = false;
+	}
+}
+
+function onModalClose() {
+	if (!hasOnceBeenSaved.value) {
+		workflowsStore.removeNode(node.value);
+		if (nodeParameters.value.id && typeof nodeParameters.value.id !== 'object') {
+			logStreamingStore.removeDestination(nodeParameters.value.id.toString());
+		}
+	}
+	ndvStore.activeNodeName = null;
+	callEventBus('closing', destination.id);
+	uiStore.stateIsDirty = false;
+}
+
+async function saveDestination() {
+	if (unchanged.value || !destination.id) {
+		return;
+	}
+	const saveResult = await logStreamingStore.saveDestination(nodeParameters.value);
+	if (saveResult) {
+		hasOnceBeenSaved.value = true;
+		testMessageSent.value = false;
+		unchanged.value = true;
+		callEventBus('destinationWasSaved', destination.id);
+		uiStore.stateIsDirty = false;
+
+		const destinationType = (
+			nodeParameters.value.__type && typeof nodeParameters.value.__type !== 'object'
+				? `${nodeParameters.value.__type}`
+				: 'unknown'
+		)
+			.replace('$$MessageEventBusDestination', '')
+			.toLowerCase();
+
+		const isComplete = () => {
+			if (isTypeWebhook.value) {
+				const webhookDestination = destination as MessageEventBusDestinationWebhookOptions;
+				return webhookDestination.url !== '';
+			} else if (isTypeSentry.value) {
+				const sentryDestination = destination as MessageEventBusDestinationSentryOptions;
+				return sentryDestination.dsn !== '';
+			} else if (isTypeSyslog.value) {
+				const syslogDestination = destination as MessageEventBusDestinationSyslogOptions;
+				return (
+					syslogDestination.host !== '' &&
+					syslogDestination.port !== undefined &&
+					// @ts-expect-error TODO: fix this typing
+					syslogDestination.protocol !== '' &&
+					syslogDestination.facility !== undefined &&
+					syslogDestination.app_name !== ''
+				);
+			}
+			return false;
+		};
+
+		telemetry.track('User updated log streaming destination', {
+			instance_id: useRootStore().instanceId,
+			destination_type: destinationType,
+			is_complete: isComplete(),
+			is_active: destination.enabled,
+		});
+	}
+}
+
+function callEventBus(event: string, data: unknown) {
+	if (eventBus) {
+		eventBus.emit(event, data);
+	}
+}
 </script>
 
 <template>
@@ -381,7 +378,7 @@ export default defineComponent({
 					<div :class="$style.destinationInfo">
 						<InlineNameEdit
 							:model-value="headerLabel"
-							:subtitle="!isTypeAbstract ? $locale.baseText(typeLabelName) : 'Select type'"
+							:subtitle="!isTypeAbstract ? i18n.baseText(typeLabelName) : 'Select type'"
 							:readonly="isTypeAbstract"
 							type="Credential"
 							data-test-id="subtitle-showing-type"
@@ -406,7 +403,7 @@ export default defineComponent({
 						<template v-if="canManageLogStreaming">
 							<n8n-icon-button
 								v-if="nodeParameters && hasOnceBeenSaved"
-								:title="$locale.baseText('settings.log-streaming.delete')"
+								:title="i18n.baseText('settings.log-streaming.delete')"
 								icon="trash"
 								type="tertiary"
 								:disabled="isSaving"
@@ -417,7 +414,7 @@ export default defineComponent({
 							<SaveButton
 								:saved="unchanged && hasOnceBeenSaved"
 								:disabled="isTypeAbstract || unchanged"
-								:saving-label="$locale.baseText('settings.log-streaming.saving')"
+								:saving-label="i18n.baseText('settings.log-streaming.saving')"
 								data-test-id="destination-save-button"
 								@click="saveDestination"
 							/>
@@ -432,8 +429,8 @@ export default defineComponent({
 				<template v-if="isTypeAbstract">
 					<n8n-input-label
 						:class="$style.typeSelector"
-						:label="$locale.baseText('settings.log-streaming.selecttype')"
-						:tooltip-text="$locale.baseText('settings.log-streaming.selecttypehint')"
+						:label="i18n.baseText('settings.log-streaming.selecttype')"
+						:tooltip-text="i18n.baseText('settings.log-streaming.selecttypehint')"
 						:bold="false"
 						size="medium"
 						:underline="false"
@@ -450,7 +447,7 @@ export default defineComponent({
 								v-for="option in typeSelectOptions || []"
 								:key="option.value"
 								:value="option.value"
-								:label="$locale.baseText(option.label)"
+								:label="i18n.baseText(option.label)"
 							/>
 						</n8n-select>
 						<div class="mt-m text-right">
@@ -460,7 +457,7 @@ export default defineComponent({
 								:disabled="!typeSelectValue"
 								@click="onContinueAddClicked"
 							>
-								{{ $locale.baseText(`settings.log-streaming.continue`) }}
+								{{ i18n.baseText(`settings.log-streaming.continue`) }}
 							</n8n-button>
 						</div>
 					</n8n-input-label>
@@ -505,7 +502,7 @@ export default defineComponent({
 						<div class="">
 							<n8n-input-label
 								class="mb-m mt-m"
-								:label="$locale.baseText('settings.log-streaming.tab.events.title')"
+								:label="i18n.baseText('settings.log-streaming.tab.events.title')"
 								:bold="true"
 								size="medium"
 								:underline="false"
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
index 9a1591809c..bad07344b6 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue
@@ -3,8 +3,10 @@ import { ElCheckbox as Checkbox, type CheckboxValueType } from 'element-plus';
 import { mapStores } from 'pinia';
 import type { BaseTextKey } from '@/plugins/i18n';
 import { useLogStreamingStore } from '@/stores/logStreaming.store';
+import { defineComponent } from 'vue';
+import { useI18n } from '@/composables/useI18n';
 
-export default {
+export default defineComponent({
 	name: 'EventSelection',
 	components: {
 		Checkbox,
@@ -16,6 +18,13 @@ export default {
 		},
 		readonly: Boolean,
 	},
+	setup() {
+		const i18n = useI18n();
+
+		return {
+			i18n,
+		};
+	},
 	data() {
 		return {
 			unchanged: true,
@@ -42,16 +51,16 @@ export default {
 			this.$forceUpdate();
 		},
 		groupLabelName(t: string): string {
-			return this.$locale.baseText(`settings.log-streaming.eventGroup.${t}` as BaseTextKey) ?? t;
+			return this.i18n.baseText(`settings.log-streaming.eventGroup.${t}` as BaseTextKey) ?? t;
 		},
 		groupLabelInfo(t: string): string | undefined {
 			const labelInfo = `settings.log-streaming.eventGroup.${t}.info`;
-			const infoText = this.$locale.baseText(labelInfo as BaseTextKey);
+			const infoText = this.i18n.baseText(labelInfo as BaseTextKey);
 			if (infoText === labelInfo || infoText === '') return;
 			return infoText;
 		},
 	},
-};
+});
 </script>
 
 <template>
@@ -89,11 +98,11 @@ export default {
 				@update:model-value="onInput"
 				@change="anonymizeAuditMessagesChanged"
 			>
-				{{ $locale.baseText('settings.log-streaming.tab.events.anonymize') }}
+				{{ i18n.baseText('settings.log-streaming.tab.events.anonymize') }}
 				<n8n-tooltip placement="top" :popper-class="$style.tooltipPopper">
 					<n8n-icon icon="question-circle" size="small" class="ml-4xs" />
 					<template #content>
-						{{ $locale.baseText('settings.log-streaming.tab.events.anonymize.info') }}
+						{{ i18n.baseText('settings.log-streaming.tab.events.anonymize.info') }}
 					</template>
 				</n8n-tooltip>
 			</Checkbox>
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts b/packages/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts
index 421d9f1451..46f6447c55 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/descriptions.ee.ts
@@ -258,7 +258,7 @@ export const webhookModalDescription = [
 		default: {},
 		options: [
 			{
-				displayName: 'Ignore SSL Issues',
+				displayName: 'Ignore SSL Issues (Insecure)',
 				name: 'allowUnauthorizedCerts',
 				type: 'boolean',
 				noDataExpression: true,
diff --git a/packages/editor-ui/src/components/SettingsSidebar.vue b/packages/editor-ui/src/components/SettingsSidebar.vue
index 5409620e45..41a7de813e 100644
--- a/packages/editor-ui/src/components/SettingsSidebar.vue
+++ b/packages/editor-ui/src/components/SettingsSidebar.vue
@@ -2,9 +2,7 @@
 import { computed } from 'vue';
 import { ABOUT_MODAL_KEY, VIEWS } from '@/constants';
 import { useUserHelpers } from '@/composables/useUserHelpers';
-import type { IFakeDoor } from '@/Interface';
 import type { IMenuItem } from 'n8n-design-system';
-import type { BaseTextKey } from '@/plugins/i18n';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/root.store';
@@ -26,23 +24,6 @@ const rootStore = useRootStore();
 const settingsStore = useSettingsStore();
 const uiStore = useUIStore();
 
-const settingsFakeDoorFeatures = computed<IFakeDoor[]>(() =>
-	Object.keys(uiStore.fakeDoorsByLocation)
-		.filter((location: string) => location.includes('settings'))
-		.map((location) => uiStore.fakeDoorsByLocation[location]),
-);
-
-const handleSelect = (key: string) => {
-	switch (key) {
-		case 'users': // Fakedoor feature added via hooks when user management is disabled on cloud
-		case 'logging':
-			router.push({ name: VIEWS.FAKE_DOOR, params: { featureId: key } }).catch(() => {});
-			break;
-		default:
-			break;
-	}
-};
-
 const sidebarMenuItems = computed<IMenuItem[]>(() => {
 	const menuItems: IMenuItem[] = [
 		{
@@ -122,19 +103,6 @@ const sidebarMenuItems = computed<IMenuItem[]>(() => {
 		},
 	];
 
-	for (const item of settingsFakeDoorFeatures.value) {
-		if (item.uiLocations.includes('settings')) {
-			menuItems.push({
-				id: item.id,
-				icon: item.icon ?? 'question',
-				label: i18n.baseText(item.featureName as BaseTextKey),
-				position: 'top',
-				available: true,
-				activateOnRoutePaths: [`/settings/coming-soon/${item.id}`],
-			});
-		}
-	}
-
 	menuItems.push({
 		id: 'settings-log-streaming',
 		icon: 'sign-in-alt',
@@ -159,7 +127,7 @@ const sidebarMenuItems = computed<IMenuItem[]>(() => {
 
 <template>
 	<div :class="$style.container">
-		<n8n-menu :items="sidebarMenuItems" @select="handleSelect">
+		<n8n-menu :items="sidebarMenuItems">
 			<template #header>
 				<div :class="$style.returnButton" data-test-id="settings-back" @click="emit('return')">
 					<i class="mr-xs">
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/SourceControlPullModal.ee.vue b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
index 624b2dd61f..f70b4f7925 100644
--- a/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPullModal.ee.vue
@@ -2,7 +2,6 @@
 import Modal from './Modal.vue';
 import { SOURCE_CONTROL_PULL_MODAL_KEY } from '@/constants';
 import type { EventBus } from 'n8n-design-system/utils';
-import type { SourceControlAggregatedFile } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useToast } from '@/composables/useToast';
@@ -10,9 +9,10 @@ import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
 import { computed, nextTick, ref } from 'vue';
 import { sourceControlEventBus } from '@/event-bus/source-control';
+import type { SourceControlledFile } from '@n8n/api-types';
 
 const props = defineProps<{
-	data: { eventBus: EventBus; status: SourceControlAggregatedFile[] };
+	data: { eventBus: EventBus; status: SourceControlledFile[] };
 }>();
 
 const incompleteFileTypes = ['variables', 'credential'];
@@ -23,7 +23,7 @@ const toast = useToast();
 const i18n = useI18n();
 const sourceControlStore = useSourceControlStore();
 
-const files = ref<SourceControlAggregatedFile[]>(props.data.status || []);
+const files = ref<SourceControlledFile[]>(props.data.status || []);
 
 const workflowFiles = computed(() => {
 	return files.value.filter((file) => file.type === 'workflow');
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts b/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
index c2aecd6999..80af6e29f2 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.test.ts
@@ -1,16 +1,20 @@
-import { within } from '@testing-library/dom';
+import { within, waitFor } from '@testing-library/dom';
 import userEvent from '@testing-library/user-event';
 import { useRoute } from 'vue-router';
 import { createComponentRenderer } from '@/__tests__/render';
 import SourceControlPushModal from '@/components/SourceControlPushModal.ee.vue';
 import { createTestingPinia } from '@pinia/testing';
 import { createEventBus } from 'n8n-design-system';
-import type { SourceControlAggregatedFile } from '@/Interface';
+import type { SourceControlledFile } from '@n8n/api-types';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { mockedStore } from '@/__tests__/utils';
+import { VIEWS } from '@/constants';
 
 const eventBus = createEventBus();
 
 vi.mock('vue-router', () => ({
 	useRoute: vi.fn().mockReturnValue({
+		name: vi.fn(),
 		params: vi.fn(),
 		fullPath: vi.fn(),
 	}),
@@ -20,9 +24,17 @@ vi.mock('vue-router', () => ({
 
 let route: ReturnType<typeof useRoute>;
 
+const RecycleScroller = {
+	props: {
+		items: Array,
+	},
+	template: '<div><template v-for="item in items"><slot v-bind="{ item }"></slot></template></div>',
+};
+
 const renderModal = createComponentRenderer(SourceControlPushModal, {
 	global: {
 		stubs: {
+			RecycleScroller,
 			Modal: {
 				template: `
 					<div>
@@ -40,12 +52,13 @@ const renderModal = createComponentRenderer(SourceControlPushModal, {
 describe('SourceControlPushModal', () => {
 	beforeEach(() => {
 		route = useRoute();
+		createTestingPinia();
 	});
 
 	it('mounts', () => {
 		vi.spyOn(route, 'fullPath', 'get').mockReturnValue('');
 
-		const { getByTitle } = renderModal({
+		const { getByText } = renderModal({
 			pinia: createTestingPinia(),
 			props: {
 				data: {
@@ -54,11 +67,11 @@ describe('SourceControlPushModal', () => {
 				},
 			},
 		});
-		expect(getByTitle('Commit and push changes')).toBeInTheDocument();
+		expect(getByText('Commit and push changes')).toBeInTheDocument();
 	});
 
 	it('should toggle checkboxes', async () => {
-		const status: SourceControlAggregatedFile[] = [
+		const status: SourceControlledFile[] = [
 			{
 				id: 'gTbbBkkYTnNyX1jD',
 				name: 'My workflow 1',
@@ -81,10 +94,7 @@ describe('SourceControlPushModal', () => {
 			},
 		];
 
-		vi.spyOn(route, 'fullPath', 'get').mockReturnValue('/home/workflows');
-
 		const { getByTestId, getAllByTestId } = renderModal({
-			pinia: createTestingPinia(),
 			props: {
 				data: {
 					eventBus,
@@ -148,4 +158,272 @@ describe('SourceControlPushModal', () => {
 		expect(within(files[0]).getByRole('checkbox')).not.toBeChecked();
 		expect(within(files[1]).getByRole('checkbox')).not.toBeChecked();
 	});
+
+	it('should push non workflow entities', async () => {
+		const status: SourceControlledFile[] = [
+			{
+				id: 'gTbbBkkYTnNyX1jD',
+				name: 'credential',
+				type: 'credential',
+				status: 'created',
+				location: 'local',
+				conflict: false,
+				file: '',
+				updatedAt: '2024-09-20T10:31:40.000Z',
+			},
+			{
+				id: 'JIGKevgZagmJAnM6',
+				name: 'variables',
+				type: 'variables',
+				status: 'created',
+				location: 'local',
+				conflict: false,
+				file: '',
+				updatedAt: '2024-09-20T14:42:51.968Z',
+			},
+			{
+				id: 'mappings',
+				name: 'tags',
+				type: 'tags',
+				status: 'modified',
+				location: 'local',
+				conflict: false,
+				file: '/Users/raul/.n8n/git/tags.json',
+				updatedAt: '2024-12-04T11:29:22.095Z',
+			},
+		];
+
+		const sourceControlStore = mockedStore(useSourceControlStore);
+
+		const { getByTestId, getByText } = renderModal({
+			props: {
+				data: {
+					eventBus,
+					status,
+				},
+			},
+		});
+
+		const submitButton = getByTestId('source-control-push-modal-submit');
+		const commitMessage = 'commit message';
+		expect(submitButton).toBeDisabled();
+		expect(getByText('1 new credentials added, 0 deleted and 0 changed')).toBeInTheDocument();
+		expect(getByText('At least one new variable has been added or modified')).toBeInTheDocument();
+		expect(getByText('At least one new tag has been added or modified')).toBeInTheDocument();
+
+		await userEvent.type(getByTestId('source-control-push-modal-commit'), commitMessage);
+
+		expect(submitButton).not.toBeDisabled();
+		await userEvent.click(submitButton);
+
+		expect(sourceControlStore.pushWorkfolder).toHaveBeenCalledWith(
+			expect.objectContaining({
+				commitMessage,
+				fileNames: expect.arrayContaining(status),
+				force: true,
+			}),
+		);
+	});
+
+	it('should auto select currentWorkflow', async () => {
+		const status: SourceControlledFile[] = [
+			{
+				id: 'gTbbBkkYTnNyX1jD',
+				name: 'My workflow 1',
+				type: 'workflow',
+				status: 'created',
+				location: 'local',
+				conflict: false,
+				file: '/home/user/.n8n/git/workflows/gTbbBkkYTnNyX1jD.json',
+				updatedAt: '2024-09-20T10:31:40.000Z',
+			},
+			{
+				id: 'JIGKevgZagmJAnM6',
+				name: 'My workflow 2',
+				type: 'workflow',
+				status: 'created',
+				location: 'local',
+				conflict: false,
+				file: '/home/user/.n8n/git/workflows/JIGKevgZagmJAnM6.json',
+				updatedAt: '2024-09-20T14:42:51.968Z',
+			},
+		];
+
+		vi.spyOn(route, 'name', 'get').mockReturnValue(VIEWS.WORKFLOW);
+		vi.spyOn(route, 'params', 'get').mockReturnValue({ name: 'gTbbBkkYTnNyX1jD' });
+
+		const { getByTestId, getAllByTestId } = renderModal({
+			props: {
+				data: {
+					eventBus,
+					status,
+				},
+			},
+		});
+
+		const submitButton = getByTestId('source-control-push-modal-submit');
+		expect(submitButton).toBeDisabled();
+
+		const files = getAllByTestId('source-control-push-modal-file-checkbox');
+		expect(files).toHaveLength(2);
+
+		await waitFor(() => expect(within(files[0]).getByRole('checkbox')).toBeChecked());
+		expect(within(files[1]).getByRole('checkbox')).not.toBeChecked();
+
+		await userEvent.type(getByTestId('source-control-push-modal-commit'), 'message');
+		expect(submitButton).not.toBeDisabled();
+	});
+
+	describe('filters', () => {
+		it('should filter by name', async () => {
+			const status: SourceControlledFile[] = [
+				{
+					id: 'gTbbBkkYTnNyX1jD',
+					name: 'My workflow 1',
+					type: 'workflow',
+					status: 'created',
+					location: 'local',
+					conflict: false,
+					file: '/home/user/.n8n/git/workflows/gTbbBkkYTnNyX1jD.json',
+					updatedAt: '2024-09-20T10:31:40.000Z',
+				},
+				{
+					id: 'JIGKevgZagmJAnM6',
+					name: 'My workflow 2',
+					type: 'workflow',
+					status: 'created',
+					location: 'local',
+					conflict: false,
+					file: '/home/user/.n8n/git/workflows/JIGKevgZagmJAnM6.json',
+					updatedAt: '2024-09-20T14:42:51.968Z',
+				},
+			];
+
+			const { getByTestId, getAllByTestId } = renderModal({
+				props: {
+					data: {
+						eventBus,
+						status,
+					},
+				},
+			});
+
+			expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(2);
+
+			await userEvent.type(getByTestId('source-control-push-search'), '1');
+			await waitFor(() =>
+				expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(1),
+			);
+		});
+
+		it('should filter by status', async () => {
+			const status: SourceControlledFile[] = [
+				{
+					id: 'gTbbBkkYTnNyX1jD',
+					name: 'Created Workflow',
+					type: 'workflow',
+					status: 'created',
+					location: 'local',
+					conflict: false,
+					file: '/home/user/.n8n/git/workflows/gTbbBkkYTnNyX1jD.json',
+					updatedAt: '2024-09-20T10:31:40.000Z',
+				},
+				{
+					id: 'JIGKevgZagmJAnM6',
+					name: 'Modified workflow',
+					type: 'workflow',
+					status: 'modified',
+					location: 'local',
+					conflict: false,
+					file: '/home/user/.n8n/git/workflows/JIGKevgZagmJAnM6.json',
+					updatedAt: '2024-09-20T14:42:51.968Z',
+				},
+			];
+
+			const { getByTestId, getAllByTestId } = renderModal({
+				props: {
+					data: {
+						eventBus,
+						status,
+					},
+				},
+			});
+
+			expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(2);
+
+			await userEvent.click(getByTestId('source-control-filter-dropdown'));
+
+			expect(getByTestId('source-control-status-filter')).toBeVisible();
+
+			await userEvent.click(
+				within(getByTestId('source-control-status-filter')).getByRole('combobox'),
+			);
+
+			await waitFor(() =>
+				expect(getAllByTestId('source-control-status-filter-option')[0]).toBeVisible(),
+			);
+
+			const menu = getAllByTestId('source-control-status-filter-option')[0]
+				.parentElement as HTMLElement;
+
+			await userEvent.click(within(menu).getByText('New'));
+			await waitFor(() => {
+				const items = getAllByTestId('source-control-push-modal-file-checkbox');
+				expect(items).toHaveLength(1);
+				expect(items[0]).toHaveTextContent('Created Workflow');
+			});
+		});
+
+		it('should reset', async () => {
+			const status: SourceControlledFile[] = [
+				{
+					id: 'JIGKevgZagmJAnM6',
+					name: 'Modified workflow',
+					type: 'workflow',
+					status: 'modified',
+					location: 'local',
+					conflict: false,
+					file: '/home/user/.n8n/git/workflows/JIGKevgZagmJAnM6.json',
+					updatedAt: '2024-09-20T14:42:51.968Z',
+				},
+			];
+
+			const { getByTestId, getAllByTestId, queryAllByTestId } = renderModal({
+				props: {
+					data: {
+						eventBus,
+						status,
+					},
+				},
+			});
+
+			expect(getAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(1);
+
+			await userEvent.click(getByTestId('source-control-filter-dropdown'));
+
+			expect(getByTestId('source-control-status-filter')).toBeVisible();
+
+			await userEvent.click(
+				within(getByTestId('source-control-status-filter')).getByRole('combobox'),
+			);
+
+			await waitFor(() =>
+				expect(getAllByTestId('source-control-status-filter-option')[0]).toBeVisible(),
+			);
+
+			const menu = getAllByTestId('source-control-status-filter-option')[0]
+				.parentElement as HTMLElement;
+
+			await userEvent.click(within(menu).getByText('New'));
+			await waitFor(() => {
+				expect(queryAllByTestId('source-control-push-modal-file-checkbox')).toHaveLength(0);
+				expect(getByTestId('source-control-filters-reset')).toBeInTheDocument();
+			});
+
+			await userEvent.click(getByTestId('source-control-filters-reset'));
+
+			const items = getAllByTestId('source-control-push-modal-file-checkbox');
+			expect(items).toHaveLength(1);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
index 0a0d99389a..5aad2a6be6 100644
--- a/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
+++ b/packages/editor-ui/src/components/SourceControlPushModal.ee.vue
@@ -1,9 +1,8 @@
 <script lang="ts" setup>
 import Modal from './Modal.vue';
-import { CREDENTIAL_EDIT_MODAL_KEY, SOURCE_CONTROL_PUSH_MODAL_KEY } from '@/constants';
+import { SOURCE_CONTROL_PUSH_MODAL_KEY, VIEWS } from '@/constants';
 import { computed, onMounted, ref } from 'vue';
 import type { EventBus } from 'n8n-design-system/utils';
-import type { SourceControlAggregatedFile } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useToast } from '@/composables/useToast';
@@ -11,13 +10,38 @@ import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useRoute } from 'vue-router';
 import dateformat from 'dateformat';
+import { RecycleScroller } from 'vue-virtual-scroller';
+import 'vue-virtual-scroller/dist/vue-virtual-scroller.css';
+import type { BaseTextKey } from '@/plugins/i18n';
+import { refDebounced } from '@vueuse/core';
+import {
+	N8nHeading,
+	N8nText,
+	N8nLink,
+	N8nCheckbox,
+	N8nInput,
+	N8nIcon,
+	N8nButton,
+	N8nBadge,
+	N8nNotice,
+	N8nPopover,
+	N8nSelect,
+	N8nOption,
+	N8nInputLabel,
+	N8nInfoTip,
+} from 'n8n-design-system';
+import {
+	type SourceControlledFile,
+	SOURCE_CONTROL_FILE_STATUS,
+	SOURCE_CONTROL_FILE_TYPE,
+	SOURCE_CONTROL_FILE_LOCATION,
+} from '@n8n/api-types';
+import { orderBy, groupBy } from 'lodash-es';
 
 const props = defineProps<{
-	data: { eventBus: EventBus; status: SourceControlAggregatedFile[] };
+	data: { eventBus: EventBus; status: SourceControlledFile[] };
 }>();
 
-const defaultStagedFileTypes = ['tags', 'variables', 'credential'];
-
 const loadingService = useLoadingService();
 const uiStore = useUIStore();
 const toast = useToast();
@@ -25,170 +49,206 @@ const i18n = useI18n();
 const sourceControlStore = useSourceControlStore();
 const route = useRoute();
 
-const staged = ref<Record<string, boolean>>({});
-const files = ref<SourceControlAggregatedFile[]>(
-	props.data.status.filter((file, index, self) => {
-		// do not show remote workflows that are not yet created locally during push
-		if (file.location === 'remote' && file.type === 'workflow' && file.status === 'created') {
-			return false;
-		}
-		return self.findIndex((f) => f.id === file.id) === index;
-	}) || [],
-);
+type SourceControlledFileStatus = SourceControlledFile['status'];
 
-const commitMessage = ref('');
-const loading = ref(true);
-const context = ref<'workflow' | 'workflows' | 'credentials' | ''>('');
-
-const statusToBadgeThemeMap: Record<string, string> = {
-	created: 'success',
-	deleted: 'danger',
-	modified: 'warning',
-	renamed: 'warning',
+type Changes = {
+	tags: SourceControlledFile[];
+	variables: SourceControlledFile[];
+	credentials: SourceControlledFile[];
+	workflows: SourceControlledFile[];
+	currentWorkflow?: SourceControlledFile;
 };
 
-const isSubmitDisabled = computed(() => {
-	return !commitMessage.value || Object.values(staged.value).every((value) => !value);
-});
+const classifyFilesByType = (files: SourceControlledFile[], currentWorkflowId?: string): Changes =>
+	files.reduce<Changes>(
+		(acc, file) => {
+			// do not show remote workflows that are not yet created locally during push
+			if (
+				file.location === SOURCE_CONTROL_FILE_LOCATION.remote &&
+				file.type === SOURCE_CONTROL_FILE_TYPE.workflow &&
+				file.status === SOURCE_CONTROL_FILE_STATUS.created
+			) {
+				return acc;
+			}
 
-const workflowId = computed(() => {
-	if (context.value === 'workflow') {
-		return route.params.name as string;
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.variables) {
+				acc.variables.push(file);
+				return acc;
+			}
+
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.tags) {
+				acc.tags.push(file);
+				return acc;
+			}
+
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.workflow && currentWorkflowId === file.id) {
+				acc.currentWorkflow = file;
+			}
+
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.workflow) {
+				acc.workflows.push(file);
+				return acc;
+			}
+
+			if (file.type === SOURCE_CONTROL_FILE_TYPE.credential) {
+				acc.credentials.push(file);
+				return acc;
+			}
+
+			return acc;
+		},
+		{ tags: [], variables: [], credentials: [], workflows: [], currentWorkflow: undefined },
+	);
+
+const userNotices = computed(() => {
+	const messages: string[] = [];
+
+	if (changes.value.credentials.length) {
+		const { created, deleted, modified } = groupBy(changes.value.credentials, 'status');
+
+		messages.push(
+			`${created?.length ?? 0} new credentials added, ${deleted?.length ?? 0} deleted and ${modified?.length ?? 0} changed`,
+		);
 	}
 
-	return '';
+	if (changes.value.variables.length) {
+		messages.push('At least one new variable has been added or modified');
+	}
+
+	if (changes.value.tags.length) {
+		messages.push('At least one new tag has been added or modified');
+	}
+
+	return messages;
 });
+const workflowId = computed(
+	() =>
+		([VIEWS.WORKFLOW].includes(route.name as VIEWS) && route.params.name?.toString()) || undefined,
+);
 
-const sortedFiles = computed(() => {
-	const statusPriority: Record<string, number> = {
-		modified: 1,
-		renamed: 2,
-		created: 3,
-		deleted: 4,
-	};
+const changes = computed(() => classifyFilesByType(props.data.status, workflowId.value));
 
-	return [...files.value].sort((a, b) => {
-		if (context.value === 'workflow') {
-			if (a.id === workflowId.value) {
-				return -1;
-			} else if (b.id === workflowId.value) {
-				return 1;
-			}
+const selectedChanges = ref<Set<string>>(new Set());
+const toggleSelected = (id: string) => {
+	if (selectedChanges.value.has(id)) {
+		selectedChanges.value.delete(id);
+	} else {
+		selectedChanges.value.add(id);
+	}
+};
+
+const maybeSelectCurrentWorkflow = (workflow?: SourceControlledFile) =>
+	workflow && selectedChanges.value.add(workflow.id);
+onMounted(() => maybeSelectCurrentWorkflow(changes.value.currentWorkflow));
+
+const filters = ref<{ status?: SourceControlledFileStatus }>({});
+const filtersApplied = computed(() => Boolean(Object.keys(filters.value).length));
+const resetFilters = () => {
+	filters.value = {};
+};
+
+const statusFilterOptions: Array<{ label: string; value: SourceControlledFileStatus }> = [
+	{
+		label: 'New',
+		value: SOURCE_CONTROL_FILE_STATUS.created,
+	},
+	{
+		label: 'Modified',
+		value: SOURCE_CONTROL_FILE_STATUS.modified,
+	},
+	{
+		label: 'Deleted',
+		value: SOURCE_CONTROL_FILE_STATUS.deleted,
+	},
+] as const;
+
+const search = ref('');
+const debouncedSearch = refDebounced(search, 250);
+
+const filterCount = computed(() =>
+	Object.values(filters.value).reduce((acc, item) => (item ? acc + 1 : acc), 0),
+);
+
+const filteredWorkflows = computed(() => {
+	const searchQuery = debouncedSearch.value.toLocaleLowerCase();
+
+	return changes.value.workflows.filter((workflow) => {
+		if (!workflow.name.toLocaleLowerCase().includes(searchQuery)) {
+			return false;
 		}
 
-		if (statusPriority[a.status] < statusPriority[b.status]) {
-			return -1;
-		} else if (statusPriority[a.status] > statusPriority[b.status]) {
-			return 1;
+		if (filters.value.status && filters.value.status !== workflow.status) {
+			return false;
 		}
 
-		return (a.updatedAt ?? 0) < (b.updatedAt ?? 0)
-			? 1
-			: (a.updatedAt ?? 0) > (b.updatedAt ?? 0)
-				? -1
-				: 0;
+		return true;
 	});
 });
 
-const selectAll = computed(() => {
-	return files.value.every((file) => staged.value[file.file]);
-});
+const statusPriority: Partial<Record<SourceControlledFileStatus, number>> = {
+	[SOURCE_CONTROL_FILE_STATUS.modified]: 1,
+	[SOURCE_CONTROL_FILE_STATUS.renamed]: 2,
+	[SOURCE_CONTROL_FILE_STATUS.created]: 3,
+	[SOURCE_CONTROL_FILE_STATUS.deleted]: 4,
+} as const;
+const getPriorityByStatus = (status: SourceControlledFileStatus): number =>
+	statusPriority[status] ?? 0;
 
-const workflowFiles = computed(() => {
-	return files.value.filter((file) => file.type === 'workflow');
-});
-
-const stagedWorkflowFiles = computed(() => {
-	return workflowFiles.value.filter((workflow) => staged.value[workflow.file]);
-});
-
-const selectAllIndeterminate = computed(() => {
-	return (
-		stagedWorkflowFiles.value.length > 0 &&
-		stagedWorkflowFiles.value.length < workflowFiles.value.length
+const sortedWorkflows = computed(() => {
+	const sorted = orderBy(
+		filteredWorkflows.value,
+		[
+			// keep the current workflow at the top of the list
+			({ id }) => id === changes.value.currentWorkflow?.id,
+			({ status }) => getPriorityByStatus(status),
+			'updatedAt',
+		],
+		['desc', 'asc', 'desc'],
 	);
+
+	return sorted;
 });
 
-onMounted(async () => {
-	context.value = getContext();
-	try {
-		staged.value = getStagedFilesByContext(files.value);
-	} catch (error) {
-		toast.showError(error, i18n.baseText('error'));
-	} finally {
-		loading.value = false;
+const commitMessage = ref('');
+const isSubmitDisabled = computed(() => {
+	if (!commitMessage.value.trim()) {
+		return true;
 	}
+
+	const toBePushed =
+		changes.value.credentials.length +
+		changes.value.tags.length +
+		changes.value.variables.length +
+		selectedChanges.value.size;
+	if (toBePushed <= 0) {
+		return true;
+	}
+
+	return false;
 });
 
+const selectAll = computed(
+	() =>
+		selectedChanges.value.size > 0 && selectedChanges.value.size === sortedWorkflows.value.length,
+);
+
+const selectAllIndeterminate = computed(
+	() => selectedChanges.value.size > 0 && selectedChanges.value.size < sortedWorkflows.value.length,
+);
+
 function onToggleSelectAll() {
 	if (selectAll.value) {
-		files.value.forEach((file) => {
-			if (!defaultStagedFileTypes.includes(file.type)) {
-				staged.value[file.file] = false;
-			}
-		});
+		selectedChanges.value.clear();
 	} else {
-		files.value.forEach((file) => {
-			if (!defaultStagedFileTypes.includes(file.type)) {
-				staged.value[file.file] = true;
-			}
-		});
+		selectedChanges.value = new Set(changes.value.workflows.map((file) => file.id));
 	}
 }
 
-function getContext() {
-	if (route.fullPath.startsWith('/workflows')) {
-		return 'workflows';
-	} else if (
-		route.fullPath.startsWith('/credentials') ||
-		uiStore.modalsById[CREDENTIAL_EDIT_MODAL_KEY].open
-	) {
-		return 'credentials';
-	} else if (route.fullPath.startsWith('/workflow/')) {
-		return 'workflow';
-	}
-
-	return '';
-}
-
-function getStagedFilesByContext(
-	filesByContext: SourceControlAggregatedFile[],
-): Record<string, boolean> {
-	const stagedFiles = filesByContext.reduce(
-		(acc, file) => {
-			acc[file.file] = false;
-			return acc;
-		},
-		{} as Record<string, boolean>,
-	);
-
-	filesByContext.forEach((file) => {
-		if (defaultStagedFileTypes.includes(file.type)) {
-			stagedFiles[file.file] = true;
-		}
-
-		if (context.value === 'workflow') {
-			if (file.type === 'workflow' && file.id === workflowId.value) {
-				stagedFiles[file.file] = true;
-			}
-		}
-	});
-
-	return stagedFiles;
-}
-
-function setStagedStatus(file: SourceControlAggregatedFile, status: boolean) {
-	staged.value = {
-		...staged.value,
-		[file.file]: status,
-	};
-}
-
 function close() {
 	uiStore.closeModal(SOURCE_CONTROL_PUSH_MODAL_KEY);
 }
 
-function renderUpdatedAt(file: SourceControlAggregatedFile) {
+function renderUpdatedAt(file: SourceControlledFile) {
 	const currentYear = new Date().getFullYear().toString();
 
 	return i18n.baseText('settings.sourceControl.lastUpdated', {
@@ -208,9 +268,46 @@ async function onCommitKeyDownEnter() {
 	}
 }
 
-async function commitAndPush() {
-	const fileNames = files.value.filter((file) => staged.value[file.file]);
+const successNotificationMessage = () => {
+	const messages: string[] = [];
 
+	if (selectedChanges.value.size) {
+		messages.push(
+			i18n.baseText('generic.workflow', {
+				adjustToNumber: selectedChanges.value.size,
+				interpolate: { count: selectedChanges.value.size },
+			}),
+		);
+	}
+
+	if (changes.value.credentials.length) {
+		messages.push(
+			i18n.baseText('generic.credential', {
+				adjustToNumber: changes.value.credentials.length,
+				interpolate: { count: changes.value.credentials.length },
+			}),
+		);
+	}
+
+	if (changes.value.variables.length) {
+		messages.push(i18n.baseText('generic.variable_plural'));
+	}
+
+	if (changes.value.tags.length) {
+		messages.push(i18n.baseText('generic.tag_plural'));
+	}
+
+	return [
+		new Intl.ListFormat(i18n.locale, { style: 'long', type: 'conjunction' }).format(messages),
+		i18n.baseText('settings.sourceControl.modals.push.success.description'),
+	].join(' ');
+};
+
+async function commitAndPush() {
+	const files = changes.value.tags
+		.concat(changes.value.variables)
+		.concat(changes.value.credentials)
+		.concat(changes.value.workflows.filter((file) => selectedChanges.value.has(file.id)));
 	loadingService.startLoading(i18n.baseText('settings.sourceControl.loading.push'));
 	close();
 
@@ -218,12 +315,12 @@ async function commitAndPush() {
 		await sourceControlStore.pushWorkfolder({
 			force: true,
 			commitMessage: commitMessage.value,
-			fileNames,
+			fileNames: files,
 		});
 
 		toast.showToast({
 			title: i18n.baseText('settings.sourceControl.modals.push.success.title'),
-			message: i18n.baseText('settings.sourceControl.modals.push.success.description'),
+			message: successNotificationMessage(),
 			type: 'success',
 		});
 	} catch (error) {
@@ -233,159 +330,205 @@ async function commitAndPush() {
 	}
 }
 
-function getStatusText(file: SourceControlAggregatedFile): string {
-	if (file.status === 'deleted') {
-		return i18n.baseText('settings.sourceControl.status.deleted');
-	}
-
-	if (file.status === 'created') {
-		return i18n.baseText('settings.sourceControl.status.created');
-	}
-
-	if (file.status === 'modified') {
-		return i18n.baseText('settings.sourceControl.status.modified');
-	}
-
-	return i18n.baseText('settings.sourceControl.status.renamed');
-}
+const getStatusText = (status: SourceControlledFileStatus) =>
+	i18n.baseText(`settings.sourceControl.status.${status}` as BaseTextKey);
+const getStatusTheme = (status: SourceControlledFileStatus) => {
+	const statusToBadgeThemeMap: Partial<
+		Record<SourceControlledFileStatus, 'success' | 'danger' | 'warning'>
+	> = {
+		[SOURCE_CONTROL_FILE_STATUS.created]: 'success',
+		[SOURCE_CONTROL_FILE_STATUS.deleted]: 'danger',
+		[SOURCE_CONTROL_FILE_STATUS.modified]: 'warning',
+	} as const;
+	return statusToBadgeThemeMap[status];
+};
 </script>
 
 <template>
 	<Modal
 		width="812px"
-		:title="i18n.baseText('settings.sourceControl.modals.push.title')"
 		:event-bus="data.eventBus"
 		:name="SOURCE_CONTROL_PUSH_MODAL_KEY"
 		max-height="80%"
+		:custom-class="$style.sourceControlPush"
 	>
-		<template #content>
-			<div :class="$style.container">
-				<div v-if="files.length > 0">
-					<div v-if="workflowFiles.length > 0">
-						<n8n-text tag="div" class="mb-l">
-							{{ i18n.baseText('settings.sourceControl.modals.push.description') }}
-							<n8n-link :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
-								{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
-							</n8n-link>
-						</n8n-text>
+		<template #header>
+			<N8nHeading tag="h1" size="xlarge">
+				{{ i18n.baseText('settings.sourceControl.modals.push.title') }}
+			</N8nHeading>
+			<div class="mt-l">
+				<N8nText tag="div">
+					{{ i18n.baseText('settings.sourceControl.modals.push.description') }}
+					<N8nLink :to="i18n.baseText('settings.sourceControl.docs.using.pushPull.url')">
+						{{ i18n.baseText('settings.sourceControl.modals.push.description.learnMore') }}
+					</N8nLink>
+				</N8nText>
 
-						<n8n-checkbox
-							:class="$style.selectAll"
-							:indeterminate="selectAllIndeterminate"
-							:model-value="selectAll"
-							data-test-id="source-control-push-modal-toggle-all"
-							@update:model-value="onToggleSelectAll"
-						>
-							<n8n-text bold tag="strong">
-								{{ i18n.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
-							</n8n-text>
-							<n8n-text v-show="workflowFiles.length > 0" tag="strong">
-								({{ stagedWorkflowFiles.length }}/{{ workflowFiles.length }})
-							</n8n-text>
-						</n8n-checkbox>
-
-						<n8n-checkbox
-							v-for="file in sortedFiles"
-							:key="file.file"
-							:class="[
-								'scopedListItem',
-								$style.listItem,
-								{ [$style.hiddenListItem]: defaultStagedFileTypes.includes(file.type) },
-							]"
-							data-test-id="source-control-push-modal-file-checkbox"
-							:model-value="staged[file.file]"
-							@update:model-value="setStagedStatus(file, !staged[file.file])"
-						>
-							<span>
-								<n8n-text v-if="file.status === 'deleted'" color="text-light">
-									<span v-if="file.type === 'workflow'"> Deleted Workflow: </span>
-									<span v-if="file.type === 'credential'"> Deleted Credential: </span>
-									<strong>{{ file.name || file.id }}</strong>
-								</n8n-text>
-								<n8n-text v-else bold> {{ file.name }} </n8n-text>
-								<n8n-text
-									v-if="file.updatedAt"
-									tag="p"
-									class="mt-0"
-									color="text-light"
-									size="small"
-								>
-									{{ renderUpdatedAt(file) }}
-								</n8n-text>
-							</span>
-							<span>
-								<n8n-badge v-if="workflowId === file.id && file.type === 'workflow'" class="mr-2xs">
-									Current workflow
-								</n8n-badge>
-								<n8n-badge :theme="statusToBadgeThemeMap[file.status] || 'default'">
-									{{ getStatusText(file) }}
-								</n8n-badge>
-							</span>
-						</n8n-checkbox>
-					</div>
-					<n8n-notice v-else class="mt-0">
-						<i18n-t keypath="settings.sourceControl.modals.push.noWorkflowChanges">
-							<template #link>
-								<n8n-link size="small" :to="i18n.baseText('settings.sourceControl.docs.using.url')">
-									{{
-										i18n.baseText('settings.sourceControl.modals.push.noWorkflowChanges.moreInfo')
-									}}
-								</n8n-link>
-							</template>
-						</i18n-t>
-					</n8n-notice>
-
-					<n8n-text bold tag="p" class="mt-l mb-2xs">
-						{{ i18n.baseText('settings.sourceControl.modals.push.commitMessage') }}
-					</n8n-text>
-					<n8n-input
-						v-model="commitMessage"
-						type="text"
-						:placeholder="
-							i18n.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')
-						"
-						@keydown.enter="onCommitKeyDownEnter"
-					/>
-				</div>
-				<div v-else-if="!loading">
-					<n8n-notice class="mt-0 mb-0">
-						{{ i18n.baseText('settings.sourceControl.modals.push.everythingIsUpToDate') }}
-					</n8n-notice>
-				</div>
+				<N8nNotice v-if="userNotices.length" class="mt-xs" :compact="false">
+					<ul class="ml-m">
+						<li v-for="notice in userNotices" :key="notice">{{ notice }}</li>
+					</ul>
+				</N8nNotice>
 			</div>
+
+			<div v-if="changes.workflows.length" :class="[$style.filers]" class="mt-l">
+				<N8nCheckbox
+					:class="$style.selectAll"
+					:indeterminate="selectAllIndeterminate"
+					:model-value="selectAll"
+					data-test-id="source-control-push-modal-toggle-all"
+					@update:model-value="onToggleSelectAll"
+				>
+					<N8nText bold tag="strong">
+						{{ i18n.baseText('settings.sourceControl.modals.push.workflowsToCommit') }}
+					</N8nText>
+					<N8nText tag="strong">
+						({{ selectedChanges.size }}/{{ sortedWorkflows.length }})
+					</N8nText>
+				</N8nCheckbox>
+				<N8nPopover trigger="click" width="304" style="align-self: normal">
+					<template #reference>
+						<N8nButton
+							icon="filter"
+							type="tertiary"
+							style="height: 100%"
+							:active="Boolean(filterCount)"
+							data-test-id="source-control-filter-dropdown"
+						>
+							<N8nBadge v-show="filterCount" theme="primary" class="mr-4xs">
+								{{ filterCount }}
+							</N8nBadge>
+							{{ i18n.baseText('forms.resourceFiltersDropdown.filters') }}
+						</N8nButton>
+					</template>
+					<N8nInputLabel
+						:label="i18n.baseText('workflows.filters.status')"
+						:bold="false"
+						size="small"
+						color="text-base"
+						class="mb-3xs"
+					/>
+					<N8nSelect v-model="filters.status" data-test-id="source-control-status-filter" clearable>
+						<N8nOption
+							v-for="option in statusFilterOptions"
+							:key="option.label"
+							data-test-id="source-control-status-filter-option"
+							v-bind="option"
+						>
+						</N8nOption>
+					</N8nSelect>
+				</N8nPopover>
+				<N8nInput
+					v-model="search"
+					data-test-id="source-control-push-search"
+					:placeholder="i18n.baseText('workflows.search.placeholder')"
+					clearable
+				>
+					<template #prefix>
+						<N8nIcon icon="search" />
+					</template>
+				</N8nInput>
+			</div>
+		</template>
+		<template #content>
+			<N8nInfoTip v-if="filtersApplied && !sortedWorkflows.length" :bold="false">
+				{{ i18n.baseText('workflows.filters.active') }}
+				<N8nLink size="small" data-test-id="source-control-filters-reset" @click="resetFilters">
+					{{ i18n.baseText('workflows.filters.active.reset') }}
+				</N8nLink>
+			</N8nInfoTip>
+			<RecycleScroller
+				v-if="sortedWorkflows.length"
+				:class="[$style.scroller]"
+				:items="sortedWorkflows"
+				:item-size="69"
+				key-field="id"
+			>
+				<template #default="{ item: file }">
+					<N8nCheckbox
+						:class="['scopedListItem', $style.listItem]"
+						data-test-id="source-control-push-modal-file-checkbox"
+						:model-value="selectedChanges.has(file.id)"
+						@update:model-value="toggleSelected(file.id)"
+					>
+						<span>
+							<N8nText v-if="file.status === SOURCE_CONTROL_FILE_STATUS.deleted" color="text-light">
+								<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.workflow">
+									Deleted Workflow:
+								</span>
+								<span v-if="file.type === SOURCE_CONTROL_FILE_TYPE.credential">
+									Deleted Credential:
+								</span>
+								<strong>{{ file.name || file.id }}</strong>
+							</N8nText>
+							<N8nText v-else bold> {{ file.name }} </N8nText>
+							<N8nText v-if="file.updatedAt" tag="p" class="mt-0" color="text-light" size="small">
+								{{ renderUpdatedAt(file) }}
+							</N8nText>
+						</span>
+						<span :class="[$style.badges]">
+							<N8nBadge
+								v-if="changes.currentWorkflow && file.id === changes.currentWorkflow.id"
+								class="mr-2xs"
+							>
+								Current workflow
+							</N8nBadge>
+							<N8nBadge :theme="getStatusTheme(file.status)">
+								{{ getStatusText(file.status) }}
+							</N8nBadge>
+						</span>
+					</N8nCheckbox>
+				</template>
+			</RecycleScroller>
 		</template>
 
 		<template #footer>
+			<N8nText bold tag="p" class="mb-2xs">
+				{{ i18n.baseText('settings.sourceControl.modals.push.commitMessage') }}
+			</N8nText>
+			<N8nInput
+				v-model="commitMessage"
+				data-test-id="source-control-push-modal-commit"
+				:placeholder="i18n.baseText('settings.sourceControl.modals.push.commitMessage.placeholder')"
+				@keydown.enter="onCommitKeyDownEnter"
+			/>
+
 			<div :class="$style.footer">
-				<n8n-button type="tertiary" class="mr-2xs" @click="close">
+				<N8nButton type="tertiary" class="mr-2xs" @click="close">
 					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.cancel') }}
-				</n8n-button>
-				<n8n-button type="primary" :disabled="isSubmitDisabled" @click="commitAndPush">
+				</N8nButton>
+				<N8nButton
+					data-test-id="source-control-push-modal-submit"
+					type="primary"
+					:disabled="isSubmitDisabled"
+					@click="commitAndPush"
+				>
 					{{ i18n.baseText('settings.sourceControl.modals.push.buttons.save') }}
-				</n8n-button>
+				</N8nButton>
 			</div>
 		</template>
 	</Modal>
 </template>
 
 <style module lang="scss">
-.container > * {
-	overflow-wrap: break-word;
+.filers {
+	display: flex;
+	align-items: center;
+	gap: 8px;
 }
 
-.actionButtons {
-	display: flex;
-	justify-content: flex-end;
-	align-items: center;
+.selectAll {
+	flex-shrink: 0;
+	margin-bottom: 0;
+}
+
+.scroller {
+	max-height: 380px;
 }
 
 .listItem {
-	display: flex;
-	width: 100%;
 	align-items: center;
-	margin: var(--spacing-2xs) 0 var(--spacing-2xs);
 	padding: var(--spacing-xs);
-	cursor: pointer;
 	transition: border 0.3s ease;
 	border-radius: var(--border-radius-large);
 	border: var(--border-base);
@@ -394,37 +537,32 @@ function getStatusText(file: SourceControlAggregatedFile): string {
 		border-color: var(--color-foreground-dark);
 	}
 
-	&:first-child {
-		margin-top: 0;
+	:global(.el-checkbox__label) {
+		display: flex;
+		width: 100%;
+		justify-content: space-between;
+		align-items: center;
 	}
 
-	&:last-child {
-		margin-bottom: 0;
-	}
-
-	&.hiddenListItem {
-		display: none !important;
+	:global(.el-checkbox__inner) {
+		transition: none;
 	}
 }
 
-.selectAll {
-	float: left;
-	clear: both;
-	margin: 0 0 var(--spacing-2xs);
+.badges {
+	display: flex;
 }
 
 .footer {
 	display: flex;
 	flex-direction: row;
 	justify-content: flex-end;
+	margin-top: 20px;
 }
-</style>
 
-<style scoped lang="scss">
-.scopedListItem :deep(.el-checkbox__label) {
-	display: flex;
-	width: 100%;
-	justify-content: space-between;
-	align-items: center;
+.sourceControlPush {
+	:global(.el-dialog__header) {
+		padding-bottom: var(--spacing-xs);
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
index 5475e04a05..16a10468d0 100644
--- a/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
+++ b/packages/editor-ui/src/components/SqlEditor/SqlEditor.vue
@@ -1,18 +1,14 @@
 <script setup lang="ts">
 import InlineExpressionEditorOutput from '@/components/InlineExpressionEditor/InlineExpressionEditorOutput.vue';
-import { codeNodeEditorEventBus } from '@/event-bus';
 import { useExpressionEditor } from '@/composables/useExpressionEditor';
+import { codeNodeEditorEventBus } from '@/event-bus';
 import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
+import { dropInExpressionEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
-import {
-	autocompleteKeyMap,
-	enterKeyMap,
-	historyKeyMap,
-	tabKeyMap,
-} from '@/plugins/codemirror/keymap';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
 import { n8nAutocompletion } from '@/plugins/codemirror/n8nLang';
 import { ifNotIn } from '@codemirror/autocomplete';
-import { history, toggleComment } from '@codemirror/commands';
+import { history } from '@codemirror/commands';
 import { LanguageSupport, bracketMatching, foldGutter, indentOnInput } from '@codemirror/language';
 import { Prec, type Line } from '@codemirror/state';
 import {
@@ -34,9 +30,9 @@ import {
 	StandardSQL,
 	keywordCompletionSource,
 } from '@n8n/codemirror-lang-sql';
+import { onClickOutside } from '@vueuse/core';
 import { computed, onBeforeUnmount, onMounted, ref, toRaw, watch } from 'vue';
-import { codeNodeEditorTheme } from '../CodeNodeEditor/theme';
-import { dropInExpressionEditor, mappingDropCursor } from '@/plugins/codemirror/dragAndDrop';
+import { codeEditorTheme } from '../CodeNodeEditor/theme';
 
 const SQL_DIALECTS = {
 	StandardSQL,
@@ -68,7 +64,10 @@ const emit = defineEmits<{
 	'update:model-value': [value: string];
 }>();
 
-const sqlEditor = ref<HTMLElement>();
+const container = ref<HTMLDivElement>();
+const sqlEditor = ref<HTMLDivElement>();
+const isFocused = ref(false);
+
 const extensions = computed(() => {
 	const dialect = SQL_DIALECTS[props.dialect] ?? SQL_DIALECTS.StandardSQL;
 	function sqlWithN8nLanguageSupport() {
@@ -83,7 +82,7 @@ const extensions = computed(() => {
 	const baseExtensions = [
 		sqlWithN8nLanguageSupport(),
 		expressionInputHandler(),
-		codeNodeEditorTheme({
+		codeEditorTheme({
 			isReadOnly: props.isReadOnly,
 			maxHeight: props.fullscreen ? '100%' : '40vh',
 			minHeight: '10vh',
@@ -96,15 +95,7 @@ const extensions = computed(() => {
 	if (!props.isReadOnly) {
 		return baseExtensions.concat([
 			history(),
-			Prec.highest(
-				keymap.of([
-					...tabKeyMap(),
-					...enterKeyMap,
-					...historyKeyMap,
-					...autocompleteKeyMap,
-					{ key: 'Mod-/', run: toggleComment },
-				]),
-			),
+			Prec.highest(keymap.of(editorKeymap)),
 			n8nAutocompletion(),
 			indentOnInput(),
 			highlightActiveLine(),
@@ -122,7 +113,8 @@ const {
 	editor,
 	segments: { all: segments },
 	readEditorValue,
-	hasFocus,
+	hasFocus: editorHasFocus,
+	isDirty,
 } = useExpressionEditor({
 	editorRef: sqlEditor,
 	editorValue,
@@ -138,6 +130,12 @@ watch(
 	},
 );
 
+watch(editorHasFocus, (focus) => {
+	if (focus) {
+		isFocused.value = true;
+	}
+});
+
 watch(segments, () => {
 	emit('update:model-value', readEditorValue());
 });
@@ -151,9 +149,23 @@ onMounted(() => {
 });
 
 onBeforeUnmount(() => {
+	if (isDirty.value) emit('update:model-value', readEditorValue());
 	codeNodeEditorEventBus.off('highlightLine', highlightLine);
 });
 
+onClickOutside(container, (event) => onBlur(event));
+
+function onBlur(event: FocusEvent | KeyboardEvent) {
+	if (
+		event?.target instanceof Element &&
+		Array.from(event.target.classList).some((_class) => _class.includes('resizer'))
+	) {
+		return; // prevent blur on resizing
+	}
+
+	isFocused.value = false;
+}
+
 function line(lineNumber: number): Line | null {
 	try {
 		return editor.value?.state.doc.line(lineNumber) ?? null;
@@ -162,10 +174,10 @@ function line(lineNumber: number): Line | null {
 	}
 }
 
-function highlightLine(lineNumber: number | 'final') {
+function highlightLine(lineNumber: number | 'last') {
 	if (!editor.value) return;
 
-	if (lineNumber === 'final') {
+	if (lineNumber === 'last') {
 		editor.value.dispatch({
 			selection: { anchor: editor.value.state.doc.length },
 		});
@@ -189,7 +201,7 @@ async function onDrop(value: string, event: MouseEvent) {
 </script>
 
 <template>
-	<div :class="$style.sqlEditor">
+	<div ref="container" :class="$style.sqlEditor" @keydown.tab="onBlur">
 		<DraggableTarget type="mapping" :disabled="isReadOnly" @drop="onDrop">
 			<template #default="{ activeDrop, droppable }">
 				<div
@@ -207,7 +219,7 @@ async function onDrop(value: string, event: MouseEvent) {
 			v-if="!fullscreen"
 			:segments="segments"
 			:is-read-only="isReadOnly"
-			:visible="hasFocus"
+			:visible="isFocused"
 		/>
 	</div>
 </template>
@@ -216,6 +228,10 @@ async function onDrop(value: string, event: MouseEvent) {
 .sqlEditor {
 	position: relative;
 	height: 100%;
+
+	& > div {
+		height: 100%;
+	}
 }
 
 .codemirror {
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index 12ee2dfa89..ea4e2d7aa2 100644
--- a/packages/editor-ui/src/components/Sticky.vue
+++ b/packages/editor-ui/src/components/Sticky.vue
@@ -7,7 +7,6 @@ import type { Workflow } from 'n8n-workflow';
 import { isNumber, isString } from '@/utils/typeGuards';
 import type { INodeUi, XYPosition } from '@/Interface';
 
-import { QUICKSTART_NOTE_NAME } from '@/constants';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useNDVStore } from '@/stores/ndv.store';
@@ -21,6 +20,7 @@ import type { BrowserJsPlumbInstance } from '@jsplumb/browser-ui';
 import { useNodeBase } from '@/composables/useNodeBase';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useStyles } from '@/composables/useStyles';
+import { useI18n } from '@/composables/useI18n';
 
 const props = withDefaults(
 	defineProps<{
@@ -56,12 +56,14 @@ const nodeTypesStore = useNodeTypesStore();
 const uiStore = useUIStore();
 const workflowsStore = useWorkflowsStore();
 const { APP_Z_INDEXES } = useStyles();
+const i18n = useI18n();
 
 const isResizing = ref<boolean>(false);
 const isTouchActive = ref<boolean>(false);
 const forceActions = ref(false);
 const isColorPopoverVisible = ref(false);
 const stickOptions = ref<HTMLElement>();
+const isEditing = ref(false);
 
 const setForceActions = (value: boolean) => {
 	forceActions.value = value;
@@ -147,8 +149,13 @@ const workflowRunning = computed(() => uiStore.isActionActive.workflowRunning);
 
 const showActions = computed(
 	() =>
-		!(props.hideActions || props.isReadOnly || workflowRunning.value || isResizing.value) ||
-		forceActions.value,
+		!(
+			props.hideActions ||
+			isEditing.value ||
+			props.isReadOnly ||
+			workflowRunning.value ||
+			isResizing.value
+		) || forceActions.value,
 );
 
 onMounted(() => {
@@ -187,6 +194,7 @@ const changeColor = (index: number) => {
 };
 
 const onEdit = (edit: boolean) => {
+	isEditing.value = edit;
 	if (edit && !props.isActive && node.value) {
 		ndvStore.activeNodeName = node.value.name;
 	} else if (props.isActive && !edit) {
@@ -196,16 +204,7 @@ const onEdit = (edit: boolean) => {
 
 const onMarkdownClick = (link: HTMLAnchorElement) => {
 	if (link) {
-		const isOnboardingNote = props.name === QUICKSTART_NOTE_NAME;
-		const isWelcomeVideo = link.querySelector('img[alt="n8n quickstart video"]');
-		const type =
-			isOnboardingNote && isWelcomeVideo
-				? 'welcome_video'
-				: isOnboardingNote && link.getAttribute('href') === '/templates'
-					? 'templates'
-					: 'other';
-
-		telemetry.track('User clicked note link', { type });
+		telemetry.track('User clicked note link', { type: 'other' });
 	}
 };
 
@@ -354,7 +353,7 @@ const onContextMenu = (e: MouseEvent): void => {
 					v-touch:tap="deleteNode"
 					class="option"
 					data-test-id="delete-sticky"
-					:title="$locale.baseText('node.delete')"
+					:title="i18n.baseText('node.delete')"
 				>
 					<font-awesome-icon icon="trash" />
 				</div>
@@ -371,7 +370,7 @@ const onContextMenu = (e: MouseEvent): void => {
 						<div
 							class="option"
 							data-test-id="change-sticky-color"
-							:title="$locale.baseText('node.changeColor')"
+							:title="i18n.baseText('node.changeColor')"
 							@click="() => setColorPopoverVisible(!isColorPopoverVisible)"
 						>
 							<font-awesome-icon icon="palette" />
diff --git a/packages/editor-ui/src/components/TagsDropdown.vue b/packages/editor-ui/src/components/TagsDropdown.vue
index 2c25e455fc..0a1b342b5c 100644
--- a/packages/editor-ui/src/components/TagsDropdown.vue
+++ b/packages/editor-ui/src/components/TagsDropdown.vue
@@ -12,11 +12,14 @@ 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>;
+	createEnabled?: boolean;
+	manageEnabled?: boolean;
+	createTag?: (name: string) => Promise<ITag>;
+	multipleLimit?: number;
 }
 
 const i18n = useI18n();
@@ -27,6 +30,10 @@ const props = withDefaults(defineProps<TagsDropdownProps>(), {
 	placeholder: '',
 	modelValue: () => [],
 	eventBus: null,
+	createEnabled: true,
+	manageEnabled: true,
+	createTag: undefined,
+	multipleLimit: 0,
 });
 
 const emit = defineEmits<{
@@ -59,6 +66,17 @@ const appliedTags = computed<string[]>(() => {
 	return props.modelValue.filter((id: string) => props.tagsById[id]);
 });
 
+const containerClasses = computed(() => {
+	return { 'tags-container': true, focused: focused.value };
+});
+
+const dropdownClasses = computed(() => ({
+	'tags-dropdown': true,
+	[`tags-dropdown-${dropdownId}`]: true,
+	'tags-dropdown-create-enabled': props.createEnabled,
+	'tags-dropdown-manage-enabled': props.manageEnabled,
+}));
+
 watch(
 	() => props.allTags,
 	() => {
@@ -109,6 +127,8 @@ function filterOptions(value = '') {
 }
 
 async function onCreate() {
+	if (!props.createTag) return;
+
 	const name = filter.value;
 	try {
 		const newTag = await props.createTag(name);
@@ -187,7 +207,7 @@ onClickOutside(
 </script>
 
 <template>
-	<div ref="container" :class="{ 'tags-container': true, focused }" @keydown.stop>
+	<div ref="container" :class="containerClasses" @keydown.stop>
 		<N8nSelect
 			ref="selectRef"
 			:teleported="true"
@@ -197,16 +217,17 @@ onClickOutside(
 			:filter-method="filterOptions"
 			filterable
 			multiple
+			:multiple-limit="props.multipleLimit"
 			:reserve-keyword="false"
 			loading-text="..."
-			:popper-class="['tags-dropdown', 'tags-dropdown-' + dropdownId].join(' ')"
+			:popper-class="dropdownClasses"
 			data-test-id="tags-dropdown"
 			@update:model-value="onTagsUpdated"
 			@visible-change="onVisibleChange"
 			@remove-tag="onRemoveTag"
 		>
 			<N8nOption
-				v-if="options.length === 0 && filter"
+				v-if="createEnabled && options.length === 0 && filter"
 				:key="CREATE_KEY"
 				ref="createRef"
 				:value="CREATE_KEY"
@@ -218,7 +239,7 @@ onClickOutside(
 				</span>
 			</N8nOption>
 			<N8nOption v-else-if="options.length === 0" value="message" disabled>
-				<span>{{ i18n.baseText('tagsDropdown.typeToCreateATag') }}</span>
+				<span v-if="createEnabled">{{ i18n.baseText('tagsDropdown.typeToCreateATag') }}</span>
 				<span v-if="allTags.length > 0">{{
 					i18n.baseText('tagsDropdown.noMatchingTagsExist')
 				}}</span>
@@ -235,7 +256,7 @@ onClickOutside(
 				data-test-id="tag"
 			/>
 
-			<N8nOption :key="MANAGE_KEY" :value="MANAGE_KEY" class="ops manage-tags">
+			<N8nOption v-if="manageEnabled" :key="MANAGE_KEY" :value="MANAGE_KEY" class="ops manage-tags">
 				<font-awesome-icon icon="cog" />
 				<span>{{ i18n.baseText('tagsDropdown.manageTags') }}</span>
 			</N8nOption>
@@ -311,7 +332,7 @@ onClickOutside(
 			}
 		}
 
-		&:after {
+		.tags-dropdown-manage-enabled &:after {
 			content: ' ';
 			display: block;
 			min-height: $--item-height;
diff --git a/packages/editor-ui/src/components/TagsManager/NoTagsView.vue b/packages/editor-ui/src/components/TagsManager/NoTagsView.vue
index c34ed41bd6..91fb9cb540 100644
--- a/packages/editor-ui/src/components/TagsManager/NoTagsView.vue
+++ b/packages/editor-ui/src/components/TagsManager/NoTagsView.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
 import type { BaseTextKey } from '@/plugins/i18n';
 
 type Props = {
@@ -10,6 +11,8 @@ withDefaults(defineProps<Props>(), {
 	titleLocaleKey: 'noTagsView.readyToOrganizeYourWorkflows',
 	descriptionLocaleKey: 'noTagsView.withWorkflowTagsYouReFree',
 });
+
+const i18n = useI18n();
 </script>
 
 <template>
@@ -19,11 +22,11 @@ withDefaults(defineProps<Props>(), {
 			<div>
 				<div class="mb-s">
 					<n8n-heading size="large">
-						{{ $locale.baseText(titleLocaleKey) }}
+						{{ i18n.baseText(titleLocaleKey) }}
 					</n8n-heading>
 				</div>
 				<div class="description">
-					{{ $locale.baseText(descriptionLocaleKey) }}
+					{{ i18n.baseText(descriptionLocaleKey) }}
 				</div>
 			</div>
 			<n8n-button label="Create a tag" size="large" @click="$emit('enableCreate')" />
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
index 06f611d2e6..9b217ed6d6 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
@@ -5,6 +5,7 @@ import type { ITagRow } from '@/Interface';
 import { onMounted, ref, watch } from 'vue';
 import { N8nInput } from 'n8n-design-system';
 import type { BaseTextKey } from '@/plugins/i18n';
+import { useI18n } from '@/composables/useI18n';
 
 interface Props {
 	rows: ITagRow[];
@@ -26,6 +27,8 @@ const emit = defineEmits<{
 	applyOperation: [];
 }>();
 
+const i18n = useI18n();
+
 const INPUT_TRANSITION_TIMEOUT = 350;
 const DELETE_TRANSITION_TIMEOUT = 100;
 
@@ -135,12 +138,12 @@ onMounted(() => {
 		:class="$style['tags-table']"
 		stripe
 		max-height="450"
-		:empty-text="$locale.baseText('tagsTable.noMatchingTagsExist')"
+		:empty-text="i18n.baseText('tagsTable.noMatchingTagsExist')"
 		:data="rows"
 		:span-method="getSpan"
 		:row-class-name="getRowClasses"
 	>
-		<el-table-column :label="$locale.baseText('tagsTable.name')">
+		<el-table-column :label="i18n.baseText('tagsTable.name')">
 			<template #default="scope">
 				<div :key="scope.row.id" :class="$style.name" @keydown.stop>
 					<transition name="fade" mode="out-in">
@@ -152,7 +155,7 @@ onMounted(() => {
 							@update:model-value="onNewNameChange"
 						></N8nInput>
 						<span v-else-if="scope.row.delete">
-							<span>{{ $locale.baseText('tagsTable.areYouSureYouWantToDeleteThisTag') }}</span>
+							<span>{{ i18n.baseText('tagsTable.areYouSureYouWantToDeleteThisTag') }}</span>
 							<input ref="deleteHiddenInput" :class="$style.hidden" />
 						</span>
 						<span v-else :class="{ [$style.disabled]: scope.row.disable }">
@@ -162,7 +165,7 @@ onMounted(() => {
 				</div>
 			</template>
 		</el-table-column>
-		<el-table-column :label="$locale.baseText(usageColumnTitleLocaleKey)" width="170">
+		<el-table-column :label="i18n.baseText(usageColumnTitleLocaleKey)" width="170">
 			<template #default="scope">
 				<transition name="fade" mode="out-in">
 					<div
@@ -179,53 +182,53 @@ onMounted(() => {
 				<transition name="fade" mode="out-in">
 					<div v-if="scope.row.create" :class="$style.ops">
 						<n8n-button
-							:label="$locale.baseText('tagsTable.cancel')"
+							:label="i18n.baseText('tagsTable.cancel')"
 							type="secondary"
 							:disabled="isSaving"
 							@click.stop="cancel"
 						/>
 						<n8n-button
-							:label="$locale.baseText('tagsTable.createTag')"
+							:label="i18n.baseText('tagsTable.createTag')"
 							:loading="isSaving"
 							@click.stop="apply"
 						/>
 					</div>
 					<div v-else-if="scope.row.update" :class="$style.ops">
 						<n8n-button
-							:label="$locale.baseText('tagsTable.cancel')"
+							:label="i18n.baseText('tagsTable.cancel')"
 							type="secondary"
 							:disabled="isSaving"
 							@click.stop="cancel"
 						/>
 						<n8n-button
-							:label="$locale.baseText('tagsTable.saveChanges')"
+							:label="i18n.baseText('tagsTable.saveChanges')"
 							:loading="isSaving"
 							@click.stop="apply"
 						/>
 					</div>
 					<div v-else-if="scope.row.delete" :class="$style.ops">
 						<n8n-button
-							:label="$locale.baseText('tagsTable.cancel')"
+							:label="i18n.baseText('tagsTable.cancel')"
 							type="secondary"
 							:disabled="isSaving"
 							@click.stop="cancel"
 						/>
 						<n8n-button
-							:label="$locale.baseText('tagsTable.deleteTag')"
+							:label="i18n.baseText('tagsTable.deleteTag')"
 							:loading="isSaving"
 							@click.stop="apply"
 						/>
 					</div>
 					<div v-else-if="!scope.row.disable" :class="[$style.ops, $style.main]">
 						<n8n-icon-button
-							:title="$locale.baseText('tagsTable.editTag')"
+							:title="i18n.baseText('tagsTable.editTag')"
 							icon="pen"
 							data-test-id="edit-tag-button"
 							@click.stop="enableUpdate(scope.row)"
 						/>
 						<n8n-icon-button
 							v-if="scope.row.canDelete"
-							:title="$locale.baseText('tagsTable.deleteTag')"
+							:title="i18n.baseText('tagsTable.deleteTag')"
 							icon="trash"
 							data-test-id="delete-tag-button"
 							@click.stop="enableDelete(scope.row)"
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
index f3b1144440..cf3bdc8047 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { MAX_TAG_NAME_LENGTH } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
 
 withDefaults(
 	defineProps<{
@@ -13,6 +14,8 @@ withDefaults(
 	},
 );
 
+const i18n = useI18n();
+
 const emit = defineEmits<{
 	searchChange: [value: string];
 	createEnable: [];
@@ -33,7 +36,7 @@ const onSearchChange = (search: string) => {
 	<el-row class="tags-header">
 		<el-col :span="10">
 			<n8n-input
-				:placeholder="$locale.baseText('tagsTableHeader.searchTags')"
+				:placeholder="i18n.baseText('tagsTableHeader.searchTags')"
 				:model-value="search"
 				:disabled="disabled"
 				:maxlength="maxLength"
@@ -49,7 +52,7 @@ const onSearchChange = (search: string) => {
 			<n8n-button
 				:disabled="disabled"
 				icon="plus"
-				:label="$locale.baseText('tagsTableHeader.addNew')"
+				:label="i18n.baseText('tagsTableHeader.addNew')"
 				size="large"
 				float="right"
 				@click="onAddNew"
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
index e3d0342afc..9a75eb61f1 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
@@ -1,181 +1,176 @@
-<script lang="ts">
-import type { PropType } from 'vue';
-import { defineComponent } from 'vue';
-
+<script setup lang="ts">
+import { ref, computed } from 'vue';
 import type { ITag, ITagRow } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
 import TagsTableHeader from '@/components/TagsManager/TagsView/TagsTableHeader.vue';
 import TagsTable from '@/components/TagsManager/TagsView/TagsTable.vue';
-import { mapStores } from 'pinia';
-import { useUsersStore } from '@/stores/users.store';
 import { useRBACStore } from '@/stores/rbac.store';
 import type { BaseTextKey } from '@/plugins/i18n';
 
+defineOptions({ name: 'TagsView' });
+
+const props = withDefaults(
+	defineProps<{
+		usageColumnTitleLocaleKey?: BaseTextKey;
+		usageLocaleKey?: BaseTextKey;
+		tags: ITag[];
+		isLoading: boolean;
+	}>(),
+	{
+		usageColumnTitleLocaleKey: 'tagsTable.usage',
+		usageLocaleKey: 'tagsView.inUse',
+	},
+);
+
+const emit = defineEmits<{
+	update: [updateId: string, name: string, onUpdate: (updated: boolean) => void];
+	delete: [deleteId: string, onDelete: (deleted: boolean) => void];
+	create: [name: string, onCreate: (created: ITag | null) => void];
+	disableCreate: [];
+}>();
+
 const matches = (name: string, filter: string) =>
 	name.toLowerCase().trim().includes(filter.toLowerCase().trim());
 
-export default defineComponent({
-	name: 'TagsView',
-	components: { TagsTableHeader, TagsTable },
-	props: {
-		usageColumnTitleLocaleKey: {
-			type: String as PropType<BaseTextKey>,
-			default: 'tagsTable.usage',
-		},
-		usageLocaleKey: {
-			type: String as PropType<BaseTextKey>,
-			default: 'tagsView.inUse',
-		},
-		tags: {
-			type: Array as () => ITag[],
-			required: true,
-		},
-		isLoading: {
-			type: Boolean,
-			required: true,
-		},
-	},
-	emits: {
-		update: null,
-		delete: null,
-		create: null,
-		disableCreate: null,
-	},
-	data() {
-		return {
-			createEnabled: false,
-			deleteId: '',
-			updateId: '',
-			search: '',
-			newName: '',
-			stickyIds: new Set(),
-			isSaving: false,
-		};
-	},
-	computed: {
-		...mapStores(useUsersStore, useRBACStore),
-		isCreateEnabled(): boolean {
-			return (this.tags || []).length === 0 || this.createEnabled;
-		},
-		rows(): ITagRow[] {
-			const getUsage = (count: number | undefined) =>
-				count && count > 0
-					? this.$locale.baseText(this.usageLocaleKey, { adjustToNumber: count })
-					: this.$locale.baseText('tagsView.notBeingUsed');
+const i18n = useI18n();
+const rbacStore = useRBACStore();
 
-			const disabled = this.isCreateEnabled || !!this.updateId || !!this.deleteId;
-			const tagRows = (this.tags ?? [])
-				.filter((tag) => this.stickyIds.has(tag.id) || matches(tag.name, this.search))
-				.map(
-					(tag): ITagRow => ({
-						tag,
-						usage: getUsage(tag.usageCount),
-						disable: disabled && tag.id !== this.deleteId && tag.id !== this.updateId,
-						update: disabled && tag.id === this.updateId,
-						delete: disabled && tag.id === this.deleteId,
-						canDelete: this.rbacStore.hasScope('tag:delete'),
-					}),
-				);
+const createEnabled = ref(false);
+const deleteId = ref('');
+const updateId = ref('');
+const search = ref('');
+const newName = ref('');
+const stickyIds = ref(new Set());
+const isSaving = ref(false);
 
-			return this.isCreateEnabled ? [{ create: true }, ...tagRows] : tagRows;
-		},
-	},
-	methods: {
-		onNewNameChange(name: string): void {
-			this.newName = name;
-		},
-		onSearchChange(search: string): void {
-			this.stickyIds.clear();
-			this.search = search;
-		},
-		isHeaderDisabled(): boolean {
-			return this.isLoading || !!(this.isCreateEnabled || this.updateId || this.deleteId);
-		},
+const isCreateEnabled = computed(() => props.tags.length === 0 || createEnabled.value);
 
-		onUpdateEnable(updateId: string): void {
-			this.updateId = updateId;
-		},
-		disableUpdate(): void {
-			this.updateId = '';
-			this.newName = '';
-		},
-		updateTag(): void {
-			this.isSaving = true;
-			const name = this.newName.trim();
-			const onUpdate = (updated: boolean) => {
-				this.isSaving = false;
-				if (updated) {
-					this.stickyIds.add(this.updateId);
-					this.disableUpdate();
-				}
-			};
+const rows = computed(() => {
+	const getUsage = (count: number | undefined) =>
+		count && count > 0
+			? i18n.baseText(props.usageLocaleKey, { adjustToNumber: count })
+			: i18n.baseText('tagsView.notBeingUsed');
 
-			this.$emit('update', this.updateId, name, onUpdate);
-		},
+	const disabled = isCreateEnabled.value || !!updateId.value || !!deleteId.value;
+	const tagRows = props.tags
+		.filter((tag) => stickyIds.value.has(tag.id) || matches(tag.name, search.value))
+		.map(
+			(tag): ITagRow => ({
+				tag,
+				usage: getUsage(tag.usageCount),
+				disable: disabled && tag.id !== deleteId.value && tag.id !== updateId.value,
+				update: disabled && tag.id === updateId.value,
+				delete: disabled && tag.id === deleteId.value,
+				canDelete: rbacStore.hasScope('tag:delete'),
+			}),
+		);
 
-		onDeleteEnable(deleteId: string): void {
-			this.deleteId = deleteId;
-		},
-		disableDelete(): void {
-			this.deleteId = '';
-		},
-		deleteTag(): void {
-			this.isSaving = true;
-			const onDelete = (deleted: boolean) => {
-				if (deleted) {
-					this.disableDelete();
-				}
-				this.isSaving = false;
-			};
-
-			this.$emit('delete', this.deleteId, onDelete);
-		},
-
-		onCreateEnable(): void {
-			this.createEnabled = true;
-			this.newName = '';
-		},
-		disableCreate(): void {
-			this.createEnabled = false;
-			this.$emit('disableCreate');
-		},
-		createTag(): void {
-			this.isSaving = true;
-			const name = this.newName.trim();
-			const onCreate = (created: ITag | null) => {
-				if (created) {
-					this.stickyIds.add(created.id);
-					this.disableCreate();
-				}
-				this.isSaving = false;
-			};
-
-			this.$emit('create', name, onCreate);
-		},
-
-		applyOperation(): void {
-			if (this.isSaving) {
-				return;
-			} else if (this.isCreateEnabled) {
-				this.createTag();
-			} else if (this.updateId) {
-				this.updateTag();
-			} else if (this.deleteId) {
-				this.deleteTag();
-			}
-		},
-		cancelOperation(): void {
-			if (this.isSaving) {
-				return;
-			} else if (this.isCreateEnabled) {
-				this.disableCreate();
-			} else if (this.updateId) {
-				this.disableUpdate();
-			} else if (this.deleteId) {
-				this.disableDelete();
-			}
-		},
-	},
+	return isCreateEnabled.value ? [{ create: true }, ...tagRows] : tagRows;
 });
+
+const onNewNameChange = (name: string): void => {
+	newName.value = name;
+};
+
+const onSearchChange = (searchValue: string): void => {
+	stickyIds.value.clear();
+	search.value = searchValue;
+};
+
+const isHeaderDisabled = (): boolean => {
+	return props.isLoading || !!(isCreateEnabled.value || updateId.value || deleteId.value);
+};
+
+const onUpdateEnable = (updateIdValue: string): void => {
+	updateId.value = updateIdValue;
+};
+
+const disableUpdate = (): void => {
+	updateId.value = '';
+	newName.value = '';
+};
+
+const updateTag = (): void => {
+	isSaving.value = true;
+	const name = newName.value.trim();
+	const onUpdate = (updated: boolean) => {
+		isSaving.value = false;
+		if (updated) {
+			stickyIds.value.add(updateId.value);
+			disableUpdate();
+		}
+	};
+
+	emit('update', updateId.value, name, onUpdate);
+};
+
+const onDeleteEnable = (deleteIdValue: string): void => {
+	deleteId.value = deleteIdValue;
+};
+
+const disableDelete = (): void => {
+	deleteId.value = '';
+};
+
+const deleteTag = (): void => {
+	isSaving.value = true;
+	const onDelete = (deleted: boolean) => {
+		if (deleted) {
+			disableDelete();
+		}
+		isSaving.value = false;
+	};
+
+	emit('delete', deleteId.value, onDelete);
+};
+
+const onCreateEnable = (): void => {
+	createEnabled.value = true;
+	newName.value = '';
+};
+
+const disableCreate = (): void => {
+	createEnabled.value = false;
+	emit('disableCreate');
+};
+
+const createTag = (): void => {
+	isSaving.value = true;
+	const name = newName.value.trim();
+	const onCreate = (created: ITag | null) => {
+		if (created) {
+			stickyIds.value.add(created.id);
+			disableCreate();
+		}
+		isSaving.value = false;
+	};
+
+	emit('create', name, onCreate);
+};
+
+const applyOperation = (): void => {
+	if (isSaving.value) {
+		return;
+	} else if (isCreateEnabled.value) {
+		createTag();
+	} else if (updateId.value) {
+		updateTag();
+	} else if (deleteId.value) {
+		deleteTag();
+	}
+};
+
+const cancelOperation = (): void => {
+	if (isSaving.value) {
+		return;
+	} else if (isCreateEnabled.value) {
+		disableCreate();
+	} else if (updateId.value) {
+		disableUpdate();
+	} else if (deleteId.value) {
+		disableDelete();
+	}
+};
 </script>
 
 <template>
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/TemplateCard.vue b/packages/editor-ui/src/components/TemplateCard.vue
index 51a77a0cc3..77178eefeb 100644
--- a/packages/editor-ui/src/components/TemplateCard.vue
+++ b/packages/editor-ui/src/components/TemplateCard.vue
@@ -1,63 +1,45 @@
-<script lang="ts">
-import { type PropType, defineComponent } from 'vue';
-import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
+<script lang="ts" setup>
 import { abbreviateNumber } from '@/utils/typesUtils';
 import NodeList from './NodeList.vue';
 import TimeAgo from '@/components/TimeAgo.vue';
 import type { ITemplatesWorkflow } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
+import type { BaseTextKey } from '@/plugins/i18n';
 
-export default defineComponent({
-	name: 'TemplateCard',
-	components: {
-		TimeAgo,
-		NodeList,
+const i18n = useI18n();
+
+const nodesToBeShown = 5;
+
+withDefaults(
+	defineProps<{
+		workflow?: ITemplatesWorkflow;
+		lastItem?: boolean;
+		firstItem?: boolean;
+		useWorkflowButton?: boolean;
+		loading?: boolean;
+		simpleView?: boolean;
+	}>(),
+	{
+		lastItem: false,
+		firstItem: false,
+		useWorkflowButton: false,
+		loading: false,
+		simpleView: false,
 	},
-	props: {
-		workflow: {
-			type: Object as PropType<ITemplatesWorkflow>,
-		},
-		lastItem: {
-			type: Boolean,
-			default: false,
-		},
-		firstItem: {
-			type: Boolean,
-			default: false,
-		},
-		useWorkflowButton: {
-			type: Boolean,
-		},
-		loading: {
-			type: Boolean,
-		},
-		simpleView: {
-			type: Boolean,
-			default: false,
-		},
-	},
-	data() {
-		return {
-			nodesToBeShown: 5,
-		};
-	},
-	methods: {
-		filterTemplateNodes,
-		abbreviateNumber,
-		countNodesToBeSliced(nodes: []): number {
-			if (nodes.length > this.nodesToBeShown) {
-				return this.nodesToBeShown - 1;
-			} else {
-				return this.nodesToBeShown;
-			}
-		},
-		onUseWorkflowClick(e: MouseEvent) {
-			this.$emit('useWorkflow', e);
-		},
-		onCardClick(e: MouseEvent) {
-			this.$emit('click', e);
-		},
-	},
-});
+);
+
+const emit = defineEmits<{
+	useWorkflow: [e: MouseEvent];
+	click: [e: MouseEvent];
+}>();
+
+function onUseWorkflowClick(e: MouseEvent) {
+	emit('useWorkflow', e);
+}
+
+function onCardClick(e: MouseEvent) {
+	emit('click', e);
+}
 </script>
 
 <template>
@@ -88,8 +70,12 @@ export default defineComponent({
 					<TimeAgo :date="workflow.createdAt" />
 				</n8n-text>
 				<div v-if="workflow.user" :class="$style.line" v-text="'|'" />
-				<n8n-text v-if="workflow.user" size="small" color="text-light"
-					>By {{ workflow.user.username }}</n8n-text
+				<n8n-text v-if="workflow.user" size="small" color="text-light">
+					{{
+						i18n.baseText('template.byAuthor' as BaseTextKey, {
+							interpolate: { name: workflow.user.username },
+						})
+					}}</n8n-text
 				>
 			</div>
 		</div>
diff --git a/packages/editor-ui/src/components/TemplateDetails.vue b/packages/editor-ui/src/components/TemplateDetails.vue
index e8b97a0281..a8aa5c9c41 100644
--- a/packages/editor-ui/src/components/TemplateDetails.vue
+++ b/packages/editor-ui/src/components/TemplateDetails.vue
@@ -1,6 +1,4 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import type { PropType } from 'vue';
+<script setup lang="ts">
 import TemplateDetailsBlock from '@/components/TemplateDetailsBlock.vue';
 import NodeIcon from '@/components/NodeIcon.vue';
 import { filterTemplateNodes } from '@/utils/nodeTypesUtils';
@@ -11,51 +9,32 @@ import type {
 	ITemplatesNode,
 	ITemplatesWorkflow,
 } from '@/Interface';
-import { mapStores } from 'pinia';
 import { useTemplatesStore } from '@/stores/templates.store';
 import TimeAgo from '@/components/TimeAgo.vue';
 import { isFullTemplatesCollection, isTemplatesWorkflow } from '@/utils/templates/typeGuards';
+import { useRouter } from 'vue-router';
+import { useI18n } from '@/composables/useI18n';
 
-export default defineComponent({
-	name: 'TemplateDetails',
-	components: {
-		NodeIcon,
-		TemplateDetailsBlock,
-		TimeAgo,
-	},
-	props: {
-		template: {
-			type: Object as PropType<
-				ITemplatesWorkflow | ITemplatesCollection | ITemplatesCollectionFull | null
-			>,
-			required: true,
-		},
-		blockTitle: {
-			type: String,
-			required: true,
-		},
-		loading: {
-			type: Boolean,
-		},
-	},
-	computed: {
-		...mapStores(useTemplatesStore),
-	},
-	methods: {
-		abbreviateNumber,
-		filterTemplateNodes,
-		redirectToCategory(id: string) {
-			this.templatesStore.resetSessionId();
-			void this.$router.push(`/templates?categories=${id}`);
-		},
-		redirectToSearchPage(node: ITemplatesNode) {
-			this.templatesStore.resetSessionId();
-			void this.$router.push(`/templates?search=${node.displayName}`);
-		},
-		isFullTemplatesCollection,
-		isTemplatesWorkflow,
-	},
-});
+defineProps<{
+	template: ITemplatesWorkflow | ITemplatesCollection | ITemplatesCollectionFull | null;
+	blockTitle: string;
+	loading: boolean;
+}>();
+
+const router = useRouter();
+const i18n = useI18n();
+
+const templatesStore = useTemplatesStore();
+
+const redirectToCategory = (id: string) => {
+	templatesStore.resetSessionId();
+	void router.push(`/templates?categories=${id}`);
+};
+
+const redirectToSearchPage = (node: ITemplatesNode) => {
+	templatesStore.resetSessionId();
+	void router.push(`/templates?search=${node.displayName}`);
+};
 </script>
 
 <template>
@@ -84,20 +63,20 @@ export default defineComponent({
 
 		<TemplateDetailsBlock
 			v-if="!loading && isFullTemplatesCollection(template) && template.categories.length > 0"
-			:title="$locale.baseText('template.details.categories')"
+			:title="i18n.baseText('template.details.categories')"
 		>
 			<n8n-tags :tags="template.categories" @click:tag="redirectToCategory" />
 		</TemplateDetailsBlock>
 
 		<TemplateDetailsBlock
 			v-if="!loading && template"
-			:title="$locale.baseText('template.details.details')"
+			:title="i18n.baseText('template.details.details')"
 		>
 			<div :class="$style.text">
 				<n8n-text v-if="isTemplatesWorkflow(template)" size="small" color="text-base">
-					{{ $locale.baseText('template.details.created') }}
+					{{ i18n.baseText('template.details.created') }}
 					<TimeAgo :date="template.createdAt" />
-					{{ $locale.baseText('template.details.by') }}
+					{{ i18n.baseText('template.details.by') }}
 					{{ template.user ? template.user.username : 'n8n team' }}
 				</n8n-text>
 			</div>
@@ -107,9 +86,9 @@ export default defineComponent({
 					size="small"
 					color="text-base"
 				>
-					{{ $locale.baseText('template.details.viewed') }}
+					{{ i18n.baseText('template.details.viewed') }}
 					{{ abbreviateNumber(template.totalViews) }}
-					{{ $locale.baseText('template.details.times') }}
+					{{ i18n.baseText('template.details.times') }}
 				</n8n-text>
 			</div>
 		</TemplateDetailsBlock>
diff --git a/packages/editor-ui/src/components/TemplateFilters.vue b/packages/editor-ui/src/components/TemplateFilters.vue
index 8fedd594d1..655cbf5214 100644
--- a/packages/editor-ui/src/components/TemplateFilters.vue
+++ b/packages/editor-ui/src/components/TemplateFilters.vue
@@ -1,101 +1,104 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { computed, ref, watch } from 'vue';
 import type { ITemplatesCategory } from '@/Interface';
-import type { PropType } from 'vue';
-import { useTemplatesStore } from '@/stores/templates.store';
-import { mapStores } from 'pinia';
+import { useI18n } from '@/composables/useI18n';
 
-export default defineComponent({
-	name: 'TemplateFilters',
-	props: {
-		categories: {
-			type: Array as PropType<ITemplatesCategory[]>,
-			default: () => [],
-		},
-		sortOnPopulate: {
-			type: Boolean,
-			default: false,
-		},
-		expandLimit: {
-			type: Number,
-			default: 12,
-		},
-		loading: {
-			type: Boolean,
-		},
-		selected: {
-			type: Array as PropType<ITemplatesCategory[]>,
-			default: () => [],
-		},
-	},
-	emits: ['clearAll', 'select', 'clear'],
-	data() {
-		return {
-			collapsed: true,
-			sortedCategories: [] as ITemplatesCategory[],
-		};
-	},
-	computed: {
-		...mapStores(useTemplatesStore),
-		allSelected(): boolean {
-			return this.selected.length === 0;
-		},
-	},
-	watch: {
-		sortOnPopulate: {
-			handler(value: boolean) {
-				if (value) {
-					this.sortCategories();
-				}
-			},
-			immediate: true,
-		},
-		categories: {
-			handler(categories: ITemplatesCategory[]) {
-				if (categories.length > 0) {
-					this.sortCategories();
-				}
-			},
-			immediate: true,
-		},
-	},
-	methods: {
-		sortCategories() {
-			if (!this.sortOnPopulate) {
-				this.sortedCategories = this.categories;
-			} else {
-				const selected = this.selected || [];
-				const selectedCategories = this.categories.filter((cat) => selected.includes(cat));
-				const notSelectedCategories = this.categories.filter((cat) => !selected.includes(cat));
-				this.sortedCategories = selectedCategories.concat(notSelectedCategories);
-			}
-		},
-		collapseAction() {
-			this.collapsed = false;
-		},
-		handleCheckboxChanged(value: boolean, selectedCategory: ITemplatesCategory) {
-			this.$emit(value ? 'select' : 'clear', selectedCategory);
-		},
-		isSelected(category: ITemplatesCategory) {
-			return this.selected.includes(category);
-		},
-		resetCategories() {
-			this.$emit('clearAll');
-		},
-	},
+interface Props {
+	categories?: ITemplatesCategory[];
+	sortOnPopulate?: boolean;
+	expandLimit?: number;
+	loading?: boolean;
+	selected?: ITemplatesCategory[];
+}
+
+const props = withDefaults(defineProps<Props>(), {
+	categories: () => [],
+	sortOnPopulate: false,
+	expandLimit: 12,
+	loading: false,
+	selected: () => [],
 });
+
+const emit = defineEmits<{
+	clearAll: [];
+	select: [category: ITemplatesCategory];
+	clear: [category: ITemplatesCategory];
+}>();
+
+const i18n = useI18n();
+
+const collapsed = ref(true);
+const sortedCategories = ref<ITemplatesCategory[]>([]);
+
+const allSelected = computed((): boolean => {
+	return props.selected.length === 0;
+});
+
+function sortCategories() {
+	if (!props.sortOnPopulate) {
+		sortedCategories.value = props.categories;
+	} else {
+		const selected = props.selected || [];
+		const selectedCategories = props.categories.filter((cat) => selected.includes(cat));
+		const notSelectedCategories = props.categories.filter((cat) => !selected.includes(cat));
+		sortedCategories.value = selectedCategories.concat(notSelectedCategories);
+	}
+}
+function collapseAction() {
+	collapsed.value = false;
+}
+
+function handleCheckboxChanged(value: boolean, selectedCategory: ITemplatesCategory) {
+	if (value) {
+		emit('select', selectedCategory);
+	} else {
+		emit('clear', selectedCategory);
+	}
+}
+
+function isSelected(category: ITemplatesCategory) {
+	return props.selected.includes(category);
+}
+
+function resetCategories() {
+	emit('clearAll');
+}
+
+watch(
+	() => props.sortOnPopulate,
+	(value: boolean) => {
+		if (value) {
+			sortCategories();
+		}
+	},
+	{
+		immediate: true,
+	},
+);
+
+watch(
+	() => props.categories,
+	(categories: ITemplatesCategory[]) => {
+		if (categories.length > 0) {
+			sortCategories();
+		}
+	},
+	{
+		immediate: true,
+	},
+);
 </script>
 
 <template>
 	<div :class="$style.filters" class="template-filters" data-test-id="templates-filter-container">
-		<div :class="$style.title" v-text="$locale.baseText('templates.categoriesHeading')" />
+		<div :class="$style.title" v-text="i18n.baseText('templates.categoriesHeading')" />
 		<div v-if="loading" :class="$style.list">
 			<n8n-loading :loading="loading" :rows="expandLimit" />
 		</div>
 		<ul v-if="!loading" :class="$style.categories">
 			<li :class="$style.item" data-test-id="template-filter-all-categories">
 				<el-checkbox :model-value="allSelected" @update:model-value="() => resetCategories()">
-					{{ $locale.baseText('templates.allCategories') }}
+					{{ i18n.baseText('templates.allCategories') }}
 				</el-checkbox>
 			</li>
 			<li
diff --git a/packages/editor-ui/src/components/TemplateList.vue b/packages/editor-ui/src/components/TemplateList.vue
index 06c644dc80..ba42ddd1b6 100644
--- a/packages/editor-ui/src/components/TemplateList.vue
+++ b/packages/editor-ui/src/components/TemplateList.vue
@@ -1,89 +1,85 @@
-<script lang="ts">
-import { type PropType, defineComponent } from 'vue';
+<script lang="ts" setup>
+import { onBeforeUnmount, onMounted, ref } from 'vue';
 import TemplateCard from './TemplateCard.vue';
 import type { ITemplatesWorkflow } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
 
-export default defineComponent({
-	name: 'TemplateList',
-	components: {
-		TemplateCard,
-	},
-	props: {
-		infiniteScrollEnabled: {
-			type: Boolean,
-			default: false,
-		},
-		loading: {
-			type: Boolean,
-		},
-		useWorkflowButton: {
-			type: Boolean,
-			default: false,
-		},
-		workflows: {
-			type: Array as PropType<ITemplatesWorkflow[]>,
-			default: () => [],
-		},
-		totalWorkflows: {
-			type: Number,
-			default: 0,
-		},
-		simpleView: {
-			type: Boolean,
-			default: false,
-		},
-		totalCount: {
-			type: Number,
-			default: 0,
-		},
-	},
-	mounted() {
-		if (this.infiniteScrollEnabled) {
-			const content = document.getElementById('content');
-			if (content) {
-				content.addEventListener('scroll', this.onScroll);
-			}
-		}
-	},
-	beforeUnmount() {
+interface Props {
+	workflows?: ITemplatesWorkflow[];
+	infiniteScrollEnabled?: boolean;
+	loading?: boolean;
+	useWorkflowButton?: boolean;
+	totalWorkflows?: number;
+	simpleView?: boolean;
+	totalCount?: number;
+}
+
+const emit = defineEmits<{
+	loadMore: [];
+	openTemplate: [{ event: MouseEvent; id: number }];
+	useWorkflow: [{ event: MouseEvent; id: number }];
+}>();
+
+const props = withDefaults(defineProps<Props>(), {
+	infiniteScrollEnabled: false,
+	loading: false,
+	useWorkflowButton: false,
+	workflows: () => [],
+	totalWorkflows: 0,
+	simpleView: false,
+	totalCount: 0,
+});
+
+const i18n = useI18n();
+
+const loader = ref<HTMLElement | null>(null);
+
+onMounted(() => {
+	if (props.infiniteScrollEnabled) {
 		const content = document.getElementById('content');
 		if (content) {
-			content.removeEventListener('scroll', this.onScroll);
+			content.addEventListener('scroll', onScroll);
 		}
-	},
-	methods: {
-		onScroll() {
-			const loaderRef = this.$refs.loader as HTMLElement | undefined;
-			if (!loaderRef || this.loading) {
-				return;
-			}
-
-			const rect = loaderRef.getBoundingClientRect();
-			const inView =
-				rect.top >= 0 &&
-				rect.left >= 0 &&
-				rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
-				rect.right <= (window.innerWidth || document.documentElement.clientWidth);
-
-			if (inView) {
-				this.$emit('loadMore');
-			}
-		},
-		onCardClick(event: MouseEvent, id: number) {
-			this.$emit('openTemplate', { event, id });
-		},
-		onUseWorkflow(event: MouseEvent, id: number) {
-			this.$emit('useWorkflow', { event, id });
-		},
-	},
+	}
 });
+
+onBeforeUnmount(() => {
+	const content = document.getElementById('content');
+	if (content) {
+		content.removeEventListener('scroll', onScroll);
+	}
+});
+
+function onScroll() {
+	const loaderRef = loader.value as HTMLElement | undefined;
+	if (!loaderRef || props.loading) {
+		return;
+	}
+
+	const rect = loaderRef.getBoundingClientRect();
+	const inView =
+		rect.top >= 0 &&
+		rect.left >= 0 &&
+		rect.bottom <= (window.innerHeight || document.documentElement.clientHeight) &&
+		rect.right <= (window.innerWidth || document.documentElement.clientWidth);
+
+	if (inView) {
+		emit('loadMore');
+	}
+}
+function onCardClick(event: MouseEvent, id: number) {
+	emit('openTemplate', { event, id });
+}
+function onUseWorkflow(event: MouseEvent, id: number) {
+	emit('useWorkflow', { event, id });
+}
 </script>
 
 <template>
 	<div v-if="loading || workflows.length" :class="$style.list">
 		<div v-if="!simpleView" :class="$style.header">
 			<n8n-heading :bold="true" size="medium" color="text-light">
-				{{ $locale.baseText('templates.workflows') }}
+				{{ i18n.baseText('templates.workflows') }}
 				<span v-if="totalCount > 0" data-test-id="template-count-label">({{ totalCount }})</span>
 				<span v-if="!loading && totalWorkflows" v-text="`(${totalWorkflows})`" />
 			</n8n-heading>
diff --git a/packages/editor-ui/src/components/__tests__/TemplatesInfoCard.test.ts b/packages/editor-ui/src/components/TemplatesInfoCard.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/TemplatesInfoCard.test.ts
rename to packages/editor-ui/src/components/TemplatesInfoCard.test.ts
diff --git a/packages/editor-ui/src/components/TemplatesInfoCard.vue b/packages/editor-ui/src/components/TemplatesInfoCard.vue
index 9e77a9e10a..384c32a948 100644
--- a/packages/editor-ui/src/components/TemplatesInfoCard.vue
+++ b/packages/editor-ui/src/components/TemplatesInfoCard.vue
@@ -1,33 +1,23 @@
-<script lang="ts">
-import { type PropType, defineComponent } from 'vue';
+<script lang="ts" setup>
 import Card from '@/components/CollectionWorkflowCard.vue';
 import NodeList from '@/components/NodeList.vue';
+import { useI18n } from '@/composables/useI18n';
 import type { ITemplatesCollection } from '@/Interface';
 
-export default defineComponent({
-	name: 'TemplatesInfoCard',
-	components: {
-		Card,
-		NodeList,
+withDefaults(
+	defineProps<{
+		collection: ITemplatesCollection;
+		loading?: boolean;
+		showItemCount?: boolean;
+		width: string;
+	}>(),
+	{
+		loading: false,
+		showItemCount: true,
 	},
-	props: {
-		collection: {
-			type: Object as PropType<ITemplatesCollection>,
-			required: true,
-		},
-		loading: {
-			type: Boolean,
-		},
-		showItemCount: {
-			type: Boolean,
-			default: true,
-		},
-		width: {
-			type: String,
-			required: true,
-		},
-	},
-});
+);
+
+const i18n = useI18n();
 </script>
 
 <template>
@@ -36,7 +26,7 @@ export default defineComponent({
 			<span>
 				<n8n-text v-show="showItemCount" size="small" color="text-light">
 					{{ collection.workflows.length }}
-					{{ $locale.baseText('templates.workflows') }}
+					{{ i18n.baseText('templates.workflows') }}
 				</n8n-text>
 			</span>
 			<NodeList :nodes="collection.nodes" :show-more="false" />
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..c858e04b0c
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/DescriptionInput.vue
@@ -0,0 +1,84 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { EditableField } from '../types';
+
+interface Props {
+	modelValue: EditableField<string>;
+	startEditing: (field: 'description') => void;
+	saveChanges: (field: 'description') => void;
+	handleKeydown: (e: KeyboardEvent, field: 'description') => void;
+}
+
+defineProps<Props>();
+defineEmits<{ 'update:modelValue': [value: EditableField<string>] }>();
+
+const locale = useI18n();
+</script>
+
+<template>
+	<div :class="$style.description">
+		<template v-if="!modelValue.isEditing">
+			<span :class="$style.descriptionText" @click="startEditing('description')">
+				<n8n-icon
+					v-if="modelValue.value.length === 0"
+					:class="$style.icon"
+					icon="plus"
+					color="text-light"
+					size="medium"
+				/>
+				<N8nText size="medium">
+					{{ modelValue.value.length > 0 ? modelValue.value : 'Add a description' }}
+				</N8nText>
+			</span>
+			<n8n-icon-button
+				:class="$style.editInputButton"
+				icon="pen"
+				type="tertiary"
+				@click="startEditing('description')"
+			/>
+		</template>
+		<N8nInput
+			v-else
+			ref="descriptionInput"
+			data-test-id="evaluation-description-input"
+			:model-value="modelValue.tempValue"
+			type="textarea"
+			:placeholder="locale.baseText('testDefinition.edit.descriptionPlaceholder')"
+			@update:model-value="$emit('update:modelValue', { ...modelValue, tempValue: $event })"
+			@blur="() => saveChanges('description')"
+			@keydown="(e: KeyboardEvent) => handleKeydown(e, 'description')"
+		/>
+	</div>
+</template>
+
+<style module lang="scss">
+.description {
+	display: flex;
+	align-items: center;
+	color: var(--color-text-light);
+	font-size: var(--font-size-s);
+
+	&:hover {
+		.editInputButton {
+			opacity: 1;
+		}
+	}
+}
+
+.descriptionText {
+	display: block;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+
+	.icon {
+		margin-right: var(--spacing-2xs);
+	}
+}
+
+.editInputButton {
+	--button-font-color: var(--prim-gray-490);
+	opacity: 0;
+	border: none;
+}
+</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..9f5baa66d9
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationHeader.vue
@@ -0,0 +1,96 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { EditableField } from '../types';
+
+export interface EvaluationHeaderProps {
+	modelValue: EditableField<string>;
+	startEditing: (field: 'name') => void;
+	saveChanges: (field: 'name') => void;
+	handleKeydown: (e: KeyboardEvent, field: 'name') => void;
+}
+
+defineEmits<{ 'update:modelValue': [value: EditableField<string>] }>();
+defineProps<EvaluationHeaderProps>();
+
+const locale = useI18n();
+</script>
+
+<template>
+	<div :class="$style.header">
+		<n8n-icon-button
+			:class="$style.backButton"
+			icon="arrow-left"
+			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;
+
+	&: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.2;
+	border: none;
+}
+
+.backButton {
+	--button-font-color: var(--color-text-light);
+	border: none;
+	padding-left: 0;
+}
+</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..806daa36b3
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/EvaluationStep.vue
@@ -0,0 +1,156 @@
+<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;
+	description?: string;
+}
+
+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]"
+		data-test-id="evaluation-step"
+	>
+		<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, '-')"
+					data-test-id="evaluation-step-collapse-button"
+					@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>
+			<div v-if="description" :class="$style.description">{{ description }}</div>
+			<ElCollapseTransition v-if="$slots.cardContent">
+				<div v-show="isExpanded" :class="$style.cardContentWrapper">
+					<div ref="contentRef" :class="$style.cardContent" data-test-id="evaluation-step-content">
+						<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%;
+		margin-left: auto;
+	}
+}
+.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;
+}
+
+.description {
+	font-size: var(--font-size-2xs);
+	color: var(--color-text-light);
+	line-height: 1rem;
+}
+</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..0597ac9c58
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/MetricsInput.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import type { TestMetricRecord } from '@/api/testDefinition.ee';
+import { useI18n } from '@/composables/useI18n';
+
+export interface MetricsInputProps {
+	modelValue: Array<Partial<TestMetricRecord>>;
+}
+const props = defineProps<MetricsInputProps>();
+const emit = defineEmits<{
+	'update:modelValue': [value: MetricsInputProps['modelValue']];
+	deleteMetric: [metric: Partial<TestMetricRecord>];
+}>();
+const locale = useI18n();
+
+function addNewMetric() {
+	emit('update:modelValue', [...props.modelValue, { name: '' }]);
+}
+
+function updateMetric(index: number, name: string) {
+	const newMetrics = [...props.modelValue];
+	newMetrics[index].name = name;
+	emit('update:modelValue', newMetrics);
+}
+
+function onDeleteMetric(metric: Partial<TestMetricRecord>) {
+	emit('deleteMetric', metric);
+}
+</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" :class="$style.metricItem">
+					<N8nInput
+						:ref="`metric_${index}`"
+						data-test-id="evaluation-metric-item"
+						:model-value="metric.name"
+						:placeholder="locale.baseText('testDefinition.edit.metricsPlaceholder')"
+						@update:model-value="(value: string) => updateMetric(index, value)"
+					/>
+					<n8n-icon-button icon="trash" type="text" @click="onDeleteMetric(metric)" />
+				</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);
+}
+
+.metricItem {
+	display: flex;
+	align-items: center;
+}
+
+.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/NodesPinning.vue b/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
new file mode 100644
index 0000000000..608073969d
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/NodesPinning.vue
@@ -0,0 +1,188 @@
+<script setup lang="ts">
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+import { computed, onMounted, ref, useCssModule } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useCanvasOperations } from '@/composables/useCanvasOperations';
+import { useCanvasMapping } from '@/composables/useCanvasMapping';
+import { createEventBus, N8nTooltip } from 'n8n-design-system';
+import type { CanvasConnectionPort, CanvasEventBusEvents, CanvasNodeData } from '@/types';
+import { useVueFlow } from '@vue-flow/core';
+import { useI18n } from '@/composables/useI18n';
+
+const workflowsStore = useWorkflowsStore();
+const nodeTypesStore = useNodeTypesStore();
+const route = useRoute();
+const router = useRouter();
+const locale = useI18n();
+
+const { resetWorkspace, initializeWorkspace } = useCanvasOperations({ router });
+
+const eventBus = createEventBus<CanvasEventBusEvents>();
+const style = useCssModule();
+const uuid = crypto.randomUUID();
+const props = defineProps<{
+	modelValue: Array<{ name: string; id: string }>;
+}>();
+
+const emit = defineEmits<{
+	'update:modelValue': [value: Array<{ name: string; id: string }>];
+}>();
+
+const isLoading = ref(true);
+
+const workflowId = computed(() => route.params.name as string);
+const testId = computed(() => route.params.testId as string);
+const workflow = computed(() => workflowsStore.getWorkflowById(workflowId.value));
+const workflowObject = computed(() => workflowsStore.getCurrentWorkflow(true));
+const canvasId = computed(() => `${uuid}-${testId.value}`);
+
+const { onNodesInitialized, fitView, zoomTo } = useVueFlow({ id: canvasId.value });
+const nodes = computed(() => {
+	return workflow.value.nodes ?? [];
+});
+const connections = computed(() => workflow.value.connections);
+
+const { nodes: mappedNodes, connections: mappedConnections } = useCanvasMapping({
+	nodes,
+	connections,
+	workflowObject,
+});
+async function loadData() {
+	workflowsStore.resetState();
+	resetWorkspace();
+	const loadingPromise = Promise.all([
+		nodeTypesStore.getNodeTypes(),
+		workflowsStore.fetchWorkflow(workflowId.value),
+	]);
+	await loadingPromise;
+	initializeWorkspace(workflow.value);
+	disableAllNodes();
+}
+function getNodeNameById(id: string) {
+	return mappedNodes.value.find((node) => node.id === id)?.data?.name;
+}
+function updateNodeClasses(nodeIds: string[], isPinned: boolean) {
+	eventBus.emit('nodes:action', {
+		ids: nodeIds,
+		action: 'update:node:class',
+		payload: {
+			className: style.pinnedNode,
+			add: isPinned,
+		},
+	});
+	eventBus.emit('nodes:action', {
+		ids: nodeIds,
+		action: 'update:node:class',
+		payload: {
+			className: style.notPinnedNode,
+			add: !isPinned,
+		},
+	});
+}
+function disableAllNodes() {
+	const ids = mappedNodes.value.map((node) => node.id);
+	updateNodeClasses(ids, false);
+
+	const pinnedNodes = props.modelValue.map((node) => node.id).filter((id) => id !== null);
+
+	if (pinnedNodes.length > 0) {
+		updateNodeClasses(pinnedNodes, true);
+	}
+}
+function onPinButtonClick(data: CanvasNodeData) {
+	const nodeName = getNodeNameById(data.id);
+	if (!nodeName) return;
+
+	const isPinned = props.modelValue.some((node) => node.id === data.id);
+	const updatedNodes = isPinned
+		? props.modelValue.filter((node) => node.id !== data.id)
+		: [...props.modelValue, { name: nodeName, id: data.id }];
+
+	emit('update:modelValue', updatedNodes);
+	updateNodeClasses([data.id], !isPinned);
+}
+function isPinButtonVisible(outputs: CanvasConnectionPort[]) {
+	return outputs.length === 1;
+}
+
+onNodesInitialized(async () => {
+	await fitView();
+	isLoading.value = false;
+	await zoomTo(0.7, { duration: 400 });
+});
+onMounted(loadData);
+</script>
+
+<template>
+	<div :class="$style.container">
+		<N8nSpinner v-if="isLoading" size="xlarge" type="dots" :class="$style.spinner" />
+		<Canvas
+			:id="canvasId"
+			:loading="isLoading"
+			:class="{ [$style.canvas]: true }"
+			:nodes="mappedNodes"
+			:connections="mappedConnections"
+			:show-bug-reporting-button="false"
+			:read-only="true"
+			:event-bus="eventBus"
+		>
+			<template #nodeToolbar="{ data, outputs }">
+				<div :class="$style.pinButtonContainer">
+					<N8nTooltip v-if="isPinButtonVisible(outputs)" placement="left">
+						<template #content>
+							{{ locale.baseText('testDefinition.edit.nodesPinning.pinButtonTooltip') }}
+						</template>
+						<n8n-icon-button
+							type="tertiary"
+							size="large"
+							icon="thumbtack"
+							:class="$style.pinButton"
+							data-test-id="node-pin-button"
+							@click="onPinButtonClick(data)"
+						/>
+					</N8nTooltip>
+				</div>
+			</template>
+		</Canvas>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	width: 100vw;
+	height: 100%;
+}
+.pinButtonContainer {
+	position: absolute;
+	right: 0;
+	display: flex;
+	justify-content: flex-end;
+	bottom: 100%;
+}
+
+.pinButton {
+	cursor: pointer;
+	color: var(--canvas-node--border-color);
+	border: none;
+}
+.notPinnedNode,
+.pinnedNode {
+	:global(.n8n-node-icon) > div {
+		filter: contrast(40%) brightness(1.5) grayscale(100%);
+	}
+}
+.pinnedNode {
+	--canvas-node--border-color: hsla(247, 49%, 55%, 1);
+
+	:global(.n8n-node-icon) > div {
+		filter: contrast(40%) brightness(1.5) grayscale(100%);
+	}
+}
+.spinner {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+</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..9bd4a77ce0
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/TagsInput.vue
@@ -0,0 +1,113 @@
+<script setup lang="ts">
+import { useI18n } from '@/composables/useI18n';
+import type { ITag } from '@/Interface';
+import { createEventBus } from 'n8n-design-system';
+import { computed } from 'vue';
+import type { EditableField } from '../types';
+
+export interface TagsInputProps {
+	modelValue: EditableField<string[]>;
+	allTags: ITag[];
+	tagsById: Record<string, ITag>;
+	isLoading: boolean;
+	startEditing: (field: 'tags') => void;
+	saveChanges: (field: 'tags') => void;
+	cancelEditing: (field: 'tags') => void;
+	createTag?: (name: string) => Promise<ITag>;
+}
+
+const props = withDefaults(defineProps<TagsInputProps>(), {
+	modelValue: () => ({
+		isEditing: false,
+		value: [],
+		tempValue: [],
+	}),
+	createTag: undefined,
+});
+
+const emit = defineEmits<{ 'update:modelValue': [value: TagsInputProps['modelValue']] }>();
+
+const locale = useI18n();
+const tagsEventBus = createEventBus();
+
+/**
+ * Compute the tag name by ID
+ */
+const getTagName = computed(() => (tagId: string) => {
+	return props.tagsById[tagId]?.name ?? '';
+});
+
+/**
+ * Update the tempValue of the tags when the dropdown changes.
+ * This does not finalize the changes; that happens on blur or hitting enter.
+ */
+function updateTags(tags: string[]) {
+	emit('update:modelValue', {
+		...props.modelValue,
+		tempValue: tags,
+	});
+}
+</script>
+
+<template>
+	<div data-test-id="workflow-tags-field">
+		<n8n-input-label
+			:label="locale.baseText('testDefinition.edit.tagName')"
+			:bold="false"
+			size="small"
+		>
+			<!-- Read-only view -->
+			<div v-if="!modelValue.isEditing" :class="$style.tagsRead" @click="startEditing('tags')">
+				<n8n-text v-if="modelValue.value.length === 0" size="small">
+					{{ locale.baseText('testDefinition.edit.selectTag') }}
+				</n8n-text>
+				<n8n-tag
+					v-for="tagId in modelValue.value"
+					: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>
+
+			<!-- Editing view -->
+			<TagsDropdown
+				v-else
+				:model-value="modelValue.tempValue"
+				:placeholder="locale.baseText('executionAnnotationView.chooseOrCreateATag')"
+				:create-enabled="modelValue.tempValue.length === 0"
+				:all-tags="allTags"
+				:is-loading="isLoading"
+				:tags-by-id="tagsById"
+				data-test-id="workflow-tags-dropdown"
+				:event-bus="tagsEventBus"
+				:create-tag="createTag"
+				:manage-enabled="false"
+				:multiple-limit="1"
+				@update:model-value="updateTags"
+				@esc="cancelEditing('tags')"
+				@blur="saveChanges('tags')"
+			/>
+		</n8n-input-label>
+	</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/EditDefinition/tests/NodesPinning.test.ts b/packages/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts
new file mode 100644
index 0000000000..e4d0fd4c29
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/EditDefinition/tests/NodesPinning.test.ts
@@ -0,0 +1,143 @@
+import { waitFor } from '@testing-library/vue';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import NodesPinning from '../NodesPinning.vue';
+import { createComponentRenderer } from '@/__tests__/render';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useNodeTypesStore } from '@/stores/nodeTypes.store';
+
+import {
+	createTestNode,
+	createTestWorkflow,
+	createTestWorkflowObject,
+	mockNodeTypeDescription,
+} from '@/__tests__/mocks';
+import { mockedStore } from '@/__tests__/utils';
+import { NodeConnectionType } from 'n8n-workflow';
+import { SET_NODE_TYPE } from '@/constants';
+
+vi.mock('vue-router', () => {
+	const push = vi.fn();
+	return {
+		useRouter: () => ({
+			push,
+		}),
+		useRoute: () => ({
+			params: {
+				name: 'test-workflow',
+				testId: 'test-123',
+			},
+		}),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+const renderComponent = createComponentRenderer(NodesPinning, {
+	props: {
+		modelValue: [{ id: '1', name: 'Node 1' }],
+	},
+	global: {
+		plugins: [createTestingPinia()],
+	},
+});
+
+describe('NodesPinning', () => {
+	const workflowsStore = mockedStore(useWorkflowsStore);
+	const nodes = [
+		createTestNode({ id: '1', name: 'Node 1', type: SET_NODE_TYPE }),
+		createTestNode({ id: '2', name: 'Node 2', type: SET_NODE_TYPE }),
+	];
+
+	const nodeTypesStore = mockedStore(useNodeTypesStore);
+	const nodeTypeDescription = mockNodeTypeDescription({
+		name: SET_NODE_TYPE,
+		inputs: [NodeConnectionType.Main],
+		outputs: [NodeConnectionType.Main],
+	});
+	nodeTypesStore.nodeTypes = {
+		node: { 1: nodeTypeDescription },
+	};
+
+	nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+	const workflow = createTestWorkflow({
+		id: 'test-workflow',
+		name: 'Test Workflow',
+		nodes,
+		connections: {},
+	});
+
+	const workflowObject = createTestWorkflowObject(workflow);
+
+	workflowsStore.getWorkflowById = vi.fn().mockReturnValue(workflow);
+	workflowsStore.getCurrentWorkflow = vi.fn().mockReturnValue(workflowObject);
+	beforeEach(() => {
+		const pinia = createPinia();
+		setActivePinia(pinia);
+
+		nodeTypesStore.setNodeTypes([nodeTypeDescription]);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should render workflow nodes', async () => {
+		const { container } = renderComponent();
+
+		await waitFor(() => {
+			expect(container.querySelectorAll('.vue-flow__node')).toHaveLength(2);
+		});
+
+		expect(container.querySelector('[data-node-name="Node 1"]')).toBeInTheDocument();
+		expect(container.querySelector('[data-node-name="Node 2"]')).toBeInTheDocument();
+	});
+
+	it('should update node classes when pinning/unpinning nodes', async () => {
+		const { container } = renderComponent();
+
+		await waitFor(() => {
+			expect(container.querySelector('[data-node-name="Node 1"]')).toBeInTheDocument();
+		});
+
+		await waitFor(() => {
+			expect(container.querySelector('[data-node-name="Node 1"]')).toHaveClass(
+				'canvasNode pinnedNode',
+			);
+			expect(container.querySelector('[data-node-name="Node 2"]')).toHaveClass(
+				'canvasNode notPinnedNode',
+			);
+		});
+	});
+
+	it('should emit update:modelValue when pinning nodes', async () => {
+		const { container, emitted, getAllByTestId } = renderComponent();
+
+		await waitFor(() => {
+			expect(container.querySelector('[data-node-name="Node 1"]')).toBeInTheDocument();
+		});
+		const pinButton = getAllByTestId('node-pin-button')[1];
+		pinButton?.click();
+
+		expect(emitted('update:modelValue')).toBeTruthy();
+		expect(emitted('update:modelValue')[0]).toEqual([
+			[
+				{ id: '1', name: 'Node 1' },
+				{ id: '2', name: 'Node 2' },
+			],
+		]);
+	});
+	it('should emit update:modelValue when unpinning nodes', async () => {
+		const { container, emitted, getAllByTestId } = renderComponent();
+
+		await waitFor(() => {
+			expect(container.querySelector('[data-node-name="Node 1"]')).toBeInTheDocument();
+		});
+		const pinButton = getAllByTestId('node-pin-button')[0];
+		pinButton?.click();
+
+		expect(emitted('update:modelValue')).toBeTruthy();
+		expect(emitted('update:modelValue')[0]).toEqual([[]]);
+	});
+});
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..d2f022777b
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/EmptyState.vue
@@ -0,0 +1,57 @@
+<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>
+		<div :class="$style.content">
+			<n8n-action-box
+				:class="$style.actionBox"
+				:heading="locale.baseText('testDefinition.list.evaluations')"
+				:description="locale.baseText('testDefinition.list.actionDescription')"
+				:button-text="locale.baseText('testDefinition.list.actionButton')"
+				@click:button="$emit('create-test')"
+			/>
+			<n8n-action-box
+				:class="$style.actionBox"
+				:heading="locale.baseText('testDefinition.list.unitTests.title')"
+				:description="locale.baseText('testDefinition.list.unitTests.description')"
+				:button-text="locale.baseText('testDefinition.list.unitTests.cta')"
+				button-type="tertiary"
+			/>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	max-width: 75rem;
+}
+.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;
+	}
+}
+.content {
+	width: 100%;
+	display: flex;
+	gap: var(--spacing-m);
+}
+.actionBox {
+	flex: 1;
+}
+</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..4325c8698d
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListDefinition/TestItem.vue
@@ -0,0 +1,176 @@
+<script setup lang="ts">
+import type { TestListItem } from '@/components/TestDefinition/types';
+import TimeAgo from '@/components/TimeAgo.vue';
+import { useI18n } from '@/composables/useI18n';
+import n8nIconButton from 'n8n-design-system/components/N8nIconButton';
+import { computed } from 'vue';
+
+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];
+	'cancel-test-run': [testId: string, testRunId: string | null];
+}>();
+
+const actions = [
+	{
+		icon: 'play',
+		id: 'run',
+		event: () => emit('run-test', props.test.id),
+		tooltip: locale.baseText('testDefinition.runTest'),
+		show: () => props.test.execution.status !== 'running',
+	},
+	{
+		icon: 'stop',
+		id: 'cancel',
+		event: () => emit('cancel-test-run', props.test.id, props.test.execution.id),
+		tooltip: locale.baseText('testDefinition.cancelTestRun'),
+		show: () => props.test.execution.status === 'running',
+	},
+	{
+		icon: 'list',
+		id: 'view',
+		event: () => emit('view-details', props.test.id),
+		tooltip: locale.baseText('testDefinition.viewDetails'),
+	},
+	{
+		icon: 'pen',
+		id: 'edit',
+		event: () => emit('edit-test', props.test.id),
+		tooltip: locale.baseText('testDefinition.editTest'),
+	},
+	{
+		icon: 'trash',
+		id: 'delete',
+		event: () => emit('delete-test', props.test.id),
+		tooltip: locale.baseText('testDefinition.deleteTest'),
+	},
+];
+
+const visibleActions = computed(() => actions.filter((action) => action.show?.() ?? true));
+</script>
+
+<template>
+	<div
+		:class="$style.testItem"
+		:data-test-id="`test-item-${test.id}`"
+		@click="$emit('view-details', test.id)"
+	>
+		<div :class="$style.testInfo">
+			<div :class="$style.testName">
+				{{ test.name }}
+			</div>
+			<div :class="$style.testCases">
+				<n8n-text size="small">
+					{{ locale.baseText('testDefinition.list.testRuns', { adjustToNumber: test.testCases }) }}
+				</n8n-text>
+				<template v-if="test.execution.status === 'running'">
+					{{ locale.baseText('testDefinition.list.running') }}
+					<n8n-spinner />
+				</template>
+				<span v-else-if="test.execution.lastRun">
+					{{ locale.baseText('testDefinition.list.lastRun') }}
+					<TimeAgo :date="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.toFixed(2) ?? '-' }}
+			</div>
+		</div>
+
+		<div :class="$style.actions">
+			<n8n-tooltip
+				v-for="action in visibleActions"
+				:key="action.icon"
+				placement="top"
+				:show-after="1000"
+			>
+				<template #content>
+					{{ action.tooltip }}
+				</template>
+				<component
+					:is="n8nIconButton"
+					:icon="action.icon"
+					:data-test-id="`${action.id}-test-button-${test.id}`"
+					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);
+	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..d744b1a31b
--- /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" data-test-id="test-definition-list">
+		<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/ListRuns/MetricsChart.vue b/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
new file mode 100644
index 0000000000..4e3502dc6b
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListRuns/MetricsChart.vue
@@ -0,0 +1,109 @@
+<script setup lang="ts">
+import { computed, watchEffect } from 'vue';
+import { Line } from 'vue-chartjs';
+import { useMetricsChart } from '../composables/useMetricsChart';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import { useI18n } from '@/composables/useI18n';
+import type { AppliedThemeOption } from '@/Interface';
+
+const emit = defineEmits<{
+	'update:selectedMetric': [value: string];
+}>();
+
+const props = defineProps<{
+	selectedMetric: string;
+	runs: TestRunRecord[];
+	theme?: AppliedThemeOption;
+}>();
+
+const locale = useI18n();
+const metricsChart = useMetricsChart(props.theme);
+
+const availableMetrics = computed(() => {
+	return props.runs.reduce((acc, run) => {
+		const metricKeys = Object.keys(run.metrics ?? {});
+		return [...new Set([...acc, ...metricKeys])];
+	}, [] as string[]);
+});
+
+const chartData = computed(() => metricsChart.generateChartData(props.runs, props.selectedMetric));
+
+const chartOptions = computed(() =>
+	metricsChart.generateChartOptions({
+		metric: props.selectedMetric,
+		xTitle: locale.baseText('testDefinition.listRuns.runDate'),
+	}),
+);
+
+watchEffect(() => {
+	if (props.runs.length > 0 && !props.selectedMetric) {
+		emit('update:selectedMetric', availableMetrics.value[0]);
+	}
+});
+</script>
+
+<template>
+	<div v-if="availableMetrics.length > 0" :class="$style.metricsChartContainer">
+		<div :class="$style.chartHeader">
+			<N8nSelect
+				:model-value="selectedMetric"
+				:class="$style.metricSelect"
+				placeholder="Select metric"
+				size="small"
+				@update:model-value="emit('update:selectedMetric', $event)"
+			>
+				<N8nOption
+					v-for="metric in availableMetrics"
+					:key="metric"
+					:label="metric"
+					:value="metric"
+				/>
+			</N8nSelect>
+			<N8nText>{{ locale.baseText('testDefinition.listRuns.metricsOverTime') }}</N8nText>
+		</div>
+		<div :class="$style.chartWrapper">
+			<Line
+				v-if="availableMetrics.length > 0"
+				:key="selectedMetric"
+				:data="chartData"
+				:options="chartOptions"
+				:class="$style.metricsChart"
+			/>
+		</div>
+	</div>
+</template>
+
+<style lang="scss" module>
+.metricsChartContainer {
+	background: var(--color-background-xlight);
+	border-radius: var(--border-radius-large);
+	box-shadow: var(--box-shadow-base);
+
+	.chartHeader {
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		gap: var(--spacing-s);
+		margin-bottom: var(--spacing-m);
+		padding: var(--spacing-xs) var(--spacing-s);
+		border-bottom: 1px solid var(--color-foreground-base);
+	}
+
+	.chartTitle {
+		font-size: var(--font-size-l);
+		font-weight: var(--font-weight-bold);
+		color: var(--color-text-base);
+	}
+
+	.metricSelect {
+		max-width: 15rem;
+	}
+
+	.chartWrapper {
+		position: relative;
+		height: var(--metrics-chart-height, 400px);
+		width: 100%;
+		padding: var(--spacing-s);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue b/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
new file mode 100644
index 0000000000..2692355611
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/ListRuns/TestRunsTable.vue
@@ -0,0 +1,126 @@
+<script setup lang="ts">
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import { computed, ref } from 'vue';
+import type { TestTableColumn } from '../shared/TestTableBase.vue';
+import TestTableBase from '../shared/TestTableBase.vue';
+import { convertToDisplayDate } from '@/utils/typesUtils';
+import { VIEWS } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+
+const emit = defineEmits<{
+	getRunDetail: [run: TestRunRecord];
+	selectionChange: [runs: TestRunRecord[]];
+	deleteRuns: [runs: TestRunRecord[]];
+}>();
+
+const props = defineProps<{
+	runs: TestRunRecord[];
+	selectable?: boolean;
+}>();
+
+const locale = useI18n();
+const navigateToRunDetail = (run: TestRunRecord) => emit('getRunDetail', run);
+const selectedRows = ref<TestRunRecord[]>([]);
+
+const metrics = computed(() => {
+	return props.runs.reduce((acc, run) => {
+		const metricKeys = Object.keys(run.metrics ?? {});
+		return [...new Set([...acc, ...metricKeys])];
+	}, [] as string[]);
+});
+
+const columns = computed((): Array<TestTableColumn<TestRunRecord>> => {
+	return [
+		{
+			prop: 'runNumber',
+			label: locale.baseText('testDefinition.listRuns.runNumber'),
+			width: 200,
+			route: (row: TestRunRecord) => ({
+				name: VIEWS.TEST_DEFINITION_RUNS_DETAIL,
+				params: { testId: row.testDefinitionId, runId: row.id },
+			}),
+			formatter: (row: TestRunRecord) => `${row.id}`,
+		},
+		{
+			prop: 'status',
+			label: locale.baseText('testDefinition.listRuns.status'),
+			filters: [
+				{ text: locale.baseText('testDefinition.listRuns.status.new'), value: 'new' },
+				{ text: locale.baseText('testDefinition.listRuns.status.running'), value: 'running' },
+				{ text: locale.baseText('testDefinition.listRuns.status.completed'), value: 'completed' },
+				{ text: locale.baseText('testDefinition.listRuns.status.error'), value: 'error' },
+				{ text: locale.baseText('testDefinition.listRuns.status.cancelled'), value: 'cancelled' },
+			],
+			filterMethod: (value: string, row: TestRunRecord) => row.status === value,
+		},
+		{
+			prop: 'date',
+			label: locale.baseText('testDefinition.listRuns.runDate'),
+			sortable: true,
+			formatter: (row: TestRunRecord) => convertToDisplayDate(new Date(row.runAt).getTime()),
+			sortMethod: (a: TestRunRecord, b: TestRunRecord) =>
+				new Date(a.runAt).getTime() - new Date(b.runAt).getTime(),
+		},
+
+		...metrics.value.map((metric) => ({
+			prop: `metrics.${metric}`,
+			label: metric,
+			sortable: true,
+			formatter: (row: TestRunRecord) => `${row.metrics?.[metric]?.toFixed(2) ?? '-'}`,
+		})),
+	];
+});
+
+function onSelectionChange(runs: TestRunRecord[]) {
+	selectedRows.value = runs;
+	emit('selectionChange', runs);
+}
+
+function deleteRuns() {
+	emit('deleteRuns', selectedRows.value);
+}
+</script>
+
+<template>
+	<div :class="$style.container">
+		<N8nHeading size="large" :bold="true" :class="$style.runsTableHeading">{{
+			locale.baseText('testDefinition.edit.pastRuns')
+		}}</N8nHeading>
+		<div :class="$style.header">
+			<n8n-button
+				v-show="selectedRows.length > 0"
+				type="danger"
+				:class="$style.activator"
+				size="medium"
+				icon="trash"
+				data-test-id="delete-runs-button"
+				@click="deleteRuns"
+			>
+				{{
+					locale.baseText('testDefinition.listRuns.deleteRuns', {
+						adjustToNumber: selectedRows.length,
+					})
+				}}
+			</n8n-button>
+		</div>
+		<TestTableBase
+			:data="runs"
+			:columns="columns"
+			selectable
+			@row-click="navigateToRunDetail"
+			@selection-change="onSelectionChange"
+		/>
+		<N8nText :class="$style.runsTableTotal">{{
+			locale.baseText('testDefinition.edit.pastRuns.total', { adjustToNumber: runs.length })
+		}}</N8nText>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	display: flex;
+	flex-direction: column;
+	gap: 10px;
+	flex: 1;
+}
+</style>
diff --git a/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts b/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
new file mode 100644
index 0000000000..2e1faa2e58
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/composables/useMetricsChart.ts
@@ -0,0 +1,142 @@
+import type { ChartData, ChartOptions } from 'chart.js';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import dateFormat from 'dateformat';
+import type { AppliedThemeOption } from '@/Interface';
+
+const THEME_COLORS = {
+	light: {
+		primary: 'rgb(255, 110, 92)',
+		text: {
+			primary: 'rgb(68, 68, 68)',
+			secondary: 'rgb(102, 102, 102)',
+		},
+		background: 'rgb(255, 255, 255)',
+		grid: 'rgba(68, 68, 68, 0.1)',
+	},
+	dark: {
+		primary: 'rgb(255, 110, 92)',
+		text: {
+			primary: 'rgb(255, 255, 255)',
+			secondary: 'rgba(255, 255, 255, 0.7)',
+		},
+		background: 'rgb(32, 32, 32)',
+		grid: 'rgba(255, 255, 255, 0.1)',
+	},
+};
+
+export function useMetricsChart(mode: AppliedThemeOption = 'light') {
+	const colors = THEME_COLORS[mode];
+	const toRGBA = (color: string, alpha: number) => {
+		if (color.includes('rgba')) return color;
+		return color.replace('rgb', 'rgba').replace(')', `, ${alpha})`);
+	};
+	function generateChartData(runs: TestRunRecord[], metric: string): ChartData<'line'> {
+		const sortedRuns = [...runs]
+			.sort((a, b) => new Date(a.runAt).getTime() - new Date(b.runAt).getTime())
+			.filter((run) => run.metrics?.[metric]);
+
+		return {
+			labels: sortedRuns.map((run) => {
+				return dateFormat(run.runAt, 'yyyy-mm-dd HH:MM');
+			}),
+			datasets: [
+				{
+					label: metric,
+					data: sortedRuns.map((run) => run.metrics?.[metric] ?? 0),
+					borderColor: colors.primary,
+					backgroundColor: toRGBA(colors.primary, 0.1),
+					borderWidth: 2,
+					pointRadius: 4,
+					pointHoverRadius: 6,
+					pointBackgroundColor: colors.primary,
+					pointBorderColor: colors.primary,
+					pointHoverBackgroundColor: colors.background,
+					pointHoverBorderColor: colors.primary,
+					tension: 0.4,
+					fill: true,
+				},
+			],
+		};
+	}
+
+	function generateChartOptions(params: { metric: string; xTitle: string }): ChartOptions<'line'> {
+		return {
+			responsive: true,
+			maintainAspectRatio: false,
+			devicePixelRatio: 2,
+			interaction: {
+				mode: 'index' as const,
+				intersect: false,
+			},
+			scales: {
+				y: {
+					beginAtZero: true,
+					grid: {
+						color: colors.grid,
+					},
+					ticks: {
+						padding: 8,
+						color: colors.text.primary,
+					},
+					title: {
+						display: false,
+						text: params.metric,
+						padding: 16,
+						color: colors.text.primary,
+					},
+				},
+				x: {
+					grid: {
+						display: false,
+					},
+					ticks: {
+						display: false,
+					},
+					title: {
+						text: params.xTitle,
+						padding: 1,
+						color: colors.text.primary,
+					},
+				},
+			},
+			plugins: {
+				tooltip: {
+					backgroundColor: colors.background,
+					titleColor: colors.text.primary,
+					titleFont: {
+						weight: '600',
+					},
+					bodyColor: colors.text.secondary,
+					bodySpacing: 4,
+					padding: 12,
+					borderColor: toRGBA(colors.primary, 0.2),
+					borderWidth: 1,
+					displayColors: true,
+					callbacks: {
+						title: (tooltipItems) => tooltipItems[0].label,
+						label: (context) => `${params.metric}: ${context.parsed.y.toFixed(2)}`,
+					},
+				},
+				legend: {
+					display: false,
+				},
+			},
+			animation: {
+				duration: 750,
+				easing: 'easeInOutQuart',
+			},
+			transitions: {
+				active: {
+					animation: {
+						duration: 300,
+					},
+				},
+			},
+		};
+	}
+
+	return {
+		generateChartData,
+		generateChartOptions,
+	};
+}
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..fe87606bdd
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/composables/useTestDefinitionForm.ts
@@ -0,0 +1,246 @@
+import { ref, computed } from 'vue';
+import type { ComponentPublicInstance, ComputedRef } from 'vue';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import type AnnotationTagsDropdownEe from '@/components/AnnotationTagsDropdown.ee.vue';
+import type { N8nInput } from 'n8n-design-system';
+import type { UpdateTestDefinitionParams } from '@/api/testDefinition.ee';
+import type { EditableField, EditableFormState, EvaluationFormState } from '../types';
+
+type FormRefs = {
+	nameInput: ComponentPublicInstance<typeof N8nInput>;
+	tagsInput: ComponentPublicInstance<typeof AnnotationTagsDropdownEe>;
+};
+
+export function useTestDefinitionForm() {
+	const evaluationsStore = useTestDefinitionStore();
+
+	// State initialization
+	const state = ref<EvaluationFormState>({
+		name: {
+			value: `My Test ${evaluationsStore.allTestDefinitions.length + 1}`,
+			tempValue: '',
+			isEditing: false,
+		},
+		tags: {
+			value: [],
+			tempValue: [],
+			isEditing: false,
+		},
+		description: {
+			value: '',
+			tempValue: '',
+			isEditing: false,
+		},
+		evaluationWorkflow: {
+			mode: 'list',
+			value: '',
+			__rl: true,
+		},
+		metrics: [],
+		mockedNodes: [],
+	});
+
+	const isSaving = ref(false);
+	const fieldsIssues = ref<Array<{ field: string; message: string }>>([]);
+	const fields = ref<FormRefs>({} as FormRefs);
+
+	// A computed mapping of editable fields to their states
+	// This ensures TS knows the exact type of each field.
+	const editableFields: ComputedRef<{
+		name: EditableField<string>;
+		tags: EditableField<string[]>;
+		description: EditableField<string>;
+	}> = computed(() => ({
+		name: state.value.name,
+		tags: state.value.tags,
+		description: state.value.description,
+	}));
+
+	/**
+	 * Load test data including metrics.
+	 */
+	const loadTestData = async (testId: string) => {
+		try {
+			await evaluationsStore.fetchAll({ force: true });
+			const testDefinition = evaluationsStore.testDefinitionsById[testId];
+
+			if (testDefinition) {
+				const metrics = await evaluationsStore.fetchMetrics(testId);
+
+				state.value.description = {
+					value: testDefinition.description ?? '',
+					isEditing: false,
+					tempValue: '',
+				};
+				state.value.name = {
+					value: testDefinition.name ?? '',
+					isEditing: false,
+					tempValue: '',
+				};
+				state.value.tags = {
+					isEditing: false,
+					value: testDefinition.annotationTagId ? [testDefinition.annotationTagId] : [],
+					tempValue: [],
+				};
+				state.value.evaluationWorkflow = {
+					mode: 'list',
+					value: testDefinition.evaluationWorkflowId ?? '',
+					__rl: true,
+				};
+				state.value.metrics = metrics;
+				state.value.mockedNodes = testDefinition.mockedNodes ?? [];
+			}
+		} catch (error) {
+			console.error('Failed to load test data', error);
+		}
+	};
+
+	const createTest = async (workflowId: string) => {
+		if (isSaving.value) return;
+
+		isSaving.value = true;
+		fieldsIssues.value = [];
+
+		try {
+			const params = {
+				name: state.value.name.value,
+				workflowId,
+				description: state.value.description.value,
+			};
+			return await evaluationsStore.create(params);
+		} finally {
+			isSaving.value = false;
+		}
+	};
+
+	const deleteMetric = async (metricId: string, testId: string) => {
+		await evaluationsStore.deleteMetric({ id: metricId, testDefinitionId: testId });
+		state.value.metrics = state.value.metrics.filter((metric) => metric.id !== metricId);
+	};
+
+	const updateMetrics = async (testId: string) => {
+		const promises = state.value.metrics.map(async (metric) => {
+			if (!metric.name) return;
+			if (!metric.id) {
+				const createdMetric = await evaluationsStore.createMetric({
+					name: metric.name,
+					testDefinitionId: testId,
+				});
+				metric.id = createdMetric.id;
+			} else {
+				await evaluationsStore.updateMetric({
+					name: metric.name,
+					id: metric.id,
+					testDefinitionId: testId,
+				});
+			}
+		});
+		isSaving.value = true;
+		await Promise.all(promises);
+		isSaving.value = false;
+	};
+
+	const updateTest = async (testId: string) => {
+		if (isSaving.value) return;
+
+		isSaving.value = true;
+		fieldsIssues.value = [];
+
+		try {
+			if (!testId) {
+				throw new Error('Test ID is required for updating a test');
+			}
+
+			const params: UpdateTestDefinitionParams = {
+				name: state.value.name.value,
+				description: state.value.description.value,
+			};
+
+			if (state.value.evaluationWorkflow.value) {
+				params.evaluationWorkflowId = state.value.evaluationWorkflow.value.toString();
+			}
+
+			const annotationTagId = state.value.tags.value[0];
+			if (annotationTagId) {
+				params.annotationTagId = annotationTagId;
+			}
+			if (state.value.mockedNodes.length > 0) {
+				params.mockedNodes = state.value.mockedNodes;
+			}
+
+			const response = await evaluationsStore.update({ ...params, id: testId });
+			return response;
+		} finally {
+			isSaving.value = false;
+		}
+	};
+
+	/**
+	 * Start editing an editable field by copying `value` to `tempValue`.
+	 */
+	function startEditing<T extends keyof EditableFormState>(field: T) {
+		const fieldObj = editableFields.value[field];
+		if (fieldObj.isEditing) {
+			// Already editing, do nothing
+			return;
+		}
+
+		if (Array.isArray(fieldObj.value)) {
+			fieldObj.tempValue = [...fieldObj.value];
+		} else {
+			fieldObj.tempValue = fieldObj.value;
+		}
+		fieldObj.isEditing = true;
+	}
+	/**
+	 * Save changes by copying `tempValue` back into `value`.
+	 */
+	function saveChanges<T extends keyof EditableFormState>(field: T) {
+		const fieldObj = editableFields.value[field];
+		fieldObj.value = Array.isArray(fieldObj.tempValue)
+			? [...fieldObj.tempValue]
+			: fieldObj.tempValue;
+		fieldObj.isEditing = false;
+	}
+
+	/**
+	 * Cancel editing and revert `tempValue` from `value`.
+	 */
+	function cancelEditing<T extends keyof EditableFormState>(field: T) {
+		const fieldObj = editableFields.value[field];
+		if (Array.isArray(fieldObj.value)) {
+			fieldObj.tempValue = [...fieldObj.value];
+		} else {
+			fieldObj.tempValue = fieldObj.value;
+		}
+		fieldObj.isEditing = false;
+	}
+
+	/**
+	 * Handle keyboard events during editing.
+	 */
+	function handleKeydown<T extends keyof EditableFormState>(event: KeyboardEvent, field: T) {
+		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),
+		deleteMetric,
+		updateMetrics,
+		loadTestData,
+		createTest,
+		updateTest,
+		startEditing,
+		saveChanges,
+		cancelEditing,
+		handleKeydown,
+	};
+}
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue b/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
new file mode 100644
index 0000000000..24913d2f95
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/shared/TableCell.vue
@@ -0,0 +1,76 @@
+<script setup lang="ts" generic="T">
+import { useI18n } from '@/composables/useI18n';
+import type { TestTableColumn } from './TestTableBase.vue';
+import { useRouter } from 'vue-router';
+
+defineProps<{
+	column: TestTableColumn<T>;
+	row: T;
+}>();
+
+defineEmits<{
+	click: [];
+}>();
+
+const locale = useI18n();
+const router = useRouter();
+interface WithStatus {
+	status: string;
+}
+
+function hasStatus(row: unknown): row is WithStatus {
+	return typeof row === 'object' && row !== null && 'status' in row;
+}
+
+const statusThemeMap: Record<string, string> = {
+	new: 'info',
+	running: 'warning',
+	completed: 'success',
+	error: 'danger',
+	success: 'success',
+	cancelled: 'default',
+};
+
+const statusLabelMap: Record<string, string> = {
+	new: locale.baseText('testDefinition.listRuns.status.new'),
+	running: locale.baseText('testDefinition.listRuns.status.running'),
+	completed: locale.baseText('testDefinition.listRuns.status.completed'),
+	error: locale.baseText('testDefinition.listRuns.status.error'),
+	success: locale.baseText('testDefinition.listRuns.status.success'),
+	cancelled: locale.baseText('testDefinition.listRuns.status.cancelled'),
+};
+
+function hasProperty(row: unknown, prop: string): row is Record<string, unknown> {
+	return typeof row === 'object' && row !== null && prop in row;
+}
+
+const getCellContent = (column: TestTableColumn<T>, row: T) => {
+	if (column.formatter) {
+		return column.formatter(row);
+	}
+	return hasProperty(row, column.prop) ? row[column.prop] : undefined;
+};
+</script>
+
+<template>
+	<div v-if="column.route">
+		<a v-if="column.openInNewTab" :href="router.resolve(column.route(row)).href" target="_blank">
+			{{ getCellContent(column, row) }}
+		</a>
+		<router-link v-else :to="column.route(row)">
+			{{ getCellContent(column, row) }}
+		</router-link>
+	</div>
+
+	<N8nBadge
+		v-else-if="column.prop === 'status' && hasStatus(row)"
+		:theme="statusThemeMap[row.status]"
+		class="mr-4xs"
+	>
+		{{ statusLabelMap[row.status] }}
+	</N8nBadge>
+
+	<div v-else>
+		{{ getCellContent(column, row) }}
+	</div>
+</template>
diff --git a/packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue b/packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
new file mode 100644
index 0000000000..8f2001d640
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/shared/TestTableBase.vue
@@ -0,0 +1,152 @@
+<script setup lang="ts" generic="T extends object">
+import type { RouteLocationRaw } from 'vue-router';
+import TableCell from './TableCell.vue';
+import { ElTable, ElTableColumn } from 'element-plus';
+import { ref, watch, nextTick, onMounted, onUnmounted } from 'vue';
+import type { TableInstance } from 'element-plus';
+import { isEqual } from 'lodash-es';
+/**
+ * A reusable table component for displaying evaluation results data
+ * @template T - The type of data being displayed in the table rows
+ */
+
+/**
+ * Configuration for a table column
+ * @template TRow - The type of data in each table row
+ */
+export type TestTableColumn<TRow> = {
+	prop: string;
+	label: string;
+	width?: number;
+	sortable?: boolean;
+	filters?: Array<{ text: string; value: string }>;
+	filterMethod?: (value: string, row: TRow) => boolean;
+	route?: (row: TRow) => RouteLocationRaw;
+	sortMethod?: (a: TRow, b: TRow) => number;
+	openInNewTab?: boolean;
+	formatter?: (row: TRow) => string;
+};
+
+type TableRow = T & { id: string };
+
+const MIN_TABLE_HEIGHT = 350;
+const MAX_TABLE_HEIGHT = 1400;
+const props = withDefaults(
+	defineProps<{
+		data: TableRow[];
+		columns: Array<TestTableColumn<TableRow>>;
+		showControls?: boolean;
+		defaultSort?: { prop: string; order: 'ascending' | 'descending' };
+		selectable?: boolean;
+		selectableFilter?: (row: TableRow) => boolean;
+	}>(),
+	{
+		defaultSort: () => ({ prop: 'date', order: 'descending' }),
+		selectable: false,
+		selectableFilter: () => true,
+	},
+);
+
+const tableRef = ref<TableInstance>();
+const selectedRows = ref<TableRow[]>([]);
+const localData = ref<TableRow[]>([]);
+const tableHeight = ref<string>('100%');
+const emit = defineEmits<{
+	rowClick: [row: TableRow];
+	selectionChange: [rows: TableRow[]];
+}>();
+
+// Watch for changes to the data prop and update the local data state
+// This preserves selected rows when the data changes by:
+// 1. Storing current selection IDs
+// 2. Updating local data with new data
+// 3. Re-applying default sort
+// 4. Re-selecting previously selected rows that still exist in new data
+watch(
+	() => props.data,
+	async (newData) => {
+		if (!isEqual(localData.value, newData)) {
+			const currentSelectionIds = selectedRows.value.map((row) => row.id);
+
+			localData.value = newData;
+			await nextTick();
+
+			tableRef.value?.sort(props.defaultSort.prop, props.defaultSort.order);
+			currentSelectionIds.forEach((id) => {
+				const row = localData.value.find((r) => r.id === id);
+				if (row) {
+					tableRef.value?.toggleRowSelection(row, true);
+				}
+			});
+		}
+	},
+	{ immediate: true, deep: true },
+);
+
+const handleSelectionChange = (rows: TableRow[]) => {
+	selectedRows.value = rows;
+	emit('selectionChange', rows);
+};
+
+const computeTableHeight = () => {
+	const containerHeight = tableRef.value?.$el?.parentElement?.clientHeight ?? 600;
+	const height = Math.min(Math.max(containerHeight, MIN_TABLE_HEIGHT), MAX_TABLE_HEIGHT);
+	tableHeight.value = `${height - 100}px`;
+};
+
+onMounted(() => {
+	computeTableHeight();
+
+	window.addEventListener('resize', computeTableHeight);
+});
+
+onUnmounted(() => {
+	window.removeEventListener('resize', computeTableHeight);
+});
+</script>
+
+<template>
+	<ElTable
+		ref="tableRef"
+		:class="$style.table"
+		:default-sort="defaultSort"
+		:data="localData"
+		:border="true"
+		:max-height="tableHeight"
+		resizable
+		@selection-change="handleSelectionChange"
+		@vue:mounted="computeTableHeight"
+	>
+		<ElTableColumn
+			v-if="selectable"
+			type="selection"
+			:selectable="selectableFilter"
+			data-test-id="table-column-select"
+		/>
+		<ElTableColumn
+			v-for="column in columns"
+			:key="column.prop"
+			v-bind="column"
+			:resizable="true"
+			data-test-id="table-column"
+		>
+			<template #default="{ row }">
+				<TableCell
+					:key="row.status"
+					:column="column"
+					:row="row"
+					data-test-id="table-cell"
+					@click="$emit('rowClick', row)"
+				/>
+			</template>
+		</ElTableColumn>
+	</ElTable>
+</template>
+
+<style module lang="scss">
+.table {
+	:global(.el-table__cell) {
+		padding: var(--spacing-3xs) 0;
+	}
+}
+</style>
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..b9784ca284
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/tests/MetricsInput.test.ts
@@ -0,0 +1,139 @@
+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: Array<{ name: string }> };
+
+	beforeEach(() => {
+		props = {
+			modelValue: [{ name: 'Metric 1' }, { name: '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: [{ name: '' }],
+			},
+		});
+		const inputs = getAllByPlaceholderText('Enter metric name');
+		await userEvent.type(inputs[0], 'Updated Metric 1');
+
+		// Every character typed triggers an update event. Let's check the last emission.
+		const allEmits = emitted('update:modelValue');
+		expect(allEmits).toBeTruthy();
+		// The last emission should contain the fully updated name
+		const lastEmission = allEmits[allEmits.length - 1];
+		expect(lastEmission).toEqual([[{ name: 'Updated Metric 1' }]]);
+	});
+
+	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');
+
+		await userEvent.click(addButton);
+		await userEvent.click(addButton);
+		await userEvent.click(addButton);
+
+		// Each click adds a new metric
+		const updateEvents = emitted('update:modelValue');
+		expect(updateEvents).toHaveLength(3);
+
+		// Check the structure of one of the emissions
+		// Initial: [{ name: 'Metric 1' }, { name: 'Metric 2' }]
+		// After first click: [{ name: 'Metric 1' }, { name: 'Metric 2' }, { name: '' }]
+		expect(updateEvents[0]).toEqual([[{ name: 'Metric 1' }, { name: 'Metric 2' }, { name: '' }]]);
+	});
+
+	it('should emit "deleteMetric" event when a delete button is clicked', async () => {
+		const { getAllByRole, emitted } = renderComponent({ props });
+
+		// Each metric row has a delete button, identified by "button"
+		const deleteButtons = getAllByRole('button', { name: '' });
+		expect(deleteButtons).toHaveLength(props.modelValue.length);
+
+		// Click on the delete button for the second metric
+		await userEvent.click(deleteButtons[1]);
+
+		expect(emitted('deleteMetric')).toBeTruthy();
+		expect(emitted('deleteMetric')[0]).toEqual([{ name: 'Metric 2' }]);
+	});
+
+	it('should emit multiple update events as the user types and reflect the final name correctly', async () => {
+		const { getAllByPlaceholderText, emitted } = renderComponent({
+			props: {
+				modelValue: [{ name: '' }],
+			},
+		});
+		const inputs = getAllByPlaceholderText('Enter metric name');
+		await userEvent.type(inputs[0], 'ABC');
+
+		const allEmits = emitted('update:modelValue');
+		expect(allEmits).toBeTruthy();
+		// Each character typed should emit a new value
+		expect(allEmits.length).toBe(3);
+		expect(allEmits[2]).toEqual([[{ name: 'ABC' }]]);
+	});
+
+	it('should not break if metrics are empty and still allow adding a new metric', async () => {
+		props.modelValue = [];
+		const { queryAllByRole, getByText, emitted } = renderComponent({ props });
+
+		// No metrics initially
+		const inputs = queryAllByRole('textbox');
+		expect(inputs).toHaveLength(0);
+
+		const addButton = getByText('New metric');
+		await userEvent.click(addButton);
+
+		const updates = emitted('update:modelValue');
+		expect(updates).toBeTruthy();
+		expect(updates[0]).toEqual([[{ name: '' }]]);
+
+		// After adding one metric, we should now have an input
+		const { getAllByPlaceholderText } = renderComponent({
+			props: { modelValue: [{ name: '' }] },
+		});
+		const updatedInputs = getAllByPlaceholderText('Enter metric name');
+		expect(updatedInputs).toHaveLength(1);
+	});
+
+	it('should handle deleting the first metric and still display remaining metrics correctly', async () => {
+		const { getAllByPlaceholderText, getAllByRole, rerender, emitted } = renderComponent({
+			props,
+		});
+		const inputs = getAllByPlaceholderText('Enter metric name');
+		expect(inputs).toHaveLength(2);
+
+		const deleteButtons = getAllByRole('button', { name: '' });
+		await userEvent.click(deleteButtons[0]);
+
+		expect(emitted('deleteMetric')).toBeTruthy();
+		expect(emitted('deleteMetric')[0]).toEqual([{ name: 'Metric 1' }]);
+
+		await rerender({ modelValue: [{ name: 'Metric 2' }] });
+		const updatedInputs = getAllByPlaceholderText('Enter metric name');
+		expect(updatedInputs).toHaveLength(1);
+		expect(updatedInputs[0]).toHaveValue('Metric 2');
+	});
+});
diff --git a/packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts b/packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts
new file mode 100644
index 0000000000..924ccecfde
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/tests/useMetricsChart.test.ts
@@ -0,0 +1,127 @@
+import { describe, it, expect } from 'vitest';
+import { useMetricsChart } from '../composables/useMetricsChart';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+
+describe('useMetricsChart', () => {
+	const mockRuns: TestRunRecord[] = [
+		{
+			id: '1',
+			testDefinitionId: 'test1',
+			status: 'completed',
+			createdAt: '2025-01-06T10:00:00Z',
+			updatedAt: '2025-01-06T10:00:00Z',
+			completedAt: '2025-01-06T10:00:00Z',
+			runAt: '2025-01-06T10:00:00Z',
+			metrics: { responseTime: 100, successRate: 95 },
+		},
+		{
+			id: '2',
+			testDefinitionId: 'test1',
+			status: 'completed',
+			createdAt: '2025-01-06T10:00:00Z',
+			updatedAt: '2025-01-06T10:00:00Z',
+			completedAt: '2025-01-06T10:00:00Z',
+			runAt: '2025-01-06T10:00:00Z',
+			metrics: { responseTime: 150, successRate: 98 },
+		},
+	] as TestRunRecord[];
+
+	describe('generateChartData', () => {
+		it('should generate correct chart data structure', () => {
+			const { generateChartData } = useMetricsChart('light');
+			const result = generateChartData(mockRuns, 'responseTime');
+
+			expect(result.labels).toHaveLength(2);
+			expect(result.datasets).toHaveLength(1);
+			expect(result.datasets[0].data).toEqual([100, 150]);
+		});
+
+		it('should sort runs by date', () => {
+			const unsortedRuns = [
+				{
+					id: '1',
+					testDefinitionId: 'test1',
+					status: 'completed',
+					createdAt: '2025-01-06T10:05:00Z',
+					updatedAt: '2025-01-06T10:05:00Z',
+					completedAt: '2025-01-06T10:05:00Z',
+					runAt: '2025-01-06T10:05:00Z',
+					metrics: { responseTime: 150 },
+				},
+				{
+					id: '2',
+					testDefinitionId: 'test1',
+					status: 'completed',
+					createdAt: '2025-01-06T10:00:00Z',
+					updatedAt: '2025-01-06T10:00:00Z',
+					completedAt: '2025-01-06T10:00:00Z',
+					runAt: '2025-01-06T10:00:00Z',
+					metrics: { responseTime: 100 },
+				},
+			] as TestRunRecord[];
+
+			const { generateChartData } = useMetricsChart('light');
+			const result = generateChartData(unsortedRuns, 'responseTime');
+
+			expect(result.datasets[0].data).toEqual([100, 150]);
+		});
+
+		it('should filter out runs without specified metric', () => {
+			const runsWithMissingMetrics = [
+				{
+					id: '1',
+					testDefinitionId: 'test1',
+					status: 'completed',
+					createdAt: '2025-01-06T10:00:00Z',
+					updatedAt: '2025-01-06T10:00:00Z',
+					completedAt: '2025-01-06T10:00:00Z',
+					runAt: '2025-01-06T10:00:00Z',
+					metrics: { responseTime: 100 },
+				},
+				{
+					id: '2',
+					testDefinitionId: 'test1',
+					status: 'completed',
+					createdAt: '2025-01-06T10:00:00Z',
+					updatedAt: '2025-01-06T10:00:00Z',
+					completedAt: '2025-01-06T10:00:00Z',
+					runAt: '2025-01-06T10:00:00Z',
+					metrics: {},
+				},
+			] as TestRunRecord[];
+
+			const { generateChartData } = useMetricsChart('light');
+			const result = generateChartData(runsWithMissingMetrics, 'responseTime');
+
+			expect(result.labels).toHaveLength(1);
+			expect(result.datasets[0].data).toEqual([100]);
+		});
+
+		it('should handle dark theme colors', () => {
+			const { generateChartData } = useMetricsChart('dark');
+			const result = generateChartData(mockRuns, 'responseTime');
+
+			expect(result.datasets[0].pointHoverBackgroundColor).toBe('rgb(32, 32, 32)');
+		});
+	});
+
+	describe('generateChartOptions', () => {
+		it('should generate correct chart options structure', () => {
+			const { generateChartOptions } = useMetricsChart('light');
+			const result = generateChartOptions({ metric: 'responseTime', xTitle: 'Time' });
+
+			expect(result.scales?.y?.title?.text).toBe('responseTime');
+			expect(result.scales?.x?.title?.text).toBe('Time');
+			expect(result.responsive).toBe(true);
+			expect(result.maintainAspectRatio).toBe(false);
+		});
+
+		it('should apply correct theme colors', () => {
+			const { generateChartOptions } = useMetricsChart('dark');
+			const result = generateChartOptions({ metric: 'responseTime', xTitle: 'Time' });
+
+			expect(result.scales?.y?.ticks?.color).toBe('rgb(255, 255, 255)');
+			expect(result.plugins?.tooltip?.backgroundColor).toBe('rgb(32, 32, 32)');
+		});
+	});
+});
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..05f9d83038
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/tests/useTestDefinitionForm.test.ts
@@ -0,0 +1,333 @@
+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',
+	annotationTag: null,
+};
+const TEST_DEF_B: TestDefinitionRecord = {
+	id: '2',
+	name: 'Test Definition B',
+	workflowId: '123',
+	description: 'Description B',
+	annotationTag: null,
+};
+const TEST_DEF_NEW: TestDefinitionRecord = {
+	id: '3',
+	workflowId: '123',
+	name: 'New Test Definition',
+	description: 'New Description',
+	annotationTag: null,
+};
+
+beforeEach(() => {
+	const pinia = createTestingPinia();
+	setActivePinia(pinia);
+});
+
+afterEach(() => {
+	vi.clearAllMocks();
+});
+
+describe('useTestDefinitionForm', () => {
+	it('should initialize with default props', () => {
+		const { state } = useTestDefinitionForm();
+
+		expect(state.value.description.value).toBe('');
+		expect(state.value.name.value).toContain('My Test');
+		expect(state.value.tags.value).toEqual([]);
+		expect(state.value.metrics).toEqual([]);
+		expect(state.value.evaluationWorkflow.value).toBe('');
+	});
+
+	it('should load test data', async () => {
+		const { loadTestData, state } = useTestDefinitionForm();
+		const fetchSpy = vi.spyOn(useTestDefinitionStore(), 'fetchAll');
+		const fetchMetricsSpy = vi.spyOn(useTestDefinitionStore(), 'fetchMetrics').mockResolvedValue([
+			{
+				id: 'metric1',
+				name: 'Metric 1',
+				testDefinitionId: TEST_DEF_A.id,
+			},
+		]);
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+
+		evaluationsStore.testDefinitionsById = {
+			[TEST_DEF_A.id]: TEST_DEF_A,
+			[TEST_DEF_B.id]: TEST_DEF_B,
+		};
+
+		await loadTestData(TEST_DEF_A.id);
+		expect(fetchSpy).toBeCalled();
+		expect(fetchMetricsSpy).toBeCalledWith(TEST_DEF_A.id);
+		expect(state.value.name.value).toEqual(TEST_DEF_A.name);
+		expect(state.value.description.value).toEqual(TEST_DEF_A.description);
+		expect(state.value.tags.value).toEqual([TEST_DEF_A.annotationTagId]);
+		expect(state.value.evaluationWorkflow.value).toEqual(TEST_DEF_A.evaluationWorkflowId);
+		expect(state.value.metrics).toEqual([
+			{ id: 'metric1', name: 'Metric 1', testDefinitionId: TEST_DEF_A.id },
+		]);
+	});
+
+	it('should gracefully handle loadTestData when no test definition found', async () => {
+		const { loadTestData, state } = useTestDefinitionForm();
+		const fetchSpy = vi.spyOn(useTestDefinitionStore(), 'fetchAll');
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+
+		evaluationsStore.testDefinitionsById = {};
+
+		await loadTestData('unknown-id');
+		expect(fetchSpy).toBeCalled();
+		// Should remain unchanged since no definition found
+		expect(state.value.description.value).toBe('');
+		expect(state.value.name.value).toContain('My Test');
+		expect(state.value.tags.value).toEqual([]);
+		expect(state.value.metrics).toEqual([]);
+	});
+
+	it('should handle errors while loading test data', async () => {
+		const { loadTestData } = useTestDefinitionForm();
+		const fetchSpy = vi
+			.spyOn(useTestDefinitionStore(), 'fetchAll')
+			.mockRejectedValue(new Error('Fetch Failed'));
+		const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
+
+		await loadTestData(TEST_DEF_A.id);
+		expect(fetchSpy).toBeCalled();
+		expect(consoleErrorSpy).toBeCalledWith('Failed to load test data', expect.any(Error));
+		consoleErrorSpy.mockRestore();
+	});
+
+	it('should save a new test', async () => {
+		const { createTest, state } = useTestDefinitionForm();
+		const createSpy = vi.spyOn(useTestDefinitionStore(), 'create').mockResolvedValue(TEST_DEF_NEW);
+
+		state.value.name.value = TEST_DEF_NEW.name;
+		state.value.description.value = 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 handle errors when creating a new test', async () => {
+		const { createTest } = useTestDefinitionForm();
+		const createSpy = vi
+			.spyOn(useTestDefinitionStore(), 'create')
+			.mockRejectedValue(new Error('Create Failed'));
+
+		await expect(createTest('123')).rejects.toThrow('Create Failed');
+		expect(createSpy).toBeCalled();
+	});
+
+	it('should update an existing test', async () => {
+		const { updateTest, state } = useTestDefinitionForm();
+		const updatedBTest = {
+			...TEST_DEF_B,
+			updatedAt: '2022-01-01T00:00:00.000Z',
+			createdAt: '2022-01-01T00:00:00.000Z',
+		};
+		const updateSpy = vi.spyOn(useTestDefinitionStore(), 'update').mockResolvedValue(updatedBTest);
+
+		state.value.name.value = TEST_DEF_B.name;
+		state.value.description.value = 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(updatedBTest);
+	});
+
+	it('should throw an error if no testId is provided when updating a test', async () => {
+		const { updateTest } = useTestDefinitionForm();
+		await expect(updateTest('')).rejects.toThrow('Test ID is required for updating a test');
+	});
+
+	it('should handle errors when updating a test', async () => {
+		const { updateTest, state } = useTestDefinitionForm();
+		const updateSpy = vi
+			.spyOn(useTestDefinitionStore(), 'update')
+			.mockRejectedValue(new Error('Update Failed'));
+
+		state.value.name.value = 'Test';
+		state.value.description.value = 'Some description';
+
+		await expect(updateTest(TEST_DEF_A.id)).rejects.toThrow('Update Failed');
+		expect(updateSpy).toBeCalled();
+	});
+
+	it('should delete a metric', async () => {
+		const { state, deleteMetric } = useTestDefinitionForm();
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+		const deleteMetricSpy = vi.spyOn(evaluationsStore, 'deleteMetric');
+
+		state.value.metrics = [
+			{
+				id: 'metric1',
+				name: 'Metric 1',
+				testDefinitionId: '1',
+			},
+			{
+				id: 'metric2',
+				name: 'Metric 2',
+				testDefinitionId: '1',
+			},
+		];
+
+		await deleteMetric('metric1', TEST_DEF_A.id);
+		expect(deleteMetricSpy).toBeCalledWith({ id: 'metric1', testDefinitionId: TEST_DEF_A.id });
+		expect(state.value.metrics).toEqual([
+			{ id: 'metric2', name: 'Metric 2', testDefinitionId: '1' },
+		]);
+	});
+
+	it('should update metrics', async () => {
+		const { state, updateMetrics } = useTestDefinitionForm();
+		const evaluationsStore = mockedStore(useTestDefinitionStore);
+		const updateMetricSpy = vi.spyOn(evaluationsStore, 'updateMetric');
+		const createMetricSpy = vi
+			.spyOn(evaluationsStore, 'createMetric')
+			.mockResolvedValue({ id: 'metric_new', name: 'Metric 2', testDefinitionId: TEST_DEF_A.id });
+
+		state.value.metrics = [
+			{
+				id: 'metric1',
+				name: 'Metric 1',
+				testDefinitionId: TEST_DEF_A.id,
+			},
+			{
+				id: '',
+				name: 'Metric 2',
+				testDefinitionId: TEST_DEF_A.id,
+			}, // New metric that needs creation
+		];
+
+		await updateMetrics(TEST_DEF_A.id);
+		expect(createMetricSpy).toHaveBeenCalledWith({
+			name: 'Metric 2',
+			testDefinitionId: TEST_DEF_A.id,
+		});
+		expect(updateMetricSpy).toHaveBeenCalledWith({
+			name: 'Metric 1',
+			id: 'metric1',
+			testDefinitionId: TEST_DEF_A.id,
+		});
+		expect(state.value.metrics).toEqual([
+			{ id: 'metric1', name: 'Metric 1', testDefinitionId: TEST_DEF_A.id },
+			{ id: 'metric_new', name: 'Metric 2', testDefinitionId: TEST_DEF_A.id },
+		]);
+	});
+
+	it('should start editing a field', () => {
+		const { state, startEditing } = useTestDefinitionForm();
+
+		startEditing('name');
+		expect(state.value.name.isEditing).toBe(true);
+		expect(state.value.name.tempValue).toBe(state.value.name.value);
+
+		startEditing('tags');
+		expect(state.value.tags.isEditing).toBe(true);
+		expect(state.value.tags.tempValue).toEqual(state.value.tags.value);
+	});
+
+	it('should do nothing if startEditing is called while already editing', () => {
+		const { state, startEditing } = useTestDefinitionForm();
+		state.value.name.isEditing = true;
+		state.value.name.tempValue = 'Original Name';
+
+		startEditing('name');
+		// Should remain unchanged because it was already editing
+		expect(state.value.name.isEditing).toBe(true);
+		expect(state.value.name.tempValue).toBe('Original Name');
+	});
+
+	it('should save changes to a field', () => {
+		const { state, startEditing, saveChanges } = useTestDefinitionForm();
+
+		// Name
+		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');
+
+		// Tags
+		startEditing('tags');
+		state.value.tags.tempValue = ['123'];
+		saveChanges('tags');
+		expect(state.value.tags.isEditing).toBe(false);
+		expect(state.value.tags.value).toEqual(['123']);
+	});
+
+	it('should cancel editing a field', () => {
+		const { state, startEditing, cancelEditing } = useTestDefinitionForm();
+
+		const originalName = state.value.name.value;
+		startEditing('name');
+		state.value.name.tempValue = 'New Name';
+		cancelEditing('name');
+		expect(state.value.name.isEditing).toBe(false);
+		expect(state.value.name.tempValue).toBe(originalName);
+
+		const originalTags = [...state.value.tags.value];
+		startEditing('tags');
+		state.value.tags.tempValue = ['123'];
+		cancelEditing('tags');
+		expect(state.value.tags.isEditing).toBe(false);
+		expect(state.value.tags.tempValue).toEqual(originalTags);
+	});
+
+	it('should handle keydown - Escape', () => {
+		const { state, startEditing, handleKeydown } = useTestDefinitionForm();
+
+		startEditing('name');
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Escape' }), 'name');
+		expect(state.value.name.isEditing).toBe(false);
+
+		startEditing('tags');
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Escape' }), 'tags');
+		expect(state.value.tags.isEditing).toBe(false);
+	});
+
+	it('should handle keydown - Enter', () => {
+		const { state, startEditing, handleKeydown } = useTestDefinitionForm();
+
+		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');
+
+		startEditing('tags');
+		state.value.tags.tempValue = ['123'];
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Enter' }), 'tags');
+		expect(state.value.tags.isEditing).toBe(false);
+		expect(state.value.tags.value).toEqual(['123']);
+	});
+
+	it('should not save changes when shift+Enter is pressed', () => {
+		const { state, startEditing, handleKeydown } = useTestDefinitionForm();
+
+		startEditing('name');
+		state.value.name.tempValue = 'New Name With Shift';
+		handleKeydown(new KeyboardEvent('keydown', { key: 'Enter', shiftKey: true }), 'name');
+		expect(state.value.name.isEditing).toBe(true);
+		expect(state.value.name.value).not.toBe('New Name With Shift');
+	});
+});
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..087784f709
--- /dev/null
+++ b/packages/editor-ui/src/components/TestDefinition/types.ts
@@ -0,0 +1,36 @@
+import type { TestMetricRecord, TestRunRecord } from '@/api/testDefinition.ee';
+import type { INodeParameterResourceLocator } from 'n8n-workflow';
+
+export interface EditableField<T = string> {
+	value: T;
+	tempValue: T;
+	isEditing: boolean;
+}
+
+export interface EditableFormState {
+	name: EditableField<string>;
+	tags: EditableField<string[]>;
+	description: EditableField<string>;
+}
+
+export interface EvaluationFormState extends EditableFormState {
+	evaluationWorkflow: INodeParameterResourceLocator;
+	metrics: TestMetricRecord[];
+	mockedNodes: Array<{ name: string; id: string }>;
+}
+
+export interface TestExecution {
+	lastRun: string | null;
+	errorRate: number | null;
+	metrics: Record<string, number>;
+	status: TestRunRecord['status'];
+	id: string | null;
+}
+
+export interface TestListItem {
+	id: string;
+	name: string;
+	tagName: string;
+	testCases: number;
+	execution: TestExecution;
+}
diff --git a/packages/editor-ui/src/components/TextEdit.vue b/packages/editor-ui/src/components/TextEdit.vue
index e884a0d7d6..02d01413ec 100644
--- a/packages/editor-ui/src/components/TextEdit.vue
+++ b/packages/editor-ui/src/components/TextEdit.vue
@@ -2,6 +2,7 @@
 import { ref, watch, onMounted, nextTick } from 'vue';
 import type { INodeProperties } from 'n8n-workflow';
 import { APP_MODALS_ELEMENT_ID } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps<{
 	dialogVisible: boolean;
@@ -19,6 +20,8 @@ const emit = defineEmits<{
 const inputField = ref<HTMLInputElement | null>(null);
 const tempValue = ref('');
 
+const i18n = useI18n();
+
 watch(
 	() => props.dialogVisible,
 	async (newValue) => {
@@ -63,19 +66,19 @@ const closeDialog = () => {
 			:model-value="dialogVisible"
 			:append-to="`#${APP_MODALS_ELEMENT_ID}`"
 			width="80%"
-			:title="`${$locale.baseText('textEdit.edit')} ${$locale
+			:title="`${i18n.baseText('textEdit.edit')} ${i18n
 				.nodeText()
 				.inputLabelDisplayName(parameter, path)}`"
 			:before-close="closeDialog"
 		>
-			<div class="ignore-key-press">
-				<n8n-input-label :label="$locale.nodeText().inputLabelDisplayName(parameter, path)">
+			<div class="ignore-key-press-canvas">
+				<n8n-input-label :label="i18n.nodeText().inputLabelDisplayName(parameter, path)">
 					<div @keydown.stop @keydown.esc="onKeyDownEsc">
 						<n8n-input
 							ref="inputField"
 							v-model="tempValue"
 							type="textarea"
-							:placeholder="$locale.nodeText().placeholder(parameter, path)"
+							:placeholder="i18n.nodeText().placeholder(parameter, path)"
 							:read-only="isReadOnly"
 							:rows="15"
 							@update:model-value="valueChanged"
diff --git a/packages/editor-ui/src/components/__tests__/TextWithHIghlights.test.ts b/packages/editor-ui/src/components/TextWithHIghlights.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/TextWithHIghlights.test.ts
rename to packages/editor-ui/src/components/TextWithHIghlights.test.ts
diff --git a/packages/editor-ui/src/components/TriggerPanel.vue b/packages/editor-ui/src/components/TriggerPanel.vue
index 0702f34c49..ea998de9ef 100644
--- a/packages/editor-ui/src/components/TriggerPanel.vue
+++ b/packages/editor-ui/src/components/TriggerPanel.vue
@@ -1,6 +1,5 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
+<script setup lang="ts">
+import { computed, ref } from 'vue';
 import {
 	CHAT_TRIGGER_NODE_TYPE,
 	VIEWS,
@@ -22,336 +21,348 @@ import { createEventBus } from 'n8n-design-system/utils';
 import { useRouter } from 'vue-router';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { isTriggerPanelObject } from '@/utils/typeGuards';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 
-export default defineComponent({
-	name: 'TriggerPanel',
-	components: {
-		NodeExecuteButton,
-		CopyInput,
-		NodeIcon,
+const props = withDefaults(
+	defineProps<{
+		nodeName: string;
+		pushRef: string;
+	}>(),
+	{
+		pushRef: '',
 	},
-	props: {
-		nodeName: {
-			type: String,
-			required: true,
-		},
-		pushRef: {
-			type: String,
-			default: '',
-		},
-	},
-	emits: { activate: null, execute: null },
-	setup() {
-		const router = useRouter();
-		const workflowHelpers = useWorkflowHelpers({ router });
+);
 
-		return {
-			workflowHelpers,
-		};
-	},
-	data: () => {
-		return {
-			executionsHelpEventBus: createEventBus(),
-		};
-	},
-	computed: {
-		...mapStores(useNodeTypesStore, useNDVStore, useUIStore, useWorkflowsStore),
-		node(): INodeUi | null {
-			return this.workflowsStore.getNodeByName(this.nodeName);
-		},
-		nodeType(): INodeTypeDescription | null {
-			if (this.node) {
-				return this.nodeTypesStore.getNodeType(this.node.type, this.node.typeVersion);
-			}
+const emit = defineEmits<{
+	activate: [];
+	execute: [];
+}>();
 
-			return null;
-		},
-		triggerPanel() {
-			const panel = this.nodeType?.triggerPanel;
-			if (isTriggerPanelObject(panel)) {
-				return panel;
-			}
-			return undefined;
-		},
-		hideContent(): boolean {
-			const hideContent = this.triggerPanel?.hideContent;
-			if (typeof hideContent === 'boolean') {
-				return hideContent;
-			}
+const nodesTypeStore = useNodeTypesStore();
+const uiStore = useUIStore();
+const workflowsStore = useWorkflowsStore();
+const ndvStore = useNDVStore();
 
-			if (this.node) {
-				const hideContentValue = this.workflowHelpers
-					.getCurrentWorkflow()
-					.expression.getSimpleParameterValue(this.node, hideContent, 'internal', {});
+const router = useRouter();
+const workflowHelpers = useWorkflowHelpers({ router });
+const i18n = useI18n();
+const telemetry = useTelemetry();
 
-				if (typeof hideContentValue === 'boolean') {
-					return hideContentValue;
-				}
-			}
+const executionsHelpEventBus = createEventBus();
 
-			return false;
-		},
-		hasIssues(): boolean {
-			return Boolean(
-				this.node?.issues && (this.node.issues.parameters ?? this.node.issues.credentials),
-			);
-		},
-		serviceName(): string {
-			if (this.nodeType) {
-				return getTriggerNodeServiceName(this.nodeType);
-			}
+const help = ref<HTMLElement | null>(null);
 
-			return '';
-		},
-		displayChatButton(): boolean {
-			return Boolean(
-				this.node &&
-					this.node.type === CHAT_TRIGGER_NODE_TYPE &&
-					this.node.parameters.mode !== 'webhook',
-			);
-		},
-		isWebhookNode(): boolean {
-			return Boolean(this.node && this.node.type === WEBHOOK_NODE_TYPE);
-		},
-		webhookHttpMethod(): string | undefined {
-			if (!this.node || !this.nodeType?.webhooks?.length) {
-				return undefined;
-			}
+const node = computed<INodeUi | null>(() => workflowsStore.getNodeByName(props.nodeName));
 
-			const httpMethod = this.workflowHelpers.getWebhookExpressionValue(
-				this.nodeType.webhooks[0],
-				'httpMethod',
-				false,
-			);
+const nodeType = computed<INodeTypeDescription | null>(() => {
+	if (node.value) {
+		return nodesTypeStore.getNodeType(node.value.type, node.value.typeVersion);
+	}
 
-			if (Array.isArray(httpMethod)) {
-				return httpMethod.join(', ');
-			}
-
-			return httpMethod;
-		},
-		webhookTestUrl(): string | undefined {
-			if (!this.node || !this.nodeType?.webhooks?.length) {
-				return undefined;
-			}
-
-			return this.workflowHelpers.getWebhookUrl(this.nodeType.webhooks[0], this.node, 'test');
-		},
-		isWebhookBasedNode(): boolean {
-			return Boolean(this.nodeType?.webhooks?.length);
-		},
-		isPollingNode(): boolean {
-			return Boolean(this.nodeType?.polling);
-		},
-		isListeningForEvents(): boolean {
-			const waitingOnWebhook = this.workflowsStore.executionWaitingForWebhook;
-			const executedNode = this.workflowsStore.executedNode;
-			return (
-				!!this.node &&
-				!this.node.disabled &&
-				this.isWebhookBasedNode &&
-				waitingOnWebhook &&
-				(!executedNode || executedNode === this.nodeName)
-			);
-		},
-		workflowRunning(): boolean {
-			return this.uiStore.isActionActive['workflowRunning'];
-		},
-		isActivelyPolling(): boolean {
-			const triggeredNode = this.workflowsStore.executedNode;
-
-			return this.workflowRunning && this.isPollingNode && this.nodeName === triggeredNode;
-		},
-		isWorkflowActive(): boolean {
-			return this.workflowsStore.isWorkflowActive;
-		},
-		listeningTitle(): string {
-			return this.nodeType?.name === FORM_TRIGGER_NODE_TYPE
-				? this.$locale.baseText('ndv.trigger.webhookNode.formTrigger.listening')
-				: this.$locale.baseText('ndv.trigger.webhookNode.listening');
-		},
-		listeningHint(): string {
-			switch (this.nodeType?.name) {
-				case CHAT_TRIGGER_NODE_TYPE:
-					return this.$locale.baseText('ndv.trigger.webhookBasedNode.chatTrigger.serviceHint');
-				case FORM_TRIGGER_NODE_TYPE:
-					return this.$locale.baseText('ndv.trigger.webhookBasedNode.formTrigger.serviceHint');
-				default:
-					return this.$locale.baseText('ndv.trigger.webhookBasedNode.serviceHint', {
-						interpolate: { service: this.serviceName },
-					});
-			}
-		},
-		header(): string {
-			const serviceName = this.nodeType ? getTriggerNodeServiceName(this.nodeType) : '';
-
-			if (this.isActivelyPolling) {
-				return this.$locale.baseText('ndv.trigger.pollingNode.fetchingEvent');
-			}
-
-			if (this.triggerPanel?.header) {
-				return this.triggerPanel.header;
-			}
-
-			if (this.isWebhookBasedNode) {
-				return this.$locale.baseText('ndv.trigger.webhookBasedNode.action', {
-					interpolate: { name: serviceName },
-				});
-			}
-
-			return '';
-		},
-		subheader(): string {
-			const serviceName = this.nodeType ? getTriggerNodeServiceName(this.nodeType) : '';
-			if (this.isActivelyPolling) {
-				return this.$locale.baseText('ndv.trigger.pollingNode.fetchingHint', {
-					interpolate: { name: serviceName },
-				});
-			}
-
-			return '';
-		},
-		executionsHelp(): string {
-			if (this.triggerPanel?.executionsHelp) {
-				if (typeof this.triggerPanel.executionsHelp === 'string') {
-					return this.triggerPanel.executionsHelp;
-				}
-				if (!this.isWorkflowActive && this.triggerPanel.executionsHelp.inactive) {
-					return this.triggerPanel.executionsHelp.inactive;
-				}
-				if (this.isWorkflowActive && this.triggerPanel.executionsHelp.active) {
-					return this.triggerPanel.executionsHelp.active;
-				}
-			}
-
-			if (this.isWebhookBasedNode) {
-				if (this.isWorkflowActive) {
-					return this.$locale.baseText('ndv.trigger.webhookBasedNode.executionsHelp.active', {
-						interpolate: { service: this.serviceName },
-					});
-				} else {
-					return this.$locale.baseText('ndv.trigger.webhookBasedNode.executionsHelp.inactive', {
-						interpolate: { service: this.serviceName },
-					});
-				}
-			}
-
-			if (this.isPollingNode) {
-				if (this.isWorkflowActive) {
-					return this.$locale.baseText('ndv.trigger.pollingNode.executionsHelp.active', {
-						interpolate: { service: this.serviceName },
-					});
-				} else {
-					return this.$locale.baseText('ndv.trigger.pollingNode.executionsHelp.inactive', {
-						interpolate: { service: this.serviceName },
-					});
-				}
-			}
-
-			return '';
-		},
-		activationHint(): string {
-			if (this.isActivelyPolling || !this.triggerPanel) {
-				return '';
-			}
-
-			if (this.triggerPanel.activationHint) {
-				if (typeof this.triggerPanel.activationHint === 'string') {
-					return this.triggerPanel.activationHint;
-				}
-				if (
-					!this.isWorkflowActive &&
-					typeof this.triggerPanel.activationHint.inactive === 'string'
-				) {
-					return this.triggerPanel.activationHint.inactive;
-				}
-				if (this.isWorkflowActive && typeof this.triggerPanel.activationHint.active === 'string') {
-					return this.triggerPanel.activationHint.active;
-				}
-			}
-
-			if (this.isWebhookBasedNode) {
-				if (this.isWorkflowActive) {
-					return this.$locale.baseText('ndv.trigger.webhookBasedNode.activationHint.active', {
-						interpolate: { service: this.serviceName },
-					});
-				} else {
-					return this.$locale.baseText('ndv.trigger.webhookBasedNode.activationHint.inactive', {
-						interpolate: { service: this.serviceName },
-					});
-				}
-			}
-
-			if (this.isPollingNode) {
-				if (this.isWorkflowActive) {
-					return this.$locale.baseText('ndv.trigger.pollingNode.activationHint.active', {
-						interpolate: { service: this.serviceName },
-					});
-				} else {
-					return this.$locale.baseText('ndv.trigger.pollingNode.activationHint.inactive', {
-						interpolate: { service: this.serviceName },
-					});
-				}
-			}
-
-			return '';
-		},
-	},
-	methods: {
-		expandExecutionHelp() {
-			if (this.$refs.help) {
-				this.executionsHelpEventBus.emit('expand');
-			}
-		},
-		openWebhookUrl() {
-			this.$telemetry.track('User clicked ndv link', {
-				workflow_id: this.workflowsStore.workflowId,
-				push_ref: this.pushRef,
-				pane: 'input',
-				type: 'open-chat',
-			});
-			window.open(this.webhookTestUrl, '_blank', 'noreferrer');
-		},
-		onLinkClick(e: MouseEvent) {
-			if (!e.target) {
-				return;
-			}
-			const target = e.target as HTMLElement;
-			if (target.localName !== 'a') return;
-
-			if (target.dataset?.key) {
-				e.stopPropagation();
-				e.preventDefault();
-
-				if (target.dataset.key === 'activate') {
-					this.$emit('activate');
-				} else if (target.dataset.key === 'executions') {
-					this.$telemetry.track('User clicked ndv link', {
-						workflow_id: this.workflowsStore.workflowId,
-						push_ref: this.pushRef,
-						pane: 'input',
-						type: 'open-executions-log',
-					});
-					this.ndvStore.activeNodeName = null;
-					void this.$router.push({
-						name: VIEWS.EXECUTIONS,
-					});
-				} else if (target.dataset.key === 'settings') {
-					this.uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-				}
-			}
-		},
-		onTestLinkCopied() {
-			this.$telemetry.track('User copied webhook URL', {
-				pane: 'inputs',
-				type: 'test url',
-			});
-		},
-		onNodeExecute() {
-			this.$emit('execute');
-		},
-	},
+	return null;
 });
+
+const triggerPanel = computed(() => {
+	const panel = nodeType.value?.triggerPanel;
+	if (isTriggerPanelObject(panel)) {
+		return panel;
+	}
+	return undefined;
+});
+
+const hideContent = computed(() => {
+	const hideContent = triggerPanel.value?.hideContent;
+	if (typeof hideContent === 'boolean') {
+		return hideContent;
+	}
+
+	if (node.value) {
+		const hideContentValue = workflowHelpers
+			.getCurrentWorkflow()
+			.expression.getSimpleParameterValue(node.value, hideContent, 'internal', {});
+
+		if (typeof hideContentValue === 'boolean') {
+			return hideContentValue;
+		}
+	}
+
+	return false;
+});
+
+const hasIssues = computed(() => {
+	return Boolean(
+		node.value?.issues && (node.value.issues.parameters ?? node.value.issues.credentials),
+	);
+});
+
+const serviceName = computed(() => {
+	if (nodeType.value) {
+		return getTriggerNodeServiceName(nodeType.value);
+	}
+
+	return '';
+});
+
+const displayChatButton = computed(() => {
+	return Boolean(
+		node.value &&
+			node.value.type === CHAT_TRIGGER_NODE_TYPE &&
+			node.value.parameters.mode !== 'webhook',
+	);
+});
+
+const isWebhookNode = computed(() => {
+	return Boolean(node.value && node.value.type === WEBHOOK_NODE_TYPE);
+});
+
+const webhookHttpMethod = computed(() => {
+	if (!node.value || !nodeType.value?.webhooks?.length) {
+		return undefined;
+	}
+
+	const httpMethod = workflowHelpers.getWebhookExpressionValue(
+		nodeType.value.webhooks[0],
+		'httpMethod',
+		false,
+	);
+
+	if (Array.isArray(httpMethod)) {
+		return httpMethod.join(', ');
+	}
+
+	return httpMethod;
+});
+
+const webhookTestUrl = computed(() => {
+	if (!node.value || !nodeType.value?.webhooks?.length) {
+		return undefined;
+	}
+
+	return workflowHelpers.getWebhookUrl(nodeType.value.webhooks[0], node.value, 'test');
+});
+
+const isWebhookBasedNode = computed(() => {
+	return Boolean(nodeType.value?.webhooks?.length);
+});
+
+const isPollingNode = computed(() => {
+	return Boolean(nodeType.value?.polling);
+});
+
+const isListeningForEvents = computed(() => {
+	const waitingOnWebhook = workflowsStore.executionWaitingForWebhook;
+	const executedNode = workflowsStore.executedNode;
+	return (
+		!!node.value &&
+		!node.value.disabled &&
+		isWebhookBasedNode.value &&
+		waitingOnWebhook &&
+		(!executedNode || executedNode === props.nodeName)
+	);
+});
+
+const workflowRunning = computed(() => {
+	return uiStore.isActionActive['workflowRunning'];
+});
+
+const isActivelyPolling = computed(() => {
+	const triggeredNode = workflowsStore.executedNode;
+
+	return workflowRunning.value && isPollingNode.value && props.nodeName === triggeredNode;
+});
+
+const isWorkflowActive = computed(() => {
+	return workflowsStore.isWorkflowActive;
+});
+
+const listeningTitle = computed(() => {
+	return nodeType.value?.name === FORM_TRIGGER_NODE_TYPE
+		? i18n.baseText('ndv.trigger.webhookNode.formTrigger.listening')
+		: i18n.baseText('ndv.trigger.webhookNode.listening');
+});
+
+const listeningHint = computed(() => {
+	switch (nodeType.value?.name) {
+		case CHAT_TRIGGER_NODE_TYPE:
+			return i18n.baseText('ndv.trigger.webhookBasedNode.chatTrigger.serviceHint');
+		case FORM_TRIGGER_NODE_TYPE:
+			return i18n.baseText('ndv.trigger.webhookBasedNode.formTrigger.serviceHint');
+		default:
+			return i18n.baseText('ndv.trigger.webhookBasedNode.serviceHint', {
+				interpolate: { service: serviceName.value },
+			});
+	}
+});
+
+const header = computed(() => {
+	if (isActivelyPolling.value) {
+		return i18n.baseText('ndv.trigger.pollingNode.fetchingEvent');
+	}
+
+	if (triggerPanel.value?.header) {
+		return triggerPanel.value.header;
+	}
+
+	if (isWebhookBasedNode.value) {
+		return i18n.baseText('ndv.trigger.webhookBasedNode.action', {
+			interpolate: { name: serviceName.value },
+		});
+	}
+
+	return '';
+});
+
+const subheader = computed(() => {
+	if (isActivelyPolling.value) {
+		return i18n.baseText('ndv.trigger.pollingNode.fetchingHint', {
+			interpolate: { name: serviceName.value },
+		});
+	}
+
+	return '';
+});
+
+const executionsHelp = computed(() => {
+	if (triggerPanel.value?.executionsHelp) {
+		if (typeof triggerPanel.value.executionsHelp === 'string') {
+			return triggerPanel.value.executionsHelp;
+		}
+		if (!isWorkflowActive.value && triggerPanel.value.executionsHelp.inactive) {
+			return triggerPanel.value.executionsHelp.inactive;
+		}
+		if (isWorkflowActive.value && triggerPanel.value.executionsHelp.active) {
+			return triggerPanel.value.executionsHelp.active;
+		}
+	}
+
+	if (isWebhookBasedNode.value) {
+		if (isWorkflowActive.value) {
+			return i18n.baseText('ndv.trigger.webhookBasedNode.executionsHelp.active', {
+				interpolate: { service: serviceName.value },
+			});
+		} else {
+			return i18n.baseText('ndv.trigger.webhookBasedNode.executionsHelp.inactive', {
+				interpolate: { service: serviceName.value },
+			});
+		}
+	}
+
+	if (isPollingNode.value) {
+		if (isWorkflowActive.value) {
+			return i18n.baseText('ndv.trigger.pollingNode.executionsHelp.active', {
+				interpolate: { service: serviceName.value },
+			});
+		} else {
+			return i18n.baseText('ndv.trigger.pollingNode.executionsHelp.inactive', {
+				interpolate: { service: serviceName.value },
+			});
+		}
+	}
+
+	return '';
+});
+
+const activationHint = computed(() => {
+	if (isActivelyPolling.value || !triggerPanel.value) {
+		return '';
+	}
+
+	if (triggerPanel.value.activationHint) {
+		if (typeof triggerPanel.value.activationHint === 'string') {
+			return triggerPanel.value.activationHint;
+		}
+		if (!isWorkflowActive.value && typeof triggerPanel.value.activationHint.inactive === 'string') {
+			return triggerPanel.value.activationHint.inactive;
+		}
+		if (isWorkflowActive.value && typeof triggerPanel.value.activationHint.active === 'string') {
+			return triggerPanel.value.activationHint.active;
+		}
+	}
+
+	if (isWebhookBasedNode.value) {
+		if (isWorkflowActive.value) {
+			return i18n.baseText('ndv.trigger.webhookBasedNode.activationHint.active', {
+				interpolate: { service: serviceName.value },
+			});
+		} else {
+			return i18n.baseText('ndv.trigger.webhookBasedNode.activationHint.inactive', {
+				interpolate: { service: serviceName.value },
+			});
+		}
+	}
+
+	if (isPollingNode.value) {
+		if (isWorkflowActive.value) {
+			return i18n.baseText('ndv.trigger.pollingNode.activationHint.active', {
+				interpolate: { service: serviceName.value },
+			});
+		} else {
+			return i18n.baseText('ndv.trigger.pollingNode.activationHint.inactive', {
+				interpolate: { service: serviceName.value },
+			});
+		}
+	}
+
+	return '';
+});
+
+const expandExecutionHelp = () => {
+	if (help.value) {
+		executionsHelpEventBus.emit('expand');
+	}
+};
+
+const openWebhookUrl = () => {
+	telemetry.track('User clicked ndv link', {
+		workflow_id: workflowsStore.workflowId,
+		push_ref: props.pushRef,
+		pane: 'input',
+		type: 'open-chat',
+	});
+	window.open(webhookTestUrl.value, '_blank', 'noreferrer');
+};
+
+const onLinkClick = (e: MouseEvent) => {
+	if (!e.target) {
+		return;
+	}
+	const target = e.target as HTMLElement;
+	if (target.localName !== 'a') return;
+
+	if (target.dataset?.key) {
+		e.stopPropagation();
+		e.preventDefault();
+
+		if (target.dataset.key === 'activate') {
+			emit('activate');
+		} else if (target.dataset.key === 'executions') {
+			telemetry.track('User clicked ndv link', {
+				workflow_id: workflowsStore.workflowId,
+				push_ref: props.pushRef,
+				pane: 'input',
+				type: 'open-executions-log',
+			});
+			ndvStore.activeNodeName = null;
+			void router.push({
+				name: VIEWS.EXECUTIONS,
+			});
+		} else if (target.dataset.key === 'settings') {
+			uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+		}
+	}
+};
+
+const onTestLinkCopied = () => {
+	telemetry.track('User copied webhook URL', {
+		pane: 'inputs',
+		type: 'test url',
+	});
+};
+
+const onNodeExecute = () => {
+	emit('execute');
+};
 </script>
 
 <template>
@@ -364,12 +375,12 @@ export default defineComponent({
 				</n8n-pulse>
 				<div v-if="isWebhookNode">
 					<n8n-text tag="div" size="large" color="text-dark" class="mb-2xs" bold>{{
-						$locale.baseText('ndv.trigger.webhookNode.listening')
+						i18n.baseText('ndv.trigger.webhookNode.listening')
 					}}</n8n-text>
 					<div :class="[$style.shake, 'mb-xs']">
 						<n8n-text>
 							{{
-								$locale.baseText('ndv.trigger.webhookNode.requestHint', {
+								i18n.baseText('ndv.trigger.webhookNode.requestHint', {
 									interpolate: { type: webhookHttpMethod ?? '' },
 								})
 							}}
@@ -377,11 +388,11 @@ export default defineComponent({
 					</div>
 					<CopyInput
 						:value="webhookTestUrl"
-						:toast-title="$locale.baseText('ndv.trigger.copiedTestUrl')"
+						:toast-title="i18n.baseText('ndv.trigger.copiedTestUrl')"
 						class="mb-2xl"
 						size="medium"
 						:collapse="true"
-						:copy-button-text="$locale.baseText('generic.clickToCopy')"
+						:copy-button-text="i18n.baseText('generic.clickToCopy')"
 						@copy="onTestLinkCopied"
 					></CopyInput>
 					<NodeExecuteButton
@@ -403,7 +414,7 @@ export default defineComponent({
 					</div>
 					<div v-if="displayChatButton">
 						<n8n-button class="mb-xl" @click="openWebhookUrl()">
-							{{ $locale.baseText('ndv.trigger.chatTrigger.openChat') }}
+							{{ i18n.baseText('ndv.trigger.chatTrigger.openChat') }}
 						</n8n-button>
 					</div>
 
@@ -447,13 +458,13 @@ export default defineComponent({
 					v-if="activationHint && executionsHelp"
 					size="small"
 					@click="expandExecutionHelp"
-					>{{ $locale.baseText('ndv.trigger.moreInfo') }}</n8n-link
+					>{{ i18n.baseText('ndv.trigger.moreInfo') }}</n8n-link
 				>
 				<n8n-info-accordion
 					v-if="executionsHelp"
 					ref="help"
 					:class="$style.accordion"
-					:title="$locale.baseText('ndv.trigger.executionsHint.question')"
+					:title="i18n.baseText('ndv.trigger.executionsHint.question')"
 					:description="executionsHelp"
 					:event-bus="executionsHelpEventBus"
 					@click:body="onLinkClick"
diff --git a/packages/editor-ui/src/components/UpdatesPanel.vue b/packages/editor-ui/src/components/UpdatesPanel.vue
index b96a20c650..a5f1332bc4 100644
--- a/packages/editor-ui/src/components/UpdatesPanel.vue
+++ b/packages/editor-ui/src/components/UpdatesPanel.vue
@@ -1,39 +1,16 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-
+<script setup lang="ts">
 import ModalDrawer from './ModalDrawer.vue';
 import TimeAgo from './TimeAgo.vue';
 import VersionCard from './VersionCard.vue';
 import { VERSIONS_MODAL_KEY } from '../constants';
-import { mapStores } from 'pinia';
 import { useVersionsStore } from '@/stores/versions.store';
-import type { IVersion } from '@/Interface';
+import { useI18n } from '@/composables/useI18n';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
-export default defineComponent({
-	name: 'UpdatesPanel',
-	components: {
-		ModalDrawer,
-		VersionCard,
-		TimeAgo,
-	},
-	computed: {
-		...mapStores(useVersionsStore),
-		nextVersions(): IVersion[] {
-			return this.versionsStore.nextVersions;
-		},
-		currentVersion(): IVersion | undefined {
-			return this.versionsStore.currentVersion;
-		},
-		infoUrl(): string {
-			return this.versionsStore.infoUrl;
-		},
-	},
-	data() {
-		return {
-			VERSIONS_MODAL_KEY,
-		};
-	},
-});
+const versionsStore = useVersionsStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
+
+const i18n = useI18n();
 </script>
 
 <template>
@@ -45,43 +22,55 @@ export default defineComponent({
 	>
 		<template #header>
 			<span :class="$style.title">
-				{{ $locale.baseText('updatesPanel.weVeBeenBusy') }}
+				{{ i18n.baseText('updatesPanel.weVeBeenBusy') }}
 			</span>
 		</template>
 		<template #content>
 			<section :class="$style['description']">
-				<p v-if="currentVersion">
+				<p v-if="versionsStore.currentVersion">
 					{{
-						$locale.baseText('updatesPanel.youReOnVersion', {
-							interpolate: { currentVersionName: currentVersion.name },
+						i18n.baseText('updatesPanel.youReOnVersion', {
+							interpolate: { currentVersionName: versionsStore.currentVersion.name },
 						})
 					}}
 					<strong>
-						<TimeAgo :date="currentVersion.createdAt" />
+						<TimeAgo :date="versionsStore.currentVersion.createdAt" />
 					</strong>
-					{{ $locale.baseText('updatesPanel.andIs') }}
+					{{ i18n.baseText('updatesPanel.andIs') }}
 					<strong>
 						{{
-							$locale.baseText('updatesPanel.version', {
+							i18n.baseText('updatesPanel.version', {
 								interpolate: {
-									numberOfVersions: nextVersions.length,
-									howManySuffix: nextVersions.length > 1 ? 's' : '',
+									numberOfVersions: versionsStore.nextVersions.length,
+									howManySuffix: versionsStore.nextVersions.length > 1 ? 's' : '',
 								},
 							})
 						}}
 					</strong>
-					{{ $locale.baseText('updatesPanel.behindTheLatest') }}
+					{{ i18n.baseText('updatesPanel.behindTheLatest') }}
 				</p>
 
-				<n8n-link v-if="infoUrl" :to="infoUrl" :bold="true">
+				<n8n-button
+					v-if="versionsStore.infoUrl"
+					:text="true"
+					type="primary"
+					size="large"
+					:class="$style['link']"
+					:bold="true"
+					@click="pageRedirectionHelper.goToVersions()"
+				>
 					<font-awesome-icon icon="info-circle" class="mr-2xs" />
 					<span>
-						{{ $locale.baseText('updatesPanel.howToUpdateYourN8nVersion') }}
+						{{ i18n.baseText('updatesPanel.howToUpdateYourN8nVersion') }}
 					</span>
-				</n8n-link>
+				</n8n-button>
 			</section>
 			<section :class="$style.versions">
-				<div v-for="version in nextVersions" :key="version.name" :class="$style['versions-card']">
+				<div
+					v-for="version in versionsStore.nextVersions"
+					:key="version.name"
+					:class="$style['versions-card']"
+				>
 					<VersionCard :version="version" />
 				</div>
 			</section>
@@ -114,6 +103,15 @@ export default defineComponent({
 	div {
 		padding-top: 20px;
 	}
+
+	.link {
+		padding-left: 0px;
+	}
+
+	.link:hover {
+		color: var(--prim-color-primary);
+		text-decoration: none;
+	}
 }
 
 .versions {
diff --git a/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts b/packages/editor-ui/src/components/VariablesRow.test.ts
similarity index 98%
rename from packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
rename to packages/editor-ui/src/components/VariablesRow.test.ts
index 88928b0e80..7d7013054f 100644
--- a/packages/editor-ui/src/components/__tests__/VariablesRow.spec.ts
+++ b/packages/editor-ui/src/components/VariablesRow.test.ts
@@ -1,4 +1,4 @@
-import VariablesRow from '../VariablesRow.vue';
+import VariablesRow from './VariablesRow.vue';
 import { fireEvent } from '@testing-library/vue';
 import { setupServer } from '@/__tests__/server';
 import { afterAll, beforeAll } from 'vitest';
diff --git a/packages/editor-ui/src/components/VersionCard.vue b/packages/editor-ui/src/components/VersionCard.vue
index 7b36d18152..e62214ead6 100644
--- a/packages/editor-ui/src/components/VersionCard.vue
+++ b/packages/editor-ui/src/components/VersionCard.vue
@@ -28,24 +28,24 @@ const nodeName = (node: IVersionNode): string => {
 		<div :class="$style.header">
 			<div>
 				<div :class="$style.name">
-					{{ `${$locale.baseText('versionCard.version')} ${version.name}` }}
+					{{ `${i18n.baseText('versionCard.version')} ${version.name}` }}
 				</div>
 				<WarningTooltip v-if="version.hasSecurityIssue">
-					<span v-n8n-html="$locale.baseText('versionCard.thisVersionHasASecurityIssue')"></span>
+					<span v-n8n-html="i18n.baseText('versionCard.thisVersionHasASecurityIssue')"></span>
 				</WarningTooltip>
 				<Badge
 					v-if="version.hasSecurityFix"
-					:text="$locale.baseText('versionCard.securityUpdate')"
+					:text="i18n.baseText('versionCard.securityUpdate')"
 					type="danger"
 				/>
 				<Badge
 					v-if="version.hasBreakingChange"
-					:text="$locale.baseText('versionCard.breakingChanges')"
+					:text="i18n.baseText('versionCard.breakingChanges')"
 					type="warning"
 				/>
 			</div>
 			<div :class="$style['release-date']">
-				{{ $locale.baseText('versionCard.released') }}&nbsp;<TimeAgo :date="version.createdAt" />
+				{{ i18n.baseText('versionCard.released') }}&nbsp;<TimeAgo :date="version.createdAt" />
 			</div>
 		</div>
 		<div
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..f648b1de3c
--- /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('VirtualSchema.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 149f0d77d7..60ba947256 100644
--- a/packages/editor-ui/src/components/WorkerList.ee.vue
+++ b/packages/editor-ui/src/components/WorkerList.ee.vue
@@ -1,103 +1,67 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script setup lang="ts">
+import { computed, onBeforeMount, onBeforeUnmount, onMounted } from 'vue';
 import { useRouter } from 'vue-router';
-import { mapStores } from 'pinia';
-import type { WorkerStatus } from '@n8n/api-types';
-import type { ExecutionStatus } from 'n8n-workflow';
 
-import PushConnectionTracker from '@/components/PushConnectionTracker.vue';
 import { useI18n } from '@/composables/useI18n';
-import { useToast } from '@/composables/useToast';
-import { useUIStore } from '@/stores/ui.store';
 import { useOrchestrationStore } from '@/stores/orchestration.store';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
-import WorkerCard from './Workers/WorkerCard.ee.vue';
 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';
 
-// eslint-disable-next-line import/no-default-export
-export default defineComponent({
-	name: 'WorkerList',
-	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/naming-convention
-	components: { PushConnectionTracker, WorkerCard },
-	props: {
-		autoRefreshEnabled: {
-			type: Boolean,
-			default: true,
-		},
+withDefaults(
+	defineProps<{
+		autoRefreshEnabled?: boolean;
+	}>(),
+	{
+		autoRefreshEnabled: true,
 	},
-	setup() {
-		const router = useRouter();
-		const i18n = useI18n();
-		const pushConnection = usePushConnection({ router });
+);
 
-		return {
-			i18n,
-			pushConnection,
-			...useToast(),
-			documentTitle: useDocumentTitle(),
-		};
-	},
-	computed: {
-		...mapStores(useRootStore, useUIStore, usePushConnectionStore, useOrchestrationStore),
-		combinedWorkers(): WorkerStatus[] {
-			const returnData: WorkerStatus[] = [];
-			for (const workerId in this.orchestrationManagerStore.workers) {
-				returnData.push(this.orchestrationManagerStore.workers[workerId]);
-			}
-			return returnData;
-		},
-		initialStatusReceived(): boolean {
-			return this.orchestrationManagerStore.initialStatusReceived;
-		},
-		workerIds(): string[] {
-			return Object.keys(this.orchestrationManagerStore.workers);
-		},
-		pageTitle() {
-			return this.i18n.baseText('workerList.pageTitle');
-		},
-	},
-	mounted() {
-		this.documentTitle.set(this.pageTitle);
+const router = useRouter();
+const i18n = useI18n();
+const pushConnection = usePushConnection({ router });
+const documentTitle = useDocumentTitle();
+const telemetry = useTelemetry();
 
-		this.$telemetry.track('User viewed worker view', {
-			instance_id: this.rootStore.instanceId,
-		});
-	},
-	beforeMount() {
-		if (window.Cypress !== undefined) {
-			return;
-		}
+const orchestrationManagerStore = useOrchestrationStore();
+const rootStore = useRootStore();
+const pushStore = usePushConnectionStore();
 
-		this.pushConnection.initialize();
-		this.pushStore.pushConnect();
-		this.orchestrationManagerStore.startWorkerStatusPolling();
-	},
-	beforeUnmount() {
-		if (window.Cypress !== undefined) {
-			return;
-		}
+const initialStatusReceived = computed(() => orchestrationManagerStore.initialStatusReceived);
 
-		this.orchestrationManagerStore.stopWorkerStatusPolling();
-		this.pushStore.pushDisconnect();
-		this.pushConnection.terminate();
-	},
-	methods: {
-		averageLoadAvg(loads: number[]) {
-			return (loads.reduce((prev, curr) => prev + curr, 0) / loads.length).toFixed(2);
-		},
-		getStatus(payload: WorkerStatus): ExecutionStatus {
-			if (payload.runningJobsSummary.length > 0) {
-				return 'running';
-			} else {
-				return 'success';
-			}
-		},
-		getRowClass(payload: WorkerStatus): string {
-			return [this.$style.execRow, this.$style[this.getStatus(payload)]].join(' ');
-		},
-	},
+const workerIds = computed(() => Object.keys(orchestrationManagerStore.workers));
+
+const pageTitle = computed(() => i18n.baseText('workerList.pageTitle'));
+
+onMounted(() => {
+	documentTitle.set(pageTitle.value);
+
+	telemetry.track('User viewed worker view', {
+		instance_id: rootStore.instanceId,
+	});
+});
+
+onBeforeMount(() => {
+	if (window.Cypress !== undefined) {
+		return;
+	}
+
+	pushConnection.initialize();
+	pushStore.pushConnect();
+	orchestrationManagerStore.startWorkerStatusPolling();
+});
+
+onBeforeUnmount(() => {
+	if (window.Cypress !== undefined) {
+		return;
+	}
+
+	orchestrationManagerStore.stopWorkerStatusPolling();
+	pushStore.pushDisconnect();
+	pushConnection.terminate();
 });
 </script>
 
@@ -111,7 +75,7 @@ export default defineComponent({
 			<n8n-spinner />
 		</div>
 		<div v-else>
-			<div v-if="workerIds.length === 0">{{ $locale.baseText('workerList.empty') }}</div>
+			<div v-if="workerIds.length === 0">{{ i18n.baseText('workerList.empty') }}</div>
 			<div v-else>
 				<div v-for="workerId in workerIds" :key="workerId" :class="$style.card">
 					<WorkerCard :worker-id="workerId" data-test-id="worker-card" />
diff --git a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
index 75096b7639..1ead01caa8 100644
--- a/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerCard.ee.vue
@@ -8,11 +8,14 @@ import WorkerJobAccordion from './WorkerJobAccordion.ee.vue';
 import WorkerNetAccordion from './WorkerNetAccordion.ee.vue';
 import WorkerChartsAccordion from './WorkerChartsAccordion.ee.vue';
 import { sortByProperty } from '@/utils/sortUtils';
+import { useI18n } from '@/composables/useI18n';
 
 let interval: NodeJS.Timer;
 
 const orchestrationStore = useOrchestrationStore();
 
+const i18n = useI18n();
+
 const props = defineProps<{
 	workerId: string;
 }>();
@@ -73,7 +76,7 @@ onBeforeUnmount(() => {
 		<div :class="$style.cardDescription">
 			<n8n-text color="text-light" size="small" :class="$style.container">
 				<span
-					>{{ $locale.baseText('workerList.item.lastUpdated') }} {{ secondsSinceLastUpdateString }}s
+					>{{ i18n.baseText('workerList.item.lastUpdated') }} {{ secondsSinceLastUpdateString }}s
 					ago | n8n-Version: {{ worker.version }} | Architecture: {{ worker.arch }} (
 					{{ worker.platform }}) | Uptime: {{ upTime(worker.uptime) }}</span
 				>
diff --git a/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
index 4383f59673..2197aa3ea9 100644
--- a/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerChartsAccordion.ee.vue
@@ -6,11 +6,14 @@ import type { ChartData, ChartOptions } from 'chart.js';
 import type { ChartComponentRef } from 'vue-chartjs';
 import { Chart } from 'vue-chartjs';
 import { averageWorkerLoadFromLoads, memAsGb } from '@/utils/workerUtils';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps<{
 	workerId: string;
 }>();
 
+const i18n = useI18n();
+
 const blankDataSet = (label: string, color: string, prefill: number = 0) => ({
 	datasets: [
 		{
@@ -94,7 +97,7 @@ orchestrationStore.$onAction(({ name, store }) => {
 <template>
 	<WorkerAccordion icon="tasks" icon-color="black" :initial-expanded="false">
 		<template #title>
-			{{ $locale.baseText('workerList.item.chartsTitle') }}
+			{{ i18n.baseText('workerList.item.chartsTitle') }}
 		</template>
 		<template #content>
 			<div :class="$style.charts">
diff --git a/packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue
index f8550e0b38..f88adb54ff 100644
--- a/packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerJobAccordion.ee.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import type { RunningJobSummary } from '@n8n/api-types';
 import WorkerAccordion from './WorkerAccordion.ee.vue';
+import { useI18n } from '@/composables/useI18n';
 
 const props = defineProps<{
 	items: RunningJobSummary[];
 }>();
 
+const i18n = useI18n();
+
 function runningSince(started: Date): string {
 	let seconds = Math.floor((new Date().getTime() - started.getTime()) / 1000);
 	const hrs = Math.floor(seconds / 3600);
@@ -19,7 +22,7 @@ function runningSince(started: Date): string {
 <template>
 	<WorkerAccordion icon="tasks" icon-color="black" :initial-expanded="true">
 		<template #title>
-			{{ $locale.baseText('workerList.item.jobListTitle') }} ({{ items.length }})
+			{{ i18n.baseText('workerList.item.jobListTitle') }} ({{ items.length }})
 		</template>
 		<template #content>
 			<div v-if="props.items.length > 0" :class="$style.accordionItems">
@@ -38,7 +41,7 @@ function runningSince(started: Date): string {
 			</div>
 			<div v-else :class="$style.accordionItems">
 				<span :class="$style.empty">
-					{{ $locale.baseText('workerList.item.jobList.empty') }}
+					{{ i18n.baseText('workerList.item.jobList.empty') }}
 				</span>
 			</div>
 		</template>
diff --git a/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue b/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
index 7ec4b53c17..1073ef6ba7 100644
--- a/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
+++ b/packages/editor-ui/src/components/Workers/WorkerNetAccordion.ee.vue
@@ -27,7 +27,7 @@ function onCopyToClipboard(content: string) {
 <template>
 	<WorkerAccordion icon="tasks" icon-color="black" :initial-expanded="false">
 		<template #title>
-			{{ $locale.baseText('workerList.item.netListTitle') }} ({{ items.length }})
+			{{ i18n.baseText('workerList.item.netListTitle') }} ({{ items.length }})
 		</template>
 		<template #content>
 			<div v-if="props.items.length > 0" :class="$style.accordionItems">
diff --git a/packages/editor-ui/src/components/WorkflowActivator.test.ts b/packages/editor-ui/src/components/WorkflowActivator.test.ts
new file mode 100644
index 0000000000..46bc6a7190
--- /dev/null
+++ b/packages/editor-ui/src/components/WorkflowActivator.test.ts
@@ -0,0 +1,264 @@
+import { describe, it, expect, vi } from 'vitest';
+import WorkflowActivator from '@/components/WorkflowActivator.vue';
+import userEvent from '@testing-library/user-event';
+
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import { EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE, WOOCOMMERCE_TRIGGER_NODE_TYPE } from '@/constants';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import { useToast } from '@/composables/useToast';
+
+const renderComponent = createComponentRenderer(WorkflowActivator);
+let mockWorkflowsStore: ReturnType<typeof mockedStore<typeof useWorkflowsStore>>;
+let mockCredentialsStore: ReturnType<typeof mockedStore<typeof useCredentialsStore>>;
+
+vi.mock('@/composables/useToast', () => {
+	const showMessage = vi.fn();
+	return {
+		useToast: () => {
+			return {
+				showMessage,
+			};
+		},
+	};
+});
+
+describe('WorkflowActivator', () => {
+	beforeEach(() => {
+		createTestingPinia();
+
+		mockWorkflowsStore = mockedStore(useWorkflowsStore);
+		mockCredentialsStore = mockedStore(useCredentialsStore);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('renders correctly', () => {
+		const renderOptions = {
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		};
+
+		const { getByTestId, getByRole } = renderComponent(renderOptions);
+		expect(getByTestId('workflow-activator-status')).toBeInTheDocument();
+		expect(getByRole('switch')).toBeInTheDocument();
+	});
+
+	it('display an inactive tooltip when there are no nodes available', async () => {
+		mockWorkflowsStore.workflowId = '1';
+
+		const { getByTestId, getByRole } = renderComponent({
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		});
+
+		await userEvent.hover(getByRole('switch'));
+		expect(getByRole('tooltip')).toBeInTheDocument();
+
+		expect(getByRole('tooltip')).toHaveTextContent(
+			'This workflow has no trigger nodes that require activation',
+		);
+		expect(getByTestId('workflow-activator-status')).toHaveTextContent('Inactive');
+	});
+
+	it('display an inactive tooltip when only execute workflow trigger is available', async () => {
+		mockWorkflowsStore.workflowId = '1';
+		mockWorkflowsStore.workflowTriggerNodes = [
+			{ type: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE, disabled: false } as never,
+		];
+
+		const { getByTestId, getByRole } = renderComponent({
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		});
+
+		await userEvent.hover(getByRole('switch'));
+		expect(getByRole('tooltip')).toBeInTheDocument();
+
+		expect(getByRole('tooltip')).toHaveTextContent(
+			"Execute Workflow Trigger' doesn't require activation as it is triggered by another workflow",
+		);
+		expect(getByTestId('workflow-activator-status')).toHaveTextContent('Inactive');
+	});
+
+	it('Should show warning toast if the workflow to be activated has non-disabled node using free OpenAI credentials', async () => {
+		const toast = useToast();
+
+		mockWorkflowsStore.usedCredentials = {
+			'1': {
+				id: '1',
+				name: '',
+				credentialType: '',
+				currentUserHasAccess: false,
+			},
+		};
+
+		mockCredentialsStore.state.credentials = {
+			'1': {
+				id: '1',
+				name: 'OpenAI',
+				type: 'openAiApi',
+				data: '',
+				isManaged: true,
+				createdAt: new Date().toISOString(),
+				updatedAt: new Date().toISOString(),
+			},
+		};
+
+		mockWorkflowsStore.workflowTriggerNodes = [
+			{ type: WOOCOMMERCE_TRIGGER_NODE_TYPE, disabled: false } as never,
+		];
+
+		mockWorkflowsStore.allNodes = [
+			{
+				credentials: {
+					openAiApi: {
+						name: 'OpenAI',
+						id: '1',
+					},
+				},
+				disabled: false,
+				position: [1, 1],
+				name: '',
+				id: '',
+				typeVersion: 0,
+				type: '',
+				parameters: {},
+			},
+		];
+
+		const { rerender } = renderComponent({
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		});
+
+		await rerender({ workflowActive: true });
+
+		expect(toast.showMessage).toHaveBeenCalledWith(
+			expect.objectContaining({
+				title: "You're using free OpenAI API credits",
+				message:
+					'To make sure your workflow runs smoothly in the future, replace the free OpenAI API credits with your own API key.',
+				type: 'warning',
+				duration: 0,
+			}),
+		);
+	});
+
+	it('Should not show warning toast if the workflow to be activated has disabled node using free OpenAI credentials', async () => {
+		const toast = useToast();
+
+		mockWorkflowsStore.usedCredentials = {
+			'1': {
+				id: '1',
+				name: '',
+				credentialType: '',
+				currentUserHasAccess: false,
+			},
+		};
+
+		mockCredentialsStore.state.credentials = {
+			'1': {
+				id: '1',
+				name: 'OpenAI',
+				type: 'openAiApi',
+				data: '',
+				isManaged: true,
+				createdAt: new Date().toISOString(),
+				updatedAt: new Date().toISOString(),
+			},
+		};
+
+		mockWorkflowsStore.workflowTriggerNodes = [
+			{ type: WOOCOMMERCE_TRIGGER_NODE_TYPE, disabled: false } as never,
+		];
+
+		mockWorkflowsStore.allNodes = [
+			{
+				credentials: {
+					openAiApi: {
+						name: 'OpenAI',
+						id: '1',
+					},
+				},
+				disabled: true,
+				position: [1, 1],
+				name: '',
+				id: '',
+				typeVersion: 0,
+				type: '',
+				parameters: {},
+			},
+		];
+
+		const { rerender } = renderComponent({
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		});
+
+		await rerender({ workflowActive: true });
+
+		expect(toast.showMessage).not.toHaveBeenCalled();
+	});
+
+	it('Should not show warning toast if the workflow to be activated has no node with free OpenAI credential', async () => {
+		const toast = useToast();
+
+		mockWorkflowsStore.usedCredentials = {
+			'1': {
+				id: '1',
+				name: '',
+				credentialType: '',
+				currentUserHasAccess: false,
+			},
+		};
+
+		mockCredentialsStore.state.credentials = {
+			'1': {
+				id: '1',
+				name: 'Jira',
+				type: 'jiraApi',
+				data: '',
+				isManaged: true,
+				createdAt: new Date().toISOString(),
+				updatedAt: new Date().toISOString(),
+			},
+		};
+
+		mockWorkflowsStore.workflowTriggerNodes = [
+			{ type: WOOCOMMERCE_TRIGGER_NODE_TYPE, disabled: false } as never,
+		];
+
+		const { rerender } = renderComponent({
+			props: {
+				workflowActive: false,
+				workflowId: '1',
+				workflowPermissions: { update: true },
+			},
+		});
+
+		await rerender({ workflowActive: true });
+
+		expect(toast.showMessage).not.toHaveBeenCalled();
+	});
+});
diff --git a/packages/editor-ui/src/components/WorkflowActivator.vue b/packages/editor-ui/src/components/WorkflowActivator.vue
index 6bfe6f799e..888f473cc0 100644
--- a/packages/editor-ui/src/components/WorkflowActivator.vue
+++ b/packages/editor-ui/src/components/WorkflowActivator.vue
@@ -4,11 +4,14 @@ import { useWorkflowActivate } from '@/composables/useWorkflowActivate';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { getActivatableTriggerNodes } from '@/utils/nodeTypesUtils';
 import type { VNode } from 'vue';
-import { computed, h } from 'vue';
+import { computed, h, watch } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import type { PermissionsRecord } from '@/permissions';
-import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
+import { EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE, PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/constants';
 import WorkflowActivationErrorMessage from './WorkflowActivationErrorMessage.vue';
+import { useCredentialsStore } from '@/stores/credentials.store';
+import type { INodeUi, IUsedCredential } from '@/Interface';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
 
 const props = defineProps<{
 	workflowActive: boolean;
@@ -20,6 +23,7 @@ const workflowActivate = useWorkflowActivate();
 
 const i18n = useI18n();
 const workflowsStore = useWorkflowsStore();
+const credentialsStore = useCredentialsStore();
 
 const isWorkflowActive = computed((): boolean => {
 	const activeWorkflows = workflowsStore.activeWorkflows;
@@ -43,6 +47,17 @@ const containsTrigger = computed((): boolean => {
 	return foundTriggers.length > 0;
 });
 
+const containsOnlyExecuteWorkflowTrigger = computed((): boolean => {
+	const foundActiveTriggers = workflowsStore.workflowTriggerNodes.filter(
+		(trigger) => !trigger.disabled,
+	);
+	const foundTriggers = foundActiveTriggers.filter(
+		(trigger) => trigger.type === EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+	);
+
+	return foundTriggers.length > 0 && foundTriggers.length === foundActiveTriggers.length;
+});
+
 const isNewWorkflow = computed(
 	() =>
 		!props.workflowId ||
@@ -58,6 +73,41 @@ const disabled = computed((): boolean => {
 	return false;
 });
 
+function findManagedOpenAiCredentialId(
+	usedCredentials: Record<string, IUsedCredential>,
+): string | undefined {
+	return Object.keys(usedCredentials).find((credentialId) => {
+		const credential = credentialsStore.state.credentials[credentialId];
+		return credential.isManaged && credential.type === OPEN_AI_API_CREDENTIAL_TYPE;
+	});
+}
+
+function hasActiveNodeUsingCredential(nodes: INodeUi[], credentialId: string): boolean {
+	return nodes.some(
+		(node) =>
+			node?.credentials?.[OPEN_AI_API_CREDENTIAL_TYPE]?.id === credentialId && !node.disabled,
+	);
+}
+
+/**
+ * Determines if the warning for free AI credits should be shown in the workflow.
+ *
+ * This computed property evaluates whether to display a warning about free AI credits
+ * in the workflow. The warning is shown when both conditions are met:
+ * 1. The workflow uses managed OpenAI API credentials
+ * 2. Those credentials are associated with at least one enabled node
+ *
+ */
+const shouldShowFreeAiCreditsWarning = computed((): boolean => {
+	const usedCredentials = workflowsStore?.usedCredentials;
+	if (!usedCredentials) return false;
+
+	const managedOpenAiCredentialId = findManagedOpenAiCredentialId(usedCredentials);
+	if (!managedOpenAiCredentialId) return false;
+
+	return hasActiveNodeUsingCredential(workflowsStore.allNodes, managedOpenAiCredentialId);
+});
+
 async function activeChanged(newActiveState: boolean) {
 	return await workflowActivate.updateWorkflowActivation(props.workflowId, newActiveState);
 }
@@ -89,6 +139,20 @@ async function displayActivationError() {
 		duration: 0,
 	});
 }
+
+watch(
+	() => props.workflowActive,
+	(workflowActive) => {
+		if (workflowActive && shouldShowFreeAiCreditsWarning.value) {
+			showMessage({
+				title: i18n.baseText('freeAi.credits.showWarning.workflow.activation.title'),
+				message: i18n.baseText('freeAi.credits.showWarning.workflow.activation.description'),
+				type: 'warning',
+				duration: 0,
+			});
+		}
+	},
+);
 </script>
 
 <template>
@@ -109,7 +173,13 @@ async function displayActivationError() {
 		<n8n-tooltip :disabled="!disabled" placement="bottom">
 			<template #content>
 				<div>
-					{{ i18n.baseText('workflowActivator.thisWorkflowHasNoTriggerNodes') }}
+					{{
+						i18n.baseText(
+							containsOnlyExecuteWorkflowTrigger
+								? 'workflowActivator.thisWorkflowHasOnlyOneExecuteWorkflowTriggerNode'
+								: 'workflowActivator.thisWorkflowHasNoTriggerNodes',
+						)
+					}}
 				</div>
 			</template>
 			<el-switch
diff --git a/packages/editor-ui/src/components/WorkflowCard.vue b/packages/editor-ui/src/components/WorkflowCard.vue
index cc0713e2b2..3a12304afc 100644
--- a/packages/editor-ui/src/components/WorkflowCard.vue
+++ b/packages/editor-ui/src/components/WorkflowCard.vue
@@ -268,6 +268,7 @@ function moveResource() {
 		<template #append>
 			<div :class="$style.cardActions" @click.stop>
 				<ProjectCardBadge
+					:class="$style.cardBadge"
 					:resource="data"
 					:resource-type="ResourceType.Workflow"
 					:resource-type-label="resourceTypeLabel"
@@ -330,4 +331,22 @@ function moveResource() {
 	padding: 0 var(--spacing-s) 0 0;
 	cursor: default;
 }
+
+@include mixins.breakpoint('sm-and-down') {
+	.cardLink {
+		--card--padding: 0 var(--spacing-s) var(--spacing-s);
+		--card--append--width: 100%;
+
+		flex-direction: column;
+	}
+
+	.cardActions {
+		width: 100%;
+		padding: 0 var(--spacing-s) var(--spacing-s);
+	}
+
+	.cardBadge {
+		margin-right: auto;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryContent.test.ts b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryContent.test.ts
rename to packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryContent.test.ts
diff --git a/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryList.test.ts
rename to packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryList.test.ts
diff --git a/packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryListItem.test.ts b/packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/WorkflowHistory/__tests__/WorkflowHistoryListItem.test.ts
rename to packages/editor-ui/src/components/WorkflowHistory/WorkflowHistoryListItem.test.ts
diff --git a/packages/editor-ui/src/components/WorkflowLMChat/MessageOptionAction.vue b/packages/editor-ui/src/components/WorkflowLMChat/MessageOptionAction.vue
deleted file mode 100644
index 69bb16737d..0000000000
--- a/packages/editor-ui/src/components/WorkflowLMChat/MessageOptionAction.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-<script setup lang="ts">
-const emit = defineEmits<{
-	click: [];
-}>();
-
-defineProps<{
-	label: string;
-	icon: string;
-	placement: 'left' | 'right' | 'top' | 'bottom';
-}>();
-</script>
-
-<template>
-	<N8nTooltip :placement="placement">
-		<button :class="$style.button" :style="{ color: '#aaa' }" @click="emit('click')">
-			<N8nIcon :icon="icon" size="small" />
-		</button>
-		<template #content>
-			{{ label }}
-		</template>
-	</N8nTooltip>
-</template>
-
-<style module>
-.button {
-	background: none;
-	border: none;
-	cursor: pointer;
-	padding: 0;
-}
-</style>
diff --git a/packages/editor-ui/src/components/WorkflowLMChat/MessageOptionTooltip.vue b/packages/editor-ui/src/components/WorkflowLMChat/MessageOptionTooltip.vue
deleted file mode 100644
index 008993fee5..0000000000
--- a/packages/editor-ui/src/components/WorkflowLMChat/MessageOptionTooltip.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<script setup lang="ts">
-defineProps<{
-	placement: 'left' | 'right';
-}>();
-</script>
-
-<template>
-	<n8n-info-tip type="tooltip" theme="info-light" :tooltip-placement="placement">
-		<n8n-text :bold="true" size="small">
-			<slot />
-		</n8n-text>
-	</n8n-info-tip>
-</template>
-
-<style module lang="scss"></style>
diff --git a/packages/editor-ui/src/components/WorkflowLMChat/WorkflowLMChat.vue b/packages/editor-ui/src/components/WorkflowLMChat/WorkflowLMChat.vue
deleted file mode 100644
index cd889278f8..0000000000
--- a/packages/editor-ui/src/components/WorkflowLMChat/WorkflowLMChat.vue
+++ /dev/null
@@ -1,696 +0,0 @@
-<script setup lang="ts">
-import type { Ref } from 'vue';
-import { defineAsyncComponent, provide, ref, computed, onMounted, nextTick } from 'vue';
-import { v4 as uuid } from 'uuid';
-import Modal from '@/components/Modal.vue';
-import {
-	AI_CATEGORY_AGENTS,
-	AI_CATEGORY_CHAINS,
-	AI_CODE_NODE_TYPE,
-	AI_SUBCATEGORY,
-	CHAT_EMBED_MODAL_KEY,
-	CHAT_TRIGGER_NODE_TYPE,
-	MANUAL_CHAT_TRIGGER_NODE_TYPE,
-	MODAL_CONFIRM,
-	VIEWS,
-	WORKFLOW_LM_CHAT_MODAL_KEY,
-} from '@/constants';
-
-import { useUsersStore } from '@/stores/users.store';
-
-// eslint-disable-next-line import/no-unresolved
-import MessagesList from '@n8n/chat/components/MessagesList.vue';
-import type { ArrowKeyDownPayload } from '@n8n/chat/components/Input.vue';
-import ChatInput from '@n8n/chat/components/Input.vue';
-import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
-import { useRouter } from 'vue-router';
-import { useRunWorkflow } from '@/composables/useRunWorkflow';
-import type { Chat, ChatMessage, ChatMessageText, ChatOptions } from '@n8n/chat/types';
-import { useI18n } from '@/composables/useI18n';
-import { ChatOptionsSymbol, ChatSymbol } from '@n8n/chat/constants';
-import MessageOptionTooltip from './MessageOptionTooltip.vue';
-import MessageOptionAction from './MessageOptionAction.vue';
-
-import type {
-	BinaryFileType,
-	IBinaryData,
-	IBinaryKeyData,
-	IDataObject,
-	INode,
-	INodeExecutionData,
-	INodeParameters,
-	INodeType,
-	ITaskData,
-	IUser,
-} from 'n8n-workflow';
-import {
-	CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE,
-	NodeConnectionType,
-	NodeHelpers,
-} from 'n8n-workflow';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useToast } from '@/composables/useToast';
-import type { INodeUi } from '@/Interface';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { createEventBus } from 'n8n-design-system';
-import { useUIStore } from '@/stores/ui.store';
-import { useMessage } from '@/composables/useMessage';
-import { usePinnedData } from '@/composables/usePinnedData';
-import { get, last } from 'lodash-es';
-import { isEmpty } from '@/utils/typesUtils';
-import { chatEventBus } from '@n8n/chat/event-buses';
-
-const LazyRunDataAi = defineAsyncComponent(
-	async () => await import('@/components/RunDataAi/RunDataAi.vue'),
-);
-
-// TODO: Add proper type
-interface LangChainMessage {
-	id: string[];
-	kwargs: {
-		content: string;
-	};
-}
-
-interface MemoryOutput {
-	action: string;
-	chatHistory?: LangChainMessage[];
-}
-
-const router = useRouter();
-const workflowHelpers = useWorkflowHelpers({ router });
-const { runWorkflow } = useRunWorkflow({ router });
-const workflowsStore = useWorkflowsStore();
-const nodeTypesStore = useNodeTypesStore();
-const uiStore = useUIStore();
-
-const { showError } = useToast();
-const messages: Ref<ChatMessage[]> = ref([]);
-const currentSessionId = ref<string>(String(Date.now()));
-const isDisabled = ref(false);
-
-const connectedNode = ref<INode | null>(null);
-const chatTrigger = ref<INode | null>(null);
-const modalBus = createEventBus();
-const node = ref<INode | null>(null);
-const previousMessageIndex = ref(0);
-
-const isLoading = computed(() => uiStore.isActionActive.workflowRunning);
-const allowFileUploads = computed(() => {
-	return (chatTrigger.value?.parameters?.options as INodeParameters)?.allowFileUploads === true;
-});
-const allowedFilesMimeTypes = computed(() => {
-	return (
-		(
-			chatTrigger.value?.parameters?.options as INodeParameters
-		)?.allowedFilesMimeTypes?.toString() ?? ''
-	);
-});
-const locale = useI18n();
-
-const chatOptions: ChatOptions = {
-	i18n: {
-		en: {
-			title: '',
-			footer: '',
-			subtitle: '',
-			inputPlaceholder: locale.baseText('chat.window.chat.placeholder'),
-			getStarted: '',
-			closeButtonTooltip: '',
-		},
-	},
-	webhookUrl: '',
-	mode: 'window',
-	showWindowCloseButton: true,
-	disabled: isDisabled,
-	allowFileUploads,
-	allowedFilesMimeTypes,
-};
-
-const chatConfig: Chat = {
-	messages,
-	sendMessage,
-	initialMessages: ref([]),
-	currentSessionId,
-	waitingForResponse: isLoading,
-};
-
-const messageVars = {
-	'--chat--message--bot--background': 'var(--color-lm-chat-bot-background)',
-	'--chat--message--user--background': 'var(--color-lm-chat-user-background)',
-	'--chat--message--bot--color': 'var(--color-text-dark)',
-	'--chat--message--user--color': 'var(--color-lm-chat-user-color)',
-	'--chat--message--bot--border': 'none',
-	'--chat--message--user--border': 'none',
-	'--chat--color-typing': 'var(--color-text-dark)',
-};
-
-function getTriggerNode() {
-	const workflow = workflowHelpers.getCurrentWorkflow();
-	const triggerNode = workflow.queryNodes((nodeType: INodeType) =>
-		[CHAT_TRIGGER_NODE_TYPE, MANUAL_CHAT_TRIGGER_NODE_TYPE].includes(nodeType.description.name),
-	);
-
-	if (!triggerNode.length) {
-		chatTrigger.value = null;
-	}
-
-	chatTrigger.value = triggerNode[0];
-}
-
-function setNode() {
-	const triggerNode = chatTrigger.value;
-	if (!triggerNode) {
-		return;
-	}
-
-	const workflow = workflowHelpers.getCurrentWorkflow();
-	const childNodes = workflow.getChildNodes(triggerNode.name);
-
-	for (const childNode of childNodes) {
-		// Look for the first connected node with metadata
-		// TODO: Allow later users to change that in the UI
-		const resultData = workflowsStore.getWorkflowResultDataByNodeName(childNode);
-
-		if (!resultData && !Array.isArray(resultData)) {
-			continue;
-		}
-
-		if (resultData[resultData.length - 1].metadata) {
-			node.value = workflowsStore.getNodeByName(childNode);
-			break;
-		}
-	}
-}
-
-function setConnectedNode() {
-	const triggerNode = chatTrigger.value;
-
-	if (!triggerNode) {
-		showError(new Error('Chat Trigger Node could not be found!'), 'Trigger Node not found');
-		return;
-	}
-	const workflow = workflowHelpers.getCurrentWorkflow();
-
-	const chatNode = workflowsStore.getNodes().find((storeNode: INodeUi): boolean => {
-		if (storeNode.type === CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE) return false;
-		const nodeType = nodeTypesStore.getNodeType(storeNode.type, storeNode.typeVersion);
-		if (!nodeType) return false;
-
-		const isAgent = nodeType.codex?.subcategories?.[AI_SUBCATEGORY]?.includes(AI_CATEGORY_AGENTS);
-		const isChain = nodeType.codex?.subcategories?.[AI_SUBCATEGORY]?.includes(AI_CATEGORY_CHAINS);
-
-		let isCustomChainOrAgent = false;
-		if (nodeType.name === AI_CODE_NODE_TYPE) {
-			const inputs = NodeHelpers.getNodeInputs(workflow, storeNode, nodeType);
-			const inputTypes = NodeHelpers.getConnectionTypes(inputs);
-
-			const outputs = NodeHelpers.getNodeOutputs(workflow, storeNode, nodeType);
-			const outputTypes = NodeHelpers.getConnectionTypes(outputs);
-
-			if (
-				inputTypes.includes(NodeConnectionType.AiLanguageModel) &&
-				inputTypes.includes(NodeConnectionType.Main) &&
-				outputTypes.includes(NodeConnectionType.Main)
-			) {
-				isCustomChainOrAgent = true;
-			}
-		}
-
-		if (!isAgent && !isChain && !isCustomChainOrAgent) return false;
-
-		const parentNodes = workflow.getParentNodes(storeNode.name);
-		const isChatChild = parentNodes.some((parentNodeName) => parentNodeName === triggerNode.name);
-
-		return Boolean(isChatChild && (isAgent || isChain || isCustomChainOrAgent));
-	});
-
-	if (!chatNode) {
-		return;
-	}
-
-	connectedNode.value = chatNode;
-}
-
-async function convertFileToBinaryData(file: File): Promise<IBinaryData> {
-	const reader = new FileReader();
-	return await new Promise((resolve, reject) => {
-		reader.onload = () => {
-			const binaryData: IBinaryData = {
-				data: (reader.result as string).split('base64,')?.[1] ?? '',
-				mimeType: file.type,
-				fileName: file.name,
-				fileSize: `${file.size} bytes`,
-				fileExtension: file.name.split('.').pop() ?? '',
-				fileType: file.type.split('/')[0] as BinaryFileType,
-			};
-			resolve(binaryData);
-		};
-		reader.onerror = () => {
-			reject(new Error('Failed to convert file to binary data'));
-		};
-		reader.readAsDataURL(file);
-	});
-}
-
-async function getKeyedFiles(files: File[]): Promise<IBinaryKeyData> {
-	const binaryData: IBinaryKeyData = {};
-
-	await Promise.all(
-		files.map(async (file, index) => {
-			const data = await convertFileToBinaryData(file);
-			const key = `data${index}`;
-
-			binaryData[key] = data;
-		}),
-	);
-
-	return binaryData;
-}
-
-function extractFileMeta(file: File): IDataObject {
-	return {
-		fileName: file.name,
-		fileSize: `${file.size} bytes`,
-		fileExtension: file.name.split('.').pop() ?? '',
-		fileType: file.type.split('/')[0],
-		mimeType: file.type,
-	};
-}
-
-async function startWorkflowWithMessage(message: string, files?: File[]): Promise<void> {
-	const triggerNode = chatTrigger.value;
-
-	if (!triggerNode) {
-		showError(new Error('Chat Trigger Node could not be found!'), 'Trigger Node not found');
-		return;
-	}
-
-	let inputKey = 'chatInput';
-	if (triggerNode.type === MANUAL_CHAT_TRIGGER_NODE_TYPE && triggerNode.typeVersion < 1.1) {
-		inputKey = 'input';
-	}
-	if (triggerNode.type === CHAT_TRIGGER_NODE_TYPE) {
-		inputKey = 'chatInput';
-	}
-
-	const usersStore = useUsersStore();
-	const currentUser = usersStore.currentUser ?? ({} as IUser);
-
-	const inputPayload: INodeExecutionData = {
-		json: {
-			sessionId: `test-${currentUser.id || 'unknown'}`,
-			action: 'sendMessage',
-			[inputKey]: message,
-		},
-	};
-
-	if (files && files.length > 0) {
-		const filesMeta = files.map((file) => extractFileMeta(file));
-		const binaryData = await getKeyedFiles(files);
-
-		inputPayload.json.files = filesMeta;
-		inputPayload.binary = binaryData;
-	}
-	const nodeData: ITaskData = {
-		startTime: new Date().getTime(),
-		executionTime: 0,
-		executionStatus: 'success',
-		data: {
-			main: [[inputPayload]],
-		},
-		source: [null],
-	};
-
-	const response = await runWorkflow({
-		triggerNode: triggerNode.name,
-		nodeData,
-		source: 'RunData.ManualChatMessage',
-	});
-
-	workflowsStore.appendChatMessage(message);
-	if (!response) {
-		showError(new Error('It was not possible to start workflow!'), 'Workflow could not be started');
-		return;
-	}
-
-	waitForExecution(response.executionId);
-}
-
-function waitForExecution(executionId?: string) {
-	const waitInterval = setInterval(() => {
-		if (!isLoading.value) {
-			clearInterval(waitInterval);
-
-			const lastNodeExecuted =
-				workflowsStore.getWorkflowExecution?.data?.resultData.lastNodeExecuted;
-
-			if (!lastNodeExecuted) return;
-
-			const nodeResponseDataArray =
-				get(workflowsStore.getWorkflowExecution?.data?.resultData.runData, lastNodeExecuted) ?? [];
-
-			const nodeResponseData = nodeResponseDataArray[nodeResponseDataArray.length - 1];
-
-			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(),
-			});
-
-			void nextTick(setNode);
-		}
-	}, 500);
-}
-
-function extractResponseMessage(responseData?: IDataObject) {
-	if (!responseData || isEmpty(responseData)) {
-		return locale.baseText('chat.window.chat.response.empty');
-	}
-
-	// Paths where the response message might be located
-	const paths = ['output', 'text', 'response.text'];
-	const matchedPath = paths.find((path) => get(responseData, path));
-
-	if (!matchedPath) return JSON.stringify(responseData, null, 2);
-
-	const matchedOutput = get(responseData, matchedPath);
-	if (typeof matchedOutput === 'object') {
-		return '```json\n' + JSON.stringify(matchedOutput, null, 2) + '\n```';
-	}
-
-	return matchedOutput?.toString() ?? '';
-}
-
-async function sendMessage(message: string, files?: File[]) {
-	previousMessageIndex.value = 0;
-	if (message.trim() === '' && (!files || files.length === 0)) {
-		showError(
-			new Error(locale.baseText('chat.window.chat.provideMessage')),
-			locale.baseText('chat.window.chat.emptyChatMessage'),
-		);
-		return;
-	}
-
-	const pinnedChatData = usePinnedData(chatTrigger.value);
-	if (pinnedChatData.hasData.value) {
-		const confirmResult = await useMessage().confirm(
-			locale.baseText('chat.window.chat.unpinAndExecute.description'),
-			locale.baseText('chat.window.chat.unpinAndExecute.title'),
-			{
-				confirmButtonText: locale.baseText('chat.window.chat.unpinAndExecute.confirm'),
-				cancelButtonText: locale.baseText('chat.window.chat.unpinAndExecute.cancel'),
-			},
-		);
-
-		if (!(confirmResult === MODAL_CONFIRM)) return;
-
-		pinnedChatData.unsetData('unpin-and-send-chat-message-modal');
-	}
-
-	const newMessage: ChatMessage = {
-		text: message,
-		sender: 'user',
-		createdAt: new Date().toISOString(),
-		id: uuid(),
-		files,
-	};
-	messages.value.push(newMessage);
-
-	await startWorkflowWithMessage(newMessage.text, files);
-}
-
-function displayExecution(executionId: string) {
-	const workflow = workflowHelpers.getCurrentWorkflow();
-	const route = router.resolve({
-		name: VIEWS.EXECUTION_PREVIEW,
-		params: { name: workflow.id, executionId },
-	});
-	window.open(route.href, '_blank');
-}
-function isTextMessage(message: ChatMessage): message is ChatMessageText {
-	return message.type === 'text' || !message.type;
-}
-
-function repostMessage(message: ChatMessageText) {
-	void sendMessage(message.text);
-}
-function reuseMessage(message: ChatMessageText) {
-	chatEventBus.emit('setInputValue', message.text);
-}
-
-function getChatMessages(): ChatMessageText[] {
-	if (!connectedNode.value) return [];
-
-	const workflow = workflowHelpers.getCurrentWorkflow();
-	const connectedMemoryInputs =
-		workflow.connectionsByDestinationNode[connectedNode.value.name][NodeConnectionType.AiMemory];
-	if (!connectedMemoryInputs) return [];
-
-	const memoryConnection = (connectedMemoryInputs ?? []).find((i) => i.length > 0)?.[0];
-
-	if (!memoryConnection) return [];
-
-	const nodeResultData = workflowsStore.getWorkflowResultDataByNodeName(memoryConnection.node);
-
-	const memoryOutputData = (nodeResultData ?? [])
-		.map((data) => get(data, ['data', NodeConnectionType.AiMemory, 0, 0, 'json']) as MemoryOutput)
-		.find((data) => data.action === 'saveContext');
-
-	return (memoryOutputData?.chatHistory ?? []).map((message, index) => {
-		return {
-			createdAt: new Date().toISOString(),
-			text: message.kwargs.content,
-			id: `preload__${index}`,
-			sender: last(message.id) === 'HumanMessage' ? 'user' : 'bot',
-		};
-	});
-}
-
-function onArrowKeyDown({ currentInputValue, key }: ArrowKeyDownPayload) {
-	const pastMessages = workflowsStore.getPastChatMessages;
-	const isCurrentInputEmptyOrMatch =
-		currentInputValue.length === 0 || pastMessages.includes(currentInputValue);
-
-	if (isCurrentInputEmptyOrMatch && (key === 'ArrowUp' || key === 'ArrowDown')) {
-		// Blur the input when the user presses the up or down arrow key
-		chatEventBus.emit('blurInput');
-
-		if (pastMessages.length === 1) {
-			previousMessageIndex.value = 0;
-		} else if (key === 'ArrowUp') {
-			previousMessageIndex.value = (previousMessageIndex.value + 1) % pastMessages.length;
-		} else if (key === 'ArrowDown') {
-			previousMessageIndex.value =
-				(previousMessageIndex.value - 1 + pastMessages.length) % pastMessages.length;
-		}
-
-		chatEventBus.emit(
-			'setInputValue',
-			pastMessages[pastMessages.length - 1 - previousMessageIndex.value] ?? '',
-		);
-
-		// Refocus to move the cursor to the end of the input
-		chatEventBus.emit('focusInput');
-	}
-}
-
-provide(ChatSymbol, chatConfig);
-provide(ChatOptionsSymbol, chatOptions);
-onMounted(() => {
-	getTriggerNode();
-	setConnectedNode();
-	messages.value = getChatMessages();
-	setNode();
-
-	setTimeout(() => chatEventBus.emit('focusInput'), 0);
-});
-</script>
-
-<template>
-	<Modal
-		:name="WORKFLOW_LM_CHAT_MODAL_KEY"
-		width="80%"
-		max-height="80%"
-		:title="
-			locale.baseText('chat.window.title', {
-				interpolate: {
-					nodeName: connectedNode?.name || locale.baseText('chat.window.noChatNode'),
-				},
-			})
-		"
-		:event-bus="modalBus"
-		:scrollable="false"
-		@keydown.stop
-	>
-		<template #content>
-			<div
-				:class="$style.workflowLmChat"
-				data-test-id="workflow-lm-chat-dialog"
-				:style="messageVars"
-			>
-				<MessagesList :messages="messages" :class="[$style.messages, 'ignore-key-press']">
-					<template #beforeMessage="{ message }">
-						<MessageOptionTooltip
-							v-if="message.sender === 'bot' && !message.id.includes('preload')"
-							placement="right"
-						>
-							{{ locale.baseText('chat.window.chat.chatMessageOptions.executionId') }}:
-							<a href="#" @click="displayExecution(message.id)">{{ message.id }}</a>
-						</MessageOptionTooltip>
-
-						<MessageOptionAction
-							v-if="isTextMessage(message) && message.sender === 'user'"
-							data-test-id="repost-message-button"
-							icon="redo"
-							:label="locale.baseText('chat.window.chat.chatMessageOptions.repostMessage')"
-							placement="left"
-							@click="repostMessage(message)"
-						/>
-
-						<MessageOptionAction
-							v-if="isTextMessage(message) && message.sender === 'user'"
-							data-test-id="reuse-message-button"
-							icon="copy"
-							:label="locale.baseText('chat.window.chat.chatMessageOptions.reuseMessage')"
-							placement="left"
-							@click="reuseMessage(message)"
-						/>
-					</template>
-				</MessagesList>
-				<div v-if="node" :class="$style.logsWrapper" data-test-id="lm-chat-logs">
-					<n8n-text :class="$style.logsTitle" tag="p" size="large">{{
-						locale.baseText('chat.window.logs')
-					}}</n8n-text>
-					<div :class="$style.logs">
-						<LazyRunDataAi :key="messages.length" :node="node" hide-title slim />
-					</div>
-				</div>
-			</div>
-		</template>
-		<template #footer>
-			<ChatInput
-				:class="$style.messagesInput"
-				data-test-id="lm-chat-inputs"
-				@arrow-key-down="onArrowKeyDown"
-			/>
-			<n8n-info-tip class="mt-s">
-				{{ locale.baseText('chatEmbed.infoTip.description') }}
-				<a @click="uiStore.openModal(CHAT_EMBED_MODAL_KEY)">
-					{{ locale.baseText('chatEmbed.infoTip.link') }}
-				</a>
-			</n8n-info-tip>
-		</template>
-	</Modal>
-</template>
-
-<style lang="scss">
-.chat-message-markdown ul,
-.chat-message-markdown ol {
-	padding: 0 0 0 1em;
-}
-</style>
-<style module lang="scss">
-.no-node-connected {
-	width: 100%;
-	height: 100%;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-.workflowLmChat {
-	--chat--spacing: var(--spacing-m);
-	--chat--message--padding: var(--spacing-xs);
-
-	display: flex;
-	height: 100%;
-	z-index: 9999;
-	min-height: 10rem;
-
-	@media (min-height: 34rem) {
-		min-height: 14.5rem;
-	}
-	@media (min-height: 47rem) {
-		min-height: 25rem;
-	}
-	& ::-webkit-scrollbar {
-		width: 4px;
-	}
-
-	& ::-webkit-scrollbar-thumb {
-		border-radius: var(--border-radius-base);
-		background: var(--color-foreground-dark);
-		border: 1px solid white;
-	}
-
-	& ::-webkit-scrollbar-thumb:hover {
-		background: var(--color-foreground-xdark);
-	}
-}
-
-.logsWrapper {
-	--node-icon-color: var(--color-text-base);
-	border: 1px solid var(--color-foreground-base);
-	border-radius: var(--border-radius-base);
-	height: 100%;
-	overflow: auto;
-	width: 100%;
-	padding: var(--spacing-xs) 0;
-}
-
-.logsTitle {
-	margin: 0 var(--spacing-s) var(--spacing-s);
-}
-
-.messages {
-	background-color: var(--color-lm-chat-messages-background);
-	border: 1px solid var(--color-foreground-base);
-	border-radius: var(--border-radius-base);
-	height: 100%;
-	width: 100%;
-	overflow: auto;
-	padding-top: 1.5em;
-
-	&:not(:last-child) {
-		margin-right: 1em;
-	}
-
-	& * {
-		font-size: var(--font-size-s);
-	}
-}
-.messagesInput {
-	--chat--input--border: var(--input-border-color, var(--border-color-base))
-		var(--input-border-style, var(--border-style-base))
-		var(--input-border-width, var(--border-width-base));
-
-	--chat--input--border-radius: var(--border-radius-base) 0 0 var(--border-radius-base);
-	--chat--input--send--button--background: transparent;
-	--chat--input--send--button--color: var(--color-button-secondary-font);
-	--chat--input--send--button--color-hover: var(--color-primary);
-	--chat--input--border-active: var(--input-focus-border-color, var(--color-secondary));
-	--chat--files-spacing: var(--spacing-2xs) 0;
-	--chat--input--background: var(--color-lm-chat-bot-background);
-
-	[data-theme='dark'] & {
-		--chat--input--text-color: var(--input-font-color, var(--color-text-dark));
-	}
-	@media (prefers-color-scheme: dark) {
-		--chat--input--text-color: var(--input-font-color, var(--color-text-dark));
-	}
-
-	border-bottom-right-radius: var(--border-radius-base);
-	border-top-right-radius: var(--border-radius-base);
-	overflow: hidden;
-}
-</style>
diff --git a/packages/editor-ui/src/components/__tests__/WorkflowPreview.test.ts b/packages/editor-ui/src/components/WorkflowPreview.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/WorkflowPreview.test.ts
rename to packages/editor-ui/src/components/WorkflowPreview.test.ts
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
index 3a3817b58c..c54b13144d 100644
--- a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/WorkflowSelectorParameterInput.vue
@@ -18,6 +18,10 @@ import { useRouter } from 'vue-router';
 import { useWorkflowResourceLocatorDropdown } from './useWorkflowResourceLocatorDropdown';
 import { useWorkflowResourceLocatorModes } from './useWorkflowResourceLocatorModes';
 import { useWorkflowResourcesLocator } from './useWorkflowResourcesLocator';
+import { useProjectsStore } from '@/stores/projects.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL } from '@/constants';
+import { SAMPLE_SUBWORKFLOW_WORKFLOW } from '@/constants.workflows';
 
 interface Props {
 	modelValue: INodeParameterResourceLocator;
@@ -50,11 +54,14 @@ const emit = defineEmits<{
 	blur: [];
 }>();
 
-const router = useRouter();
 const workflowsStore = useWorkflowsStore();
+const projectStore = useProjectsStore();
+
+const router = useRouter();
 const i18n = useI18n();
 const container = ref<HTMLDivElement>();
 const dropdown = ref<ComponentInstance<typeof ResourceLocatorDropdown>>();
+const telemetry = useTelemetry();
 
 const width = ref(0);
 const inputRef = ref<HTMLInputElement | undefined>();
@@ -73,14 +80,35 @@ const {
 	hasMoreWorkflowsToLoad,
 	isLoadingResources,
 	filteredResources,
-	onSearchFilter,
 	searchFilter,
+	onSearchFilter,
 	getWorkflowName,
 	populateNextWorkflowsPage,
 	setWorkflowsResources,
+	reloadWorkflows,
 	getWorkflowUrl,
 } = useWorkflowResourcesLocator(router);
 
+const currentProjectName = computed(() => {
+	if (!projectStore.isTeamProjectFeatureEnabled) return '';
+
+	if (!projectStore?.currentProject || projectStore.currentProject?.type === 'personal') {
+		return `'${i18n.baseText('projects.menu.personal')}'`;
+	}
+
+	return `'${projectStore.currentProject?.name}'`;
+});
+
+const getCreateResourceLabel = computed(() => {
+	if (!currentProjectName.value) {
+		return i18n.baseText('executeWorkflowTrigger.createNewSubworkflow.noProject');
+	}
+
+	return i18n.baseText('executeWorkflowTrigger.createNewSubworkflow', {
+		interpolate: { projectName: currentProjectName.value },
+	});
+});
+
 const valueToDisplay = computed<NodeParameterValue>(() => {
 	if (typeof props.modelValue !== 'object') {
 		return props.modelValue;
@@ -122,13 +150,13 @@ function onInputChange(value: NodeParameterValue): void {
 }
 
 function onListItemSelected(value: NodeParameterValue) {
+	telemetry.track('User chose sub-workflow', {}, { withPostHog: true });
 	onInputChange(value);
 	hideDropdown();
 }
 
 function onInputFocus(): void {
 	setWidth();
-	showDropdown();
 	emit('focus');
 }
 
@@ -176,8 +204,39 @@ watch(
 onClickOutside(dropdown, () => {
 	isDropdownVisible.value = false;
 });
-</script>
 
+const onAddResourceClicked = () => {
+	const subWorkflowNameRegex = /My\s+Sub-Workflow\s+\d+/;
+
+	const urlSearchParams = new URLSearchParams();
+
+	if (projectStore.currentProjectId) {
+		urlSearchParams.set('projectId', projectStore.currentProjectId);
+	}
+
+	const sampleSubWorkflows = workflowsStore.allWorkflows.filter(
+		(w) => w.name && subWorkflowNameRegex.test(w.name),
+	);
+
+	urlSearchParams.set('sampleSubWorkflows', sampleSubWorkflows.length.toString());
+
+	telemetry.track('User clicked create new sub-workflow button', {}, { withPostHog: true });
+
+	const sampleSubworkflowChannel = new BroadcastChannel(NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL);
+
+	sampleSubworkflowChannel.onmessage = async (event: MessageEvent<{ workflowId: string }>) => {
+		const workflowId = event.data.workflowId;
+		await reloadWorkflows();
+		onInputChange(workflowId);
+		hideDropdown();
+	};
+
+	window.open(
+		`/workflows/onboarding/${SAMPLE_SUBWORKFLOW_WORKFLOW.meta.templateId}?${urlSearchParams.toString()}`,
+		'_blank',
+	);
+};
+</script>
 <template>
 	<div
 		ref="container"
@@ -194,11 +253,15 @@ onClickOutside(dropdown, () => {
 			:filter="searchFilter"
 			:has-more="hasMoreWorkflowsToLoad"
 			:error-view="false"
+			:allow-new-resources="{
+				label: getCreateResourceLabel,
+			}"
 			:width="width"
 			:event-bus="eventBus"
 			@update:model-value="onListItemSelected"
 			@filter="onSearchFilter"
 			@load-more="populateNextWorkflowsPage"
+			@add-resource-click="onAddResourceClicked"
 		>
 			<template #error>
 				<div :class="$style.error" data-test-id="rlc-error-container">
@@ -261,6 +324,7 @@ onClickOutside(dropdown, () => {
 									ref="input"
 									:model-value="expressionDisplayValue"
 									:path="path"
+									:is-read-only="isReadOnly"
 									:rows="3"
 									@update:model-value="onInputChange"
 									@modal-opener-click="emit('modalOpenerClick')"
diff --git a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts
index a34e9018e9..baeb3dcd87 100644
--- a/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts
+++ b/packages/editor-ui/src/components/WorkflowSelectorParameterInput/useWorkflowResourcesLocator.ts
@@ -24,17 +24,13 @@ export function useWorkflowResourcesLocator(router: Router) {
 	);
 
 	const filteredResources = computed(() => {
-		if (!searchFilter.value) return workflowsResources.value;
-
 		return workflowsStore.allWorkflows
 			.filter((resource) => resource.name.toLowerCase().includes(searchFilter.value.toLowerCase()))
 			.map(workflowDbToResourceMapper);
 	});
 
 	async function populateNextWorkflowsPage() {
-		if (workflowsStore.allWorkflows.length <= 1) {
-			await workflowsStore.fetchAllWorkflows();
-		}
+		await workflowsStore.fetchAllWorkflows();
 		const nextPage = sortedWorkflows.value.slice(
 			workflowsResources.value.length,
 			workflowsResources.value.length + PAGE_SIZE,
@@ -49,6 +45,12 @@ export function useWorkflowResourcesLocator(router: Router) {
 		isLoadingResources.value = false;
 	}
 
+	async function reloadWorkflows() {
+		isLoadingResources.value = true;
+		await workflowsStore.fetchAllWorkflows();
+		isLoadingResources.value = false;
+	}
+
 	function workflowDbToResourceMapper(workflow: IWorkflowDb) {
 		return {
 			name: getWorkflowName(workflow.id),
@@ -84,6 +86,7 @@ export function useWorkflowResourcesLocator(router: Router) {
 		hasMoreWorkflowsToLoad,
 		filteredResources,
 		searchFilter,
+		reloadWorkflows,
 		getWorkflowUrl,
 		onSearchFilter,
 		getWorkflowName,
diff --git a/packages/editor-ui/src/components/WorkflowSettings.spec.ts b/packages/editor-ui/src/components/WorkflowSettings.test.ts
similarity index 68%
rename from packages/editor-ui/src/components/WorkflowSettings.spec.ts
rename to packages/editor-ui/src/components/WorkflowSettings.test.ts
index 2c1a5e2c9c..ae0e27131f 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.spec.ts
+++ b/packages/editor-ui/src/components/WorkflowSettings.test.ts
@@ -2,6 +2,7 @@ import { createPinia, setActivePinia } from 'pinia';
 import WorkflowSettingsVue from '@/components/WorkflowSettings.vue';
 
 import { setupServer } from '@/__tests__/server';
+import type { MockInstance } from 'vitest';
 import { afterAll, beforeAll } from 'vitest';
 import { within } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
@@ -24,6 +25,8 @@ let workflowsStore: ReturnType<typeof useWorkflowsStore>;
 let settingsStore: ReturnType<typeof useSettingsStore>;
 let uiStore: ReturnType<typeof useUIStore>;
 
+let fetchAllWorkflowsSpy: MockInstance<(typeof workflowsStore)['fetchAllWorkflows']>;
+
 const createComponent = createComponentRenderer(WorkflowSettingsVue);
 
 describe('WorkflowSettingsVue', () => {
@@ -46,6 +49,18 @@ describe('WorkflowSettingsVue', () => {
 
 		vi.spyOn(workflowsStore, 'workflowName', 'get').mockReturnValue('Test Workflow');
 		vi.spyOn(workflowsStore, 'workflowId', 'get').mockReturnValue('1');
+		fetchAllWorkflowsSpy = vi.spyOn(workflowsStore, 'fetchAllWorkflows').mockResolvedValue([
+			{
+				id: '1',
+				name: 'Test Workflow',
+				active: true,
+				nodes: [],
+				connections: {},
+				createdAt: 1,
+				updatedAt: 1,
+				versionId: '123',
+			},
+		]);
 		vi.spyOn(workflowsStore, 'getWorkflowById').mockReturnValue({
 			id: '1',
 			name: 'Test Workflow',
@@ -113,6 +128,20 @@ describe('WorkflowSettingsVue', () => {
 		expect(getByTestId('workflow-caller-policy-workflow-ids')).toBeVisible();
 	});
 
+	it('should fetch all workflows and render them in the error workflows dropdown', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Sharing] = true;
+		const { getByTestId } = createComponent({ pinia });
+
+		await nextTick();
+		const dropdownItems = await getDropdownItems(getByTestId('error-workflow'));
+
+		// first is `- No Workflow -`, second is the workflow returned by
+		// `workflowsStore.fetchAllWorkflows`
+		expect(dropdownItems).toHaveLength(2);
+		expect(fetchAllWorkflowsSpy).toHaveBeenCalledTimes(1);
+		expect(fetchAllWorkflowsSpy).toHaveBeenCalledWith();
+	});
+
 	it('should not remove valid workflow ID characters', async () => {
 		const validWorkflowList = '1234567890, abcde, efgh, 1234';
 
@@ -145,4 +174,50 @@ describe('WorkflowSettingsVue', () => {
 
 		expect(getByTestId('workflow-caller-policy-workflow-ids')).toHaveValue(cleanedUpWorkflowList);
 	});
+
+	test.each([
+		['workflow-settings-save-failed-executions', 'Default - Save', () => {}],
+		[
+			'workflow-settings-save-failed-executions',
+			'Default - Do not save',
+			() => {
+				settingsStore.saveDataErrorExecution = 'none';
+			},
+		],
+		['workflow-settings-save-success-executions', 'Default - Save', () => {}],
+		[
+			'workflow-settings-save-success-executions',
+			'Default - Do not save',
+			() => {
+				settingsStore.saveDataSuccessExecution = 'none';
+			},
+		],
+		[
+			'workflow-settings-save-manual-executions',
+			'Default - Save',
+			() => {
+				settingsStore.saveManualExecutions = true;
+			},
+		],
+		['workflow-settings-save-manual-executions', 'Default - Do not save', () => {}],
+		[
+			'workflow-settings-save-execution-progress',
+			'Default - Save',
+			() => {
+				settingsStore.saveDataProgressExecution = true;
+			},
+		],
+		['workflow-settings-save-execution-progress', 'Default - Do not save', () => {}],
+	])(
+		'should show %s dropdown correct default value as %s',
+		async (testId, optionText, storeSetter) => {
+			storeSetter();
+			const { getByTestId } = createComponent({ pinia });
+			await nextTick();
+
+			const dropdownItems = await getDropdownItems(getByTestId(testId));
+
+			expect(dropdownItems[0]).toHaveTextContent(optionText);
+		},
+	);
 });
diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue
index 1ecac538a6..c6571769e2 100644
--- a/packages/editor-ui/src/components/WorkflowSettings.vue
+++ b/packages/editor-ui/src/components/WorkflowSettings.vue
@@ -1,13 +1,10 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-
+<script setup lang="ts">
+import { ref, computed, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import { useToast } from '@/composables/useToast';
 import type {
 	ITimeoutHMS,
-	IUser,
 	IWorkflowDataUpdate,
-	IWorkflowDb,
 	IWorkflowSettings,
 	IWorkflowShortResponse,
 } from '@/Interface';
@@ -17,11 +14,9 @@ import {
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	WORKFLOW_SETTINGS_MODAL_KEY,
 } from '@/constants';
-
 import type { WorkflowSettings } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUsersStore } from '@/stores/users.store';
 import { useRootStore } from '@/stores/root.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -30,501 +25,442 @@ import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { ProjectTypes } from '@/types/projects.types';
 import { getResourcePermissions } from '@/permissions';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
 
-export default defineComponent({
-	name: 'WorkflowSettings',
-	components: {
-		Modal,
-	},
-	setup() {
-		const externalHooks = useExternalHooks();
+const route = useRoute();
+const i18n = useI18n();
+const externalHooks = useExternalHooks();
+const toast = useToast();
+const modalBus = createEventBus();
+const telemetry = useTelemetry();
 
-		return {
-			externalHooks,
-			...useToast(),
-		};
-	},
-	data() {
-		return {
-			isLoading: true,
-			helpTexts: {
-				errorWorkflow: this.$locale.baseText('workflowSettings.helpTexts.errorWorkflow'),
-				timezone: this.$locale.baseText('workflowSettings.helpTexts.timezone'),
-				saveDataErrorExecution: this.$locale.baseText(
-					'workflowSettings.helpTexts.saveDataErrorExecution',
-				),
-				saveDataSuccessExecution: this.$locale.baseText(
-					'workflowSettings.helpTexts.saveDataSuccessExecution',
-				),
-				saveExecutionProgress: this.$locale.baseText(
-					'workflowSettings.helpTexts.saveExecutionProgress',
-				),
-				saveManualExecutions: this.$locale.baseText(
-					'workflowSettings.helpTexts.saveManualExecutions',
-				),
-				executionTimeoutToggle: this.$locale.baseText(
-					'workflowSettings.helpTexts.executionTimeoutToggle',
-				),
-				executionTimeout: this.$locale.baseText('workflowSettings.helpTexts.executionTimeout'),
-				workflowCallerPolicy: this.$locale.baseText(
-					'workflowSettings.helpTexts.workflowCallerPolicy',
-				),
-				workflowCallerIds: this.$locale.baseText('workflowSettings.helpTexts.workflowCallerIds'),
-			},
-			defaultValues: {
-				timezone: 'America/New_York',
-				saveDataErrorExecution: 'all',
-				saveDataSuccessExecution: 'all',
-				saveExecutionProgress: false,
-				saveManualExecutions: false,
-				workflowCallerPolicy: 'workflowsFromSameOwner',
-			},
-			workflowCallerPolicyOptions: [] as Array<{ key: string; value: string }>,
-			saveDataErrorExecutionOptions: [] as Array<{ key: string; value: string }>,
-			saveDataSuccessExecutionOptions: [] as Array<{ key: string; value: string }>,
-			saveExecutionProgressOptions: [] as Array<{ key: string | boolean; value: string }>,
-			saveManualOptions: [] as Array<{ key: string | boolean; value: string }>,
-			executionOrderOptions: [
-				{ key: 'v0', value: 'v0 (legacy)' },
-				{ key: 'v1', value: 'v1 (recommended)' },
-			] as Array<{ key: string; value: string }>,
-			timezones: [] as Array<{ key: string; value: string }>,
-			workflowSettings: {} as IWorkflowSettings,
-			workflows: [] as IWorkflowShortResponse[],
-			executionOrder: 'v0',
-			executionTimeout: 0,
-			maxExecutionTimeout: 0,
-			timeoutHMS: { hours: 0, minutes: 0, seconds: 0 } as ITimeoutHMS,
-			modalBus: createEventBus(),
-			WORKFLOW_SETTINGS_MODAL_KEY,
-		};
-	},
+const rootStore = useRootStore();
+const settingsStore = useSettingsStore();
+const sourceControlStore = useSourceControlStore();
+const workflowsStore = useWorkflowsStore();
+const workflowsEEStore = useWorkflowsEEStore();
 
-	computed: {
-		...mapStores(
-			useRootStore,
-			useUsersStore,
-			useSettingsStore,
-			useSourceControlStore,
-			useWorkflowsStore,
-			useWorkflowsEEStore,
-		),
-		readOnlyEnv(): boolean {
-			return this.sourceControlStore.preferences.branchReadOnly;
-		},
-		workflowName(): string {
-			return this.workflowsStore.workflowName;
-		},
-		workflowId(): string {
-			return this.workflowsStore.workflowId;
-		},
-		workflow(): IWorkflowDb {
-			return this.workflowsStore.getWorkflowById(this.workflowId);
-		},
-		currentUser(): IUser | null {
-			return this.usersStore.currentUser;
-		},
-		isSharingEnabled(): boolean {
-			return this.settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing];
-		},
-		workflowOwnerName(): string {
-			const fallback = this.$locale.baseText(
-				'workflowSettings.callerPolicy.options.workflowsFromSameProject',
-			);
+const isLoading = ref(true);
+const workflowCallerPolicyOptions = ref<Array<{ key: string; value: string }>>([]);
+const saveDataErrorExecutionOptions = ref<Array<{ key: string; value: string }>>([]);
+const saveDataSuccessExecutionOptions = ref<Array<{ key: string; value: string }>>([]);
+const saveExecutionProgressOptions = ref<Array<{ key: string | boolean; value: string }>>([]);
+const saveManualOptions = ref<Array<{ key: string | boolean; value: string }>>([]);
+const executionOrderOptions = ref<Array<{ key: string; value: string }>>([
+	{ key: 'v0', value: 'v0 (legacy)' },
+	{ key: 'v1', value: 'v1 (recommended)' },
+]);
+const timezones = ref<Array<{ key: string; value: string }>>([]);
+const workflowSettings = ref<IWorkflowSettings>({} as IWorkflowSettings);
+const workflows = ref<IWorkflowShortResponse[]>([]);
+const executionTimeout = ref(0);
+const maxExecutionTimeout = ref(0);
+const timeoutHMS = ref<ITimeoutHMS>({ hours: 0, minutes: 0, seconds: 0 });
 
-			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflowId}`, fallback);
-		},
-		workflowPermissions() {
-			return getResourcePermissions(this.workflow?.scopes).workflow;
-		},
-	},
-	async mounted() {
-		this.executionTimeout = this.rootStore.executionTimeout;
-		this.maxExecutionTimeout = this.rootStore.maxExecutionTimeout;
+const helpTexts = computed(() => ({
+	errorWorkflow: i18n.baseText('workflowSettings.helpTexts.errorWorkflow'),
+	timezone: i18n.baseText('workflowSettings.helpTexts.timezone'),
+	saveDataErrorExecution: i18n.baseText('workflowSettings.helpTexts.saveDataErrorExecution'),
+	saveDataSuccessExecution: i18n.baseText('workflowSettings.helpTexts.saveDataSuccessExecution'),
+	saveExecutionProgress: i18n.baseText('workflowSettings.helpTexts.saveExecutionProgress'),
+	saveManualExecutions: i18n.baseText('workflowSettings.helpTexts.saveManualExecutions'),
+	executionTimeoutToggle: i18n.baseText('workflowSettings.helpTexts.executionTimeoutToggle'),
+	executionTimeout: i18n.baseText('workflowSettings.helpTexts.executionTimeout'),
+	workflowCallerPolicy: i18n.baseText('workflowSettings.helpTexts.workflowCallerPolicy'),
+	workflowCallerIds: i18n.baseText('workflowSettings.helpTexts.workflowCallerIds'),
+}));
+const defaultValues = ref({
+	timezone: 'America/New_York',
+	saveDataErrorExecution: 'all',
+	saveDataSuccessExecution: 'all',
+	saveExecutionProgress: false,
+	saveManualExecutions: false,
+	workflowCallerPolicy: 'workflowsFromSameOwner',
+});
+const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
+const workflowName = computed(() => workflowsStore.workflowName);
+const workflowId = computed(() => workflowsStore.workflowId);
+const workflow = computed(() => workflowsStore.getWorkflowById(workflowId.value));
+const isSharingEnabled = computed(
+	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing],
+);
+const workflowOwnerName = computed(() => {
+	const fallback = i18n.baseText('workflowSettings.callerPolicy.options.workflowsFromSameProject');
 
-		if (!this.workflowId || this.workflowId === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-			this.showMessage({
-				title: 'No workflow active',
-				message: 'No workflow active to display settings of.',
-				type: 'error',
-				duration: 0,
-			});
-			this.closeDialog();
-			return;
-		}
+	return workflowsEEStore.getWorkflowOwnerName(`${workflowId.value}`, fallback);
+});
+const workflowPermissions = computed(() => getResourcePermissions(workflow.value?.scopes).workflow);
 
-		this.defaultValues.saveDataErrorExecution = this.settingsStore.saveDataErrorExecution;
-		this.defaultValues.saveDataSuccessExecution = this.settingsStore.saveDataSuccessExecution;
-		this.defaultValues.saveManualExecutions = this.settingsStore.saveManualExecutions;
-		this.defaultValues.timezone = this.rootStore.timezone;
-		this.defaultValues.workflowCallerPolicy = this.settingsStore.workflowCallerPolicyDefaultOption;
+const onCallerIdsInput = (str: string) => {
+	workflowSettings.value.callerIds = /^[a-zA-Z0-9,\s]+$/.test(str)
+		? str
+		: str.replace(/[^a-zA-Z0-9,\s]/g, '');
+};
 
-		this.isLoading = true;
+const closeDialog = () => {
+	modalBus.emit('close');
+	void externalHooks.run('workflowSettings.dialogVisibleChanged', {
+		dialogVisible: false,
+	});
+};
 
-		try {
-			await Promise.all([
-				this.loadWorkflows(),
-				this.loadSaveDataErrorExecutionOptions(),
-				this.loadSaveDataSuccessExecutionOptions(),
-				this.loadSaveExecutionProgressOptions(),
-				this.loadSaveManualOptions(),
-				this.loadTimezones(),
-				this.loadWorkflowCallerPolicyOptions(),
-			]);
-		} catch (error) {
-			this.showError(
-				error,
-				'Problem loading settings',
-				'The following error occurred loading the data:',
-			);
-		}
+const setTheTimeout = (key: string, value: string) => {
+	const time = value ? parseInt(value, 10) : 0;
 
-		const workflowSettings = deepCopy(this.workflowsStore.workflowSettings) as IWorkflowSettings;
+	timeoutHMS.value = {
+		...timeoutHMS.value,
+		[key]: time,
+	};
+};
 
-		if (workflowSettings.timezone === undefined) {
-			workflowSettings.timezone = 'DEFAULT';
-		}
-		if (workflowSettings.saveDataErrorExecution === undefined) {
-			workflowSettings.saveDataErrorExecution = 'DEFAULT';
-		}
-		if (workflowSettings.saveDataSuccessExecution === undefined) {
-			workflowSettings.saveDataSuccessExecution = 'DEFAULT';
-		}
-		if (workflowSettings.saveExecutionProgress === undefined) {
-			workflowSettings.saveExecutionProgress = 'DEFAULT';
-		}
-		if (workflowSettings.saveManualExecutions === undefined) {
-			workflowSettings.saveManualExecutions = this.defaultValues.saveManualExecutions;
-		}
-		if (workflowSettings.callerPolicy === undefined) {
-			workflowSettings.callerPolicy = this.defaultValues
-				.workflowCallerPolicy as WorkflowSettings.CallerPolicy;
-		}
-		if (workflowSettings.executionTimeout === undefined) {
-			workflowSettings.executionTimeout = this.rootStore.executionTimeout;
-		}
-		if (workflowSettings.maxExecutionTimeout === undefined) {
-			workflowSettings.maxExecutionTimeout = this.rootStore.maxExecutionTimeout;
-		}
-		if (workflowSettings.executionOrder === undefined) {
-			workflowSettings.executionOrder = 'v0';
-		}
-
-		this.workflowSettings = workflowSettings;
-		this.timeoutHMS = this.convertToHMS(workflowSettings.executionTimeout);
-		this.isLoading = false;
-
-		void this.externalHooks.run('workflowSettings.dialogVisibleChanged', {
-			dialogVisible: true,
-		});
-		this.$telemetry.track('User opened workflow settings', {
-			workflow_id: this.workflowsStore.workflowId,
-		});
-	},
-	methods: {
-		onCallerIdsInput(str: string) {
-			this.workflowSettings.callerIds = /^[a-zA-Z0-9,\s]+$/.test(str)
-				? str
-				: str.replace(/[^a-zA-Z0-9,\s]/g, '');
+const loadWorkflowCallerPolicyOptions = async () => {
+	workflowCallerPolicyOptions.value = [
+		{
+			key: 'none',
+			value: i18n.baseText('workflowSettings.callerPolicy.options.none'),
 		},
-		closeDialog() {
-			this.modalBus.emit('close');
-			void this.externalHooks.run('workflowSettings.dialogVisibleChanged', {
-				dialogVisible: false,
-			});
-		},
-		setTimeout(key: string, value: string) {
-			const time = value ? parseInt(value, 10) : 0;
-
-			this.timeoutHMS = {
-				...this.timeoutHMS,
-				[key]: time,
-			};
-		},
-		async loadWorkflowCallerPolicyOptions() {
-			this.workflowCallerPolicyOptions = [
+		{
+			key: 'workflowsFromSameOwner',
+			value: i18n.baseText(
+				workflow.value.homeProject?.type === ProjectTypes.Personal
+					? 'workflowSettings.callerPolicy.options.workflowsFromPersonalProject'
+					: 'workflowSettings.callerPolicy.options.workflowsFromTeamProject',
 				{
-					key: 'none',
-					value: this.$locale.baseText('workflowSettings.callerPolicy.options.none'),
-				},
-				{
-					key: 'workflowsFromSameOwner',
-					value: this.$locale.baseText(
-						this.workflow.homeProject?.type === ProjectTypes.Personal
-							? 'workflowSettings.callerPolicy.options.workflowsFromPersonalProject'
-							: 'workflowSettings.callerPolicy.options.workflowsFromTeamProject',
-						{
-							interpolate: {
-								projectName: this.workflowOwnerName,
-							},
-						},
-					),
-				},
-				{
-					key: 'workflowsFromAList',
-					value: this.$locale.baseText('workflowSettings.callerPolicy.options.workflowsFromAList'),
-				},
-				{
-					key: 'any',
-					value: this.$locale.baseText('workflowSettings.callerPolicy.options.any'),
-				},
-			];
-		},
-		async loadSaveDataErrorExecutionOptions() {
-			this.saveDataErrorExecutionOptions.length = 0;
-			this.saveDataErrorExecutionOptions.push.apply(this.saveDataErrorExecutionOptions, [
-				{
-					key: 'DEFAULT',
-					value: this.$locale.baseText(
-						'workflowSettings.saveDataErrorExecutionOptions.defaultSave',
-						{
-							interpolate: {
-								defaultValue:
-									this.defaultValues.saveDataErrorExecution === 'all'
-										? this.$locale.baseText('workflowSettings.saveDataErrorExecutionOptions.save')
-										: this.$locale.baseText(
-												'workflowSettings.saveDataErrorExecutionOptions.doNotSave',
-											),
-							},
-						},
-					),
-				},
-				{
-					key: 'all',
-					value: this.$locale.baseText('workflowSettings.saveDataErrorExecutionOptions.save'),
-				},
-				{
-					key: 'none',
-					value: this.$locale.baseText('workflowSettings.saveDataErrorExecutionOptions.doNotSave'),
-				},
-			]);
-		},
-		async loadSaveDataSuccessExecutionOptions() {
-			this.saveDataSuccessExecutionOptions.length = 0;
-			this.saveDataSuccessExecutionOptions.push.apply(this.saveDataSuccessExecutionOptions, [
-				{
-					key: 'DEFAULT',
-					value: this.$locale.baseText(
-						'workflowSettings.saveDataSuccessExecutionOptions.defaultSave',
-						{
-							interpolate: {
-								defaultValue:
-									this.defaultValues.saveDataSuccessExecution === 'all'
-										? this.$locale.baseText('workflowSettings.saveDataSuccessExecutionOptions.save')
-										: this.$locale.baseText(
-												'workflowSettings.saveDataSuccessExecutionOptions.doNotSave',
-											),
-							},
-						},
-					),
-				},
-				{
-					key: 'all',
-					value: this.$locale.baseText('workflowSettings.saveDataSuccessExecutionOptions.save'),
-				},
-				{
-					key: 'none',
-					value: this.$locale.baseText(
-						'workflowSettings.saveDataSuccessExecutionOptions.doNotSave',
-					),
-				},
-			]);
-		},
-		async loadSaveExecutionProgressOptions() {
-			this.saveExecutionProgressOptions.length = 0;
-			this.saveExecutionProgressOptions.push.apply(this.saveExecutionProgressOptions, [
-				{
-					key: 'DEFAULT',
-					value: this.$locale.baseText(
-						'workflowSettings.saveExecutionProgressOptions.defaultSave',
-						{
-							interpolate: {
-								defaultValue: this.defaultValues.saveExecutionProgress
-									? this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.save')
-									: this.$locale.baseText(
-											'workflowSettings.saveExecutionProgressOptions.doNotSave',
-										),
-							},
-						},
-					),
-				},
-				{
-					key: true,
-					value: this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.save'),
-				},
-				{
-					key: false,
-					value: this.$locale.baseText('workflowSettings.saveExecutionProgressOptions.doNotSave'),
-				},
-			]);
-		},
-		async loadSaveManualOptions() {
-			this.saveManualOptions.length = 0;
-			this.saveManualOptions.push({
-				key: 'DEFAULT',
-				value: this.$locale.baseText('workflowSettings.saveManualOptions.defaultSave', {
 					interpolate: {
-						defaultValue: this.defaultValues.saveManualExecutions
-							? this.$locale.baseText('workflowSettings.saveManualOptions.save')
-							: this.$locale.baseText('workflowSettings.saveManualOptions.doNotSave'),
+						projectName: workflowOwnerName.value,
+					},
+				},
+			),
+		},
+		{
+			key: 'workflowsFromAList',
+			value: i18n.baseText('workflowSettings.callerPolicy.options.workflowsFromAList'),
+		},
+		{
+			key: 'any',
+			value: i18n.baseText('workflowSettings.callerPolicy.options.any'),
+		},
+	];
+};
+
+const loadSaveDataErrorExecutionOptions = async () => {
+	saveDataErrorExecutionOptions.value = [
+		{
+			key: 'DEFAULT',
+			value: i18n.baseText('workflowSettings.saveDataErrorExecutionOptions.defaultSave', {
+				interpolate: {
+					defaultValue:
+						defaultValues.value.saveDataErrorExecution === 'all'
+							? i18n.baseText('workflowSettings.saveDataErrorExecutionOptions.save')
+							: i18n.baseText('workflowSettings.saveDataErrorExecutionOptions.doNotSave'),
+				},
+			}),
+		},
+		{
+			key: 'all',
+			value: i18n.baseText('workflowSettings.saveDataErrorExecutionOptions.save'),
+		},
+		{
+			key: 'none',
+			value: i18n.baseText('workflowSettings.saveDataErrorExecutionOptions.doNotSave'),
+		},
+	];
+};
+
+const loadSaveDataSuccessExecutionOptions = async () => {
+	saveDataSuccessExecutionOptions.value = [
+		{
+			key: 'DEFAULT',
+			value: i18n.baseText('workflowSettings.saveDataSuccessExecutionOptions.defaultSave', {
+				interpolate: {
+					defaultValue:
+						defaultValues.value.saveDataSuccessExecution === 'all'
+							? i18n.baseText('workflowSettings.saveDataSuccessExecutionOptions.save')
+							: i18n.baseText('workflowSettings.saveDataSuccessExecutionOptions.doNotSave'),
+				},
+			}),
+		},
+		{
+			key: 'all',
+			value: i18n.baseText('workflowSettings.saveDataSuccessExecutionOptions.save'),
+		},
+		{
+			key: 'none',
+			value: i18n.baseText('workflowSettings.saveDataSuccessExecutionOptions.doNotSave'),
+		},
+	];
+};
+
+const loadSaveExecutionProgressOptions = async () => {
+	saveExecutionProgressOptions.value = [
+		{
+			key: 'DEFAULT',
+			value: i18n.baseText('workflowSettings.saveExecutionProgressOptions.defaultSave', {
+				interpolate: {
+					defaultValue: defaultValues.value.saveExecutionProgress
+						? i18n.baseText('workflowSettings.saveExecutionProgressOptions.save')
+						: i18n.baseText('workflowSettings.saveExecutionProgressOptions.doNotSave'),
+				},
+			}),
+		},
+		{
+			key: true,
+			value: i18n.baseText('workflowSettings.saveExecutionProgressOptions.save'),
+		},
+		{
+			key: false,
+			value: i18n.baseText('workflowSettings.saveExecutionProgressOptions.doNotSave'),
+		},
+	];
+};
+
+const loadSaveManualOptions = async () => {
+	saveManualOptions.value = [
+		{
+			key: 'DEFAULT',
+			value: i18n.baseText('workflowSettings.saveManualOptions.defaultSave', {
+				interpolate: {
+					defaultValue: defaultValues.value.saveManualExecutions
+						? i18n.baseText('workflowSettings.saveManualOptions.save')
+						: i18n.baseText('workflowSettings.saveManualOptions.doNotSave'),
+				},
+			}),
+		},
+		{
+			key: true,
+			value: i18n.baseText('workflowSettings.saveManualOptions.save'),
+		},
+		{
+			key: false,
+			value: i18n.baseText('workflowSettings.saveManualOptions.doNotSave'),
+		},
+	];
+};
+
+const loadTimezones = async () => {
+	if (timezones.value.length !== 0) {
+		// Data got already loaded
+		return;
+	}
+
+	const timezonesData = await settingsStore.getTimezones();
+
+	let defaultTimezoneValue = timezonesData[defaultValues.value.timezone] as string | undefined;
+	if (defaultTimezoneValue === undefined) {
+		defaultTimezoneValue = i18n.baseText('workflowSettings.defaultTimezoneNotValid');
+	}
+
+	timezones.value.push({
+		key: 'DEFAULT',
+		value: i18n.baseText('workflowSettings.defaultTimezone', {
+			interpolate: { defaultTimezoneValue },
+		}),
+	});
+	for (const timezone of Object.keys(timezonesData)) {
+		timezones.value.push({
+			key: timezone,
+			value: timezonesData[timezone] as string,
+		});
+	}
+};
+
+const loadWorkflows = async () => {
+	const workflowsData = (await workflowsStore.fetchAllWorkflows()) as IWorkflowShortResponse[];
+	workflowsData.sort((a, b) => {
+		if (a.name.toLowerCase() < b.name.toLowerCase()) {
+			return -1;
+		}
+		if (a.name.toLowerCase() > b.name.toLowerCase()) {
+			return 1;
+		}
+		return 0;
+	});
+
+	workflowsData.unshift({
+		id: undefined as unknown as string,
+		name: i18n.baseText('workflowSettings.noWorkflow'),
+	} as IWorkflowShortResponse);
+
+	workflows.value = workflowsData;
+};
+
+const convertToHMS = (num: number): ITimeoutHMS => {
+	if (num > 0) {
+		const hours = Math.floor(num / 3600);
+		const remainder = num % 3600;
+		const minutes = Math.floor(remainder / 60);
+		const seconds = remainder % 60;
+		return { hours, minutes, seconds };
+	}
+	return { hours: 0, minutes: 0, seconds: 0 };
+};
+
+const saveSettings = async () => {
+	// Set that the active state should be changed
+	const data: IWorkflowDataUpdate & { settings: IWorkflowSettings } = {
+		settings: workflowSettings.value,
+	};
+
+	// Convert hours, minutes, seconds into seconds for the workflow timeout
+	const { hours, minutes, seconds } = timeoutHMS.value;
+	data.settings.executionTimeout =
+		data.settings.executionTimeout !== -1 ? hours * 3600 + minutes * 60 + seconds : -1;
+
+	if (data.settings.executionTimeout === 0) {
+		toast.showError(
+			new Error(i18n.baseText('workflowSettings.showError.saveSettings1.errorMessage')),
+			i18n.baseText('workflowSettings.showError.saveSettings1.title'),
+			i18n.baseText('workflowSettings.showError.saveSettings1.message') + ':',
+		);
+		return;
+	}
+
+	if (
+		workflowSettings.value?.maxExecutionTimeout &&
+		data.settings.executionTimeout > workflowSettings.value?.maxExecutionTimeout
+	) {
+		const convertedMaxExecutionTimeout = convertToHMS(workflowSettings.value.maxExecutionTimeout);
+		toast.showError(
+			new Error(
+				i18n.baseText('workflowSettings.showError.saveSettings2.errorMessage', {
+					interpolate: {
+						hours: convertedMaxExecutionTimeout.hours.toString(),
+						minutes: convertedMaxExecutionTimeout.minutes.toString(),
+						seconds: convertedMaxExecutionTimeout.seconds.toString(),
 					},
 				}),
-			});
-			this.saveManualOptions.push({
-				key: true,
-				value: this.$locale.baseText('workflowSettings.saveManualOptions.save'),
-			});
-			this.saveManualOptions.push({
-				key: false,
-				value: this.$locale.baseText('workflowSettings.saveManualOptions.doNotSave'),
-			});
-		},
+			),
+			i18n.baseText('workflowSettings.showError.saveSettings2.title'),
+			i18n.baseText('workflowSettings.showError.saveSettings2.message') + ':',
+		);
+		return;
+	}
+	delete data.settings.maxExecutionTimeout;
 
-		async loadTimezones() {
-			if (this.timezones.length !== 0) {
-				// Data got already loaded
-				return;
-			}
+	isLoading.value = true;
+	data.versionId = workflowsStore.workflowVersionId;
 
-			const timezones = await this.settingsStore.getTimezones();
+	try {
+		const workflowData = await workflowsStore.updateWorkflow(String(route.params.name), data);
+		workflowsStore.setWorkflowVersionId(workflowData.versionId);
+	} catch (error) {
+		toast.showError(error, i18n.baseText('workflowSettings.showError.saveSettings3.title'));
+		isLoading.value = false;
+		return;
+	}
 
-			let defaultTimezoneValue = timezones[this.defaultValues.timezone] as string | undefined;
-			if (defaultTimezoneValue === undefined) {
-				defaultTimezoneValue = this.$locale.baseText('workflowSettings.defaultTimezoneNotValid');
-			}
+	// Get the settings without the defaults set for local workflow settings
+	const localWorkflowSettings = Object.fromEntries(
+		Object.entries(workflowSettings.value).filter(([, value]) => value !== 'DEFAULT'),
+	);
 
-			this.timezones.push({
-				key: 'DEFAULT',
-				value: this.$locale.baseText('workflowSettings.defaultTimezone', {
-					interpolate: { defaultTimezoneValue },
-				}),
-			});
-			for (const timezone of Object.keys(timezones)) {
-				this.timezones.push({
-					key: timezone,
-					value: timezones[timezone] as string,
-				});
-			}
-		},
-		async loadWorkflows() {
-			const workflows = (await this.workflowsStore.fetchAllWorkflows(
-				this.workflow.homeProject?.id,
-			)) as IWorkflowShortResponse[];
-			workflows.sort((a, b) => {
-				if (a.name.toLowerCase() < b.name.toLowerCase()) {
-					return -1;
-				}
-				if (a.name.toLowerCase() > b.name.toLowerCase()) {
-					return 1;
-				}
-				return 0;
-			});
+	const oldSettings = deepCopy(workflowsStore.workflowSettings);
 
-			workflows.unshift({
-				id: undefined as unknown as string,
-				name: this.$locale.baseText('workflowSettings.noWorkflow'),
-			} as IWorkflowShortResponse);
+	workflowsStore.setWorkflowSettings(localWorkflowSettings);
 
-			this.workflows = workflows;
-		},
-		async saveSettings() {
-			// Set that the active state should be changed
-			const data: IWorkflowDataUpdate = {
-				settings: this.workflowSettings,
-			};
+	isLoading.value = false;
 
-			// Convert hours, minutes, seconds into seconds for the workflow timeout
-			const { hours, minutes, seconds } = this.timeoutHMS;
-			data.settings!.executionTimeout =
-				data.settings!.executionTimeout !== -1 ? hours * 3600 + minutes * 60 + seconds : -1;
+	toast.showMessage({
+		title: i18n.baseText('workflowSettings.showMessage.saveSettings.title'),
+		type: 'success',
+	});
 
-			if (data.settings!.executionTimeout === 0) {
-				this.showError(
-					new Error(this.$locale.baseText('workflowSettings.showError.saveSettings1.errorMessage')),
-					this.$locale.baseText('workflowSettings.showError.saveSettings1.title'),
-					this.$locale.baseText('workflowSettings.showError.saveSettings1.message') + ':',
-				);
-				return;
-			}
+	closeDialog();
 
-			// @ts-ignore
-			if (data.settings!.executionTimeout > this.workflowSettings.maxExecutionTimeout) {
-				const { hours, minutes, seconds } = this.convertToHMS(
-					this.workflowSettings.maxExecutionTimeout as number,
-				);
-				this.showError(
-					new Error(
-						this.$locale.baseText('workflowSettings.showError.saveSettings2.errorMessage', {
-							interpolate: {
-								hours: hours.toString(),
-								minutes: minutes.toString(),
-								seconds: seconds.toString(),
-							},
-						}),
-					),
-					this.$locale.baseText('workflowSettings.showError.saveSettings2.title'),
-					this.$locale.baseText('workflowSettings.showError.saveSettings2.message') + ':',
-				);
-				return;
-			}
-			delete data.settings!.maxExecutionTimeout;
+	void externalHooks.run('workflowSettings.saveSettings', { oldSettings });
+	telemetry.track('User updated workflow settings', {
+		workflow_id: workflowsStore.workflowId,
+	});
+};
 
-			this.isLoading = true;
-			data.versionId = this.workflowsStore.workflowVersionId;
+const toggleTimeout = () => {
+	workflowSettings.value.executionTimeout = workflowSettings.value.executionTimeout === -1 ? 0 : -1;
+};
 
-			try {
-				const workflow = await this.workflowsStore.updateWorkflow(
-					String(this.$route.params.name),
-					data,
-				);
-				this.workflowsStore.setWorkflowVersionId(workflow.versionId);
-			} catch (error) {
-				this.showError(
-					error,
-					this.$locale.baseText('workflowSettings.showError.saveSettings3.title'),
-				);
-				this.isLoading = false;
-				return;
-			}
+onMounted(async () => {
+	executionTimeout.value = rootStore.executionTimeout;
+	maxExecutionTimeout.value = rootStore.maxExecutionTimeout;
 
-			// Get the settings without the defaults set for local workflow settings
-			const localWorkflowSettings = Object.fromEntries(
-				Object.entries(this.workflowSettings).filter(([, value]) => value !== 'DEFAULT'),
-			);
+	if (!workflowId.value || workflowId.value === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+		toast.showMessage({
+			title: 'No workflow active',
+			message: 'No workflow active to display settings of.',
+			type: 'error',
+			duration: 0,
+		});
+		closeDialog();
+		return;
+	}
 
-			const oldSettings = deepCopy(this.workflowsStore.workflowSettings);
+	defaultValues.value.saveDataErrorExecution = settingsStore.saveDataErrorExecution;
+	defaultValues.value.saveDataSuccessExecution = settingsStore.saveDataSuccessExecution;
+	defaultValues.value.saveManualExecutions = settingsStore.saveManualExecutions;
+	defaultValues.value.saveExecutionProgress = settingsStore.saveDataProgressExecution;
+	defaultValues.value.timezone = rootStore.timezone;
+	defaultValues.value.workflowCallerPolicy = settingsStore.workflowCallerPolicyDefaultOption;
 
-			this.workflowsStore.setWorkflowSettings(localWorkflowSettings);
+	isLoading.value = true;
 
-			this.isLoading = false;
+	try {
+		await Promise.all([
+			loadWorkflows(),
+			loadSaveDataErrorExecutionOptions(),
+			loadSaveDataSuccessExecutionOptions(),
+			loadSaveExecutionProgressOptions(),
+			loadSaveManualOptions(),
+			loadTimezones(),
+			loadWorkflowCallerPolicyOptions(),
+		]);
+	} catch (error) {
+		toast.showError(
+			error,
+			'Problem loading settings',
+			'The following error occurred loading the data:',
+		);
+	}
 
-			this.showMessage({
-				title: this.$locale.baseText('workflowSettings.showMessage.saveSettings.title'),
-				type: 'success',
-			});
+	const workflowSettingsData = deepCopy(workflowsStore.workflowSettings);
 
-			this.closeDialog();
+	if (workflowSettingsData.timezone === undefined) {
+		workflowSettingsData.timezone = 'DEFAULT';
+	}
+	if (workflowSettingsData.saveDataErrorExecution === undefined) {
+		workflowSettingsData.saveDataErrorExecution = 'DEFAULT';
+	}
+	if (workflowSettingsData.saveDataSuccessExecution === undefined) {
+		workflowSettingsData.saveDataSuccessExecution = 'DEFAULT';
+	}
+	if (workflowSettingsData.saveExecutionProgress === undefined) {
+		workflowSettingsData.saveExecutionProgress = 'DEFAULT';
+	}
+	if (workflowSettingsData.saveManualExecutions === undefined) {
+		workflowSettingsData.saveManualExecutions = 'DEFAULT';
+	}
+	if (workflowSettingsData.callerPolicy === undefined) {
+		workflowSettingsData.callerPolicy = defaultValues.value
+			.workflowCallerPolicy as WorkflowSettings.CallerPolicy;
+	}
+	if (workflowSettingsData.executionTimeout === undefined) {
+		workflowSettingsData.executionTimeout = rootStore.executionTimeout;
+	}
+	if (workflowSettingsData.maxExecutionTimeout === undefined) {
+		workflowSettingsData.maxExecutionTimeout = rootStore.maxExecutionTimeout;
+	}
+	if (workflowSettingsData.executionOrder === undefined) {
+		workflowSettingsData.executionOrder = 'v0';
+	}
 
-			void this.externalHooks.run('workflowSettings.saveSettings', { oldSettings });
-			this.$telemetry.track('User updated workflow settings', {
-				workflow_id: this.workflowsStore.workflowId,
-			});
-		},
-		toggleTimeout() {
-			this.workflowSettings.executionTimeout =
-				this.workflowSettings.executionTimeout === -1 ? 0 : -1;
-		},
-		convertToHMS(num: number): ITimeoutHMS {
-			if (num > 0) {
-				const hours = Math.floor(num / 3600);
-				const remainder = num % 3600;
-				const minutes = Math.floor(remainder / 60);
-				const seconds = remainder % 60;
-				return { hours, minutes, seconds };
-			}
-			return { hours: 0, minutes: 0, seconds: 0 };
-		},
-	},
+	workflowSettings.value = workflowSettingsData;
+	timeoutHMS.value = convertToHMS(workflowSettingsData.executionTimeout);
+	isLoading.value = false;
+
+	void externalHooks.run('workflowSettings.dialogVisibleChanged', {
+		dialogVisible: true,
+	});
+	telemetry.track('User opened workflow settings', {
+		workflow_id: workflowsStore.workflowId,
+	});
 });
 </script>
 
@@ -534,7 +470,7 @@ export default defineComponent({
 		width="65%"
 		max-height="80%"
 		:title="
-			$locale.baseText('workflowSettings.settingsFor', {
+			i18n.baseText('workflowSettings.settingsFor', {
 				interpolate: { workflowName, workflowId },
 			})
 		"
@@ -545,9 +481,9 @@ export default defineComponent({
 			<div v-loading="isLoading" class="workflow-settings" data-test-id="workflow-settings-dialog">
 				<el-row>
 					<el-col :span="10" class="setting-name">
-						{{ $locale.baseText('workflowSettings.executionOrder') + ':' }}
+						{{ i18n.baseText('workflowSettings.executionOrder') + ':' }}
 					</el-col>
-					<el-col :span="14" class="ignore-key-press">
+					<el-col :span="14" class="ignore-key-press-canvas">
 						<n8n-select
 							v-model="workflowSettings.executionOrder"
 							placeholder="Select Execution Order"
@@ -568,9 +504,9 @@ export default defineComponent({
 					</el-col>
 				</el-row>
 
-				<el-row>
+				<el-row data-test-id="error-workflow">
 					<el-col :span="10" class="setting-name">
-						{{ $locale.baseText('workflowSettings.errorWorkflow') + ':' }}
+						{{ i18n.baseText('workflowSettings.errorWorkflow') + ':' }}
 						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-n8n-html="helpTexts.errorWorkflow"></div>
@@ -578,7 +514,7 @@ export default defineComponent({
 							<font-awesome-icon icon="question-circle" />
 						</n8n-tooltip>
 					</el-col>
-					<el-col :span="14" class="ignore-key-press">
+					<el-col :span="14" class="ignore-key-press-canvas">
 						<n8n-select
 							v-model="workflowSettings.errorWorkflow"
 							placeholder="Select Workflow"
@@ -600,7 +536,7 @@ export default defineComponent({
 				<div v-if="isSharingEnabled" data-test-id="workflow-caller-policy">
 					<el-row>
 						<el-col :span="10" class="setting-name">
-							{{ $locale.baseText('workflowSettings.callerPolicy') + ':' }}
+							{{ i18n.baseText('workflowSettings.callerPolicy') + ':' }}
 							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.workflowCallerPolicy"></div>
@@ -609,11 +545,11 @@ export default defineComponent({
 							</n8n-tooltip>
 						</el-col>
 
-						<el-col :span="14" class="ignore-key-press">
+						<el-col :span="14" class="ignore-key-press-canvas">
 							<n8n-select
 								v-model="workflowSettings.callerPolicy"
 								:disabled="readOnlyEnv || !workflowPermissions.update"
-								:placeholder="$locale.baseText('workflowSettings.selectOption')"
+								:placeholder="i18n.baseText('workflowSettings.selectOption')"
 								filterable
 								:limit-popper-width="true"
 							>
@@ -629,7 +565,7 @@ export default defineComponent({
 					</el-row>
 					<el-row v-if="workflowSettings.callerPolicy === 'workflowsFromAList'">
 						<el-col :span="10" class="setting-name">
-							{{ $locale.baseText('workflowSettings.callerIds') + ':' }}
+							{{ i18n.baseText('workflowSettings.callerIds') + ':' }}
 							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.workflowCallerIds"></div>
@@ -641,7 +577,7 @@ export default defineComponent({
 							<n8n-input
 								v-model="workflowSettings.callerIds"
 								:disabled="readOnlyEnv || !workflowPermissions.update"
-								:placeholder="$locale.baseText('workflowSettings.callerIds.placeholder')"
+								:placeholder="i18n.baseText('workflowSettings.callerIds.placeholder')"
 								type="text"
 								data-test-id="workflow-caller-policy-workflow-ids"
 								@update:model-value="onCallerIdsInput"
@@ -651,7 +587,7 @@ export default defineComponent({
 				</div>
 				<el-row>
 					<el-col :span="10" class="setting-name">
-						{{ $locale.baseText('workflowSettings.timezone') + ':' }}
+						{{ i18n.baseText('workflowSettings.timezone') + ':' }}
 						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.timezone"></div>
@@ -659,7 +595,7 @@ export default defineComponent({
 							<font-awesome-icon icon="question-circle" />
 						</n8n-tooltip>
 					</el-col>
-					<el-col :span="14" class="ignore-key-press">
+					<el-col :span="14" class="ignore-key-press-canvas">
 						<n8n-select
 							v-model="workflowSettings.timezone"
 							placeholder="Select Timezone"
@@ -680,7 +616,7 @@ export default defineComponent({
 				</el-row>
 				<el-row>
 					<el-col :span="10" class="setting-name">
-						{{ $locale.baseText('workflowSettings.saveDataErrorExecution') + ':' }}
+						{{ i18n.baseText('workflowSettings.saveDataErrorExecution') + ':' }}
 						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveDataErrorExecution"></div>
@@ -688,10 +624,10 @@ export default defineComponent({
 							<font-awesome-icon icon="question-circle" />
 						</n8n-tooltip>
 					</el-col>
-					<el-col :span="14" class="ignore-key-press">
+					<el-col :span="14" class="ignore-key-press-canvas">
 						<n8n-select
 							v-model="workflowSettings.saveDataErrorExecution"
-							:placeholder="$locale.baseText('workflowSettings.selectOption')"
+							:placeholder="i18n.baseText('workflowSettings.selectOption')"
 							filterable
 							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
@@ -709,7 +645,7 @@ export default defineComponent({
 				</el-row>
 				<el-row>
 					<el-col :span="10" class="setting-name">
-						{{ $locale.baseText('workflowSettings.saveDataSuccessExecution') + ':' }}
+						{{ i18n.baseText('workflowSettings.saveDataSuccessExecution') + ':' }}
 						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveDataSuccessExecution"></div>
@@ -717,10 +653,10 @@ export default defineComponent({
 							<font-awesome-icon icon="question-circle" />
 						</n8n-tooltip>
 					</el-col>
-					<el-col :span="14" class="ignore-key-press">
+					<el-col :span="14" class="ignore-key-press-canvas">
 						<n8n-select
 							v-model="workflowSettings.saveDataSuccessExecution"
-							:placeholder="$locale.baseText('workflowSettings.selectOption')"
+							:placeholder="i18n.baseText('workflowSettings.selectOption')"
 							filterable
 							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
@@ -738,7 +674,7 @@ export default defineComponent({
 				</el-row>
 				<el-row>
 					<el-col :span="10" class="setting-name">
-						{{ $locale.baseText('workflowSettings.saveManualExecutions') + ':' }}
+						{{ i18n.baseText('workflowSettings.saveManualExecutions') + ':' }}
 						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveManualExecutions"></div>
@@ -746,10 +682,10 @@ export default defineComponent({
 							<font-awesome-icon icon="question-circle" />
 						</n8n-tooltip>
 					</el-col>
-					<el-col :span="14" class="ignore-key-press">
+					<el-col :span="14" class="ignore-key-press-canvas">
 						<n8n-select
 							v-model="workflowSettings.saveManualExecutions"
-							:placeholder="$locale.baseText('workflowSettings.selectOption')"
+							:placeholder="i18n.baseText('workflowSettings.selectOption')"
 							filterable
 							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
@@ -767,7 +703,7 @@ export default defineComponent({
 				</el-row>
 				<el-row>
 					<el-col :span="10" class="setting-name">
-						{{ $locale.baseText('workflowSettings.saveExecutionProgress') + ':' }}
+						{{ i18n.baseText('workflowSettings.saveExecutionProgress') + ':' }}
 						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.saveExecutionProgress"></div>
@@ -775,10 +711,10 @@ export default defineComponent({
 							<font-awesome-icon icon="question-circle" />
 						</n8n-tooltip>
 					</el-col>
-					<el-col :span="14" class="ignore-key-press">
+					<el-col :span="14" class="ignore-key-press-canvas">
 						<n8n-select
 							v-model="workflowSettings.saveExecutionProgress"
-							:placeholder="$locale.baseText('workflowSettings.selectOption')"
+							:placeholder="i18n.baseText('workflowSettings.selectOption')"
 							filterable
 							:disabled="readOnlyEnv || !workflowPermissions.update"
 							:limit-popper-width="true"
@@ -796,7 +732,7 @@ export default defineComponent({
 				</el-row>
 				<el-row>
 					<el-col :span="10" class="setting-name">
-						{{ $locale.baseText('workflowSettings.timeoutWorkflow') + ':' }}
+						{{ i18n.baseText('workflowSettings.timeoutWorkflow') + ':' }}
 						<n8n-tooltip placement="top">
 							<template #content>
 								<div v-text="helpTexts.executionTimeoutToggle"></div>
@@ -823,7 +759,7 @@ export default defineComponent({
 				>
 					<el-row>
 						<el-col :span="10" class="setting-name">
-							{{ $locale.baseText('workflowSettings.timeoutAfter') + ':' }}
+							{{ i18n.baseText('workflowSettings.timeoutAfter') + ':' }}
 							<n8n-tooltip placement="top">
 								<template #content>
 									<div v-text="helpTexts.executionTimeout"></div>
@@ -836,9 +772,9 @@ export default defineComponent({
 								:disabled="readOnlyEnv || !workflowPermissions.update"
 								:model-value="timeoutHMS.hours"
 								:min="0"
-								@update:model-value="(value: string) => setTimeout('hours', value)"
+								@update:model-value="(value: string) => setTheTimeout('hours', value)"
 							>
-								<template #append>{{ $locale.baseText('workflowSettings.hours') }}</template>
+								<template #append>{{ i18n.baseText('workflowSettings.hours') }}</template>
 							</n8n-input>
 						</el-col>
 						<el-col :span="4" class="timeout-input">
@@ -847,9 +783,9 @@ export default defineComponent({
 								:model-value="timeoutHMS.minutes"
 								:min="0"
 								:max="60"
-								@update:model-value="(value: string) => setTimeout('minutes', value)"
+								@update:model-value="(value: string) => setTheTimeout('minutes', value)"
 							>
-								<template #append>{{ $locale.baseText('workflowSettings.minutes') }}</template>
+								<template #append>{{ i18n.baseText('workflowSettings.minutes') }}</template>
 							</n8n-input>
 						</el-col>
 						<el-col :span="4" class="timeout-input">
@@ -858,9 +794,9 @@ export default defineComponent({
 								:model-value="timeoutHMS.seconds"
 								:min="0"
 								:max="60"
-								@update:model-value="(value: string) => setTimeout('seconds', value)"
+								@update:model-value="(value: string) => setTheTimeout('seconds', value)"
 							>
-								<template #append>{{ $locale.baseText('workflowSettings.seconds') }}</template>
+								<template #append>{{ i18n.baseText('workflowSettings.seconds') }}</template>
 							</n8n-input>
 						</el-col>
 					</el-row>
@@ -871,7 +807,7 @@ export default defineComponent({
 			<div class="action-buttons" data-test-id="workflow-settings-save-button">
 				<n8n-button
 					:disabled="readOnlyEnv || !workflowPermissions.update"
-					:label="$locale.baseText('workflowSettings.save')"
+					:label="i18n.baseText('workflowSettings.save')"
 					size="large"
 					float="right"
 					@click="saveSettings"
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 886bd90003..7f234b690e 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -1,6 +1,5 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
+<script setup lang="ts">
+import { computed, watch, onMounted, ref } from 'vue';
 import { createEventBus } from 'n8n-design-system/utils';
 
 import Modal from './Modal.vue';
@@ -8,10 +7,8 @@ import {
 	EnterpriseEditionFeature,
 	MODAL_CONFIRM,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
-	VIEWS,
 	WORKFLOW_SHARE_MODAL_KEY,
 } from '@/constants';
-import type { IUser, IWorkflowDb } from '@/Interface';
 import { getResourcePermissions } from '@/permissions';
 import { useMessage } from '@/composables/useMessage';
 import { useToast } from '@/composables/useToast';
@@ -23,237 +20,208 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useWorkflowsEEStore } from '@/stores/workflows.ee.store';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import type { BaseTextKey } from '@/plugins/i18n';
-import { isNavigationFailure } from 'vue-router';
 import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
 import { useProjectsStore } from '@/stores/projects.store';
-import type { ProjectListItem, ProjectSharingData, Project } from '@/types/projects.types';
+import type { ProjectSharingData, Project } from '@/types/projects.types';
 import { ProjectTypes } from '@/types/projects.types';
 import { useRolesStore } from '@/stores/roles.store';
-import type { RoleMap } from '@/types/roles.types';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+import { useI18n } from '@/composables/useI18n';
+import { telemetry } from '@/plugins/telemetry';
 
-export default defineComponent({
-	name: 'WorkflowShareModal',
-	components: {
-		Modal,
-		ProjectSharing,
-	},
-	props: {
-		data: {
-			type: Object,
-			default: () => ({}),
-		},
-	},
-	setup() {
-		return {
-			...useToast(),
-			...useMessage(),
-		};
-	},
-	data() {
-		const workflowsStore = useWorkflowsStore();
-		const workflow =
-			this.data.id === PLACEHOLDER_EMPTY_WORKFLOW_ID
-				? workflowsStore.workflow
-				: workflowsStore.workflowsById[this.data.id];
+const props = defineProps<{
+	data: {
+		id: string;
+	};
+}>();
 
-		return {
-			WORKFLOW_SHARE_MODAL_KEY,
-			loading: true,
-			isDirty: false,
-			modalBus: createEventBus(),
-			sharedWithProjects: [...(workflow.sharedWithProjects || [])] as ProjectSharingData[],
-			EnterpriseEditionFeature,
-			teamProject: null as Project | null,
-		};
-	},
-	computed: {
-		...mapStores(
-			useSettingsStore,
-			useUIStore,
-			useUsersStore,
-			useWorkflowsStore,
-			useWorkflowsEEStore,
-			useProjectsStore,
-			useRolesStore,
-		),
-		isSharingEnabled(): boolean {
-			return this.settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing];
-		},
-		modalTitle(): string {
-			if (this.isHomeTeamProject) {
-				return this.$locale.baseText('workflows.shareModal.title.static', {
-					interpolate: { projectName: this.workflow.homeProject?.name ?? '' },
-				});
-			}
+const { data } = props;
 
-			return this.$locale.baseText(
-				this.isSharingEnabled
-					? (this.uiStore.contextBasedTranslationKeys.workflows.sharing.title as BaseTextKey)
-					: (this.uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable
-							.title as BaseTextKey),
-				{
-					interpolate: { name: this.workflow.name },
-				},
-			);
-		},
-		workflow(): IWorkflowDb {
-			return this.data.id === PLACEHOLDER_EMPTY_WORKFLOW_ID
-				? this.workflowsStore.workflow
-				: this.workflowsStore.workflowsById[this.data.id];
-		},
-		currentUser(): IUser | null {
-			return this.usersStore.currentUser;
-		},
-		workflowPermissions() {
-			return getResourcePermissions(this.workflow?.scopes).workflow;
-		},
-		workflowOwnerName(): string {
-			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflow.id}`);
-		},
-		projects(): ProjectListItem[] {
-			return this.projectsStore.personalProjects.filter(
-				(project) => project.id !== this.workflow.homeProject?.id,
-			);
-		},
-		isHomeTeamProject(): boolean {
-			return this.workflow.homeProject?.type === ProjectTypes.Team;
-		},
-		numberOfMembersInHomeTeamProject(): number {
-			return this.teamProject?.relations.length ?? 0;
-		},
-		workflowRoleTranslations(): Record<string, string> {
-			return {
-				'workflow:editor': this.$locale.baseText('workflows.shareModal.role.editor'),
-			};
-		},
-		workflowRoles(): RoleMap['workflow'] {
-			return this.rolesStore.processedWorkflowRoles.map(({ role, scopes, licensed }) => ({
-				role,
-				name: this.workflowRoleTranslations[role],
-				scopes,
-				licensed,
-			}));
-		},
-	},
-	watch: {
-		sharedWithProjects: {
-			handler() {
-				this.isDirty = true;
-			},
-			deep: true,
-		},
-	},
-	async mounted() {
-		await this.initialize();
-	},
-	methods: {
-		onProjectAdded(project: ProjectSharingData) {
-			this.trackTelemetry('User selected sharee to add', {
-				project_id_sharer: this.workflow.homeProject?.id,
-				project_id_sharee: project.id,
-			});
-		},
-		onProjectRemoved(project: ProjectSharingData) {
-			this.trackTelemetry('User selected sharee to remove', {
-				project_id_sharer: this.workflow.homeProject?.id,
-				project_id_sharee: project.id,
-			});
-		},
-		async onSave() {
-			if (this.loading) {
-				return;
-			}
+const workflowsStore = useWorkflowsStore();
+const settingsStore = useSettingsStore();
+const uiStore = useUIStore();
+const usersStore = useUsersStore();
+const workflowsEEStore = useWorkflowsEEStore();
+const projectsStore = useProjectsStore();
+const rolesStore = useRolesStore();
 
-			this.loading = true;
+const toast = useToast();
+const message = useMessage();
+const pageRedirectionHelper = usePageRedirectionHelper();
+const i18n = useI18n();
 
-			const saveWorkflowPromise = async () => {
-				return await new Promise<string>((resolve) => {
-					if (this.workflow.id === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-						nodeViewEventBus.emit('saveWorkflow', () => {
-							resolve(this.workflow.id);
-						});
-					} else {
-						resolve(this.workflow.id);
-					}
-				});
-			};
+const workflow = ref(
+	data.id === PLACEHOLDER_EMPTY_WORKFLOW_ID
+		? workflowsStore.workflow
+		: workflowsStore.workflowsById[data.id],
+);
+const loading = ref(true);
+const isDirty = ref(false);
+const modalBus = createEventBus();
+const sharedWithProjects = ref([
+	...(workflow.value.sharedWithProjects ?? []),
+] as ProjectSharingData[]);
+const teamProject = ref(null as Project | null);
 
-			try {
-				const workflowId = await saveWorkflowPromise();
-				await this.workflowsEEStore.saveWorkflowSharedWith({
-					workflowId,
-					sharedWithProjects: this.sharedWithProjects,
-				});
+const isSharingEnabled = computed(
+	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing],
+);
 
-				this.showMessage({
-					title: this.$locale.baseText('workflows.shareModal.onSave.success.title'),
-					type: 'success',
-				});
-				this.isDirty = false;
-			} catch (error) {
-				this.showError(error, this.$locale.baseText('workflows.shareModal.onSave.error.title'));
-			} finally {
-				this.modalBus.emit('close');
-				this.loading = false;
-			}
+const isHomeTeamProject = computed(() => workflow.value.homeProject?.type === ProjectTypes.Team);
+
+const modalTitle = computed(() => {
+	if (isHomeTeamProject.value) {
+		return i18n.baseText('workflows.shareModal.title.static', {
+			interpolate: { projectName: workflow.value.homeProject?.name ?? '' },
+		});
+	}
+
+	return i18n.baseText(
+		isSharingEnabled.value
+			? (uiStore.contextBasedTranslationKeys.workflows.sharing.title as BaseTextKey)
+			: (uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.title as BaseTextKey),
+		{
+			interpolate: { name: workflow.value.name },
 		},
-		async onCloseModal() {
-			if (this.isDirty) {
-				const shouldSave = await this.confirm(
-					this.$locale.baseText('workflows.shareModal.saveBeforeClose.message'),
-					this.$locale.baseText('workflows.shareModal.saveBeforeClose.title'),
-					{
-						type: 'warning',
-						confirmButtonText: this.$locale.baseText(
-							'workflows.shareModal.saveBeforeClose.confirmButtonText',
-						),
-						cancelButtonText: this.$locale.baseText(
-							'workflows.shareModal.saveBeforeClose.cancelButtonText',
-						),
-					},
-				);
-
-				if (shouldSave === MODAL_CONFIRM) {
-					return await this.onSave();
-				}
-			}
-
-			return true;
-		},
-		goToUsersSettings() {
-			this.$router.push({ name: VIEWS.USERS_SETTINGS }).catch((failure) => {
-				if (!isNavigationFailure(failure)) {
-					console.error(failure);
-				}
-			});
-			this.modalBus.emit('close');
-		},
-		trackTelemetry(eventName: string, data: ITelemetryTrackProperties) {
-			this.$telemetry.track(eventName, {
-				workflow_id: this.workflow.id,
-				...data,
-			});
-		},
-		goToUpgrade() {
-			void this.uiStore.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
-		},
-		async initialize() {
-			if (this.isSharingEnabled) {
-				await Promise.all([this.usersStore.fetchUsers(), this.projectsStore.getAllProjects()]);
-
-				if (this.workflow.id !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-					await this.workflowsStore.fetchWorkflow(this.workflow.id);
-				}
-
-				if (this.isHomeTeamProject && this.workflow.homeProject) {
-					this.teamProject = await this.projectsStore.fetchProject(this.workflow.homeProject.id);
-				}
-			}
-
-			this.loading = false;
-		},
-	},
+	);
 });
+
+const workflowPermissions = computed(() => getResourcePermissions(workflow.value?.scopes).workflow);
+
+const workflowOwnerName = computed(() =>
+	workflowsEEStore.getWorkflowOwnerName(`${workflow.value.id}`),
+);
+
+const projects = computed(() =>
+	projectsStore.personalProjects.filter((project) => project.id !== workflow.value.homeProject?.id),
+);
+
+const numberOfMembersInHomeTeamProject = computed(() => teamProject.value?.relations.length ?? 0);
+
+const workflowRoleTranslations = computed(() => ({
+	'workflow:editor': i18n.baseText('workflows.shareModal.role.editor'),
+	'workflow:owner': '',
+}));
+
+const workflowRoles = computed(() =>
+	rolesStore.processedWorkflowRoles.map(({ role, scopes, licensed }) => ({
+		role,
+		name: workflowRoleTranslations.value[role],
+		scopes,
+		licensed,
+	})),
+);
+
+const trackTelemetry = (eventName: string, data: ITelemetryTrackProperties) => {
+	telemetry.track(eventName, {
+		workflow_id: workflow.value.id,
+		...data,
+	});
+};
+
+const onProjectAdded = (project: ProjectSharingData) => {
+	trackTelemetry('User selected sharee to add', {
+		project_id_sharer: workflow.value.homeProject?.id,
+		project_id_sharee: project.id,
+	});
+};
+
+const onProjectRemoved = (project: ProjectSharingData) => {
+	trackTelemetry('User selected sharee to remove', {
+		project_id_sharer: workflow.value.homeProject?.id,
+		project_id_sharee: project.id,
+	});
+};
+
+const onSave = async () => {
+	if (loading.value) {
+		return;
+	}
+
+	loading.value = true;
+
+	const saveWorkflowPromise = async () => {
+		return await new Promise<string>((resolve) => {
+			if (workflow.value.id === PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+				nodeViewEventBus.emit('saveWorkflow', () => {
+					resolve(workflow.value.id);
+				});
+			} else {
+				resolve(workflow.value.id);
+			}
+		});
+	};
+
+	try {
+		const workflowId = await saveWorkflowPromise();
+		await workflowsEEStore.saveWorkflowSharedWith({
+			workflowId,
+			sharedWithProjects: sharedWithProjects.value,
+		});
+
+		toast.showMessage({
+			title: i18n.baseText('workflows.shareModal.onSave.success.title'),
+		});
+		isDirty.value = false;
+	} catch (error) {
+		toast.showError(error, i18n.baseText('workflows.shareModal.onSave.error.title'));
+	} finally {
+		modalBus.emit('close');
+		loading.value = false;
+	}
+};
+
+const onCloseModal = async () => {
+	if (isDirty.value) {
+		const shouldSave = await message.confirm(
+			i18n.baseText('workflows.shareModal.saveBeforeClose.message'),
+			i18n.baseText('workflows.shareModal.saveBeforeClose.title'),
+			{
+				type: 'warning',
+				confirmButtonText: i18n.baseText('workflows.shareModal.saveBeforeClose.confirmButtonText'),
+				cancelButtonText: i18n.baseText('workflows.shareModal.saveBeforeClose.cancelButtonText'),
+			},
+		);
+
+		if (shouldSave === MODAL_CONFIRM) {
+			return await onSave();
+		}
+	}
+
+	return true;
+};
+
+const goToUpgrade = () => {
+	void pageRedirectionHelper.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
+};
+
+const initialize = async () => {
+	if (isSharingEnabled.value) {
+		await Promise.all([usersStore.fetchUsers(), projectsStore.getAllProjects()]);
+
+		if (workflow.value.id !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+			await workflowsStore.fetchWorkflow(workflow.value.id);
+		}
+
+		if (isHomeTeamProject.value && workflow.value.homeProject) {
+			teamProject.value = await projectsStore.fetchProject(workflow.value.homeProject.id);
+		}
+	}
+
+	loading.value = false;
+};
+
+onMounted(async () => {
+	await initialize();
+});
+
+watch(
+	sharedWithProjects,
+	() => {
+		isDirty.value = true;
+	},
+	{ deep: true },
+);
 </script>
 
 <template>
@@ -270,7 +238,7 @@ export default defineComponent({
 			<div v-if="!isSharingEnabled" :class="$style.container">
 				<n8n-text>
 					{{
-						$locale.baseText(
+						i18n.baseText(
 							uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.description.modal,
 						)
 					}}
@@ -283,7 +251,7 @@ export default defineComponent({
 					class="mb-s"
 				>
 					{{
-						$locale.baseText('workflows.shareModal.info.sharee', {
+						i18n.baseText('workflows.shareModal.info.sharee', {
 							interpolate: { workflowOwnerName },
 						})
 					}}
@@ -297,7 +265,7 @@ export default defineComponent({
 							:roles="workflowRoles"
 							:readonly="!workflowPermissions.share"
 							:static="isHomeTeamProject || !workflowPermissions.share"
-							:placeholder="$locale.baseText('workflows.shareModal.select.placeholder')"
+							:placeholder="i18n.baseText('workflows.shareModal.select.placeholder')"
 							@project-added="onProjectAdded"
 							@project-removed="onProjectRemoved"
 						/>
@@ -309,7 +277,7 @@ export default defineComponent({
 								<template #members>
 									<strong>
 										{{
-											$locale.baseText('workflows.shareModal.info.members.number', {
+											i18n.baseText('workflows.shareModal.info.members.number', {
 												interpolate: {
 													number: String(numberOfMembersInHomeTeamProject),
 												},
@@ -342,9 +310,7 @@ export default defineComponent({
 			<div v-if="!isSharingEnabled" :class="$style.actionButtons">
 				<n8n-button @click="goToUpgrade">
 					{{
-						$locale.baseText(
-							uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.button,
-						)
+						i18n.baseText(uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.button)
 					}}
 				</n8n-button>
 			</div>
@@ -354,10 +320,10 @@ export default defineComponent({
 				:class="$style.actionButtons"
 			>
 				<n8n-text v-show="isDirty" color="text-light" size="small" class="mr-xs">
-					{{ $locale.baseText('workflows.shareModal.changesHint') }}
+					{{ i18n.baseText('workflows.shareModal.changesHint') }}
 				</n8n-text>
 				<n8n-button v-if="isHomeTeamProject" type="secondary" @click="modalBus.emit('close')">
-					{{ $locale.baseText('generic.close') }}
+					{{ i18n.baseText('generic.close') }}
 				</n8n-button>
 				<n8n-button
 					v-else
@@ -367,7 +333,7 @@ export default defineComponent({
 					data-test-id="workflow-sharing-modal-save-button"
 					@click="onSave"
 				>
-					{{ $locale.baseText('workflows.shareModal.save') }}
+					{{ i18n.baseText('workflows.shareModal.save') }}
 				</n8n-button>
 			</enterprise-edition>
 		</template>
diff --git a/packages/editor-ui/src/components/WorkflowTagsDropdown.vue b/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
index 9f8eefa184..553de58fe6 100644
--- a/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
+++ b/packages/editor-ui/src/components/WorkflowTagsDropdown.vue
@@ -15,7 +15,7 @@ interface TagsDropdownWrapperProps {
 const props = withDefaults(defineProps<TagsDropdownWrapperProps>(), {
 	placeholder: '',
 	modelValue: () => [],
-	createEnabled: false,
+	createEnabled: true,
 	eventBus: null,
 });
 
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/ChangePasswordModal.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/ChangePasswordModal.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/__snapshots__/ChangePasswordModal.test.ts.snap
rename to packages/editor-ui/src/components/__snapshots__/ChangePasswordModal.test.ts.snap
diff --git a/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
new file mode 100644
index 0000000000..37ce7d48ca
--- /dev/null
+++ b/packages/editor-ui/src/components/__snapshots__/InputPanel.test.ts.snap
@@ -0,0 +1,184 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`InputPanel > should render 1`] = `
+<div>
+  <div
+    class="run-data container"
+    data-test-id="ndv-input-panel"
+    data-v-2e5cd75c=""
+  >
+    <!--v-if-->
+    <!--v-if-->
+    <div
+      class="header"
+      data-v-2e5cd75c=""
+    >
+      
+      <div
+        class="titleSection"
+      >
+        <span
+          class="title"
+        >
+          Input
+        </span>
+        <div
+          class="n8n-radio-buttons radioGroup"
+          data-test-id="input-panel-mode"
+          role="radiogroup"
+        >
+          
+          <label
+            aria-checked="false"
+            class="n8n-radio-button container hoverable"
+            role="radio"
+            tabindex="-1"
+          >
+            <div
+              class="button medium"
+              data-test-id="radio-button-mapping"
+            >
+              Mapping
+            </div>
+          </label>
+          <label
+            aria-checked="true"
+            class="n8n-radio-button container hoverable"
+            role="radio"
+            tabindex="-1"
+          >
+            <div
+              class="button active medium"
+              data-test-id="radio-button-debugging"
+            >
+              Debugging
+            </div>
+          </label>
+          
+        </div>
+      </div>
+      
+      <div
+        class="displayModes"
+        data-test-id="run-data-pane-header"
+        data-v-2e5cd75c=""
+      >
+        <!---->
+        <div
+          class="n8n-radio-buttons radioGroup"
+          data-test-id="ndv-run-data-display-mode"
+          data-v-2e5cd75c=""
+          role="radiogroup"
+        >
+          
+          <label
+            aria-checked="true"
+            class="n8n-radio-button container hoverable"
+            role="radio"
+            tabindex="-1"
+          >
+            <div
+              class="button active medium"
+              data-test-id="radio-button-schema"
+            >
+              Schema
+            </div>
+          </label>
+          <label
+            aria-checked="false"
+            class="n8n-radio-button container hoverable"
+            role="radio"
+            tabindex="-1"
+          >
+            <div
+              class="button medium"
+              data-test-id="radio-button-table"
+            >
+              Table
+            </div>
+          </label>
+          <label
+            aria-checked="false"
+            class="n8n-radio-button container hoverable"
+            role="radio"
+            tabindex="-1"
+          >
+            <div
+              class="button medium"
+              data-test-id="radio-button-json"
+            >
+              JSON
+            </div>
+          </label>
+          
+        </div>
+        <!--v-if-->
+        <!--v-if-->
+        <div
+          class="editModeActions"
+          data-v-2e5cd75c=""
+          style="display: none;"
+        >
+          <button
+            aria-live="polite"
+            class="button button tertiary medium"
+            data-v-2e5cd75c=""
+          >
+            <!--v-if-->
+            <span>
+              
+              Cancel
+              
+            </span>
+          </button>
+          <button
+            aria-live="polite"
+            class="button button primary medium ml-2xs ml-2xs"
+            data-v-2e5cd75c=""
+          >
+            <!--v-if-->
+            <span>
+              
+              Save
+              
+            </span>
+          </button>
+        </div>
+      </div>
+    </div>
+    <!--v-if-->
+    <!--v-if-->
+    <!--v-if-->
+    <!--v-if-->
+    
+    
+    <!--v-if-->
+    <div
+      class="dataContainer"
+      data-test-id="ndv-data-container"
+      data-v-2e5cd75c=""
+    >
+      <!---->
+    </div>
+    <!--v-if-->
+    <transition-stub
+      appear="false"
+      class="uiBlocker"
+      css="true"
+      data-v-249d9307=""
+      data-v-2e5cd75c=""
+      mode="out-in"
+      name="fade"
+      persisted="true"
+    >
+      <div
+        aria-hidden="true"
+        class="n8n-block-ui uiBlocker"
+        data-v-249d9307=""
+        role="dialog"
+        style="display: none;"
+      />
+    </transition-stub>
+  </div>
+</div>
+`;
diff --git a/packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap
new file mode 100644
index 0000000000..5321a5b16a
--- /dev/null
+++ b/packages/editor-ui/src/components/__snapshots__/MultipleParameter.test.ts.snap
@@ -0,0 +1,17 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`MultipleParameter > should render correctly 1`] = `
+"<div data-v-a47e4507="" class="duplicate-parameter">
+  <div data-v-a47e4507="" class="container" data-test-id="input-label"><label class="n8n-input-label inputLabel heading underline small">
+      <div class="title"><span class="n8n-text text-dark size-small bold">Additional Fields <!--v-if--></span></div>
+      <!--v-if-->
+      <!--v-if-->
+      <!--v-if-->
+    </label></div>
+  <div data-v-a47e4507="" class="add-item-wrapper">
+    <div data-v-a47e4507="" class="no-items-exist"><span data-v-a47e4507="" class="n8n-text size-small regular">Currently no items exist</span></div><button data-v-a47e4507="" class="button button tertiary medium block" aria-live="polite">
+      <!--v-if--><span>Add item</span>
+    </button>
+  </div>
+</div>"
+`;
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/RunDataJson.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/__tests__/__snapshots__/RunDataJson.test.ts.snap
rename to packages/editor-ui/src/components/__snapshots__/RunDataJson.test.ts.snap
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..d7d666d2bb
--- /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[`VirtualSchema.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[`VirtualSchema.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[`VirtualSchema.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[`VirtualSchema.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/__tests__/MainSidebarSourceControl.test.ts b/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
deleted file mode 100644
index b6f89a1d33..0000000000
--- a/packages/editor-ui/src/components/__tests__/MainSidebarSourceControl.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { describe, it, expect, vi } from 'vitest';
-import { waitFor } from '@testing-library/vue';
-import userEvent from '@testing-library/user-event';
-import { createTestingPinia } from '@pinia/testing';
-import { merge } from 'lodash-es';
-import { SOURCE_CONTROL_PULL_MODAL_KEY, STORES } from '@/constants';
-import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
-import MainSidebarSourceControl from '@/components/MainSidebarSourceControl.vue';
-import { useSourceControlStore } from '@/stores/sourceControl.store';
-import { useUIStore } from '@/stores/ui.store';
-import { useRBACStore } from '@/stores/rbac.store';
-import { createComponentRenderer } from '@/__tests__/render';
-
-let pinia: ReturnType<typeof createTestingPinia>;
-let sourceControlStore: ReturnType<typeof useSourceControlStore>;
-let uiStore: ReturnType<typeof useUIStore>;
-let rbacStore: ReturnType<typeof useRBACStore>;
-
-const renderComponent = createComponentRenderer(MainSidebarSourceControl);
-
-describe('MainSidebarSourceControl', () => {
-	beforeEach(() => {
-		pinia = createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
-				},
-			},
-		});
-
-		rbacStore = useRBACStore(pinia);
-		vi.spyOn(rbacStore, 'hasScope').mockReturnValue(true);
-
-		sourceControlStore = useSourceControlStore();
-		vi.spyOn(sourceControlStore, 'isEnterpriseSourceControlEnabled', 'get').mockReturnValue(true);
-
-		uiStore = useUIStore();
-	});
-
-	it('should render nothing when not instance owner', async () => {
-		vi.spyOn(rbacStore, 'hasScope').mockReturnValue(false);
-		const { container } = renderComponent({ pinia, props: { isCollapsed: false } });
-		expect(container).toBeEmptyDOMElement();
-	});
-
-	it('should render empty content when instance owner but not connected', async () => {
-		const { getByTestId } = renderComponent({ pinia, props: { isCollapsed: false } });
-		expect(getByTestId('main-sidebar-source-control')).toBeInTheDocument();
-		expect(getByTestId('main-sidebar-source-control')).toBeEmptyDOMElement();
-	});
-
-	describe('when connected', () => {
-		beforeEach(() => {
-			vi.spyOn(sourceControlStore, 'preferences', 'get').mockReturnValue({
-				branchName: 'main',
-				branches: [],
-				repositoryUrl: '',
-				branchReadOnly: false,
-				branchColor: '#5296D6',
-				connected: true,
-				publicKey: '',
-			});
-		});
-
-		it('should render the appropriate content', async () => {
-			const { getByTestId, queryByTestId } = renderComponent({
-				pinia,
-				props: { isCollapsed: false },
-			});
-			expect(getByTestId('main-sidebar-source-control-connected')).toBeInTheDocument();
-			expect(queryByTestId('main-sidebar-source-control-setup')).not.toBeInTheDocument();
-		});
-
-		it('should show toast error if pull response http status code is not 409', async () => {
-			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockRejectedValueOnce({
-				response: { status: 400 },
-			});
-			const { getAllByRole, getByRole } = renderComponent({
-				pinia,
-				props: { isCollapsed: false },
-			});
-
-			await userEvent.click(getAllByRole('button')[0]);
-			await waitFor(() => expect(getByRole('alert')).toBeInTheDocument());
-		});
-
-		it('should show confirm if pull response http status code is 409', async () => {
-			const status = {};
-			vi.spyOn(sourceControlStore, 'pullWorkfolder').mockRejectedValueOnce({
-				response: { status: 409, data: { data: status } },
-			});
-			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
-
-			const { getAllByRole } = renderComponent({
-				pinia,
-				props: { isCollapsed: false },
-			});
-
-			await userEvent.click(getAllByRole('button')[0]);
-			await waitFor(() =>
-				expect(openModalSpy).toHaveBeenCalledWith(
-					expect.objectContaining({
-						name: SOURCE_CONTROL_PULL_MODAL_KEY,
-						data: expect.objectContaining({
-							status,
-						}),
-					}),
-				),
-			);
-		});
-	});
-});
diff --git a/packages/editor-ui/src/components/__tests__/RBAC.test.ts b/packages/editor-ui/src/components/__tests__/RBAC.test.ts
deleted file mode 100644
index 511786c318..0000000000
--- a/packages/editor-ui/src/components/__tests__/RBAC.test.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import RBAC from '@/components/RBAC.vue';
-import { createComponentRenderer } from '@/__tests__/render';
-import { useRBACStore } from '@/stores/rbac.store';
-
-const renderComponent = createComponentRenderer(RBAC);
-
-vi.mock('vue-router', () => ({
-	useRoute: vi.fn(() => ({
-		path: '/workflows',
-		params: {},
-	})),
-	RouterLink: vi.fn(),
-}));
-
-vi.mock('@/stores/rbac.store', () => ({
-	useRBACStore: vi.fn(),
-}));
-
-describe('RBAC', () => {
-	it('renders default slot when hasScope is true', async () => {
-		vi.mocked(useRBACStore).mockImplementation(
-			() =>
-				({
-					hasScope: () => true,
-				}) as unknown as ReturnType<typeof useRBACStore>,
-		);
-
-		const wrapper = renderComponent({
-			props: { scope: 'worfklow:list' },
-			slots: {
-				default: 'Default Content',
-				fallback: 'Fallback Content',
-			},
-		});
-
-		expect(wrapper.getByText('Default Content')).toBeInTheDocument();
-	});
-
-	it('renders fallback slot when hasScope is false', async () => {
-		vi.mocked(useRBACStore).mockImplementation(
-			() =>
-				({
-					hasScope: () => false,
-				}) as unknown as ReturnType<typeof useRBACStore>,
-		);
-
-		const wrapper = renderComponent({
-			props: { scope: 'worfklow:list' },
-			slots: {
-				default: 'Default Content',
-				fallback: 'Fallback Content',
-			},
-		});
-
-		expect(wrapper.getByText('Fallback Content')).toBeInTheDocument();
-	});
-});
diff --git a/packages/editor-ui/src/components/__tests__/RunData.test.ts b/packages/editor-ui/src/components/__tests__/RunData.test.ts
deleted file mode 100644
index 042062a9c1..0000000000
--- a/packages/editor-ui/src/components/__tests__/RunData.test.ts
+++ /dev/null
@@ -1,307 +0,0 @@
-import { waitFor } from '@testing-library/vue';
-import userEvent from '@testing-library/user-event';
-import { createTestingPinia } from '@pinia/testing';
-import { merge } from 'lodash-es';
-import RunData from '@/components/RunData.vue';
-import { SET_NODE_TYPE, STORES, VIEWS } from '@/constants';
-import { SETTINGS_STORE_DEFAULT_STATE } from '@/__tests__/utils';
-import { createComponentRenderer } from '@/__tests__/render';
-import type { INodeUi, IRunDataDisplayMode, NodePanelType } from '@/Interface';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { setActivePinia } from 'pinia';
-import { defaultNodeTypes } from '@/__tests__/mocks';
-import type { INodeExecutionData } from 'n8n-workflow';
-
-const nodes = [
-	{
-		id: '1',
-		typeVersion: 3,
-		name: 'Test Node',
-		position: [0, 0],
-		type: SET_NODE_TYPE,
-		parameters: {},
-	},
-] as INodeUi[];
-
-describe('RunData', () => {
-	it("should render pin button in output panel disabled when there's binary data", () => {
-		const { getByTestId } = render(
-			[
-				{
-					json: {},
-					binary: {
-						data: {
-							fileName: 'test.xyz',
-							mimeType: 'application/octet-stream',
-						},
-					},
-				},
-			],
-			'binary',
-		);
-
-		expect(getByTestId('ndv-pin-data')).toBeInTheDocument();
-		expect(getByTestId('ndv-pin-data')).toHaveAttribute('disabled');
-	});
-
-	it("should not render pin button in input panel when there's binary data", () => {
-		const { queryByTestId } = render(
-			[
-				{
-					json: {},
-					binary: {
-						data: {
-							fileName: 'test.xyz',
-							mimeType: 'application/octet-stream',
-						},
-					},
-				},
-			],
-			'binary',
-			undefined,
-			'input',
-		);
-
-		expect(queryByTestId('ndv-pin-data')).not.toBeInTheDocument();
-	});
-
-	it('should render data correctly even when "item.json" has another "json" key', async () => {
-		const { getByText, getAllByTestId, getByTestId } = render(
-			[
-				{
-					json: {
-						id: 1,
-						name: 'Test 1',
-						json: {
-							data: 'Json data 1',
-						},
-					},
-				},
-				{
-					json: {
-						id: 2,
-						name: 'Test 2',
-						json: {
-							data: 'Json data 2',
-						},
-					},
-				},
-			],
-			'schema',
-		);
-
-		await userEvent.click(getByTestId('ndv-pin-data'));
-		await waitFor(() => getAllByTestId('run-data-schema-item'), { timeout: 1000 });
-		expect(getByText('Test 1')).toBeInTheDocument();
-		expect(getByText('Json data 1')).toBeInTheDocument();
-	});
-
-	it('should render view and download buttons for PDFs', async () => {
-		const { getByTestId } = render(
-			[
-				{
-					json: {},
-					binary: {
-						data: {
-							fileName: 'test.pdf',
-							fileType: 'pdf',
-							mimeType: 'application/pdf',
-						},
-					},
-				},
-			],
-			'binary',
-		);
-		expect(getByTestId('ndv-view-binary-data')).toBeInTheDocument();
-		expect(getByTestId('ndv-download-binary-data')).toBeInTheDocument();
-		expect(getByTestId('ndv-binary-data_0')).toBeInTheDocument();
-	});
-
-	it('should not render a view button for unknown content-type', async () => {
-		const { getByTestId, queryByTestId } = render(
-			[
-				{
-					json: {},
-					binary: {
-						data: {
-							fileName: 'test.xyz',
-							mimeType: 'application/octet-stream',
-						},
-					},
-				},
-			],
-			'binary',
-		);
-		expect(queryByTestId('ndv-view-binary-data')).not.toBeInTheDocument();
-		expect(getByTestId('ndv-download-binary-data')).toBeInTheDocument();
-		expect(getByTestId('ndv-binary-data_0')).toBeInTheDocument();
-	});
-
-	it('should not render pin data button when there is no output data', async () => {
-		const { queryByTestId } = render([], 'table');
-		expect(queryByTestId('ndv-pin-data')).not.toBeInTheDocument();
-	});
-
-	it('should disable pin data button when data is pinned', async () => {
-		const { getByTestId } = render([], 'table', [{ json: { name: 'Test' } }]);
-		const pinDataButton = getByTestId('ndv-pin-data');
-		expect(pinDataButton).toBeDisabled();
-	});
-
-	it('should enable pin data button when data is not pinned', async () => {
-		const { getByTestId } = render([{ json: { name: 'Test' } }], 'table');
-		const pinDataButton = getByTestId('ndv-pin-data');
-		expect(pinDataButton).toBeEnabled();
-	});
-
-	it('should not render pagination on binary tab', async () => {
-		const { queryByTestId } = render(
-			Array.from({ length: 11 }).map((_, i) => ({
-				json: {
-					data: {
-						id: i,
-						name: `Test ${i}`,
-					},
-				},
-				binary: {
-					data: {
-						a: 'b',
-					},
-				},
-			})),
-			'binary',
-		);
-		expect(queryByTestId('ndv-data-pagination')).not.toBeInTheDocument();
-	});
-
-	it('should render pagination with binary data on non-binary tab', async () => {
-		const { getByTestId } = render(
-			Array.from({ length: 11 }).map((_, i) => ({
-				json: {
-					data: {
-						id: i,
-						name: `Test ${i}`,
-					},
-				},
-				binary: {
-					data: {
-						a: 'b',
-					},
-				},
-			})),
-			'json',
-		);
-		expect(getByTestId('ndv-data-pagination')).toBeInTheDocument();
-	});
-
-	const render = (
-		outputData: unknown[],
-		displayMode: IRunDataDisplayMode,
-		pinnedData?: INodeExecutionData[],
-		paneType: NodePanelType = 'output',
-	) => {
-		const pinia = createTestingPinia({
-			initialState: {
-				[STORES.SETTINGS]: {
-					settings: merge({}, SETTINGS_STORE_DEFAULT_STATE.settings),
-				},
-				[STORES.NDV]: {
-					output: {
-						displayMode,
-					},
-					activeNodeName: 'Test Node',
-				},
-				[STORES.WORKFLOWS]: {
-					workflow: {
-						nodes,
-					},
-					workflowExecutionData: {
-						id: '1',
-						finished: true,
-						mode: 'trigger',
-						startedAt: new Date(),
-						workflowData: {
-							id: '1',
-							name: 'Test Workflow',
-							versionId: '1',
-							createdAt: new Date().toISOString(),
-							updatedAt: new Date().toISOString(),
-							active: false,
-							nodes: [],
-							connections: {},
-						},
-						data: {
-							resultData: {
-								runData: {
-									'Test Node': [
-										{
-											startTime: new Date().getTime(),
-											executionTime: new Date().getTime(),
-											data: {
-												main: [outputData],
-											},
-											source: [null],
-										},
-									],
-								},
-							},
-						},
-					},
-				},
-				[STORES.NODE_TYPES]: {
-					nodeTypes: defaultNodeTypes,
-				},
-			},
-		});
-
-		setActivePinia(pinia);
-
-		const workflowsStore = useWorkflowsStore();
-		vi.mocked(workflowsStore).getNodeByName.mockReturnValue(nodes[0]);
-		if (pinnedData) {
-			vi.mocked(workflowsStore).pinDataByNodeName.mockReturnValue(pinnedData);
-		}
-
-		return createComponentRenderer(RunData, {
-			props: {
-				node: {
-					name: 'Test Node',
-				},
-				workflow: {
-					nodes,
-				},
-			},
-			data() {
-				return {
-					canPinData: true,
-					showData: true,
-				};
-			},
-			global: {
-				stubs: {
-					RunDataPinButton: { template: '<button data-test-id="ndv-pin-data"></button>' },
-				},
-				mocks: {
-					$route: {
-						name: VIEWS.WORKFLOW,
-					},
-				},
-			},
-		})({
-			props: {
-				node: {
-					id: '1',
-					name: 'Test Node',
-					position: [0, 0],
-				},
-				nodes: [{ name: 'Test Node', indicies: [], depth: 1 }],
-				runIndex: 0,
-				paneType,
-				isExecuting: false,
-				mappingEnabled: true,
-				distanceFromActive: 0,
-			},
-			pinia,
-		});
-	};
-});
diff --git a/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts b/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
deleted file mode 100644
index 3cbe68836f..0000000000
--- a/packages/editor-ui/src/components/__tests__/RunDataSchema.test.ts
+++ /dev/null
@@ -1,304 +0,0 @@
-import { createComponentRenderer } from '@/__tests__/render';
-import RunDataJsonSchema from '@/components/RunDataSchema.vue';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { userEvent } from '@testing-library/user-event';
-import { cleanup, within, waitFor } from '@testing-library/vue';
-import { createPinia, setActivePinia } from 'pinia';
-import {
-	createTestNode,
-	defaultNodeDescriptions,
-	mockNodeTypeDescription,
-} from '@/__tests__/mocks';
-import { IF_NODE_TYPE, SET_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 } from 'n8n-workflow';
-import * as nodeHelpers from '@/composables/useNodeHelpers';
-
-const mockNode1 = createTestNode({
-	name: 'Set1',
-	type: SET_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,
-});
-
-async function setupStore() {
-	const workflow = mock<IWorkflowDb>({
-		id: '123',
-		name: 'Test Workflow',
-		connections: {},
-		active: true,
-		nodes: [mockNode1, mockNode2, disabledNode, ifNode, aiTool],
-	});
-
-	const pinia = createPinia();
-	setActivePinia(pinia);
-
-	const workflowsStore = useWorkflowsStore();
-	const nodeTypesStore = useNodeTypesStore();
-
-	nodeTypesStore.setNodeTypes([
-		...defaultNodeDescriptions,
-		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>;
-
-	beforeEach(async () => {
-		cleanup();
-		renderComponent = createComponentRenderer(RunDataJsonSchema, {
-			global: {
-				stubs: ['font-awesome-icon'],
-			},
-			pinia: await setupStore(),
-			props: {
-				mappingEnabled: true,
-				runIndex: 1,
-				outputIndex: 0,
-				totalRuns: 2,
-				paneType: 'input',
-				connectionType: 'main',
-				search: '',
-				nodes: [
-					{ name: 'Set1', indicies: [], depth: 1 },
-					{ name: 'Set2', indicies: [], depth: 2 },
-				],
-			},
-		});
-	});
-
-	it('renders schema for empty data', async () => {
-		const { getAllByTestId } = renderComponent();
-		expect(getAllByTestId('run-data-schema-empty').length).toBe(1);
-
-		// Expand second node
-		await userEvent.click(getAllByTestId('run-data-schema-node-name')[1]);
-		expect(getAllByTestId('run-data-schema-empty').length).toBe(2);
-	});
-
-	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 nodes = getAllByTestId('run-data-schema-node');
-		expect(nodes.length).toBe(2);
-		const firstNodeName = await within(nodes[0]).findByTestId('run-data-schema-node-name');
-		const firstNodeItemCount = await within(nodes[0]).findByTestId(
-			'run-data-schema-node-item-count',
-		);
-		expect(firstNodeName).toHaveTextContent('Set1');
-		expect(firstNodeItemCount).toHaveTextContent('2 items');
-		expect(within(nodes[0]).getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-
-		const secondNodeName = await within(nodes[1]).findByTestId('run-data-schema-node-name');
-		expect(secondNodeName).toHaveTextContent('Set2');
-
-		// Expand second node
-		await userEvent.click(secondNodeName);
-		expect(within(nodes[1]).getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-	});
-
-	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 { getAllByTestId } = renderComponent();
-		expect(getAllByTestId('run-data-schema-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-disabled')).toBeInTheDocument();
-		expect(getByTestId('run-data-schema-node-name')).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-node-name')).toHaveTextContent('If');
-			expect(getByTestId('run-data-schema-node-item-count')).toHaveTextContent('2 items');
-			expect(getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-		});
-	});
-
-	it('renders previous nodes schema for AI tools', async () => {
-		mockNodeOutputData(
-			'If',
-			[
-				{ id: 1, name: 'John' },
-				{ id: 2, name: 'Jane' },
-			],
-			0,
-		);
-		const { getByTestId } = renderComponent({
-			props: {
-				nodes: [
-					{
-						name: 'If',
-						indicies: [], // indicies are not set for AI tools
-						depth: 2,
-					},
-				],
-				node: aiTool,
-			},
-		});
-
-		await waitFor(() => {
-			expect(getByTestId('run-data-schema-node-name')).toHaveTextContent('If');
-			expect(getByTestId('run-data-schema-node-item-count')).toHaveTextContent('2 items');
-			expect(getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-		});
-	});
-
-	it('renders its own data for AI tools in debug mode', async () => {
-		const { getByTestId } = renderComponent({
-			props: {
-				nodes: [], // in debug mode nodes are empty
-				node: aiTool,
-				data: [{ output: 'AI tool output' }],
-			},
-		});
-
-		await waitFor(() => {
-			expect(getByTestId('run-data-schema-node-schema')).toMatchSnapshot();
-		});
-	});
-
-	test.each([[[{ tx: false }, { tx: false }]], [[{ tx: '' }, { tx: '' }]], [[{ tx: [] }]]])(
-		'renders schema instead of showing no data for %o',
-		(data) => {
-			useWorkflowsStore().pinData({
-				node: mockNode1,
-				data: data.map((item) => ({ json: item })),
-			});
-
-			const { queryByTestId } = renderComponent();
-			expect(queryByTestId('run-data-schema-empty')).not.toBeInTheDocument();
-		},
-	);
-});
diff --git a/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts b/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts
deleted file mode 100644
index 8fa20d0965..0000000000
--- a/packages/editor-ui/src/components/__tests__/WorkflowLMChatModal.test.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia';
-import { fireEvent, waitFor } from '@testing-library/vue';
-import { mock } from 'vitest-mock-extended';
-import { NodeConnectionType } from 'n8n-workflow';
-import type { IConnections, INode } from 'n8n-workflow';
-
-import WorkflowLMChatModal from '@/components/WorkflowLMChat/WorkflowLMChat.vue';
-import { WORKFLOW_LM_CHAT_MODAL_KEY } from '@/constants';
-import type { IWorkflowDb } from '@/Interface';
-import { useNodeTypesStore } from '@/stores/nodeTypes.store';
-import { useSettingsStore } from '@/stores/settings.store';
-import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/stores/users.store';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-
-import { createComponentRenderer } from '@/__tests__/render';
-import { setupServer } from '@/__tests__/server';
-import { defaultNodeDescriptions, mockNodes } from '@/__tests__/mocks';
-import { cleanupAppModals, createAppModals } from '@/__tests__/utils';
-
-const connections: IConnections = {
-	'Chat Trigger': {
-		main: [
-			[
-				{
-					node: 'Agent',
-					type: NodeConnectionType.Main,
-					index: 0,
-				},
-			],
-		],
-	},
-};
-
-const renderComponent = createComponentRenderer(WorkflowLMChatModal, {
-	props: {
-		teleported: false,
-		appendToBody: false,
-	},
-});
-
-async function createPiniaWithAINodes(options = { withConnections: true, withAgentNode: true }) {
-	const { withConnections, withAgentNode } = options;
-
-	const chatTriggerNode = mockNodes[4];
-	const agentNode = mockNodes[5];
-	const nodes: INode[] = [chatTriggerNode];
-	if (withAgentNode) nodes.push(agentNode);
-	const workflow = mock<IWorkflowDb>({
-		nodes,
-		...(withConnections ? { connections } : {}),
-	});
-
-	const pinia = createPinia();
-	setActivePinia(pinia);
-
-	const workflowsStore = useWorkflowsStore();
-	const nodeTypesStore = useNodeTypesStore();
-	const uiStore = useUIStore();
-
-	nodeTypesStore.setNodeTypes(defaultNodeDescriptions);
-	workflowsStore.workflow = workflow;
-
-	await useSettingsStore().getSettings();
-	await useUsersStore().loginWithCookie();
-	uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
-
-	return pinia;
-}
-
-describe('WorkflowLMChatModal', () => {
-	let server: ReturnType<typeof setupServer>;
-
-	beforeAll(() => {
-		server = setupServer();
-	});
-
-	beforeEach(() => {
-		createAppModals();
-	});
-
-	afterEach(() => {
-		cleanupAppModals();
-		vi.clearAllMocks();
-	});
-
-	afterAll(() => {
-		server.shutdown();
-	});
-
-	it('should render correctly', async () => {
-		const { getByTestId } = renderComponent({
-			pinia: await createPiniaWithAINodes(),
-		});
-
-		await waitFor(() => expect(getByTestId('lmChat-modal')).toBeInTheDocument());
-
-		expect(getByTestId('workflow-lm-chat-dialog')).toBeInTheDocument();
-	});
-
-	it('should send and display chat message', async () => {
-		const { getByTestId } = renderComponent({
-			pinia: await createPiniaWithAINodes({
-				withConnections: true,
-				withAgentNode: true,
-			}),
-		});
-
-		await waitFor(() => expect(getByTestId('lmChat-modal')).toBeInTheDocument());
-
-		const chatDialog = getByTestId('workflow-lm-chat-dialog');
-		const chatInputsContainer = getByTestId('lm-chat-inputs');
-		const chatSendButton = chatInputsContainer.querySelector('.chat-input-send-button');
-		const chatInput = chatInputsContainer.querySelector('textarea');
-
-		if (chatInput && chatSendButton) {
-			await fireEvent.update(chatInput, 'Hello!');
-			await fireEvent.click(chatSendButton);
-		}
-
-		await waitFor(() =>
-			expect(chatDialog.querySelectorAll('.chat-message-from-user')).toHaveLength(1),
-		);
-
-		expect(chatDialog.querySelector('.chat-message-from-user')).toHaveTextContent('Hello!');
-	});
-});
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
deleted file mode 100644
index 9ad2012439..0000000000
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/RunDataSchema.test.ts.snap
+++ /dev/null
@@ -1,2453 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`RunDataSchema.vue > renders its own data for AI tools in debug mode 1`] = `
-<div
-  class="schema"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="item"
-    data-test-id="run-data-schema-item"
-    data-v-46dade00=""
-  >
-    <div
-      class="itemContent"
-    >
-      <!--v-if-->
-      <!--v-if-->
-    </div>
-    <!--v-if-->
-    <!--v-if-->
-    <div
-      class="sub"
-    >
-      <div
-        class="innerSub"
-      >
-        
-        <div
-          class="item"
-          data-test-id="run-data-schema-item"
-        >
-          <div
-            class="itemContent"
-          >
-            <div
-              class="pill mappable"
-              title="string"
-            >
-              <span
-                class="label"
-                data-depth="1"
-                data-name="output"
-                data-path=".output"
-                data-target="mappable"
-                data-value="{{ $json.output }}"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                  data-icon="font"
-                  data-prefix="fas"
-                  focusable="false"
-                  role="img"
-                  viewBox="0 0 448 512"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    class=""
-                    d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                    fill="currentColor"
-                  />
-                </svg>
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    output
-                  </span>
-                  
-                </span>
-              </span>
-            </div>
-            <span
-              class="text"
-              data-test-id="run-data-schema-item-value"
-            >
-              
-              
-              <!--v-if-->
-              <span
-                class="content"
-              >
-                
-                <span>
-                  <!--v-if-->
-                  AI tool output
-                </span>
-                
-              </span>
-              
-              
-            </span>
-          </div>
-          <!--v-if-->
-          <!--v-if-->
-          <!--v-if-->
-        </div>
-        
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders previous nodes schema for AI tools 1`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="id"
-                  data-path=".id"
-                  data-target="mappable"
-                  data-value="{{ $('If').item.json.id }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      id
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    1
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $('If').item.json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema for correct output branch 1`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="id"
-                  data-path=".id"
-                  data-target="mappable"
-                  data-value="{{ $('If').item.json.id }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      id
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    1
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $('If').item.json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema for data 1`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="age"
-                  data-path=".age"
-                  data-target="mappable"
-                  data-value="{{ $json.age }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      age
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    22
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="array"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="hobbies"
-                  data-path=".hobbies"
-                  data-target="mappable"
-                  data-value="{{ $json.hobbies }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                    data-icon="list"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      hobbies
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <!--v-if-->
-            </div>
-            <input
-              checked=""
-              id="set_1-hobbies"
-              inert=""
-              type="checkbox"
-            />
-            <label
-              class="toggle"
-              for="set_1-hobbies"
-            >
-              <svg
-                aria-hidden="true"
-                class="svg-inline--fa fa-angle-right fa-w-8"
-                data-icon="angle-right"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                viewBox="0 0 256 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  class=""
-                  d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                  fill="currentColor"
-                />
-              </svg>
-            </label>
-            <div
-              class="sub"
-            >
-              <div
-                class="innerSub"
-              >
-                
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[0]"
-                        data-path=".hobbies[0]"
-                        data-target="mappable"
-                        data-value="{{ $json.hobbies[0] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [0]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          surfing
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[1]"
-                        data-path=".hobbies[1]"
-                        data-target="mappable"
-                        data-value="{{ $json.hobbies[1] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [1]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          traveling
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema for data 2`] = `
-<div
-  class="schema animated"
-  data-test-id="run-data-schema-node-schema"
-  data-v-46dade00=""
->
-  <div
-    class="innerSchema"
-    data-v-46dade00=""
-  >
-    <div
-      class="item"
-      data-test-id="run-data-schema-item"
-      data-v-46dade00=""
-    >
-      <div
-        class="itemContent"
-      >
-        <!--v-if-->
-        <!--v-if-->
-      </div>
-      <!--v-if-->
-      <!--v-if-->
-      <div
-        class="sub"
-      >
-        <div
-          class="innerSub"
-        >
-          
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="string"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="name"
-                  data-path=".name"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.name }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                    data-icon="font"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      name
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    John
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="number"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="age"
-                  data-path=".age"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.age }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                    data-icon="hashtag"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 448 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      age
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <span
-                class="text"
-                data-test-id="run-data-schema-item-value"
-              >
-                
-                
-                <!--v-if-->
-                <span
-                  class="content"
-                >
-                  
-                  <span>
-                    <!--v-if-->
-                    22
-                  </span>
-                  
-                </span>
-                
-                
-              </span>
-            </div>
-            <!--v-if-->
-            <!--v-if-->
-            <!--v-if-->
-          </div>
-          <div
-            class="item"
-            data-test-id="run-data-schema-item"
-          >
-            <div
-              class="itemContent"
-            >
-              <div
-                class="pill mappable"
-                title="array"
-              >
-                <span
-                  class="label"
-                  data-depth="1"
-                  data-name="hobbies"
-                  data-path=".hobbies"
-                  data-target="mappable"
-                  data-value="{{ $('Set2').item.json.hobbies }}"
-                >
-                  <svg
-                    aria-hidden="true"
-                    class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                    data-icon="list"
-                    data-prefix="fas"
-                    focusable="false"
-                    role="img"
-                    viewBox="0 0 512 512"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      class=""
-                      d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                      fill="currentColor"
-                    />
-                  </svg>
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      hobbies
-                    </span>
-                    
-                  </span>
-                </span>
-              </div>
-              <!--v-if-->
-            </div>
-            <input
-              checked=""
-              id="set_2-hobbies"
-              inert=""
-              type="checkbox"
-            />
-            <label
-              class="toggle"
-              for="set_2-hobbies"
-            >
-              <svg
-                aria-hidden="true"
-                class="svg-inline--fa fa-angle-right fa-w-8"
-                data-icon="angle-right"
-                data-prefix="fas"
-                focusable="false"
-                role="img"
-                viewBox="0 0 256 512"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <path
-                  class=""
-                  d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                  fill="currentColor"
-                />
-              </svg>
-            </label>
-            <div
-              class="sub"
-            >
-              <div
-                class="innerSub"
-              >
-                
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[0]"
-                        data-path=".hobbies[0]"
-                        data-target="mappable"
-                        data-value="{{ $('Set2').item.json.hobbies[0] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [0]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          surfing
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                <div
-                  class="item"
-                  data-test-id="run-data-schema-item"
-                >
-                  <div
-                    class="itemContent"
-                  >
-                    <div
-                      class="pill mappable"
-                      title="string"
-                    >
-                      <span
-                        class="label"
-                        data-depth="2"
-                        data-name="string[1]"
-                        data-path=".hobbies[1]"
-                        data-target="mappable"
-                        data-value="{{ $('Set2').item.json.hobbies[1] }}"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                          data-icon="font"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 448 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            hobbies
-                          </span>
-                          
-                        </span>
-                        <span
-                          class="content arrayIndex"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            [1]
-                          </span>
-                          
-                        </span>
-                      </span>
-                    </div>
-                    <span
-                      class="text"
-                      data-test-id="run-data-schema-item-value"
-                    >
-                      
-                      
-                      <!--v-if-->
-                      <span
-                        class="content"
-                      >
-                        
-                        <span>
-                          <!--v-if-->
-                          traveling
-                        </span>
-                        
-                      </span>
-                      
-                      
-                    </span>
-                  </div>
-                  <!--v-if-->
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema in output pane 1`] = `
-<div>
-  <div
-    class="schemaWrapper"
-    data-v-46dade00=""
-  >
-    <div
-      class="schema"
-      data-test-id="run-data-schema-node-schema"
-      data-v-46dade00=""
-    >
-      <div
-        class="item"
-        data-test-id="run-data-schema-item"
-        data-v-46dade00=""
-      >
-        <div
-          class="itemContent"
-        >
-          <!--v-if-->
-          <!--v-if-->
-        </div>
-        <!--v-if-->
-        <!--v-if-->
-        <div
-          class="sub"
-        >
-          <div
-            class="innerSub"
-          >
-            
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="string"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="name"
-                    data-path=".name"
-                    data-target="mappable"
-                    data-value="{{ $json.name }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                      data-icon="font"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 448 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        name
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <span
-                  class="text"
-                  data-test-id="run-data-schema-item-value"
-                >
-                  
-                  
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      John
-                    </span>
-                    
-                  </span>
-                  
-                  
-                </span>
-              </div>
-              <!--v-if-->
-              <!--v-if-->
-              <!--v-if-->
-            </div>
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="number"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="age"
-                    data-path=".age"
-                    data-target="mappable"
-                    data-value="{{ $json.age }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                      data-icon="hashtag"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 448 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        age
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <span
-                  class="text"
-                  data-test-id="run-data-schema-item-value"
-                >
-                  
-                  
-                  <!--v-if-->
-                  <span
-                    class="content"
-                  >
-                    
-                    <span>
-                      <!--v-if-->
-                      22
-                    </span>
-                    
-                  </span>
-                  
-                  
-                </span>
-              </div>
-              <!--v-if-->
-              <!--v-if-->
-              <!--v-if-->
-            </div>
-            <div
-              class="item"
-              data-test-id="run-data-schema-item"
-            >
-              <div
-                class="itemContent"
-              >
-                <div
-                  class="pill mappable"
-                  title="array"
-                >
-                  <span
-                    class="label"
-                    data-depth="1"
-                    data-name="hobbies"
-                    data-path=".hobbies"
-                    data-target="mappable"
-                    data-value="{{ $json.hobbies }}"
-                  >
-                    <svg
-                      aria-hidden="true"
-                      class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                      data-icon="list"
-                      data-prefix="fas"
-                      focusable="false"
-                      role="img"
-                      viewBox="0 0 512 512"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        class=""
-                        d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                        fill="currentColor"
-                      />
-                    </svg>
-                    <!--v-if-->
-                    <span
-                      class="content"
-                    >
-                      
-                      <span>
-                        <!--v-if-->
-                        hobbies
-                      </span>
-                      
-                    </span>
-                  </span>
-                </div>
-                <!--v-if-->
-              </div>
-              <input
-                checked=""
-                id="output_object-0-0-hobbies"
-                inert=""
-                type="checkbox"
-              />
-              <label
-                class="toggle"
-                for="output_object-0-0-hobbies"
-              >
-                <svg
-                  aria-hidden="true"
-                  class="svg-inline--fa fa-angle-right fa-w-8"
-                  data-icon="angle-right"
-                  data-prefix="fas"
-                  focusable="false"
-                  role="img"
-                  viewBox="0 0 256 512"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <path
-                    class=""
-                    d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                    fill="currentColor"
-                  />
-                </svg>
-              </label>
-              <div
-                class="sub"
-              >
-                <div
-                  class="innerSub"
-                >
-                  
-                  <div
-                    class="item"
-                    data-test-id="run-data-schema-item"
-                  >
-                    <div
-                      class="itemContent"
-                    >
-                      <div
-                        class="pill mappable"
-                        title="string"
-                      >
-                        <span
-                          class="label"
-                          data-depth="2"
-                          data-name="string[0]"
-                          data-path=".hobbies[0]"
-                          data-target="mappable"
-                          data-value="{{ $json.hobbies[0] }}"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                            data-icon="font"
-                            data-prefix="fas"
-                            focusable="false"
-                            role="img"
-                            viewBox="0 0 448 512"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              class=""
-                              d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                              fill="currentColor"
-                            />
-                          </svg>
-                          <span
-                            class="content"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              hobbies
-                            </span>
-                            
-                          </span>
-                          <span
-                            class="content arrayIndex"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              [0]
-                            </span>
-                            
-                          </span>
-                        </span>
-                      </div>
-                      <span
-                        class="text"
-                        data-test-id="run-data-schema-item-value"
-                      >
-                        
-                        
-                        <!--v-if-->
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            surfing
-                          </span>
-                          
-                        </span>
-                        
-                        
-                      </span>
-                    </div>
-                    <!--v-if-->
-                    <!--v-if-->
-                    <!--v-if-->
-                  </div>
-                  <div
-                    class="item"
-                    data-test-id="run-data-schema-item"
-                  >
-                    <div
-                      class="itemContent"
-                    >
-                      <div
-                        class="pill mappable"
-                        title="string"
-                      >
-                        <span
-                          class="label"
-                          data-depth="2"
-                          data-name="string[1]"
-                          data-path=".hobbies[1]"
-                          data-target="mappable"
-                          data-value="{{ $json.hobbies[1] }}"
-                        >
-                          <svg
-                            aria-hidden="true"
-                            class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                            data-icon="font"
-                            data-prefix="fas"
-                            focusable="false"
-                            role="img"
-                            viewBox="0 0 448 512"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              class=""
-                              d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                              fill="currentColor"
-                            />
-                          </svg>
-                          <span
-                            class="content"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              hobbies
-                            </span>
-                            
-                          </span>
-                          <span
-                            class="content arrayIndex"
-                          >
-                            
-                            <span>
-                              <!--v-if-->
-                              [1]
-                            </span>
-                            
-                          </span>
-                        </span>
-                      </div>
-                      <span
-                        class="text"
-                        data-test-id="run-data-schema-item-value"
-                      >
-                        
-                        
-                        <!--v-if-->
-                        <span
-                          class="content"
-                        >
-                          
-                          <span>
-                            <!--v-if-->
-                            traveling
-                          </span>
-                          
-                        </span>
-                        
-                        
-                      </span>
-                    </div>
-                    <!--v-if-->
-                    <!--v-if-->
-                    <!--v-if-->
-                  </div>
-                  
-                </div>
-              </div>
-            </div>
-            
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`RunDataSchema.vue > renders schema with spaces and dots 1`] = `
-<div>
-  <div
-    class="schemaWrapper"
-    data-v-46dade00=""
-  >
-    <!--v-if-->
-    
-    <div
-      class="node"
-      data-test-id="run-data-schema-node"
-      data-v-46dade00=""
-    >
-      <div
-        class="header"
-        data-test-id="run-data-schema-node-header"
-        data-v-46dade00=""
-      >
-        <div
-          class="expand"
-          data-v-46dade00=""
-        >
-          <svg
-            aria-hidden="true"
-            class="svg-inline--fa fa-angle-right fa-w-8 expandIcon"
-            data-icon="angle-right"
-            data-prefix="fas"
-            data-v-46dade00=""
-            focusable="false"
-            role="img"
-            viewBox="0 0 256 512"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              class=""
-              d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-              fill="currentColor"
-            />
-          </svg>
-        </div>
-        <div
-          class="titleContainer"
-          data-test-id="run-data-schema-node-name"
-          data-v-46dade00=""
-        >
-          <div
-            class="nodeIcon"
-            data-v-46dade00=""
-          >
-            <div
-              class="n8n-node-icon"
-              data-v-46dade00=""
-            >
-              <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>
-          <div
-            class="title"
-            data-v-46dade00=""
-          >
-            Set1 
-            <!--v-if-->
-          </div>
-          <!--v-if-->
-        </div>
-        <transition-stub
-          appear="false"
-          css="true"
-          data-v-46dade00=""
-          name="items"
-          persisted="false"
-        >
-          <!--v-if-->
-        </transition-stub>
-      </div>
-      <div
-        class=""
-        data-v-46dade00=""
-      >
-        
-        <transition-stub
-          appear="false"
-          css="true"
-          data-v-46dade00=""
-          name="schema"
-          persisted="false"
-        >
-          <div
-            class="schema animated"
-            data-test-id="run-data-schema-node-schema"
-            data-v-46dade00=""
-          >
-            <div
-              class="innerSchema"
-              data-v-46dade00=""
-            >
-              <div
-                class="item"
-                data-test-id="run-data-schema-item"
-                data-v-46dade00=""
-              >
-                <div
-                  class="itemContent"
-                >
-                  <!--v-if-->
-                  <!--v-if-->
-                </div>
-                <!--v-if-->
-                <!--v-if-->
-                <div
-                  class="sub"
-                >
-                  <div
-                    class="innerSub"
-                  >
-                    
-                    <div
-                      class="item"
-                      data-test-id="run-data-schema-item"
-                    >
-                      <div
-                        class="itemContent"
-                      >
-                        <div
-                          class="pill mappable"
-                          title="array"
-                        >
-                          <span
-                            class="label"
-                            data-depth="1"
-                            data-name="hello world"
-                            data-path="['hello world']"
-                            data-target="mappable"
-                            data-value="{{ $json['hello world'] }}"
-                          >
-                            <svg
-                              aria-hidden="true"
-                              class="svg-inline--fa fa-list fa-w-16 fa-sm"
-                              data-icon="list"
-                              data-prefix="fas"
-                              focusable="false"
-                              role="img"
-                              viewBox="0 0 512 512"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                class=""
-                                d="M80 368H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm0-320H16A16 16 0 0 0 0 64v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16V64a16 16 0 0 0-16-16zm0 160H16a16 16 0 0 0-16 16v64a16 16 0 0 0 16 16h64a16 16 0 0 0 16-16v-64a16 16 0 0 0-16-16zm416 176H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zm0-320H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16V80a16 16 0 0 0-16-16zm0 160H176a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h320a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16z"
-                                fill="currentColor"
-                              />
-                            </svg>
-                            <!--v-if-->
-                            <span
-                              class="content"
-                            >
-                              
-                              <span>
-                                <!--v-if-->
-                                hello world
-                              </span>
-                              
-                            </span>
-                          </span>
-                        </div>
-                        <!--v-if-->
-                      </div>
-                      <input
-                        checked=""
-                        id="set_1-hello world"
-                        inert=""
-                        type="checkbox"
-                      />
-                      <label
-                        class="toggle"
-                        for="set_1-hello world"
-                      >
-                        <svg
-                          aria-hidden="true"
-                          class="svg-inline--fa fa-angle-right fa-w-8"
-                          data-icon="angle-right"
-                          data-prefix="fas"
-                          focusable="false"
-                          role="img"
-                          viewBox="0 0 256 512"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            class=""
-                            d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                            fill="currentColor"
-                          />
-                        </svg>
-                      </label>
-                      <div
-                        class="sub"
-                      >
-                        <div
-                          class="innerSub"
-                        >
-                          
-                          <div
-                            class="item"
-                            data-test-id="run-data-schema-item"
-                          >
-                            <div
-                              class="itemContent"
-                            >
-                              <div
-                                class="pill mappable"
-                                title="object"
-                              >
-                                <span
-                                  class="label"
-                                  data-depth="2"
-                                  data-name="object[0]"
-                                  data-path="['hello world'][0]"
-                                  data-target="mappable"
-                                  data-value="{{ $json['hello world'][0] }}"
-                                >
-                                  <svg
-                                    aria-hidden="true"
-                                    class="svg-inline--fa fa-cube fa-w-16 fa-sm"
-                                    data-icon="cube"
-                                    data-prefix="fas"
-                                    focusable="false"
-                                    role="img"
-                                    viewBox="0 0 512 512"
-                                    xmlns="http://www.w3.org/2000/svg"
-                                  >
-                                    <path
-                                      class=""
-                                      d="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"
-                                      fill="currentColor"
-                                    />
-                                  </svg>
-                                  <span
-                                    class="content"
-                                  >
-                                    
-                                    <span>
-                                      <!--v-if-->
-                                      hello world
-                                    </span>
-                                    
-                                  </span>
-                                  <span
-                                    class="content arrayIndex"
-                                  >
-                                    
-                                    <span>
-                                      <!--v-if-->
-                                      [0]
-                                    </span>
-                                    
-                                  </span>
-                                </span>
-                              </div>
-                              <!--v-if-->
-                            </div>
-                            <input
-                              checked=""
-                              id="set_1-hello world-0"
-                              inert=""
-                              type="checkbox"
-                            />
-                            <label
-                              class="toggle"
-                              for="set_1-hello world-0"
-                            >
-                              <svg
-                                aria-hidden="true"
-                                class="svg-inline--fa fa-angle-right fa-w-8"
-                                data-icon="angle-right"
-                                data-prefix="fas"
-                                focusable="false"
-                                role="img"
-                                viewBox="0 0 256 512"
-                                xmlns="http://www.w3.org/2000/svg"
-                              >
-                                <path
-                                  class=""
-                                  d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                                  fill="currentColor"
-                                />
-                              </svg>
-                            </label>
-                            <div
-                              class="sub"
-                            >
-                              <div
-                                class="innerSub"
-                              >
-                                
-                                <div
-                                  class="item"
-                                  data-test-id="run-data-schema-item"
-                                >
-                                  <div
-                                    class="itemContent"
-                                  >
-                                    <div
-                                      class="pill mappable"
-                                      title="object"
-                                    >
-                                      <span
-                                        class="label"
-                                        data-depth="3"
-                                        data-name="test"
-                                        data-path="['hello world'][0].test"
-                                        data-target="mappable"
-                                        data-value="{{ $json['hello world'][0].test }}"
-                                      >
-                                        <svg
-                                          aria-hidden="true"
-                                          class="svg-inline--fa fa-cube fa-w-16 fa-sm"
-                                          data-icon="cube"
-                                          data-prefix="fas"
-                                          focusable="false"
-                                          role="img"
-                                          viewBox="0 0 512 512"
-                                          xmlns="http://www.w3.org/2000/svg"
-                                        >
-                                          <path
-                                            class=""
-                                            d="M239.1 6.3l-208 78c-18.7 7-31.1 25-31.1 45v225.1c0 18.2 10.3 34.8 26.5 42.9l208 104c13.5 6.8 29.4 6.8 42.9 0l208-104c16.3-8.1 26.5-24.8 26.5-42.9V129.3c0-20-12.4-37.9-31.1-44.9l-208-78C262 2.2 250 2.2 239.1 6.3zM256 68.4l192 72v1.1l-192 78-192-78v-1.1l192-72zm32 356V275.5l160-65v133.9l-160 80z"
-                                            fill="currentColor"
-                                          />
-                                        </svg>
-                                        <!--v-if-->
-                                        <span
-                                          class="content"
-                                        >
-                                          
-                                          <span>
-                                            <!--v-if-->
-                                            test
-                                          </span>
-                                          
-                                        </span>
-                                      </span>
-                                    </div>
-                                    <!--v-if-->
-                                  </div>
-                                  <input
-                                    checked=""
-                                    id="set_1-hello world-0-test"
-                                    inert=""
-                                    type="checkbox"
-                                  />
-                                  <label
-                                    class="toggle"
-                                    for="set_1-hello world-0-test"
-                                  >
-                                    <svg
-                                      aria-hidden="true"
-                                      class="svg-inline--fa fa-angle-right fa-w-8"
-                                      data-icon="angle-right"
-                                      data-prefix="fas"
-                                      focusable="false"
-                                      role="img"
-                                      viewBox="0 0 256 512"
-                                      xmlns="http://www.w3.org/2000/svg"
-                                    >
-                                      <path
-                                        class=""
-                                        d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-                                        fill="currentColor"
-                                      />
-                                    </svg>
-                                  </label>
-                                  <div
-                                    class="sub"
-                                  >
-                                    <div
-                                      class="innerSub"
-                                    >
-                                      
-                                      <div
-                                        class="item"
-                                        data-test-id="run-data-schema-item"
-                                      >
-                                        <div
-                                          class="itemContent"
-                                        >
-                                          <div
-                                            class="pill mappable"
-                                            title="number"
-                                          >
-                                            <span
-                                              class="label"
-                                              data-depth="4"
-                                              data-name="more to think about"
-                                              data-path="['hello world'][0].test['more to think about']"
-                                              data-target="mappable"
-                                              data-value="{{ $json['hello world'][0].test['more to think about'] }}"
-                                            >
-                                              <svg
-                                                aria-hidden="true"
-                                                class="svg-inline--fa fa-hashtag fa-w-14 fa-sm"
-                                                data-icon="hashtag"
-                                                data-prefix="fas"
-                                                focusable="false"
-                                                role="img"
-                                                viewBox="0 0 448 512"
-                                                xmlns="http://www.w3.org/2000/svg"
-                                              >
-                                                <path
-                                                  class=""
-                                                  d="M440.667 182.109l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l14.623-81.891C377.123 38.754 371.468 32 363.997 32h-40.632a12 12 0 0 0-11.813 9.891L296.175 128H197.54l14.623-81.891C213.477 38.754 207.822 32 200.35 32h-40.632a12 12 0 0 0-11.813 9.891L132.528 128H53.432a12 12 0 0 0-11.813 9.891l-7.143 40C33.163 185.246 38.818 192 46.289 192h74.81L98.242 320H19.146a12 12 0 0 0-11.813 9.891l-7.143 40C-1.123 377.246 4.532 384 12.003 384h74.81L72.19 465.891C70.877 473.246 76.532 480 84.003 480h40.632a12 12 0 0 0 11.813-9.891L151.826 384h98.634l-14.623 81.891C234.523 473.246 240.178 480 247.65 480h40.632a12 12 0 0 0 11.813-9.891L315.472 384h79.096a12 12 0 0 0 11.813-9.891l7.143-40c1.313-7.355-4.342-14.109-11.813-14.109h-74.81l22.857-128h79.096a12 12 0 0 0 11.813-9.891zM261.889 320h-98.634l22.857-128h98.634l-22.857 128z"
-                                                  fill="currentColor"
-                                                />
-                                              </svg>
-                                              <!--v-if-->
-                                              <span
-                                                class="content"
-                                              >
-                                                
-                                                <span>
-                                                  <!--v-if-->
-                                                  more to think about
-                                                </span>
-                                                
-                                              </span>
-                                            </span>
-                                          </div>
-                                          <span
-                                            class="text"
-                                            data-test-id="run-data-schema-item-value"
-                                          >
-                                            
-                                            
-                                            <!--v-if-->
-                                            <span
-                                              class="content"
-                                            >
-                                              
-                                              <span>
-                                                <!--v-if-->
-                                                1
-                                              </span>
-                                              
-                                            </span>
-                                            
-                                            
-                                          </span>
-                                        </div>
-                                        <!--v-if-->
-                                        <!--v-if-->
-                                        <!--v-if-->
-                                      </div>
-                                      
-                                    </div>
-                                  </div>
-                                </div>
-                                <div
-                                  class="item"
-                                  data-test-id="run-data-schema-item"
-                                >
-                                  <div
-                                    class="itemContent"
-                                  >
-                                    <div
-                                      class="pill mappable"
-                                      title="string"
-                                    >
-                                      <span
-                                        class="label"
-                                        data-depth="3"
-                                        data-name="test.how"
-                                        data-path="['hello world'][0]['test.how']"
-                                        data-target="mappable"
-                                        data-value="{{ $json['hello world'][0]['test.how'] }}"
-                                      >
-                                        <svg
-                                          aria-hidden="true"
-                                          class="svg-inline--fa fa-font fa-w-14 fa-sm"
-                                          data-icon="font"
-                                          data-prefix="fas"
-                                          focusable="false"
-                                          role="img"
-                                          viewBox="0 0 448 512"
-                                          xmlns="http://www.w3.org/2000/svg"
-                                        >
-                                          <path
-                                            class=""
-                                            d="M432 416h-23.41L277.88 53.69A32 32 0 0 0 247.58 32h-47.16a32 32 0 0 0-30.3 21.69L39.41 416H16a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16h-19.58l23.3-64h152.56l23.3 64H304a16 16 0 0 0-16 16v32a16 16 0 0 0 16 16h128a16 16 0 0 0 16-16v-32a16 16 0 0 0-16-16zM176.85 272L224 142.51 271.15 272z"
-                                            fill="currentColor"
-                                          />
-                                        </svg>
-                                        <!--v-if-->
-                                        <span
-                                          class="content"
-                                        >
-                                          
-                                          <span>
-                                            <!--v-if-->
-                                            test.how
-                                          </span>
-                                          
-                                        </span>
-                                      </span>
-                                    </div>
-                                    <span
-                                      class="text"
-                                      data-test-id="run-data-schema-item-value"
-                                    >
-                                      
-                                      
-                                      <!--v-if-->
-                                      <span
-                                        class="content"
-                                      >
-                                        
-                                        <span>
-                                          <!--v-if-->
-                                          ignore
-                                        </span>
-                                        
-                                      </span>
-                                      
-                                      
-                                    </span>
-                                  </div>
-                                  <!--v-if-->
-                                  <!--v-if-->
-                                  <!--v-if-->
-                                </div>
-                                
-                              </div>
-                            </div>
-                          </div>
-                          
-                        </div>
-                      </div>
-                    </div>
-                    
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </transition-stub>
-        
-        <!--teleport start-->
-        <!--teleport end-->
-      </div>
-    </div>
-    <div
-      class="node"
-      data-test-id="run-data-schema-node"
-      data-v-46dade00=""
-    >
-      <div
-        class="header"
-        data-test-id="run-data-schema-node-header"
-        data-v-46dade00=""
-      >
-        <div
-          class="expand"
-          data-v-46dade00=""
-        >
-          <svg
-            aria-hidden="true"
-            class="svg-inline--fa fa-angle-right fa-w-8 expandIcon"
-            data-icon="angle-right"
-            data-prefix="fas"
-            data-v-46dade00=""
-            focusable="false"
-            role="img"
-            viewBox="0 0 256 512"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              class=""
-              d="M224.3 273l-136 136c-9.4 9.4-24.6 9.4-33.9 0l-22.6-22.6c-9.4-9.4-9.4-24.6 0-33.9l96.4-96.4-96.4-96.4c-9.4-9.4-9.4-24.6 0-33.9L54.3 103c9.4-9.4 24.6-9.4 33.9 0l136 136c9.5 9.4 9.5 24.6.1 34z"
-              fill="currentColor"
-            />
-          </svg>
-        </div>
-        <div
-          class="titleContainer"
-          data-test-id="run-data-schema-node-name"
-          data-v-46dade00=""
-        >
-          <div
-            class="nodeIcon"
-            data-v-46dade00=""
-          >
-            <div
-              class="n8n-node-icon"
-              data-v-46dade00=""
-            >
-              <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>
-          <div
-            class="title"
-            data-v-46dade00=""
-          >
-            Set2 
-            <!--v-if-->
-          </div>
-          <!--v-if-->
-        </div>
-        <transition-stub
-          appear="false"
-          css="true"
-          data-v-46dade00=""
-          name="items"
-          persisted="false"
-        >
-          <!--v-if-->
-        </transition-stub>
-      </div>
-      <div
-        class=""
-        data-v-46dade00=""
-      >
-        
-        <transition-stub
-          appear="false"
-          css="true"
-          data-v-46dade00=""
-          name="schema"
-          persisted="false"
-        >
-          <!--v-if-->
-        </transition-stub>
-        
-        <!--teleport start-->
-        <!--teleport end-->
-      </div>
-    </div>
-    
-  </div>
-</div>
-`;
diff --git a/packages/editor-ui/src/components/banners/BaseBanner.vue b/packages/editor-ui/src/components/banners/BaseBanner.vue
index 32af54cec0..aac7e3428e 100644
--- a/packages/editor-ui/src/components/banners/BaseBanner.vue
+++ b/packages/editor-ui/src/components/banners/BaseBanner.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
 import { useUIStore } from '@/stores/ui.store';
 import { computed, useSlots } from 'vue';
-import type { BannerName } from 'n8n-workflow';
+import type { BannerName } from '@n8n/api-types';
+import { useI18n } from '@/composables/useI18n';
 
 interface Props {
 	name: BannerName;
@@ -10,6 +11,8 @@ interface Props {
 	dismissible?: boolean;
 }
 
+const i18n = useI18n();
+
 const uiStore = useUIStore();
 const slots = useSlots();
 
@@ -39,6 +42,7 @@ async function onCloseClick() {
 		icon-size="medium"
 		:round-corners="false"
 		:data-test-id="`banners-${props.name}`"
+		:only-bottom-border="true"
 	>
 		<div :class="[$style.mainContent, !hasTrailingContent ? $style.keepSpace : '']">
 			<slot name="mainContent" />
@@ -50,7 +54,7 @@ async function onCloseClick() {
 					v-if="dismissible"
 					size="small"
 					icon="times"
-					title="Dismiss"
+					:title="i18n.baseText('generic.dismiss')"
 					class="clickable"
 					:data-test-id="`banner-${props.name}-close`"
 					@click="onCloseClick"
@@ -78,10 +82,4 @@ async function onCloseClick() {
 	align-items: center;
 	gap: var(--spacing-l);
 }
-
-:global(.n8n-callout) {
-	border-top: 0;
-	border-left: 0;
-	border-right: 0;
-}
 </style>
diff --git a/packages/editor-ui/src/components/banners/TrialBanner.vue b/packages/editor-ui/src/components/banners/TrialBanner.vue
index f09a561df5..25c0f3d802 100644
--- a/packages/editor-ui/src/components/banners/TrialBanner.vue
+++ b/packages/editor-ui/src/components/banners/TrialBanner.vue
@@ -3,13 +3,15 @@ import BaseBanner from '@/components/banners/BaseBanner.vue';
 import { i18n as locale } from '@/plugins/i18n';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { computed } from 'vue';
-import { useUIStore } from '@/stores/ui.store';
 import type { CloudPlanAndUsageData } from '@/Interface';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const PROGRESS_BAR_MINIMUM_THRESHOLD = 8;
 
 const cloudPlanStore = useCloudPlanStore();
 
+const pageRedirectionHelper = usePageRedirectionHelper();
+
 const trialDaysLeft = computed(() => -1 * cloudPlanStore.trialDaysLeft);
 const messageText = computed(() => {
 	return locale.baseText('banners.trial.message', {
@@ -49,7 +51,7 @@ const currentExecutions = computed(() => {
 });
 
 function onUpdatePlanClick() {
-	void useUIStore().goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
+	void pageRedirectionHelper.goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
 }
 </script>
 
diff --git a/packages/editor-ui/src/components/banners/TrialOverBanner.vue b/packages/editor-ui/src/components/banners/TrialOverBanner.vue
index 9080ad0fed..45eedf9c14 100644
--- a/packages/editor-ui/src/components/banners/TrialOverBanner.vue
+++ b/packages/editor-ui/src/components/banners/TrialOverBanner.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
 import BaseBanner from '@/components/banners/BaseBanner.vue';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 import { i18n as locale } from '@/plugins/i18n';
-import { useUIStore } from '@/stores/ui.store';
 
 function onUpdatePlanClick() {
-	void useUIStore().goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
+	void usePageRedirectionHelper().goToUpgrade('canvas-nav', 'upgrade-canvas-nav', 'redirect');
 }
 </script>
 
diff --git a/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts b/packages/editor-ui/src/components/banners/V1Banner.test.ts
similarity index 96%
rename from packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts
rename to packages/editor-ui/src/components/banners/V1Banner.test.ts
index f01ea4c3f6..9636bbaae6 100644
--- a/packages/editor-ui/src/components/banners/__tests__/V1Banner.spec.ts
+++ b/packages/editor-ui/src/components/banners/V1Banner.test.ts
@@ -1,5 +1,5 @@
 import { createComponentRenderer } from '@/__tests__/render';
-import V1Banner from '../V1Banner.vue';
+import V1Banner from './V1Banner.vue';
 import { createPinia, setActivePinia } from 'pinia';
 import { useUsersStore } from '@/stores/users.store';
 import { ROLE } from '@/constants';
diff --git a/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap b/packages/editor-ui/src/components/banners/__snapshots__/V1Banner.test.ts.snap
similarity index 97%
rename from packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
rename to packages/editor-ui/src/components/banners/__snapshots__/V1Banner.test.ts.snap
index 41daf10517..29665752de 100644
--- a/packages/editor-ui/src/components/banners/__tests__/__snapshots__/V1Banner.spec.ts.snap
+++ b/packages/editor-ui/src/components/banners/__snapshots__/V1Banner.test.ts.snap
@@ -3,7 +3,7 @@
 exports[`V1 Banner > should render banner 1`] = `
 <div>
   <div
-    class="n8n-callout callout warning callout v1container"
+    class="n8n-callout callout warning onlyBottomBorder callout v1container"
     data-test-id="banners-V1"
     role="alert"
   >
@@ -104,7 +104,7 @@ exports[`V1 Banner > should render banner 1`] = `
 exports[`V1 Banner > should render banner with dismiss call if user is owner 1`] = `
 <div>
   <div
-    class="n8n-callout callout warning callout v1container"
+    class="n8n-callout callout warning onlyBottomBorder callout v1container"
     data-test-id="banners-V1"
     role="alert"
   >
diff --git a/packages/editor-ui/src/components/canvas/Canvas.spec.ts b/packages/editor-ui/src/components/canvas/Canvas.test.ts
similarity index 87%
rename from packages/editor-ui/src/components/canvas/Canvas.spec.ts
rename to packages/editor-ui/src/components/canvas/Canvas.test.ts
index aa23b7064a..bf7dae71a7 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.spec.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,20 +110,11 @@ describe('Canvas', () => {
 		});
 		await fireEvent.mouseUp(node, { view: window });
 
-		vi.advanceTimersByTime(250); // Event debounce time
-
 		expect(emitted()['update:nodes:position']).toEqual([
 			[
 				[
 					{
 						id: '1',
-						type: 'position',
-						dragging: true,
-						from: {
-							x: 100,
-							y: 100,
-							z: 0,
-						},
 						position: { x: 120, y: 120 },
 					},
 				],
@@ -211,29 +200,18 @@ describe('Canvas', () => {
 	describe('background', () => {
 		it('should render default background', () => {
 			const { container } = renderComponent();
-			expect(container.querySelector('#pattern-canvas')).toBeInTheDocument();
+			const patternCanvas = container.querySelector('#pattern-canvas');
+			expect(patternCanvas).toBeInTheDocument();
+			expect(patternCanvas?.innerHTML).toContain('<circle');
+			expect(patternCanvas?.innerHTML).not.toContain('<path');
 		});
 
 		it('should render striped background', () => {
 			const { container } = renderComponent({ props: { readOnly: true } });
-			expect(container.querySelector('#pattern-canvas')).not.toBeInTheDocument();
-			expect(container.querySelector('#diagonalHatch')).toBeInTheDocument();
-		});
-	});
-
-	describe('pane', () => {
-		describe('onPaneMouseDown', () => {
-			it('should enable panning when middle mouse button is pressed', async () => {
-				const { getByTestId } = renderComponent();
-				const canvas = getByTestId('canvas');
-				const pane = canvas.querySelector('.vue-flow__pane');
-
-				if (!pane) throw new Error('VueFlow pane not in the document');
-
-				await fireEvent.mouseDown(canvas, { button: 1, view: window });
-
-				expect(canvas).toHaveClass('draggable');
-			});
+			const patternCanvas = container.querySelector('#pattern-canvas');
+			expect(patternCanvas).toBeInTheDocument();
+			expect(patternCanvas?.innerHTML).toContain('<path');
+			expect(patternCanvas?.innerHTML).not.toContain('<circle');
 		});
 	});
 });
diff --git a/packages/editor-ui/src/components/canvas/Canvas.vue b/packages/editor-ui/src/components/canvas/Canvas.vue
index b09302cbdd..be51e1f81f 100644
--- a/packages/editor-ui/src/components/canvas/Canvas.vue
+++ b/packages/editor-ui/src/components/canvas/Canvas.vue
@@ -9,28 +9,17 @@ import type {
 import type {
 	Connection,
 	XYPosition,
-	ViewportTransform,
-	NodeChange,
-	NodePositionChange,
+	NodeDragEvent,
+	NodeMouseEvent,
+	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';
 import Node from './elements/nodes/CanvasNode.vue';
 import Edge from './elements/edges/CanvasEdge.vue';
-import {
-	computed,
-	nextTick,
-	onMounted,
-	onUnmounted,
-	provide,
-	ref,
-	toRef,
-	useCssModule,
-	watch,
-} from 'vue';
+import { computed, onMounted, onUnmounted, provide, ref, toRef, useCssModule, watch } from 'vue';
 import type { EventBus } from 'n8n-design-system';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus, useDeviceSupport } from 'n8n-design-system';
 import { useContextMenu, type ContextMenuAction } from '@/composables/useContextMenu';
 import { useKeybindings } from '@/composables/useKeybindings';
 import ContextMenu from '@/components/ContextMenu/ContextMenu.vue';
@@ -39,11 +28,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, useDebounceFn } from '@vueuse/core';
+import { onKeyDown, onKeyUp, useThrottleFn } from '@vueuse/core';
 import CanvasArrowHeadMarker from './elements/edges/CanvasArrowHeadMarker.vue';
-import { CanvasNodeRenderType } from '@/types';
-import CanvasBackgroundStripedPattern from './elements/CanvasBackgroundStripedPattern.vue';
-import { isMiddleMouseButton } from '@/utils/eventUtils';
+import CanvasBackground from './elements/background/CanvasBackground.vue';
+import { useCanvasTraversal } from '@/composables/useCanvasTraversal';
+import { NodeConnectionType } from 'n8n-workflow';
 
 const $style = useCssModule();
 
@@ -56,6 +45,8 @@ const emit = defineEmits<{
 	'update:node:selected': [id: string];
 	'update:node:name': [id: string];
 	'update:node:parameters': [id: string, parameters: Record<string, unknown>];
+	'update:node:inputs': [id: string];
+	'update:node:outputs': [id: string];
 	'click:node:add': [id: string, handle: string];
 	'run:node': [id: string];
 	'delete:node': [id: string];
@@ -81,6 +72,7 @@ const emit = defineEmits<{
 	'run:workflow': [];
 	'save:workflow': [];
 	'create:workflow': [];
+	'drag-and-drop': [position: XYPosition, event: DragEvent];
 }>();
 
 const props = withDefaults(
@@ -94,6 +86,7 @@ const props = withDefaults(
 		executing?: boolean;
 		keyBindings?: boolean;
 		showBugReportingButton?: boolean;
+		loading?: boolean;
 	}>(),
 	{
 		id: 'canvas',
@@ -104,11 +97,14 @@ const props = withDefaults(
 		readOnly: false,
 		executing: false,
 		keyBindings: true,
+		loading: false,
 	},
 );
 
+const { isMobileDevice, controlKeyCode } = useDeviceSupport();
+
+const vueFlow = useVueFlow({ id: props.id, deleteKeyCode: null });
 const {
-	vueFlowRef,
 	getSelectedNodes: selectedNodes,
 	addSelectedNodes,
 	removeSelectedNodes,
@@ -122,17 +118,28 @@ const {
 	project,
 	nodes: graphNodes,
 	onPaneReady,
-	findNode,
 	onNodesInitialized,
+	findNode,
 	viewport,
-} = useVueFlow({ id: props.id, deleteKeyCode: null });
+	onEdgeMouseLeave,
+	onEdgeMouseEnter,
+	onEdgeMouseMove,
+	onNodeMouseEnter,
+	onNodeMouseLeave,
+} = vueFlow;
+const {
+	getIncomingNodes,
+	getOutgoingNodes,
+	getSiblingNodes,
+	getDownstreamNodes,
+	getUpstreamNodes,
+} = useCanvasTraversal(vueFlow);
 
 const isPaneReady = ref(false);
 
 const classes = computed(() => ({
 	[$style.canvas]: true,
-	[$style.ready]: isPaneReady.value,
-	[$style.draggable]: isPanningEnabled.value,
+	[$style.ready]: !props.loading && isPaneReady.value,
 }));
 
 /**
@@ -145,27 +152,83 @@ const disableKeyBindings = computed(() => !props.keyBindings);
  * @see https://developer.mozilla.org/en-US/docs/Web/API/UI_Events/Keyboard_event_key_values#whitespace_keys
  */
 
-const panningKeyCode = ' ';
-const isPanningEnabled = ref(false);
-const selectionKeyCode = ref<true | null>(true);
+const panningKeyCode = ref<string[] | true>(isMobileDevice ? true : [' ', controlKeyCode]);
+const panningMouseButton = ref<number[] | true>(isMobileDevice ? true : [1]);
+const selectionKeyCode = ref<string | true | null>(isMobileDevice ? 'Shift' : true);
 
-onKeyDown(panningKeyCode, () => {
-	setPanningEnabled(true);
+onKeyDown(panningKeyCode.value, () => {
+	selectionKeyCode.value = null;
+	panningMouseButton.value = [0, 1];
 });
 
-onKeyUp(panningKeyCode, () => {
-	setPanningEnabled(false);
+onKeyUp(panningKeyCode.value, () => {
+	selectionKeyCode.value = true;
+	panningMouseButton.value = [1];
 });
 
+function selectLeftNode(id: string) {
+	const incomingNodes = getIncomingNodes(id);
+	const previousNode = incomingNodes[0];
+	if (previousNode) {
+		onSelectNodes({ ids: [previousNode.id] });
+	}
+}
+
+function selectRightNode(id: string) {
+	const outgoingNodes = getOutgoingNodes(id);
+	const nextNode = outgoingNodes[0];
+	if (nextNode) {
+		onSelectNodes({ ids: [nextNode.id] });
+	}
+}
+
+function selectLowerSiblingNode(id: string) {
+	const siblingNodes = getSiblingNodes(id);
+	const index = siblingNodes.findIndex((n) => n.id === id);
+	const nextNode = siblingNodes[index + 1] ?? siblingNodes[0];
+	if (nextNode) {
+		onSelectNodes({
+			ids: [nextNode.id],
+		});
+	}
+}
+
+function selectUpperSiblingNode(id: string) {
+	const siblingNodes = getSiblingNodes(id);
+	const index = siblingNodes.findIndex((n) => n.id === id);
+	const previousNode = siblingNodes[index - 1] ?? siblingNodes[siblingNodes.length - 1];
+	if (previousNode) {
+		onSelectNodes({
+			ids: [previousNode.id],
+		});
+	}
+}
+
+function selectDownstreamNodes(id: string) {
+	const downstreamNodes = getDownstreamNodes(id);
+	onSelectNodes({ ids: [...downstreamNodes.map((node) => node.id), id] });
+}
+
+function selectUpstreamNodes(id: string) {
+	const upstreamNodes = getUpstreamNodes(id);
+	onSelectNodes({ ids: [...upstreamNodes.map((node) => node.id), id] });
+}
+
 const keyMap = computed(() => ({
 	ctrl_c: emitWithSelectedNodes((ids) => emit('copy:nodes', ids)),
 	enter: emitWithLastSelectedNode((id) => onSetNodeActive(id)),
 	ctrl_a: () => addSelectedNodes(graphNodes.value),
-	'+|=': async () => await onZoomIn(),
-	'-|_': async () => await onZoomOut(),
+	// Support both key and code for zooming in and out
+	'shift_+|+|=|shift_Equal|Equal': async () => await onZoomIn(),
+	'shift+_|-|_|shift_Minus|Minus': async () => await onZoomOut(),
 	0: async () => await onResetZoom(),
 	1: async () => await onFitView(),
-	// @TODO implement arrow key shortcuts to modify selection
+	ArrowUp: emitWithLastSelectedNode(selectUpperSiblingNode),
+	ArrowDown: emitWithLastSelectedNode(selectLowerSiblingNode),
+	ArrowLeft: emitWithLastSelectedNode(selectLeftNode),
+	ArrowRight: emitWithLastSelectedNode(selectRightNode),
+	shift_ArrowLeft: emitWithLastSelectedNode(selectUpstreamNodes),
+	shift_ArrowRight: emitWithLastSelectedNode(selectDownstreamNodes),
 
 	...(props.readOnly
 		? {}
@@ -186,58 +249,46 @@ const keyMap = computed(() => ({
 
 useKeybindings(keyMap, { disabled: disableKeyBindings });
 
-function setPanningEnabled(value: boolean) {
-	if (value) {
-		isPanningEnabled.value = true;
-		selectionKeyCode.value = null;
-	} else {
-		isPanningEnabled.value = false;
-		selectionKeyCode.value = true;
-	}
-}
-
-/**
- * When the window is focused, the selection key code is lost.
- * We trigger a value refresh to ensure that the selection key code is set correctly again.
- *
- * @issue https://linear.app/n8n/issue/N8N-7843/selection-keycode-gets-unset-when-changing-tabs
- */
-function resetSelectionKeyCode() {
-	selectionKeyCode.value = null;
-	void nextTick(() => {
-		selectionKeyCode.value = true;
-	});
-}
-
 /**
  * Nodes
  */
 
-const lastSelectedNode = computed(() => selectedNodes.value[selectedNodes.value.length - 1]);
 const hasSelection = computed(() => selectedNodes.value.length > 0);
 const selectedNodeIds = computed(() => selectedNodes.value.map((node) => node.id));
 
+const lastSelectedNode = ref<GraphNode>();
+watch(selectedNodes, (nodes) => {
+	if (!lastSelectedNode.value || !nodes.find((node) => node.id === lastSelectedNode.value?.id)) {
+		lastSelectedNode.value = nodes[nodes.length - 1];
+	}
+});
+
 function onClickNodeAdd(id: string, handle: string) {
 	emit('click:node:add', id, handle);
 }
 
-// Debounced to prevent emitting too many events, necessary for undo/redo
-const onUpdateNodesPosition = useDebounceFn((events: NodePositionChange[]) => {
+function onUpdateNodesPosition(events: CanvasNodeMoveEvent[]) {
 	emit('update:nodes:position', events);
-}, 200);
+}
 
 function onUpdateNodePosition(id: string, position: XYPosition) {
 	emit('update:node:position', id, position);
 }
 
-const isPositionChangeEvent = (event: NodeChange): event is NodePositionChange =>
-	event.type === 'position' && 'position' in event;
+function onNodeDragStop(event: NodeDragEvent) {
+	onUpdateNodesPosition(event.nodes.map(({ id, position }) => ({ id, position })));
+}
 
-function onNodesChange(events: NodeChange[]) {
-	const positionChangeEndEvents = events.filter(isPositionChangeEvent);
-	if (positionChangeEndEvents.length > 0) {
-		void onUpdateNodesPosition(positionChangeEndEvents);
+function onNodeClick({ event, node }: NodeMouseEvent) {
+	if (event.ctrlKey || event.metaKey || selectedNodes.value.length < 2) {
+		return;
 	}
+
+	onSelectNodes({ ids: [node.id] });
+}
+
+function onSelectionDragStop(event: NodeDragEvent) {
+	onUpdateNodesPosition(event.nodes.map(({ id, position }) => ({ id, position })));
 }
 
 function onSetNodeActive(id: string) {
@@ -271,8 +322,16 @@ function onUpdateNodeParameters(id: string, parameters: Record<string, unknown>)
 	emit('update:node:parameters', id, parameters);
 }
 
+function onUpdateNodeInputs(id: string) {
+	emit('update:node:inputs', id);
+}
+
+function onUpdateNodeOutputs(id: string) {
+	emit('update:node:outputs', id);
+}
+
 /**
- * Connections
+ * Connections / Edges
  */
 
 const connectionCreated = ref(false);
@@ -314,6 +373,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
  */
@@ -347,10 +457,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;
@@ -385,37 +494,17 @@ async function onResetZoom() {
 	await onZoomTo(defaultZoom);
 }
 
-function onViewportChange(viewport: ViewportTransform) {
-	zoom.value = viewport.zoom;
-}
-
 function setReadonly(value: boolean) {
 	setInteractive(!value);
 	elementsSelectable.value = true;
 }
 
-function onPaneMouseDown(event: MouseEvent) {
-	if (isMiddleMouseButton(event)) {
-		setPanningEnabled(true);
-
-		// Re-emit the event to start panning after setting the panning state to true
-		// This workaround is necessary because the Vue Flow library does not provide a way to
-		// start panning programmatically
-		void nextTick(() =>
-			vueFlowRef.value
-				?.querySelector('.vue-flow__pane')
-				?.dispatchEvent(new MouseEvent('mousedown', event)),
-		);
-	}
-}
-
 function onPaneMoveStart() {
 	isPaneMoving.value = true;
 }
 
 function onPaneMoveEnd() {
 	isPaneMoving.value = false;
-	setPanningEnabled(false);
 }
 
 /**
@@ -431,6 +520,13 @@ function onOpenContextMenu(event: MouseEvent) {
 	});
 }
 
+function onOpenSelectionContextMenu({ event }: { event: MouseEvent }) {
+	contextMenu.open(event, {
+		source: 'canvas',
+		nodeIds: selectedNodeIds.value,
+	});
+}
+
 function onOpenNodeContextMenu(
 	id: string,
 	event: MouseEvent,
@@ -474,6 +570,20 @@ function onContextMenuAction(action: ContextMenuAction, nodeIds: string[]) {
 	}
 }
 
+/**
+ * Drag and drop
+ */
+
+function onDragOver(event: DragEvent) {
+	event.preventDefault();
+}
+
+function onDrop(event: DragEvent) {
+	const position = getProjectedPosition(event);
+
+	emit('drag-and-drop', position, event);
+}
+
 /**
  * Minimap
  */
@@ -521,16 +631,16 @@ function onMinimapMouseLeave() {
  * Lifecycle
  */
 
+const initialized = ref(false);
+
 onMounted(() => {
 	props.eventBus.on('fitView', onFitView);
 	props.eventBus.on('nodes:select', onSelectNodes);
-	window.addEventListener('focus', resetSelectionKeyCode);
 });
 
 onUnmounted(() => {
 	props.eventBus.off('fitView', onFitView);
 	props.eventBus.off('nodes:select', onSelectNodes);
-	window.removeEventListener('focus', resetSelectionKeyCode);
 });
 
 onPaneReady(async () => {
@@ -538,9 +648,8 @@ onPaneReady(async () => {
 	isPaneReady.value = true;
 });
 
-onNodesInitialized((nodes) => {
-	if (nodes.length !== 1 || nodes[0].data?.render.type !== CanvasNodeRenderType.AddNodes) return;
-	void onFitView();
+onNodesInitialized(() => {
+	initialized.value = true;
 });
 
 watch(() => props.readOnly, setReadonly, {
@@ -556,6 +665,8 @@ const isExecuting = toRef(props, 'executing');
 provide(CanvasKey, {
 	connectingHandle,
 	isExecuting,
+	initialized,
+	viewport,
 });
 </script>
 
@@ -564,34 +675,41 @@ provide(CanvasKey, {
 		:id="id"
 		:nodes="nodes"
 		:edges="connections"
+		:class="classes"
 		:apply-changes="false"
 		:connection-line-options="{ markerEnd: MarkerType.ArrowClosed }"
 		:connection-radius="60"
+		:pan-on-drag="panningMouseButton"
 		pan-on-scroll
 		snap-to-grid
 		:snap-grid="[GRID_SIZE, GRID_SIZE]"
 		:min-zoom="0"
 		:max-zoom="4"
-		:class="classes"
 		:selection-key-code="selectionKeyCode"
+		:zoom-activation-key-code="panningKeyCode"
 		:pan-activation-key-code="panningKeyCode"
+		:disable-keyboard-a11y="true"
 		data-test-id="canvas"
 		@connect-start="onConnectStart"
 		@connect="onConnect"
 		@connect-end="onConnectEnd"
 		@pane-click="onClickPane"
-		@contextmenu="onOpenContextMenu"
-		@viewport-change="onViewportChange"
-		@nodes-change="onNodesChange"
+		@pane-context-menu="onOpenContextMenu"
 		@move-start="onPaneMoveStart"
 		@move-end="onPaneMoveEnd"
-		@mousedown="onPaneMouseDown"
+		@node-drag-stop="onNodeDragStop"
+		@node-click="onNodeClick"
+		@selection-drag-stop="onSelectionDragStop"
+		@selection-context-menu="onOpenSelectionContextMenu"
+		@dragover="onDragOver"
+		@drop="onDrop"
 	>
-		<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"
@@ -599,18 +717,27 @@ provide(CanvasKey, {
 				@activate="onSetNodeActive"
 				@open:contextmenu="onOpenNodeContextMenu"
 				@update="onUpdateNodeParameters"
+				@update:inputs="onUpdateNodeInputs"
+				@update:outputs="onUpdateNodeOutputs"
 				@move="onUpdateNodePosition"
 				@add="onClickNodeAdd"
-			/>
+			>
+				<template v-if="$slots.nodeToolbar" #toolbar="toolbarProps">
+					<slot name="nodeToolbar" v-bind="toolbarProps" />
+				</template>
+			</Node>
 		</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>
 
@@ -620,11 +747,7 @@ provide(CanvasKey, {
 
 		<CanvasArrowHeadMarker :id="arrowHeadMarkerId" />
 
-		<Background data-test-id="canvas-background" pattern-color="#aaa" :gap="GRID_SIZE">
-			<template v-if="readOnly" #pattern-container>
-				<CanvasBackgroundStripedPattern :x="viewport.x" :y="viewport.y" :zoom="viewport.zoom" />
-			</template>
-		</Background>
+		<CanvasBackground :viewport="viewport" :striped="readOnly" />
 
 		<Transition name="minimap">
 			<MiniMap
@@ -649,7 +772,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"
@@ -664,22 +787,25 @@ provide(CanvasKey, {
 
 <style lang="scss" module>
 .canvas {
+	width: 100%;
+	height: 100%;
 	opacity: 0;
+	transition: opacity 300ms ease;
 
 	&.ready {
 		opacity: 1;
 	}
 
-	&.draggable :global(.vue-flow__pane) {
-		cursor: grab;
-	}
-
 	:global(.vue-flow__pane) {
-		cursor: default;
-	}
+		cursor: grab;
 
-	:global(.vue-flow__pane.dragging) {
-		cursor: grabbing;
+		&:global(.selection) {
+			cursor: default;
+		}
+
+		&:global(.dragging) {
+			cursor: grabbing;
+		}
 	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.spec.ts b/packages/editor-ui/src/components/canvas/WorkflowCanvas.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/WorkflowCanvas.spec.ts
rename to packages/editor-ui/src/components/canvas/WorkflowCanvas.test.ts
diff --git a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
index 72dc04cbcd..d32b974a40 100644
--- a/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
+++ b/packages/editor-ui/src/components/canvas/WorkflowCanvas.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import Canvas from '@/components/canvas/Canvas.vue';
-import { computed, toRef, useCssModule } from 'vue';
+import { computed, ref, toRef, useCssModule } from 'vue';
 import type { Workflow } from 'n8n-workflow';
 import type { IWorkflowDb } from '@/Interface';
 import { useCanvasMapping } from '@/composables/useCanvasMapping';
 import type { EventBus } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system';
 import type { CanvasEventBusEvents } from '@/types';
+import { useVueFlow } from '@vue-flow/core';
 
 defineOptions({
 	inheritAttrs: false,
@@ -34,6 +35,8 @@ const props = withDefaults(
 
 const $style = useCssModule();
 
+const { onNodesInitialized } = useVueFlow({ id: props.id });
+
 const workflow = toRef(props, 'workflow');
 const workflowObject = toRef(props, 'workflowObject');
 
@@ -49,6 +52,14 @@ const { nodes: mappedNodes, connections: mappedConnections } = useCanvasMapping(
 	connections,
 	workflowObject,
 });
+
+const initialFitViewDone = ref(false); // Workaround for https://github.com/bcakmakoglu/vue-flow/issues/1636
+onNodesInitialized(() => {
+	if (!initialFitViewDone.value || props.showFallbackNodes) {
+		props.eventBus.emit('fitView');
+		initialFitViewDone.value = true;
+	}
+});
 </script>
 
 <template>
diff --git a/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts
new file mode 100644
index 0000000000..cef24134a8
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.test.ts
@@ -0,0 +1,33 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import CanvasBackground from '@/components/canvas/elements/background/CanvasBackground.vue';
+
+const renderComponent = createComponentRenderer(CanvasBackground);
+
+describe('CanvasBackground', () => {
+	it('should render the background with the correct gap', () => {
+		const { getByTestId, html } = renderComponent({
+			props: { striped: false, viewport: { x: 0, y: 0, zoom: 1 } },
+		});
+		const background = getByTestId('canvas-background');
+
+		expect(background).toBeInTheDocument();
+		expect(html()).toMatchSnapshot();
+	});
+
+	it('should render the striped pattern when striped is true', () => {
+		const { getByTestId } = renderComponent({
+			props: { striped: true, viewport: { x: 0, y: 0, zoom: 1 } },
+		});
+		const pattern = getByTestId('canvas-background-striped-pattern');
+
+		expect(pattern).toBeInTheDocument();
+	});
+
+	it('should not render the striped pattern when striped is false', () => {
+		const { getByTestId } = renderComponent({
+			props: { striped: false, viewport: { x: 0, y: 0, zoom: 1 } },
+		});
+
+		expect(() => getByTestId('canvas-background-striped-pattern')).toThrow();
+	});
+});
diff --git a/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue
new file mode 100644
index 0000000000..a15ff96a9b
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackground.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { GRID_SIZE } from '@/utils/nodeViewUtils';
+import CanvasBackgroundStripedPattern from './CanvasBackgroundStripedPattern.vue';
+import { Background } from '@vue-flow/background';
+import type { ViewportTransform } from '@vue-flow/core';
+
+defineProps<{
+	striped: boolean;
+	viewport: ViewportTransform;
+}>();
+</script>
+<template>
+	<Background data-test-id="canvas-background" pattern-color="#aaa" :gap="GRID_SIZE">
+		<template v-if="striped" #pattern-container="patternProps">
+			<CanvasBackgroundStripedPattern
+				:id="patternProps.id"
+				data-test-id="canvas-background-striped-pattern"
+				:x="viewport.x"
+				:y="viewport.y"
+				:zoom="viewport.zoom"
+			/>
+		</template>
+	</Background>
+</template>
diff --git a/packages/editor-ui/src/components/canvas/elements/CanvasBackgroundStripedPattern.vue b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue
similarity index 89%
rename from packages/editor-ui/src/components/canvas/elements/CanvasBackgroundStripedPattern.vue
rename to packages/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue
index d72d1f5365..b15d4b67d2 100644
--- a/packages/editor-ui/src/components/canvas/elements/CanvasBackgroundStripedPattern.vue
+++ b/packages/editor-ui/src/components/canvas/elements/background/CanvasBackgroundStripedPattern.vue
@@ -5,6 +5,7 @@
  */
 import { computed } from 'vue';
 const props = defineProps<{
+	id: string;
 	x: number;
 	y: number;
 	zoom: number;
@@ -16,7 +17,7 @@ const patternOffset = computed(() => scaledGap.value / 2);
 
 <template>
 	<pattern
-		id="diagonalHatch"
+		:id="id"
 		patternUnits="userSpaceOnUse"
 		:x="x % scaledGap"
 		:y="y % scaledGap"
@@ -26,7 +27,6 @@ const patternOffset = computed(() => scaledGap.value / 2);
 	>
 		<path :d="`M0 ${scaledGap / 2} H${scaledGap}`" :stroke-width="scaledGap / 2" />
 	</pattern>
-	<rect x="0" y="0" width="100%" height="100%" fill="url(#diagonalHatch)" />
 </template>
 
 <style scoped>
diff --git a/packages/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap b/packages/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap
new file mode 100644
index 0000000000..fa764fae2f
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/background/__snapshots__/CanvasBackground.test.ts.snap
@@ -0,0 +1,11 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`CanvasBackground > should render the background with the correct gap 1`] = `
+"<svg class="vue-flow__background vue-flow__container" style="height: 100%; width: 100%;" data-test-id="canvas-background">
+  <pattern id="pattern-vue-flow-0" x="0" y="0" width="20" height="20" patternTransform="translate(-11,-11)" patternUnits="userSpaceOnUse">
+    <circle cx="0.5" cy="0.5" r="0.5" fill="#aaa"></circle>
+    <!---->
+  </pattern>
+  <rect x="0" y="0" width="100%" height="100%" fill="url(#pattern-vue-flow-0)"></rect>
+</svg>"
+`;
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.spec.ts b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasChatButton.vue
index 877180cd4e..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,9 +1,16 @@
+<script lang="ts" setup>
+export interface Props {
+	type: 'primary' | 'tertiary';
+	label: string;
+}
+defineProps<Props>();
+</script>
 <template>
 	<N8nButton
-		label="Chat"
+		:label="label"
 		size="large"
 		icon="comment"
-		type="primary"
+		:type="type"
 		data-test-id="workflow-chat-button"
 	/>
 </template>
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.spec.ts b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/buttons/CanvasClearExecutionDataButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.spec.ts b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
index 785040a92a..72e1e6251c 100644
--- a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasControlButtons.vue
@@ -4,6 +4,7 @@ import KeyboardShortcutTooltip from '@/components/KeyboardShortcutTooltip.vue';
 import { computed } from 'vue';
 import { useBugReporting } from '@/composables/useBugReporting';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { useI18n } from '@/composables/useI18n';
 
 const props = withDefaults(
 	defineProps<{
@@ -25,6 +26,7 @@ const emit = defineEmits<{
 
 const { getReportingURL } = useBugReporting();
 const telemetry = useTelemetry();
+const i18n = useI18n();
 
 const isResetZoomVisible = computed(() => props.zoom !== 1);
 
@@ -51,7 +53,7 @@ function trackBugReport() {
 <template>
 	<Controls :show-zoom="false" :show-fit-view="false">
 		<KeyboardShortcutTooltip
-			:label="$locale.baseText('nodeView.zoomToFit')"
+			:label="i18n.baseText('nodeView.zoomToFit')"
 			:shortcut="{ keys: ['1'] }"
 		>
 			<N8nIconButton
@@ -62,10 +64,7 @@ function trackBugReport() {
 				@click="onZoomToFit"
 			/>
 		</KeyboardShortcutTooltip>
-		<KeyboardShortcutTooltip
-			:label="$locale.baseText('nodeView.zoomIn')"
-			:shortcut="{ keys: ['+'] }"
-		>
+		<KeyboardShortcutTooltip :label="i18n.baseText('nodeView.zoomIn')" :shortcut="{ keys: ['+'] }">
 			<N8nIconButton
 				type="tertiary"
 				size="large"
@@ -74,10 +73,7 @@ function trackBugReport() {
 				@click="onZoomIn"
 			/>
 		</KeyboardShortcutTooltip>
-		<KeyboardShortcutTooltip
-			:label="$locale.baseText('nodeView.zoomOut')"
-			:shortcut="{ keys: ['-'] }"
-		>
+		<KeyboardShortcutTooltip :label="i18n.baseText('nodeView.zoomOut')" :shortcut="{ keys: ['-'] }">
 			<N8nIconButton
 				type="tertiary"
 				size="large"
@@ -88,7 +84,7 @@ function trackBugReport() {
 		</KeyboardShortcutTooltip>
 		<KeyboardShortcutTooltip
 			v-if="isResetZoomVisible"
-			:label="$locale.baseText('nodeView.resetZoom')"
+			:label="i18n.baseText('nodeView.resetZoom')"
 			:shortcut="{ keys: ['0'] }"
 		>
 			<N8nIconButton
@@ -101,7 +97,7 @@ function trackBugReport() {
 		</KeyboardShortcutTooltip>
 		<KeyboardShortcutTooltip
 			v-if="props.showBugReportingButton"
-			:label="$locale.baseText('nodeView.reportBug')"
+			:label="i18n.baseText('nodeView.reportBug')"
 		>
 			<a :href="getReportingURL()" target="_blank" @click="trackBugReport">
 				<N8nIconButton type="tertiary" size="large" icon="bug" data-test-id="report-bug" />
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.spec.ts b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/buttons/CanvasRunWorkflowButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.spec.ts b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopCurrentExecutionButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.spec.ts b/packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/buttons/CanvasStopWaitingForWebhookButton.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.spec.ts.snap
deleted file mode 100644
index d5e08f213e..0000000000
--- a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.spec.ts.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// 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>"`;
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
new file mode 100644
index 0000000000..b2fe2141e0
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasChatButton.test.ts.snap
@@ -0,0 +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>
+  <!--v-if-->
+</button>"
+`;
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasClearExecutionDataButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasControlButtons.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasExecuteWorkflowButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasRunWorkflowButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopCurrentExecutionButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/buttons/__snapshots__/CanvasStopWaitingForWebhookButton.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.spec.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
similarity index 67%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
index 812dd7effc..85d8771109 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.test.ts
@@ -4,6 +4,8 @@ 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';
+import { waitFor } from '@testing-library/vue';
 
 const DEFAULT_PROPS = {
 	sourceX: 0,
@@ -15,6 +17,11 @@ const DEFAULT_PROPS = {
 } satisfies Partial<ConnectionLineProps>;
 const renderComponent = createComponentRenderer(CanvasConnectionLine, {
 	props: DEFAULT_PROPS,
+	global: {
+		provide: {
+			...createCanvasProvide(),
+		},
+	},
 });
 
 beforeEach(() => {
@@ -46,32 +53,30 @@ 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',
+		);
+		expect(edges[1]).toHaveAttribute(
+			'd',
+			'M-50 130L-90 130L -124,130Q -140,130 -140,114L -140,-84Q -140,-100 -124,-100L-100 -100',
 		);
 	});
 
-	it('should only avoid obstacles when the edge intersects the nodes ', () => {
+	it('should show the connection line after a short delay', async () => {
+		vi.useFakeTimers();
 		const { container } = renderComponent({
-			props: {
-				...DEFAULT_PROPS,
-				sourceX: -72,
-				sourceY: -290,
-				sourcePosition: Position.Right,
-				targetX: -344,
-				targetY: -30,
-				targetPosition: Position.Left,
-			},
+			props: DEFAULT_PROPS,
 		});
 
 		const edge = container.querySelector('.vue-flow__edge-path');
 
-		expect(edge).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',
-		);
+		expect(edge).not.toHaveClass('visible');
+
+		vi.advanceTimersByTime(300);
+
+		await waitFor(() => expect(edge).toHaveClass('visible'));
 	});
 });
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..e4833cb4c2 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasConnectionLine.vue
@@ -2,8 +2,8 @@
 /* eslint-disable vue/no-multiple-template-root */
 import type { ConnectionLineProps } from '@vue-flow/core';
 import { BaseEdge } from '@vue-flow/core';
-import { computed, useCssModule } from 'vue';
-import { getCustomPath } from './utils/edgePath';
+import { computed, onMounted, ref, useCssModule } from 'vue';
+import { getEdgeRenderData } from './utils';
 import { useCanvas } from '@/composables/useCanvas';
 import { NodeConnectionType } from 'n8n-workflow';
 import { parseCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
@@ -18,6 +18,13 @@ const connectionType = computed(
 	() => parseCanvasConnectionHandleString(connectingHandle.value?.handleId).type,
 );
 
+const classes = computed(() => {
+	return {
+		[$style.edge]: true,
+		[$style.visible]: isVisible.value,
+	};
+});
+
 const edgeColor = computed(() => {
 	if (connectionType.value !== NodeConnectionType.Main) {
 		return 'var(--node-type-supplemental-color)';
@@ -32,15 +39,45 @@ 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);
+
+/**
+ * Used to delay the visibility of the connection line to prevent flickering
+ * when the actual user intent is to click the plus button
+ */
+const isVisible = ref(false);
+
+onMounted(() => {
+	setTimeout(() => {
+		isVisible.value = true;
+	}, 300);
+});
 </script>
 
 <template>
-	<BaseEdge :class="$style.edge" :style="edgeStyle" :path="path[0]" :marker-end="markerEnd" />
+	<BaseEdge
+		v-for="segment in segments"
+		:key="segment[0]"
+		:class="classes"
+		:style="edgeStyle"
+		:path="segment[0]"
+		:marker-end="markerEnd"
+	/>
 </template>
 
 <style lang="scss" module>
 .edge {
-	transition: stroke 0.3s ease;
+	transition-property: stroke, opacity;
+	transition-duration: 300ms;
+	transition-timing-function: ease;
+	opacity: 0;
+
+	&.visible {
+		opacity: 1;
+	}
 }
 </style>
diff --git a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.spec.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
similarity index 71%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
index 6a8ce9e789..c8cad29247 100644
--- a/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdge.test.ts
@@ -1,10 +1,10 @@
-import CanvasEdge, { type CanvasEdgeProps } from './CanvasEdge.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createTestingPinia } from '@pinia/testing';
-import { setActivePinia } from 'pinia';
+import userEvent from '@testing-library/user-event';
 import { Position } from '@vue-flow/core';
 import { NodeConnectionType } from 'n8n-workflow';
-import userEvent from '@testing-library/user-event';
+import { setActivePinia } from 'pinia';
+import CanvasEdge, { type CanvasEdgeProps } from './CanvasEdge.vue';
 
 const DEFAULT_PROPS = {
 	sourceX: 0,
@@ -30,8 +30,12 @@ beforeEach(() => {
 
 describe('CanvasEdge', () => {
 	it('should emit delete event when toolbar delete is clicked', async () => {
-		const { emitted, getByTestId } = renderComponent();
-		await userEvent.hover(getByTestId('edge-label-wrapper'));
+		const { emitted, getByTestId } = renderComponent({
+			props: {
+				hovered: true,
+			},
+		});
+		await userEvent.hover(getByTestId('edge-label'));
 		const deleteButton = getByTestId('delete-connection-button');
 
 		await userEvent.click(deleteButton);
@@ -40,8 +44,12 @@ describe('CanvasEdge', () => {
 	});
 
 	it('should emit add event when toolbar add is clicked', async () => {
-		const { emitted, getByTestId } = renderComponent();
-		await userEvent.hover(getByTestId('edge-label-wrapper'));
+		const { emitted, getByTestId } = renderComponent({
+			props: {
+				hovered: true,
+			},
+		});
+		await userEvent.hover(getByTestId('edge-label'));
 
 		const addButton = getByTestId('add-connection-button');
 
@@ -57,7 +65,7 @@ describe('CanvasEdge', () => {
 			},
 		});
 
-		await userEvent.hover(getByTestId('edge-label-wrapper'));
+		await userEvent.hover(getByTestId('edge-label'));
 
 		expect(() => getByTestId('add-connection-button')).toThrow();
 		expect(() => getByTestId('delete-connection-button')).toThrow();
@@ -73,18 +81,6 @@ describe('CanvasEdge', () => {
 		});
 	});
 
-	it('should correctly style a running connection', () => {
-		const { container } = renderComponent({
-			props: { ...DEFAULT_PROPS, data: { ...DEFAULT_PROPS.data, status: 'running' } },
-		});
-
-		const edge = container.querySelector('.vue-flow__edge-path');
-
-		expect(edge).toHaveStyle({
-			stroke: 'var(--color-primary)',
-		});
-	});
-
 	it('should correctly style a pinned connection', () => {
 		const { container } = renderComponent({
 			props: { ...DEFAULT_PROPS, data: { ...DEFAULT_PROPS.data, status: 'pinned' } },
@@ -120,11 +116,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',
 		);
 	});
 
@@ -151,4 +151,38 @@ describe('CanvasEdge', () => {
 
 		expect(edge).toHaveAttribute('d', 'M0,0 C62.5,0 -162.5,-100 -100,-100');
 	});
+
+	it('should render a label above the connector when it is straight', () => {
+		const { container } = renderComponent({
+			props: {
+				...DEFAULT_PROPS,
+				sourceY: 50,
+				targetY: 50,
+			},
+		});
+
+		const label = container.querySelector('.vue-flow__edge-label');
+
+		expect(label).toHaveAttribute(
+			'style',
+			'transform: translate(-50%, -150%) translate(50px, 50px);',
+		);
+	});
+
+	it("should render a label in the middle of the connector when it isn't straight", () => {
+		const { container } = renderComponent({
+			props: {
+				...DEFAULT_PROPS,
+				sourceY: 0,
+				targetY: 100,
+			},
+		});
+
+		const label = container.querySelector('.vue-flow__edge-label');
+
+		expect(label).toHaveAttribute(
+			'style',
+			'transform: translate(-50%, -50%) translate(50px, 50px);',
+		);
+	});
 });
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..e3b8d178ac 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, toRef, useCssModule } 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);
 
@@ -56,8 +44,6 @@ const edgeColor = computed(() => {
 		return 'var(--color-success)';
 	} else if (status.value === 'pinned') {
 		return 'var(--color-secondary)';
-	} else if (status.value === 'running') {
-		return 'var(--color-primary)';
 	} else if (!isMainConnection.value) {
 		return 'var(--node-type-supplemental-color)';
 	} else if (props.selected) {
@@ -71,23 +57,27 @@ 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(() => ({
 	color: edgeColor.value,
 }));
 
+const isConnectorStraight = computed(() => renderData.value.isConnectorStraight);
+
 const edgeToolbarStyle = computed(() => {
-	const [, labelX, labelY] = path.value;
+	const translateY = isConnectorStraight.value ? '-150%' : '-50%';
+
 	return {
-		transform: `translate(-50%, -50%) translate(${labelX}px,${labelY}px)`,
-		...(isHovered.value ? { zIndex: 1 } : {}),
+		transform: `translate(-50%, ${translateY}) translate(${labelPosition.value[0]}px, ${labelPosition.value[1]}px)`,
+		...(props.hovered ? { zIndex: 1 } : {}),
 	};
 });
 
@@ -97,12 +87,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,28 +111,44 @@ 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"
-		:class="edgeClasses"
-		:style="edgeStyle"
-		:path="path[0]"
-		:marker-end="markerEnd"
-		:interaction-width="40"
-	/>
+	<g
+		data-test-id="edge"
+		:data-source-node-name="data.source?.node"
+		:data-target-node-name="data.target?.node"
+	>
+		<BaseEdge
+			v-for="(segment, index) in segments"
+			:id="`${id}-${index}`"
+			:key="segment[0]"
+			:class="edgeClasses"
+			:style="edgeStyle"
+			:path="segment[0]"
+			:marker-end="markerEnd"
+			:interaction-width="40"
+		/>
+	</g>
 
 	<EdgeLabelRenderer>
 		<div
-			data-test-id="edge-label-wrapper"
-			:data-source-node-name="sourceNode?.label"
-			:data-target-node-name="targetNode?.label"
+			data-test-id="edge-label"
+			:data-source-node-name="data.source?.node"
+			:data-target-node-name="data.target?.node"
 			: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/CanvasEdgeToolbar.spec.ts b/packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/edges/CanvasEdgeToolbar.test.ts
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..5fcfede7e4
--- /dev/null
+++ b/packages/editor-ui/src/components/canvas/elements/edges/utils/getEdgeRenderData.ts
@@ -0,0 +1,66 @@
+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;
+	const isConnectorStraight = sourceY === targetY;
+
+	if (!isRightOfSourceHandle(sourceX, targetX) || connectionType !== NodeConnectionType.Main) {
+		const segment = getBezierPath(props);
+		return {
+			segments: [segment],
+			labelPosition: [segment[1], segment[2]],
+			isConnectorStraight,
+		};
+	}
+
+	// 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],
+		isConnectorStraight,
+	};
+}
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.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/CanvasHandleRenderer.vue b/packages/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/CanvasHandleMainInput.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainInput.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
similarity index 96%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
index 04a422ac74..f77e7fa86e 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.test.ts
@@ -46,7 +46,7 @@ describe('CanvasHandleMainOutput', () => {
 			},
 		});
 
-		expect(queryByTestId('canvas-handle-plus')).toHaveClass('success');
+		expect(queryByTestId('canvas-handle-plus-wrapper')).toHaveClass('success');
 	});
 
 	it('should render run data label', async () => {
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
index 9945405dce..89c83b4887 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleMainOutput.vue
@@ -83,7 +83,6 @@ function onClickAdd() {
 			<CanvasHandlePlus
 				v-if="!isConnected && !isReadOnly"
 				v-show="isHandlePlusVisible"
-				data-test-id="canvas-handle-plus"
 				:data-plus-type="plusType"
 				:line-size="plusLineSize"
 				:handle-classes="handleClasses"
@@ -133,9 +132,9 @@ function onClickAdd() {
 
 .runDataLabel {
 	position: absolute;
-	top: 0;
+	top: 50%;
 	left: 50%;
-	transform: translate(-50%, -50%);
+	transform: translate(-50%, -150%);
 	font-size: var(--font-size-xs);
 	color: var(--color-success);
 }
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainInput.vue b/packages/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/CanvasHandleNonMainOutput.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/CanvasHandleNonMainOutput.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDiamond.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleDot.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandlePlus.vue
index 3da94d6f26..880a9a0401 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
@@ -96,7 +96,12 @@ function onClick(event: MouseEvent) {
 </script>
 
 <template>
-	<svg :class="classes" :viewBox="`0 0 ${viewBox.width} ${viewBox.height}`" :style="styles">
+	<svg
+		data-test-id="canvas-handle-plus-wrapper"
+		:class="classes"
+		:viewBox="`0 0 ${viewBox.width} ${viewBox.height}`"
+		:style="styles"
+	>
 		<line
 			:class="[handleClasses, $style.line]"
 			:x1="linePosition[0][0]"
@@ -107,6 +112,7 @@ function onClick(event: MouseEvent) {
 			stroke-width="2"
 		/>
 		<g
+			data-test-id="canvas-handle-plus"
 			:class="[$style.plus, handleClasses, 'clickable']"
 			:transform="`translate(${plusPosition[0]}, ${plusPosition[1]})`"
 			@click="onClick"
@@ -156,18 +162,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/handles/render-types/parts/CanvasHandleRectangle.spec.ts b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/CanvasHandleRectangle.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDiamond.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleDot.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
similarity index 81%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
index 1f9cd25c2b..681be89f62 100644
--- a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.spec.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandlePlus.test.ts.snap
@@ -1,9 +1,9 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`CanvasHandlePlus > should render with default props 1`] = `
-"<svg class="wrapper right default" viewBox="0 0 70 24" style="width: 70px; height: 24px;">
+"<svg data-test-id="canvas-handle-plus-wrapper" class="wrapper right default" viewBox="0 0 70 24" style="width: 70px; height: 24px;">
   <line class="line" x1="0" y1="12" x2="47" y2="12" stroke="var(--color-foreground-xdark)" stroke-width="2"></line>
-  <g class="plus clickable" transform="translate(46, 0)">
+  <g data-test-id="canvas-handle-plus" class="plus clickable" transform="translate(46, 0)">
     <rect class="clickable" x="2" y="2" width="20" height="20" stroke="var(--color-foreground-xdark)" stroke-width="2" rx="4" fill="var(--color-foreground-xlight)"></rect>
     <path class="clickable" fill="var(--color-foreground-xdark)" d="m16.40655,10.89837l-3.30491,0l0,-3.30491c0,-0.40555 -0.32889,-0.73443 -0.73443,-0.73443l-0.73443,0c-0.40554,0 -0.73442,0.32888 -0.73442,0.73443l0,3.30491l-3.30491,0c-0.40555,0 -0.73443,0.32888 -0.73443,0.73442l0,0.73443c0,0.40554 0.32888,0.73443 0.73443,0.73443l3.30491,0l0,3.30491c0,0.40554 0.32888,0.73442 0.73442,0.73442l0.73443,0c0.40554,0 0.73443,-0.32888 0.73443,-0.73442l0,-3.30491l3.30491,0c0.40554,0 0.73442,-0.32889 0.73442,-0.73443l0,-0.73443c0,-0.40554 -0.32888,-0.73442 -0.73442,-0.73442z"></path>
   </g>
diff --git a/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/handles/render-types/parts/__snapshots__/CanvasHandleRectangle.test.ts.snap
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
similarity index 78%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.test.ts
index 31818cc93a..816310ac7d 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNode.spec.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', () => {
@@ -77,6 +84,33 @@ describe('CanvasNode', () => {
 			expect(inputHandles.length).toBe(3);
 			expect(outputHandles.length).toBe(2);
 		});
+
+		it('should insert spacers after required non-main input handle', () => {
+			const { getAllByTestId } = renderComponent({
+				props: {
+					...createCanvasNodeProps({
+						data: {
+							inputs: [
+								{ type: NodeConnectionType.Main, index: 0 },
+								{ type: NodeConnectionType.AiAgent, index: 0, required: true },
+								{ type: NodeConnectionType.AiTool, index: 0 },
+							],
+							outputs: [],
+						},
+					}),
+				},
+				global: {
+					stubs: {
+						Handle: true,
+					},
+				},
+			});
+
+			const inputHandles = getAllByTestId('canvas-node-input-handle');
+
+			expect(inputHandles[1]).toHaveStyle('left: 20%');
+			expect(inputHandles[2]).toHaveStyle('left: 80%');
+		});
 	});
 
 	describe('toolbar', () => {
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..fd231ecc62 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,
@@ -19,15 +28,28 @@ import { useContextMenu } from '@/composables/useContextMenu';
 import type { NodeProps, XYPosition } from '@vue-flow/core';
 import { Position } from '@vue-flow/core';
 import { useCanvas } from '@/composables/useCanvas';
-import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
+import {
+	createCanvasConnectionHandleString,
+	insertSpacersBetweenEndpoints,
+} from '@/utils/canvasUtilsV2';
 import type { EventBus } from 'n8n-design-system';
 import { createEventBus } from 'n8n-design-system';
+import { isEqual } from 'lodash-es';
 
 type Props = NodeProps<CanvasNodeData> & {
 	readOnly?: boolean;
 	eventBus?: EventBus<CanvasEventBusEvents>;
+	hovered?: boolean;
 };
 
+const slots = defineSlots<{
+	toolbar?: (props: {
+		inputs: (typeof mainInputs)['value'];
+		outputs: (typeof mainOutputs)['value'];
+		data: CanvasNodeData;
+	}) => void;
+}>();
+
 const emit = defineEmits<{
 	add: [id: string, handle: string];
 	delete: [id: string];
@@ -37,9 +59,13 @@ const emit = defineEmits<{
 	activate: [id: string];
 	'open:contextmenu': [id: string, event: MouseEvent, source: 'node-button' | 'node-right-click'];
 	update: [id: string, parameters: Record<string, unknown>];
+	'update:inputs': [id: string];
+	'update:outputs': [id: string];
 	move: [id: string, position: XYPosition];
 }>();
 
+const style = useCssModule();
+
 const props = defineProps<Props>();
 
 const nodeTypesStore = useNodeTypesStore();
@@ -47,15 +73,25 @@ const contextMenu = useContextMenu();
 
 const { connectingHandle } = useCanvas();
 
+/*
+  Toolbar slot classes
+*/
+const nodeClasses = ref<string[]>([]);
 const inputs = computed(() => props.data.inputs);
 const outputs = computed(() => props.data.outputs);
 const connections = computed(() => props.data.connections);
-const { mainInputs, nonMainInputs, mainOutputs, nonMainOutputs, isValidConnection } =
-	useNodeConnections({
-		inputs,
-		outputs,
-		connections,
-	});
+const {
+	mainInputs,
+	nonMainInputs,
+	requiredNonMainInputs,
+	mainOutputs,
+	nonMainOutputs,
+	isValidConnection,
+} = useNodeConnections({
+	inputs,
+	outputs,
+	connections,
+});
 
 const isDisabled = computed(() => props.data.disabled);
 
@@ -63,6 +99,14 @@ 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,
+	...Object.fromEntries([...nodeClasses.value].map((c) => [c, true])),
+}));
+
 /**
  * Event bus
  */
@@ -70,7 +114,7 @@ const nodeTypeDescription = computed(() => {
 const canvasNodeEventBus = ref(createEventBus<CanvasNodeEventBusEvents>());
 
 function emitCanvasNodeEvent(event: CanvasEventBusEvents['nodes:action']) {
-	if (event.ids.includes(props.id)) {
+	if (event.ids.includes(props.id) && canvasNodeEventBus.value) {
 		canvasNodeEventBus.value.emit(event.action, event.payload);
 	}
 }
@@ -79,23 +123,15 @@ function emitCanvasNodeEvent(event: CanvasEventBusEvents['nodes:action']) {
  * Inputs
  */
 
+const nonMainInputsWithSpacer = computed(() =>
+	insertSpacersBetweenEndpoints(nonMainInputs.value, requiredNonMainInputs.value.length),
+);
+
 const mappedInputs = computed(() => {
 	return [
-		...mainInputs.value.map(
-			createEndpointMappingFn({
-				mode: CanvasConnectionMode.Input,
-				position: Position.Left,
-				offsetAxis: 'top',
-			}),
-		),
-		...nonMainInputs.value.map(
-			createEndpointMappingFn({
-				mode: CanvasConnectionMode.Input,
-				position: Position.Bottom,
-				offsetAxis: 'left',
-			}),
-		),
-	];
+		...mainInputs.value.map(mainInputsMappingFn),
+		...nonMainInputsWithSpacer.value.map(nonMainInputsMappingFn),
+	].filter((endpoint) => !!endpoint);
 });
 
 /**
@@ -104,21 +140,9 @@ const mappedInputs = computed(() => {
 
 const mappedOutputs = computed(() => {
 	return [
-		...mainOutputs.value.map(
-			createEndpointMappingFn({
-				mode: CanvasConnectionMode.Output,
-				position: Position.Right,
-				offsetAxis: 'top',
-			}),
-		),
-		...nonMainOutputs.value.map(
-			createEndpointMappingFn({
-				mode: CanvasConnectionMode.Output,
-				position: Position.Top,
-				offsetAxis: 'left',
-			}),
-		),
-	];
+		...mainOutputs.value.map(mainOutputsMappingFn),
+		...nonMainOutputs.value.map(nonMainOutputsMappingFn),
+	].filter((endpoint) => !!endpoint);
 });
 
 /**
@@ -144,10 +168,14 @@ const createEndpointMappingFn =
 		offsetAxis: 'top' | 'left';
 	}) =>
 	(
-		endpoint: CanvasConnectionPort,
+		endpoint: CanvasConnectionPort | null,
 		index: number,
-		endpoints: CanvasConnectionPort[],
-	): CanvasElementPortWithRenderData => {
+		endpoints: Array<CanvasConnectionPort | null>,
+	): CanvasElementPortWithRenderData | undefined => {
+		if (!endpoint) {
+			return;
+		}
+
 		const handleId = createCanvasConnectionHandleString({
 			mode,
 			type: endpoint.type,
@@ -172,6 +200,30 @@ const createEndpointMappingFn =
 		};
 	};
 
+const mainInputsMappingFn = createEndpointMappingFn({
+	mode: CanvasConnectionMode.Input,
+	position: Position.Left,
+	offsetAxis: 'top',
+});
+
+const nonMainInputsMappingFn = createEndpointMappingFn({
+	mode: CanvasConnectionMode.Input,
+	position: Position.Bottom,
+	offsetAxis: 'left',
+});
+
+const mainOutputsMappingFn = createEndpointMappingFn({
+	mode: CanvasConnectionMode.Output,
+	position: Position.Right,
+	offsetAxis: 'top',
+});
+
+const nonMainOutputsMappingFn = createEndpointMappingFn({
+	mode: CanvasConnectionMode.Output,
+	position: Position.Top,
+	offsetAxis: 'left',
+});
+
 /**
  * Events
  */
@@ -211,6 +263,12 @@ function onMove(position: XYPosition) {
 	emit('move', props.id, position);
 }
 
+function onUpdateClass({ className, add = true }: CanvasNodeEventBusEvents['update:node:class']) {
+	nodeClasses.value = add
+		? [...new Set([...nodeClasses.value, className])]
+		: nodeClasses.value.filter((c) => c !== className);
+}
+
 /**
  * Provide
  */
@@ -246,19 +304,34 @@ watch(
 	},
 );
 
+watch(inputs, (newValue, oldValue) => {
+	if (!isEqual(newValue, oldValue)) {
+		emit('update:inputs', props.id);
+	}
+});
+
+watch(outputs, (newValue, oldValue) => {
+	if (!isEqual(newValue, oldValue)) {
+		emit('update:outputs', props.id);
+	}
+});
+
 onMounted(() => {
 	props.eventBus?.on('nodes:action', emitCanvasNodeEvent);
+	canvasNodeEventBus.value?.on('update:node:class', onUpdateClass);
 });
 
 onBeforeUnmount(() => {
 	props.eventBus?.off('nodes:action', emitCanvasNodeEvent);
+	canvasNodeEventBus.value?.off('update:node:class', onUpdateClass);
 });
 </script>
 
 <template>
 	<div
-		:class="[$style.canvasNode, { [$style.showToolbar]: showToolbar }]"
+		:class="classes"
 		data-test-id="canvas-node"
+		:data-node-name="data.name"
 		:data-node-type="data.type"
 	>
 		<template
@@ -270,9 +343,10 @@ onBeforeUnmount(() => {
 				:mode="CanvasConnectionMode.Output"
 				:is-read-only="readOnly"
 				:is-valid-connection="isValidConnection"
-				:data-node-name="label"
+				:data-node-name="data.name"
 				data-test-id="canvas-node-output-handle"
-				:data-handle-index="source.index"
+				:data-index="source.index"
+				:data-connection-type="source.type"
 				@add="onAdd"
 			/>
 		</template>
@@ -287,14 +361,19 @@ onBeforeUnmount(() => {
 				:is-read-only="readOnly"
 				:is-valid-connection="isValidConnection"
 				data-test-id="canvas-node-input-handle"
-				:data-handle-index="target.index"
-				:data-node-name="label"
+				:data-index="target.index"
+				:data-connection-type="target.type"
+				:data-node-name="data.name"
 				@add="onAdd"
 			/>
 		</template>
 
+		<template v-if="slots.toolbar">
+			<slot name="toolbar" :inputs="mainInputs" :outputs="mainOutputs" :data="data" />
+		</template>
+
 		<CanvasNodeToolbar
-			v-if="nodeTypeDescription"
+			v-else-if="nodeTypeDescription"
 			data-test-id="canvas-node-toolbar"
 			:read-only="readOnly"
 			:class="$style.canvasNodeToolbar"
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.test.ts
similarity index 90%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeRenderer.spec.ts
rename to 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.spec.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/CanvasNodeToolbar.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
similarity index 77%
rename from packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
index 619457e903..54680b1347 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.test.ts
@@ -1,4 +1,4 @@
-import { fireEvent } from '@testing-library/vue';
+import { fireEvent, waitFor } from '@testing-library/vue';
 import CanvasNodeToolbar from '@/components/canvas/elements/nodes/CanvasNodeToolbar.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { createCanvasNodeProvide, createCanvasProvide } from '@/__tests__/data';
@@ -137,4 +137,45 @@ describe('CanvasNodeToolbar', () => {
 
 		expect(emitted('update')[0]).toEqual([{ color: 1 }]);
 	});
+
+	it('should have "forceVisible" class when hovered', async () => {
+		const { getByTestId } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide(),
+					...createCanvasProvide(),
+				},
+			},
+		});
+
+		const toolbar = getByTestId('canvas-node-toolbar');
+
+		await fireEvent.mouseEnter(toolbar);
+
+		expect(toolbar).toHaveClass('forceVisible');
+	});
+
+	it('should have "forceVisible" class when sticky color picker is visible', async () => {
+		const { getByTestId } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide({
+						data: {
+							render: {
+								type: CanvasNodeRenderType.StickyNote,
+								options: { color: 3 },
+							},
+						},
+					}),
+					...createCanvasProvide(),
+				},
+			},
+		});
+
+		const toolbar = getByTestId('canvas-node-toolbar');
+
+		await fireEvent.click(getByTestId('change-sticky-color'));
+
+		await waitFor(() => expect(toolbar).toHaveClass('forceVisible'));
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
index 4cb940b757..2c552d757c 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/CanvasNodeToolbar.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed, useCssModule } from 'vue';
+import { computed, ref, useCssModule } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { useCanvasNode } from '@/composables/useCanvasNode';
 import { CanvasNodeRenderType } from '@/types';
@@ -24,12 +24,16 @@ const { isExecuting } = useCanvas();
 const { isDisabled, render } = useCanvasNode();
 
 const nodeDisabledTitle = computed(() => {
-	return isDisabled.value ? i18n.baseText('node.disable') : i18n.baseText('node.enable');
+	return isDisabled.value ? i18n.baseText('node.enable') : i18n.baseText('node.disable');
 });
 
+const isStickyColorSelectorOpen = ref(false);
+const isHovered = ref(false);
+
 const classes = computed(() => ({
 	[$style.canvasNodeToolbar]: true,
 	[$style.readOnly]: props.readOnly,
+	[$style.forceVisible]: isHovered.value || isStickyColorSelectorOpen.value,
 }));
 
 const isExecuteNodeVisible = computed(() => {
@@ -72,10 +76,23 @@ function onChangeStickyColor(color: number) {
 function onOpenContextMenu(event: MouseEvent) {
 	emit('open:contextmenu', event);
 }
+
+function onMouseEnter() {
+	isHovered.value = true;
+}
+
+function onMouseLeave() {
+	isHovered.value = false;
+}
 </script>
 
 <template>
-	<div :class="classes">
+	<div
+		data-test-id="canvas-node-toolbar"
+		:class="classes"
+		@mouseenter="onMouseEnter"
+		@mouseleave="onMouseLeave"
+	>
 		<div :class="$style.canvasNodeToolbarItems">
 			<N8nIconButton
 				v-if="isExecuteNodeVisible"
@@ -110,6 +127,7 @@ function onOpenContextMenu(event: MouseEvent) {
 			/>
 			<CanvasNodeStickyColorSelector
 				v-if="isStickyNoteChangeColorVisible"
+				v-model:visible="isStickyColorSelectorOpen"
 				@update="onChangeStickyColor"
 			/>
 			<N8nIconButton
@@ -143,4 +161,8 @@ function onOpenContextMenu(event: MouseEvent) {
 		--button-font-color: var(--color-text-light);
 	}
 }
+
+.forceVisible {
+	opacity: 1 !important;
+}
 </style>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue
index 7fd78c8b87..9573b42014 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeAddNodes.vue
@@ -3,8 +3,10 @@ import { onBeforeUnmount, onMounted, ref } from 'vue';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
 import { NODE_CREATOR_OPEN_SOURCES } from '@/constants';
 import { nodeViewEventBus } from '@/event-bus';
+import { useI18n } from '@/composables/useI18n';
 
 const nodeCreatorStore = useNodeCreatorStore();
+const i18n = useI18n();
 
 const isTooltipVisible = ref(false);
 
@@ -45,10 +47,10 @@ function onClick() {
 				<FontAwesomeIcon icon="plus" size="lg" />
 			</button>
 			<template #content>
-				{{ $locale.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting') }}
+				{{ i18n.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting') }}
 			</template>
 		</N8nTooltip>
-		<p :class="$style.label" v-text="$locale.baseText('nodeView.canvasAddButton.addFirstStep')" />
+		<p :class="$style.label" v-text="i18n.baseText('nodeView.canvasAddButton.addFirstStep')" />
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.test.ts
similarity index 98%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeDefault.spec.ts
rename to 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.spec.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 74bce00cfd..2481831249 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="$locale.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">
@@ -150,8 +158,9 @@ function openContextMenu(event: MouseEvent) {
 	--configurable-node--icon-offset: 40px;
 	--configurable-node--icon-size: 30px;
 	--trigger-node--border-radius: 36px;
-	--canvas-node--status-icons-offset: var(--spacing-2xs);
+	--canvas-node--status-icons-offset: var(--spacing-3xs);
 
+	position: relative;
 	height: var(--canvas-node--height);
 	width: var(--canvas-node--width);
 	display: flex;
@@ -192,6 +201,12 @@ function openContextMenu(event: MouseEvent) {
 				var(--configurable-node--input-width)
 		);
 
+		justify-content: flex-start;
+
+		:global(.n8n-node-icon) {
+			margin-left: var(--configurable-node--icon-offset);
+		}
+
 		.description {
 			top: unset;
 			position: relative;
@@ -298,12 +313,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/CanvasNodeStickyNote.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
similarity index 64%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
index e56b3cef63..e9d48541ff 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.spec.ts
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.test.ts
@@ -3,6 +3,7 @@ import { createComponentRenderer } from '@/__tests__/render';
 import { createCanvasNodeProvide } from '@/__tests__/data';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
+import { fireEvent } from '@testing-library/vue';
 
 const renderComponent = createComponentRenderer(CanvasNodeStickyNote);
 
@@ -42,4 +43,29 @@ describe('CanvasNodeStickyNote', () => {
 
 		expect(resizeControls).toHaveLength(0);
 	});
+
+	it('should disable sticky options when in edit mode', async () => {
+		const { container } = renderComponent({
+			global: {
+				provide: {
+					...createCanvasNodeProvide({
+						id: 'sticky',
+						readOnly: false,
+					}),
+				},
+			},
+		});
+
+		const stickyTextarea = container.querySelector('.sticky-textarea');
+
+		if (!stickyTextarea) return;
+
+		await fireEvent.dblClick(stickyTextarea);
+
+		const stickyOptions = container.querySelector('.sticky-options');
+
+		if (!stickyOptions) return;
+
+		expect(getComputedStyle(stickyOptions).display).toBe('none');
+	});
 });
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
index 6a0d0ac8ec..969c97311f 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/CanvasNodeStickyNote.vue
@@ -4,7 +4,7 @@ import { useCanvasNode } from '@/composables/useCanvasNode';
 import type { CanvasNodeStickyNoteRender } from '@/types';
 import { ref, computed, useCssModule, onMounted, onBeforeUnmount } from 'vue';
 import { NodeResizer } from '@vue-flow/node-resizer';
-import type { OnResize } from '@vue-flow/node-resizer/dist/types';
+import type { OnResize } from '@vue-flow/node-resizer';
 import type { XYPosition } from '@vue-flow/core';
 
 defineOptions({
@@ -103,12 +103,13 @@ onBeforeUnmount(() => {
 		v-bind="$attrs"
 		:id="id"
 		:class="classes"
-		data-test-id="canvas-sticky-note-node"
+		data-test-id="sticky"
 		:height="renderOptions.height"
 		:width="renderOptions.width"
 		:model-value="renderOptions.content"
 		:background-color="renderOptions.color"
 		:edit-mode="isActive"
+		:read-only="isReadOnly"
 		@edit="onEdit"
 		@dblclick="onDoubleClick"
 		@update:model-value="onInputChange"
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.test.ts.snap
similarity index 97%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeDefault.spec.ts.snap
rename to 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.spec.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/__snapshots__/CanvasNodeStickyNote.spec.ts.snap b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
similarity index 94%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.spec.ts.snap
rename to packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
index 211bab169f..658e31dc1e 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.spec.ts.snap
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/__snapshots__/CanvasNodeStickyNote.test.ts.snap
@@ -9,7 +9,7 @@ exports[`CanvasNodeStickyNote > should render node correctly 1`] = `
 <div class="vue-flow__resize-control nodrag top right handle"></div>
 <div class="vue-flow__resize-control nodrag bottom left handle"></div>
 <div class="vue-flow__resize-control nodrag bottom right handle"></div>
-<div class="n8n-sticky sticky clickable color-1 sticky" style="height: 180px; width: 240px;" data-test-id="canvas-sticky-note-node">
+<div class="n8n-sticky sticky clickable color-1 sticky" style="height: 180px; width: 240px;" data-test-id="sticky">
   <div class="wrapper">
     <div class="n8n-markdown">
       <div class="sticky"></div>
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeDisabledStrikeThrough.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
index b3413183dd..aa80598baa 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/render-types/parts/CanvasNodeStatusIcons.vue
@@ -3,8 +3,10 @@ import { computed } from 'vue';
 import TitledList from '@/components/TitledList.vue';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useCanvasNode } from '@/composables/useCanvasNode';
+import { useI18n } from '@/composables/useI18n';
 
 const nodeHelpers = useNodeHelpers();
+const i18n = useI18n();
 
 const {
 	hasPinnedData,
@@ -12,7 +14,7 @@ const {
 	hasIssues,
 	executionStatus,
 	executionWaiting,
-	executionRunning,
+	executionRunningThrottled,
 	hasRunData,
 	runDataIterations,
 	isDisabled,
@@ -29,7 +31,7 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
 	>
 		<N8nTooltip :show-after="500" placement="bottom">
 			<template #content>
-				<TitledList :title="`${$locale.baseText('node.issues')}:`" :items="issues" />
+				<TitledList :title="`${i18n.baseText('node.issues')}:`" :items="issues" />
 			</template>
 			<FontAwesomeIcon icon="exclamation-triangle" />
 		</N8nTooltip>
@@ -58,7 +60,7 @@ const hideNodeIssues = computed(() => false); // @TODO Implement this
 		<!-- Do nothing, unknown means the node never executed -->
 	</div>
 	<div
-		v-else-if="executionRunning || executionStatus === 'running'"
+		v-else-if="executionRunningThrottled || executionStatus === 'running'"
 		data-test-id="canvas-node-status-running"
 		:class="[$style.status, $style.running]"
 	>
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/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.spec.ts b/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
similarity index 100%
rename from packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.spec.ts
rename to packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.test.ts
diff --git a/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue b/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
index 3b05bb5302..1e11fe6d98 100644
--- a/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
+++ b/packages/editor-ui/src/components/canvas/elements/nodes/toolbar/CanvasNodeStickyColorSelector.vue
@@ -14,13 +14,10 @@ const { render, eventBus } = useCanvasNode();
 const renderOptions = computed(() => render.value.options as CanvasNodeStickyNoteRender['options']);
 
 const autoHideTimeout = ref<NodeJS.Timeout | null>(null);
-const isPopoverVisible = ref(false);
 
 const colors = computed(() => Array.from({ length: 7 }).map((_, index) => index + 1));
 
-function togglePopover() {
-	isPopoverVisible.value = !isPopoverVisible.value;
-}
+const isPopoverVisible = defineModel<boolean>('visible');
 
 function hidePopover() {
 	isPopoverVisible.value = false;
@@ -59,22 +56,21 @@ onBeforeUnmount(() => {
 
 <template>
 	<N8nPopover
+		v-model:visible="isPopoverVisible"
 		effect="dark"
 		trigger="click"
 		placement="top"
 		:popper-class="$style.popover"
 		:popper-style="{ width: '208px' }"
-		:visible="isPopoverVisible"
-		:teleported="false"
-		@mouseenter="onMouseEnter"
-		@mouseleave="onMouseLeave"
+		:teleported="true"
+		@before-enter="onMouseEnter"
+		@after-leave="onMouseLeave"
 	>
 		<template #reference>
 			<div
 				:class="$style.option"
 				data-test-id="change-sticky-color"
 				:title="i18n.baseText('node.changeColor')"
-				@click.stop="togglePopover"
 			>
 				<FontAwesomeIcon icon="palette" />
 			</div>
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..9089fa2934
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.test.ts
@@ -0,0 +1,91 @@
+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 with Upgrade link and emit "goToUpgrade" on click when on cloud', async () => {
+		const { container, getByText, getByRole, queryByRole, emitted } = renderComponent({
+			props: {
+				runningExecutionsCount: 2,
+				concurrencyCap: 5,
+				isCloudDeployment: true,
+			},
+		});
+
+		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(emitted().goToUpgrade).toHaveLength(1);
+	});
+
+	it('should show tooltip on hover with Viev docs link when self-hosted', async () => {
+		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('View docs')).toBeVisible();
+	});
+});
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..6c4b691507
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/ConcurrentExecutionsHeader.vue
@@ -0,0 +1,87 @@
+<script lang="ts" setup>
+import { computed } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import { WORKFLOW_EVALUATION_EXPERIMENT } from '@/constants';
+import { usePostHog } from '@/stores/posthog.store';
+
+const props = defineProps<{
+	runningExecutionsCount: number;
+	concurrencyCap: number;
+	isCloudDeployment?: boolean;
+}>();
+
+const emit = defineEmits<{
+	goToUpgrade: [];
+}>();
+
+const i18n = useI18n();
+
+const posthogStore = usePostHog();
+
+const tooltipText = computed(() => {
+	let text = i18n.baseText('executionsList.activeExecutions.tooltip', {
+		interpolate: {
+			running: props.runningExecutionsCount,
+			cap: props.concurrencyCap,
+		},
+	});
+
+	if (posthogStore.isFeatureEnabled(WORKFLOW_EVALUATION_EXPERIMENT)) {
+		text += '\n' + i18n.baseText('executionsList.activeExecutions.evaluationNote');
+	}
+
+	return text;
+});
+
+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,
+		},
+	});
+});
+</script>
+
+<template>
+	<div data-test-id="concurrent-executions-header">
+		<n8n-text>{{ headerText }}</n8n-text>
+		<n8n-tooltip>
+			<template #content>
+				<div :class="$style.tooltip">
+					{{ tooltipText }}
+					<N8nLink
+						v-if="props.isCloudDeployment"
+						bold
+						size="small"
+						:class="$style.link"
+						@click="emit('goToUpgrade')"
+					>
+						{{ i18n.baseText('generic.upgradeNow') }}
+					</N8nLink>
+					<N8nLink
+						v-else
+						:class="$style.link"
+						:href="i18n.baseText('executions.concurrency.docsLink')"
+						target="_blank"
+						>{{ i18n.baseText('generic.viewDocs') }}</N8nLink
+					>
+				</div>
+			</template>
+			<font-awesome-icon icon="info-circle" class="ml-2xs" />
+		</n8n-tooltip>
+	</div>
+</template>
+
+<style lang="scss" module>
+.tooltip {
+	display: flex;
+	flex-direction: column;
+}
+.link {
+	margin-top: var(--spacing-xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/ExecutionsFilter.vue b/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
index b76b51f24d..4325c9b94f 100644
--- a/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
+++ b/packages/editor-ui/src/components/executions/ExecutionsFilter.vue
@@ -10,11 +10,11 @@ import { i18n as locale } from '@/plugins/i18n';
 import { getObjectKeys, isEmpty } from '@/utils/typesUtils';
 import { EnterpriseEditionFeature } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUIStore } from '@/stores/ui.store';
 import { useTelemetry } from '@/composables/useTelemetry';
 import type { Placement } from '@floating-ui/core';
 import { useDebounce } from '@/composables/useDebounce';
 import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.ee.vue';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 export type ExecutionFilterProps = {
 	workflows?: Array<IWorkflowDb | IWorkflowShortResponse>;
@@ -25,10 +25,10 @@ export type ExecutionFilterProps = {
 const DATE_TIME_MASK = 'YYYY-MM-DD HH:mm';
 
 const settingsStore = useSettingsStore();
-const uiStore = useUIStore();
 const { debounce } = useDebounce();
 
 const telemetry = useTelemetry();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const props = withDefaults(defineProps<ExecutionFilterProps>(), {
 	workflows: () => [] as Array<IWorkflowDb | IWorkflowShortResponse>,
@@ -149,7 +149,7 @@ const onFilterReset = () => {
 };
 
 const goToUpgrade = () => {
-	void uiStore.goToUpgrade('custom-data-filter', 'upgrade-custom-data-filter');
+	void pageRedirectionHelper.goToUpgrade('custom-data-filter', 'upgrade-custom-data-filter');
 };
 
 onBeforeMount(() => {
diff --git a/packages/editor-ui/src/components/executions/ExecutionsTime.vue b/packages/editor-ui/src/components/executions/ExecutionsTime.vue
index 5316562f75..e39a9ff3d3 100644
--- a/packages/editor-ui/src/components/executions/ExecutionsTime.vue
+++ b/packages/editor-ui/src/components/executions/ExecutionsTime.vue
@@ -16,7 +16,7 @@ const time = computed(() => {
 		return '...';
 	}
 	const msPassed = nowTime.value - new Date(props.startTime).getTime();
-	return i18n.displayTimer(msPassed); // Note: Adjust for $locale usage in setup
+	return i18n.displayTimer(msPassed);
 });
 
 onMounted(() => {
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 5b2c9c7486..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)) {
@@ -39,6 +46,7 @@ const executionDataFactory = (): ExecutionSummary => ({
 	id: faker.string.uuid(),
 	finished: faker.datatype.boolean(),
 	mode: faker.helpers.arrayElement(['manual', 'trigger']),
+	createdAt: faker.date.past(),
 	startedAt: faker.date.past(),
 	stoppedAt: faker.date.past(),
 	workflowId: faker.number.int().toString(),
@@ -57,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,
 	},
@@ -79,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 () => {
@@ -104,7 +112,6 @@ describe('GlobalExecutionsList', () => {
 				total: 0,
 				estimated: false,
 			},
-			pinia,
 		});
 		await waitAllPromises();
 
@@ -127,7 +134,6 @@ describe('GlobalExecutionsList', () => {
 					filters: {},
 					estimated: false,
 				},
-				pinia,
 			});
 			await waitAllPromises();
 
@@ -193,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 e11821fd1d..1ab314ee03 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsList.vue
@@ -14,6 +14,9 @@ import { useExecutionsStore } from '@/stores/executions.store';
 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';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const props = withDefaults(
 	defineProps<{
@@ -38,6 +41,7 @@ const telemetry = useTelemetry();
 const workflowsStore = useWorkflowsStore();
 const executionsStore = useExecutionsStore();
 const settingsStore = useSettingsStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const isMounted = ref(false);
 const allVisibleSelected = ref(false);
@@ -69,6 +73,17 @@ const isAnnotationEnabled = computed(
 	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.AdvancedExecutionFilters],
 );
 
+/**
+ * Calculate the number of executions counted towards the production executions concurrency limit.
+ * Evaluation executions are not counted towards this limit and the evaluation limit isn't shown in the UI.
+ */
+const runningExecutionsCount = computed(() => {
+	return props.executions.filter(
+		(execution) =>
+			execution.status === 'running' && ['webhook', 'trigger'].includes(execution.mode),
+	).length;
+});
+
 watch(
 	() => props.executions,
 	() => {
@@ -311,16 +326,26 @@ async function onAutoRefreshToggle(value: boolean) {
 		executionsStore.stopAutoRefreshInterval();
 	}
 }
+
+const goToUpgrade = () => {
+	void pageRedirectionHelper.goToUpgrade('concurrency', 'upgrade-concurrency');
+};
 </script>
 
 <template>
 	<div :class="$style.execListWrapper">
+		<ProjectHeader />
 		<div :class="$style.execList">
 			<div :class="$style.execListHeader">
-				<N8nHeading tag="h1" size="2xlarge">
-					{{ i18n.baseText('executionsList.workflowExecutions') }}
-				</N8nHeading>
 				<div :class="$style.execListHeaderControls">
+					<ConcurrentExecutionsHeader
+						v-if="settingsStore.isConcurrencyEnabled"
+						class="mr-xl"
+						:running-executions-count="runningExecutionsCount"
+						:concurrency-cap="settingsStore.concurrency"
+						:is-cloud-deployment="settingsStore.isCloudDeployment"
+						@go-to-upgrade="goToUpgrade"
+					/>
 					<N8nLoading v-if="!isMounted" :class="$style.filterLoader" variant="custom" />
 					<ElCheckbox
 						v-else
@@ -334,6 +359,7 @@ async function onAutoRefreshToggle(value: boolean) {
 					<ExecutionsFilter
 						v-show="isMounted"
 						:workflows="workflows"
+						class="execFilter"
 						@filter-changed="onFilterChanged"
 					/>
 				</div>
@@ -388,12 +414,15 @@ async function onAutoRefreshToggle(value: boolean) {
 						:workflow-name="getExecutionWorkflowName(execution)"
 						:workflow-permissions="getExecutionWorkflowPermissions(execution)"
 						:selected="selectedItems[execution.id] || allExistingSelected"
+						:concurrency-cap="settingsStore.concurrency"
+						:is-cloud-deployment="settingsStore.isCloudDeployment"
 						data-test-id="global-execution-list-item"
 						@stop="stopExecution"
 						@delete="deleteExecution"
 						@select="toggleSelectExecution"
 						@retry-saved="retrySavedExecution"
 						@retry-original="retryOriginalExecution"
+						@go-to-upgrade="goToUpgrade"
 					/>
 				</TransitionGroup>
 			</table>
@@ -455,27 +484,28 @@ async function onAutoRefreshToggle(value: boolean) {
 <style module lang="scss">
 .execListWrapper {
 	display: grid;
-	grid-template-rows: 1fr 0;
+	grid-template-rows: auto auto 1fr 0;
 	position: relative;
 	height: 100%;
 	width: 100%;
-	max-width: 1280px;
+	padding: var(--spacing-l) var(--spacing-2xl) 0;
+	max-width: var(--content-container-width);
+
+	@include mixins.breakpoint('xs-only') {
+		padding: var(--spacing-xs) var(--spacing-xs) 0;
+	}
 }
 
 .execList {
 	position: relative;
 	height: 100%;
 	overflow: auto;
-	padding: var(--spacing-l) var(--spacing-l) 0;
-	@media (min-width: 1200px) {
-		padding: var(--spacing-2xl) var(--spacing-2xl) 0;
-	}
 }
 
 .execListHeader {
 	display: flex;
 	align-items: center;
-	justify-content: space-between;
+	justify-content: flex-start;
 	margin-bottom: var(--spacing-s);
 }
 
@@ -588,3 +618,15 @@ async function onAutoRefreshToggle(value: boolean) {
 	margin-bottom: var(--spacing-2xs);
 }
 </style>
+
+<style lang="scss" scoped>
+.execFilter:deep(button) {
+	height: 40px;
+}
+
+:deep(.el-checkbox) {
+	display: inline-flex;
+	align-items: center;
+	vertical-align: middle;
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
index 5f15c9534f..47e89f8714 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.test.ts
@@ -1,6 +1,7 @@
-import { describe, it, expect, vi } from 'vitest';
+import { vi } from 'vitest';
 import { fireEvent } from '@testing-library/vue';
-import GlobalExecutionsListItem from './GlobalExecutionsListItem.vue';
+import { WAIT_INDEFINITELY } from 'n8n-workflow';
+import GlobalExecutionsListItem from '@/components/executions/global/GlobalExecutionsListItem.vue';
 import { createComponentRenderer } from '@/__tests__/render';
 import { DateTime } from 'luxon';
 
@@ -15,9 +16,20 @@ vi.mock('vue-router', async () => {
 	};
 });
 
+const globalExecutionsListItemQueuedTooltipRenderSpy = vi.fn();
+
 const renderComponent = createComponentRenderer(GlobalExecutionsListItem, {
 	global: {
-		stubs: ['font-awesome-icon', 'n8n-tooltip', 'n8n-button', 'i18n-t'],
+		//stubs: ['font-awesome-icon', 'n8n-tooltip', 'n8n-button', 'i18n-t'],
+		stubs: {
+			'font-awesome-icon': true,
+			'n8n-tooltip': true,
+			'n8n-button': true,
+			'i18n-t': true,
+			GlobalExecutionsListItemQueuedTooltip: {
+				render: globalExecutionsListItemQueuedTooltipRenderSpy,
+			},
+		},
 	},
 });
 
@@ -98,6 +110,7 @@ describe('GlobalExecutionsListItem', () => {
 
 		await fireEvent.click(getByText('TestWorkflow'));
 		expect(window.open).toHaveBeenCalledWith('mockedRoute', '_blank');
+		expect(globalExecutionsListItemQueuedTooltipRenderSpy).not.toHaveBeenCalled();
 	});
 
 	it('should show formatted start date', () => {
@@ -113,4 +126,50 @@ describe('GlobalExecutionsListItem', () => {
 			getByText(`1 Jan, 2022 at ${DateTime.fromJSDate(new Date(testDate)).toFormat('HH')}:00:00`),
 		).toBeInTheDocument();
 	});
+
+	it('should not render queued tooltip for a not indefinitely waiting execution', async () => {
+		renderComponent({
+			props: {
+				execution: {
+					status: 'waiting',
+					waitTill: new Date(Date.now() + 10000000).toISOString(),
+					id: 123,
+					workflowName: 'Test Workflow',
+				},
+				workflowPermissions: {},
+				concurrencyCap: 5,
+			},
+		});
+
+		expect(globalExecutionsListItemQueuedTooltipRenderSpy).not.toHaveBeenCalled();
+	});
+
+	it('should render queued tooltip for an indefinitely waiting execution', async () => {
+		renderComponent({
+			props: {
+				execution: {
+					status: 'waiting',
+					waitTill: WAIT_INDEFINITELY,
+					id: 123,
+					workflowName: 'Test Workflow',
+				},
+				workflowPermissions: {},
+				concurrencyCap: 5,
+			},
+		});
+
+		expect(globalExecutionsListItemQueuedTooltipRenderSpy).toHaveBeenCalled();
+	});
+
+	it('should render queued tooltip for a new execution', async () => {
+		renderComponent({
+			props: {
+				execution: { status: 'new', id: 123, workflowName: 'Test Workflow' },
+				workflowPermissions: {},
+				concurrencyCap: 5,
+			},
+		});
+
+		expect(globalExecutionsListItemQueuedTooltipRenderSpy).toHaveBeenCalled();
+	});
 });
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
index f23dbbc4ac..db8e7a6ef4 100644
--- a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItem.vue
@@ -1,14 +1,14 @@
 <script lang="ts" setup>
 import { ref, computed, useCssModule } from 'vue';
 import type { ExecutionSummary } from 'n8n-workflow';
+import { WAIT_INDEFINITELY } from 'n8n-workflow';
 import { useI18n } from '@/composables/useI18n';
-import { VIEWS, WAIT_TIME_UNLIMITED } from '@/constants';
-import { useRouter } from 'vue-router';
 import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
 import { i18n as locale } from '@/plugins/i18n';
 import ExecutionsTime from '@/components/executions/ExecutionsTime.vue';
 import { useExecutionHelpers } from '@/composables/useExecutionHelpers';
 import type { PermissionsRecord } from '@/permissions';
+import GlobalExecutionsListItemQueuedTooltip from '@/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue';
 
 type Command = 'retrySaved' | 'retryOriginal' | 'delete';
 
@@ -18,6 +18,7 @@ const emit = defineEmits<{
 	retrySaved: [data: ExecutionSummary];
 	retryOriginal: [data: ExecutionSummary];
 	delete: [data: ExecutionSummary];
+	goToUpgrade: [];
 }>();
 
 const props = withDefaults(
@@ -26,6 +27,8 @@ const props = withDefaults(
 		selected?: boolean;
 		workflowName?: string;
 		workflowPermissions: PermissionsRecord['workflow'];
+		concurrencyCap: number;
+		isCloudDeployment?: boolean;
 	}>(),
 	{
 		selected: false,
@@ -35,7 +38,6 @@ const props = withDefaults(
 
 const style = useCssModule();
 const i18n = useI18n();
-const router = useRouter();
 const executionHelpers = useExecutionHelpers();
 
 const isStopping = ref(false);
@@ -44,12 +46,16 @@ 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;
 	}
 
-	return new Date(props.execution.waitTill).toISOString() === WAIT_TIME_UNLIMITED;
+	return new Date(props.execution.waitTill).getTime() === WAIT_INDEFINITELY.getTime();
 });
 
 const isRetriable = computed(() => executionHelpers.isExecutionRetriable(props.execution));
@@ -81,13 +87,6 @@ const formattedStoppedAtDate = computed(() => {
 		: '';
 });
 
-const statusTooltipText = computed(() => {
-	if (props.execution.status === 'waiting' && isWaitTillIndefinite.value) {
-		return i18n.baseText('executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely');
-	}
-	return '';
-});
-
 const statusText = computed(() => {
 	switch (props.execution.status) {
 		case 'waiting':
@@ -138,11 +137,7 @@ function formatDate(fullDate: Date | string | number) {
 }
 
 function displayExecution() {
-	const route = router.resolve({
-		name: VIEWS.EXECUTION_PREVIEW,
-		params: { name: props.execution.workflowId, executionId: props.execution.id },
-	});
-	window.open(route.href, '_blank');
+	executionHelpers.openExecutionInNewTab(props.execution.id, props.execution.workflowId);
 }
 
 function onStopExecution() {
@@ -184,7 +179,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"
@@ -203,12 +198,15 @@ async function handleActionItemClick(commandData: Command) {
 						/>
 					</template>
 				</i18n-t>
-				<N8nTooltip v-else placement="top">
-					<template #content>
-						<span>{{ statusTooltipText }}</span>
-					</template>
+				<GlobalExecutionsListItemQueuedTooltip
+					v-else
+					:status="props.execution.status"
+					:concurrency-cap="props.concurrencyCap"
+					:is-cloud-deployment="props.isCloudDeployment"
+					@go-to-upgrade="emit('goToUpgrade')"
+				>
 					<span :class="$style.status">{{ statusText }}</span>
-				</N8nTooltip>
+				</GlobalExecutionsListItemQueuedTooltip>
 			</div>
 		</td>
 		<td>
@@ -346,7 +344,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 {
@@ -396,8 +394,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/global/GlobalExecutionsListItemQueuedTooltip.test.ts b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts
new file mode 100644
index 0000000000..b200822799
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.test.ts
@@ -0,0 +1,76 @@
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import GlobalExecutionsListItemQueuedTooltip from '@/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue';
+
+const renderComponent = createComponentRenderer(GlobalExecutionsListItemQueuedTooltip);
+
+describe('GlobalExecutionsListItemQueuedTooltip', () => {
+	it('should not throw error when rendered', async () => {
+		expect(() =>
+			renderComponent({
+				props: {
+					status: 'waiting',
+					concurrencyCap: 0,
+				},
+				slots: {
+					default: 'Waiting',
+				},
+			}),
+		).not.toThrow();
+	});
+
+	it('should show waiting indefinitely tooltip', async () => {
+		const { getByText } = renderComponent({
+			props: {
+				status: 'waiting',
+				concurrencyCap: 0,
+			},
+			slots: {
+				default: 'Waiting',
+			},
+		});
+
+		await userEvent.hover(getByText('Waiting'));
+
+		expect(getByText(/waiting indefinitely/)).toBeVisible();
+	});
+
+	it('should show queued tooltip for self-hosted', async () => {
+		const { getByText } = renderComponent({
+			props: {
+				status: 'new',
+				concurrencyCap: 0,
+			},
+			slots: {
+				default: 'Queued',
+			},
+		});
+
+		await userEvent.hover(getByText('Queued'));
+
+		expect(getByText(/instance is limited/)).toBeVisible();
+		expect(getByText('View docs')).toBeVisible();
+	});
+
+	it('should show queued tooltip for cloud', async () => {
+		const { getByText, emitted } = renderComponent({
+			props: {
+				status: 'new',
+				concurrencyCap: 0,
+				isCloudDeployment: true,
+			},
+			slots: {
+				default: 'Queued',
+			},
+		});
+
+		await userEvent.hover(getByText('Queued'));
+
+		expect(getByText(/plan is limited/)).toBeVisible();
+		expect(getByText('Upgrade now')).toBeVisible();
+
+		await userEvent.click(getByText('Upgrade now'));
+
+		expect(emitted().goToUpgrade).toHaveLength(1);
+	});
+});
diff --git a/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue
new file mode 100644
index 0000000000..666f9b7668
--- /dev/null
+++ b/packages/editor-ui/src/components/executions/global/GlobalExecutionsListItemQueuedTooltip.vue
@@ -0,0 +1,67 @@
+<script lang="ts" setup="">
+import type { ExecutionStatus } from 'n8n-workflow';
+import { useI18n } from '@/composables/useI18n';
+
+const props = defineProps<{
+	status: ExecutionStatus;
+	concurrencyCap: number;
+	isCloudDeployment?: boolean;
+}>();
+
+const emit = defineEmits<{
+	goToUpgrade: [];
+}>();
+
+const i18n = useI18n();
+</script>
+
+<template>
+	<N8nTooltip placement="top">
+		<template #content>
+			<i18n-t
+				v-if="props.status === 'waiting'"
+				keypath="executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely"
+			/>
+			<i18n-t
+				v-if="props.status === 'new'"
+				keypath="executionsList.statusTooltipText.waitingForConcurrencyCapacity"
+			>
+				<template #instance>
+					<i18n-t
+						v-if="props.isCloudDeployment"
+						keypath="executionsList.statusTooltipText.waitingForConcurrencyCapacity.cloud"
+					>
+						<template #concurrencyCap>{{ props.concurrencyCap }}</template>
+						<template #link>
+							<N8nLink bold size="small" :class="$style.link" @click="emit('goToUpgrade')">
+								{{ i18n.baseText('generic.upgradeNow') }}
+							</N8nLink>
+						</template>
+					</i18n-t>
+					<i18n-t
+						v-else
+						keypath="executionsList.statusTooltipText.waitingForConcurrencyCapacity.self"
+					>
+						<template #concurrencyCap>{{ props.concurrencyCap }}</template>
+						<template #link>
+							<N8nLink
+								:class="$style.link"
+								:href="i18n.baseText('executions.concurrency.docsLink')"
+								target="_blank"
+								>{{ i18n.baseText('generic.viewDocs') }}</N8nLink
+							>
+						</template>
+					</i18n-t>
+				</template>
+			</i18n-t>
+		</template>
+		<slot />
+	</N8nTooltip>
+</template>
+
+<style lang="scss" module>
+.link {
+	display: inline-block;
+	margin-top: var(--spacing-xs);
+}
+</style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
index 424c38aad8..40e4a2e79c 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
@@ -6,10 +6,12 @@ import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.ee.vue';
 import { createEventBus } from 'n8n-design-system';
 import VoteButtons from '@/components/executions/workflow/VoteButtons.vue';
 import { useToast } from '@/composables/useToast';
+import { useI18n } from '@/composables/useI18n';
 
 const executionsStore = useExecutionsStore();
 
 const { showError } = useToast();
+const i18n = useI18n();
 
 const tagsEventBus = createEventBus();
 const isTagsEditEnabled = ref(false);
@@ -100,7 +102,7 @@ const onTagsEditEsc = () => {
 	>
 		<div :class="$style.section">
 			<div :class="$style.vote">
-				<div>{{ $locale.baseText('generic.rating') }}</div>
+				<div>{{ i18n.baseText('generic.rating') }}</div>
 				<VoteButtons :vote="vote" @vote-click="onVoteClick" />
 			</div>
 			<span :class="$style.tags" data-test-id="annotation-tags-container">
@@ -110,7 +112,7 @@ const onTagsEditEsc = () => {
 					v-model="appliedTagIds"
 					:create-enabled="true"
 					:event-bus="tagsEventBus"
-					:placeholder="$locale.baseText('executionAnnotationView.chooseOrCreateATag')"
+					:placeholder="i18n.baseText('executionAnnotationView.chooseOrCreateATag')"
 					class="tags-edit"
 					data-test-id="workflow-tags-dropdown"
 					@blur="onTagsBlur"
@@ -122,7 +124,7 @@ const onTagsEditEsc = () => {
 						data-test-id="new-tag-link"
 						@click="onTagsEditEnable"
 					>
-						+ {{ $locale.baseText('executionAnnotationView.addTag') }}
+						+ {{ i18n.baseText('executionAnnotationView.addTag') }}
 					</span>
 				</div>
 
@@ -143,7 +145,7 @@ const onTagsEditEsc = () => {
 					<span :class="$style.addTagWrapper">
 						<n8n-button
 							:class="$style.addTag"
-							:label="`+ ` + $locale.baseText('executionAnnotationView.addTag')"
+							:label="`+ ` + i18n.baseText('executionAnnotationView.addTag')"
 							type="secondary"
 							size="mini"
 							:outline="false"
@@ -157,7 +159,7 @@ const onTagsEditEsc = () => {
 		<div :class="$style.section">
 			<div :class="$style.heading">
 				<n8n-heading tag="h3" size="small" color="text-dark">
-					{{ $locale.baseText('generic.annotationData') }}
+					{{ i18n.baseText('generic.annotationData') }}
 				</n8n-heading>
 			</div>
 			<div
@@ -179,7 +181,7 @@ const onTagsEditEsc = () => {
 			</div>
 			<div v-else :class="$style.noResultsContainer" data-test-id="execution-annotation-data-empty">
 				<n8n-text color="text-base" size="small" align="center">
-					<span v-n8n-html="$locale.baseText('executionAnnotationView.data.notFound')" />
+					<span v-n8n-html="i18n.baseText('executionAnnotationView.data.notFound')" />
 				</n8n-text>
 			</div>
 		</div>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
index ff6631ab21..4358584dba 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsCard.vue
@@ -182,7 +182,7 @@ function onRetryMenuItemSelect(action: string): void {
 @import '@/styles/variables';
 
 .WorkflowExecutionsCard {
-	--execution-list-item-background: var(--color-foreground-xlight);
+	--execution-list-item-background: var(--execution-card-background);
 	--execution-list-item-highlight-background: var(--color-warning-tint-1);
 
 	display: flex;
@@ -200,7 +200,7 @@ function onRetryMenuItemSelect(action: string): void {
 	&:hover,
 	&.active {
 		.executionLink {
-			--execution-list-item-background: var(--color-foreground-light);
+			--execution-list-item-background: var(--execution-card-background-hover);
 		}
 	}
 
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
index d58815ad88..0ea42bab9a 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsInfoAccordion.vue
@@ -26,6 +26,7 @@ const props = withDefaults(
 	},
 );
 
+const i18n = useI18n();
 const router = useRouter();
 const workflowHelpers = useWorkflowHelpers({ router });
 const locale = useI18n();
@@ -190,7 +191,7 @@ async function onSaveWorkflowClick(): Promise<void> {
 <template>
 	<N8nInfoAccordion
 		:class="[$style.accordion, 'mt-2xl']"
-		:title="$locale.baseText('executionsLandingPage.emptyState.accordion.title')"
+		:title="i18n.baseText('executionsLandingPage.emptyState.accordion.title')"
 		:items="accordionItems"
 		:initially-expanded="shouldExpandAccordion"
 		:header-icon="accordionIcon"
@@ -199,16 +200,14 @@ async function onSaveWorkflowClick(): Promise<void> {
 	>
 		<template #customContent>
 			<footer class="mt-2xs">
-				{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer') }}
+				{{ i18n.baseText('executionsLandingPage.emptyState.accordion.footer') }}
 				<N8nTooltip :disabled="!isNewWorkflow">
 					<template #content>
 						<div>
 							<N8nLink @click.prevent="onSaveWorkflowClick">{{
-								$locale.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipLink')
+								i18n.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipLink')
 							}}</N8nLink>
-							{{
-								$locale.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipText')
-							}}
+							{{ i18n.baseText('executionsLandingPage.emptyState.accordion.footer.tooltipText') }}
 						</div>
 					</template>
 					<N8nLink
@@ -216,7 +215,7 @@ async function onSaveWorkflowClick(): Promise<void> {
 						size="small"
 						@click.prevent="openWorkflowSettings"
 					>
-						{{ $locale.baseText('executionsLandingPage.emptyState.accordion.footer.settingsLink') }}
+						{{ i18n.baseText('executionsLandingPage.emptyState.accordion.footer.settingsLink') }}
 					</N8nLink>
 				</N8nTooltip>
 			</footer>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
index 530ca029dd..5aced98fcf 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsList.vue
@@ -129,4 +129,14 @@ onBeforeRouteLeave(async (to, _, next) => {
 .content {
 	flex: 1;
 }
+
+@include mixins.breakpoint('sm-and-down') {
+	.container {
+		flex-direction: column;
+	}
+
+	.content {
+		flex: 1 1 50%;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
index 98add737fe..e332203192 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsPreview.test.ts
@@ -50,6 +50,7 @@ const executionDataFactory = (): ExecutionSummaryWithScopes => ({
 	id: faker.string.uuid(),
 	finished: faker.datatype.boolean(),
 	mode: faker.helpers.arrayElement(['manual', 'trigger']),
+	createdAt: faker.date.past(),
 	startedAt: faker.date.past(),
 	stoppedAt: faker.date.past(),
 	workflowId: faker.number.int().toString(),
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 fec95888ee..1255320c40 100644
--- a/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/executions/workflow/WorkflowExecutionsSidebar.vue
@@ -12,6 +12,10 @@ import { useExecutionsStore } from '@/stores/executions.store';
 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';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 type AutoScrollDeps = { activeExecutionSet: boolean; cardsMounted: boolean; scroll: boolean };
 
@@ -32,8 +36,11 @@ const emit = defineEmits<{
 
 const route = useRoute();
 const router = useRouter();
+const i18n = useI18n();
 
 const executionsStore = useExecutionsStore();
+const settingsStore = useSettingsStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const mountedItems = ref<string[]>([]);
 const autoScrollDeps = ref<AutoScrollDeps>({
@@ -47,6 +54,17 @@ const executionListRef = ref<HTMLElement | null>(null);
 
 const workflowPermissions = computed(() => getResourcePermissions(props.workflow?.scopes).workflow);
 
+/**
+ * Calculate the number of executions counted towards the production executions concurrency limit.
+ * Evaluation executions are not counted towards this limit and the evaluation limit isn't shown in the UI.
+ */
+const runningExecutionsCount = computed(() => {
+	return props.executions.filter(
+		(execution) =>
+			execution.status === 'running' && ['webhook', 'trigger'].includes(execution.mode),
+	).length;
+});
+
 watch(
 	() => route,
 	(to: RouteLocationNormalizedLoaded, from: RouteLocationNormalizedLoaded) => {
@@ -160,6 +178,10 @@ function scrollToActiveCard(): void {
 		}
 	}
 }
+
+const goToUpgrade = () => {
+	void pageRedirectionHelper.goToUpgrade('concurrency', 'upgrade-concurrency');
+};
 </script>
 
 <template>
@@ -170,8 +192,16 @@ function scrollToActiveCard(): void {
 	>
 		<div :class="$style.heading">
 			<n8n-heading tag="h2" size="medium" color="text-dark">
-				{{ $locale.baseText('generic.executions') }}
+				{{ i18n.baseText('generic.executions') }}
 			</n8n-heading>
+
+			<ConcurrentExecutionsHeader
+				v-if="settingsStore.isConcurrencyEnabled"
+				:running-executions-count="runningExecutionsCount"
+				:concurrency-cap="settingsStore.concurrency"
+				:is-cloud-deployment="settingsStore.isCloudDeployment"
+				@go-to-upgrade="goToUpgrade"
+			/>
 		</div>
 		<div :class="$style.controls">
 			<el-checkbox
@@ -179,7 +209,7 @@ function scrollToActiveCard(): void {
 				data-test-id="auto-refresh-checkbox"
 				@update:model-value="onAutoRefreshChange"
 			>
-				{{ $locale.baseText('executionsList.autoRefresh') }}
+				{{ i18n.baseText('executionsList.autoRefresh') }}
 			</el-checkbox>
 			<ExecutionsFilter popover-placement="left-start" @filter-changed="onFilterChanged" />
 		</div>
@@ -198,7 +228,7 @@ function scrollToActiveCard(): void {
 				data-test-id="execution-list-empty"
 			>
 				<n8n-text color="text-base" size="medium" align="center">
-					{{ $locale.baseText('executionsLandingPage.noResults') }}
+					{{ i18n.baseText('executionsLandingPage.noResults') }}
 				</n8n-text>
 			</div>
 			<WorkflowExecutionsCard
@@ -242,6 +272,7 @@ function scrollToActiveCard(): void {
 	display: flex;
 	flex-direction: column;
 	overflow: hidden;
+	position: relative;
 }
 
 .heading {
@@ -291,9 +322,10 @@ function scrollToActiveCard(): void {
 	bottom: 0;
 	margin-left: calc(-1 * var(--spacing-l));
 	border-top: var(--border-base);
+	width: 100%;
 
 	& > div {
-		width: 309px;
+		width: 100%;
 		background-color: var(--color-background-light);
 		margin-top: 0 !important;
 	}
@@ -313,4 +345,9 @@ function scrollToActiveCard(): void {
 		border-radius: 0;
 	}
 }
+
+:deep(.el-checkbox) {
+	display: flex;
+	align-items: center;
+}
 </style>
diff --git a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
index 470d0b5fd4..af0329cbe2 100644
--- a/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
+++ b/packages/editor-ui/src/components/forms/ResourceFiltersDropdown.vue
@@ -1,98 +1,102 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script setup lang="ts">
+import { ref, computed, watch, onBeforeMount } from 'vue';
 import { EnterpriseEditionFeature } from '@/constants';
-import { mapStores } from 'pinia';
 import { useProjectsStore } from '@/stores/projects.store';
-import type { PropType } from 'vue';
 import type { ProjectSharingData } from '@/types/projects.types';
 import ProjectSharing from '@/components/Projects/ProjectSharing.vue';
+import type { IFilters } from '../layouts/ResourcesListLayout.vue';
+import { useI18n } from '@/composables/useI18n';
 
-export type IResourceFiltersType = Record<string, boolean | string | string[]>;
+type IResourceFiltersType = Record<string, boolean | string | string[]>;
 
-export default defineComponent({
-	components: {
-		ProjectSharing,
+const props = withDefaults(
+	defineProps<{
+		modelValue?: IResourceFiltersType;
+		keys?: string[];
+		shareable?: boolean;
+		reset?: () => void;
+	}>(),
+	{
+		modelValue: () => ({}),
+		keys: () => [],
+		shareable: true,
+		reset: () => {},
 	},
-	props: {
-		modelValue: {
-			type: Object as PropType<IResourceFiltersType>,
-			default: () => ({}),
-		},
-		keys: {
-			type: Array as PropType<string[]>,
-			default: () => [],
-		},
-		shareable: {
-			type: Boolean,
-			default: true,
-		},
-		reset: {
-			type: Function as PropType<() => void>,
-			default: () => {},
-		},
-	},
-	data() {
-		return {
-			EnterpriseEditionFeature,
-			selectedProject: null as ProjectSharingData | null,
-		};
-	},
-	computed: {
-		...mapStores(useProjectsStore),
-		filtersLength(): number {
-			let length = 0;
+);
 
-			this.keys.forEach((key) => {
-				if (key === 'search') {
-					return;
-				}
+const emit = defineEmits<{
+	'update:modelValue': [value: IFilters];
+	'update:filtersLength': [value: number];
+}>();
 
-				const value = this.modelValue[key];
-				length += (Array.isArray(value) ? value.length > 0 : value !== '') ? 1 : 0;
-			});
+const selectedProject = ref<ProjectSharingData | null>(null);
 
-			return length;
-		},
-		hasFilters(): boolean {
-			return this.filtersLength > 0;
-		},
-	},
-	watch: {
-		filtersLength(value: number) {
-			this.$emit('update:filtersLength', value);
-		},
-	},
-	async beforeMount() {
-		await this.projectsStore.getAvailableProjects();
-		this.selectedProject =
-			this.projectsStore.availableProjects.find(
-				(project) => project.id === this.modelValue.homeProject,
-			) ?? null;
-	},
-	methods: {
-		setKeyValue(key: string, value: unknown) {
-			const filters = {
-				...this.modelValue,
-				[key]: value,
-			};
+const projectsStore = useProjectsStore();
 
-			this.$emit('update:modelValue', filters);
-		},
-		resetFilters() {
-			if (this.reset) {
-				this.reset();
-			} else {
-				const filters = { ...this.modelValue };
+const i18n = useI18n();
 
-				this.keys.forEach((key) => {
-					filters[key] = Array.isArray(this.modelValue[key]) ? [] : '';
-				});
+const filtersLength = computed(() => {
+	let length = 0;
 
-				this.$emit('update:modelValue', filters);
-			}
-			this.selectedProject = null;
-		},
-	},
+	props.keys.forEach((key) => {
+		if (key === 'search') {
+			return;
+		}
+
+		const value = props.modelValue[key];
+
+		if (value === true) {
+			length += 1;
+		}
+
+		if (Array.isArray(value) && value.length) {
+			length += 1;
+		}
+
+		if (typeof value === 'string' && value !== '') {
+			length += 1;
+		}
+	});
+
+	return length;
+});
+
+const hasFilters = computed(() => filtersLength.value > 0);
+
+const setKeyValue = (key: string, value: unknown) => {
+	const filters = {
+		...props.modelValue,
+		[key]: value,
+	} as IFilters;
+
+	emit('update:modelValue', filters);
+};
+
+const resetFilters = () => {
+	if (props.reset) {
+		props.reset();
+	} else {
+		const filters = { ...props.modelValue } as IFilters;
+
+		props.keys.forEach((key) => {
+			filters[key] = Array.isArray(props.modelValue[key]) ? [] : '';
+		});
+
+		emit('update:modelValue', filters);
+	}
+	selectedProject.value = null;
+};
+
+watch(filtersLength, (value) => {
+	emit('update:filtersLength', value);
+});
+
+onBeforeMount(async () => {
+	await projectsStore.getAvailableProjects();
+	selectedProject.value =
+		projectsStore.availableProjects.find(
+			(project) => project.id === props.modelValue.homeProject,
+		) ?? null;
 });
 </script>
 
@@ -106,10 +110,16 @@ export default defineComponent({
 				:class="$style['filter-button']"
 				data-test-id="resources-list-filters-trigger"
 			>
-				<n8n-badge v-show="filtersLength > 0" theme="primary" class="mr-4xs">
+				<n8n-badge
+					v-show="filtersLength > 0"
+					:class="$style['filter-button-count']"
+					theme="primary"
+				>
 					{{ filtersLength }}
 				</n8n-badge>
-				{{ $locale.baseText('forms.resourceFiltersDropdown.filters') }}
+				<span :class="$style['filter-button-text']">
+					{{ i18n.baseText('forms.resourceFiltersDropdown.filters') }}
+				</span>
 			</n8n-button>
 		</template>
 		<div :class="$style['filters-dropdown']" data-test-id="resources-list-filters-dropdown">
@@ -119,7 +129,7 @@ export default defineComponent({
 				:features="[EnterpriseEditionFeature.Sharing]"
 			>
 				<n8n-input-label
-					:label="$locale.baseText('forms.resourceFiltersDropdown.owner')"
+					:label="i18n.baseText('forms.resourceFiltersDropdown.owner')"
 					:bold="false"
 					size="small"
 					color="text-base"
@@ -128,14 +138,14 @@ export default defineComponent({
 				<ProjectSharing
 					v-model="selectedProject"
 					:projects="projectsStore.availableProjects"
-					:placeholder="$locale.baseText('forms.resourceFiltersDropdown.owner.placeholder')"
-					:empty-options-text="$locale.baseText('projects.sharing.noMatchingProjects')"
+					:placeholder="i18n.baseText('forms.resourceFiltersDropdown.owner.placeholder')"
+					:empty-options-text="i18n.baseText('projects.sharing.noMatchingProjects')"
 					@update:model-value="setKeyValue('homeProject', ($event as ProjectSharingData).id)"
 				/>
 			</enterprise-edition>
 			<div v-if="hasFilters" :class="[$style['filters-dropdown-footer'], 'mt-s']">
 				<n8n-link @click="resetFilters">
-					{{ $locale.baseText('forms.resourceFiltersDropdown.reset') }}
+					{{ i18n.baseText('forms.resourceFiltersDropdown.reset') }}
 				</n8n-link>
 			</div>
 		</div>
@@ -146,6 +156,25 @@ export default defineComponent({
 .filter-button {
 	height: 40px;
 	align-items: center;
+
+	.filter-button-count {
+		margin-right: var(--spacing-4xs);
+
+		@include mixins.breakpoint('xs-only') {
+			margin-right: 0;
+		}
+	}
+
+	@media screen and (max-width: 480px) {
+		.filter-button-text {
+			text-indent: -10000px;
+		}
+
+		// Remove icon margin when the "Filters" text is hidden
+		:global(span + span) {
+			margin: 0;
+		}
+	}
 }
 
 .filters-dropdown {
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayout.vue b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
index abb1ba02a0..6ab16365c9 100644
--- a/packages/editor-ui/src/components/layouts/PageViewLayout.vue
+++ b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
@@ -1,21 +1,3 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui.store';
-
-export default defineComponent({
-	name: 'PageViewLayout',
-	data() {
-		return {
-			loading: false,
-		};
-	},
-	computed: {
-		...mapStores(useUIStore),
-	},
-});
-</script>
-
 <template>
 	<div :class="$style.wrapper">
 		<slot name="header" />
@@ -27,14 +9,18 @@ export default defineComponent({
 
 <style lang="scss" module>
 .wrapper {
-	display: grid;
+	display: flex;
+	flex-direction: column;
 	height: 100%;
 	width: 100%;
-	max-width: 1280px;
-	grid-template-rows: auto 1fr;
+	max-width: var(--content-container-width);
 	box-sizing: border-box;
 	align-content: start;
 	padding: var(--spacing-l) var(--spacing-2xl) 0;
+
+	@include mixins.breakpoint('sm-and-down') {
+		padding: var(--spacing-s) var(--spacing-s) 0;
+	}
 }
 
 .content {
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue b/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue
index 263a5b4cab..b46f58d284 100644
--- a/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue
+++ b/packages/editor-ui/src/components/layouts/PageViewLayoutList.vue
@@ -1,13 +1,10 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+interface Props {
+	overflow: boolean;
+}
 
-export default defineComponent({
-	props: {
-		overflow: {
-			type: Boolean,
-			default: false,
-		},
-	},
+withDefaults(defineProps<Props>(), {
+	overflow: false,
 });
 </script>
 
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.test.ts b/packages/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
index b7130c0c9a..327e003bf1 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.test.ts
@@ -1,8 +1,15 @@
-import { setActivePinia, createPinia } from 'pinia';
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
 import { createComponentRenderer } from '@/__tests__/render';
 import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
 import type router from 'vue-router';
 
+vi.mock('@/composables/useGlobalEntityCreation', () => ({
+	useGlobalEntityCreation: () => ({
+		menu: [],
+	}),
+}));
+
 vi.mock('vue-router', async (importOriginal) => {
 	const { RouterLink } = await importOriginal<typeof router>();
 	return {
@@ -18,7 +25,8 @@ const renderComponent = createComponentRenderer(ResourcesListLayout);
 
 describe('ResourcesListLayout', () => {
 	beforeEach(() => {
-		setActivePinia(createPinia());
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
 	});
 
 	it('should render loading skeleton', () => {
diff --git a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
index 74f3c7d7d3..221b2127d6 100644
--- a/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
+++ b/packages/editor-ui/src/components/layouts/ResourcesListLayout.vue
@@ -1,8 +1,7 @@
-<script lang="ts">
-import { computed, defineComponent, nextTick, ref, onMounted, watch } from 'vue';
-import type { PropType } from 'vue';
+<script lang="ts" setup>
+import { computed, nextTick, ref, onMounted, watch } from 'vue';
 
-import type { ProjectSharingData } from '@/types/projects.types';
+import { type ProjectSharingData } from '@/types/projects.types';
 import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import ResourceFiltersDropdown from '@/components/forms/ResourceFiltersDropdown.vue';
@@ -13,7 +12,6 @@ import { useDebounce } from '@/composables/useDebounce';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useRoute } from 'vue-router';
 
-// eslint-disable-next-line unused-imports/no-unused-imports, @typescript-eslint/no-unused-vars
 import type { BaseTextKey } from '@/plugins/i18n';
 import type { Scope } from '@n8n/permissions';
 
@@ -30,346 +28,318 @@ export type IResource = {
 	sharedWithProjects?: ProjectSharingData[];
 };
 
-interface IFilters {
+export interface IFilters {
 	search: string;
 	homeProject: string;
 	[key: string]: boolean | string | string[];
 }
 
-type IResourceKeyType = 'credentials' | 'workflows';
+type IResourceKeyType = 'credentials' | 'workflows' | 'variables';
 
-export default defineComponent({
-	name: 'ResourcesListLayout',
-	components: {
-		PageViewLayout,
-		PageViewLayoutList,
-		ResourceFiltersDropdown,
+const props = withDefaults(
+	defineProps<{
+		resourceKey: IResourceKeyType;
+		displayName?: (resource: IResource) => string;
+		resources: IResource[];
+		disabled: boolean;
+		initialize: () => Promise<void>;
+		filters?: IFilters;
+		additionalFiltersHandler?: (
+			resource: IResource,
+			filters: IFilters,
+			matches: boolean,
+		) => boolean;
+		shareable?: boolean;
+		showFiltersDropdown?: boolean;
+		sortFns?: Record<string, (a: IResource, b: IResource) => number>;
+		sortOptions?: string[];
+		type?: 'datatable' | 'list';
+		typeProps: { itemSize: number } | { columns: DatatableColumn[] };
+		loading: boolean;
+	}>(),
+	{
+		displayName: (resource: IResource) => resource.name,
+		initialize: async () => {},
+		filters: () => ({ search: '', homeProject: '' }),
+		sortFns: () => ({}),
+		sortOptions: () => ['lastUpdated', 'lastCreated', 'nameAsc', 'nameDesc'],
+		type: 'list',
+		typeProps: () => ({ itemSize: 80 }),
+		loading: true,
+		additionalFiltersHandler: undefined,
+		showFiltersDropdown: true,
+		shareable: true,
 	},
-	props: {
-		resourceKey: {
-			type: String,
-			default: '' as IResourceKeyType,
-		},
-		displayName: {
-			type: Function as PropType<(resource: IResource) => string>,
-			default: (resource: IResource) => resource.name,
-		},
-		resources: {
-			type: Array as PropType<IResource[]>,
-			default: (): IResource[] => [],
-		},
-		disabled: {
-			type: Boolean,
-			default: false,
-		},
-		initialize: {
-			type: Function as PropType<() => Promise<void>>,
-			default: () => async () => {},
-		},
-		filters: {
-			type: Object,
-			default: (): IFilters => ({ search: '', homeProject: '' }),
-		},
-		additionalFiltersHandler: {
-			type: Function,
-			required: false,
-			default: undefined,
-		},
-		shareable: {
-			type: Boolean,
-			default: true,
-		},
-		showFiltersDropdown: {
-			type: Boolean,
-			default: true,
-		},
-		sortFns: {
-			type: Object as PropType<Record<string, (a: IResource, b: IResource) => number>>,
-			default: (): Record<string, (a: IResource, b: IResource) => number> => ({}),
-		},
-		sortOptions: {
-			type: Array as PropType<string[]>,
-			default: () => ['lastUpdated', 'lastCreated', 'nameAsc', 'nameDesc'],
-		},
-		type: {
-			type: String as PropType<'datatable' | 'list'>,
-			default: 'list',
-		},
-		typeProps: {
-			type: Object as PropType<{ itemSize: number } | { columns: DatatableColumn[] }>,
-			default: () => ({
-				itemSize: 80,
-			}),
-		},
-		loading: {
-			type: Boolean,
-			required: false,
-			default: true,
-		},
+);
+
+const emit = defineEmits<{
+	'update:filters': [value: IFilters];
+	'click:add': [event: Event];
+	sort: [value: string];
+}>();
+
+defineSlots<{
+	header(): unknown;
+	empty(): unknown;
+	preamble(): unknown;
+	postamble(): unknown;
+	'add-button'(): unknown;
+	callout(): unknown;
+	filters(props: {
+		filters: Record<string, boolean | string | string[]>;
+		setKeyValue: (key: string, value: unknown) => void;
+	}): unknown;
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	default(props: { data: any; updateItemSize: (data: any) => void }): unknown;
+}>();
+
+const route = useRoute();
+const i18n = useI18n();
+const { callDebounced } = useDebounce();
+const usersStore = useUsersStore();
+const telemetry = useTelemetry();
+
+const sortBy = ref(props.sortOptions[0]);
+const hasFilters = ref(false);
+const filtersModel = ref(props.filters);
+const currentPage = ref(1);
+const rowsPerPage = ref<number>(10);
+const resettingFilters = ref(false);
+const search = ref<HTMLElement | null>(null);
+
+//computed
+
+const filterKeys = computed(() => {
+	return Object.keys(filtersModel.value);
+});
+
+const filteredAndSortedResources = computed(() => {
+	const filtered = props.resources.filter((resource) => {
+		let matches = true;
+
+		if (filtersModel.value.homeProject) {
+			matches =
+				matches &&
+				!!(resource.homeProject && resource.homeProject.id === filtersModel.value.homeProject);
+		}
+
+		if (filtersModel.value.search) {
+			const searchString = filtersModel.value.search.toLowerCase();
+			matches = matches && props.displayName(resource).toLowerCase().includes(searchString);
+		}
+
+		if (props.additionalFiltersHandler) {
+			matches = props.additionalFiltersHandler(resource, filtersModel.value, matches);
+		}
+
+		return matches;
+	});
+
+	return filtered.sort((a, b) => {
+		switch (sortBy.value) {
+			case 'lastUpdated':
+				return props.sortFns.lastUpdated
+					? props.sortFns.lastUpdated(a, b)
+					: new Date(b.updatedAt ?? '').valueOf() - new Date(a.updatedAt ?? '').valueOf();
+			case 'lastCreated':
+				return props.sortFns.lastCreated
+					? props.sortFns.lastCreated(a, b)
+					: new Date(b.createdAt ?? '').valueOf() - new Date(a.createdAt ?? '').valueOf();
+			case 'nameAsc':
+				return props.sortFns.nameAsc
+					? props.sortFns.nameAsc(a, b)
+					: props.displayName(a).trim().localeCompare(props.displayName(b).trim());
+			case 'nameDesc':
+				return props.sortFns.nameDesc
+					? props.sortFns.nameDesc(a, b)
+					: props.displayName(b).trim().localeCompare(props.displayName(a).trim());
+			default:
+				return props.sortFns[sortBy.value] ? props.sortFns[sortBy.value](a, b) : 0;
+		}
+	});
+});
+
+//methods
+
+const focusSearchInput = () => {
+	if (search.value) {
+		search.value.focus();
+	}
+};
+
+const hasAppliedFilters = (): boolean => {
+	return !!filterKeys.value.find((key) => {
+		if (key === 'search') return false;
+
+		if (typeof props.filters[key] === 'boolean') {
+			return props.filters[key];
+		}
+
+		if (Array.isArray(props.filters[key])) {
+			return props.filters[key].length > 0;
+		}
+
+		return props.filters[key] !== '';
+	});
+};
+
+const setRowsPerPage = (numberOfRowsPerPage: number) => {
+	rowsPerPage.value = numberOfRowsPerPage;
+};
+
+const setCurrentPage = (page: number) => {
+	currentPage.value = page;
+};
+
+defineExpose({
+	currentPage,
+	setCurrentPage,
+});
+
+const sendFiltersTelemetry = (source: string) => {
+	// Prevent sending multiple telemetry events when resetting filters
+	// Timeout is required to wait for search debounce to be over
+	if (resettingFilters.value) {
+		if (source !== 'reset') {
+			return;
+		}
+
+		setTimeout(() => (resettingFilters.value = false), 1500);
+	}
+
+	const filters = filtersModel.value as Record<string, string[] | string | boolean>;
+	const filtersSet: string[] = [];
+	const filterValues: Array<string[] | string | boolean | null> = [];
+
+	Object.keys(filters).forEach((key) => {
+		if (filters[key]) {
+			filtersSet.push(key);
+			filterValues.push(key === 'search' ? null : filters[key]);
+		}
+	});
+
+	telemetry.track(`User set filters in ${props.resourceKey} list`, {
+		filters_set: filtersSet,
+		filter_values: filterValues,
+		[`${props.resourceKey}_total_in_view`]: props.resources.length,
+		[`${props.resourceKey}_after_filtering`]: filteredAndSortedResources.value.length,
+	});
+};
+
+const onAddButtonClick = (e: Event) => {
+	emit('click:add', e);
+};
+
+const onUpdateFilters = (e: IFilters) => {
+	emit('update:filters', e);
+};
+
+const resetFilters = () => {
+	Object.keys(filtersModel.value).forEach((key) => {
+		filtersModel.value[key] = Array.isArray(filtersModel.value[key]) ? [] : '';
+	});
+
+	resettingFilters.value = true;
+	sendFiltersTelemetry('reset');
+	emit('update:filters', filtersModel.value);
+};
+
+const itemSize = () => {
+	if ('itemSize' in props.typeProps) {
+		return props.typeProps.itemSize;
+	}
+	return 0;
+};
+
+const getColumns = () => {
+	if ('columns' in props.typeProps) {
+		return props.typeProps.columns;
+	}
+	return {};
+};
+
+const sendSortingTelemetry = () => {
+	telemetry.track(`User changed sorting in ${props.resourceKey} list`, {
+		sorting: sortBy.value,
+	});
+};
+
+const onUpdateFiltersLength = (length: number) => {
+	hasFilters.value = length > 0;
+};
+
+const onSearch = (s: string) => {
+	filtersModel.value.search = s;
+	emit('update:filters', filtersModel.value);
+};
+
+//watchers
+
+watch(
+	() => props.filters,
+	(value) => {
+		filtersModel.value = value;
 	},
-	emits: ['update:filters', 'click:add', 'sort'],
-	setup(props, { emit }) {
-		const route = useRoute();
-		const i18n = useI18n();
-		const { callDebounced } = useDebounce();
-		const usersStore = useUsersStore();
-		const telemetry = useTelemetry();
+);
 
-		const sortBy = ref(props.sortOptions[0]);
-		const hasFilters = ref(false);
-		const filtersModel = ref(props.filters);
-		const currentPage = ref(1);
-		const rowsPerPage = ref<number>(10);
-		const resettingFilters = ref(false);
-		const search = ref<HTMLElement | null>(null);
-
-		//computed
-
-		const filterKeys = computed(() => {
-			return Object.keys(filtersModel.value);
-		});
-
-		const filteredAndSortedResources = computed(() => {
-			const filtered = props.resources.filter((resource) => {
-				let matches = true;
-
-				if (filtersModel.value.homeProject) {
-					matches =
-						matches &&
-						!!(resource.homeProject && resource.homeProject.id === filtersModel.value.homeProject);
-				}
-
-				if (filtersModel.value.search) {
-					const searchString = filtersModel.value.search.toLowerCase();
-					matches = matches && props.displayName(resource).toLowerCase().includes(searchString);
-				}
-
-				if (props.additionalFiltersHandler) {
-					matches = props.additionalFiltersHandler(resource, filtersModel.value, matches);
-				}
-
-				return matches;
-			});
-
-			return filtered.sort((a, b) => {
-				switch (sortBy.value) {
-					case 'lastUpdated':
-						return props.sortFns.lastUpdated
-							? props.sortFns.lastUpdated(a, b)
-							: new Date(b.updatedAt ?? '').valueOf() - new Date(a.updatedAt ?? '').valueOf();
-					case 'lastCreated':
-						return props.sortFns.lastCreated
-							? props.sortFns.lastCreated(a, b)
-							: new Date(b.createdAt ?? '').valueOf() - new Date(a.createdAt ?? '').valueOf();
-					case 'nameAsc':
-						return props.sortFns.nameAsc
-							? props.sortFns.nameAsc(a, b)
-							: props.displayName(a).trim().localeCompare(props.displayName(b).trim());
-					case 'nameDesc':
-						return props.sortFns.nameDesc
-							? props.sortFns.nameDesc(a, b)
-							: props.displayName(b).trim().localeCompare(props.displayName(a).trim());
-					default:
-						return props.sortFns[sortBy.value] ? props.sortFns[sortBy.value](a, b) : 0;
-				}
-			});
-		});
-
-		//methods
-
-		const focusSearchInput = () => {
-			if (search.value) {
-				search.value.focus();
-			}
-		};
-
-		const hasAppliedFilters = (): boolean => {
-			return !!filterKeys.value.find(
-				(key) =>
-					key !== 'search' &&
-					(Array.isArray(props.filters[key])
-						? props.filters[key].length > 0
-						: props.filters[key] !== ''),
-			);
-		};
-
-		const setRowsPerPage = (numberOfRowsPerPage: number) => {
-			rowsPerPage.value = numberOfRowsPerPage;
-		};
-
-		const setCurrentPage = (page: number) => {
-			currentPage.value = page;
-		};
-
-		const sendFiltersTelemetry = (source: string) => {
-			// Prevent sending multiple telemetry events when resetting filters
-			// Timeout is required to wait for search debounce to be over
-			if (resettingFilters.value) {
-				if (source !== 'reset') {
-					return;
-				}
-
-				setTimeout(() => (resettingFilters.value = false), 1500);
-			}
-
-			const filters = filtersModel.value as Record<string, string[] | string | boolean>;
-			const filtersSet: string[] = [];
-			const filterValues: Array<string[] | string | boolean | null> = [];
-
-			Object.keys(filters).forEach((key) => {
-				if (filters[key]) {
-					filtersSet.push(key);
-					filterValues.push(key === 'search' ? null : filters[key]);
-				}
-			});
-
-			telemetry.track(`User set filters in ${props.resourceKey} list`, {
-				filters_set: filtersSet,
-				filter_values: filterValues,
-				[`${props.resourceKey}_total_in_view`]: props.resources.length,
-				[`${props.resourceKey}_after_filtering`]: filteredAndSortedResources.value.length,
-			});
-		};
-
-		const onAddButtonClick = (e: Event) => {
-			emit('click:add', e);
-		};
-
-		const onUpdateFilters = (e: Event) => {
-			emit('update:filters', e);
-		};
-
-		const resetFilters = () => {
-			Object.keys(filtersModel.value).forEach((key) => {
-				filtersModel.value[key] = Array.isArray(filtersModel.value[key]) ? [] : '';
-			});
-
-			resettingFilters.value = true;
-			sendFiltersTelemetry('reset');
-			emit('update:filters', filtersModel.value);
-		};
-
-		const itemSize = () => {
-			if ('itemSize' in props.typeProps) {
-				return props.typeProps.itemSize;
-			}
-			return 0;
-		};
-
-		const getColumns = () => {
-			if ('columns' in props.typeProps) {
-				return props.typeProps.columns;
-			}
-			return {};
-		};
-
-		const sendSortingTelemetry = () => {
-			telemetry.track(`User changed sorting in ${props.resourceKey} list`, {
-				sorting: sortBy.value,
-			});
-		};
-
-		const onUpdateFiltersLength = (length: number) => {
-			hasFilters.value = length > 0;
-		};
-
-		const onSearch = (s: string) => {
-			filtersModel.value.search = s;
-			emit('update:filters', filtersModel.value);
-		};
-
-		//watchers
-
-		watch(
-			() => props.filters,
-			(value) => {
-				filtersModel.value = value;
-			},
-		);
-
-		watch(
-			() => filtersModel.value.homeProject,
-			() => {
-				sendFiltersTelemetry('homeProject');
-			},
-		);
-
-		watch(
-			() => filtersModel.value.tags,
-			() => {
-				sendFiltersTelemetry('tags');
-			},
-		);
-
-		watch(
-			() => filtersModel.value.type,
-			() => {
-				sendFiltersTelemetry('type');
-			},
-		);
-
-		watch(
-			() => filtersModel.value.search,
-			() => callDebounced(sendFiltersTelemetry, { debounceTime: 1000, trailing: true }, 'search'),
-		);
-
-		watch(
-			() => sortBy.value,
-			(newValue) => {
-				emit('sort', newValue);
-				sendSortingTelemetry();
-			},
-		);
-
-		watch(
-			() => route?.params?.projectId,
-			() => {
-				resetFilters();
-			},
-		);
-
-		onMounted(async () => {
-			await props.initialize();
-			await nextTick();
-
-			focusSearchInput();
-
-			if (hasAppliedFilters()) {
-				hasFilters.value = true;
-			}
-		});
-
-		return {
-			i18n,
-			search,
-			usersStore,
-			filterKeys,
-			currentPage,
-			rowsPerPage,
-			filteredAndSortedResources,
-			hasFilters,
-			sortBy,
-			resettingFilters,
-			filtersModel,
-			sendFiltersTelemetry,
-			getColumns,
-			itemSize,
-			onAddButtonClick,
-			onUpdateFiltersLength,
-			onUpdateFilters,
-			resetFilters,
-			callDebounced,
-			setCurrentPage,
-			setRowsPerPage,
-			onSearch,
-		};
+watch(
+	() => filtersModel.value.homeProject,
+	() => {
+		sendFiltersTelemetry('homeProject');
 	},
+);
+
+watch(
+	() => filtersModel.value.tags,
+	() => {
+		sendFiltersTelemetry('tags');
+	},
+);
+
+watch(
+	() => filtersModel.value.type,
+	() => {
+		sendFiltersTelemetry('type');
+	},
+);
+
+watch(
+	() => filtersModel.value.search,
+	() => callDebounced(sendFiltersTelemetry, { debounceTime: 1000, trailing: true }, 'search'),
+);
+
+watch(
+	() => sortBy.value,
+	(newValue) => {
+		emit('sort', newValue);
+		sendSortingTelemetry();
+	},
+);
+
+watch(
+	() => route?.params?.projectId,
+	() => {
+		resetFilters();
+	},
+);
+
+onMounted(async () => {
+	await props.initialize();
+	await nextTick();
+
+	focusSearchInput();
+
+	if (hasAppliedFilters()) {
+		hasFilters.value = true;
+	}
 });
 </script>
 
 <template>
 	<PageViewLayout>
-		<template #header> <slot name="header" /> </template>
+		<template #header>
+			<slot name="header" />
+		</template>
 		<div v-if="loading" class="resource-list-loading">
 			<n8n-loading :rows="25" :shrink-last="false" />
 		</div>
@@ -443,16 +413,7 @@ export default defineComponent({
 								</n8n-select>
 							</div>
 						</div>
-						<slot name="add-button" :disabled="disabled">
-							<n8n-button
-								size="large"
-								:disabled="disabled"
-								data-test-id="resources-list-add"
-								@click="onAddButtonClick"
-							>
-								{{ i18n.baseText(`${resourceKey}.add` as BaseTextKey) }}
-							</n8n-button>
-						</slot>
+						<slot name="add-button"></slot>
 					</div>
 
 					<slot name="callout"></slot>
@@ -520,6 +481,7 @@ export default defineComponent({
 	flex-direction: row;
 	align-items: center;
 	justify-content: space-between;
+	width: 100%;
 }
 
 .filters {
@@ -528,10 +490,24 @@ export default defineComponent({
 	grid-auto-columns: max-content;
 	gap: var(--spacing-2xs);
 	align-items: center;
+	width: 100%;
+
+	@include mixins.breakpoint('xs-only') {
+		grid-template-columns: 1fr auto;
+		grid-auto-flow: row;
+
+		> *:last-child {
+			grid-column: auto;
+		}
+	}
 }
 
 .search {
 	max-width: 240px;
+
+	@include mixins.breakpoint('sm-and-down') {
+		max-width: 100%;
+	}
 }
 
 .listWrapper {
@@ -542,6 +518,10 @@ export default defineComponent({
 
 .sort-and-filter {
 	white-space: nowrap;
+
+	@include mixins.breakpoint('sm-and-down') {
+		width: 100%;
+	}
 }
 
 .datatable {
diff --git a/packages/editor-ui/src/composables/__snapshots__/useBugReporting.spec.ts.snap b/packages/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/composables/__snapshots__/useBugReporting.spec.ts.snap
rename to packages/editor-ui/src/composables/__snapshots__/useBugReporting.test.ts.snap
diff --git a/packages/editor-ui/src/composables/__tests__/__snapshots__/useCanvasOperations.spec.ts.snap b/packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
similarity index 91%
rename from packages/editor-ui/src/composables/__tests__/__snapshots__/useCanvasOperations.spec.ts.snap
rename to packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
index 079a5d2f51..821da444d4 100644
--- a/packages/editor-ui/src/composables/__tests__/__snapshots__/useCanvasOperations.spec.ts.snap
+++ b/packages/editor-ui/src/composables/__snapshots__/useCanvasOperations.test.ts.snap
@@ -29,7 +29,10 @@ exports[`useCanvasOperations > copyNodes > should copy nodes 1`] = `
     }
   ],
   "connections": {},
-  "pinData": {}
+  "pinData": {},
+  "meta": {
+    "instanceId": ""
+  }
 }",
   ],
 ]
@@ -64,7 +67,10 @@ exports[`useCanvasOperations > cutNodes > should copy and delete nodes 1`] = `
     }
   ],
   "connections": {},
-  "pinData": {}
+  "pinData": {},
+  "meta": {
+    "instanceId": ""
+  }
 }",
   ],
 ]
diff --git a/packages/editor-ui/src/composables/__tests__/__snapshots__/useContextMenu.test.ts.snap b/packages/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/__snapshots__/useContextMenu.test.ts.snap
rename to packages/editor-ui/src/composables/__snapshots__/useContextMenu.test.ts.snap
diff --git a/packages/editor-ui/src/composables/__snapshots__/useDebugInfo.spec.ts.snap b/packages/editor-ui/src/composables/__snapshots__/useDebugInfo.test.ts.snap
similarity index 100%
rename from packages/editor-ui/src/composables/__snapshots__/useDebugInfo.spec.ts.snap
rename to packages/editor-ui/src/composables/__snapshots__/useDebugInfo.test.ts.snap
diff --git a/packages/editor-ui/src/composables/__tests__/usePushConnection.spec.ts b/packages/editor-ui/src/composables/__tests__/usePushConnection.spec.ts
deleted file mode 100644
index c21fc76702..0000000000
--- a/packages/editor-ui/src/composables/__tests__/usePushConnection.spec.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-import { useRouter } from 'vue-router';
-import { createPinia, setActivePinia } from 'pinia';
-import type { PushMessage, PushPayload } from '@n8n/api-types';
-
-import { usePushConnection } from '@/composables/usePushConnection';
-import { usePushConnectionStore } from '@/stores/pushConnection.store';
-import { useOrchestrationStore } from '@/stores/orchestration.store';
-
-vi.mock('vue-router', () => {
-	return {
-		RouterLink: vi.fn(),
-		useRouter: () => ({
-			push: vi.fn(),
-		}),
-		useRoute: () => ({}),
-	};
-});
-
-vi.useFakeTimers();
-
-describe('usePushConnection()', () => {
-	let router: ReturnType<typeof useRouter>;
-	let pushStore: ReturnType<typeof usePushConnectionStore>;
-	let orchestrationStore: ReturnType<typeof useOrchestrationStore>;
-	let pushConnection: ReturnType<typeof usePushConnection>;
-
-	beforeEach(() => {
-		setActivePinia(createPinia());
-
-		router = vi.mocked(useRouter)();
-		pushStore = usePushConnectionStore();
-		orchestrationStore = useOrchestrationStore();
-		pushConnection = usePushConnection({ router });
-	});
-
-	describe('initialize()', () => {
-		it('should add event listener to the pushStore', () => {
-			const spy = vi.spyOn(pushStore, 'addEventListener').mockImplementation(() => () => {});
-
-			pushConnection.initialize();
-
-			expect(spy).toHaveBeenCalled();
-		});
-	});
-
-	describe('terminate()', () => {
-		it('should remove event listener from the pushStore', () => {
-			const returnFn = vi.fn();
-			vi.spyOn(pushStore, 'addEventListener').mockImplementation(() => returnFn);
-
-			pushConnection.initialize();
-			pushConnection.terminate();
-
-			expect(returnFn).toHaveBeenCalled();
-		});
-	});
-
-	describe('queuePushMessage()', () => {
-		it('should add message to the queue and sets timeout if not already set', () => {
-			const event: PushMessage = {
-				type: 'sendWorkerStatusMessage',
-				data: {
-					workerId: '1',
-					status: {} as PushPayload<'sendWorkerStatusMessage'>['status'],
-				},
-			};
-
-			pushConnection.queuePushMessage(event, 5);
-
-			expect(pushConnection.pushMessageQueue.value).toHaveLength(1);
-			expect(pushConnection.pushMessageQueue.value[0]).toEqual({ message: event, retriesLeft: 5 });
-			expect(pushConnection.retryTimeout.value).not.toBeNull();
-		});
-	});
-
-	describe('processWaitingPushMessages()', () => {
-		it('should clear the queue and reset the timeout', async () => {
-			const event: PushMessage = { type: 'executionRecovered', data: { executionId: '1' } };
-
-			pushConnection.queuePushMessage(event, 0);
-			expect(pushConnection.pushMessageQueue.value).toHaveLength(1);
-			expect(pushConnection.retryTimeout.value).toBeDefined();
-
-			await pushConnection.processWaitingPushMessages();
-
-			expect(pushConnection.pushMessageQueue.value).toHaveLength(0);
-			expect(pushConnection.retryTimeout.value).toBeNull();
-		});
-	});
-
-	describe('pushMessageReceived()', () => {
-		describe('sendWorkerStatusMessage', () => {
-			it('should handle event type correctly', async () => {
-				const spy = vi.spyOn(orchestrationStore, 'updateWorkerStatus').mockImplementation(() => {});
-				const event: PushMessage = {
-					type: 'sendWorkerStatusMessage',
-					data: {
-						workerId: '1',
-						status: {} as PushPayload<'sendWorkerStatusMessage'>['status'],
-					},
-				};
-
-				const result = await pushConnection.pushMessageReceived(event);
-
-				expect(spy).toHaveBeenCalledWith(event.data.status);
-				expect(result).toBeTruthy();
-			});
-		});
-	});
-});
diff --git a/packages/editor-ui/src/composables/__tests__/useAIAssistantHelpers.test.ts b/packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts
similarity index 74%
rename from packages/editor-ui/src/composables/__tests__/useAIAssistantHelpers.test.ts
rename to packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts
index d04733336e..7d0ac11398 100644
--- a/packages/editor-ui/src/composables/__tests__/useAIAssistantHelpers.test.ts
+++ b/packages/editor-ui/src/composables/useAIAssistantHelpers.test.ts
@@ -1,8 +1,9 @@
 import { describe, it, expect } from 'vitest';
-import type { INode } from 'n8n-workflow';
-import { useAIAssistantHelpers } from '../useAIAssistantHelpers';
+import type { INode, IRunExecutionData, NodeConnectionType } from 'n8n-workflow';
+import { useAIAssistantHelpers } from './useAIAssistantHelpers';
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
+import type { IWorkflowDb } from '@/Interface';
 
 const referencedNodesTestCases: Array<{ caseName: string; node: INode; expected: string[] }> = [
 	{
@@ -76,6 +77,15 @@ const referencedNodesTestCases: Array<{ caseName: string; node: INode; expected:
 							name: 'document',
 							value: "={{ $('Edit Fields 2').item.json.document}}",
 							type: 'string',
+							typeVersion: 1,
+						},
+						{
+							parameters: {},
+							id: 'b5942df6-0160-4ef7-965d-57583acdc8aa',
+							name: 'Replace me with your logic',
+							type: 'n8n-nodes-base.noOp',
+							position: [520, 340],
+							typeVersion: 1,
 						},
 					],
 				},
@@ -377,6 +387,121 @@ const referencedNodesTestCases: Array<{ caseName: string; node: INode; expected:
 	},
 ];
 
+const testWorkflow: IWorkflowDb = {
+	id: 'MokOcBHON6KkPq6Y',
+	name: 'My Sub-Workflow 3',
+	active: false,
+	createdAt: -1,
+	updatedAt: -1,
+	connections: {
+		'Execute Workflow Trigger': {
+			main: [
+				[
+					{
+						node: 'Replace me with your logic',
+						type: 'main' as NodeConnectionType,
+						index: 0,
+					},
+				],
+			],
+		},
+	},
+	nodes: [
+		{
+			parameters: {
+				notice: '',
+				events: 'worklfow_call',
+			},
+			id: 'c055762a-8fe7-4141-a639-df2372f30060',
+			name: 'Execute Workflow Trigger',
+			type: 'n8n-nodes-base.executeWorkflowTrigger',
+			position: [260, 340],
+			typeVersion: 0,
+		},
+		{
+			parameters: {},
+			id: 'b5942df6-0160-4ef7-965d-57583acdc8aa',
+			name: 'Replace me with your logic',
+			type: 'n8n-nodes-base.noOp',
+			position: [520, 340],
+			typeVersion: 1,
+		},
+	],
+	settings: {
+		executionOrder: 'v1',
+	},
+	tags: [],
+	pinData: {},
+	versionId: '9f3263e3-d23d-4cc8-bff0-0fdecfbd82bf',
+	usedCredentials: [],
+	scopes: [
+		'workflow:create',
+		'workflow:delete',
+		'workflow:execute',
+		'workflow:list',
+		'workflow:move',
+		'workflow:read',
+		'workflow:share',
+		'workflow:update',
+	],
+	sharedWithProjects: [],
+};
+
+const testExecutionData: IRunExecutionData['resultData'] = {
+	runData: {
+		'When clicking ‘Test workflow’': [
+			{
+				hints: [],
+				startTime: 1732882780588,
+				executionTime: 4,
+				source: [],
+				executionStatus: 'success',
+				data: {
+					main: [
+						[
+							{
+								json: {},
+								pairedItem: {
+									item: 0,
+								},
+							},
+						],
+					],
+				},
+			},
+		],
+		'Edit Fields': [
+			{
+				hints: [],
+				startTime: 1732882780593,
+				executionTime: 0,
+				source: [
+					{
+						previousNode: 'When clicking ‘Test workflow’',
+					},
+				],
+				executionStatus: 'success',
+				data: {
+					main: [
+						[
+							{
+								json: {
+									something: 'here',
+								},
+								pairedItem: {
+									item: 0,
+								},
+							},
+						],
+					],
+				},
+			},
+		],
+	},
+	pinData: {},
+	lastNodeExecuted: 'Edit Fields',
+};
+
 describe.each(referencedNodesTestCases)('getReferencedNodes', (testCase) => {
 	let aiAssistantHelpers: ReturnType<typeof useAIAssistantHelpers>;
 
@@ -390,3 +515,37 @@ describe.each(referencedNodesTestCases)('getReferencedNodes', (testCase) => {
 		expect(aiAssistantHelpers.getReferencedNodes(testCase.node)).toEqual(testCase.expected);
 	});
 });
+
+describe('Simplify assistant payloads', () => {
+	let aiAssistantHelpers: ReturnType<typeof useAIAssistantHelpers>;
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+		aiAssistantHelpers = useAIAssistantHelpers();
+	});
+
+	it('simplifyWorkflowForAssistant: Should remove unnecessary properties from workflow object', () => {
+		const simplifiedWorkflow = aiAssistantHelpers.simplifyWorkflowForAssistant(testWorkflow);
+		const removedProperties = [
+			'createdAt',
+			'updatedAt',
+			'settings',
+			'versionId',
+			'usedCredentials',
+			'sharedWithProjects',
+			'pinData',
+			'scopes',
+			'tags',
+		];
+		removedProperties.forEach((property) => {
+			expect(simplifiedWorkflow).not.toHaveProperty(property);
+		});
+	});
+
+	it('simplifyResultData: Should remove data from nodes', () => {
+		const simplifiedResultData = aiAssistantHelpers.simplifyResultData(testExecutionData);
+		for (const nodeName of Object.keys(simplifiedResultData.runData)) {
+			expect(simplifiedResultData.runData[nodeName][0]).not.toHaveProperty('data');
+		}
+	});
+});
diff --git a/packages/editor-ui/src/composables/useAIAssistantHelpers.ts b/packages/editor-ui/src/composables/useAIAssistantHelpers.ts
index 5adc3952fe..b19f2817cd 100644
--- a/packages/editor-ui/src/composables/useAIAssistantHelpers.ts
+++ b/packages/editor-ui/src/composables/useAIAssistantHelpers.ts
@@ -16,6 +16,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useDataSchema } from './useDataSchema';
 import { VIEWS } from '@/constants';
 import { useI18n } from './useI18n';
+import type { IWorkflowDb } from '@/Interface';
 
 const CANVAS_VIEWS = [VIEWS.NEW_WORKFLOW, VIEWS.WORKFLOW, VIEWS.EXECUTION_DEBUG];
 const EXECUTION_VIEWS = [VIEWS.EXECUTION_PREVIEW];
@@ -225,13 +226,13 @@ export const useAIAssistantHelpers = () => {
 			simplifiedResultData.error = data.error;
 		}
 		// Map runData, excluding the `data` field from ITaskData
-		Object.keys(data.runData).forEach((key) => {
+		for (const key of Object.keys(data.runData)) {
 			const taskDataArray = data.runData[key];
 			simplifiedResultData.runData[key] = taskDataArray.map((taskData) => {
 				const { data: taskDataContent, ...taskDataWithoutData } = taskData;
 				return taskDataWithoutData;
 			});
-		});
+		}
 		// Handle lastNodeExecuted if it exists
 		if (data.lastNodeExecuted) {
 			simplifiedResultData.lastNodeExecuted = data.lastNodeExecuted;
@@ -243,6 +244,13 @@ export const useAIAssistantHelpers = () => {
 		return simplifiedResultData;
 	}
 
+	const simplifyWorkflowForAssistant = (workflow: IWorkflowDb): Partial<IWorkflowDb> => ({
+		name: workflow.name,
+		active: workflow.active,
+		connections: workflow.connections,
+		nodes: workflow.nodes,
+	});
+
 	return {
 		processNodeForAssistant,
 		getNodeInfoForAssistant,
@@ -252,5 +260,6 @@ export const useAIAssistantHelpers = () => {
 		getCurrentViewDescription,
 		getReferencedNodes,
 		simplifyResultData,
+		simplifyWorkflowForAssistant,
 	};
 };
diff --git a/packages/editor-ui/src/composables/__tests__/useActiveNode.test.ts b/packages/editor-ui/src/composables/useActiveNode.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useActiveNode.test.ts
rename to packages/editor-ui/src/composables/useActiveNode.test.ts
diff --git a/packages/editor-ui/src/composables/__tests__/useAutocompleteTelemetry.test.ts b/packages/editor-ui/src/composables/useAutocompleteTelemetry.test.ts
similarity index 97%
rename from packages/editor-ui/src/composables/__tests__/useAutocompleteTelemetry.test.ts
rename to packages/editor-ui/src/composables/useAutocompleteTelemetry.test.ts
index c5625fb33b..17f0289ed9 100644
--- a/packages/editor-ui/src/composables/__tests__/useAutocompleteTelemetry.test.ts
+++ b/packages/editor-ui/src/composables/useAutocompleteTelemetry.test.ts
@@ -5,7 +5,7 @@ import { createTestingPinia } from '@pinia/testing';
 import { waitFor } from '@testing-library/vue';
 import { setActivePinia } from 'pinia';
 import { beforeEach, describe, vi } from 'vitest';
-import { useAutocompleteTelemetry } from '../useAutocompleteTelemetry';
+import { useAutocompleteTelemetry } from './useAutocompleteTelemetry';
 
 const trackSpy = vi.fn();
 const setAutocompleteOnboardedSpy = vi.fn();
diff --git a/packages/editor-ui/src/composables/__tests__/useBeforeUnload.test.ts b/packages/editor-ui/src/composables/useBeforeUnload.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useBeforeUnload.test.ts
rename to packages/editor-ui/src/composables/useBeforeUnload.test.ts
diff --git a/packages/editor-ui/src/composables/useBugReporting.spec.ts b/packages/editor-ui/src/composables/useBugReporting.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useBugReporting.spec.ts
rename to packages/editor-ui/src/composables/useBugReporting.test.ts
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.spec.ts b/packages/editor-ui/src/composables/useCanvasMapping.test.ts
similarity index 63%
rename from packages/editor-ui/src/composables/useCanvasMapping.spec.ts
rename to packages/editor-ui/src/composables/useCanvasMapping.test.ts
index 059b36a988..49ea69506f 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.spec.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.test.ts
@@ -1,7 +1,7 @@
 import type { Ref } from 'vue';
 import { ref } from 'vue';
 import { NodeConnectionType } from 'n8n-workflow';
-import type { Workflow } from 'n8n-workflow';
+import type { Workflow, INode, NodeApiError } from 'n8n-workflow';
 import { setActivePinia } from 'pinia';
 
 import { useCanvasMapping } from '@/composables/useCanvasMapping';
@@ -23,6 +23,7 @@ import { CanvasConnectionMode, CanvasNodeRenderType } from '@/types';
 import { MarkerType } from '@vue-flow/core';
 import { createTestingPinia } from '@pinia/testing';
 import { mockedStore } from '@/__tests__/utils';
+import { mock } from 'vitest-mock-extended';
 
 beforeEach(() => {
 	const pinia = createTestingPinia({
@@ -237,7 +238,7 @@ describe('useCanvasMapping', () => {
 			expect(
 				mappedNodes.value[0]?.data?.connections[CanvasConnectionMode.Output][
 					NodeConnectionType.Main
-				][0][0],
+				][0]?.[0],
 			).toEqual(
 				expect.objectContaining({
 					node: setNode.name,
@@ -252,7 +253,7 @@ describe('useCanvasMapping', () => {
 			expect(
 				mappedNodes.value[1]?.data?.connections[CanvasConnectionMode.Input][
 					NodeConnectionType.Main
-				][0][0],
+				][0]?.[0],
 			).toEqual(
 				expect.objectContaining({
 					node: manualTriggerNode.name,
@@ -678,6 +679,442 @@ describe('useCanvasMapping', () => {
 				});
 			});
 		});
+
+		describe('nodeIssuesById', () => {
+			it('should return empty array when node has no issues', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({ name: 'Test Node' });
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {};
+
+				const { nodeIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeIssuesById.value[node.id]).toEqual([]);
+			});
+
+			it('should handle execution errors', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({ name: 'Test Node' });
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				const errorMessage = 'Test error message';
+				const errorDescription = 'Test error description';
+				workflowsStore.getWorkflowRunData = {
+					'Test Node': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							error: mock<NodeApiError>({
+								message: errorMessage,
+								description: errorDescription,
+							}),
+						},
+					],
+				};
+
+				const { nodeIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeIssuesById.value[node.id]).toEqual([`${errorMessage} (${errorDescription})`]);
+			});
+
+			it('should handle execution error without description', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({ name: 'Test Node' });
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				const errorMessage = 'Test error message';
+				workflowsStore.getWorkflowRunData = {
+					'Test Node': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							error: mock<NodeApiError>({
+								message: errorMessage,
+								description: null,
+							}),
+						},
+					],
+				};
+
+				const { nodeIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeIssuesById.value[node.id]).toEqual([errorMessage]);
+			});
+
+			it('should handle multiple execution errors', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({ name: 'Test Node' });
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {
+					'Test Node': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							error: mock<NodeApiError>({
+								message: 'Error 1',
+								description: 'Description 1',
+							}),
+						},
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							error: mock<NodeApiError>({
+								message: 'Error 2',
+								description: 'Description 2',
+							}),
+						},
+					],
+				};
+
+				const { nodeIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeIssuesById.value[node.id]).toEqual([
+					'Error 1 (Description 1)',
+					'Error 2 (Description 2)',
+				]);
+			});
+
+			it('should handle node issues', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({
+					name: 'Test Node',
+					issues: {
+						typeUnknown: true,
+					},
+				} as Partial<INode>);
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {};
+
+				const { nodeIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeIssuesById.value[node.id]).toEqual([
+					'Node Type "n8n-nodes-base.set" is not known.',
+				]);
+			});
+
+			it('should combine execution errors and node issues', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({
+					name: 'Test Node',
+					issues: {
+						typeUnknown: true,
+					},
+				} as Partial<INode>);
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {
+					'Test Node': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							error: mock<NodeApiError>({
+								message: 'Execution error',
+								description: 'Error description',
+							}),
+						},
+					],
+				};
+
+				const { nodeIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeIssuesById.value[node.id]).toEqual([
+					'Execution error (Error description)',
+					'Node Type "n8n-nodes-base.set" is not known.',
+				]);
+			});
+
+			it('should handle multiple nodes with different issues', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node1 = createTestNode({
+					name: 'Node 1',
+					issues: {
+						typeUnknown: true,
+					},
+				} as Partial<INode>);
+				const node2 = createTestNode({ name: 'Node 2' });
+				const nodes = [node1, node2];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {
+					'Node 2': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							error: mock<NodeApiError>({
+								message: 'Execution error',
+								description: 'Error description',
+							}),
+						},
+					],
+				};
+
+				const { nodeIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeIssuesById.value[node1.id]).toEqual([
+					'Node Type "n8n-nodes-base.set" is not known.',
+				]);
+				expect(nodeIssuesById.value[node2.id]).toEqual(['Execution error (Error description)']);
+			});
+		});
+
+		describe('nodeHasIssuesById', () => {
+			it('should return false when node has no issues or errors', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({ name: 'Test Node' });
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {};
+				workflowsStore.pinDataByNodeName.mockReturnValue(undefined);
+
+				const { nodeHasIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeHasIssuesById.value[node.id]).toBe(false);
+			});
+
+			it('should return true when execution status is crashed', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({ name: 'Test Node' });
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {
+					'Test Node': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							executionStatus: 'crashed',
+						},
+					],
+				};
+				workflowsStore.pinDataByNodeName.mockReturnValue(undefined);
+
+				const { nodeHasIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeHasIssuesById.value[node.id]).toBe(true);
+			});
+
+			it('should return true when execution status is error', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({ name: 'Test Node' });
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {
+					'Test Node': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							executionStatus: 'error',
+						},
+					],
+				};
+				workflowsStore.pinDataByNodeName.mockReturnValue(undefined);
+
+				const { nodeHasIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeHasIssuesById.value[node.id]).toBe(true);
+			});
+
+			it('should return false when node has pinned data regardless of issues', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({
+					name: 'Test Node',
+					issues: {
+						typeUnknown: true,
+					},
+				} as Partial<INode>);
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {};
+				workflowsStore.pinDataByNodeName.mockReturnValue([{ json: {} }]);
+
+				const { nodeHasIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeHasIssuesById.value[node.id]).toBe(false);
+			});
+
+			it('should return true when node has issues and no pinned data', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({
+					name: 'Test Node',
+					issues: {
+						typeUnknown: true,
+					},
+				} as Partial<INode>);
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {};
+				workflowsStore.pinDataByNodeName.mockReturnValue(undefined);
+
+				const { nodeHasIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeHasIssuesById.value[node.id]).toBe(true);
+			});
+
+			it('should return true for execution errors even with other issues', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node = createTestNode({
+					name: 'Test Node',
+					issues: {
+						typeUnknown: true,
+					},
+				} as Partial<INode>);
+				const nodes = [node];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {
+					'Test Node': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							executionStatus: 'error',
+							error: mock<NodeApiError>({
+								message: 'Execution error',
+								description: 'Error description',
+							}),
+						},
+					],
+				};
+				workflowsStore.pinDataByNodeName.mockReturnValue(undefined);
+
+				const { nodeHasIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeHasIssuesById.value[node.id]).toBe(true);
+			});
+
+			it('should handle multiple nodes with different issue states', () => {
+				const workflowsStore = mockedStore(useWorkflowsStore);
+				const node1 = createTestNode({
+					name: 'Node 1',
+					issues: {
+						typeUnknown: true,
+					},
+				} as Partial<INode>);
+				const node2 = createTestNode({ name: 'Node 2' });
+				const node3 = createTestNode({ name: 'Node 3' });
+				const nodes = [node1, node2, node3];
+				const connections = {};
+				const workflowObject = createTestWorkflowObject({ nodes, connections });
+
+				workflowsStore.getWorkflowRunData = {
+					'Node 2': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							executionStatus: 'error',
+						},
+					],
+					'Node 3': [
+						{
+							startTime: 0,
+							executionTime: 0,
+							source: [],
+							executionStatus: 'success',
+						},
+					],
+				};
+				workflowsStore.pinDataByNodeName.mockImplementation((nodeName: string) => {
+					return nodeName === 'Node 1' ? [{ json: {} }] : undefined;
+				});
+
+				const { nodeHasIssuesById } = useCanvasMapping({
+					nodes: ref(nodes),
+					connections: ref(connections),
+					workflowObject: ref(workflowObject) as Ref<Workflow>,
+				});
+
+				expect(nodeHasIssuesById.value[node1.id]).toBe(false); // Has issues but also pinned data
+				expect(nodeHasIssuesById.value[node2.id]).toBe(true); // Has error status
+				expect(nodeHasIssuesById.value[node3.id]).toBe(false); // No issues
+			});
+		});
 	});
 
 	describe('connections', () => {
@@ -724,13 +1161,14 @@ describe('useCanvasMapping', () => {
 			expect(mappedConnections.value).toEqual([
 				{
 					data: {
-						fromNodeName: manualTriggerNode.name,
 						source: {
+							node: manualTriggerNode.name,
 							index: 0,
 							type: NodeConnectionType.Main,
 						},
 						status: undefined,
 						target: {
+							node: setNode.name,
 							index: 0,
 							type: NodeConnectionType.Main,
 						},
@@ -743,7 +1181,6 @@ describe('useCanvasMapping', () => {
 					target,
 					targetHandle,
 					type: 'canvas-edge',
-					animated: false,
 				},
 			]);
 		});
@@ -813,13 +1250,14 @@ describe('useCanvasMapping', () => {
 			expect(mappedConnections.value).toEqual([
 				{
 					data: {
-						fromNodeName: manualTriggerNode.name,
 						source: {
+							node: manualTriggerNode.name,
 							index: 0,
 							type: NodeConnectionType.AiTool,
 						},
 						status: undefined,
 						target: {
+							node: setNode.name,
 							index: 0,
 							type: NodeConnectionType.AiTool,
 						},
@@ -832,17 +1270,17 @@ describe('useCanvasMapping', () => {
 					target: targetA,
 					targetHandle: targetHandleA,
 					type: 'canvas-edge',
-					animated: false,
 				},
 				{
 					data: {
-						fromNodeName: manualTriggerNode.name,
 						source: {
+							node: manualTriggerNode.name,
 							index: 0,
 							type: NodeConnectionType.AiDocument,
 						},
 						status: undefined,
 						target: {
+							node: setNode.name,
 							index: 1,
 							type: NodeConnectionType.AiDocument,
 						},
@@ -855,7 +1293,6 @@ describe('useCanvasMapping', () => {
 					targetHandle: targetHandleB,
 					type: 'canvas-edge',
 					markerEnd: MarkerType.ArrowClosed,
-					animated: false,
 				},
 			]);
 		});
diff --git a/packages/editor-ui/src/composables/useCanvasMapping.ts b/packages/editor-ui/src/composables/useCanvasMapping.ts
index bb6699a9cb..517463fc6c 100644
--- a/packages/editor-ui/src/composables/useCanvasMapping.ts
+++ b/packages/editor-ui/src/composables/useCanvasMapping.ts
@@ -33,21 +33,22 @@ import type {
 	ExecutionSummary,
 	IConnections,
 	INodeExecutionData,
+	INodeTypeDescription,
 	ITaskData,
 	Workflow,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeHelpers, SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
-import type { INodeUi } from '@/Interface';
 import {
-	CUSTOM_API_CALL_KEY,
-	FORM_NODE_TYPE,
-	STICKY_NODE_TYPE,
-	WAIT_NODE_TYPE,
-	WAIT_TIME_UNLIMITED,
-} from '@/constants';
+	NodeConnectionType,
+	NodeHelpers,
+	SEND_AND_WAIT_OPERATION,
+	WAIT_INDEFINITELY,
+} from 'n8n-workflow';
+import type { INodeUi } from '@/Interface';
+import { CUSTOM_API_CALL_KEY, FORM_NODE_TYPE, STICKY_NODE_TYPE, WAIT_NODE_TYPE } from '@/constants';
 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 +87,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 +96,7 @@ export function useCanvasMapping({
 				outputs: {
 					labelSize: nodeOutputLabelSizeById.value[node.id],
 				},
+				tooltip: nodeTooltipById.value[node.id],
 			},
 		};
 	}
@@ -117,10 +119,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 +166,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 +229,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 +255,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);
@@ -316,7 +373,7 @@ export function useCanvasMapping({
 			} else if (nodePinnedDataById.value[node.id]) {
 				acc[node.id] = false;
 			} else {
-				acc[node.id] = Object.keys(node?.issues ?? {}).length > 0;
+				acc[node.id] = nodeIssuesById.value[node.id].length > 0;
 			}
 
 			return acc;
@@ -361,7 +418,7 @@ export function useCanvasMapping({
 
 					const waitDate = new Date(workflowExecution.waitTill);
 
-					if (waitDate.toISOString() === WAIT_TIME_UNLIMITED) {
+					if (waitDate.getTime() === WAIT_INDEFINITELY.getTime()) {
 						acc[node.id] = i18n.baseText(
 							'node.theNodeIsWaitingIndefinitelyForAnIncomingWebhookCall',
 						);
@@ -507,7 +564,6 @@ export function useCanvasMapping({
 					data,
 					type,
 					label,
-					animated: data.status === 'running',
 					markerEnd: MarkerType.ArrowClosed,
 				};
 			},
@@ -515,30 +571,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,
 		};
 	}
@@ -548,7 +614,7 @@ export function useCanvasMapping({
 	}
 
 	function getConnectionLabel(connection: CanvasConnection): string {
-		const fromNode = nodes.value.find((node) => node.name === connection.data?.fromNodeName);
+		const fromNode = nodes.value.find((node) => node.name === connection.data?.source.node);
 		if (!fromNode) {
 			return '';
 		}
@@ -580,6 +646,8 @@ export function useCanvasMapping({
 	return {
 		additionalNodePropertiesById,
 		nodeExecutionRunDataOutputMapById,
+		nodeIssuesById,
+		nodeHasIssuesById,
 		connections: mappedConnections,
 		nodes: mappedNodes,
 	};
diff --git a/packages/editor-ui/src/composables/useCanvasNode.spec.ts b/packages/editor-ui/src/composables/useCanvasNode.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useCanvasNode.spec.ts
rename to packages/editor-ui/src/composables/useCanvasNode.test.ts
diff --git a/packages/editor-ui/src/composables/useCanvasNode.ts b/packages/editor-ui/src/composables/useCanvasNode.ts
index 56b27264ba..878ecc4d0f 100644
--- a/packages/editor-ui/src/composables/useCanvasNode.ts
+++ b/packages/editor-ui/src/composables/useCanvasNode.ts
@@ -7,6 +7,7 @@ import { CanvasNodeKey } from '@/constants';
 import { computed, inject } from 'vue';
 import type { CanvasNodeData } from '@/types';
 import { CanvasNodeRenderType, CanvasConnectionMode } from '@/types';
+import { refThrottled } from '@vueuse/core';
 
 export function useCanvasNode() {
 	const node = inject(CanvasNodeKey);
@@ -58,6 +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, 50);
 
 	const runDataOutputMap = computed(() => data.value.runData.outputMap);
 	const runDataIterations = computed(() => data.value.runData.iterations);
@@ -89,6 +91,7 @@ export function useCanvasNode() {
 		executionStatus,
 		executionWaiting,
 		executionRunning,
+		executionRunningThrottled,
 		render,
 		eventBus,
 	};
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/__tests__/useCanvasOperations.spec.ts b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
similarity index 70%
rename from packages/editor-ui/src/composables/__tests__/useCanvasOperations.spec.ts
rename to packages/editor-ui/src/composables/useCanvasOperations.test.ts
index d54f7ccbfc..f0a0b11a8f 100644
--- a/packages/editor-ui/src/composables/__tests__/useCanvasOperations.spec.ts
+++ b/packages/editor-ui/src/composables/useCanvasOperations.test.ts
@@ -1,9 +1,17 @@
 import { setActivePinia } from 'pinia';
-import type { IConnection, Workflow } from 'n8n-workflow';
+import type {
+	IConnection,
+	INodeTypeDescription,
+	IWebhookDescription,
+	Workflow,
+	INodeConnections,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
 import { NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 import { useCanvasOperations } from '@/composables/useCanvasOperations';
-import type { CanvasNode } from '@/types';
-import type { ICredentialsResponse, INodeUi, IWorkflowDb } from '@/Interface';
+import type { CanvasConnection, CanvasNode } from '@/types';
+import { CanvasConnectionMode } from '@/types';
+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';
@@ -11,6 +19,7 @@ import { useHistoryStore } from '@/stores/history.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import {
 	createTestNode,
+	createTestWorkflow,
 	createTestWorkflowObject,
 	mockNode,
 	mockNodeTypeDescription,
@@ -22,9 +31,18 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { waitFor } from '@testing-library/vue';
 import { createTestingPinia } from '@pinia/testing';
 import { mockedStore } from '@/__tests__/utils';
-import { SET_NODE_TYPE, STICKY_NODE_TYPE, STORES } from '@/constants';
+import {
+	AGENT_NODE_TYPE,
+	FORM_TRIGGER_NODE_TYPE,
+	SET_NODE_TYPE,
+	STICKY_NODE_TYPE,
+	STORES,
+	WEBHOOK_NODE_TYPE,
+} from '@/constants';
 import type { Connection } from '@vue-flow/core';
 import { useClipboard } from '@/composables/useClipboard';
+import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
+import { nextTick } from 'vue';
 
 vi.mock('vue-router', async (importOriginal) => {
 	const actual = await importOriginal<{}>();
@@ -178,36 +196,6 @@ describe('useCanvasOperations', () => {
 			expect(result.position).toEqual([20, 20]);
 		});
 
-		it('should create node with default credentials when only one credential is available', () => {
-			const credentialsStore = useCredentialsStore();
-			const credential = mock<ICredentialsResponse>({ id: '1', name: 'cred', type: 'cred' });
-			const nodeTypeName = 'type';
-			const nodeTypeDescription = mockNodeTypeDescription({
-				name: nodeTypeName,
-				credentials: [{ name: credential.name }],
-			});
-
-			credentialsStore.state.credentials = {
-				[credential.id]: credential,
-			};
-
-			// @ts-expect-error Known pinia issue when spying on store getters
-			vi.spyOn(credentialsStore, 'getUsableCredentialByType', 'get').mockReturnValue(() => [
-				credential,
-			]);
-
-			const { addNode } = useCanvasOperations({ router });
-			const result = addNode(
-				{
-					type: nodeTypeName,
-					typeVersion: 1,
-				},
-				nodeTypeDescription,
-			);
-
-			expect(result.credentials).toEqual({ [credential.name]: { id: '1', name: credential.name } });
-		});
-
 		it('should not assign credentials when multiple credentials are available', () => {
 			const credentialsStore = useCredentialsStore();
 			const credentialA = mock<ICredentialsResponse>({ id: '1', name: 'credA', type: 'cred' });
@@ -635,6 +623,48 @@ describe('useCanvasOperations', () => {
 			const added = await addNodes(nodes, {});
 			expect(added.length).toBe(2);
 		});
+
+		it('should mark UI state as dirty', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const uiStore = mockedStore(useUIStore);
+			const nodeTypesStore = useNodeTypesStore();
+			const nodeTypeName = 'type';
+			const nodes = [mockNode({ name: 'Node 1', type: nodeTypeName, position: [30, 40] })];
+
+			workflowsStore.getCurrentWorkflow.mockReturnValue(
+				createTestWorkflowObject(workflowsStore.workflow),
+			);
+
+			nodeTypesStore.nodeTypes = {
+				[nodeTypeName]: { 1: mockNodeTypeDescription({ name: nodeTypeName }) },
+			};
+
+			const { addNodes } = useCanvasOperations({ router });
+			await addNodes(nodes, { keepPristine: false });
+
+			expect(uiStore.stateIsDirty).toEqual(true);
+		});
+
+		it('should not mark UI state as dirty if keepPristine is true', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const uiStore = mockedStore(useUIStore);
+			const nodeTypesStore = useNodeTypesStore();
+			const nodeTypeName = 'type';
+			const nodes = [mockNode({ name: 'Node 1', type: nodeTypeName, position: [30, 40] })];
+
+			workflowsStore.getCurrentWorkflow.mockReturnValue(
+				createTestWorkflowObject(workflowsStore.workflow),
+			);
+
+			nodeTypesStore.nodeTypes = {
+				[nodeTypeName]: { 1: mockNodeTypeDescription({ name: nodeTypeName }) },
+			};
+
+			const { addNodes } = useCanvasOperations({ router });
+			await addNodes(nodes, { keepPristine: true });
+
+			expect(uiStore.stateIsDirty).toEqual(false);
+		});
 	});
 
 	describe('revertAddNode', () => {
@@ -774,6 +804,82 @@ describe('useCanvasOperations', () => {
 			expect(workflowsStore.removeNodeExecutionDataById).toHaveBeenCalledWith(nodes[1].id);
 			expect(workflowsStore.removeNodeById).toHaveBeenCalledWith(nodes[1].id);
 		});
+
+		it('should handle nodes with null connections for unconnected indexes', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			nodeTypesStore.nodeTypes = {
+				[SET_NODE_TYPE]: { 1: mockNodeTypeDescription({ name: SET_NODE_TYPE }) },
+			};
+
+			const nodes = [
+				createTestNode({
+					id: 'input',
+					type: SET_NODE_TYPE,
+					position: [10, 20],
+					name: 'Input Node',
+				}),
+				createTestNode({
+					id: 'middle',
+					type: SET_NODE_TYPE,
+					position: [10, 20],
+					name: 'Middle Node',
+				}),
+				createTestNode({
+					id: 'output',
+					type: SET_NODE_TYPE,
+					position: [10, 20],
+					name: 'Output Node',
+				}),
+			];
+
+			workflowsStore.getNodeByName = vi
+				.fn()
+				.mockImplementation((name: string) => nodes.find((node) => node.name === name));
+
+			workflowsStore.workflow.nodes = nodes;
+			workflowsStore.workflow.connections = {
+				[nodes[0].name]: {
+					main: [
+						null,
+						[
+							{
+								node: nodes[1].name,
+								type: NodeConnectionType.Main,
+								index: 0,
+							},
+						],
+					],
+				},
+				[nodes[1].name]: {
+					main: [
+						// null here to simulate no connection at index
+						null,
+						[
+							{
+								node: nodes[2].name,
+								type: NodeConnectionType.Main,
+								index: 0,
+							},
+						],
+					],
+				},
+			};
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+			workflowsStore.incomingConnectionsByNodeName.mockReturnValue({});
+
+			workflowsStore.getNodeById.mockReturnValue(nodes[1]);
+
+			const { deleteNode } = useCanvasOperations({ router });
+			deleteNode(nodes[1].id);
+
+			expect(workflowsStore.removeNodeById).toHaveBeenCalledWith(nodes[1].id);
+			expect(workflowsStore.removeNodeExecutionDataById).toHaveBeenCalledWith(nodes[1].id);
+			expect(workflowsStore.removeNodeById).toHaveBeenCalledWith(nodes[1].id);
+		});
 	});
 
 	describe('revertDeleteNode', () => {
@@ -889,6 +995,18 @@ describe('useCanvasOperations', () => {
 
 			expect(ndvStore.activeNodeName).toBe('Existing Node');
 		});
+
+		it('should set node as dirty when node is set active', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const node = createTestNode();
+
+			workflowsStore.getNodeById.mockImplementation(() => node);
+
+			const { setNodeActive } = useCanvasOperations({ router });
+			setNodeActive(node.id);
+
+			expect(workflowsStore.setNodePristine).toHaveBeenCalledWith(node.name, false);
+		});
 	});
 
 	describe('setNodeActiveByName', () => {
@@ -966,7 +1084,17 @@ describe('useCanvasOperations', () => {
 			const connections = [
 				{
 					source: nodes[0].id,
+					sourceHandle: createCanvasConnectionHandleString({
+						mode: CanvasConnectionMode.Output,
+						index: 0,
+						type: NodeConnectionType.Main,
+					}),
 					target: nodes[1].id,
+					targetHandle: createCanvasConnectionHandleString({
+						mode: CanvasConnectionMode.Input,
+						index: 0,
+						type: NodeConnectionType.Main,
+					}),
 					data: {
 						source: { type: NodeConnectionType.Main, index: 0 },
 						target: { type: NodeConnectionType.Main, index: 0 },
@@ -974,7 +1102,17 @@ describe('useCanvasOperations', () => {
 				},
 				{
 					source: nodes[1].id,
+					sourceHandle: createCanvasConnectionHandleString({
+						mode: CanvasConnectionMode.Output,
+						index: 0,
+						type: NodeConnectionType.Main,
+					}),
 					target: nodes[2].id,
+					targetHandle: createCanvasConnectionHandleString({
+						mode: CanvasConnectionMode.Input,
+						index: 0,
+						type: NodeConnectionType.Main,
+					}),
 					data: {
 						source: { type: NodeConnectionType.Main, index: 0 },
 						target: { type: NodeConnectionType.Main, index: 0 },
@@ -993,7 +1131,7 @@ describe('useCanvasOperations', () => {
 			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeType);
 
 			const { addConnections } = useCanvasOperations({ router });
-			addConnections(connections);
+			await addConnections(connections);
 
 			expect(workflowsStore.addConnection).toHaveBeenCalledWith({
 				connection: [
@@ -1010,6 +1148,26 @@ describe('useCanvasOperations', () => {
 				],
 			});
 		});
+
+		it('should set UI state as dirty', async () => {
+			const uiStore = mockedStore(useUIStore);
+			const connections: CanvasConnection[] = [];
+
+			const { addConnections } = useCanvasOperations({ router });
+			await addConnections(connections, { keepPristine: false });
+
+			expect(uiStore.stateIsDirty).toBe(true);
+		});
+
+		it('should not set UI state as dirty if keepPristine is true', async () => {
+			const uiStore = mockedStore(useUIStore);
+			const connections: CanvasConnection[] = [];
+
+			const { addConnections } = useCanvasOperations({ router });
+			await addConnections(connections, { keepPristine: true });
+
+			expect(uiStore.stateIsDirty).toBe(false);
+		});
 	});
 
 	describe('createConnection', () => {
@@ -1099,6 +1257,57 @@ describe('useCanvasOperations', () => {
 			});
 			expect(uiStore.stateIsDirty).toBe(true);
 		});
+
+		it('should not set UI state as dirty if keepPristine is true', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const uiStore = mockedStore(useUIStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			const nodeTypeDescription = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+				outputs: [NodeConnectionType.Main],
+			});
+
+			const nodeA = createTestNode({
+				id: 'a',
+				type: nodeTypeDescription.name,
+				name: 'Node A',
+			});
+
+			const nodeB = createTestNode({
+				id: 'b',
+				type: nodeTypeDescription.name,
+				name: 'Node B',
+			});
+
+			const connection: Connection = {
+				source: nodeA.id,
+				sourceHandle: `outputs/${NodeConnectionType.Main}/0`,
+				target: nodeB.id,
+				targetHandle: `inputs/${NodeConnectionType.Main}/0`,
+			};
+
+			nodeTypesStore.nodeTypes = {
+				node: { 1: nodeTypeDescription },
+			};
+
+			workflowsStore.workflow.nodes = [nodeA, nodeB];
+			workflowsStore.getNodeById.mockReturnValueOnce(nodeA).mockReturnValueOnce(nodeB);
+			nodeTypesStore.getNodeType = vi.fn().mockReturnValue(nodeTypeDescription);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { createConnection, editableWorkflowObject } = useCanvasOperations({ router });
+
+			editableWorkflowObject.value.nodes[nodeA.name] = nodeA;
+			editableWorkflowObject.value.nodes[nodeB.name] = nodeB;
+
+			createConnection(connection, { keepPristine: true });
+
+			expect(uiStore.stateIsDirty).toBe(false);
+		});
 	});
 
 	describe('revertCreateConnection', () => {
@@ -1739,6 +1948,304 @@ describe('useCanvasOperations', () => {
 		});
 	});
 
+	describe('revalidateNodeInputConnections', () => {
+		it('should not delete connections when target node does not exist', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nonexistentId = 'nonexistent';
+			workflowsStore.getNodeById.mockReturnValue(undefined);
+
+			const { revalidateNodeInputConnections } = useCanvasOperations({ router });
+			revalidateNodeInputConnections(nonexistentId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+
+		it('should not delete connections when node type description is not found', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+			const nodeId = 'test-node';
+			const node = createTestNode({ id: nodeId, type: 'unknown-type' });
+
+			workflowsStore.getNodeById.mockReturnValue(node);
+			nodeTypesStore.getNodeType = () => null;
+
+			const { revalidateNodeInputConnections } = useCanvasOperations({ router });
+			revalidateNodeInputConnections(nodeId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+
+		it('should remove invalid connections that do not match input type', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			workflowsStore.removeConnection = vi.fn();
+
+			const targetNodeId = 'target';
+			const targetNode = createTestNode({
+				id: targetNodeId,
+				name: 'Target Node',
+				type: SET_NODE_TYPE,
+			});
+			const targetNodeType = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+			});
+
+			const sourceNodeId = 'source';
+			const sourceNode = createTestNode({
+				id: sourceNodeId,
+				name: 'Source Node',
+				type: AGENT_NODE_TYPE,
+			});
+			const sourceNodeType = mockNodeTypeDescription({
+				name: AGENT_NODE_TYPE,
+				outputs: [NodeConnectionType.AiTool],
+			});
+
+			workflowsStore.workflow.nodes = [sourceNode, targetNode];
+			workflowsStore.workflow.connections = {
+				[sourceNode.name]: {
+					[NodeConnectionType.AiTool]: [
+						[{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			workflowsStore.getNodeById
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode)
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode);
+
+			nodeTypesStore.getNodeType = vi
+				.fn()
+				.mockReturnValueOnce(targetNodeType)
+				.mockReturnValueOnce(sourceNodeType);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { revalidateNodeInputConnections } = useCanvasOperations({ router });
+			revalidateNodeInputConnections(targetNodeId);
+
+			await nextTick();
+
+			expect(workflowsStore.removeConnection).toHaveBeenCalledWith({
+				connection: [
+					{ node: sourceNode.name, type: NodeConnectionType.AiTool, index: 0 },
+					{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 },
+				],
+			});
+		});
+
+		it('should keep valid connections that match input type', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			workflowsStore.removeConnection = vi.fn();
+
+			const targetNodeId = 'target';
+			const targetNode = createTestNode({
+				id: targetNodeId,
+				name: 'Target Node',
+				type: SET_NODE_TYPE,
+			});
+			const targetNodeType = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+			});
+
+			const sourceNodeId = 'source';
+			const sourceNode = createTestNode({
+				id: sourceNodeId,
+				name: 'Source Node',
+				type: AGENT_NODE_TYPE,
+			});
+			const sourceNodeType = mockNodeTypeDescription({
+				name: AGENT_NODE_TYPE,
+				outputs: [NodeConnectionType.Main],
+			});
+
+			workflowsStore.workflow.nodes = [sourceNode, targetNode];
+			workflowsStore.workflow.connections = {
+				[sourceNode.name]: {
+					[NodeConnectionType.Main]: [
+						[{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			workflowsStore.getNodeById
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode)
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode);
+
+			nodeTypesStore.getNodeType = vi
+				.fn()
+				.mockReturnValueOnce(targetNodeType)
+				.mockReturnValueOnce(sourceNodeType);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { revalidateNodeInputConnections } = useCanvasOperations({ router });
+			revalidateNodeInputConnections(targetNodeId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('revalidateNodeOutputConnections', () => {
+		it('should not delete connections when source node does not exist', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nonexistentId = 'nonexistent';
+			workflowsStore.getNodeById.mockReturnValue(undefined);
+
+			const { revalidateNodeOutputConnections } = useCanvasOperations({ router });
+			revalidateNodeOutputConnections(nonexistentId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+
+		it('should not delete connections when node type description is not found', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+			const nodeId = 'test-node';
+			const node = createTestNode({ id: nodeId, type: 'unknown-type' });
+
+			workflowsStore.getNodeById.mockReturnValue(node);
+			nodeTypesStore.getNodeType = () => null;
+
+			const { revalidateNodeOutputConnections } = useCanvasOperations({ router });
+			revalidateNodeOutputConnections(nodeId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+
+		it('should remove invalid connections that do not match output type', async () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			workflowsStore.removeConnection = vi.fn();
+
+			const targetNodeId = 'target';
+			const targetNode = createTestNode({
+				id: targetNodeId,
+				name: 'Target Node',
+				type: SET_NODE_TYPE,
+			});
+			const targetNodeType = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+			});
+
+			const sourceNodeId = 'source';
+			const sourceNode = createTestNode({
+				id: sourceNodeId,
+				name: 'Source Node',
+				type: AGENT_NODE_TYPE,
+			});
+			const sourceNodeType = mockNodeTypeDescription({
+				name: AGENT_NODE_TYPE,
+				outputs: [NodeConnectionType.AiTool],
+			});
+
+			workflowsStore.workflow.nodes = [sourceNode, targetNode];
+			workflowsStore.workflow.connections = {
+				[sourceNode.name]: {
+					[NodeConnectionType.AiTool]: [
+						[{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			workflowsStore.getNodeById
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode)
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode);
+
+			nodeTypesStore.getNodeType = vi
+				.fn()
+				.mockReturnValueOnce(targetNodeType)
+				.mockReturnValueOnce(sourceNodeType);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { revalidateNodeOutputConnections } = useCanvasOperations({ router });
+			revalidateNodeOutputConnections(sourceNodeId);
+
+			await nextTick();
+
+			expect(workflowsStore.removeConnection).toHaveBeenCalledWith({
+				connection: [
+					{ node: sourceNode.name, type: NodeConnectionType.AiTool, index: 0 },
+					{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 },
+				],
+			});
+		});
+
+		it('should keep valid connections that match output type', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+
+			workflowsStore.removeConnection = vi.fn();
+
+			const targetNodeId = 'target';
+			const targetNode = createTestNode({
+				id: targetNodeId,
+				name: 'Target Node',
+				type: SET_NODE_TYPE,
+			});
+			const targetNodeType = mockNodeTypeDescription({
+				name: SET_NODE_TYPE,
+				inputs: [NodeConnectionType.Main],
+			});
+
+			const sourceNodeId = 'source';
+			const sourceNode = createTestNode({
+				id: sourceNodeId,
+				name: 'Source Node',
+				type: AGENT_NODE_TYPE,
+			});
+			const sourceNodeType = mockNodeTypeDescription({
+				name: AGENT_NODE_TYPE,
+				outputs: [NodeConnectionType.Main],
+			});
+
+			workflowsStore.workflow.nodes = [sourceNode, targetNode];
+			workflowsStore.workflow.connections = {
+				[sourceNode.name]: {
+					[NodeConnectionType.AiTool]: [
+						[{ node: targetNode.name, type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			workflowsStore.getNodeById
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode)
+				.mockReturnValueOnce(sourceNode)
+				.mockReturnValueOnce(targetNode);
+
+			nodeTypesStore.getNodeType = vi
+				.fn()
+				.mockReturnValueOnce(targetNodeType)
+				.mockReturnValueOnce(sourceNodeType);
+
+			const workflowObject = createTestWorkflowObject(workflowsStore.workflow);
+			workflowsStore.getCurrentWorkflow.mockReturnValue(workflowObject);
+
+			const { revalidateNodeOutputConnections } = useCanvasOperations({ router });
+			revalidateNodeOutputConnections(sourceNodeId);
+
+			expect(workflowsStore.removeConnection).not.toHaveBeenCalled();
+		});
+	});
+
 	describe('deleteConnectionsByNodeId', () => {
 		it('should delete all connections for a given node ID', () => {
 			const workflowsStore = mockedStore(useWorkflowsStore);
@@ -1867,6 +2374,256 @@ describe('useCanvasOperations', () => {
 			expect(vi.mocked(useClipboard().copy).mock.calls).toMatchSnapshot();
 		});
 	});
+
+	describe('resolveNodeWebhook', () => {
+		const nodeTypeDescription = mock<INodeTypeDescription>({
+			webhooks: [mock<IWebhookDescription>()],
+		});
+
+		it("should set webhookId if it doesn't already exist", () => {
+			const node = mock<INodeUi>({ webhookId: undefined });
+
+			const { resolveNodeWebhook } = useCanvasOperations({ router });
+			resolveNodeWebhook(node, nodeTypeDescription);
+
+			expect(node.webhookId).toBeDefined();
+		});
+
+		it('should not set webhookId if it already exists', () => {
+			const node = mock<INodeUi>({ webhookId: 'random-id' });
+
+			const { resolveNodeWebhook } = useCanvasOperations({ router });
+			resolveNodeWebhook(node, nodeTypeDescription);
+
+			expect(node.webhookId).toBe('random-id');
+		});
+
+		it("should not set webhookId if node description doesn't define any webhooks", () => {
+			const node = mock<INodeUi>({ webhookId: undefined });
+
+			const { resolveNodeWebhook } = useCanvasOperations({ router });
+			resolveNodeWebhook(node, mock<INodeTypeDescription>({ webhooks: [] }));
+
+			expect(node.webhookId).toBeUndefined();
+		});
+
+		test.each([WEBHOOK_NODE_TYPE, FORM_TRIGGER_NODE_TYPE])(
+			'should update the webhook path, if the node type is %s, and the path parameter is empty',
+			(nodeType) => {
+				const node = mock<INodeUi>({
+					webhookId: 'random-id',
+					type: nodeType,
+					parameters: { path: '' },
+				});
+
+				const { resolveNodeWebhook } = useCanvasOperations({ router });
+				resolveNodeWebhook(node, nodeTypeDescription);
+
+				expect(node.webhookId).toBe('random-id');
+				expect(node.parameters.path).toBe('random-id');
+			},
+		);
+	});
+
+	describe('initializeWorkspace', () => {
+		it('should initialize the workspace', () => {
+			const workflowsStore = mockedStore(useWorkflowsStore);
+			const workflow = createTestWorkflow({
+				nodes: [createTestNode()],
+				connections: {},
+			});
+
+			const { initializeWorkspace } = useCanvasOperations({ router });
+			initializeWorkspace(workflow);
+
+			expect(workflowsStore.setNodes).toHaveBeenCalled();
+			expect(workflowsStore.setConnections).toHaveBeenCalled();
+		});
+
+		it('should initialize node data from node type description', () => {
+			const nodeTypesStore = mockedStore(useNodeTypesStore);
+			const type = SET_NODE_TYPE;
+			const version = 1;
+			const expectedDescription = mockNodeTypeDescription({
+				name: type,
+				version,
+				properties: [
+					{
+						displayName: 'Value',
+						name: 'value',
+						type: 'boolean',
+						default: true,
+					},
+				],
+			});
+
+			nodeTypesStore.nodeTypes = { [type]: { [version]: expectedDescription } };
+
+			const workflow = createTestWorkflow({
+				nodes: [createTestNode()],
+				connections: {},
+			});
+
+			const { initializeWorkspace } = useCanvasOperations({ router });
+			initializeWorkspace(workflow);
+
+			expect(workflow.nodes[0].parameters).toEqual({ value: true });
+		});
+	});
+
+	describe('filterConnectionsByNodes', () => {
+		it('should return filtered connections when all nodes are included', () => {
+			const connections: INodeConnections = {
+				[NodeConnectionType.Main]: [
+					[
+						{ node: 'node1', type: NodeConnectionType.Main, index: 0 },
+						{ node: 'node2', type: NodeConnectionType.Main, index: 0 },
+					],
+					[{ node: 'node3', type: NodeConnectionType.Main, index: 0 }],
+				],
+			};
+			const includeNodeNames = new Set<string>(['node1', 'node2', 'node3']);
+
+			const { filterConnectionsByNodes } = useCanvasOperations({ router });
+			const result = filterConnectionsByNodes(connections, includeNodeNames);
+
+			expect(result).toEqual(connections);
+		});
+
+		it('should return empty connections when no nodes are included', () => {
+			const connections: INodeConnections = {
+				[NodeConnectionType.Main]: [
+					[
+						{ node: 'node1', type: NodeConnectionType.Main, index: 0 },
+						{ node: 'node2', type: NodeConnectionType.Main, index: 0 },
+					],
+					[{ node: 'node3', type: NodeConnectionType.Main, index: 0 }],
+				],
+			};
+			const includeNodeNames = new Set<string>();
+
+			const { filterConnectionsByNodes } = useCanvasOperations({ router });
+			const result = filterConnectionsByNodes(connections, includeNodeNames);
+
+			expect(result).toEqual({
+				[NodeConnectionType.Main]: [[], []],
+			});
+		});
+
+		it('should return partially filtered connections when some nodes are included', () => {
+			const connections: INodeConnections = {
+				[NodeConnectionType.Main]: [
+					[
+						{ node: 'node1', type: NodeConnectionType.Main, index: 0 },
+						{ node: 'node2', type: NodeConnectionType.Main, index: 0 },
+					],
+					[{ node: 'node3', type: NodeConnectionType.Main, index: 0 }],
+				],
+			};
+			const includeNodeNames = new Set<string>(['node1']);
+
+			const { filterConnectionsByNodes } = useCanvasOperations({ router });
+			const result = filterConnectionsByNodes(connections, includeNodeNames);
+
+			expect(result).toEqual({
+				[NodeConnectionType.Main]: [
+					[{ node: 'node1', type: NodeConnectionType.Main, index: 0 }],
+					[],
+				],
+			});
+		});
+
+		it('should handle empty connections input', () => {
+			const connections: INodeConnections = {};
+			const includeNodeNames = new Set<string>(['node1']);
+
+			const { filterConnectionsByNodes } = useCanvasOperations({ router });
+			const result = filterConnectionsByNodes(connections, includeNodeNames);
+
+			expect(result).toEqual({});
+		});
+
+		it('should handle connections with no valid nodes', () => {
+			const connections: INodeConnections = {
+				[NodeConnectionType.Main]: [
+					[
+						{ node: 'node4', type: NodeConnectionType.Main, index: 0 },
+						{ node: 'node5', type: NodeConnectionType.Main, index: 0 },
+					],
+					[{ node: 'node6', type: NodeConnectionType.Main, index: 0 }],
+				],
+			};
+			const includeNodeNames = new Set<string>(['node1', 'node2', 'node3']);
+
+			const { filterConnectionsByNodes } = useCanvasOperations({ router });
+			const result = filterConnectionsByNodes(connections, includeNodeNames);
+
+			expect(result).toEqual({
+				[NodeConnectionType.Main]: [[], []],
+			});
+		});
+	});
+
+	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 4ee13581d2..812f453c57 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,
@@ -24,7 +25,6 @@ import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import {
 	EnterpriseEditionFeature,
 	FORM_TRIGGER_NODE_TYPE,
-	QUICKSTART_NOTE_NAME,
 	STICKY_NODE_TYPE,
 	UPDATE_WEBHOOK_ID_NODE_TYPES,
 	WEBHOOK_NODE_TYPE,
@@ -52,6 +52,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import type {
 	CanvasConnection,
 	CanvasConnectionCreateData,
+	CanvasConnectionPort,
 	CanvasNode,
 	CanvasNodeMoveEvent,
 } from '@/types';
@@ -71,7 +72,6 @@ import {
 	generateOffsets,
 	PUSH_NODES_OFFSET,
 } from '@/utils/nodeViewUtils';
-import { isValidNodeConnectionType } from '@/utils/typeGuards';
 import type { Connection } from '@vue-flow/core';
 import type {
 	IConnection,
@@ -85,14 +85,12 @@ import type {
 	INodeTypeDescription,
 	INodeTypeNameVersion,
 	IPinData,
-	ITelemetryTrackProperties,
 	IWorkflowBase,
 	NodeInputConnections,
 	NodeParameterValueType,
 	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';
@@ -107,14 +105,23 @@ type AddNodeDataWithTypeVersion = AddNodeData & {
 	typeVersion: INodeUi['typeVersion'];
 };
 
-type AddNodeOptions = {
+type AddNodesBaseOptions = {
 	dragAndDrop?: boolean;
-	openNDV?: boolean;
 	trackHistory?: boolean;
-	isAutoAdd?: boolean;
+	keepPristine?: boolean;
 	telemetry?: boolean;
 };
 
+type AddNodesOptions = AddNodesBaseOptions & {
+	position?: XYPosition;
+	trackBulk?: boolean;
+};
+
+type AddNodeOptions = AddNodesBaseOptions & {
+	openNDV?: boolean;
+	isAutoAdd?: boolean;
+};
+
 export function useCanvasOperations({ router }: { router: ReturnType<typeof useRouter> }) {
 	const rootStore = useRootStore();
 	const workflowsStore = useWorkflowsStore();
@@ -358,7 +365,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		if (node.type === STICKY_NODE_TYPE) {
 			telemetry.track('User deleted workflow note', {
 				workflow_id: workflowsStore.workflowId,
-				is_welcome_note: node.name === QUICKSTART_NOTE_NAME,
 			});
 		} else {
 			void externalHooks.run('node.deleteNode', { node });
@@ -375,6 +381,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			return;
 		}
 
+		workflowsStore.setNodePristine(node.name, false);
 		setNodeActiveByName(node.name);
 	}
 
@@ -481,17 +488,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		);
 	}
 
-	async function addNodes(
-		nodes: AddedNodesAndConnections['nodes'],
-		options: {
-			dragAndDrop?: boolean;
-			position?: XYPosition;
-			trackHistory?: boolean;
-			trackBulk?: boolean;
-			keepPristine?: boolean;
-			telemetry?: boolean;
-		} = {},
-	) {
+	async function addNodes(nodes: AddedNodesAndConnections['nodes'], options: AddNodesOptions = {}) {
 		let insertPosition = options.position;
 		let lastAddedNode: INodeUi | undefined;
 		const addedNodes: INodeUi[] = [];
@@ -615,8 +612,11 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		}
 
 		void nextTick(() => {
-			workflowsStore.setNodePristine(nodeData.name, true);
+			if (!options.keepPristine) {
+				uiStore.stateIsDirty = true;
+			}
 
+			workflowsStore.setNodePristine(nodeData.name, true);
 			nodeHelpers.matchCredentials(nodeData);
 			nodeHelpers.updateNodeParameterIssues(nodeData);
 			nodeHelpers.updateNodeCredentialIssues(nodeData);
@@ -734,25 +734,22 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	}
 
 	function trackAddStickyNoteNode() {
-		telemetry.trackNodesPanel('nodeView.addSticky', {
+		telemetry.track('User inserted workflow note', {
 			workflow_id: workflowsStore.workflowId,
 		});
 	}
 
 	function trackAddDefaultNode(nodeData: INodeUi, options: AddNodeOptions) {
-		const trackProperties: ITelemetryTrackProperties = {
+		nodeCreatorStore.onNodeAddedToCanvas({
 			node_type: nodeData.type,
 			node_version: nodeData.typeVersion,
 			is_auto_add: options.isAutoAdd,
 			workflow_id: workflowsStore.workflowId,
 			drag_and_drop: options.dragAndDrop,
-		};
-
-		if (uiStore.lastInteractedWithNode) {
-			trackProperties.input_node_type = uiStore.lastInteractedWithNode.type;
-		}
-
-		telemetry.trackNodesPanel('nodeView.addNodeButton', trackProperties);
+			input_node_type: uiStore.lastInteractedWithNode
+				? uiStore.lastInteractedWithNode.type
+				: undefined,
+		});
 	}
 
 	/**
@@ -762,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;
@@ -781,9 +778,8 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			parameters,
 		};
 
-		resolveNodeParameters(nodeData);
-		resolveNodeCredentials(nodeData, nodeTypeDescription);
 		resolveNodeName(nodeData);
+		resolveNodeParameters(nodeData, nodeTypeDescription);
 		resolveNodeWebhook(nodeData, nodeTypeDescription);
 
 		return nodeData;
@@ -832,10 +828,9 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		return nodeVersion;
 	}
 
-	function resolveNodeParameters(node: INodeUi) {
-		const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+	function resolveNodeParameters(node: INodeUi, nodeTypeDescription: INodeTypeDescription) {
 		const nodeParameters = NodeHelpers.getNodeParameters(
-			nodeType?.properties ?? [],
+			nodeTypeDescription?.properties ?? [],
 			node.parameters,
 			true,
 			false,
@@ -845,60 +840,6 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		node.parameters = nodeParameters ?? {};
 	}
 
-	function resolveNodeCredentials(node: INodeUi, nodeTypeDescription: INodeTypeDescription) {
-		const credentialPerType = nodeTypeDescription.credentials
-			?.map((type) => credentialsStore.getUsableCredentialByType(type.name))
-			.flat();
-
-		if (credentialPerType?.length === 1) {
-			const defaultCredential = credentialPerType[0];
-
-			const selectedCredentials = credentialsStore.getCredentialById(defaultCredential.id);
-			const selected = { id: selectedCredentials.id, name: selectedCredentials.name };
-			const credentials = {
-				[defaultCredential.type]: selected,
-			};
-
-			if (nodeTypeDescription.credentials) {
-				const authentication = nodeTypeDescription.credentials.find(
-					(type) => type.name === defaultCredential.type,
-				);
-
-				const authDisplayOptionsHide = authentication?.displayOptions?.hide;
-				const authDisplayOptionsShow = authentication?.displayOptions?.show;
-
-				if (!authDisplayOptionsHide) {
-					if (!authDisplayOptionsShow) {
-						node.credentials = credentials;
-					} else if (
-						Object.keys(authDisplayOptionsShow).length === 1 &&
-						authDisplayOptionsShow.authentication
-					) {
-						// ignore complex case when there's multiple dependencies
-						node.credentials = credentials;
-
-						let parameters: { [key: string]: string } = {};
-						for (const displayOption of Object.keys(authDisplayOptionsShow)) {
-							if (node.parameters && !node.parameters[displayOption]) {
-								parameters = {};
-								node.credentials = undefined;
-								break;
-							}
-							const optionValue = authDisplayOptionsShow[displayOption]?.[0];
-							if (optionValue && typeof optionValue === 'string') {
-								parameters[displayOption] = optionValue;
-							}
-							node.parameters = {
-								...node.parameters,
-								...parameters,
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-
 	function resolveNodePosition(
 		node: Omit<INodeUi, 'position'> & { position?: INodeUi['position'] },
 		nodeTypeDescription: INodeTypeDescription,
@@ -1085,8 +1026,8 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	}
 
 	function resolveNodeWebhook(node: INodeUi, nodeTypeDescription: INodeTypeDescription) {
-		if (nodeTypeDescription.webhooks?.length) {
-			node.webhookId = uuid();
+		if (nodeTypeDescription.webhooks?.length && !node.webhookId) {
+			nodeHelpers.assignWebhookId(node);
 		}
 
 		// if it's a webhook and the path is empty set the UUID as the default path
@@ -1133,7 +1074,10 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	 * Connection operations
 	 */
 
-	function createConnection(connection: Connection, { trackHistory = false } = {}) {
+	function createConnection(
+		connection: Connection,
+		{ trackHistory = false, keepPristine = false } = {},
+	) {
 		const sourceNode = workflowsStore.getNodeById(connection.source);
 		const targetNode = workflowsStore.getNodeById(connection.target);
 		if (!sourceNode || !targetNode) {
@@ -1167,7 +1111,9 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 			nodeHelpers.updateNodeInputIssues(targetNode);
 		});
 
-		uiStore.stateIsDirty = true;
+		if (!keepPristine) {
+			uiStore.stateIsDirty = true;
+		}
 	}
 
 	function revertCreateConnection(connection: [IConnection, IConnection]) {
@@ -1205,11 +1151,9 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 
 			for (const type of Object.keys(connections[nodeName])) {
 				for (const index of Object.keys(connections[nodeName][type])) {
-					for (const connectionIndex of Object.keys(
-						connections[nodeName][type][parseInt(index, 10)],
-					)) {
-						const connectionData =
-							connections[nodeName][type][parseInt(index, 10)][parseInt(connectionIndex, 10)];
+					const connectionsToDelete = connections[nodeName][type][parseInt(index, 10)] ?? [];
+					for (const connectionIndex of Object.keys(connectionsToDelete)) {
+						const connectionData = connectionsToDelete[parseInt(connectionIndex, 10)];
 						if (!connectionData) {
 							continue;
 						}
@@ -1288,11 +1232,63 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		});
 	}
 
+	function revalidateNodeConnections(id: string, connectionMode: CanvasConnectionMode) {
+		const node = workflowsStore.getNodeById(id);
+		const isInput = connectionMode === CanvasConnectionMode.Input;
+		if (!node) {
+			return;
+		}
+
+		const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+		if (!nodeType) {
+			return;
+		}
+
+		const connections = mapLegacyConnectionsToCanvasConnections(
+			workflowsStore.workflow.connections,
+			workflowsStore.workflow.nodes,
+		);
+
+		connections.forEach((connection) => {
+			const isRelevantConnection = isInput ? connection.target === id : connection.source === id;
+
+			if (isRelevantConnection) {
+				const otherNodeId = isInput ? connection.source : connection.target;
+
+				const otherNode = workflowsStore.getNodeById(otherNodeId);
+				if (!otherNode || !connection.data) {
+					return;
+				}
+
+				const [firstNode, secondNode] = isInput ? [otherNode, node] : [node, otherNode];
+
+				if (
+					!isConnectionAllowed(
+						firstNode,
+						secondNode,
+						connection.data.source,
+						connection.data.target,
+					)
+				) {
+					void nextTick(() => deleteConnection(connection));
+				}
+			}
+		});
+	}
+
+	function revalidateNodeInputConnections(id: string) {
+		return revalidateNodeConnections(id, CanvasConnectionMode.Input);
+	}
+
+	function revalidateNodeOutputConnections(id: string) {
+		return revalidateNodeConnections(id, CanvasConnectionMode.Output);
+	}
+
 	function isConnectionAllowed(
 		sourceNode: INodeUi,
 		targetNode: INodeUi,
-		sourceConnection: IConnection,
-		targetConnection: IConnection,
+		sourceConnection: IConnection | CanvasConnectionPort,
+		targetConnection: IConnection | CanvasConnectionPort,
 	): boolean {
 		const blocklist = [STICKY_NODE_TYPE];
 
@@ -1374,41 +1370,27 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		return targetNodeHasInputConnectionOfType && targetNodeHasInputConnectionPortOfType;
 	}
 
-	function addConnections(
+	async function addConnections(
 		connections: CanvasConnectionCreateData[] | CanvasConnection[],
-		{ trackBulk = true, trackHistory = false } = {},
+		{ trackBulk = true, trackHistory = false, keepPristine = false } = {},
 	) {
+		await nextTick(); // Connection creation relies on the nodes being already added to the store
+
 		if (trackBulk && trackHistory) {
 			historyStore.startRecordingUndo();
 		}
 
-		for (const { source, target, data } of connections) {
-			createConnection(
-				{
-					source,
-					sourceHandle: createCanvasConnectionHandleString({
-						mode: CanvasConnectionMode.Output,
-						type: isValidNodeConnectionType(data?.source.type)
-							? data?.source.type
-							: NodeConnectionType.Main,
-						index: data?.source.index ?? 0,
-					}),
-					target,
-					targetHandle: createCanvasConnectionHandleString({
-						mode: CanvasConnectionMode.Input,
-						type: isValidNodeConnectionType(data?.target.type)
-							? data?.target.type
-							: NodeConnectionType.Main,
-						index: data?.target.index ?? 0,
-					}),
-				},
-				{ trackHistory },
-			);
+		for (const connection of connections) {
+			createConnection(connection, { trackHistory, keepPristine });
 		}
 
 		if (trackBulk && trackHistory) {
 			historyStore.stopRecordingUndo();
 		}
+
+		if (!keepPristine) {
+			uiStore.stateIsDirty = true;
+		}
 	}
 
 	/**
@@ -1444,12 +1426,17 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		nodeHelpers.credentialsUpdated.value = false;
 	}
 
-	async function initializeWorkspace(data: IWorkflowDb) {
-		// Set workflow data
+	function initializeWorkspace(data: IWorkflowDb) {
 		workflowHelpers.initState(data);
 
-		// Add nodes and connections
-		await addNodes(data.nodes, { keepPristine: true });
+		data.nodes.forEach((node) => {
+			const nodeTypeDescription = requireNodeTypeDescription(node.type, node.typeVersion);
+			nodeHelpers.matchCredentials(node);
+			resolveNodeParameters(node, nodeTypeDescription);
+			resolveNodeWebhook(node, nodeTypeDescription);
+		});
+
+		workflowsStore.setNodes(data.nodes);
 		workflowsStore.setConnections(data.connections);
 	}
 
@@ -1555,13 +1542,14 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 					sourceIndex++
 				) {
 					const nodeSourceConnections = [];
-					if (currentConnections[sourceNode][type][sourceIndex]) {
+					const connectionsToCheck = currentConnections[sourceNode][type][sourceIndex];
+					if (connectionsToCheck) {
 						for (
 							connectionIndex = 0;
-							connectionIndex < currentConnections[sourceNode][type][sourceIndex].length;
+							connectionIndex < connectionsToCheck.length;
 							connectionIndex++
 						) {
-							connectionData = currentConnections[sourceNode][type][sourceIndex][connectionIndex];
+							connectionData = connectionsToCheck[connectionIndex];
 							if (!createNodeNames.includes(connectionData.node)) {
 								// Node does not get created so skip input connection
 								continue;
@@ -1621,7 +1609,7 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		}
 
 		await addNodes(Object.values(tempWorkflow.nodes), { trackBulk: false, trackHistory });
-		addConnections(
+		await addConnections(
 			mapLegacyConnectionsToCanvasConnections(
 				tempWorkflow.connectionsBySourceNode,
 				Object.values(tempWorkflow.nodes),
@@ -1676,7 +1664,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;
@@ -1686,13 +1674,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);
 					}
 				});
 			}
@@ -1872,17 +1860,15 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	}
 
 	function filterConnectionsByNodes(
-		connections: Record<string, IConnection[][]>,
+		connections: INodeConnections,
 		includeNodeNames: Set<string>,
 	): INodeConnections {
 		const filteredConnections: INodeConnections = {};
 
 		for (const [type, typeConnections] of Object.entries(connections)) {
-			const validConnections = typeConnections
-				.map((sourceConnections) =>
-					sourceConnections.filter((connection) => includeNodeNames.has(connection.node)),
-				)
-				.filter((sourceConnections) => sourceConnections.length > 0);
+			const validConnections = typeConnections.map((sourceConnections) =>
+				(sourceConnections ?? []).filter((connection) => includeNodeNames.has(connection.node)),
+			);
 
 			if (validConnections.length) {
 				filteredConnections[type] = validConnections;
@@ -1902,6 +1888,12 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 	async function copyNodes(ids: string[]) {
 		const workflowData = deepCopy(getNodesToSave(workflowsStore.getNodesByIds(ids)));
 
+		workflowData.meta = {
+			...workflowData.meta,
+			...workflowsStore.workflow.meta,
+			instanceId: rootStore.instanceId,
+		};
+
 		await clipboard.copy(JSON.stringify(workflowData, null, 2));
 
 		telemetry.track('User copied nodes', {
@@ -1915,6 +1907,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 (!['manual', 'evaluation'].includes(data.mode)) {
+			workflowsStore.setWorkflowPinData({});
+		}
+
+		uiStore.stateIsDirty = false;
+
+		return data;
+	}
+
 	return {
 		lastClickPosition,
 		editableWorkflow,
@@ -1950,10 +1968,15 @@ export function useCanvasOperations({ router }: { router: ReturnType<typeof useR
 		deleteConnection,
 		revertDeleteConnection,
 		deleteConnectionsByNodeId,
+		revalidateNodeInputConnections,
+		revalidateNodeOutputConnections,
 		isConnectionAllowed,
+		filterConnectionsByNodes,
 		importWorkflowData,
 		fetchWorkflowDataFromUrl,
 		resetWorkspace,
 		initializeWorkspace,
+		resolveNodeWebhook,
+		openExecution,
 	};
 }
diff --git a/packages/editor-ui/src/composables/__tests__/useCanvasPanning.test.ts b/packages/editor-ui/src/composables/useCanvasPanning.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useCanvasPanning.test.ts
rename to packages/editor-ui/src/composables/useCanvasPanning.test.ts
diff --git a/packages/editor-ui/src/composables/useCanvasTraversal.test.ts b/packages/editor-ui/src/composables/useCanvasTraversal.test.ts
new file mode 100644
index 0000000000..16ff5f1389
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCanvasTraversal.test.ts
@@ -0,0 +1,180 @@
+import { useCanvasTraversal } from '@/composables/useCanvasTraversal';
+import type { CanvasNode } from '@/types';
+import type { VueFlowStore } from '@vue-flow/core';
+import { mock } from 'vitest-mock-extended';
+
+describe('useCanvasTraversal', () => {
+	const mockGetIncomers = vi.fn();
+	const mockGetOutgoers = vi.fn();
+
+	const vueFlow = mock<VueFlowStore>({
+		getIncomers: mockGetIncomers,
+		getOutgoers: mockGetOutgoers,
+	});
+
+	const {
+		sortNodesByVerticalPosition,
+		getIncomingNodes,
+		getOutgoingNodes,
+		getSiblingNodes,
+		getDownstreamNodes,
+		getUpstreamNodes,
+	} = useCanvasTraversal(vueFlow);
+
+	describe('sortNodesByVerticalPosition', () => {
+		it('should sort nodes by their vertical position', () => {
+			const nodes: CanvasNode[] = [
+				{ id: '1', position: { x: 0, y: 200 } },
+				{ id: '2', position: { x: 0, y: 100 } },
+			];
+			const result = sortNodesByVerticalPosition(nodes);
+			expect(result).toEqual([
+				{ id: '2', position: { x: 0, y: 100 } },
+				{ id: '1', position: { x: 0, y: 200 } },
+			]);
+		});
+	});
+
+	describe('getIncomingNodes', () => {
+		it('should return sorted incoming nodes by vertical position', () => {
+			const incomingNodes = [
+				{ id: '1', position: { x: 0, y: 200 } },
+				{ id: '2', position: { x: 0, y: 100 } },
+			];
+			mockGetIncomers.mockReturnValue([...incomingNodes]);
+			const result = getIncomingNodes('3');
+			expect(result).toEqual([incomingNodes[1], incomingNodes[0]]);
+		});
+	});
+
+	describe('getOutgoingNodes', () => {
+		it('should return sorted outgoing nodes by vertical position', () => {
+			const outgoingNodes = [
+				{ id: '1', position: { x: 0, y: 300 } },
+				{ id: '2', position: { x: 0, y: 150 } },
+			];
+			mockGetOutgoers.mockReturnValue([...outgoingNodes]);
+			const result = getOutgoingNodes('3');
+			expect(result).toEqual([outgoingNodes[1], outgoingNodes[0]]);
+		});
+	});
+
+	describe('getSiblingNodes', () => {
+		it('should return sorted sibling nodes by vertical position', () => {
+			const incomingNodes = [{ id: '1', position: { x: 0, y: 200 } }];
+			const incomingNodesOutgoingChildren = [{ id: '2', position: { x: 0, y: 400 } }];
+			const outgoingNodes = [{ id: '3', position: { x: 0, y: 300 } }];
+			const outgoingNodesIncomingChildren = [{ id: '4', position: { x: 0, y: 500 } }];
+
+			mockGetIncomers.mockReturnValueOnce(incomingNodes);
+			mockGetOutgoers.mockReturnValueOnce(incomingNodesOutgoingChildren);
+			mockGetOutgoers.mockReturnValueOnce(outgoingNodes);
+			mockGetIncomers.mockReturnValueOnce(outgoingNodesIncomingChildren);
+
+			const result = getSiblingNodes('5');
+			expect(result).toEqual([...incomingNodesOutgoingChildren, ...outgoingNodesIncomingChildren]);
+		});
+	});
+
+	describe('getDownstreamNodes', () => {
+		it('should return sorted downstream nodes by vertical position - one level', () => {
+			const outgoingNodes = [{ id: '2', position: { x: 0, y: 100 } }];
+
+			mockGetOutgoers.mockReturnValue(outgoingNodes);
+
+			const result = getDownstreamNodes('1');
+			expect(result).toEqual([{ id: '2', position: { x: 0, y: 100 } }]);
+		});
+
+		it('should return sorted downstream nodes by vertical position - multiple levels', () => {
+			const outgoingNodes1 = [{ id: '1', position: { x: 0, y: 100 } }];
+			const outgoingNodes2 = [{ id: '2', position: { x: 0, y: 200 } }];
+			const outgoingNodes3 = [{ id: '3', position: { x: 0, y: 300 } }];
+
+			mockGetOutgoers
+				.mockReturnValueOnce(outgoingNodes1)
+				.mockReturnValueOnce(outgoingNodes2)
+				.mockReturnValueOnce(outgoingNodes3);
+
+			const result = getDownstreamNodes('4');
+			expect(result).toEqual([...outgoingNodes1, ...outgoingNodes2, ...outgoingNodes3]);
+		});
+
+		it('should handle circular references in downstream nodes', () => {
+			const outgoingNodes1 = [{ id: '1', position: { x: 0, y: 100 } }];
+			const outgoingNodes2 = [
+				{ id: '1', position: { x: 0, y: 100 } },
+				{ id: '2', position: { x: 0, y: 300 } },
+				{ id: '3', position: { x: 0, y: 400 } },
+			];
+			const outgoingNodes3 = [
+				{ id: '1', position: { x: 0, y: 100 } },
+				{ id: '4', position: { x: 0, y: 600 } },
+			];
+
+			mockGetOutgoers
+				.mockReturnValueOnce(outgoingNodes1)
+				.mockReturnValueOnce(outgoingNodes2)
+				.mockReturnValueOnce(outgoingNodes3);
+
+			const result = getDownstreamNodes('5');
+			expect(result).toEqual([
+				outgoingNodes1[0],
+				outgoingNodes2[1],
+				outgoingNodes2[2],
+				outgoingNodes3[1],
+			]);
+		});
+	});
+
+	describe('getUpstreamNodes', () => {
+		it('should return sorted upstream nodes by vertical position - one level', () => {
+			const incomingNodes = [{ id: '2', position: { x: 0, y: 100 } }];
+
+			mockGetIncomers.mockReturnValue(incomingNodes);
+
+			const result = getUpstreamNodes('1');
+			expect(result).toEqual([{ id: '2', position: { x: 0, y: 100 } }]);
+		});
+
+		it('should return sorted upstream nodes by vertical position - multiple levels', () => {
+			const incomingNodes1 = [{ id: '1', position: { x: 0, y: 100 } }];
+			const incomingNodes2 = [{ id: '2', position: { x: 0, y: 200 } }];
+			const incomingNodes3 = [{ id: '3', position: { x: 0, y: 300 } }];
+
+			mockGetIncomers
+				.mockReturnValueOnce(incomingNodes1)
+				.mockReturnValueOnce(incomingNodes2)
+				.mockReturnValueOnce(incomingNodes3);
+
+			const result = getUpstreamNodes('4');
+			expect(result).toEqual([...incomingNodes1, ...incomingNodes2, ...incomingNodes3]);
+		});
+
+		it('should handle circular references in upstream nodes', () => {
+			const incomingNodes1 = [{ id: '1', position: { x: 0, y: 100 } }];
+			const incomingNodes2 = [
+				{ id: '1', position: { x: 0, y: 100 } },
+				{ id: '2', position: { x: 0, y: 300 } },
+				{ id: '3', position: { x: 0, y: 400 } },
+			];
+			const incomingNodes3 = [
+				{ id: '1', position: { x: 0, y: 100 } },
+				{ id: '4', position: { x: 0, y: 600 } },
+			];
+
+			mockGetIncomers
+				.mockReturnValueOnce(incomingNodes1)
+				.mockReturnValueOnce(incomingNodes2)
+				.mockReturnValueOnce(incomingNodes3);
+
+			const result = getUpstreamNodes('5');
+			expect(result).toEqual([
+				incomingNodes1[0],
+				incomingNodes2[1],
+				incomingNodes2[2],
+				incomingNodes3[1],
+			]);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/useCanvasTraversal.ts b/packages/editor-ui/src/composables/useCanvasTraversal.ts
new file mode 100644
index 0000000000..f325cb31d0
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCanvasTraversal.ts
@@ -0,0 +1,68 @@
+import type { CanvasNode } from '@/types';
+import type { VueFlowStore } from '@vue-flow/core';
+
+export function useCanvasTraversal({ getIncomers, getOutgoers }: VueFlowStore) {
+	function sortNodesByVerticalPosition(nodes: CanvasNode[]) {
+		return nodes.sort((a, b) => a.position.y - b.position.y);
+	}
+
+	function getIncomingNodes(id: string) {
+		return sortNodesByVerticalPosition(getIncomers(id));
+	}
+
+	function getOutgoingNodes(id: string) {
+		return sortNodesByVerticalPosition(getOutgoers(id));
+	}
+
+	function getSiblingNodes(id: string) {
+		const incomingSiblings = getIncomers(id).flatMap((incomingNode) =>
+			getOutgoers(incomingNode.id),
+		);
+		const outgoingSiblings = getOutgoers(id).flatMap((outgoingNode) =>
+			getIncomers(outgoingNode.id),
+		);
+
+		return sortNodesByVerticalPosition(
+			[...incomingSiblings, ...outgoingSiblings].filter(
+				(node, index, nodes) => nodes.findIndex((n) => n.id === node.id) === index,
+			),
+		);
+	}
+
+	function getDownstreamNodes(id: string, visited: string[] = []): CanvasNode[] {
+		if (visited.includes(id)) {
+			return [];
+		}
+		visited.push(id);
+
+		const downstreamNodes = getOutgoers(id);
+
+		return [
+			...downstreamNodes,
+			...downstreamNodes.flatMap((node) => getDownstreamNodes(node.id, visited)),
+		].filter((node, index, nodes) => nodes.findIndex((n) => n.id === node.id) === index);
+	}
+
+	function getUpstreamNodes(id: string, visited: string[] = []): CanvasNode[] {
+		if (visited.includes(id)) {
+			return [];
+		}
+		visited.push(id);
+
+		const upstreamNodes = getIncomers(id);
+
+		return [
+			...upstreamNodes,
+			...upstreamNodes.flatMap((node) => getUpstreamNodes(node.id, visited)),
+		].filter((node, index, nodes) => nodes.findIndex((n) => n.id === node.id) === index);
+	}
+
+	return {
+		sortNodesByVerticalPosition,
+		getIncomingNodes,
+		getOutgoingNodes,
+		getSiblingNodes,
+		getDownstreamNodes,
+		getUpstreamNodes,
+	};
+}
diff --git a/packages/editor-ui/src/composables/__tests__/useClipboard.test.ts b/packages/editor-ui/src/composables/useClipboard.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useClipboard.test.ts
rename to packages/editor-ui/src/composables/useClipboard.test.ts
diff --git a/packages/editor-ui/src/composables/useClipboard.ts b/packages/editor-ui/src/composables/useClipboard.ts
index 1cd4c9ef70..6716494f94 100644
--- a/packages/editor-ui/src/composables/useClipboard.ts
+++ b/packages/editor-ui/src/composables/useClipboard.ts
@@ -14,7 +14,7 @@ export function useClipboard(
 	const { debounce } = useDebounce();
 	const { copy, copied, isSupported, text } = useClipboardCore({ legacy: true });
 
-	const ignoreClasses = ['el-messsage-box', 'ignore-key-press'];
+	const ignoreClasses = ['el-messsage-box', 'ignore-key-press-canvas'];
 	const initialized = ref(false);
 
 	const onPasteCallback = ref<ClipboardEventFn | null>(options.onPaste || null);
diff --git a/packages/editor-ui/src/composables/useCodeEditor.test.ts b/packages/editor-ui/src/composables/useCodeEditor.test.ts
new file mode 100644
index 0000000000..7dbb31f110
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCodeEditor.test.ts
@@ -0,0 +1,103 @@
+import { renderComponent } from '@/__tests__/render';
+import { EditorView } from '@codemirror/view';
+import { createTestingPinia } from '@pinia/testing';
+import { waitFor } from '@testing-library/vue';
+import { setActivePinia } from 'pinia';
+import { beforeEach, describe, vi } from 'vitest';
+import { defineComponent, h, ref, toValue } from 'vue';
+import { useCodeEditor } from './useCodeEditor';
+import userEvent from '@testing-library/user-event';
+
+describe('useCodeEditor', () => {
+	const defaultOptions: Omit<Parameters<typeof useCodeEditor>[0], 'editorRef'> = {
+		language: 'javaScript',
+	};
+
+	const renderCodeEditor = async (options: Partial<typeof defaultOptions> = defaultOptions) => {
+		let codeEditor!: ReturnType<typeof useCodeEditor>;
+		const renderResult = renderComponent(
+			defineComponent({
+				setup() {
+					const root = ref<HTMLElement>();
+					codeEditor = useCodeEditor({ ...defaultOptions, ...options, editorRef: root });
+
+					return () => h('div', { ref: root, 'data-test-id': 'editor-root' });
+				},
+			}),
+			{ props: { options } },
+		);
+		expect(renderResult.getByTestId('editor-root')).toBeInTheDocument();
+		await waitFor(() => toValue(codeEditor.editor));
+		return { renderResult, codeEditor };
+	};
+
+	beforeEach(() => {
+		setActivePinia(createTestingPinia());
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+		vi.useRealTimers();
+	});
+
+	it('should create an editor', async () => {
+		const { codeEditor } = await renderCodeEditor();
+
+		await waitFor(() => expect(toValue(codeEditor.editor)).toBeInstanceOf(EditorView));
+	});
+
+	it('should focus editor', async () => {
+		const { renderResult, codeEditor } = await renderCodeEditor({});
+
+		const root = renderResult.getByTestId('editor-root');
+		const input = root.querySelector('.cm-line') as HTMLDivElement;
+
+		await userEvent.click(input);
+
+		expect(codeEditor.editor.value?.hasFocus).toBe(true);
+	});
+
+	it('should emit changes', async () => {
+		vi.useFakeTimers();
+
+		const user = userEvent.setup({
+			advanceTimers: vi.advanceTimersByTime,
+		});
+
+		const onChange = vi.fn();
+		const { renderResult } = await renderCodeEditor({
+			onChange,
+		});
+
+		const root = renderResult.getByTestId('editor-root');
+		const input = root.querySelector('.cm-line') as HTMLDivElement;
+
+		await user.type(input, 'test');
+
+		vi.advanceTimersByTime(300);
+
+		expect(onChange.mock.calls[0][0].state.doc.toString()).toEqual('test');
+	});
+
+	it('should emit debounced changes before unmount', async () => {
+		vi.useFakeTimers();
+
+		const user = userEvent.setup({
+			advanceTimers: vi.advanceTimersByTime,
+		});
+
+		const onChange = vi.fn();
+		const { renderResult } = await renderCodeEditor({
+			onChange,
+		});
+
+		const root = renderResult.getByTestId('editor-root');
+		const input = root.querySelector('.cm-line') as HTMLDivElement;
+
+		await user.type(input, 'test');
+
+		renderResult.unmount();
+
+		expect(onChange.mock.calls[0][0].state.doc.toString()).toEqual('test');
+	});
+});
diff --git a/packages/editor-ui/src/composables/useCodeEditor.ts b/packages/editor-ui/src/composables/useCodeEditor.ts
new file mode 100644
index 0000000000..05afc3b2d9
--- /dev/null
+++ b/packages/editor-ui/src/composables/useCodeEditor.ts
@@ -0,0 +1,456 @@
+import { codeEditorTheme } from '@/components/CodeNodeEditor/theme';
+import { editorKeymap } from '@/plugins/codemirror/keymap';
+import { useTypescript } from '@/plugins/codemirror/typescript/client/useTypescript';
+import { closeCursorInfoBox } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
+import { closeBrackets, closeCompletion, completionStatus } from '@codemirror/autocomplete';
+import { history, historyField } from '@codemirror/commands';
+import { javascript } from '@codemirror/lang-javascript';
+import { json } from '@codemirror/lang-json';
+import { python } from '@codemirror/lang-python';
+import { bracketMatching, foldGutter, foldState, indentOnInput } from '@codemirror/language';
+import { highlightSelectionMatches } from '@codemirror/search';
+import {
+	Compartment,
+	EditorSelection,
+	EditorState,
+	type EditorStateConfig,
+	type Extension,
+	type SelectionRange,
+} from '@codemirror/state';
+import {
+	drawSelection,
+	dropCursor,
+	EditorView,
+	highlightActiveLineGutter,
+	highlightActiveLine,
+	highlightSpecialChars,
+	keymap,
+	lineNumbers,
+	type ViewUpdate,
+} from '@codemirror/view';
+import { indentationMarkers } from '@replit/codemirror-indentation-markers';
+import { html } from 'codemirror-lang-html-n8n';
+import { jsonParse, type CodeExecutionMode, type IDataObject } from 'n8n-workflow';
+import { v4 as uuid } from 'uuid';
+import {
+	computed,
+	onBeforeUnmount,
+	onMounted,
+	ref,
+	toRef,
+	toValue,
+	watch,
+	type MaybeRefOrGetter,
+	type Ref,
+} from 'vue';
+import { useCompleter } from '../components/CodeNodeEditor/completer';
+import { mappingDropCursor } from '../plugins/codemirror/dragAndDrop';
+import { languageFacet, type CodeEditorLanguage } from '../plugins/codemirror/format';
+import { debounce } from 'lodash-es';
+import { ignoreUpdateAnnotation } from '../utils/forceParse';
+
+export type CodeEditorLanguageParamsMap = {
+	json: {};
+	html: {};
+	javaScript: { mode: CodeExecutionMode };
+	python: { mode: CodeExecutionMode };
+};
+
+export const useCodeEditor = <L extends CodeEditorLanguage>({
+	editorRef,
+	editorValue,
+	language,
+	languageParams,
+	placeholder,
+	extensions = [],
+	isReadOnly = false,
+	theme = {},
+	onChange = () => {},
+	id = uuid(),
+}: {
+	editorRef: MaybeRefOrGetter<HTMLElement | undefined>;
+	language: MaybeRefOrGetter<L>;
+	editorValue?: MaybeRefOrGetter<string>;
+	placeholder?: MaybeRefOrGetter<string>;
+	extensions?: MaybeRefOrGetter<Extension[]>;
+	isReadOnly?: MaybeRefOrGetter<boolean>;
+	theme?: MaybeRefOrGetter<{
+		maxHeight?: string;
+		minHeight?: string;
+		rows?: number;
+	}>;
+	languageParams?: MaybeRefOrGetter<CodeEditorLanguageParamsMap[L]>;
+	id?: MaybeRefOrGetter<string>;
+	onChange?: (viewUpdate: ViewUpdate) => void;
+}) => {
+	const editor = ref<EditorView>();
+	const hasFocus = ref(false);
+	const hasChanges = ref(false);
+	const selection = ref<SelectionRange>(EditorSelection.cursor(0)) as Ref<SelectionRange>;
+	const customExtensions = ref<Compartment>(new Compartment());
+	const readOnlyExtensions = ref<Compartment>(new Compartment());
+	const telemetryExtensions = ref<Compartment>(new Compartment());
+	const languageExtensions = ref<Compartment>(new Compartment());
+	const themeExtensions = ref<Compartment>(new Compartment());
+	const autocompleteStatus = ref<'pending' | 'active' | null>(null);
+	const dragging = ref(false);
+	const storedStateFields = { fold: foldState, history: historyField };
+
+	const storedStateId = computed(() => `${toValue(id)}.editorState`);
+	const mode = computed(() => {
+		const params = toValue(languageParams);
+		return params && 'mode' in params ? params.mode : 'runOnceForAllItems';
+	});
+	const { createWorker: createTsWorker } = useTypescript(editor, mode, id);
+
+	function getInitialLanguageExtensions(lang: CodeEditorLanguage): Extension[] {
+		switch (lang) {
+			case 'javaScript':
+				return [javascript()];
+			default:
+				return [];
+		}
+	}
+
+	async function getFullLanguageExtensions(): Promise<Extension[]> {
+		if (!editor.value) return [];
+		const lang = toValue(language);
+		const langExtensions: Extension[] = [languageFacet.of(lang)];
+
+		switch (lang) {
+			case 'javaScript': {
+				const tsExtension = await createTsWorker();
+				langExtensions.push(tsExtension);
+				break;
+			}
+			case 'python': {
+				const pythonAutocomplete = useCompleter(mode, editor.value ?? null).autocompletionExtension(
+					'python',
+				);
+				langExtensions.push([python(), pythonAutocomplete]);
+				break;
+			}
+			case 'json':
+				langExtensions.push(json());
+				break;
+			case 'html':
+				langExtensions.push(html());
+				break;
+		}
+
+		return langExtensions;
+	}
+
+	function readEditorValue(): string {
+		return editor.value?.state.doc.toString() ?? '';
+	}
+
+	function updateSelection(update: ViewUpdate) {
+		const currentSelection = selection.value;
+		const newSelection = update.state.selection.ranges[0];
+
+		if (!currentSelection?.eq(newSelection)) {
+			selection.value = newSelection;
+		}
+	}
+
+	const emitChanges = debounce((update: ViewUpdate) => {
+		onChange(update);
+	}, 300);
+	const lastChange = ref<ViewUpdate>();
+
+	function onEditorUpdate(update: ViewUpdate) {
+		autocompleteStatus.value = completionStatus(update.view.state);
+		updateSelection(update);
+
+		const shouldIgnoreUpdate = update.transactions.some((tr) =>
+			tr.annotation(ignoreUpdateAnnotation),
+		);
+
+		if (update.docChanged && !shouldIgnoreUpdate) {
+			lastChange.value = update;
+			hasChanges.value = true;
+			emitChanges(update);
+		}
+	}
+
+	function blur() {
+		if (editor.value) {
+			editor.value.contentDOM.blur();
+			closeCompletion(editor.value);
+			closeCursorInfoBox(editor.value);
+		}
+	}
+
+	function blurOnClickOutside(event: MouseEvent) {
+		if (event.target && !dragging.value && !editor.value?.dom.contains(event.target as Node)) {
+			blur();
+		}
+		dragging.value = false;
+	}
+
+	async function setLanguageExtensions() {
+		if (!editor.value) return;
+		const initialExtensions = getInitialLanguageExtensions(toValue(language));
+		if (initialExtensions.length > 0) {
+			editor.value.dispatch({
+				effects: languageExtensions.value.reconfigure(initialExtensions),
+			});
+		}
+
+		editor.value.dispatch({
+			effects: languageExtensions.value.reconfigure(await getFullLanguageExtensions()),
+		});
+	}
+
+	function getReadOnlyExtensions() {
+		return [
+			EditorState.readOnly.of(toValue(isReadOnly)),
+			EditorView.editable.of(!toValue(isReadOnly)),
+			highlightSpecialChars(),
+		];
+	}
+
+	function setReadOnlyExtensions() {
+		if (!editor.value) return;
+		editor.value.dispatch({
+			effects: readOnlyExtensions.value.reconfigure([getReadOnlyExtensions()]),
+		});
+	}
+
+	watch(toRef(editorRef), async () => {
+		const parent = toValue(editorRef);
+
+		if (!parent) return;
+
+		const initialValue = toValue(editorValue) ? toValue(editorValue) : toValue(placeholder);
+
+		const allExtensions = [
+			customExtensions.value.of(toValue(extensions)),
+			readOnlyExtensions.value.of(getReadOnlyExtensions()),
+			telemetryExtensions.value.of([]),
+			languageExtensions.value.of(getInitialLanguageExtensions(toValue(language))),
+			themeExtensions.value.of(codeEditorTheme(toValue(theme))),
+			EditorView.updateListener.of(onEditorUpdate),
+			EditorView.focusChangeEffect.of((_, newHasFocus) => {
+				hasFocus.value = newHasFocus;
+				selection.value = state.selection.ranges[0];
+				if (!newHasFocus) {
+					autocompleteStatus.value = null;
+				}
+				return null;
+			}),
+			EditorState.allowMultipleSelections.of(true),
+			EditorView.clickAddsSelectionRange.of(
+				(event) => event.altKey && !event.metaKey && !event.shiftKey,
+			),
+			EditorView.contentAttributes.of({ 'data-gramm': 'false' }), // disable grammarly
+			EditorView.domEventHandlers({
+				mousedown: () => {
+					dragging.value = true;
+				},
+			}),
+			highlightSelectionMatches({ minSelectionLength: 2 }),
+			lineNumbers(),
+			drawSelection(),
+			foldGutter({
+				markerDOM: (open) => {
+					const svgNS = 'http://www.w3.org/2000/svg';
+					const wrapper = document.createElement('div');
+					wrapper.classList.add('cm-fold-marker');
+					const svgElement = document.createElementNS(svgNS, 'svg');
+					svgElement.setAttribute('viewBox', '0 0 10 10');
+					svgElement.setAttribute('width', '10');
+					svgElement.setAttribute('height', '10');
+					const pathElement = document.createElementNS(svgNS, 'path');
+					const d = open ? 'M1 3 L5 7 L9 3' : 'M3 1 L7 5 L3 9'; // Chevron paths
+					pathElement.setAttribute('d', d);
+					pathElement.setAttribute('fill', 'none');
+					pathElement.setAttribute('stroke', 'currentColor');
+					pathElement.setAttribute('stroke-width', '1.5');
+					pathElement.setAttribute('stroke-linecap', 'round');
+					svgElement.appendChild(pathElement);
+					wrapper.appendChild(svgElement);
+					return wrapper;
+				},
+			}),
+			EditorView.lineWrapping,
+			history(),
+			dropCursor(),
+			indentOnInput(),
+			bracketMatching(),
+			closeBrackets(),
+			highlightActiveLine(),
+			highlightActiveLineGutter(),
+			mappingDropCursor(),
+			indentationMarkers({
+				highlightActiveBlock: true,
+				markerType: 'fullScope',
+				colors: {
+					activeDark: 'var(--color-code-indentation-marker-active)',
+					activeLight: 'var(--color-code-indentation-marker-active)',
+					dark: 'var(--color-code-indentation-marker)',
+					light: 'var(--color-code-indentation-marker)',
+				},
+			}),
+			keymap.of(editorKeymap),
+		];
+
+		const parsedStoredState = jsonParse<IDataObject | null>(
+			localStorage.getItem(storedStateId.value) ?? '',
+			{
+				fallbackValue: null,
+			},
+		);
+		const config: EditorStateConfig = {
+			doc: initialValue,
+			extensions: allExtensions,
+		};
+
+		const state =
+			// Only restore from localstorage when code did not change
+			parsedStoredState && parsedStoredState.doc === initialValue
+				? EditorState.fromJSON(parsedStoredState, config, storedStateFields)
+				: EditorState.create(config);
+
+		if (editor.value) {
+			editor.value.destroy();
+		}
+		editor.value = new EditorView({
+			parent,
+			state,
+			scrollTo: EditorView.scrollIntoView(state.selection.main, { y: 'center' }),
+		});
+
+		editor.value.dispatch({
+			effects: languageExtensions.value.reconfigure(await getFullLanguageExtensions()),
+		});
+	});
+
+	watch(extensions, () => {
+		if (editor.value) {
+			editor.value.dispatch({
+				effects: customExtensions.value.reconfigure(toValue(extensions)),
+			});
+		}
+	});
+
+	watch(toRef(language), setLanguageExtensions);
+
+	watch(toRef(isReadOnly), setReadOnlyExtensions);
+
+	watch(toRef(theme), () => {
+		if (editor.value) {
+			editor.value.dispatch({
+				effects: themeExtensions.value.reconfigure(codeEditorTheme(toValue(theme))),
+			});
+		}
+	});
+
+	watch(toRef(editorValue), () => {
+		if (!editor.value || hasFocus.value) return;
+
+		const newValue = toValue(editorValue);
+		const currentValue = readEditorValue();
+		if (newValue === undefined || newValue === currentValue) return;
+
+		editor.value.dispatch({
+			changes: { from: 0, to: currentValue.length, insert: newValue },
+		});
+	});
+
+	onMounted(() => {
+		document.addEventListener('click', blurOnClickOutside);
+	});
+
+	onBeforeUnmount(() => {
+		document.removeEventListener('click', blurOnClickOutside);
+
+		if (editor.value) {
+			const stateToStore = editor.value.state.toJSON(storedStateFields);
+			try {
+				localStorage.setItem(storedStateId.value, JSON.stringify(stateToStore));
+			} catch (error) {
+				// Code is too large, localStorage quota exceeded
+				localStorage.removeItem(storedStateId.value);
+			}
+
+			if (lastChange.value) {
+				onChange(lastChange.value);
+			}
+			editor.value.destroy();
+		}
+	});
+
+	function setCursorPosition(pos: number | 'end'): void {
+		const finalPos = pos === 'end' ? (editor.value?.state.doc.length ?? 0) : pos;
+		editor.value?.dispatch({ selection: { head: finalPos, anchor: finalPos } });
+	}
+
+	function select(anchor: number, head: number | 'end' = 'end'): void {
+		editor.value?.dispatch({
+			selection: {
+				anchor,
+				head: head === 'end' ? (editor.value?.state.doc.length ?? 0) : head,
+			},
+		});
+	}
+
+	function getLine(lineNumber: number | 'last' | 'first') {
+		if (!editor.value) return;
+
+		const { doc } = editor.value.state;
+		switch (lineNumber) {
+			case 'first':
+				return doc.lineAt(0);
+			case 'last':
+				return doc.lineAt(doc.length - 1);
+			default:
+				return doc.line(lineNumber);
+		}
+	}
+
+	function selectLine(lineNumber: number | 'last' | 'first'): void {
+		if (!editor.value) return;
+
+		const line = getLine(lineNumber);
+
+		if (!line) return;
+
+		editor.value.dispatch({
+			selection: EditorSelection.range(line.from, line.to),
+		});
+	}
+
+	function highlightLine(lineNumber: number | 'last' | 'first'): void {
+		if (!editor.value) return;
+
+		const line = getLine(lineNumber);
+
+		if (!line) return;
+
+		editor.value.dispatch({ selection: EditorSelection.cursor(line.from) });
+	}
+
+	const selectAll = () => select(0, 'end');
+
+	function focus(): void {
+		if (hasFocus.value) return;
+		editor.value?.focus();
+	}
+
+	return {
+		editor,
+		hasFocus,
+		hasChanges,
+		selection,
+		readEditorValue,
+		setCursorPosition,
+		select,
+		selectLine,
+		selectAll,
+		highlightLine,
+		focus,
+		blur,
+	};
+};
diff --git a/packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts b/packages/editor-ui/src/composables/useContextMenu.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useContextMenu.test.ts
rename to packages/editor-ui/src/composables/useContextMenu.test.ts
diff --git a/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts b/packages/editor-ui/src/composables/useDataSchema.test.ts
similarity index 75%
rename from packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
rename to packages/editor-ui/src/composables/useDataSchema.test.ts
index c359f60f57..212f767675 100644
--- a/packages/editor-ui/src/composables/__tests__/useDataSchema.test.ts
+++ b/packages/editor-ui/src/composables/useDataSchema.test.ts
@@ -1,6 +1,16 @@
 import jp from 'jsonpath';
-import { useDataSchema } from '@/composables/useDataSchema';
-import type { Schema } from '@/Interface';
+import { useDataSchema, useFlattenSchema } from '@/composables/useDataSchema';
+import type { IExecutionResponse, INodeUi, Schema } from '@/Interface';
+import { setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import {
+	NodeConnectionType,
+	type INodeExecutionData,
+	type ITaskDataConnections,
+} from 'n8n-workflow';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+
+vi.mock('@/stores/workflows.store');
 
 describe('useDataSchema', () => {
 	const getSchema = useDataSchema().getSchema;
@@ -524,4 +534,154 @@ describe('useDataSchema', () => {
 			expect(filterSchema(flatSchema, '')).toEqual(flatSchema);
 		});
 	});
+	describe('getNodeInputData', () => {
+		const getNodeInputData = useDataSchema().getNodeInputData;
+
+		beforeEach(() => {
+			setActivePinia(createTestingPinia());
+		});
+
+		afterEach(() => {
+			vi.clearAllMocks();
+		});
+
+		const name = 'a';
+		const makeMockData = (data: ITaskDataConnections | undefined, runDataKey?: string) => ({
+			data: {
+				resultData: {
+					runData: {
+						[runDataKey ?? name]: [{ data, startTime: 0, executionTime: 0, source: [] }],
+					},
+				},
+			},
+		});
+
+		const mockExecutionDataMarker = Symbol() as unknown as INodeExecutionData[];
+		const Main = NodeConnectionType.Main;
+
+		test.each<
+			[
+				[Partial<INodeUi> | null, number, number, Partial<IExecutionResponse> | null],
+				ReturnType<typeof getNodeInputData>,
+			]
+		>([
+			//
+			// Null / Out of Bounds Cases
+			//
+			[[null, 0, 0, null], []],
+			[[{ name }, 0, 0, null], []],
+			[[{ name }, 0, 0, { data: undefined }], []],
+			[[{ name }, 0, 0, { data: { resultData: { runData: {} } } }], []],
+			[[{ name }, 0, 0, { data: { resultData: { runData: { [name]: [] } } } }], []],
+			[[{ name }, 0, 0, makeMockData(undefined)], []],
+			[[{ name }, 1, 0, makeMockData({})], []],
+			[[{ name }, -1, 0, makeMockData({})], []],
+			[[{ name }, 0, 0, makeMockData({}, 'DIFFERENT_NAME')], []],
+			// getMainInputData cases
+			[[{ name }, 0, 0, makeMockData({ [Main]: [] })], []],
+			[[{ name }, 0, 0, makeMockData({ [Main]: [null] })], []],
+			[[{ name }, 0, 1, makeMockData({ [Main]: [null] })], []],
+			[[{ name }, 0, -1, makeMockData({ [Main]: [null] })], []],
+			[
+				[{ name }, 0, 0, makeMockData({ [Main]: [mockExecutionDataMarker] })],
+				mockExecutionDataMarker,
+			],
+			[
+				[{ name }, 0, 0, makeMockData({ [Main]: [mockExecutionDataMarker, null] })],
+				mockExecutionDataMarker,
+			],
+			[
+				[{ name }, 0, 1, makeMockData({ [Main]: [null, mockExecutionDataMarker] })],
+				mockExecutionDataMarker,
+			],
+			[
+				[
+					{ name },
+					0,
+					1,
+					makeMockData({ DIFFERENT_NAME: [], [Main]: [null, mockExecutionDataMarker] }),
+				],
+				mockExecutionDataMarker,
+			],
+			[
+				[
+					{ name },
+					2,
+					1,
+					{
+						data: {
+							resultData: {
+								runData: {
+									[name]: [
+										{
+											startTime: 0,
+											executionTime: 0,
+											source: [],
+										},
+										{
+											startTime: 0,
+											executionTime: 0,
+											source: [],
+										},
+										{
+											data: { [Main]: [null, mockExecutionDataMarker] },
+											startTime: 0,
+											executionTime: 0,
+											source: [],
+										},
+									],
+								},
+							},
+						},
+					},
+				],
+				mockExecutionDataMarker,
+			],
+		])(
+			'should return correct output %s',
+			([node, runIndex, outputIndex, getWorkflowExecution], output) => {
+				vi.mocked(useWorkflowsStore).mockReturnValue({
+					...useWorkflowsStore(),
+					getWorkflowExecution: getWorkflowExecution as IExecutionResponse,
+				});
+				expect(getNodeInputData(node as INodeUi, runIndex, outputIndex)).toEqual(output);
+			},
+		);
+	});
+});
+
+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 4e3d35d31e..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(
@@ -72,12 +75,13 @@ export function useDataSchema() {
 		if (
 			!connectionsData?.hasOwnProperty(NodeConnectionType.Main) ||
 			connectionsData.main === undefined ||
-			connectionsData.main.length < outputIndex ||
+			outputIndex < 0 ||
+			outputIndex >= connectionsData.main.length ||
 			connectionsData.main[outputIndex] === null
 		) {
 			return [];
 		}
-		return connectionsData.main[outputIndex] as INodeExecutionData[];
+		return connectionsData.main[outputIndex];
 	}
 
 	function getNodeInputData(
@@ -100,11 +104,12 @@ export function useDataSchema() {
 		}
 		const runData = executionData.resultData.runData;
 
-		if (!runData?.[node.name]?.[runIndex].data || runData[node.name][runIndex].data === undefined) {
+		const taskData = runData?.[node.name]?.[runIndex];
+		if (taskData?.data === undefined) {
 			return [];
 		}
 
-		return getMainInputData(runData[node.name][runIndex].data!, outputIndex);
+		return getMainInputData(taskData.data, outputIndex);
 	}
 
 	function getInputDataWithPinned(
@@ -164,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/__tests__/useDebounce.test.ts b/packages/editor-ui/src/composables/useDebounce.test.ts
similarity index 97%
rename from packages/editor-ui/src/composables/__tests__/useDebounce.test.ts
rename to packages/editor-ui/src/composables/useDebounce.test.ts
index ea342da77a..729acf1f03 100644
--- a/packages/editor-ui/src/composables/__tests__/useDebounce.test.ts
+++ b/packages/editor-ui/src/composables/useDebounce.test.ts
@@ -1,5 +1,5 @@
 import { vi, describe, it, expect } from 'vitest';
-import { useDebounce } from '../useDebounce';
+import { useDebounce } from './useDebounce';
 import { render, screen } from '@testing-library/vue';
 
 describe('useDebounce()', () => {
diff --git a/packages/editor-ui/src/composables/useDebugInfo.spec.ts b/packages/editor-ui/src/composables/useDebugInfo.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/useDebugInfo.spec.ts
rename to packages/editor-ui/src/composables/useDebugInfo.test.ts
diff --git a/packages/editor-ui/src/composables/useDebugInfo.ts b/packages/editor-ui/src/composables/useDebugInfo.ts
index 42e2a8c1de..13bd94ec17 100644
--- a/packages/editor-ui/src/composables/useDebugInfo.ts
+++ b/packages/editor-ui/src/composables/useDebugInfo.ts
@@ -96,12 +96,12 @@ export function useDebugInfo() {
 	};
 
 	const pruningInfo = () => {
-		if (!settingsStore.pruning.isEnabled) return { enabled: false } as const;
+		if (!settingsStore.pruning?.isEnabled) return { enabled: false } as const;
 
 		return {
 			enabled: true,
-			maxAge: `${settingsStore.pruning.maxAge} hours`,
-			maxCount: `${settingsStore.pruning.maxCount} executions`,
+			maxAge: `${settingsStore.pruning?.maxAge} hours`,
+			maxCount: `${settingsStore.pruning?.maxCount} executions`,
 		} as const;
 	};
 
diff --git a/packages/editor-ui/src/composables/__tests__/useDocumentTitle.test.ts b/packages/editor-ui/src/composables/useDocumentTitle.test.ts
similarity index 94%
rename from packages/editor-ui/src/composables/__tests__/useDocumentTitle.test.ts
rename to packages/editor-ui/src/composables/useDocumentTitle.test.ts
index 5a88ee570a..a4d8f08417 100644
--- a/packages/editor-ui/src/composables/__tests__/useDocumentTitle.test.ts
+++ b/packages/editor-ui/src/composables/useDocumentTitle.test.ts
@@ -1,7 +1,7 @@
 import { mock } from 'vitest-mock-extended';
 import { describe, it, expect } from 'vitest';
 import type { FrontendSettings } from '@n8n/api-types';
-import { useDocumentTitle } from '../useDocumentTitle';
+import { useDocumentTitle } from './useDocumentTitle';
 
 const settings = mock<FrontendSettings>({ releaseChannel: 'stable' });
 vi.mock('@/stores/settings.store', () => ({
diff --git a/packages/editor-ui/src/composables/useDocumentVisibility.ts b/packages/editor-ui/src/composables/useDocumentVisibility.ts
new file mode 100644
index 0000000000..47af96309f
--- /dev/null
+++ b/packages/editor-ui/src/composables/useDocumentVisibility.ts
@@ -0,0 +1,52 @@
+import type { Ref } from 'vue';
+import { ref, onMounted, onUnmounted } from 'vue';
+
+type VisibilityHandler = () => void;
+
+type DocumentVisibilityResult = {
+	isVisible: Ref<boolean>;
+	onDocumentVisible: (handler: VisibilityHandler) => void;
+	onDocumentHidden: (handler: VisibilityHandler) => void;
+};
+
+export function useDocumentVisibility(): DocumentVisibilityResult {
+	const isVisible = ref<boolean>(!document.hidden);
+	const visibleHandlers = ref<VisibilityHandler[]>([]);
+	const hiddenHandlers = ref<VisibilityHandler[]>([]);
+
+	const onVisibilityChange = (): void => {
+		const newVisibilityState = !document.hidden;
+		isVisible.value = newVisibilityState;
+
+		if (newVisibilityState) {
+			visibleHandlers.value.forEach((handler) => handler());
+		} else {
+			hiddenHandlers.value.forEach((handler) => handler());
+		}
+	};
+
+	const onDocumentVisible = (handler: VisibilityHandler): void => {
+		visibleHandlers.value.push(handler);
+	};
+
+	const onDocumentHidden = (handler: VisibilityHandler): void => {
+		hiddenHandlers.value.push(handler);
+	};
+
+	onMounted((): void => {
+		document.addEventListener('visibilitychange', onVisibilityChange);
+	});
+
+	onUnmounted((): void => {
+		document.removeEventListener('visibilitychange', onVisibilityChange);
+		// Clear handlers on unmount
+		visibleHandlers.value = [];
+		hiddenHandlers.value = [];
+	});
+
+	return {
+		isVisible,
+		onDocumentVisible,
+		onDocumentHidden,
+	};
+}
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.spec.ts b/packages/editor-ui/src/composables/useExecutionDebugging.spec.ts
deleted file mode 100644
index a3c0b02ac7..0000000000
--- a/packages/editor-ui/src/composables/useExecutionDebugging.spec.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { createTestingPinia } from '@pinia/testing';
-import { setActivePinia } from 'pinia';
-import { mockedStore } from '@/__tests__/utils';
-import { useWorkflowsStore } from '@/stores/workflows.store';
-import { useExecutionDebugging } from './useExecutionDebugging';
-import type { INodeUi, IExecutionResponse } from '@/Interface';
-import type { Workflow } from 'n8n-workflow';
-
-describe('useExecutionDebugging()', () => {
-	it('should applyExecutionData', async () => {
-		setActivePinia(createTestingPinia());
-		const mockExecution = {
-			data: {
-				resultData: {
-					runData: {
-						testNode: [
-							{
-								data: {},
-							},
-						],
-					},
-				},
-			},
-		} as unknown as IExecutionResponse;
-
-		const workflowStore = mockedStore(useWorkflowsStore);
-		workflowStore.getNodes.mockReturnValue([{ name: 'testNode' }] as INodeUi[]);
-		workflowStore.getExecution.mockResolvedValueOnce(mockExecution);
-		workflowStore.getCurrentWorkflow.mockReturnValue({
-			pinData: {},
-			getParentNodes: vi.fn().mockReturnValue([]),
-		} as unknown as Workflow);
-
-		const { applyExecutionData } = useExecutionDebugging();
-
-		await applyExecutionData('1');
-
-		expect(workflowStore.setWorkflowExecutionData).toHaveBeenCalledWith(mockExecution);
-	});
-});
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.test.ts b/packages/editor-ui/src/composables/useExecutionDebugging.test.ts
new file mode 100644
index 0000000000..2cde7a70a6
--- /dev/null
+++ b/packages/editor-ui/src/composables/useExecutionDebugging.test.ts
@@ -0,0 +1,109 @@
+import { createTestingPinia } from '@pinia/testing';
+import { mockedStore } from '@/__tests__/utils';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useExecutionDebugging } from './useExecutionDebugging';
+import type { INodeUi, IExecutionResponse } from '@/Interface';
+import type { Workflow } from 'n8n-workflow';
+import { useToast } from '@/composables/useToast';
+
+vi.mock('@/composables/useToast', () => {
+	const showToast = vi.fn();
+	return {
+		useToast: () => ({
+			showToast,
+		}),
+	};
+});
+
+let executionDebugging: ReturnType<typeof useExecutionDebugging>;
+let toast: ReturnType<typeof useToast>;
+
+describe('useExecutionDebugging()', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+		createTestingPinia();
+		executionDebugging = useExecutionDebugging();
+		toast = useToast();
+	});
+
+	it('should not throw when runData node is an empty array', async () => {
+		const mockExecution = {
+			data: {
+				resultData: {
+					runData: {
+						testNode: [],
+					},
+				},
+			},
+		} as unknown as IExecutionResponse;
+
+		const workflowStore = mockedStore(useWorkflowsStore);
+		workflowStore.getNodes.mockReturnValue([{ name: 'testNode' }] as INodeUi[]);
+		workflowStore.getExecution.mockResolvedValueOnce(mockExecution);
+		workflowStore.getCurrentWorkflow.mockReturnValue({
+			pinData: {},
+			getParentNodes: vi.fn().mockReturnValue([]),
+		} as unknown as Workflow);
+
+		await expect(executionDebugging.applyExecutionData('1')).resolves.not.toThrowError();
+	});
+
+	it('should show missing nodes warning toast', async () => {
+		const mockExecution = {
+			data: {
+				resultData: {
+					runData: {
+						testNode: [
+							{
+								data: {},
+							},
+						],
+					},
+				},
+			},
+		} as unknown as IExecutionResponse;
+
+		const workflowStore = mockedStore(useWorkflowsStore);
+		workflowStore.getNodes.mockReturnValue([{ name: 'testNode2' }] as INodeUi[]);
+		workflowStore.getExecution.mockResolvedValueOnce(mockExecution);
+		workflowStore.getCurrentWorkflow.mockReturnValue({
+			pinData: {},
+			getParentNodes: vi.fn().mockReturnValue([]),
+		} as unknown as Workflow);
+
+		await executionDebugging.applyExecutionData('1');
+
+		expect(workflowStore.setWorkflowExecutionData).toHaveBeenCalledWith(mockExecution);
+		expect(toast.showToast).toHaveBeenCalledWith(expect.objectContaining({ type: 'info' }));
+		expect(toast.showToast).toHaveBeenCalledWith(expect.objectContaining({ type: 'warning' }));
+	});
+
+	it('should applyExecutionData', async () => {
+		const mockExecution = {
+			data: {
+				resultData: {
+					runData: {
+						testNode: [
+							{
+								data: {},
+							},
+						],
+					},
+				},
+			},
+		} as unknown as IExecutionResponse;
+
+		const workflowStore = mockedStore(useWorkflowsStore);
+		workflowStore.getNodes.mockReturnValue([{ name: 'testNode' }] as INodeUi[]);
+		workflowStore.getExecution.mockResolvedValueOnce(mockExecution);
+		workflowStore.getCurrentWorkflow.mockReturnValue({
+			pinData: {},
+			getParentNodes: vi.fn().mockReturnValue([]),
+		} as unknown as Workflow);
+
+		await executionDebugging.applyExecutionData('1');
+
+		expect(workflowStore.setWorkflowExecutionData).toHaveBeenCalledWith(mockExecution);
+		expect(toast.showToast).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/editor-ui/src/composables/useExecutionDebugging.ts b/packages/editor-ui/src/composables/useExecutionDebugging.ts
index cf59964bb8..19bb660d38 100644
--- a/packages/editor-ui/src/composables/useExecutionDebugging.ts
+++ b/packages/editor-ui/src/composables/useExecutionDebugging.ts
@@ -17,6 +17,7 @@ import { useTelemetry } from './useTelemetry';
 import { useRootStore } from '@/stores/root.store';
 import { isFullExecutionResponse } from '@/utils/typeGuards';
 import { sanitizeHtml } from '@/utils/htmlUtils';
+import { usePageRedirectionHelper } from './usePageRedirectionHelper';
 
 export const useExecutionDebugging = () => {
 	const telemetry = useTelemetry();
@@ -29,6 +30,8 @@ export const useExecutionDebugging = () => {
 	const settingsStore = useSettingsStore();
 	const uiStore = useUIStore();
 
+	const pageRedirectionHelper = usePageRedirectionHelper();
+
 	const isDebugEnabled = computed(
 		() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.DebugInEditor],
 	);
@@ -73,7 +76,7 @@ export const useExecutionDebugging = () => {
 					type: 'warning',
 					confirmButtonText: i18n.baseText('nodeView.confirmMessage.debug.confirmButtonText'),
 					cancelButtonText: i18n.baseText('nodeView.confirmMessage.debug.cancelButtonText'),
-					dangerouslyUseHTMLString: true,
+
 					customClass: 'matching-pinned-nodes-confirmation',
 				},
 			);
@@ -105,7 +108,7 @@ export const useExecutionDebugging = () => {
 		let pinnings = 0;
 
 		pinnableNodes.forEach((node: INodeUi) => {
-			const nodeData = runData[node.name]?.[0].data?.main?.[0];
+			const nodeData = runData[node.name]?.[0]?.data?.main?.[0];
 			if (nodeData) {
 				pinnings++;
 				workflowsStore.pinData({
@@ -147,7 +150,7 @@ export const useExecutionDebugging = () => {
 					title: i18n.baseText(uiStore.contextBasedTranslationKeys.feature.unavailable.title),
 					footerButtonAction: () => {
 						uiStore.closeModal(DEBUG_PAYWALL_MODAL_KEY);
-						void uiStore.goToUpgrade('debug', 'upgrade-debug');
+						void pageRedirectionHelper.goToUpgrade('debug', 'upgrade-debug');
 					},
 				},
 			});
diff --git a/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts b/packages/editor-ui/src/composables/useExecutionHelpers.test.ts
similarity index 51%
rename from packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
rename to packages/editor-ui/src/composables/useExecutionHelpers.test.ts
index 465abeb173..882c6715b2 100644
--- a/packages/editor-ui/src/composables/__tests__/useExecutionHelpers.test.ts
+++ b/packages/editor-ui/src/composables/useExecutionHelpers.test.ts
@@ -3,6 +3,22 @@ import type { ExecutionSummary } from 'n8n-workflow';
 import { i18n } from '@/plugins/i18n';
 import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
 
+const { resolve, track } = vi.hoisted(() => ({
+	resolve: vi.fn(),
+	track: vi.fn(),
+}));
+
+vi.mock('vue-router', () => ({
+	useRouter: () => ({
+		resolve,
+	}),
+	RouterLink: vi.fn(),
+}));
+
+vi.mock('@/composables/useTelemetry', () => ({
+	useTelemetry: () => ({ track }),
+}));
+
 describe('useExecutionHelpers()', () => {
 	describe('getUIDetails()', () => {
 		it.each([
@@ -68,4 +84,70 @@ describe('useExecutionHelpers()', () => {
 			).toEqual(false);
 		});
 	});
+
+	describe('openExecutionInNewTab', () => {
+		const executionId = '123';
+		const workflowId = 'xyz';
+		const href = 'test.com';
+		global.window.open = vi.fn();
+
+		it('opens execution in new tab', () => {
+			const { openExecutionInNewTab } = useExecutionHelpers();
+			resolve.mockReturnValue({ href });
+			openExecutionInNewTab(executionId, workflowId);
+			expect(window.open).toHaveBeenCalledWith(href, '_blank');
+		});
+	});
+
+	describe('trackOpeningRelatedExecution', () => {
+		it('tracks sub execution click', () => {
+			const { trackOpeningRelatedExecution } = useExecutionHelpers();
+
+			trackOpeningRelatedExecution(
+				{ subExecution: { executionId: '123', workflowId: 'xyz' } },
+				'table',
+			);
+
+			expect(track).toHaveBeenCalledWith('User clicked inspect sub-workflow', { view: 'table' });
+		});
+
+		it('tracks parent execution click', () => {
+			const { trackOpeningRelatedExecution } = useExecutionHelpers();
+
+			trackOpeningRelatedExecution(
+				{ parentExecution: { executionId: '123', workflowId: 'xyz' } },
+				'json',
+			);
+
+			expect(track).toHaveBeenCalledWith('User clicked parent execution button', { view: 'json' });
+		});
+	});
+
+	describe('resolveRelatedExecutionUrl', () => {
+		it('resolves sub execution url', () => {
+			const fullPath = 'test.com';
+			resolve.mockReturnValue({ fullPath });
+			const { resolveRelatedExecutionUrl } = useExecutionHelpers();
+
+			expect(
+				resolveRelatedExecutionUrl({ subExecution: { executionId: '123', workflowId: 'xyz' } }),
+			).toEqual(fullPath);
+		});
+
+		it('resolves parent execution url', () => {
+			const fullPath = 'test.com';
+			resolve.mockReturnValue({ fullPath });
+			const { resolveRelatedExecutionUrl } = useExecutionHelpers();
+
+			expect(
+				resolveRelatedExecutionUrl({ parentExecution: { executionId: '123', workflowId: 'xyz' } }),
+			).toEqual(fullPath);
+		});
+
+		it('returns empty if no related execution url', () => {
+			const { resolveRelatedExecutionUrl } = useExecutionHelpers();
+
+			expect(resolveRelatedExecutionUrl({})).toEqual('');
+		});
+	});
 });
diff --git a/packages/editor-ui/src/composables/useExecutionHelpers.ts b/packages/editor-ui/src/composables/useExecutionHelpers.ts
index c87006c92a..909a9005dd 100644
--- a/packages/editor-ui/src/composables/useExecutionHelpers.ts
+++ b/packages/editor-ui/src/composables/useExecutionHelpers.ts
@@ -1,6 +1,10 @@
-import type { ExecutionSummary } from 'n8n-workflow';
+import type { ExecutionSummary, RelatedExecution } from 'n8n-workflow';
 import { convertToDisplayDate } from '@/utils/formatters/dateFormatter';
 import { useI18n } from '@/composables/useI18n';
+import { useRouter } from 'vue-router';
+import { VIEWS } from '@/constants';
+import { useTelemetry } from './useTelemetry';
+import type { IRunDataDisplayMode } from '@/Interface';
 
 export interface IExecutionUIData {
 	name: string;
@@ -14,6 +18,8 @@ export interface IExecutionUIData {
 
 export function useExecutionHelpers() {
 	const i18n = useI18n();
+	const router = useRouter();
+	const telemetry = useTelemetry();
 
 	function getUIDetails(execution: ExecutionSummary): IExecutionUIData {
 		const status = {
@@ -69,9 +75,57 @@ export function useExecutionHelpers() {
 		return ['crashed', 'error'].includes(execution.status) && !execution.retrySuccessId;
 	}
 
+	function openExecutionInNewTab(executionId: string, workflowId: string): void {
+		const route = router.resolve({
+			name: VIEWS.EXECUTION_PREVIEW,
+			params: { name: workflowId, executionId },
+		});
+
+		window.open(route.href, '_blank');
+	}
+
+	function resolveRelatedExecutionUrl(metadata: {
+		parentExecution?: RelatedExecution;
+		subExecution?: RelatedExecution;
+	}): string {
+		const info = metadata.parentExecution || metadata.subExecution;
+		if (!info) {
+			return '';
+		}
+
+		const { workflowId, executionId } = info;
+
+		return router.resolve({
+			name: VIEWS.EXECUTION_PREVIEW,
+			params: { name: workflowId, executionId },
+		}).fullPath;
+	}
+
+	function trackOpeningRelatedExecution(
+		metadata: { parentExecution?: RelatedExecution; subExecution?: RelatedExecution },
+		view: IRunDataDisplayMode,
+	) {
+		const info = metadata.parentExecution || metadata.subExecution;
+		if (!info) {
+			return;
+		}
+
+		telemetry.track(
+			metadata.parentExecution
+				? 'User clicked parent execution button'
+				: 'User clicked inspect sub-workflow',
+			{
+				view,
+			},
+		);
+	}
+
 	return {
 		getUIDetails,
 		formatDate,
 		isExecutionRetriable,
+		openExecutionInNewTab,
+		trackOpeningRelatedExecution,
+		resolveRelatedExecutionUrl,
 	};
 }
diff --git a/packages/editor-ui/src/composables/__tests__/useExpressionEditor.test.ts b/packages/editor-ui/src/composables/useExpressionEditor.test.ts
similarity index 77%
rename from packages/editor-ui/src/composables/__tests__/useExpressionEditor.test.ts
rename to packages/editor-ui/src/composables/useExpressionEditor.test.ts
index 958946d2ad..7f5b6d73c1 100644
--- a/packages/editor-ui/src/composables/__tests__/useExpressionEditor.test.ts
+++ b/packages/editor-ui/src/composables/useExpressionEditor.test.ts
@@ -1,17 +1,16 @@
+import { renderComponent } from '@/__tests__/render';
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
-import { EditorView, keymap } from '@codemirror/view';
+import { n8nLang } from '@/plugins/codemirror/n8nLang';
+import { EditorSelection } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
 import { createTestingPinia } from '@pinia/testing';
-import { waitFor, fireEvent } from '@testing-library/vue';
+import userEvent from '@testing-library/user-event';
+import { fireEvent, waitFor } from '@testing-library/vue';
 import { setActivePinia } from 'pinia';
 import { beforeEach, describe, vi } from 'vitest';
 import { defineComponent, h, ref, toValue } from 'vue';
-import { n8nLang } from '@/plugins/codemirror/n8nLang';
-import { useExpressionEditor } from '../useExpressionEditor';
 import { useRouter } from 'vue-router';
-import { EditorSelection } from '@codemirror/state';
-import userEvent from '@testing-library/user-event';
-import { renderComponent } from '@/__tests__/render';
-import { tabKeyMap } from '@/plugins/codemirror/keymap';
+import { useExpressionEditor } from './useExpressionEditor';
 
 vi.mock('@/composables/useAutocompleteTelemetry', () => ({
 	useAutocompleteTelemetry: vi.fn(),
@@ -132,6 +131,109 @@ describe('useExpressionEditor', () => {
 		});
 	});
 
+	test('render [empty] when expression evaluates to an empty string', async () => {
+		mockResolveExpression().mockReturnValueOnce('');
+
+		const {
+			expressionEditor: { segments },
+		} = await renderExpressionEditor({
+			editorValue: "{{ '' }}",
+			extensions: [n8nLang()],
+		});
+
+		await waitFor(() => {
+			expect(toValue(segments.all)).toEqual([
+				{
+					error: null,
+					from: 0,
+					kind: 'resolvable',
+					resolvable: "{{ '' }}",
+					resolved: '[empty]',
+					state: 'valid',
+					to: 8,
+				},
+			]);
+
+			expect(toValue(segments.resolvable)).toEqual([
+				{
+					error: null,
+					from: 0,
+					kind: 'resolvable',
+					resolvable: "{{ '' }}",
+					resolved: '[empty]',
+					state: 'valid',
+					to: 8,
+				},
+			]);
+
+			expect(toValue(segments.plaintext)).toEqual([]);
+		});
+	});
+
+	test('does not render [empty] when expression evaluates to an empty string within a string', async () => {
+		mockResolveExpression().mockReturnValueOnce('');
+
+		const {
+			expressionEditor: { segments },
+		} = await renderExpressionEditor({
+			editorValue: "before {{ '' }} after",
+			extensions: [n8nLang()],
+		});
+
+		await waitFor(() => {
+			expect(toValue(segments.all)).toEqual([
+				{
+					from: 0,
+					kind: 'plaintext',
+					plaintext: 'before ',
+					to: 7,
+				},
+				{
+					error: null,
+					from: 7,
+					kind: 'resolvable',
+					resolvable: "{{ '' }}",
+					resolved: '',
+					state: 'valid',
+					to: 15,
+				},
+				{
+					from: 15,
+					kind: 'plaintext',
+					plaintext: ' after',
+					to: 21,
+				},
+			]);
+
+			expect(toValue(segments.resolvable)).toEqual([
+				{
+					error: null,
+					from: 7,
+					kind: 'resolvable',
+					resolvable: "{{ '' }}",
+					resolved: '',
+					state: 'valid',
+					to: 15,
+				},
+			]);
+
+			expect(toValue(segments.plaintext)).toEqual([
+				{
+					from: 0,
+					kind: 'plaintext',
+					plaintext: 'before ',
+					to: 7,
+				},
+				{
+					from: 15,
+					kind: 'plaintext',
+					plaintext: ' after',
+					to: 21,
+				},
+			]);
+		});
+	});
+
 	describe('readEditorValue()', () => {
 		test('should return the full editor value (unresolved)', async () => {
 			mockResolveExpression().mockReturnValueOnce(15);
@@ -255,32 +357,4 @@ describe('useExpressionEditor', () => {
 			expect(expressionEditor.editor.value?.hasFocus).toBe(true);
 		});
 	});
-
-	describe('keymap', () => {
-		const TEST_EDITOR_VALUE = '{{ { "foo": "bar" } }}';
-
-		test('should indent on tab if blurOnTab is false', async () => {
-			const { renderResult, expressionEditor } = await renderExpressionEditor({
-				editorValue: TEST_EDITOR_VALUE,
-				extensions: [keymap.of([...tabKeyMap(false)])],
-			});
-			const root = renderResult.getByTestId('editor-root');
-			const input = root.querySelector('.cm-line') as HTMLDivElement;
-
-			await userEvent.type(input, '{tab}');
-			expect(expressionEditor.editor.value?.state.doc.toString()).toEqual(`  ${TEST_EDITOR_VALUE}`);
-		});
-
-		test('should NOT indent on tab if blurOnTab is true', async () => {
-			const { renderResult, expressionEditor } = await renderExpressionEditor({
-				editorValue: TEST_EDITOR_VALUE,
-				extensions: [keymap.of([...tabKeyMap(true)])],
-			});
-			const root = renderResult.getByTestId('editor-root');
-			const input = root.querySelector('.cm-line') as HTMLDivElement;
-
-			await userEvent.type(input, '{tab}');
-			expect(expressionEditor.editor.value?.state.doc.toString()).toEqual(TEST_EDITOR_VALUE);
-		});
-	});
 });
diff --git a/packages/editor-ui/src/composables/useExpressionEditor.ts b/packages/editor-ui/src/composables/useExpressionEditor.ts
index a63570d101..ed845e3501 100644
--- a/packages/editor-ui/src/composables/useExpressionEditor.ts
+++ b/packages/editor-ui/src/composables/useExpressionEditor.ts
@@ -3,6 +3,7 @@ import {
 	onBeforeUnmount,
 	onMounted,
 	ref,
+	toRef,
 	toValue,
 	watch,
 	watchEffect,
@@ -22,11 +23,7 @@ import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
 import { closeCursorInfoBox } from '@/plugins/codemirror/tooltips/InfoBoxTooltip';
 import type { Html, Plaintext, RawSegment, Resolvable, Segment } from '@/types/expressions';
-import {
-	getExpressionErrorMessage,
-	getResolvableState,
-	isEmptyExpression,
-} from '@/utils/expressions';
+import { getExpressionErrorMessage, getResolvableState } from '@/utils/expressions';
 import { closeCompletion, completionStatus } from '@codemirror/autocomplete';
 import {
 	Compartment,
@@ -51,7 +48,7 @@ export const useExpressionEditor = ({
 	autocompleteTelemetry,
 	isReadOnly = false,
 }: {
-	editorRef: Ref<HTMLElement | undefined>;
+	editorRef: MaybeRefOrGetter<HTMLElement | undefined>;
 	editorValue?: MaybeRefOrGetter<string>;
 	extensions?: MaybeRefOrGetter<Extension[]>;
 	additionalData?: MaybeRefOrGetter<IDataObject>;
@@ -73,6 +70,7 @@ export const useExpressionEditor = ({
 	const telemetryExtensions = ref<Compartment>(new Compartment());
 	const autocompleteStatus = ref<'pending' | 'active' | null>(null);
 	const dragging = ref(false);
+	const isDirty = ref(false);
 
 	const updateSegments = (): void => {
 		const state = editor.value?.state;
@@ -129,6 +127,12 @@ export const useExpressionEditor = ({
 
 			return acc;
 		}, []);
+		if (
+			segments.value.length === 1 &&
+			segments.value[0]?.kind === 'resolvable' &&
+			segments.value[0]?.resolved === ''
+		)
+			segments.value[0].resolved = i18n.baseText('expressionModalInput.empty');
 	};
 
 	function readEditorValue(): string {
@@ -153,6 +157,7 @@ export const useExpressionEditor = ({
 	const debouncedUpdateSegments = debounce(updateSegments, 200);
 
 	function onEditorUpdate(viewUpdate: ViewUpdate) {
+		isDirty.value = true;
 		autocompleteStatus.value = completionStatus(viewUpdate.view.state);
 		updateSelection(viewUpdate);
 
@@ -176,7 +181,7 @@ export const useExpressionEditor = ({
 		dragging.value = false;
 	}
 
-	watch(editorRef, () => {
+	watch(toRef(editorRef), () => {
 		const parent = toValue(editorRef);
 
 		if (!parent) return;
@@ -305,19 +310,15 @@ 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;
 		}
 
-		if (result.resolved === '') {
-			result.resolved = i18n.baseText('expressionModalInput.empty');
-		}
-
-		if (result.resolved === undefined && isEmptyExpression(resolvable)) {
-			result.resolved = i18n.baseText('expressionModalInput.empty');
-		}
-
 		if (result.resolved === undefined) {
 			result.resolved = isUncalledExpressionExtension(resolvable)
 				? i18n.baseText('expressionEditor.uncalledFunction')
@@ -464,5 +465,6 @@ export const useExpressionEditor = ({
 		select,
 		selectAll,
 		focus,
+		isDirty,
 	};
 };
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts b/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
new file mode 100644
index 0000000000..f8445325d6
--- /dev/null
+++ b/packages/editor-ui/src/composables/useGlobalEntityCreation.test.ts
@@ -0,0 +1,207 @@
+import { createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
+import { useProjectsStore } from '@/stores/projects.store';
+import { mockedStore } from '@/__tests__/utils';
+import type router from 'vue-router';
+import { flushPromises } from '@vue/test-utils';
+import { useToast } from '@/composables/useToast';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import type { CloudPlanState } from '@/Interface';
+
+import { VIEWS } from '@/constants';
+import type { Project, ProjectListItem } from '@/types/projects.types';
+
+import { useGlobalEntityCreation } from './useGlobalEntityCreation';
+
+vi.mock('@/composables/usePageRedirectionHelper', () => {
+	const goToUpgrade = vi.fn();
+	return {
+		usePageRedirectionHelper: () => ({
+			goToUpgrade,
+		}),
+	};
+});
+
+vi.mock('@/composables/useToast', () => {
+	const showMessage = vi.fn();
+	const showError = vi.fn();
+	return {
+		useToast: () => {
+			return {
+				showMessage,
+				showError,
+			};
+		},
+	};
+});
+
+const routerPushMock = vi.fn();
+vi.mock('vue-router', async (importOriginal) => {
+	const { RouterLink, useRoute } = await importOriginal<typeof router>();
+	return {
+		RouterLink,
+		useRoute,
+		useRouter: () => ({
+			push: routerPushMock,
+		}),
+	};
+});
+
+beforeEach(() => {
+	setActivePinia(createTestingPinia());
+	routerPushMock.mockReset();
+});
+
+describe('useGlobalEntityCreation', () => {
+	it('should not contain projects for community', () => {
+		const projectsStore = mockedStore(useProjectsStore);
+
+		const personalProjectId = 'personal-project';
+		projectsStore.isTeamProjectFeatureEnabled = false;
+		projectsStore.personalProject = { id: personalProjectId } as Project;
+		const { menu } = useGlobalEntityCreation();
+
+		expect(menu.value[0]).toStrictEqual(
+			expect.objectContaining({
+				route: { name: VIEWS.NEW_WORKFLOW, query: { projectId: personalProjectId } },
+			}),
+		);
+
+		expect(menu.value[1]).toStrictEqual(
+			expect.objectContaining({
+				route: {
+					name: VIEWS.CREDENTIALS,
+					params: { projectId: personalProjectId, credentialId: 'create' },
+				},
+			}),
+		);
+	});
+
+	describe('global', () => {
+		it('should show personal + all team projects', () => {
+			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.teamProjectsLimit = -1;
+
+			const personalProjectId = 'personal-project';
+			projectsStore.isTeamProjectFeatureEnabled = true;
+			projectsStore.personalProject = { id: personalProjectId } as Project;
+			projectsStore.myProjects = [
+				{ id: '1', name: '1', type: 'team' },
+				{ id: '2', name: '2', type: 'public' },
+				{ id: '3', name: '3', type: 'team' },
+			] as ProjectListItem[];
+
+			const { menu } = useGlobalEntityCreation();
+
+			expect(menu.value[0].submenu?.length).toBe(4);
+			expect(menu.value[1].submenu?.length).toBe(4);
+		});
+	});
+
+	describe('handleSelect()', () => {
+		it('should only handle create-project', () => {
+			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.isTeamProjectFeatureEnabled = true;
+			const { handleSelect } = useGlobalEntityCreation();
+			handleSelect('dummy');
+			expect(projectsStore.createProject).not.toHaveBeenCalled();
+		});
+
+		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);
+
+			const { handleSelect } = useGlobalEntityCreation();
+
+			handleSelect('create-project');
+			await flushPromises();
+
+			expect(projectsStore.createProject).toHaveBeenCalled();
+			expect(routerPushMock).toHaveBeenCalled();
+			expect(toast.showMessage).toHaveBeenCalled();
+		});
+
+		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'));
+
+			const { handleSelect } = useGlobalEntityCreation();
+
+			handleSelect('create-project');
+			await flushPromises();
+			expect(toast.showError).toHaveBeenCalled();
+		});
+
+		it('redirects when project limit has been reached', () => {
+			const projectsStore = mockedStore(useProjectsStore);
+			projectsStore.canCreateProjects = false;
+			projectsStore.isTeamProjectFeatureEnabled = true;
+			const redirect = usePageRedirectionHelper();
+
+			const { handleSelect } = useGlobalEntityCreation();
+
+			handleSelect('create-project');
+			expect(redirect.goToUpgrade).toHaveBeenCalled();
+		});
+	});
+
+	it('should show plan and limit according to deployment type', () => {
+		const settingsStore = mockedStore(useSettingsStore);
+
+		const cloudPlanStore = mockedStore(useCloudPlanStore);
+		cloudPlanStore.currentPlanData = { displayName: 'Pro' } as CloudPlanState['data'];
+		const projectsStore = mockedStore(useProjectsStore);
+		projectsStore.isTeamProjectFeatureEnabled = true;
+		projectsStore.teamProjectsLimit = 10;
+
+		settingsStore.isCloudDeployment = true;
+		const { projectsLimitReachedMessage, upgradeLabel } = useGlobalEntityCreation();
+		expect(projectsLimitReachedMessage.value).toContain(
+			'You have reached the Pro plan limit of 10.',
+		);
+		expect(upgradeLabel.value).toBe('Upgrade');
+
+		settingsStore.isCloudDeployment = false;
+		expect(projectsLimitReachedMessage.value).toContain('You have reached the  plan limit of');
+		expect(upgradeLabel.value).toBe('Upgrade');
+
+		projectsStore.isTeamProjectFeatureEnabled = false;
+		expect(projectsLimitReachedMessage.value).toContain(
+			'Upgrade to unlock projects for more granular control over sharing, access and organisation of workflows',
+		);
+		expect(upgradeLabel.value).toBe('Enterprise');
+	});
+
+	it('should display properly for readOnlyEnvironment', () => {
+		const sourceControlStore = mockedStore(useSourceControlStore);
+		sourceControlStore.preferences.branchReadOnly = true;
+		const projectsStore = mockedStore(useProjectsStore);
+		projectsStore.teamProjectsLimit = -1;
+
+		const personalProjectId = 'personal-project';
+		projectsStore.isTeamProjectFeatureEnabled = true;
+		projectsStore.personalProject = { id: personalProjectId } as Project;
+		projectsStore.myProjects = [
+			{ id: '1', name: '1', type: 'team' },
+			{ id: '2', name: '2', type: 'public' },
+			{ id: '3', name: '3', type: 'team' },
+		] as ProjectListItem[];
+
+		const { menu } = useGlobalEntityCreation();
+
+		expect(menu.value[0].disabled).toBe(true);
+		expect(menu.value[1].disabled).toBe(true);
+
+		expect(menu.value[0].submenu).toBe(undefined);
+		expect(menu.value[1].submenu).toBe(undefined);
+	});
+});
diff --git a/packages/editor-ui/src/composables/useGlobalEntityCreation.ts b/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
new file mode 100644
index 0000000000..abecefd2d6
--- /dev/null
+++ b/packages/editor-ui/src/composables/useGlobalEntityCreation.ts
@@ -0,0 +1,254 @@
+import { computed, ref } from 'vue';
+import { VIEWS } from '@/constants';
+import { useRouter } from 'vue-router';
+import { useI18n } from '@/composables/useI18n';
+import { sortByProperty } from '@/utils/sortUtils';
+import { useToast } from '@/composables/useToast';
+import { useProjectsStore } from '@/stores/projects.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useSourceControlStore } from '@/stores/sourceControl.store';
+import { getResourcePermissions } from '@/permissions';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+import type { Scope } from '@n8n/permissions';
+import type { RouteLocationRaw } from 'vue-router';
+
+type BaseItem = {
+	id: string;
+	title: string;
+	disabled?: boolean;
+	icon?: string;
+	route?: RouteLocationRaw;
+};
+
+type Item = BaseItem & {
+	submenu?: BaseItem[];
+};
+
+export const useGlobalEntityCreation = () => {
+	const CREATE_PROJECT_ID = 'create-project';
+	const WORKFLOWS_MENU_ID = 'workflow';
+	const CREDENTIALS_MENU_ID = 'credential';
+
+	const settingsStore = useSettingsStore();
+	const cloudPlanStore = useCloudPlanStore();
+	const projectsStore = useProjectsStore();
+	const sourceControlStore = useSourceControlStore();
+	const router = useRouter();
+	const i18n = useI18n();
+	const toast = useToast();
+
+	const isCreatingProject = ref(false);
+
+	const displayProjects = computed(() =>
+		sortByProperty(
+			'name',
+			projectsStore.myProjects.filter((p) => p.type === 'team'),
+		),
+	);
+
+	const disabledWorkflow = (scopes: Scope[] = []): boolean =>
+		sourceControlStore.preferences.branchReadOnly ||
+		!getResourcePermissions(scopes).workflow.create;
+
+	const disabledCredential = (scopes: Scope[] = []): boolean =>
+		sourceControlStore.preferences.branchReadOnly ||
+		!getResourcePermissions(scopes).credential.create;
+
+	const menu = computed<Item[]>(() => {
+		// Community
+		if (!projectsStore.isTeamProjectFeatureEnabled) {
+			return [
+				{
+					id: 'workflow',
+					title: 'Workflow',
+					route: {
+						name: VIEWS.NEW_WORKFLOW,
+						query: {
+							projectId: projectsStore.personalProject?.id,
+						},
+					},
+				},
+				{
+					id: 'credential',
+					title: 'Credential',
+					route: {
+						name: VIEWS.CREDENTIALS,
+						params: {
+							projectId: projectsStore.personalProject?.id,
+							credentialId: 'create',
+						},
+					},
+				},
+				{
+					id: CREATE_PROJECT_ID,
+					title: 'Project',
+					disabled: true,
+				},
+			];
+		}
+
+		// global
+		return [
+			{
+				id: WORKFLOWS_MENU_ID,
+				title: 'Workflow',
+				disabled: sourceControlStore.preferences.branchReadOnly,
+
+				...(!sourceControlStore.preferences.branchReadOnly && {
+					submenu: [
+						{
+							id: 'workflow-title',
+							title: 'Create in',
+							disabled: true,
+						},
+						{
+							id: 'workflow-personal',
+							title: i18n.baseText('projects.menu.personal'),
+							icon: 'user',
+							disabled: disabledWorkflow(projectsStore.personalProject?.scopes),
+							route: {
+								name: VIEWS.NEW_WORKFLOW,
+								query: { projectId: projectsStore.personalProject?.id },
+							},
+						},
+						...displayProjects.value.map((project) => ({
+							id: `workflow-${project.id}`,
+							title: project.name as string,
+							icon: 'layer-group',
+							disabled: disabledWorkflow(project.scopes),
+							route: {
+								name: VIEWS.NEW_WORKFLOW,
+								query: { projectId: project.id },
+							},
+						})),
+					],
+				}),
+			},
+			{
+				id: CREDENTIALS_MENU_ID,
+				title: 'Credential',
+				disabled: sourceControlStore.preferences.branchReadOnly,
+				...(!sourceControlStore.preferences.branchReadOnly && {
+					submenu: [
+						{
+							id: 'credential-title',
+							title: 'Create in',
+							disabled: true,
+						},
+						{
+							id: 'credential-personal',
+							title: i18n.baseText('projects.menu.personal'),
+							icon: 'user',
+							disabled: disabledCredential(projectsStore.personalProject?.scopes),
+							route: {
+								name: VIEWS.PROJECTS_CREDENTIALS,
+								params: { projectId: projectsStore.personalProject?.id, credentialId: 'create' },
+							},
+						},
+						...displayProjects.value.map((project) => ({
+							id: `credential-${project.id}`,
+							title: project.name as string,
+							icon: 'layer-group',
+							disabled: disabledCredential(project.scopes),
+							route: {
+								name: VIEWS.PROJECTS_CREDENTIALS,
+								params: { projectId: project.id, credentialId: 'create' },
+							},
+						})),
+					],
+				}),
+			},
+			{
+				id: CREATE_PROJECT_ID,
+				title: 'Project',
+				disabled: !projectsStore.canCreateProjects,
+			},
+		];
+	});
+
+	const createProject = async () => {
+		isCreatingProject.value = true;
+
+		try {
+			const newProject = await projectsStore.createProject({
+				name: i18n.baseText('projects.settings.newProjectName'),
+				icon: { type: 'icon', value: 'layer-group' },
+			});
+			await router.push({ name: VIEWS.PROJECT_SETTINGS, params: { projectId: newProject.id } });
+			toast.showMessage({
+				title: i18n.baseText('projects.settings.save.successful.title', {
+					interpolate: { projectName: newProject.name as string },
+				}),
+				type: 'success',
+			});
+		} catch (error) {
+			toast.showError(error, i18n.baseText('projects.error.title'));
+		} finally {
+			isCreatingProject.value = false;
+		}
+	};
+
+	const handleSelect = (id: string) => {
+		if (id !== CREATE_PROJECT_ID) return;
+
+		if (projectsStore.canCreateProjects) {
+			void createProject();
+			return;
+		}
+
+		void usePageRedirectionHelper().goToUpgrade('rbac', 'upgrade-rbac');
+	};
+
+	const projectsLimitReachedMessage = computed(() => {
+		if (settingsStore.isCloudDeployment) {
+			return i18n.baseText('projects.create.limitReached.cloud', {
+				adjustToNumber: projectsStore.teamProjectsLimit,
+				interpolate: {
+					planName: cloudPlanStore.currentPlanData?.displayName ?? '',
+					limit: projectsStore.teamProjectsLimit,
+				},
+			});
+		}
+
+		if (!projectsStore.isTeamProjectFeatureEnabled) {
+			return i18n.baseText('projects.create.limitReached.self');
+		}
+
+		return i18n.baseText('projects.create.limitReached', {
+			adjustToNumber: projectsStore.teamProjectsLimit,
+			interpolate: {
+				limit: projectsStore.teamProjectsLimit,
+			},
+		});
+	});
+
+	const createProjectAppendSlotName = computed(() => `item.append.${CREATE_PROJECT_ID}`);
+	const createWorkflowsAppendSlotName = computed(() => `item.append.${WORKFLOWS_MENU_ID}`);
+	const createCredentialsAppendSlotName = computed(() => `item.append.${CREDENTIALS_MENU_ID}`);
+
+	const upgradeLabel = computed(() => {
+		if (settingsStore.isCloudDeployment) {
+			return i18n.baseText('generic.upgrade');
+		}
+
+		if (!projectsStore.isTeamProjectFeatureEnabled) {
+			return i18n.baseText('generic.enterprise');
+		}
+
+		return i18n.baseText('generic.upgrade');
+	});
+
+	return {
+		menu,
+		handleSelect,
+		createProjectAppendSlotName,
+		createWorkflowsAppendSlotName,
+		createCredentialsAppendSlotName,
+		projectsLimitReachedMessage,
+		upgradeLabel,
+		createProject,
+		isCreatingProject,
+		displayProjects,
+	};
+};
diff --git a/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts b/packages/editor-ui/src/composables/useHistoryHelper.test.ts
similarity index 97%
rename from packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
rename to packages/editor-ui/src/composables/useHistoryHelper.test.ts
index 494554f68d..6b6848649d 100644
--- a/packages/editor-ui/src/composables/__tests__/useHistoryHelper.test.ts
+++ b/packages/editor-ui/src/composables/useHistoryHelper.test.ts
@@ -2,7 +2,7 @@ import { vi, describe, it, expect } from 'vitest';
 import { MAIN_HEADER_TABS } from '@/constants';
 import { render } from '@testing-library/vue';
 import userEvent from '@testing-library/user-event';
-import { useHistoryHelper } from '../useHistoryHelper';
+import { useHistoryHelper } from './useHistoryHelper';
 import { defineComponent, type PropType } from 'vue';
 import type { RouteLocationNormalizedLoaded } from 'vue-router';
 import { mock } from 'vitest-mock-extended';
diff --git a/packages/editor-ui/src/composables/__tests__/useKeybindings.test.ts b/packages/editor-ui/src/composables/useKeybindings.test.ts
similarity index 75%
rename from packages/editor-ui/src/composables/__tests__/useKeybindings.test.ts
rename to packages/editor-ui/src/composables/useKeybindings.test.ts
index 54c042c79a..9a3965412c 100644
--- a/packages/editor-ui/src/composables/__tests__/useKeybindings.test.ts
+++ b/packages/editor-ui/src/composables/useKeybindings.test.ts
@@ -2,7 +2,7 @@ import { renderComponent } from '@/__tests__/render';
 import userEvent from '@testing-library/user-event';
 import { describe, expect, it, vi } from 'vitest';
 import { defineComponent, h, ref } from 'vue';
-import { useKeybindings } from '../useKeybindings';
+import { useKeybindings } from './useKeybindings';
 
 const renderTestComponent = async (...args: Parameters<typeof useKeybindings>) => {
 	return renderComponent(
@@ -110,6 +110,18 @@ describe('useKeybindings', () => {
 		expect(handler).toHaveBeenCalled();
 	});
 
+	it('should normalize shortcut strings containing splitting key correctly', async () => {
+		const handler = vi.fn();
+		const keymap = ref({ 'ctrl_+': handler });
+
+		useKeybindings(keymap);
+
+		const event = new KeyboardEvent('keydown', { key: '+', ctrlKey: true });
+		document.dispatchEvent(event);
+
+		expect(handler).toHaveBeenCalled();
+	});
+
 	it('should normalize shortcut string alternatives correctly', async () => {
 		const handler = vi.fn();
 		const keymap = ref({ 'a|b': handler });
@@ -124,4 +136,31 @@ describe('useKeybindings', () => {
 		document.dispatchEvent(eventB);
 		expect(handler).toHaveBeenCalledTimes(2);
 	});
+
+	it("should prefer the 'key' over 'code' for dvorak to work correctly", () => {
+		const cHandler = vi.fn();
+		const iHandler = vi.fn();
+		const keymap = ref({
+			'ctrl+c': cHandler,
+			'ctrl+i': iHandler,
+		});
+
+		useKeybindings(keymap);
+
+		const event = new KeyboardEvent('keydown', { key: 'c', code: 'KeyI', ctrlKey: true });
+		document.dispatchEvent(event);
+		expect(cHandler).toHaveBeenCalled();
+		expect(iHandler).not.toHaveBeenCalled();
+	});
+
+	it("should fallback to 'code' for non-ansi layouts", () => {
+		const handler = vi.fn();
+		const keymap = ref({ 'ctrl+c': handler });
+
+		useKeybindings(keymap);
+
+		const event = new KeyboardEvent('keydown', { key: 'ב', code: 'KeyC', ctrlKey: true });
+		document.dispatchEvent(event);
+		expect(handler).toHaveBeenCalled();
+	});
 });
diff --git a/packages/editor-ui/src/composables/useKeybindings.ts b/packages/editor-ui/src/composables/useKeybindings.ts
index 4aa460c562..65d61886a9 100644
--- a/packages/editor-ui/src/composables/useKeybindings.ts
+++ b/packages/editor-ui/src/composables/useKeybindings.ts
@@ -5,6 +5,20 @@ import { computed, unref } from 'vue';
 
 type KeyMap = Record<string, (event: KeyboardEvent) => void>;
 
+/**
+ * Binds a `keydown` event to `document` and calls the approriate
+ * handlers based on the given `keymap`. The keymap is a map from
+ * shortcut strings to handlers. The shortcut strings can contain
+ * multiple shortcuts separated by `|`.
+ *
+ * @example
+ * ```ts
+ * {
+ * 	'ctrl+a': () => console.log('ctrl+a'),
+ * 	'ctrl+b|ctrl+c': () => console.log('ctrl+b or ctrl+c'),
+ * }
+ * ```
+ */
 export const useKeybindings = (
 	keymap: Ref<KeyMap>,
 	options?: {
@@ -22,34 +36,74 @@ export const useKeybindings = (
 		const active = activeElement.value;
 		const isInput = ['INPUT', 'TEXTAREA'].includes(active.tagName);
 		const isContentEditable = active.closest('[contenteditable]') !== null;
-		const isIgnoreClass = active.closest('.ignore-key-press') !== null;
+		const isIgnoreClass = active.closest('.ignore-key-press-canvas') !== null;
 
 		return isInput || isContentEditable || isIgnoreClass;
 	});
 
 	const normalizedKeymap = computed(() =>
 		Object.fromEntries(
-			Object.entries(keymap.value)
-				.map(([shortcut, handler]) => {
-					const shortcuts = shortcut.split('|');
-					return shortcuts.map((s) => [normalizeShortcutString(s), handler]);
-				})
-				.flat(),
+			Object.entries(keymap.value).flatMap(([shortcut, handler]) => {
+				const shortcuts = shortcut.split('|');
+				return shortcuts.map((s) => [normalizeShortcutString(s), handler]);
+			}),
 		),
 	);
 
-	function normalizeShortcutString(shortcut: string) {
-		return shortcut
-			.split(/[+_-]/)
+	function shortcutPartsToString(parts: string[]) {
+		return parts
 			.map((key) => key.toLowerCase())
 			.sort((a, b) => a.localeCompare(b))
 			.join('+');
 	}
 
+	function normalizeShortcutString(shortcut: string) {
+		if (shortcut.length === 1) {
+			return shortcut.toLowerCase();
+		}
+
+		const splitChars = ['+', '_', '-'];
+		const splitCharsRegEx = splitChars.reduce((acc, char) => {
+			if (shortcut.startsWith(char) || shortcut.endsWith(char)) {
+				return acc;
+			}
+
+			return char + acc;
+		}, '');
+
+		return shortcutPartsToString(shortcut.split(new RegExp(`[${splitCharsRegEx}]`)));
+	}
+
+	/**
+	 * Converts a keyboard event code to a key string.
+	 *
+	 * @example
+	 * keyboardEventCodeToKey('Digit0') -> '0'
+	 * keyboardEventCodeToKey('KeyA') -> 'a'
+	 */
+	function keyboardEventCodeToKey(code: string) {
+		if (code.startsWith('Digit')) {
+			return code.replace('Digit', '').toLowerCase();
+		} else if (code.startsWith('Key')) {
+			return code.replace('Key', '').toLowerCase();
+		}
+
+		return code.toLowerCase();
+	}
+
+	/**
+	 * Converts a keyboard event to a shortcut string for both
+	 * `key` and `code`.
+	 *
+	 * @example
+	 * keyboardEventToShortcutString({ key: 'a', code: 'KeyA', ctrlKey: true })
+	 * // --> { byKey: 'ctrl+a', byCode: 'ctrl+a' }
+	 */
 	function toShortcutString(event: KeyboardEvent) {
 		const { shiftKey, altKey } = event;
 		const ctrlKey = isCtrlKeyPressed(event);
 		const keys = [event.key];
+		const codes = [keyboardEventCodeToKey(event.code)];
 		const modifiers: string[] = [];
 
 		if (shiftKey) {
@@ -64,15 +118,22 @@ export const useKeybindings = (
 			modifiers.push('alt');
 		}
 
-		return normalizeShortcutString([...modifiers, ...keys].join('+'));
+		return {
+			byKey: shortcutPartsToString([...modifiers, ...keys]),
+			byCode: shortcutPartsToString([...modifiers, ...codes]),
+		};
 	}
 
 	function onKeyDown(event: KeyboardEvent) {
 		if (ignoreKeyPresses.value || isDisabled.value) return;
 
-		const shortcutString = toShortcutString(event);
+		const { byKey, byCode } = toShortcutString(event);
 
-		const handler = normalizedKeymap.value[shortcutString];
+		// Prefer `byKey` over `byCode` so that:
+		// - ANSI layouts work correctly
+		// - Dvorak works correctly
+		// - Non-ansi layouts work correctly
+		const handler = normalizedKeymap.value[byKey] ?? normalizedKeymap.value[byCode];
 
 		if (handler) {
 			event.preventDefault();
diff --git a/packages/editor-ui/src/composables/useMessage.ts b/packages/editor-ui/src/composables/useMessage.ts
index 22bb50fc69..9f5e2742ac 100644
--- a/packages/editor-ui/src/composables/useMessage.ts
+++ b/packages/editor-ui/src/composables/useMessage.ts
@@ -26,6 +26,7 @@ export function useMessage() {
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 			cancelButtonClass: 'btn--cancel',
 			confirmButtonClass: 'btn--confirm',
+			dangerouslyUseHTMLString: true,
 		};
 
 		if (typeof configOrTitle === 'string') {
@@ -49,6 +50,7 @@ export function useMessage() {
 			distinguishCancelAndClose: true,
 			showClose: config?.showClose ?? false,
 			closeOnClickModal: false,
+			dangerouslyUseHTMLString: true,
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 		};
 
@@ -74,6 +76,7 @@ export function useMessage() {
 			...(config ?? (typeof configOrTitle === 'object' ? configOrTitle : {})),
 			cancelButtonClass: 'btn--cancel',
 			confirmButtonClass: 'btn--confirm',
+			dangerouslyUseHTMLString: true,
 		};
 
 		if (typeof configOrTitle === 'string') {
diff --git a/packages/editor-ui/src/composables/__tests__/useNodeBase.spec.ts b/packages/editor-ui/src/composables/useNodeBase.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useNodeBase.spec.ts
rename to packages/editor-ui/src/composables/useNodeBase.test.ts
diff --git a/packages/editor-ui/src/composables/__tests__/useNodeConnections.spec.ts b/packages/editor-ui/src/composables/useNodeConnections.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useNodeConnections.spec.ts
rename to packages/editor-ui/src/composables/useNodeConnections.test.ts
diff --git a/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts b/packages/editor-ui/src/composables/useNodeHelpers.test.ts
similarity index 71%
rename from packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts
rename to packages/editor-ui/src/composables/useNodeHelpers.test.ts
index 732bf51f5e..c5ba6dc1f3 100644
--- a/packages/editor-ui/src/composables/__tests__/useNodeHelpers.test.ts
+++ b/packages/editor-ui/src/composables/useNodeHelpers.test.ts
@@ -208,4 +208,63 @@ 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+)+/);
+		});
+	});
+
+	describe('isSingleExecution', () => {
+		let isSingleExecution: ReturnType<typeof useNodeHelpers>['isSingleExecution'];
+		beforeEach(() => {
+			isSingleExecution = useNodeHelpers().isSingleExecution;
+		});
+
+		test('should determine based on node parameters if it would be executed once', () => {
+			expect(isSingleExecution('n8n-nodes-base.code', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.code', { mode: 'runOnceForEachItem' })).toEqual(
+				false,
+			);
+			expect(isSingleExecution('n8n-nodes-base.executeWorkflow', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.executeWorkflow', { mode: 'each' })).toEqual(false);
+			expect(isSingleExecution('n8n-nodes-base.crateDb', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.crateDb', { operation: 'update' })).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.timescaleDb', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.timescaleDb', { operation: 'update' })).toEqual(
+				true,
+			);
+			expect(isSingleExecution('n8n-nodes-base.microsoftSql', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.microsoftSql', { operation: 'update' })).toEqual(
+				true,
+			);
+			expect(isSingleExecution('n8n-nodes-base.microsoftSql', { operation: 'delete' })).toEqual(
+				true,
+			);
+			expect(isSingleExecution('n8n-nodes-base.questDb', {})).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.mongoDb', { operation: 'insert' })).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.mongoDb', { operation: 'update' })).toEqual(true);
+			expect(isSingleExecution('n8n-nodes-base.redis', {})).toEqual(true);
+		});
+	});
 });
diff --git a/packages/editor-ui/src/composables/useNodeHelpers.ts b/packages/editor-ui/src/composables/useNodeHelpers.ts
index f2f33a5ef7..461f550212 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 {
@@ -36,6 +35,7 @@ import type {
 	INodeTypeNameVersion,
 	IConnection,
 	IPinData,
+	NodeParameterValue,
 } from 'n8n-workflow';
 
 import type {
@@ -120,8 +120,9 @@ export function useNodeHelpers() {
 		parameter: INodeProperties | INodeCredentialDescription,
 		path: string,
 		node: INodeUi | null,
+		displayKey: 'displayOptions' | 'disabledOptions' = 'displayOptions',
 	) {
-		return NodeHelpers.displayParameterPath(nodeValues, parameter, path, node);
+		return NodeHelpers.displayParameterPath(nodeValues, parameter, path, node, displayKey);
 	}
 
 	function refreshNodeIssues(): void {
@@ -565,6 +566,29 @@ export function useNodeHelpers() {
 		}
 	}
 
+	function getNodeTaskData(node: INodeUi | null, runIndex = 0) {
+		if (node === null) {
+			return null;
+		}
+		if (workflowsStore.getWorkflowExecution === null) {
+			return null;
+		}
+
+		const executionData = workflowsStore.getWorkflowExecution.data;
+		if (!executionData?.resultData) {
+			// unknown status
+			return null;
+		}
+		const runData = executionData.resultData.runData;
+
+		const taskData = get(runData, [node.name, runIndex]);
+		if (!taskData) {
+			return null;
+		}
+
+		return taskData;
+	}
+
 	function getNodeInputData(
 		node: INodeUi | null,
 		runIndex = 0,
@@ -582,22 +606,8 @@ export function useNodeHelpers() {
 			runIndex = runIndex - 1;
 		}
 
-		if (node === null) {
-			return [];
-		}
-		if (workflowsStore.getWorkflowExecution === null) {
-			return [];
-		}
-
-		const executionData = workflowsStore.getWorkflowExecution.data;
-		if (!executionData?.resultData) {
-			// unknown status
-			return [];
-		}
-		const runData = executionData.resultData.runData;
-
-		const taskData = get(runData, [node.name, runIndex]);
-		if (!taskData) {
+		const taskData = getNodeTaskData(node, runIndex);
+		if (taskData === null) {
 			return [];
 		}
 
@@ -1177,7 +1187,7 @@ export function useNodeHelpers() {
 			};
 
 			if (!newNode.id) {
-				newNode.id = uuid();
+				assignNodeId(newNode);
 			}
 
 			nodeType = nodeTypesStore.getNodeType(newNode.type, newNode.typeVersion);
@@ -1247,6 +1257,62 @@ 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;
+	}
+
+	/** nodes that would execute only once with such parameters add 'undefined' to parameters values if it is parameter's default value */
+	const SINGLE_EXECUTION_NODES: { [key: string]: { [key: string]: NodeParameterValue[] } } = {
+		'n8n-nodes-base.code': {
+			mode: [undefined, 'runOnceForAllItems'],
+		},
+		'n8n-nodes-base.executeWorkflow': {
+			mode: [undefined, 'once'],
+		},
+		'n8n-nodes-base.crateDb': {
+			operation: [undefined, 'update'], // default insert
+		},
+		'n8n-nodes-base.timescaleDb': {
+			operation: [undefined, 'update'], // default insert
+		},
+		'n8n-nodes-base.microsoftSql': {
+			operation: [undefined, 'update', 'delete'], // default insert
+		},
+		'n8n-nodes-base.questDb': {
+			operation: [undefined], // default insert
+		},
+		'n8n-nodes-base.mongoDb': {
+			operation: ['insert', 'update'],
+		},
+		'n8n-nodes-base.redis': {
+			operation: [undefined], // default info
+		},
+	};
+
+	function isSingleExecution(type: string, parameters: INodeParameters): boolean {
+		const singleExecutionCase = SINGLE_EXECUTION_NODES[type];
+
+		if (singleExecutionCase) {
+			for (const parameter of Object.keys(singleExecutionCase)) {
+				if (!singleExecutionCase[parameter].includes(parameters[parameter] as NodeParameterValue)) {
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
 	return {
 		hasProxyAuth,
 		isCustomApiCallSelected,
@@ -1281,5 +1347,9 @@ export function useNodeHelpers() {
 		removeConnectionByConnectionInfo,
 		addPinDataConnections,
 		removePinDataConnections,
+		getNodeTaskData,
+		assignNodeId,
+		assignWebhookId,
+		isSingleExecution,
 	};
 }
diff --git a/packages/editor-ui/src/composables/__tests__/useNodeType.test.ts b/packages/editor-ui/src/composables/useNodeType.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useNodeType.test.ts
rename to packages/editor-ui/src/composables/useNodeType.test.ts
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..2b8ce7710d
--- /dev/null
+++ b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.test.ts
@@ -0,0 +1,161 @@
+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]: {},
+		[STORES.SETTINGS]: {
+			settings: {
+				betaFeatures: ['canvas_v2'],
+			},
+		},
+	};
+
+	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 336bf388b6..b0ef4a4f4c 100644
--- a/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts
+++ b/packages/editor-ui/src/composables/useNodeViewVersionSwitcher.ts
@@ -1,23 +1,21 @@
 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';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export function useNodeViewVersionSwitcher() {
 	const ndvStore = useNDVStore();
 	const workflowsStore = useWorkflowsStore();
-	const settingsStore = useSettingsStore();
 	const telemetry = useTelemetry();
+	const settingsStore = useSettingsStore();
 
 	const isNewUser = computed(() => workflowsStore.activeWorkflows.length === 0);
-	const isNewUserDebounced = debouncedRef(isNewUser, 3000);
 
-	const nodeViewVersion = useLocalStorage(
-		'NodeView.version',
-		settingsStore.deploymentType === 'n8n-internal' ? '2' : '1',
-	);
+	const defaultVersion = settingsStore.isCanvasV2Enabled ? '2' : '1';
+	const nodeViewVersion = useLocalStorage('NodeView.version', defaultVersion);
+	const nodeViewVersionMigrated = useLocalStorage('NodeView.migrated', false);
 
 	function setNodeViewSwitcherDropdownOpened(visible: boolean) {
 		if (!visible) {
@@ -25,20 +23,25 @@ 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';
+
+		if (!nodeViewVersionMigrated.value) {
+			nodeViewVersionMigrated.value = true;
+		}
 
 		telemetry.track('User switched canvas version', {
 			to_version: toVersion,
@@ -47,12 +50,23 @@ export function useNodeViewVersionSwitcher() {
 		nodeViewVersion.value = toVersion;
 	}
 
+	function migrateToNewNodeViewVersion() {
+		if (nodeViewVersionMigrated.value || nodeViewVersion.value === '2') {
+			return;
+		}
+
+		switchNodeViewVersion();
+	}
+
 	return {
+		isNewUser,
 		nodeViewVersion,
+		nodeViewVersionMigrated,
 		nodeViewSwitcherDiscovered,
 		isNodeViewDiscoveryTooltipVisible,
 		setNodeViewSwitcherDropdownOpened,
 		setNodeViewSwitcherDiscovered,
 		switchNodeViewVersion,
+		migrateToNewNodeViewVersion,
 	};
 }
diff --git a/packages/editor-ui/src/composables/usePageRedirectionHelper.test.ts b/packages/editor-ui/src/composables/usePageRedirectionHelper.test.ts
new file mode 100644
index 0000000000..246ac9f9fe
--- /dev/null
+++ b/packages/editor-ui/src/composables/usePageRedirectionHelper.test.ts
@@ -0,0 +1,231 @@
+import { ROLE } from '@/constants';
+import { useSettingsStore } from '@/stores/settings.store';
+import { merge } from 'lodash-es';
+import { usePageRedirectionHelper } from './usePageRedirectionHelper';
+import { defaultSettings } from '@/__tests__/defaults';
+import { useUsersStore } from '@/stores/users.store';
+import { createPinia, setActivePinia } from 'pinia';
+import * as cloudPlanApi from '@/api/cloudPlans';
+import { useVersionsStore } from '@/stores/versions.store';
+import { useTelemetry } from './useTelemetry';
+
+let settingsStore: ReturnType<typeof useSettingsStore>;
+let usersStore: ReturnType<typeof useUsersStore>;
+let versionStore: ReturnType<typeof useVersionsStore>;
+let pageRedirectionHelper: ReturnType<typeof usePageRedirectionHelper>;
+
+vi.mock('@/composables/useTelemetry', () => {
+	const track = vi.fn();
+	return {
+		useTelemetry: () => {
+			return {
+				track,
+			};
+		},
+	};
+});
+
+describe('usePageRedirectionHelper', () => {
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+		settingsStore = useSettingsStore();
+		usersStore = useUsersStore();
+		versionStore = useVersionsStore();
+
+		pageRedirectionHelper = usePageRedirectionHelper();
+
+		vi.spyOn(cloudPlanApi, 'getAdminPanelLoginCode').mockResolvedValue({
+			code: '123',
+		});
+
+		const url = 'https://test.app.n8n.cloud';
+
+		Object.defineProperty(window, 'location', {
+			value: {
+				href: url,
+			},
+			writable: true,
+		});
+
+		versionStore.setVersionNotificationSettings({
+			enabled: true,
+			endpoint: '',
+			infoUrl:
+				'https://docs.n8n.io/release-notes/#n8n1652?utm_source=n8n_app&utm_medium=instance_upgrade_releases',
+		});
+	});
+
+	test.each([
+		[
+			'default',
+			'production',
+			ROLE.Owner,
+			'https://n8n.io/pricing?utm_campaign=upgrade-api&source=advanced-permissions',
+		],
+		[
+			'default',
+			'development',
+			ROLE.Owner,
+			'https://n8n.io/pricing?utm_campaign=upgrade-api&source=advanced-permissions',
+		],
+		[
+			'cloud',
+			'production',
+			ROLE.Owner,
+			`https://app.n8n.cloud/login?code=123&returnPath=${encodeURIComponent(
+				'/account/change-plan',
+			)}&utm_campaign=upgrade-api&source=advanced-permissions`,
+		],
+		[
+			'cloud',
+			'production',
+			ROLE.Member,
+			'https://n8n.io/pricing?utm_campaign=upgrade-api&source=advanced-permissions',
+		],
+	])(
+		'"goToUpgrade" should generate the correct URL for "%s" deployment and "%s" license environment and user role "%s"',
+		async (type, environment, role, expectation) => {
+			// Arrange
+
+			usersStore.addUsers([
+				{
+					id: '1',
+					isPending: false,
+					role,
+				},
+			]);
+
+			usersStore.currentUserId = '1';
+
+			const telemetry = useTelemetry();
+
+			settingsStore.setSettings(
+				merge({}, defaultSettings, {
+					deployment: {
+						type,
+					},
+					license: {
+						environment,
+					},
+				}),
+			);
+
+			// Act
+
+			await pageRedirectionHelper.goToUpgrade('advanced-permissions', 'upgrade-api', 'redirect');
+
+			// Assert
+
+			expect(telemetry.track).toHaveBeenCalledWith(
+				'User clicked upgrade CTA',
+				expect.objectContaining({
+					source: 'advanced-permissions',
+					isTrial: false,
+					deploymentType: type,
+					trialDaysLeft: expect.any(Number),
+					executionsLeft: expect.any(Number),
+					workflowsLeft: expect.any(Number),
+				}),
+			);
+
+			expect(location.href).toBe(expectation);
+		},
+	);
+
+	test.each([
+		[
+			'cloud',
+			'production',
+			ROLE.Owner,
+			`https://app.n8n.cloud/login?code=123&returnPath=${encodeURIComponent('/manage')}`,
+		],
+		[
+			'cloud',
+			'production',
+			ROLE.Member,
+			'https://docs.n8n.io/release-notes/#n8n1652?utm_source=n8n_app&utm_medium=instance_upgrade_releases',
+		],
+	])(
+		'"goToVersions" should generate the correct URL for "%s" deployment and "%s" license environment and user role "%s"',
+		async (type, environment, role, expectation) => {
+			// Arrange
+
+			usersStore.addUsers([
+				{
+					id: '1',
+					isPending: false,
+					role,
+				},
+			]);
+
+			usersStore.currentUserId = '1';
+
+			settingsStore.setSettings(
+				merge({}, defaultSettings, {
+					deployment: {
+						type,
+					},
+					license: {
+						environment,
+					},
+				}),
+			);
+
+			// Act
+
+			await pageRedirectionHelper.goToVersions();
+
+			// Assert
+
+			expect(location.href).toBe(expectation);
+		},
+	);
+
+	test.each([
+		[
+			'cloud',
+			'production',
+			ROLE.Owner,
+			`https://app.n8n.cloud/login?code=123&returnPath=${encodeURIComponent('/dashboard')}`,
+		],
+		['cloud', 'production', ROLE.Member, 'https://test.app.n8n.cloud'],
+	])(
+		'"goToDashboard" should generate the correct URL for "%s" deployment and "%s" license environment and user role "%s"',
+		async (type, environment, role, expectation) => {
+			// Arrange
+
+			usersStore.addUsers([
+				{
+					id: '1',
+					isPending: false,
+					role,
+				},
+			]);
+
+			usersStore.currentUserId = '1';
+
+			settingsStore.setSettings(
+				merge({}, defaultSettings, {
+					deployment: {
+						type,
+					},
+					license: {
+						environment,
+					},
+				}),
+			);
+
+			// Act
+
+			await pageRedirectionHelper.goToDashboard();
+
+			// Assert
+
+			expect(location.href).toBe(expectation);
+		},
+	);
+});
diff --git a/packages/editor-ui/src/composables/usePageRedirectionHelper.ts b/packages/editor-ui/src/composables/usePageRedirectionHelper.ts
new file mode 100644
index 0000000000..42a1616dd9
--- /dev/null
+++ b/packages/editor-ui/src/composables/usePageRedirectionHelper.ts
@@ -0,0 +1,105 @@
+import { useUsersStore } from '@/stores/users.store';
+import { useCloudPlanStore } from '@/stores/cloudPlan.store';
+import { useVersionsStore } from '@/stores/versions.store';
+import { useTelemetry } from './useTelemetry';
+import { useSettingsStore } from '@/stores/settings.store';
+import type { CloudUpdateLinkSourceType, UTMCampaign } from '@/Interface';
+import { N8N_PRICING_PAGE_URL } from '@/constants';
+
+export function usePageRedirectionHelper() {
+	const usersStore = useUsersStore();
+	const cloudPlanStore = useCloudPlanStore();
+	const versionsStore = useVersionsStore();
+	const telemetry = useTelemetry();
+	const settingsStore = useSettingsStore();
+
+	/**
+	 * If the user is an instance owner in the cloud, it generates an auto-login link to the
+	 * cloud dashboard that redirects the user to the /manage page where they can upgrade to a new n8n version.
+	 * Otherwise, it redirect them to our docs.
+	 */
+	const goToVersions = async () => {
+		let versionsLink = versionsStore.infoUrl;
+
+		if (usersStore.isInstanceOwner && settingsStore.isCloudDeployment) {
+			versionsLink = await cloudPlanStore.generateCloudDashboardAutoLoginLink({
+				redirectionPath: '/manage',
+			});
+		}
+
+		location.href = versionsLink;
+	};
+
+	const goToDashboard = async () => {
+		if (usersStore.isInstanceOwner && settingsStore.isCloudDeployment) {
+			const dashboardLink = await cloudPlanStore.generateCloudDashboardAutoLoginLink({
+				redirectionPath: '/dashboard',
+			});
+
+			location.href = dashboardLink;
+		}
+
+		return;
+	};
+
+	/**
+	 * If the user is an instance owner in the cloud, it generates an auto-login link to the
+	 * cloud dashboard that redirects the user to the /account/change-plan page where they upgrade/downgrade the current plan.
+	 * Otherwise, it redirect them our website.
+	 */
+
+	const goToUpgrade = async (
+		source: CloudUpdateLinkSourceType,
+		utm_campaign: UTMCampaign,
+		mode: 'open' | 'redirect' = 'open',
+	) => {
+		const { usageLeft, trialDaysLeft, userIsTrialing } = cloudPlanStore;
+		const { executionsLeft, workflowsLeft } = usageLeft;
+		const deploymentType = settingsStore.deploymentType;
+
+		telemetry.track('User clicked upgrade CTA', {
+			source,
+			isTrial: userIsTrialing,
+			deploymentType,
+			trialDaysLeft,
+			executionsLeft,
+			workflowsLeft,
+		});
+
+		const upgradeLink = await generateUpgradeLink(source, utm_campaign);
+
+		if (mode === 'open') {
+			window.open(upgradeLink, '_blank');
+		} else {
+			location.href = upgradeLink;
+		}
+	};
+
+	const generateUpgradeLink = async (source: string, utm_campaign: string) => {
+		let upgradeLink = N8N_PRICING_PAGE_URL;
+
+		if (usersStore.isInstanceOwner && settingsStore.isCloudDeployment) {
+			upgradeLink = await cloudPlanStore.generateCloudDashboardAutoLoginLink({
+				redirectionPath: '/account/change-plan',
+			});
+		}
+
+		const url = new URL(upgradeLink);
+
+		if (utm_campaign) {
+			url.searchParams.set('utm_campaign', utm_campaign);
+		}
+
+		if (source) {
+			url.searchParams.set('source', source);
+		}
+
+		return url.toString();
+	};
+
+	return {
+		goToDashboard,
+		goToVersions,
+		goToUpgrade,
+	};
+}
diff --git a/packages/editor-ui/src/composables/__tests__/usePinnedData.test.ts b/packages/editor-ui/src/composables/usePinnedData.test.ts
similarity index 54%
rename from packages/editor-ui/src/composables/__tests__/usePinnedData.test.ts
rename to packages/editor-ui/src/composables/usePinnedData.test.ts
index 499c371496..cc83ce0ed6 100644
--- a/packages/editor-ui/src/composables/__tests__/usePinnedData.test.ts
+++ b/packages/editor-ui/src/composables/usePinnedData.test.ts
@@ -3,9 +3,10 @@ import { setActivePinia, createPinia } from 'pinia';
 import { ref } from 'vue';
 import { usePinnedData } from '@/composables/usePinnedData';
 import type { INodeUi } from '@/Interface';
-import { MAX_PINNED_DATA_SIZE } from '@/constants';
+import { HTTP_REQUEST_NODE_TYPE, IF_NODE_TYPE, MAX_PINNED_DATA_SIZE } from '@/constants';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { NodeConnectionType, STICKY_NODE_TYPE, type INodeTypeDescription } from 'n8n-workflow';
 
 vi.mock('@/composables/useToast', () => ({ useToast: vi.fn(() => ({ showError: vi.fn() })) }));
 vi.mock('@/composables/useI18n', () => ({
@@ -17,6 +18,13 @@ vi.mock('@/composables/useExternalHooks', () => ({
 	})),
 }));
 
+const getNodeType = vi.fn();
+vi.mock('@/stores/nodeTypes.store', () => ({
+	useNodeTypesStore: vi.fn(() => ({
+		getNodeType,
+	})),
+}));
+
 describe('usePinnedData', () => {
 	beforeEach(() => {
 		setActivePinia(createPinia());
@@ -133,4 +141,127 @@ describe('usePinnedData', () => {
 			expect(spy).toHaveBeenCalled();
 		});
 	});
+
+	describe('canPinData()', () => {
+		afterEach(() => {
+			vi.clearAllMocks();
+		});
+
+		it('allows pin on single output', async () => {
+			const node = ref({
+				name: 'single output node',
+				typeVersion: 1,
+				type: HTTP_REQUEST_NODE_TYPE,
+
+				parameters: {},
+				onError: 'stopWorkflow',
+			} as INodeUi);
+			getNodeType.mockReturnValue(makeNodeType([NodeConnectionType.Main], HTTP_REQUEST_NODE_TYPE));
+
+			const { canPinNode } = usePinnedData(node);
+
+			expect(canPinNode()).toBe(true);
+			expect(canPinNode(false, 0)).toBe(true);
+			// validate out of range index
+			expect(canPinNode(false, 1)).toBe(false);
+			expect(canPinNode(false, -1)).toBe(false);
+		});
+
+		it('allows pin on one main and one error output', async () => {
+			const node = ref({
+				name: 'single output node',
+				typeVersion: 1,
+				type: HTTP_REQUEST_NODE_TYPE,
+				parameters: {},
+				onError: 'continueErrorOutput',
+			} as INodeUi);
+			getNodeType.mockReturnValue(makeNodeType([NodeConnectionType.Main], HTTP_REQUEST_NODE_TYPE));
+
+			const { canPinNode } = usePinnedData(node);
+
+			expect(canPinNode()).toBe(true);
+			expect(canPinNode(false, 0)).toBe(true);
+			expect(canPinNode(false, 1)).toBe(false);
+			// validate out of range index
+			expect(canPinNode(false, 2)).toBe(false);
+			expect(canPinNode(false, -1)).toBe(false);
+		});
+
+		it('does not allow pin on two main outputs', async () => {
+			const node = ref({
+				name: 'single output node',
+				typeVersion: 1,
+				type: IF_NODE_TYPE,
+				parameters: {},
+				onError: 'stopWorkflow',
+			} as INodeUi);
+			getNodeType.mockReturnValue(
+				makeNodeType([NodeConnectionType.Main, NodeConnectionType.Main], IF_NODE_TYPE),
+			);
+
+			const { canPinNode } = usePinnedData(node);
+
+			expect(canPinNode()).toBe(false);
+			expect(canPinNode(false, 0)).toBe(false);
+			expect(canPinNode(false, 1)).toBe(false);
+			// validate out of range index
+			expect(canPinNode(false, 2)).toBe(false);
+			expect(canPinNode(false, -1)).toBe(false);
+		});
+
+		it('does not allow pin on denylisted node', async () => {
+			const node = ref({
+				name: 'single output node',
+				typeVersion: 1,
+				type: STICKY_NODE_TYPE,
+			} as INodeUi);
+			const { canPinNode } = usePinnedData(node);
+
+			expect(canPinNode()).toBe(false);
+			expect(canPinNode(false, 0)).toBe(false);
+		});
+
+		it('does not allow pin with checkDataEmpty and no pin', async () => {
+			const node = ref({
+				name: 'single output node',
+				typeVersion: 1,
+				type: HTTP_REQUEST_NODE_TYPE,
+			} as INodeUi);
+			getNodeType.mockReturnValue(makeNodeType([NodeConnectionType.Main], HTTP_REQUEST_NODE_TYPE));
+
+			const { canPinNode } = usePinnedData(node);
+
+			expect(canPinNode(true)).toBe(false);
+			expect(canPinNode(true, 0)).toBe(false);
+		});
+
+		it('does not allow pin without output', async () => {
+			const node = ref({
+				name: 'zero output node',
+				typeVersion: 1,
+				type: 'n8n-nodes-base.stopAndError',
+			} as INodeUi);
+			getNodeType.mockReturnValue(makeNodeType([], 'n8n-nodes-base.stopAndError'));
+
+			const { canPinNode } = usePinnedData(node);
+
+			expect(canPinNode()).toBe(false);
+			expect(canPinNode(false, 0)).toBe(false);
+			expect(canPinNode(false, -1)).toBe(false);
+			expect(canPinNode(false, 1)).toBe(false);
+		});
+	});
 });
+
+const makeNodeType = (outputs: NodeConnectionType[], name: string) =>
+	({
+		displayName: name,
+		name,
+		version: [1],
+		inputs: [],
+		outputs,
+		properties: [],
+		defaults: { color: '', name: '' },
+		group: [],
+		description: '',
+	}) as INodeTypeDescription;
diff --git a/packages/editor-ui/src/composables/usePinnedData.ts b/packages/editor-ui/src/composables/usePinnedData.ts
index 2ee0d046b5..46d33fc629 100644
--- a/packages/editor-ui/src/composables/usePinnedData.ts
+++ b/packages/editor-ui/src/composables/usePinnedData.ts
@@ -75,9 +75,9 @@ export function usePinnedData(
 		);
 	});
 
-	function canPinNode(checkDataEmpty = false) {
+	function canPinNode(checkDataEmpty = false, outputIndex?: number) {
 		const targetNode = unref(node);
-		if (targetNode === null) return false;
+		if (targetNode === null || PIN_DATA_NODE_TYPES_DENYLIST.includes(targetNode.type)) return false;
 
 		const nodeType = useNodeTypesStore().getNodeType(targetNode.type, targetNode.typeVersion);
 		const dataToPin = getInputDataWithPinned(targetNode);
@@ -85,14 +85,25 @@ export function usePinnedData(
 		if (!nodeType || (checkDataEmpty && dataToPin.length === 0)) return false;
 
 		const workflow = workflowsStore.getCurrentWorkflow();
-		const outputs = NodeHelpers.getNodeOutputs(workflow, targetNode, nodeType);
-		const mainOutputs = outputs.filter((output) =>
-			typeof output === 'string'
-				? output === NodeConnectionType.Main
-				: output.type === NodeConnectionType.Main,
+		const outputs = NodeHelpers.getNodeOutputs(workflow, targetNode, nodeType).map((output) =>
+			typeof output === 'string' ? { type: output } : output,
 		);
 
-		return mainOutputs.length === 1 && !PIN_DATA_NODE_TYPES_DENYLIST.includes(targetNode.type);
+		const mainOutputs = outputs.filter(
+			(output) => output.type === NodeConnectionType.Main && output.category !== 'error',
+		);
+
+		let indexAcceptable = true;
+
+		if (outputIndex !== undefined) {
+			const output = outputs[outputIndex];
+
+			if (outputs[outputIndex] === undefined) return false;
+
+			indexAcceptable = output.type === NodeConnectionType.Main && output.category !== 'error';
+		}
+
+		return mainOutputs.length === 1 && indexAcceptable;
 	}
 
 	function isValidJSON(data: string): boolean {
diff --git a/packages/editor-ui/src/composables/usePushConnection.test.ts b/packages/editor-ui/src/composables/usePushConnection.test.ts
new file mode 100644
index 0000000000..63592afd79
--- /dev/null
+++ b/packages/editor-ui/src/composables/usePushConnection.test.ts
@@ -0,0 +1,297 @@
+import { stringify } from 'flatted';
+import { useRouter } from 'vue-router';
+import { createPinia, setActivePinia } from 'pinia';
+import type { PushMessage, PushPayload } from '@n8n/api-types';
+import type { ITaskData, WorkflowOperationError, IRunData } from 'n8n-workflow';
+
+import { usePushConnection } from '@/composables/usePushConnection';
+import { usePushConnectionStore } from '@/stores/pushConnection.store';
+import { useOrchestrationStore } from '@/stores/orchestration.store';
+import { useUIStore } from '@/stores/ui.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useToast } from '@/composables/useToast';
+import type { IExecutionResponse } from '@/Interface';
+
+vi.mock('vue-router', () => {
+	return {
+		RouterLink: vi.fn(),
+		useRouter: () => ({
+			push: vi.fn(),
+		}),
+		useRoute: () => ({}),
+	};
+});
+
+vi.mock('@/composables/useToast', () => {
+	const showMessage = vi.fn();
+	const showError = vi.fn();
+	return {
+		useToast: () => {
+			return {
+				showMessage,
+				showError,
+			};
+		},
+	};
+});
+
+vi.useFakeTimers();
+
+describe('usePushConnection()', () => {
+	let router: ReturnType<typeof useRouter>;
+	let pushStore: ReturnType<typeof usePushConnectionStore>;
+	let orchestrationStore: ReturnType<typeof useOrchestrationStore>;
+	let pushConnection: ReturnType<typeof usePushConnection>;
+	let uiStore: ReturnType<typeof useUIStore>;
+	let workflowsStore: ReturnType<typeof useWorkflowsStore>;
+	let toast: ReturnType<typeof useToast>;
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		router = vi.mocked(useRouter)();
+		pushStore = usePushConnectionStore();
+		orchestrationStore = useOrchestrationStore();
+		uiStore = useUIStore();
+		workflowsStore = useWorkflowsStore();
+		pushConnection = usePushConnection({ router });
+		toast = useToast();
+	});
+
+	afterEach(() => {
+		vi.restoreAllMocks();
+		pushConnection.pushMessageQueue.value = [];
+	});
+
+	describe('initialize()', () => {
+		it('should add event listener to the pushStore', () => {
+			const spy = vi.spyOn(pushStore, 'addEventListener').mockImplementation(() => () => {});
+
+			pushConnection.initialize();
+
+			expect(spy).toHaveBeenCalled();
+		});
+	});
+
+	describe('terminate()', () => {
+		it('should remove event listener from the pushStore', () => {
+			const returnFn = vi.fn();
+			vi.spyOn(pushStore, 'addEventListener').mockImplementation(() => returnFn);
+
+			pushConnection.initialize();
+			pushConnection.terminate();
+
+			expect(returnFn).toHaveBeenCalled();
+		});
+	});
+
+	describe('queuePushMessage()', () => {
+		it('should add message to the queue and sets timeout if not already set', () => {
+			const event: PushMessage = {
+				type: 'sendWorkerStatusMessage',
+				data: {
+					workerId: '1',
+					status: {} as PushPayload<'sendWorkerStatusMessage'>['status'],
+				},
+			};
+
+			pushConnection.queuePushMessage(event, 5);
+
+			expect(pushConnection.pushMessageQueue.value).toHaveLength(1);
+			expect(pushConnection.pushMessageQueue.value[0]).toEqual({ message: event, retriesLeft: 5 });
+			expect(pushConnection.retryTimeout.value).not.toBeNull();
+		});
+	});
+
+	describe('processWaitingPushMessages()', () => {
+		it('should clear the queue and reset the timeout', async () => {
+			const event: PushMessage = { type: 'executionRecovered', data: { executionId: '1' } };
+
+			pushConnection.queuePushMessage(event, 0);
+			expect(pushConnection.pushMessageQueue.value).toHaveLength(1);
+			expect(pushConnection.retryTimeout.value).toBeDefined();
+
+			await pushConnection.processWaitingPushMessages();
+
+			expect(pushConnection.pushMessageQueue.value).toHaveLength(0);
+			expect(pushConnection.retryTimeout.value).toBeNull();
+		});
+	});
+
+	describe('pushMessageReceived()', () => {
+		describe('sendWorkerStatusMessage', () => {
+			it('should handle event type correctly', async () => {
+				const spy = vi.spyOn(orchestrationStore, 'updateWorkerStatus').mockImplementation(() => {});
+				const event: PushMessage = {
+					type: 'sendWorkerStatusMessage',
+					data: {
+						workerId: '1',
+						status: {} as PushPayload<'sendWorkerStatusMessage'>['status'],
+					},
+				};
+
+				const result = await pushConnection.pushMessageReceived(event);
+
+				expect(spy).toHaveBeenCalledWith(event.data.status);
+				expect(result).toBeTruthy();
+			});
+		});
+
+		describe('executionFinished', () => {
+			const executionId = '1';
+			const workflowId = 'abc';
+
+			beforeEach(() => {
+				workflowsStore.activeExecutionId = executionId;
+				uiStore.isActionActive.workflowRunning = true;
+			});
+
+			it('should handle executionFinished event correctly', async () => {
+				const result = await pushConnection.pushMessageReceived({
+					type: 'executionFinished',
+					data: {
+						executionId,
+						workflowId,
+						status: 'success',
+						rawData: stringify({
+							resultData: {
+								runData: {},
+							},
+						}),
+					},
+				});
+
+				expect(result).toBeTruthy();
+				expect(workflowsStore.workflowExecutionData).toBeDefined();
+				expect(uiStore.isActionActive.workflowRunning).toBeTruthy();
+
+				expect(toast.showMessage).toHaveBeenCalledWith({
+					title: 'Workflow executed successfully',
+					type: 'success',
+				});
+			});
+
+			it('should handle isManualExecutionCancelled correctly', async () => {
+				const result = await pushConnection.pushMessageReceived({
+					type: 'executionFinished',
+					data: {
+						executionId,
+						workflowId,
+						status: 'error',
+						rawData: stringify({
+							startData: {},
+							resultData: {
+								runData: {
+									'Last Node': [],
+								},
+								lastNodeExecuted: 'Last Node',
+								error: {
+									message:
+										'Your trial has ended. <a href="https://app.n8n.cloud/account/change-plan">Upgrade now</a> to keep automating',
+									name: 'NodeApiError',
+									node: 'Last Node',
+								} as unknown as WorkflowOperationError,
+							},
+						}),
+					},
+				});
+
+				expect(useToast().showMessage).toHaveBeenCalledWith({
+					message:
+						'Your trial has ended. <a href="https://app.n8n.cloud/account/change-plan">Upgrade now</a> to keep automating',
+					title: 'Problem in node ‘Last Node‘',
+					type: 'error',
+					duration: 0,
+				});
+
+				expect(result).toBeTruthy();
+				expect(workflowsStore.workflowExecutionData).toBeDefined();
+				expect(uiStore.isActionActive.workflowRunning).toBeTruthy();
+			});
+		});
+
+		describe('nodeExecuteAfter', async () => {
+			it("enqueues messages if we don't have the active execution id yet", async () => {
+				uiStore.isActionActive.workflowRunning = true;
+				const event: PushMessage = {
+					type: 'nodeExecuteAfter',
+					data: {
+						executionId: '1',
+						nodeName: 'foo',
+						data: {} as ITaskData,
+					},
+				};
+
+				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();
+			});
+		});
+
+		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 6e1d993c0e..3bf9cd4cc1 100644
--- a/packages/editor-ui/src/composables/usePushConnection.ts
+++ b/packages/editor-ui/src/composables/usePushConnection.ts
@@ -1,25 +1,24 @@
 import { parse } from 'flatted';
 import { h, ref } from 'vue';
 import type { useRouter } from 'vue-router';
+import { TelemetryHelpers } from 'n8n-workflow';
 import type {
 	ExpressionError,
 	IDataObject,
 	INodeTypeNameVersion,
-	IRun,
 	IRunExecutionData,
 	IWorkflowBase,
 	SubworkflowOperationError,
 	IExecuteContextData,
 	NodeOperationError,
 	INodeTypeDescription,
+	NodeError,
 } from 'n8n-workflow';
-import { TelemetryHelpers } from 'n8n-workflow';
-import type { PushMessage, PushPayload } from '@n8n/api-types';
+import type { PushMessage } from '@n8n/api-types';
 
-import type { IExecutionResponse, IExecutionsCurrentSummaryExtended } from '@/Interface';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useToast } from '@/composables/useToast';
-import { WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
+import { AI_CREDITS_EXPERIMENT, WORKFLOW_SETTINGS_MODAL_KEY } from '@/constants';
 import { getTriggerNodeServiceName } from '@/utils/nodeTypesUtils';
 import { codeNodeEditorEventBus, globalLinkActionsEventBus } from '@/event-bus';
 import { useUIStore } from '@/stores/ui.store';
@@ -36,8 +35,10 @@ import { useTelemetry } from '@/composables/useTelemetry';
 import type { PushMessageQueueItem } from '@/types';
 import { useAssistantStore } from '@/stores/assistant.store';
 import NodeExecutionErrorMessage from '@/components/NodeExecutionErrorMessage.vue';
-
-type IPushDataExecutionFinishedPayload = PushPayload<'executionFinished'>;
+import type { IExecutionResponse } from '@/Interface';
+import { clearPopupWindowState, hasTrimmedData, hasTrimmedItem } from '../utils/executionUtils';
+import { usePostHog } from '@/stores/posthog.store';
+import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
 export function usePushConnection({ router }: { router: ReturnType<typeof useRouter> }) {
 	const workflowHelpers = useWorkflowHelpers({ router });
@@ -54,6 +55,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 	const uiStore = useUIStore();
 	const workflowsStore = useWorkflowsStore();
 	const assistantStore = useAssistantStore();
+	const posthogStore = usePostHog();
 
 	const retryTimeout = ref<NodeJS.Timeout | null>(null);
 	const pushMessageQueue = ref<PushMessageQueueItem[]>([]);
@@ -148,7 +150,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;
@@ -158,58 +164,12 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 				// The data is not for the currently active execution or
 				// we do not have the execution id yet.
 				if (isRetry !== true) {
-					queuePushMessage(event as unknown as PushMessage, retryAttempts);
+					queuePushMessage(receivedData, retryAttempts);
 				}
 				return false;
 			}
 		}
 
-		// recovered execution data is handled like executionFinished data, however for security reasons
-		// we need to fetch the data from the server again rather than push it to all clients
-		let recoveredPushData: IPushDataExecutionFinishedPayload | undefined = undefined;
-		if (receivedData.type === 'executionRecovered') {
-			const recoveredExecutionId = receivedData.data?.executionId;
-			const isWorkflowRunning = uiStore.isActionActive['workflowRunning'];
-			if (isWorkflowRunning && workflowsStore.activeExecutionId === recoveredExecutionId) {
-				// pull execution data for the recovered execution from the server
-				const executionData = await workflowsStore.fetchExecutionDataById(
-					workflowsStore.activeExecutionId,
-				);
-				if (executionData?.data) {
-					// data comes in as 'flatten' object, so we need to parse it
-					executionData.data = parse(executionData.data as unknown as string) as IRunExecutionData;
-					const iRunExecutionData: IRunExecutionData = {
-						startData: executionData.data?.startData,
-						resultData: executionData.data?.resultData ?? { runData: {} },
-						executionData: executionData.data?.executionData,
-					};
-					if (workflowsStore.workflowExecutionData?.workflowId === executionData.workflowId) {
-						const activeRunData = workflowsStore.workflowExecutionData?.data?.resultData?.runData;
-						if (activeRunData) {
-							for (const key of Object.keys(activeRunData)) {
-								iRunExecutionData.resultData.runData[key] = activeRunData[key];
-							}
-						}
-					}
-					const iRun: IRun = {
-						data: iRunExecutionData,
-						finished: executionData.finished,
-						mode: executionData.mode,
-						waitTill: executionData.data?.waitTill,
-						startedAt: executionData.startedAt,
-						stoppedAt: executionData.stoppedAt,
-						status: 'crashed',
-					};
-					if (executionData.data) {
-						recoveredPushData = {
-							executionId: executionData.id,
-							data: iRun,
-						};
-					}
-				}
-			}
-		}
-
 		if (
 			receivedData.type === 'workflowFailedToActivate' &&
 			workflowsStore.workflowId === receivedData.data.workflowId
@@ -238,51 +198,115 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 		}
 
 		if (receivedData.type === 'executionFinished' || receivedData.type === 'executionRecovered') {
-			// The workflow finished executing
-			let pushData: IPushDataExecutionFinishedPayload;
-			if (receivedData.type === 'executionRecovered' && recoveredPushData !== undefined) {
-				pushData = recoveredPushData;
-			} else {
-				pushData = receivedData.data as IPushDataExecutionFinishedPayload;
-			}
-
-			const { activeExecutionId } = workflowsStore;
-			if (activeExecutionId === pushData.executionId) {
-				const activeRunData = workflowsStore.workflowExecutionData?.data?.resultData?.runData;
-				if (activeRunData) {
-					for (const key of Object.keys(activeRunData)) {
-						if (
-							pushData.data.data.resultData.runData[key]?.[0]?.data?.main?.[0]?.[0]?.json
-								?.isArtificialRecoveredEventItem === true &&
-							activeRunData[key].length > 0
-						)
-							pushData.data.data.resultData.runData[key] = activeRunData[key];
-					}
-				}
-				workflowsStore.finishActiveExecution(pushData);
-			}
-
 			if (!uiStore.isActionActive['workflowRunning']) {
 				// No workflow is running so ignore the messages
 				return false;
 			}
 
-			if (activeExecutionId !== pushData.executionId) {
+			if (receivedData.type === 'executionFinished') {
+				clearPopupWindowState();
+				const workflow = workflowsStore.getWorkflowById(receivedData.data.workflowId);
+				if (workflow?.meta?.templateId) {
+					const isAiCreditsExperimentEnabled =
+						posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) === AI_CREDITS_EXPERIMENT.variant;
+					const easyAiWorkflowJson = getEasyAiWorkflowJson({
+						isInstanceInAiFreeCreditsExperiment: isAiCreditsExperimentEnabled,
+						withOpenAiFreeCredits: settingsStore.aiCreditsQuota,
+					});
+					const isEasyAIWorkflow = workflow.meta.templateId === easyAiWorkflowJson.meta.templateId;
+					if (isEasyAIWorkflow) {
+						telemetry.track(
+							'User executed test AI workflow',
+							{
+								status: receivedData.data.status,
+							},
+							{ withPostHog: true },
+						);
+					}
+				}
+			}
+
+			const { executionId } = receivedData.data;
+			const { activeExecutionId } = workflowsStore;
+			if (executionId !== activeExecutionId) {
 				// The workflow which did finish execution did either not get started
 				// by this session or we do not have the execution id yet.
 				if (isRetry !== true) {
-					queuePushMessage(event as unknown as PushMessage, retryAttempts);
+					queuePushMessage(receivedData, retryAttempts);
 				}
 				return false;
 			}
 
-			const runDataExecuted = pushData.data;
+			let showedSuccessToast = false;
 
-			let runDataExecutedErrorMessage = getExecutionError(runDataExecuted.data);
+			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 {
+				uiStore.setProcessingExecutionResults(true);
 
-			if (runDataExecuted.status === 'crashed') {
+				/**
+				 * On successful completion without data, we show a success toast
+				 * immediately, even though we still need to fetch and deserialize the
+				 * full execution data, to minimize perceived latency.
+				 */
+				if (receivedData.type === 'executionFinished' && receivedData.data.status === 'success') {
+					workflowHelpers.setDocumentTitle(
+						workflowsStore.getWorkflowById(receivedData.data.workflowId)?.name,
+						'IDLE',
+					);
+					uiStore.removeActiveAction('workflowRunning');
+					toast.showMessage({
+						title: i18n.baseText('pushConnection.workflowExecutedSuccessfully'),
+						type: 'success',
+					});
+					showedSuccessToast = true;
+				}
+
+				let execution: IExecutionResponse | null;
+
+				try {
+					execution = await workflowsStore.fetchExecutionDataById(executionId);
+					if (!execution?.data) {
+						uiStore.setProcessingExecutionResults(false);
+						return false;
+					}
+
+					executionData = {
+						workflowId: execution.workflowId,
+						data: parse(execution.data as unknown as string),
+						status: execution.status,
+					};
+				} catch {
+					uiStore.setProcessingExecutionResults(false);
+					return false;
+				}
+			}
+
+			const iRunExecutionData: IRunExecutionData = {
+				startData: executionData.data?.startData,
+				resultData: executionData.data?.resultData ?? { runData: {} },
+				executionData: executionData.data?.executionData,
+			};
+
+			if (workflowsStore.workflowExecutionData?.workflowId === executionData.workflowId) {
+				const activeRunData = workflowsStore.workflowExecutionData?.data?.resultData?.runData;
+				if (activeRunData) {
+					for (const key of Object.keys(activeRunData)) {
+						if (hasTrimmedItem(activeRunData[key])) continue;
+						iRunExecutionData.resultData.runData[key] = activeRunData[key];
+					}
+				}
+			}
+
+			uiStore.setProcessingExecutionResults(false);
+
+			let runDataExecutedErrorMessage = getExecutionError(iRunExecutionData);
+
+			if (executionData.status === 'crashed') {
 				runDataExecutedErrorMessage = i18n.baseText('pushConnection.executionFailed.message');
-			} else if (runDataExecuted.status === 'canceled') {
+			} else if (executionData.status === 'canceled') {
 				runDataExecutedErrorMessage = i18n.baseText(
 					'executionsList.showMessage.stopExecution.message',
 					{
@@ -291,12 +315,12 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 				);
 			}
 
-			const lineNumber = runDataExecuted?.data?.resultData?.error?.lineNumber;
+			const lineNumber = iRunExecutionData.resultData?.error?.lineNumber;
 
-			codeNodeEditorEventBus.emit('highlightLine', lineNumber ?? 'final');
+			codeNodeEditorEventBus.emit('highlightLine', lineNumber ?? 'last');
 
 			const workflow = workflowHelpers.getCurrentWorkflow();
-			if (runDataExecuted.waitTill !== undefined) {
+			if (executionData.data?.waitTill !== undefined) {
 				const workflowSettings = workflowsStore.workflowSettings;
 				const saveManualExecutions = settingsStore.saveManualExecutions;
 
@@ -317,15 +341,14 @@ 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 (runDataExecuted.finished !== true) {
+			} else if (executionData.status === 'error' || executionData.status === 'canceled') {
 				workflowHelpers.setDocumentTitle(workflow.name as string, 'ERROR');
 
 				if (
-					runDataExecuted.data.resultData.error?.name === 'ExpressionError' &&
-					(runDataExecuted.data.resultData.error as ExpressionError).context.functionality ===
-						'pairedItem'
+					iRunExecutionData.resultData.error?.name === 'ExpressionError' &&
+					(iRunExecutionData.resultData.error as ExpressionError).functionality === 'pairedItem'
 				) {
-					const error = runDataExecuted.data.resultData.error as ExpressionError;
+					const error = iRunExecutionData.resultData.error as ExpressionError;
 
 					void workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
 						const eventData: IDataObject = {
@@ -365,8 +388,8 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 					});
 				}
 
-				if (runDataExecuted.data.resultData.error?.name === 'SubworkflowOperationError') {
-					const error = runDataExecuted.data.resultData.error as SubworkflowOperationError;
+				if (iRunExecutionData.resultData.error?.name === 'SubworkflowOperationError') {
+					const error = iRunExecutionData.resultData.error as SubworkflowOperationError;
 
 					workflowsStore.subWorkflowExecutionError = error;
 
@@ -377,13 +400,13 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 						duration: 0,
 					});
 				} else if (
-					runDataExecuted.data.resultData.error?.name === 'NodeOperationError' &&
-					(runDataExecuted.data.resultData.error as NodeOperationError).functionality ===
-						'configuration-node'
+					(iRunExecutionData.resultData.error?.name === 'NodeOperationError' ||
+						iRunExecutionData.resultData.error?.name === 'NodeApiError') &&
+					(iRunExecutionData.resultData.error as NodeError).functionality === 'configuration-node'
 				) {
 					// If the error is a configuration error of the node itself doesn't get executed so we can't use lastNodeExecuted for the title
 					let title: string;
-					const nodeError = runDataExecuted.data.resultData.error as NodeOperationError;
+					const nodeError = iRunExecutionData.resultData.error as NodeOperationError;
 					if (nodeError.node.name) {
 						title = `Error in sub-node ‘${nodeError.node.name}‘`;
 					} else {
@@ -400,19 +423,16 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 						duration: 0,
 					});
 				} else {
-					let title: string;
-					const isManualExecutionCancelled =
-						runDataExecuted.mode === 'manual' && runDataExecuted.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 {
-						if (runDataExecuted.data.resultData.lastNodeExecuted) {
-							title = `Problem in node ‘${runDataExecuted.data.resultData.lastNodeExecuted}‘`;
+						let title: string;
+						if (iRunExecutionData.resultData.lastNodeExecuted) {
+							title = `Problem in node ‘${iRunExecutionData.resultData.lastNodeExecuted}‘`;
 						} else {
 							title = 'Problem executing workflow';
 						}
@@ -426,7 +446,6 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 					}
 				}
 			} else {
-				// Workflow did execute without a problem
 				workflowHelpers.setDocumentTitle(workflow.name as string, 'IDLE');
 
 				const execution = workflowsStore.getWorkflowExecution;
@@ -457,7 +476,7 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 							type: 'success',
 						});
 					}
-				} else {
+				} else if (!showedSuccessToast) {
 					toast.showMessage({
 						title: i18n.baseText('pushConnection.workflowExecutedSuccessfully'),
 						type: 'success',
@@ -467,57 +486,66 @@ export function usePushConnection({ router }: { router: ReturnType<typeof useRou
 
 			// It does not push the runData as it got already pushed with each
 			// node that did finish. For that reason copy in here the data
-			// which we already have.
-			if (workflowsStore.getWorkflowRunData) {
-				runDataExecuted.data.resultData.runData = workflowsStore.getWorkflowRunData;
+			// which we already have. But if the run data in the store is trimmed,
+			// we skip copying so we use the full data from the final message.
+			if (workflowsStore.getWorkflowRunData && !hasTrimmedData(workflowsStore.getWorkflowRunData)) {
+				iRunExecutionData.resultData.runData = workflowsStore.getWorkflowRunData;
 			}
 
 			workflowsStore.executingNode.length = 0;
-			workflowsStore.setWorkflowExecutionData(runDataExecuted as IExecutionResponse);
+			workflowsStore.setWorkflowExecutionData(executionData as IExecutionResponse);
 			uiStore.removeActiveAction('workflowRunning');
 
 			// Set the node execution issues on all the nodes which produced an error so that
 			// it can be displayed in the node-view
 			nodeHelpers.updateNodesExecutionIssues();
 
-			const lastNodeExecuted: string | undefined = runDataExecuted.data.resultData.lastNodeExecuted;
+			const lastNodeExecuted: string | undefined = iRunExecutionData.resultData.lastNodeExecuted;
 			let itemsCount = 0;
 			if (
 				lastNodeExecuted &&
-				runDataExecuted.data.resultData.runData[lastNodeExecuted] &&
+				iRunExecutionData.resultData.runData[lastNodeExecuted] &&
 				!runDataExecutedErrorMessage
 			) {
 				itemsCount =
-					runDataExecuted.data.resultData.runData[lastNodeExecuted][0].data!.main[0]!.length;
+					iRunExecutionData.resultData.runData[lastNodeExecuted][0].data!.main[0]!.length;
 			}
 
 			void useExternalHooks().run('pushConnection.executionFinished', {
 				itemsCount,
-				nodeName: runDataExecuted.data.resultData.lastNodeExecuted,
+				nodeName: iRunExecutionData.resultData.lastNodeExecuted,
 				errorMessage: runDataExecutedErrorMessage,
-				runDataExecutedStartData: runDataExecuted.data.startData,
-				resultDataError: runDataExecuted.data.resultData.error,
+				runDataExecutedStartData: iRunExecutionData.startData,
+				resultDataError: iRunExecutionData.resultData.error,
 			});
+		} else if (receivedData.type === 'executionWaiting') {
+			// Nothing to do
 		} else if (receivedData.type === 'executionStarted') {
-			const pushData = receivedData.data;
-
-			const executionData: IExecutionsCurrentSummaryExtended = {
-				id: pushData.executionId,
-				finished: false,
-				status: 'running',
-				mode: pushData.mode,
-				startedAt: pushData.startedAt,
-				retryOf: pushData.retryOf,
-				workflowId: pushData.workflowId,
-				workflowName: pushData.workflowName,
-			};
-
-			workflowsStore.addActiveExecution(executionData);
+			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;
-			workflowsStore.addNodeExecutionData(pushData);
-			workflowsStore.removeExecutingNode(pushData.nodeName);
+
+			/**
+			 * When we receive a placeholder in `nodeExecuteAfter`, we fake the items
+			 * to be the same count as the data the placeholder is standing in for.
+			 * This prevents the items count from jumping up when the execution
+			 * finishes and the full data replaces the placeholder.
+			 */
+			if (
+				pushData.itemCount &&
+				pushData.data?.data?.main &&
+				Array.isArray(pushData.data.data.main[0]) &&
+				pushData.data.data.main[0].length < pushData.itemCount
+			) {
+				pushData.data.data.main[0]?.push(...new Array(pushData.itemCount - 1).fill({ json: {} }));
+			}
+
+			workflowsStore.updateNodeExecutionData(pushData);
 			void assistantStore.onNodeExecution(pushData);
 		} else if (receivedData.type === 'nodeExecuteBefore') {
 			// A node started to be executed. Set it as executing.
diff --git a/packages/editor-ui/src/composables/__tests__/useRunWorkflow.spec.ts b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
similarity index 59%
rename from packages/editor-ui/src/composables/__tests__/useRunWorkflow.spec.ts
rename to packages/editor-ui/src/composables/useRunWorkflow.test.ts
index 08fa852b39..e6b8c586f5 100644
--- a/packages/editor-ui/src/composables/__tests__/useRunWorkflow.spec.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.test.ts
@@ -2,14 +2,26 @@ 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,
+	type ITaskData,
+} from 'n8n-workflow';
 
 import { useRootStore } from '@/stores/root.store';
 import { useRunWorkflow } from '@/composables/useRunWorkflow';
-import type { IExecutionResponse, IStartRunData, IWorkflowData } from '@/Interface';
+import type { IStartRunData, IWorkflowData } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 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';
+import { mock } from 'vitest-mock-extended';
 
 vi.mock('@/stores/workflows.store', () => ({
 	useWorkflowsStore: vi.fn().mockReturnValue({
@@ -24,9 +36,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() }),
 }));
@@ -55,6 +79,7 @@ vi.mock('@/composables/useWorkflowHelpers', () => ({
 		saveCurrentWorkflow: vi.fn(),
 		getWorkflowDataToSave: vi.fn(),
 		setDocumentTitle: vi.fn(),
+		executeData: vi.fn(),
 	}),
 }));
 
@@ -71,6 +96,7 @@ vi.mock('vue-router', async (importOriginal) => {
 		useRouter: vi.fn().mockReturnValue({
 			push: vi.fn(),
 		}),
+		useRoute: vi.fn(),
 	};
 });
 
@@ -96,6 +122,7 @@ describe('useRunWorkflow({ router })', () => {
 
 	beforeEach(() => {
 		uiStore.activeActions = [];
+		vi.clearAllMocks();
 	});
 
 	describe('runWorkflowApi()', () => {
@@ -162,6 +189,85 @@ describe('useRunWorkflow({ router })', () => {
 			expect(response).toEqual(mockResponse);
 			expect(workflowsStore.executionWaitingForWebhook).toBe(true);
 		});
+		it('should prevent execution and show error message when workflow is active with single webhook trigger', async () => {
+			const pinia = createTestingPinia({ stubActions: false });
+			setActivePinia(pinia);
+			const toast = useToast();
+			const i18n = useI18n();
+			const { runWorkflow } = useRunWorkflow({ router });
+
+			vi.mocked(workflowsStore).isWorkflowActive = true;
+
+			vi.mocked(useWorkflowHelpers({ router })).getWorkflowDataToSave.mockResolvedValue({
+				nodes: [
+					{
+						name: 'Slack',
+						type: 'n8n-nodes-base.slackTrigger',
+						disabled: false,
+					},
+				],
+			} as unknown as IWorkflowData);
+
+			const result = await runWorkflow({});
+
+			expect(result).toBeUndefined();
+			expect(toast.showMessage).toHaveBeenCalledWith({
+				title: i18n.baseText('workflowRun.showError.deactivate'),
+				message: i18n.baseText('workflowRun.showError.productionActive', {
+					interpolate: { nodeName: 'Webhook' },
+				}),
+				type: 'error',
+			});
+		});
+		it('should execute workflow has pin data and is active with single webhook trigger', async () => {
+			const pinia = createTestingPinia({ stubActions: false });
+			setActivePinia(pinia);
+			const toast = useToast();
+			const i18n = useI18n();
+			const { runWorkflow } = useRunWorkflow({ router });
+
+			vi.mocked(workflowsStore).isWorkflowActive = true;
+
+			vi.mocked(useWorkflowHelpers({ router })).getWorkflowDataToSave.mockResolvedValue({
+				nodes: [
+					{
+						name: 'Slack',
+						type: 'n8n-nodes-base.slackTrigger',
+						disabled: false,
+					},
+				],
+				pinData: {
+					Slack: [{ json: { value: 'data2' } }],
+				},
+			} as unknown as IWorkflowData);
+
+			const mockExecutionResponse = { executionId: '123' };
+
+			vi.mocked(uiStore).activeActions = [''];
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue({
+				name: 'Test Workflow',
+			} as unknown as Workflow);
+			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
+			vi.mocked(workflowsStore).nodesIssuesExist = true;
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue({
+				id: 'workflowId',
+				nodes: [],
+			} as unknown as IWorkflowData);
+			vi.mocked(workflowsStore).getWorkflowRunData = {
+				NodeName: [],
+			};
+
+			const result = await runWorkflow({});
+			expect(result).toEqual(mockExecutionResponse);
+
+			expect(toast.showMessage).not.toHaveBeenCalledWith({
+				title: i18n.baseText('workflowRun.showError.deactivate'),
+				message: i18n.baseText('workflowRun.showError.productionActive', {
+					interpolate: { nodeName: 'Webhook' },
+				}),
+				type: 'error',
+			});
+		});
 	});
 
 	describe('runWorkflow()', () => {
@@ -215,6 +321,148 @@ 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('should send triggerToStartFrom if triggerNode and nodeData are passed in', async () => {
+			// ARRANGE
+			const composable = useRunWorkflow({ router });
+			const triggerNode = 'Chat Trigger';
+			const nodeData = mock<ITaskData>();
+			vi.mocked(workflowHelpers).getCurrentWorkflow.mockReturnValue(
+				mock<Workflow>({ getChildNodes: vi.fn().mockReturnValue([]) }),
+			);
+			vi.mocked(workflowHelpers).getWorkflowDataToSave.mockResolvedValue(
+				mock<IWorkflowData>({ nodes: [] }),
+			);
+
+			const { runWorkflow } = composable;
+
+			// ACT
+			await runWorkflow({ triggerNode, nodeData });
+
+			// ASSERT
+			expect(workflowsStore.runWorkflow).toHaveBeenCalledWith(
+				expect.objectContaining({
+					triggerToStartFrom: {
+						name: triggerNode,
+						data: nodeData,
+					},
+				}),
+			);
+		});
+
+		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()', () => {
@@ -320,77 +568,4 @@ describe('useRunWorkflow({ router })', () => {
 			expect(result.runData).toEqual(undefined);
 		});
 	});
-
-	describe('useRunWorkflow({ router }) - runWorkflowResolvePending', () => {
-		let uiStore: ReturnType<typeof useUIStore>;
-		let workflowsStore: ReturnType<typeof useWorkflowsStore>;
-		let router: ReturnType<typeof useRouter>;
-
-		beforeAll(() => {
-			const pinia = createTestingPinia({ stubActions: false });
-			setActivePinia(pinia);
-			rootStore = useRootStore();
-			uiStore = useUIStore();
-			workflowsStore = useWorkflowsStore();
-			router = useRouter();
-			workflowHelpers = useWorkflowHelpers({ router });
-		});
-
-		beforeEach(() => {
-			uiStore.activeActions = [];
-			vi.mocked(workflowsStore).runWorkflow.mockReset();
-		});
-
-		it('should resolve when runWorkflow finished', async () => {
-			const { runWorkflowResolvePending } = useRunWorkflow({ router });
-			const mockExecutionResponse = { executionId: '123' };
-
-			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
-			vi.mocked(workflowsStore).allNodes = [];
-			vi.mocked(workflowsStore).getExecution.mockResolvedValue({
-				finished: true,
-				workflowData: { nodes: [] },
-			} as unknown as IExecutionResponse);
-			vi.mocked(workflowsStore).workflowExecutionData = {
-				id: '123',
-			} as unknown as IExecutionResponse;
-
-			const result = await runWorkflowResolvePending({});
-
-			expect(result).toEqual(mockExecutionResponse);
-		});
-
-		it('should return when workflowExecutionData is null', async () => {
-			const { runWorkflowResolvePending } = useRunWorkflow({ router });
-			const mockExecutionResponse = { executionId: '123' };
-
-			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
-			vi.mocked(workflowsStore).allNodes = [];
-			vi.mocked(workflowsStore).getExecution.mockResolvedValue({
-				finished: true,
-			} as unknown as IExecutionResponse);
-			vi.mocked(workflowsStore).workflowExecutionData = null;
-
-			const result = await runWorkflowResolvePending({});
-
-			expect(result).toEqual(mockExecutionResponse);
-		});
-
-		it('should handle workflow execution error properly', async () => {
-			const { runWorkflowResolvePending } = useRunWorkflow({ router });
-			const mockExecutionResponse = { executionId: '123' };
-
-			vi.mocked(workflowsStore).runWorkflow.mockResolvedValue(mockExecutionResponse);
-			vi.mocked(workflowsStore).allNodes = [];
-			vi.mocked(workflowsStore).getExecution.mockResolvedValue({
-				finished: false,
-				status: 'error',
-			} as unknown as IExecutionResponse);
-
-			await runWorkflowResolvePending({});
-
-			expect(workflowsStore.setWorkflowExecutionData).toHaveBeenCalled();
-			expect(workflowsStore.workflowExecutionData).toBe(null);
-		});
-	});
 });
diff --git a/packages/editor-ui/src/composables/useRunWorkflow.ts b/packages/editor-ui/src/composables/useRunWorkflow.ts
index 658e35b3c6..a5489af869 100644
--- a/packages/editor-ui/src/composables/useRunWorkflow.ts
+++ b/packages/editor-ui/src/composables/useRunWorkflow.ts
@@ -17,22 +17,17 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 
-import { FORM_NODE_TYPE, NodeConnectionType } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
 
 import { useToast } from '@/composables/useToast';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 
-import {
-	CHAT_TRIGGER_NODE_TYPE,
-	FORM_TRIGGER_NODE_TYPE,
-	WAIT_NODE_TYPE,
-	WORKFLOW_LM_CHAT_MODAL_KEY,
-} from '@/constants';
+import { CHAT_TRIGGER_NODE_TYPE, SINGLE_WEBHOOK_TRIGGERS } from '@/constants';
 
 import { useRootStore } from '@/stores/root.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import { displayForm, openPopUpWindow } from '@/utils/executionUtils';
+import { displayForm } from '@/utils/executionUtils';
 import { useExternalHooks } from '@/composables/useExternalHooks';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import type { useRouter } from 'vue-router';
@@ -40,10 +35,26 @@ import { isEmpty } from '@/utils/typesUtils';
 import { useI18n } from '@/composables/useI18n';
 import { get } from 'lodash-es';
 import { useExecutionsStore } from '@/stores/executions.store';
-import type { PushPayload } from '@n8n/api-types';
 import { useLocalStorage } from '@vueuse/core';
 
-const FORM_RELOAD = 'n8n_redirect_to_next_form_test_page';
+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();
@@ -55,7 +66,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 	const uiStore = useUIStore();
 	const workflowsStore = useWorkflowsStore();
 	const executionsStore = useExecutionsStore();
-
 	// Starts to execute a workflow on server
 	async function runWorkflowApi(runData: IStartRunData): Promise<IExecutionPushResponse> {
 		if (!rootStore.pushConnectionActive) {
@@ -105,8 +115,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 			return;
 		}
 
-		workflowHelpers.setDocumentTitle(workflow.name as string, 'EXECUTING');
-
 		toast.clearAllStickyNotifications();
 
 		try {
@@ -142,6 +150,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 
 			let { runData: newRunData } = consolidatedData;
 			let executedNode: string | undefined;
+			let triggerToStartFrom: IStartRunData['triggerToStartFrom'];
 			if (
 				startNodeNames.length === 0 &&
 				'destinationNode' in options &&
@@ -149,14 +158,16 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 			) {
 				executedNode = options.destinationNode;
 				startNodeNames.push(options.destinationNode);
-			} else if ('triggerNode' in options && 'nodeData' in options) {
+			} else if (options.triggerNode && options.nodeData) {
 				startNodeNames.push(
-					...workflow.getChildNodes(options.triggerNode as string, NodeConnectionType.Main, 1),
+					...workflow.getChildNodes(options.triggerNode, NodeConnectionType.Main, 1),
 				);
-				newRunData = {
-					[options.triggerNode as string]: [options.nodeData],
-				} as IRunData;
+				newRunData = { [options.triggerNode]: [options.nodeData] };
 				executedNode = options.triggerNode;
+				triggerToStartFrom = {
+					name: options.triggerNode,
+					data: options.nodeData,
+				};
 			}
 
 			// If the destination node is specified, check if it is a chat node or has a chat parent
@@ -175,12 +186,16 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 					// If the chat node has no input data or pin data, open the chat modal
 					// and halt the execution
 					if (!chatHasInputData && !chatHasPinData) {
-						uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
+						workflowsStore.setPanelOpen('chat', true);
 						return;
 					}
 				}
 			}
 
+			const triggers = workflowData.nodes.filter(
+				(node) => node.type.toLowerCase().includes('trigger') && !node.disabled,
+			);
+
 			//if no destination node is specified
 			//and execution is not triggered from chat
 			//and there are other triggers in the workflow
@@ -190,12 +205,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				options.source !== 'RunData.ManualChatMessage' &&
 				workflowData.nodes.some((node) => node.type === CHAT_TRIGGER_NODE_TYPE)
 			) {
-				const otherTriggers = workflowData.nodes.filter(
-					(node) =>
-						node.type !== CHAT_TRIGGER_NODE_TYPE &&
-						node.type.toLowerCase().includes('trigger') &&
-						!node.disabled,
-				);
+				const otherTriggers = triggers.filter((node) => node.type !== CHAT_TRIGGER_NODE_TYPE);
 
 				if (otherTriggers.length) {
 					const chatTriggerNode = workflowData.nodes.find(
@@ -226,6 +236,25 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				};
 			});
 
+			const singleWebhookTrigger = triggers.find((node) =>
+				SINGLE_WEBHOOK_TRIGGERS.includes(node.type),
+			);
+
+			if (
+				singleWebhookTrigger &&
+				workflowsStore.isWorkflowActive &&
+				!workflowData.pinData?.[singleWebhookTrigger.name]
+			) {
+				toast.showMessage({
+					title: i18n.baseText('workflowRun.showError.deactivate'),
+					message: i18n.baseText('workflowRun.showError.productionActive', {
+						interpolate: { nodeName: singleWebhookTrigger.name },
+					}),
+					type: 'error',
+				});
+				return undefined;
+			}
+
 			// -1 means the backend chooses the default
 			// 0 is the old flow
 			// 1 is the new flow
@@ -236,11 +265,19 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				// data to use and what to ignore.
 				runData: partialExecutionVersion.value === 1 ? (runData ?? undefined) : newRunData,
 				startNodes,
+				triggerToStartFrom,
 			};
 			if ('destinationNode' in options) {
 				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
@@ -249,13 +286,14 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 				finished: false,
 				mode: 'manual',
 				status: 'running',
+				createdAt: new Date(),
 				startedAt: new Date(),
 				stoppedAt: undefined,
 				workflowId: workflow.id,
 				executedNode,
 				data: {
 					resultData: {
-						runData: newRunData ?? {},
+						runData: startRunData.runData ?? {},
 						pinData: workflowData.pinData,
 						workflowData,
 					},
@@ -272,6 +310,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 			workflowsStore.setWorkflowExecutionData(executionData);
 			nodeHelpers.updateNodesExecutionIssues();
 
+			workflowHelpers.setDocumentTitle(workflow.name as string, 'EXECUTING');
 			const runWorkflowApiResponse = await runWorkflowApi(startRunData);
 			const pinData = workflowData.pinData ?? {};
 
@@ -310,149 +349,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 		}
 	}
 
-	function getFormResumeUrl(node: INode, executionId: string) {
-		const { webhookSuffix } = (node.parameters.options ?? {}) as IDataObject;
-		const suffix = webhookSuffix && typeof webhookSuffix !== 'object' ? `/${webhookSuffix}` : '';
-		const testUrl = `${rootStore.formWaitingUrl}/${executionId}${suffix}`;
-		return testUrl;
-	}
-
-	async function runWorkflowResolvePending(options: {
-		destinationNode?: string;
-		triggerNode?: string;
-		nodeData?: ITaskData;
-		source?: string;
-	}): Promise<IExecutionPushResponse | undefined> {
-		let runWorkflowApiResponse = await runWorkflow(options);
-		let { executionId } = runWorkflowApiResponse || {};
-
-		const MAX_DELAY = 3000;
-
-		const waitForWebhook = async (): Promise<string> => {
-			return await new Promise<string>((resolve) => {
-				let delay = 300;
-				let timeoutId: NodeJS.Timeout | null = null;
-
-				const checkWebhook = async () => {
-					await useExternalHooks().run('workflowRun.runWorkflow', {
-						nodeName: options.destinationNode,
-						source: options.source,
-					});
-
-					if (workflowsStore.activeExecutionId) {
-						executionId = workflowsStore.activeExecutionId;
-						runWorkflowApiResponse = { executionId };
-
-						if (timeoutId) clearTimeout(timeoutId);
-
-						resolve(executionId);
-					}
-
-					delay = Math.min(delay * 1.1, MAX_DELAY);
-					timeoutId = setTimeout(checkWebhook, delay);
-				};
-				timeoutId = setTimeout(checkWebhook, delay);
-			});
-		};
-
-		if (!executionId) executionId = await waitForWebhook();
-
-		let isFormShown =
-			!options.destinationNode &&
-			workflowsStore.allNodes.some((node) => node.type === FORM_TRIGGER_NODE_TYPE);
-
-		const resolveWaitingNodesData = async (): Promise<void> => {
-			return await new Promise<void>((resolve) => {
-				let delay = 300;
-				let timeoutId: NodeJS.Timeout | null = null;
-
-				const processExecution = async () => {
-					await useExternalHooks().run('workflowRun.runWorkflow', {
-						nodeName: options.destinationNode,
-						source: options.source,
-					});
-					const execution = await workflowsStore.getExecution((executionId as string) || '');
-
-					localStorage.removeItem(FORM_RELOAD);
-
-					if (!execution || workflowsStore.workflowExecutionData === null) {
-						uiStore.removeActiveAction('workflowRunning');
-						if (timeoutId) clearTimeout(timeoutId);
-						resolve();
-						return;
-					}
-
-					const { lastNodeExecuted } = execution.data?.resultData || {};
-					const lastNode = execution.workflowData.nodes.find((node) => {
-						return node.name === lastNodeExecuted;
-					});
-
-					if (
-						execution.finished ||
-						['error', 'canceled', 'crashed', 'success'].includes(execution.status)
-					) {
-						workflowsStore.setWorkflowExecutionData(execution);
-						uiStore.removeActiveAction('workflowRunning');
-						workflowsStore.activeExecutionId = null;
-						if (timeoutId) clearTimeout(timeoutId);
-						resolve();
-						return;
-					}
-
-					if (execution.status === 'waiting' && execution.data?.waitTill) {
-						delete execution.data.resultData.runData[
-							execution.data.resultData.lastNodeExecuted as string
-						];
-						workflowsStore.setWorkflowExecutionRunData(execution.data);
-
-						if (
-							lastNode &&
-							(lastNode.type === FORM_NODE_TYPE ||
-								(lastNode.type === WAIT_NODE_TYPE && lastNode.parameters.resume === 'form'))
-						) {
-							let testUrl = getFormResumeUrl(lastNode, executionId as string);
-
-							if (isFormShown) {
-								localStorage.setItem(FORM_RELOAD, testUrl);
-							} else {
-								if (options.destinationNode) {
-									// Check if the form trigger has starting data
-									// if not do not show next form as trigger would redirect to page
-									// otherwise there would be duplicate popup
-									const formTrigger = execution?.workflowData.nodes.find((node) => {
-										return node.type === FORM_TRIGGER_NODE_TYPE;
-									});
-									const runNodeFilter = execution?.data?.startData?.runNodeFilter || [];
-									if (formTrigger && !runNodeFilter.includes(formTrigger.name)) {
-										isFormShown = true;
-									}
-								}
-								if (!isFormShown) {
-									if (lastNode.type === FORM_NODE_TYPE) {
-										testUrl = `${rootStore.formWaitingUrl}/${executionId}`;
-									} else {
-										testUrl = getFormResumeUrl(lastNode, executionId as string);
-									}
-
-									isFormShown = true;
-									if (testUrl) openPopUpWindow(testUrl);
-								}
-							}
-						}
-					}
-
-					delay = Math.min(delay * 1.1, MAX_DELAY);
-					timeoutId = setTimeout(processExecution, delay);
-				};
-				timeoutId = setTimeout(processExecution, delay);
-			});
-		};
-
-		await resolveWaitingNodesData();
-
-		return runWorkflowApiResponse;
-	}
-
 	function consolidateRunDataAndStartNodes(
 		directParentNodes: string[],
 		runData: IRunData | null,
@@ -518,14 +414,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 
 			if (execution === undefined) {
 				// execution finished but was not saved (e.g. due to low connectivity)
-				workflowsStore.finishActiveExecution({
-					executionId,
-					data: { finished: true, stoppedAt: new Date() } as IRun,
-				});
-				workflowsStore.executingNode.length = 0;
-				uiStore.removeActiveAction('workflowRunning');
-
-				workflowHelpers.setDocumentTitle(workflowsStore.workflowName, 'IDLE');
 				toast.showMessage({
 					title: i18n.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.title'),
 					message: i18n.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.message'),
@@ -540,16 +428,7 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 					startedAt: execution.startedAt,
 					stoppedAt: execution.stoppedAt,
 				} as IRun;
-				const pushData: PushPayload<'executionFinished'> = {
-					data: executedData,
-					executionId,
-					retryOf: execution.retryOf,
-				};
-				workflowsStore.finishActiveExecution(pushData);
-				workflowHelpers.setDocumentTitle(execution.workflowData.name, 'IDLE');
-				workflowsStore.executingNode.length = 0;
 				workflowsStore.setWorkflowExecutionData(executedData as IExecutionResponse);
-				uiStore.removeActiveAction('workflowRunning');
 				toast.showMessage({
 					title: i18n.baseText('nodeView.showMessage.stopExecutionCatch.title'),
 					message: i18n.baseText('nodeView.showMessage.stopExecutionCatch.message'),
@@ -558,6 +437,8 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 			} else {
 				toast.showError(error, i18n.baseText('nodeView.showError.stopExecution.title'));
 			}
+		} finally {
+			workflowsStore.markExecutionAsStopped();
 		}
 	}
 
@@ -573,7 +454,6 @@ export function useRunWorkflow(useRunWorkflowOpts: { router: ReturnType<typeof u
 	return {
 		consolidateRunDataAndStartNodes,
 		runWorkflow,
-		runWorkflowResolvePending,
 		runWorkflowApi,
 		stopCurrentExecution,
 		stopWaitingForWebhook,
diff --git a/packages/editor-ui/src/composables/useStyles.spec.ts b/packages/editor-ui/src/composables/useStyles.test.ts
similarity index 83%
rename from packages/editor-ui/src/composables/useStyles.spec.ts
rename to packages/editor-ui/src/composables/useStyles.test.ts
index 2e27979b3e..cf6eebd549 100644
--- a/packages/editor-ui/src/composables/useStyles.spec.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/useToast.test.ts b/packages/editor-ui/src/composables/useToast.test.ts
new file mode 100644
index 0000000000..b4a7f2a7e3
--- /dev/null
+++ b/packages/editor-ui/src/composables/useToast.test.ts
@@ -0,0 +1,90 @@
+import { screen, waitFor, within } from '@testing-library/vue';
+import { createTestingPinia } from '@pinia/testing';
+import { h, defineComponent } from 'vue';
+import { useToast } from './useToast';
+
+describe('useToast', () => {
+	let toast: ReturnType<typeof useToast>;
+
+	beforeEach(() => {
+		document.body.innerHTML = '<div id="app-grid"></div>';
+		createTestingPinia();
+
+		toast = useToast();
+	});
+
+	it('should show a message', async () => {
+		const messageData = { message: 'Test message', title: 'Test title' };
+		toast.showMessage(messageData);
+
+		await waitFor(() => {
+			expect(screen.getByRole('alert')).toBeVisible();
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }),
+			).toHaveTextContent('Test title');
+			expect(screen.getByRole('alert')).toContainHTML('<p>Test message</p>');
+		});
+	});
+
+	it('should sanitize message and title', async () => {
+		const messageData = {
+			message: '<script>alert("xss")</script>',
+			title: '<script>alert("xss")</script>',
+		};
+		toast.showMessage(messageData);
+
+		await waitFor(() => {
+			expect(screen.getByRole('alert')).toBeVisible();
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }),
+			).toHaveTextContent('alert("xss")');
+			expect(screen.getByRole('alert')).toContainHTML('<p>alert("xss")</p>');
+		});
+	});
+
+	it('should sanitize but keep valid, allowed HTML tags', async () => {
+		const messageData = {
+			message:
+				'<a data-action="reload">Refresh</a> to see the <strong>latest status</strong>.<br/> <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">More info</a> or go to the <a href="/settings/usage">Usage and plan</a> settings page.',
+			title: '<strong>Title</strong>',
+		};
+
+		toast.showMessage(messageData);
+
+		await waitFor(() => {
+			expect(screen.getByRole('alert')).toBeVisible();
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }),
+			).toHaveTextContent('Title');
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }).querySelectorAll('*'),
+			).toHaveLength(0);
+			expect(screen.getByRole('alert')).toContainHTML(
+				'<a data-action="reload">Refresh</a> to see the <strong>latest status</strong>.<br /> <a href="https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.wait/" target="_blank">More info</a> or go to the <a href="/settings/usage">Usage and plan</a> settings page.',
+			);
+		});
+	});
+
+	it('should render component as message, sanitized as well', async () => {
+		const messageData = {
+			message: h(
+				defineComponent({
+					template: '<p>Test <strong>content</strong><script>alert("xss")</script></p>',
+				}),
+			),
+		};
+
+		toast.showMessage(messageData);
+
+		await waitFor(() => {
+			expect(screen.getByRole('alert')).toBeVisible();
+			expect(
+				within(screen.getByRole('alert')).queryByRole('heading', { level: 2 }),
+			).toHaveTextContent('');
+			expect(
+				within(screen.getByRole('alert')).getByRole('heading', { level: 2 }).querySelectorAll('*'),
+			).toHaveLength(0);
+			expect(screen.getByRole('alert')).toContainHTML('<p>Test <strong>content</strong></p>');
+		});
+	});
+});
diff --git a/packages/editor-ui/src/composables/useToast.ts b/packages/editor-ui/src/composables/useToast.ts
index 7d07cdf249..764215cf70 100644
--- a/packages/editor-ui/src/composables/useToast.ts
+++ b/packages/editor-ui/src/composables/useToast.ts
@@ -10,6 +10,8 @@ import { useExternalHooks } from './useExternalHooks';
 import { VIEWS } from '@/constants';
 import type { ApplicationError } from 'n8n-workflow';
 import { useStyles } from './useStyles';
+import { useCanvasStore } from '@/stores/canvas.store';
+import { useSettingsStore } from '@/stores/settings.store';
 
 export interface NotificationErrorWithNodeAndDescription extends ApplicationError {
 	node: {
@@ -26,13 +28,15 @@ export function useToast() {
 	const uiStore = useUIStore();
 	const externalHooks = useExternalHooks();
 	const i18n = useI18n();
+	const settingsStore = useSettingsStore();
 	const { APP_Z_INDEXES } = useStyles();
+	const canvasStore = useCanvasStore();
 
 	const messageDefaults: Partial<Omit<NotificationOptions, 'message'>> = {
-		dangerouslyUseHTMLString: false,
+		dangerouslyUseHTMLString: true,
 		position: 'bottom-right',
 		zIndex: APP_Z_INDEXES.TOASTS, // above NDV and modal overlays
-		offset: 64,
+		offset: settingsStore.isAiAssistantEnabled || workflowsStore.isChatPanelOpen ? 64 : 0,
 		appendTo: '#app-grid',
 		customClass: 'content-toast',
 	};
@@ -41,6 +45,8 @@ export function useToast() {
 		const { message, title } = messageData;
 		const params = { ...messageDefaults, ...messageData };
 
+		params.offset = +canvasStore.panelHeight;
+
 		if (typeof message === 'string') {
 			params.message = sanitizeHtml(message);
 		}
@@ -76,7 +82,6 @@ export function useToast() {
 		customClass?: string;
 		closeOnClick?: boolean;
 		type?: MessageBoxState['type'];
-		dangerouslyUseHTMLString?: boolean;
 	}) {
 		// eslint-disable-next-line prefer-const
 		let notification: NotificationHandle;
@@ -101,7 +106,6 @@ export function useToast() {
 			duration: config.duration,
 			customClass: config.customClass,
 			type: config.type,
-			dangerouslyUseHTMLString: config.dangerouslyUseHTMLString ?? true,
 		});
 
 		return notification;
@@ -139,7 +143,6 @@ export function useToast() {
 					${collapsableDetails(error)}`,
 				type: 'error',
 				duration: 0,
-				dangerouslyUseHTMLString: true,
 			},
 			false,
 		);
@@ -159,12 +162,6 @@ export function useToast() {
 		});
 	}
 
-	function showAlert(config: NotificationOptions): NotificationHandle {
-		return Notification({
-			...config,
-		});
-	}
-
 	function causedByCredential(message: string | undefined) {
 		if (!message || typeof message !== 'string') return false;
 
@@ -203,7 +200,6 @@ export function useToast() {
 		showMessage,
 		showToast,
 		showError,
-		showAlert,
 		clearAllStickyNotifications,
 		showNotificationForViews,
 	};
diff --git a/packages/editor-ui/src/composables/__tests__/useUniqueNodeName.test.ts b/packages/editor-ui/src/composables/useUniqueNodeName.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useUniqueNodeName.test.ts
rename to packages/editor-ui/src/composables/useUniqueNodeName.test.ts
diff --git a/packages/editor-ui/src/composables/__tests__/useWorkflowHelpers.spec.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.test.ts
similarity index 100%
rename from packages/editor-ui/src/composables/__tests__/useWorkflowHelpers.spec.ts
rename to packages/editor-ui/src/composables/useWorkflowHelpers.test.ts
diff --git a/packages/editor-ui/src/composables/useWorkflowHelpers.ts b/packages/editor-ui/src/composables/useWorkflowHelpers.ts
index 87492ac545..493bb7f824 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;
@@ -415,7 +413,7 @@ export function executeData(
 					mainConnections: for (const mainConnections of workflow.connectionsByDestinationNode[
 						currentNode
 					].main) {
-						for (const connection of mainConnections) {
+						for (const connection of mainConnections ?? []) {
 							if (
 								connection.type === NodeConnectionType.Main &&
 								connection.node === parentNodeName
@@ -520,7 +518,6 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 
 		const nodes: INode[] = [];
 		for (let nodeIndex = 0; nodeIndex < workflowNodes.length; nodeIndex++) {
-			// @ts-ignore
 			nodeData = getNodeDataToSave(workflowNodes[nodeIndex]);
 
 			nodes.push(nodeData);
@@ -884,7 +881,6 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 					}),
 					i18n.baseText('workflows.concurrentChanges.confirmMessage.title'),
 					{
-						dangerouslyUseHTMLString: true,
 						confirmButtonText: i18n.baseText(
 							'workflows.concurrentChanges.confirmMessage.confirmButtonText',
 						),
@@ -937,7 +933,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 +942,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;
 					}
@@ -1005,9 +1000,10 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 			}
 
 			if (redirect) {
-				void router.replace({
+				await router.replace({
 					name: VIEWS.WORKFLOW,
-					params: { name: workflowData.id, action: 'workflowSave' },
+					params: { name: workflowData.id },
+					query: { action: 'workflowSave' },
 				});
 			}
 
@@ -1184,6 +1180,14 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 		tagsStore.upsertTags(tags);
 	}
 
+	/**
+	 * Check if workflow contains any node from specified package
+	 * by performing a quick check based on the node type name.
+	 */
+	const containsNodeFromPackage = (workflow: IWorkflowDb, packageName: string) => {
+		return workflow.nodes.some((node) => node.type.startsWith(packageName));
+	};
+
 	return {
 		setDocumentTitle,
 		resolveParameter,
@@ -1210,5 +1214,6 @@ export function useWorkflowHelpers(options: { router: ReturnType<typeof useRoute
 		promptSaveUnsavedWorkflowChanges,
 		initState,
 		getNodeParametersWithResolvedExpressions,
+		containsNodeFromPackage,
 	};
 }
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index e72da4d2d0..b1d5546183 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -33,7 +33,6 @@ export const MIN_WORKFLOW_NAME_LENGTH = 1;
 export const MAX_WORKFLOW_NAME_LENGTH = 128;
 export const DUPLICATE_POSTFFIX = ' copy';
 export const NODE_OUTPUT_DEFAULT_KEY = '_NODE_OUTPUT_DEFAULT_KEY_';
-export const QUICKSTART_NOTE_NAME = '_QUICKSTART_NOTE_';
 
 // tags
 export const MAX_TAG_NAME_LENGTH = 24;
@@ -51,10 +50,10 @@ export const TAGS_MANAGER_MODAL_KEY = 'tagsManager';
 export const ANNOTATION_TAGS_MANAGER_MODAL_KEY = 'annotationTagsManager';
 export const VERSIONS_MODAL_KEY = 'versions';
 export const WORKFLOW_SETTINGS_MODAL_KEY = 'settings';
-export const WORKFLOW_LM_CHAT_MODAL_KEY = 'lmChat';
 export const WORKFLOW_SHARE_MODAL_KEY = 'workflowShare';
 export const PERSONALIZATION_MODAL_KEY = 'personalization';
 export const CONTACT_PROMPT_MODAL_KEY = 'contactPrompt';
+export const NODE_PINNING_MODAL_KEY = 'nodePinning';
 export const NPS_SURVEY_MODAL_KEY = 'npsSurvey';
 export const WORKFLOW_ACTIVE_MODAL_KEY = 'activation';
 export const COMMUNITY_PACKAGE_INSTALL_MODAL_KEY = 'communityPackageInstall';
@@ -196,6 +195,9 @@ export const SIMULATE_NODE_TYPE = 'n8n-nodes-base.simulate';
 export const SIMULATE_TRIGGER_NODE_TYPE = 'n8n-nodes-base.simulateTrigger';
 export const AI_TRANSFORM_NODE_TYPE = 'n8n-nodes-base.aiTransform';
 export const FORM_NODE_TYPE = 'n8n-nodes-base.form';
+export const SLACK_TRIGGER_NODE_TYPE = 'n8n-nodes-base.slackTrigger';
+export const TELEGRAM_TRIGGER_NODE_TYPE = 'n8n-nodes-base.telegramTrigger';
+export const FACEBOOK_LEAD_ADS_TRIGGER_NODE_TYPE = 'n8n-nodes-base.facebookLeadAdsTrigger';
 
 export const CREDENTIAL_ONLY_NODE_PREFIX = 'n8n-creds-base';
 export const CREDENTIAL_ONLY_HTTP_NODE_VERSION = 4.1;
@@ -221,6 +223,8 @@ export const NODES_USING_CODE_NODE_EDITOR = [
 	AI_TRANSFORM_NODE_TYPE,
 ];
 
+export const NODE_POSITION_CONFLICT_ALLOWLIST = [STICKY_NODE_TYPE];
+
 export const PIN_DATA_NODE_TYPES_DENYLIST = [SPLIT_IN_BATCHES_NODE_TYPE, STICKY_NODE_TYPE];
 
 export const OPEN_URL_PANEL_TRIGGER_NODE_TYPES = [
@@ -229,6 +233,12 @@ export const OPEN_URL_PANEL_TRIGGER_NODE_TYPES = [
 	CHAT_TRIGGER_NODE_TYPE,
 ];
 
+export const SINGLE_WEBHOOK_TRIGGERS = [
+	TELEGRAM_TRIGGER_NODE_TYPE,
+	SLACK_TRIGGER_NODE_TYPE,
+	FACEBOOK_LEAD_ADS_TRIGGER_NODE_TYPE,
+];
+
 export const LIST_LIKE_NODE_OPERATIONS = ['getAll', 'getMany', 'read', 'search'];
 
 export const PRODUCTION_ONLY_TRIGGER_NODE_TYPES = [CHAT_TRIGGER_NODE_TYPE];
@@ -274,6 +284,7 @@ export const AI_CATEGORY_RETRIEVERS = 'Retrievers';
 export const AI_CATEGORY_EMBEDDING = 'Embeddings';
 export const AI_CATEGORY_DOCUMENT_LOADERS = 'Document Loaders';
 export const AI_CATEGORY_TEXT_SPLITTERS = 'Text Splitters';
+export const AI_CATEGORY_OTHER_TOOLS = 'Other Tools';
 export const AI_CATEGORY_ROOT_NODES = 'Root Nodes';
 export const AI_UNCATEGORIZED_CATEGORY = 'Miscellaneous';
 export const AI_CODE_TOOL_LANGCHAIN_NODE_TYPE = '@n8n/n8n-nodes-langchain.toolCode';
@@ -289,7 +300,6 @@ export const NODE_CONNECTION_TYPE_ALLOW_MULTIPLE: NodeConnectionType[] = [
 
 // General
 export const INSTANCE_ID_HEADER = 'n8n-instance-id';
-export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
 
 /** PERSONALIZATION SURVEY */
 export const EMAIL_KEY = 'email';
@@ -425,6 +435,9 @@ export const LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH = 'N8N_MAIN_PANEL_RELATIVE_
 export const LOCAL_STORAGE_ACTIVE_MODAL = 'N8N_ACTIVE_MODAL';
 export const LOCAL_STORAGE_THEME = 'N8N_THEME';
 export const LOCAL_STORAGE_EXPERIMENT_OVERRIDES = 'N8N_EXPERIMENT_OVERRIDES';
+export const LOCAL_STORAGE_HIDE_GITHUB_STAR_BUTTON = 'N8N_HIDE_HIDE_GITHUB_STAR_BUTTON';
+export const LOCAL_STORAGE_NDV_INPUT_PANEL_DISPLAY_MODE = 'N8N_NDV_INPUT_PANEL_DISPLAY_MODE';
+export const LOCAL_STORAGE_NDV_OUTPUT_PANEL_DISPLAY_MODE = 'N8N_NDV_OUTPUT_PANEL_DISPLAY_MODE';
 export const BASE_NODE_SURVEY_URL = 'https://n8n-community.typeform.com/to/BvmzxqYv#nodename=';
 
 export const HIRING_BANNER = `
@@ -474,15 +487,21 @@ export const enum VIEWS {
 	SETUP = 'SetupView',
 	FORGOT_PASSWORD = 'ForgotMyPasswordView',
 	CHANGE_PASSWORD = 'ChangePasswordView',
+	SETTINGS = 'Settings',
 	USERS_SETTINGS = 'UsersSettings',
 	LDAP_SETTINGS = 'LdapSettings',
 	PERSONAL_SETTINGS = 'PersonalSettings',
 	API_SETTINGS = 'APISettings',
 	NOT_FOUND = 'NotFoundView',
-	FAKE_DOOR = 'ComingSoon',
 	COMMUNITY_NODES = 'CommunityNodes',
 	WORKFLOWS = 'WorkflowsView',
 	WORKFLOW_EXECUTIONS = 'WorkflowExecutions',
+	TEST_DEFINITION = 'TestDefinition',
+	TEST_DEFINITION_EDIT = 'TestDefinitionEdit',
+	TEST_DEFINITION_RUNS = 'TestDefinitionRuns',
+	TEST_DEFINITION_RUNS_COMPARE = 'TestDefinitionRunsCompare',
+	TEST_DEFINITION_RUNS_DETAIL = 'TestDefinitionRunsDetail',
+	NEW_TEST_DEFINITION = 'NewTestDefinition',
 	USAGE = 'Usage',
 	LOG_STREAMING_SETTINGS = 'LogStreamingSettingsView',
 	SSO_SETTINGS = 'SSoSettings',
@@ -496,16 +515,11 @@ export const enum VIEWS {
 	PROJECTS_WORKFLOWS = 'ProjectsWorkflows',
 	PROJECTS_CREDENTIALS = 'ProjectsCredentials',
 	PROJECT_SETTINGS = 'ProjectSettings',
+	PROJECTS_EXECUTIONS = 'ProjectsExecutions',
 }
 
 export const EDITABLE_CANVAS_VIEWS = [VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW, VIEWS.EXECUTION_DEBUG];
 
-export const enum FAKE_DOOR_FEATURES {
-	ENVIRONMENTS = 'environments',
-	LOGGING = 'logging',
-	SSO = 'sso',
-}
-
 export const TEST_PIN_DATA = [
 	{
 		name: 'First item',
@@ -584,6 +598,7 @@ export const enum MAIN_HEADER_TABS {
 	WORKFLOW = 'workflow',
 	EXECUTIONS = 'executions',
 	SETTINGS = 'settings',
+	TEST_DEFINITION = 'testDefinition',
 }
 export const CURL_IMPORT_NOT_SUPPORTED_PROTOCOLS = [
 	'ftp',
@@ -645,6 +660,7 @@ export const enum STORES {
 	ASSISTANT = 'assistant',
 	BECOME_TEMPLATE_CREATOR = 'becomeTemplateCreator',
 	PROJECTS = 'projects',
+	TEST_DEFINITION = 'testDefinition',
 }
 
 export const enum SignInType {
@@ -683,25 +699,35 @@ export const AI_ASSISTANT_EXPERIMENT = {
 	variant: 'variant',
 };
 
-export const MORE_ONBOARDING_OPTIONS_EXPERIMENT = {
-	name: '022_more_onboarding_options',
-	control: 'control',
-	variant: 'variant',
-};
-
 export const CREDENTIAL_DOCS_EXPERIMENT = {
 	name: '024_credential_docs',
 	control: 'control',
 	variant: 'variant',
 };
+
+export const EASY_AI_WORKFLOW_EXPERIMENT = {
+	name: '026_easy_ai_workflow',
+	control: 'control',
+	variant: 'variant',
+};
+
+export const AI_CREDITS_EXPERIMENT = {
+	name: '027_free_openai_calls',
+	control: 'control',
+	variant: 'variant',
+};
+
 export const EXPERIMENTS_TO_TRACK = [
 	TEMPLATE_CREDENTIAL_SETUP_EXPERIMENT,
 	CANVAS_AUTO_ADD_MANUAL_TRIGGER_EXPERIMENT.name,
 	AI_ASSISTANT_EXPERIMENT.name,
-	MORE_ONBOARDING_OPTIONS_EXPERIMENT.name,
 	CREDENTIAL_DOCS_EXPERIMENT.name,
+	EASY_AI_WORKFLOW_EXPERIMENT.name,
+	AI_CREDITS_EXPERIMENT.name,
 ];
 
+export const WORKFLOW_EVALUATION_EXPERIMENT = '025_workflow_evaluation';
+
 export const MFA_FORM = {
 	MFA_TOKEN: 'MFA_TOKEN',
 	MFA_RECOVERY_CODE: 'MFA_RECOVERY_CODE',
@@ -709,9 +735,9 @@ export const MFA_FORM = {
 
 export const MFA_AUTHENTICATION_REQUIRED_ERROR_CODE = 998;
 
-export const MFA_AUTHENTICATION_TOKEN_WINDOW_EXPIRED = 997;
+export const MFA_AUTHENTICATION_CODE_WINDOW_EXPIRED = 997;
 
-export const MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH = 6;
+export const MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH = 6;
 
 export const MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH = 36;
 
@@ -877,3 +903,7 @@ export const CanvasNodeHandleKey =
 export const BROWSER_ID_STORAGE_KEY = 'n8n-browserId';
 
 export const APP_MODALS_ELEMENT_ID = 'app-modals';
+
+export const NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL = 'new-sample-sub-workflow-created';
+
+export const AI_NODES_PACKAGE_NAME = '@n8n/n8n-nodes-langchain';
diff --git a/packages/editor-ui/src/constants.workflows.ts b/packages/editor-ui/src/constants.workflows.ts
new file mode 100644
index 0000000000..3816ea80a8
--- /dev/null
+++ b/packages/editor-ui/src/constants.workflows.ts
@@ -0,0 +1,43 @@
+import { NodeConnectionType } from 'n8n-workflow';
+import type { INodeUi, WorkflowDataWithTemplateId } from './Interface';
+
+export const SAMPLE_SUBWORKFLOW_WORKFLOW: WorkflowDataWithTemplateId = {
+	name: 'My Sub-Workflow',
+	meta: {
+		templateId: 'VMiAxXa3lCAizGB5f7dVZQSFfg3FtHkdTKvLuupqBls=',
+	},
+	nodes: [
+		{
+			id: 'c055762a-8fe7-4141-a639-df2372f30060',
+			typeVersion: 1.1,
+			name: 'Workflow Input Trigger',
+			type: 'n8n-nodes-base.executeWorkflowTrigger',
+			position: [260, 340],
+			parameters: {},
+		},
+		{
+			id: 'b5942df6-0160-4ef7-965d-57583acdc8aa',
+			name: 'Replace me with your logic',
+			type: 'n8n-nodes-base.noOp',
+			position: [520, 340],
+			parameters: {},
+		},
+	] as INodeUi[],
+	connections: {
+		'Workflow Input Trigger': {
+			main: [
+				[
+					{
+						node: 'Replace me with your logic',
+						type: NodeConnectionType.Main,
+						index: 0,
+					},
+				],
+			],
+		},
+	},
+	settings: {
+		executionOrder: 'v1',
+	},
+	pinData: {},
+};
diff --git a/packages/editor-ui/src/event-bus/code-node-editor.ts b/packages/editor-ui/src/event-bus/code-node-editor.ts
index 6ba3a32a7c..92bd35bd3a 100644
--- a/packages/editor-ui/src/event-bus/code-node-editor.ts
+++ b/packages/editor-ui/src/event-bus/code-node-editor.ts
@@ -1,6 +1,6 @@
 import { createEventBus } from 'n8n-design-system/utils';
 
-export type HighlightLineEvent = number | 'final';
+export type HighlightLineEvent = number | 'last';
 
 export interface CodeNodeEditorEventBusEvents {
 	/** Event that a diff have been applied to the code node editor */
diff --git a/packages/editor-ui/src/event-bus/mfa.ts b/packages/editor-ui/src/event-bus/mfa.ts
index 290ac46ca6..b455ab9c12 100644
--- a/packages/editor-ui/src/event-bus/mfa.ts
+++ b/packages/editor-ui/src/event-bus/mfa.ts
@@ -3,7 +3,8 @@ import { createEventBus } from 'n8n-design-system/utils';
 export const mfaEventBus = createEventBus();
 
 export interface MfaModalClosedEventPayload {
-	mfaCode: string;
+	mfaCode?: string;
+	mfaRecoveryCode?: string;
 }
 
 export interface MfaModalEvents {
diff --git a/packages/editor-ui/src/hooks/cloud.ts b/packages/editor-ui/src/hooks/cloud.ts
deleted file mode 100644
index 4b66669d52..0000000000
--- a/packages/editor-ui/src/hooks/cloud.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { hooksAddFakeDoorFeatures } from '@/hooks/utils';
-import type { PartialDeep } from 'type-fest';
-import type { ExternalHooks } from '@/types';
-
-export const n8nCloudHooks: PartialDeep<ExternalHooks> = {
-	app: {
-		mount: [
-			() => {
-				hooksAddFakeDoorFeatures();
-			},
-		],
-	},
-};
diff --git a/packages/editor-ui/src/hooks/register.ts b/packages/editor-ui/src/hooks/register.ts
deleted file mode 100644
index 86bf2fc416..0000000000
--- a/packages/editor-ui/src/hooks/register.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { PartialDeep } from 'type-fest';
-import type { ExternalHooks, ExternalHooksGenericContext } from '@/types';
-
-export function extendExternalHooks(hooksExtension: PartialDeep<ExternalHooks>) {
-	if (typeof window.n8nExternalHooks === 'undefined') {
-		window.n8nExternalHooks = {};
-	}
-
-	for (const resource of Object.keys(hooksExtension) as Array<keyof ExternalHooks>) {
-		if (typeof window.n8nExternalHooks[resource] === 'undefined') {
-			window.n8nExternalHooks[resource] = {};
-		}
-
-		const extensionContext = hooksExtension[resource] as ExternalHooksGenericContext;
-		const context = window.n8nExternalHooks[resource] as ExternalHooksGenericContext;
-		for (const operator of Object.keys(extensionContext)) {
-			if (typeof context[operator] === 'undefined') {
-				context[operator] = [];
-			}
-
-			context[operator].push(...extensionContext[operator]);
-		}
-	}
-}
-
-let cloudHooksInitialized = false;
-export async function initializeCloudHooks() {
-	if (cloudHooksInitialized) {
-		return;
-	}
-
-	try {
-		const { n8nCloudHooks } = await import('@/hooks/cloud');
-		extendExternalHooks(n8nCloudHooks);
-	} catch (error) {
-		throw new Error(`Failed to extend external hooks: ${error.message}`);
-	} finally {
-		cloudHooksInitialized = true;
-	}
-}
diff --git a/packages/editor-ui/src/hooks/types.ts b/packages/editor-ui/src/hooks/types.ts
deleted file mode 100644
index 1c293a5888..0000000000
--- a/packages/editor-ui/src/hooks/types.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import type { ITelemetryTrackProperties } from 'n8n-workflow';
-
-export interface TelemetryEventData {
-	eventName: string;
-	properties?: ITelemetryTrackProperties;
-}
diff --git a/packages/editor-ui/src/hooks/utils/hooksAddFakeDoorFeatures.ts b/packages/editor-ui/src/hooks/utils/hooksAddFakeDoorFeatures.ts
deleted file mode 100644
index 23b360a907..0000000000
--- a/packages/editor-ui/src/hooks/utils/hooksAddFakeDoorFeatures.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { useUIStore } from '@/stores/ui.store';
-import type { IFakeDoor } from '@/Interface';
-import { FAKE_DOOR_FEATURES } from '@/constants';
-import type { BaseTextKey } from '@/plugins/i18n';
-
-export function compileFakeDoorFeatures(): IFakeDoor[] {
-	const uiStore = useUIStore();
-	const fakeDoorFeatures: IFakeDoor[] = uiStore.fakeDoorFeatures.map((feature) => ({ ...feature }));
-
-	const environmentsFeature = fakeDoorFeatures.find(
-		(feature) => feature.id === FAKE_DOOR_FEATURES.ENVIRONMENTS,
-	);
-	if (environmentsFeature) {
-		environmentsFeature.actionBoxTitle += '.cloud';
-		environmentsFeature.linkURL += '&edition=cloud';
-	}
-
-	const loggingFeature = fakeDoorFeatures.find(
-		(feature) => feature.id === FAKE_DOOR_FEATURES.LOGGING,
-	);
-	if (loggingFeature) {
-		loggingFeature.actionBoxTitle += '.cloud';
-		loggingFeature.linkURL += '&edition=cloud';
-		loggingFeature.infoText = '' as BaseTextKey;
-	}
-
-	return fakeDoorFeatures;
-}
-
-export const hooksAddFakeDoorFeatures = () => {
-	const uiStore = useUIStore();
-
-	uiStore.fakeDoorFeatures = compileFakeDoorFeatures();
-};
diff --git a/packages/editor-ui/src/hooks/utils/hooksNodesPanel.ts b/packages/editor-ui/src/hooks/utils/hooksNodesPanel.ts
deleted file mode 100644
index 2784f35a0e..0000000000
--- a/packages/editor-ui/src/hooks/utils/hooksNodesPanel.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-export const nodesPanelSession = {
-	pushRef: '',
-	data: {
-		nodeFilter: '',
-		resultsNodes: [] as string[],
-		filterMode: 'Regular',
-	},
-};
-
-export const hooksGenerateNodesPanelEvent = () => {
-	return {
-		eventName: 'User entered nodes panel search term',
-		properties: {
-			search_string: nodesPanelSession.data.nodeFilter,
-			results_count: nodesPanelSession.data.resultsNodes.length,
-			results_nodes: nodesPanelSession.data.resultsNodes,
-			filter_mode: nodesPanelSession.data.filterMode,
-			nodes_panel_session_id: nodesPanelSession.pushRef,
-		},
-	};
-};
-
-export const hooksResetNodesPanelSession = () => {
-	nodesPanelSession.pushRef = `nodes_panel_session_${new Date().valueOf()}`;
-	nodesPanelSession.data = {
-		nodeFilter: '',
-		resultsNodes: [],
-		filterMode: 'Regular',
-	};
-};
diff --git a/packages/editor-ui/src/hooks/utils/index.ts b/packages/editor-ui/src/hooks/utils/index.ts
deleted file mode 100644
index 43979c5141..0000000000
--- a/packages/editor-ui/src/hooks/utils/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './hooksAddFakeDoorFeatures';
-export * from './hooksNodesPanel';
diff --git a/packages/editor-ui/src/__tests__/init.test.ts b/packages/editor-ui/src/init.test.ts
similarity index 84%
rename from packages/editor-ui/src/__tests__/init.test.ts
rename to packages/editor-ui/src/init.test.ts
index f41e3abc52..d4e366988b 100644
--- a/packages/editor-ui/src/__tests__/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() }),
@@ -66,9 +73,6 @@ describe('Init', () => {
 			vi.mocked(useRootStore).mockReturnValue({ defaultLocale: 'es' } as ReturnType<
 				typeof useRootStore
 			>);
-			vi.mock('@/hooks/register', () => ({
-				initializeCloudHooks: vi.fn(),
-			}));
 		});
 
 		afterEach(() => {
@@ -111,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 b523393f31..8b3a69f820 100644
--- a/packages/editor-ui/src/init.ts
+++ b/packages/editor-ui/src/init.ts
@@ -1,13 +1,17 @@
+import { h } from 'vue';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import { useRootStore } from '@/stores/root.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useUsersStore } from '@/stores/users.store';
-import { initializeCloudHooks } from '@/hooks/register';
+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;
@@ -26,18 +30,13 @@ export async function initializeCore() {
 	const versionsStore = useVersionsStore();
 
 	await settingsStore.initialize();
+
+	void useExternalHooks().run('app.mount');
+
 	if (!settingsStore.isPreviewMode) {
 		await usersStore.initialize();
 
 		void versionsStore.checkForNewVersions();
-
-		if (settingsStore.isCloudDeployment) {
-			try {
-				await initializeCloudHooks();
-			} catch (e) {
-				console.error('Failed to initialize cloud hooks:', e);
-			}
-		}
 	}
 
 	coreInitialized = true;
@@ -46,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;
 	}
 
@@ -56,6 +57,8 @@ export async function initializeAuthenticatedFeatures() {
 		return;
 	}
 
+	const i18n = useI18n();
+	const toast = useToast();
 	const sourceControlStore = useSourceControlStore();
 	const settingsStore = useSettingsStore();
 	const rootStore = useRootStore();
@@ -65,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/main.ts b/packages/editor-ui/src/main.ts
index b137d3eb0d..6370591435 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -21,7 +21,7 @@ import App from '@/App.vue';
 import router from './router';
 
 import { TelemetryPlugin } from './plugins/telemetry';
-import { I18nPlugin, i18nInstance } from './plugins/i18n';
+import { i18nInstance } from './plugins/i18n';
 import { GlobalComponentsPlugin } from './plugins/components';
 import { GlobalDirectivesPlugin } from './plugins/directives';
 import { FontAwesomePlugin } from './plugins/icons';
@@ -38,7 +38,6 @@ const app = createApp(App);
 app.use(SentryPlugin);
 app.use(TelemetryPlugin);
 app.use(PiniaVuePlugin);
-app.use(I18nPlugin);
 app.use(FontAwesomePlugin);
 app.use(GlobalComponentsPlugin);
 app.use(GlobalDirectivesPlugin);
diff --git a/packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts b/packages/editor-ui/src/mixins/workflowHelpers.test.ts
similarity index 100%
rename from packages/editor-ui/src/mixins/__tests__/workflowHelpers.spec.ts
rename to packages/editor-ui/src/mixins/workflowHelpers.test.ts
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/permissions.spec.ts b/packages/editor-ui/src/permissions.test.ts
similarity index 100%
rename from packages/editor-ui/src/permissions.spec.ts
rename to packages/editor-ui/src/permissions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/base.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/base.completions.test.ts
similarity index 99%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/base.completions.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/base.completions.test.ts
index b2436bfd48..fa38f072c4 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/base.completions.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/base.completions.test.ts
@@ -14,7 +14,7 @@ import type { CompletionSource, CompletionResult } from '@codemirror/autocomplet
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
 import { n8nLang } from '@/plugins/codemirror/n8nLang';
-import { LUXON_RECOMMENDED_OPTIONS, STRING_RECOMMENDED_OPTIONS } from '../constants';
+import { LUXON_RECOMMENDED_OPTIONS, STRING_RECOMMENDED_OPTIONS } from './constants';
 import { uniqBy } from 'lodash-es';
 
 beforeEach(async () => {
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/completions.test.ts
similarity index 99%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/completions.test.ts
index bed05f2c31..8a10db1395 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/completions.test.ts
@@ -12,7 +12,7 @@ import {
 	natives,
 } from '@/plugins/codemirror/completions/datatype.completions';
 
-import { mockProxy } from './mock';
+import { mockProxy } from './__tests__/mock';
 import type { CompletionSource, CompletionResult } from '@codemirror/autocomplete';
 import { CompletionContext } from '@codemirror/autocomplete';
 import { EditorState } from '@codemirror/state';
@@ -28,7 +28,7 @@ import {
 	METHODS_SECTION,
 	RECOMMENDED_SECTION,
 	STRING_RECOMMENDED_OPTIONS,
-} from '../constants';
+} from './constants';
 import { set, uniqBy } from 'lodash-es';
 import { mockNodes } from '@/__tests__/mocks';
 
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/itemField.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/itemField.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/itemField.completions.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/itemField.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/itemIndex.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/itemIndex.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/itemIndex.completions.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/itemIndex.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/jsonField.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/jsonField.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/jsonField.completions.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/jsonField.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/prevNode.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/prevNode.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/prevNode.completions.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/prevNode.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/require.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/require.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/require.completions.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/require.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/utils.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/utils.test.ts
similarity index 99%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/utils.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/utils.test.ts
index 7fb6e8ea8b..9d1da3ad52 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/utils.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/utils.test.ts
@@ -1,7 +1,7 @@
 import { createTestNode, createTestWorkflowObject } from '@/__tests__/mocks';
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
 import { javascriptLanguage } from '@codemirror/lang-javascript';
-import { autocompletableNodeNames, expressionWithFirstItem } from '../utils';
+import { autocompletableNodeNames, expressionWithFirstItem } from './utils';
 import type { MockInstance } from 'vitest';
 import * as ndvStore from '@/stores/ndv.store';
 import { NodeConnectionType, type IConnections } from 'n8n-workflow';
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
index 6d4ee5c56d..929d1d918c 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
@@ -112,23 +112,19 @@ export function expressionWithFirstItem(syntaxTree: Tree, expression: string): s
 }
 
 export function longestCommonPrefix(...strings: string[]) {
-	if (strings.length < 2) {
-		throw new Error('Expected at least two strings');
-	}
+	if (strings.length < 2) return '';
 
-	return strings.reduce((acc, next) => {
-		let i = 0;
-
-		while (acc[i] && next[i] && acc[i] === next[i]) {
-			i++;
+	return strings.reduce((prefix, str) => {
+		while (!str.startsWith(prefix)) {
+			prefix = prefix.slice(0, -1);
+			if (prefix === '') return '';
 		}
-
-		return acc.slice(0, i);
-	}, '');
+		return prefix;
+	}, strings[0]);
 }
 
 export const prefixMatch = (first: string, second: string) =>
-	first.toLocaleLowerCase().startsWith(second.toLocaleLowerCase()) && first !== second;
+	first.toLocaleLowerCase().startsWith(second.toLocaleLowerCase());
 
 export const isPseudoParam = (candidate: string) => {
 	const PSEUDO_PARAMS = ['notice']; // user input disallowed
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/variables.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/variables.completions.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/codemirror/completions/__tests__/variables.completions.test.ts
rename to packages/editor-ui/src/plugins/codemirror/completions/variables.completions.test.ts
diff --git a/packages/editor-ui/src/plugins/codemirror/__tests__/dragAndDrop.test.ts b/packages/editor-ui/src/plugins/codemirror/dragAndDrop.test.ts
similarity index 95%
rename from packages/editor-ui/src/plugins/codemirror/__tests__/dragAndDrop.test.ts
rename to packages/editor-ui/src/plugins/codemirror/dragAndDrop.test.ts
index 512cc49109..0e2a51150c 100644
--- a/packages/editor-ui/src/plugins/codemirror/__tests__/dragAndDrop.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/dragAndDrop.test.ts
@@ -4,8 +4,8 @@ import { EditorView } from '@codemirror/view';
 import { createTestingPinia } from '@pinia/testing';
 import { fireEvent } from '@testing-library/dom';
 import { setActivePinia } from 'pinia';
-import { mappingDropCursor } from '../dragAndDrop';
-import { n8nLang } from '../n8nLang';
+import { mappingDropCursor } from './dragAndDrop';
+import { n8nLang } from './n8nLang';
 
 describe('CodeMirror drag and drop', () => {
 	beforeEach(() => {
diff --git a/packages/editor-ui/src/plugins/codemirror/format.ts b/packages/editor-ui/src/plugins/codemirror/format.ts
new file mode 100644
index 0000000000..feeb7ae34e
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/format.ts
@@ -0,0 +1,47 @@
+import { EditorSelection, Facet } from '@codemirror/state';
+import type { EditorView } from '@codemirror/view';
+import { formatWithCursor, type BuiltInParserName } from 'prettier';
+import babelPlugin from 'prettier/plugins/babel';
+import estreePlugin from 'prettier/plugins/estree';
+
+export type CodeEditorLanguage = 'json' | 'html' | 'javaScript' | 'python';
+
+export const languageFacet = Facet.define<CodeEditorLanguage, CodeEditorLanguage>({
+	combine: (values) => values[0] ?? 'javaScript',
+});
+
+export function formatDocument(view: EditorView) {
+	function format(parser: BuiltInParserName) {
+		void formatWithCursor(view.state.doc.toString(), {
+			cursorOffset: view.state.selection.main.anchor,
+			parser,
+			plugins: [babelPlugin, estreePlugin],
+		}).then(({ formatted, cursorOffset }) => {
+			view.dispatch({
+				changes: {
+					from: 0,
+					to: view.state.doc.length,
+					insert: formatted,
+				},
+				selection: EditorSelection.single(cursorOffset),
+			});
+		});
+	}
+
+	const langauge = view.state.facet(languageFacet);
+	switch (langauge) {
+		case 'javaScript':
+			format('babel');
+			break;
+		case 'html':
+			format('html');
+			break;
+		case 'json':
+			format('json');
+			break;
+		default:
+			return false;
+	}
+
+	return true;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/keymap.ts b/packages/editor-ui/src/plugins/codemirror/keymap.ts
index 46e8e284d8..b656b9a8cc 100644
--- a/packages/editor-ui/src/plugins/codemirror/keymap.ts
+++ b/packages/editor-ui/src/plugins/codemirror/keymap.ts
@@ -1,51 +1,83 @@
 import {
 	acceptCompletion,
+	closeCompletion,
 	completionStatus,
+	deleteBracketPair,
 	moveCompletionSelection,
-	selectedCompletion,
+	startCompletion,
 } from '@codemirror/autocomplete';
-import { indentLess, indentMore, insertNewlineAndIndent, redo, undo } from '@codemirror/commands';
 import type { EditorView, KeyBinding } from '@codemirror/view';
 
-export const tabKeyMap = (blurOnTab = false): KeyBinding[] => [
-	{
-		any(view, event) {
-			if (
-				event.key === 'Tab' ||
-				(event.key === 'Escape' && completionStatus(view.state) !== null)
-			) {
-				event.stopPropagation();
-			}
-
-			return false;
-		},
-	},
-	{
-		key: 'Tab',
-		run: (view) => {
-			if (selectedCompletion(view.state)) {
-				return acceptCompletion(view);
-			}
-
-			if (!blurOnTab) return indentMore(view);
-			return false;
-		},
-	},
-	{ key: 'Shift-Tab', run: indentLess },
-];
-
-export const enterKeyMap: KeyBinding[] = [
-	{
-		key: 'Enter',
-		run: (view) => {
-			if (selectedCompletion(view.state)) {
-				return acceptCompletion(view);
-			}
-
-			return insertNewlineAndIndent(view);
-		},
-	},
-];
+import {
+	insertNewlineAndIndent,
+	cursorCharLeft,
+	selectCharLeft,
+	deleteLine,
+	moveLineDown,
+	moveLineUp,
+	copyLineDown,
+	copyLineUp,
+	selectLine,
+	cursorMatchingBracket,
+	indentMore,
+	indentLess,
+	cursorLineBoundaryBackward,
+	selectLineBoundaryBackward,
+	cursorDocStart,
+	selectDocStart,
+	cursorLineBoundaryForward,
+	selectLineBoundaryForward,
+	cursorDocEnd,
+	selectDocEnd,
+	cursorGroupLeft,
+	selectGroupLeft,
+	cursorPageDown,
+	cursorPageUp,
+	deleteCharBackward,
+	deleteCharForward,
+	deleteGroupBackward,
+	deleteGroupForward,
+	deleteToLineEnd,
+	deleteToLineStart,
+	selectAll,
+	selectPageDown,
+	selectPageUp,
+	cursorCharRight,
+	cursorGroupRight,
+	selectCharRight,
+	selectGroupRight,
+	cursorLineUp,
+	selectLineUp,
+	cursorLineDown,
+	selectLineDown,
+	cursorLineEnd,
+	cursorLineStart,
+	selectLineEnd,
+	selectLineStart,
+	splitLine,
+	transposeChars,
+	redo,
+	undo,
+	undoSelection,
+	toggleComment,
+	lineComment,
+	lineUncomment,
+	toggleBlockComment,
+} from '@codemirror/commands';
+import {
+	closeSearchPanel,
+	gotoLine,
+	openSearchPanel,
+	replaceAll,
+	selectMatches,
+	selectNextOccurrence,
+	selectSelectionMatches,
+} from '@codemirror/search';
+import { addCursorAtEachSelectionLine, addCursorDown, addCursorUp } from './multiCursor';
+import { foldAll, foldCode, unfoldAll, unfoldCode } from '@codemirror/language';
+import { nextDiagnostic, previousDiagnostic, openLintPanel } from '@codemirror/lint';
+import { EditorSelection } from '@codemirror/state';
+import { formatDocument } from './format';
 
 const SELECTED_AUTOCOMPLETE_OPTION_SELECTOR = '.cm-tooltip-autocomplete li[aria-selected]';
 const onAutocompleteNavigate = (dir: 'up' | 'down') => (view: EditorView) => {
@@ -59,7 +91,20 @@ const onAutocompleteNavigate = (dir: 'up' | 'down') => (view: EditorView) => {
 	return false;
 };
 
-export const autocompleteKeyMap: KeyBinding[] = [
+// Keymap based on VSCode
+export const editorKeymap: KeyBinding[] = [
+	{ key: 'Ctrl-Space', run: startCompletion },
+	{ key: 'Escape', run: closeCompletion },
+	{
+		key: 'Escape',
+		run: (view) => {
+			if (view.state.selection.ranges.length > 1) {
+				view.dispatch({ selection: EditorSelection.single(view.state.selection.main.head) });
+				return true;
+			}
+			return false;
+		},
+	},
 	{
 		key: 'ArrowDown',
 		run: onAutocompleteNavigate('down'),
@@ -68,9 +113,185 @@ export const autocompleteKeyMap: KeyBinding[] = [
 		key: 'ArrowUp',
 		run: onAutocompleteNavigate('up'),
 	},
-];
+	{ key: 'PageDown', run: moveCompletionSelection(true, 'page') },
+	{ key: 'PageUp', run: moveCompletionSelection(false, 'page') },
+	{ key: 'Enter', run: acceptCompletion },
+	{ key: 'Tab', run: acceptCompletion },
 
-export const historyKeyMap: KeyBinding[] = [
-	{ key: 'Mod-z', run: undo },
-	{ key: 'Mod-Shift-z', run: redo },
+	{ key: 'Mod-f', run: openSearchPanel, scope: 'editor search-panel' },
+	{ key: 'Escape', run: closeSearchPanel, scope: 'editor search-panel' },
+	{ key: 'Alt-Enter', run: selectMatches, scope: 'editor search-panel' },
+	{ key: 'Mod-Alt-Enter', run: replaceAll, scope: 'editor search-panel' },
+	{ key: 'Ctrl-g', run: gotoLine },
+	{ key: 'Mod-d', run: selectNextOccurrence, preventDefault: true },
+	{ key: 'Shift-Mod-l', run: selectSelectionMatches },
+	{ key: 'Enter', run: insertNewlineAndIndent, shift: insertNewlineAndIndent },
+	{
+		key: 'ArrowLeft',
+		run: cursorCharLeft,
+		shift: selectCharLeft,
+		preventDefault: true,
+	},
+	{
+		key: 'Mod-ArrowLeft',
+		mac: 'Alt-ArrowLeft',
+		run: cursorGroupLeft,
+		shift: selectGroupLeft,
+	},
+	{
+		key: 'ArrowRight',
+		run: cursorCharRight,
+		shift: selectCharRight,
+		preventDefault: true,
+	},
+	{
+		key: 'Mod-ArrowRight',
+		mac: 'Alt-ArrowRight',
+		run: cursorGroupRight,
+		shift: selectGroupRight,
+	},
+
+	{
+		key: 'ArrowUp',
+		run: cursorLineUp,
+		shift: selectLineUp,
+		preventDefault: true,
+	},
+	{
+		key: 'ArrowDown',
+		run: cursorLineDown,
+		shift: selectLineDown,
+		preventDefault: true,
+	},
+
+	{
+		key: 'Home',
+		run: cursorLineBoundaryBackward,
+		shift: selectLineBoundaryBackward,
+	},
+	{
+		mac: 'Cmd-ArrowLeft',
+		run: cursorLineBoundaryBackward,
+		shift: selectLineBoundaryBackward,
+	},
+	{ key: 'Mod-Home', run: cursorDocStart, shift: selectDocStart },
+	{ mac: 'Cmd-ArrowUp', run: cursorDocStart, shift: selectDocStart },
+
+	{ key: 'PageUp', run: cursorPageUp, shift: selectPageUp },
+	{ mac: 'Ctrl-ArrowUp', run: cursorPageUp, shift: selectPageUp },
+
+	{ key: 'PageDown', run: cursorPageDown, shift: selectPageDown },
+	{ mac: 'Ctrl-ArrowDown', run: cursorPageDown, shift: selectPageDown },
+
+	{
+		key: 'End',
+		run: cursorLineBoundaryForward,
+		shift: selectLineBoundaryForward,
+	},
+	{
+		mac: 'Cmd-ArrowRight',
+		run: cursorLineBoundaryForward,
+		shift: selectLineBoundaryForward,
+	},
+
+	{
+		key: 'Mod-Alt-ArrowUp',
+		linux: 'Shift-Alt-ArrowUp',
+		run: addCursorUp,
+		preventDefault: true,
+	},
+	{
+		key: 'Mod-Alt-ArrowDown',
+		linux: 'Shift-Alt-ArrowDown',
+		run: addCursorDown,
+		preventDefault: true,
+	},
+
+	{
+		key: 'Shift-Alt-i',
+		run: addCursorAtEachSelectionLine,
+	},
+
+	{ key: 'Mod-End', run: cursorDocEnd, shift: selectDocEnd },
+	{ mac: 'Cmd-ArrowDown', run: cursorDocEnd, shift: selectDocEnd },
+
+	{ key: 'Mod-a', run: selectAll },
+	{ key: 'Backspace', run: deleteBracketPair },
+	{ key: 'Backspace', run: deleteCharBackward, shift: deleteCharBackward },
+	{ key: 'Delete', run: deleteCharForward },
+	{ key: 'Mod-Backspace', mac: 'Alt-Backspace', run: deleteGroupBackward },
+	{ key: 'Mod-Delete', mac: 'Alt-Delete', run: deleteGroupForward },
+	{ mac: 'Mod-Backspace', run: deleteToLineStart },
+	{ mac: 'Mod-Delete', run: deleteToLineEnd },
+
+	{
+		mac: 'Ctrl-b',
+		run: cursorCharLeft,
+		shift: selectCharLeft,
+		preventDefault: true,
+	},
+	{ mac: 'Ctrl-f', run: cursorCharRight, shift: selectCharRight },
+
+	{ mac: 'Ctrl-p', run: cursorLineUp, shift: selectLineUp },
+	{ mac: 'Ctrl-n', run: cursorLineDown, shift: selectLineDown },
+
+	{ mac: 'Ctrl-a', run: cursorLineStart, shift: selectLineStart },
+	{ mac: 'Ctrl-e', run: cursorLineEnd, shift: selectLineEnd },
+
+	{ mac: 'Ctrl-d', run: deleteCharForward },
+	{ mac: 'Ctrl-h', run: deleteCharBackward },
+	{ mac: 'Ctrl-k', run: deleteToLineEnd },
+	{ mac: 'Ctrl-Alt-h', run: deleteGroupBackward },
+
+	{ mac: 'Ctrl-o', run: splitLine },
+	{ mac: 'Ctrl-t', run: transposeChars },
+
+	{ mac: 'Ctrl-v', run: cursorPageDown },
+	{ mac: 'Alt-v', run: cursorPageUp },
+
+	{ key: 'Shift-Mod-k', run: deleteLine },
+	{ key: 'Alt-ArrowDown', run: moveLineDown },
+	{ key: 'Alt-ArrowUp', run: moveLineUp },
+	{ win: 'Shift-Alt-ArrowDown', mac: 'Shift-Alt-ArrowDown', run: copyLineDown },
+	{ win: 'Shift-Alt-ArrowUp', mac: 'Shift-Alt-ArrowUp', run: copyLineUp },
+
+	{ key: 'Mod-l', run: selectLine, preventDefault: true },
+	{ key: 'Shift-Mod-\\', run: cursorMatchingBracket },
+	{
+		any(view, event) {
+			if (
+				event.key === 'Tab' ||
+				(event.key === 'Escape' && completionStatus(view.state) !== null)
+			) {
+				event.stopPropagation();
+			}
+
+			return false;
+		},
+	},
+	{ key: 'Tab', run: indentMore, shift: indentLess, preventDefault: true },
+
+	{ key: 'Mod-[', run: indentLess },
+	{ key: 'Mod-]', run: indentMore },
+
+	{ key: 'Ctrl-Shift-[', mac: 'Cmd-Alt-[', run: foldCode },
+	{ key: 'Ctrl-Shift-]', mac: 'Cmd-Alt-]', run: unfoldCode },
+	{ key: 'Mod-k Mod-0', run: foldAll },
+	{ key: 'Mod-k Mod-j', run: unfoldAll },
+
+	{ key: 'Mod-k Mod-c', run: lineComment },
+	{ key: 'Mod-k Mod-u', run: lineUncomment },
+	{ key: 'Mod-/', run: toggleComment },
+	{ key: 'Shift-Alt-a', run: toggleBlockComment },
+
+	{ key: 'Mod-z', run: undo, preventDefault: true },
+	{ key: 'Mod-y', run: redo, preventDefault: true },
+	{ key: 'Mod-Shift-z', run: redo, preventDefault: true },
+	{ key: 'Mod-u', run: undoSelection, preventDefault: true },
+
+	{ key: 'Mod-Shift-m', run: openLintPanel },
+	{ key: 'F8', run: nextDiagnostic },
+	{ key: 'Shift-F8', run: previousDiagnostic },
+
+	{ key: 'Shift-Alt-f', linux: 'Ctrl-Shift-i', run: formatDocument },
 ];
diff --git a/packages/editor-ui/src/plugins/codemirror/multiCursor.ts b/packages/editor-ui/src/plugins/codemirror/multiCursor.ts
new file mode 100644
index 0000000000..f61b784486
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/multiCursor.ts
@@ -0,0 +1,52 @@
+import { EditorSelection } from '@codemirror/state';
+import type { Command } from '@codemirror/view';
+
+const createAddCursor =
+	(direction: 'up' | 'down'): Command =>
+	(view) => {
+		const forward = direction === 'down';
+
+		let selection = view.state.selection;
+
+		for (const r of selection.ranges) {
+			selection = selection.addRange(view.moveVertically(r, forward));
+		}
+
+		view.dispatch({ selection });
+
+		return true;
+	};
+
+export const addCursorUp = createAddCursor('up');
+export const addCursorDown = createAddCursor('down');
+
+export const addCursorAtEachSelectionLine: Command = (view) => {
+	let selection: EditorSelection | null = null;
+	for (const r of view.state.selection.ranges) {
+		if (r.empty) {
+			continue;
+		}
+
+		for (let pos = r.from; pos <= r.to; ) {
+			const line = view.state.doc.lineAt(pos);
+
+			const anchor = Math.min(line.to, r.to);
+
+			if (selection) {
+				selection = selection.addRange(EditorSelection.range(anchor, anchor));
+			} else {
+				selection = EditorSelection.single(anchor);
+			}
+
+			pos = line.to + 1;
+		}
+	}
+
+	if (!selection) {
+		return false;
+	}
+
+	view.dispatch({ selection });
+
+	return true;
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts b/packages/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts
index db76510f7b..8b9c992fad 100644
--- a/packages/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts
+++ b/packages/editor-ui/src/plugins/codemirror/tooltips/InfoBoxTooltip.ts
@@ -242,6 +242,9 @@ export const hoverTooltipSource = (view: EditorView, pos: number) => {
 	const state = view.state.field(cursorInfoBoxTooltip, false);
 	const cursorTooltipOpen = !!state?.tooltip;
 
+	// Don't show hover tooltips when autocomplete is active
+	if (completionStatus(view.state) === 'active') return null;
+
 	const jsNodeResult = getJsNodeAtPosition(view.state, pos);
 
 	if (!jsNodeResult) {
diff --git a/packages/editor-ui/src/plugins/codemirror/tooltips/__tests__/infoBoxTooltip.test.ts b/packages/editor-ui/src/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
similarity index 90%
rename from packages/editor-ui/src/plugins/codemirror/tooltips/__tests__/infoBoxTooltip.test.ts
rename to packages/editor-ui/src/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
index 8a5cb32fe2..7c4f7f499b 100644
--- a/packages/editor-ui/src/plugins/codemirror/tooltips/__tests__/infoBoxTooltip.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/tooltips/infoBoxTooltip.test.ts
@@ -3,9 +3,19 @@ import { EditorView, getTooltip, showTooltip, type Tooltip } from '@codemirror/v
 import { createTestingPinia } from '@pinia/testing';
 import { setActivePinia } from 'pinia';
 import { n8nLang } from '@/plugins/codemirror/n8nLang';
-import { hoverTooltipSource, infoBoxTooltips } from '../InfoBoxTooltip';
+import { hoverTooltipSource, infoBoxTooltips } from './InfoBoxTooltip';
 import * as utils from '@/plugins/codemirror/completions/utils';
 import * as workflowHelpers from '@/composables/useWorkflowHelpers';
+import { completionStatus } from '@codemirror/autocomplete';
+
+vi.mock('@codemirror/autocomplete', async (importOriginal) => {
+	const actual = await importOriginal<{}>();
+
+	return {
+		...actual,
+		completionStatus: vi.fn(() => null),
+	};
+});
 
 describe('Infobox tooltips', () => {
 	beforeEach(() => {
@@ -99,6 +109,13 @@ describe('Infobox tooltips', () => {
 			expect(tooltip).not.toBeNull();
 			expect(infoBoxHeader(tooltip?.view)).toHaveTextContent('includes(searchString, start?)');
 		});
+
+		test('should not show a tooltip when autocomplete is open', () => {
+			vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValue('foo');
+			vi.mocked(completionStatus).mockReturnValue('active');
+			const tooltip = hoverTooltip('{{ $json.str.includ|es() }}');
+			expect(tooltip).toBeNull();
+		});
 	});
 });
 
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts
new file mode 100644
index 0000000000..6a6cac8282
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/completions.ts
@@ -0,0 +1,94 @@
+import { escapeMappingString } from '@/utils/mappingUtils';
+import {
+	insertCompletionText,
+	pickedCompletion,
+	type Completion,
+	type CompletionSource,
+} from '@codemirror/autocomplete';
+import {
+	autocompletableNodeNames,
+	longestCommonPrefix,
+	prefixMatch,
+} from '../../completions/utils';
+import { typescriptWorkerFacet } from './facet';
+import { blockCommentSnippet, snippets } from './snippets';
+
+const START_CHARACTERS = ['"', "'", '(', '.', '@'];
+const START_CHARACTERS_REGEX = /[\.\(\'\"\@]/;
+
+export const typescriptCompletionSource: CompletionSource = async (context) => {
+	const { worker } = context.state.facet(typescriptWorkerFacet);
+
+	let word = context.matchBefore(START_CHARACTERS_REGEX);
+	if (!word?.text) {
+		word = context.matchBefore(/[\"\'].*/);
+	}
+	if (!word?.text) {
+		word = context.matchBefore(/[\$\w]+/);
+	}
+
+	const blockComment = context.matchBefore(/\/\*?\*?/);
+	if (blockComment) {
+		// Autocomplete a block comment snippet
+		return { from: blockComment?.from, options: [blockCommentSnippet] };
+	}
+
+	if (!word) return null;
+
+	const completionResult = await worker.getCompletionsAtPos(context.pos);
+
+	if (!completionResult || context.aborted) return null;
+
+	const { result, isGlobal } = completionResult;
+
+	let options = [...result.options];
+
+	if (isGlobal) {
+		options = options
+			.flatMap((opt) => {
+				if (opt.label === '$') {
+					return [
+						opt,
+						...autocompletableNodeNames().map((name) => ({
+							...opt,
+							label: `$('${escapeMappingString(name)}')`,
+						})),
+					];
+				}
+				return opt;
+			})
+			.concat(snippets);
+	}
+
+	return {
+		from: word ? (START_CHARACTERS.includes(word.text) ? word.to : word.from) : context.pos,
+		filter: false,
+		getMatch(completion: Completion) {
+			const lcp = longestCommonPrefix(completion.label, word.text);
+			return [0, lcp.length];
+		},
+		options: options
+			.filter(
+				(option) =>
+					word.text === '' ||
+					START_CHARACTERS.includes(word.text) ||
+					prefixMatch(
+						option.label.replace(START_CHARACTERS_REGEX, ''),
+						word.text.replace(START_CHARACTERS_REGEX, ''),
+					),
+			)
+			.map((completion) => {
+				if (completion.label.endsWith('()')) {
+					completion.apply = (view, _, from, to) => {
+						const cursorPosition = from + completion.label.length - 1;
+						view.dispatch({
+							...insertCompletionText(view.state, completion.label, from, to),
+							annotations: pickedCompletion.of(completion),
+							selection: { anchor: cursorPosition, head: cursorPosition },
+						});
+					};
+				}
+				return completion;
+			}),
+	};
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts
new file mode 100644
index 0000000000..57bb2a2350
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/facet.ts
@@ -0,0 +1,12 @@
+import { Facet, combineConfig } from '@codemirror/state';
+import type { LanguageServiceWorker } from '../types';
+import type * as Comlink from 'comlink';
+
+export const typescriptWorkerFacet = Facet.define<
+	{ worker: Comlink.Remote<LanguageServiceWorker> },
+	{ worker: Comlink.Remote<LanguageServiceWorker> }
+>({
+	combine(configs) {
+		return combineConfig(configs, {});
+	},
+});
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts
new file mode 100644
index 0000000000..30c1f177e1
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/hoverTooltip.ts
@@ -0,0 +1,54 @@
+import type { hoverTooltip } from '@codemirror/view';
+import { typescriptWorkerFacet } from './facet';
+
+type HoverSource = Parameters<typeof hoverTooltip>[0];
+export const typescriptHoverTooltips: HoverSource = async (view, pos) => {
+	const { worker } = view.state.facet(typescriptWorkerFacet);
+
+	const info = await worker.getHoverTooltip(pos);
+
+	if (!info) return null;
+
+	return {
+		pos: info.start,
+		end: info.end,
+		above: true,
+		create: () => {
+			const div = document.createElement('div');
+			div.classList.add('cm-tooltip-lint');
+			const wrapper = document.createElement('div');
+			wrapper.classList.add('cm-diagnostic');
+			div.appendChild(wrapper);
+			const text = document.createElement('div');
+			text.classList.add('cm-diagnosticText');
+			wrapper.appendChild(text);
+
+			if (info.quickInfo?.displayParts) {
+				for (const part of info.quickInfo.displayParts) {
+					const span = text.appendChild(document.createElement('span'));
+					if (
+						part.kind === 'keyword' &&
+						['string', 'number', 'boolean', 'object'].includes(part.text)
+					) {
+						span.className = 'ts-primitive';
+					} else if (part.kind === 'punctuation' && ['(', ')'].includes(part.text)) {
+						span.className = 'ts-text';
+					} else {
+						span.className = `ts-${part.kind}`;
+					}
+					span.innerText = part.text;
+				}
+			}
+
+			const documentation = info.quickInfo?.documentation?.find((doc) => doc.kind === 'text')?.text;
+			if (documentation) {
+				const docElement = document.createElement('div');
+				docElement.classList.add('cm-diagnosticDocs');
+				docElement.textContent = documentation;
+				wrapper.appendChild(docElement);
+			}
+
+			return { dom: div };
+		},
+	};
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts
new file mode 100644
index 0000000000..c0c4042aca
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/linter.ts
@@ -0,0 +1,11 @@
+import type { LintSource } from '@codemirror/lint';
+import { typescriptWorkerFacet } from './facet';
+
+export const typescriptLintSource: LintSource = async (view) => {
+	const { worker } = view.state.facet(typescriptWorkerFacet);
+	const docLength = view.state.doc.length;
+
+	return (await worker.getDiagnostics()).filter((diag) => {
+		return diag.from < docLength && diag.to <= docLength && diag.from >= 0;
+	});
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts
new file mode 100644
index 0000000000..720e100249
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/snippets.ts
@@ -0,0 +1,60 @@
+import { snippetCompletion } from '@codemirror/autocomplete';
+
+export const blockCommentSnippet = snippetCompletion('/**\n * #{}\n */', {
+	label: '/**',
+	detail: 'Block Comment',
+});
+
+export const snippets = [
+	snippetCompletion('console.log(#{})', { label: 'log', detail: 'Log to console' }),
+	snippetCompletion('for (const #{1:element} of #{2:array}) {\n\t#{}\n}', {
+		label: 'forof',
+		detail: 'For-of Loop',
+	}),
+	snippetCompletion(
+		'for (const #{1:key} in #{2:object}) {\n\tif (Object.prototype.hasOwnProperty.call(#{2:object}, #{1:key})) {\n\t\tconst #{3:element} = #{2:object}[#{1:key}];\n\t\t#{}\n\t}\n}',
+		{
+			label: 'forin',
+			detail: 'For-in Loop',
+		},
+	),
+	snippetCompletion(
+		'for (let #{1:index} = 0; #{1:index} < #{2:array}.length; #{1:index}++) {\n\tconst #{3:element} = #{2:array}[#{1:index}];\n\t#{}\n}',
+		{
+			label: 'for',
+			detail: 'For Loop',
+		},
+	),
+	snippetCompletion('if (#{1:condition}) {\n\t#{}\n}', {
+		label: 'if',
+		detail: 'If Statement',
+	}),
+	snippetCompletion('if (#{1:condition}) {\n\t#{}\n} else {\n\t\n}', {
+		label: 'ifelse',
+		detail: 'If-Else Statement',
+	}),
+	snippetCompletion('function #{1:name}(#{2:params}) {\n\t#{}\n}', {
+		label: 'function',
+		detail: 'Function Statement',
+	}),
+	snippetCompletion('function #{1:name}(#{2:params}) {\n\t#{}\n}', {
+		label: 'fn',
+		detail: 'Function Statement',
+	}),
+	snippetCompletion(
+		'switch (#{1:key}) {\n\tcase #{2:value}:\n\t\t#{}\n\t\tbreak;\n\tdefault:\n\t\tbreak;\n}',
+		{
+			label: 'switch',
+			detail: 'Switch Statement',
+		},
+	),
+	snippetCompletion('try {\n\t#{}\n} catch (#{1:error}) {\n\t\n}', {
+		label: 'trycatch',
+		detail: 'Try-Catch Statement',
+	}),
+	snippetCompletion('while (#{1:condition}) {\n\t#{}\n}', {
+		label: 'while',
+		detail: 'While Statement',
+	}),
+	blockCommentSnippet,
+];
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts b/packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
new file mode 100644
index 0000000000..aef7eb5126
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/client/useTypescript.ts
@@ -0,0 +1,131 @@
+import { useDataSchema } from '@/composables/useDataSchema';
+import { useDebounce } from '@/composables/useDebounce';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { autocompletableNodeNames } from '@/plugins/codemirror/completions/utils';
+import useEnvironmentsStore from '@/stores/environments.ee.store';
+import { useNDVStore } from '@/stores/ndv.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { forceParse } from '@/utils/forceParse';
+import { executionDataToJson } from '@/utils/nodeTypesUtils';
+import { autocompletion } from '@codemirror/autocomplete';
+import { javascriptLanguage } from '@codemirror/lang-javascript';
+import { LanguageSupport } from '@codemirror/language';
+import { Text, type Extension } from '@codemirror/state';
+import { EditorView, hoverTooltip } from '@codemirror/view';
+import * as Comlink from 'comlink';
+import { NodeConnectionType, type CodeExecutionMode, type INodeExecutionData } from 'n8n-workflow';
+import { ref, toRef, toValue, watch, type MaybeRefOrGetter } from 'vue';
+import type { LanguageServiceWorker, RemoteLanguageServiceWorkerInit } from '../types';
+import { typescriptCompletionSource } from './completions';
+import { typescriptWorkerFacet } from './facet';
+import { typescriptHoverTooltips } from './hoverTooltip';
+import { linter } from '@codemirror/lint';
+import { typescriptLintSource } from './linter';
+
+export function useTypescript(
+	view: MaybeRefOrGetter<EditorView | undefined>,
+	mode: MaybeRefOrGetter<CodeExecutionMode>,
+	id: MaybeRefOrGetter<string>,
+) {
+	const { getInputDataWithPinned, getSchemaForExecutionData } = useDataSchema();
+	const ndvStore = useNDVStore();
+	const workflowsStore = useWorkflowsStore();
+	const { debounce } = useDebounce();
+	const activeNodeName = ndvStore.activeNodeName;
+	const worker = ref<Comlink.Remote<LanguageServiceWorker>>();
+
+	async function createWorker(): Promise<Extension> {
+		const { init } = Comlink.wrap<RemoteLanguageServiceWorkerInit>(
+			new Worker(new URL('../worker/typescript.worker.ts', import.meta.url), { type: 'module' }),
+		);
+		worker.value = await init(
+			{
+				id: toValue(id),
+				content: Comlink.proxy((toValue(view)?.state.doc ?? Text.empty).toJSON()),
+				allNodeNames: autocompletableNodeNames(),
+				variables: useEnvironmentsStore().variables.map((v) => v.key),
+				inputNodeNames: activeNodeName
+					? workflowsStore
+							.getCurrentWorkflow()
+							.getParentNodes(activeNodeName, NodeConnectionType.Main, 1)
+					: [],
+				mode: toValue(mode),
+			},
+			Comlink.proxy(async (nodeName) => {
+				const node = workflowsStore.getNodeByName(nodeName);
+
+				if (node) {
+					const inputData: INodeExecutionData[] = getInputDataWithPinned(node);
+					const schema = getSchemaForExecutionData(executionDataToJson(inputData), true);
+					const execution = workflowsStore.getWorkflowExecution;
+					const binaryData = useNodeHelpers()
+						.getBinaryData(
+							execution?.data?.resultData?.runData ?? null,
+							node.name,
+							ndvStore.ndvInputRunIndex ?? 0,
+							0,
+						)
+						.filter((data) => Boolean(data && Object.keys(data).length));
+
+					return {
+						json: schema,
+						binary: Object.keys(binaryData.reduce((acc, obj) => ({ ...acc, ...obj }), {})),
+						params: getSchemaForExecutionData([node.parameters]),
+					};
+				}
+
+				return undefined;
+			}),
+		);
+
+		const editor = toValue(view);
+
+		if (editor) {
+			forceParse(editor);
+		}
+
+		return [
+			typescriptWorkerFacet.of({ worker: worker.value }),
+			new LanguageSupport(javascriptLanguage, [
+				javascriptLanguage.data.of({ autocomplete: typescriptCompletionSource }),
+			]),
+			autocompletion({ icons: false, aboveCursor: true }),
+			linter(typescriptLintSource),
+			hoverTooltip(typescriptHoverTooltips, {
+				hideOnChange: true,
+				hoverTime: 500,
+			}),
+			EditorView.updateListener.of(async (update) => {
+				if (update.docChanged) {
+					void worker.value?.updateFile(update.changes.toJSON());
+				}
+			}),
+		];
+	}
+
+	async function onWorkflowDataChange() {
+		const editor = toValue(view);
+		if (!editor || !worker.value) return;
+
+		await worker.value.updateNodeTypes();
+
+		forceParse(editor);
+	}
+
+	watch(
+		[() => workflowsStore.getWorkflowExecution, () => workflowsStore.getWorkflowRunData],
+		debounce(onWorkflowDataChange, { debounceTime: 200, trailing: true }),
+	);
+
+	watch(toRef(mode), async (newMode) => {
+		const editor = toValue(view);
+		if (!editor || !worker.value) return;
+
+		await worker.value.updateMode(newMode);
+		forceParse(editor);
+	});
+
+	return {
+		createWorker,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/types.ts b/packages/editor-ui/src/plugins/codemirror/typescript/types.ts
new file mode 100644
index 0000000000..ab795f7401
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/types.ts
@@ -0,0 +1,49 @@
+import type { Schema } from '@/Interface';
+import type { CompletionResult } from '@codemirror/autocomplete';
+import type { Diagnostic } from '@codemirror/lint';
+import type { CodeExecutionMode } from 'n8n-workflow';
+import type ts from 'typescript';
+import type * as Comlink from 'comlink';
+import type { ChangeSet } from '@codemirror/state';
+
+export interface HoverInfo {
+	start: number;
+	end: number;
+	typeDef?: readonly ts.DefinitionInfo[];
+	quickInfo: ts.QuickInfo | undefined;
+}
+
+export type WorkerInitOptions = {
+	id: string;
+	content: string[];
+	allNodeNames: string[];
+	inputNodeNames: string[];
+	variables: string[];
+	mode: CodeExecutionMode;
+};
+
+export type NodeData = { json: Schema | undefined; binary: string[]; params: Schema };
+export type NodeDataFetcher = (nodeName: string) => Promise<NodeData | undefined>;
+
+export type LanguageServiceWorker = {
+	updateFile(changes: ChangeSet): void;
+	updateMode(mode: CodeExecutionMode): void;
+	updateNodeTypes(): void;
+	getCompletionsAtPos(pos: number): Promise<{ result: CompletionResult; isGlobal: boolean } | null>;
+	getDiagnostics(): Diagnostic[];
+	getHoverTooltip(pos: number): HoverInfo | null;
+};
+
+export type LanguageServiceWorkerInit = {
+	init(
+		options: WorkerInitOptions,
+		nodeDataFetcher: NodeDataFetcher,
+	): Promise<LanguageServiceWorker>;
+};
+
+export type RemoteLanguageServiceWorkerInit = {
+	init(
+		options: WorkerInitOptions,
+		nodeDataFetcher: NodeDataFetcher,
+	): Comlink.Remote<LanguageServiceWorker>;
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts
new file mode 100644
index 0000000000..1a516c3bb7
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/cache.ts
@@ -0,0 +1,130 @@
+export type IndexedDbCache = Awaited<ReturnType<typeof indexedDbCache>>;
+
+export async function indexedDbCache(dbName: string, storeName: string) {
+	let cache: Record<string, string> = {};
+
+	void (await loadCache());
+
+	async function loadCache() {
+		await transaction('readonly', async (store, db) => {
+			return await new Promise<void>((resolve, reject) => {
+				const request = store.openCursor();
+
+				request.onsuccess = (event) => {
+					const cursor = (event.target as IDBRequest<IDBCursorWithValue>).result;
+
+					if (cursor) {
+						cache[cursor.key as string] = cursor.value.value;
+						cursor.continue();
+					} else {
+						db.close();
+						resolve();
+					}
+				};
+
+				request.onerror = (event) => {
+					db.close();
+					reject(event);
+				};
+			});
+		});
+	}
+
+	async function openDb(): Promise<IDBDatabase> {
+		return await new Promise((resolve, reject) => {
+			const request = indexedDB.open(dbName, 1);
+			request.onupgradeneeded = () => {
+				request.result.createObjectStore(storeName, { keyPath: 'key' });
+			};
+			request.onsuccess = () => resolve(request.result);
+			request.onerror = () => reject(request.error);
+		});
+	}
+
+	function setItem(key: string, value: string): void {
+		cache[key] = value;
+		void persistToIndexedDB(key, value);
+	}
+
+	function getItem(key: string): string | null {
+		return cache[key] ?? null;
+	}
+
+	function removeItem(key: string): void {
+		delete cache[key];
+		void deleteFromIndexedDB(key);
+	}
+
+	function clear(): void {
+		cache = {};
+		void clearIndexedDB();
+	}
+
+	async function getAllWithPrefix(prefix: string) {
+		const keyRange = IDBKeyRange.bound(prefix, prefix + '\uffff', false, false);
+
+		const results: Record<string, string> = {};
+		return await transaction('readonly', async (store) => {
+			return await new Promise<Record<string, string>>((resolve, reject) => {
+				const request = store.openCursor(keyRange);
+
+				request.onsuccess = (event) => {
+					const cursor = (event.target as IDBRequest<IDBCursorWithValue>).result;
+
+					if (cursor) {
+						results[cursor.key as string] = cursor.value.value;
+						cursor.continue();
+					} else {
+						resolve(results);
+					}
+				};
+
+				request.onerror = () => {
+					reject(request.error);
+				};
+			});
+		});
+	}
+
+	async function transaction<T>(
+		mode: 'readonly' | 'readwrite',
+		action: (store: IDBObjectStore, db: IDBDatabase) => Promise<T> | T,
+	): Promise<T> {
+		const db = await openDb();
+		const tx = db.transaction(storeName, mode);
+		const store = tx.objectStore(storeName);
+
+		const result = await action(store, db);
+
+		return await new Promise<T>((resolve, reject) => {
+			tx.oncomplete = () => {
+				db.close();
+				resolve(result);
+			};
+			tx.onerror = () => {
+				db.close();
+				reject(tx.error);
+			};
+		});
+	}
+
+	async function persistToIndexedDB(key: string, value: string) {
+		await transaction('readwrite', (store) => {
+			store.put({ key, value });
+		});
+	}
+
+	async function deleteFromIndexedDB(key: string) {
+		await transaction('readwrite', (store) => {
+			store.delete(key);
+		});
+	}
+
+	async function clearIndexedDB() {
+		await transaction('readwrite', (store) => {
+			store.clear();
+		});
+	}
+
+	return { getItem, removeItem, setItem, clear, getAllWithPrefix };
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts
new file mode 100644
index 0000000000..1a634397cf
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/completions.ts
@@ -0,0 +1,60 @@
+import type * as tsvfs from '@typescript/vfs';
+import type ts from 'typescript';
+
+import { type Completion } from '@codemirror/autocomplete';
+import { TS_COMPLETE_BLOCKLIST, TYPESCRIPT_AUTOCOMPLETE_THRESHOLD } from './constants';
+
+function convertTsKindtoEditorCompletionType(kind: ts.ScriptElementKind) {
+	if (!kind) return undefined;
+
+	const type = String(kind);
+	if (type === 'member') return 'property';
+
+	return type;
+}
+
+function typescriptCompletionToEditor(
+	completionInfo: ts.WithMetadata<ts.CompletionInfo>,
+	entry: ts.CompletionEntry,
+): Completion {
+	const boost = -Number(entry.sortText) || 0;
+	const type = convertTsKindtoEditorCompletionType(entry.kind);
+
+	return {
+		label: type && ['method', 'function'].includes(type) ? entry.name + '()' : entry.name,
+		type: convertTsKindtoEditorCompletionType(entry.kind),
+		commitCharacters: entry.commitCharacters ?? completionInfo.defaultCommitCharacters,
+		detail: entry.labelDetails?.detail,
+		boost,
+	};
+}
+
+function filterTypescriptCompletions(
+	completionInfo: ts.WithMetadata<ts.CompletionInfo>,
+	entry: ts.CompletionEntry,
+) {
+	return (
+		!TS_COMPLETE_BLOCKLIST.includes(entry.kind) &&
+		(entry.sortText < TYPESCRIPT_AUTOCOMPLETE_THRESHOLD ||
+			completionInfo.optionalReplacementSpan?.length)
+	);
+}
+
+export async function getCompletionsAtPos({
+	pos,
+	fileName,
+	env,
+}: { pos: number; fileName: string; env: tsvfs.VirtualTypeScriptEnvironment }) {
+	const completionInfo = env.languageService.getCompletionsAtPosition(fileName, pos, {}, {});
+
+	if (!completionInfo) return null;
+
+	const options = completionInfo.entries
+		.filter((entry) => filterTypescriptCompletions(completionInfo, entry))
+		.map((entry) => typescriptCompletionToEditor(completionInfo, entry));
+
+	return {
+		result: { from: pos, options },
+		isGlobal: completionInfo.isGlobalCompletion,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts
new file mode 100644
index 0000000000..215d7a2544
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/constants.ts
@@ -0,0 +1,26 @@
+import ts from 'typescript';
+
+export const TS_COMPLETE_BLOCKLIST: ts.ScriptElementKind[] = [ts.ScriptElementKind.warning];
+export const COMPILER_OPTIONS: ts.CompilerOptions = {
+	allowJs: true,
+	checkJs: true,
+	target: ts.ScriptTarget.ESNext,
+	lib: ['es2023'],
+	module: ts.ModuleKind.ESNext,
+	strict: true,
+	noUnusedLocals: true,
+	noUnusedParameters: true,
+	importHelpers: false,
+	skipDefaultLibCheck: true,
+	noEmit: true,
+};
+export const TYPESCRIPT_AUTOCOMPLETE_THRESHOLD = '15';
+export const TYPESCRIPT_FILES = {
+	DYNAMIC_TYPES: 'n8n-dynamic.d.ts',
+	DYNAMIC_INPUT_TYPES: 'n8n-dynamic-input.d.ts',
+	DYNAMIC_VARIABLES_TYPES: 'n8n-variables.d.ts',
+	MODE_TYPES: 'n8n-mode-specific.d.ts',
+	N8N_TYPES: 'n8n.d.ts',
+	GLOBAL_TYPES: 'globals.d.ts',
+};
+export const LUXON_VERSION = '3.2.0';
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
new file mode 100644
index 0000000000..668a86d4c6
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.test.ts
@@ -0,0 +1,66 @@
+import { schemaToTypescriptTypes } from './dynamicTypes';
+
+describe('typescript worker dynamicTypes', () => {
+	describe('schemaToTypescriptTypes', () => {
+		it('should convert a schema to a typescript type', () => {
+			expect(
+				schemaToTypescriptTypes(
+					{
+						type: 'object',
+						value: [
+							{
+								key: 'test',
+								type: 'string',
+								value: '',
+								path: '.test',
+							},
+							{
+								type: 'object',
+								key: 'nested',
+								path: '.nested',
+								value: [
+									{
+										key: 'amount',
+										type: 'number',
+										value: '',
+										path: '.amount',
+									},
+								],
+							},
+							{
+								type: 'array',
+								key: 'nestedArray',
+								path: '.nestedArray',
+								value: [
+									{
+										type: 'object',
+										key: 'nested',
+										path: '.nestedArray.nested',
+										value: [
+											{
+												key: 'amount',
+												type: 'number',
+												value: '',
+												path: '.amount',
+											},
+										],
+									},
+								],
+							},
+						],
+						path: '',
+					},
+					'NodeName_1',
+				),
+			).toEqual(`interface NodeName_1 {
+  test: string;
+  nested: {
+  amount: number;
+};
+  nestedArray: Array<{
+  amount: number;
+}>;
+}`);
+		});
+	});
+});
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts
new file mode 100644
index 0000000000..0991472246
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/dynamicTypes.ts
@@ -0,0 +1,91 @@
+import type { Schema } from '@/Interface';
+import { pascalCase } from 'change-case';
+import { globalTypeDefinition } from './utils';
+
+function processSchema(schema: Schema): string {
+	switch (schema.type) {
+		case 'string':
+		case 'number':
+		case 'boolean':
+		case 'bigint':
+		case 'symbol':
+		case 'null':
+		case 'undefined':
+			return schema.type;
+
+		case 'function':
+			return 'Function';
+
+		case 'array':
+			if (Array.isArray(schema.value)) {
+				if (schema.value.length > 0) {
+					return `Array<${processSchema(schema.value[0])}>`;
+				}
+				return 'any[]';
+			}
+
+			return `${schema.value}[]`;
+
+		case 'object':
+			if (!Array.isArray(schema.value)) {
+				return '{}';
+			}
+
+			const properties = schema.value
+				.map((prop) => {
+					const key = prop.key ?? 'unknown';
+					const type = processSchema(prop);
+					return `  ${key}: ${type};`;
+				})
+				.join('\n');
+
+			return `{\n${properties}\n}`;
+
+		default:
+			return 'any';
+	}
+}
+
+export function schemaToTypescriptTypes(schema: Schema, interfaceName: string): string {
+	return `interface ${interfaceName} ${processSchema(schema)}`;
+}
+
+export async function getDynamicNodeTypes({
+	nodeNames,
+	loadedNodes,
+}: { nodeNames: string[]; loadedNodes: Map<string, { type: string; typeName: string }> }) {
+	return globalTypeDefinition(`
+type NodeName = ${nodeNames.map((name) => `'${name}'`).join(' | ')};
+
+${Array.from(loadedNodes.values())
+	.map(({ type }) => type)
+	.join(';\n')}
+
+interface NodeDataMap {
+    ${Array.from(loadedNodes.entries())
+			.map(
+				([nodeName, { typeName }]) =>
+					`'${nodeName}': NodeData<${typeName}Context, ${typeName}Json, ${typeName}BinaryKeys, ${typeName}Params>`,
+			)
+			.join(';\n')}
+}
+`);
+}
+
+export async function getDynamicInputNodeTypes(inputNodeNames: string[]) {
+	const typeNames = inputNodeNames.map((nodeName) => pascalCase(nodeName));
+
+	return globalTypeDefinition(`
+type N8nInputJson = ${typeNames.map((typeName) => `${typeName}Json`).join(' | ')};
+type N8nInputBinaryKeys = ${typeNames.map((typeName) => `${typeName}BinaryKeys`).join(' | ')};
+type N8nInputContext = ${typeNames.map((typeName) => `${typeName}Context`).join(' | ')};
+type N8nInputParams = ${typeNames.map((typeName) => `${typeName}Params`).join(' | ')};
+`);
+}
+
+export async function getDynamicVariableTypes(variables: string[]) {
+	return globalTypeDefinition(`
+	interface N8nVars {
+	${variables.map((key) => `${key}: string;`).join('\n')}
+}`);
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts
new file mode 100644
index 0000000000..e746f2a853
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/env.ts
@@ -0,0 +1,60 @@
+import * as tsvfs from '@typescript/vfs';
+import { COMPILER_OPTIONS, TYPESCRIPT_FILES } from './constants';
+import ts from 'typescript';
+import type { IndexedDbCache } from './cache';
+
+import globalTypes from './type-declarations/globals.d.ts?raw';
+import n8nTypes from './type-declarations/n8n.d.ts?raw';
+
+import type { CodeExecutionMode } from 'n8n-workflow';
+import { wrapInFunction } from './utils';
+
+type EnvOptions = {
+	code: {
+		content: string;
+		fileName: string;
+	};
+	mode: CodeExecutionMode;
+	cache: IndexedDbCache;
+};
+
+export function removeUnusedLibs(fsMap: Map<string, string>) {
+	for (const [name] of fsMap.entries()) {
+		if (
+			name === 'lib.d.ts' ||
+			name.startsWith('/lib.dom') ||
+			name.startsWith('/lib.webworker') ||
+			name.startsWith('/lib.scripthost') ||
+			name.endsWith('.full.d.ts')
+		) {
+			fsMap.delete(name);
+		}
+	}
+}
+
+export async function setupTypescriptEnv({ cache, code, mode }: EnvOptions) {
+	const fsMap = await tsvfs.createDefaultMapFromCDN(
+		COMPILER_OPTIONS,
+		ts.version,
+		true,
+		ts,
+		undefined,
+		undefined,
+		cache,
+	);
+
+	removeUnusedLibs(fsMap);
+
+	fsMap.set(TYPESCRIPT_FILES.N8N_TYPES, n8nTypes);
+	fsMap.set(TYPESCRIPT_FILES.GLOBAL_TYPES, globalTypes);
+
+	fsMap.set(code.fileName, wrapInFunction(code.content, mode));
+
+	const system = tsvfs.createSystem(fsMap);
+	return tsvfs.createVirtualTypeScriptEnvironment(
+		system,
+		Array.from(fsMap.keys()),
+		ts,
+		COMPILER_OPTIONS,
+	);
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts
new file mode 100644
index 0000000000..e6a5c9ff2f
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/hoverTooltip.ts
@@ -0,0 +1,24 @@
+import type * as tsvfs from '@typescript/vfs';
+
+export function getHoverTooltip({
+	pos,
+	fileName,
+	env,
+}: { pos: number; fileName: string; env: tsvfs.VirtualTypeScriptEnvironment }) {
+	const quickInfo = env.languageService.getQuickInfoAtPosition(fileName, pos);
+
+	if (!quickInfo) return null;
+
+	const start = quickInfo.textSpan.start;
+
+	const typeDef =
+		env.languageService.getTypeDefinitionAtPosition(fileName, pos) ??
+		env.languageService.getDefinitionAtPosition(fileName, pos);
+
+	return {
+		start,
+		end: start + quickInfo.textSpan.length,
+		typeDef,
+		quickInfo,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
new file mode 100644
index 0000000000..c53774cbfe
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/linter.ts
@@ -0,0 +1,111 @@
+import type { Diagnostic } from '@codemirror/lint';
+import type * as tsvfs from '@typescript/vfs';
+import ts from 'typescript';
+import type { DiagnosticWithLocation } from 'typescript';
+
+/**
+ * TypeScript has a set of diagnostic categories,
+ * which maps roughly onto CodeMirror's categories.
+ * Here, we do the mapping.
+ */
+export function tsCategoryToSeverity(
+	diagnostic: Pick<ts.DiagnosticWithLocation, 'category' | 'code'>,
+): Diagnostic['severity'] {
+	switch (diagnostic.code) {
+		case 6133:
+			// No unused variables
+			return 'warning';
+		case 7027:
+			// Unreachable code detected
+			return 'warning';
+		default: {
+			switch (diagnostic.category) {
+				case ts.DiagnosticCategory.Error:
+					return 'error';
+				case ts.DiagnosticCategory.Message:
+					return 'info';
+				case ts.DiagnosticCategory.Warning:
+					return 'warning';
+				case ts.DiagnosticCategory.Suggestion:
+					return 'info';
+			}
+		}
+	}
+}
+
+/**
+ * Not all TypeScript diagnostic relate to specific
+ * ranges in source code: here we filter for those that
+ * do.
+ */
+function isDiagnosticWithLocation(
+	diagnostic: ts.Diagnostic,
+): diagnostic is ts.DiagnosticWithLocation {
+	return !!(
+		diagnostic.file &&
+		typeof diagnostic.start === 'number' &&
+		typeof diagnostic.length === 'number'
+	);
+}
+
+function isIgnoredDiagnostic(diagnostic: ts.Diagnostic) {
+	// No implicit any
+	return diagnostic.code === 7006;
+}
+
+/**
+ * Get the message for a diagnostic. TypeScript
+ * is kind of weird: messageText might have the message,
+ * or a pointer to the message. This follows the chain
+ * to get a string, regardless of which case we're in.
+ */
+function tsDiagnosticMessage(diagnostic: Pick<ts.Diagnostic, 'messageText'>): string {
+	if (typeof diagnostic.messageText === 'string') {
+		return diagnostic.messageText;
+	}
+	// TODO: go through linked list
+	return diagnostic.messageText.messageText;
+}
+
+function tsDiagnosticClassName(diagnostic: ts.Diagnostic) {
+	switch (diagnostic.code) {
+		case 6133:
+			// No unused variables
+			return 'cm-faded';
+		default:
+			return undefined;
+	}
+}
+
+function convertTSDiagnosticToCM(d: ts.DiagnosticWithLocation): Diagnostic {
+	const start = d.start;
+	const message = tsDiagnosticMessage(d);
+
+	return {
+		from: start,
+		to: start + d.length,
+		message,
+		markClass: tsDiagnosticClassName(d),
+		severity: tsCategoryToSeverity(d),
+	};
+}
+
+export function getDiagnostics({
+	env,
+	fileName,
+}: { env: tsvfs.VirtualTypeScriptEnvironment; fileName: string }) {
+	const exists = env.getSourceFile(fileName);
+	if (!exists) return [];
+
+	const tsDiagnostics = [
+		...env.languageService.getSemanticDiagnostics(fileName),
+		...env.languageService.getSyntacticDiagnostics(fileName),
+	];
+
+	const diagnostics = tsDiagnostics.filter(
+		(diagnostic): diagnostic is DiagnosticWithLocation =>
+			isDiagnosticWithLocation(diagnostic) && !isIgnoredDiagnostic(diagnostic),
+	);
+
+	return diagnostics.map((d) => convertTSDiagnosticToCM(d));
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts
new file mode 100644
index 0000000000..a1eadf750c
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/npmTypesLoader.ts
@@ -0,0 +1,60 @@
+type NPMTreeMeta = {
+	default: string;
+	files: Array<{ name: string }>;
+	moduleName: string;
+	version: string;
+};
+
+const jsDelivrApi = {
+	async getFileTree(packageName: string, version = 'latest'): Promise<NPMTreeMeta> {
+		const url = `https://data.jsdelivr.com/v1/package/npm/${packageName}@${version}/flat`;
+		const res = await fetch(url);
+		return await res.json();
+	},
+	async getFileContent(packageName: string, fileName: string, version = 'latest'): Promise<string> {
+		const url = `https://cdn.jsdelivr.net/npm/${packageName}@${version}${fileName}`;
+		const res = await fetch(url);
+		return await res.text();
+	},
+};
+
+function isRequiredTypePackageFile(fileName: string) {
+	return fileName.endsWith('.d.ts') || fileName === '/package.json';
+}
+
+function toLocalFilePath(packageName: string, fileName: string) {
+	return `/node_modules/@types/${packageName}${fileName}`;
+}
+
+export const loadTypes = async (
+	packageName: string,
+	version: string,
+	onFileReceived: (path: string, content: string) => void,
+): Promise<void> => {
+	const { files } = await loadTypesFileTree(packageName, version);
+	await Promise.all(
+		files
+			.filter((file) => isRequiredTypePackageFile(file.name))
+			.map(
+				async (file) =>
+					await loadFileContent(packageName, file.name, version).then((content) =>
+						onFileReceived(toLocalFilePath(packageName, file.name), content),
+					),
+			),
+	);
+};
+
+export const loadTypesFileTree = async (
+	packageName: string,
+	version: string,
+): Promise<NPMTreeMeta> => {
+	return await jsDelivrApi.getFileTree(`@types/${packageName}`, version);
+};
+
+export const loadFileContent = async (
+	packageName: string,
+	fileName: string,
+	version = 'latest',
+) => {
+	return await jsDelivrApi.getFileContent(`@types/${packageName}`, fileName, version);
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
new file mode 100644
index 0000000000..4ea8fc639b
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/globals.d.ts
@@ -0,0 +1,16 @@
+export {};
+
+import luxon from 'luxon';
+
+declare global {
+	const DateTime: typeof luxon.DateTime;
+	type DateTime = luxon.DateTime;
+
+	/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/console) */
+	interface Console {
+		/** [MDN Reference](https://developer.mozilla.org/docs/Web/API/console/log_static) */
+		log(...data: any[]): void;
+	}
+
+	var console: Console;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
new file mode 100644
index 0000000000..fd6f13ee3d
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-all-items.d.ts
@@ -0,0 +1,15 @@
+export {};
+
+declare global {
+	interface NodeData<C = any, J extends N8nJson = any, B extends string = string, P = any> {
+		context: C;
+		params: P;
+		all(branchIndex?: number, runIndex?: number): Array<N8nItem<J, B>>;
+		first(branchIndex?: number, runIndex?: number): N8nItem<J, B>;
+		last(branchIndex?: number, runIndex?: number): N8nItem<J, B>;
+		itemMatching(itemIndex: number): N8nItem<J, B>;
+	}
+
+	// @ts-expect-error N8nInputJson is populated dynamically
+	type N8nInput = NodeData<N8nInputContext, N8nInputJson, N8nInputBinaryKeys, N8nInputParams>;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
new file mode 100644
index 0000000000..b1d6f6ddf1
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n-once-for-each-item.d.ts
@@ -0,0 +1,16 @@
+export {};
+
+declare global {
+	interface NodeData<C, J extends N8nJson, B extends string, P> {
+		context: C;
+		item: N8nItem<J, B>;
+		params: P;
+	}
+
+	// @ts-expect-error N8nInputJson is populated dynamically
+	type N8nInput = NodeData<{}, N8nInputJson, {}, {}>;
+
+	const $itemIndex: number;
+	const $json: N8nInput['item']['json'];
+	const $binary: N8nInput['item']['binary'];
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
new file mode 100644
index 0000000000..c211470bf7
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/type-declarations/n8n.d.ts
@@ -0,0 +1,103 @@
+import type { DateTime } from 'luxon';
+
+export {};
+
+declare global {
+	type OutputItemWithoutJsonKey = {
+		[key: string]: unknown;
+	} & { json?: never };
+
+	type OutputItemWithJsonKey = {
+		json: {
+			[key: string]: unknown;
+		};
+	};
+
+	type MaybePromise<T> = Promise<T> | T;
+
+	type OneOutputItem = OutputItemWithJsonKey | OutputItemWithoutJsonKey;
+	type AllOutputItems = OneOutputItem | Array<OneOutputItem>;
+
+	type N8nOutputItem = MaybePromise<OneOutputItem>;
+	type N8nOutputItems = MaybePromise<AllOutputItems>;
+
+	interface N8nJson {
+		[key: string]: any;
+	}
+
+	interface N8nBinary {
+		id: string;
+		fileName: string;
+		fileExtension: string;
+		fileType: string;
+		fileSize: string;
+		mimeType: string;
+	}
+
+	interface N8nVars {}
+
+	// TODO: populate dynamically
+	interface N8nParameter {}
+
+	interface N8nItem<J extends N8nJson = N8nJson, B extends string = string> {
+		json: J & N8nJson;
+		binary: Record<B, N8nBinary>;
+	}
+
+	interface N8nCustomData {
+		set(key: string, value: string): void;
+		get(key: string): string;
+		getAll(): Record<string, string>;
+		setAll(values: Record<string, string>): void;
+	}
+
+	type N8nExecutionMode = 'test' | 'production';
+	interface N8nExecution {
+		id: string;
+		mode: N8nExecutionMode;
+		resumeUrl?: string;
+		resumeFormUrl?: string;
+		customData: N8nCustomData;
+	}
+
+	interface N8nWorkflow {
+		id: string;
+		active: boolean;
+		name: string;
+	}
+
+	interface N8nPrevNode {
+		name: string;
+		outputIndex: number;
+		runIndex: number;
+	}
+
+	const $input: N8nInput;
+	const $execution: N8nExecution;
+	const $workflow: N8nWorkflow;
+	const $prevNode: N8nPrevNode;
+	const $runIndex: number;
+	const $now: DateTime;
+	const $today: DateTime;
+
+	const $parameter: N8nInput['params'];
+	const $vars: N8nVars;
+	const $nodeVersion: number;
+
+	function $jmespath(object: Object | Array<any>, expression: string): any;
+	function $if<B extends boolean, T, F>(
+		condition: B,
+		valueIfTrue: T,
+		valueIfFalse: F,
+	): B extends true ? T : T extends false ? F : T | F;
+	function $ifEmpty<V, E>(value: V, valueIfEmpty: E): V | E;
+	function $min(...numbers: number[]): number;
+	function $max(...numbers: number[]): number;
+
+	type SomeOtherString = string & NonNullable<unknown>;
+	// @ts-expect-error NodeName is created dynamically
+	function $<K extends NodeName>(
+		nodeName: K | SomeOtherString,
+		// @ts-expect-error NodeDataMap is created dynamically
+	): K extends keyof NodeDataMap ? NodeDataMap[K] : NodeData;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts
new file mode 100644
index 0000000000..a6467d1cfd
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescript.worker.ts
@@ -0,0 +1,224 @@
+import * as Comlink from 'comlink';
+import type { LanguageServiceWorker, LanguageServiceWorkerInit } from '../types';
+import { indexedDbCache } from './cache';
+import { bufferChangeSets, fnPrefix } from './utils';
+
+import type { CodeExecutionMode } from 'n8n-workflow';
+
+import { pascalCase } from 'change-case';
+import { computed, reactive, ref, watch } from 'vue';
+import { getCompletionsAtPos } from './completions';
+import { LUXON_VERSION, TYPESCRIPT_FILES } from './constants';
+import {
+	getDynamicInputNodeTypes,
+	getDynamicNodeTypes,
+	getDynamicVariableTypes,
+	schemaToTypescriptTypes,
+} from './dynamicTypes';
+import { setupTypescriptEnv } from './env';
+import { getHoverTooltip } from './hoverTooltip';
+import { getDiagnostics } from './linter';
+import { getUsedNodeNames } from './typescriptAst';
+
+import runOnceForAllItemsTypes from './type-declarations/n8n-once-for-all-items.d.ts?raw';
+import runOnceForEachItemTypes from './type-declarations/n8n-once-for-each-item.d.ts?raw';
+import { loadTypes } from './npmTypesLoader';
+import { ChangeSet, Text } from '@codemirror/state';
+import { until } from '@vueuse/core';
+
+self.process = { env: {} } as NodeJS.Process;
+
+const worker: LanguageServiceWorkerInit = {
+	async init(options, nodeDataFetcher) {
+		const loadedNodeTypesMap: Map<string, { type: string; typeName: string }> = reactive(new Map());
+
+		const inputNodeNames = options.inputNodeNames;
+		const allNodeNames = options.allNodeNames;
+		const codeFileName = `${options.id}.js`;
+		const mode = ref<CodeExecutionMode>(options.mode);
+		const busyApplyingChangesToCode = ref(false);
+
+		const cache = await indexedDbCache('typescript-cache', 'fs-map');
+		const env = await setupTypescriptEnv({
+			cache,
+			mode: mode.value,
+			code: { content: Text.of(options.content).toString(), fileName: codeFileName },
+		});
+
+		const prefix = computed(() => fnPrefix(mode.value));
+
+		function editorPositionToTypescript(pos: number) {
+			return pos + prefix.value.length;
+		}
+
+		function typescriptPositionToEditor(pos: number) {
+			return pos - prefix.value.length;
+		}
+
+		async function loadNodeTypes(nodeName: string) {
+			const data = await nodeDataFetcher(nodeName);
+
+			const typeName = pascalCase(nodeName);
+			const jsonType = data?.json
+				? schemaToTypescriptTypes(data.json, `${typeName}Json`)
+				: `type ${typeName}Json = N8nJson`;
+			const paramsType = data?.params
+				? schemaToTypescriptTypes(data.params, `${typeName}Params`)
+				: `type ${typeName}Params = {}`;
+
+			// Using || on purpose to handle empty string
+			// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+			const binaryType = `type ${typeName}BinaryKeys = ${data?.binary.map((key) => `'${key}'`).join(' | ') || 'string'}`;
+			const contextType = `type ${typeName}Context = {}`;
+			const type = [jsonType, binaryType, paramsType, contextType].join('\n');
+			loadedNodeTypesMap.set(nodeName, { type, typeName });
+		}
+
+		async function loadTypesIfNeeded() {
+			const file = env.getSourceFile(codeFileName);
+
+			if (!file) return;
+
+			const nodeNames = await getUsedNodeNames(file);
+
+			for (const nodeName of nodeNames) {
+				if (!loadedNodeTypesMap.has(nodeName)) {
+					await loadNodeTypes(nodeName);
+				}
+			}
+		}
+
+		async function loadLuxonTypes() {
+			if (cache.getItem('/node_modules/@types/luxon/package.json')) {
+				const fileMap = await cache.getAllWithPrefix('/node_modules/@types/luxon');
+
+				for (const [path, content] of Object.entries(fileMap)) {
+					updateFile(path, content);
+				}
+			} else {
+				await loadTypes('luxon', LUXON_VERSION, (path, types) => {
+					cache.setItem(path, types);
+					updateFile(path, types);
+				});
+			}
+		}
+
+		async function setVariableTypes() {
+			updateFile(
+				TYPESCRIPT_FILES.DYNAMIC_VARIABLES_TYPES,
+				await getDynamicVariableTypes(options.variables),
+			);
+		}
+
+		function updateFile(fileName: string, content: string) {
+			const exists = env.getSourceFile(fileName);
+			if (exists) {
+				env.updateFile(fileName, content);
+			} else {
+				env.createFile(fileName, content);
+			}
+		}
+
+		const loadInputNodes = options.inputNodeNames.map(
+			async (nodeName) => await loadNodeTypes(nodeName),
+		);
+		await Promise.all(
+			loadInputNodes.concat(loadTypesIfNeeded(), loadLuxonTypes(), setVariableTypes()),
+		);
+
+		watch(
+			loadedNodeTypesMap,
+			async (loadedNodes) => {
+				updateFile(
+					TYPESCRIPT_FILES.DYNAMIC_INPUT_TYPES,
+					await getDynamicInputNodeTypes(inputNodeNames),
+				);
+				updateFile(
+					TYPESCRIPT_FILES.DYNAMIC_TYPES,
+					await getDynamicNodeTypes({ nodeNames: allNodeNames, loadedNodes }),
+				);
+			},
+			{ immediate: true },
+		);
+
+		watch(
+			mode,
+			(newMode) => {
+				updateFile(
+					TYPESCRIPT_FILES.MODE_TYPES,
+					newMode === 'runOnceForAllItems' ? runOnceForAllItemsTypes : runOnceForEachItemTypes,
+				);
+			},
+			{ immediate: true },
+		);
+
+		watch(prefix, (newPrefix, oldPrefix) => {
+			env.updateFile(codeFileName, newPrefix, { start: 0, length: oldPrefix.length });
+		});
+
+		const applyChangesToCode = bufferChangeSets((bufferedChanges) => {
+			bufferedChanges.iterChanges((start, end, _fromNew, _toNew, text) => {
+				const length = end - start;
+
+				env.updateFile(codeFileName, text.toString(), {
+					start: editorPositionToTypescript(start),
+					length,
+				});
+			});
+
+			void loadTypesIfNeeded();
+		});
+
+		const waitForChangesAppliedToCode = async () => {
+			await until(busyApplyingChangesToCode).toBe(false, { timeout: 500 });
+		};
+
+		return Comlink.proxy<LanguageServiceWorker>({
+			updateFile: async (changes) => {
+				busyApplyingChangesToCode.value = true;
+				void applyChangesToCode(ChangeSet.fromJSON(changes)).then(() => {
+					busyApplyingChangesToCode.value = false;
+				});
+			},
+			async getCompletionsAtPos(pos) {
+				await waitForChangesAppliedToCode();
+
+				return await getCompletionsAtPos({
+					pos: editorPositionToTypescript(pos),
+					fileName: codeFileName,
+					env,
+				});
+			},
+			getDiagnostics() {
+				return getDiagnostics({ env, fileName: codeFileName }).map((diagnostic) => ({
+					...diagnostic,
+					from: typescriptPositionToEditor(diagnostic.from),
+					to: typescriptPositionToEditor(diagnostic.to),
+				}));
+			},
+			getHoverTooltip(pos) {
+				const tooltip = getHoverTooltip({
+					pos: editorPositionToTypescript(pos),
+					fileName: codeFileName,
+					env,
+				});
+
+				if (!tooltip) return null;
+
+				tooltip.start = typescriptPositionToEditor(tooltip.start);
+				tooltip.end = typescriptPositionToEditor(tooltip.end);
+
+				return tooltip;
+			},
+			async updateMode(newMode) {
+				mode.value = newMode;
+			},
+			async updateNodeTypes() {
+				const loadedNodeNames = Array.from(loadedNodeTypesMap.keys());
+				await Promise.all(loadedNodeNames.map(async (nodeName) => await loadNodeTypes(nodeName)));
+			},
+		});
+	},
+};
+
+Comlink.expose(worker);
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts
new file mode 100644
index 0000000000..ea44d75faa
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/typescriptAst.ts
@@ -0,0 +1,38 @@
+import ts from 'typescript';
+
+function findNodes(node: ts.Node, check: (node: ts.Node) => boolean): ts.Node[] {
+	const result: ts.Node[] = [];
+
+	// If the current node matches the condition, add it to the result
+	if (check(node)) {
+		result.push(node);
+	}
+
+	// Recursively check all child nodes
+	node.forEachChild((child) => {
+		result.push(...findNodes(child, check));
+	});
+
+	return result;
+}
+
+/**
+ * Get nodes mentioned in the code
+ * Check if code includes calls to $('Node A')
+ */
+export async function getUsedNodeNames(file: ts.SourceFile) {
+	const callExpressions = findNodes(
+		file,
+		(n) =>
+			n.kind === ts.SyntaxKind.CallExpression &&
+			(n as ts.CallExpression).expression.getText() === '$',
+	);
+
+	if (callExpressions.length === 0) return [];
+
+	const nodeNames = (callExpressions as ts.CallExpression[])
+		.map((e) => (e.arguments.at(0) as ts.StringLiteral)?.text)
+		.filter(Boolean);
+
+	return nodeNames;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts b/packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts
new file mode 100644
index 0000000000..b43a7bcd1b
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/typescript/worker/utils.ts
@@ -0,0 +1,64 @@
+import { ChangeSet } from '@codemirror/state';
+import { type CodeExecutionMode } from 'n8n-workflow';
+
+export const fnPrefix = (mode: CodeExecutionMode) => `(
+/**
+ * @returns {${returnTypeForMode(mode)}}
+*/
+() => {\n`;
+
+export function wrapInFunction(script: string, mode: CodeExecutionMode): string {
+	return `${fnPrefix(mode)}${script}\n})()`;
+}
+
+export function globalTypeDefinition(types: string) {
+	return `export {};
+declare global {
+	${types}
+}`;
+}
+
+export function returnTypeForMode(mode: CodeExecutionMode): string {
+	return mode === 'runOnceForAllItems' ? 'N8nOutputItems' : 'N8nOutputItem';
+}
+
+const MAX_CHANGE_BUFFER_CHAR_SIZE = 10_000_000;
+const MIN_CHANGE_BUFFER_WINDOW_MS = 50;
+const MAX_CHANGE_BUFFER_WINDOW_MS = 500;
+
+// Longer buffer window for large code
+function calculateBufferWindowMs(docSize: number, minDelay: number, maxDelay: number): number {
+	const clampedSize = Math.min(docSize, MAX_CHANGE_BUFFER_CHAR_SIZE);
+	const normalizedSize = clampedSize / MAX_CHANGE_BUFFER_CHAR_SIZE;
+
+	return Math.ceil(minDelay + (maxDelay - minDelay) * normalizedSize);
+}
+
+// Create a buffer function to accumulate and compose changesets
+export function bufferChangeSets(fn: (changeset: ChangeSet) => void) {
+	let changeSet = ChangeSet.empty(0);
+	let timeoutId: NodeJS.Timeout | null = null;
+
+	return async (changes: ChangeSet) => {
+		changeSet = changeSet.compose(changes);
+
+		if (timeoutId) {
+			clearTimeout(timeoutId);
+		}
+
+		return await new Promise<void>((resolve) => {
+			timeoutId = setTimeout(
+				() => {
+					fn(changeSet);
+					resolve();
+					changeSet = ChangeSet.empty(0);
+				},
+				calculateBufferWindowMs(
+					changeSet.length,
+					MIN_CHANGE_BUFFER_WINDOW_MS,
+					MAX_CHANGE_BUFFER_WINDOW_MS,
+				),
+			);
+		});
+	};
+}
diff --git a/packages/editor-ui/src/plugins/components.ts b/packages/editor-ui/src/plugins/components.ts
index d87d7f0ac6..38c600a8f4 100644
--- a/packages/editor-ui/src/plugins/components.ts
+++ b/packages/editor-ui/src/plugins/components.ts
@@ -6,7 +6,6 @@ import ElementPlus, { ElLoading, ElMessageBox } from 'element-plus';
 import { N8nPlugin } from 'n8n-design-system';
 import { useMessage } from '@/composables/useMessage';
 import EnterpriseEdition from '@/components/EnterpriseEdition.ee.vue';
-import RBAC from '@/components/RBAC.vue';
 import ParameterInputList from '@/components/ParameterInputList.vue';
 
 export const GlobalComponentsPlugin: Plugin = {
@@ -14,7 +13,6 @@ export const GlobalComponentsPlugin: Plugin = {
 		const messageService = useMessage();
 
 		app.component('EnterpriseEdition', EnterpriseEdition);
-		app.component('RBAC', RBAC);
 		app.component('ParameterInputList', ParameterInputList);
 
 		app.use(ElementPlus);
diff --git a/packages/editor-ui/src/plugins/i18n/docs/README.md b/packages/editor-ui/src/plugins/i18n/docs/README.md
index 98ae353758..5e57bb308e 100644
--- a/packages/editor-ui/src/plugins/i18n/docs/README.md
+++ b/packages/editor-ui/src/plugins/i18n/docs/README.md
@@ -72,7 +72,7 @@ The base text file for each locale is located at `/packages/editor-ui/src/plugin
 cp ./packages/editor-ui/src/plugins/i18n/locales/en.json ./packages/editor-ui/src/plugins/i18n/locales/de.json
 ```
 
-2. Find in the UI a string to translate, and search for it in the newly created base text file. Alternatively, find in `/editor-ui` a call to `$locale.baseText(key)`, e.g. `$locale.baseText('workflowActivator.deactivateWorkflow')`, and take note of the key and find it in the newly created base text file.
+2. Find in the UI a string to translate, and search for it in the newly created base text file. Alternatively, find in `/editor-ui` a call to `i18n.baseText(key)`, e.g. `i18n.baseText('workflowActivator.deactivateWorkflow')`, and take note of the key and find it in the newly created base text file.
 
 > **Note**: If you cannot find a string in the new base text file, either it does not belong to base text (i.e., the string might be part of header text, credential text, or node text), or the string might belong to the backend, where i18n is currently unsupported.
 
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index 6c7372dce2..2a3ff1fe9d 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -1,7 +1,6 @@
-import type { Plugin } from 'vue';
 import axios from 'axios';
 import { createI18n } from 'vue-i18n';
-import { locale, type N8nLocaleTranslateFn } from 'n8n-design-system';
+import { locale } from 'n8n-design-system';
 import type { INodeProperties, INodePropertyCollection, INodePropertyOptions } from 'n8n-workflow';
 
 import type { INodeTranslationHeaders } from '@/Interface';
@@ -20,9 +19,13 @@ export const i18nInstance = createI18n({
 	locale: 'en',
 	fallbackLocale: 'en',
 	messages: { en: englishBaseText },
+	warnHtmlInMessage: 'off',
 });
 
-type BaseTextOptions = { adjustToNumber?: number; interpolate?: Record<string, string | number> };
+type BaseTextOptions = {
+	adjustToNumber?: number;
+	interpolate?: Record<string, string | number>;
+};
 
 export class I18nClass {
 	private baseTextCache = new Map<string, string>();
@@ -43,6 +46,10 @@ export class I18nClass {
 		return longNodeType.replace('n8n-nodes-base.', '');
 	}
 
+	get locale() {
+		return i18nInstance.global.locale;
+	}
+
 	// ----------------------------------
 	//        render methods
 	// ----------------------------------
@@ -437,17 +444,6 @@ export function addHeaders(headers: INodeTranslationHeaders, language: string) {
 
 export const i18n: I18nClass = new I18nClass();
 
-export const I18nPlugin: Plugin = {
-	async install(app) {
-		locale.i18n(((key: string, options?: BaseTextOptions) =>
-			i18nInstance.global.t(key, options?.interpolate ?? {})) as N8nLocaleTranslateFn);
-
-		app.config.globalProperties.$locale = i18n;
-
-		await locale.use('en');
-	},
-};
-
 // ----------------------------------
 //             typings
 // ----------------------------------
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 54618e5dc2..443721a619 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -46,7 +46,11 @@
 	"generic.copy": "Copy",
 	"generic.delete": "Delete",
 	"generic.dontShowAgain": "Don't show again",
+	"generic.enterprise": "Enterprise",
 	"generic.executions": "Executions",
+	"generic.tag_plural": "Tags",
+	"generic.tag": "Tag | {count} Tags",
+	"generic.tests": "Tests",
 	"generic.or": "or",
 	"generic.clickToCopy": "Click to copy",
 	"generic.copiedToClipboard": "Copied to clipboard",
@@ -54,18 +58,21 @@
 	"generic.yes": "Yes",
 	"generic.no": "No",
 	"generic.rating": "Rating",
+	"generic.refresh": "Refresh",
 	"generic.retry": "Retry",
 	"generic.error": "Something went wrong",
 	"generic.settings": "Settings",
 	"generic.service": "the service",
+	"generic.tryNow": "Try now",
+	"generic.dismiss": "Dismiss",
 	"generic.unsavedWork.confirmMessage.headline": "Save changes before leaving?",
 	"generic.unsavedWork.confirmMessage.message": "If you don't save, you will lose your changes.",
 	"generic.unsavedWork.confirmMessage.confirmButtonText": "Save",
 	"generic.unsavedWork.confirmMessage.cancelButtonText": "Leave without saving",
 	"generic.upgrade": "Upgrade",
 	"generic.upgradeNow": "Upgrade now",
-	"generic.credential": "Credential",
-	"generic.workflow": "Workflow",
+	"generic.credential": "Credential | {count} Credential | {count} Credentials",
+	"generic.workflow": "Workflow | {count} Workflow | {count} Workflows",
 	"generic.workflowSaved": "Workflow changes saved",
 	"generic.editor": "Editor",
 	"generic.seePlans": "See plans",
@@ -74,6 +81,10 @@
 	"generic.ownedByMe": "(You)",
 	"generic.moreInfo": "More info",
 	"generic.next": "Next",
+	"generic.pro": "Pro",
+	"generic.variable_plural": "Variables",
+	"generic.variable": "Variable | {count} Variables",
+	"generic.viewDocs": "View docs",
 	"about.aboutN8n": "About n8n",
 	"about.close": "Close",
 	"about.license": "License",
@@ -169,11 +180,14 @@
 	"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.window.title": "Chat Window ({nodeName})",
-	"chat.window.logs": "Log (for last message)",
+	"chat.hide": "Hide chat",
+	"chat.window.title": "Chat",
+	"chat.window.logs": "Latest Logs",
+	"chat.window.logsFromNode": "from {nodeName} node",
 	"chat.window.noChatNode": "No Chat Node",
 	"chat.window.noExecution": "Nothing got executed yet",
 	"chat.window.chat.placeholder": "Type a message, or press ‘up’ arrow for previous one",
+	"chat.window.chat.placeholderPristine": "Type a message",
 	"chat.window.chat.sendButtonText": "Send",
 	"chat.window.chat.provideMessage": "Please provide a message",
 	"chat.window.chat.emptyChatMessage": "Empty chat message",
@@ -185,6 +199,10 @@
 	"chat.window.chat.unpinAndExecute.confirm": "Unpin and send",
 	"chat.window.chat.unpinAndExecute.cancel": "Cancel",
 	"chat.window.chat.response.empty": "[No response. Make sure the last executed node outputs the content to display here]",
+	"chat.window.session.title": "Session",
+	"chat.window.session.reset.title": "Reset session?",
+	"chat.window.session.reset.warning": "This will clear all chat messages and the current execution data",
+	"chat.window.session.reset.confirm": "Reset",
 	"chatEmbed.infoTip.description": "Add chat to external applications using the n8n chat package.",
 	"chatEmbed.infoTip.link": "More info",
 	"chatEmbed.title": "Embed Chat in your website",
@@ -447,7 +465,7 @@
 	"codeNodeEditor.linter.allItems.itemCall": "`item` is a property to access, not a method to call. Did you mean `.item` without brackets?",
 	"codeNodeEditor.linter.allItems.itemMatchingNoArg": "`.itemMatching()` expects an item index to be passed in as its argument.",
 	"codeNodeEditor.linter.allItems.unavailableItem": "Legacy `item` is only available in the 'Run Once for Each Item' mode.",
-	"codeNodeEditor.linter.allItems.unavailableProperty": "`.item` is only available in the 'Run Once for Each Item' mode.",
+	"codeNodeEditor.linter.allItems.unavailableProperty": "`.item` is only available in the 'Run Once for Each Item' mode. Use `.first()` instead.",
 	"codeNodeEditor.linter.allItems.unavailableVar": "is only available in the 'Run Once for Each Item' mode.",
 	"codeNodeEditor.linter.bothModes.directAccess.firstOrLastCall": "@:_reusableBaseText.codeNodeEditor.linter.useJson",
 	"codeNodeEditor.linter.bothModes.directAccess.itemProperty": "@:_reusableBaseText.codeNodeEditor.linter.useJson",
@@ -458,7 +476,9 @@
 	"codeNodeEditor.linter.eachItem.returnArray": "Code doesn't return an object. Array found instead. Please return an object representing the output item",
 	"codeNodeEditor.linter.eachItem.unavailableItems": "Legacy `items` is only available in the 'Run Once for All Items' mode.",
 	"codeNodeEditor.linter.eachItem.unavailableMethod": "Method `$input.{method}()` is only available in the 'Run Once for All Items' mode.",
+	"codeNodeEditor.linter.eachItem.preferFirst": "Prefer `.first()` over `.item` so n8n can optimize execution",
 	"codeNodeEditor.linter.bothModes.syntaxError": "Syntax error",
+	"codeNodeEditor.linter.bothModes.dollarSignVariable": "Use a string literal instead of a variable so n8n can optimize execution.",
 	"codeNodeEditor.askAi.placeholder": "Tell AI what you want the code to achieve. You can reference input data fields using dot notation (e.g. user.email)",
 	"codeNodeEditor.askAi.intro": "Hey AI, generate JavaScript code that...",
 	"codeNodeEditor.askAi.help": "Help",
@@ -577,7 +597,6 @@
 	"credentialsList.confirmMessage.confirmButtonText": "Yes, delete",
 	"credentialsList.confirmMessage.headline": "Delete Credential?",
 	"credentialsList.confirmMessage.message": "Are you sure you want to delete {credentialName}?",
-	"credentialsList.createNewCredential": "Create New Credential",
 	"credentialsList.created": "Created",
 	"credentialsList.credentials": "Credentials",
 	"credentialsList.deleteCredential": "Delete Credential",
@@ -605,8 +624,11 @@
 	"credentials.item.created": "Created",
 	"credentials.item.owner": "Owner",
 	"credentials.item.readonly": "Read only",
+	"credentials.item.needsSetup": "Needs first setup",
 	"credentials.search.placeholder": "Search credentials...",
 	"credentials.filters.type": "Type",
+	"credentials.filters.setup": "Needs first setup",
+	"credentials.filters.status": "Status",
 	"credentials.filters.active": "Some credentials may be hidden since filters are applied.",
 	"credentials.filters.active.reset": "Remove filters",
 	"credentials.sort.lastUpdated": "Sort by last updated",
@@ -617,7 +639,7 @@
 	"credentials.noResults.withSearch.switchToShared.preamble": "some credentials may be",
 	"credentials.noResults.withSearch.switchToShared.link": "hidden",
 	"credentials.create.personal.toast.title": "Credential successfully created",
-	"credentials.create.personal.toast.text": "This credential is currently private to you.",
+	"credentials.create.personal.toast.text": "This credential has been created inside your personal space.",
 	"credentials.create.project.toast.title": "Credential successfully created in {projectName}",
 	"credentials.create.project.toast.text": "All members from {projectName} will have access to this credential.",
 	"dataDisplay.needHelp": "Need help?",
@@ -650,6 +672,7 @@
 	"error.goBack": "Go back",
 	"error.pageNotFound": "Oops, couldn’t find that",
 	"executions.ExecutionStatus": "Execution status",
+	"executions.concurrency.docsLink": "https://docs.n8n.io/hosting/scaling/concurrency-control/",
 	"executionDetails.confirmMessage.confirmButtonText": "Yes, delete",
 	"executionDetails.confirmMessage.headline": "Delete Execution?",
 	"executionDetails.confirmMessage.message": "Are you sure that you want to delete the current execution?",
@@ -688,6 +711,10 @@
 	"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}. This instance is limited to {cap} concurrent production executions.",
+	"executionsList.activeExecutions.evaluationNote": "Evaluation runs appear in the list of executions but do not count towards your execution concurrency.",
 	"executionsList.allWorkflows": "All Workflows",
 	"executionsList.anyStatus": "Any Status",
 	"executionsList.autoRefresh": "Auto refresh",
@@ -755,6 +782,10 @@
 	"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. {instance}",
+	"executionsList.statusTooltipText.waitingForConcurrencyCapacity.cloud": "Your plan is limited to {concurrencyCap} concurrent production executions. {link}",
+	"executionsList.statusTooltipText.waitingForConcurrencyCapacity.self": "This instance is limited to {concurrencyCap} concurrent production executions. {link}",
 	"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",
@@ -825,15 +856,11 @@
 	"expressionModalInput.pairedItemConnectionError": "No path back to node",
 	"expressionModalInput.pairedItemInvalidPinnedError": "Unpin node ‘{node}’ and execute",
 	"expressionModalInput.pairedItemError": "Can’t determine which item to use",
-	"fakeDoor.settings.environments.name": "Environments",
-	"fakeDoor.settings.sso.name": "Single Sign-On",
-	"fakeDoor.settings.sso.actionBox.title": "We’re working on this (as a paid feature)",
-	"fakeDoor.settings.sso.actionBox.title.cloud": "We’re working on this",
-	"fakeDoor.settings.sso.actionBox.description": "SSO will offer a secured and convenient way to access n8n using your existing credentials (Google, Github, Keycloak…)",
-	"fakeDoor.actionBox.button.label": "Join the list",
+	"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",
+	"fixedCollectionParameter.dragItem": "Drag item",
 	"fixedCollectionParameter.moveDown": "Move down",
 	"fixedCollectionParameter.moveUp": "Move up",
 	"forgotPassword": "Forgot my password",
@@ -864,6 +891,12 @@
 	"readOnlyEnv.showMessage.executions.title": "Cannot edit execution",
 	"readOnlyEnv.showMessage.workflows.message": "Workflows are read-only in protected instances.",
 	"readOnlyEnv.showMessage.workflows.title": "Cannot edit workflow",
+	"readOnlyEnv.tooltip": "This is a protected instance where modifications are restricted. {link}",
+	"readOnlyEnv.tooltip.link": "More info.",
+	"readOnlyEnv.cantAdd.workflow": "You can't add new workflows to a protected n8n instance",
+	"readOnlyEnv.cantAdd.credential": "You can't add new credentials to a protected n8n instance",
+	"readOnlyEnv.cantAdd.any": "You can't create new workflows or credentials on a protected n8n instance",
+	"readOnlyEnv.cantEditOrRun": "This workflow can't be edited or run manually because it's on a protected instance",
 	"mainSidebar.aboutN8n": "About n8n",
 	"mainSidebar.confirmMessage.workflowDelete.cancelButtonText": "",
 	"mainSidebar.confirmMessage.workflowDelete.confirmButtonText": "Yes, delete",
@@ -897,7 +930,7 @@
 	"mainSidebar.workflows": "Workflows",
 	"mainSidebar.workflows.readOnlyEnv.tooltip": "Protected instances prevent editing workflows (recommended for production environments). {link}",
 	"mainSidebar.workflows.readOnlyEnv.tooltip.link": "More info",
-	"mainSidebar.executions": "All executions",
+	"mainSidebar.executions": "Executions",
 	"mainSidebar.workersView": "Workers",
 	"menuActions.duplicate": "Duplicate",
 	"menuActions.download": "Download",
@@ -909,7 +942,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",
@@ -919,9 +954,13 @@
 	"ndv.backToCanvas.waitingForTriggerWarning": "Waiting for a Trigger node to execute. Close this view to see the Workflow Canvas.",
 	"ndv.execute.testNode": "Test step",
 	"ndv.execute.testNode.description": "Runs the current node. Will also run previous nodes if they have not been run yet",
+	"ndv.execute.generateCodeAndTestNode.description": "Generates code and then runs the current node",
+	"ndv.execute.generateCode.message": "The instructions in '{nodeName}' have changed",
+	"ndv.execute.generateCode.title": "Generating transformation code",
 	"ndv.execute.executing": "Executing",
 	"ndv.execute.fetchEvent": "Fetch Test Event",
 	"ndv.execute.fixPrevious": "Fix previous node first",
+	"ndv.execute.generatingCode": "Genereting code from instructions",
 	"ndv.execute.listenForTestEvent": "Listen for test event",
 	"ndv.execute.testChat": "Test chat",
 	"ndv.execute.testStep": "Test step",
@@ -951,7 +990,8 @@
 	"ndv.input.disabled": "The '{nodeName}' node is disabled and won’t execute.",
 	"ndv.input.disabled.cta": "Enable it",
 	"ndv.output": "Output",
-	"ndv.output.ai.empty": "👈 This is {node}’s AI Logs. Click on a node to see the input it received and data it outputted.",
+	"ndv.output.ai.empty": "👈 Use these logs to see information on how the {node} node completed processing. You can click on a node to see the input it received and data it output.",
+	"ndv.output.ai.waiting": "Waiting for message",
 	"ndv.output.outType.logs": "Logs",
 	"ndv.output.outType.regular": "Output",
 	"ndv.output.edit": "Edit Output",
@@ -959,6 +999,7 @@
 	"ndv.output.branch": "Branch",
 	"ndv.output.executing": "Executing node...",
 	"ndv.output.items": "{count} item | {count} items",
+	"ndv.output.andSubExecutions": ", {count} sub-execution | , {count} sub-executions",
 	"ndv.output.noOutputData.message": "n8n stops executing the workflow when a node has no output data. You can change this default behaviour via",
 	"ndv.output.noOutputData.message.settings": "Settings",
 	"ndv.output.noOutputData.message.settingsOption": "> \"Always Output Data\".",
@@ -980,6 +1021,7 @@
 	"ndv.output.tooMuchData.showDataAnyway": "Show data",
 	"ndv.output.tooMuchData.title": "Display data?",
 	"ndv.output.waitingToRun": "Waiting to execute...",
+	"ndv.output.noToolUsedInfo": "None of your tools were used in this run. Try giving your tools clearer names and descriptions to help the AI",
 	"ndv.title.cancel": "Cancel",
 	"ndv.title.rename": "Rename",
 	"ndv.title.renameNode": "Rename node",
@@ -1118,6 +1160,8 @@
 	"nodeCreator.triggerHelperPanel.manualChatTriggerDisplayName": "On chat message",
 	"nodeCreator.triggerHelperPanel.manualChatTriggerDescription": "Runs the flow when a user sends a chat message. For use with AI nodes",
 	"nodeCreator.triggerHelperPanel.manualTriggerTag": "Recommended",
+	"nodeCreator.triggerHelperPanel.chatTriggerDisplayName": "On chat message",
+	"nodeCreator.triggerHelperPanel.chatTriggerDescription": "Runs the flow when a user sends a chat message. For use with AI nodes",
 	"nodeCreator.triggerHelperPanel.whatHappensNext": "What happens next?",
 	"nodeCreator.triggerHelperPanel.selectATrigger": "What triggers this workflow?",
 	"nodeCreator.triggerHelperPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
@@ -1146,7 +1190,7 @@
 	"nodeCreator.aiPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
 	"nodeCreator.nodeItem.triggerIconTitle": "Trigger Node",
 	"nodeCreator.nodeItem.aiIconTitle": "LangChain AI Node",
-	"nodeCredentials.createNew": "Create New Credential",
+	"nodeCredentials.createNew": "Create new credential",
 	"nodeCredentials.credentialFor": "Credential for {credentialType}",
 	"nodeCredentials.credentialsLabel": "Credential to connect with",
 	"nodeCredentials.issues": "Issues",
@@ -1263,6 +1307,7 @@
 	"nodeView.confirmMessage.debug.headline": "Unpin workflow data",
 	"nodeView.confirmMessage.debug.message": "Loading this execution will unpin the data currently pinned in these nodes",
 	"nodeView.couldntImportWorkflow": "Could not import workflow",
+	"nodeView.couldntLoadWorkflow.invalidWorkflowObject": "Invalid workflow object",
 	"nodeView.deletesTheCurrentExecutionData": "Deletes the current execution data",
 	"nodeView.itLooksLikeYouHaveBeenEditingSomething": "It looks like you made some edits. If you leave before saving, your changes will be lost.",
 	"nodeView.loadingTemplate": "Loading template",
@@ -1360,7 +1405,6 @@
 	"nodeWebhooks.webhookUrls": "Webhook URLs",
 	"nodeWebhooks.webhookUrls.formTrigger": "Form URLs",
 	"nodeWebhooks.webhookUrls.chatTrigger": "Chat URL",
-	"onboardingWorkflow.stickyContent": "## 👇 Get started faster \nLightning tour of the key concepts [4 min] \n\n[![n8n quickstart video](/static/quickstart_thumbnail.png#full-width)](https://www.youtube.com/watch?v=1MwSoB0gnM4)",
 	"openWorkflow.workflowImportError": "Could not import workflow",
 	"openWorkflow.workflowNotFoundError": "Could not find workflow",
 	"parameterInput.expressionResult": "e.g. {result}",
@@ -1389,6 +1433,7 @@
 	"parameterInput.parameterHasIssues": "Parameter: \"{shortPath}\" has issues",
 	"parameterInput.parameterHasIssuesAndExpression": "Parameter: \"{shortPath}\" has issues and an expression",
 	"parameterInput.refreshList": "Refresh List",
+	"parameterInput.clearContents": "Clear Contents",
 	"parameterInput.resetValue": "Reset Value",
 	"parameterInput.select": "Select",
 	"parameterInput.selectDateAndTime": "Select date and time",
@@ -1499,7 +1544,7 @@
 	"pushConnection.executionFailed": "Execution failed",
 	"pushConnection.executionFailed.message": "There might not be enough memory to finish the execution. Tips for avoiding this <a target=\"_blank\" href=\"https://docs.n8n.io/flow-logic/error-handling/memory-errors/\">here</a>",
 	"pushConnection.executionError": "There was a problem executing the workflow{error}",
-	"pushConnection.executionError.openNode": " <a data-action='openNodeDetail' data-action-parameter-node='{node}'>Open node</a>",
+	"pushConnection.executionError.openNode": "Open errored node",
 	"pushConnection.executionError.details": "<br /><strong>{details}</strong>",
 	"prompts.productTeamMessage": "Our product team will get in touch personally",
 	"prompts.npsSurvey.recommendationQuestion": "How likely are you to recommend n8n to a friend or colleague?",
@@ -1538,7 +1583,7 @@
 	"resourceMapper.fetchingFields.message": "Fetching {fieldWord}",
 	"resourceMapper.fetchingFields.errorMessage": "Can't get {fieldWord}.",
 	"resourceMapper.fetchingFields.noFieldsFound": "No {fieldWord} found in {serviceName}.",
-	"resourceMapper.columnsToMatchOn.label": "{fieldWord} to Match On",
+	"resourceMapper.columnsToMatchOn.label": "{fieldWord} to match on",
 	"resourceMapper.columnsToMatchOn.multi.description": "The {fieldWord} to use when matching rows in {nodeDisplayName} to the input items of this node. Usually an ID.",
 	"resourceMapper.columnsToMatchOn.single.description": "The {fieldWord} to use when matching rows in {nodeDisplayName} to the input items of this node. Usually an ID.",
 	"resourceMapper.columnsToMatchOn.tooltip": "The {fieldWord} to compare when finding the rows to update",
@@ -1549,11 +1594,18 @@
 	"resourceMapper.usingToMatch.description": "This {fieldWord} won't be updated and can't be removed, as it's used for matching",
 	"resourceMapper.removeField": "Remove {fieldWord}",
 	"resourceMapper.mandatoryField.title": "This {fieldWord} is mandatory and can’t be removed",
-	"resourceMapper.addFieldToSend": "Add {fieldWord} to Send",
+	"resourceMapper.addFieldToSend": "Add {fieldWord} to send",
 	"resourceMapper.matching.title": "This {fieldWord} is used for matching and can’t be removed",
 	"resourceMapper.addAllFields": "Add All {fieldWord}",
 	"resourceMapper.removeAllFields": "Remove All {fieldWord}",
 	"resourceMapper.refreshFieldList": "Refresh {fieldWord} List",
+	"resourceMapper.staleDataWarning.tooltip": "{fieldWord} are outdated. Refresh to see the changes.",
+	"resourceMapper.staleDataWarning.notice": "Refresh to see the updated fields",
+	"resourceMapper.attemptToConvertTypes.displayName": "Attempt to convert types",
+	"resourceMapper.attemptToConvertTypes.description": "Attempt to convert types when mapping fields",
+	"runData.openSubExecutionSingle": "View sub-execution",
+	"runData.openSubExecutionWithId": "View sub-execution {id}",
+	"runData.openParentExecution": "View parent execution {id}",
 	"runData.emptyItemHint": "This is an item, but it's empty.",
 	"runData.emptyArray": "[empty array]",
 	"runData.emptyString": "[empty]",
@@ -1601,6 +1653,7 @@
 	"runData.showBinaryData": "View",
 	"runData.startTime": "Start Time",
 	"runData.table": "Table",
+	"runData.table.viewSubExecution": "View sub-execution {id}",
 	"runData.pindata.learnMore": "Learn more",
 	"runData.pindata.thisDataIsPinned": "This data is pinned.",
 	"runData.pindata.unpin": "Unpin",
@@ -1611,6 +1664,9 @@
 	"runData.aiContentBlock.tokens": "{count} Tokens",
 	"runData.aiContentBlock.tokens.prompt": "Prompt:",
 	"runData.aiContentBlock.tokens.completion": "Completion:",
+	"runData.trimmedData.title": "Data not viewable yet",
+	"runData.trimmedData.message": "It will be available here once the execution has finished.",
+	"runData.trimmedData.loading": "Loading data",
 	"saveButton.save": "@:_reusableBaseText.save",
 	"saveButton.saved": "Saved",
 	"saveWorkflowButton.hint": "Save workflow",
@@ -1857,6 +1913,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",
@@ -1890,19 +1949,19 @@
 	"settings.sourceControl.button.push": "Push",
 	"settings.sourceControl.button.pull": "Pull",
 	"settings.sourceControl.modals.push.title": "Commit and push changes",
-	"settings.sourceControl.modals.push.description": "Workflows you push will overwrite any existing versions in the repository. ",
+	"settings.sourceControl.modals.push.description": "The following will be committed: ",
 	"settings.sourceControl.modals.push.description.learnMore": "More info",
 	"settings.sourceControl.modals.push.filesToCommit": "Files to commit",
 	"settings.sourceControl.modals.push.workflowsToCommit": "Select workflows",
 	"settings.sourceControl.modals.push.everythingIsUpToDate": "Everything is up to date",
-	"settings.sourceControl.modals.push.noWorkflowChanges": "No workflow changes to push. Only modified credentials, variables, and tags will be pushed. {link}",
+	"settings.sourceControl.modals.push.noWorkflowChanges": "There are no workflow changes but the following will be committed: {link}",
 	"settings.sourceControl.modals.push.noWorkflowChanges.moreInfo": "More info",
 	"settings.sourceControl.modals.push.commitMessage": "Commit message",
 	"settings.sourceControl.modals.push.commitMessage.placeholder": "e.g. My commit",
 	"settings.sourceControl.modals.push.buttons.cancel": "Cancel",
 	"settings.sourceControl.modals.push.buttons.save": "Commit and push",
 	"settings.sourceControl.modals.push.success.title": "Pushed successfully",
-	"settings.sourceControl.modals.push.success.description": "The files you selected were committed and pushed to the remote repository",
+	"settings.sourceControl.modals.push.success.description": "were committed and pushed to your remote repository",
 	"settings.sourceControl.status.modified": "Modified",
 	"settings.sourceControl.status.deleted": "Deleted",
 	"settings.sourceControl.status.created": "New",
@@ -1912,6 +1971,10 @@
 	"settings.sourceControl.pull.success.title": "Pulled successfully",
 	"settings.sourceControl.pull.upToDate.title": "Up to date",
 	"settings.sourceControl.pull.upToDate.description": "No workflow changes to pull from Git",
+	"settings.sourceControl.pull.upToDate.variables.title": "Finish setting up your new variables to use in workflows",
+	"settings.sourceControl.pull.upToDate.variables.description": "Review Variables",
+	"settings.sourceControl.pull.upToDate.credentials.title": "Finish setting up your new credentials to use in workflows",
+	"settings.sourceControl.pull.upToDate.credentials.description": "Review Credentials",
 	"settings.sourceControl.modals.pull.title": "Pull changes",
 	"settings.sourceControl.modals.pull.description": "These workflows will be updated, and any local changes to them will be overridden. To keep the local version, push it before pulling.",
 	"settings.sourceControl.modals.pull.description.learnMore": "More info",
@@ -1997,6 +2060,7 @@
 	"template.details.details": "Details",
 	"template.details.times": "times",
 	"template.details.viewed": "Viewed",
+	"template.byAuthor": "By {name}",
 	"templates.allCategories": "All Categories",
 	"templates.categoriesHeading": "Categories",
 	"templates.collection": "Collection",
@@ -2071,6 +2135,7 @@
 	"ndv.search.noMatch.title": "No matching items",
 	"ndv.search.noNodeMatch.title": "No matching nodes",
 	"ndv.search.noMatch.description": "Try changing or {link} the filter to see more",
+	"ndv.search.noMatchSchema.description": "To search field contents rather than just names, use Table or JSON view",
 	"ndv.search.noMatch.description.link": "clearing",
 	"ndv.search.items": "{matched} of {total} item | {matched} of {total} items",
 	"updatesPanel.andIs": "and is",
@@ -2101,6 +2166,7 @@
 	"workflowActivator.showMessage.displayActivationError.title": "Problem activating workflow",
 	"workflowActivator.theWorkflowIsSetToBeActiveBut": "The workflow is activated but could not be started.<br />Click to display error message.",
 	"workflowActivator.thisWorkflowHasNoTriggerNodes": "This workflow has no trigger nodes that require activation",
+	"workflowActivator.thisWorkflowHasOnlyOneExecuteWorkflowTriggerNode": "'Execute Workflow Trigger' doesn't require activation as it is triggered by another workflow",
 	"workflowDetails.share": "Share",
 	"workflowDetails.active": "Active",
 	"workflowDetails.addTag": "Add tag",
@@ -2128,6 +2194,8 @@
 	"workflowPreview.executionMode.showError.previewError.message": "Unable to preview workflow execution",
 	"workflowPreview.showError.previewError.title": "Preview error",
 	"workflowRun.noActiveConnectionToTheServer": "Lost connection to the server",
+	"workflowRun.showError.deactivate": "Deactivate workflow to execute",
+	"workflowRun.showError.productionActive": "Because of limitations in {nodeName}, n8n can't listen for test executions at the same time as listening for production ones",
 	"workflowRun.showError.title": "Problem running workflow",
 	"workflowRun.showError.payloadTooLarge": "Please execute the whole workflow, rather than just the node. (Existing execution data is too large.)",
 	"workflowRun.showError.resolveOutstandingIssues": "Please resolve outstanding issues before you activate it",
@@ -2262,6 +2330,8 @@
 	"workflows.empty.browseTemplates": "Explore workflow templates",
 	"workflows.empty.learnN8n": "Learn n8n",
 	"workflows.empty.button.disabled.tooltip": "Your current role in the project does not allow you to create workflows",
+	"workflows.empty.easyAI": "Test a ready-to-go AI Agent example",
+	"workflows.list.easyAI": "Test the power of AI in n8n with this ready-to-go AI Agent Workflow",
 	"workflows.shareModal.title": "Share '{name}'",
 	"workflows.shareModal.title.static": "Shared with {projectName}",
 	"workflows.shareModal.select.placeholder": "Add users...",
@@ -2289,7 +2359,7 @@
 	"workflows.concurrentChanges.confirmMessage.cancelButtonText": "Cancel",
 	"workflows.concurrentChanges.confirmMessage.confirmButtonText": "Overwrite and Save",
 	"workflows.create.personal.toast.title": "Workflow successfully created",
-	"workflows.create.personal.toast.text": "This workflow is currently private to you.",
+	"workflows.create.personal.toast.text": "This workflow has been created inside your personal space.",
 	"workflows.create.project.toast.title": "Workflow successfully created in {projectName}",
 	"workflows.create.project.toast.text": "All members from {projectName} will have access to this workflow.",
 	"importCurlModal.title": "Import cURL command",
@@ -2486,13 +2556,18 @@
 	"settings.mfa.title": "Multi-factor Authentication",
 	"settings.mfa.updateConfiguration": "MFA configuration updated",
 	"settings.mfa.invalidAuthenticatorCode": "Invalid authenticator code",
-	"projects.menu.home": "Home",
+	"projects.header.subtitle": "All the workflows, credentials and executions you have access to",
+	"projects.create": "Create",
+	"projects.create.personal": "Create in personal",
+	"projects.create.team": "Create in project",
+	"projects.menu.overview": "Overview",
 	"projects.menu.title": "Projects",
 	"projects.menu.personal": "Personal",
-	"projects.menu.addProject": "Add project",
+	"projects.menu.addFirstProject": "Add project",
 	"projects.settings": "Project settings",
 	"projects.settings.newProjectName": "My project",
-	"projects.settings.name": "Project name",
+	"projects.settings.iconPicker.button.tooltip": "Choose project icon",
+	"projects.settings.name": "Project icon and name",
 	"projects.settings.projectMembers": "Project members",
 	"projects.settings.message.unsavedChanges": "You have unsaved changes",
 	"projects.settings.danger.message": "When deleting a project, you can also choose to move all workflows and credentials to another project.",
@@ -2516,6 +2591,7 @@
 	"projects.settings.delete.successful.title": "Project {projectName} deleted",
 	"projects.settings.delete.error.title": "An error occurred while deleting the project",
 	"projects.settings.save.successful.title": "Project {projectName} saved successfully",
+	"projects.settings.icon.update.successful.title": "Project icon updated successfully",
 	"projects.settings.save.error.title": "An error occurred while saving the project",
 	"projects.settings.role.upgrade.title": "Upgrade to unlock additional roles",
 	"projects.settings.role.upgrade.message": "You're currently limited to {limit} on the {planName} plan and can only assign the admin role to users within this project. To create more projects and unlock additional roles, upgrade your plan.",
@@ -2527,6 +2603,8 @@
 	"projects.error.title": "Project error",
 	"projects.create.limit": "{num} project | {num} projects",
 	"projects.create.limitReached": "You have reached the {planName} plan limit of {limit}. Upgrade your plan to unlock more projects. {link}",
+	"projects.create.limitReached.cloud": "You have reached the {planName} plan limit of {limit}. Upgrade your plan to unlock more projects.",
+	"projects.create.limitReached.self": "Upgrade to unlock projects for more granular control over sharing, access and organisation of workflows",
 	"projects.create.limitReached.link": "View plans",
 	"projects.move.resource.modal.title": "Choose a project or user to move this {resourceTypeLabel} to",
 	"projects.move.resource.modal.message": "\"{resourceName}\" is currently {inPersonalProject}{inTeamProject}",
@@ -2560,7 +2638,9 @@
 	"mfa.button.back": "Back",
 	"mfa.code.input.label": "Two-factor code",
 	"mfa.code.input.placeholder": "e.g. 123456",
-	"mfa.recovery.input.label": "Recovery Code",
+	"mfa.code.recovery.input.label": "Two-factor code or recovery code",
+	"mfa.code.recovery.input.placeholder": "e.g. 123456 or c79f9c02-7b2e-44...",
+	"mfa.recovery.input.label": "Recovery code",
 	"mfa.recovery.input.placeholder": "e.g c79f9c02-7b2e-44...",
 	"mfa.code.invalid": "This code is invalid, try again or",
 	"mfa.recovery.invalid": "This code is invalid or was already used, try again",
@@ -2584,7 +2664,7 @@
 	"mfa.setup.step2.toast.setupFinished.message": "Two-factor authentication enabled",
 	"mfa.setup.step2.toast.setupFinished.error.message": "Error enabling two-factor authentication",
 	"mfa.setup.step2.toast.tokenExpired.error.message": "MFA token expired. Close the modal and enable MFA again",
-	"mfa.prompt.code.modal.title": "Two-factor code required",
+	"mfa.prompt.code.modal.title": "Two-factor code or recovery code required",
 	"settings.personal.mfa.section.title": "Two-factor authentication (2FA)",
 	"settings.personal.personalisation": "Personalisation",
 	"settings.personal.theme": "Theme",
@@ -2610,6 +2690,8 @@
 	"executionUsage.button.upgrade": "Upgrade plan",
 	"executionUsage.expired.text": "Your trial is over. Upgrade now to keep your data.",
 	"executionUsage.ranOutOfExecutions.text": "You’re out of executions. Upgrade your plan to keep automating.",
+	"openExecution.missingExeuctionId.title": "Could not find execution",
+	"openExecution.missingExeuctionId.message": "Make sure this workflow saves executions via the settings",
 	"type.string": "String",
 	"type.number": "Number",
 	"type.dateTime": "Date & Time",
@@ -2650,6 +2732,7 @@
 	"filter.combinator.and": "AND",
 	"filter.addCondition": "Add condition",
 	"filter.removeCondition": "Remove condition",
+	"filter.dragCondition": "Drag condition",
 	"filter.maxConditions": "Maximum conditions reached",
 	"filter.condition.resolvedTrue": "This condition is true for the first input item",
 	"filter.condition.resolvedFalse": "This condition is false for the first input item",
@@ -2688,5 +2771,103 @@
 	"communityPlusModal.features.third.description": "Search and organize past workflow executions for easier review",
 	"communityPlusModal.input.email.label": "Enter email to receive your license key",
 	"communityPlusModal.button.skip": "Skip",
-	"communityPlusModal.button.confirm": "Send me a free license key"
+	"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",
+	"testDefinition.edit.descriptionPlaceholder": "Enter test description",
+	"testDefinition.edit.showConfig": "Show config",
+	"testDefinition.edit.hideConfig": "Hide config",
+	"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": "Save test",
+	"testDefinition.edit.runTest": "Run test",
+	"testDefinition.edit.testSaved": "Test saved",
+	"testDefinition.edit.testSaveFailed": "Failed to save test",
+	"testDefinition.edit.description": "Description",
+	"testDefinition.edit.description.description": "Add details about what this test evaluates and what success looks like",
+	"testDefinition.edit.tagName": "Tag name",
+	"testDefinition.edit.step.intro": "When running a test",
+	"testDefinition.edit.step.executions": "1. Fetch N past executions tagged | 1. Fetch {count} past execution tagged | 1. Fetch {count} past executions tagged",
+	"testDefinition.edit.step.executions.description": "Use a tag to select past executions for use as test cases in evaluation. The trigger data from each of these past executions will be used as input to run your workflow. The outputs of past executions are used as benchmark and compared against to check whether performance has changed based on logic and metrics that you define below.",
+	"testDefinition.edit.step.mockedNodes": "2. Mock N nodes |2. Mock {count} node |2. Mock {count} nodes",
+	"testDefinition.edit.step.nodes.description": "Mocked nodes have their data replayed rather than being re-executed. Do this to avoid calling external services, save time executing, and isolate what you are evaluating. If a node is mocked, the tagged past execution's output data for that node is used in the evaluation instead.",
+	"testDefinition.edit.step.reRunExecutions": "3. Simulation",
+	"testDefinition.edit.step.reRunExecutions.description": "Each past execution is re-run using the latest version of the workflow being tested. Outputs from both the evaluated and comparison data will be passed to evaluation logic.",
+	"testDefinition.edit.step.compareExecutions": "4. Compare each past and new execution",
+	"testDefinition.edit.step.compareExecutions.description": "Each past execution is compared with its new equivalent to check for changes in performance. This is done using a separate evaluation workflow: it receives the two execution versions as input, and outputs metrics based on logic that you define.",
+	"testDefinition.edit.step.metrics": "5. Summarise metrics",
+	"testDefinition.edit.step.metrics.description": "The names of metrics fields returned by the evaluation workflow (defined above). If included in this section, they are displayed in the test run results and averaged to give a score for the entire test run.",
+	"testDefinition.edit.step.collapse": "Collapse",
+	"testDefinition.edit.step.expand": "Expand",
+	"testDefinition.edit.selectNodes": "Select nodes",
+	"testDefinition.edit.runExecution": "Run execution",
+	"testDefinition.edit.pastRuns": "Past runs",
+	"testDefinition.edit.pastRuns.total": "No runs | {count} run | {count} runs",
+	"testDefinition.edit.nodesPinning.pinButtonTooltip": "Pin execution data of this node during test run",
+	"testDefinition.edit.saving": "Saving...",
+	"testDefinition.edit.saved": "Changes saved",
+	"testDefinition.list.testDeleted": "Test deleted",
+	"testDefinition.list.tests": "Tests",
+	"testDefinition.list.evaluations": "Evaluations",
+	"testDefinition.list.unitTests.title": "Unit tests",
+	"testDefinition.list.unitTests.description": "Test sections of your workflow in isolation",
+	"testDefinition.list.unitTests.cta": "Register interest",
+	"testDefinition.list.createNew": "Create new test",
+	"testDefinition.list.actionDescription": "Replay past executions to check whether performance has changed",
+	"testDefinition.list.actionButton": "Create an Evaluation",
+	"testDefinition.list.testRuns": "No test runs | {count} test run | {count} test runs",
+	"testDefinition.list.lastRun": "Ran",
+	"testDefinition.list.running": "Running",
+	"testDefinition.list.errorRate": "Error rate: {errorRate}",
+	"testDefinition.list.testStartError": "Failed to start test run",
+	"testDefinition.list.testStarted": "Test run started",
+	"testDefinition.list.testCancelled": "Test run cancelled",
+	"testDefinition.list.loadError": "Failed to load tests",
+	"testDefinition.listRuns.status.new": "New",
+	"testDefinition.listRuns.status.running": "Running",
+	"testDefinition.listRuns.status.completed": "Completed",
+	"testDefinition.listRuns.status.cancelled": "Cancelled",
+	"testDefinition.listRuns.status.error": "Error",
+	"testDefinition.listRuns.status.success": "Success",
+	"testDefinition.listRuns.metricsOverTime": "Metrics over time",
+	"testDefinition.listRuns.status": "Status",
+	"testDefinition.listRuns.runNumber": "Run #",
+	"testDefinition.listRuns.runDate": "Run date",
+	"testDefinition.listRuns.runStatus": "Run status",
+	"testDefinition.listRuns.noRuns": "No test runs",
+	"testDefinition.listRuns.noRuns.description": "Run a test to see the results here",
+	"testDefinition.listRuns.deleteRuns": "No runs to delete | Delete {count} run | Delete {count} runs",
+	"testDefinition.listRuns.noRuns.button": "Run Test",
+	"testDefinition.runDetail.ranAt": "Ran at",
+	"testDefinition.runDetail.testCase": "Test case",
+	"testDefinition.runDetail.testCase.id": "Test case ID",
+	"testDefinition.runDetail.testCase.status": "Test case status",
+	"testDefinition.runDetail.totalCases": "Total cases",
+	"testDefinition.runTest": "Run Test",
+	"testDefinition.cancelTestRun": "Cancel Test Run",
+	"testDefinition.notImplemented": "This feature is not implemented yet!",
+	"testDefinition.viewDetails": "View Details",
+	"testDefinition.editTest": "Edit Test",
+	"testDefinition.deleteTest": "Delete Test",
+	"freeAi.credits.callout.claim.title": "Get {credits} free OpenAI API credits",
+	"freeAi.credits.callout.claim.button.label": "Claim credits",
+	"freeAi.credits.callout.success.title.part1": "Claimed {credits} free OpenAI API credits! Please note these free credits are only for the following models:",
+	"freeAi.credits.callout.success.title.part2": "gpt-4o-mini, text-embedding-3-small, dall-e-3, tts-1, whisper-1, and text-moderation-latest",
+	"freeAi.credits.credentials.edit": "This is a managed credential and cannot be edited.",
+	"freeAi.credits.showError.claim.title": "Free AI credits",
+	"freeAi.credits.showError.claim.message": "Enable to claim credits",
+	"freeAi.credits.showWarning.workflow.activation.title": "You're using free OpenAI API credits",
+	"freeAi.credits.showWarning.workflow.activation.description": "To make sure your workflow runs smoothly in the future, replace the free OpenAI API credits with your own API key."
 }
diff --git a/packages/editor-ui/src/plugins/icons/index.ts b/packages/editor-ui/src/plugins/icons/index.ts
index 0e9430d8ae..2e53ddabb8 100644
--- a/packages/editor-ui/src/plugins/icons/index.ts
+++ b/packages/editor-ui/src/plugins/icons/index.ts
@@ -1,6 +1,6 @@
 import type { Plugin } from 'vue';
 import { library } from '@fortawesome/fontawesome-svg-core';
-import type { IconDefinition } from '@fortawesome/fontawesome-svg-core';
+import type { IconDefinition, Library } from '@fortawesome/fontawesome-svg-core';
 import {
 	faAngleDoubleLeft,
 	faAngleDown,
@@ -51,7 +51,9 @@ import {
 	faEllipsisH,
 	faEllipsisV,
 	faEnvelope,
+	faEquals,
 	faEye,
+	faEyeSlash,
 	faExclamationTriangle,
 	faExpand,
 	faExpandAlt,
@@ -122,6 +124,7 @@ import {
 	faSearchPlus,
 	faServer,
 	faScrewdriver,
+	faSmile,
 	faSignInAlt,
 	faSignOutAlt,
 	faSlidersH,
@@ -161,6 +164,7 @@ import {
 	faStream,
 	faPowerOff,
 	faPaperPlane,
+	faExclamationCircle,
 } from '@fortawesome/free-solid-svg-icons';
 import { faVariable, faXmark, faVault, faRefresh } from './custom';
 import { faStickyNote } from '@fortawesome/free-regular-svg-icons';
@@ -223,8 +227,11 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faEllipsisH);
 		addIcon(faEllipsisV);
 		addIcon(faEnvelope);
+		addIcon(faEquals);
 		addIcon(faEye);
+		addIcon(faEyeSlash);
 		addIcon(faExclamationTriangle);
+		addIcon(faExclamationCircle);
 		addIcon(faExpand);
 		addIcon(faExpandAlt);
 		addIcon(faExternalLinkAlt);
@@ -294,6 +301,7 @@ export const FontAwesomePlugin: Plugin = {
 		addIcon(faSearchPlus);
 		addIcon(faServer);
 		addIcon(faScrewdriver);
+		addIcon(faSmile);
 		addIcon(faSignInAlt);
 		addIcon(faSignOutAlt);
 		addIcon(faSlidersH);
@@ -340,3 +348,13 @@ export const FontAwesomePlugin: Plugin = {
 		app.component('FontAwesomeIcon', FontAwesomeIcon);
 	},
 };
+
+type LibraryWithDefinitions = Library & {
+	definitions: Record<string, Record<string, IconDefinition>>;
+};
+
+export const iconLibrary = library as LibraryWithDefinitions;
+
+export const getAllIconNames = () => {
+	return Object.keys(iconLibrary.definitions.fas);
+};
diff --git a/packages/editor-ui/src/plugins/sentry.spec.ts b/packages/editor-ui/src/plugins/sentry.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/sentry.spec.ts
rename to packages/editor-ui/src/plugins/sentry.test.ts
diff --git a/packages/editor-ui/src/plugins/sentry.ts b/packages/editor-ui/src/plugins/sentry.ts
index c00826a092..dac25cd05c 100644
--- a/packages/editor-ui/src/plugins/sentry.ts
+++ b/packages/editor-ui/src/plugins/sentry.ts
@@ -7,6 +7,10 @@ const ignoredErrors = [
 	{ instanceof: AxiosError },
 	{ instanceof: ResponseError, message: /ECONNREFUSED/ },
 	{ instanceof: ResponseError, message: "Can't connect to n8n." },
+	{ instanceof: ResponseError, message: 'Unauthorized' },
+	{ instanceof: RangeError, message: /Position \d+ is out of range for changeset of length \d+/ },
+	{ instanceof: RangeError, message: /Invalid change range \d+ to \d+/ },
+	{ instanceof: RangeError, message: /Selection points outside of document$/ },
 	{ instanceof: Error, message: /ResizeObserver/ },
 ] as const;
 
diff --git a/packages/editor-ui/src/plugins/__tests__/telemetry.test.ts b/packages/editor-ui/src/plugins/telemetry.test.ts
similarity index 100%
rename from packages/editor-ui/src/plugins/__tests__/telemetry.test.ts
rename to packages/editor-ui/src/plugins/telemetry.test.ts
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index 7c14fc9933..56d17f0ad1 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -3,8 +3,8 @@ import type { ITelemetrySettings } from '@n8n/api-types';
 import type { ITelemetryTrackProperties, IDataObject } from 'n8n-workflow';
 import type { RouteLocation } from 'vue-router';
 
-import type { INodeCreateElement, IUpdateInformation } from '@/Interface';
-import type { IUserNodesPanelSession, RudderStack } from './telemetry.types';
+import type { IUpdateInformation } from '@/Interface';
+import type { RudderStack } from './telemetry.types';
 import {
 	APPEND_ATTRIBUTION_DEFAULT_PATH,
 	MICROSOFT_TEAMS_NODE_TYPE,
@@ -26,15 +26,6 @@ export class Telemetry {
 		return window.rudderanalytics;
 	}
 
-	private userNodesPanelSession: IUserNodesPanelSession = {
-		pushRef: '',
-		data: {
-			nodeFilter: '',
-			resultsNodes: [],
-			filterMode: 'Regular',
-		},
-	};
-
 	constructor() {
 		this.pageEventQueue = [];
 		this.previousPath = '';
@@ -200,78 +191,6 @@ export class Telemetry {
 		}
 	}
 
-	trackNodesPanel(event: string, properties: IDataObject = {}) {
-		if (this.rudderStack) {
-			properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
-			switch (event) {
-				case 'nodeView.createNodeActiveChanged':
-					if (properties.createNodeActive !== false) {
-						this.resetNodesPanelSession();
-						properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
-						this.track('User opened nodes panel', properties);
-					}
-					break;
-				case 'nodeCreateList.destroyed':
-					if (
-						this.userNodesPanelSession.data.nodeFilter.length > 0 &&
-						this.userNodesPanelSession.data.nodeFilter !== ''
-					) {
-						this.track('User entered nodes panel search term', this.generateNodesPanelEvent());
-					}
-					break;
-				case 'nodeCreateList.nodeFilterChanged':
-					if (
-						(properties.newValue as string).length === 0 &&
-						this.userNodesPanelSession.data.nodeFilter.length > 0
-					) {
-						this.track('User entered nodes panel search term', this.generateNodesPanelEvent());
-					}
-
-					if (
-						(properties.newValue as string).length > ((properties.oldValue as string) || '').length
-					) {
-						this.userNodesPanelSession.data.nodeFilter = properties.newValue as string;
-						this.userNodesPanelSession.data.resultsNodes = (
-							(properties.filteredNodes || []) as INodeCreateElement[]
-						).map((node: INodeCreateElement) => node.key);
-					}
-					break;
-				case 'nodeCreateList.onCategoryExpanded':
-					properties.is_subcategory = false;
-					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
-					this.track('User viewed node category', properties);
-					break;
-				case 'nodeCreateList.onViewActions':
-					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
-					this.track('User viewed node actions', properties);
-					break;
-				case 'nodeCreateList.onActionsCustmAPIClicked':
-					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
-					this.track('User clicked custom API from node actions', properties);
-					break;
-				case 'nodeCreateList.addAction':
-					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
-					this.track('User added action', properties);
-					break;
-				case 'nodeCreateList.onSubcategorySelected':
-					properties.category_name = properties.subcategory;
-					properties.is_subcategory = true;
-					properties.nodes_panel_session_id = this.userNodesPanelSession.pushRef;
-					delete properties.selected;
-					this.track('User viewed node category', properties);
-					break;
-				case 'nodeView.addNodeButton':
-					this.track('User added node to workflow canvas', properties, { withPostHog: true });
-					break;
-				case 'nodeView.addSticky':
-					this.track('User inserted workflow note', properties);
-					break;
-				default:
-					break;
-			}
-		}
-	}
-
 	// We currently do not support tracking directly from within node implementation
 	// so we are using this method as centralized way to track node parameters changes
 	trackNodeParametersValuesChange(nodeType: string, change: IUpdateInformation) {
@@ -295,24 +214,6 @@ export class Telemetry {
 		}
 	}
 
-	private resetNodesPanelSession() {
-		this.userNodesPanelSession.pushRef = `nodes_panel_session_${new Date().valueOf()}`;
-		this.userNodesPanelSession.data = {
-			nodeFilter: '',
-			resultsNodes: [],
-			filterMode: 'All',
-		};
-	}
-
-	private generateNodesPanelEvent() {
-		return {
-			search_string: this.userNodesPanelSession.data.nodeFilter,
-			results_count: this.userNodesPanelSession.data.resultsNodes.length,
-			filter_mode: this.userNodesPanelSession.data.filterMode,
-			nodes_panel_session_id: this.userNodesPanelSession.pushRef,
-		};
-	}
-
 	private initRudderStack(key: string, url: string, options: IDataObject) {
 		window.rudderanalytics = window.rudderanalytics || [];
 		if (!this.rudderStack) {
diff --git a/packages/editor-ui/src/__tests__/router.test.ts b/packages/editor-ui/src/router.test.ts
similarity index 91%
rename from packages/editor-ui/src/__tests__/router.test.ts
rename to packages/editor-ui/src/router.test.ts
index f67399d634..8af15d9da5 100644
--- a/packages/editor-ui/src/__tests__/router.test.ts
+++ b/packages/editor-ui/src/router.test.ts
@@ -14,6 +14,8 @@ const App = {
 };
 const renderComponent = createComponentRenderer(App);
 
+let settingsStore: ReturnType<typeof useSettingsStore>;
+
 describe('router', () => {
 	let server: ReturnType<typeof setupServer>;
 	const initializeAuthenticatedFeaturesSpy = vi.spyOn(init, 'initializeAuthenticatedFeatures');
@@ -28,6 +30,7 @@ describe('router', () => {
 	});
 
 	beforeEach(() => {
+		settingsStore = useSettingsStore();
 		initializeAuthenticatedFeaturesSpy.mockImplementation(async () => await Promise.resolve());
 	});
 
@@ -114,7 +117,6 @@ describe('router', () => {
 	])(
 		'should resolve %s to %s with %s user permissions',
 		async (path, name, scopes) => {
-			const settingsStore = useSettingsStore();
 			const rbacStore = useRBACStore();
 
 			settingsStore.settings.communityNodesEnabled = true;
@@ -126,4 +128,13 @@ describe('router', () => {
 		},
 		10000,
 	);
+
+	test.each([
+		[VIEWS.PERSONAL_SETTINGS, true],
+		[VIEWS.USAGE, false],
+	])('should redirect Settings to %s', async (name, hideUsagePage) => {
+		settingsStore.settings.hideUsagePage = hideUsagePage;
+		await router.push('/settings');
+		expect(router.currentRoute.value.name).toBe(name);
+	});
 });
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index cbcc0dc1ce..4a6faf9f51 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -18,12 +18,15 @@ import type { RouterMiddleware } from '@/types/router';
 import { initializeAuthenticatedFeatures, initializeCore } from '@/init';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { projectsRoutes } from '@/routes/projects.routes';
+import TestDefinitionRunsListView from './views/TestDefinition/TestDefinitionRunsListView.vue';
+import TestDefinitionRunDetailView from './views/TestDefinition/TestDefinitionRunDetailView.vue';
 
 const ChangePasswordView = async () => await import('./views/ChangePasswordView.vue');
 const ErrorView = async () => await import('./views/ErrorView.vue');
 const ForgotMyPasswordView = async () => await import('./views/ForgotMyPasswordView.vue');
 const MainHeader = async () => await import('@/components/MainHeader/MainHeader.vue');
 const MainSidebar = async () => await import('@/components/MainSidebar.vue');
+const CanvasChat = async () => await import('@/components/CanvasChat/CanvasChat.vue');
 const NodeView = async () => await import('@/views/NodeViewSwitcher.vue');
 const WorkflowExecutionsView = async () => await import('@/views/WorkflowExecutionsView.vue');
 const WorkflowExecutionsLandingPage = async () =>
@@ -38,7 +41,6 @@ const SettingsCommunityNodesView = async () =>
 	await import('./views/SettingsCommunityNodesView.vue');
 const SettingsApiView = async () => await import('./views/SettingsApiView.vue');
 const SettingsLogStreamingView = async () => await import('./views/SettingsLogStreamingView.vue');
-const SettingsFakeDoorView = async () => await import('./views/SettingsFakeDoorView.vue');
 const SetupView = async () => await import('./views/SetupView.vue');
 const SigninView = async () => await import('./views/SigninView.vue');
 const SignupView = async () => await import('./views/SignupView.vue');
@@ -47,7 +49,6 @@ const TemplatesWorkflowView = async () => await import('@/views/TemplatesWorkflo
 const SetupWorkflowFromTemplateView = async () =>
 	await import('@/views/SetupWorkflowFromTemplateView/SetupWorkflowFromTemplateView.vue');
 const TemplatesSearchView = async () => await import('@/views/TemplatesSearchView.vue');
-const ExecutionsView = async () => await import('@/views/ExecutionsView.vue');
 const VariablesView = async () => await import('@/views/VariablesView.vue');
 const SettingsUsageAndPlan = async () => await import('./views/SettingsUsageAndPlan.vue');
 const SettingsSso = async () => await import('./views/SettingsSso.vue');
@@ -58,6 +59,12 @@ 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');
+const TestDefinitionRootView = async () =>
+	await import('./views/TestDefinition/TestDefinitionRootView.vue');
 
 function getTemplatesRedirect(defaultRedirect: VIEWS[keyof VIEWS]): { name: string } | false {
 	const settingsStore = useSettingsStore();
@@ -194,17 +201,6 @@ export const routes: RouteRecordRaw[] = [
 		},
 		meta: { middleware: ['authenticated'] },
 	},
-	{
-		path: '/executions',
-		name: VIEWS.EXECUTIONS,
-		components: {
-			default: ExecutionsView,
-			sidebar: MainSidebar,
-		},
-		meta: {
-			middleware: ['authenticated'],
-		},
-	},
 	{
 		path: '/workflow/:name/debug/:executionId',
 		name: VIEWS.EXECUTION_DEBUG,
@@ -261,6 +257,75 @@ export const routes: RouteRecordRaw[] = [
 			},
 		],
 	},
+	{
+		path: '/workflow/:name/evaluation',
+		components: {
+			default: TestDefinitionRootView,
+			header: MainHeader,
+			sidebar: MainSidebar,
+		},
+		meta: {
+			keepWorkflowAlive: true,
+			middleware: ['authenticated'],
+		},
+		children: [
+			{
+				path: '',
+				name: VIEWS.TEST_DEFINITION,
+				components: {
+					default: TestDefinitionListView,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+			{
+				path: 'new',
+				name: VIEWS.NEW_TEST_DEFINITION,
+				components: {
+					default: TestDefinitionEditView,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+			{
+				path: ':testId',
+				name: VIEWS.TEST_DEFINITION_EDIT,
+				components: {
+					default: TestDefinitionEditView,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+			{
+				path: ':testId/runs',
+				name: VIEWS.TEST_DEFINITION_RUNS,
+				components: {
+					default: TestDefinitionRunsListView,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+			{
+				path: ':testId/runs/:runId',
+				name: VIEWS.TEST_DEFINITION_RUNS_DETAIL,
+				components: {
+					default: TestDefinitionRunDetailView,
+				},
+				meta: {
+					keepWorkflowAlive: true,
+					middleware: ['authenticated'],
+				},
+			},
+		],
+	},
 	{
 		path: '/workflow/:workflowId/history/:versionId?',
 		name: VIEWS.WORKFLOW_HISTORY,
@@ -314,6 +379,7 @@ export const routes: RouteRecordRaw[] = [
 			default: NodeView,
 			header: MainHeader,
 			sidebar: MainSidebar,
+			footer: CanvasChat,
 		},
 		meta: {
 			nodeView: true,
@@ -346,6 +412,7 @@ export const routes: RouteRecordRaw[] = [
 			default: NodeView,
 			header: MainHeader,
 			sidebar: MainSidebar,
+			footer: CanvasChat,
 		},
 		meta: {
 			nodeView: true,
@@ -437,8 +504,16 @@ export const routes: RouteRecordRaw[] = [
 	},
 	{
 		path: '/settings',
+		name: VIEWS.SETTINGS,
 		component: SettingsView,
 		props: true,
+		redirect: () => {
+			const settingsStore = useSettingsStore();
+			if (settingsStore.settings.hideUsagePage) {
+				return { name: VIEWS.PERSONAL_SETTINGS };
+			}
+			return { name: VIEWS.USAGE };
+		},
 		children: [
 			{
 				path: 'usage',
@@ -642,24 +717,6 @@ export const routes: RouteRecordRaw[] = [
 					},
 				},
 			},
-			{
-				path: 'coming-soon/:featureId',
-				name: VIEWS.FAKE_DOOR,
-				components: {
-					settingsView: SettingsFakeDoorView,
-				},
-				meta: {
-					middleware: ['authenticated'],
-					telemetry: {
-						pageCategory: 'settings',
-						getProperties(route: RouteLocation) {
-							return {
-								feature: route.params.featureId,
-							};
-						},
-					},
-				},
-			},
 			{
 				path: 'ldap',
 				name: VIEWS.LDAP_SETTINGS,
diff --git a/packages/editor-ui/src/routes/projects.routes.ts b/packages/editor-ui/src/routes/projects.routes.ts
index 6d32b88441..3363e99e50 100644
--- a/packages/editor-ui/src/routes/projects.routes.ts
+++ b/packages/editor-ui/src/routes/projects.routes.ts
@@ -5,6 +5,7 @@ const MainSidebar = async () => await import('@/components/MainSidebar.vue');
 const WorkflowsView = async () => await import('@/views/WorkflowsView.vue');
 const CredentialsView = async () => await import('@/views/CredentialsView.vue');
 const ProjectSettings = async () => await import('@/views/ProjectSettings.vue');
+const ExecutionsView = async () => await import('@/views/ExecutionsView.vue');
 
 const commonChildRoutes: RouteRecordRaw[] = [
 	{
@@ -28,6 +29,16 @@ const commonChildRoutes: RouteRecordRaw[] = [
 			middleware: ['authenticated'],
 		},
 	},
+	{
+		path: 'executions',
+		components: {
+			default: ExecutionsView,
+			sidebar: MainSidebar,
+		},
+		meta: {
+			middleware: ['authenticated'],
+		},
+	},
 ];
 
 const commonChildRouteExtensions = {
@@ -38,6 +49,9 @@ const commonChildRouteExtensions = {
 		{
 			name: VIEWS.CREDENTIALS,
 		},
+		{
+			name: VIEWS.EXECUTIONS,
+		},
 	],
 	projects: [
 		{
@@ -46,6 +60,9 @@ const commonChildRouteExtensions = {
 		{
 			name: VIEWS.PROJECTS_CREDENTIALS,
 		},
+		{
+			name: VIEWS.PROJECTS_EXECUTIONS,
+		},
 	],
 };
 
@@ -105,4 +122,8 @@ export const projectsRoutes: RouteRecordRaw[] = [
 		path: '/credentials',
 		redirect: '/home/credentials',
 	},
+	{
+		path: '/executions',
+		redirect: '/home/executions',
+	},
 ];
diff --git a/packages/editor-ui/src/shims-modules.d.ts b/packages/editor-ui/src/shims-modules.d.ts
index 7191a5a3ab..ff3351fa15 100644
--- a/packages/editor-ui/src/shims-modules.d.ts
+++ b/packages/editor-ui/src/shims-modules.d.ts
@@ -16,6 +16,11 @@ declare module '*.jpeg';
 declare module '*.gif';
 declare module '*.webp';
 
+declare module '*?raw' {
+	const content: string;
+	export default content;
+}
+
 declare module 'v3-infinite-loading' {
 	import { Plugin, DefineComponent } from 'vue';
 
diff --git a/packages/editor-ui/src/shims-vue.d.ts b/packages/editor-ui/src/shims-vue.d.ts
index 9adef18d39..8791acf417 100644
--- a/packages/editor-ui/src/shims-vue.d.ts
+++ b/packages/editor-ui/src/shims-vue.d.ts
@@ -21,7 +21,6 @@ declare module '@vue/runtime-core' {
 
 	interface ComponentCustomProperties {
 		$style: Record<string, string>;
-		$locale: I18nClass;
 		$telemetry: Telemetry;
 		$route: RouteLocation;
 		$router: Router;
diff --git a/packages/editor-ui/src/shims.d.ts b/packages/editor-ui/src/shims.d.ts
index 30b8303cd8..0fa35a73f0 100644
--- a/packages/editor-ui/src/shims.d.ts
+++ b/packages/editor-ui/src/shims.d.ts
@@ -1,3 +1,5 @@
+/// <reference types="vite-plugin-comlink/client" />
+
 import type { VNode, ComponentPublicInstance } from 'vue';
 import type { PartialDeep } from 'type-fest';
 import type { ExternalHooks } from '@/types/externalHooks';
diff --git a/packages/editor-ui/src/stores/__tests__/assistant.store.test.ts b/packages/editor-ui/src/stores/assistant.store.test.ts
similarity index 99%
rename from packages/editor-ui/src/stores/__tests__/assistant.store.test.ts
rename to packages/editor-ui/src/stores/assistant.store.test.ts
index a4685e9e8d..c5877a0648 100644
--- a/packages/editor-ui/src/stores/__tests__/assistant.store.test.ts
+++ b/packages/editor-ui/src/stores/assistant.store.test.ts
@@ -8,9 +8,9 @@ import {
 	useAssistantStore,
 } from '@/stores/assistant.store';
 import type { ChatRequest } from '@/types/assistant.types';
-import { usePostHog } from '../posthog.store';
+import { usePostHog } from './posthog.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { defaultSettings } from '../../__tests__/defaults';
+import { defaultSettings } from '../__tests__/defaults';
 import { merge } from 'lodash-es';
 import { DEFAULT_POSTHOG_SETTINGS } from './posthog.test';
 import { AI_ASSISTANT_EXPERIMENT, VIEWS } from '@/constants';
diff --git a/packages/editor-ui/src/stores/assistant.store.ts b/packages/editor-ui/src/stores/assistant.store.ts
index 02178c0784..446501e9c4 100644
--- a/packages/editor-ui/src/stores/assistant.store.ts
+++ b/packages/editor-ui/src/stores/assistant.store.ts
@@ -72,13 +72,15 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 		};
 	}>({});
 
+	type NodeExecutionStatus = 'error' | 'not_executed' | 'success';
+
 	const chatSessionCredType = ref<ICredentialType | undefined>();
 	const chatSessionError = ref<ChatRequest.ErrorContext | undefined>();
 	const currentSessionId = ref<string | undefined>();
 	const currentSessionActiveExecutionId = ref<string | undefined>();
 	const currentSessionWorkflowId = ref<string | undefined>();
 	const lastUnread = ref<ChatUI.AssistantMessage | undefined>();
-	const nodeExecutionStatus = ref<'not_executed' | 'success' | 'error'>('not_executed');
+	const nodeExecutionStatus = ref<NodeExecutionStatus>('not_executed');
 	// This is used to show a message when the assistant is performing intermediate steps
 	// We use streaming for assistants that support it, and this for agents
 	const assistantThinkingMessage = ref<string | undefined>();
@@ -397,7 +399,9 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 						authType: nodeInfo?.authType?.name,
 					}
 				: undefined,
-			currentWorkflow: workflowDataStale.value ? workflowsStore.workflow : undefined,
+			currentWorkflow: workflowDataStale.value
+				? assistantHelpers.simplifyWorkflowForAssistant(workflowsStore.workflow)
+				: undefined,
 			executionData:
 				workflowExecutionDataStale.value && executionResult
 					? assistantHelpers.simplifyResultData(executionResult)
@@ -536,10 +540,16 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 			(e) => handleServiceError(e, id, async () => await sendEvent(eventName, error)),
 		);
 	}
+
 	async function onNodeExecution(pushEvent: PushPayload<'nodeExecuteAfter'>) {
 		if (!chatSessionError.value || pushEvent.nodeName !== chatSessionError.value.node.name) {
 			return;
 		}
+
+		if (nodeExecutionStatus.value === 'success') {
+			return;
+		}
+
 		if (pushEvent.data.error && nodeExecutionStatus.value !== 'error') {
 			await sendEvent('node-execution-errored', pushEvent.data.error);
 			nodeExecutionStatus.value = 'error';
@@ -550,7 +560,7 @@ export const useAssistantStore = defineStore(STORES.ASSISTANT, () => {
 			});
 		} else if (
 			pushEvent.data.executionStatus === 'success' &&
-			nodeExecutionStatus.value !== 'success'
+			['error', 'not_executed'].includes(nodeExecutionStatus.value)
 		) {
 			await sendEvent('node-execution-succeeded');
 			nodeExecutionStatus.value = 'success';
diff --git a/packages/editor-ui/src/stores/canvas.store.ts b/packages/editor-ui/src/stores/canvas.store.ts
index 252c06859e..b96699f297 100644
--- a/packages/editor-ui/src/stores/canvas.store.ts
+++ b/packages/editor-ui/src/stores/canvas.store.ts
@@ -54,8 +54,8 @@ export const useCanvasStore = defineStore('canvas', () => {
 	const jsPlumbInstanceRef = ref<BrowserJsPlumbInstance>();
 	const isDragging = ref<boolean>(false);
 	const lastSelectedConnection = ref<Connection>();
-
 	const newNodeInsertPosition = ref<XYPosition | null>(null);
+	const panelHeight = ref(0);
 
 	const nodes = computed<INodeUi[]>(() => workflowStore.allNodes);
 	const triggerNodes = computed<INodeUi[]>(() =>
@@ -109,9 +109,9 @@ export const useCanvasStore = defineStore('canvas', () => {
 		const manualTriggerNode = nodeTypesStore.getNodeType(MANUAL_TRIGGER_NODE_TYPE);
 
 		if (!manualTriggerNode) {
-			console.error('Could not find the manual trigger node');
 			return null;
 		}
+
 		return {
 			id: uuid(),
 			name: manualTriggerNode.defaults.name?.toString() ?? manualTriggerNode.displayName,
@@ -324,6 +324,10 @@ export const useCanvasStore = defineStore('canvas', () => {
 
 	watch(readOnlyEnv, setReadOnly);
 
+	function setPanelHeight(height: number) {
+		panelHeight.value = height;
+	}
+
 	return {
 		isDemo,
 		nodeViewScale,
@@ -333,6 +337,8 @@ export const useCanvasStore = defineStore('canvas', () => {
 		isLoading: loadingService.isLoading,
 		aiNodes,
 		lastSelectedConnection: lastSelectedConnectionComputed,
+		panelHeight: computed(() => panelHeight.value),
+		setPanelHeight,
 		setReadOnly,
 		setLastSelectedConnection,
 		startLoading: loadingService.startLoading,
diff --git a/packages/editor-ui/src/stores/cloudPlan.store.ts b/packages/editor-ui/src/stores/cloudPlan.store.ts
index 6d14383fb4..4f8c29ebef 100644
--- a/packages/editor-ui/src/stores/cloudPlan.store.ts
+++ b/packages/editor-ui/src/stores/cloudPlan.store.ts
@@ -147,12 +147,6 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 		}
 	};
 
-	const redirectToDashboard = async () => {
-		const adminPanelHost = new URL(window.location.href).host.split('.').slice(1).join('.');
-		const { code } = await getAutoLoginCode();
-		window.location.href = `https://${adminPanelHost}/login?code=${code}`;
-	};
-
 	const initialize = async () => {
 		if (state.initialized) {
 			return;
@@ -173,11 +167,22 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 		state.initialized = true;
 	};
 
+	const generateCloudDashboardAutoLoginLink = async (data: {
+		redirectionPath: string;
+	}) => {
+		const searchParams = new URLSearchParams();
+
+		const adminPanelHost = new URL(window.location.href).host.split('.').slice(1).join('.');
+		const { code } = await getAutoLoginCode();
+		const linkUrl = `https://${adminPanelHost}/login`;
+		searchParams.set('code', code);
+		searchParams.set('returnPath', data.redirectionPath);
+
+		return `${linkUrl}?${searchParams.toString()}`;
+	};
+
 	return {
 		state,
-		initialize,
-		getOwnerCurrentPlan,
-		getInstanceCurrentUsage,
 		usageLeft,
 		trialDaysLeft,
 		userIsTrialing,
@@ -185,10 +190,13 @@ export const useCloudPlanStore = defineStore(STORES.CLOUD_PLAN, () => {
 		currentUsageData,
 		trialExpired,
 		allExecutionsUsed,
+		generateCloudDashboardAutoLoginLink,
+		initialize,
+		getOwnerCurrentPlan,
+		getInstanceCurrentUsage,
 		reset,
 		checkForCloudPlanData,
 		fetchUserCloudAccount,
 		getAutoLoginCode,
-		redirectToDashboard,
 	};
 });
diff --git a/packages/editor-ui/src/stores/credentials.store.ts b/packages/editor-ui/src/stores/credentials.store.ts
index 4e87eaaf98..d04b96242c 100644
--- a/packages/editor-ui/src/stores/credentials.store.ts
+++ b/packages/editor-ui/src/stores/credentials.store.ts
@@ -26,6 +26,7 @@ import { computed, ref } from 'vue';
 import { useNodeTypesStore } from './nodeTypes.store';
 import { useRootStore } from './root.store';
 import { useSettingsStore } from './settings.store';
+import * as aiApi from '@/api/ai';
 
 const DEFAULT_CREDENTIAL_NAME = 'Unnamed credential';
 const DEFAULT_CREDENTIAL_POSTFIX = 'account';
@@ -36,6 +37,8 @@ export type CredentialsStore = ReturnType<typeof useCredentialsStore>;
 export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 	const state = ref<ICredentialsState>({ credentialTypes: {}, credentials: {} });
 
+	const rootStore = useRootStore();
+
 	// ---------------------------------------------------------------------------
 	// #region Computed
 	// ---------------------------------------------------------------------------
@@ -252,7 +255,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 		if (allCredentialTypes.value.length > 0 && !forceFetch) {
 			return;
 		}
-		const rootStore = useRootStore();
 		const credentialTypes = await credentialsApi.getCredentialTypes(rootStore.baseUrl);
 		setCredentialTypes(credentialTypes);
 	};
@@ -261,8 +263,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 		projectId?: string,
 		includeScopes = true,
 	): Promise<ICredentialsResponse[]> => {
-		const rootStore = useRootStore();
-
 		const filter = {
 			projectId,
 		};
@@ -279,8 +279,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 	const fetchAllCredentialsForWorkflow = async (
 		options: { workflowId: string } | { projectId: string },
 	): Promise<ICredentialsResponse[]> => {
-		const rootStore = useRootStore();
-
 		const credentials = await credentialsApi.getAllCredentialsForWorkflow(
 			rootStore.restApiContext,
 			options,
@@ -294,7 +292,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 	}: {
 		id: string;
 	}): Promise<ICredentialsResponse | ICredentialsDecryptedResponse | undefined> => {
-		const rootStore = useRootStore();
 		return await credentialsApi.getCredentialData(rootStore.restApiContext, id);
 	};
 
@@ -302,7 +299,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 		data: ICredentialsDecrypted,
 		projectId?: string,
 	): Promise<ICredentialsResponse> => {
-		const rootStore = useRootStore();
 		const settingsStore = useSettingsStore();
 		const credential = await credentialsApi.createNewCredential(
 			rootStore.restApiContext,
@@ -333,7 +329,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 		id: string;
 	}): Promise<ICredentialsResponse> => {
 		const { id, data } = params;
-		const rootStore = useRootStore();
 		const credential = await credentialsApi.updateCredential(rootStore.restApiContext, id, data);
 
 		upsertCredential(credential);
@@ -342,7 +337,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 	};
 
 	const deleteCredential = async ({ id }: { id: string }) => {
-		const rootStore = useRootStore();
 		const deleted = await credentialsApi.deleteCredential(rootStore.restApiContext, id);
 		if (deleted) {
 			const { [id]: deletedCredential, ...rest } = state.value.credentials;
@@ -351,19 +345,16 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 	};
 
 	const oAuth2Authorize = async (data: ICredentialsResponse): Promise<string> => {
-		const rootStore = useRootStore();
 		return await credentialsApi.oAuth2CredentialAuthorize(rootStore.restApiContext, data);
 	};
 
 	const oAuth1Authorize = async (data: ICredentialsResponse): Promise<string> => {
-		const rootStore = useRootStore();
 		return await credentialsApi.oAuth1CredentialAuthorize(rootStore.restApiContext, data);
 	};
 
 	const testCredential = async (
 		data: ICredentialsDecrypted,
 	): Promise<INodeCredentialTestResult> => {
-		const rootStore = useRootStore();
 		return await credentialsApi.testCredential(rootStore.restApiContext, { credentials: data });
 	};
 
@@ -377,7 +368,6 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 				newName =
 					newName.length > 0 ? `${newName} ${DEFAULT_CREDENTIAL_POSTFIX}` : DEFAULT_CREDENTIAL_NAME;
 			}
-			const rootStore = useRootStore();
 			const res = await credentialsApi.getCredentialsNewName(rootStore.restApiContext, newName);
 			return res.name;
 		} catch (e) {
@@ -407,12 +397,19 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 	};
 
 	const getCredentialTranslation = async (credentialType: string): Promise<object> => {
-		const rootStore = useRootStore();
 		return await makeRestApiRequest(rootStore.restApiContext, 'GET', '/credential-translation', {
 			credentialType,
 		});
 	};
 
+	const claimFreeAiCredits = async (projectId?: string): Promise<ICredentialsResponse> => {
+		const credential = await aiApi.claimFreeAiCredits(rootStore.restApiContext, {
+			projectId,
+		});
+		upsertCredential(credential);
+		return credential;
+	};
+
 	// #endregion
 
 	return {
@@ -449,6 +446,7 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, () => {
 		testCredential,
 		getCredentialTranslation,
 		setCredentialSharedWith,
+		claimFreeAiCredits,
 	};
 });
 
diff --git a/packages/editor-ui/src/stores/__tests__/credentials.spec.ts b/packages/editor-ui/src/stores/credentials.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/__tests__/credentials.spec.ts
rename to packages/editor-ui/src/stores/credentials.test.ts
diff --git a/packages/editor-ui/src/stores/__tests__/environments.spec.ts b/packages/editor-ui/src/stores/environments.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/__tests__/environments.spec.ts
rename to packages/editor-ui/src/stores/environments.test.ts
diff --git a/packages/editor-ui/src/stores/executions.store.test.ts b/packages/editor-ui/src/stores/executions.store.test.ts
index bcc5d9614b..f3b10b5852 100644
--- a/packages/editor-ui/src/stores/executions.store.test.ts
+++ b/packages/editor-ui/src/stores/executions.store.test.ts
@@ -22,6 +22,7 @@ describe('executions.store', () => {
 				id: '3',
 				mode: 'manual',
 				status: 'success',
+				createdAt: new Date('2021-01-01T00:00:00Z'),
 				startedAt: new Date('2021-01-03T00:00:00Z'),
 				workflowId: '1',
 				scopes: [],
@@ -30,6 +31,7 @@ describe('executions.store', () => {
 				id: '2',
 				mode: 'manual',
 				status: 'success',
+				createdAt: new Date('2021-01-02T00:00:00Z'),
 				startedAt: new Date('2021-01-02T00:00:00Z'),
 				workflowId: '1',
 				scopes: [],
@@ -38,6 +40,7 @@ describe('executions.store', () => {
 				id: '1',
 				mode: 'manual',
 				status: 'success',
+				createdAt: new Date('2021-01-03T00:00:00Z'),
 				startedAt: new Date('2021-01-01T00:00:00Z'),
 				workflowId: '1',
 				scopes: [],
@@ -55,9 +58,13 @@ describe('executions.store', () => {
 		});
 
 		it('should delete executions started before given date', async () => {
-			await executionsStore.deleteExecutions({ deleteBefore: mockExecutions[1].startedAt });
+			const deleteBefore = mockExecutions[1].startedAt;
+			await executionsStore.deleteExecutions({ deleteBefore });
 
-			expect(executionsStore.executions).toEqual([mockExecutions[0], mockExecutions[1]]);
+			expect(executionsStore.executions.length).toBe(2);
+			executionsStore.executions.forEach(({ startedAt }) =>
+				expect(startedAt.getTime()).toBeGreaterThanOrEqual(deleteBefore.getTime()),
+			);
 		});
 
 		it('should delete all executions if given date is now', async () => {
@@ -66,4 +73,40 @@ describe('executions.store', () => {
 			expect(executionsStore.executions).toEqual([]);
 		});
 	});
+
+	it('should sort execution by createdAt', () => {
+		const mockExecutions: ExecutionSummaryWithScopes[] = [
+			{
+				id: '1',
+				mode: 'manual',
+				status: 'success',
+				createdAt: new Date('2021-01-01T00:00:00Z'),
+				startedAt: new Date('2021-02-03T00:00:00Z'),
+				workflowId: '1',
+				scopes: [],
+			},
+			{
+				id: '2',
+				mode: 'manual',
+				status: 'success',
+				createdAt: new Date('2021-01-02T00:00:00Z'),
+				startedAt: new Date('2021-02-02T00:00:00Z'),
+				workflowId: '1',
+				scopes: [],
+			},
+			{
+				id: '3',
+				mode: 'manual',
+				status: 'success',
+				createdAt: new Date('2021-01-03T00:00:00Z'),
+				startedAt: new Date('2021-02-01T00:00:00Z'),
+				workflowId: '1',
+				scopes: [],
+			},
+		];
+
+		mockExecutions.forEach(executionsStore.addExecution);
+
+		expect(executionsStore.executions.at(-1)).toEqual(expect.objectContaining({ id: '1' }));
+	});
 });
diff --git a/packages/editor-ui/src/stores/executions.store.ts b/packages/editor-ui/src/stores/executions.store.ts
index f80f0f5e4d..14711d8198 100644
--- a/packages/editor-ui/src/stores/executions.store.ts
+++ b/packages/editor-ui/src/stores/executions.store.ts
@@ -14,9 +14,13 @@ import type {
 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);
@@ -24,9 +28,15 @@ export const useExecutionsStore = defineStore('executions', () => {
 	const activeExecution = ref<ExecutionSummary | null>(null);
 
 	const filters = ref<ExecutionFilterType>(getDefaultExecutionFilters());
-	const executionsFilters = computed<ExecutionsQueryFilter>(() =>
-		executionFilterToQueryFilter(filters.value),
-	);
+	const executionsFilters = computed<ExecutionsQueryFilter>(() => {
+		const filter = executionFilterToQueryFilter(filters.value);
+
+		if (projectsStore.currentProjectId) {
+			filter.projectId = projectsStore.currentProjectId;
+		}
+
+		return filter;
+	});
 	const currentExecutionsFilters = computed<Partial<ExecutionFilterType>>(() => ({
 		...(filters.value.workflowId !== 'all' ? { workflowId: filters.value.workflowId } : {}),
 	}));
@@ -42,7 +52,7 @@ export const useExecutionsStore = defineStore('executions', () => {
 		const data = Object.values(executionsById.value);
 
 		data.sort((a, b) => {
-			return new Date(b.startedAt).getTime() - new Date(a.startedAt).getTime();
+			return new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime();
 		});
 
 		return data;
@@ -59,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;
 	});
@@ -145,6 +172,7 @@ export const useExecutionsStore = defineStore('executions', () => {
 
 			executionsCount.value = data.count;
 			executionsCountEstimated.value = data.estimated;
+			return data;
 		} catch (e) {
 			throw e;
 		} finally {
diff --git a/packages/editor-ui/src/stores/ndv.store.ts b/packages/editor-ui/src/stores/ndv.store.ts
index e3be5db5fe..a22964f35a 100644
--- a/packages/editor-ui/src/stores/ndv.store.ts
+++ b/packages/editor-ui/src/stores/ndv.store.ts
@@ -1,328 +1,431 @@
+import { useLocalStorage } from '@vueuse/core';
 import type {
-	INodeUi,
+	Draggable,
+	InputPanel,
 	IRunDataDisplayMode,
+	MainPanelDimensions,
+	MainPanelType,
 	NDVState,
 	NodePanelType,
+	OutputPanel,
 	TargetItem,
-	XYPosition,
 } from '@/Interface';
 import { useStorage } from '@/composables/useStorage';
 import {
 	LOCAL_STORAGE_AUTOCOMPLETE_IS_ONBOARDED,
 	LOCAL_STORAGE_MAPPING_IS_ONBOARDED,
+	LOCAL_STORAGE_NDV_INPUT_PANEL_DISPLAY_MODE,
+	LOCAL_STORAGE_NDV_OUTPUT_PANEL_DISPLAY_MODE,
 	LOCAL_STORAGE_TABLE_HOVER_IS_ONBOARDED,
 	STORES,
 } from '@/constants';
-import type { INodeExecutionData, INodeIssues } from 'n8n-workflow';
+import type { INodeIssues } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 import { defineStore } from 'pinia';
 import { v4 as uuid } from 'uuid';
 import { useWorkflowsStore } from './workflows.store';
+import { computed, ref } from 'vue';
 
-export const useNDVStore = defineStore(STORES.NDV, {
-	state: (): NDVState => ({
-		activeNodeName: null,
-		mainPanelDimensions: {},
-		pushRef: '',
-		input: {
-			displayMode: 'schema',
-			nodeName: undefined,
-			run: undefined,
-			branch: undefined,
-			data: {
-				isEmpty: true,
-			},
+const DEFAULT_MAIN_PANEL_DIMENSIONS = {
+	relativeLeft: 1,
+	relativeRight: 1,
+	relativeWidth: 1,
+};
+
+export const useNDVStore = defineStore(STORES.NDV, () => {
+	const localStorageMappingIsOnboarded = useStorage(LOCAL_STORAGE_MAPPING_IS_ONBOARDED);
+	const localStorageTableHoverIsOnboarded = useStorage(LOCAL_STORAGE_TABLE_HOVER_IS_ONBOARDED);
+	const localStorageAutoCompleteIsOnboarded = useStorage(LOCAL_STORAGE_AUTOCOMPLETE_IS_ONBOARDED);
+
+	const activeNodeName = ref<string | null>(null);
+	const mainPanelDimensions = ref<MainPanelDimensions>({
+		unknown: { ...DEFAULT_MAIN_PANEL_DIMENSIONS },
+		regular: { ...DEFAULT_MAIN_PANEL_DIMENSIONS },
+		dragless: { ...DEFAULT_MAIN_PANEL_DIMENSIONS },
+		inputless: { ...DEFAULT_MAIN_PANEL_DIMENSIONS },
+		wide: { ...DEFAULT_MAIN_PANEL_DIMENSIONS },
+	});
+	const pushRef = ref('');
+	const input = ref<InputPanel>({
+		nodeName: undefined,
+		run: undefined,
+		branch: undefined,
+		data: {
+			isEmpty: true,
 		},
-		output: {
-			displayMode: 'table',
-			branch: undefined,
-			data: {
-				isEmpty: true,
-			},
-			editMode: {
-				enabled: false,
-				value: '',
-			},
+	});
+	const inputPanelDisplayMode = useLocalStorage<IRunDataDisplayMode>(
+		LOCAL_STORAGE_NDV_INPUT_PANEL_DISPLAY_MODE,
+		'schema',
+	);
+	const output = ref<OutputPanel>({
+		branch: undefined,
+		data: {
+			isEmpty: true,
 		},
-		focusedMappableInput: '',
-		focusedInputPath: '',
-		mappingTelemetry: {},
-		hoveringItem: null,
-		expressionOutputItemIndex: 0,
-		draggable: {
+		editMode: {
+			enabled: false,
+			value: '',
+		},
+	});
+	const outputPanelDisplayMode = useLocalStorage<IRunDataDisplayMode>(
+		LOCAL_STORAGE_NDV_OUTPUT_PANEL_DISPLAY_MODE,
+		'table',
+	);
+	const focusedMappableInput = ref('');
+	const focusedInputPath = ref('');
+	const mappingTelemetry = ref<Record<string, string | number | boolean>>({});
+	const hoveringItem = ref<null | TargetItem>(null);
+	const expressionOutputItemIndex = ref(0);
+	const draggable = ref<Draggable>({
+		isDragging: false,
+		type: '',
+		data: '',
+		dimensions: null,
+		activeTarget: null,
+	});
+	const isMappingOnboarded = ref(localStorageMappingIsOnboarded.value === 'true');
+	const isTableHoverOnboarded = ref(localStorageTableHoverIsOnboarded.value === 'true');
+
+	const isAutocompleteOnboarded = ref(localStorageAutoCompleteIsOnboarded.value === 'true');
+
+	const highlightDraggables = ref(false);
+
+	const workflowsStore = useWorkflowsStore();
+
+	const activeNode = computed(() => {
+		return workflowsStore.getNodeByName(activeNodeName.value || '');
+	});
+
+	const ndvInputData = computed(() => {
+		const executionData = workflowsStore.getWorkflowExecution;
+		const inputNodeName: string | undefined = input.value.nodeName;
+		const inputRunIndex: number = input.value.run ?? 0;
+		const inputBranchIndex: number = input.value.branch ?? 0;
+
+		if (
+			!executionData ||
+			!inputNodeName ||
+			inputRunIndex === undefined ||
+			inputBranchIndex === undefined
+		) {
+			return [];
+		}
+
+		return (
+			executionData.data?.resultData?.runData?.[inputNodeName]?.[inputRunIndex]?.data?.main?.[
+				inputBranchIndex
+			] ?? []
+		);
+	});
+
+	const ndvInputNodeName = computed(() => {
+		return input.value.nodeName;
+	});
+
+	const ndvInputDataWithPinnedData = computed(() => {
+		const data = ndvInputData.value;
+		return ndvInputNodeName.value
+			? (workflowsStore.pinDataByNodeName(ndvInputNodeName.value) ?? data)
+			: data;
+	});
+
+	const hasInputData = computed(() => {
+		return ndvInputDataWithPinnedData.value.length > 0;
+	});
+
+	const isDraggableDragging = computed(() => draggable.value.isDragging);
+
+	const draggableType = computed(() => draggable.value.type);
+
+	const draggableData = computed(() => draggable.value.data);
+
+	const canDraggableDrop = computed(() => draggable.value.activeTarget !== null);
+
+	const outputPanelEditMode = computed(() => output.value.editMode);
+
+	const draggableStickyPos = computed(() => draggable.value.activeTarget?.stickyPosition ?? null);
+
+	const ndvNodeInputNumber = computed(() => {
+		const returnData: { [nodeName: string]: number[] } = {};
+		const workflow = workflowsStore.getCurrentWorkflow();
+		const activeNodeConections = (
+			workflow.connectionsByDestinationNode[activeNode.value?.name || ''] ?? {}
+		).main;
+
+		if (!activeNodeConections || activeNodeConections.length < 2) return returnData;
+
+		for (const [index, connection] of activeNodeConections.entries()) {
+			for (const node of connection ?? []) {
+				if (!returnData[node.node]) {
+					returnData[node.node] = [];
+				}
+				returnData[node.node].push(index + 1);
+			}
+		}
+
+		return returnData;
+	});
+
+	const ndvInputRunIndex = computed(() => input.value.run);
+
+	const ndvInputBranchIndex = computed(() => input.value.branch);
+
+	const isInputPanelEmpty = computed(() => input.value.data.isEmpty);
+
+	const isOutputPanelEmpty = computed(() => output.value.data.isEmpty);
+
+	const isInputParentOfActiveNode = computed(() => {
+		const inputNodeName = ndvInputNodeName.value;
+		if (!activeNode.value || !inputNodeName) {
+			return false;
+		}
+		const workflow = workflowsStore.getCurrentWorkflow();
+		const parentNodes = workflow.getParentNodes(activeNode.value.name, NodeConnectionType.Main, 1);
+		return parentNodes.includes(inputNodeName);
+	});
+
+	const getHoveringItem = computed(() => {
+		if (isInputParentOfActiveNode.value) {
+			return hoveringItem.value;
+		}
+
+		return null;
+	});
+
+	const expressionTargetItem = computed(() => {
+		if (getHoveringItem.value) {
+			return getHoveringItem.value;
+		}
+
+		if (expressionOutputItemIndex.value && ndvInputNodeName.value) {
+			return {
+				nodeName: ndvInputNodeName.value,
+				runIndex: ndvInputRunIndex.value ?? 0,
+				outputIndex: ndvInputBranchIndex.value ?? 0,
+				itemIndex: expressionOutputItemIndex.value,
+			};
+		}
+
+		return null;
+	});
+
+	const isNDVOpen = computed(() => activeNodeName.value !== null);
+
+	const setActiveNodeName = (nodeName: string | null): void => {
+		activeNodeName.value = nodeName;
+	};
+
+	const setInputNodeName = (nodeName: string | undefined): void => {
+		input.value.nodeName = nodeName;
+	};
+
+	const setInputRunIndex = (run?: number): void => {
+		input.value.run = run;
+	};
+
+	const setMainPanelDimensions = (params: {
+		panelType: MainPanelType;
+		dimensions: { relativeLeft?: number; relativeRight?: number; relativeWidth?: number };
+	}): void => {
+		mainPanelDimensions.value[params.panelType] = {
+			...mainPanelDimensions.value[params.panelType],
+			...params.dimensions,
+		};
+	};
+
+	const setNDVPushRef = (): void => {
+		pushRef.value = `ndv-${uuid()}`;
+	};
+
+	const resetNDVPushRef = (): void => {
+		pushRef.value = '';
+	};
+
+	const setPanelDisplayMode = (params: {
+		pane: NodePanelType;
+		mode: IRunDataDisplayMode;
+	}): void => {
+		if (params.pane === 'input') {
+			inputPanelDisplayMode.value = params.mode;
+		} else {
+			outputPanelDisplayMode.value = params.mode;
+		}
+	};
+
+	const setOutputPanelEditModeEnabled = (isEnabled: boolean): void => {
+		output.value.editMode.enabled = isEnabled;
+	};
+
+	const setOutputPanelEditModeValue = (payload: string): void => {
+		output.value.editMode.value = payload;
+	};
+
+	const setMappableNDVInputFocus = (paramName: string): void => {
+		focusedMappableInput.value = paramName;
+	};
+
+	const draggableStartDragging = ({
+		type,
+		data,
+		dimensions,
+	}: { type: string; data: string; dimensions: DOMRect | null }): void => {
+		draggable.value = {
+			isDragging: true,
+			type,
+			data,
+			dimensions,
+			activeTarget: null,
+		};
+	};
+
+	const draggableStopDragging = (): void => {
+		draggable.value = {
 			isDragging: false,
 			type: '',
 			data: '',
 			dimensions: null,
 			activeTarget: null,
-		},
-		isMappingOnboarded: useStorage(LOCAL_STORAGE_MAPPING_IS_ONBOARDED).value === 'true',
-		isTableHoverOnboarded: useStorage(LOCAL_STORAGE_TABLE_HOVER_IS_ONBOARDED).value === 'true',
-		isAutocompleteOnboarded: useStorage(LOCAL_STORAGE_AUTOCOMPLETE_IS_ONBOARDED).value === 'true',
-		highlightDraggables: false,
-	}),
-	getters: {
-		activeNode(): INodeUi | null {
-			const workflowsStore = useWorkflowsStore();
-			return workflowsStore.getNodeByName(this.activeNodeName || '');
-		},
-		ndvInputData(): INodeExecutionData[] {
-			const workflowsStore = useWorkflowsStore();
-			const executionData = workflowsStore.getWorkflowExecution;
-			const inputNodeName: string | undefined = this.input.nodeName;
-			const inputRunIndex: number = this.input.run ?? 0;
-			const inputBranchIndex: number = this.input.branch ?? 0;
+		};
+	};
 
-			if (
-				!executionData ||
-				!inputNodeName ||
-				inputRunIndex === undefined ||
-				inputBranchIndex === undefined
-			) {
-				return [];
-			}
+	const setDraggableTarget = (target: NDVState['draggable']['activeTarget']): void => {
+		draggable.value.activeTarget = target;
+	};
 
-			return (
-				executionData.data?.resultData?.runData?.[inputNodeName]?.[inputRunIndex]?.data?.main?.[
-					inputBranchIndex
-				] ?? []
-			);
-		},
-		ndvInputDataWithPinnedData(): INodeExecutionData[] {
-			const data = this.ndvInputData;
-			return this.ndvInputNodeName
-				? (useWorkflowsStore().pinDataByNodeName(this.ndvInputNodeName) ?? data)
-				: data;
-		},
-		hasInputData(): boolean {
-			return this.ndvInputDataWithPinnedData.length > 0;
-		},
-		getPanelDisplayMode() {
-			return (panel: NodePanelType) => this[panel].displayMode;
-		},
-		inputPanelDisplayMode(): IRunDataDisplayMode {
-			return this.input.displayMode;
-		},
-		outputPanelDisplayMode(): IRunDataDisplayMode {
-			return this.output.displayMode;
-		},
-		isDraggableDragging(): boolean {
-			return this.draggable.isDragging;
-		},
-		draggableType(): string {
-			return this.draggable.type;
-		},
-		draggableData(): string {
-			return this.draggable.data;
-		},
-		canDraggableDrop(): boolean {
-			return this.draggable.activeTarget !== null;
-		},
-		outputPanelEditMode(): NDVState['output']['editMode'] {
-			return this.output.editMode;
-		},
-		getMainPanelDimensions() {
-			return (panelType: string) => {
-				const defaults = { relativeRight: 1, relativeLeft: 1, relativeWidth: 1 };
-				return { ...defaults, ...this.mainPanelDimensions[panelType] };
-			};
-		},
-		draggableStickyPos(): XYPosition | null {
-			return this.draggable.activeTarget?.stickyPosition ?? null;
-		},
-		ndvInputNodeName(): string | undefined {
-			return this.input.nodeName;
-		},
-		ndvInputRunIndex(): number | undefined {
-			return this.input.run;
-		},
-		ndvInputBranchIndex(): number | undefined {
-			return this.input.branch;
-		},
-		isNDVDataEmpty() {
-			return (panel: 'input' | 'output'): boolean => this[panel].data.isEmpty;
-		},
-		isInputParentOfActiveNode(): boolean {
-			const inputNodeName = this.ndvInputNodeName;
-			if (!this.activeNode || !inputNodeName) {
-				return false;
-			}
-			const workflow = useWorkflowsStore().getCurrentWorkflow();
-			const parentNodes = workflow.getParentNodes(this.activeNode.name, NodeConnectionType.Main, 1);
-			return parentNodes.includes(inputNodeName);
-		},
-		getHoveringItem(): TargetItem | null {
-			if (this.isInputParentOfActiveNode) {
-				return this.hoveringItem;
-			}
+	const setMappingTelemetry = (telemetry: { [key: string]: string | number | boolean }): void => {
+		mappingTelemetry.value = { ...mappingTelemetry.value, ...telemetry };
+	};
 
-			return null;
-		},
-		expressionTargetItem(): TargetItem | null {
-			if (this.getHoveringItem) {
-				return this.getHoveringItem;
-			}
+	const resetMappingTelemetry = (): void => {
+		mappingTelemetry.value = {};
+	};
 
-			if (this.expressionOutputItemIndex && this.ndvInputNodeName) {
-				return {
-					nodeName: this.ndvInputNodeName,
-					runIndex: this.ndvInputRunIndex ?? 0,
-					outputIndex: this.ndvInputBranchIndex ?? 0,
-					itemIndex: this.expressionOutputItemIndex,
-				};
-			}
+	const setHoveringItem = (item: TargetItem | null): void => {
+		if (item) setTableHoverOnboarded();
+		hoveringItem.value = item;
+	};
 
-			return null;
-		},
-		isNDVOpen(): boolean {
-			return this.activeNodeName !== null;
-		},
-		ndvNodeInputNumber() {
-			const returnData: { [nodeName: string]: number[] } = {};
-			const workflow = useWorkflowsStore().getCurrentWorkflow();
-			const activeNodeConections = (
-				workflow.connectionsByDestinationNode[this.activeNode?.name || ''] ?? {}
-			).main;
+	const setNDVBranchIndex = (e: { pane: NodePanelType; branchIndex: number }): void => {
+		if (e.pane === 'input') {
+			input.value.branch = e.branchIndex;
+		} else {
+			output.value.branch = e.branchIndex;
+		}
+	};
 
-			if (!activeNodeConections || activeNodeConections.length < 2) return returnData;
+	const setNDVPanelDataIsEmpty = (params: {
+		panel: NodePanelType;
+		isEmpty: boolean;
+	}): void => {
+		if (params.panel === 'input') {
+			input.value.data.isEmpty = params.isEmpty;
+		} else {
+			output.value.data.isEmpty = params.isEmpty;
+		}
+	};
 
-			for (const [index, connection] of activeNodeConections.entries()) {
-				for (const node of connection) {
-					if (!returnData[node.node]) {
-						returnData[node.node] = [];
-					}
-					returnData[node.node].push(index + 1);
-				}
-			}
+	const setMappingOnboarded = () => {
+		isMappingOnboarded.value = true;
+		localStorageMappingIsOnboarded.value = 'true';
+	};
 
-			return returnData;
-		},
-	},
-	actions: {
-		setActiveNodeName(nodeName: string | null): void {
-			this.activeNodeName = nodeName;
-		},
-		setInputNodeName(nodeName: string | undefined): void {
-			this.input = {
-				...this.input,
-				nodeName,
-			};
-		},
-		setInputRunIndex(run?: number): void {
-			this.input = {
-				...this.input,
-				run,
-			};
-		},
-		setMainPanelDimensions(params: {
-			panelType: string;
-			dimensions: { relativeLeft?: number; relativeRight?: number; relativeWidth?: number };
-		}): void {
-			this.mainPanelDimensions = {
-				...this.mainPanelDimensions,
-				[params.panelType]: {
-					...this.mainPanelDimensions[params.panelType],
-					...params.dimensions,
+	const setTableHoverOnboarded = () => {
+		isTableHoverOnboarded.value = true;
+		localStorageTableHoverIsOnboarded.value = 'true';
+	};
+
+	const setAutocompleteOnboarded = () => {
+		isAutocompleteOnboarded.value = true;
+		localStorageAutoCompleteIsOnboarded.value = 'true';
+	};
+
+	const setHighlightDraggables = (highlight: boolean) => {
+		highlightDraggables.value = highlight;
+	};
+
+	const updateNodeParameterIssues = (issues: INodeIssues): void => {
+		const activeNode = workflowsStore.getNodeByName(activeNodeName.value || '');
+
+		if (activeNode) {
+			const nodeIndex = workflowsStore.workflow.nodes.findIndex((node) => {
+				return node.name === activeNode.name;
+			});
+
+			workflowsStore.updateNodeAtIndex(nodeIndex, {
+				issues: {
+					...activeNode.issues,
+					...issues,
 				},
-			};
-		},
-		setNDVPushRef(): void {
-			this.pushRef = `ndv-${uuid()}`;
-		},
-		resetNDVPushRef(): void {
-			this.pushRef = '';
-		},
-		setPanelDisplayMode(params: { pane: NodePanelType; mode: IRunDataDisplayMode }): void {
-			this[params.pane].displayMode = params.mode;
-		},
-		setOutputPanelEditModeEnabled(isEnabled: boolean): void {
-			this.output.editMode.enabled = isEnabled;
-		},
-		setOutputPanelEditModeValue(payload: string): void {
-			this.output.editMode.value = payload;
-		},
-		setMappableNDVInputFocus(paramName: string): void {
-			this.focusedMappableInput = paramName;
-		},
-		draggableStartDragging({
-			type,
-			data,
-			dimensions,
-		}: {
-			type: string;
-			data: string;
-			dimensions: DOMRect | null;
-		}): void {
-			this.draggable = {
-				isDragging: true,
-				type,
-				data,
-				dimensions,
-				activeTarget: null,
-			};
-		},
-		draggableStopDragging(): void {
-			this.draggable = {
-				isDragging: false,
-				type: '',
-				data: '',
-				dimensions: null,
-				activeTarget: null,
-			};
-		},
-		setDraggableTarget(target: NDVState['draggable']['activeTarget']): void {
-			this.draggable.activeTarget = target;
-		},
-		setMappingTelemetry(telemetry: { [key: string]: string | number | boolean }): void {
-			this.mappingTelemetry = { ...this.mappingTelemetry, ...telemetry };
-		},
-		resetMappingTelemetry(): void {
-			this.mappingTelemetry = {};
-		},
-		setHoveringItem(item: null | NDVState['hoveringItem']): void {
-			if (item) this.setTableHoverOnboarded();
-			this.hoveringItem = item;
-		},
-		setNDVBranchIndex(e: { pane: 'input' | 'output'; branchIndex: number }): void {
-			this[e.pane].branch = e.branchIndex;
-		},
-		setNDVPanelDataIsEmpty(payload: { panel: 'input' | 'output'; isEmpty: boolean }): void {
-			this[payload.panel].data.isEmpty = payload.isEmpty;
-		},
-		setMappingOnboarded() {
-			this.isMappingOnboarded = true;
-			useStorage(LOCAL_STORAGE_MAPPING_IS_ONBOARDED).value = 'true';
-		},
-		setTableHoverOnboarded() {
-			this.isTableHoverOnboarded = true;
-			useStorage(LOCAL_STORAGE_TABLE_HOVER_IS_ONBOARDED).value = 'true';
-		},
-		setAutocompleteOnboarded() {
-			this.isAutocompleteOnboarded = true;
-			useStorage(LOCAL_STORAGE_AUTOCOMPLETE_IS_ONBOARDED).value = 'true';
-		},
-		setHighlightDraggables(highlight: boolean) {
-			this.highlightDraggables = highlight;
-		},
-		updateNodeParameterIssues(issues: INodeIssues): void {
-			const workflowsStore = useWorkflowsStore();
-			const activeNode = workflowsStore.getNodeByName(this.activeNodeName || '');
+			});
+		}
+	};
 
-			if (activeNode) {
-				const nodeIndex = workflowsStore.workflow.nodes.findIndex((node) => {
-					return node.name === activeNode.name;
-				});
+	const setFocusedInputPath = (path: string) => {
+		focusedInputPath.value = path;
+	};
 
-				workflowsStore.updateNodeAtIndex(nodeIndex, {
-					issues: {
-						...activeNode.issues,
-						...issues,
-					},
-				});
-			}
-		},
-		setFocusedInputPath(path: string) {
-			this.focusedInputPath = path;
-		},
-	},
+	return {
+		activeNode,
+		ndvInputData,
+		ndvInputNodeName,
+		ndvInputDataWithPinnedData,
+		hasInputData,
+		inputPanelDisplayMode,
+		outputPanelDisplayMode,
+		isDraggableDragging,
+		draggableType,
+		draggableData,
+		canDraggableDrop,
+		outputPanelEditMode,
+		draggableStickyPos,
+		ndvNodeInputNumber,
+		ndvInputRunIndex,
+		ndvInputBranchIndex,
+		isInputParentOfActiveNode,
+		getHoveringItem,
+		expressionTargetItem,
+		isNDVOpen,
+		isInputPanelEmpty,
+		isOutputPanelEmpty,
+		focusedMappableInput,
+		isMappingOnboarded,
+		pushRef,
+		activeNodeName,
+		focusedInputPath,
+		input,
+		output,
+		hoveringItem,
+		highlightDraggables,
+		mappingTelemetry,
+		draggable,
+		isAutocompleteOnboarded,
+		expressionOutputItemIndex,
+		isTableHoverOnboarded,
+		mainPanelDimensions,
+		setActiveNodeName,
+		setInputNodeName,
+		setInputRunIndex,
+		setMainPanelDimensions,
+		setNDVPushRef,
+		resetNDVPushRef,
+		setPanelDisplayMode,
+		setOutputPanelEditModeEnabled,
+		setOutputPanelEditModeValue,
+		setMappableNDVInputFocus,
+		draggableStartDragging,
+		draggableStopDragging,
+		setDraggableTarget,
+		setMappingTelemetry,
+		resetMappingTelemetry,
+		setHoveringItem,
+		setNDVBranchIndex,
+		setNDVPanelDataIsEmpty,
+		setMappingOnboarded,
+		setTableHoverOnboarded,
+		setAutocompleteOnboarded,
+		setHighlightDraggables,
+		updateNodeParameterIssues,
+		setFocusedInputPath,
+	};
 });
diff --git a/packages/editor-ui/src/stores/nodeCreator.store.test.ts b/packages/editor-ui/src/stores/nodeCreator.store.test.ts
new file mode 100644
index 0000000000..b59d763e97
--- /dev/null
+++ b/packages/editor-ui/src/stores/nodeCreator.store.test.ts
@@ -0,0 +1,297 @@
+import { createPinia, setActivePinia } from 'pinia';
+import { useNodeCreatorStore } from './nodeCreator.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { CUSTOM_API_CALL_KEY, REGULAR_NODE_CREATOR_VIEW } from '@/constants';
+import type { INodeCreateElement } from '@/Interface';
+
+const workflow_id = 'workflow-id';
+const category_name = 'category-name';
+const source = 'source';
+const mode = 'mode';
+const now = 1717602004819;
+const now1 = 1718602004819;
+const node_type = 'node-type';
+const node_version = 1;
+const input_node_type = 'input-node-type';
+const action = 'action';
+const source_mode = 'source-mode';
+const resource = 'resource';
+const actions = ['action1'];
+
+vi.mock('@/composables/useTelemetry', () => {
+	const track = vi.fn();
+	return {
+		useTelemetry: () => {
+			return {
+				track,
+			};
+		},
+	};
+});
+
+describe('useNodeCreatorStore', () => {
+	let nodeCreatorStore: ReturnType<typeof useNodeCreatorStore>;
+
+	beforeEach(() => {
+		vi.useFakeTimers();
+		vi.restoreAllMocks();
+		setActivePinia(createPinia());
+		nodeCreatorStore = useNodeCreatorStore();
+		vi.setSystemTime(now);
+	});
+
+	it('tracks when node creator is opened', () => {
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User opened nodes panel',
+			{
+				mode,
+				source,
+				nodes_panel_session_id: getSessionId(now),
+				workflow_id,
+			},
+			{
+				withPostHog: false,
+			},
+		);
+	});
+
+	it('resets session id every time node creator is opened', () => {
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User opened nodes panel',
+			{
+				mode,
+				source,
+				nodes_panel_session_id: getSessionId(now),
+				workflow_id,
+			},
+			{
+				withPostHog: false,
+			},
+		);
+
+		vi.setSystemTime(now1);
+
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User opened nodes panel',
+			{
+				mode,
+				source,
+				nodes_panel_session_id: getSessionId(now1),
+				workflow_id,
+			},
+			{
+				withPostHog: false,
+			},
+		);
+	});
+
+	it('tracks event on category expanded', () => {
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+		nodeCreatorStore.onCategoryExpanded({ workflow_id, category_name });
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User viewed node category',
+			{
+				category_name,
+				is_subcategory: false,
+				nodes_panel_session_id: getSessionId(now),
+				workflow_id,
+			},
+			{
+				withPostHog: false,
+			},
+		);
+	});
+
+	it('tracks event when node is added to canvas', () => {
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+		nodeCreatorStore.onNodeAddedToCanvas({
+			node_type,
+			node_version,
+			is_auto_add: true,
+			workflow_id,
+			drag_and_drop: true,
+			input_node_type,
+		});
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User added node to workflow canvas',
+			{
+				node_type,
+				node_version,
+				is_auto_add: true,
+				drag_and_drop: true,
+				input_node_type,
+				nodes_panel_session_id: getSessionId(now),
+				workflow_id,
+			},
+			{
+				withPostHog: true,
+			},
+		);
+	});
+
+	it('tracks event when action is added', () => {
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+		nodeCreatorStore.onAddActions({
+			node_type,
+			action,
+			source_mode,
+			resource,
+		});
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User added action',
+			{
+				node_type,
+				action,
+				source_mode,
+				resource,
+				nodes_panel_session_id: getSessionId(now),
+			},
+			{
+				withPostHog: false,
+			},
+		);
+	});
+
+	it('tracks when custom api action is clicked', () => {
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+		nodeCreatorStore.onActionsCustomAPIClicked({
+			app_identifier: node_type,
+		});
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User clicked custom API from node actions',
+			{
+				app_identifier: node_type,
+				nodes_panel_session_id: getSessionId(now),
+			},
+			{
+				withPostHog: false,
+			},
+		);
+	});
+
+	it('tracks when action is viewed', () => {
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+		nodeCreatorStore.onViewActions({
+			app_identifier: node_type,
+			actions,
+			regular_action_count: 1,
+			trigger_action_count: 2,
+		});
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User viewed node actions',
+			{
+				app_identifier: node_type,
+				actions,
+				regular_action_count: 1,
+				trigger_action_count: 2,
+				nodes_panel_session_id: getSessionId(now),
+			},
+			{
+				withPostHog: false,
+			},
+		);
+	});
+
+	it('tracks when search filter is updated, ignoring custom actions in count', () => {
+		const newValue = 'new-value';
+		const subcategory = 'subcategory';
+		const title = 'title';
+
+		const mockTrigger = {
+			key: 'n8n-node.exampleTrigger',
+			properties: {
+				name: 'n8n-node.exampleTrigge',
+				displayName: 'Example Trigger',
+			},
+		} as INodeCreateElement;
+
+		const mockCustom = {
+			key: 'action',
+			properties: {
+				actionKey: CUSTOM_API_CALL_KEY,
+			},
+		} as INodeCreateElement;
+
+		const mockRegular = {
+			key: 'n8n-node.example',
+			properties: {},
+		} as INodeCreateElement;
+
+		nodeCreatorStore.onCreatorOpened({
+			source,
+			mode,
+			workflow_id,
+		});
+		nodeCreatorStore.onNodeFilterChanged({
+			newValue,
+			filteredNodes: [mockCustom, mockRegular, mockTrigger],
+			filterMode: REGULAR_NODE_CREATOR_VIEW,
+			subcategory,
+			title,
+		});
+
+		expect(useTelemetry().track).toHaveBeenCalledWith(
+			'User entered nodes panel search term',
+			{
+				search_string: newValue,
+				filter_mode: 'regular',
+				category_name: subcategory,
+				results_count: 2,
+				trigger_count: 1,
+				regular_count: 1,
+				nodes_panel_session_id: getSessionId(now),
+				title,
+			},
+			{
+				withPostHog: false,
+			},
+		);
+	});
+});
+
+function getSessionId(time: number) {
+	return `nodes_panel_session_${time}`;
+}
diff --git a/packages/editor-ui/src/stores/nodeCreator.store.ts b/packages/editor-ui/src/stores/nodeCreator.store.ts
index db6ce26eaa..05dd4a9795 100644
--- a/packages/editor-ui/src/stores/nodeCreator.store.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.store.ts
@@ -1,6 +1,8 @@
 import { defineStore } from 'pinia';
 import {
 	AI_NODE_CREATOR_VIEW,
+	AI_OTHERS_NODE_CREATOR_VIEW,
+	CUSTOM_API_CALL_KEY,
 	NODE_CREATOR_OPEN_SOURCES,
 	REGULAR_NODE_CREATOR_VIEW,
 	STORES,
@@ -12,17 +14,17 @@ import type {
 	SimplifiedNodeType,
 	ActionsRecord,
 	ToggleNodeCreatorOptions,
+	INodeCreateElement,
 } from '@/Interface';
 
 import { computed, ref } from 'vue';
 import { transformNodeType } from '@/components/Node/NodeCreator/utils';
-import type { INodeInputConfiguration } from 'n8n-workflow';
+import type { IDataObject, INodeInputConfiguration, NodeParameterValueType } from 'n8n-workflow';
 import { NodeConnectionType, nodeConnectionTypes, NodeHelpers } from 'n8n-workflow';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useNDVStore } from '@/stores/ndv.store';
 import { useExternalHooks } from '@/composables/useExternalHooks';
-import { useTelemetry } from '@/composables/useTelemetry';
 import { useViewStacks } from '@/components/Node/NodeCreator/composables/useViewStacks';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 import {
@@ -33,15 +35,15 @@ import type { Connection } from '@vue-flow/core';
 import { CanvasConnectionMode } from '@/types';
 import { isVueFlowConnection } from '@/utils/typeGuards';
 import type { PartialBy } from '@/utils/typeHelpers';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 	const workflowsStore = useWorkflowsStore();
 	const ndvStore = useNDVStore();
 	const uiStore = useUIStore();
 	const nodeTypesStore = useNodeTypesStore();
-
-	const externalHooks = useExternalHooks();
 	const telemetry = useTelemetry();
+	const externalHooks = useExternalHooks();
 
 	const selectedView = ref<NodeFilterType>(TRIGGER_NODE_CREATOR_VIEW);
 	const mergedNodes = ref<SimplifiedNodeType[]>([]);
@@ -50,6 +52,10 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 	const showScrim = ref(false);
 	const openSource = ref<NodeCreatorOpenSource>('');
 
+	const isCreateNodeActive = ref<boolean>(false);
+
+	const nodePanelSessionId = ref<string>('');
+
 	const allNodeCreatorNodes = computed(() =>
 		Object.values(mergedNodes.value).map((i) => transformNodeType(i)),
 	);
@@ -115,7 +121,7 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 		createNodeActive,
 		nodeCreatorView,
 	}: ToggleNodeCreatorOptions) {
-		if (createNodeActive === uiStore.isCreateNodeActive) {
+		if (createNodeActive === isCreateNodeActive.value) {
 			return;
 		}
 
@@ -128,54 +134,24 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 		// Default to the trigger tab in node creator if there's no trigger node yet
 		setSelectedView(nodeCreatorView);
 
-		let mode;
-		switch (selectedView.value) {
-			case AI_NODE_CREATOR_VIEW:
-				mode = 'ai';
-				break;
-			case REGULAR_NODE_CREATOR_VIEW:
-				mode = 'regular';
-				break;
-			default:
-				mode = 'regular';
-		}
-
-		uiStore.isCreateNodeActive = createNodeActive;
+		isCreateNodeActive.value = createNodeActive;
 		if (createNodeActive && source) {
 			setOpenSource(source);
 		}
 
 		void externalHooks.run('nodeView.createNodeActiveChanged', {
 			source,
-			mode,
+			mode: getMode(nodeCreatorView),
 			createNodeActive,
 		});
 
-		trackNodesPanelActiveChanged({
-			source,
-			mode,
-			createNodeActive,
-			workflowId: workflowsStore.workflowId,
-		});
-	}
-
-	function trackNodesPanelActiveChanged({
-		source,
-		mode,
-		createNodeActive,
-		workflowId,
-	}: {
-		source?: string;
-		mode?: string;
-		createNodeActive?: boolean;
-		workflowId?: string;
-	}) {
-		telemetry.trackNodesPanel('nodeView.createNodeActiveChanged', {
-			source,
-			mode,
-			createNodeActive,
-			workflow_id: workflowId,
-		});
+		if (createNodeActive) {
+			onCreatorOpened({
+				source,
+				mode: getMode(nodeCreatorView),
+				workflow_id: workflowsStore.workflowId,
+			});
+		}
 	}
 
 	function openNodeCreatorForConnectingNode({
@@ -264,7 +240,150 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 		return filter;
 	}
 
+	function resetNodesPanelSession() {
+		nodePanelSessionId.value = `nodes_panel_session_${new Date().valueOf()}`;
+	}
+
+	function trackNodeCreatorEvent(event: string, properties: IDataObject = {}, withPostHog = false) {
+		telemetry.track(
+			event,
+			{
+				...properties,
+				nodes_panel_session_id: nodePanelSessionId.value,
+			},
+			{
+				withPostHog,
+			},
+		);
+	}
+
+	function onCreatorOpened({
+		source,
+		mode,
+		workflow_id,
+	}: {
+		source?: string;
+		mode: string;
+		workflow_id?: string;
+	}) {
+		resetNodesPanelSession();
+		trackNodeCreatorEvent('User opened nodes panel', {
+			source,
+			mode,
+			workflow_id,
+		});
+	}
+
+	function onNodeFilterChanged({
+		newValue,
+		filteredNodes,
+		filterMode,
+		subcategory,
+		title,
+	}: {
+		newValue: string;
+		filteredNodes: INodeCreateElement[];
+		filterMode: NodeFilterType;
+		subcategory?: string;
+		title?: string;
+	}) {
+		if (!newValue.length) {
+			return;
+		}
+
+		const { results_count, trigger_count, regular_count } = filteredNodes.reduce(
+			(accu, node) => {
+				if (!('properties' in node)) {
+					return accu;
+				}
+				const isCustomAction =
+					'actionKey' in node.properties && node.properties.actionKey === CUSTOM_API_CALL_KEY;
+				if (isCustomAction) {
+					return accu;
+				}
+				const isTrigger = node.key.includes('Trigger');
+				return {
+					results_count: accu.results_count + 1,
+					trigger_count: accu.trigger_count + (isTrigger ? 1 : 0),
+					regular_count: accu.regular_count + (isTrigger ? 0 : 1),
+				};
+			},
+			{
+				results_count: 0,
+				trigger_count: 0,
+				regular_count: 0,
+			},
+		);
+
+		trackNodeCreatorEvent('User entered nodes panel search term', {
+			search_string: newValue,
+			filter_mode: getMode(filterMode),
+			category_name: subcategory,
+			results_count,
+			trigger_count,
+			regular_count,
+			title,
+		});
+	}
+
+	function onCategoryExpanded(properties: { category_name: string; workflow_id: string }) {
+		trackNodeCreatorEvent('User viewed node category', { ...properties, is_subcategory: false });
+	}
+
+	function onViewActions(properties: {
+		app_identifier: string;
+		actions: string[];
+		regular_action_count: number;
+		trigger_action_count: number;
+	}) {
+		trackNodeCreatorEvent('User viewed node actions', properties);
+	}
+
+	function onActionsCustomAPIClicked(properties: { app_identifier: string }) {
+		trackNodeCreatorEvent('User clicked custom API from node actions', properties);
+	}
+
+	function onAddActions(properties: {
+		node_type?: string;
+		action: string;
+		source_mode: string;
+		resource: NodeParameterValueType;
+	}) {
+		trackNodeCreatorEvent('User added action', properties);
+	}
+
+	function onSubcategorySelected(properties: { subcategory: string }) {
+		trackNodeCreatorEvent('User viewed node category', {
+			category_name: properties.subcategory,
+			is_subcategory: true,
+		});
+	}
+
+	function onNodeAddedToCanvas(properties: {
+		node_type: string;
+		node_version: number;
+		is_auto_add?: boolean;
+		workflow_id: string;
+		drag_and_drop?: boolean;
+		input_node_type?: string;
+	}) {
+		trackNodeCreatorEvent('User added node to workflow canvas', properties, true);
+	}
+
+	function getMode(mode: NodeFilterType): string {
+		if (mode === AI_NODE_CREATOR_VIEW || mode === AI_OTHERS_NODE_CREATOR_VIEW) {
+			return 'ai';
+		}
+
+		if (mode === TRIGGER_NODE_CREATOR_VIEW) {
+			return 'trigger';
+		}
+
+		return 'regular';
+	}
+
 	return {
+		isCreateNodeActive,
 		openSource,
 		selectedView,
 		showScrim,
@@ -280,5 +399,13 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, () => {
 		openNodeCreatorForConnectingNode,
 		openNodeCreatorForTriggerNodes,
 		allNodeCreatorNodes,
+		onCreatorOpened,
+		onNodeFilterChanged,
+		onCategoryExpanded,
+		onActionsCustomAPIClicked,
+		onViewActions,
+		onAddActions,
+		onSubcategorySelected,
+		onNodeAddedToCanvas,
 	};
 });
diff --git a/packages/editor-ui/src/stores/nodeTypes.store.ts b/packages/editor-ui/src/stores/nodeTypes.store.ts
index 7a8e66aab0..8f0fc35e16 100644
--- a/packages/editor-ui/src/stores/nodeTypes.store.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.store.ts
@@ -1,6 +1,12 @@
+import type {
+	ActionResultRequestDto,
+	OptionsRequestDto,
+	ResourceLocatorRequestDto,
+	ResourceMapperFieldsRequestDto,
+} from '@n8n/api-types';
 import * as nodeTypesApi from '@/api/nodeTypes';
 import { HTTP_REQUEST_NODE_TYPE, STORES, CREDENTIAL_ONLY_HTTP_NODE_VERSION } from '@/constants';
-import type { DynamicNodeParameters, NodeTypesByTypeNameAndVersion } from '@/Interface';
+import type { NodeTypesByTypeNameAndVersion } from '@/Interface';
 import { addHeaders, addNodeTranslation } from '@/plugins/i18n';
 import { omit } from '@/utils/typesUtils';
 import type {
@@ -282,19 +288,15 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		}
 	};
 
-	const getNodeParameterOptions = async (sendData: DynamicNodeParameters.OptionsRequest) => {
+	const getNodeParameterOptions = async (sendData: OptionsRequestDto) => {
 		return await nodeTypesApi.getNodeParameterOptions(rootStore.restApiContext, sendData);
 	};
 
-	const getResourceLocatorResults = async (
-		sendData: DynamicNodeParameters.ResourceLocatorResultsRequest,
-	) => {
+	const getResourceLocatorResults = async (sendData: ResourceLocatorRequestDto) => {
 		return await nodeTypesApi.getResourceLocatorResults(rootStore.restApiContext, sendData);
 	};
 
-	const getResourceMapperFields = async (
-		sendData: DynamicNodeParameters.ResourceMapperFieldsRequest,
-	) => {
+	const getResourceMapperFields = async (sendData: ResourceMapperFieldsRequestDto) => {
 		try {
 			return await nodeTypesApi.getResourceMapperFields(rootStore.restApiContext, sendData);
 		} catch (error) {
@@ -302,9 +304,15 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		}
 	};
 
-	const getNodeParameterActionResult = async (
-		sendData: DynamicNodeParameters.ActionResultRequest,
-	) => {
+	const getLocalResourceMapperFields = async (sendData: ResourceMapperFieldsRequestDto) => {
+		try {
+			return await nodeTypesApi.getLocalResourceMapperFields(rootStore.restApiContext, sendData);
+		} catch (error) {
+			return null;
+		}
+	};
+
+	const getNodeParameterActionResult = async (sendData: ActionResultRequestDto) => {
 		return await nodeTypesApi.getNodeParameterActionResult(rootStore.restApiContext, sendData);
 	};
 
@@ -326,6 +334,7 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, () => {
 		visibleNodeTypesByInputConnectionTypeNames,
 		isConfigurableNode,
 		getResourceMapperFields,
+		getLocalResourceMapperFields,
 		getNodeParameterActionResult,
 		getResourceLocatorResults,
 		getNodeParameterOptions,
diff --git a/packages/editor-ui/src/stores/npsStore.store.spec.ts b/packages/editor-ui/src/stores/npsStore.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/npsStore.store.spec.ts
rename to packages/editor-ui/src/stores/npsStore.store.test.ts
diff --git a/packages/editor-ui/src/stores/__tests__/posthog.test.ts b/packages/editor-ui/src/stores/posthog.test.ts
similarity index 98%
rename from packages/editor-ui/src/stores/__tests__/posthog.test.ts
rename to packages/editor-ui/src/stores/posthog.test.ts
index e2a5dd9d67..745d1ca7e1 100644
--- a/packages/editor-ui/src/stores/__tests__/posthog.test.ts
+++ b/packages/editor-ui/src/stores/posthog.test.ts
@@ -6,7 +6,7 @@ import { useRootStore } from '@/stores/root.store';
 import type { FrontendSettings } from '@n8n/api-types';
 import { LOCAL_STORAGE_EXPERIMENT_OVERRIDES } from '@/constants';
 import { nextTick } from 'vue';
-import { defaultSettings } from '../../__tests__/defaults';
+import { defaultSettings } from '../__tests__/defaults';
 import { useTelemetry } from '@/composables/useTelemetry';
 
 export const DEFAULT_POSTHOG_SETTINGS: FrontendSettings['posthog'] = {
diff --git a/packages/editor-ui/src/stores/projects.store.ts b/packages/editor-ui/src/stores/projects.store.ts
index 1824574b6f..8c652eb018 100644
--- a/packages/editor-ui/src/stores/projects.store.ts
+++ b/packages/editor-ui/src/stores/projects.store.ts
@@ -5,13 +5,7 @@ import { useRootStore } from '@/stores/root.store';
 import * as projectsApi from '@/api/projects.api';
 import * as workflowsEEApi from '@/api/workflows.ee';
 import * as credentialsEEApi from '@/api/credentials.ee';
-import type {
-	Project,
-	ProjectCreateRequest,
-	ProjectListItem,
-	ProjectUpdateRequest,
-	ProjectsCount,
-} from '@/types/projects.types';
+import type { Project, ProjectListItem, ProjectsCount } from '@/types/projects.types';
 import { ProjectTypes } from '@/types/projects.types';
 import { useSettingsStore } from '@/stores/settings.store';
 import { hasPermission } from '@/utils/rbac/permissions';
@@ -21,6 +15,7 @@ import { useCredentialsStore } from '@/stores/credentials.store';
 import { STORES } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
 import { getResourcePermissions } from '@/permissions';
+import type { CreateProjectDto, UpdateProjectDto } from '@n8n/api-types';
 
 export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 	const route = useRoute();
@@ -112,24 +107,30 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => {
 		currentProject.value = await fetchProject(id);
 	};
 
-	const createProject = async (project: ProjectCreateRequest): Promise<Project> => {
+	const createProject = async (project: CreateProjectDto): Promise<Project> => {
 		const newProject = await projectsApi.createProject(rootStore.restApiContext, project);
 		await getProjectsCount();
 		myProjects.value = [...myProjects.value, newProject as unknown as ProjectListItem];
 		return newProject;
 	};
 
-	const updateProject = async (projectData: ProjectUpdateRequest): Promise<void> => {
-		await projectsApi.updateProject(rootStore.restApiContext, projectData);
-		const projectIndex = myProjects.value.findIndex((p) => p.id === projectData.id);
+	const updateProject = async (
+		id: Project['id'],
+		projectData: Required<UpdateProjectDto>,
+	): Promise<void> => {
+		await projectsApi.updateProject(rootStore.restApiContext, id, projectData);
+		const projectIndex = myProjects.value.findIndex((p) => p.id === id);
+		const { name, icon } = projectData;
 		if (projectIndex !== -1) {
-			myProjects.value[projectIndex].name = projectData.name;
+			myProjects.value[projectIndex].name = name;
+			myProjects.value[projectIndex].icon = icon;
 		}
 		if (currentProject.value) {
-			currentProject.value.name = projectData.name;
+			currentProject.value.name = name;
+			currentProject.value.icon = icon;
 		}
 		if (projectData.relations) {
-			await getProject(projectData.id);
+			await getProject(id);
 		}
 	};
 
diff --git a/packages/editor-ui/src/stores/__tests__/rbac.store.test.ts b/packages/editor-ui/src/stores/rbac.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/__tests__/rbac.store.test.ts
rename to packages/editor-ui/src/stores/rbac.store.test.ts
diff --git a/packages/editor-ui/src/stores/settings.store.ts b/packages/editor-ui/src/stores/settings.store.ts
index b7325e4ec5..194e5b3cc4 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);
@@ -96,6 +98,10 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 
 	const isCloudDeployment = computed(() => settings.value.deployment?.type === 'cloud');
 
+	const isAiCreditsEnabled = computed(() => settings.value.aiCredits?.enabled);
+
+	const aiCreditsQuota = computed(() => settings.value.aiCredits?.credits);
+
 	const isSmtpSetup = computed(() => userManagement.value.smtpSetup);
 
 	const isPersonalizationSurveyEnabled = computed(
@@ -147,7 +153,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 	const permanentlyDismissedBanners = computed(() => settings.value.banners?.dismissed ?? []);
 
 	const isBelowUserQuota = computed(
-		() =>
+		(): boolean =>
 			userManagement.value.quota === -1 ||
 			userManagement.value.quota > useUsersStore().allUsers.length,
 	);
@@ -156,6 +162,10 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 
 	const isDevRelease = computed(() => settings.value.releaseChannel === 'dev');
 
+	const isCanvasV2Enabled = computed(() =>
+		(settings.value.betaFeatures ?? []).includes('canvas_v2'),
+	);
+
 	const setSettings = (newSettings: FrontendSettings) => {
 		settings.value = newSettings;
 		userManagement.value = newSettings.userManagement;
@@ -272,7 +282,6 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 				message: i18n.baseText('startupError.message'),
 				type: 'error',
 				duration: 0,
-				dangerouslyUseHTMLString: true,
 			});
 
 			throw e;
@@ -380,6 +389,7 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		security,
 		nodeJsVersion,
 		concurrency,
+		isConcurrencyEnabled,
 		isPublicApiEnabled,
 		isSwaggerUIEnabled,
 		isPreviewMode,
@@ -418,6 +428,9 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, () => {
 		saveDataProgressExecution,
 		isCommunityPlan,
 		isAskAiEnabled,
+		isCanvasV2Enabled,
+		isAiCreditsEnabled,
+		aiCreditsQuota,
 		reset,
 		testLdapConnection,
 		getLdapConfig,
diff --git a/packages/editor-ui/src/stores/sourceControl.store.ts b/packages/editor-ui/src/stores/sourceControl.store.ts
index 958558603f..70cb31fc3c 100644
--- a/packages/editor-ui/src/stores/sourceControl.store.ts
+++ b/packages/editor-ui/src/stores/sourceControl.store.ts
@@ -4,8 +4,9 @@ import { EnterpriseEditionFeature } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/root.store';
 import * as vcApi from '@/api/sourceControl';
-import type { SourceControlPreferences, SshKeyTypes } from '@/Interface';
+import type { SourceControlPreferences, SshKeyTypes } from '@/types/sourceControl.types';
 import type { TupleToUnion } from '@/utils/typeHelpers';
+import type { SourceControlledFile } from '@n8n/api-types';
 
 export const useSourceControlStore = defineStore('sourceControl', () => {
 	const rootStore = useRootStore();
@@ -39,23 +40,14 @@ export const useSourceControlStore = defineStore('sourceControl', () => {
 
 	const pushWorkfolder = async (data: {
 		commitMessage: string;
-		fileNames?: Array<{
-			conflict: boolean;
-			file: string;
-			id: string;
-			location: string;
-			name: string;
-			status: string;
-			type: string;
-			updatedAt?: string | undefined;
-		}>;
+		fileNames: SourceControlledFile[];
 		force: boolean;
 	}) => {
 		state.commitMessage = data.commitMessage;
 		await vcApi.pushWorkfolder(rootStore.restApiContext, {
 			force: data.force,
-			message: data.commitMessage,
-			...(data.fileNames ? { fileNames: data.fileNames } : {}),
+			commitMessage: data.commitMessage,
+			fileNames: data.fileNames,
 		});
 	};
 
diff --git a/packages/editor-ui/src/stores/sso.store.ts b/packages/editor-ui/src/stores/sso.store.ts
index d9d522274c..3df11b0e2e 100644
--- a/packages/editor-ui/src/stores/sso.store.ts
+++ b/packages/editor-ui/src/stores/sso.store.ts
@@ -1,10 +1,11 @@
+import type { SamlPreferences } from '@n8n/api-types';
 import { computed, reactive } from 'vue';
 import { defineStore } from 'pinia';
 import { EnterpriseEditionFeature } from '@/constants';
 import { useRootStore } from '@/stores/root.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import * as ssoApi from '@/api/sso';
-import type { SamlPreferences, SamlPreferencesExtractedData } from '@/Interface';
+import type { SamlPreferencesExtractedData } from '@/Interface';
 import { updateCurrentUser } from '@/api/users';
 import { useUsersStore } from '@/stores/users.store';
 
@@ -64,7 +65,7 @@ export const useSSOStore = defineStore('sso', () => {
 		state.samlConfig = samlConfig;
 		return samlConfig;
 	};
-	const saveSamlConfig = async (config: SamlPreferences) =>
+	const saveSamlConfig = async (config: Partial<SamlPreferences>) =>
 		await ssoApi.saveSamlConfig(rootStore.restApiContext, config);
 	const testSamlConfig = async () => await ssoApi.testSamlConfig(rootStore.restApiContext);
 
diff --git a/packages/editor-ui/src/stores/__tests__/sso.test.ts b/packages/editor-ui/src/stores/sso.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/__tests__/sso.test.ts
rename to packages/editor-ui/src/stores/sso.test.ts
diff --git a/packages/editor-ui/src/stores/tags.store.ts b/packages/editor-ui/src/stores/tags.store.ts
index fade74a39c..00272d96bd 100644
--- a/packages/editor-ui/src/stores/tags.store.ts
+++ b/packages/editor-ui/src/stores/tags.store.ts
@@ -80,10 +80,9 @@ const createTagsStore = (id: STORES.TAGS | STORES.ANNOTATION_TAGS) => {
 				}
 
 				loading.value = true;
-				const retrievedTags = await tagsApi.getTags(
-					rootStore.restApiContext,
-					Boolean(withUsageCount),
-				);
+				const retrievedTags = await tagsApi.getTags(rootStore.restApiContext, {
+					withUsageCount,
+				});
 				setAllTags(retrievedTags);
 				loading.value = false;
 				return retrievedTags;
diff --git a/packages/editor-ui/src/stores/templates.store.ts b/packages/editor-ui/src/stores/templates.store.ts
index 36eceb120a..be00083d99 100644
--- a/packages/editor-ui/src/stores/templates.store.ts
+++ b/packages/editor-ui/src/stores/templates.store.ts
@@ -6,24 +6,17 @@ import type {
 	ITemplatesCollection,
 	ITemplatesCollectionFull,
 	ITemplatesQuery,
-	ITemplateState,
 	ITemplatesWorkflow,
 	ITemplatesWorkflowFull,
 	IWorkflowTemplate,
 } from '@/Interface';
 import { useSettingsStore } from './settings.store';
-import {
-	getCategories,
-	getCollectionById,
-	getCollections,
-	getTemplateById,
-	getWorkflows,
-	getWorkflowTemplate,
-} from '@/api/templates';
+import * as templatesApi from '@/api/templates';
 import { getFixedNodesList } from '@/utils/nodeViewUtils';
 import { useRootStore } from '@/stores/root.store';
 import { useUsersStore } from './users.store';
 import { useWorkflowsStore } from './workflows.store';
+import { computed, ref } from 'vue';
 
 const TEMPLATES_PAGE_SIZE = 20;
 
@@ -33,398 +26,429 @@ function getSearchKey(query: ITemplatesQuery): string {
 
 export type TemplatesStore = ReturnType<typeof useTemplatesStore>;
 
-export const useTemplatesStore = defineStore(STORES.TEMPLATES, {
-	state: (): ITemplateState => ({
-		categories: [],
-		collections: {},
-		workflows: {},
-		collectionSearches: {},
-		workflowSearches: {},
-		currentSessionId: '',
-		previousSessionId: '',
-		currentN8nPath: `${window.location.protocol}//${window.location.host}${window.BASE_PATH}`,
-	}),
-	getters: {
-		allCategories(): ITemplatesCategory[] {
-			return Object.values(this.categories).sort((a: ITemplatesCategory, b: ITemplatesCategory) =>
-				a.name > b.name ? 1 : -1,
-			);
-		},
-		getTemplateById() {
-			return (id: string): null | ITemplatesWorkflow => this.workflows[id];
-		},
-		getFullTemplateById() {
-			return (id: string): null | ITemplatesWorkflowFull => {
-				const template = this.workflows[id];
-				return template && 'full' in template && template.full ? template : null;
-			};
-		},
-		getCollectionById() {
-			return (id: string): null | ITemplatesCollection => this.collections[id];
-		},
-		getCategoryById() {
-			return (id: string): null | ITemplatesCategory => this.categories[id as unknown as number];
-		},
-		getSearchedCollections() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.collectionSearches[searchKey];
-				if (!search) {
-					return null;
-				}
-
-				return search.collectionIds.map((collectionId: string) => this.collections[collectionId]);
-			};
-		},
-		getSearchedWorkflows() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.workflowSearches[searchKey];
-				if (!search) {
-					return null;
-				}
-
-				return search.workflowIds.map((workflowId: string) => this.workflows[workflowId]);
-			};
-		},
-		getSearchedWorkflowsTotal() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.workflowSearches[searchKey];
-
-				return search ? search.totalWorkflows : 0;
-			};
-		},
-		isSearchLoadingMore() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.workflowSearches[searchKey];
-
-				return Boolean(search && search.loadingMore);
-			};
-		},
-		isSearchFinished() {
-			return (query: ITemplatesQuery) => {
-				const searchKey = getSearchKey(query);
-				const search = this.workflowSearches[searchKey];
-
-				return Boolean(
-					search && !search.loadingMore && search.totalWorkflows === search.workflowIds.length,
-				);
-			};
-		},
-		hasCustomTemplatesHost(): boolean {
-			const settingsStore = useSettingsStore();
-			return settingsStore.templatesHost !== TEMPLATES_URLS.DEFAULT_API_HOST;
-		},
-		/**
-		 * Constructs URLSearchParams object based on the default parameters for the template repository
-		 * and provided additional parameters
-		 */
-		websiteTemplateRepositoryParameters(_roleOverride?: string) {
-			const rootStore = useRootStore();
-			const userStore = useUsersStore();
-			const workflowsStore = useWorkflowsStore();
-			const defaultParameters: Record<string, string> = {
-				...TEMPLATES_URLS.UTM_QUERY,
-				utm_instance: this.currentN8nPath,
-				utm_n8n_version: rootStore.versionCli,
-				utm_awc: String(workflowsStore.activeWorkflows.length),
-			};
-			const userRole: string | null | undefined =
-				userStore.currentUserCloudInfo?.role ??
-				(userStore.currentUser?.personalizationAnswers &&
-				'role' in userStore.currentUser.personalizationAnswers
-					? userStore.currentUser.personalizationAnswers.role
-					: undefined);
-
-			if (userRole) {
-				defaultParameters.utm_user_role = userRole;
+export const useTemplatesStore = defineStore(STORES.TEMPLATES, () => {
+	const categories = ref<ITemplatesCategory[]>([]);
+	const collections = ref<Record<string, ITemplatesCollection>>({});
+	const workflows = ref<Record<string, ITemplatesWorkflow | ITemplatesWorkflowFull>>({});
+	const workflowSearches = ref<
+		Record<
+			string,
+			{
+				workflowIds: string[];
+				totalWorkflows: number;
+				loadingMore?: boolean;
+				categories?: ITemplatesCategory[];
 			}
-			return (additionalParameters: Record<string, string> = {}) => {
-				return new URLSearchParams({
-					...defaultParameters,
-					...additionalParameters,
-				});
-			};
-		},
-		/**
-		 * Construct the URL for the template repository on the website
-		 * @returns {string}
-		 */
-		websiteTemplateRepositoryURL(): string {
-			return `${
-				TEMPLATES_URLS.BASE_WEBSITE_URL
-			}?${this.websiteTemplateRepositoryParameters().toString()}`;
-		},
-		/**
-		 * Construct the URL for the template category page on the website for a given category id
-		 */
-		getWebsiteCategoryURL() {
-			return (id?: string, roleOverride?: string) => {
-				const payload: Record<string, string> = {};
-				if (id) {
-					payload.categories = id;
-				}
-				if (roleOverride) {
-					payload.utm_user_role = roleOverride;
-				}
-				return `${TEMPLATES_URLS.BASE_WEBSITE_URL}/?${this.websiteTemplateRepositoryParameters(payload).toString()}`;
-			};
-		},
-	},
-	actions: {
-		addCategories(categories: ITemplatesCategory[]): void {
-			categories.forEach((category: ITemplatesCategory) => {
-				this.categories = {
-					...this.categories,
-					[category.id]: category,
-				};
-			});
-		},
-		addCollections(collections: Array<ITemplatesCollection | ITemplatesCollectionFull>): void {
-			collections.forEach((collection) => {
-				const workflows = (collection.workflows || []).map((workflow) => ({ id: workflow.id }));
-				const cachedCollection = this.collections[collection.id] || {};
-
-				this.collections = {
-					...this.collections,
-					[collection.id]: {
-						...cachedCollection,
-						...collection,
-						workflows,
-					},
-				};
-			});
-		},
-		addWorkflows(workflows: Array<ITemplatesWorkflow | ITemplatesWorkflowFull>): void {
-			workflows.forEach((workflow: ITemplatesWorkflow) => {
-				const cachedWorkflow = this.workflows[workflow.id] || {};
-
-				this.workflows = {
-					...this.workflows,
-					[workflow.id]: {
-						...cachedWorkflow,
-						...workflow,
-					},
-				};
-			});
-		},
-		addCollectionSearch(data: {
-			collections: ITemplatesCollection[];
-			query: ITemplatesQuery;
-		}): void {
-			const collectionIds = data.collections.map((collection) => String(collection.id));
-			const searchKey = getSearchKey(data.query);
-
-			this.collectionSearches = {
-				...this.collectionSearches,
-				[searchKey]: {
-					collectionIds,
-				},
-			};
-		},
-		addWorkflowsSearch(data: {
-			totalWorkflows: number;
-			workflows: ITemplatesWorkflow[];
-			query: ITemplatesQuery;
-		}): void {
-			const workflowIds = data.workflows.map((workflow) => workflow.id);
-			const searchKey = getSearchKey(data.query);
-			const cachedResults = this.workflowSearches[searchKey];
-			if (!cachedResults) {
-				this.workflowSearches = {
-					...this.workflowSearches,
-					[searchKey]: {
-						workflowIds: workflowIds as unknown as string[],
-						totalWorkflows: data.totalWorkflows,
-						categories: this.categories,
-					},
-				};
-
-				return;
+		>
+	>({});
+	const collectionSearches = ref<
+		Record<
+			string,
+			{
+				collectionIds: string[];
 			}
+		>
+	>({});
+	const currentSessionId = ref<string>('');
+	const previousSessionId = ref<string>('');
+	const currentN8nPath = ref<string>(
+		`${window.location.protocol}//${window.location.host}${window.BASE_PATH}`,
+	);
 
-			this.workflowSearches = {
-				...this.workflowSearches,
-				[searchKey]: {
-					workflowIds: [...cachedResults.workflowIds, ...workflowIds] as string[],
-					totalWorkflows: data.totalWorkflows,
-					categories: this.categories,
-				},
-			};
-		},
-		setWorkflowSearchLoading(query: ITemplatesQuery): void {
+	const settingsStore = useSettingsStore();
+	const rootStore = useRootStore();
+	const userStore = useUsersStore();
+	const workflowsStore = useWorkflowsStore();
+
+	const allCategories = computed(() => {
+		return categories.value.sort((a: ITemplatesCategory, b: ITemplatesCategory) =>
+			a.name > b.name ? 1 : -1,
+		);
+	});
+
+	const getTemplatesById = computed(() => {
+		return (id: string): null | ITemplatesWorkflow => workflows.value[id];
+	});
+
+	const getFullTemplateById = computed(() => {
+		return (id: string): null | ITemplatesWorkflowFull => {
+			const template = workflows.value[id];
+			return template && 'full' in template && template.full ? template : null;
+		};
+	});
+
+	const getCollectionById = computed(() => collections.value);
+
+	const getCategoryById = computed(() => {
+		return (id: string): null | ITemplatesCategory => categories.value[id as unknown as number];
+	});
+
+	const getSearchedCollections = computed(() => {
+		return (query: ITemplatesQuery) => {
 			const searchKey = getSearchKey(query);
-			const cachedResults = this.workflowSearches[searchKey];
-			if (!cachedResults) {
-				return;
+			const search = collectionSearches.value[searchKey];
+			if (!search) {
+				return null;
 			}
 
-			this.workflowSearches[searchKey] = {
-				...this.workflowSearches[searchKey],
-				loadingMore: true,
-			};
-		},
-		setWorkflowSearchLoaded(query: ITemplatesQuery): void {
+			return search.collectionIds.map((collectionId: string) => collections.value[collectionId]);
+		};
+	});
+
+	const getSearchedWorkflows = computed(() => {
+		return (query: ITemplatesQuery) => {
 			const searchKey = getSearchKey(query);
-			const cachedResults = this.workflowSearches[searchKey];
-			if (!cachedResults) {
-				return;
+			const search = workflowSearches.value[searchKey];
+			if (!search) {
+				return null;
 			}
 
-			this.workflowSearches[searchKey] = {
-				...this.workflowSearches[searchKey],
-				loadingMore: false,
+			return search.workflowIds.map((workflowId: string) => workflows.value[workflowId]);
+		};
+	});
+
+	const getSearchedWorkflowsTotal = computed(() => {
+		return (query: ITemplatesQuery) => {
+			const searchKey = getSearchKey(query);
+			const search = workflowSearches.value[searchKey];
+
+			return search ? search.totalWorkflows : 0;
+		};
+	});
+
+	const isSearchLoadingMore = computed(() => {
+		return (query: ITemplatesQuery) => {
+			const searchKey = getSearchKey(query);
+			const search = workflowSearches.value[searchKey];
+
+			return Boolean(search && search.loadingMore);
+		};
+	});
+
+	const isSearchFinished = computed(() => {
+		return (query: ITemplatesQuery) => {
+			const searchKey = getSearchKey(query);
+			const search = workflowSearches.value[searchKey];
+
+			return Boolean(
+				search && !search.loadingMore && search.totalWorkflows === search.workflowIds.length,
+			);
+		};
+	});
+
+	const hasCustomTemplatesHost = computed(() => {
+		return settingsStore.templatesHost !== TEMPLATES_URLS.DEFAULT_API_HOST;
+	});
+
+	const websiteTemplateRepositoryParameters = computed(() => {
+		const defaultParameters: Record<string, string> = {
+			...TEMPLATES_URLS.UTM_QUERY,
+			utm_instance: currentN8nPath.value,
+			utm_n8n_version: rootStore.versionCli,
+			utm_awc: String(workflowsStore.activeWorkflows.length),
+		};
+		const userRole: string | null | undefined =
+			userStore.currentUserCloudInfo?.role ??
+			(userStore.currentUser?.personalizationAnswers &&
+			'role' in userStore.currentUser.personalizationAnswers
+				? userStore.currentUser.personalizationAnswers.role
+				: undefined);
+
+		if (userRole) {
+			defaultParameters.utm_user_role = userRole;
+		}
+		return new URLSearchParams({
+			...defaultParameters,
+		});
+	});
+
+	const websiteTemplateRepositoryURL = computed(
+		() =>
+			`${TEMPLATES_URLS.BASE_WEBSITE_URL}?${websiteTemplateRepositoryParameters.value.toString()}`,
+	);
+
+	const constructTemplateRepositoryURL = (params: URLSearchParams): string => {
+		return `${TEMPLATES_URLS.BASE_WEBSITE_URL}?${params.toString()}`;
+	};
+
+	const addCategories = (_categories: ITemplatesCategory[]): void => {
+		categories.value = _categories;
+	};
+
+	const addCollections = (
+		_collections: Array<ITemplatesCollection | ITemplatesCollectionFull>,
+	): void => {
+		_collections.forEach((collection) => {
+			const workflows = (collection.workflows || []).map((workflow) => ({ id: workflow.id }));
+			const cachedCollection = collections.value[collection.id] || {};
+
+			collections.value[collection.id] = {
+				...cachedCollection,
+				...collection,
+				workflows,
 			};
-		},
-		resetSessionId(): void {
-			this.previousSessionId = this.currentSessionId;
-			this.currentSessionId = '';
-		},
-		setSessionId(): void {
-			if (!this.currentSessionId) {
-				this.currentSessionId = `templates-${Date.now()}`;
-			}
-		},
-		async fetchTemplateById(templateId: string): Promise<ITemplatesWorkflowFull> {
-			const settingsStore = useSettingsStore();
-			const rootStore = useRootStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = rootStore.versionCli;
-			const response = await getTemplateById(apiEndpoint, templateId, {
-				'n8n-version': versionCli,
+		});
+	};
+
+	const addWorkflows = (_workflows: Array<ITemplatesWorkflow | ITemplatesWorkflowFull>): void => {
+		_workflows.forEach((workflow) => {
+			const cachedWorkflow = workflows.value[workflow.id] || {};
+			workflows.value[workflow.id.toString()] = { ...cachedWorkflow, ...workflow };
+		});
+	};
+
+	const addCollectionsSearch = (data: {
+		_collections: ITemplatesCollection[];
+		query: ITemplatesQuery;
+	}) => {
+		const collectionIds = data._collections.map((collection) => String(collection.id));
+		const searchKey = getSearchKey(data.query);
+
+		collectionSearches.value[searchKey] = {
+			collectionIds,
+		};
+	};
+
+	const addWorkflowsSearch = (data: {
+		totalWorkflows: number;
+		workflows: ITemplatesWorkflow[];
+		query: ITemplatesQuery;
+	}) => {
+		const workflowIds = data.workflows.map((workflow) => workflow.id);
+		const searchKey = getSearchKey(data.query);
+		const cachedResults = workflowSearches.value[searchKey];
+		if (!cachedResults) {
+			workflowSearches.value[searchKey] = {
+				workflowIds: workflowIds as unknown as string[],
+				totalWorkflows: data.totalWorkflows,
+				categories: categories.value,
+			};
+			return;
+		}
+
+		workflowSearches.value[searchKey] = {
+			workflowIds: [...cachedResults.workflowIds, ...workflowIds] as string[],
+			totalWorkflows: data.totalWorkflows,
+			categories: categories.value,
+		};
+	};
+
+	const setWorkflowSearchLoading = (query: ITemplatesQuery): void => {
+		const searchKey = getSearchKey(query);
+		const cachedResults = workflowSearches.value[searchKey];
+		if (!cachedResults) {
+			return;
+		}
+
+		workflowSearches.value[searchKey] = {
+			...workflowSearches.value[searchKey],
+			loadingMore: true,
+		};
+	};
+
+	const setWorkflowSearchLoaded = (query: ITemplatesQuery): void => {
+		const searchKey = getSearchKey(query);
+		const cachedResults = workflowSearches.value[searchKey];
+		if (!cachedResults) {
+			return;
+		}
+
+		workflowSearches.value[searchKey] = {
+			...workflowSearches.value[searchKey],
+			loadingMore: false,
+		};
+	};
+
+	const resetSessionId = (): void => {
+		previousSessionId.value = currentSessionId.value;
+		currentSessionId.value = '';
+	};
+
+	const setSessionId = (): void => {
+		if (!currentSessionId.value) {
+			currentSessionId.value = `templates-${Date.now()}`;
+		}
+	};
+
+	const fetchTemplateById = async (templateId: string): Promise<ITemplatesWorkflowFull> => {
+		const apiEndpoint: string = settingsStore.templatesHost;
+		const versionCli: string = rootStore.versionCli;
+		const response = await templatesApi.getTemplateById(apiEndpoint, templateId, {
+			'n8n-version': versionCli,
+		});
+
+		const template: ITemplatesWorkflowFull = {
+			...response.workflow,
+			full: true,
+		};
+		addWorkflows([template]);
+
+		return template;
+	};
+
+	const fetchCollectionById = async (
+		collectionId: string,
+	): Promise<ITemplatesCollection | null> => {
+		const apiEndpoint: string = settingsStore.templatesHost;
+		const versionCli: string = rootStore.versionCli;
+		const response = await templatesApi.getCollectionById(apiEndpoint, collectionId, {
+			'n8n-version': versionCli,
+		});
+		const collection: ITemplatesCollectionFull = {
+			...response.collection,
+			full: true,
+		};
+
+		addCollections([collection]);
+		addWorkflows(response.collection.workflows);
+		return getCollectionById.value[collectionId];
+	};
+
+	const getCategories = async (): Promise<ITemplatesCategory[]> => {
+		const cachedCategories = allCategories.value;
+		if (cachedCategories.length) {
+			return cachedCategories;
+		}
+		const apiEndpoint: string = settingsStore.templatesHost;
+		const versionCli: string = rootStore.versionCli;
+		const response = await templatesApi.getCategories(apiEndpoint, {
+			'n8n-version': versionCli,
+		});
+		const categories = response.categories;
+
+		addCategories(categories);
+		return categories;
+	};
+
+	const getCollections = async (query: ITemplatesQuery): Promise<ITemplatesCollection[]> => {
+		const cachedResults = getSearchedCollections.value(query);
+		if (cachedResults) {
+			return cachedResults;
+		}
+
+		const apiEndpoint: string = settingsStore.templatesHost;
+		const versionCli: string = rootStore.versionCli;
+		const response = await templatesApi.getCollections(apiEndpoint, query, {
+			'n8n-version': versionCli,
+		});
+		const collections = response.collections;
+
+		addCollections(collections);
+		addCollectionsSearch({ query, _collections: collections });
+		collections.forEach((collection) => addWorkflows(collection.workflows as ITemplatesWorkflow[]));
+
+		return collections;
+	};
+
+	const getWorkflows = async (query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> => {
+		const cachedResults = getSearchedWorkflows.value(query);
+		if (cachedResults) {
+			categories.value = workflowSearches.value[getSearchKey(query)].categories ?? [];
+			return cachedResults;
+		}
+
+		const apiEndpoint: string = settingsStore.templatesHost;
+		const versionCli: string = rootStore.versionCli;
+		const payload = await templatesApi.getWorkflows(
+			apiEndpoint,
+			{ ...query, page: 1, limit: TEMPLATES_PAGE_SIZE },
+			{ 'n8n-version': versionCli },
+		);
+
+		addWorkflows(payload.workflows);
+		addWorkflowsSearch({ ...payload, query });
+		return getSearchedWorkflows.value(query) || [];
+	};
+
+	const getMoreWorkflows = async (query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> => {
+		if (isSearchLoadingMore.value(query) && !isSearchFinished.value(query)) {
+			return [];
+		}
+		const cachedResults = getSearchedWorkflows.value(query) || [];
+		const apiEndpoint: string = settingsStore.templatesHost;
+
+		setWorkflowSearchLoading(query);
+		try {
+			const payload = await templatesApi.getWorkflows(apiEndpoint, {
+				...query,
+				page: cachedResults.length / TEMPLATES_PAGE_SIZE + 1,
+				limit: TEMPLATES_PAGE_SIZE,
 			});
 
-			const template: ITemplatesWorkflowFull = {
-				...response.workflow,
-				full: true,
-			};
-			this.addWorkflows([template]);
+			setWorkflowSearchLoaded(query);
+			addWorkflows(payload.workflows);
+			addWorkflowsSearch({ ...payload, query });
 
-			return template;
-		},
-		async fetchCollectionById(collectionId: string): Promise<ITemplatesCollection | null> {
-			const settingsStore = useSettingsStore();
-			const rootStore = useRootStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = rootStore.versionCli;
-			const response = await getCollectionById(apiEndpoint, collectionId, {
-				'n8n-version': versionCli,
+			return getSearchedWorkflows.value(query) || [];
+		} catch (e) {
+			setWorkflowSearchLoaded(query);
+			throw e;
+		}
+	};
+
+	const getWorkflowTemplate = async (templateId: string): Promise<IWorkflowTemplate> => {
+		const apiEndpoint: string = settingsStore.templatesHost;
+		const versionCli: string = rootStore.versionCli;
+		return await templatesApi.getWorkflowTemplate(apiEndpoint, templateId, {
+			'n8n-version': versionCli,
+		});
+	};
+
+	const getFixedWorkflowTemplate = async (
+		templateId: string,
+	): Promise<IWorkflowTemplate | undefined> => {
+		const template = await getWorkflowTemplate(templateId);
+		if (template?.workflow?.nodes) {
+			template.workflow.nodes = getFixedNodesList(template.workflow.nodes) as INodeUi[];
+			template.workflow.nodes?.forEach((node) => {
+				if (node.credentials) {
+					delete node.credentials;
+				}
 			});
-			const collection: ITemplatesCollectionFull = {
-				...response.collection,
-				full: true,
-			};
+		}
 
-			this.addCollections([collection]);
-			this.addWorkflows(response.collection.workflows);
-			return this.getCollectionById(collectionId);
-		},
-		async getCategories(): Promise<ITemplatesCategory[]> {
-			const cachedCategories = this.allCategories;
-			if (cachedCategories.length) {
-				return cachedCategories;
-			}
-			const settingsStore = useSettingsStore();
-			const rootStore = useRootStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = rootStore.versionCli;
-			const response = await getCategories(apiEndpoint, { 'n8n-version': versionCli });
-			const categories = response.categories;
+		return template;
+	};
 
-			this.addCategories(categories);
-			return categories;
-		},
-		async getCollections(query: ITemplatesQuery): Promise<ITemplatesCollection[]> {
-			const cachedResults = this.getSearchedCollections(query);
-			if (cachedResults) {
-				return cachedResults;
-			}
-
-			const settingsStore = useSettingsStore();
-			const rootStore = useRootStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = rootStore.versionCli;
-			const response = await getCollections(apiEndpoint, query, { 'n8n-version': versionCli });
-			const collections = response.collections;
-
-			this.addCollections(collections);
-			this.addCollectionSearch({ query, collections });
-			collections.forEach((collection) =>
-				this.addWorkflows(collection.workflows as ITemplatesWorkflowFull[]),
-			);
-
-			return collections;
-		},
-		async getWorkflows(query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> {
-			const cachedResults = this.getSearchedWorkflows(query);
-			if (cachedResults) {
-				this.categories = this.workflowSearches[getSearchKey(query)].categories ?? [];
-				return cachedResults;
-			}
-
-			const settingsStore = useSettingsStore();
-			const rootStore = useRootStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = rootStore.versionCli;
-
-			const payload = await getWorkflows(
-				apiEndpoint,
-				{ ...query, page: 1, limit: TEMPLATES_PAGE_SIZE },
-				{ 'n8n-version': versionCli },
-			);
-
-			this.addWorkflows(payload.workflows);
-			this.addWorkflowsSearch({ ...payload, query });
-			return this.getSearchedWorkflows(query) || [];
-		},
-		async getMoreWorkflows(query: ITemplatesQuery): Promise<ITemplatesWorkflow[]> {
-			if (this.isSearchLoadingMore(query) && !this.isSearchFinished(query)) {
-				return [];
-			}
-			const cachedResults = this.getSearchedWorkflows(query) || [];
-			const settingsStore = useSettingsStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-
-			this.setWorkflowSearchLoading(query);
-			try {
-				const payload = await getWorkflows(apiEndpoint, {
-					...query,
-					page: cachedResults.length / TEMPLATES_PAGE_SIZE + 1,
-					limit: TEMPLATES_PAGE_SIZE,
-				});
-
-				this.setWorkflowSearchLoaded(query);
-				this.addWorkflows(payload.workflows);
-				this.addWorkflowsSearch({ ...payload, query });
-
-				return this.getSearchedWorkflows(query) || [];
-			} catch (e) {
-				this.setWorkflowSearchLoaded(query);
-				throw e;
-			}
-		},
-		async getWorkflowTemplate(templateId: string): Promise<IWorkflowTemplate> {
-			const settingsStore = useSettingsStore();
-			const rootStore = useRootStore();
-			const apiEndpoint: string = settingsStore.templatesHost;
-			const versionCli: string = rootStore.versionCli;
-			return await getWorkflowTemplate(apiEndpoint, templateId, { 'n8n-version': versionCli });
-		},
-
-		async getFixedWorkflowTemplate(templateId: string): Promise<IWorkflowTemplate | undefined> {
-			const template = await this.getWorkflowTemplate(templateId);
-			if (template?.workflow?.nodes) {
-				template.workflow.nodes = getFixedNodesList(template.workflow.nodes) as INodeUi[];
-				template.workflow.nodes?.forEach((node) => {
-					if (node.credentials) {
-						delete node.credentials;
-					}
-				});
-			}
-
-			return template;
-		},
-	},
+	return {
+		categories,
+		collections,
+		workflows,
+		workflowSearches,
+		collectionSearches,
+		currentSessionId,
+		previousSessionId,
+		currentN8nPath,
+		allCategories,
+		getTemplatesById,
+		getFullTemplateById,
+		getCollectionById,
+		getCategoryById,
+		getSearchedCollections,
+		getSearchedWorkflows,
+		getSearchedWorkflowsTotal,
+		isSearchLoadingMore,
+		isSearchFinished,
+		hasCustomTemplatesHost,
+		websiteTemplateRepositoryURL,
+		constructTemplateRepositoryURL,
+		websiteTemplateRepositoryParameters,
+		addCategories,
+		addCollections,
+		addWorkflows,
+		addCollectionsSearch,
+		addWorkflowsSearch,
+		setWorkflowSearchLoading,
+		setWorkflowSearchLoaded,
+		resetSessionId,
+		setSessionId,
+		fetchTemplateById,
+		fetchCollectionById,
+		getCategories,
+		getCollections,
+		getWorkflows,
+		getMoreWorkflows,
+		getWorkflowTemplate,
+		getFixedWorkflowTemplate,
+	};
 });
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..47f6307d9b
--- /dev/null
+++ b/packages/editor-ui/src/stores/testDefinition.store.ee.test.ts
@@ -0,0 +1,581 @@
+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, TestRunRecord } from '@/api/testDefinition.ee';
+
+const {
+	createTestDefinition,
+	deleteTestDefinition,
+	getTestDefinitions,
+	updateTestDefinition,
+	getTestMetrics,
+	createTestMetric,
+	updateTestMetric,
+	deleteTestMetric,
+	getTestRuns,
+	getTestRun,
+	startTestRun,
+	deleteTestRun,
+} = vi.hoisted(() => ({
+	getTestDefinitions: vi.fn(),
+	createTestDefinition: vi.fn(),
+	updateTestDefinition: vi.fn(),
+	deleteTestDefinition: vi.fn(),
+	getTestMetrics: vi.fn(),
+	createTestMetric: vi.fn(),
+	updateTestMetric: vi.fn(),
+	deleteTestMetric: vi.fn(),
+	getTestRuns: vi.fn(),
+	getTestRun: vi.fn(),
+	startTestRun: vi.fn(),
+	deleteTestRun: vi.fn(),
+}));
+
+vi.mock('@/api/testDefinition.ee', () => ({
+	createTestDefinition,
+	deleteTestDefinition,
+	getTestDefinitions,
+	updateTestDefinition,
+	getTestMetrics,
+	createTestMetric,
+	updateTestMetric,
+	deleteTestMetric,
+	getTestRuns,
+	getTestRun,
+	startTestRun,
+	deleteTestRun,
+}));
+
+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',
+};
+
+const TEST_METRIC = {
+	id: 'metric1',
+	name: 'Test Metric',
+	testDefinitionId: '1',
+};
+
+const TEST_RUN: TestRunRecord = {
+	id: 'run1',
+	testDefinitionId: '1',
+	status: 'completed',
+	metrics: { metric1: 0.75 },
+	createdAt: '2024-01-01',
+	updatedAt: '2024-01-01',
+	runAt: '2024-01-01',
+	completedAt: '2024-01-01',
+};
+
+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 });
+
+		getTestRuns.mockResolvedValue([TEST_RUN]);
+		getTestRun.mockResolvedValue(TEST_RUN);
+		startTestRun.mockResolvedValue({ success: true });
+		deleteTestRun.mockResolvedValue({ success: true });
+	});
+
+	test('Initialization', () => {
+		expect(store.testDefinitionsById).toEqual({});
+		expect(store.isLoading).toBe(false);
+		expect(store.hasTestDefinitions).toBe(false);
+	});
+
+	describe('Test Definitions', () => {
+		test('Fetching Test Definitions', async () => {
+			expect(store.isLoading).toBe(false);
+
+			const result = await store.fetchAll({ workflowId: '123' });
+
+			expect(getTestDefinitions).toHaveBeenCalledWith(rootStoreMock.restApiContext, {
+				workflowId: '123',
+			});
+			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, workflowId: '123' });
+
+			expect(getTestDefinitions).toHaveBeenCalledWith(rootStoreMock.restApiContext, {
+				workflowId: '123',
+			});
+			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('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', () => {
+			store.testDefinitionsById = {
+				'1': TEST_DEF_A,
+				'2': TEST_DEF_B,
+			};
+
+			store.deleteTestDefinition('1');
+
+			expect(store.testDefinitionsById).toEqual({
+				'2': TEST_DEF_B,
+			});
+		});
+
+		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);
+		});
+	});
+
+	describe('Metrics', () => {
+		test('Fetching Metrics for a Test Definition', async () => {
+			getTestMetrics.mockResolvedValue([TEST_METRIC]);
+
+			const metrics = await store.fetchMetrics('1');
+
+			expect(getTestMetrics).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
+			expect(store.metricsById).toEqual({
+				metric1: TEST_METRIC,
+			});
+			expect(metrics).toEqual([TEST_METRIC]);
+		});
+
+		test('Creating a Metric', async () => {
+			createTestMetric.mockResolvedValue(TEST_METRIC);
+
+			const params = {
+				name: 'Test Metric',
+				testDefinitionId: '1',
+			};
+
+			const result = await store.createMetric(params);
+
+			expect(createTestMetric).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.metricsById).toEqual({
+				metric1: TEST_METRIC,
+			});
+			expect(result).toEqual(TEST_METRIC);
+		});
+
+		test('Updating a Metric', async () => {
+			const updatedMetric = { ...TEST_METRIC, name: 'Updated Metric' };
+			updateTestMetric.mockResolvedValue(updatedMetric);
+
+			const result = await store.updateMetric(updatedMetric);
+
+			expect(updateTestMetric).toHaveBeenCalledWith(rootStoreMock.restApiContext, updatedMetric);
+			expect(store.metricsById).toEqual({
+				metric1: updatedMetric,
+			});
+			expect(result).toEqual(updatedMetric);
+		});
+
+		test('Deleting a Metric', async () => {
+			store.metricsById = {
+				metric1: TEST_METRIC,
+			};
+
+			const params = { id: 'metric1', testDefinitionId: '1' };
+			deleteTestMetric.mockResolvedValue(undefined);
+
+			await store.deleteMetric(params);
+
+			expect(deleteTestMetric).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.metricsById).toEqual({});
+		});
+
+		test('Getting Metrics by Test ID', () => {
+			const metric1 = { ...TEST_METRIC, id: 'metric1', testDefinitionId: '1' };
+			const metric2 = { ...TEST_METRIC, id: 'metric2', testDefinitionId: '1' };
+			const metric3 = { ...TEST_METRIC, id: 'metric3', testDefinitionId: '2' };
+
+			store.metricsById = {
+				metric1,
+				metric2,
+				metric3,
+			};
+
+			const metricsForTest1 = store.metricsByTestId['1'];
+			expect(metricsForTest1).toEqual([metric1, metric2]);
+
+			const metricsForTest2 = store.metricsByTestId['2'];
+			expect(metricsForTest2).toEqual([metric3]);
+		});
+	});
+
+	describe('Computed Properties', () => {
+		test('hasTestDefinitions', () => {
+			store.testDefinitionsById = {};
+
+			expect(store.hasTestDefinitions).toBe(false);
+			store.testDefinitionsById = {
+				'1': TEST_DEF_A,
+			};
+
+			expect(store.hasTestDefinitions).toBe(true);
+		});
+
+		test('isFeatureEnabled', () => {
+			posthogStoreMock.isFeatureEnabled = vi.fn().mockReturnValue(false);
+
+			expect(store.isFeatureEnabled).toBe(false);
+			posthogStoreMock.isFeatureEnabled = vi.fn().mockReturnValue(true);
+
+			expect(store.isFeatureEnabled).toBe(true);
+		});
+
+		test('allTestDefinitionsByWorkflowId', () => {
+			store.testDefinitionsById = {
+				'1': { ...TEST_DEF_A, workflowId: 'workflow1' },
+				'2': { ...TEST_DEF_B, workflowId: 'workflow1' },
+				'3': { ...TEST_DEF_NEW, workflowId: 'workflow2' },
+			};
+
+			expect(store.allTestDefinitionsByWorkflowId).toEqual({
+				workflow1: [
+					{ ...TEST_DEF_A, workflowId: 'workflow1' },
+					{ ...TEST_DEF_B, workflowId: 'workflow1' },
+				],
+				workflow2: [{ ...TEST_DEF_NEW, workflowId: 'workflow2' }],
+			});
+		});
+
+		test('lastRunByTestId', () => {
+			const olderRun = {
+				...TEST_RUN,
+				id: 'run2',
+				testDefinitionId: '1',
+				updatedAt: '2023-12-31',
+			};
+
+			const newerRun = {
+				...TEST_RUN,
+				id: 'run3',
+				testDefinitionId: '2',
+				updatedAt: '2024-01-02',
+			};
+
+			store.testRunsById = {
+				run1: { ...TEST_RUN, testDefinitionId: '1' },
+				run2: olderRun,
+				run3: newerRun,
+			};
+
+			expect(store.lastRunByTestId).toEqual({
+				'1': TEST_RUN,
+				'2': newerRun,
+			});
+		});
+
+		test('lastRunByTestId with no runs', () => {
+			store.testRunsById = {};
+			expect(store.lastRunByTestId).toEqual({});
+		});
+	});
+
+	describe('Error Handling', () => {
+		test('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('update', async () => {
+			updateTestDefinition.mockRejectedValue(new Error('Update failed'));
+
+			await expect(store.update({ id: '1', name: 'Updated Test Definition A' })).rejects.toThrow(
+				'Update failed',
+			);
+		});
+
+		test('deleteById', async () => {
+			deleteTestDefinition.mockResolvedValue({ success: false });
+
+			const result = await store.deleteById('1');
+
+			expect(result).toBe(false);
+		});
+	});
+
+	describe('Test Runs', () => {
+		test('Fetching Test Runs', async () => {
+			const result = await store.fetchTestRuns('1');
+
+			expect(getTestRuns).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
+			expect(store.testRunsById).toEqual({
+				run1: TEST_RUN,
+			});
+			expect(result).toEqual([TEST_RUN]);
+		});
+
+		test('Getting specific Test Run', async () => {
+			const params = { testDefinitionId: '1', runId: 'run1' };
+			const result = await store.getTestRun(params);
+
+			expect(getTestRun).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.testRunsById).toEqual({
+				run1: TEST_RUN,
+			});
+			expect(result).toEqual(TEST_RUN);
+		});
+
+		test('Starting Test Run', async () => {
+			const result = await store.startTestRun('1');
+
+			expect(startTestRun).toHaveBeenCalledWith(rootStoreMock.restApiContext, '1');
+			expect(result).toEqual({ success: true });
+		});
+
+		test('Deleting Test Run', async () => {
+			store.testRunsById = { run1: TEST_RUN };
+			const params = { testDefinitionId: '1', runId: 'run1' };
+
+			const result = await store.deleteTestRun(params);
+
+			expect(deleteTestRun).toHaveBeenCalledWith(rootStoreMock.restApiContext, params);
+			expect(store.testRunsById).toEqual({});
+			expect(result).toEqual({ success: true });
+		});
+
+		test('Getting Test Runs by Test ID', () => {
+			store.testRunsById = {
+				run1: TEST_RUN,
+				run2: { ...TEST_RUN, id: 'run2', testDefinitionId: '2' },
+			};
+
+			const runs = store.testRunsByTestId['1'];
+
+			expect(runs).toEqual([TEST_RUN]);
+		});
+	});
+
+	describe('Polling Mechanism', () => {
+		beforeEach(() => {
+			vi.useFakeTimers();
+		});
+
+		afterEach(() => {
+			vi.useRealTimers();
+		});
+
+		test('should start polling for running test runs', async () => {
+			const runningTestRun = {
+				...TEST_RUN,
+				status: 'running',
+			};
+
+			getTestRuns.mockResolvedValueOnce([runningTestRun]);
+
+			// First call returns running status
+			getTestRun.mockResolvedValueOnce({
+				...runningTestRun,
+				status: 'running',
+			});
+
+			// Second call returns completed status
+			getTestRun.mockResolvedValueOnce({
+				...runningTestRun,
+				status: 'completed',
+			});
+
+			await store.fetchTestRuns('1');
+
+			expect(store.testRunsById).toEqual({
+				run1: runningTestRun,
+			});
+
+			// Advance timer to trigger the first poll
+			await vi.advanceTimersByTimeAsync(1000);
+
+			// Verify first poll happened
+			expect(getTestRun).toHaveBeenCalledWith(rootStoreMock.restApiContext, {
+				testDefinitionId: '1',
+				runId: 'run1',
+			});
+
+			// Advance timer again
+			await vi.advanceTimersByTimeAsync(1000);
+
+			// Verify polling stopped after status changed to completed
+			expect(getTestRun).toHaveBeenCalledTimes(2);
+		});
+
+		test('should cleanup polling timeouts', async () => {
+			const runningTestRun = {
+				...TEST_RUN,
+				status: 'running',
+			};
+
+			getTestRuns.mockResolvedValueOnce([runningTestRun]);
+			getTestRun.mockResolvedValue({
+				...runningTestRun,
+				status: 'running',
+			});
+
+			await store.fetchTestRuns('1');
+
+			// Wait for the first poll to complete
+			await vi.runOnlyPendingTimersAsync();
+
+			// Clear mock calls from initial setup
+			getTestRun.mockClear();
+
+			store.cleanupPolling();
+
+			// Advance timer
+			await vi.advanceTimersByTimeAsync(1000);
+
+			// Verify no more polling happened after cleanup
+			expect(getTestRun).not.toHaveBeenCalled();
+		});
+	});
+});
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..bcdbd636ad
--- /dev/null
+++ b/packages/editor-ui/src/stores/testDefinition.store.ee.ts
@@ -0,0 +1,387 @@
+import { defineStore } from 'pinia';
+import { computed, ref } from 'vue';
+import { useRootStore } from './root.store';
+import * as testDefinitionsApi from '@/api/testDefinition.ee';
+import type { TestDefinitionRecord, TestRunRecord } 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);
+		const metricsById = ref<Record<string, testDefinitionsApi.TestMetricRecord>>({});
+		const testRunsById = ref<Record<string, TestRunRecord>>({});
+		const pollingTimeouts = ref<Record<string, NodeJS.Timeout>>({});
+
+		// 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 ?? ''),
+			);
+		});
+
+		const allTestDefinitionsByWorkflowId = computed(() => {
+			return Object.values(testDefinitionsById.value).reduce(
+				(acc: Record<string, TestDefinitionRecord[]>, test) => {
+					if (!acc[test.workflowId]) {
+						acc[test.workflowId] = [];
+					}
+					acc[test.workflowId].push(test);
+					return acc;
+				},
+				{},
+			);
+		});
+
+		// 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);
+
+		const metricsByTestId = computed(() => {
+			return Object.values(metricsById.value).reduce(
+				(acc: Record<string, testDefinitionsApi.TestMetricRecord[]>, metric) => {
+					if (!acc[metric.testDefinitionId]) {
+						acc[metric.testDefinitionId] = [];
+					}
+					acc[metric.testDefinitionId].push(metric);
+					return acc;
+				},
+				{},
+			);
+		});
+
+		const testRunsByTestId = computed(() => {
+			return Object.values(testRunsById.value).reduce(
+				(acc: Record<string, TestRunRecord[]>, run) => {
+					if (!acc[run.testDefinitionId]) {
+						acc[run.testDefinitionId] = [];
+					}
+					acc[run.testDefinitionId].push(run);
+					return acc;
+				},
+				{},
+			);
+		});
+
+		const lastRunByTestId = computed(() => {
+			const grouped = Object.values(testRunsById.value).reduce(
+				(acc: Record<string, TestRunRecord[]>, run) => {
+					if (!acc[run.testDefinitionId]) {
+						acc[run.testDefinitionId] = [];
+					}
+					acc[run.testDefinitionId].push(run);
+					return acc;
+				},
+				{},
+			);
+
+			return Object.entries(grouped).reduce(
+				(acc: Record<string, TestRunRecord | null>, [testId, runs]) => {
+					acc[testId] =
+						runs.sort(
+							(a, b) => new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime(),
+						)[0] || null;
+					return acc;
+				},
+				{},
+			);
+		});
+
+		// 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;
+		};
+
+		const fetchRunsForAllTests = async () => {
+			const testDefinitions = Object.values(testDefinitionsById.value);
+			try {
+				await Promise.all(testDefinitions.map(async (testDef) => await fetchTestRuns(testDef.id)));
+			} catch (error) {
+				console.error('Error fetching test runs:', error);
+			}
+		};
+
+		const fetchTestDefinition = async (id: string) => {
+			const testDefinition = await testDefinitionsApi.getTestDefinition(
+				rootStore.restApiContext,
+				id,
+			);
+			testDefinitionsById.value[testDefinition.id] = testDefinition;
+
+			return testDefinition;
+		};
+
+		/**
+		 * 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; workflowId?: string }) => {
+			const { force = false, workflowId } = params ?? {};
+			if (!force && fetchedAll.value && !workflowId) {
+				const testDefinitions = Object.values(testDefinitionsById.value);
+				return {
+					count: testDefinitions.length,
+					testDefinitions,
+				};
+			}
+
+			loading.value = true;
+			try {
+				const retrievedDefinitions = await testDefinitionsApi.getTestDefinitions(
+					rootStore.restApiContext,
+					{ workflowId },
+				);
+
+				setAllTestDefinitions(retrievedDefinitions.testDefinitions);
+				fetchedAll.value = true;
+
+				await fetchRunsForAllTests();
+				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;
+		};
+
+		const fetchMetrics = async (testId: string) => {
+			loading.value = true;
+			try {
+				const metrics = await testDefinitionsApi.getTestMetrics(rootStore.restApiContext, testId);
+				metrics.forEach((metric) => {
+					metricsById.value[metric.id] = metric;
+				});
+				return metrics;
+			} finally {
+				loading.value = false;
+			}
+		};
+
+		const createMetric = async (params: {
+			name: string;
+			testDefinitionId: string;
+		}): Promise<testDefinitionsApi.TestMetricRecord> => {
+			const metric = await testDefinitionsApi.createTestMetric(rootStore.restApiContext, params);
+			metricsById.value[metric.id] = metric;
+			return metric;
+		};
+
+		const updateMetric = async (
+			params: testDefinitionsApi.TestMetricRecord,
+		): Promise<testDefinitionsApi.TestMetricRecord> => {
+			const metric = await testDefinitionsApi.updateTestMetric(rootStore.restApiContext, params);
+			metricsById.value[metric.id] = metric;
+			return metric;
+		};
+
+		const deleteMetric = async (
+			params: testDefinitionsApi.DeleteTestMetricParams,
+		): Promise<void> => {
+			await testDefinitionsApi.deleteTestMetric(rootStore.restApiContext, params);
+			const { [params.id]: deleted, ...rest } = metricsById.value;
+			metricsById.value = rest;
+		};
+
+		// Test Runs Methods
+		const fetchTestRuns = async (testDefinitionId: string) => {
+			loading.value = true;
+			try {
+				const runs = await testDefinitionsApi.getTestRuns(
+					rootStore.restApiContext,
+					testDefinitionId,
+				);
+				runs.forEach((run) => {
+					testRunsById.value[run.id] = run;
+					if (['running', 'new'].includes(run.status)) {
+						startPollingTestRun(testDefinitionId, run.id);
+					}
+				});
+				return runs;
+			} finally {
+				loading.value = false;
+			}
+		};
+
+		const getTestRun = async (params: { testDefinitionId: string; runId: string }) => {
+			const run = await testDefinitionsApi.getTestRun(rootStore.restApiContext, params);
+			testRunsById.value[run.id] = run;
+			return run;
+		};
+
+		const startTestRun = async (testDefinitionId: string) => {
+			const result = await testDefinitionsApi.startTestRun(
+				rootStore.restApiContext,
+				testDefinitionId,
+			);
+			return result;
+		};
+
+		const cancelTestRun = async (testDefinitionId: string, testRunId: string) => {
+			const result = await testDefinitionsApi.cancelTestRun(
+				rootStore.restApiContext,
+				testDefinitionId,
+				testRunId,
+			);
+			return result;
+		};
+
+		const deleteTestRun = async (params: { testDefinitionId: string; runId: string }) => {
+			const result = await testDefinitionsApi.deleteTestRun(rootStore.restApiContext, params);
+			if (result.success) {
+				const { [params.runId]: deleted, ...rest } = testRunsById.value;
+				testRunsById.value = rest;
+			}
+			return result;
+		};
+
+		// TODO: This is a temporary solution to poll for test run status.
+		// We should use a more efficient polling mechanism in the future.
+		const startPollingTestRun = (testDefinitionId: string, runId: string) => {
+			const poll = async () => {
+				const run = await getTestRun({ testDefinitionId, runId });
+				if (['running', 'new'].includes(run.status)) {
+					pollingTimeouts.value[runId] = setTimeout(poll, 1000);
+				} else {
+					delete pollingTimeouts.value[runId];
+				}
+			};
+			void poll();
+		};
+
+		const cleanupPolling = () => {
+			Object.values(pollingTimeouts.value).forEach((timeout) => {
+				clearTimeout(timeout);
+			});
+			pollingTimeouts.value = {};
+		};
+
+		return {
+			// State
+			fetchedAll,
+			testDefinitionsById,
+			testRunsById,
+
+			// Computed
+			allTestDefinitions,
+			allTestDefinitionsByWorkflowId,
+			isLoading,
+			hasTestDefinitions,
+			isFeatureEnabled,
+			metricsById,
+			metricsByTestId,
+			testRunsByTestId,
+			lastRunByTestId,
+
+			// Methods
+			fetchTestDefinition,
+			fetchAll,
+			create,
+			update,
+			deleteById,
+			upsertTestDefinitions,
+			deleteTestDefinition,
+			fetchMetrics,
+			createMetric,
+			updateMetric,
+			deleteMetric,
+			fetchTestRuns,
+			getTestRun,
+			startTestRun,
+			cancelTestRun,
+			deleteTestRun,
+			cleanupPolling,
+		};
+	},
+	{},
+);
diff --git a/packages/editor-ui/src/stores/ui.store.ts b/packages/editor-ui/src/stores/ui.store.ts
index 4121099291..c8d0939482 100644
--- a/packages/editor-ui/src/stores/ui.store.ts
+++ b/packages/editor-ui/src/stores/ui.store.ts
@@ -11,12 +11,12 @@ import {
 	CREDENTIAL_SELECT_MODAL_KEY,
 	DELETE_USER_MODAL_KEY,
 	DUPLICATE_MODAL_KEY,
-	FAKE_DOOR_FEATURES,
 	IMPORT_CURL_MODAL_KEY,
 	INVITE_USER_MODAL_KEY,
 	LOG_STREAM_MODAL_KEY,
 	MFA_SETUP_MODAL_KEY,
 	PERSONALIZATION_MODAL_KEY,
+	NODE_PINNING_MODAL_KEY,
 	STORES,
 	TAGS_MANAGER_MODAL_KEY,
 	ANNOTATION_TAGS_MANAGER_MODAL_KEY,
@@ -24,14 +24,12 @@ import {
 	VERSIONS_MODAL_KEY,
 	VIEWS,
 	WORKFLOW_ACTIVE_MODAL_KEY,
-	WORKFLOW_LM_CHAT_MODAL_KEY,
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_SHARE_MODAL_KEY,
 	EXTERNAL_SECRETS_PROVIDER_MODAL_KEY,
 	SOURCE_CONTROL_PUSH_MODAL_KEY,
 	SOURCE_CONTROL_PULL_MODAL_KEY,
 	DEBUG_PAYWALL_MODAL_KEY,
-	N8N_PRICING_PAGE_URL,
 	WORKFLOW_HISTORY_VERSION_RESTORE,
 	SETUP_CREDENTIALS_MODAL_KEY,
 	PROJECT_MOVE_RESOURCE_MODAL,
@@ -40,10 +38,7 @@ import {
 	COMMUNITY_PLUS_ENROLLMENT_MODAL,
 } from '@/constants';
 import type {
-	CloudUpdateLinkSourceType,
-	IFakeDoorLocation,
 	INodeUi,
-	UTMCampaign,
 	XYPosition,
 	Modals,
 	NewCredentialsModal,
@@ -51,18 +46,16 @@ import type {
 	NotificationOptions,
 	ModalState,
 	ModalKey,
-	IFakeDoor,
+	AppliedThemeOption,
 } from '@/Interface';
 import { defineStore } from 'pinia';
 import { useRootStore } from '@/stores/root.store';
 import * as curlParserApi from '@/api/curlHelper';
-import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import { hasPermission } from '@/utils/rbac/permissions';
 import { useUsersStore } from '@/stores/users.store';
 import { dismissBannerPermanently } from '@/api/ui';
-import type { BannerName } from 'n8n-workflow';
+import type { BannerName } from '@n8n/api-types';
 import {
 	addThemeToBody,
 	getPreferredTheme,
@@ -72,9 +65,10 @@ import {
 } from './ui.utils';
 import { computed, ref } from 'vue';
 import type { Connection } from '@vue-flow/core';
-import { useTelemetry } from '@/composables/useTelemetry';
+import { useLocalStorage } from '@vueuse/core';
 
 let savedTheme: ThemeOption = 'system';
+
 try {
 	const value = getThemeOverride();
 	if (isValidTheme(value)) {
@@ -107,12 +101,12 @@ export const useUIStore = defineStore(STORES.UI, () => {
 				CREDENTIAL_SELECT_MODAL_KEY,
 				DUPLICATE_MODAL_KEY,
 				PERSONALIZATION_MODAL_KEY,
+				NODE_PINNING_MODAL_KEY,
 				INVITE_USER_MODAL_KEY,
 				TAGS_MANAGER_MODAL_KEY,
 				ANNOTATION_TAGS_MANAGER_MODAL_KEY,
 				NPS_SURVEY_MODAL_KEY,
 				VERSIONS_MODAL_KEY,
-				WORKFLOW_LM_CHAT_MODAL_KEY,
 				WORKFLOW_SETTINGS_MODAL_KEY,
 				WORKFLOW_SHARE_MODAL_KEY,
 				WORKFLOW_ACTIVE_MODAL_KEY,
@@ -158,20 +152,9 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	});
 
 	const modalStack = ref<string[]>([]);
-	const sidebarMenuCollapsed = ref<boolean>(true);
+	const sidebarMenuCollapsedPreference = useLocalStorage<boolean>('sidebar.collapsed', false);
+	const sidebarMenuCollapsed = ref<boolean>(sidebarMenuCollapsedPreference.value);
 	const currentView = ref<string>('');
-	const fakeDoorFeatures = ref<IFakeDoor[]>([
-		{
-			id: FAKE_DOOR_FEATURES.SSO,
-			featureName: 'fakeDoor.settings.sso.name',
-			icon: 'key',
-			actionBoxTitle: 'fakeDoor.settings.sso.actionBox.title',
-			actionBoxDescription: 'fakeDoor.settings.sso.actionBox.description',
-			linkURL: 'https://n8n-community.typeform.com/to/l7QOrERN#f=sso',
-			uiLocations: ['settings/users'],
-		},
-	]);
-
 	const draggable = ref<Draggable>({
 		isDragging: false,
 		type: '',
@@ -192,7 +175,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	const bannersHeight = ref<number>(0);
 	const bannerStack = ref<BannerName[]>([]);
 	const pendingNotificationsForViews = ref<{ [key in VIEWS]?: NotificationOptions[] }>({});
-	const isCreateNodeActive = ref<boolean>(false);
+	const processingExecutionResults = ref<boolean>(false);
 
 	const appGridWidth = ref<number>(0);
 
@@ -205,20 +188,17 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	const settingsStore = useSettingsStore();
 	const workflowsStore = useWorkflowsStore();
 	const rootStore = useRootStore();
-	const telemetry = useTelemetry();
-	const cloudPlanStore = useCloudPlanStore();
 	const userStore = useUsersStore();
 
-	const appliedTheme = computed(() => {
-		return theme.value === 'system' ? getPreferredTheme() : theme.value;
+	// Keep track of the preferred theme and update it when the system preference changes
+	const preferredTheme = getPreferredTheme();
+	const preferredSystemTheme = ref<AppliedThemeOption>(preferredTheme.theme);
+	preferredTheme.mediaQuery?.addEventListener('change', () => {
+		preferredSystemTheme.value = getPreferredTheme().theme;
 	});
 
-	const logo = computed(() => {
-		const { releaseChannel } = settingsStore.settings;
-		const suffix = appliedTheme.value === 'dark' ? '-dark.svg' : '.svg';
-		return `static/logo/${
-			releaseChannel === 'stable' ? 'expanded' : `channel/${releaseChannel}`
-		}${suffix}`;
+	const appliedTheme = computed(() => {
+		return theme.value === 'system' ? preferredSystemTheme.value : theme.value;
 	});
 
 	const contextBasedTranslationKeys = computed(() => {
@@ -307,22 +287,6 @@ export const useUIStore = defineStore(STORES.UI, () => {
 
 	const activeModals = computed(() => modalStack.value.map((modalName) => modalName));
 
-	const fakeDoorsByLocation = computed(() =>
-		fakeDoorFeatures.value.reduce((acc: { [uiLocation: string]: IFakeDoor }, fakeDoor) => {
-			fakeDoor.uiLocations.forEach((uiLocation: IFakeDoorLocation) => {
-				acc[uiLocation] = fakeDoor;
-			});
-			return acc;
-		}, {}),
-	);
-
-	const fakeDoorsById = computed(() =>
-		fakeDoorFeatures.value.reduce((acc: { [id: string]: IFakeDoor }, fakeDoor) => {
-			acc[fakeDoor.id.toString()] = fakeDoor;
-			return acc;
-		}, {}),
-	);
-
 	const isReadOnlyView = computed(() => {
 		return ![
 			VIEWS.WORKFLOW.toString(),
@@ -366,6 +330,12 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		return modalStack.value.length > 0;
 	});
 
+	/**
+	 * Whether we are currently in the process of fetching and deserializing
+	 * the full execution data and loading it to the store.
+	 */
+	const isProcessingExecutionResults = computed(() => processingExecutionResults.value);
+
 	// Methods
 
 	const setTheme = (newTheme: ThemeOption): void => {
@@ -541,7 +511,9 @@ export const useUIStore = defineStore(STORES.UI, () => {
 	};
 
 	const toggleSidebarMenuCollapse = () => {
-		sidebarMenuCollapsed.value = !sidebarMenuCollapsed.value;
+		const newCollapsedState = !sidebarMenuCollapsed.value;
+		sidebarMenuCollapsedPreference.value = newCollapsedState;
+		sidebarMenuCollapsed.value = newCollapsedState;
 	};
 
 	const getCurlToJson = async (curlCommand: string) => {
@@ -557,33 +529,6 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		return parameters;
 	};
 
-	const goToUpgrade = async (
-		source: CloudUpdateLinkSourceType,
-		utm_campaign: UTMCampaign,
-		mode: 'open' | 'redirect' = 'open',
-	) => {
-		const { usageLeft, trialDaysLeft, userIsTrialing } = cloudPlanStore;
-		const { executionsLeft, workflowsLeft } = usageLeft;
-		const deploymentType = settingsStore.deploymentType;
-
-		telemetry.track('User clicked upgrade CTA', {
-			source,
-			isTrial: userIsTrialing,
-			deploymentType,
-			trialDaysLeft,
-			executionsLeft,
-			workflowsLeft,
-		});
-
-		const upgradeLink = await generateUpgradeLinkUrl(source, utm_campaign, deploymentType);
-
-		if (mode === 'open') {
-			window.open(upgradeLink, '_blank');
-		} else {
-			location.href = upgradeLink;
-		}
-	};
-
 	const removeBannerFromStack = (name: BannerName) => {
 		bannerStack.value = bannerStack.value.filter((bannerName) => bannerName !== name);
 	};
@@ -628,15 +573,21 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		lastCancelledConnectionPosition.value = undefined;
 	}
 
+	/**
+	 * Set whether we are currently in the process of fetching and deserializing
+	 * the full execution data and loading it to the store.
+	 */
+	const setProcessingExecutionResults = (value: boolean) => {
+		processingExecutionResults.value = value;
+	};
+
 	return {
 		appGridWidth,
 		appliedTheme,
-		logo,
 		contextBasedTranslationKeys,
 		getLastSelectedNode,
 		isVersionsOpen,
 		isModalActiveById,
-		fakeDoorsByLocation,
 		isReadOnlyView,
 		isActionActive,
 		activeActions,
@@ -659,16 +610,16 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		nodeViewMoveInProgress,
 		nodeViewInitialized,
 		addFirstStepOnLoad,
-		isCreateNodeActive,
 		sidebarMenuCollapsed,
-		fakeDoorFeatures,
+		sidebarMenuCollapsedPreference,
 		bannerStack,
 		theme,
 		modalsById,
 		currentView,
 		isAnyModalOpen,
-		fakeDoorsById,
 		pendingNotificationsForViews,
+		activeModals,
+		isProcessingExecutionResults,
 		setTheme,
 		setMode,
 		setActiveId,
@@ -695,7 +646,6 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		setCurlCommand,
 		toggleSidebarMenuCollapse,
 		getCurlToJson,
-		goToUpgrade,
 		removeBannerFromStack,
 		dismissBanner,
 		updateBannersHeight,
@@ -704,7 +654,7 @@ export const useUIStore = defineStore(STORES.UI, () => {
 		setNotificationsForView,
 		deleteNotificationsForView,
 		resetLastInteractedWith,
-		activeModals,
+		setProcessingExecutionResults,
 	};
 });
 
@@ -748,34 +698,3 @@ export const listenForModalChanges = (opts: {
 		});
 	});
 };
-
-export const generateUpgradeLinkUrl = async (
-	source: string,
-	utm_campaign: string,
-	deploymentType: string,
-) => {
-	let linkUrl = '';
-
-	const searchParams = new URLSearchParams();
-
-	const cloudPlanStore = useCloudPlanStore();
-
-	if (deploymentType === 'cloud' && hasPermission(['instanceOwner'])) {
-		const adminPanelHost = new URL(window.location.href).host.split('.').slice(1).join('.');
-		const { code } = await cloudPlanStore.getAutoLoginCode();
-		linkUrl = `https://${adminPanelHost}/login`;
-		searchParams.set('code', code);
-		searchParams.set('returnPath', '/account/change-plan');
-	} else {
-		linkUrl = N8N_PRICING_PAGE_URL;
-	}
-
-	if (utm_campaign) {
-		searchParams.set('utm_campaign', utm_campaign);
-	}
-
-	if (source) {
-		searchParams.set('source', source);
-	}
-	return `${linkUrl}?${searchParams.toString()}`;
-};
diff --git a/packages/editor-ui/src/stores/__tests__/ui.test.ts b/packages/editor-ui/src/stores/ui.test.ts
similarity index 78%
rename from packages/editor-ui/src/stores/__tests__/ui.test.ts
rename to packages/editor-ui/src/stores/ui.test.ts
index ace9ab3bca..ea937abb6e 100644
--- a/packages/editor-ui/src/stores/__tests__/ui.test.ts
+++ b/packages/editor-ui/src/stores/ui.test.ts
@@ -1,17 +1,17 @@
 import { createPinia, setActivePinia } from 'pinia';
-import { generateUpgradeLinkUrl, useUIStore } from '@/stores/ui.store';
+import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { merge } from 'lodash-es';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import * as cloudPlanApi from '@/api/cloudPlans';
-import { defaultSettings } from '../../__tests__/defaults';
+import { defaultSettings } from '../__tests__/defaults';
 import {
 	getTrialExpiredUserResponse,
 	getTrialingUserResponse,
 	getUserCloudInfo,
 	getNotTrialingUserResponse,
-} from './utils/cloudStoreUtils';
+} from './__tests__/utils/cloudStoreUtils';
 import type { IRole } from '@/Interface';
 import { ROLE } from '@/constants';
 
@@ -70,57 +70,6 @@ describe('UI store', () => {
 		});
 	});
 
-	test.each([
-		[
-			'default',
-			'production',
-			ROLE.Owner,
-			'https://n8n.io/pricing?utm_campaign=utm-test-campaign&source=test_source',
-		],
-		[
-			'default',
-			'development',
-			ROLE.Owner,
-			'https://n8n.io/pricing?utm_campaign=utm-test-campaign&source=test_source',
-		],
-		[
-			'cloud',
-			'production',
-			ROLE.Owner,
-			`https://app.n8n.cloud/login?code=123&returnPath=${encodeURIComponent(
-				'/account/change-plan',
-			)}&utm_campaign=utm-test-campaign&source=test_source`,
-		],
-		[
-			'cloud',
-			'production',
-			ROLE.Member,
-			'https://n8n.io/pricing?utm_campaign=utm-test-campaign&source=test_source',
-		],
-	])(
-		'"generateUpgradeLinkUrl" should generate the correct URL for "%s" deployment and "%s" license environment and user role "%s"',
-		async (type, environment, role, expectation) => {
-			setUser(role as IRole);
-
-			settingsStore.setSettings(
-				merge({}, defaultSettings, {
-					deployment: {
-						type,
-					},
-					license: {
-						environment,
-					},
-					instanceId: '123abc',
-					versionCli: '0.223.0',
-				}),
-			);
-
-			const updateLinkUrl = await generateUpgradeLinkUrl('test_source', 'utm-test-campaign', type);
-
-			expect(updateLinkUrl).toBe(expectation);
-		},
-	);
-
 	it('should add non-production license banner to stack based on enterprise settings', () => {
 		settingsStore.setSettings(
 			merge({}, defaultSettings, {
diff --git a/packages/editor-ui/src/stores/ui.utils.ts b/packages/editor-ui/src/stores/ui.utils.ts
index 9245bc549a..19e147f494 100644
--- a/packages/editor-ui/src/stores/ui.utils.ts
+++ b/packages/editor-ui/src/stores/ui.utils.ts
@@ -31,9 +31,11 @@ export function updateTheme(theme: ThemeOption) {
 	}
 }
 
-export function getPreferredTheme(): AppliedThemeOption {
-	const isDarkMode =
-		!!window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)')?.matches;
+export function getPreferredTheme(): { theme: AppliedThemeOption; mediaQuery: MediaQueryList } {
+	const isDarkModeQuery = !!window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)');
 
-	return isDarkMode ? 'dark' : 'light';
+	return {
+		theme: isDarkModeQuery?.matches ? 'dark' : 'light',
+		mediaQuery: isDarkModeQuery,
+	};
 }
diff --git a/packages/editor-ui/src/stores/__tests__/usage.test.ts b/packages/editor-ui/src/stores/usage.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/__tests__/usage.test.ts
rename to packages/editor-ui/src/stores/usage.test.ts
diff --git a/packages/editor-ui/src/stores/users.store.ts b/packages/editor-ui/src/stores/users.store.ts
index 4f17aa3f76..b349bcb37f 100644
--- a/packages/editor-ui/src/stores/users.store.ts
+++ b/packages/editor-ui/src/stores/users.store.ts
@@ -18,7 +18,6 @@ import { getPersonalizedNodeTypes } from '@/utils/userUtils';
 import { defineStore } from 'pinia';
 import { useRootStore } from '@/stores/root.store';
 import { usePostHog } from './posthog.store';
-import { useSettingsStore } from './settings.store';
 import { useUIStore } from './ui.store';
 import { useCloudPlanStore } from './cloudPlan.store';
 import * as mfaApi from '@/api/mfa';
@@ -29,6 +28,7 @@ import * as invitationsApi from '@/api/invitation';
 import { useNpsSurveyStore } from './npsSurvey.store';
 import { computed, ref } from 'vue';
 import { useTelemetry } from '@/composables/useTelemetry';
+import { useSettingsStore } from '@/stores/settings.store';
 
 const _isPendingUser = (user: IUserResponse | null) => !!user?.isPending;
 const _isInstanceOwner = (user: IUserResponse | null) => user?.role === ROLE.Owner;
@@ -49,6 +49,7 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 	const rootStore = useRootStore();
 	const settingsStore = useSettingsStore();
 	const cloudPlanStore = useCloudPlanStore();
+
 	const telemetry = useTelemetry();
 
 	// Composables
@@ -73,6 +74,18 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 
 	const globalRoleName = computed(() => currentUser.value?.role ?? 'default');
 
+	const userClaimedAiCredits = computed(() => currentUser.value?.settings?.userClaimedAiCredits);
+
+	const isEasyAIWorkflowOnboardingDone = computed(() =>
+		Boolean(currentUser.value?.settings?.easyAIWorkflowOnboarded),
+	);
+
+	const setEasyAIWorkflowOnboardingDone = () => {
+		if (currentUser.value?.settings) {
+			currentUser.value.settings.easyAIWorkflowOnboarded = true;
+		}
+	};
+
 	const personalizedNodeTypes = computed(() => {
 		const user = currentUser.value;
 		if (!user) {
@@ -171,7 +184,7 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 	const loginWithCreds = async (params: {
 		email: string;
 		password: string;
-		mfaToken?: string;
+		mfaCode?: string;
 		mfaRecoveryCode?: string;
 	}) => {
 		const user = await usersApi.login(rootStore.restApiContext, params);
@@ -231,7 +244,7 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		await usersApi.validatePasswordToken(rootStore.restApiContext, params);
 	};
 
-	const changePassword = async (params: { token: string; password: string; mfaToken?: string }) => {
+	const changePassword = async (params: { token: string; password: string; mfaCode?: string }) => {
 		await usersApi.changePassword(rootStore.restApiContext, params);
 	};
 
@@ -315,25 +328,23 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		return await mfaApi.getMfaQR(rootStore.restApiContext);
 	};
 
-	const verifyMfaToken = async (data: { token: string }) => {
-		return await mfaApi.verifyMfaToken(rootStore.restApiContext, data);
+	const verifyMfaCode = async (data: { mfaCode: string }) => {
+		return await mfaApi.verifyMfaCode(rootStore.restApiContext, data);
 	};
 
 	const canEnableMFA = async () => {
 		return await mfaApi.canEnableMFA(rootStore.restApiContext);
 	};
 
-	const enableMfa = async (data: { token: string }) => {
+	const enableMfa = async (data: { mfaCode: string }) => {
 		await mfaApi.enableMfa(rootStore.restApiContext, data);
 		if (currentUser.value) {
 			currentUser.value.mfaEnabled = true;
 		}
 	};
 
-	const disableMfa = async (mfaCode: string) => {
-		await mfaApi.disableMfa(rootStore.restApiContext, {
-			token: mfaCode,
-		});
+	const disableMfa = async (data: mfaApi.DisableMfaParams) => {
+		await mfaApi.disableMfa(rootStore.restApiContext, data);
 
 		if (currentUser.value) {
 			currentUser.value.mfaEnabled = false;
@@ -379,6 +390,8 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		mfaEnabled,
 		globalRoleName,
 		personalizedNodeTypes,
+		userClaimedAiCredits,
+		isEasyAIWorkflowOnboardingDone,
 		addUsers,
 		loginWithCookie,
 		initialize,
@@ -403,7 +416,7 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		submitPersonalizationSurvey,
 		showPersonalizationSurvey,
 		fetchMfaQR,
-		verifyMfaToken,
+		verifyMfaCode,
 		enableMfa,
 		disableMfa,
 		canEnableMFA,
@@ -411,5 +424,6 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 		sendConfirmationEmail,
 		updateGlobalRole,
 		reset,
+		setEasyAIWorkflowOnboardingDone,
 	};
 });
diff --git a/packages/editor-ui/src/stores/__tests__/workflowHistory.store.test.ts b/packages/editor-ui/src/stores/workflowHistory.store.test.ts
similarity index 100%
rename from packages/editor-ui/src/stores/__tests__/workflowHistory.store.test.ts
rename to packages/editor-ui/src/stores/workflowHistory.store.test.ts
diff --git a/packages/editor-ui/src/stores/workflows.store.spec.ts b/packages/editor-ui/src/stores/workflows.store.test.ts
similarity index 87%
rename from packages/editor-ui/src/stores/workflows.store.spec.ts
rename to packages/editor-ui/src/stores/workflows.store.test.ts
index acf86d0744..a612be7441 100644
--- a/packages/editor-ui/src/stores/workflows.store.spec.ts
+++ b/packages/editor-ui/src/stores/workflows.store.test.ts
@@ -8,27 +8,18 @@ import {
 	WAIT_NODE_TYPE,
 } from '@/constants';
 import { useWorkflowsStore } from '@/stores/workflows.store';
-import type {
-	IExecutionResponse,
-	IExecutionsCurrentSummaryExtended,
-	INodeUi,
-	IWorkflowDb,
-	IWorkflowSettings,
-} from '@/Interface';
+import type { IExecutionResponse, INodeUi, IWorkflowDb, IWorkflowSettings } from '@/Interface';
 import { useNodeTypesStore } from '@/stores/nodeTypes.store';
 
-import {
-	SEND_AND_WAIT_OPERATION,
-	type ExecutionSummary,
-	type IConnection,
-	type INodeExecutionData,
-} from 'n8n-workflow';
+import { SEND_AND_WAIT_OPERATION } from 'n8n-workflow';
+import type { IPinData, ExecutionSummary, IConnection, INodeExecutionData } from 'n8n-workflow';
 import { stringSizeInBytes } from '@/utils/typesUtils';
 import { dataPinningEventBus } from '@/event-bus';
 import { useUIStore } from '@/stores/ui.store';
 import type { PushPayload } from '@n8n/api-types';
 import { flushPromises } from '@vue/test-utils';
 import { useNDVStore } from '@/stores/ndv.store';
+import { mock } from 'vitest-mock-extended';
 
 vi.mock('@/stores/ndv.store', () => ({
 	useNDVStore: vi.fn(() => ({
@@ -477,7 +468,6 @@ describe('useWorkflowsStore', () => {
 			const expectedName = `${name}${DUPLICATE_POSTFFIX}`;
 			vi.mocked(workflowsApi).getNewWorkflow.mockResolvedValue({
 				name: expectedName,
-				onboardingFlowEnabled: false,
 				settings: {} as IWorkflowSettings,
 			});
 			const newName = await workflowsStore.getDuplicateCurrentWorkflowName(name);
@@ -533,20 +523,24 @@ describe('useWorkflowsStore', () => {
 		});
 	});
 
-	describe('addNodeExecutionData', () => {
-		const { successEvent, errorEvent, executionReponse } = generateMockExecutionEvents();
-		it('should throw error if not initalized', () => {
-			expect(() => workflowsStore.addNodeExecutionData(successEvent)).toThrowError();
+	describe('updateNodeExecutionData', () => {
+		const { successEvent, errorEvent, executionResponse } = generateMockExecutionEvents();
+		it('should throw error if not initialized', () => {
+			expect(() => workflowsStore.updateNodeExecutionData(successEvent)).toThrowError();
 		});
 
 		it('should add node success run data', () => {
-			workflowsStore.setWorkflowExecutionData(executionReponse);
+			workflowsStore.setWorkflowExecutionData(executionResponse);
+
+			workflowsStore.nodesByName[successEvent.nodeName] = mock<INodeUi>({
+				type: 'n8n-nodes-base.manualTrigger',
+			});
 
 			// ACT
-			workflowsStore.addNodeExecutionData(successEvent);
+			workflowsStore.updateNodeExecutionData(successEvent);
 
 			expect(workflowsStore.workflowExecutionData).toEqual({
-				...executionReponse,
+				...executionResponse,
 				data: {
 					resultData: {
 						runData: {
@@ -558,7 +552,7 @@ describe('useWorkflowsStore', () => {
 		});
 
 		it('should add node error event and track errored executions', async () => {
-			workflowsStore.setWorkflowExecutionData(executionReponse);
+			workflowsStore.setWorkflowExecutionData(executionResponse);
 			workflowsStore.addNode({
 				parameters: {},
 				id: '554c7ff4-7ee2-407c-8931-e34234c5056a',
@@ -571,11 +565,11 @@ describe('useWorkflowsStore', () => {
 			getNodeType.mockReturnValue(getMockEditFieldsNode());
 
 			// ACT
-			workflowsStore.addNodeExecutionData(errorEvent);
+			workflowsStore.updateNodeExecutionData(errorEvent);
 			await flushPromises();
 
 			expect(workflowsStore.workflowExecutionData).toEqual({
-				...executionReponse,
+				...executionResponse,
 				data: {
 					resultData: {
 						runData: {
@@ -599,51 +593,75 @@ describe('useWorkflowsStore', () => {
 				},
 			);
 		});
-	});
 
-	describe('finishActiveExecution', () => {
-		it('should update execution', async () => {
-			const cursor = 1;
-			const ids = ['0', '1', '2'];
-			workflowsStore.setActiveExecutions(
-				ids.map((id) => ({ id })) as IExecutionsCurrentSummaryExtended[],
-			);
-
-			const stoppedAt = new Date();
-
-			workflowsStore.finishActiveExecution({
-				executionId: ids[cursor],
-				data: {
-					finished: true,
-					stoppedAt,
-				},
-			} as PushPayload<'executionFinished'>);
-
-			expect(workflowsStore.activeExecutions[cursor]).toStrictEqual({
-				id: ids[cursor],
-				finished: true,
-				stoppedAt,
-			});
+		it('sets workflow pin data', () => {
+			workflowsStore.workflow.pinData = undefined;
+			const data: IPinData = {
+				TestNode: [{ json: { test: true } }],
+				TestNode1: [{ json: { test: false } }],
+			};
+			workflowsStore.setWorkflowPinData(data);
+			expect(workflowsStore.workflow.pinData).toEqual(data);
 		});
 
-		it('should handle parameter casting', async () => {
-			const cursor = 1;
-			const ids = ['0', '1', '2'];
-			workflowsStore.setActiveExecutions(
-				ids.map((id) => ({ id })) as IExecutionsCurrentSummaryExtended[],
-			);
-
-			workflowsStore.finishActiveExecution({
-				executionId: ids[cursor],
-			} as PushPayload<'executionFinished'>);
-
-			expect(workflowsStore.activeExecutions[cursor]).toStrictEqual({
-				id: ids[cursor],
-				finished: undefined,
-				stoppedAt: undefined,
+		it('sets workflow pin data, adding json keys', () => {
+			workflowsStore.workflow.pinData = undefined;
+			const data = {
+				TestNode: [{ test: true }],
+				TestNode1: [{ test: false }],
+			};
+			workflowsStore.setWorkflowPinData(data as unknown as IPinData);
+			expect(workflowsStore.workflow.pinData).toEqual({
+				TestNode: [{ json: { test: true } }],
+				TestNode1: [{ json: { test: false } }],
 			});
 		});
 	});
+
+	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() {
@@ -667,7 +685,7 @@ function getMockEditFieldsNode() {
 }
 
 function generateMockExecutionEvents() {
-	const executionReponse: IExecutionResponse = {
+	const executionResponse: IExecutionResponse = {
 		id: '1',
 		workflowData: {
 			id: '1',
@@ -682,6 +700,7 @@ function generateMockExecutionEvents() {
 		finished: false,
 		mode: 'cli',
 		startedAt: new Date(),
+		createdAt: new Date(),
 		status: 'new',
 		data: {
 			resultData: {
@@ -768,5 +787,5 @@ function generateMockExecutionEvents() {
 		},
 	};
 
-	return { executionReponse, errorEvent, successEvent };
+	return { executionResponse, errorEvent, successEvent };
 }
diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts
index 08bee0d448..7e4cb6d95e 100644
--- a/packages/editor-ui/src/stores/workflows.store.ts
+++ b/packages/editor-ui/src/stores/workflows.store.ts
@@ -1,4 +1,5 @@
 import {
+	AI_NODES_PACKAGE_NAME,
 	CHAT_TRIGGER_NODE_TYPE,
 	DEFAULT_NEW_WORKFLOW_NAME,
 	DUPLICATE_POSTFFIX,
@@ -11,10 +12,8 @@ import {
 	WAIT_NODE_TYPE,
 } from '@/constants';
 import type {
-	ExecutionsQueryFilter,
 	IExecutionPushResponse,
 	IExecutionResponse,
-	IExecutionsCurrentSummaryExtended,
 	IExecutionsListResponse,
 	INewWorkflowData,
 	INodeMetadata,
@@ -30,6 +29,7 @@ import type {
 	WorkflowMetadata,
 	IExecutionFlattedResponse,
 	IWorkflowTemplateNode,
+	IWorkflowDataCreate,
 } from '@/Interface';
 import { defineStore } from 'pinia';
 import type {
@@ -85,6 +85,10 @@ import { TelemetryHelpers } from 'n8n-workflow';
 import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useRouter } from 'vue-router';
 import { useSettingsStore } from './settings.store';
+import { clearPopupWindowState, openFormPopupWindow } from '@/utils/executionUtils';
+import { useNodeHelpers } from '@/composables/useNodeHelpers';
+import { useUsersStore } from '@/stores/users.store';
+import { updateCurrentUserSettings } from '@/api/users';
 
 const defaults: Omit<IWorkflowDb, 'id'> & { settings: NonNullable<IWorkflowDb['settings']> } = {
 	name: '',
@@ -116,6 +120,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	const router = useRouter();
 	const workflowHelpers = useWorkflowHelpers({ router });
 	const settingsStore = useSettingsStore();
+	const rootStore = useRootStore();
+	const nodeHelpers = useNodeHelpers();
+	const usersStore = useUsersStore();
+
 	// -1 means the backend chooses the default
 	// 0 is the old flow
 	// 1 is the new flow
@@ -125,10 +133,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	const usedCredentials = ref<Record<string, IUsedCredential>>({});
 
 	const activeWorkflows = ref<string[]>([]);
-	const activeExecutions = ref<IExecutionsCurrentSummaryExtended[]>([]);
 	const activeWorkflowExecution = ref<ExecutionSummary | null>(null);
 	const currentWorkflowExecutions = ref<ExecutionSummary[]>([]);
-	const finishedExecutionsCount = ref(0);
 	const workflowExecutionData = ref<IExecutionResponse | null>(null);
 	const workflowExecutionPairedItemMappings = ref<Record<string, Set<string>>>({});
 	const activeExecutionId = ref<string | null>(null);
@@ -139,6 +145,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	const nodeMetadata = ref<NodeMetadataMap>({});
 	const isInDebugMode = ref(false);
 	const chatMessages = ref<string[]>([]);
+	const isChatPanelOpen = ref(false);
+	const isLogsPanelOpen = ref(false);
 
 	const workflowName = computed(() => workflow.value.name);
 
@@ -264,8 +272,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 	const getWorkflowExecution = computed(() => workflowExecutionData.value);
 
-	const getTotalFinishedExecutionsCount = computed(() => finishedExecutionsCount.value);
-
 	const getPastChatMessages = computed(() => Array.from(new Set(chatMessages.value)));
 
 	function getWorkflowResultDataByNodeName(nodeName: string): ITaskData[] | null {
@@ -457,14 +463,12 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	async function getWorkflowFromUrl(url: string): Promise<IWorkflowDb> {
-		const rootStore = useRootStore();
 		return await makeRestApiRequest(rootStore.restApiContext, 'GET', '/workflows/from-url', {
 			url,
 		});
 	}
 
 	async function getActivationError(id: string): Promise<string | undefined> {
-		const rootStore = useRootStore();
 		return await makeRestApiRequest(
 			rootStore.restApiContext,
 			'GET',
@@ -473,8 +477,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	async function fetchAllWorkflows(projectId?: string): Promise<IWorkflowDb[]> {
-		const rootStore = useRootStore();
-
 		const filter = {
 			projectId,
 		};
@@ -488,7 +490,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	async function fetchWorkflow(id: string): Promise<IWorkflowDb> {
-		const rootStore = useRootStore();
 		const workflowData = await workflowsApi.getWorkflow(rootStore.restApiContext, id);
 		addWorkflow(workflowData);
 		return workflowData;
@@ -497,12 +498,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	async function getNewWorkflowData(name?: string, projectId?: string): Promise<INewWorkflowData> {
 		let workflowData = {
 			name: '',
-			onboardingFlowEnabled: false,
 			settings: { ...defaults.settings },
 		};
 		try {
-			const rootStore = useRootStore();
-
 			const data: IDataObject = {
 				name,
 				projectId,
@@ -636,7 +634,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	async function deleteWorkflow(id: string) {
-		const rootStore = useRootStore();
 		await makeRestApiRequest(rootStore.restApiContext, 'DELETE', `/workflows/${id}`);
 		const { [id]: deletedWorkflow, ...workflows } = workflowsById.value;
 		workflowsById.value = workflows;
@@ -680,7 +677,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	async function fetchActiveWorkflows(): Promise<string[]> {
-		const rootStore = useRootStore();
 		const data = await workflowsApi.getActiveWorkflows(rootStore.restApiContext);
 		activeWorkflows.value = data;
 		return data;
@@ -700,7 +696,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 		let newName = `${currentWorkflowName}${DUPLICATE_POSTFFIX}`;
 		try {
-			const rootStore = useRootStore();
 			const newWorkflow = await workflowsApi.getNewWorkflow(rootStore.restApiContext, {
 				name: newName,
 			});
@@ -735,14 +730,23 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		};
 	}
 
-	function setWorkflowPinData(pinData?: IPinData) {
-		workflow.value = {
-			...workflow.value,
-			pinData: pinData ?? {},
-		};
+	function setWorkflowPinData(data: IPinData = {}) {
+		const validPinData = Object.keys(data).reduce((accu, nodeName) => {
+			accu[nodeName] = data[nodeName].map((item) => {
+				if (!isJsonKeyObject(item)) {
+					return { json: item };
+				}
+
+				return item;
+			});
+
+			return accu;
+		}, {} as IPinData);
+
+		workflow.value.pinData = validPinData;
 		updateCachedWorkflow();
 
-		dataPinningEventBus.emit('pin-data', pinData ?? {});
+		dataPinningEventBus.emit('pin-data', validPinData);
 	}
 
 	function setWorkflowTagIds(tags: string[]) {
@@ -891,23 +895,28 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		let propertyName: keyof IConnection;
 		let connectionExists = false;
 
-		connectionLoop: for (const existingConnection of workflow.value.connections[sourceData.node][
-			sourceData.type
-		][sourceData.index]) {
-			for (propertyName of checkProperties) {
-				if (existingConnection[propertyName] !== destinationData[propertyName]) {
-					continue connectionLoop;
+		const nodeConnections = workflow.value.connections[sourceData.node][sourceData.type];
+		const connectionsToCheck = nodeConnections[sourceData.index];
+
+		if (connectionsToCheck) {
+			connectionLoop: for (const existingConnection of connectionsToCheck) {
+				for (propertyName of checkProperties) {
+					if (existingConnection[propertyName] !== destinationData[propertyName]) {
+						continue connectionLoop;
+					}
 				}
+				connectionExists = true;
+				break;
 			}
-			connectionExists = true;
-			break;
 		}
 
 		// Add the new connection if it does not exist already
 		if (!connectionExists) {
-			workflow.value.connections[sourceData.node][sourceData.type][sourceData.index].push(
-				destinationData,
-			);
+			nodeConnections[sourceData.index] = nodeConnections[sourceData.index] ?? [];
+			const connections = nodeConnections[sourceData.index];
+			if (connections) {
+				connections.push(destinationData);
+			}
 		}
 	}
 
@@ -934,6 +943,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 		const connections =
 			workflow.value.connections[sourceData.node][sourceData.type][sourceData.index];
+		if (!connections) {
+			return;
+		}
+
 		for (const index in connections) {
 			if (
 				connections[index].node === destinationData.node &&
@@ -979,23 +992,19 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 			for (type of Object.keys(workflow.value.connections[sourceNode])) {
 				for (sourceIndex of Object.keys(workflow.value.connections[sourceNode][type])) {
 					indexesToRemove.length = 0;
-					for (connectionIndex of Object.keys(
-						workflow.value.connections[sourceNode][type][parseInt(sourceIndex, 10)],
-					)) {
-						connectionData =
-							workflow.value.connections[sourceNode][type][parseInt(sourceIndex, 10)][
-								parseInt(connectionIndex, 10)
-							];
-						if (connectionData.node === node.name) {
-							indexesToRemove.push(connectionIndex);
+					const connectionsToRemove =
+						workflow.value.connections[sourceNode][type][parseInt(sourceIndex, 10)];
+					if (connectionsToRemove) {
+						for (connectionIndex of Object.keys(connectionsToRemove)) {
+							connectionData = connectionsToRemove[parseInt(connectionIndex, 10)];
+							if (connectionData.node === node.name) {
+								indexesToRemove.push(connectionIndex);
+							}
 						}
+						indexesToRemove.forEach((index) => {
+							connectionsToRemove.splice(parseInt(index, 10), 1);
+						});
 					}
-					indexesToRemove.forEach((index) => {
-						workflow.value.connections[sourceNode][type][parseInt(sourceIndex, 10)].splice(
-							parseInt(index, 10),
-							1,
-						);
-					});
 				}
 			}
 		}
@@ -1037,10 +1046,23 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 
 	function setNodes(nodes: INodeUi[]): void {
 		workflow.value.nodes = nodes;
+		nodes.forEach((node) => {
+			if (!node.id) {
+				nodeHelpers.assignNodeId(node);
+			}
+
+			if (!nodeMetadata.value[node.name]) {
+				nodeMetadata.value[node.name] = { pristine: true };
+			}
+		});
 	}
 
-	function setConnections(connections: IConnections): void {
+	function setConnections(connections: IConnections, updateWorkflow = false): void {
 		workflow.value.connections = connections;
+
+		if (updateWorkflow) {
+			updateCachedWorkflow();
+		}
 	}
 
 	function resetAllNodesIssues(): boolean {
@@ -1110,6 +1132,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		const { [node.name]: removedNodeMetadata, ...remainingNodeMetadata } = nodeMetadata.value;
 		nodeMetadata.value = remainingNodeMetadata;
 
+		// If chat trigger node is removed, close chat
+		if (node.type === CHAT_TRIGGER_NODE_TYPE) {
+			setPanelOpen('chat', false);
+		}
+
 		if (workflow.value.pinData && workflow.value.pinData.hasOwnProperty(node.name)) {
 			const { [node.name]: removedPinData, ...remainingPinData } = workflow.value.pinData;
 			workflow.value = {
@@ -1181,6 +1208,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 {
@@ -1258,12 +1289,24 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		}
 	}
 
-	function addNodeExecutionData(pushData: PushPayload<'nodeExecuteAfter'>): void {
+	function getFormResumeUrl(node: INode, executionId: string) {
+		const { webhookSuffix } = (node.parameters.options ?? {}) as IDataObject;
+		const suffix = webhookSuffix && typeof webhookSuffix !== 'object' ? `/${webhookSuffix}` : '';
+		const testUrl = `${rootStore.formWaitingUrl}/${executionId}${suffix}`;
+		return testUrl;
+	}
+
+	function updateNodeExecutionData(pushData: PushPayload<'nodeExecuteAfter'>): void {
 		if (!workflowExecutionData.value?.data) {
 			throw new Error('The "workflowExecutionData" is not initialized!');
 		}
 
-		if (workflowExecutionData.value.data.resultData.runData[pushData.nodeName] === undefined) {
+		const { nodeName, data, executionId } = pushData;
+		const isNodeWaiting = data.executionStatus === 'waiting';
+		const node = getNodeByName(nodeName);
+		if (!node) return;
+
+		if (workflowExecutionData.value.data.resultData.runData[nodeName] === undefined) {
 			workflowExecutionData.value = {
 				...workflowExecutionData.value,
 				data: {
@@ -1272,15 +1315,33 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 						...workflowExecutionData.value.data.resultData,
 						runData: {
 							...workflowExecutionData.value.data.resultData.runData,
-							[pushData.nodeName]: [],
+							[nodeName]: [],
 						},
 					},
 				},
 			};
 		}
-		workflowExecutionData.value.data!.resultData.runData[pushData.nodeName].push(pushData.data);
 
-		void trackNodeExecution(pushData);
+		const tasksData = workflowExecutionData.value.data!.resultData.runData[nodeName];
+		if (isNodeWaiting) {
+			tasksData.push(data);
+			if (
+				node.type === FORM_NODE_TYPE ||
+				(node.type === WAIT_NODE_TYPE && node.parameters.resume === 'form')
+			) {
+				const testUrl = getFormResumeUrl(node, executionId);
+				openFormPopupWindow(testUrl);
+			}
+		} else {
+			if (tasksData.length && tasksData[tasksData.length - 1].executionStatus === 'waiting') {
+				tasksData.splice(tasksData.length - 1, 1, data);
+			} else {
+				tasksData.push(data);
+			}
+
+			removeExecutingNode(nodeName);
+			void trackNodeExecution(pushData);
+		}
 	}
 
 	function clearNodeExecutionData(nodeName: string): void {
@@ -1314,52 +1375,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		return ndvStore.activeNode;
 	}
 
-	function addActiveExecution(newActiveExecution: IExecutionsCurrentSummaryExtended): void {
-		// Check if the execution exists already
-		const activeExecution = activeExecutions.value.find((execution) => {
-			return execution.id === newActiveExecution.id;
-		});
-
-		if (activeExecution !== undefined) {
-			// Exists already so no need to add it again
-			if (activeExecution.workflowName === undefined) {
-				activeExecution.workflowName = newActiveExecution.workflowName;
-			}
-			return;
-		}
-
-		activeExecutions.value.unshift(newActiveExecution);
-		activeExecutionId.value = newActiveExecution.id;
-	}
-
-	function finishActiveExecution(finishedActiveExecution: PushPayload<'executionFinished'>): void {
-		// Find the execution to set to finished
-		const activeExecutionIndex = activeExecutions.value.findIndex((execution) => {
-			return execution.id === finishedActiveExecution.executionId;
-		});
-
-		if (activeExecutionIndex === -1) {
-			// The execution could not be found
-			return;
-		}
-
-		Object.assign(activeExecutions.value[activeExecutionIndex], {
-			...(finishedActiveExecution.executionId !== undefined
-				? { id: finishedActiveExecution.executionId }
-				: {}),
-			finished: finishedActiveExecution.data?.finished,
-			stoppedAt: finishedActiveExecution.data?.stoppedAt,
-		});
-
-		if (finishedActiveExecution.data?.data) {
-			setWorkflowExecutionRunData(finishedActiveExecution.data.data);
-		}
-	}
-
-	function setActiveExecutions(newActiveExecutions: IExecutionsCurrentSummaryExtended[]): void {
-		activeExecutions.value = newActiveExecutions;
-	}
-
 	// TODO: For sure needs some kind of default filter like last day, with max 10 results, ...
 	async function getPastExecutions(
 		filter: IDataObject,
@@ -1376,32 +1391,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 				limit,
 			};
 		}
-		const rootStore = useRootStore();
 		return await makeRestApiRequest(rootStore.restApiContext, 'GET', '/executions', sendData);
 	}
 
-	async function getActiveExecutions(
-		filter: IDataObject,
-	): Promise<IExecutionsCurrentSummaryExtended[]> {
-		let sendData = {};
-		if (filter) {
-			sendData = {
-				filter,
-			};
-		}
-		const rootStore = useRootStore();
-		const output = await makeRestApiRequest<{ results: IExecutionsCurrentSummaryExtended[] }>(
-			rootStore.restApiContext,
-			'GET',
-			'/executions',
-			sendData,
-		);
-
-		return output.results;
-	}
-
 	async function getExecution(id: string): Promise<IExecutionResponse | undefined> {
-		const rootStore = useRootStore();
 		const response = await makeRestApiRequest<IExecutionFlattedResponse | undefined>(
 			rootStore.restApiContext,
 			'GET',
@@ -1411,23 +1404,40 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		return response && unflattenExecutionData(response);
 	}
 
-	async function createNewWorkflow(sendData: IWorkflowDataUpdate): Promise<IWorkflowDb> {
+	/**
+	 * Creates a new workflow with the provided data.
+	 * Ensures that the new workflow is not active upon creation.
+	 * If the project ID is not provided in the data, it assigns the current project ID from the project store.
+	 */
+	async function createNewWorkflow(sendData: IWorkflowDataCreate): Promise<IWorkflowDb> {
 		// make sure that the new ones are not active
 		sendData.active = false;
 
-		const rootStore = useRootStore();
 		const projectStore = useProjectsStore();
 
-		if (projectStore.currentProjectId) {
+		if (!sendData.projectId && projectStore.currentProjectId) {
 			(sendData as unknown as IDataObject).projectId = projectStore.currentProjectId;
 		}
 
-		return await makeRestApiRequest(
+		const newWorkflow = await makeRestApiRequest<IWorkflowDb>(
 			rootStore.restApiContext,
 			'POST',
 			'/workflows',
 			sendData as unknown as IDataObject,
 		);
+
+		const isAIWorkflow = workflowHelpers.containsNodeFromPackage(
+			newWorkflow,
+			AI_NODES_PACKAGE_NAME,
+		);
+		if (isAIWorkflow && !usersStore.isEasyAIWorkflowOnboardingDone) {
+			await updateCurrentUserSettings(rootStore.restApiContext, {
+				easyAIWorkflowOnboarded: true,
+			});
+			usersStore.setEasyAIWorkflowOnboardingDone();
+		}
+
+		return newWorkflow;
 	}
 
 	async function updateWorkflow(
@@ -1435,23 +1445,31 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		data: IWorkflowDataUpdate,
 		forceSave = false,
 	): Promise<IWorkflowDb> {
-		const rootStore = useRootStore();
-
 		if (data.settings === null) {
 			data.settings = undefined;
 		}
 
-		return await makeRestApiRequest(
+		const updatedWorkflow = await makeRestApiRequest<IWorkflowDb>(
 			rootStore.restApiContext,
 			'PATCH',
 			`/workflows/${id}${forceSave ? '?forceSave=true' : ''}`,
 			data as unknown as IDataObject,
 		);
+
+		if (
+			workflowHelpers.containsNodeFromPackage(updatedWorkflow, AI_NODES_PACKAGE_NAME) &&
+			!usersStore.isEasyAIWorkflowOnboardingDone
+		) {
+			await updateCurrentUserSettings(rootStore.restApiContext, {
+				easyAIWorkflowOnboarded: true,
+			});
+			usersStore.setEasyAIWorkflowOnboardingDone();
+		}
+
+		return updatedWorkflow;
 	}
 
 	async function runWorkflow(startRunData: IStartRunData): Promise<IExecutionPushResponse> {
-		const rootStore = useRootStore();
-
 		if (startRunData.workflowData.settings === null) {
 			startRunData.workflowData.settings = undefined;
 		}
@@ -1475,7 +1493,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	}
 
 	async function removeTestWebhook(targetWorkflowId: string): Promise<boolean> {
-		const rootStore = useRootStore();
 		return await makeRestApiRequest(
 			rootStore.restApiContext,
 			'DELETE',
@@ -1483,38 +1500,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		);
 	}
 
-	async function loadCurrentWorkflowExecutions(
-		requestFilter: ExecutionsQueryFilter,
-	): Promise<ExecutionSummary[]> {
-		let retrievedActiveExecutions: IExecutionsCurrentSummaryExtended[] = [];
-
-		if (!requestFilter.workflowId) {
-			return [];
-		}
-
-		try {
-			const rootStore = useRootStore();
-			if ((!requestFilter.status || !requestFilter.finished) && isEmpty(requestFilter.metadata)) {
-				retrievedActiveExecutions = await workflowsApi.getActiveExecutions(
-					rootStore.restApiContext,
-					{
-						workflowId: requestFilter.workflowId,
-					},
-				);
-			}
-			const retrievedFinishedExecutions = await workflowsApi.getExecutions(
-				rootStore.restApiContext,
-				requestFilter,
-			);
-			finishedExecutionsCount.value = retrievedFinishedExecutions.count;
-			return [...retrievedActiveExecutions, ...(retrievedFinishedExecutions.results || [])];
-		} catch (error) {
-			throw error;
-		}
-	}
-
 	async function fetchExecutionDataById(executionId: string): Promise<IExecutionResponse | null> {
-		const rootStore = useRootStore();
 		return await workflowsApi.getExecutionData(rootStore.restApiContext, executionId);
 	}
 
@@ -1537,7 +1523,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		fileName: string,
 		mimeType: string,
 	): string {
-		const rootStore = useRootStore();
 		let restUrl = rootStore.restUrl;
 		if (restUrl.startsWith('/')) restUrl = window.location.origin + restUrl;
 		const url = new URL(`${restUrl}/binary-data`);
@@ -1608,14 +1593,37 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 	// End Canvas V2 Functions
 	//
 
+	function setPanelOpen(panel: 'chat' | 'logs', isOpen: boolean) {
+		if (panel === 'chat') {
+			isChatPanelOpen.value = isOpen;
+		}
+		// Logs panel open/close is tied to the chat panel open/close
+		isLogsPanelOpen.value = isOpen;
+	}
+
+	function markExecutionAsStopped() {
+		activeExecutionId.value = null;
+		executingNode.value.length = 0;
+		executionWaitingForWebhook.value = false;
+		uiStore.removeActiveAction('workflowRunning');
+		workflowHelpers.setDocumentTitle(workflowName.value, 'IDLE');
+
+		clearPopupWindowState();
+
+		const runData = workflowExecutionData.value?.data?.resultData.runData ?? {};
+		for (const nodeName in runData) {
+			runData[nodeName] = runData[nodeName].filter(
+				({ executionStatus }) => executionStatus === 'success',
+			);
+		}
+	}
+
 	return {
 		workflow,
 		usedCredentials,
 		activeWorkflows,
-		activeExecutions,
 		activeWorkflowExecution,
 		currentWorkflowExecutions,
-		finishedExecutionsCount,
 		workflowExecutionData,
 		workflowExecutionPairedItemMappings,
 		activeExecutionId,
@@ -1650,8 +1658,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		executedNode,
 		getAllLoadedFinishedExecutions,
 		getWorkflowExecution,
-		getTotalFinishedExecutionsCount,
 		getPastChatMessages,
+		isChatPanelOpen: computed(() => isChatPanelOpen.value),
+		isLogsPanelOpen: computed(() => isLogsPanelOpen.value),
+		setPanelOpen,
 		outgoingConnectionsByNodeName,
 		incomingConnectionsByNodeName,
 		nodeHasOutputConnection,
@@ -1721,21 +1731,16 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		setNodeValue,
 		setNodeParameters,
 		setLastNodeParameters,
-		addNodeExecutionData,
+		updateNodeExecutionData,
 		clearNodeExecutionData,
 		pinDataByNodeName,
 		activeNode,
-		addActiveExecution,
-		finishActiveExecution,
-		setActiveExecutions,
 		getPastExecutions,
-		getActiveExecutions,
 		getExecution,
 		createNewWorkflow,
 		updateWorkflow,
 		runWorkflow,
 		removeTestWebhook,
-		loadCurrentWorkflowExecutions,
 		fetchExecutionDataById,
 		deleteExecution,
 		addToCurrentExecutions,
@@ -1750,5 +1755,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		removeNodeExecutionDataById,
 		setNodes,
 		setConnections,
+		markExecutionAsStopped,
 	};
 });
diff --git a/packages/editor-ui/src/styles/plugins/_codemirror.scss b/packages/editor-ui/src/styles/plugins/_codemirror.scss
index 00de6a0136..210791d562 100644
--- a/packages/editor-ui/src/styles/plugins/_codemirror.scss
+++ b/packages/editor-ui/src/styles/plugins/_codemirror.scss
@@ -1,11 +1,3 @@
-.code-node-editor .cm-tooltip-autocomplete:after {
-	padding: var(--spacing-2xs) var(--spacing-s);
-	border: var(--border-base);
-	border-bottom-left-radius: var(--border-radius-base);
-	display: block;
-	content: 'n8n supports all JavaScript functions, including those not listed.';
-}
-
 .code-node-editor .cm-editor .cm-tooltip-autocomplete > ul[role='listbox'] {
 	border-bottom: none;
 	border-bottom-left-radius: 0;
@@ -24,9 +16,9 @@
 
 	> ul[role='listbox'] {
 		font-family: var(--font-family-monospace);
-		height: min(250px, 50vh);
-		max-height: none;
-		max-width: 200px;
+		max-height: min(220px, 20vh);
+		max-width: 240px;
+		min-width: 200px;
 
 		border: var(--border-base);
 		border-top-left-radius: var(--border-radius-base);
@@ -41,6 +33,10 @@
 			border-bottom-right-radius: var(--border-radius-base);
 		}
 
+		&:has(+ .cm-completionInfo) {
+			height: min(220px, 20vh);
+		}
+
 		li[role='option'] {
 			color: var(--color-text-base);
 			display: flex;
@@ -105,6 +101,10 @@
 	&:has(.cm-tooltip-lint) {
 		padding: 0;
 		overflow: hidden;
+
+		.cm-diagnostic {
+			border-left: none;
+		}
 	}
 
 	.autocomplete-info-container {
@@ -267,6 +267,30 @@
 		font-size: var(--font-size-3xs);
 		font-weight: var(--font-weight-bold);
 	}
+
+	// Syntax highlighting
+	.ts-keyword,
+	.ts-punctuation {
+		color: var(--color-code-tags-keyword);
+	}
+
+	.ts-stringLiteral,
+	.ts-primitive {
+		color: var(--color-code-tags-primitive);
+	}
+
+	.ts-localName,
+	.ts-parameterName,
+	.ts-methodName {
+		color: var(--color-code-tags-variable);
+	}
+
+	.ts-typeName,
+	.ts-interfaceName,
+	.ts-className,
+	.ts-aliasName {
+		color: var(--color-code-tags-class);
+	}
 }
 
 .cm-editor .cm-tooltip.cm-completionInfo {
@@ -286,7 +310,7 @@
 	top: 0 !important;
 	left: 100% !important;
 	right: auto !important;
-	max-width: 320px !important;
+	max-width: 280px !important;
 	height: 100%;
 
 	&.cm-completionInfo-left-narrow,
@@ -319,10 +343,14 @@
 	border-radius: var(--border-radius-base);
 	line-height: var(--font-line-height-loose);
 	padding: 0;
-	max-width: 320px;
+	max-width: 280px;
+
+	.cm-tooltip-section:not(:first-child) {
+		border-top: var(--border-base);
+	}
 
 	.autocomplete-info-container {
 		height: auto;
-		max-height: min(250px, 50vh);
+		max-height: min(220px, 20vh);
 	}
 }
diff --git a/packages/editor-ui/src/styles/plugins/_vueflow.scss b/packages/editor-ui/src/styles/plugins/_vueflow.scss
index ebda12c8b6..7d8a7e84ae 100644
--- a/packages/editor-ui/src/styles/plugins/_vueflow.scss
+++ b/packages/editor-ui/src/styles/plugins/_vueflow.scss
@@ -56,6 +56,10 @@
 		fill: var(--color-foreground-dark);
 		opacity: 0.2;
 	}
+
+	@include mixins.breakpoint('xs-only') {
+		display: none;
+	}
 }
 
 /**
@@ -77,6 +81,10 @@
 	}
 }
 
+.vue-flow__nodes:has(.bring-to-front) {
+	z-index: 2 !important;
+}
+
 /**
  * Selection
  */
@@ -92,8 +100,24 @@
  * 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;
 }
+
+/**
+ * Controls
+ */
+
+.vue-flow__controls {
+	margin: var(--spacing-s);
+
+	@include mixins.breakpoint('xs-only') {
+		max-width: calc(100% - 3 * var(--spacing-s) - var(--spacing-2xs));
+		overflow: auto;
+		margin-left: 0;
+		margin-right: 0;
+		padding-left: var(--spacing-s);
+		padding-right: var(--spacing-s);
+	}
+}
diff --git a/packages/editor-ui/src/types/assistant.types.ts b/packages/editor-ui/src/types/assistant.types.ts
index c911f5087b..3f1c4c7aae 100644
--- a/packages/editor-ui/src/types/assistant.types.ts
+++ b/packages/editor-ui/src/types/assistant.types.ts
@@ -19,7 +19,7 @@ export namespace ChatRequest {
 
 	export interface WorkflowContext {
 		executionSchema?: NodeExecutionSchema[];
-		currentWorkflow?: IWorkflowDb;
+		currentWorkflow?: Partial<IWorkflowDb>;
 		executionData?: IRunExecutionData['resultData'];
 	}
 
diff --git a/packages/editor-ui/src/types/canvas.ts b/packages/editor-ui/src/types/canvas.ts
index 4620d80c3a..3034232379 100644
--- a/packages/editor-ui/src/types/canvas.ts
+++ b/packages/editor-ui/src/types/canvas.ts
@@ -1,18 +1,17 @@
 /* eslint-disable @typescript-eslint/no-redundant-type-constituents */
+import type { ExecutionStatus, INodeConnections, NodeConnectionType } from 'n8n-workflow';
 import type {
-	ExecutionStatus,
-	INodeConnections,
-	IConnection,
-	NodeConnectionType,
-} from 'n8n-workflow';
-import type { DefaultEdge, Node, NodeProps, Position, OnConnectStartParams } from '@vue-flow/core';
+	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';
 import type { EventBus } from 'n8n-design-system';
 
-export type CanvasConnectionPortType = NodeConnectionType;
-
 export const enum CanvasConnectionMode {
 	Input = 'inputs',
 	Output = 'outputs',
@@ -24,10 +23,11 @@ export const canvasConnectionModes = [
 ] as const;
 
 export type CanvasConnectionPort = {
-	type: CanvasConnectionPortType;
+	node?: string;
+	type: NodeConnectionType;
+	index: number;
 	required?: boolean;
 	maxConnections?: number;
-	index: number;
 	label?: string;
 };
 
@@ -59,6 +59,7 @@ export type CanvasNodeDefaultRender = {
 		outputs: {
 			labelSize: CanvasNodeDefaultRenderLabelSize;
 		};
+		tooltip?: string;
 	}>;
 };
 
@@ -116,29 +117,34 @@ export type CanvasNode = Node<CanvasNodeData>;
 export interface CanvasConnectionData {
 	source: CanvasConnectionPort;
 	target: CanvasConnectionPort;
-	fromNodeName?: string;
 	status?: 'success' | 'error' | 'pinned' | 'running';
+	maxConnections?: number;
 }
 
 export type CanvasConnection = DefaultEdge<CanvasConnectionData>;
 
 export type CanvasConnectionCreateData = {
 	source: string;
+	sourceHandle: string;
 	target: string;
+	targetHandle: string;
 	data: {
-		source: PartialBy<IConnection, 'node'>;
-		target: PartialBy<IConnection, 'node'>;
+		source: CanvasConnectionPort;
+		target: CanvasConnectionPort;
 	};
 };
 
 export interface CanvasInjectionData {
+	initialized: Ref<boolean>;
 	isExecuting: Ref<boolean | undefined>;
 	connectingHandle: Ref<ConnectStartEvent | undefined>;
+	viewport: Ref<ViewportTransform>;
 }
 
 export type CanvasNodeEventBusEvents = {
 	'update:sticky:color': never;
 	'update:node:active': never;
+	'update:node:class': { className: string; add?: boolean };
 };
 
 export type CanvasEventBusEvents = {
@@ -171,6 +177,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/types/projects.types.ts b/packages/editor-ui/src/types/projects.types.ts
index df76edeb30..0006ac4d48 100644
--- a/packages/editor-ui/src/types/projects.types.ts
+++ b/packages/editor-ui/src/types/projects.types.ts
@@ -18,6 +18,7 @@ export type ProjectRelationPayload = { userId: string; role: ProjectRole };
 export type ProjectSharingData = {
 	id: string;
 	name: string | null;
+	icon: ProjectIcon | null;
 	type: ProjectType;
 	createdAt: string;
 	updatedAt: string;
@@ -30,8 +31,9 @@ export type ProjectListItem = ProjectSharingData & {
 	role: ProjectRole;
 	scopes?: Scope[];
 };
-export type ProjectCreateRequest = { name: string };
-export type ProjectUpdateRequest = Pick<Project, 'id' | 'name'> & {
-	relations: ProjectRelationPayload[];
-};
 export type ProjectsCount = Record<ProjectType, number>;
+
+export type ProjectIcon = {
+	type: 'icon' | 'emoji';
+	value: string;
+};
diff --git a/packages/editor-ui/src/types/sourceControl.types.ts b/packages/editor-ui/src/types/sourceControl.types.ts
new file mode 100644
index 0000000000..1b412ed843
--- /dev/null
+++ b/packages/editor-ui/src/types/sourceControl.types.ts
@@ -0,0 +1,35 @@
+import type { TupleToUnion } from '@/utils/typeHelpers';
+
+export type SshKeyTypes = ['ed25519', 'rsa'];
+
+export type SourceControlPreferences = {
+	connected: boolean;
+	repositoryUrl: string;
+	branchName: string;
+	branches: string[];
+	branchReadOnly: boolean;
+	branchColor: string;
+	publicKey?: string;
+	keyGeneratorType?: TupleToUnion<SshKeyTypes>;
+	currentBranch?: string;
+};
+
+export interface SourceControlStatus {
+	ahead: number;
+	behind: number;
+	conflicted: string[];
+	created: string[];
+	current: string;
+	deleted: string[];
+	detached: boolean;
+	files: Array<{
+		path: string;
+		index: string;
+		working_dir: string;
+	}>;
+	modified: string[];
+	not_added: string[];
+	renamed: string[];
+	staged: string[];
+	tracking: null;
+}
diff --git a/packages/editor-ui/src/utils/__tests__/executionUtils.spec.ts b/packages/editor-ui/src/utils/__tests__/executionUtils.spec.ts
deleted file mode 100644
index e1748a5bc0..0000000000
--- a/packages/editor-ui/src/utils/__tests__/executionUtils.spec.ts
+++ /dev/null
@@ -1,126 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { displayForm, openPopUpWindow, executionFilterToQueryFilter } from '../executionUtils';
-import type { INode, IRunData, IPinData } from 'n8n-workflow';
-
-const FORM_TRIGGER_NODE_TYPE = 'formTrigger';
-const WAIT_NODE_TYPE = 'waitNode';
-
-vi.mock('../executionUtils', async () => {
-	const actual = await vi.importActual('../executionUtils');
-	return {
-		...actual,
-		openPopUpWindow: vi.fn(),
-	};
-});
-
-describe('displayForm', () => {
-	const getTestUrlMock = vi.fn();
-
-	beforeEach(() => {
-		vi.clearAllMocks();
-	});
-
-	it('should not call openPopUpWindow if node has already run or is pinned', () => {
-		const nodes: INode[] = [
-			{
-				id: '1',
-				name: 'Node1',
-				typeVersion: 1,
-				type: FORM_TRIGGER_NODE_TYPE,
-				position: [0, 0],
-				parameters: {},
-			},
-			{
-				id: '2',
-				name: 'Node2',
-				typeVersion: 1,
-				type: WAIT_NODE_TYPE,
-				position: [0, 0],
-				parameters: {},
-			},
-		];
-
-		const runData: IRunData = { Node1: [] };
-		const pinData: IPinData = { Node2: [{ json: { data: {} } }] };
-
-		displayForm({
-			nodes,
-			runData,
-			pinData,
-			destinationNode: undefined,
-			directParentNodes: [],
-			source: undefined,
-			getTestUrl: getTestUrlMock,
-		});
-
-		expect(openPopUpWindow).not.toHaveBeenCalled();
-	});
-
-	it('should skip nodes if destinationNode does not match and node is not a directParentNode', () => {
-		const nodes: INode[] = [
-			{
-				id: '1',
-				name: 'Node1',
-				typeVersion: 1,
-				type: FORM_TRIGGER_NODE_TYPE,
-				position: [0, 0],
-				parameters: {},
-			},
-			{
-				id: '2',
-				name: 'Node2',
-				typeVersion: 1,
-				type: WAIT_NODE_TYPE,
-				position: [0, 0],
-				parameters: {},
-			},
-		];
-
-		displayForm({
-			nodes,
-			runData: undefined,
-			pinData: {},
-			destinationNode: 'Node3',
-			directParentNodes: ['Node4'],
-			source: undefined,
-			getTestUrl: getTestUrlMock,
-		});
-
-		expect(openPopUpWindow).not.toHaveBeenCalled();
-	});
-
-	it('should not open pop-up if source is "RunData.ManualChatMessage"', () => {
-		const nodes: INode[] = [
-			{
-				id: '1',
-				name: 'Node1',
-				typeVersion: 1,
-				type: FORM_TRIGGER_NODE_TYPE,
-				position: [0, 0],
-				parameters: {},
-			},
-		];
-
-		getTestUrlMock.mockReturnValue('http://test-url.com');
-
-		displayForm({
-			nodes,
-			runData: undefined,
-			pinData: {},
-			destinationNode: undefined,
-			directParentNodes: [],
-			source: 'RunData.ManualChatMessage',
-			getTestUrl: getTestUrlMock,
-		});
-
-		expect(openPopUpWindow).not.toHaveBeenCalled();
-	});
-
-	describe('executionFilterToQueryFilter()', () => {
-		it('adds "new" to the filter', () => {
-			expect(executionFilterToQueryFilter({ status: 'new' }).status).toStrictEqual(
-				expect.arrayContaining(['new']),
-			);
-		});
-	});
-});
diff --git a/packages/editor-ui/src/utils/__tests__/apiUtils.spec.ts b/packages/editor-ui/src/utils/apiUtils.test.ts
similarity index 97%
rename from packages/editor-ui/src/utils/__tests__/apiUtils.spec.ts
rename to packages/editor-ui/src/utils/apiUtils.test.ts
index cefb6f3389..f6be9036b2 100644
--- a/packages/editor-ui/src/utils/__tests__/apiUtils.spec.ts
+++ b/packages/editor-ui/src/utils/apiUtils.test.ts
@@ -1,4 +1,4 @@
-import { STREAM_SEPERATOR, streamRequest } from '../apiUtils';
+import { STREAM_SEPERATOR, streamRequest } from './apiUtils';
 
 describe('streamRequest', () => {
 	it('should stream data from the API endpoint', async () => {
diff --git a/packages/editor-ui/src/utils/apiUtils.ts b/packages/editor-ui/src/utils/apiUtils.ts
index fef135769e..e86dcadf26 100644
--- a/packages/editor-ui/src/utils/apiUtils.ts
+++ b/packages/editor-ui/src/utils/apiUtils.ts
@@ -9,7 +9,7 @@ import type { IExecutionFlattedResponse, IExecutionResponse, IRestApiContext } f
 
 const getBrowserId = () => {
 	let browserId = localStorage.getItem(BROWSER_ID_STORAGE_KEY);
-	if (!browserId && 'randomUUID' in crypto) {
+	if (!browserId) {
 		browserId = crypto.randomUUID();
 		localStorage.setItem(BROWSER_ID_STORAGE_KEY, browserId);
 	}
@@ -113,8 +113,8 @@ export async function request(config: {
 			});
 		}
 
-		const errorResponseData = error.response.data;
-		if (errorResponseData !== undefined && errorResponseData.message !== undefined) {
+		const errorResponseData = error.response?.data;
+		if (errorResponseData?.message !== undefined) {
 			if (errorResponseData.name === 'NodeApiError') {
 				errorResponseData.httpStatusCode = error.response.status;
 				throw errorResponseData;
diff --git a/packages/editor-ui/src/utils/__tests__/canvasUtilsV2.spec.ts b/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
similarity index 76%
rename from packages/editor-ui/src/utils/__tests__/canvasUtilsV2.spec.ts
rename to packages/editor-ui/src/utils/canvasUtilsV2.test.ts
index 25ede479f2..63c7321808 100644
--- a/packages/editor-ui/src/utils/__tests__/canvasUtilsV2.spec.ts
+++ b/packages/editor-ui/src/utils/canvasUtilsV2.test.ts
@@ -1,13 +1,15 @@
 import {
+	checkOverlap,
 	createCanvasConnectionHandleString,
 	createCanvasConnectionId,
+	insertSpacersBetweenEndpoints,
 	mapCanvasConnectionToLegacyConnection,
 	mapLegacyConnectionsToCanvasConnections,
 	mapLegacyEndpointsToCanvasConnectionPort,
 	parseCanvasConnectionHandleString,
-	checkOverlap,
 } from '@/utils/canvasUtilsV2';
-import { type IConnections, type INodeTypeDescription, NodeConnectionType } from 'n8n-workflow';
+import type { IConnection, IConnections, INodeTypeDescription } from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
 import type { CanvasConnection } from '@/types';
 import { CanvasConnectionMode } from '@/types';
 import type { INodeUi } from '@/Interface';
@@ -22,7 +24,7 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 	it('should map legacy connections to canvas connections', () => {
 		const legacyConnections: IConnections = {
 			'Node A': {
-				main: [[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }]],
+				[NodeConnectionType.Main]: [[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }]],
 			},
 		};
 		const nodes: INodeUi[] = [
@@ -76,12 +78,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle,
 				targetHandle,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -93,7 +96,7 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 	it('should return empty array when no matching nodes found', () => {
 		const legacyConnections: IConnections = {
 			'Node A': {
-				main: [[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }]],
+				[NodeConnectionType.Main]: [[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }]],
 			},
 		};
 		const nodes: INodeUi[] = [];
@@ -138,7 +141,7 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 	it('should map multiple connections between the same nodes', () => {
 		const legacyConnections: IConnections = {
 			'Node A': {
-				main: [
+				[NodeConnectionType.Main]: [
 					[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }],
 					[{ node: 'Node B', type: NodeConnectionType.Main, index: 1 }],
 				],
@@ -214,12 +217,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleA,
 				targetHandle: targetHandleA,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -232,12 +236,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleB,
 				targetHandle: targetHandleB,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
@@ -249,7 +254,7 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 	it('should map multiple connections from one node to different nodes', () => {
 		const legacyConnections: IConnections = {
 			'Node A': {
-				main: [
+				[NodeConnectionType.Main]: [
 					[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }],
 					[{ node: 'Node C', type: NodeConnectionType.Main, index: 0 }],
 				],
@@ -333,12 +338,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleA,
 				targetHandle: targetHandleA,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -351,12 +357,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleB,
 				targetHandle: targetHandleB,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[2].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -368,13 +375,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 	it('should map complex node setup with mixed inputs and outputs', () => {
 		const legacyConnections: IConnections = {
 			'Node A': {
-				main: [[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }]],
+				[NodeConnectionType.Main]: [[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }]],
 				[NodeConnectionType.AiMemory]: [
 					[{ node: 'Node C', type: NodeConnectionType.AiMemory, index: 1 }],
 				],
 			},
 			'Node B': {
-				main: [[{ node: 'Node C', type: NodeConnectionType.Main, index: 0 }]],
+				[NodeConnectionType.Main]: [[{ node: 'Node C', type: NodeConnectionType.Main, index: 0 }]],
 			},
 		};
 		const nodes: INodeUi[] = [
@@ -474,12 +481,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleA,
 				targetHandle: targetHandleA,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -492,12 +500,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleB,
 				targetHandle: targetHandleB,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 0,
 						type: NodeConnectionType.AiMemory,
 					},
 					target: {
+						node: nodes[2].name,
 						index: 1,
 						type: NodeConnectionType.AiMemory,
 					},
@@ -510,12 +519,13 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle: sourceHandleC,
 				targetHandle: targetHandleC,
 				data: {
-					fromNodeName: nodes[1].name,
 					source: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[2].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -527,7 +537,7 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 	it('should handle edge cases with invalid data gracefully', () => {
 		const legacyConnections: IConnections = {
 			'Node A': {
-				main: [
+				[NodeConnectionType.Main]: [
 					[{ node: 'Nonexistent Node', type: NodeConnectionType.Main, index: 0 }],
 					[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }],
 				],
@@ -586,12 +596,89 @@ describe('mapLegacyConnectionsToCanvasConnections', () => {
 				sourceHandle,
 				targetHandle,
 				data: {
-					fromNodeName: nodes[0].name,
 					source: {
+						node: nodes[0].name,
 						index: 1,
 						type: NodeConnectionType.Main,
 					},
 					target: {
+						node: nodes[1].name,
+						index: 0,
+						type: NodeConnectionType.Main,
+					},
+				},
+			},
+		]);
+	});
+
+	// @issue https://linear.app/n8n/issue/N8N-7880/cannot-load-some-templates
+	it('should handle null connections gracefully', () => {
+		const legacyConnections: IConnections = {
+			'Node A': {
+				[NodeConnectionType.Main]: [
+					null as unknown as IConnection[],
+					[{ node: 'Node B', type: NodeConnectionType.Main, index: 0 }],
+				],
+			},
+		};
+		const nodes: INodeUi[] = [
+			{
+				id: '1',
+				name: 'Node A',
+				type: 'n8n-nodes-base.node',
+				typeVersion: 1,
+				position: [100, 100],
+				parameters: {},
+			},
+			{
+				id: '2',
+				name: 'Node B',
+				type: 'n8n-nodes-base.node',
+				typeVersion: 1,
+				position: [200, 200],
+				parameters: {},
+			},
+		];
+
+		const result: CanvasConnection[] = mapLegacyConnectionsToCanvasConnections(
+			legacyConnections,
+			nodes,
+		);
+
+		const source = nodes[0].id;
+		const sourceHandle = createCanvasConnectionHandleString({
+			mode: CanvasConnectionMode.Output,
+			type: NodeConnectionType.Main,
+			index: 1,
+		});
+		const target = nodes[1].id;
+		const targetHandle = createCanvasConnectionHandleString({
+			mode: CanvasConnectionMode.Input,
+			type: NodeConnectionType.Main,
+			index: 0,
+		});
+		const id = createCanvasConnectionId({
+			source,
+			target,
+			sourceHandle,
+			targetHandle,
+		});
+
+		expect(result).toEqual([
+			{
+				id,
+				source,
+				target,
+				sourceHandle,
+				targetHandle,
+				data: {
+					source: {
+						node: nodes[0].name,
+						index: 1,
+						type: NodeConnectionType.Main,
+					},
+					target: {
+						node: nodes[1].name,
 						index: 0,
 						type: NodeConnectionType.Main,
 					},
@@ -731,7 +818,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,
+			},
 		]);
 	});
 
@@ -744,7 +836,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,
+			},
 		]);
 	});
 
@@ -758,7 +856,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 },
 		]);
 	});
@@ -798,7 +901,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,
+			},
 		]);
 	});
 
@@ -869,3 +977,72 @@ describe('checkOverlap', () => {
 		expect(checkOverlap(node1, node2)).toBe(false);
 	});
 });
+
+describe('insertSpacersBetweenEndpoints', () => {
+	it('should insert spacers when there are less than min endpoints count', () => {
+		const endpoints = [{ index: 0, required: true }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([{ index: 0, required: true }, null, null, null]);
+	});
+
+	it('should not insert spacers when there are at least min endpoints count', () => {
+		const endpoints = [{ index: 0, required: true }, { index: 1 }, { index: 2 }, { index: 3 }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual(endpoints);
+	});
+
+	it('should handle zero required endpoints', () => {
+		const endpoints = [{ index: 0, required: false }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([null, null, null, { index: 0, required: false }]);
+	});
+
+	it('should handle no endpoints', () => {
+		const endpoints: Array<{ index: number; required: boolean }> = [];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([null, null, null, null]);
+	});
+
+	it('should handle required endpoints greater than min endpoints count', () => {
+		const endpoints = [
+			{ index: 0, required: true },
+			{ index: 1, required: true },
+			{ index: 2, required: true },
+			{ index: 3, required: true },
+			{ index: 4, required: true },
+		];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual(endpoints);
+	});
+
+	it('should insert spacers between required and optional endpoints', () => {
+		const endpoints = [{ index: 0, required: true }, { index: 1, required: true }, { index: 2 }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([
+			{ index: 0, required: true },
+			{ index: 1, required: true },
+			null,
+			{ index: 2 },
+		]);
+	});
+
+	it('should handle required endpoints count greater than endpoints length', () => {
+		const endpoints = [{ index: 0, required: true }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 4);
+		expect(result).toEqual([{ index: 0, required: true }, null, null, null]);
+	});
+
+	it('should handle min endpoints count less than required endpoints count', () => {
+		const endpoints = [{ index: 0, required: false }];
+		const requiredEndpointsCount = endpoints.filter((endpoint) => endpoint.required).length;
+		const result = insertSpacersBetweenEndpoints(endpoints, requiredEndpointsCount, 0);
+		expect(result).toEqual([{ index: 0, required: false }]);
+	});
+});
diff --git a/packages/editor-ui/src/utils/canvasUtilsV2.ts b/packages/editor-ui/src/utils/canvasUtilsV2.ts
index c4a49d8c94..f8e412caea 100644
--- a/packages/editor-ui/src/utils/canvasUtilsV2.ts
+++ b/packages/editor-ui/src/utils/canvasUtilsV2.ts
@@ -20,9 +20,10 @@ export function mapLegacyConnectionsToCanvasConnections(
 
 		fromConnectionTypes.forEach((fromConnectionType) => {
 			const fromPorts = legacyConnections[fromNodeName][fromConnectionType];
-			fromPorts.forEach((toPorts, fromIndex) => {
-				toPorts.forEach((toPort) => {
-					const toId = nodes.find((node) => node.name === toPort.node)?.id ?? '';
+			fromPorts?.forEach((toPorts, fromIndex) => {
+				toPorts?.forEach((toPort) => {
+					const toNodeName = toPort.node;
+					const toId = nodes.find((node) => node.name === toNodeName)?.id ?? '';
 					const toConnectionType = toPort.type as NodeConnectionType;
 					const toIndex = toPort.index;
 
@@ -53,12 +54,13 @@ export function mapLegacyConnectionsToCanvasConnections(
 							sourceHandle,
 							targetHandle,
 							data: {
-								fromNodeName,
 								source: {
+									node: fromNodeName,
 									index: fromIndex,
 									type: fromConnectionType,
 								},
 								target: {
+									node: toNodeName,
 									index: toIndex,
 									type: toConnectionType,
 								},
@@ -208,3 +210,23 @@ export function checkOverlap(node1: BoundingBox, node2: BoundingBox) {
 		)
 	);
 }
+
+export function insertSpacersBetweenEndpoints<T>(
+	endpoints: T[],
+	requiredEndpointsCount = 0,
+	minEndpointsCount = 4,
+) {
+	const endpointsWithSpacers: Array<T | null> = [...endpoints];
+	const optionalNonMainInputsCount = endpointsWithSpacers.length - requiredEndpointsCount;
+	const spacerCount = minEndpointsCount - requiredEndpointsCount - optionalNonMainInputsCount;
+
+	// Insert `null` in between required non-main inputs and non-required non-main inputs
+	// to separate them visually if there are less than 4 inputs in total
+	if (endpointsWithSpacers.length < minEndpointsCount) {
+		for (let i = 0; i < spacerCount; i++) {
+			endpointsWithSpacers.splice(requiredEndpointsCount + i, 0, null);
+		}
+	}
+
+	return endpointsWithSpacers;
+}
diff --git a/packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts b/packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts
new file mode 100644
index 0000000000..9fa1654216
--- /dev/null
+++ b/packages/editor-ui/src/utils/easyAiWorkflowUtils.test.ts
@@ -0,0 +1,38 @@
+import { describe, it, expect } from 'vitest';
+import { getEasyAiWorkflowJson } from './easyAiWorkflowUtils';
+
+describe('getEasyAiWorkflowJson', () => {
+	it('should update sticky note content for AI free credits experiment', () => {
+		const workflow = getEasyAiWorkflowJson({
+			isInstanceInAiFreeCreditsExperiment: true,
+			withOpenAiFreeCredits: 25,
+		});
+
+		if (!workflow?.nodes) fail();
+
+		const stickyNote = workflow.nodes.find(
+			(node) => node.type === 'n8n-nodes-base.stickyNote' && node.name === 'Sticky Note',
+		);
+
+		expect(stickyNote?.parameters.content).toContain(
+			'Claim your `free` 25 OpenAI calls in the `OpenAI model` node',
+		);
+	});
+
+	it('should show default content when not in AI free credits experiment', () => {
+		const workflow = getEasyAiWorkflowJson({
+			isInstanceInAiFreeCreditsExperiment: false,
+			withOpenAiFreeCredits: 0,
+		});
+
+		if (!workflow?.nodes) fail();
+
+		const stickyNote = workflow.nodes.find(
+			(node) => node.type === 'n8n-nodes-base.stickyNote' && node.name === 'Sticky Note',
+		);
+
+		expect(stickyNote?.parameters.content).toContain(
+			'Set up your [OpenAI credentials](https://docs.n8n.io/integrations/builtin/credentials/openai/?utm_source=n8n_app&utm_medium=credential_settings&utm_campaign=create_new_credentials_modal) in the `OpenAI Model` node',
+		);
+	});
+});
diff --git a/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts b/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts
new file mode 100644
index 0000000000..3d9fad7809
--- /dev/null
+++ b/packages/editor-ui/src/utils/easyAiWorkflowUtils.ts
@@ -0,0 +1,193 @@
+import type { INodeUi, WorkflowDataWithTemplateId } from '@/Interface';
+import { NodeConnectionType } from 'n8n-workflow';
+
+/**
+ * Generates a workflow JSON object for an AI Agent in n8n.
+ *
+ * @param {Object} params - The parameters for generating the workflow JSON.
+ * @param {boolean} params.isInstanceInAiFreeCreditsExperiment - Indicates if the instance is part of the AI free credits experiment.
+ * @param {number} params.withOpenAiFreeCredits - The number of free OpenAI calls available.
+ *
+ * @remarks
+ * This function can be deleted once the free AI credits experiment is removed.
+ */
+export const getEasyAiWorkflowJson = ({
+	isInstanceInAiFreeCreditsExperiment,
+	withOpenAiFreeCredits,
+}: {
+	withOpenAiFreeCredits: number;
+	isInstanceInAiFreeCreditsExperiment: boolean;
+}): WorkflowDataWithTemplateId => {
+	let instructionsFirstStep =
+		'Set up your [OpenAI credentials](https://docs.n8n.io/integrations/builtin/credentials/openai/?utm_source=n8n_app&utm_medium=credential_settings&utm_campaign=create_new_credentials_modal) in the `OpenAI Model` node';
+
+	if (isInstanceInAiFreeCreditsExperiment) {
+		instructionsFirstStep = `Claim your \`free\` ${withOpenAiFreeCredits} OpenAI calls in the \`OpenAI model\` node`;
+	}
+
+	return {
+		name: 'Demo: My first AI Agent in n8n',
+		meta: {
+			templateId: 'PT1i+zU92Ii5O2XCObkhfHJR5h9rNJTpiCIkYJk9jHU=',
+		},
+		nodes: [
+			{
+				id: '0d7e4666-bc0e-489a-9e8f-a5ef191f4954',
+				name: 'Google Calendar',
+				type: 'n8n-nodes-base.googleCalendarTool',
+				typeVersion: 1.2,
+				position: [880, 220],
+				parameters: {
+					operation: 'getAll',
+					calendar: {
+						__rl: true,
+						mode: 'list',
+					},
+					returnAll: true,
+					options: {
+						timeMin:
+							"={{ $fromAI('after', 'The earliest datetime we want to look for events for') }}",
+						timeMax:
+							"={{ $fromAI('before', 'The latest datetime we want to look for events for') }}",
+						query:
+							"={{ $fromAI('query', 'The search query to look for in the calendar. Leave empty if no search query is needed') }}",
+						singleEvents: true,
+					},
+				},
+			},
+			{
+				id: '5b410409-5b0b-47bd-b413-5b9b1000a063',
+				name: 'When chat message received',
+				type: '@n8n/n8n-nodes-langchain.chatTrigger',
+				typeVersion: 1.1,
+				position: [360, 20],
+				webhookId: 'a889d2ae-2159-402f-b326-5f61e90f602e',
+				parameters: {
+					options: {},
+				},
+			},
+			{
+				id: '29963449-1dc1-487d-96f2-7ff0a5c3cd97',
+				name: 'AI Agent',
+				type: '@n8n/n8n-nodes-langchain.agent',
+				typeVersion: 1.7,
+				position: [560, 20],
+				parameters: {
+					options: {
+						systemMessage:
+							"=You're a helpful assistant that the user to answer questions about their calendar.\n\nToday is {{ $now.format('cccc') }} the {{ $now.format('yyyy-MM-dd HH:mm') }}.",
+					},
+				},
+			},
+			{
+				id: 'eae35513-07c2-4de2-a795-a153b6934c1b',
+				name: 'Sticky Note',
+				type: 'n8n-nodes-base.stickyNote',
+				typeVersion: 1,
+				position: [0, 0],
+				parameters: {
+					content: `## 👋 Welcome to n8n!\nThis example shows how to build an AI Agent that interacts with your \ncalendar.\n\n### 1. Connect your accounts\n- ${instructionsFirstStep} \n- Connect your Google account in the \`Google Calendar\` node credentials section\n\n### 2. Ready to test it?\nClick Chat below and start asking questions! For example you can try \`What meetings do I have today?\``,
+					height: 389,
+					width: 319,
+					color: 6,
+				},
+			},
+			{
+				id: '68b59889-7aca-49fd-a49b-d86fa6239b96',
+				name: 'Sticky Note1',
+				type: 'n8n-nodes-base.stickyNote',
+				typeVersion: 1,
+				position: [820, 200],
+				parameters: {
+					content:
+						"\n\n\n\n\n\n\n\n\n\n\n\nDon't have **Google Calendar**? Simply exchange this with the **Microsoft Outlook** or other tools",
+					height: 253,
+					width: 226,
+					color: 7,
+				},
+			},
+			{
+				id: 'cbaedf86-9153-4778-b893-a7e50d3e04ba',
+				name: 'OpenAI Model',
+				type: '@n8n/n8n-nodes-langchain.lmChatOpenAi',
+				typeVersion: 1,
+				position: [520, 220],
+				parameters: {
+					options: {},
+				},
+			},
+			{
+				id: '75481370-bade-4d90-a878-3a3b0201edcc',
+				name: 'Memory',
+				type: '@n8n/n8n-nodes-langchain.memoryBufferWindow',
+				typeVersion: 1.3,
+				position: [680, 220],
+				parameters: {},
+			},
+			{
+				id: '907552eb-6e0f-472e-9d90-4513a67a31db',
+				name: 'Sticky Note3',
+				type: 'n8n-nodes-base.stickyNote',
+				typeVersion: 1,
+				position: [0, 400],
+				parameters: {
+					content:
+						'### Want to learn more?\nWant to learn more about AI and how to apply it best in n8n? Have a look at our [new tutorial series on YouTube](https://www.youtube.com/watch?v=yzvLfHb0nqE&lc).',
+					height: 100,
+					width: 317,
+					color: 6,
+				},
+			},
+		] as INodeUi[],
+		connections: {
+			'Google Calendar': {
+				ai_tool: [
+					[
+						{
+							node: 'AI Agent',
+							type: NodeConnectionType.AiTool,
+							index: 0,
+						},
+					],
+				],
+			},
+			'When chat message received': {
+				main: [
+					[
+						{
+							node: 'AI Agent',
+							type: NodeConnectionType.Main,
+							index: 0,
+						},
+					],
+				],
+			},
+			'OpenAI Model': {
+				ai_languageModel: [
+					[
+						{
+							node: 'AI Agent',
+							type: NodeConnectionType.AiLanguageModel,
+							index: 0,
+						},
+					],
+				],
+			},
+			Memory: {
+				ai_memory: [
+					[
+						{
+							node: 'AI Agent',
+							type: NodeConnectionType.AiMemory,
+							index: 0,
+						},
+					],
+				],
+			},
+		},
+		settings: {
+			executionOrder: 'v1',
+		},
+		pinData: {},
+	};
+};
diff --git a/packages/editor-ui/src/utils/executionUtils.test.ts b/packages/editor-ui/src/utils/executionUtils.test.ts
new file mode 100644
index 0000000000..a4f87cf3f1
--- /dev/null
+++ b/packages/editor-ui/src/utils/executionUtils.test.ts
@@ -0,0 +1,272 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import {
+	displayForm,
+	openFormPopupWindow,
+	executionFilterToQueryFilter,
+	waitingNodeTooltip,
+} from './executionUtils';
+import type { INode, IRunData, IPinData } from 'n8n-workflow';
+import { type INodeUi } from '../Interface';
+
+const FORM_TRIGGER_NODE_TYPE = 'formTrigger';
+const WAIT_NODE_TYPE = 'waitNode';
+
+vi.mock('./executionUtils', async () => {
+	const actual = await vi.importActual('./executionUtils');
+	return {
+		...actual,
+		openFormPopupWindow: vi.fn(),
+	};
+});
+
+vi.mock('@/stores/root.store', () => ({
+	useRootStore: () => ({
+		formWaitingUrl: 'http://localhost:5678/form-waiting',
+		webhookWaitingUrl: 'http://localhost:5678/webhook-waiting',
+	}),
+}));
+
+vi.mock('@/stores/workflows.store', () => ({
+	useWorkflowsStore: () => ({
+		activeExecutionId: '123',
+	}),
+}));
+
+vi.mock('@/plugins/i18n', () => ({
+	i18n: {
+		baseText: (key: string) => {
+			const texts: { [key: string]: string } = {
+				'ndv.output.waitNodeWaiting': 'Waiting for execution to resume...',
+				'ndv.output.waitNodeWaitingForFormSubmission': 'Waiting for form submission: ',
+				'ndv.output.waitNodeWaitingForWebhook': 'Waiting for webhook call: ',
+				'ndv.output.sendAndWaitWaitingApproval': 'Waiting for approval...',
+			};
+			return texts[key] || key;
+		},
+	},
+}));
+
+describe('displayForm', () => {
+	const getTestUrlMock = vi.fn();
+
+	beforeEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should not call openPopUpWindow if node has already run or is pinned', () => {
+		const nodes: INode[] = [
+			{
+				id: '1',
+				name: 'Node1',
+				typeVersion: 1,
+				type: FORM_TRIGGER_NODE_TYPE,
+				position: [0, 0],
+				parameters: {},
+			},
+			{
+				id: '2',
+				name: 'Node2',
+				typeVersion: 1,
+				type: WAIT_NODE_TYPE,
+				position: [0, 0],
+				parameters: {},
+			},
+		];
+
+		const runData: IRunData = { Node1: [] };
+		const pinData: IPinData = { Node2: [{ json: { data: {} } }] };
+
+		displayForm({
+			nodes,
+			runData,
+			pinData,
+			destinationNode: undefined,
+			directParentNodes: [],
+			source: undefined,
+			getTestUrl: getTestUrlMock,
+		});
+
+		expect(openFormPopupWindow).not.toHaveBeenCalled();
+	});
+
+	it('should skip nodes if destinationNode does not match and node is not a directParentNode', () => {
+		const nodes: INode[] = [
+			{
+				id: '1',
+				name: 'Node1',
+				typeVersion: 1,
+				type: FORM_TRIGGER_NODE_TYPE,
+				position: [0, 0],
+				parameters: {},
+			},
+			{
+				id: '2',
+				name: 'Node2',
+				typeVersion: 1,
+				type: WAIT_NODE_TYPE,
+				position: [0, 0],
+				parameters: {},
+			},
+		];
+
+		displayForm({
+			nodes,
+			runData: undefined,
+			pinData: {},
+			destinationNode: 'Node3',
+			directParentNodes: ['Node4'],
+			source: undefined,
+			getTestUrl: getTestUrlMock,
+		});
+
+		expect(openFormPopupWindow).not.toHaveBeenCalled();
+	});
+
+	it('should not open pop-up if source is "RunData.ManualChatMessage"', () => {
+		const nodes: INode[] = [
+			{
+				id: '1',
+				name: 'Node1',
+				typeVersion: 1,
+				type: FORM_TRIGGER_NODE_TYPE,
+				position: [0, 0],
+				parameters: {},
+			},
+		];
+
+		getTestUrlMock.mockReturnValue('http://test-url.com');
+
+		displayForm({
+			nodes,
+			runData: undefined,
+			pinData: {},
+			destinationNode: undefined,
+			directParentNodes: [],
+			source: 'RunData.ManualChatMessage',
+			getTestUrl: getTestUrlMock,
+		});
+
+		expect(openFormPopupWindow).not.toHaveBeenCalled();
+	});
+
+	describe('executionFilterToQueryFilter()', () => {
+		it('adds "new" to the filter', () => {
+			expect(executionFilterToQueryFilter({ status: 'new' }).status).toStrictEqual(
+				expect.arrayContaining(['new']),
+			);
+		});
+	});
+});
+
+describe('waitingNodeTooltip', () => {
+	it('should return empty string for null or undefined node', () => {
+		expect(waitingNodeTooltip(null)).toBe('');
+		expect(waitingNodeTooltip(undefined)).toBe('');
+	});
+
+	it('should return default waiting message for time resume types', () => {
+		const node: INodeUi = {
+			id: '1',
+			name: 'Wait',
+			type: 'n8n-nodes-base.wait',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {
+				resume: 'timeInterval',
+			},
+		};
+
+		expect(waitingNodeTooltip(node)).toBe('Waiting for execution to resume...');
+	});
+
+	it('should return form submission message with URL for form resume type', () => {
+		const node: INodeUi = {
+			id: '1',
+			name: 'Wait',
+			type: 'n8n-nodes-base.wait',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {
+				resume: 'form',
+			},
+		};
+
+		const expectedUrl = 'http://localhost:5678/form-waiting/123';
+		expect(waitingNodeTooltip(node)).toBe(
+			`Waiting for form submission: <a href="${expectedUrl}" target="_blank">${expectedUrl}</a>`,
+		);
+	});
+
+	it('should include webhook suffix in URL when provided', () => {
+		const node: INodeUi = {
+			id: '1',
+			name: 'Wait',
+			type: 'n8n-nodes-base.wait',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {
+				resume: 'webhook',
+				options: {
+					webhookSuffix: 'test-suffix',
+				},
+			},
+		};
+
+		const expectedUrl = 'http://localhost:5678/webhook-waiting/123/test-suffix';
+		expect(waitingNodeTooltip(node)).toBe(
+			`Waiting for webhook call: <a href="${expectedUrl}" target="_blank">${expectedUrl}</a>`,
+		);
+	});
+
+	it('should handle form node type', () => {
+		const node: INodeUi = {
+			id: '1',
+			name: 'Form',
+			type: 'n8n-nodes-base.form',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {},
+		};
+
+		const expectedUrl = 'http://localhost:5678/form-waiting/123';
+		expect(waitingNodeTooltip(node)).toBe(
+			`Waiting for form submission: <a href="${expectedUrl}" target="_blank">${expectedUrl}</a>`,
+		);
+	});
+
+	it('should handle send and wait operation', () => {
+		const node: INodeUi = {
+			id: '1',
+			name: 'SendWait',
+			type: 'n8n-nodes-base.sendWait',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {
+				operation: 'sendAndWait',
+			},
+		};
+
+		expect(waitingNodeTooltip(node)).toBe('Waiting for approval...');
+	});
+
+	it('should ignore object-type webhook suffix', () => {
+		const node: INodeUi = {
+			id: '1',
+			name: 'Wait',
+			type: 'n8n-nodes-base.wait',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {
+				resume: 'webhook',
+				options: {
+					webhookSuffix: { some: 'object' },
+				},
+			},
+		};
+
+		const expectedUrl = 'http://localhost:5678/webhook-waiting/123';
+		expect(waitingNodeTooltip(node)).toBe(
+			`Waiting for webhook call: <a href="${expectedUrl}" target="_blank">${expectedUrl}</a>`,
+		);
+	});
+});
diff --git a/packages/editor-ui/src/utils/executionUtils.ts b/packages/editor-ui/src/utils/executionUtils.ts
index e076c8c18e..11457e89e4 100644
--- a/packages/editor-ui/src/utils/executionUtils.ts
+++ b/packages/editor-ui/src/utils/executionUtils.ts
@@ -1,12 +1,13 @@
-import {
-	SEND_AND_WAIT_OPERATION,
-	type ExecutionStatus,
-	type IDataObject,
-	type INode,
-	type IPinData,
-	type IRunData,
+import { SEND_AND_WAIT_OPERATION, TRIMMED_TASK_DATA_CONNECTIONS_KEY } from 'n8n-workflow';
+import type {
+	ITaskData,
+	ExecutionStatus,
+	IDataObject,
+	INode,
+	IPinData,
+	IRunData,
 } from 'n8n-workflow';
-import type { ExecutionFilterType, ExecutionsQueryFilter } from '@/Interface';
+import type { ExecutionFilterType, ExecutionsQueryFilter, INodeUi } from '@/Interface';
 import { isEmpty } from '@/utils/typesUtils';
 import { FORM_NODE_TYPE, FORM_TRIGGER_NODE_TYPE } from '../constants';
 import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -82,25 +83,23 @@ 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: boolean = false;
+
+export const openFormPopupWindow = (url: string) => {
+	if (!formPopupWindow) {
+		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);
+		window.open(url, windowName, features);
+		formPopupWindow = true;
 	}
 };
 
+export const clearPopupWindowState = () => (formPopupWindow = false);
+
 export function displayForm({
 	nodes,
 	runData,
@@ -131,23 +130,22 @@ 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);
 		}
 	}
 }
 
-export const waitingNodeTooltip = () => {
+export const waitingNodeTooltip = (node: INodeUi | null | undefined) => {
+	if (!node) return '';
 	try {
-		const lastNode =
-			useWorkflowsStore().workflowExecutionData?.data?.executionData?.nodeExecutionStack[0]?.node;
-		const resume = lastNode?.parameters?.resume;
+		const resume = node?.parameters?.resume;
 
 		if (resume) {
 			if (!['webhook', 'form'].includes(resume as string)) {
 				return i18n.baseText('ndv.output.waitNodeWaiting');
 			}
 
-			const { webhookSuffix } = (lastNode.parameters.options ?? {}) as { webhookSuffix: string };
+			const { webhookSuffix } = (node.parameters.options ?? {}) as { webhookSuffix: string };
 			const suffix = webhookSuffix && typeof webhookSuffix !== 'object' ? `/${webhookSuffix}` : '';
 
 			let message = '';
@@ -168,13 +166,13 @@ export const waitingNodeTooltip = () => {
 			}
 		}
 
-		if (lastNode?.type === FORM_NODE_TYPE) {
+		if (node?.type === FORM_NODE_TYPE) {
 			const message = i18n.baseText('ndv.output.waitNodeWaitingForFormSubmission');
 			const resumeUrl = `${useRootStore().formWaitingUrl}/${useWorkflowsStore().activeExecutionId}`;
 			return `${message}<a href="${resumeUrl}" target="_blank">${resumeUrl}</a>`;
 		}
 
-		if (lastNode?.parameters.operation === SEND_AND_WAIT_OPERATION) {
+		if (node?.parameters.operation === SEND_AND_WAIT_OPERATION) {
 			return i18n.baseText('ndv.output.sendAndWaitWaitingApproval');
 		}
 	} catch (error) {
@@ -183,3 +181,25 @@ export const waitingNodeTooltip = () => {
 
 	return '';
 };
+
+/**
+ * Check whether task data contains a trimmed item.
+ *
+ * In manual executions in scaling mode, the payload in push messages may be
+ * arbitrarily large. To protect Redis as it relays run data from workers to
+ * main process, we set a limit on payload size. If the payload is oversize,
+ * we replace it with a placeholder, which is later overridden on execution
+ * finish, when the client receives the full data.
+ */
+export function hasTrimmedItem(taskData: ITaskData[]) {
+	return taskData[0]?.data?.main?.[0]?.[0]?.json?.[TRIMMED_TASK_DATA_CONNECTIONS_KEY] ?? false;
+}
+
+/**
+ * Check whether run data contains any trimmed items.
+ *
+ * See {@link hasTrimmedItem} for more details.
+ */
+export function hasTrimmedData(runData: IRunData) {
+	return Object.keys(runData).some((nodeName) => hasTrimmedItem(runData[nodeName]));
+}
diff --git a/packages/editor-ui/src/utils/__tests__/expressions.test.ts b/packages/editor-ui/src/utils/expressions.test.ts
similarity index 94%
rename from packages/editor-ui/src/utils/__tests__/expressions.test.ts
rename to packages/editor-ui/src/utils/expressions.test.ts
index c467dc59f5..b2b11728c5 100644
--- a/packages/editor-ui/src/utils/__tests__/expressions.test.ts
+++ b/packages/editor-ui/src/utils/expressions.test.ts
@@ -1,9 +1,5 @@
 import { ExpressionError } from 'n8n-workflow';
-import {
-	removeExpressionPrefix,
-	stringifyExpressionResult,
-	unwrapExpression,
-} from '../expressions';
+import { removeExpressionPrefix, stringifyExpressionResult, unwrapExpression } from './expressions';
 
 describe('Utils: Expressions', () => {
 	describe('stringifyExpressionResult()', () => {
diff --git a/packages/editor-ui/src/utils/expressions.ts b/packages/editor-ui/src/utils/expressions.ts
index 3ce0fe04a9..d572006ad5 100644
--- a/packages/editor-ui/src/utils/expressions.ts
+++ b/packages/editor-ui/src/utils/expressions.ts
@@ -60,7 +60,7 @@ export const isNoInputConnectionError = (error: unknown): error is ExpressionErr
 };
 
 export const isAnyPairedItemError = (error: unknown): error is ExpressionError => {
-	return error instanceof ExpressionError && error.context.functionality === 'pairedItem';
+	return error instanceof ExpressionError && error.functionality === 'pairedItem';
 };
 
 export const getResolvableState = (error: unknown, ignoreError = false): ResolvableState => {
@@ -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/forceParse.ts b/packages/editor-ui/src/utils/forceParse.ts
index 1b0136f0a4..40494508f4 100644
--- a/packages/editor-ui/src/utils/forceParse.ts
+++ b/packages/editor-ui/src/utils/forceParse.ts
@@ -1,14 +1,19 @@
+import { Annotation } from '@codemirror/state';
 import type { EditorView } from '@codemirror/view';
 
+export const ignoreUpdateAnnotation = Annotation.define<boolean>();
+
 /**
  * Simulate user action to force parser to catch up during scroll.
  */
-export function forceParse(_: Event, view: EditorView) {
+export function forceParse(view: EditorView) {
 	view.dispatch({
 		changes: { from: view.viewport.to, insert: '_' },
+		annotations: [ignoreUpdateAnnotation.of(true)],
 	});
 
 	view.dispatch({
 		changes: { from: view.viewport.to - 1, to: view.viewport.to, insert: '' },
+		annotations: [ignoreUpdateAnnotation.of(true)],
 	});
 }
diff --git a/packages/editor-ui/src/utils/__tests__/htmlUtils.spec.ts b/packages/editor-ui/src/utils/htmlUtils.test.ts
similarity index 97%
rename from packages/editor-ui/src/utils/__tests__/htmlUtils.spec.ts
rename to packages/editor-ui/src/utils/htmlUtils.test.ts
index 6032c02420..1b1b5f04f8 100644
--- a/packages/editor-ui/src/utils/__tests__/htmlUtils.spec.ts
+++ b/packages/editor-ui/src/utils/htmlUtils.test.ts
@@ -1,5 +1,5 @@
 import { ALLOWED_HTML_TAGS } from '@/constants';
-import { sanitizeHtml } from '../htmlUtils';
+import { sanitizeHtml } from './htmlUtils';
 
 describe('sanitizeHtml', () => {
 	test.each(ALLOWED_HTML_TAGS)('should allow allowed HTML tag %s', (tag) => {
diff --git a/packages/editor-ui/src/utils/htmlUtils.ts b/packages/editor-ui/src/utils/htmlUtils.ts
index cf4bb85c6c..f1d6119adb 100644
--- a/packages/editor-ui/src/utils/htmlUtils.ts
+++ b/packages/editor-ui/src/utils/htmlUtils.ts
@@ -18,8 +18,8 @@ export function sanitizeHtml(dirtyHtml: string) {
 			}
 
 			if (ALLOWED_HTML_ATTRIBUTES.includes(name) || name.startsWith('data-')) {
-				// href is allowed but we need to sanitize certain protocols
-				if (name === 'href' && !value.match(/^https?:\/\//gm)) {
+				// href is allowed but we allow only https and relative URLs
+				if (name === 'href' && !value.match(/^https?:\/\//gm) && !value.startsWith('/')) {
 					return '';
 				}
 				return `${name}="${escapeAttrValue(value)}"`;
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/utils/__tests__/mappingUtils.test.ts b/packages/editor-ui/src/utils/mappingUtils.test.ts
similarity index 99%
rename from packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
rename to packages/editor-ui/src/utils/mappingUtils.test.ts
index 797c512768..eb41dfd122 100644
--- a/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
+++ b/packages/editor-ui/src/utils/mappingUtils.test.ts
@@ -4,7 +4,7 @@ import {
 	getMappedExpression,
 	escapeMappingString,
 	propertyNameFromExpression,
-} from '../mappingUtils';
+} from './mappingUtils';
 
 const RLC_PARAM: INodeProperties = {
 	displayName: 'Base',
diff --git a/packages/editor-ui/src/utils/nodeSettingsUtils.test.ts b/packages/editor-ui/src/utils/nodeSettingsUtils.test.ts
new file mode 100644
index 0000000000..9968bc6984
--- /dev/null
+++ b/packages/editor-ui/src/utils/nodeSettingsUtils.test.ts
@@ -0,0 +1,162 @@
+import { describe, it, expect, afterAll } from 'vitest';
+import { mock } from 'vitest-mock-extended';
+import type { IConnections, NodeParameterValueType } from 'n8n-workflow';
+import { updateDynamicConnections } from './nodeSettingsUtils';
+import { SWITCH_NODE_TYPE } from '@/constants';
+import type { INodeUi, IUpdateInformation } from '@/Interface';
+
+describe('updateDynamicConnections', () => {
+	afterAll(() => {
+		vi.clearAllMocks();
+	});
+	it('should remove extra outputs when the number of outputs decreases', () => {
+		const node = mock<INodeUi>({
+			name: 'TestNode',
+			type: SWITCH_NODE_TYPE,
+			parameters: { numberOutputs: 3 },
+		});
+
+		const connections = mock<IConnections>({
+			TestNode: {
+				main: [[{ node: 'Node1' }], [{ node: 'Node2' }], [{ node: 'Node3' }]],
+			},
+		});
+
+		const parameterData = mock<IUpdateInformation<number>>({
+			name: 'parameters.numberOutputs',
+			value: 2,
+		});
+
+		const updatedConnections = updateDynamicConnections(node, connections, parameterData);
+
+		expect(updatedConnections?.TestNode.main).toHaveLength(2);
+	});
+
+	it('should splice connections when a rule is removed', () => {
+		const node = mock<INodeUi>({
+			name: 'TestNode',
+			type: SWITCH_NODE_TYPE,
+			parameters: {
+				rules: { values: [{}, {}, {}] },
+				options: {},
+			},
+		});
+
+		const connections = mock<IConnections>({
+			TestNode: {
+				main: [[{ node: 'Node1' }], [{ node: 'Node2' }], [{ node: 'Node3' }]],
+			},
+		});
+
+		const parameterData = mock<IUpdateInformation<number>>({
+			name: 'parameters.rules.values[1]',
+			value: undefined,
+		});
+
+		const updatedConnections = updateDynamicConnections(node, connections, parameterData);
+
+		expect(updatedConnections?.TestNode.main).toHaveLength(2);
+		expect(updatedConnections?.TestNode.main[1]?.[0].node).toEqual('Node3');
+	});
+
+	it('should handle fallbackOutput === "extra" and all rules removed', () => {
+		const node = mock<INodeUi>({
+			name: 'TestNode',
+			type: SWITCH_NODE_TYPE,
+			parameters: {
+				options: { fallbackOutput: 'extra' },
+			},
+		});
+
+		const connections = mock<IConnections>({
+			TestNode: {
+				main: [[{ node: 'Node1' }], [{ node: 'Node2' }], [{ node: 'Node3' }]],
+			},
+		});
+
+		const parameterData = mock<IUpdateInformation<number>>({
+			name: 'parameters.rules.values',
+			value: undefined,
+		});
+
+		const updatedConnections = updateDynamicConnections(node, connections, parameterData);
+
+		expect(updatedConnections?.TestNode.main).toHaveLength(1);
+		expect(updatedConnections?.TestNode.main[0]?.[0].node).toEqual('Node3');
+	});
+
+	it('should add a new connection when a rule is added', () => {
+		const node = mock<INodeUi>({
+			name: 'TestNode',
+			type: SWITCH_NODE_TYPE,
+			parameters: {
+				rules: { values: [{}, {}] },
+				options: { fallbackOutput: 'none' },
+			},
+		});
+
+		const connections = mock<IConnections>({
+			TestNode: {
+				main: [[{ node: 'Node1' }], [{ node: 'Node2' }]],
+			},
+		});
+
+		const parameterData = mock<IUpdateInformation<NodeParameterValueType>>({
+			name: 'parameters.rules.values',
+			value: [{}, {}, {}],
+		});
+
+		const updatedConnections = updateDynamicConnections(node, connections, parameterData);
+
+		expect(updatedConnections?.TestNode.main).toHaveLength(3);
+		expect(updatedConnections?.TestNode.main[2]).toEqual([]);
+	});
+
+	it('should handle extra output when rule is added and fallbackOutput is extra', () => {
+		const node = mock<INodeUi>({
+			name: 'TestNode',
+			type: SWITCH_NODE_TYPE,
+			parameters: {
+				rules: { values: [{}, {}] },
+				options: { fallbackOutput: 'extra' },
+			},
+		});
+
+		const connections = mock<IConnections>({
+			TestNode: {
+				main: [[{ node: 'Node1' }], [{ node: 'Node2' }], [{ node: 'Node3' }]],
+			},
+		});
+
+		const parameterData = mock<IUpdateInformation<NodeParameterValueType>>({
+			name: 'parameters.rules.values',
+			value: [{}, {}, {}],
+		});
+
+		const updatedConnections = updateDynamicConnections(node, connections, parameterData);
+
+		expect(updatedConnections?.TestNode.main).toHaveLength(4);
+		expect(updatedConnections?.TestNode.main[2]).toEqual([]);
+		expect(updatedConnections?.TestNode.main[3]?.[0].node).toEqual('Node3');
+	});
+
+	it('should return null if no conditions are met', () => {
+		const node = mock<INodeUi>({
+			name: 'TestNode',
+			type: 'otherNodeType',
+		});
+
+		const connections = mock<IConnections>({
+			TestNode: { main: [] },
+		});
+
+		const parameterData = mock<IUpdateInformation<number>>({
+			name: 'parameters.otherParameter',
+			value: 3,
+		});
+
+		const result = updateDynamicConnections(node, connections, parameterData);
+
+		expect(result).toBeNull();
+	});
+});
diff --git a/packages/editor-ui/src/utils/nodeSettingsUtils.ts b/packages/editor-ui/src/utils/nodeSettingsUtils.ts
new file mode 100644
index 0000000000..09f1c4f2db
--- /dev/null
+++ b/packages/editor-ui/src/utils/nodeSettingsUtils.ts
@@ -0,0 +1,133 @@
+import type {
+	IConnection,
+	IConnections,
+	IDataObject,
+	NodeInputConnections,
+	NodeParameterValueType,
+} from 'n8n-workflow';
+import type { INodeUi, IUpdateInformation } from '@/Interface';
+import { SWITCH_NODE_TYPE } from '@/constants';
+import { isEqual } from 'lodash-es';
+
+import { captureException } from '@sentry/vue';
+
+export function updateDynamicConnections(
+	node: INodeUi,
+	workflowConnections: IConnections,
+	parameterData: IUpdateInformation<NodeParameterValueType>,
+) {
+	const connections = { ...workflowConnections };
+
+	try {
+		if (parameterData.name.includes('conditions') || !connections[node.name]?.main) return null;
+
+		if (node.type === SWITCH_NODE_TYPE && parameterData.name === 'parameters.numberOutputs') {
+			const curentNumberOutputs = node.parameters?.numberOutputs as number;
+			const newNumberOutputs = parameterData.value as number;
+
+			// remove extra outputs
+			if (newNumberOutputs < curentNumberOutputs) {
+				connections[node.name].main = connections[node.name].main.slice(0, newNumberOutputs);
+				return connections;
+			}
+		}
+
+		if (
+			node.type === SWITCH_NODE_TYPE &&
+			parameterData.name === 'parameters.options.fallbackOutput'
+		) {
+			const curentFallbackOutput = (node.parameters?.options as { fallbackOutput: string })
+				?.fallbackOutput as string;
+			if (curentFallbackOutput === 'extra') {
+				if (!parameterData.value || parameterData.value !== 'extra') {
+					connections[node.name].main = connections[node.name].main.slice(0, -1);
+					return connections;
+				}
+			}
+		}
+
+		if (node.type === SWITCH_NODE_TYPE && parameterData.name.includes('parameters.rules.values')) {
+			const { fallbackOutput } = node.parameters?.options as { fallbackOutput: string };
+
+			if (parameterData.value === undefined) {
+				function extractIndex(path: string): number | null {
+					const match = path.match(/parameters\.rules\.values\[(\d+)\]$/);
+					return match ? parseInt(match[1], 10) : null;
+				}
+
+				const index = extractIndex(parameterData.name);
+
+				// rule was removed
+				if (index !== null) {
+					connections[node.name].main.splice(index, 1);
+					return connections;
+				}
+
+				// all rules were removed
+				if (parameterData.name === 'parameters.rules.values') {
+					if (fallbackOutput === 'extra') {
+						connections[node.name].main = [
+							connections[node.name].main[connections[node.name].main.length - 1],
+						];
+					} else {
+						connections[node.name].main = [];
+					}
+
+					return connections;
+				}
+			} else if (parameterData.name === 'parameters.rules.values') {
+				const curentRulesvalues = (node.parameters?.rules as { values: IDataObject[] })?.values;
+				let lastConnection: IConnection[] | null | undefined = undefined;
+				if (
+					fallbackOutput === 'extra' &&
+					connections[node.name].main.length === curentRulesvalues.length + 1
+				) {
+					lastConnection = connections[node.name].main.pop();
+				}
+				// rule was added
+				const currentRulesLength = (node.parameters?.rules as { values: IDataObject[] })?.values
+					?.length;
+
+				const newRulesLength = (parameterData.value as IDataObject[])?.length;
+
+				if (newRulesLength - currentRulesLength === 1) {
+					connections[node.name].main = [...connections[node.name].main, []];
+
+					if (lastConnection) {
+						connections[node.name].main.push(lastConnection);
+					}
+
+					return connections;
+				} else {
+					// order was changed
+					const newRulesvalues = parameterData.value as IDataObject[];
+					const updatedConnectionsIndex: number[] = [];
+
+					for (const rule of curentRulesvalues) {
+						const index = newRulesvalues.findIndex((newRule) => isEqual(rule, newRule));
+						if (index !== -1) {
+							updatedConnectionsIndex.push(index);
+						}
+					}
+
+					const reorderedConnections: NodeInputConnections = [];
+
+					for (const index of updatedConnectionsIndex) {
+						reorderedConnections.push(connections[node.name].main[index] ?? []);
+					}
+
+					if (lastConnection) {
+						reorderedConnections.push(lastConnection);
+					}
+
+					connections[node.name].main = reorderedConnections;
+					return connections;
+				}
+			}
+		}
+	} catch (error) {
+		captureException(error);
+	}
+
+	return null;
+}
diff --git a/packages/editor-ui/src/utils/nodeTypeUtils.test.ts b/packages/editor-ui/src/utils/nodeTypeUtils.test.ts
new file mode 100644
index 0000000000..8eb9c47118
--- /dev/null
+++ b/packages/editor-ui/src/utils/nodeTypeUtils.test.ts
@@ -0,0 +1,75 @@
+import type { ResourceMapperField } from 'n8n-workflow';
+import { isResourceMapperFieldListStale } from './nodeTypesUtils';
+
+describe('isResourceMapperFieldListStale', () => {
+	const baseField: ResourceMapperField = {
+		id: 'test',
+		displayName: 'test',
+		required: false,
+		defaultMatch: false,
+		display: true,
+		canBeUsedToMatch: true,
+		type: 'string',
+	};
+
+	// Test property changes
+	test.each([
+		[
+			'displayName',
+			{ ...baseField },
+			{ ...baseField, displayName: 'changed' } as ResourceMapperField,
+		],
+		['required', { ...baseField }, { ...baseField, required: true } as ResourceMapperField],
+		['defaultMatch', { ...baseField }, { ...baseField, defaultMatch: true } as ResourceMapperField],
+		['display', { ...baseField }, { ...baseField, display: false }],
+		[
+			'canBeUsedToMatch',
+			{ ...baseField },
+			{ ...baseField, canBeUsedToMatch: false } as ResourceMapperField,
+		],
+		['type', { ...baseField }, { ...baseField, type: 'number' } as ResourceMapperField],
+	])('returns true when %s changes', (_property, oldField, newField) => {
+		expect(isResourceMapperFieldListStale([oldField], [newField])).toBe(true);
+	});
+
+	// Test different array lengths
+	test.each([
+		['empty vs non-empty', [], [baseField]],
+		['non-empty vs empty', [baseField], []],
+		['one vs two fields', [baseField], [baseField, { ...baseField, id: 'test2' }]],
+	])('returns true for different lengths: %s', (_scenario, oldFields, newFields) => {
+		expect(isResourceMapperFieldListStale(oldFields, newFields)).toBe(true);
+	});
+
+	// Test identical cases
+	test.each([
+		['empty arrays', [], []],
+		['single field', [baseField], [{ ...baseField }]],
+		[
+			'multiple fields',
+			[
+				{ ...baseField, id: 'test1' },
+				{ ...baseField, id: 'test2' },
+			],
+			[
+				{ ...baseField, id: 'test1' },
+				{ ...baseField, id: 'test2' },
+			],
+		],
+	])('returns false for identical lists: %s', (_scenario, oldFields, newFields) => {
+		expect(isResourceMapperFieldListStale(oldFields, newFields)).toBe(false);
+	});
+
+	// This test case is complex enough to keep separate
+	test('returns true when field is removed/replaced', () => {
+		const oldFields = [
+			{ ...baseField, id: 'test1' },
+			{ ...baseField, id: 'test2' },
+		];
+		const newFields = [
+			{ ...baseField, id: 'test1' },
+			{ ...baseField, id: 'test3' }, // different id
+		];
+		expect(isResourceMapperFieldListStale(oldFields, newFields)).toBe(true);
+	});
+});
diff --git a/packages/editor-ui/src/utils/nodeTypesUtils.ts b/packages/editor-ui/src/utils/nodeTypesUtils.ts
index 91fe812e4e..3b732dcda6 100644
--- a/packages/editor-ui/src/utils/nodeTypesUtils.ts
+++ b/packages/editor-ui/src/utils/nodeTypesUtils.ts
@@ -440,6 +440,42 @@ export const fieldCannotBeDeleted = (
 	);
 };
 
+export const isResourceMapperFieldListStale = (
+	oldFields: ResourceMapperField[],
+	newFields: ResourceMapperField[],
+): boolean => {
+	if (oldFields.length !== newFields.length) {
+		return true;
+	}
+
+	// Create map for O(1) lookup
+	const newFieldsMap = new Map(newFields.map((field) => [field.id, field]));
+
+	// Check if any fields were removed or modified
+	for (const oldField of oldFields) {
+		const newField = newFieldsMap.get(oldField.id);
+
+		// Field was removed
+		if (!newField) {
+			return true;
+		}
+
+		// Check if any properties changed
+		if (
+			oldField.displayName !== newField.displayName ||
+			oldField.required !== newField.required ||
+			oldField.defaultMatch !== newField.defaultMatch ||
+			oldField.display !== newField.display ||
+			oldField.canBeUsedToMatch !== newField.canBeUsedToMatch ||
+			oldField.type !== newField.type
+		) {
+			return true;
+		}
+	}
+
+	return false;
+};
+
 export const isMatchingField = (
 	field: string,
 	matchingFields: string[],
diff --git a/packages/editor-ui/src/utils/__tests__/nodeViewUtils.spec.ts b/packages/editor-ui/src/utils/nodeViewUtils.test.ts
similarity index 68%
rename from packages/editor-ui/src/utils/__tests__/nodeViewUtils.spec.ts
rename to packages/editor-ui/src/utils/nodeViewUtils.test.ts
index 2ad737f198..9e01b3449c 100644
--- a/packages/editor-ui/src/utils/__tests__/nodeViewUtils.spec.ts
+++ b/packages/editor-ui/src/utils/nodeViewUtils.test.ts
@@ -1,10 +1,12 @@
-import { generateOffsets, getGenericHints } from '../nodeViewUtils';
+import { generateOffsets, getGenericHints, getNewNodePosition } from './nodeViewUtils';
 import type { INode, INodeTypeDescription, INodeExecutionData, Workflow } from 'n8n-workflow';
-import type { INodeUi } from '@/Interface';
+import type { INodeUi, XYPosition } from '@/Interface';
 import { NodeHelpers } from 'n8n-workflow';
 
 import { describe, it, expect, beforeEach } from 'vitest';
 import { mock, type MockProxy } from 'vitest-mock-extended';
+import { SET_NODE_TYPE, STICKY_NODE_TYPE } from '@/constants';
+import { createTestNode } from '@/__tests__/mocks';
 
 describe('getGenericHints', () => {
 	let mockWorkflowNode: MockProxy<INode>;
@@ -169,3 +171,57 @@ describe('generateOffsets', () => {
 		expect(result).toEqual([-580, -460, -340, -220, -100, 100, 220, 340, 460, 580]);
 	});
 });
+
+describe('getNewNodePosition', () => {
+	it('should return the new position when there are no conflicts', () => {
+		const nodes: INodeUi[] = [];
+		const newPosition: XYPosition = [100, 100];
+		const result = getNewNodePosition(nodes, newPosition);
+		expect(result).toEqual([100, 100]);
+	});
+
+	it('should adjust the position to the closest grid size', () => {
+		const nodes: INodeUi[] = [];
+		const newPosition: XYPosition = [105, 115];
+		const result = getNewNodePosition(nodes, newPosition);
+		expect(result).toEqual([120, 120]);
+	});
+
+	it('should move the position to avoid conflicts', () => {
+		const nodes: INodeUi[] = [
+			createTestNode({ id: '1', position: [100, 100], type: SET_NODE_TYPE }),
+		];
+		const newPosition: XYPosition = [100, 100];
+		const result = getNewNodePosition(nodes, newPosition);
+		expect(result).toEqual([180, 180]);
+	});
+
+	it('should skip nodes in the conflict allowlist', () => {
+		const nodes: INodeUi[] = [
+			createTestNode({ id: '1', position: [100, 100], type: STICKY_NODE_TYPE }),
+		];
+		const newPosition: XYPosition = [100, 100];
+		const result = getNewNodePosition(nodes, newPosition);
+		expect(result).toEqual([100, 100]);
+	});
+
+	it('should use the provided move position to resolve conflicts', () => {
+		const nodes: INodeUi[] = [
+			createTestNode({ id: '1', position: [100, 100], type: SET_NODE_TYPE }),
+		];
+		const newPosition: XYPosition = [100, 100];
+		const movePosition: XYPosition = [50, 50];
+		const result = getNewNodePosition(nodes, newPosition, movePosition);
+		expect(result).toEqual([200, 200]);
+	});
+
+	it('should handle multiple conflicts correctly', () => {
+		const nodes: INodeUi[] = [
+			createTestNode({ id: '1', position: [100, 100], type: SET_NODE_TYPE }),
+			createTestNode({ id: '2', position: [140, 140], type: SET_NODE_TYPE }),
+		];
+		const newPosition: XYPosition = [100, 100];
+		const result = getNewNodePosition(nodes, newPosition);
+		expect(result).toEqual([220, 220]);
+	});
+});
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.ts b/packages/editor-ui/src/utils/nodeViewUtils.ts
index a4495cf5dc..a382180598 100644
--- a/packages/editor-ui/src/utils/nodeViewUtils.ts
+++ b/packages/editor-ui/src/utils/nodeViewUtils.ts
@@ -2,6 +2,7 @@ import { isNumber, isValidNodeConnectionType } from '@/utils/typeGuards';
 import {
 	LIST_LIKE_NODE_OPERATIONS,
 	NODE_OUTPUT_DEFAULT_KEY,
+	NODE_POSITION_CONFLICT_ALLOWLIST,
 	SET_NODE_TYPE,
 	SPLIT_IN_BATCHES_NODE_TYPE,
 	STICKY_NODE_TYPE,
@@ -582,6 +583,11 @@ export const getNewNodePosition = (
 		conflictFound = false;
 		for (i = 0; i < nodes.length; i++) {
 			node = nodes[i];
+
+			if (NODE_POSITION_CONFLICT_ALLOWLIST.includes(node.type)) {
+				continue;
+			}
+
 			if (!canUsePosition(node.position, targetPosition)) {
 				conflictFound = true;
 				break;
diff --git a/packages/editor-ui/src/utils/__tests__/objectUtils.test.ts b/packages/editor-ui/src/utils/objectUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/__tests__/objectUtils.test.ts
rename to packages/editor-ui/src/utils/objectUtils.test.ts
diff --git a/packages/editor-ui/src/utils/__tests__/pairedItemUtils.test.ts b/packages/editor-ui/src/utils/pairedItemUtils.test.ts
similarity index 99%
rename from packages/editor-ui/src/utils/__tests__/pairedItemUtils.test.ts
rename to packages/editor-ui/src/utils/pairedItemUtils.test.ts
index 6d41511c70..e3e2835bb0 100644
--- a/packages/editor-ui/src/utils/__tests__/pairedItemUtils.test.ts
+++ b/packages/editor-ui/src/utils/pairedItemUtils.test.ts
@@ -4,7 +4,7 @@ import {
 	getSourceItems,
 	getPairedItemsMapping,
 	MAX_ITEM_COUNT_FOR_PAIRING,
-} from '../pairedItemUtils';
+} from './pairedItemUtils';
 
 const MOCK_EXECUTION: Partial<IExecutionResponse> = {
 	data: {
diff --git a/packages/editor-ui/src/utils/__tests__/rbacUtils.test.ts b/packages/editor-ui/src/utils/rbacUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/__tests__/rbacUtils.test.ts
rename to packages/editor-ui/src/utils/rbacUtils.test.ts
diff --git a/packages/editor-ui/src/utils/templates/__tests__/templateActions.test.ts b/packages/editor-ui/src/utils/templates/templateActions.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/templates/__tests__/templateActions.test.ts
rename to packages/editor-ui/src/utils/templates/templateActions.test.ts
diff --git a/packages/editor-ui/src/utils/templates/__tests__/templateTransforms.test.ts b/packages/editor-ui/src/utils/templates/templateTransforms.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/templates/__tests__/templateTransforms.test.ts
rename to packages/editor-ui/src/utils/templates/templateTransforms.test.ts
diff --git a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts b/packages/editor-ui/src/utils/typesUtils.test.ts
similarity index 100%
rename from packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
rename to packages/editor-ui/src/utils/typesUtils.test.ts
diff --git a/packages/editor-ui/src/views/__tests__/AuthView.test.ts b/packages/editor-ui/src/views/AuthView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/__tests__/AuthView.test.ts
rename to packages/editor-ui/src/views/AuthView.test.ts
diff --git a/packages/editor-ui/src/views/AuthView.vue b/packages/editor-ui/src/views/AuthView.vue
index 1bc9267c8c..426fac0345 100644
--- a/packages/editor-ui/src/views/AuthView.vue
+++ b/packages/editor-ui/src/views/AuthView.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
+import Logo from '@/components/Logo/Logo.vue';
 import SSOLogin from '@/components/SSOLogin.vue';
 import type { IFormBoxConfig } from '@/Interface';
+import { useSettingsStore } from '@/stores/settings.store';
 
 withDefaults(
 	defineProps<{
@@ -32,13 +34,15 @@ const onSubmit = (values: { [key: string]: string }) => {
 const onSecondaryClick = () => {
 	emit('secondaryClick');
 };
+
+const {
+	settings: { releaseChannel },
+} = useSettingsStore();
 </script>
 
 <template>
 	<div :class="$style.container">
-		<div :class="$style.logoContainer">
-			<Logo />
-		</div>
+		<Logo location="authView" :release-channel="releaseChannel" />
 		<div v-if="subtitle" :class="$style.textContainer">
 			<n8n-text size="large">{{ subtitle }}</n8n-text>
 		</div>
@@ -69,16 +73,10 @@ body {
 	padding-top: var(--spacing-2xl);
 
 	> * {
-		margin-bottom: var(--spacing-l);
 		width: 352px;
 	}
 }
 
-.logoContainer {
-	display: flex;
-	justify-content: center;
-}
-
 .textContainer {
 	text-align: center;
 }
diff --git a/packages/editor-ui/src/views/CanvasAddButton.vue b/packages/editor-ui/src/views/CanvasAddButton.vue
index 108cf321e8..58574d5420 100644
--- a/packages/editor-ui/src/views/CanvasAddButton.vue
+++ b/packages/editor-ui/src/views/CanvasAddButton.vue
@@ -2,12 +2,15 @@
 import { computed } from 'vue';
 import type { XYPosition } from '@/Interface';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
+import { useI18n } from '@/composables/useI18n';
 
 export interface Props {
 	showTooltip: boolean;
 	position: XYPosition;
 }
 
+const i18n = useI18n();
+
 const props = defineProps<Props>();
 
 const nodeCreatorStore = useNodeCreatorStore();
@@ -35,10 +38,10 @@ const containerCssVars = computed(() => ({
 				<font-awesome-icon icon="plus" size="lg" />
 			</button>
 			<template #content>
-				{{ $locale.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting') }}
+				{{ i18n.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting') }}
 			</template>
 		</n8n-tooltip>
-		<p :class="$style.label" v-text="$locale.baseText('nodeView.canvasAddButton.addFirstStep')" />
+		<p :class="$style.label" v-text="i18n.baseText('nodeView.canvasAddButton.addFirstStep')" />
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/views/ChangePasswordView.vue b/packages/editor-ui/src/views/ChangePasswordView.vue
index 7a48c5867a..ea4c3fb9ce 100644
--- a/packages/editor-ui/src/views/ChangePasswordView.vue
+++ b/packages/editor-ui/src/views/ChangePasswordView.vue
@@ -9,7 +9,7 @@ import { useToast } from '@/composables/useToast';
 import { useUsersStore } from '@/stores/users.store';
 
 import type { IFormBoxConfig } from '@/Interface';
-import { MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH, VIEWS } from '@/constants';
+import { MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH, VIEWS } from '@/constants';
 
 const usersStore = useUsersStore();
 
@@ -56,7 +56,7 @@ const onSubmit = async (values: { [key: string]: string }) => {
 			const changePasswordParameters = {
 				token,
 				password: password.value,
-				...(values.mfaToken && { mfaToken: values.mfaToken }),
+				...(values.mfaCode && { mfaCode: values.mfaCode }),
 			};
 
 			await usersStore.changePassword(changePasswordParameters);
@@ -129,13 +129,13 @@ onMounted(async () => {
 
 	if (mfaEnabled) {
 		form.inputs.push({
-			name: 'mfaToken',
+			name: 'mfaCode',
 			initialValue: '',
 			properties: {
 				required: true,
 				label: locale.baseText('mfa.code.input.label'),
 				placeholder: locale.baseText('mfa.code.input.placeholder'),
-				maxlength: MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH,
+				maxlength: MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH,
 				capitalize: true,
 				validateOnBlur: true,
 			},
diff --git a/packages/editor-ui/src/views/CredentialsView.test.ts b/packages/editor-ui/src/views/CredentialsView.test.ts
index d45c70c78b..878cc108b0 100644
--- a/packages/editor-ui/src/views/CredentialsView.test.ts
+++ b/packages/editor-ui/src/views/CredentialsView.test.ts
@@ -5,24 +5,27 @@ import CredentialsView from '@/views/CredentialsView.vue';
 import { useUIStore } from '@/stores/ui.store';
 import { mockedStore } from '@/__tests__/utils';
 import { waitFor, within, fireEvent } from '@testing-library/vue';
-import { CREDENTIAL_SELECT_MODAL_KEY, STORES } from '@/constants';
-import userEvent from '@testing-library/user-event';
+import { CREDENTIAL_SELECT_MODAL_KEY, STORES, VIEWS } from '@/constants';
 import { useProjectsStore } from '@/stores/projects.store';
 import type { Project } from '@/types/projects.types';
-import { useRouter } from 'vue-router';
+import { createRouter, createWebHistory } from 'vue-router';
+import { flushPromises } from '@vue/test-utils';
+import { CREDENTIAL_EMPTY_VALUE } from 'n8n-workflow';
+vi.mock('@/composables/useGlobalEntityCreation', () => ({
+	useGlobalEntityCreation: () => ({
+		menu: [],
+	}),
+}));
 
-vi.mock('vue-router', async () => {
-	const actual = await vi.importActual('vue-router');
-	const push = vi.fn();
-	const replace = vi.fn();
-	return {
-		...actual,
-		// your mocked methods
-		useRouter: () => ({
-			push,
-			replace,
-		}),
-	};
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/:credentialId?',
+			name: VIEWS.CREDENTIALS,
+			component: { template: '<div></div>' },
+		},
+	],
 });
 
 const initialState = {
@@ -31,13 +34,15 @@ const initialState = {
 	},
 };
 
-const renderComponent = createComponentRenderer(CredentialsView);
-let router: ReturnType<typeof useRouter>;
+const renderComponent = createComponentRenderer(CredentialsView, {
+	global: { stubs: { ProjectHeader: true }, plugins: [router] },
+});
 
 describe('CredentialsView', () => {
-	beforeEach(() => {
+	beforeEach(async () => {
 		createTestingPinia({ initialState });
-		router = useRouter();
+		await router.push('/');
+		await router.isReady();
 	});
 
 	afterEach(() => {
@@ -53,6 +58,7 @@ describe('CredentialsView', () => {
 				type: 'test',
 				createdAt: '2021-05-05T00:00:00Z',
 				updatedAt: '2021-05-05T00:00:00Z',
+				isManaged: false,
 			},
 		];
 		const projectsStore = mockedStore(useProjectsStore);
@@ -71,6 +77,7 @@ describe('CredentialsView', () => {
 				createdAt: '2021-05-05T00:00:00Z',
 				updatedAt: '2021-05-05T00:00:00Z',
 				scopes: ['credential:update'],
+				isManaged: false,
 			},
 			{
 				id: '2',
@@ -78,6 +85,7 @@ describe('CredentialsView', () => {
 				type: 'test2',
 				createdAt: '2021-05-05T00:00:00Z',
 				updatedAt: '2021-05-05T00:00:00Z',
+				isManaged: false,
 			},
 		];
 		const projectsStore = mockedStore(useProjectsStore);
@@ -96,28 +104,6 @@ describe('CredentialsView', () => {
 			renderComponent({ props: { credentialId: 'create' } });
 			expect(uiStore.openModal).toHaveBeenCalledWith(CREDENTIAL_SELECT_MODAL_KEY);
 		});
-
-		it('should update credentialId route param to create', async () => {
-			const projectsStore = mockedStore(useProjectsStore);
-			projectsStore.isProjectHome = false;
-			projectsStore.currentProject = { scopes: ['credential:create'] } as Project;
-			const credentialsStore = mockedStore(useCredentialsStore);
-			credentialsStore.allCredentials = [
-				{
-					id: '1',
-					name: 'test',
-					type: 'test',
-					createdAt: '2021-05-05T00:00:00Z',
-					updatedAt: '2021-05-05T00:00:00Z',
-				},
-			];
-			const { getByTestId } = renderComponent();
-
-			await userEvent.click(getByTestId('resources-list-add'));
-			await waitFor(() =>
-				expect(router.replace).toHaveBeenCalledWith({ params: { credentialId: 'create' } }),
-			);
-		});
 	});
 
 	describe('open existing credential', () => {
@@ -128,6 +114,7 @@ describe('CredentialsView', () => {
 		});
 
 		it('should update credentialId route param when opened', async () => {
+			const replaceSpy = vi.spyOn(router, 'replace');
 			const projectsStore = mockedStore(useProjectsStore);
 			projectsStore.isProjectHome = false;
 			projectsStore.currentProject = { scopes: ['credential:read'] } as Project;
@@ -140,6 +127,7 @@ describe('CredentialsView', () => {
 					createdAt: '2021-05-05T00:00:00Z',
 					updatedAt: '2021-05-05T00:00:00Z',
 					scopes: ['credential:update'],
+					isManaged: false,
 				},
 			];
 			const { getByTestId } = renderComponent();
@@ -149,8 +137,147 @@ describe('CredentialsView', () => {
 			 */
 			await fireEvent.click(getByTestId('resources-list-item'));
 			await waitFor(() =>
-				expect(router.replace).toHaveBeenCalledWith({ params: { credentialId: '1' } }),
+				expect(replaceSpy).toHaveBeenCalledWith(
+					expect.objectContaining({ params: { credentialId: '1' } }),
+				),
 			);
 		});
 	});
+
+	describe('filters', () => {
+		it('should filter by type', async () => {
+			await router.push({ name: VIEWS.CREDENTIALS, query: { type: ['test'] } });
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentialTypes = [
+				{
+					name: 'test',
+					displayName: 'test',
+					properties: [],
+				},
+			];
+			credentialsStore.allCredentials = [
+				{
+					id: '1',
+					name: 'test',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+				},
+				{
+					id: '1',
+					name: 'test',
+					type: 'another',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+				},
+			];
+			const { getAllByTestId } = renderComponent();
+			expect(getAllByTestId('resources-list-item').length).toBe(1);
+		});
+
+		it('should filter by setupNeeded', async () => {
+			await router.push({ name: VIEWS.CREDENTIALS, query: { setupNeeded: 'true' } });
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentials = [
+				{
+					id: '1',
+					name: 'test',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: {} as unknown as string,
+				},
+				{
+					id: '1',
+					name: 'test',
+					type: 'another',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: 'any' } as unknown as string,
+				},
+			];
+			const { getAllByTestId, getByTestId } = renderComponent();
+			await flushPromises();
+			expect(getAllByTestId('resources-list-item').length).toBe(1);
+
+			await fireEvent.click(getByTestId('credential-filter-setup-needed'));
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(2));
+		});
+
+		it('should filter by setupNeeded when object keys are empty', async () => {
+			await router.push({ name: VIEWS.CREDENTIALS, query: { setupNeeded: 'true' } });
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentials = [
+				{
+					id: '1',
+					name: 'credential needs setup',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: '' } as unknown as string,
+				},
+				{
+					id: '2',
+					name: 'random',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: 'any value' } as unknown as string,
+				},
+			];
+			const { getAllByTestId, getByTestId } = renderComponent();
+			await flushPromises();
+			expect(getAllByTestId('resources-list-item').length).toBe(1);
+			expect(getByTestId('resources-list-item').textContent).toContain('credential needs setup');
+
+			await fireEvent.click(getByTestId('credential-filter-setup-needed'));
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(2));
+		});
+
+		it('should filter by setupNeeded when object keys are "CREDENTIAL_EMPTY_VALUE"', async () => {
+			await router.push({ name: VIEWS.CREDENTIALS, query: { setupNeeded: 'true' } });
+			const credentialsStore = mockedStore(useCredentialsStore);
+			credentialsStore.allCredentials = [
+				{
+					id: '1',
+					name: 'credential needs setup',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: CREDENTIAL_EMPTY_VALUE } as unknown as string,
+				},
+				{
+					id: '2',
+					name: 'random',
+					type: 'test',
+					createdAt: '2021-05-05T00:00:00Z',
+					updatedAt: '2021-05-05T00:00:00Z',
+					scopes: ['credential:update'],
+					isManaged: false,
+					data: { anyKey: 'any value' } as unknown as string,
+				},
+			];
+			const { getAllByTestId, getByTestId } = renderComponent();
+			await flushPromises();
+			expect(getAllByTestId('resources-list-item').length).toBe(1);
+			expect(getByTestId('resources-list-item').textContent).toContain('credential needs setup');
+
+			await fireEvent.click(getByTestId('credential-filter-setup-needed'));
+			await waitFor(() => expect(getAllByTestId('resources-list-item').length).toBe(2));
+		});
+	});
 });
diff --git a/packages/editor-ui/src/views/CredentialsView.vue b/packages/editor-ui/src/views/CredentialsView.vue
index cdb11456ea..3585a3fc24 100644
--- a/packages/editor-ui/src/views/CredentialsView.vue
+++ b/packages/editor-ui/src/views/CredentialsView.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { ref, computed, onMounted, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute, useRouter, type LocationQueryRaw } from 'vue-router';
 import type { ICredentialsResponse, ICredentialTypeMap } from '@/Interface';
-import type { IResource } from '@/components/layouts/ResourcesListLayout.vue';
-import ResourcesListLayout from '@/components/layouts/ResourcesListLayout.vue';
+import type { ICredentialType, ICredentialsDecrypted } from 'n8n-workflow';
+import ResourcesListLayout, {
+	type IResource,
+	type IFilters,
+} from '@/components/layouts/ResourcesListLayout.vue';
 import CredentialCard from '@/components/CredentialCard.vue';
-import type { ICredentialType } from 'n8n-workflow';
 import {
 	CREDENTIAL_SELECT_MODAL_KEY,
 	CREDENTIAL_EDIT_MODAL_KEY,
@@ -19,12 +21,15 @@ import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useProjectsStore } from '@/stores/projects.store';
 import useEnvironmentsStore from '@/stores/environments.ee.store';
 import { useSettingsStore } from '@/stores/settings.store';
-import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
+import { useUsersStore } from '@/stores/users.store';
 import { getResourcePermissions } from '@/permissions';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useI18n } from '@/composables/useI18n';
-import { N8nButton, N8nInputLabel, N8nSelect, N8nOption } from 'n8n-design-system';
+import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
+import { N8nCheckbox } from 'n8n-design-system';
+import { pickBy } from 'lodash-es';
+import { CREDENTIAL_EMPTY_VALUE } from 'n8n-workflow';
 
 const props = defineProps<{
 	credentialId?: string;
@@ -36,6 +41,7 @@ const uiStore = useUIStore();
 const sourceControlStore = useSourceControlStore();
 const externalSecretsStore = useExternalSecretsStore();
 const projectsStore = useProjectsStore();
+const usersStore = useUsersStore();
 
 const documentTitle = useDocumentTitle();
 const route = useRoute();
@@ -43,14 +49,26 @@ const router = useRouter();
 const telemetry = useTelemetry();
 const i18n = useI18n();
 
-const filters = ref({
-	search: '',
-	homeProject: '',
-	type: '',
-});
+type Filters = IFilters & { type?: string[]; setupNeeded?: boolean };
+const updateFilter = (state: Filters) => {
+	void router.replace({ query: pickBy(state) as LocationQueryRaw });
+};
 
+const filters = computed<Filters>(
+	() =>
+		({ ...route.query, setupNeeded: route.query.setupNeeded?.toString() === 'true' }) as Filters,
+);
 const loading = ref(false);
 
+const needsSetup = (data: string | undefined): boolean => {
+	const dataObject = data as unknown as ICredentialsDecrypted['data'];
+	if (!dataObject) return false;
+
+	if (Object.keys(dataObject).length === 0) return true;
+
+	return Object.values(dataObject).every((value) => !value || value === CREDENTIAL_EMPTY_VALUE);
+};
+
 const allCredentials = computed<IResource[]>(() =>
 	credentialsStore.allCredentials.map((credential) => ({
 		id: credential.id,
@@ -63,6 +81,7 @@ const allCredentials = computed<IResource[]>(() =>
 		type: credential.type,
 		sharedWithProjects: credential.sharedWithProjects,
 		readOnly: !getResourcePermissions(credential.scopes).credential.update,
+		needsSetup: needsSetup(credential.data),
 	})),
 );
 
@@ -72,12 +91,6 @@ const credentialTypesById = computed<ICredentialTypeMap>(
 	() => credentialsStore.credentialTypesById,
 );
 
-const addCredentialButtonText = computed(() =>
-	projectsStore.currentProject
-		? i18n.baseText('credentials.project.add')
-		: i18n.baseText('credentials.add'),
-);
-
 const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
 
 const projectPermissions = computed(() =>
@@ -87,7 +100,7 @@ const projectPermissions = computed(() =>
 );
 
 const setRouteCredentialId = (credentialId?: string) => {
-	void router.replace({ params: { credentialId } });
+	void router.replace({ params: { credentialId }, query: route.query });
 };
 
 const addCredential = () => {
@@ -101,7 +114,7 @@ listenForModalChanges({
 	store: uiStore,
 	onModalClosed(modalName) {
 		if ([CREDENTIAL_SELECT_MODAL_KEY, CREDENTIAL_EDIT_MODAL_KEY].includes(modalName as string)) {
-			void router.replace({ params: { credentialId: '' } });
+			void router.replace({ params: { credentialId: '' }, query: route.query });
 		}
 	},
 });
@@ -123,13 +136,11 @@ watch(
 	},
 );
 
-const onFilter = (
-	resource: ICredentialsResponse,
-	filtersToApply: { type: string[]; search: string },
-	matches: boolean,
-): boolean => {
-	if (filtersToApply.type.length > 0) {
-		matches = matches && filtersToApply.type.includes(resource.type);
+const onFilter = (resource: IResource, newFilters: IFilters, matches: boolean): boolean => {
+	const iResource = resource as ICredentialsResponse & { needsSetup: boolean };
+	const filtersToApply = newFilters as Filters;
+	if (filtersToApply.type && filtersToApply.type.length > 0) {
+		matches = matches && filtersToApply.type.includes(iResource.type);
 	}
 
 	if (filtersToApply.search) {
@@ -137,8 +148,12 @@ const onFilter = (
 
 		matches =
 			matches ||
-			(credentialTypesById.value[resource.type] &&
-				credentialTypesById.value[resource.type].displayName.toLowerCase().includes(searchString));
+			(credentialTypesById.value[iResource.type] &&
+				credentialTypesById.value[iResource.type].displayName.toLowerCase().includes(searchString));
+	}
+
+	if (filtersToApply.setupNeeded) {
+		matches = matches && iResource.needsSetup;
 	}
 
 	return matches;
@@ -161,6 +176,14 @@ const initialize = async () => {
 	loading.value = false;
 };
 
+credentialsStore.$onAction(({ name, after }) => {
+	if (name === 'createNewCredential') {
+		after(() => {
+			void credentialsStore.fetchAllCredentials(route?.params?.projectId as string | undefined);
+		});
+	}
+});
+
 sourceControlStore.$onAction(({ name, after }) => {
 	if (name !== 'pullWorkfolder') return;
 	after(() => {
@@ -186,24 +209,10 @@ onMounted(() => {
 		:type-props="{ itemSize: 77 }"
 		:loading="loading"
 		:disabled="readOnlyEnv || !projectPermissions.credential.create"
-		@click:add="addCredential"
-		@update:filters="filters = $event"
+		@update:filters="updateFilter"
 	>
 		<template #header>
-			<ProjectTabs />
-		</template>
-		<template #add-button="{ disabled }">
-			<div>
-				<N8nButton
-					size="large"
-					block
-					:disabled="disabled"
-					data-test-id="resources-list-add"
-					@click="addCredential"
-				>
-					{{ addCredentialButtonText }}
-				</N8nButton>
-			</div>
+			<ProjectHeader />
 		</template>
 		<template #default="{ data }">
 			<CredentialCard
@@ -211,6 +220,7 @@ onMounted(() => {
 				class="mb-2xs"
 				:data="data"
 				:read-only="data.readOnly"
+				:needs-setup="data.needsSetup"
 				@click="setRouteCredentialId"
 			/>
 		</template>
@@ -240,6 +250,53 @@ onMounted(() => {
 					/>
 				</N8nSelect>
 			</div>
+			<div class="mb-s">
+				<N8nInputLabel
+					:label="i18n.baseText('credentials.filters.status')"
+					:bold="false"
+					size="small"
+					color="text-base"
+					class="mb-3xs"
+				/>
+
+				<N8nCheckbox
+					:label="i18n.baseText('credentials.filters.setup')"
+					data-test-id="credential-filter-setup-needed"
+					:model-value="filters.setupNeeded"
+					@update:model-value="setKeyValue('setupNeeded', $event)"
+				>
+				</N8nCheckbox>
+			</div>
+		</template>
+		<template #empty>
+			<n8n-action-box
+				data-test-id="empty-resources-list"
+				emoji="👋"
+				:heading="
+					i18n.baseText(
+						usersStore.currentUser?.firstName
+							? 'credentials.empty.heading'
+							: 'credentials.empty.heading.userNotSetup',
+						{
+							interpolate: { name: usersStore.currentUser?.firstName ?? '' },
+						},
+					)
+				"
+				:description="i18n.baseText('credentials.empty.description')"
+				:button-text="i18n.baseText('credentials.empty.button')"
+				button-type="secondary"
+				:button-disabled="readOnlyEnv || !projectPermissions.credential.create"
+				:button-icon="readOnlyEnv ? 'lock' : undefined"
+				@click:button="addCredential"
+			>
+				<template #disabledButtonTooltip>
+					{{
+						readOnlyEnv
+							? i18n.baseText('readOnlyEnv.cantAdd.credential')
+							: i18n.baseText('credentials.empty.button.disabled.tooltip')
+					}}
+				</template>
+			</n8n-action-box>
 		</template>
 	</ResourcesListLayout>
 </template>
diff --git a/packages/editor-ui/src/views/ErrorView.vue b/packages/editor-ui/src/views/ErrorView.vue
index 93935fe576..891a464680 100644
--- a/packages/editor-ui/src/views/ErrorView.vue
+++ b/packages/editor-ui/src/views/ErrorView.vue
@@ -2,6 +2,7 @@
 import type { BaseTextKey } from '@/plugins/i18n';
 import { useRouter } from 'vue-router';
 import { VIEWS } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
 const router = useRouter();
 
 const props = defineProps<{
@@ -11,6 +12,8 @@ const props = defineProps<{
 	redirectPage?: keyof typeof VIEWS;
 }>();
 
+const i18n = useI18n();
+
 function onButtonClick() {
 	void router.push({ name: props.redirectPage ?? VIEWS.HOMEPAGE });
 }
@@ -22,16 +25,16 @@ function onButtonClick() {
 		<div :class="$style.message">
 			<div>
 				<n8n-heading size="2xlarge">
-					{{ $locale.baseText(messageKey) }}
+					{{ i18n.baseText(messageKey) }}
 				</n8n-heading>
 			</div>
 			<div>
 				<n8n-text v-if="errorCode" size="large">
-					{{ errorCode }} {{ $locale.baseText('error') }}
+					{{ errorCode }} {{ i18n.baseText('error') }}
 				</n8n-text>
 			</div>
 		</div>
-		<n8n-button :label="$locale.baseText(redirectTextKey)" @click="onButtonClick" />
+		<n8n-button :label="i18n.baseText(redirectTextKey)" @click="onButtonClick" />
 	</div>
 </template>
 
diff --git a/packages/editor-ui/src/views/ExecutionsView.vue b/packages/editor-ui/src/views/ExecutionsView.vue
index 7ac9205ce7..8cc463190d 100644
--- a/packages/editor-ui/src/views/ExecutionsView.vue
+++ b/packages/editor-ui/src/views/ExecutionsView.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { onBeforeMount, onBeforeUnmount, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
 import GlobalExecutionsList from '@/components/executions/global/GlobalExecutionsList.vue';
 import { useI18n } from '@/composables/useI18n';
 import { useTelemetry } from '@/composables/useTelemetry';
@@ -11,13 +12,13 @@ import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { storeToRefs } from 'pinia';
 import type { ExecutionFilterType } from '@/Interface';
 
+const route = useRoute();
 const i18n = useI18n();
 const telemetry = useTelemetry();
 const externalHooks = useExternalHooks();
 const workflowsStore = useWorkflowsStore();
 const executionsStore = useExecutionsStore();
 const documentTitle = useDocumentTitle();
-
 const toast = useToast();
 
 const { executionsCount, executionsCountEstimated, filters, allExecutions } =
@@ -46,7 +47,7 @@ onBeforeUnmount(() => {
 
 async function loadWorkflows() {
 	try {
-		await workflowsStore.fetchAllWorkflows();
+		await workflowsStore.fetchAllWorkflows(route.params?.projectId as string | undefined);
 	} catch (error) {
 		toast.showError(error, i18n.baseText('executionsList.showError.loadWorkflows.title'));
 	}
diff --git a/packages/editor-ui/src/views/ForgotMyPasswordView.test.ts b/packages/editor-ui/src/views/ForgotMyPasswordView.test.ts
new file mode 100644
index 0000000000..6e5819c440
--- /dev/null
+++ b/packages/editor-ui/src/views/ForgotMyPasswordView.test.ts
@@ -0,0 +1,137 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import ForgotMyPasswordView from '@/views/ForgotMyPasswordView.vue';
+import { useToast } from '@/composables/useToast';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
+
+vi.mock('vue-router', () => {
+	const push = vi.fn();
+	const replace = vi.fn();
+	const query = {};
+	return {
+		useRouter: () => ({
+			push,
+			replace,
+		}),
+		useRoute: () => ({
+			query,
+		}),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+vi.mock('@/composables/useToast', () => {
+	const showError = vi.fn();
+	const showMessage = vi.fn();
+	return {
+		useToast: () => ({
+			showError,
+			showMessage,
+		}),
+	};
+});
+
+const renderComponent = createComponentRenderer(ForgotMyPasswordView, {
+	global: {
+		stubs: {
+			'router-link': {
+				template: '<a href="#"><slot /></a>',
+			},
+		},
+	},
+});
+
+let toast: ReturnType<typeof useToast>;
+let usersStore: ReturnType<typeof mockedStore<typeof useUsersStore>>;
+let settingsStore: ReturnType<typeof mockedStore<typeof useSettingsStore>>;
+
+describe('ForgotMyPasswordView', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+
+		createTestingPinia();
+
+		toast = useToast();
+		usersStore = mockedStore(useUsersStore);
+		settingsStore = mockedStore(useSettingsStore);
+	});
+
+	it('should not throw error when opened', () => {
+		expect(() => renderComponent()).not.toThrow();
+	});
+
+	it('should show email sending setup warning', async () => {
+		const { getByRole, queryByRole } = renderComponent();
+
+		const link = getByRole('link');
+		const emailInput = queryByRole('textbox');
+
+		expect(emailInput).not.toBeInTheDocument();
+		expect(link).toBeVisible();
+		expect(link).toHaveTextContent('Back to sign in');
+	});
+
+	it('should show form and submit', async () => {
+		settingsStore.isSmtpSetup = true;
+		usersStore.sendForgotPasswordEmail.mockResolvedValueOnce();
+
+		const { getByRole } = renderComponent();
+
+		const link = getByRole('link');
+		const emailInput = getByRole('textbox');
+		const submitButton = getByRole('button');
+
+		expect(emailInput).toBeVisible();
+		expect(link).toBeVisible();
+		expect(link).toHaveTextContent('Back to sign in');
+
+		// TODO: Remove manual tabbing when the following issue is fixed (it should fail the test anyway)
+		// https://github.com/testing-library/vue-testing-library/issues/317
+		await userEvent.tab();
+		expect(document.activeElement).toBe(emailInput);
+
+		await userEvent.type(emailInput, 'test@n8n.io');
+		await userEvent.click(submitButton);
+
+		expect(usersStore.sendForgotPasswordEmail).toHaveBeenCalledWith({
+			email: 'test@n8n.io',
+		});
+
+		expect(toast.showMessage).toHaveBeenCalledWith(
+			expect.objectContaining({
+				title: expect.any(String),
+				message: expect.any(String),
+			}),
+		);
+	});
+
+	it('should show form and error toast when submit has error', async () => {
+		settingsStore.isSmtpSetup = true;
+		usersStore.sendForgotPasswordEmail.mockRejectedValueOnce({
+			httpStatusCode: 400,
+		});
+
+		const { getByRole } = renderComponent();
+
+		const emailInput = getByRole('textbox');
+		const submitButton = getByRole('button');
+
+		await userEvent.type(emailInput, 'test@n8n.io');
+		await userEvent.click(submitButton);
+
+		expect(usersStore.sendForgotPasswordEmail).toHaveBeenCalledWith({
+			email: 'test@n8n.io',
+		});
+
+		expect(toast.showMessage).toHaveBeenCalledWith(
+			expect.objectContaining({
+				type: 'error',
+			}),
+		);
+	});
+});
diff --git a/packages/editor-ui/src/views/ForgotMyPasswordView.vue b/packages/editor-ui/src/views/ForgotMyPasswordView.vue
index 87aaa9dc47..6d7d5c4881 100644
--- a/packages/editor-ui/src/views/ForgotMyPasswordView.vue
+++ b/packages/editor-ui/src/views/ForgotMyPasswordView.vue
@@ -26,6 +26,7 @@ const formConfig = computed(() => {
 				validationRules: [{ name: 'VALID_EMAIL' }],
 				autocomplete: 'email',
 				capitalize: true,
+				focusInitially: true,
 			},
 		},
 	];
diff --git a/packages/editor-ui/src/views/MfaView.vue b/packages/editor-ui/src/views/MfaView.vue
index 71b6ff9243..b17a21dde1 100644
--- a/packages/editor-ui/src/views/MfaView.vue
+++ b/packages/editor-ui/src/views/MfaView.vue
@@ -1,15 +1,16 @@
 <script setup lang="ts">
 import type { IFormInputs } from '@/Interface';
-import Logo from '../components/Logo.vue';
+import Logo from '@/components/Logo/Logo.vue';
 import {
 	MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH,
-	MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH,
+	MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH,
 	MFA_FORM,
 } from '@/constants';
 import { mfaEventBus } from '@/event-bus';
 import { onMounted, ref } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { toRefs } from '@vueuse/core';
+import { useSettingsStore } from '@/stores/settings.store';
 
 // ---------------------------------------------------------------------------
 // #region Props
@@ -29,7 +30,7 @@ const hasAnyChanges = ref(false);
 const formBus = ref(mfaEventBus);
 const formInputs = ref<null | IFormInputs>(null);
 const showRecoveryCodeForm = ref(false);
-const verifyingMfaToken = ref(false);
+const verifyingMfaCode = ref(false);
 const formError = ref('');
 const { reportError } = toRefs(props);
 
@@ -48,7 +49,7 @@ const i18 = useI18n();
 const emit = defineEmits<{
 	onFormChanged: [formField: string];
 	onBackClick: [formField: string];
-	submit: [{ token: string; recoveryCode: string }];
+	submit: [{ mfaCode: string; mfaRecoveryCode: string }];
 }>();
 
 // #endregion
@@ -94,11 +95,11 @@ const onBackClick = () => {
 
 	showRecoveryCodeForm.value = false;
 	hasAnyChanges.value = true;
-	formInputs.value = [mfaTokenFieldWithDefaults()];
+	formInputs.value = [mfaCodeFieldWithDefaults()];
 	emit('onBackClick', MFA_FORM.MFA_RECOVERY_CODE);
 };
 
-const onSubmit = async (form: { token: string; recoveryCode: string }) => {
+const onSubmit = async (form: { mfaCode: string; mfaRecoveryCode: string }) => {
 	formError.value = !showRecoveryCodeForm.value
 		? i18.baseText('mfa.code.invalid')
 		: i18.baseText('mfa.recovery.invalid');
@@ -106,9 +107,9 @@ const onSubmit = async (form: { token: string; recoveryCode: string }) => {
 };
 
 const onInput = ({ target: { value, name } }: { target: { value: string; name: string } }) => {
-	const isSubmittingMfaToken = name === 'token';
-	const inputValidLength = isSubmittingMfaToken
-		? MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH
+	const isSubmittingMfaCode = name === 'mfaCode';
+	const inputValidLength = isSubmittingMfaCode
+		? MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH
 		: MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH;
 
 	if (value.length !== inputValidLength) {
@@ -116,33 +117,33 @@ const onInput = ({ target: { value, name } }: { target: { value: string; name: s
 		return;
 	}
 
-	verifyingMfaToken.value = true;
+	verifyingMfaCode.value = true;
 	hasAnyChanges.value = true;
 
-	const dataToSubmit = isSubmittingMfaToken
-		? { token: value, recoveryCode: '' }
-		: { token: '', recoveryCode: value };
+	const dataToSubmit = isSubmittingMfaCode
+		? { mfaCode: value, mfaRecoveryCode: '' }
+		: { mfaCode: '', mfaRecoveryCode: value };
 
 	onSubmit(dataToSubmit)
 		.catch(() => {})
-		.finally(() => (verifyingMfaToken.value = false));
+		.finally(() => (verifyingMfaCode.value = false));
 };
 
 const mfaRecoveryCodeFieldWithDefaults = () => {
 	return formField(
-		'recoveryCode',
+		'mfaRecoveryCode',
 		i18.baseText('mfa.recovery.input.label'),
 		i18.baseText('mfa.recovery.input.placeholder'),
 		MFA_AUTHENTICATION_RECOVERY_CODE_INPUT_MAX_LENGTH,
 	);
 };
 
-const mfaTokenFieldWithDefaults = () => {
+const mfaCodeFieldWithDefaults = () => {
 	return formField(
-		'token',
+		'mfaCode',
 		i18.baseText('mfa.code.input.label'),
 		i18.baseText('mfa.code.input.placeholder'),
-		MFA_AUTHENTICATION_TOKEN_INPUT_MAX_LENGTH,
+		MFA_AUTHENTICATION_CODE_INPUT_MAX_LENGTH,
 	);
 };
 
@@ -152,12 +153,16 @@ const onSaveClick = () => {
 
 // #endregion
 
+const {
+	settings: { releaseChannel },
+} = useSettingsStore();
+
 // ---------------------------------------------------------------------------
 // #region Lifecycle hooks
 // ---------------------------------------------------------------------------
 
 onMounted(() => {
-	formInputs.value = [mfaTokenFieldWithDefaults()];
+	formInputs.value = [mfaCodeFieldWithDefaults()];
 });
 
 // #endregion
@@ -165,9 +170,7 @@ onMounted(() => {
 
 <template>
 	<div :class="$style.container">
-		<div :class="$style.logoContainer">
-			<Logo />
-		</div>
+		<Logo location="authView" :release-channel="releaseChannel" />
 		<n8n-card>
 			<div :class="$style.headerContainer">
 				<n8n-heading size="xlarge" color="text-dark">{{
@@ -211,7 +214,7 @@ onMounted(() => {
 			<div>
 				<n8n-button
 					float="right"
-					:loading="verifyingMfaToken"
+					:loading="verifyingMfaCode"
 					:label="
 						showRecoveryCodeForm
 							? i18.baseText('mfa.recovery.button.verify')
@@ -245,16 +248,10 @@ body {
 	padding-top: var(--spacing-2xl);
 
 	> * {
-		margin-bottom: var(--spacing-l);
 		width: 352px;
 	}
 }
 
-.logoContainer {
-	display: flex;
-	justify-content: center;
-}
-
 .formContainer {
 	padding-bottom: var(--spacing-xl);
 }
diff --git a/packages/editor-ui/src/views/NodeView.v2.vue b/packages/editor-ui/src/views/NodeView.v2.vue
index 60f4f8983b..b09ca822a0 100644
--- a/packages/editor-ui/src/views/NodeView.v2.vue
+++ b/packages/editor-ui/src/views/NodeView.v2.vue
@@ -31,7 +31,9 @@ import type {
 	IWorkflowDb,
 	IWorkflowTemplate,
 	NodeCreatorOpenSource,
+	NodeFilterType,
 	ToggleNodeCreatorOptions,
+	WorkflowDataWithTemplateId,
 	XYPosition,
 } from '@/Interface';
 import type {
@@ -46,9 +48,10 @@ import type {
 	CanvasNodeMoveEvent,
 	ConnectStartEvent,
 } from '@/types';
-import { CanvasNodeRenderType } from '@/types';
+import { CanvasNodeRenderType, CanvasConnectionMode } from '@/types';
 import {
 	CHAT_TRIGGER_NODE_TYPE,
+	DRAG_EVENT_DATA_KEY,
 	EnterpriseEditionFeature,
 	MAIN_HEADER_TABS,
 	MANUAL_CHAT_TRIGGER_NODE_TYPE,
@@ -60,7 +63,7 @@ import {
 	STICKY_NODE_TYPE,
 	VALID_WORKFLOW_IMPORT_URL_REGEX,
 	VIEWS,
-	WORKFLOW_LM_CHAT_MODAL_KEY,
+	AI_CREDITS_EXPERIMENT,
 } from '@/constants';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useNodeCreatorStore } from '@/stores/nodeCreator.store';
@@ -84,6 +87,7 @@ import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useHistoryStore } from '@/stores/history.store';
 import { useProjectsStore } from '@/stores/projects.store';
+import { usePostHog } from '@/stores/posthog.store';
 import { useNodeHelpers } from '@/composables/useNodeHelpers';
 import { useExecutionDebugging } from '@/composables/useExecutionDebugging';
 import { useUsersStore } from '@/stores/users.store';
@@ -99,12 +103,15 @@ import { nodeViewEventBus } from '@/event-bus';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
 import { tryToParseNumber } from '@/utils/typesUtils';
 import { useTemplatesStore } from '@/stores/templates.store';
-import { createEventBus } from 'n8n-design-system';
+import { createEventBus, N8nCallout } from 'n8n-design-system';
 import type { PinDataSource } from '@/composables/usePinnedData';
 import { useClipboard } from '@/composables/useClipboard';
 import { useBeforeUnload } from '@/composables/useBeforeUnload';
 import { getResourcePermissions } from '@/permissions';
 import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';
+import { createCanvasConnectionHandleString } from '@/utils/canvasUtilsV2';
+import { isValidNodeConnectionType } from '@/utils/typeGuards';
+import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
 const LazyNodeCreation = defineAsyncComponent(
 	async () => await import('@/components/Node/NodeCreation.vue'),
@@ -114,6 +121,11 @@ const LazyNodeDetailsView = defineAsyncComponent(
 	async () => await import('@/components/NodeDetailsView.vue'),
 );
 
+const LazySetupWorkflowCredentialsButton = defineAsyncComponent(
+	async () =>
+		await import('@/components/SetupWorkflowCredentialsButton/SetupWorkflowCredentialsButton.vue'),
+);
+
 const $style = useCssModule();
 const router = useRouter();
 const route = useRoute();
@@ -146,6 +158,7 @@ const tagsStore = useTagsStore();
 const pushConnectionStore = usePushConnectionStore();
 const ndvStore = useNDVStore();
 const templatesStore = useTemplatesStore();
+const posthogStore = usePostHog();
 
 const canvasEventBus = createEventBus<CanvasEventBusEvents>();
 
@@ -153,8 +166,7 @@ const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings } = useBef
 	route,
 });
 const { registerCustomAction, unregisterCustomAction } = useGlobalLinkActions();
-const { runWorkflow, runWorkflowResolvePending, stopCurrentExecution, stopWaitingForWebhook } =
-	useRunWorkflow({ router });
+const { runWorkflow, stopCurrentExecution, stopWaitingForWebhook } = useRunWorkflow({ router });
 const {
 	updateNodePosition,
 	updateNodesPosition,
@@ -179,12 +191,15 @@ const {
 	revertCreateConnection,
 	deleteConnection,
 	revertDeleteConnection,
+	revalidateNodeInputConnections,
+	revalidateNodeOutputConnections,
 	setNodeActiveByName,
 	addConnections,
 	importWorkflowData,
 	fetchWorkflowDataFromUrl,
 	resetWorkspace,
 	initializeWorkspace,
+	openExecution,
 	editableWorkflow,
 	editableWorkflowObject,
 	lastClickPosition,
@@ -247,6 +262,8 @@ const keyBindingsEnabled = computed(() => {
 	return !ndvStore.activeNode && uiStore.activeModals.length === 0;
 });
 
+const isChatOpen = computed(() => workflowsStore.isChatPanelOpen);
+
 /**
  * Initialization
  */
@@ -269,13 +286,13 @@ async function initializeData() {
 			promises.push(externalSecretsStore.fetchAllSecrets());
 		}
 
-		if (nodeTypesStore.allNodeTypes.length === 0) {
-			promises.push(nodeTypesStore.getNodeTypes());
-		}
-
 		return promises;
 	})();
 
+	if (nodeTypesStore.allNodeTypes.length === 0) {
+		loadPromises.push(nodeTypesStore.getNodeTypes());
+	}
+
 	try {
 		await Promise.all(loadPromises);
 	} catch (error) {
@@ -288,15 +305,21 @@ async function initializeData() {
 	}
 }
 
-async function initializeRoute() {
+async function initializeRoute(force = false) {
 	// In case the workflow got saved we do not have to run init
 	// as only the route changed but all the needed data is already loaded
-	if (route.params.action === 'workflowSave') {
+
+	if (route.query.action === 'workflowSave') {
 		uiStore.stateIsDirty = false;
+		// Remove the action from the query
+		await router.replace({
+			query: { ...route.query, action: undefined },
+		});
 		return;
 	}
 
 	const isAlreadyInitialized =
+		!force &&
 		initializedWorkflowId.value &&
 		[NEW_WORKFLOW_ID, workflowId.value].includes(initializedWorkflowId.value);
 
@@ -308,7 +331,20 @@ async function initializeRoute() {
 		isBlankRedirect.value = false;
 	} else if (route.name === VIEWS.TEMPLATE_IMPORT) {
 		const templateId = route.params.id;
-		await openWorkflowTemplate(templateId.toString());
+		const loadWorkflowFromJSON = route.query.fromJson === 'true';
+
+		if (loadWorkflowFromJSON) {
+			const isAiCreditsExperimentEnabled =
+				posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) === AI_CREDITS_EXPERIMENT.variant;
+
+			const easyAiWorkflowJson = getEasyAiWorkflowJson({
+				isInstanceInAiFreeCreditsExperiment: isAiCreditsExperimentEnabled,
+				withOpenAiFreeCredits: settingsStore.aiCreditsQuota,
+			});
+			await openTemplateFromWorkflowJSON(easyAiWorkflowJson);
+		} else {
+			await openWorkflowTemplate(templateId.toString());
+		}
 	} else if (isWorkflowRoute.value) {
 		if (!isAlreadyInitialized) {
 			historyStore.reset();
@@ -352,7 +388,7 @@ async function initializeWorkspaceForExistingWorkflow(id: string) {
 	try {
 		const workflowData = await workflowsStore.fetchWorkflow(id);
 
-		await openWorkflow(workflowData);
+		openWorkflow(workflowData);
 
 		if (workflowData.meta?.onboardingId) {
 			trackOpenWorkflowFromOnboardingTemplate();
@@ -377,11 +413,11 @@ async function initializeWorkspaceForExistingWorkflow(id: string) {
  * Workflow
  */
 
-async function openWorkflow(data: IWorkflowDb) {
+function openWorkflow(data: IWorkflowDb) {
 	resetWorkspace();
 	workflowHelpers.setDocumentTitle(data.name, 'IDLE');
 
-	await initializeWorkspace(data);
+	initializeWorkspace(data);
 
 	void externalHooks.run('workflow.open', {
 		workflowId: data.id,
@@ -416,6 +452,42 @@ function trackOpenWorkflowFromOnboardingTemplate() {
  * Templates
  */
 
+async function openTemplateFromWorkflowJSON(workflow: WorkflowDataWithTemplateId) {
+	if (!workflow.nodes || !workflow.connections) {
+		toast.showError(
+			new Error(i18n.baseText('nodeView.couldntLoadWorkflow.invalidWorkflowObject')),
+			i18n.baseText('nodeView.couldntImportWorkflow'),
+		);
+		await router.replace({ name: VIEWS.NEW_WORKFLOW });
+		return;
+	}
+	resetWorkspace();
+
+	canvasStore.startLoading();
+	canvasStore.setLoadingText(i18n.baseText('nodeView.loadingTemplate'));
+
+	workflowsStore.currentWorkflowExecutions = [];
+	executionsStore.activeExecution = null;
+
+	isBlankRedirect.value = true;
+	await router.replace({
+		name: VIEWS.NEW_WORKFLOW,
+		query: { templateId: workflow.meta.templateId },
+	});
+
+	const convertedNodes = workflow.nodes.map(workflowsStore.convertTemplateNodeToNodeUi);
+
+	workflowsStore.setConnections(workflow.connections);
+	await addNodes(convertedNodes);
+	await workflowsStore.getNewWorkflowData(workflow.name, projectsStore.currentProjectId);
+
+	uiStore.stateIsDirty = true;
+
+	canvasStore.stopLoading();
+
+	fitView();
+}
+
 async function openWorkflowTemplate(templateId: string) {
 	resetWorkspace();
 
@@ -583,7 +655,6 @@ async function onClipboardPaste(plainTextData: string): Promise<void> {
 				cancelButtonText: i18n.baseText(
 					'nodeView.confirmMessage.onClipboardPasteEvent.cancelButtonText',
 				),
-				dangerouslyUseHTMLString: true,
 			},
 		);
 
@@ -632,6 +703,11 @@ function onPinNodes(ids: string[], source: PinDataSource) {
 }
 
 async function onSaveWorkflow() {
+	const workflowIsSaved = !uiStore.stateIsDirty;
+
+	if (workflowIsSaved) {
+		return;
+	}
 	const saved = await workflowHelpers.saveCurrentWorkflow();
 	if (saved) {
 		canvasEventBus.emit('saved:workflow');
@@ -719,6 +795,14 @@ function onUpdateNodeParameters(id: string, parameters: Record<string, unknown>)
 	setNodeParameters(id, parameters);
 }
 
+function onUpdateNodeInputs(id: string) {
+	revalidateNodeInputConnections(id);
+}
+
+function onUpdateNodeOutputs(id: string) {
+	revalidateNodeOutputConnections(id);
+}
+
 function onClickNodeAdd(source: string, sourceHandle: string) {
 	nodeCreatorStore.openNodeCreatorForConnectingNode({
 		connection: {
@@ -813,7 +897,8 @@ async function importWorkflowExact({ workflow: workflowData }: { workflow: IWork
 	resetWorkspace();
 
 	await initializeData();
-	await initializeWorkspace({
+
+	initializeWorkspace({
 		...workflowData,
 		nodes: NodeViewUtils.getFixedNodesList<INodeUi>(workflowData.nodes),
 	} as IWorkflowDb);
@@ -844,11 +929,13 @@ async function onImportWorkflowUrlEvent(data: IDataObject) {
 function addImportEventBindings() {
 	nodeViewEventBus.on('importWorkflowData', onImportWorkflowDataEvent);
 	nodeViewEventBus.on('importWorkflowUrl', onImportWorkflowUrlEvent);
+	nodeViewEventBus.on('openChat', onOpenChat);
 }
 
 function removeImportEventBindings() {
 	nodeViewEventBus.off('importWorkflowData', onImportWorkflowDataEvent);
 	nodeViewEventBus.off('importWorkflowUrl', onImportWorkflowUrlEvent);
+	nodeViewEventBus.off('openChat', onOpenChat);
 }
 
 /**
@@ -879,7 +966,17 @@ async function onAddNodesAndConnections(
 
 		return {
 			source: fromNode.id,
+			sourceHandle: createCanvasConnectionHandleString({
+				mode: CanvasConnectionMode.Output,
+				type: isValidNodeConnectionType(type) ? type : NodeConnectionType.Main,
+				index: from.outputIndex ?? 0,
+			}),
 			target: toNode.id,
+			targetHandle: createCanvasConnectionHandleString({
+				mode: CanvasConnectionMode.Input,
+				type: isValidNodeConnectionType(type) ? type : NodeConnectionType.Main,
+				index: to.inputIndex ?? 0,
+			}),
 			data: {
 				source: {
 					index: from.outputIndex ?? 0,
@@ -893,10 +990,13 @@ async function onAddNodesAndConnections(
 		};
 	});
 
-	addConnections(mappedConnections);
+	await addConnections(mappedConnections);
 
 	uiStore.resetLastInteractedWith();
-	selectNodes([addedNodes[addedNodes.length - 1].id]);
+
+	if (addedNodes.length > 0) {
+		selectNodes([addedNodes[addedNodes.length - 1].id]);
+	}
 }
 
 async function onRevertAddNode({ node }: { node: INodeUi }) {
@@ -904,7 +1004,11 @@ async function onRevertAddNode({ node }: { node: INodeUi }) {
 }
 
 async function onSwitchActiveNode(nodeName: string) {
+	const node = workflowsStore.getNodeByName(nodeName);
+	if (!node) return;
+
 	setNodeActiveByName(nodeName);
+	selectNodes([node.id]);
 }
 
 async function onOpenSelectiveNodeCreator(node: string, connectionType: NodeConnectionType) {
@@ -976,7 +1080,9 @@ const isExecutionDisabled = computed(() => {
 	return !containsTriggerNodes.value || allTriggerNodesDisabled.value;
 });
 
-const isRunWorkflowButtonVisible = computed(() => !isOnlyChatTriggerNodeActive.value);
+const isRunWorkflowButtonVisible = computed(
+	() => !isOnlyChatTriggerNodeActive.value || chatTriggerNodePinnedData.value,
+);
 const isStopExecutionButtonVisible = computed(
 	() => isWorkflowRunning.value && !isExecutionWaitingForWebhook.value,
 );
@@ -997,11 +1103,7 @@ const workflowExecutionData = computed(() => workflowsStore.workflowExecutionDat
 async function onRunWorkflow() {
 	trackRunWorkflow();
 
-	if (!isExecutionPreview.value && workflowsStore.isWaitingExecution) {
-		void runWorkflowResolvePending({});
-	} else {
-		void runWorkflow({});
-	}
+	void runWorkflow({});
 }
 
 function trackRunWorkflow() {
@@ -1027,11 +1129,7 @@ async function onRunWorkflowToNode(id: string) {
 
 	trackRunWorkflowToNode(node);
 
-	if (!isExecutionPreview.value && workflowsStore.isWaitingExecution) {
-		void runWorkflowResolvePending({ destinationNode: node.name, source: 'Node.executeNode' });
-	} else {
-		void runWorkflow({ destinationNode: node.name, source: 'Node.executeNode' });
-	}
+	void runWorkflow({ destinationNode: node.name, source: 'Node.executeNode' });
 }
 
 function trackRunWorkflowToNode(node: INodeUi) {
@@ -1046,28 +1144,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'));
+	resetWorkspace();
+	await initializeData();
+
+	const data = await openExecution(executionId);
+	if (!data) {
 		return;
 	}
-	if (data === undefined) {
-		throw new Error(`Execution with id "${executionId}" could not be found!`);
-	}
 
-	await initializeData();
-	await initializeWorkspace(data.workflowData);
-	workflowsStore.setWorkflowExecutionData(data);
-
-	uiStore.stateIsDirty = false;
 	canvasStore.stopLoading();
-
 	fitView();
 
 	canvasEventBus.emit('open:execution', data);
@@ -1192,7 +1280,7 @@ const chatTriggerNodePinnedData = computed(() => {
 });
 
 async function onOpenChat() {
-	uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
+	workflowsStore.setPanelOpen('chat', !workflowsStore.isChatPanelOpen);
 
 	const payload = {
 		workflow_id: workflowId.value,
@@ -1242,7 +1330,7 @@ async function onSourceControlPull() {
 			const workflowData = await workflowsStore.fetchWorkflow(workflowId.value);
 			if (workflowData) {
 				workflowHelpers.setDocumentTitle(workflowData.name, 'IDLE');
-				await openWorkflow(workflowData);
+				openWorkflow(workflowData);
 			}
 		}
 	} catch (error) {
@@ -1264,7 +1352,13 @@ function removeSourceControlEventBindings() {
 
 function addPostMessageEventBindings() {
 	window.addEventListener('message', onPostMessageReceived);
+}
 
+function removePostMessageEventBindings() {
+	window.removeEventListener('message', onPostMessageReceived);
+}
+
+function emitPostMessageReady() {
 	if (window.parent) {
 		window.parent.postMessage(
 			JSON.stringify({ command: 'n8nReady', version: rootStore.versionCli }),
@@ -1273,10 +1367,6 @@ function addPostMessageEventBindings() {
 	}
 }
 
-function removePostMessageEventBindings() {
-	window.removeEventListener('message', onPostMessageReceived);
-}
-
 async function onPostMessageReceived(messageEvent: MessageEvent) {
 	if (
 		!messageEvent ||
@@ -1309,9 +1399,10 @@ async function onPostMessageReceived(messageEvent: MessageEvent) {
 			try {
 				// If this NodeView is used in preview mode (in iframe) it will not have access to the main app store
 				// so everything it needs has to be sent using post messages and passed down to child components
-				isProductionExecutionPreview.value = json.executionMode !== 'manual';
+				isProductionExecutionPreview.value =
+					json.executionMode !== 'manual' && json.executionMode !== 'evaluation';
 
-				await openExecution(json.executionId);
+				await onOpenExecution(json.executionId);
 				canOpenNDV.value = json.canOpenNDV ?? true;
 				hideNodeIssues.value = json.hideNodeIssues ?? false;
 				isExecutionPreview.value = true;
@@ -1366,7 +1457,6 @@ function checkIfEditingIsAllowed(): boolean {
 					: 'readOnly.showMessage.executions.message',
 			),
 			type: 'info',
-			dangerouslyUseHTMLString: true,
 		}) as unknown as { visible: boolean };
 
 		return false;
@@ -1438,10 +1528,32 @@ function selectNodes(ids: string[]) {
 
 function onClickPane(position: CanvasNode['position']) {
 	lastClickPosition.value = [position.x, position.y];
-	uiStore.isCreateNodeActive = false;
+	nodeCreatorStore.isCreateNodeActive = false;
 	setNodeSelected();
 }
 
+/**
+ * Drag and Drop events
+ */
+
+async function onDragAndDrop(position: VueFlowXYPosition, event: DragEvent) {
+	if (!event.dataTransfer) {
+		return;
+	}
+
+	const dropData = jsonParse<AddedNodesAndConnections>(
+		event.dataTransfer.getData(DRAG_EVENT_DATA_KEY),
+	);
+
+	if (dropData) {
+		const insertNodePosition: XYPosition = [position.x, position.y];
+
+		await onAddNodesAndConnections(dropData, true, insertNodePosition);
+
+		onToggleNodeCreator({ createNodeActive: false, hasAddedNodes: true });
+	}
+}
+
 /**
  * Custom Actions
  */
@@ -1457,13 +1569,15 @@ function registerCustomActions() {
 	registerCustomAction({
 		key: 'openSelectiveNodeCreator',
 		action: ({
+			creatorview: creatorView,
 			connectiontype: connectionType,
 			node,
 		}: {
+			creatorview: NodeFilterType;
 			connectiontype: NodeConnectionType;
 			node: string;
 		}) => {
-			void onOpenSelectiveNodeCreator(node, connectionType);
+			nodeCreatorStore.openSelectiveNodeCreator({ node, connectionType, creatorView });
 		},
 	});
 
@@ -1485,14 +1599,23 @@ function unregisterCustomActions() {
 	unregisterCustomAction('showNodeCreator');
 }
 
+function showAddFirstStepIfEnabled() {
+	if (uiStore.addFirstStepOnLoad) {
+		void onOpenNodeCreatorForTriggerNodes(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON);
+		uiStore.addFirstStepOnLoad = false;
+	}
+}
+
 /**
  * Routing
  */
 
 watch(
 	() => route.name,
-	async () => {
-		await initializeRoute();
+	async (newRouteName, oldRouteName) => {
+		// it's navigating from and existing workflow to a new workflow
+		const force = newRouteName === VIEWS.NEW_WORKFLOW && oldRouteName === VIEWS.WORKFLOW;
+		await initializeRoute(force);
 	},
 );
 
@@ -1504,6 +1627,8 @@ onBeforeMount(() => {
 	if (!isDemoRoute.value) {
 		pushConnectionStore.pushConnect();
 	}
+
+	addPostMessageEventBindings();
 });
 
 onMounted(() => {
@@ -1524,6 +1649,8 @@ onMounted(() => {
 				canvasStore.stopLoading();
 
 				void externalHooks.run('nodeView.mount').catch(() => {});
+
+				emitPostMessageReady();
 			});
 
 		void usersStore.showPersonalizationSurvey();
@@ -1532,7 +1659,6 @@ onMounted(() => {
 	});
 
 	addSourceControlEventBindings();
-	addPostMessageEventBindings();
 	addWorkflowSavedEventBindings();
 	addBeforeUnloadEventBindings();
 	addImportEventBindings();
@@ -1542,6 +1668,7 @@ onMounted(() => {
 
 onActivated(async () => {
 	addUndoRedoEventBindings();
+	showAddFirstStepIfEnabled();
 });
 
 onDeactivated(() => {
@@ -1582,6 +1709,8 @@ onBeforeUnmount(() => {
 		@update:node:enabled="onToggleNodeDisabled"
 		@update:node:name="onOpenRenameNodeModal"
 		@update:node:parameters="onUpdateNodeParameters"
+		@update:node:inputs="onUpdateNodeInputs"
+		@update:node:outputs="onUpdateNodeOutputs"
 		@click:node:add="onClickNodeAdd"
 		@run:node="onRunWorkflowToNode"
 		@delete:node="onDeleteNode"
@@ -1602,7 +1731,11 @@ onBeforeUnmount(() => {
 		@save:workflow="onSaveWorkflow"
 		@create:workflow="onCreateWorkflow"
 		@viewport-change="onViewportChange"
+		@drag-and-drop="onDragAndDrop"
 	>
+		<Suspense>
+			<LazySetupWorkflowCredentialsButton :class="$style.setupCredentialsButtonWrapper" />
+		</Suspense>
 		<div v-if="!isCanvasReadOnly" :class="$style.executionButtons">
 			<CanvasRunWorkflowButton
 				v-if="isRunWorkflowButtonVisible"
@@ -1613,7 +1746,12 @@ onBeforeUnmount(() => {
 				@mouseleave="onRunWorkflowButtonMouseLeave"
 				@click="onRunWorkflow"
 			/>
-			<CanvasChatButton v-if="containsChatTriggerNodes" @click="onOpenChat" />
+			<CanvasChatButton
+				v-if="containsChatTriggerNodes"
+				:type="isChatOpen ? 'tertiary' : 'primary'"
+				:label="isChatOpen ? i18n.baseText('chat.hide') : i18n.baseText('chat.window.title')"
+				@click="onOpenChat"
+			/>
 			<CanvasStopCurrentExecutionButton
 				v-if="isStopExecutionButtonVisible"
 				:stopping="isStoppingExecution"
@@ -1628,10 +1766,20 @@ onBeforeUnmount(() => {
 				@click="onClearExecutionData"
 			/>
 		</div>
+
+		<N8nCallout
+			v-if="isReadOnlyEnvironment"
+			theme="warning"
+			icon="lock"
+			:class="$style.readOnlyEnvironmentNotification"
+		>
+			{{ i18n.baseText('readOnlyEnv.cantEditOrRun') }}
+		</N8nCallout>
+
 		<Suspense>
 			<LazyNodeCreation
 				v-if="!isCanvasReadOnly"
-				:create-node-active="uiStore.isCreateNodeActive"
+				:create-node-active="nodeCreatorStore.isCreateNodeActive"
 				:node-view-scale="viewportTransform.zoom"
 				@toggle-node-creator="onToggleNodeCreator"
 				@add-nodes="onAddNodesAndConnections"
@@ -1664,11 +1812,13 @@ onBeforeUnmount(() => {
 	align-items: center;
 	left: 50%;
 	transform: translateX(-50%);
-	bottom: var(--spacing-l);
+	bottom: var(--spacing-s);
 	width: auto;
 
-	@media (max-width: $breakpoint-2xs) {
-		bottom: 150px;
+	@include mixins.breakpoint('sm-only') {
+		left: auto;
+		right: var(--spacing-s);
+		transform: none;
 	}
 
 	button {
@@ -1680,6 +1830,30 @@ onBeforeUnmount(() => {
 		&:first-child {
 			margin: 0;
 		}
+
+		@include mixins.breakpoint('xs-only') {
+			text-indent: -10000px;
+			width: 42px;
+			height: 42px;
+			padding: 0;
+
+			span {
+				margin: 0;
+			}
+		}
 	}
 }
+
+.setupCredentialsButtonWrapper {
+	position: absolute;
+	left: var(--spacing-s);
+	top: var(--spacing-s);
+}
+
+.readOnlyEnvironmentNotification {
+	position: absolute;
+	bottom: 16px;
+	left: 50%;
+	transform: translateX(-50%);
+}
 </style>
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 3cb0acc227..87569a4f52 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -24,7 +24,6 @@ import {
 	MODAL_CANCEL,
 	MODAL_CONFIRM,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
-	QUICKSTART_NOTE_NAME,
 	START_NODE_TYPE,
 	STICKY_NODE_TYPE,
 	VIEWS,
@@ -34,7 +33,6 @@ import {
 	NODE_CREATOR_OPEN_SOURCES,
 	CHAT_TRIGGER_NODE_TYPE,
 	MANUAL_CHAT_TRIGGER_NODE_TYPE,
-	WORKFLOW_LM_CHAT_MODAL_KEY,
 	AI_NODE_CREATOR_VIEW,
 	DRAG_EVENT_DATA_KEY,
 	UPDATE_WEBHOOK_ID_NODE_TYPES,
@@ -71,7 +69,6 @@ import type {
 	INodeInputConfiguration,
 	INodeTypeDescription,
 	ITaskData,
-	ITelemetryTrackProperties,
 	IWorkflowBase,
 	Workflow,
 	INodeOutputConfiguration,
@@ -104,6 +101,7 @@ import type {
 	AddedNodesAndConnections,
 	ToggleNodeCreatorOptions,
 	NodeFilterType,
+	WorkflowDataWithTemplateId,
 } from '@/Interface';
 
 import { type RouteLocation, useRoute, useRouter } from 'vue-router';
@@ -183,7 +181,8 @@ import { useNpsSurveyStore } from '@/stores/npsSurvey.store';
 import { getResourcePermissions } from '@/permissions';
 import { useBeforeUnload } from '@/composables/useBeforeUnload';
 import NodeViewUnfinishedWorkflowMessage from '@/components/NodeViewUnfinishedWorkflowMessage.vue';
-import type { PushPayload } from '@n8n/api-types';
+import { AI_CREDITS_EXPERIMENT } from '@/constants';
+import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
 interface AddNodeOptions {
 	position?: XYPosition;
@@ -222,9 +221,10 @@ export default defineComponent({
 		const router = useRouter();
 		const route = useRoute();
 
+		const posthogStore = usePostHog();
 		const ndvStore = useNDVStore();
 		const externalHooks = useExternalHooks();
-		const locale = useI18n();
+		const i18n = useI18n();
 		const contextMenu = useContextMenu();
 		const dataSchema = useDataSchema();
 		const nodeHelpers = useNodeHelpers();
@@ -235,7 +235,7 @@ export default defineComponent({
 		const { callDebounced } = useDebounce();
 		const canvasPanning = useCanvasPanning(nodeViewRootRef, { onMouseMoveEnd });
 		const workflowHelpers = useWorkflowHelpers({ router });
-		const { runWorkflow, stopCurrentExecution, runWorkflowResolvePending } = useRunWorkflow({
+		const { runWorkflow, stopCurrentExecution } = useRunWorkflow({
 			router,
 		});
 		const { addBeforeUnloadEventBindings, removeBeforeUnloadEventBindings } = useBeforeUnload({
@@ -243,7 +243,7 @@ export default defineComponent({
 		});
 
 		return {
-			locale,
+			i18n,
 			contextMenu,
 			dataSchema,
 			nodeHelpers,
@@ -256,8 +256,8 @@ export default defineComponent({
 			nodeViewRef,
 			onMouseMoveEnd,
 			workflowHelpers,
+			posthogStore,
 			runWorkflow,
-			runWorkflowResolvePending,
 			stopCurrentExecution,
 			callDebounced,
 			...useCanvasMouseSelect(),
@@ -369,14 +369,14 @@ export default defineComponent({
 		},
 		runButtonText(): string {
 			if (!this.workflowRunning) {
-				return this.$locale.baseText('nodeView.runButtonText.executeWorkflow');
+				return this.i18n.baseText('nodeView.runButtonText.executeWorkflow');
 			}
 
 			if (this.executionWaitingForWebhook) {
-				return this.$locale.baseText('nodeView.runButtonText.waitingForTriggerEvent');
+				return this.i18n.baseText('nodeView.runButtonText.waitingForTriggerEvent');
 			}
 
-			return this.$locale.baseText('nodeView.runButtonText.executingWorkflow');
+			return this.i18n.baseText('nodeView.runButtonText.executingWorkflow');
 		},
 		workflowStyle() {
 			const offsetPosition = this.uiStore.nodeViewOffsetPosition;
@@ -456,14 +456,14 @@ export default defineComponent({
 				)
 			);
 		},
+		canvasChatNode() {
+			return this.nodes.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
+		},
 		isManualChatOnly(): boolean {
 			if (!this.canvasChatNode) return false;
 
 			return this.containsChatNodes && this.triggerNodes.length === 1 && !this.pinnedChatNodeData;
 		},
-		canvasChatNode() {
-			return this.nodes.find((node) => node.type === CHAT_TRIGGER_NODE_TYPE);
-		},
 		pinnedChatNodeData() {
 			if (!this.canvasChatNode) return null;
 
@@ -514,6 +514,9 @@ export default defineComponent({
 				: (this.projectsStore.currentProject ?? this.projectsStore.personalProject);
 			return getResourcePermissions(project?.scopes);
 		},
+		isChatOpen() {
+			return this.workflowsStore.isChatPanelOpen;
+		},
 	},
 	watch: {
 		// Listen to route changes and load the workflow accordingly
@@ -589,8 +592,8 @@ export default defineComponent({
 		if (!this.nodeViewRef) {
 			this.showError(
 				new Error('NodeView reference not found'),
-				this.$locale.baseText('nodeView.showError.mounted1.title'),
-				this.$locale.baseText('nodeView.showError.mounted1.message') + ':',
+				this.i18n.baseText('nodeView.showError.mounted1.title'),
+				this.i18n.baseText('nodeView.showError.mounted1.message') + ':',
 			);
 			return;
 		}
@@ -624,8 +627,8 @@ export default defineComponent({
 		} catch (error) {
 			this.showError(
 				error,
-				this.$locale.baseText('nodeView.showError.mounted1.title'),
-				this.$locale.baseText('nodeView.showError.mounted1.message') + ':',
+				this.i18n.baseText('nodeView.showError.mounted1.title'),
+				this.i18n.baseText('nodeView.showError.mounted1.message') + ':',
 			);
 			return;
 		}
@@ -645,8 +648,8 @@ export default defineComponent({
 			} catch (error) {
 				this.showError(
 					error,
-					this.$locale.baseText('nodeView.showError.mounted2.title'),
-					this.$locale.baseText('nodeView.showError.mounted2.message') + ':',
+					this.i18n.baseText('nodeView.showError.mounted2.title'),
+					this.i18n.baseText('nodeView.showError.mounted2.message') + ':',
 				);
 			}
 			this.canvasStore.stopLoading();
@@ -814,12 +817,12 @@ export default defineComponent({
 			}
 			if (this.isReadOnlyRoute || this.readOnlyEnv) {
 				this.readOnlyNotification = this.showMessage({
-					title: this.$locale.baseText(
+					title: this.i18n.baseText(
 						this.readOnlyEnv
 							? `readOnlyEnv.showMessage.${this.isReadOnlyRoute ? 'executions' : 'workflows'}.title`
 							: 'readOnly.showMessage.executions.title',
 					),
-					message: this.$locale.baseText(
+					message: this.i18n.baseText(
 						this.readOnlyEnv
 							? `readOnlyEnv.showMessage.${
 									this.isReadOnlyRoute ? 'executions' : 'workflows'
@@ -827,7 +830,7 @@ export default defineComponent({
 							: 'readOnly.showMessage.executions.message',
 					),
 					type: 'info',
-					dangerouslyUseHTMLString: true,
+
 					onClose: () => {
 						this.readOnlyNotification = null;
 					},
@@ -852,11 +855,7 @@ export default defineComponent({
 			this.$telemetry.track('User clicked execute node button', telemetryPayload);
 			void this.externalHooks.run('nodeView.onRunNode', telemetryPayload);
 
-			if (!this.isExecutionPreview && this.workflowsStore.isWaitingExecution) {
-				void this.runWorkflowResolvePending({ destinationNode: nodeName, source });
-			} else {
-				void this.runWorkflow({ destinationNode: nodeName, source });
-			}
+			void this.runWorkflow({ destinationNode: nodeName, source });
 		},
 		async onOpenChat() {
 			const telemetryPayload = {
@@ -864,7 +863,7 @@ export default defineComponent({
 			};
 			this.$telemetry.track('User clicked chat open button', telemetryPayload);
 			void this.externalHooks.run('nodeView.onOpenChat', telemetryPayload);
-			this.uiStore.openModal(WORKFLOW_LM_CHAT_MODAL_KEY);
+			this.workflowsStore.setPanelOpen('chat', !this.workflowsStore.isChatPanelOpen);
 		},
 
 		async onRunWorkflow() {
@@ -883,11 +882,7 @@ export default defineComponent({
 				void this.externalHooks.run('nodeView.onRunWorkflow', telemetryPayload);
 			});
 
-			if (!this.isExecutionPreview && this.workflowsStore.isWaitingExecution) {
-				void this.runWorkflowResolvePending({});
-			} else {
-				void this.runWorkflow({});
-			}
+			void this.runWorkflow({});
 
 			this.refreshEndpointsErrorsState();
 		},
@@ -931,12 +926,12 @@ export default defineComponent({
 
 			const message =
 				this.containsTrigger && this.allTriggersDisabled
-					? this.$locale.baseText('nodeView.addOrEnableTriggerNode')
-					: this.$locale.baseText('nodeView.addATriggerNodeFirst');
+					? this.i18n.baseText('nodeView.addOrEnableTriggerNode')
+					: this.i18n.baseText('nodeView.addATriggerNodeFirst');
 
 			const notice = this.showMessage({
 				type: 'info',
-				title: this.$locale.baseText('nodeView.cantExecuteNoTrigger'),
+				title: this.i18n.baseText('nodeView.cantExecuteNoTrigger'),
 				message,
 				duration: 3000,
 				onClick: () =>
@@ -944,7 +939,6 @@ export default defineComponent({
 						// Close the creator panel if user clicked on the link
 						if (this.createNodeActive) notice.close();
 					}, 0),
-				dangerouslyUseHTMLString: true,
 			});
 		},
 		async clearExecutionData() {
@@ -973,7 +967,7 @@ export default defineComponent({
 				}
 				if (saved) {
 					this.showMessage({
-						title: this.$locale.baseText('generic.workflowSaved'),
+						title: this.i18n.baseText('generic.workflowSaved'),
 						type: 'success',
 					});
 				}
@@ -1001,7 +995,7 @@ export default defineComponent({
 			try {
 				data = await this.workflowsStore.getExecution(executionId);
 			} catch (error) {
-				this.showError(error, this.$locale.baseText('nodeView.showError.openExecution.title'));
+				this.showError(error, this.i18n.baseText('nodeView.showError.openExecution.title'));
 				return;
 			}
 			if (data === undefined) {
@@ -1069,7 +1063,7 @@ export default defineComponent({
 					console.error(`Execution ${executionId} error:`);
 					console.error(data.data.resultData.error.stack);
 					this.showMessage({
-						title: this.$locale.baseText('nodeView.showError.workflowError'),
+						title: this.i18n.baseText('nodeView.showError.workflowError'),
 						message: data.data.resultData.error.message,
 						type: 'error',
 						duration: 0,
@@ -1078,7 +1072,7 @@ export default defineComponent({
 			}
 			if ((data as ExecutionSummary).waitTill) {
 				this.showMessage({
-					title: this.$locale.baseText('nodeView.thisExecutionHasntFinishedYet'),
+					title: this.i18n.baseText('nodeView.thisExecutionHasntFinishedYet'),
 					message: h(NodeViewUnfinishedWorkflowMessage),
 					type: 'warning',
 					duration: 0,
@@ -1101,9 +1095,45 @@ export default defineComponent({
 			await this.$nextTick();
 			this.canvasStore.zoomToFit();
 		},
+		async openWorkflowTemplateFromJson(data: { workflow: WorkflowDataWithTemplateId }) {
+			if (!data.workflow.nodes || !data.workflow.connections) {
+				this.showError(
+					new Error(this.i18n.baseText('nodeView.couldntLoadWorkflow.invalidWorkflowObject')),
+					this.i18n.baseText('nodeView.couldntImportWorkflow'),
+				);
+				await this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
+				return;
+			}
+			this.canvasStore.startLoading();
+			this.canvasStore.setLoadingText(this.i18n.baseText('nodeView.loadingTemplate'));
+			this.resetWorkspace();
+
+			this.workflowsStore.currentWorkflowExecutions = [];
+			this.executionsStore.activeExecution = null;
+
+			this.blankRedirect = true;
+			await this.$router.replace({
+				name: VIEWS.NEW_WORKFLOW,
+				query: { templateId: data.workflow.meta.templateId },
+			});
+
+			const convertedNodes = data.workflow.nodes.map(
+				this.workflowsStore.convertTemplateNodeToNodeUi,
+			);
+			await this.nodeHelpers.addNodes(convertedNodes, data.workflow.connections);
+			this.workflowData =
+				(await this.workflowsStore.getNewWorkflowData(
+					data.workflow.name,
+					this.projectsStore.currentProjectId,
+				)) || {};
+			await this.$nextTick();
+			this.canvasStore.zoomToFit();
+			this.uiStore.stateIsDirty = true;
+			this.canvasStore.stopLoading();
+		},
 		async openWorkflowTemplate(templateId: string) {
 			this.canvasStore.startLoading();
-			this.canvasStore.setLoadingText(this.$locale.baseText('nodeView.loadingTemplate'));
+			this.canvasStore.setLoadingText(this.i18n.baseText('nodeView.loadingTemplate'));
 			this.resetWorkspace();
 
 			this.workflowsStore.currentWorkflowExecutions = [];
@@ -1116,13 +1146,13 @@ export default defineComponent({
 
 				if (!data) {
 					throw new Error(
-						this.$locale.baseText('nodeView.workflowTemplateWithIdCouldNotBeFound', {
+						this.i18n.baseText('nodeView.workflowTemplateWithIdCouldNotBeFound', {
 							interpolate: { templateId },
 						}),
 					);
 				}
 			} catch (error) {
-				this.showError(error, this.$locale.baseText('nodeView.couldntImportWorkflow'));
+				this.showError(error, this.i18n.baseText('nodeView.couldntImportWorkflow'));
 				await this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
 				return;
 			}
@@ -1269,7 +1299,7 @@ export default defineComponent({
 					element instanceof HTMLElement &&
 					element.className &&
 					typeof element.className === 'string' &&
-					element.className.includes('ignore-key-press')
+					element.className.includes('ignore-key-press-canvas')
 				) {
 					return;
 				}
@@ -1367,7 +1397,7 @@ export default defineComponent({
 				}
 
 				this.showMessage({
-					title: this.$locale.baseText('nodeView.showMessage.keyDown.title'),
+					title: this.i18n.baseText('nodeView.showMessage.keyDown.title'),
 					type: 'success',
 				});
 			} else if (e.key === 'Enter' && noModifierKeys) {
@@ -1404,7 +1434,11 @@ export default defineComponent({
 					lastSelectedNode.name,
 				);
 
-				if (connections.main === undefined || connections.main.length === 0) {
+				if (
+					connections.main === undefined ||
+					connections.main.length === 0 ||
+					!connections.main[0]
+				) {
 					return;
 				}
 
@@ -1438,7 +1472,11 @@ export default defineComponent({
 
 				const connections = workflow.connectionsByDestinationNode[lastSelectedNode.name];
 
-				if (connections.main === undefined || connections.main.length === 0) {
+				if (
+					connections.main === undefined ||
+					connections.main.length === 0 ||
+					!connections.main[0]
+				) {
 					return;
 				}
 
@@ -1470,7 +1508,11 @@ export default defineComponent({
 					return;
 				}
 
-				const parentNode = connections.main[0][0].node;
+				const parentNode = connections.main[0]?.[0].node;
+				if (!parentNode) {
+					return;
+				}
+
 				const connectionsParent = this.workflowsStore.outgoingConnectionsByNodeName(parentNode);
 
 				if (!Array.isArray(connectionsParent.main) || !connectionsParent.main.length) {
@@ -1482,7 +1524,7 @@ export default defineComponent({
 				let lastCheckedNodePosition = e.key === 'ArrowUp' ? -99999999 : 99999999;
 				let nextSelectNode: string | null = null;
 				for (const ouputConnections of connectionsParent.main) {
-					for (const ouputConnection of ouputConnections) {
+					for (const ouputConnection of ouputConnections ?? []) {
 						if (ouputConnection.node === lastSelectedNode.name) {
 							// Ignore current node
 							continue;
@@ -1699,7 +1741,7 @@ export default defineComponent({
 				if (data.nodes.length > 0) {
 					if (!isCut) {
 						this.showMessage({
-							title: this.$locale.baseText('generic.copiedToClipboard'),
+							title: this.i18n.baseText('generic.copiedToClipboard'),
 							message: '',
 							type: 'success',
 						});
@@ -1727,19 +1769,13 @@ export default defineComponent({
 				if (execution === undefined) {
 					// execution finished but was not saved (e.g. due to low connectivity)
 
-					this.workflowsStore.finishActiveExecution({
-						executionId,
-						data: { finished: true, stoppedAt: new Date() } as IRun,
-					});
 					this.workflowsStore.executingNode.length = 0;
 					this.uiStore.removeActiveAction('workflowRunning');
 
 					this.workflowHelpers.setDocumentTitle(this.workflowsStore.workflowName, 'IDLE');
 					this.showMessage({
-						title: this.$locale.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.title'),
-						message: this.$locale.baseText(
-							'nodeView.showMessage.stopExecutionCatch.unsaved.message',
-						),
+						title: this.i18n.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.title'),
+						message: this.i18n.baseText('nodeView.showMessage.stopExecutionCatch.unsaved.message'),
 						type: 'success',
 					});
 				} else if (execution?.finished) {
@@ -1752,24 +1788,20 @@ export default defineComponent({
 						startedAt: execution.startedAt,
 						stoppedAt: execution.stoppedAt,
 					} as IRun;
-					const pushData: PushPayload<'executionFinished'> = {
-						data: executedData,
-						executionId,
-						retryOf: execution.retryOf,
-					};
-					this.workflowsStore.finishActiveExecution(pushData);
 					this.workflowHelpers.setDocumentTitle(execution.workflowData.name, 'IDLE');
 					this.workflowsStore.executingNode.length = 0;
 					this.workflowsStore.setWorkflowExecutionData(executedData as IExecutionResponse);
 					this.uiStore.removeActiveAction('workflowRunning');
 					this.showMessage({
-						title: this.$locale.baseText('nodeView.showMessage.stopExecutionCatch.title'),
-						message: this.$locale.baseText('nodeView.showMessage.stopExecutionCatch.message'),
+						title: this.i18n.baseText('nodeView.showMessage.stopExecutionCatch.title'),
+						message: this.i18n.baseText('nodeView.showMessage.stopExecutionCatch.message'),
 						type: 'success',
 					});
 				} else {
-					this.showError(error, this.$locale.baseText('nodeView.showError.stopExecution.title'));
+					this.showError(error, this.i18n.baseText('nodeView.showError.stopExecution.title'));
 				}
+			} finally {
+				this.workflowsStore.markExecutionAsStopped();
 			}
 			this.stopExecutionInProgress = false;
 			void this.workflowHelpers.getWorkflowDataToSave().then((workflowData) => {
@@ -1792,10 +1824,7 @@ export default defineComponent({
 			try {
 				await this.workflowsStore.removeTestWebhook(this.workflowsStore.workflowId);
 			} catch (error) {
-				this.showError(
-					error,
-					this.$locale.baseText('nodeView.showError.stopWaitingForWebhook.title'),
-				);
+				this.showError(error, this.i18n.baseText('nodeView.showError.stopWaitingForWebhook.title'));
 				return;
 			}
 		},
@@ -1826,19 +1855,18 @@ export default defineComponent({
 					}
 
 					const importConfirm = await this.confirm(
-						this.$locale.baseText('nodeView.confirmMessage.onClipboardPasteEvent.message', {
+						this.i18n.baseText('nodeView.confirmMessage.onClipboardPasteEvent.message', {
 							interpolate: { plainTextData },
 						}),
-						this.$locale.baseText('nodeView.confirmMessage.onClipboardPasteEvent.headline'),
+						this.i18n.baseText('nodeView.confirmMessage.onClipboardPasteEvent.headline'),
 						{
 							type: 'warning',
-							confirmButtonText: this.$locale.baseText(
+							confirmButtonText: this.i18n.baseText(
 								'nodeView.confirmMessage.onClipboardPasteEvent.confirmButtonText',
 							),
-							cancelButtonText: this.$locale.baseText(
+							cancelButtonText: this.i18n.baseText(
 								'nodeView.confirmMessage.onClipboardPasteEvent.cancelButtonText',
 							),
-							dangerouslyUseHTMLString: true,
 						},
 					);
 
@@ -1851,7 +1879,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);
@@ -1885,7 +1913,7 @@ export default defineComponent({
 				this.canvasStore.stopLoading();
 				this.showError(
 					error,
-					this.$locale.baseText('nodeView.showError.getWorkflowDataFromUrl.title'),
+					this.i18n.baseText('nodeView.showError.getWorkflowDataFromUrl.title'),
 				);
 				return;
 			}
@@ -2035,7 +2063,7 @@ export default defineComponent({
 					});
 				}
 			} catch (error) {
-				this.showError(error, this.$locale.baseText('nodeView.showError.importWorkflowData.title'));
+				this.showError(error, this.i18n.baseText('nodeView.showError.importWorkflowData.title'));
 			}
 		},
 
@@ -2069,10 +2097,7 @@ export default defineComponent({
 			);
 			if (dropData) {
 				const mousePosition = this.getMousePositionWithinNodeView(event);
-				const insertNodePosition = [
-					mousePosition[0] - NodeViewUtils.NODE_SIZE / 2 + NodeViewUtils.GRID_SIZE,
-					mousePosition[1] - NodeViewUtils.NODE_SIZE / 2,
-				] as XYPosition;
+				const insertNodePosition: XYPosition = [mousePosition[0], mousePosition[1]];
 
 				await this.onAddNodes(dropData, true, insertNodePosition);
 				this.createNodeActive = false;
@@ -2108,8 +2133,8 @@ export default defineComponent({
 		showMaxNodeTypeError(nodeTypeData: INodeTypeDescription) {
 			const maxNodes = nodeTypeData.maxNodes;
 			this.showMessage({
-				title: this.$locale.baseText('nodeView.showMessage.showMaxNodeTypeError.title'),
-				message: this.$locale.baseText('nodeView.showMessage.showMaxNodeTypeError.message', {
+				title: this.i18n.baseText('nodeView.showMessage.showMaxNodeTypeError.title'),
+				message: this.i18n.baseText('nodeView.showMessage.showMaxNodeTypeError.message', {
 					adjustToNumber: maxNodes,
 					interpolate: { nodeTypeDataDisplayName: nodeTypeData.displayName },
 				}),
@@ -2216,8 +2241,8 @@ export default defineComponent({
 
 			if (nodeTypeData === null) {
 				this.showMessage({
-					title: this.$locale.baseText('nodeView.showMessage.addNodeButton.title'),
-					message: this.$locale.baseText('nodeView.showMessage.addNodeButton.message', {
+					title: this.i18n.baseText('nodeView.showMessage.addNodeButton.title'),
+					message: this.i18n.baseText('nodeView.showMessage.addNodeButton.message', {
 						interpolate: { nodeTypeName },
 					}),
 					type: 'error',
@@ -2384,7 +2409,7 @@ export default defineComponent({
 				newNodeData.position = NodeViewUtils.getNewNodePosition(this.nodes, position);
 			}
 
-			const localizedName = this.locale.localizeNodeName(newNodeData.name, newNodeData.type);
+			const localizedName = this.i18n.localizeNodeName(newNodeData.name, newNodeData.type);
 
 			newNodeData.name = this.uniqueNodeName(localizedName);
 
@@ -2398,24 +2423,19 @@ export default defineComponent({
 			this.uiStore.stateIsDirty = true;
 
 			if (nodeTypeName === STICKY_NODE_TYPE) {
-				this.$telemetry.trackNodesPanel('nodeView.addSticky', {
+				this.$telemetry.track('User inserted workflow note', {
 					workflow_id: this.workflowsStore.workflowId,
 				});
 			} else {
 				void this.externalHooks.run('nodeView.addNodeButton', { nodeTypeName });
-				const trackProperties: ITelemetryTrackProperties = {
+				this.nodeCreatorStore.onNodeAddedToCanvas({
 					node_type: nodeTypeName,
 					node_version: newNodeData.typeVersion,
 					is_auto_add: isAutoAdd,
 					workflow_id: this.workflowsStore.workflowId,
 					drag_and_drop: options.dragAndDrop,
-				};
-
-				if (lastSelectedNode) {
-					trackProperties.input_node_type = lastSelectedNode.type;
-				}
-
-				this.$telemetry.trackNodesPanel('nodeView.addNodeButton', trackProperties);
+					input_node_type: lastSelectedNode ? lastSelectedNode.type : undefined,
+				});
 			}
 
 			// Automatically deselect all nodes and select the current one and also active
@@ -2740,8 +2760,8 @@ export default defineComponent({
 						if (!input.filter.nodes.includes(sourceNode.type)) {
 							this.dropPrevented = true;
 							this.showToast({
-								title: this.$locale.baseText('nodeView.showError.nodeNodeCompatible.title'),
-								message: this.$locale.baseText('nodeView.showError.nodeNodeCompatible.message', {
+								title: this.i18n.baseText('nodeView.showError.nodeNodeCompatible.title'),
+								message: this.i18n.baseText('nodeView.showError.nodeNodeCompatible.message', {
 									interpolate: { sourceNodeName: sourceNode.name, targetNodeName: targetNode.name },
 								}),
 								type: 'error',
@@ -3372,17 +3392,35 @@ export default defineComponent({
 		async initView(): Promise<void> {
 			await this.loadCredentialsForWorkflow();
 
-			if (this.$route.params.action === 'workflowSave') {
+			if (this.$route.query.action === 'workflowSave') {
 				// In case the workflow got saved we do not have to run init
 				// as only the route changed but all the needed data is already loaded
 				this.uiStore.stateIsDirty = false;
+
+				// Remove the action from the query
+				await this.$router.replace({
+					query: { ...this.$route.query, action: undefined },
+				});
 				return;
 			}
 			if (this.blankRedirect) {
 				this.blankRedirect = false;
 			} else if (this.$route.name === VIEWS.TEMPLATE_IMPORT) {
 				const templateId = this.$route.params.id;
-				await this.openWorkflowTemplate(templateId.toString());
+				const loadWorkflowFromJSON = this.$route.query.fromJson === 'true';
+				if (loadWorkflowFromJSON) {
+					const isAiCreditsExperimentEnabled =
+						this.posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) ===
+						AI_CREDITS_EXPERIMENT.variant;
+
+					const easyAiWorkflowJson = getEasyAiWorkflowJson({
+						isInstanceInAiFreeCreditsExperiment: isAiCreditsExperimentEnabled,
+						withOpenAiFreeCredits: useSettingsStore().aiCreditsQuota,
+					});
+					await this.openWorkflowTemplateFromJson({ workflow: easyAiWorkflowJson });
+				} else {
+					await this.openWorkflowTemplate(templateId.toString());
+				}
 			} else {
 				if (
 					this.uiStore.stateIsDirty &&
@@ -3391,14 +3429,14 @@ export default defineComponent({
 					(this.workflowPermissions.update ?? this.projectPermissions.workflow.update)
 				) {
 					const confirmModal = await this.confirm(
-						this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
+						this.i18n.baseText('generic.unsavedWork.confirmMessage.message'),
 						{
-							title: this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
+							title: this.i18n.baseText('generic.unsavedWork.confirmMessage.headline'),
 							type: 'warning',
-							confirmButtonText: this.$locale.baseText(
+							confirmButtonText: this.i18n.baseText(
 								'generic.unsavedWork.confirmMessage.confirmButtonText',
 							),
-							cancelButtonText: this.$locale.baseText(
+							cancelButtonText: this.i18n.baseText(
 								'generic.unsavedWork.confirmMessage.cancelButtonText',
 							),
 							showClose: true,
@@ -3421,7 +3459,7 @@ export default defineComponent({
 					try {
 						workflow = await this.workflowsStore.fetchWorkflow(workflowId);
 					} catch (error) {
-						this.showError(error, this.$locale.baseText('openWorkflow.workflowNotFoundError'));
+						this.showError(error, this.i18n.baseText('openWorkflow.workflowNotFoundError'));
 
 						void this.$router.push({
 							name: VIEWS.NEW_WORKFLOW,
@@ -3608,7 +3646,6 @@ export default defineComponent({
 			if (node.type === STICKY_NODE_TYPE) {
 				this.$telemetry.track('User deleted workflow note', {
 					workflow_id: this.workflowsStore.workflowId,
-					is_welcome_note: node.name === QUICKSTART_NOTE_NAME,
 				});
 			} else {
 				void this.externalHooks.run('node.deleteNode', { node });
@@ -3719,17 +3756,17 @@ export default defineComponent({
 		async renameNodePrompt(currentName: string) {
 			try {
 				const promptResponsePromise = this.prompt(
-					this.$locale.baseText('nodeView.prompt.newName') + ':',
-					this.$locale.baseText('nodeView.prompt.renameNode') + `: ${currentName}`,
+					this.i18n.baseText('nodeView.prompt.newName') + ':',
+					this.i18n.baseText('nodeView.prompt.renameNode') + `: ${currentName}`,
 					{
 						customClass: 'rename-prompt',
-						confirmButtonText: this.$locale.baseText('nodeView.prompt.rename'),
-						cancelButtonText: this.$locale.baseText('nodeView.prompt.cancel'),
-						inputErrorMessage: this.$locale.baseText('nodeView.prompt.invalidName'),
+						confirmButtonText: this.i18n.baseText('nodeView.prompt.rename'),
+						cancelButtonText: this.i18n.baseText('nodeView.prompt.cancel'),
+						inputErrorMessage: this.i18n.baseText('nodeView.prompt.invalidName'),
 						inputValue: currentName,
 						inputValidator: (value: string) => {
 							if (!value.trim()) {
-								return this.$locale.baseText('nodeView.prompt.invalidName');
+								return this.i18n.baseText('nodeView.prompt.invalidName');
 							}
 							return true;
 						},
@@ -3841,7 +3878,7 @@ export default defineComponent({
 
 			if (!data.nodes) {
 				// No nodes to add
-				throw new Error(this.$locale.baseText('nodeView.noNodesGivenToAdd'));
+				throw new Error(this.i18n.baseText('nodeView.noNodesGivenToAdd'));
 			}
 
 			// Get how many of the nodes of the types which have
@@ -3875,7 +3912,7 @@ export default defineComponent({
 
 				oldName = node.name;
 
-				const localized = this.locale.localizeNodeName(node.name, node.type);
+				const localized = this.i18n.localizeNodeName(node.name, node.type);
 
 				newName = this.uniqueNodeName(localized, newNodeNames);
 
@@ -3906,13 +3943,10 @@ export default defineComponent({
 						sourceIndex++
 					) {
 						const nodeSourceConnections = [];
-						if (currentConnections[sourceNode][type][sourceIndex]) {
-							for (
-								connectionIndex = 0;
-								connectionIndex < currentConnections[sourceNode][type][sourceIndex].length;
-								connectionIndex++
-							) {
-								connectionData = currentConnections[sourceNode][type][sourceIndex][connectionIndex];
+						const connections = currentConnections[sourceNode][type][sourceIndex];
+						if (connections) {
+							for (connectionIndex = 0; connectionIndex < connections.length; connectionIndex++) {
+								connectionData = connections[connectionIndex];
 								if (!createNodeNames.includes(connectionData.node)) {
 									// Node does not get created so skip input connection
 									continue;
@@ -3948,8 +3982,8 @@ export default defineComponent({
 					// Pin data limit reached
 					if (!pinDataSuccess) {
 						this.showError(
-							new Error(this.$locale.baseText('ndv.pinData.error.tooLarge.description')),
-							this.$locale.baseText('ndv.pinData.error.tooLarge.title'),
+							new Error(this.i18n.baseText('ndv.pinData.error.tooLarge.description')),
+							this.i18n.baseText('ndv.pinData.error.tooLarge.title'),
 						);
 						continue;
 					}
@@ -4042,14 +4076,17 @@ export default defineComponent({
 				for (type of Object.keys(connections)) {
 					for (sourceIndex = 0; sourceIndex < connections[type].length; sourceIndex++) {
 						connectionToKeep = [];
-						for (
-							connectionIndex = 0;
-							connectionIndex < connections[type][sourceIndex].length;
-							connectionIndex++
-						) {
-							connectionData = connections[type][sourceIndex][connectionIndex];
-							if (exportNodeNames.indexOf(connectionData.node) !== -1) {
-								connectionToKeep.push(connectionData);
+						const connectionsToCheck = connections[type][sourceIndex];
+						if (connectionsToCheck) {
+							for (
+								connectionIndex = 0;
+								connectionIndex < connectionsToCheck.length;
+								connectionIndex++
+							) {
+								connectionData = connectionsToCheck[connectionIndex];
+								if (exportNodeNames.indexOf(connectionData.node) !== -1) {
+									connectionToKeep.push(connectionData);
+								}
 							}
 						}
 
@@ -4157,13 +4194,13 @@ export default defineComponent({
 							window.top.postMessage(
 								JSON.stringify({
 									command: 'error',
-									message: this.$locale.baseText('openWorkflow.workflowImportError'),
+									message: this.i18n.baseText('openWorkflow.workflowImportError'),
 								}),
 								'*',
 							);
 						}
 						this.showMessage({
-							title: this.$locale.baseText('openWorkflow.workflowImportError'),
+							title: this.i18n.baseText('openWorkflow.workflowImportError'),
 							message: (e as Error).message,
 							type: 'error',
 						});
@@ -4183,13 +4220,13 @@ export default defineComponent({
 							window.top.postMessage(
 								JSON.stringify({
 									command: 'error',
-									message: this.$locale.baseText('nodeView.showError.openExecution.title'),
+									message: this.i18n.baseText('nodeView.showError.openExecution.title'),
 								}),
 								'*',
 							);
 						}
 						this.showMessage({
-							title: this.$locale.baseText('nodeView.showError.openExecution.title'),
+							title: this.i18n.baseText('nodeView.showError.openExecution.title'),
 							message: (e as Error).message,
 							type: 'error',
 						});
@@ -4242,12 +4279,13 @@ export default defineComponent({
 				mode,
 				createNodeActive,
 			});
-			this.$telemetry.trackNodesPanel('nodeView.createNodeActiveChanged', {
-				source,
-				mode,
-				createNodeActive,
-				workflow_id: this.workflowsStore.workflowId,
-			});
+			if (createNodeActive) {
+				this.nodeCreatorStore.onCreatorOpened({
+					source,
+					mode,
+					workflow_id: this.workflowsStore.workflowId,
+				});
+			}
 		},
 		async onAddNodes(
 			{ nodes, connections }: AddedNodesAndConnections,
@@ -4553,7 +4591,7 @@ export default defineComponent({
 					>
 						<template #custom-tooltip>
 							<span
-								v-text="$locale.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting')"
+								v-text="i18n.baseText('nodeView.canvasAddButton.addATriggerNodeBeforeExecuting')"
 							/>
 						</template>
 					</Node>
@@ -4652,10 +4690,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"
+					:type="isChatOpen ? 'tertiary' : 'primary'"
 					data-test-id="workflow-chat-button"
 					@click.stop="onOpenChat"
 				/>
@@ -4668,8 +4706,8 @@ export default defineComponent({
 					type="secondary"
 					:title="
 						stopExecutionInProgress
-							? $locale.baseText('nodeView.stoppingCurrentExecution')
-							: $locale.baseText('nodeView.stopCurrentExecution')
+							? i18n.baseText('nodeView.stoppingCurrentExecution')
+							: i18n.baseText('nodeView.stopCurrentExecution')
 					"
 					:loading="stopExecutionInProgress"
 					data-test-id="stop-execution-button"
@@ -4681,7 +4719,7 @@ export default defineComponent({
 					class="stop-execution"
 					icon="stop"
 					size="large"
-					:title="$locale.baseText('nodeView.stopWaitingForWebhookCall')"
+					:title="i18n.baseText('nodeView.stopWaitingForWebhookCall')"
 					type="secondary"
 					data-test-id="stop-execution-waiting-for-webhook-button"
 					@click.stop="stopWaitingForWebhook"
@@ -4689,7 +4727,7 @@ export default defineComponent({
 
 				<n8n-icon-button
 					v-if="workflowExecution && !workflowRunning && !allTriggersDisabled"
-					:title="$locale.baseText('nodeView.deletesTheCurrentExecutionData')"
+					:title="i18n.baseText('nodeView.deletesTheCurrentExecutionData')"
 					icon="trash"
 					size="large"
 					data-test-id="clear-execution-data-button"
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.test.ts b/packages/editor-ui/src/views/ProjectSettings.test.ts
index 8dc7a01734..1890c0bf59 100644
--- a/packages/editor-ui/src/views/ProjectSettings.test.ts
+++ b/packages/editor-ui/src/views/ProjectSettings.test.ts
@@ -66,6 +66,7 @@ describe('ProjectSettings', () => {
 			id: '123',
 			type: 'team',
 			name: 'Test Project',
+			icon: { type: 'icon', value: 'folder' },
 			relations: [],
 			createdAt: new Date().toISOString(),
 			updatedAt: new Date().toISOString(),
diff --git a/packages/editor-ui/src/views/ProjectSettings.vue b/packages/editor-ui/src/views/ProjectSettings.vue
index b752fb2b44..2a64b95fe1 100644
--- a/packages/editor-ui/src/views/ProjectSettings.vue
+++ b/packages/editor-ui/src/views/ProjectSettings.vue
@@ -7,8 +7,8 @@ import { useUsersStore } from '@/stores/users.store';
 import type { IUser } from '@/Interface';
 import { useI18n } from '@/composables/useI18n';
 import { useProjectsStore } from '@/stores/projects.store';
-import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
-import type { Project, ProjectRelation } from '@/types/projects.types';
+import type { ProjectIcon } from '@/types/projects.types';
+import { type Project, type ProjectRelation } from '@/types/projects.types';
 import { useToast } from '@/composables/useToast';
 import { VIEWS } from '@/constants';
 import ProjectDeleteDialog from '@/components/Projects/ProjectDeleteDialog.vue';
@@ -18,6 +18,9 @@ import type { ProjectRole } from '@/types/roles.types';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
+import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
+
+import { getAllIconNames } from '@/plugins/icons';
 
 type FormDataDiff = {
 	name?: string;
@@ -27,7 +30,7 @@ type FormDataDiff = {
 };
 
 const usersStore = useUsersStore();
-const locale = useI18n();
+const i18n = useI18n();
 const projectsStore = useProjectsStore();
 const rolesStore = useRolesStore();
 const cloudPlanStore = useCloudPlanStore();
@@ -35,6 +38,7 @@ const toast = useToast();
 const router = useRouter();
 const telemetry = useTelemetry();
 const documentTitle = useDocumentTitle();
+
 const dialogVisible = ref(false);
 const upgradeDialogVisible = ref(false);
 
@@ -45,12 +49,19 @@ const formData = ref<Pick<Project, 'name' | 'relations'>>({
 	relations: [],
 });
 const projectRoleTranslations = ref<{ [key: string]: string }>({
-	'project:viewer': locale.baseText('projects.settings.role.viewer'),
-	'project:editor': locale.baseText('projects.settings.role.editor'),
-	'project:admin': locale.baseText('projects.settings.role.admin'),
+	'project:viewer': i18n.baseText('projects.settings.role.viewer'),
+	'project:editor': i18n.baseText('projects.settings.role.editor'),
+	'project:admin': i18n.baseText('projects.settings.role.admin'),
 });
 const nameInput = ref<InstanceType<typeof N8nFormInput> | null>(null);
 
+const availableProjectIcons: string[] = getAllIconNames();
+
+const projectIcon = ref<ProjectIcon>({
+	type: 'icon',
+	value: 'layer-group',
+});
+
 const usersList = computed(() =>
 	usersStore.allUsers.filter((user: IUser) => {
 		const isAlreadySharedWithUser = (formData.value.relations || []).find(
@@ -176,31 +187,38 @@ const sendTelemetry = (diff: FormDataDiff) => {
 	}
 };
 
-const onSubmit = async () => {
-	try {
-		if (isDirty.value && projectsStore.currentProject) {
-			const diff = makeFormDataDiff();
-
-			await projectsStore.updateProject({
-				id: projectsStore.currentProject.id,
-				name: formData.value.name,
-				relations: formData.value.relations.map((r: ProjectRelation) => ({
-					userId: r.id,
-					role: r.role,
-				})),
-			});
-			sendTelemetry(diff);
-			isDirty.value = false;
-			toast.showMessage({
-				title: locale.baseText('projects.settings.save.successful.title', {
-					interpolate: { projectName: formData.value.name ?? '' },
-				}),
-				type: 'success',
-			});
-		}
-	} catch (error) {
-		toast.showError(error, locale.baseText('projects.settings.save.error.title'));
+const updateProject = async () => {
+	if (!projectsStore.currentProject) {
+		return;
 	}
+	try {
+		await projectsStore.updateProject(projectsStore.currentProject.id, {
+			name: formData.value.name!,
+			icon: projectIcon.value,
+			relations: formData.value.relations.map((r: ProjectRelation) => ({
+				userId: r.id,
+				role: r.role,
+			})),
+		});
+		isDirty.value = false;
+	} catch (error) {
+		toast.showError(error, i18n.baseText('projects.settings.save.error.title'));
+	}
+};
+
+const onSubmit = async () => {
+	if (!isDirty.value) {
+		return;
+	}
+	await updateProject();
+	const diff = makeFormDataDiff();
+	sendTelemetry(diff);
+	toast.showMessage({
+		title: i18n.baseText('projects.settings.save.successful.title', {
+			interpolate: { projectName: formData.value.name ?? '' },
+		}),
+		type: 'success',
+	});
 };
 
 const onDelete = async () => {
@@ -215,7 +233,7 @@ const onConfirmDelete = async (transferId?: string) => {
 			await projectsStore.deleteProject(projectsStore.currentProject.id, transferId);
 			await router.push({ name: VIEWS.HOMEPAGE });
 			toast.showMessage({
-				title: locale.baseText('projects.settings.delete.successful.title', {
+				title: i18n.baseText('projects.settings.delete.successful.title', {
 					interpolate: { projectName },
 				}),
 				type: 'success',
@@ -223,17 +241,25 @@ const onConfirmDelete = async (transferId?: string) => {
 			dialogVisible.value = true;
 		}
 	} catch (error) {
-		toast.showError(error, locale.baseText('projects.settings.delete.error.title'));
+		toast.showError(error, i18n.baseText('projects.settings.delete.error.title'));
 	}
 };
 
 const selectProjectNameIfMatchesDefault = () => {
-	if (formData.value.name === locale.baseText('projects.settings.newProjectName')) {
+	if (formData.value.name === i18n.baseText('projects.settings.newProjectName')) {
 		nameInput.value?.inputRef?.focus();
 		nameInput.value?.inputRef?.select();
 	}
 };
 
+const onIconUpdated = async () => {
+	await updateProject();
+	toast.showMessage({
+		title: i18n.baseText('projects.settings.icon.update.successful.title'),
+		type: 'success',
+	});
+};
+
 watch(
 	() => projectsStore.currentProject,
 	async () => {
@@ -243,6 +269,9 @@ watch(
 			: [];
 		await nextTick();
 		selectProjectNameIfMatchesDefault();
+		if (projectsStore.currentProject?.icon) {
+			projectIcon.value = projectsStore.currentProject.icon;
+		}
 	},
 	{ immediate: true },
 );
@@ -252,7 +281,7 @@ onBeforeMount(async () => {
 });
 
 onMounted(() => {
-	documentTitle.set(locale.baseText('projects.settings'));
+	documentTitle.set(i18n.baseText('projects.settings'));
 	selectProjectNameIfMatchesDefault();
 });
 </script>
@@ -260,35 +289,42 @@ onMounted(() => {
 <template>
 	<div :class="$style.projectSettings">
 		<div :class="$style.header">
-			<ProjectTabs />
+			<ProjectHeader />
 		</div>
 		<form @submit.prevent="onSubmit">
 			<fieldset>
-				<label for="projectName">{{ locale.baseText('projects.settings.name') }}</label>
-				<N8nFormInput
-					id="projectName"
-					ref="nameInput"
-					v-model="formData.name"
-					label=""
-					type="text"
-					name="name"
-					required
-					data-test-id="project-settings-name-input"
-					@input="onNameInput"
-					@validate="isValid = $event"
-				/>
+				<label for="projectName">{{ i18n.baseText('projects.settings.name') }}</label>
+				<div :class="$style['project-name']">
+					<N8nIconPicker
+						v-model="projectIcon"
+						:button-tooltip="i18n.baseText('projects.settings.iconPicker.button.tooltip')"
+						:available-icons="availableProjectIcons"
+						@update:model-value="onIconUpdated"
+					/>
+					<N8nFormInput
+						id="projectName"
+						ref="nameInput"
+						v-model="formData.name"
+						label=""
+						type="text"
+						name="name"
+						required
+						data-test-id="project-settings-name-input"
+						:class="$style['project-name-input']"
+						@input="onNameInput"
+						@validate="isValid = $event"
+					/>
+				</div>
 			</fieldset>
 			<fieldset>
-				<label for="projectMembers">{{
-					locale.baseText('projects.settings.projectMembers')
-				}}</label>
+				<label for="projectMembers">{{ i18n.baseText('projects.settings.projectMembers') }}</label>
 				<N8nUserSelect
 					id="projectMembers"
 					class="mb-s"
 					size="large"
 					:users="usersList"
 					:current-user-id="usersStore.currentUser?.id"
-					:placeholder="$locale.baseText('workflows.shareModal.select.placeholder')"
+					:placeholder="i18n.baseText('workflows.shareModal.select.placeholder')"
 					data-test-id="project-members-select"
 					@update:model-value="onAddMember"
 				>
@@ -300,7 +336,7 @@ onMounted(() => {
 					:actions="[]"
 					:users="formData.relations"
 					:current-user-id="usersStore.currentUser?.id"
-					:delete-label="$locale.baseText('workflows.shareModal.list.delete')"
+					:delete-label="i18n.baseText('workflows.shareModal.list.delete')"
 				>
 					<template #actions="{ user }">
 						<div :class="$style.buttons">
@@ -324,7 +360,7 @@ onMounted(() => {
 										:class="$style.upgrade"
 										@click="upgradeDialogVisible = true"
 									>
-										&nbsp;-&nbsp;{{ locale.baseText('generic.upgrade') }}
+										&nbsp;-&nbsp;{{ i18n.baseText('generic.upgrade') }}
 									</span>
 								</N8nOption>
 							</N8nSelect>
@@ -343,7 +379,7 @@ onMounted(() => {
 			<fieldset :class="$style.buttons">
 				<div>
 					<small v-if="isDirty" class="mr-2xs">{{
-						locale.baseText('projects.settings.message.unsavedChanges')
+						i18n.baseText('projects.settings.message.unsavedChanges')
 					}}</small>
 					<N8nButton
 						:disabled="!isDirty"
@@ -352,20 +388,20 @@ onMounted(() => {
 						class="mr-2xs"
 						data-test-id="project-settings-cancel-button"
 						@click.stop.prevent="onCancel"
-						>{{ locale.baseText('projects.settings.button.cancel') }}</N8nButton
+						>{{ i18n.baseText('projects.settings.button.cancel') }}</N8nButton
 					>
 				</div>
 				<N8nButton
 					:disabled="!isDirty || !isValid"
 					type="primary"
 					data-test-id="project-settings-save-button"
-					>{{ locale.baseText('projects.settings.button.save') }}</N8nButton
+					>{{ i18n.baseText('projects.settings.button.save') }}</N8nButton
 				>
 			</fieldset>
 			<fieldset>
 				<hr class="mb-2xl" />
-				<h3 class="mb-xs">{{ locale.baseText('projects.settings.danger.title') }}</h3>
-				<small>{{ locale.baseText('projects.settings.danger.message') }}</small>
+				<h3 class="mb-xs">{{ i18n.baseText('projects.settings.danger.title') }}</h3>
+				<small>{{ i18n.baseText('projects.settings.danger.message') }}</small>
 				<br />
 				<N8nButton
 					type="tertiary"
@@ -373,7 +409,7 @@ onMounted(() => {
 					class="mt-s"
 					data-test-id="project-settings-delete-button"
 					@click.stop.prevent="onDelete"
-					>{{ locale.baseText('projects.settings.danger.deleteProject') }}</N8nButton
+					>{{ i18n.baseText('projects.settings.danger.deleteProject') }}</N8nButton
 				>
 			</fieldset>
 		</form>
@@ -400,7 +436,7 @@ onMounted(() => {
 
 	form {
 		width: 100%;
-		max-width: 1280px;
+		max-width: var(--content-container-width);
 		padding: 0 var(--spacing-2xl);
 
 		fieldset {
@@ -417,7 +453,7 @@ onMounted(() => {
 
 .header {
 	width: 100%;
-	max-width: 1280px;
+	max-width: var(--content-container-width);
 	padding: var(--spacing-l) var(--spacing-2xl) 0;
 }
 
@@ -430,4 +466,14 @@ onMounted(() => {
 	justify-content: flex-end;
 	align-items: center;
 }
+
+.project-name {
+	display: flex;
+	gap: var(--spacing-2xs);
+	align-items: center;
+
+	.project-name-input {
+		flex: 1;
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts b/packages/editor-ui/src/views/SamlOnboarding.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/__tests__/SamlOnboarding.test.ts
rename to packages/editor-ui/src/views/SamlOnboarding.test.ts
diff --git a/packages/editor-ui/src/views/SettingsApiView.vue b/packages/editor-ui/src/views/SettingsApiView.vue
index 2bb67d0440..ba4030a8a7 100644
--- a/packages/editor-ui/src/views/SettingsApiView.vue
+++ b/packages/editor-ui/src/views/SettingsApiView.vue
@@ -1,140 +1,122 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import type { ApiKey, IUser } from '@/Interface';
+<script lang="ts" setup>
+import { computed, onMounted, ref } from 'vue';
+import type { ApiKey } from '@/Interface';
 import { useToast } from '@/composables/useToast';
 import { useMessage } from '@/composables/useMessage';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 
 import CopyInput from '@/components/CopyInput.vue';
-import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useRootStore } from '@/stores/root.store';
-import { useUIStore } from '@/stores/ui.store';
-import { useUsersStore } from '@/stores/users.store';
 import { useCloudPlanStore } from '@/stores/cloudPlan.store';
 import { DOCS_DOMAIN, MODAL_CONFIRM } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+import { useTelemetry } from '@/composables/useTelemetry';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
-export default defineComponent({
-	name: 'SettingsApiView',
-	components: {
-		CopyInput,
-	},
-	setup() {
-		return {
-			...useToast(),
-			...useMessage(),
-			...useUIStore(),
-			documentTitle: useDocumentTitle(),
-		};
-	},
-	data() {
-		return {
-			loading: false,
-			mounted: false,
-			apiKeys: [] as ApiKey[],
-			swaggerUIEnabled: false,
-			apiDocsURL: '',
-		};
-	},
-	mounted() {
-		this.documentTitle.set(this.$locale.baseText('settings.api'));
-		if (!this.isPublicApiEnabled) return;
+const settingsStore = useSettingsStore();
+const cloudPlanStore = useCloudPlanStore();
+const { baseUrl } = useRootStore();
 
-		void this.getApiKeys();
-		const baseUrl = this.rootStore.baseUrl;
-		const apiPath = this.settingsStore.publicApiPath;
-		const latestVersion = this.settingsStore.publicApiLatestVersion;
-		this.swaggerUIEnabled = this.settingsStore.isSwaggerUIEnabled;
-		this.apiDocsURL = this.swaggerUIEnabled
-			? `${baseUrl}${apiPath}/v${latestVersion}/docs`
-			: `https://${DOCS_DOMAIN}/api/api-reference/`;
-	},
-	computed: {
-		...mapStores(useRootStore, useSettingsStore, useUsersStore, useCloudPlanStore, useUIStore),
-		currentUser(): IUser | null {
-			return this.usersStore.currentUser;
-		},
-		isTrialing(): boolean {
-			return this.cloudPlanStore.userIsTrialing;
-		},
-		isLoadingCloudPlans(): boolean {
-			return this.cloudPlanStore.state.loadingPlan;
-		},
-		isPublicApiEnabled(): boolean {
-			return this.settingsStore.isPublicApiEnabled;
-		},
-		isRedactedApiKey(): boolean {
-			if (!this.apiKeys) return false;
-			return this.apiKeys[0].apiKey.includes('*');
-		},
-	},
-	methods: {
-		onUpgrade() {
-			void this.uiStore.goToUpgrade('settings-n8n-api', 'upgrade-api', 'redirect');
-		},
-		async showDeleteModal() {
-			const confirmed = await this.confirm(
-				this.$locale.baseText('settings.api.delete.description'),
-				this.$locale.baseText('settings.api.delete.title'),
-				{
-					confirmButtonText: this.$locale.baseText('settings.api.delete.button'),
-					cancelButtonText: this.$locale.baseText('generic.cancel'),
-				},
-			);
-			if (confirmed === MODAL_CONFIRM) {
-				await this.deleteApiKey();
-			}
-		},
-		async getApiKeys() {
-			try {
-				this.apiKeys = await this.settingsStore.getApiKeys();
-			} catch (error) {
-				this.showError(error, this.$locale.baseText('settings.api.view.error'));
-			} finally {
-				this.mounted = true;
-			}
-		},
-		async createApiKey() {
-			this.loading = true;
+const { showError, showMessage } = useToast();
+const { confirm } = useMessage();
+const documentTitle = useDocumentTitle();
+const i18n = useI18n();
+const { goToUpgrade } = usePageRedirectionHelper();
+const telemetry = useTelemetry();
 
-			try {
-				const newApiKey = await this.settingsStore.createApiKey();
-				this.apiKeys.push(newApiKey);
-			} catch (error) {
-				this.showError(error, this.$locale.baseText('settings.api.create.error'));
-			} finally {
-				this.loading = false;
-				this.$telemetry.track('User clicked create API key button');
-			}
-		},
-		async deleteApiKey() {
-			try {
-				await this.settingsStore.deleteApiKey(this.apiKeys[0].id);
-				this.showMessage({
-					title: this.$locale.baseText('settings.api.delete.toast'),
-					type: 'success',
-				});
-				this.apiKeys = [];
-			} catch (error) {
-				this.showError(error, this.$locale.baseText('settings.api.delete.error'));
-			} finally {
-				this.$telemetry.track('User clicked delete API key button');
-			}
-		},
-		onCopy() {
-			this.$telemetry.track('User clicked copy API key button');
-		},
-	},
+const loading = ref(false);
+const mounted = ref(false);
+const apiKeys = ref<ApiKey[]>([]);
+const apiDocsURL = ref('');
+
+const { isPublicApiEnabled, isSwaggerUIEnabled, publicApiPath, publicApiLatestVersion } =
+	settingsStore;
+
+const isRedactedApiKey = computed((): boolean => {
+	if (!apiKeys.value) return false;
+	return apiKeys.value[0].apiKey.includes('*');
 });
+
+onMounted(() => {
+	documentTitle.set(i18n.baseText('settings.api'));
+	if (!isPublicApiEnabled) return;
+
+	void getApiKeys();
+	apiDocsURL.value = isSwaggerUIEnabled
+		? `${baseUrl}${publicApiPath}/v${publicApiLatestVersion}/docs`
+		: `https://${DOCS_DOMAIN}/api/api-reference/`;
+});
+
+function onUpgrade() {
+	void goToUpgrade('settings-n8n-api', 'upgrade-api', 'redirect');
+}
+
+async function showDeleteModal() {
+	const confirmed = await confirm(
+		i18n.baseText('settings.api.delete.description'),
+		i18n.baseText('settings.api.delete.title'),
+		{
+			confirmButtonText: i18n.baseText('settings.api.delete.button'),
+			cancelButtonText: i18n.baseText('generic.cancel'),
+		},
+	);
+	if (confirmed === MODAL_CONFIRM) {
+		await deleteApiKey();
+	}
+}
+
+async function getApiKeys() {
+	try {
+		apiKeys.value = await settingsStore.getApiKeys();
+	} catch (error) {
+		showError(error, i18n.baseText('settings.api.view.error'));
+	} finally {
+		mounted.value = true;
+	}
+}
+
+async function createApiKey() {
+	loading.value = true;
+
+	try {
+		const newApiKey = await settingsStore.createApiKey();
+		apiKeys.value.push(newApiKey);
+	} catch (error) {
+		showError(error, i18n.baseText('settings.api.create.error'));
+	} finally {
+		loading.value = false;
+		telemetry.track('User clicked create API key button');
+	}
+}
+
+async function deleteApiKey() {
+	try {
+		await settingsStore.deleteApiKey(apiKeys.value[0].id);
+		showMessage({
+			title: i18n.baseText('settings.api.delete.toast'),
+			type: 'success',
+		});
+		apiKeys.value = [];
+	} catch (error) {
+		showError(error, i18n.baseText('settings.api.delete.error'));
+	} finally {
+		telemetry.track('User clicked delete API key button');
+	}
+}
+
+function onCopy() {
+	telemetry.track('User clicked copy API key button');
+}
 </script>
 
 <template>
 	<div :class="$style.container">
 		<div :class="$style.header">
 			<n8n-heading size="2xlarge">
-				{{ $locale.baseText('settings.api') }}
+				{{ i18n.baseText('settings.api') }}
 				<span :style="{ fontSize: 'var(--font-size-s)', color: 'var(--color-text-light)' }">
-					({{ $locale.baseText('generic.beta') }})
+					({{ i18n.baseText('generic.beta') }})
 				</span>
 			</n8n-heading>
 		</div>
@@ -147,14 +129,14 @@ export default defineComponent({
 							<a
 								href="https://docs.n8n.io/api"
 								target="_blank"
-								v-text="$locale.baseText('settings.api.view.info.api')"
+								v-text="i18n.baseText('settings.api.view.info.api')"
 							/>
 						</template>
 						<template #webhookAction>
 							<a
 								href="https://docs.n8n.io/integrations/core-nodes/n8n-nodes-base.webhook/"
 								target="_blank"
-								v-text="$locale.baseText('settings.api.view.info.webhook')"
+								v-text="i18n.baseText('settings.api.view.info.webhook')"
 							/>
 						</template>
 					</i18n-t>
@@ -163,7 +145,7 @@ export default defineComponent({
 			<n8n-card class="mb-4xs" :class="$style.card">
 				<span :class="$style.delete">
 					<n8n-link :bold="true" @click="showDeleteModal">
-						{{ $locale.baseText('generic.delete') }}
+						{{ i18n.baseText('generic.delete') }}
 					</n8n-link>
 				</span>
 
@@ -171,47 +153,43 @@ export default defineComponent({
 					<CopyInput
 						:label="apiKeys[0].label"
 						:value="apiKeys[0].apiKey"
-						:copy-button-text="$locale.baseText('generic.clickToCopy')"
-						:toast-title="$locale.baseText('settings.api.view.copy.toast')"
+						:copy-button-text="i18n.baseText('generic.clickToCopy')"
+						:toast-title="i18n.baseText('settings.api.view.copy.toast')"
 						:redact-value="true"
 						:disable-copy="isRedactedApiKey"
-						:hint="!isRedactedApiKey ? $locale.baseText('settings.api.view.copy') : ''"
+						:hint="!isRedactedApiKey ? i18n.baseText('settings.api.view.copy') : ''"
 						@copy="onCopy"
 					/>
 				</div>
 			</n8n-card>
 			<div :class="$style.hint">
 				<n8n-text size="small">
-					{{
-						$locale.baseText(`settings.api.view.${swaggerUIEnabled ? 'tryapi' : 'more-details'}`)
-					}}
+					{{ i18n.baseText(`settings.api.view.${isSwaggerUIEnabled ? 'tryapi' : 'more-details'}`) }}
 				</n8n-text>
 				{{ ' ' }}
 				<n8n-link :to="apiDocsURL" :new-window="true" size="small">
 					{{
-						$locale.baseText(
-							`settings.api.view.${swaggerUIEnabled ? 'apiPlayground' : 'external-docs'}`,
+						i18n.baseText(
+							`settings.api.view.${isSwaggerUIEnabled ? 'apiPlayground' : 'external-docs'}`,
 						)
 					}}
 				</n8n-link>
 			</div>
 		</div>
 		<n8n-action-box
-			v-else-if="!isPublicApiEnabled && isTrialing"
+			v-else-if="!isPublicApiEnabled && cloudPlanStore.userIsTrialing"
 			data-test-id="public-api-upgrade-cta"
-			:heading="$locale.baseText('settings.api.trial.upgradePlan.title')"
-			:description="$locale.baseText('settings.api.trial.upgradePlan.description')"
-			:button-text="$locale.baseText('settings.api.trial.upgradePlan.cta')"
+			:heading="i18n.baseText('settings.api.trial.upgradePlan.title')"
+			:description="i18n.baseText('settings.api.trial.upgradePlan.description')"
+			:button-text="i18n.baseText('settings.api.trial.upgradePlan.cta')"
 			@click:button="onUpgrade"
 		/>
 		<n8n-action-box
-			v-else-if="mounted && !isLoadingCloudPlans"
+			v-else-if="mounted && !cloudPlanStore.state.loadingPlan"
 			:button-text="
-				$locale.baseText(
-					loading ? 'settings.api.create.button.loading' : 'settings.api.create.button',
-				)
+				i18n.baseText(loading ? 'settings.api.create.button.loading' : 'settings.api.create.button')
 			"
-			:description="$locale.baseText('settings.api.create.description')"
+			:description="i18n.baseText('settings.api.create.description')"
 			@click:button="createApiKey"
 		/>
 	</div>
diff --git a/packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts b/packages/editor-ui/src/views/SettingsExternalSecrets.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/__tests__/SettingsExternalSecrets.test.ts
rename to packages/editor-ui/src/views/SettingsExternalSecrets.test.ts
diff --git a/packages/editor-ui/src/views/SettingsExternalSecrets.vue b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
index 30aaebeae1..0d05bf60a2 100644
--- a/packages/editor-ui/src/views/SettingsExternalSecrets.vue
+++ b/packages/editor-ui/src/views/SettingsExternalSecrets.vue
@@ -1,5 +1,4 @@
 <script lang="ts" setup>
-import { useUIStore } from '@/stores/ui.store';
 import { useI18n } from '@/composables/useI18n';
 import { useToast } from '@/composables/useToast';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
@@ -7,12 +6,13 @@ import { useExternalSecretsStore } from '@/stores/externalSecrets.ee.store';
 import { computed, onMounted } from 'vue';
 import ExternalSecretsProviderCard from '@/components/ExternalSecretsProviderCard.ee.vue';
 import type { ExternalSecretsProvider } from '@/Interface';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const i18n = useI18n();
-const uiStore = useUIStore();
 const externalSecretsStore = useExternalSecretsStore();
 const toast = useToast();
 const documentTitle = useDocumentTitle();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const sortedProviders = computed(() => {
 	return ([...externalSecretsStore.providers] as ExternalSecretsProvider[]).sort((a, b) => {
@@ -32,7 +32,7 @@ onMounted(() => {
 });
 
 function goToUpgrade() {
-	void uiStore.goToUpgrade('external-secrets', 'upgrade-external-secrets');
+	void pageRedirectionHelper.goToUpgrade('external-secrets', 'upgrade-external-secrets');
 }
 </script>
 
diff --git a/packages/editor-ui/src/views/SettingsFakeDoorView.vue b/packages/editor-ui/src/views/SettingsFakeDoorView.vue
deleted file mode 100644
index 403bd696b9..0000000000
--- a/packages/editor-ui/src/views/SettingsFakeDoorView.vue
+++ /dev/null
@@ -1,49 +0,0 @@
-<script lang="ts">
-import type { IFakeDoor } from '@/Interface';
-import { defineComponent } from 'vue';
-import FeatureComingSoon from '@/components/FeatureComingSoon.vue';
-import { mapStores } from 'pinia';
-import { useUIStore } from '@/stores/ui.store';
-
-export default defineComponent({
-	name: 'SettingsFakeDoorView',
-	components: {
-		FeatureComingSoon,
-	},
-	props: {
-		featureId: {
-			type: String,
-			required: true,
-		},
-	},
-	computed: {
-		...mapStores(useUIStore),
-		featureInfo(): IFakeDoor | undefined {
-			return this.uiStore.fakeDoorsById[this.featureId];
-		},
-	},
-	methods: {
-		openLinkPage() {
-			if (this.featureInfo) {
-				window.open(this.featureInfo.linkURL, '_blank');
-			}
-		},
-	},
-});
-</script>
-
-<template>
-	<FeatureComingSoon :feature-id="featureId" show-title />
-</template>
-
-<style lang="scss" module>
-.header {
-	display: flex;
-	align-items: center;
-	white-space: nowrap;
-
-	*:first-child {
-		flex-grow: 1;
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/views/SettingsLdapView.vue b/packages/editor-ui/src/views/SettingsLdapView.vue
index 41227c854e..c1e71cd857 100644
--- a/packages/editor-ui/src/views/SettingsLdapView.vue
+++ b/packages/editor-ui/src/views/SettingsLdapView.vue
@@ -20,10 +20,10 @@ import { ElTable, ElTableColumn } from 'element-plus';
 import type { Events } from 'v3-infinite-loading';
 import InfiniteLoading from 'v3-infinite-loading';
 import { useSettingsStore } from '@/stores/settings.store';
-import { useUIStore } from '@/stores/ui.store';
 import { createFormEventBus } from 'n8n-design-system/utils';
 import type { TableColumnCtx } from 'element-plus';
 import { useI18n } from '@/composables/useI18n';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 type TableRow = {
 	status: string;
@@ -67,9 +67,9 @@ const toast = useToast();
 const i18n = useI18n();
 const message = useMessage();
 const documentTitle = useDocumentTitle();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const settingsStore = useSettingsStore();
-const uiStore = useUIStore();
 
 const dataTable = ref<ILdapSyncTable[]>([]);
 const tableKey = ref(0);
@@ -89,7 +89,7 @@ const ldapConfigFormRef = ref<{ getValues: () => LDAPConfigForm }>();
 
 const isLDAPFeatureEnabled = computed(() => settingsStore.settings.enterprise.ldap);
 
-const goToUpgrade = async () => await uiStore.goToUpgrade('ldap', 'upgrade-ldap');
+const goToUpgrade = async () => await pageRedirectionHelper.goToUpgrade('ldap', 'upgrade-ldap');
 
 const cellClassStyle = ({ row, column }: CellClassStyleMethodParams<TableRow>): CSSProperties => {
 	if (column.property === 'status') {
diff --git a/packages/editor-ui/src/views/SettingsLogStreamingView.vue b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
index fae75b2604..9ff1409d78 100644
--- a/packages/editor-ui/src/views/SettingsLogStreamingView.vue
+++ b/packages/editor-ui/src/views/SettingsLogStreamingView.vue
@@ -1,6 +1,5 @@
-<script lang="ts">
-import { defineComponent, nextTick } from 'vue';
-import { mapStores } from 'pinia';
+<script lang="ts" setup>
+import { computed, nextTick, onBeforeMount, onMounted } from 'vue';
 import { v4 as uuid } from 'uuid';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { hasPermission } from '@/utils/rbac/permissions';
@@ -14,152 +13,158 @@ import { deepCopy, defaultMessageEventBusDestinationOptions } from 'n8n-workflow
 import EventDestinationCard from '@/components/SettingsLogStreaming/EventDestinationCard.ee.vue';
 import { createEventBus } from 'n8n-design-system/utils';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
+import { ref, getCurrentInstance } from 'vue';
+import { useI18n } from '@/composables/useI18n';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
-export default defineComponent({
-	name: 'SettingsLogStreamingView',
-	components: {
-		EventDestinationCard,
-	},
-	props: {},
-	data() {
-		return {
-			eventBus: createEventBus(),
-			destinations: Array<MessageEventBusDestinationOptions>,
-			disableLicense: false,
-			allDestinations: [] as MessageEventBusDestinationOptions[],
-			documentTitle: useDocumentTitle(),
-		};
-	},
-	async mounted() {
-		this.documentTitle.set(this.$locale.baseText('settings.log-streaming.heading'));
-		if (!this.isLicensed) return;
+const environment = process.env.NODE_ENV;
 
-		// Prepare credentialsStore so modals can pick up credentials
-		await this.credentialsStore.fetchCredentialTypes(false);
-		await this.credentialsStore.fetchAllCredentials();
-		this.uiStore.nodeViewInitialized = false;
+const settingsStore = useSettingsStore();
+const logStreamingStore = useLogStreamingStore();
+const workflowsStore = useWorkflowsStore();
+const uiStore = useUIStore();
+const credentialsStore = useCredentialsStore();
+const documentTitle = useDocumentTitle();
+const i18n = useI18n();
 
-		// fetch Destination data from the backend
-		await this.getDestinationDataFromBackend();
+const pageRedirectHelper = usePageRedirectionHelper();
 
-		// since we are not really integrated into the hooks, we listen to the store and refresh the destinations
-		this.logStreamingStore.$onAction(({ name, after }) => {
-			if (name === 'removeDestination' || name === 'updateDestination') {
-				after(async () => {
-					this.$forceUpdate();
-				});
-			}
-		});
-		// refresh when a modal closes
-		this.eventBus.on('destinationWasSaved', this.onDestinationWasSaved);
-		// listen to remove emission
-		this.eventBus.on('remove', this.onRemove);
-		// listen to modal closing and remove nodes from store
-		this.eventBus.on('closing', this.onBusClosing);
-	},
-	beforeUnmount() {
-		this.eventBus.off('destinationWasSaved', this.onDestinationWasSaved);
-		this.eventBus.off('remove', this.onRemove);
-		this.eventBus.off('closing', this.onBusClosing);
-	},
-	computed: {
-		...mapStores(
-			useSettingsStore,
-			useLogStreamingStore,
-			useWorkflowsStore,
-			useUIStore,
-			useCredentialsStore,
-		),
-		sortedItemKeysByLabel() {
-			const sortedKeys: Array<{ label: string; key: string }> = [];
-			for (const [key, value] of Object.entries(this.logStreamingStore.items)) {
-				sortedKeys.push({ key, label: value.destination?.label ?? 'Destination' });
-			}
-			return sortedKeys.sort((a, b) => a.label.localeCompare(b.label));
-		},
-		environment() {
-			return process.env.NODE_ENV;
-		},
-		isLicensed(): boolean {
-			if (this.disableLicense) return false;
-			return this.settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.LogStreaming];
-		},
-		canManageLogStreaming(): boolean {
-			return hasPermission(['rbac'], { rbac: { scope: 'logStreaming:manage' } });
-		},
-	},
-	methods: {
-		onDestinationWasSaved() {
-			this.$forceUpdate();
-		},
-		onBusClosing() {
-			this.workflowsStore.removeAllNodes({ setStateDirty: false, removePinData: true });
-			this.uiStore.stateIsDirty = false;
-		},
-		async getDestinationDataFromBackend(): Promise<void> {
-			this.logStreamingStore.clearEventNames();
-			this.logStreamingStore.clearDestinations();
-			this.allDestinations = [];
-			const eventNamesData = await this.logStreamingStore.fetchEventNames();
-			if (eventNamesData) {
-				for (const eventName of eventNamesData) {
-					this.logStreamingStore.addEventName(eventName);
-				}
-			}
-			const destinationData: MessageEventBusDestinationOptions[] =
-				await this.logStreamingStore.fetchDestinations();
-			if (destinationData) {
-				for (const destination of destinationData) {
-					this.logStreamingStore.addDestination(destination);
-					this.allDestinations.push(destination);
-				}
-			}
-			this.$forceUpdate();
-		},
-		goToUpgrade() {
-			void this.uiStore.goToUpgrade('log-streaming', 'upgrade-log-streaming');
-		},
-		storeHasItems(): boolean {
-			return this.logStreamingStore.items && Object.keys(this.logStreamingStore.items).length > 0;
-		},
-		async addDestination() {
-			const newDestination = deepCopy(defaultMessageEventBusDestinationOptions);
-			newDestination.id = uuid();
-			this.logStreamingStore.addDestination(newDestination);
-			await nextTick();
-			this.uiStore.openModalWithData({
-				name: LOG_STREAM_MODAL_KEY,
-				data: {
-					destination: newDestination,
-					isNew: true,
-					eventBus: this.eventBus,
-				},
-			});
-		},
-		async onRemove(destinationId?: string) {
-			if (!destinationId) return;
-			await this.logStreamingStore.deleteDestination(destinationId);
-			const foundNode = this.workflowsStore.getNodeByName(destinationId);
-			if (foundNode) {
-				this.workflowsStore.removeNode(foundNode);
-			}
-		},
-		async onEdit(destinationId?: string) {
-			if (!destinationId) return;
-			const editDestination = this.logStreamingStore.getDestination(destinationId);
-			if (editDestination) {
-				this.uiStore.openModalWithData({
-					name: LOG_STREAM_MODAL_KEY,
-					data: {
-						destination: editDestination,
-						isNew: false,
-						eventBus: this.eventBus,
-					},
-				});
-			}
-		},
-	},
+const eventBus = createEventBus();
+const disableLicense = ref(false);
+const allDestinations = ref<MessageEventBusDestinationOptions[]>([]);
+
+const sortedItemKeysByLabel = computed(() => {
+	const sortedKeys: Array<{ label: string; key: string }> = [];
+	for (const [key, value] of Object.entries(logStreamingStore.items)) {
+		sortedKeys.push({ key, label: value.destination?.label ?? 'Destination' });
+	}
+	return sortedKeys.sort((a, b) => a.label.localeCompare(b.label));
 });
+
+const isLicensed = computed((): boolean => {
+	if (disableLicense.value) return false;
+	return settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.LogStreaming];
+});
+
+const canManageLogStreaming = computed((): boolean => {
+	return hasPermission(['rbac'], { rbac: { scope: 'logStreaming:manage' } });
+});
+
+onMounted(async () => {
+	documentTitle.set(i18n.baseText('settings.log-streaming.heading'));
+	if (!isLicensed.value) return;
+
+	// Prepare credentialsStore so modals can pick up credentials
+	await credentialsStore.fetchCredentialTypes(false);
+	await credentialsStore.fetchAllCredentials();
+	uiStore.nodeViewInitialized = false;
+
+	// fetch Destination data from the backend
+	await getDestinationDataFromBackend();
+
+	// since we are not really integrated into the hooks, we listen to the store and refresh the destinations
+	logStreamingStore.$onAction(({ name, after }) => {
+		if (name === 'removeDestination' || name === 'updateDestination') {
+			after(async () => {
+				forceUpdateInstance();
+			});
+		}
+	});
+	// refresh when a modal closes
+	eventBus.on('destinationWasSaved', onDestinationWasSaved);
+	// listen to remove emission
+	eventBus.on('remove', onRemove);
+	// listen to modal closing and remove nodes from store
+	eventBus.on('closing', onBusClosing);
+});
+
+onBeforeMount(() => {
+	eventBus.off('destinationWasSaved', onDestinationWasSaved);
+	eventBus.off('remove', onRemove);
+	eventBus.off('closing', onBusClosing);
+});
+
+function onDestinationWasSaved() {
+	forceUpdateInstance();
+}
+
+function forceUpdateInstance() {
+	const instance = getCurrentInstance();
+	instance?.proxy?.$forceUpdate();
+}
+
+function onBusClosing() {
+	workflowsStore.removeAllNodes({ setStateDirty: false, removePinData: true });
+	uiStore.stateIsDirty = false;
+}
+
+async function getDestinationDataFromBackend(): Promise<void> {
+	logStreamingStore.clearEventNames();
+	logStreamingStore.clearDestinations();
+	allDestinations.value = [];
+	const eventNamesData = await logStreamingStore.fetchEventNames();
+	if (eventNamesData) {
+		for (const eventName of eventNamesData) {
+			logStreamingStore.addEventName(eventName);
+		}
+	}
+	const destinationData: MessageEventBusDestinationOptions[] =
+		await logStreamingStore.fetchDestinations();
+	if (destinationData) {
+		for (const destination of destinationData) {
+			logStreamingStore.addDestination(destination);
+			allDestinations.value.push(destination);
+		}
+	}
+	forceUpdateInstance();
+}
+
+function goToUpgrade() {
+	void pageRedirectHelper.goToUpgrade('log-streaming', 'upgrade-log-streaming');
+}
+
+function storeHasItems(): boolean {
+	return logStreamingStore.items && Object.keys(logStreamingStore.items).length > 0;
+}
+
+async function addDestination() {
+	const newDestination = deepCopy(defaultMessageEventBusDestinationOptions);
+	newDestination.id = uuid();
+	logStreamingStore.addDestination(newDestination);
+	await nextTick();
+	uiStore.openModalWithData({
+		name: LOG_STREAM_MODAL_KEY,
+		data: {
+			destination: newDestination,
+			isNew: true,
+			eventBus,
+		},
+	});
+}
+
+async function onRemove(destinationId?: string) {
+	if (!destinationId) return;
+	await logStreamingStore.deleteDestination(destinationId);
+	const foundNode = workflowsStore.getNodeByName(destinationId);
+	if (foundNode) {
+		workflowsStore.removeNode(foundNode);
+	}
+}
+
+async function onEdit(destinationId?: string) {
+	if (!destinationId) return;
+	const editDestination = logStreamingStore.getDestination(destinationId);
+	if (editDestination) {
+		uiStore.openModalWithData({
+			name: LOG_STREAM_MODAL_KEY,
+			data: {
+				destination: editDestination,
+				isNew: false,
+				eventBus,
+			},
+		});
+	}
+}
 </script>
 
 <template>
@@ -167,7 +172,7 @@ export default defineComponent({
 		<div :class="$style.header">
 			<div class="mb-2xl">
 				<n8n-heading size="2xlarge">
-					{{ $locale.baseText(`settings.log-streaming.heading`) }}
+					{{ i18n.baseText(`settings.log-streaming.heading`) }}
 				</n8n-heading>
 				<template v-if="environment !== 'production'">
 					<strong class="ml-m">Disable License ({{ environment }})&nbsp;</strong>
@@ -178,7 +183,7 @@ export default defineComponent({
 		<template v-if="isLicensed">
 			<div class="mb-l">
 				<n8n-info-tip theme="info" type="note">
-					<span v-n8n-html="$locale.baseText('settings.log-streaming.infoText')"></span>
+					<span v-n8n-html="i18n.baseText('settings.log-streaming.infoText')"></span>
 				</n8n-info-tip>
 			</div>
 			<template v-if="storeHasItems()">
@@ -200,35 +205,35 @@ export default defineComponent({
 				</el-row>
 				<div class="mt-m text-right">
 					<n8n-button v-if="canManageLogStreaming" size="large" @click="addDestination">
-						{{ $locale.baseText(`settings.log-streaming.add`) }}
+						{{ i18n.baseText(`settings.log-streaming.add`) }}
 					</n8n-button>
 				</div>
 			</template>
 			<div v-else data-test-id="action-box-licensed">
 				<n8n-action-box
-					:button-text="$locale.baseText(`settings.log-streaming.add`)"
+					:button-text="i18n.baseText(`settings.log-streaming.add`)"
 					@click:button="addDestination"
 				>
 					<template #heading>
-						<span v-n8n-html="$locale.baseText(`settings.log-streaming.addFirstTitle`)" />
+						<span v-n8n-html="i18n.baseText(`settings.log-streaming.addFirstTitle`)" />
 					</template>
 				</n8n-action-box>
 			</div>
 		</template>
 		<template v-else>
-			<div v-if="$locale.baseText('settings.log-streaming.infoText')" class="mb-l">
+			<div v-if="i18n.baseText('settings.log-streaming.infoText')" class="mb-l">
 				<n8n-info-tip theme="info" type="note">
-					<span v-n8n-html="$locale.baseText('settings.log-streaming.infoText')"></span>
+					<span v-n8n-html="i18n.baseText('settings.log-streaming.infoText')"></span>
 				</n8n-info-tip>
 			</div>
 			<div data-test-id="action-box-unlicensed">
 				<n8n-action-box
-					:description="$locale.baseText('settings.log-streaming.actionBox.description')"
-					:button-text="$locale.baseText('settings.log-streaming.actionBox.button')"
+					:description="i18n.baseText('settings.log-streaming.actionBox.description')"
+					:button-text="i18n.baseText('settings.log-streaming.actionBox.button')"
 					@click:button="goToUpgrade"
 				>
 					<template #heading>
-						<span v-n8n-html="$locale.baseText('settings.log-streaming.actionBox.title')" />
+						<span v-n8n-html="i18n.baseText('settings.log-streaming.actionBox.title')" />
 					</template>
 				</n8n-action-box>
 			</div>
diff --git a/packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts b/packages/editor-ui/src/views/SettingsPersonalView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/__tests__/SettingsPersonalView.test.ts
rename to packages/editor-ui/src/views/SettingsPersonalView.test.ts
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 64effcf52f..f757c553cc 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -226,7 +226,7 @@ async function disableMfa(payload: MfaModalEvents['closed']) {
 	}
 
 	try {
-		await usersStore.disableMfa(payload.mfaCode);
+		await usersStore.disableMfa(payload);
 
 		showToast({
 			title: i18n.baseText('settings.personal.mfa.toast.disabledMfa.title'),
diff --git a/packages/editor-ui/src/views/SettingsSourceControl.vue b/packages/editor-ui/src/views/SettingsSourceControl.vue
index 3928556104..3c9fd3ab2a 100644
--- a/packages/editor-ui/src/views/SettingsSourceControl.vue
+++ b/packages/editor-ui/src/views/SettingsSourceControl.vue
@@ -3,7 +3,6 @@ import { computed, reactive, ref, onMounted } from 'vue';
 import type { Rule, RuleGroup } from 'n8n-design-system/types';
 import { MODAL_CONFIRM } from '@/constants';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
-import { useUIStore } from '@/stores/ui.store';
 import { useToast } from '@/composables/useToast';
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useI18n } from '@/composables/useI18n';
@@ -11,11 +10,12 @@ import { useMessage } from '@/composables/useMessage';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import CopyInput from '@/components/CopyInput.vue';
 import type { TupleToUnion } from '@/utils/typeHelpers';
-import type { SshKeyTypes } from '@/Interface';
+import type { SshKeyTypes } from '@/types/sourceControl.types';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const locale = useI18n();
 const sourceControlStore = useSourceControlStore();
-const uiStore = useUIStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
 const toast = useToast();
 const message = useMessage();
 const documentTitle = useDocumentTitle();
@@ -102,7 +102,7 @@ const onSelect = async (b: string) => {
 };
 
 const goToUpgrade = () => {
-	void uiStore.goToUpgrade('source-control', 'upgrade-source-control');
+	void pageRedirectionHelper.goToUpgrade('source-control', 'upgrade-source-control');
 };
 
 const initialize = async () => {
diff --git a/packages/editor-ui/src/views/SettingsSso.test.ts b/packages/editor-ui/src/views/SettingsSso.test.ts
index 793f28bda2..bbd927a1e3 100644
--- a/packages/editor-ui/src/views/SettingsSso.test.ts
+++ b/packages/editor-ui/src/views/SettingsSso.test.ts
@@ -1,11 +1,18 @@
+import type { SamlPreferences } from '@n8n/api-types';
 import { createTestingPinia } from '@pinia/testing';
-import { createComponentRenderer } from '@/__tests__/render';
-import SettingsSso from './SettingsSso.vue';
-import { useSSOStore } from '@/stores/sso.store';
-import { useUIStore } from '@/stores/ui.store';
 import { within, waitFor } from '@testing-library/vue';
+import { mockedStore, retry } from '@/__tests__/utils';
+import { createPinia, setActivePinia } from 'pinia';
+import SettingsSso from '@/views/SettingsSso.vue';
+import { setupServer } from '@/__tests__/server';
+import { useSettingsStore } from '@/stores/settings.store';
 import userEvent from '@testing-library/user-event';
-import { mockedStore } from '@/__tests__/utils';
+import { useSSOStore } from '@/stores/sso.store';
+import { createComponentRenderer } from '@/__tests__/render';
+import { EnterpriseEditionFeature } from '@/constants';
+import { nextTick } from 'vue';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+import type { SamlPreferencesExtractedData } from '@/Interface';
 
 const renderView = createComponentRenderer(SettingsSso);
 
@@ -15,7 +22,7 @@ const samlConfig = {
 		'https://dev-qqkrykgkoo0p63d5.eu.auth0.com/samlp/metadata/KR1cSrRrxaZT2gV8ZhPAUIUHtEY4duhN',
 	entityID: 'https://n8n-tunnel.myhost.com/rest/sso/saml/metadata',
 	returnUrl: 'https://n8n-tunnel.myhost.com/rest/sso/saml/acs',
-};
+} as SamlPreferences & SamlPreferencesExtractedData;
 
 const telemetryTrack = vi.fn();
 vi.mock('@/composables/useTelemetry', () => ({
@@ -38,6 +45,15 @@ vi.mock('@/composables/useMessage', () => ({
 	}),
 }));
 
+vi.mock('@/composables/usePageRedirectionHelper', () => {
+	const goToUpgrade = vi.fn();
+	return {
+		usePageRedirectionHelper: () => ({
+			goToUpgrade,
+		}),
+	};
+});
+
 describe('SettingsSso View', () => {
 	beforeEach(() => {
 		telemetryTrack.mockReset();
@@ -50,7 +66,7 @@ describe('SettingsSso View', () => {
 		const ssoStore = mockedStore(useSSOStore);
 		ssoStore.isEnterpriseSamlEnabled = false;
 
-		const uiStore = useUIStore();
+		const pageRedirectionHelper = usePageRedirectionHelper();
 
 		const { getByTestId } = renderView({ pinia });
 
@@ -58,7 +74,7 @@ describe('SettingsSso View', () => {
 		expect(actionBox).toBeInTheDocument();
 
 		await userEvent.click(await within(actionBox).findByText('See plans'));
-		expect(uiStore.goToUpgrade).toHaveBeenCalledWith('sso', 'upgrade-sso');
+		expect(pageRedirectionHelper.goToUpgrade).toHaveBeenCalledWith('sso', 'upgrade-sso');
 	});
 
 	it('should show user SSO config', async () => {
@@ -119,7 +135,7 @@ describe('SettingsSso View', () => {
 		const urlinput = getByTestId('sso-provider-url');
 
 		expect(urlinput).toBeVisible();
-		await userEvent.type(urlinput, samlConfig.metadataUrl);
+		await userEvent.type(urlinput, samlConfig.metadataUrl!);
 
 		expect(saveButton).not.toBeDisabled();
 		await userEvent.click(saveButton);
@@ -158,7 +174,7 @@ describe('SettingsSso View', () => {
 		const xmlInput = getByTestId('sso-provider-xml');
 
 		expect(xmlInput).toBeVisible();
-		await userEvent.type(xmlInput, samlConfig.metadata);
+		await userEvent.type(xmlInput, samlConfig.metadata!);
 
 		expect(saveButton).not.toBeDisabled();
 		await userEvent.click(saveButton);
@@ -201,3 +217,81 @@ describe('SettingsSso View', () => {
 		});
 	});
 });
+
+let pinia: ReturnType<typeof createPinia>;
+let ssoStore: ReturnType<typeof useSSOStore>;
+let settingsStore: ReturnType<typeof useSettingsStore>;
+let server: ReturnType<typeof setupServer>;
+
+const renderComponent = createComponentRenderer(SettingsSso);
+
+describe('SettingsSso', () => {
+	beforeAll(() => {
+		server = setupServer();
+	});
+
+	beforeEach(async () => {
+		window.open = vi.fn();
+
+		pinia = createPinia();
+		setActivePinia(pinia);
+
+		ssoStore = useSSOStore();
+		settingsStore = useSettingsStore();
+
+		await settingsStore.getSettings();
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	afterAll(() => {
+		server.shutdown();
+	});
+
+	it('should render paywall state when there is no license', () => {
+		const { getByTestId, queryByTestId, queryByRole } = renderComponent({
+			pinia,
+		});
+
+		expect(queryByRole('checkbox')).not.toBeInTheDocument();
+		expect(queryByTestId('sso-content-licensed')).not.toBeInTheDocument();
+		expect(getByTestId('sso-content-unlicensed')).toBeInTheDocument();
+	});
+
+	it('should render licensed content', async () => {
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
+		await nextTick();
+
+		const { getByTestId, queryByTestId, getByRole } = renderComponent({
+			pinia,
+		});
+
+		expect(getByRole('switch')).toBeInTheDocument();
+		expect(getByTestId('sso-content-licensed')).toBeInTheDocument();
+		expect(queryByTestId('sso-content-unlicensed')).not.toBeInTheDocument();
+	});
+
+	it('should enable activation checkbox and test button if data is already saved', async () => {
+		await ssoStore.getSamlConfig();
+		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
+		await nextTick();
+
+		const { container, getByTestId, getByRole } = renderComponent({
+			pinia,
+		});
+
+		const xmlRadioButton = getByTestId('radio-button-xml');
+		await userEvent.click(xmlRadioButton);
+
+		await retry(() =>
+			expect(container.querySelector('textarea[name="metadata"]')).toHaveValue(
+				'<?xml version="1.0"?>',
+			),
+		);
+
+		expect(getByRole('switch')).toBeEnabled();
+		expect(getByTestId('sso-test')).toBeEnabled();
+	});
+});
diff --git a/packages/editor-ui/src/views/SettingsSso.vue b/packages/editor-ui/src/views/SettingsSso.vue
index a9043c41ae..64107ccba4 100644
--- a/packages/editor-ui/src/views/SettingsSso.vue
+++ b/packages/editor-ui/src/views/SettingsSso.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import { computed, ref, onMounted } from 'vue';
 import { useSSOStore } from '@/stores/sso.store';
-import { useUIStore } from '@/stores/ui.store';
 import CopyInput from '@/components/CopyInput.vue';
 import { useI18n } from '@/composables/useI18n';
 import { useMessage } from '@/composables/useMessage';
@@ -9,6 +8,7 @@ import { useToast } from '@/composables/useToast';
 import { useTelemetry } from '@/composables/useTelemetry';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
 import { useRootStore } from '@/stores/root.store';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const IdentityProviderSettingsType = {
 	URL: 'url',
@@ -19,10 +19,10 @@ const i18n = useI18n();
 const telemetry = useTelemetry();
 const rootStore = useRootStore();
 const ssoStore = useSSOStore();
-const uiStore = useUIStore();
 const message = useMessage();
 const toast = useToast();
 const documentTitle = useDocumentTitle();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const ssoActivatedLabel = computed(() =>
 	ssoStore.isSamlLoginEnabled
@@ -133,7 +133,7 @@ const onTest = async () => {
 };
 
 const goToUpgrade = () => {
-	void uiStore.goToUpgrade('sso', 'upgrade-sso');
+	void pageRedirectionHelper.goToUpgrade('sso', 'upgrade-sso');
 };
 
 const isToggleSsoDisabled = computed(() => {
diff --git a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
index e3575c6c17..8a2bb7feab 100644
--- a/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
+++ b/packages/editor-ui/src/views/SettingsUsageAndPlan.vue
@@ -13,6 +13,7 @@ import N8nInfoTip from 'n8n-design-system/components/N8nInfoTip';
 import { COMMUNITY_PLUS_ENROLLMENT_MODAL } from '@/constants';
 import { useUsersStore } from '@/stores/users.store';
 import { getResourcePermissions } from '@/permissions';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const usageStore = useUsageStore();
 const route = useRoute();
@@ -21,6 +22,7 @@ const uiStore = useUIStore();
 const usersStore = useUsersStore();
 const toast = useToast();
 const documentTitle = useDocumentTitle();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const queryParamCallback = ref<string>(
 	`callback=${encodeURIComponent(`${window.location.origin}${window.location.pathname}`)}`,
@@ -129,7 +131,7 @@ const onAddActivationKey = () => {
 };
 
 const onViewPlans = () => {
-	void uiStore.goToUpgrade('usage_page', 'open');
+	void pageRedirectionHelper.goToUpgrade('usage_page', 'open');
 	sendUsageTelemetry('view_plans');
 };
 
diff --git a/packages/editor-ui/src/views/SettingsUsersView.test.ts b/packages/editor-ui/src/views/SettingsUsersView.test.ts
index 573395405e..e2ddac9c71 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.test.ts
+++ b/packages/editor-ui/src/views/SettingsUsersView.test.ts
@@ -12,6 +12,7 @@ import { merge } from 'lodash-es';
 import { useUIStore } from '@/stores/ui.store';
 import { useSSOStore } from '@/stores/sso.store';
 import { STORES } from '@/constants';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const loggedInUser = createUser();
 const invitedUser = createUser({
@@ -72,6 +73,15 @@ vi.mock('@/composables/useToast', () => ({
 	}),
 }));
 
+vi.mock('@/composables/usePageRedirectionHelper', () => {
+	const goToUpgrade = vi.fn();
+	return {
+		usePageRedirectionHelper: () => ({
+			goToUpgrade,
+		}),
+	};
+});
+
 describe('SettingsUsersView', () => {
 	afterEach(() => {
 		copy.mockReset();
@@ -105,14 +115,17 @@ describe('SettingsUsersView', () => {
 
 		it('allows the user to upgrade', async () => {
 			const { getByTestId } = renderView({ pinia });
-			const uiStore = useUIStore();
+			const pageRedirectionHelper = usePageRedirectionHelper();
 
 			const actionBox = getByTestId('action-box');
 			expect(actionBox).toBeInTheDocument();
 
 			await userEvent.click(await within(actionBox).findByText('View plans'));
 
-			expect(uiStore.goToUpgrade).toHaveBeenCalledWith('settings-users', 'upgrade-users');
+			expect(pageRedirectionHelper.goToUpgrade).toHaveBeenCalledWith(
+				'settings-users',
+				'upgrade-users',
+			);
 		});
 	});
 
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index e29bb3e755..54b2226289 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -13,6 +13,7 @@ import type { UpdateGlobalRolePayload } from '@/api/users';
 import { computed, onMounted } from 'vue';
 import { useI18n } from '@/composables/useI18n';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const clipboard = useClipboard();
 const { showToast, showError } = useToast();
@@ -22,6 +23,7 @@ const uiStore = useUIStore();
 const usersStore = useUsersStore();
 const ssoStore = useSSOStore();
 const documentTitle = useDocumentTitle();
+const pageRedirectionHelper = usePageRedirectionHelper();
 
 const i18n = useI18n();
 
@@ -209,10 +211,10 @@ async function onDisallowSSOManualLogin(userId: string) {
 	}
 }
 function goToUpgrade() {
-	void uiStore.goToUpgrade('settings-users', 'upgrade-users');
+	void pageRedirectionHelper.goToUpgrade('settings-users', 'upgrade-users');
 }
 function goToUpgradeAdvancedPermissions() {
-	void uiStore.goToUpgrade('settings-users', 'upgrade-advanced-permissions');
+	void pageRedirectionHelper.goToUpgrade('settings-users', 'upgrade-advanced-permissions');
 }
 async function onRoleChange(user: IUser, newRoleName: UpdateGlobalRolePayload['newRoleName']) {
 	try {
diff --git a/packages/editor-ui/src/views/SettingsView.test.ts b/packages/editor-ui/src/views/SettingsView.test.ts
new file mode 100644
index 0000000000..00178caffb
--- /dev/null
+++ b/packages/editor-ui/src/views/SettingsView.test.ts
@@ -0,0 +1,122 @@
+import { createTestingPinia } from '@pinia/testing';
+import { createRouter, createWebHistory } from 'vue-router';
+import userEvent from '@testing-library/user-event';
+import { createComponentRenderer } from '@/__tests__/render';
+import SettingsView from '@/views/SettingsView.vue';
+import { VIEWS } from '@/constants';
+import { routes as originalRoutes } from '@/router';
+
+const component = { template: '<div />' };
+const settingsRoute = originalRoutes.find((route) => route.name === VIEWS.SETTINGS);
+
+const settingsRouteChildren =
+	settingsRoute?.children?.map(({ name, path }) => ({
+		name,
+		path,
+		component,
+	})) ?? [];
+
+const router = createRouter({
+	history: createWebHistory(),
+	routes: [
+		{
+			path: '/',
+			redirect: '/home',
+		},
+		{
+			path: '/home',
+			name: 'Homepage',
+			redirect: '/home/workflows',
+			children: [
+				{
+					path: 'workflows',
+					name: 'Workflows',
+					component,
+				},
+				{
+					path: 'credentials',
+					name: 'Credentials',
+					component,
+				},
+				{
+					path: 'executions',
+					name: 'Executions',
+					component,
+				},
+			],
+		},
+		{
+			path: '/settings',
+			name: VIEWS.SETTINGS,
+			component: SettingsView,
+			props: true,
+			redirect: { name: VIEWS.PERSONAL_SETTINGS },
+			children: settingsRouteChildren,
+		},
+	],
+});
+
+const renderView = createComponentRenderer(SettingsView, {
+	pinia: createTestingPinia(),
+	global: {
+		plugins: [router],
+	},
+});
+
+const renderApp = createComponentRenderer(
+	{
+		template: '<router-view />',
+	},
+	{
+		pinia: createTestingPinia(),
+		global: {
+			plugins: [router],
+			stubs: {
+				SettingsSidebar: {
+					template: '<div><button data-test-id="back" @click="$emit(\'return\')"></button></div>',
+				},
+			},
+		},
+	},
+);
+
+describe('SettingsView', () => {
+	it('should render the view without throwing', () => {
+		expect(() => renderView()).not.toThrow();
+	});
+
+	test.each([
+		['/', ['/settings', '/settings/users'], '/home/workflows'],
+		['/home', ['/settings', '/settings/users'], '/home/workflows'],
+		['/home/workflows', ['/settings', '/settings/personal'], '/home/workflows'],
+		[
+			'/home/credentials',
+			['/settings', '/settings/personal', '/settings/api', '/settings/environments'],
+			'/home/credentials',
+		],
+		['/home/executions', ['/settings'], '/home/executions'],
+		['/settings', [], '/home/workflows'],
+		[
+			'/settings',
+			['/settings/personal', '/settings/api', '/settings/environments'],
+			'/home/workflows',
+		],
+		['/settings/personal', [], '/home/workflows'],
+		['/settings/usage', ['/settings/api', '/settings/environments'], '/home/workflows'],
+	])(
+		'should start from "%s" and visit %s routes and go back to "%s"',
+		async (startRoute, routes, expectedRoute) => {
+			const { getByTestId } = renderApp();
+
+			await router.push(startRoute);
+
+			for (const route of routes) {
+				await router.push(route);
+			}
+
+			await userEvent.click(getByTestId('back'));
+
+			expect(router.currentRoute.value.path).toBe(expectedRoute);
+		},
+	);
+});
diff --git a/packages/editor-ui/src/views/SettingsView.vue b/packages/editor-ui/src/views/SettingsView.vue
index 3813d2cd91..da3fe44431 100644
--- a/packages/editor-ui/src/views/SettingsView.vue
+++ b/packages/editor-ui/src/views/SettingsView.vue
@@ -11,9 +11,16 @@ const router = useRouter();
 const previousRoute = ref<HistoryState[string] | undefined>();
 
 function onReturn() {
-	void router.push(
-		isRouteLocationRaw(previousRoute.value) ? previousRoute.value : { name: VIEWS.HOMEPAGE },
-	);
+	const resolvedSettingsRoute = router.resolve({ name: VIEWS.SETTINGS });
+	const resolvedPreviousRoute = isRouteLocationRaw(previousRoute.value)
+		? router.resolve(previousRoute.value)
+		: null;
+	const backRoute =
+		!resolvedPreviousRoute || resolvedPreviousRoute.path.startsWith(resolvedSettingsRoute.path)
+			? { name: VIEWS.HOMEPAGE }
+			: resolvedPreviousRoute;
+
+	void router.push(backRoute);
 }
 
 onMounted(() => {
diff --git a/packages/editor-ui/src/views/SetupView.vue b/packages/editor-ui/src/views/SetupView.vue
index da0457e473..0b7f18a6be 100644
--- a/packages/editor-ui/src/views/SetupView.vue
+++ b/packages/editor-ui/src/views/SetupView.vue
@@ -5,17 +5,15 @@ import { useRouter } from 'vue-router';
 import { useToast } from '@/composables/useToast';
 import { useI18n } from '@/composables/useI18n';
 
-import { usePostHog } from '@/stores/posthog.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUIStore } from '@/stores/ui.store';
 import { useUsersStore } from '@/stores/users.store';
 
 import type { IFormBoxConfig } from '@/Interface';
-import { MORE_ONBOARDING_OPTIONS_EXPERIMENT, VIEWS } from '@/constants';
+import { VIEWS } from '@/constants';
 
 import AuthView from '@/views/AuthView.vue';
 
-const posthogStore = usePostHog();
 const settingsStore = useSettingsStore();
 const uiStore = useUIStore();
 const usersStore = useUsersStore();
@@ -85,9 +83,6 @@ const formConfig: IFormBoxConfig = reactive({
 const onSubmit = async (values: { [key: string]: string | boolean }) => {
 	try {
 		const forceRedirectedHere = settingsStore.showSetupPage;
-		const isPartOfOnboardingExperiment =
-			posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
-			MORE_ONBOARDING_OPTIONS_EXPERIMENT.variant;
 		loading.value = true;
 		await usersStore.createOwner(
 			values as { firstName: string; lastName: string; email: string; password: string },
@@ -98,13 +93,8 @@ const onSubmit = async (values: { [key: string]: string | boolean }) => {
 				await uiStore.submitContactEmail(values.email.toString(), values.agree);
 			} catch {}
 		}
-
 		if (forceRedirectedHere) {
-			if (isPartOfOnboardingExperiment) {
-				await router.push({ name: VIEWS.WORKFLOWS });
-			} else {
-				await router.push({ name: VIEWS.HOMEPAGE });
-			}
+			await router.push({ name: VIEWS.HOMEPAGE });
 		} else {
 			await router.push({ name: VIEWS.USERS_SETTINGS });
 		}
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
index be05e5b18e..b75373f93f 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.testData.ts
@@ -51,5 +51,6 @@ export const newCredential = (
 	updatedAt: faker.date.past().toISOString(),
 	id: faker.string.alphanumeric({ length: 16 }),
 	name: faker.commerce.productName(),
+	isManaged: false,
 	...opts,
 });
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.test.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.test.ts
similarity index 99%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.test.ts
rename to packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.test.ts
index 8a30bd8898..ed30289602 100644
--- a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/setupTemplate.store.test.ts
+++ b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/setupTemplate.store.test.ts
@@ -21,7 +21,7 @@ import {
 	nodeTypeTelegram,
 	nodeTypeTwitter,
 } from '@/utils/testData/nodeTypeTestData';
-import * as testData from './setupTemplate.store.testData';
+import * as testData from './__tests__/setupTemplate.store.testData';
 
 const mockCredentialsResponse = (id: string) =>
 	mock<ICredentialsResponse>({
diff --git a/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/useCredentialSetupState.test.ts b/packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/SetupWorkflowFromTemplateView/__tests__/useCredentialSetupState.test.ts
rename to packages/editor-ui/src/views/SetupWorkflowFromTemplateView/useCredentialSetupState.test.ts
diff --git a/packages/editor-ui/src/views/SigninView.test.ts b/packages/editor-ui/src/views/SigninView.test.ts
new file mode 100644
index 0000000000..71c578d595
--- /dev/null
+++ b/packages/editor-ui/src/views/SigninView.test.ts
@@ -0,0 +1,100 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { mockedStore } from '@/__tests__/utils';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { useRouter } from 'vue-router';
+import SigninView from '@/views/SigninView.vue';
+import { useUsersStore } from '@/stores/users.store';
+import { useSettingsStore } from '@/stores/settings.store';
+import { useTelemetry } from '@/composables/useTelemetry';
+
+vi.mock('vue-router', () => {
+	const push = vi.fn();
+	return {
+		useRouter: () => ({
+			push,
+		}),
+		useRoute: () => ({
+			query: {
+				redirect: '/home/workflows',
+			},
+		}),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+vi.mock('@/composables/useTelemetry', () => {
+	const track = vi.fn();
+	return {
+		useTelemetry: () => ({
+			track,
+		}),
+	};
+});
+
+const renderComponent = createComponentRenderer(SigninView);
+
+let usersStore: ReturnType<typeof mockedStore<typeof useUsersStore>>;
+let settingsStore: ReturnType<typeof mockedStore<typeof useSettingsStore>>;
+
+let router: ReturnType<typeof useRouter>;
+let telemetry: ReturnType<typeof useTelemetry>;
+
+describe('SigninView', () => {
+	beforeEach(() => {
+		createTestingPinia();
+		usersStore = mockedStore(useUsersStore);
+		settingsStore = mockedStore(useSettingsStore);
+
+		router = useRouter();
+		telemetry = useTelemetry();
+	});
+
+	it('should not throw error when opened', () => {
+		expect(() => renderComponent()).not.toThrow();
+	});
+
+	it('should show and submit email/password form (happy path)', async () => {
+		settingsStore.isCloudDeployment = false;
+		usersStore.loginWithCreds.mockResolvedValueOnce();
+
+		const { getByRole, queryByTestId, container } = renderComponent();
+		const emailInput = container.querySelector('input[type="email"]');
+		const passwordInput = container.querySelector('input[type="password"]');
+		const submitButton = getByRole('button', { name: 'Sign in' });
+
+		if (!emailInput || !passwordInput) {
+			throw new Error('Inputs not found');
+		}
+
+		expect(queryByTestId('mfa-login-form')).not.toBeInTheDocument();
+
+		expect(emailInput).toBeVisible();
+		expect(passwordInput).toBeVisible();
+
+		// TODO: Remove manual tabbing when the following issue is fixed (it should fail the test anyway)
+		// https://github.com/testing-library/vue-testing-library/issues/317
+		await userEvent.tab();
+		expect(document.activeElement).toBe(emailInput);
+
+		await userEvent.type(emailInput, 'test@n8n.io');
+		await userEvent.type(passwordInput, 'password');
+
+		await userEvent.click(submitButton);
+
+		expect(usersStore.loginWithCreds).toHaveBeenCalledWith({
+			email: 'test@n8n.io',
+			password: 'password',
+			mfaCode: undefined,
+			mfaRecoveryCode: undefined,
+		});
+
+		expect(telemetry.track).toHaveBeenCalledWith('User attempted to login', {
+			result: 'success',
+		});
+
+		expect(router.push).toHaveBeenCalledWith('/home/workflows');
+	});
+});
diff --git a/packages/editor-ui/src/views/SigninView.vue b/packages/editor-ui/src/views/SigninView.vue
index fa258c5d7a..0257870c7d 100644
--- a/packages/editor-ui/src/views/SigninView.vue
+++ b/packages/editor-ui/src/views/SigninView.vue
@@ -60,6 +60,7 @@ const formConfig: IFormBoxConfig = reactive({
 				validateOnBlur: false,
 				autocomplete: 'email',
 				capitalize: true,
+				focusInitially: true,
 			},
 		},
 		{
@@ -77,12 +78,12 @@ const formConfig: IFormBoxConfig = reactive({
 	],
 });
 
-const onMFASubmitted = async (form: { token?: string; recoveryCode?: string }) => {
+const onMFASubmitted = async (form: { mfaCode?: string; mfaRecoveryCode?: string }) => {
 	await login({
 		email: email.value,
 		password: password.value,
-		token: form.token,
-		recoveryCode: form.recoveryCode,
+		mfaCode: form.mfaCode,
+		mfaRecoveryCode: form.mfaRecoveryCode,
 	});
 };
 
@@ -113,16 +114,16 @@ const getRedirectQueryParameter = () => {
 const login = async (form: {
 	email: string;
 	password: string;
-	token?: string;
-	recoveryCode?: string;
+	mfaCode?: string;
+	mfaRecoveryCode?: string;
 }) => {
 	try {
 		loading.value = true;
 		await usersStore.loginWithCreds({
 			email: form.email,
 			password: form.password,
-			mfaToken: form.token,
-			mfaRecoveryCode: form.recoveryCode,
+			mfaCode: form.mfaCode,
+			mfaRecoveryCode: form.mfaRecoveryCode,
 		});
 		loading.value = false;
 		if (settingsStore.isCloudDeployment) {
diff --git a/packages/editor-ui/src/views/SignupView.test.ts b/packages/editor-ui/src/views/SignupView.test.ts
new file mode 100644
index 0000000000..e9eb69478f
--- /dev/null
+++ b/packages/editor-ui/src/views/SignupView.test.ts
@@ -0,0 +1,149 @@
+import { useRoute, useRouter } from 'vue-router';
+import { createComponentRenderer } from '@/__tests__/render';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { useToast } from '@/composables/useToast';
+import SignupView from '@/views/SignupView.vue';
+import { VIEWS } from '@/constants';
+import { useUsersStore } from '@/stores/users.store';
+import { mockedStore } from '@/__tests__/utils';
+
+vi.mock('vue-router', () => {
+	const push = vi.fn();
+	const replace = vi.fn();
+	const query = {};
+	return {
+		useRouter: () => ({
+			push,
+			replace,
+		}),
+		useRoute: () => ({
+			query,
+		}),
+		RouterLink: {
+			template: '<a><slot /></a>',
+		},
+	};
+});
+
+vi.mock('@/composables/useToast', () => {
+	const showError = vi.fn();
+	return {
+		useToast: () => ({
+			showError,
+		}),
+	};
+});
+
+const renderComponent = createComponentRenderer(SignupView);
+
+let route: ReturnType<typeof useRoute>;
+let router: ReturnType<typeof useRouter>;
+let toast: ReturnType<typeof useToast>;
+let usersStore: ReturnType<typeof mockedStore<typeof useUsersStore>>;
+
+describe('SignupView', () => {
+	beforeEach(() => {
+		vi.clearAllMocks();
+
+		createTestingPinia();
+
+		route = useRoute();
+		router = useRouter();
+		toast = useToast();
+
+		usersStore = mockedStore(useUsersStore);
+	});
+
+	it('should not throw error when opened', async () => {
+		expect(() => renderComponent()).not.toThrow();
+	});
+
+	it('should redirect to Signin when no inviterId and inviteeId', async () => {
+		renderComponent();
+
+		expect(toast.showError).toHaveBeenCalledWith(expect.any(Error), expect.any(String));
+		expect(router.replace).toHaveBeenCalledWith({ name: VIEWS.SIGNIN });
+	});
+
+	it('should validate signup token if there is any', async () => {
+		route.query.inviterId = '123';
+		route.query.inviteeId = '456';
+
+		renderComponent();
+
+		expect(usersStore.validateSignupToken).toHaveBeenCalledWith({
+			inviterId: '123',
+			inviteeId: '456',
+		});
+	});
+
+	it('should not accept invitation when missing tokens', async () => {
+		const { getByRole } = renderComponent();
+
+		const acceptButton = getByRole('button', { name: 'Finish account setup' });
+
+		await userEvent.click(acceptButton);
+
+		expect(toast.showError).toHaveBeenCalledWith(expect.any(Error), expect.any(String));
+		expect(usersStore.acceptInvitation).not.toHaveBeenCalled();
+	});
+
+	it('should not accept invitation when form is unfilled', async () => {
+		route.query.inviterId = '123';
+		route.query.inviteeId = '456';
+
+		const { getByRole } = renderComponent();
+
+		const acceptButton = getByRole('button', { name: 'Finish account setup' });
+
+		await userEvent.click(acceptButton);
+
+		expect(toast.showError).toHaveBeenCalledWith(expect.any(Error), expect.any(String));
+		expect(usersStore.acceptInvitation).not.toHaveBeenCalled();
+	});
+
+	it('should accept invitation with tokens', async () => {
+		route.query.inviterId = '123';
+		route.query.inviteeId = '456';
+
+		usersStore.validateSignupToken.mockResolvedValueOnce({
+			inviter: {
+				firstName: 'John',
+				lastName: 'Doe',
+			},
+		});
+
+		const { getByRole, container } = renderComponent();
+
+		const acceptButton = getByRole('button', { name: 'Finish account setup' });
+
+		const firstNameInput = container.querySelector('input[name="firstName"]');
+		const lastNameInput = container.querySelector('input[name="lastName"]');
+		const passwordInput = container.querySelector('input[type="password"]');
+
+		if (!firstNameInput || !lastNameInput || !passwordInput) {
+			throw new Error('Inputs not found');
+		}
+
+		// TODO: Remove manual tabbing when the following issue is fixed (it should fail the test anyway)
+		// https://github.com/testing-library/vue-testing-library/issues/317
+		await userEvent.tab();
+		expect(document.activeElement).toBe(firstNameInput);
+
+		await userEvent.type(firstNameInput, 'Jane');
+		await userEvent.type(lastNameInput, 'Doe');
+		await userEvent.type(passwordInput, '324R435gfg5fgj!');
+
+		await userEvent.click(acceptButton);
+
+		expect(toast.showError).not.toHaveBeenCalled();
+		expect(usersStore.acceptInvitation).toHaveBeenCalledWith({
+			inviterId: '123',
+			inviteeId: '456',
+			firstName: 'Jane',
+			lastName: 'Doe',
+			password: '324R435gfg5fgj!',
+		});
+	});
+});
diff --git a/packages/editor-ui/src/views/SignupView.vue b/packages/editor-ui/src/views/SignupView.vue
index 3395616207..a68ba0a433 100644
--- a/packages/editor-ui/src/views/SignupView.vue
+++ b/packages/editor-ui/src/views/SignupView.vue
@@ -30,6 +30,7 @@ const FORM_CONFIG: IFormBoxConfig = {
 				required: true,
 				autocomplete: 'given-name',
 				capitalize: true,
+				focusInitially: true,
 			},
 		},
 		{
diff --git a/packages/editor-ui/src/views/TemplatesCollectionView.vue b/packages/editor-ui/src/views/TemplatesCollectionView.vue
index 5432a8ed54..647c7e6eee 100644
--- a/packages/editor-ui/src/views/TemplatesCollectionView.vue
+++ b/packages/editor-ui/src/views/TemplatesCollectionView.vue
@@ -35,14 +35,14 @@ const collectionId = computed(() => {
 	return Array.isArray(id) ? id[0] : id;
 });
 
-const collection = computed(() => templatesStore.getCollectionById(collectionId.value));
+const collection = computed(() => templatesStore.getCollectionById[collectionId.value]);
 
 const collectionWorkflows = computed(() => {
 	if (!collection.value || loading.value) {
 		return [];
 	}
 	return collection.value.workflows
-		.map(({ id }) => templatesStore.getTemplateById(id.toString()))
+		.map(({ id }) => templatesStore.getTemplatesById(id.toString()))
 		.filter((workflow): workflow is ITemplatesWorkflow => !!workflow);
 });
 
@@ -58,15 +58,15 @@ const scrollToTop = () => {
 	}, 50);
 };
 
-const onOpenTemplate = ({ event, id }: { event: MouseEvent; id: string }) => {
-	navigateTo(event, VIEWS.TEMPLATE, id);
+const onOpenTemplate = ({ event, id }: { event: MouseEvent; id: number }) => {
+	navigateTo(event, VIEWS.TEMPLATE, `${id}`);
 };
 
-const onUseWorkflow = async ({ event, id }: { event: MouseEvent; id: string }) => {
+const onUseWorkflow = async ({ event, id }: { event: MouseEvent; id: number }) => {
 	await useTemplateWorkflow({
 		posthogStore,
 		router,
-		templateId: id,
+		templateId: `${id}`,
 		inNewBrowserTab: event.metaKey || event.ctrlKey,
 		templatesStore,
 		externalHooks,
diff --git a/packages/editor-ui/src/views/TemplatesSearchView.vue b/packages/editor-ui/src/views/TemplatesSearchView.vue
index abb30a3586..5f0cd8fd05 100644
--- a/packages/editor-ui/src/views/TemplatesSearchView.vue
+++ b/packages/editor-ui/src/views/TemplatesSearchView.vue
@@ -1,27 +1,22 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { mapStores } from 'pinia';
+<script setup lang="ts">
+import { computed, onMounted, ref, watch } from 'vue';
 import TemplatesInfoCarousel from '@/components/TemplatesInfoCarousel.vue';
 import TemplateFilters from '@/components/TemplateFilters.vue';
 import TemplateList from '@/components/TemplateList.vue';
 import TemplatesView from '@/views/TemplatesView.vue';
 
-import type {
-	ITemplatesCollection,
-	ITemplatesWorkflow,
-	ITemplatesQuery,
-	ITemplatesCategory,
-} from '@/Interface';
+import type { ITemplatesCategory } from '@/Interface';
 import type { IDataObject } from 'n8n-workflow';
 import { CREATOR_HUB_URL, VIEWS } from '@/constants';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
 import { useTemplatesStore } from '@/stores/templates.store';
-import { useUIStore } from '@/stores/ui.store';
 import { useToast } from '@/composables/useToast';
-import { usePostHog } from '@/stores/posthog.store';
 import { useDebounce } from '@/composables/useDebounce';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
+import { useI18n } from '@/composables/useI18n';
+import { useRoute, onBeforeRouteLeave, useRouter } from 'vue-router';
+import { useTelemetry } from '@/composables/useTelemetry';
 
 interface ISearchEvent {
 	search_string: string;
@@ -31,309 +26,305 @@ interface ISearchEvent {
 	wf_template_repo_session_id: string;
 }
 
-export default defineComponent({
-	name: 'TemplatesSearchView',
-	components: {
-		TemplatesInfoCarousel,
-		TemplateFilters,
-		TemplateList,
-		TemplatesView,
-	},
-	beforeRouteLeave(_to, _from, next) {
+const areCategoriesPrepopulated = ref(false);
+const categories = ref<ITemplatesCategory[]>([]);
+const loadingCategories = ref(true);
+const loadingCollections = ref(true);
+const loadingWorkflows = ref(true);
+const search = ref('');
+const searchEventToTrack = ref<ISearchEvent | null>(null);
+const errorLoadingWorkflows = ref(false);
+
+const { callDebounced } = useDebounce();
+const toast = useToast();
+const documentTitle = useDocumentTitle();
+
+const settingsStore = useSettingsStore();
+const templatesStore = useTemplatesStore();
+const usersStore = useUsersStore();
+const i18n = useI18n();
+const route = useRoute();
+const router = useRouter();
+const telemetry = useTelemetry();
+
+const createQueryObject = (categoryId: 'name' | 'id') => {
+	// We are using category names for template search and ids for collection search
+	return {
+		categories: categories.value.map((category) =>
+			categoryId === 'name' ? category.name : String(category.id),
+		),
+		search: search.value,
+	};
+};
+
+const totalWorkflows = computed(() =>
+	templatesStore.getSearchedWorkflowsTotal(createQueryObject('name')),
+);
+
+const workflows = computed(
+	() => templatesStore.getSearchedWorkflows(createQueryObject('name')) ?? [],
+);
+
+const collections = computed(
+	() => templatesStore.getSearchedCollections(createQueryObject('id')) ?? [],
+);
+
+const endOfSearchMessage = computed(() => {
+	if (loadingWorkflows.value) {
+		return null;
+	}
+	if (!loadingCollections.value && workflows.value.length === 0 && collections.value.length === 0) {
+		if (!settingsStore.isTemplatesEndpointReachable && errorLoadingWorkflows.value) {
+			return i18n.baseText('templates.connectionWarning');
+		}
+		return i18n.baseText('templates.noSearchResults');
+	}
+
+	return null;
+});
+
+const updateQueryParam = (search: string, category: string) => {
+	const query = Object.assign({}, route.query);
+
+	if (category.length) {
+		query.categories = category;
+	} else {
+		delete query.categories;
+	}
+
+	if (search.length) {
+		query.search = search;
+	} else {
+		delete query.search;
+	}
+
+	void router.replace({ query });
+};
+
+const updateSearch = () => {
+	updateQueryParam(search.value, categories.value.map((category) => category.id).join(','));
+	void loadWorkflowsAndCollections(false);
+};
+
+const loadWorkflows = async () => {
+	try {
+		loadingWorkflows.value = true;
+		await templatesStore.getWorkflows({
+			search: search.value,
+			categories: categories.value.map((category) => category.name),
+		});
+		errorLoadingWorkflows.value = false;
+	} catch (e) {
+		errorLoadingWorkflows.value = true;
+	}
+
+	loadingWorkflows.value = false;
+};
+
+const loadCollections = async () => {
+	try {
+		loadingCollections.value = true;
+		await templatesStore.getCollections({
+			categories: categories.value.map((category) => String(category.id)),
+			search: search.value,
+		});
+	} catch (e) {}
+
+	loadingCollections.value = false;
+};
+
+const updateSearchTracking = (search: string, categories: number[]) => {
+	if (!search) {
+		return;
+	}
+	if (searchEventToTrack.value && searchEventToTrack.value.search_string.length > search.length) {
+		return;
+	}
+
+	searchEventToTrack.value = {
+		search_string: search,
+		workflow_results_count: workflows.value.length,
+		collection_results_count: collections.value.length,
+		categories_applied: categories.map((categoryId) =>
+			templatesStore.getCategoryById(categoryId.toString()),
+		) as ITemplatesCategory[],
+		wf_template_repo_session_id: templatesStore.currentSessionId,
+	};
+};
+
+const trackCategories = () => {
+	if (categories.value.length) {
+		telemetry.track('User changed template filters', {
+			search_string: search.value,
+			categories_applied: categories.value,
+			wf_template_repo_session_id: templatesStore.currentSessionId,
+		});
+	}
+};
+
+const loadWorkflowsAndCollections = async (initialLoad: boolean) => {
+	const _categories = [...categories.value];
+	const _search = search.value;
+	await Promise.all([loadWorkflows(), loadCollections()]);
+	if (!initialLoad) {
+		updateSearchTracking(
+			_search,
+			_categories.map((category) => category.id),
+		);
+	}
+};
+
+const navigateTo = (e: MouseEvent, page: string, id: number) => {
+	if (e.metaKey || e.ctrlKey) {
+		const route = router.resolve({ name: page, params: { id } });
+		window.open(route.href, '_blank');
+		return;
+	} else {
+		void router.push({ name: page, params: { id } });
+	}
+};
+
+const onOpenCollection = ({ event, id }: { event: MouseEvent; id: number }) => {
+	navigateTo(event, VIEWS.COLLECTION, id);
+};
+
+const onOpenTemplate = ({ event, id }: { event: MouseEvent; id: number }) => {
+	navigateTo(event, VIEWS.TEMPLATE, id);
+};
+
+const trackSearch = () => {
+	if (searchEventToTrack.value) {
+		telemetry.track(
+			'User searched workflow templates',
+			searchEventToTrack.value as unknown as IDataObject,
+		);
+		searchEventToTrack.value = null;
+	}
+};
+
+const onSearchInput = (searchText: string) => {
+	loadingWorkflows.value = true;
+	loadingCollections.value = true;
+	search.value = searchText;
+	void callDebounced(updateSearch, {
+		debounceTime: 500,
+		trailing: true,
+	});
+
+	if (searchText.length === 0) {
+		trackSearch();
+	}
+};
+
+const onCategorySelected = (selected: ITemplatesCategory) => {
+	categories.value = categories.value.concat(selected);
+	updateSearch();
+	trackCategories();
+};
+
+const onCategoryUnselected = (selected: ITemplatesCategory) => {
+	categories.value = categories.value.filter((category) => category.id !== selected.id);
+	updateSearch();
+	trackCategories();
+};
+
+const onCategoriesCleared = () => {
+	categories.value = [];
+	updateSearch();
+};
+
+const onLoadMore = async () => {
+	if (workflows.value.length >= totalWorkflows.value) {
+		return;
+	}
+	try {
+		loadingWorkflows.value = true;
+		await templatesStore.getMoreWorkflows({
+			categories: categories.value.map((category) => category.name),
+			search: search.value,
+		});
+	} catch (e) {
+		toast.showMessage({
+			title: 'Error',
+			message: 'Could not load more workflows',
+			type: 'error',
+		});
+	} finally {
+		loadingWorkflows.value = false;
+	}
+};
+
+const loadCategories = async () => {
+	try {
+		await templatesStore.getCategories();
+	} catch (e) {}
+	loadingCategories.value = false;
+};
+
+const scrollTo = (position: number, behavior: ScrollBehavior = 'smooth') => {
+	setTimeout(() => {
 		const contentArea = document.getElementById('content');
 		if (contentArea) {
-			// When leaving this page, store current scroll position in route data
-			this.$route.meta?.setScrollPosition?.(contentArea.scrollTop);
-		}
-
-		this.trackSearch();
-		next();
-	},
-	setup() {
-		const { callDebounced } = useDebounce();
-
-		return {
-			callDebounced,
-			...useToast(),
-			documentTitle: useDocumentTitle(),
-		};
-	},
-	data() {
-		return {
-			areCategoriesPrepopulated: false,
-			categories: [] as ITemplatesCategory[],
-			loading: true,
-			loadingCategories: true,
-			loadingCollections: true,
-			loadingWorkflows: true,
-			search: '',
-			searchEventToTrack: null as null | ISearchEvent,
-			errorLoadingWorkflows: false,
-			creatorHubUrl: CREATOR_HUB_URL as string,
-		};
-	},
-	computed: {
-		...mapStores(useSettingsStore, useTemplatesStore, useUIStore, useUsersStore, usePostHog),
-		totalWorkflows(): number {
-			return this.templatesStore.getSearchedWorkflowsTotal(this.createQueryObject('name'));
-		},
-		workflows(): ITemplatesWorkflow[] {
-			return this.templatesStore.getSearchedWorkflows(this.createQueryObject('name')) ?? [];
-		},
-		collections(): ITemplatesCollection[] {
-			return this.templatesStore.getSearchedCollections(this.createQueryObject('id')) ?? [];
-		},
-		endOfSearchMessage(): string | null {
-			if (this.loadingWorkflows) {
-				return null;
-			}
-			if (
-				!this.loadingCollections &&
-				this.workflows.length === 0 &&
-				this.collections.length === 0
-			) {
-				if (!this.settingsStore.isTemplatesEndpointReachable && this.errorLoadingWorkflows) {
-					return this.$locale.baseText('templates.connectionWarning');
-				}
-				return this.$locale.baseText('templates.noSearchResults');
-			}
-
-			return null;
-		},
-		nothingFound(): boolean {
-			return (
-				!this.loadingWorkflows &&
-				!this.loadingCollections &&
-				this.workflows.length === 0 &&
-				this.collections.length === 0
-			);
-		},
-	},
-	watch: {
-		workflows(newWorkflows) {
-			if (newWorkflows.length === 0) {
-				this.scrollTo(0);
-			}
-		},
-	},
-	async mounted() {
-		this.documentTitle.set('Templates');
-		await this.loadCategories();
-		void this.loadWorkflowsAndCollections(true);
-		void this.usersStore.showPersonalizationSurvey();
-
-		this.restoreSearchFromRoute();
-
-		setTimeout(() => {
-			// Check if there is scroll position saved in route and scroll to it
-			const scrollOffset = this.$route.meta?.scrollOffset;
-			if (typeof scrollOffset === 'number' && scrollOffset > 0) {
-				this.scrollTo(scrollOffset, 'auto');
-			}
-		}, 100);
-	},
-	methods: {
-		createQueryObject(categoryId: 'name' | 'id'): ITemplatesQuery {
-			// We are using category names for template search and ids for collection search
-			return {
-				categories: this.categories.map((category) =>
-					categoryId === 'name' ? category.name : String(category.id),
-				),
-				search: this.search,
-			};
-		},
-		restoreSearchFromRoute() {
-			let updateSearch = false;
-			if (this.$route.query.search && typeof this.$route.query.search === 'string') {
-				this.search = this.$route.query.search;
-				updateSearch = true;
-			}
-			if (typeof this.$route.query.categories === 'string' && this.$route.query.categories.length) {
-				const categoriesFromURL = this.$route.query.categories.split(',');
-				this.categories = this.templatesStore.allCategories.filter((category) =>
-					categoriesFromURL.includes(category.id.toString()),
-				);
-				updateSearch = true;
-			}
-			if (updateSearch) {
-				this.updateSearch();
-				this.trackCategories();
-				this.areCategoriesPrepopulated = true;
-			}
-		},
-		onOpenCollection({ event, id }: { event: MouseEvent; id: number }) {
-			this.navigateTo(event, VIEWS.COLLECTION, id);
-		},
-		onOpenTemplate({ event, id }: { event: MouseEvent; id: number }) {
-			this.navigateTo(event, VIEWS.TEMPLATE, id);
-		},
-		navigateTo(e: MouseEvent, page: string, id: number) {
-			if (e.metaKey || e.ctrlKey) {
-				const route = this.$router.resolve({ name: page, params: { id } });
-				window.open(route.href, '_blank');
-				return;
-			} else {
-				void this.$router.push({ name: page, params: { id } });
-			}
-		},
-		updateSearch() {
-			this.updateQueryParam(this.search, this.categories.map((category) => category.id).join(','));
-			void this.loadWorkflowsAndCollections(false);
-		},
-		updateSearchTracking(search: string, categories: number[]) {
-			if (!search) {
-				return;
-			}
-			if (this.searchEventToTrack && this.searchEventToTrack.search_string.length > search.length) {
-				return;
-			}
-
-			this.searchEventToTrack = {
-				search_string: search,
-				workflow_results_count: this.workflows.length,
-				collection_results_count: this.collections.length,
-				categories_applied: categories.map((categoryId) =>
-					this.templatesStore.getCategoryById(categoryId.toString()),
-				) as ITemplatesCategory[],
-				wf_template_repo_session_id: this.templatesStore.currentSessionId,
-			};
-		},
-		trackSearch() {
-			if (this.searchEventToTrack) {
-				this.$telemetry.track(
-					'User searched workflow templates',
-					this.searchEventToTrack as unknown as IDataObject,
-				);
-				this.searchEventToTrack = null;
-			}
-		},
-		onSearchInput(search: string) {
-			this.loadingWorkflows = true;
-			this.loadingCollections = true;
-			this.search = search;
-			void this.callDebounced(this.updateSearch, {
-				debounceTime: 500,
-				trailing: true,
+			contentArea.scrollTo({
+				top: position,
+				behavior,
 			});
+		}
+	}, 0);
+};
 
-			if (search.length === 0) {
-				this.trackSearch();
-			}
-		},
-		onCategorySelected(selected: ITemplatesCategory) {
-			this.categories = this.categories.concat(selected);
-			this.updateSearch();
-			this.trackCategories();
-		},
-		onCategoryUnselected(selected: ITemplatesCategory) {
-			this.categories = this.categories.filter((category) => category.id !== selected.id);
-			this.updateSearch();
-			this.trackCategories();
-		},
-		onCategoriesCleared() {
-			this.categories = [];
-			this.updateSearch();
-		},
-		trackCategories() {
-			if (this.categories.length) {
-				this.$telemetry.track('User changed template filters', {
-					search_string: this.search,
-					categories_applied: this.categories,
-					wf_template_repo_session_id: this.templatesStore.currentSessionId,
-				});
-			}
-		},
-		updateQueryParam(search: string, category: string) {
-			const query = Object.assign({}, this.$route.query);
+const restoreSearchFromRoute = () => {
+	let shouldUpdateSearch = false;
+	if (route.query.search && typeof route.query.search === 'string') {
+		search.value = route.query.search;
+		shouldUpdateSearch = true;
+	}
+	if (typeof route.query.categories === 'string' && route.query.categories.length) {
+		const categoriesFromURL = route.query.categories.split(',');
+		categories.value = templatesStore.allCategories.filter((category) =>
+			categoriesFromURL.includes(category.id.toString()),
+		);
+		shouldUpdateSearch = true;
+	}
+	if (shouldUpdateSearch) {
+		updateSearch();
+		trackCategories();
+		areCategoriesPrepopulated.value = true;
+	}
+};
 
-			if (category.length) {
-				query.categories = category;
-			} else {
-				delete query.categories;
-			}
+onMounted(async () => {
+	documentTitle.set('Templates');
+	await loadCategories();
+	void loadWorkflowsAndCollections(true);
+	void usersStore.showPersonalizationSurvey();
 
-			if (search.length) {
-				query.search = search;
-			} else {
-				delete query.search;
-			}
+	restoreSearchFromRoute();
 
-			void this.$router.replace({ query });
-		},
-		async onLoadMore() {
-			if (this.workflows.length >= this.totalWorkflows) {
-				return;
-			}
-			try {
-				this.loadingWorkflows = true;
-				await this.templatesStore.getMoreWorkflows({
-					categories: this.categories.map((category) => category.name),
-					search: this.search,
-				});
-			} catch (e) {
-				this.showMessage({
-					title: 'Error',
-					message: 'Could not load more workflows',
-					type: 'error',
-				});
-			} finally {
-				this.loadingWorkflows = false;
-			}
-		},
-		async loadCategories() {
-			try {
-				await this.templatesStore.getCategories();
-			} catch (e) {}
-			this.loadingCategories = false;
-		},
-		async loadCollections() {
-			try {
-				this.loadingCollections = true;
-				await this.templatesStore.getCollections({
-					categories: this.categories.map((category) => String(category.id)),
-					search: this.search,
-				});
-			} catch (e) {}
+	setTimeout(() => {
+		// Check if there is scroll position saved in route and scroll to it
+		const scrollOffset = route.meta?.scrollOffset;
+		if (typeof scrollOffset === 'number' && scrollOffset > 0) {
+			scrollTo(scrollOffset, 'auto');
+		}
+	}, 100);
+});
 
-			this.loadingCollections = false;
-		},
-		async loadWorkflows() {
-			try {
-				this.loadingWorkflows = true;
-				await this.templatesStore.getWorkflows({
-					search: this.search,
-					categories: this.categories.map((category) => category.name),
-				});
-				this.errorLoadingWorkflows = false;
-			} catch (e) {
-				this.errorLoadingWorkflows = true;
-			}
+onBeforeRouteLeave((_to, _from, next) => {
+	const contentArea = document.getElementById('content');
+	if (contentArea) {
+		// When leaving this page, store current scroll position in route data
+		route.meta?.setScrollPosition?.(contentArea.scrollTop);
+	}
 
-			this.loadingWorkflows = false;
-		},
-		async loadWorkflowsAndCollections(initialLoad: boolean) {
-			const search = this.search;
-			const categories = [...this.categories];
-			await Promise.all([this.loadWorkflows(), this.loadCollections()]);
-			if (!initialLoad) {
-				this.updateSearchTracking(
-					search,
-					categories.map((category) => category.id),
-				);
-			}
-		},
-		scrollTo(position: number, behavior: ScrollBehavior = 'smooth') {
-			setTimeout(() => {
-				const contentArea = document.getElementById('content');
-				if (contentArea) {
-					contentArea.scrollTo({
-						top: position,
-						behavior,
-					});
-				}
-			}, 0);
-		},
-	},
+	trackSearch();
+	next();
+});
+
+watch(workflows, (newWorkflows) => {
+	if (newWorkflows.length === 0) {
+		window.scrollTo(0, 0);
+	}
 });
 </script>
 
@@ -343,7 +334,7 @@ export default defineComponent({
 			<div :class="$style.wrapper">
 				<div :class="$style.title">
 					<n8n-heading tag="h1" size="2xlarge">
-						{{ $locale.baseText('templates.heading') }}
+						{{ i18n.baseText('templates.heading') }}
 					</n8n-heading>
 				</div>
 				<div :class="$style.button">
@@ -351,8 +342,8 @@ export default defineComponent({
 						size="large"
 						type="secondary"
 						element="a"
-						:href="creatorHubUrl"
-						:label="$locale.baseText('templates.shareWorkflow')"
+						:href="CREATOR_HUB_URL"
+						:label="i18n.baseText('templates.shareWorkflow')"
 						target="_blank"
 					/>
 				</div>
@@ -374,7 +365,7 @@ export default defineComponent({
 				<div :class="$style.search">
 					<n8n-input
 						:model-value="search"
-						:placeholder="$locale.baseText('templates.searchPlaceholder')"
+						:placeholder="i18n.baseText('templates.searchPlaceholder')"
 						clearable
 						data-test-id="template-search-input"
 						@update:model-value="onSearchInput"
@@ -387,7 +378,7 @@ export default defineComponent({
 					<div v-show="collections.length || loadingCollections" :class="$style.carouselContainer">
 						<div :class="$style.header">
 							<n8n-heading :bold="true" size="medium" color="text-light">
-								{{ $locale.baseText('templates.collections') }}
+								{{ i18n.baseText('templates.collections') }}
 								<span
 									v-if="!loadingCollections"
 									data-test-id="collection-count-label"
diff --git a/packages/editor-ui/src/views/TemplatesView.vue b/packages/editor-ui/src/views/TemplatesView.vue
index 6ace293911..5f570eab92 100644
--- a/packages/editor-ui/src/views/TemplatesView.vue
+++ b/packages/editor-ui/src/views/TemplatesView.vue
@@ -1,18 +1,12 @@
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
 import GoBackButton from '@/components/GoBackButton.vue';
 
-export default defineComponent({
-	name: 'TemplatesView',
-	components: {
-		GoBackButton,
-	},
-	props: {
-		goBackEnabled: {
-			type: Boolean,
-			default: false,
-		},
-	},
+interface Props {
+	goBackEnabled?: boolean;
+}
+
+withDefaults(defineProps<Props>(), {
+	goBackEnabled: false,
 });
 </script>
 
@@ -36,7 +30,7 @@ export default defineComponent({
 .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..fd3b9d5d97
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionEditView.vue
@@ -0,0 +1,495 @@
+<script setup lang="ts">
+import { computed, onMounted, watch, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { NODE_PINNING_MODAL_KEY, 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';
+import type { TestMetricRecord, TestRunRecord } from '@/api/testDefinition.ee';
+import Modal from '@/components/Modal.vue';
+import type { ModalState } from '@/Interface';
+import { useUIStore } from '@/stores/ui.store';
+import TestRunsTable from '@/components/TestDefinition/ListRuns/TestRunsTable.vue';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+
+const props = defineProps<{
+	testId?: string;
+}>();
+
+const router = useRouter();
+const route = useRoute();
+const locale = useI18n();
+const { debounce } = useDebounce();
+const toast = useToast();
+const testDefinitionStore = useTestDefinitionStore();
+const tagsStore = useAnnotationTagsStore();
+const uiStore = useUIStore();
+const {
+	state,
+	fieldsIssues,
+	isSaving,
+	cancelEditing,
+	loadTestData,
+	createTest,
+	updateTest,
+	startEditing,
+	saveChanges,
+	handleKeydown,
+	deleteMetric,
+	updateMetrics,
+} = useTestDefinitionForm();
+
+const isLoading = computed(() => tagsStore.isLoading);
+const allTags = computed(() => tagsStore.allTags);
+const tagsById = computed(() => tagsStore.tagsById);
+const testId = computed(() => props.testId ?? (route.params.testId as string));
+const currentWorkflowId = computed(() => route.params.name as string);
+const appliedTheme = computed(() => uiStore.appliedTheme);
+const tagUsageCount = computed(
+	() => tagsStore.tagsById[state.value.tags.value[0]]?.usageCount ?? 0,
+);
+const hasRuns = computed(() => runs.value.length > 0);
+const nodePinningModal = ref<ModalState | null>(null);
+const modalContentWidth = ref(0);
+const showConfig = ref(true);
+const selectedMetric = ref<string>('');
+
+onMounted(async () => {
+	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 },
+		});
+		return; // Add early return to prevent loading if feature is disabled
+	}
+	void tagsStore.fetchAll({ withUsageCount: true });
+	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.NEW_TEST_DEFINITION) {
+			await router.replace({
+				name: VIEWS.TEST_DEFINITION_EDIT,
+				params: { testId: savedTest.id },
+			});
+		}
+	} catch (e: unknown) {
+		toast.showError(e, locale.baseText('testDefinition.edit.testSaveFailed'));
+	}
+}
+
+function hasIssues(key: string) {
+	return fieldsIssues.value.some((issue) => issue.field === key);
+}
+
+async function onDeleteMetric(deletedMetric: Partial<TestMetricRecord>) {
+	if (deletedMetric.id) {
+		await deleteMetric(deletedMetric.id, testId.value);
+	}
+}
+
+async function handleCreateTag(tagName: string) {
+	try {
+		const newTag = await tagsStore.create(tagName);
+		return newTag;
+	} catch (error) {
+		toast.showError(error, 'Error', error.message);
+		throw error;
+	}
+}
+
+async function openPinningModal() {
+	uiStore.openModal(NODE_PINNING_MODAL_KEY);
+}
+
+async function runTest() {
+	await testDefinitionStore.startTestRun(testId.value);
+	await testDefinitionStore.fetchTestRuns(testId.value);
+}
+
+const runs = computed(() =>
+	Object.values(testDefinitionStore.testRunsById ?? {}).filter(
+		(run) => run.testDefinitionId === testId.value,
+	),
+);
+
+async function onDeleteRuns(toDelete: TestRunRecord[]) {
+	await Promise.all(
+		toDelete.map(async (run) => {
+			await testDefinitionStore.deleteTestRun({ testDefinitionId: testId.value, runId: run.id });
+		}),
+	);
+}
+
+function toggleConfig() {
+	showConfig.value = !showConfig.value;
+}
+
+// Debounced watchers for auto-saving
+watch(
+	() => state.value.metrics,
+	debounce(async () => await updateMetrics(testId.value), { debounceTime: 400 }),
+	{ deep: true },
+);
+
+watch(
+	() => [
+		state.value.description,
+		state.value.name,
+		state.value.tags,
+		state.value.evaluationWorkflow,
+		state.value.mockedNodes,
+	],
+	debounce(onSaveTest, { debounceTime: 400 }),
+	{ deep: true },
+);
+</script>
+
+<template>
+	<div :class="[$style.container, { [$style.noRuns]: !hasRuns }]">
+		<div :class="$style.headerSection">
+			<div :class="$style.headerMeta">
+				<div :class="$style.name">
+					<EvaluationHeader
+						v-model="state.name"
+						:class="{ 'has-issues': hasIssues('name') }"
+						:start-editing="startEditing"
+						:save-changes="saveChanges"
+						:handle-keydown="handleKeydown"
+					/>
+					<div :class="$style.lastSaved">
+						<template v-if="isSaving">
+							{{ locale.baseText('testDefinition.edit.saving') }}
+						</template>
+						<template v-else> {{ locale.baseText('testDefinition.edit.saved') }} </template>
+					</div>
+				</div>
+				<DescriptionInput
+					v-model="state.description"
+					:start-editing="startEditing"
+					:save-changes="saveChanges"
+					:handle-keydown="handleKeydown"
+					:class="$style.descriptionInput"
+				/>
+			</div>
+			<div :class="$style.controls">
+				<n8n-button
+					v-if="runs.length > 0"
+					size="small"
+					:icon="showConfig ? 'eye-slash' : 'eye'"
+					data-test-id="toggle-config-button"
+					:label="
+						showConfig
+							? locale.baseText('testDefinition.edit.hideConfig')
+							: locale.baseText('testDefinition.edit.showConfig')
+					"
+					type="tertiary"
+					@click="toggleConfig"
+				/>
+				<n8n-button
+					v-if="state.evaluationWorkflow.value && state.tags.value.length > 0"
+					:class="$style.runTestButton"
+					size="small"
+					data-test-id="run-test-button"
+					:label="locale.baseText('testDefinition.runTest')"
+					type="primary"
+					@click="runTest"
+				/>
+				<n8n-button
+					v-else
+					:class="$style.runTestButton"
+					size="small"
+					data-test-id="run-test-button"
+					:label="locale.baseText('testDefinition.edit.saveTest')"
+					type="primary"
+					@click="onSaveTest"
+				/>
+			</div>
+		</div>
+
+		<div :class="$style.content">
+			<div v-if="runs.length > 0" :class="$style.runs">
+				<!-- Metrics Chart -->
+				<MetricsChart v-model:selectedMetric="selectedMetric" :runs="runs" :theme="appliedTheme" />
+				<!-- Past Runs Table -->
+				<TestRunsTable
+					:class="$style.runsTable"
+					:runs="runs"
+					:selectable="true"
+					data-test-id="past-runs-table"
+					@delete-runs="onDeleteRuns"
+				/>
+			</div>
+
+			<div :class="[$style.panelBlock, { [$style.hidden]: !showConfig }]">
+				<div :class="$style.panelIntro">
+					{{ locale.baseText('testDefinition.edit.step.intro') }}
+				</div>
+				<BlockArrow :class="$style.introArrow" />
+				<!-- Select Executions -->
+				<EvaluationStep
+					:class="$style.step"
+					:title="
+						locale.baseText('testDefinition.edit.step.executions', {
+							adjustToNumber: tagUsageCount,
+						})
+					"
+					:description="locale.baseText('testDefinition.edit.step.executions.description')"
+				>
+					<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"
+							:create-tag="handleCreateTag"
+						/>
+					</template>
+				</EvaluationStep>
+				<div :class="$style.evaluationArrows">
+					<BlockArrow />
+					<BlockArrow />
+				</div>
+
+				<!-- Mocked Nodes -->
+				<EvaluationStep
+					:class="$style.step"
+					:title="
+						locale.baseText('testDefinition.edit.step.mockedNodes', {
+							adjustToNumber: state.mockedNodes?.length ?? 0,
+						})
+					"
+					:small="true"
+					:expanded="true"
+					:description="locale.baseText('testDefinition.edit.step.nodes.description')"
+				>
+					<template #icon><font-awesome-icon icon="thumbtack" size="lg" /></template>
+					<template #cardContent>
+						<n8n-button
+							size="small"
+							data-test-id="select-nodes-button"
+							:label="locale.baseText('testDefinition.edit.selectNodes')"
+							type="tertiary"
+							@click="openPinningModal"
+						/>
+					</template>
+				</EvaluationStep>
+
+				<!-- Re-run Executions -->
+				<EvaluationStep
+					:class="$style.step"
+					:title="locale.baseText('testDefinition.edit.step.reRunExecutions')"
+					:small="true"
+					:description="locale.baseText('testDefinition.edit.step.reRunExecutions.description')"
+				>
+					<template #icon><font-awesome-icon icon="redo" size="lg" /></template>
+				</EvaluationStep>
+
+				<!-- Compare Executions -->
+				<EvaluationStep
+					:class="$style.step"
+					:title="locale.baseText('testDefinition.edit.step.compareExecutions')"
+					:description="locale.baseText('testDefinition.edit.step.compareExecutions.description')"
+				>
+					<template #icon><font-awesome-icon icon="equals" size="lg" /></template>
+					<template #cardContent>
+						<WorkflowSelector
+							v-model="state.evaluationWorkflow"
+							:class="{ 'has-issues': hasIssues('evaluationWorkflow') }"
+						/>
+					</template>
+				</EvaluationStep>
+
+				<!-- Metrics -->
+				<EvaluationStep
+					:class="$style.step"
+					:title="locale.baseText('testDefinition.edit.step.metrics')"
+					:description="locale.baseText('testDefinition.edit.step.metrics.description')"
+				>
+					<template #icon><font-awesome-icon icon="chart-bar" size="lg" /></template>
+					<template #cardContent>
+						<MetricsInput
+							v-model="state.metrics"
+							:class="{ 'has-issues': hasIssues('metrics') }"
+							@delete-metric="onDeleteMetric"
+						/>
+					</template>
+				</EvaluationStep>
+			</div>
+		</div>
+
+		<Modal ref="nodePinningModal" width="80vw" height="85vh" :name="NODE_PINNING_MODAL_KEY">
+			<template #header>
+				<N8nHeading size="large" :bold="true" :class="$style.runsTableHeading">{{
+					locale.baseText('testDefinition.edit.selectNodes')
+				}}</N8nHeading>
+			</template>
+			<template #content>
+				<NodesPinning
+					v-model="state.mockedNodes"
+					:width="modalContentWidth"
+					data-test-id="nodes-pinning-modal"
+				/>
+			</template>
+		</Modal>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	--evaluation-edit-panel-width: 24rem;
+	--metrics-chart-height: 10rem;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+
+	@media (min-height: 56rem) {
+		--metrics-chart-height: 16rem;
+	}
+
+	@include mixins.breakpoint('lg-and-up') {
+		--evaluation-edit-panel-width: 30rem;
+	}
+}
+
+.content {
+	display: flex;
+	overflow-y: hidden;
+	position: relative;
+
+	.noRuns & {
+		justify-content: center;
+		overflow-y: auto;
+	}
+}
+
+.headerSection {
+	display: flex;
+	justify-content: space-between;
+	align-items: flex-start;
+	background-color: var(--color-background-light);
+	width: 100%;
+}
+
+.headerMeta {
+	max-width: 50%;
+}
+
+.name {
+	display: flex;
+	align-items: center;
+
+	.lastSaved {
+		font-size: var(--font-size-s);
+		color: var(--color-text-light);
+	}
+}
+
+.descriptionInput {
+	margin-top: var(--spacing-2xs);
+}
+
+.runs {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing-m);
+	flex: 1;
+	padding-top: var(--spacing-3xs);
+	overflow: auto;
+
+	@media (min-height: 56rem) {
+		margin-top: var(--spacing-2xl);
+	}
+}
+
+.panelBlock {
+	width: var(--evaluation-edit-panel-width);
+	display: grid;
+	height: 100%;
+	overflow-y: auto;
+	flex-shrink: 0;
+	padding-bottom: var(--spacing-l);
+	margin-left: var(--spacing-2xl);
+	transition: width 0.2s ease;
+
+	&.hidden {
+		margin-left: 0;
+		width: 0;
+		overflow: hidden;
+		flex-shrink: 1;
+	}
+
+	.noRuns & {
+		overflow-y: initial;
+	}
+}
+
+.panelIntro {
+	font-size: var(--font-size-m);
+	color: var(--color-text-dark);
+
+	justify-self: center;
+	position: relative;
+	display: block;
+}
+
+.step {
+	position: relative;
+
+	&:not(:first-child) {
+		margin-top: var(--spacing-m);
+	}
+}
+
+.introArrow {
+	--arrow-height: 1.5rem;
+	margin-bottom: -1rem;
+	justify-self: center;
+}
+
+.evaluationArrows {
+	--arrow-height: 22rem;
+	display: flex;
+	justify-content: space-between;
+	width: 100%;
+	max-width: 80%;
+	margin: 0 auto;
+	margin-bottom: -100%;
+	z-index: 0;
+}
+
+.controls {
+	display: flex;
+	gap: var(--spacing-s);
+}
+</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..64cf826111
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionListView.vue
@@ -0,0 +1,212 @@
+<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.allTestDefinitionsByWorkflowId[
+			router.currentRoute.value.params.name as string
+		] ?? []
+	)
+		.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: testDefinitionStore.testRunsByTestId[test.id]?.length ?? 0,
+			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 ?? '';
+}
+
+function getTestExecution(testId: string): TestExecution {
+	const lastRun = testDefinitionStore.lastRunByTestId[testId];
+	if (!lastRun) {
+		return {
+			id: null,
+			lastRun: null,
+			errorRate: 0,
+			metrics: {},
+			status: 'new',
+		};
+	}
+
+	const mockExecutions = {
+		id: lastRun.id,
+		lastRun: lastRun.updatedAt ?? '',
+		errorRate: 0,
+		metrics: lastRun.metrics ?? {},
+		status: lastRun.status ?? 'running',
+	};
+
+	return mockExecutions;
+}
+
+// Action handlers
+function onCreateTest() {
+	void router.push({ name: VIEWS.NEW_TEST_DEFINITION });
+}
+
+async function onRunTest(testId: string) {
+	try {
+		const result = await testDefinitionStore.startTestRun(testId);
+		if (result.success) {
+			toast.showMessage({
+				title: locale.baseText('testDefinition.list.testStarted'),
+				type: 'success',
+			});
+
+			// Optionally fetch the updated test runs
+			await testDefinitionStore.fetchTestRuns(testId);
+		} else {
+			throw new Error('Test run failed to start');
+		}
+	} catch (error) {
+		toast.showError(error, locale.baseText('testDefinition.list.testStartError'));
+	}
+}
+
+async function onCancelTestRun(testId: string, testRunId: string | null) {
+	try {
+		// FIXME: testRunId might be null for a short period of time between user clicking start and the test run being created and fetched. Just ignore it for now.
+		if (!testRunId) {
+			throw new Error('Failed to cancel test run');
+		}
+
+		const result = await testDefinitionStore.cancelTestRun(testId, testRunId);
+		if (result.success) {
+			toast.showMessage({
+				title: locale.baseText('testDefinition.list.testCancelled'),
+				type: 'success',
+			});
+
+			// Optionally fetch the updated test runs
+			await testDefinitionStore.fetchTestRuns(testId);
+		} else {
+			throw new Error('Failed to cancel test run');
+		}
+	} catch (error) {
+		toast.showError(error, locale.baseText('testDefinition.list.testStartError'));
+	}
+}
+
+async function onViewDetails(testId: string) {
+	void router.push({ name: VIEWS.TEST_DEFINITION_RUNS, params: { testId } });
+}
+
+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() {
+	if (!isLoading.value) {
+		// Add guard to prevent multiple loading states
+		isLoading.value = true;
+		try {
+			await Promise.all([
+				tagsStore.fetchAll(),
+				testDefinitionStore.fetchAll({
+					workflowId: router.currentRoute.value.params.name as string,
+				}),
+			]);
+			isLoading.value = false;
+		} catch (error) {
+			toast.showError(error, locale.baseText('testDefinition.list.loadError'));
+		} 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 },
+		});
+		return; // Add early return to prevent loading if feature is disabled
+	}
+
+	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"
+				data-test-id="test-definition-empty-state"
+				@create-test="onCreateTest"
+			/>
+			<TestsList
+				v-else
+				:tests="tests"
+				@create-test="onCreateTest"
+				@run-test="onRunTest"
+				@view-details="onViewDetails"
+				@edit-test="onEditTest"
+				@delete-test="onDeleteTest"
+				@cancel-test-run="onCancelTestRun"
+			/>
+		</template>
+	</div>
+</template>
+<style module lang="scss">
+.container {
+	height: 100%;
+	width: 100%;
+	max-width: var(--content-container-width);
+	margin: auto;
+}
+.loading {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 200px;
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue
new file mode 100644
index 0000000000..ace36b6814
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRootView.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { useWorkflowHelpers } from '@/composables/useWorkflowHelpers';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { useRouter } from 'vue-router';
+import { onMounted } from 'vue';
+const router = useRouter();
+const workflowHelpers = useWorkflowHelpers({ router });
+const workflowStore = useWorkflowsStore();
+
+async function initWorkflow() {
+	const workflowId = router.currentRoute.value.params.name as string;
+	const isAlreadyInitialized = workflowStore.workflow.id === workflowId;
+
+	if (isAlreadyInitialized) return;
+
+	const workflow = await workflowStore.fetchWorkflow(workflowId);
+	void workflowHelpers.initState(workflow);
+}
+
+onMounted(initWorkflow);
+</script>
+
+<template>
+	<div :class="$style.evaluationsView">
+		<router-view />
+	</div>
+</template>
+
+<style module lang="scss">
+.evaluationsView {
+	width: 100%;
+	height: 100%;
+	margin: auto;
+	padding: var(--spacing-xl) var(--spacing-l);
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
new file mode 100644
index 0000000000..d2858980fd
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunDetailView.vue
@@ -0,0 +1,287 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import { useRouter } from 'vue-router';
+import { convertToDisplayDate } from '@/utils/typesUtils';
+import { useI18n } from '@/composables/useI18n';
+import { N8nCard, N8nText } from 'n8n-design-system';
+import TestTableBase from '@/components/TestDefinition/shared/TestTableBase.vue';
+import type { TestTableColumn } from '@/components/TestDefinition/shared/TestTableBase.vue';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { get } from 'lodash-es';
+import type { ExecutionSummaryWithScopes } from '@/Interface';
+import { VIEWS } from '@/constants';
+import { useToast } from '@/composables/useToast';
+
+interface TestCase extends ExecutionSummaryWithScopes {
+	metrics: Record<string, number>;
+}
+
+const router = useRouter();
+const toast = useToast();
+const testDefinitionStore = useTestDefinitionStore();
+const executionsStore = useExecutionsStore();
+const locale = useI18n();
+
+const isLoading = ref(true);
+const testCases = ref<TestCase[]>([]);
+
+const runId = computed(() => router.currentRoute.value.params.runId as string);
+const testId = computed(() => router.currentRoute.value.params.testId as string);
+
+const run = computed(() => testDefinitionStore.testRunsById[runId.value]);
+const test = computed(() => testDefinitionStore.testDefinitionsById[testId.value]);
+const filteredTestCases = computed(() => {
+	return testCases.value;
+});
+
+const columns = computed(
+	(): Array<TestTableColumn<TestCase>> => [
+		{
+			prop: 'id',
+			width: 200,
+			label: locale.baseText('testDefinition.runDetail.testCase'),
+			sortable: true,
+			route: (row: TestCase) => ({
+				name: VIEWS.EXECUTION_PREVIEW,
+				params: { name: row.workflowId, executionId: row.id },
+			}),
+			formatter: (row: TestCase) => `[${row.id}] ${row.workflowName}`,
+			openInNewTab: true,
+		},
+		{
+			prop: 'status',
+			label: locale.baseText('testDefinition.listRuns.status'),
+			filters: [
+				{ text: locale.baseText('testDefinition.listRuns.status.new'), value: 'new' },
+				{ text: locale.baseText('testDefinition.listRuns.status.running'), value: 'running' },
+				{ text: locale.baseText('testDefinition.listRuns.status.success'), value: 'success' },
+				{ text: locale.baseText('testDefinition.listRuns.status.error'), value: 'error' },
+			],
+			filterMethod: (value: string, row: TestCase) => row.status === value,
+		},
+		...Object.keys(run.value?.metrics ?? {}).map((metric) => ({
+			prop: `metrics.${metric}`,
+			label: metric,
+			sortable: true,
+			filter: true,
+			formatter: (row: TestCase) => row.metrics[metric]?.toFixed(2) ?? '-',
+		})),
+	],
+);
+
+const metrics = computed(() => run.value?.metrics ?? {});
+
+// Temporary workaround to fetch test cases by manually getting workflow executions
+// TODO: Replace with dedicated API endpoint once available
+const fetchExecutionTestCases = async () => {
+	if (!runId.value || !testId.value) return;
+
+	isLoading.value = true;
+	try {
+		const testRun = await testDefinitionStore.getTestRun({
+			testDefinitionId: testId.value,
+			runId: runId.value,
+		});
+		const testDefinition = await testDefinitionStore.fetchTestDefinition(testId.value);
+
+		// Fetch workflow executions that match this test run
+		const evaluationWorkflowExecutions = await executionsStore.fetchExecutions({
+			workflowId: testDefinition.evaluationWorkflowId ?? '',
+			metadata: [{ key: 'testRunId', value: testRun.id }],
+		});
+
+		// For each execution, fetch full details and extract metrics
+		const executionsData = await Promise.all(
+			evaluationWorkflowExecutions?.results.map(async (execution) => {
+				const executionData = await executionsStore.fetchExecution(execution.id);
+				const lastExecutedNode = executionData?.data?.resultData?.lastNodeExecuted;
+				if (!lastExecutedNode) {
+					throw new Error('Last executed node is required');
+				}
+				const metricsData = get(
+					executionData,
+					[
+						'data',
+						'resultData',
+						'runData',
+						lastExecutedNode,
+						'0',
+						'data',
+						'main',
+						'0',
+						'0',
+						'json',
+					],
+					{},
+				);
+
+				return {
+					...execution,
+					metrics: metricsData,
+				};
+			}),
+		);
+
+		testCases.value = executionsData ?? [];
+	} catch (error) {
+		toast.showError(error, 'Failed to load run details');
+	} finally {
+		isLoading.value = false;
+	}
+};
+
+onMounted(async () => {
+	await fetchExecutionTestCases();
+});
+</script>
+
+<template>
+	<div :class="$style.container" data-test-id="test-definition-run-detail">
+		<div :class="$style.header">
+			<button :class="$style.backButton" @click="router.back()">
+				<i class="mr-xs"><font-awesome-icon icon="arrow-left" /></i>
+				<n8n-heading size="large" :bold="true">{{ test?.name }}</n8n-heading>
+				<i class="ml-xs mr-xs"><font-awesome-icon icon="chevron-right" /></i>
+				<n8n-heading size="large" :bold="true"
+					>{{ locale.baseText('testDefinition.listRuns.runNumber') }}{{ run?.id }}</n8n-heading
+				>
+			</button>
+		</div>
+
+		<div :class="$style.cardGrid">
+			<N8nCard :class="$style.summaryCard">
+				<div :class="$style.stat">
+					<N8nText size="small">
+						{{ locale.baseText('testDefinition.runDetail.totalCases') }}
+					</N8nText>
+					<N8nText size="large">{{ testCases.length }}</N8nText>
+				</div>
+			</N8nCard>
+
+			<N8nCard :class="$style.summaryCard">
+				<div :class="$style.stat">
+					<N8nText size="small">
+						{{ locale.baseText('testDefinition.runDetail.ranAt') }}
+					</N8nText>
+					<N8nText size="medium">{{
+						convertToDisplayDate(new Date(run?.runAt).getTime())
+					}}</N8nText>
+				</div>
+			</N8nCard>
+
+			<N8nCard :class="$style.summaryCard">
+				<div :class="$style.stat">
+					<N8nText size="small">
+						{{ locale.baseText('testDefinition.listRuns.status') }}
+					</N8nText>
+					<N8nText size="large" :class="run?.status.toLowerCase()">
+						{{ run?.status }}
+					</N8nText>
+				</div>
+			</N8nCard>
+
+			<N8nCard v-for="(value, key) in metrics" :key="key" :class="$style.summaryCard">
+				<div :class="$style.stat">
+					<N8nText size="small">{{ key }}</N8nText>
+					<N8nText size="large">{{ value.toFixed(2) }}</N8nText>
+				</div>
+			</N8nCard>
+		</div>
+
+		<N8nCard>
+			<div v-if="isLoading" :class="$style.loading">
+				<n8n-loading :loading="true" :rows="5" />
+			</div>
+			<TestTableBase
+				v-else
+				:data="filteredTestCases"
+				:columns="columns"
+				:default-sort="{ prop: 'id', order: 'descending' }"
+			/>
+		</N8nCard>
+	</div>
+</template>
+
+<style module lang="scss">
+.container {
+	height: 100%;
+	width: 100%;
+	max-width: var(--content-container-width);
+	margin: auto;
+}
+
+.backButton {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-s);
+	border: none;
+	background: none;
+	cursor: pointer;
+	color: var(--color-text-base);
+}
+
+.header {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing-s);
+	margin-bottom: var(--spacing-l);
+
+	.timestamp {
+		color: var(--color-text-base);
+		font-size: var(--font-size-s);
+	}
+}
+
+.summary {
+	margin-bottom: var(--spacing-m);
+
+	.summaryStats {
+		display: flex;
+		gap: var(--spacing-l);
+	}
+}
+.stat {
+	display: flex;
+	flex-direction: column;
+}
+
+.controls {
+	display: flex;
+	gap: var(--spacing-s);
+	margin-bottom: var(--spacing-s);
+}
+
+.downloadButton {
+	margin-bottom: var(--spacing-s);
+}
+
+.loading {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 200px;
+}
+
+.cardGrid {
+	display: grid;
+	grid-template-columns: repeat(auto-fit, minmax(6rem, 1fr));
+	gap: var(--spacing-xs);
+	margin-bottom: var(--spacing-m);
+}
+
+:global {
+	.new {
+		color: var(--color-info);
+	}
+	.running {
+		color: var(--color-warning);
+	}
+	.completed {
+		color: var(--color-success);
+	}
+	.error {
+		color: var(--color-danger);
+	}
+}
+</style>
diff --git a/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue
new file mode 100644
index 0000000000..b367f0ba4f
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/TestDefinitionRunsListView.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import TestRunsTable from '@/components/TestDefinition/ListRuns/TestRunsTable.vue';
+import { VIEWS } from '@/constants';
+import { useI18n } from '@/composables/useI18n';
+import { useToast } from '@/composables/useToast';
+import { useUIStore } from '@/stores/ui.store';
+
+const router = useRouter();
+const testDefinitionStore = useTestDefinitionStore();
+const uiStore = useUIStore();
+const locale = useI18n();
+const toast = useToast();
+
+const selectedMetric = ref();
+const isLoading = ref(false);
+
+const appliedTheme = computed(() => uiStore.appliedTheme);
+const testId = computed(() => {
+	return router.currentRoute.value.params.testId as string;
+});
+
+async function loadInitialData() {
+	if (!isLoading.value) {
+		// Add guard to prevent multiple loading states
+		isLoading.value = true;
+		try {
+			await testDefinitionStore.fetchTestDefinition(testId.value);
+			await testDefinitionStore.fetchTestRuns(testId.value);
+			isLoading.value = false;
+		} catch (error) {
+		} finally {
+			isLoading.value = false;
+		}
+	}
+}
+// TODO: We're currently doing the filtering on the FE but there should be an endpoint to get the runs for a test
+const runs = computed(() => {
+	return Object.values(testDefinitionStore.testRunsById ?? {}).filter(
+		(run) => run.testDefinitionId === testId.value,
+	);
+});
+
+const testDefinition = computed(() => {
+	return testDefinitionStore.testDefinitionsById[testId.value];
+});
+
+const getRunDetail = (run: TestRunRecord) => {
+	void router.push({
+		name: VIEWS.TEST_DEFINITION_RUNS_DETAIL,
+		params: { testId: testId.value, runId: run.id },
+	});
+};
+
+async function runTest() {
+	try {
+		const result = await testDefinitionStore.startTestRun(testId.value);
+		if (result.success) {
+			toast.showMessage({
+				title: locale.baseText('testDefinition.list.testStarted'),
+				type: 'success',
+			});
+
+			// Optionally fetch the updated test runs
+			await testDefinitionStore.fetchTestRuns(testId.value);
+		} else {
+			throw new Error('Test run failed to start');
+		}
+	} catch (error) {
+		toast.showError(error, locale.baseText('testDefinition.list.testStartError'));
+	}
+}
+
+async function onDeleteRuns(runsToDelete: TestRunRecord[]) {
+	await Promise.all(
+		runsToDelete.map(async (run) => {
+			await testDefinitionStore.deleteTestRun({ testDefinitionId: testId.value, runId: run.id });
+		}),
+	);
+}
+
+onMounted(async () => {
+	await loadInitialData();
+});
+</script>
+
+<template>
+	<div :class="$style.container">
+		<router-link :to="{ name: VIEWS.TEST_DEFINITION }" :class="$style.backButton">
+			<i class="mr-xs"><font-awesome-icon icon="arrow-left" /></i>
+			<n8n-heading size="large" :bold="true">{{ testDefinition?.name }}</n8n-heading>
+		</router-link>
+		<N8nText :class="$style.description" size="medium">{{ testDefinition?.description }}</N8nText>
+		<template v-if="isLoading">
+			<N8nLoading :rows="5" />
+			<N8nLoading :rows="10" />
+		</template>
+		<div :class="$style.details" v-else-if="runs.length > 0">
+			<MetricsChart v-model:selectedMetric="selectedMetric" :runs="runs" :theme="appliedTheme" />
+			<TestRunsTable :runs="runs" @get-run-detail="getRunDetail" @delete-runs="onDeleteRuns" />
+		</div>
+		<template v-else>
+			<N8nActionBox
+				:heading="locale.baseText('testDefinition.listRuns.noRuns')"
+				:description="locale.baseText('testDefinition.listRuns.noRuns.description')"
+				:button-text="locale.baseText('testDefinition.listRuns.noRuns.button')"
+				@click:button="runTest"
+			/>
+		</template>
+	</div>
+</template>
+<style module lang="scss">
+.container {
+	height: 100%;
+	width: 100%;
+	max-width: var(--content-container-width);
+	margin: auto;
+	display: flex;
+	flex-direction: column;
+}
+.backButton {
+	color: var(--color-text-base);
+}
+.description {
+	margin: var(--spacing-s) 0;
+	display: block;
+}
+.details {
+	display: flex;
+	height: 100%;
+	flex-direction: column;
+	gap: var(--spacing-xl);
+}
+</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..3e85f86425
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionEditView.test.ts
@@ -0,0 +1,300 @@
+import type { Mock } from 'vitest';
+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';
+import { cleanupAppModals, createAppModals, mockedStore } from '@/__tests__/utils';
+import { VIEWS } from '@/constants';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+
+vi.mock('vue-router');
+vi.mock('@/composables/useToast');
+vi.mock('@/components/TestDefinition/composables/useTestDefinitionForm');
+vi.mock('@/stores/projects.store');
+
+describe('TestDefinitionEditView', () => {
+	const renderComponent = createComponentRenderer(TestDefinitionEditView);
+
+	let createTestMock: Mock;
+	let updateTestMock: Mock;
+	let loadTestDataMock: Mock;
+	let deleteMetricMock: Mock;
+	let updateMetricsMock: Mock;
+	let showMessageMock: Mock;
+	let showErrorMock: Mock;
+
+	const renderComponentWithFeatureEnabled = ({
+		testRunsById = {},
+	}: { testRunsById?: Record<string, TestRunRecord> } = {}) => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const mockedTestDefinitionStore = mockedStore(useTestDefinitionStore);
+		mockedTestDefinitionStore.isFeatureEnabled = true;
+		mockedTestDefinitionStore.testRunsById = testRunsById;
+		return { ...renderComponent({ pinia }), mockedTestDefinitionStore };
+	};
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+		createAppModals();
+
+		// Default route mock: no testId
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as ReturnType<typeof useRoute>);
+
+		vi.mocked(useRouter).mockReturnValue({
+			push: vi.fn(),
+			replace: vi.fn(),
+			resolve: vi.fn().mockReturnValue({ href: '/test-href' }),
+			currentRoute: { value: { params: {} } },
+		} as unknown as ReturnType<typeof useRouter>);
+
+		createTestMock = vi.fn().mockResolvedValue({ id: 'newTestId' });
+		updateTestMock = vi.fn().mockResolvedValue({});
+		loadTestDataMock = vi.fn();
+		deleteMetricMock = vi.fn();
+		updateMetricsMock = vi.fn();
+		showMessageMock = vi.fn();
+		showErrorMock = vi.fn();
+		// const mockedTestDefinitionStore = mockedStore(useTestDefinitionStore);
+
+		vi.mocked(useToast).mockReturnValue({
+			showMessage: showMessageMock,
+			showError: showErrorMock,
+		} as unknown as ReturnType<typeof useToast>);
+		vi.mocked(useTestDefinitionForm).mockReturnValue({
+			state: ref({
+				name: { value: '', isEditing: false, tempValue: '' },
+				description: { value: '', isEditing: false, tempValue: '' },
+				tags: { value: [], tempValue: [], isEditing: false },
+				evaluationWorkflow: { mode: 'list', value: '', __rl: true },
+				metrics: [],
+			}),
+			fieldsIssues: ref([]),
+			isSaving: ref(false),
+			loadTestData: loadTestDataMock,
+			createTest: createTestMock,
+			updateTest: updateTestMock,
+			startEditing: vi.fn(),
+			saveChanges: vi.fn(),
+			cancelEditing: vi.fn(),
+			handleKeydown: vi.fn(),
+			deleteMetric: deleteMetricMock,
+			updateMetrics: updateMetricsMock,
+		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+
+		vi.mock('@/stores/projects.store', () => ({
+			useProjectsStore: vi.fn().mockReturnValue({
+				isTeamProjectFeatureEnabled: false,
+				currentProject: null,
+				currentProjectId: null,
+			}),
+		}));
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+		cleanupAppModals();
+	});
+
+	it('should load test data when testId is provided', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: { testId: '1' },
+			name: VIEWS.TEST_DEFINITION_EDIT,
+		} as unknown as ReturnType<typeof useRoute>);
+		renderComponentWithFeatureEnabled();
+
+		mockedStore(useAnnotationTagsStore).fetchAll.mockResolvedValue([]);
+
+		expect(loadTestDataMock).toHaveBeenCalledWith('1');
+	});
+
+	it('should not load test data when testId is not provided', async () => {
+		// Here route returns no testId
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as unknown as ReturnType<typeof useRoute>);
+		renderComponentWithFeatureEnabled();
+
+		expect(loadTestDataMock).not.toHaveBeenCalled();
+	});
+
+	it('should create a new test and show success message on save if no testId is present', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as ReturnType<typeof useRoute>);
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
+		mockedStore(useAnnotationTagsStore).fetchAll.mockResolvedValue([]);
+
+		await nextTick();
+		const saveButton = getByTestId('run-test-button');
+		saveButton.click();
+		await nextTick();
+
+		expect(createTestMock).toHaveBeenCalled();
+	});
+
+	it('should update test and show success message on save if testId is present', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: { testId: '1' },
+			name: VIEWS.TEST_DEFINITION_EDIT,
+		} as unknown as ReturnType<typeof useRoute>);
+
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
+		const saveButton = getByTestId('run-test-button');
+		saveButton.click();
+		await nextTick();
+
+		expect(updateTestMock).toHaveBeenCalledWith('1');
+	});
+
+	it('should show error message on failed test creation', async () => {
+		createTestMock.mockRejectedValue(new Error('Save failed'));
+
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as unknown as ReturnType<typeof useRoute>);
+
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
+		const saveButton = getByTestId('run-test-button');
+		saveButton.click();
+		await nextTick();
+
+		expect(createTestMock).toHaveBeenCalled();
+		expect(showErrorMock).toHaveBeenCalledWith(expect.any(Error), expect.any(String));
+	});
+
+	it('should display "Save Test" button when editing test without eval workflow and tags', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: { testId: '1' },
+			name: VIEWS.TEST_DEFINITION_EDIT,
+		} as unknown as ReturnType<typeof useRoute>);
+
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
+		await nextTick();
+		const updateButton = getByTestId('run-test-button');
+		expect(updateButton.textContent?.toLowerCase()).toContain('save');
+	});
+
+	it('should display "Save Test" button when creating new test', async () => {
+		vi.mocked(useRoute).mockReturnValue({
+			params: {},
+			name: VIEWS.NEW_TEST_DEFINITION,
+		} as unknown as ReturnType<typeof useRoute>);
+
+		const { getByTestId } = renderComponentWithFeatureEnabled();
+
+		const saveButton = getByTestId('run-test-button');
+		expect(saveButton.textContent?.toLowerCase()).toContain('save test');
+	});
+
+	it('should apply "has-issues" class to inputs with issues', async () => {
+		vi.mocked(useTestDefinitionForm).mockReturnValue({
+			...vi.mocked(useTestDefinitionForm)(),
+			fieldsIssues: ref([
+				{ field: 'name', message: 'Name is required' },
+				{ field: 'tags', message: 'Tag is required' },
+			]),
+		} as unknown as ReturnType<typeof useTestDefinitionForm>);
+
+		const { container } = renderComponentWithFeatureEnabled();
+
+		await nextTick();
+		const issueElements = container.querySelectorAll('.has-issues');
+		expect(issueElements.length).toBeGreaterThan(0);
+	});
+
+	it('should fetch all tags on mount', async () => {
+		renderComponentWithFeatureEnabled();
+		await nextTick();
+		expect(mockedStore(useAnnotationTagsStore).fetchAll).toHaveBeenCalled();
+	});
+
+	describe('Test Runs functionality', () => {
+		it('should display test runs table when runs exist', async () => {
+			vi.mocked(useRoute).mockReturnValue({
+				params: { testId: '1' },
+				name: VIEWS.TEST_DEFINITION_EDIT,
+			} as unknown as ReturnType<typeof useRoute>);
+
+			const { getByTestId } = renderComponentWithFeatureEnabled({
+				testRunsById: {
+					run1: {
+						id: 'run1',
+						testDefinitionId: '1',
+						status: 'completed',
+						runAt: '2023-01-01',
+						createdAt: '2023-01-01',
+						updatedAt: '2023-01-01',
+						completedAt: '2023-01-01',
+					},
+					run2: {
+						id: 'run2',
+						testDefinitionId: '1',
+						status: 'running',
+						runAt: '2023-01-02',
+						createdAt: '2023-01-02',
+						updatedAt: '2023-01-02',
+						completedAt: '',
+					},
+				},
+			});
+
+			const runsTable = getByTestId('past-runs-table');
+			expect(runsTable).toBeTruthy();
+		});
+
+		it('should not display test runs table when no runs exist', async () => {
+			const { container } = renderComponentWithFeatureEnabled();
+
+			const runsTable = container.querySelector('[data-test-id="past-runs-table"]');
+			expect(runsTable).toBeFalsy();
+		});
+
+		it('should start a test run when run test button is clicked', async () => {
+			vi.mocked(useTestDefinitionForm).mockReturnValue({
+				...vi.mocked(useTestDefinitionForm)(),
+				state: ref({
+					name: { value: 'Test', isEditing: false, tempValue: '' },
+					description: { value: '', isEditing: false, tempValue: '' },
+					tags: { value: ['tag1'], tempValue: [], isEditing: false },
+					evaluationWorkflow: { mode: 'list', value: 'workflow1', __rl: true },
+					metrics: [],
+					mockedNodes: [],
+				}),
+			} as unknown as ReturnType<typeof useTestDefinitionForm>);
+
+			vi.mocked(useRoute).mockReturnValue({
+				params: { testId: '1' },
+				name: VIEWS.TEST_DEFINITION_EDIT,
+			} as unknown as ReturnType<typeof useRoute>);
+
+			const { getByTestId, mockedTestDefinitionStore } = renderComponentWithFeatureEnabled();
+			await nextTick();
+
+			const runButton = getByTestId('run-test-button');
+			runButton.click();
+			await nextTick();
+
+			expect(mockedTestDefinitionStore.startTestRun).toHaveBeenCalledWith('1');
+			expect(mockedTestDefinitionStore.fetchTestRuns).toHaveBeenCalledWith('1');
+		});
+	});
+});
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
new file mode 100644
index 0000000000..bf23b73a9e
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionListView.test.ts
@@ -0,0 +1,174 @@
+import type { Mock } from 'vitest';
+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 TestDefinitionListView from '@/views/TestDefinition/TestDefinitionListView.vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useToast } from '@/composables/useToast';
+import { useAnnotationTagsStore } from '@/stores/tags.store';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import { nextTick, ref } from 'vue';
+import { mockedStore, waitAllPromises } from '@/__tests__/utils';
+import { VIEWS } from '@/constants';
+import type { TestDefinitionRecord } from '@/api/testDefinition.ee';
+
+vi.mock('vue-router');
+vi.mock('@/composables/useToast');
+
+describe('TestDefinitionListView', () => {
+	const renderComponent = createComponentRenderer(TestDefinitionListView);
+
+	let showMessageMock: Mock;
+	let showErrorMock: Mock;
+	let startTestRunMock: Mock;
+	let fetchTestRunsMock: Mock;
+	let deleteByIdMock: Mock;
+	let fetchAllMock: Mock;
+
+	const mockTestDefinitions: TestDefinitionRecord[] = [
+		{
+			id: '1',
+			name: 'Test 1',
+			workflowId: 'workflow1',
+			updatedAt: '2023-01-01T00:00:00.000Z',
+			annotationTagId: 'tag1',
+		},
+		{
+			id: '2',
+			name: 'Test 2',
+			workflowId: 'workflow1',
+			updatedAt: '2023-01-02T00:00:00.000Z',
+		},
+		{
+			id: '3',
+			name: 'Test 3',
+			workflowId: 'workflow1',
+			updatedAt: '2023-01-03T00:00:00.000Z',
+		},
+	];
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		vi.mocked(useRoute).mockReturnValue(
+			ref({
+				params: { name: 'workflow1' },
+				name: VIEWS.TEST_DEFINITION,
+			}) as unknown as ReturnType<typeof useRoute>,
+		);
+
+		vi.mocked(useRouter).mockReturnValue({
+			push: vi.fn(),
+			currentRoute: { value: { params: { name: 'workflow1' } } },
+		} as unknown as ReturnType<typeof useRouter>);
+
+		showMessageMock = vi.fn();
+		showErrorMock = vi.fn();
+		startTestRunMock = vi.fn().mockResolvedValue({ success: true });
+		fetchTestRunsMock = vi.fn();
+		deleteByIdMock = vi.fn();
+		fetchAllMock = vi.fn().mockResolvedValue({ testDefinitions: mockTestDefinitions });
+
+		vi.mocked(useToast).mockReturnValue({
+			showMessage: showMessageMock,
+			showError: showErrorMock,
+		} as unknown as ReturnType<typeof useToast>);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	const renderComponentWithFeatureEnabled = async (
+		{ testDefinitions }: { testDefinitions: TestDefinitionRecord[] } = {
+			testDefinitions: mockTestDefinitions,
+		},
+	) => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		// const tagsStore = mockedStore(useAnnotationTagsStore);
+		testDefinitionStore.isFeatureEnabled = true;
+		testDefinitionStore.fetchAll = fetchAllMock;
+		testDefinitionStore.startTestRun = startTestRunMock;
+		testDefinitionStore.fetchTestRuns = fetchTestRunsMock;
+		testDefinitionStore.deleteById = deleteByIdMock;
+		testDefinitionStore.allTestDefinitionsByWorkflowId = { workflow1: testDefinitions };
+
+		const component = renderComponent({ pinia });
+		await waitAllPromises();
+		return { ...component, testDefinitionStore };
+	};
+
+	it('should render empty state when no tests exist', async () => {
+		const { getByTestId } = await renderComponentWithFeatureEnabled({ testDefinitions: [] });
+
+		expect(getByTestId('test-definition-empty-state')).toBeTruthy();
+	});
+
+	it('should render tests list when tests exist', async () => {
+		const { getByTestId } = await renderComponentWithFeatureEnabled();
+
+		expect(getByTestId('test-definition-list')).toBeTruthy();
+	});
+
+	it('should load initial data on mount', async () => {
+		const { testDefinitionStore } = await renderComponentWithFeatureEnabled();
+
+		expect(testDefinitionStore.fetchAll).toHaveBeenCalledWith({
+			workflowId: 'workflow1',
+		});
+		expect(mockedStore(useAnnotationTagsStore).fetchAll).toHaveBeenCalled();
+	});
+
+	it('should start test run and show success message', async () => {
+		const { getByTestId } = await renderComponentWithFeatureEnabled();
+
+		const runButton = getByTestId('run-test-button-1');
+		runButton.click();
+		await nextTick();
+
+		expect(startTestRunMock).toHaveBeenCalledWith('1');
+		expect(fetchTestRunsMock).toHaveBeenCalledWith('1');
+		expect(showMessageMock).toHaveBeenCalledWith({
+			title: expect.any(String),
+			type: 'success',
+		});
+	});
+
+	it('should show error message on failed test run', async () => {
+		const { getByTestId, testDefinitionStore } = await renderComponentWithFeatureEnabled();
+		testDefinitionStore.startTestRun = vi.fn().mockRejectedValue(new Error('Run failed'));
+
+		const runButton = getByTestId('run-test-button-1');
+		runButton.click();
+		await nextTick();
+
+		expect(showErrorMock).toHaveBeenCalledWith(expect.any(Error), expect.any(String));
+	});
+
+	it('should delete test and show success message', async () => {
+		const { getByTestId, testDefinitionStore } = await renderComponentWithFeatureEnabled();
+
+		const deleteButton = getByTestId('delete-test-button-1');
+		deleteButton.click();
+		await nextTick();
+
+		expect(testDefinitionStore.deleteById).toHaveBeenCalledWith('1');
+		expect(showMessageMock).toHaveBeenCalledWith({
+			title: expect.any(String),
+			type: 'success',
+		});
+	});
+
+	it('should sort tests by updated date in descending order', async () => {
+		const { container } = await renderComponentWithFeatureEnabled();
+
+		const testItems = container.querySelectorAll('[data-test-id^="test-item-"]');
+		expect(testItems[0].getAttribute('data-test-id')).toBe('test-item-3');
+		expect(testItems[1].getAttribute('data-test-id')).toBe('test-item-2');
+		expect(testItems[2].getAttribute('data-test-id')).toBe('test-item-1');
+	});
+});
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts
new file mode 100644
index 0000000000..e39d53a8d5
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRootView.test.ts
@@ -0,0 +1,87 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { createPinia, setActivePinia } from 'pinia';
+import { createTestingPinia } from '@pinia/testing';
+import { createComponentRenderer } from '@/__tests__/render';
+import TestDefinitionRootView from '../TestDefinitionRootView.vue';
+import { useRouter } from 'vue-router';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { mockedStore } from '@/__tests__/utils';
+import type { IWorkflowDb } from '@/Interface';
+import * as workflowsApi from '@/api/workflows';
+
+vi.mock('vue-router');
+vi.mock('@/api/workflows');
+
+describe('TestDefinitionRootView', () => {
+	const renderComponent = createComponentRenderer(TestDefinitionRootView);
+
+	const mockWorkflow: IWorkflowDb = {
+		id: 'different-id',
+		name: 'Test Workflow',
+		active: false,
+		createdAt: Date.now(),
+		updatedAt: Date.now(),
+		nodes: [],
+		connections: {},
+		settings: {
+			executionOrder: 'v1',
+		},
+		tags: [],
+		pinData: {},
+		versionId: '',
+		usedCredentials: [],
+	};
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		vi.mocked(useRouter).mockReturnValue({
+			currentRoute: {
+				value: {
+					params: {
+						name: 'workflow123',
+					},
+				},
+			},
+		} as unknown as ReturnType<typeof useRouter>);
+
+		vi.mocked(workflowsApi.getWorkflow).mockResolvedValue({
+			...mockWorkflow,
+			id: 'workflow123',
+		});
+	});
+
+	it('should initialize workflow on mount if not already initialized', async () => {
+		const pinia = createTestingPinia();
+		const workflowsStore = mockedStore(useWorkflowsStore);
+		workflowsStore.workflow = mockWorkflow;
+
+		const newWorkflow = {
+			...mockWorkflow,
+			id: 'workflow123',
+		};
+		workflowsStore.fetchWorkflow.mockResolvedValue(newWorkflow);
+
+		renderComponent({ pinia });
+
+		expect(workflowsStore.fetchWorkflow).toHaveBeenCalledWith('workflow123');
+	});
+
+	it('should not initialize workflow if already loaded', async () => {
+		const pinia = createTestingPinia();
+		const workflowsStore = mockedStore(useWorkflowsStore);
+		workflowsStore.workflow = {
+			...mockWorkflow,
+			id: 'workflow123',
+		};
+
+		renderComponent({ pinia });
+
+		expect(workflowsStore.fetchWorkflow).not.toHaveBeenCalled();
+	});
+
+	it('should render router view', () => {
+		const { container } = renderComponent();
+		expect(container.querySelector('router-view')).toBeTruthy();
+	});
+});
diff --git a/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts
new file mode 100644
index 0000000000..537a5a5e31
--- /dev/null
+++ b/packages/editor-ui/src/views/TestDefinition/tests/TestDefinitionRunDetailView.test.ts
@@ -0,0 +1,267 @@
+import type { Mock } from 'vitest';
+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 TestDefinitionRunDetailView from '@/views/TestDefinition/TestDefinitionRunDetailView.vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useToast } from '@/composables/useToast';
+import { useTestDefinitionStore } from '@/stores/testDefinition.store.ee';
+import { useExecutionsStore } from '@/stores/executions.store';
+import { useWorkflowsStore } from '@/stores/workflows.store';
+import { nextTick, ref } from 'vue';
+import { mockedStore, waitAllPromises } from '@/__tests__/utils';
+import { VIEWS } from '@/constants';
+import type { TestRunRecord } from '@/api/testDefinition.ee';
+import type { IWorkflowDb } from '@/Interface';
+
+vi.mock('vue-router');
+vi.mock('@/composables/useToast');
+
+describe('TestDefinitionRunDetailView', () => {
+	const renderComponent = createComponentRenderer(TestDefinitionRunDetailView);
+
+	let showErrorMock: Mock;
+	let getTestRunMock: Mock;
+	let fetchExecutionsMock: Mock;
+	let fetchExecutionMock: Mock;
+
+	const mockTestRun: TestRunRecord = {
+		id: 'run1',
+		status: 'completed',
+		runAt: '2023-01-01T00:00:00.000Z',
+		metrics: {
+			accuracy: 0.95,
+			precision: 0.88,
+		},
+		testDefinitionId: 'test1',
+		createdAt: '2023-01-01T00:00:00.000Z',
+		updatedAt: '2023-01-01T00:00:00.000Z',
+		completedAt: '2023-01-01T00:00:00.000Z',
+	};
+
+	const mockTestDefinition = {
+		id: 'test1',
+		name: 'Test Definition 1',
+		evaluationWorkflowId: 'workflow1',
+		workflowId: 'workflow1',
+	};
+
+	const mockWorkflow = {
+		id: 'workflow1',
+		name: 'Evaluation Workflow',
+	};
+
+	const mockExecutions = {
+		results: [
+			{ id: 'exec1', status: 'success' },
+			{ id: 'exec2', status: 'error' },
+		],
+	};
+
+	beforeEach(() => {
+		setActivePinia(createPinia());
+
+		// Mock route with testId and runId
+		vi.mocked(useRoute).mockReturnValue(
+			ref({
+				params: { testId: 'test1', runId: 'run1' },
+				name: VIEWS.TEST_DEFINITION_RUNS,
+			}) as unknown as ReturnType<typeof useRoute>,
+		);
+
+		vi.mocked(useRouter).mockReturnValue({
+			back: vi.fn(),
+			currentRoute: { value: { params: { testId: 'test1', runId: 'run1' } } },
+			resolve: vi.fn().mockResolvedValue({ href: 'test-definition-run-detail' }),
+		} as unknown as ReturnType<typeof useRouter>);
+
+		showErrorMock = vi.fn();
+		getTestRunMock = vi.fn().mockResolvedValue(mockTestRun);
+		fetchExecutionsMock = vi.fn().mockResolvedValue(mockExecutions);
+		fetchExecutionMock = vi.fn().mockResolvedValue({
+			data: {
+				resultData: {
+					lastNodeExecuted: 'Node1',
+					runData: {
+						Node1: [{ data: { main: [[{ json: { accuracy: 0.95 } }]] } }],
+					},
+				},
+			},
+		});
+
+		vi.mocked(useToast).mockReturnValue({
+			showError: showErrorMock,
+		} as unknown as ReturnType<typeof useToast>);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	it('should load run details on mount', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.testRunsById = { run1: mockTestRun };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+		testDefinitionStore.getTestRun = getTestRunMock;
+
+		const executionsStore = mockedStore(useExecutionsStore);
+		executionsStore.fetchExecutions = fetchExecutionsMock;
+		executionsStore.fetchExecution = fetchExecutionMock;
+
+		const workflowsStore = mockedStore(useWorkflowsStore);
+		workflowsStore.workflowsById = { workflow1: mockWorkflow as IWorkflowDb };
+
+		const { getByTestId } = renderComponent({ pinia });
+		await nextTick();
+
+		expect(getTestRunMock).toHaveBeenCalledWith({
+			testDefinitionId: 'test1',
+			runId: 'run1',
+		});
+		// expect(fetchExecutionsMock).toHaveBeenCalled();
+		expect(getByTestId('test-definition-run-detail')).toBeTruthy();
+	});
+
+	it('should display test run metrics', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.testRunsById = { run1: mockTestRun };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+		testDefinitionStore.getTestRun = getTestRunMock;
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		const metricsCards = container.querySelectorAll('.summaryCard');
+		expect(metricsCards.length).toBeGreaterThan(0);
+		expect(container.textContent).toContain('0.95'); // Check for accuracy metric
+	});
+
+	it('should handle errors when loading run details', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.getTestRun = vi.fn().mockRejectedValue(new Error('Failed to load'));
+
+		renderComponent({ pinia });
+		await nextTick();
+
+		expect(showErrorMock).toHaveBeenCalledWith(expect.any(Error), 'Failed to load run details');
+	});
+
+	it('should navigate back when back button is clicked', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const router = useRouter();
+		const { getByTestId } = renderComponent({ pinia });
+		await nextTick();
+
+		const backButton = getByTestId('test-definition-run-detail').querySelector('.backButton');
+		backButton?.dispatchEvent(new Event('click'));
+
+		expect(router.back).toHaveBeenCalled();
+	});
+
+	// Test loading states
+	it('should show loading state while fetching data', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.getTestRun = vi
+			.fn()
+			.mockImplementation(async () => await new Promise(() => {})); // Never resolves
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		expect(container.querySelector('.loading')).toBeTruthy();
+	});
+
+	// Test metrics display
+	it('should correctly format and display all metrics', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testRunWithMultipleMetrics = {
+			...mockTestRun,
+			metrics: {
+				accuracy: 0.956789,
+				precision: 0.887654,
+				recall: 0.923456,
+				f1_score: 0.901234,
+			},
+		};
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.testRunsById = { run1: testRunWithMultipleMetrics };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		// Check if the metrics are displayed correctly with 2 decimal places
+		expect(container.textContent).toContain('0.96');
+		expect(container.textContent).toContain('0.89');
+		expect(container.textContent).toContain('0.92');
+		expect(container.textContent).toContain('0.90');
+	});
+
+	// Test status display
+	it('should display correct status with appropriate styling', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testRunWithStatus: TestRunRecord = {
+			...mockTestRun,
+			status: 'error',
+		};
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		testDefinitionStore.testRunsById = { run1: testRunWithStatus };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		const statusElement = container.querySelector('.error');
+		expect(statusElement).toBeTruthy();
+		expect(statusElement?.textContent?.trim()).toBe('error');
+	});
+
+	// Test table data
+	it('should correctly populate the test cases table', async () => {
+		const pinia = createTestingPinia();
+		setActivePinia(pinia);
+
+		const testDefinitionStore = mockedStore(useTestDefinitionStore);
+		const executionsStore = mockedStore(useExecutionsStore);
+
+		// Mock all required store methods
+		testDefinitionStore.testRunsById = { run1: mockTestRun };
+		testDefinitionStore.testDefinitionsById = { test1: mockTestDefinition };
+		testDefinitionStore.getTestRun = getTestRunMock;
+		// Add this mock for fetchTestDefinition
+		testDefinitionStore.fetchTestDefinition = vi.fn().mockResolvedValue(mockTestDefinition);
+
+		executionsStore.fetchExecutions = fetchExecutionsMock;
+		executionsStore.fetchExecution = fetchExecutionMock;
+
+		const { container } = renderComponent({ pinia });
+		await nextTick();
+
+		// Wait for all promises to resolve
+		await waitAllPromises();
+
+		const tableRows = container.querySelectorAll('.el-table__row');
+		expect(tableRows.length).toBe(mockExecutions.results.length);
+	});
+});
diff --git a/packages/editor-ui/src/views/VariablesView.spec.ts b/packages/editor-ui/src/views/VariablesView.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/VariablesView.spec.ts
rename to packages/editor-ui/src/views/VariablesView.test.ts
diff --git a/packages/editor-ui/src/views/VariablesView.vue b/packages/editor-ui/src/views/VariablesView.vue
index 475b30fab2..e0966aa222 100644
--- a/packages/editor-ui/src/views/VariablesView.vue
+++ b/packages/editor-ui/src/views/VariablesView.vue
@@ -20,6 +20,7 @@ import type { DatatableColumn, EnvironmentVariable } from '@/Interface';
 import { uid } from 'n8n-design-system/utils';
 import { getResourcePermissions } from '@/permissions';
 import type { BaseTextKey } from '@/plugins/i18n';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 const settingsStore = useSettingsStore();
 const environmentsStore = useEnvironmentsStore();
@@ -30,6 +31,7 @@ const i18n = useI18n();
 const message = useMessage();
 const sourceControlStore = useSourceControlStore();
 const documentTitle = useDocumentTitle();
+const pageRedirectionHelper = usePageRedirectionHelper();
 let sourceControlStoreUnsubscribe = () => {};
 
 const layoutRef = ref<InstanceType<typeof ResourcesListLayout> | null>(null);
@@ -230,7 +232,7 @@ async function deleteVariable(data: IResource) {
 }
 
 function goToUpgrade() {
-	void uiStore.goToUpgrade('variables', 'upgrade-variables');
+	void pageRedirectionHelper.goToUpgrade('variables', 'upgrade-variables');
 }
 
 function displayName(resource: IResource) {
@@ -290,7 +292,7 @@ onMounted(() => {
 						data-test-id="resources-list-add"
 						@click="addTemporaryVariable"
 					>
-						{{ $locale.baseText(`variables.add`) }}
+						{{ i18n.baseText(`variables.add`) }}
 					</n8n-button>
 				</div>
 				<template #content>
@@ -307,15 +309,15 @@ onMounted(() => {
 				data-test-id="unavailable-resources-list"
 				emoji="👋"
 				:heading="
-					$locale.baseText(contextBasedTranslationKeys.variables.unavailable.title as BaseTextKey)
+					i18n.baseText(contextBasedTranslationKeys.variables.unavailable.title as BaseTextKey)
 				"
 				:description="
-					$locale.baseText(
+					i18n.baseText(
 						contextBasedTranslationKeys.variables.unavailable.description as BaseTextKey,
 					)
 				"
 				:button-text="
-					$locale.baseText(contextBasedTranslationKeys.variables.unavailable.button as BaseTextKey)
+					i18n.baseText(contextBasedTranslationKeys.variables.unavailable.button as BaseTextKey)
 				"
 				button-type="secondary"
 				@click:button="goToUpgrade"
@@ -327,15 +329,15 @@ onMounted(() => {
 				data-test-id="unavailable-resources-list"
 				emoji="👋"
 				:heading="
-					$locale.baseText(contextBasedTranslationKeys.variables.unavailable.title as BaseTextKey)
+					i18n.baseText(contextBasedTranslationKeys.variables.unavailable.title as BaseTextKey)
 				"
 				:description="
-					$locale.baseText(
+					i18n.baseText(
 						contextBasedTranslationKeys.variables.unavailable.description as BaseTextKey,
 					)
 				"
 				:button-text="
-					$locale.baseText(contextBasedTranslationKeys.variables.unavailable.button as BaseTextKey)
+					i18n.baseText(contextBasedTranslationKeys.variables.unavailable.button as BaseTextKey)
 				"
 				button-type="secondary"
 				@click:button="goToUpgrade"
@@ -345,11 +347,11 @@ onMounted(() => {
 				data-test-id="cannot-create-variables"
 				emoji="👋"
 				:heading="
-					$locale.baseText('variables.empty.notAllowedToCreate.heading', {
+					i18n.baseText('variables.empty.notAllowedToCreate.heading', {
 						interpolate: { name: usersStore.currentUser?.firstName ?? '' },
 					})
 				"
-				:description="$locale.baseText('variables.empty.notAllowedToCreate.description')"
+				:description="i18n.baseText('variables.empty.notAllowedToCreate.description')"
 				@click="goToUpgrade"
 			/>
 		</template>
diff --git a/packages/editor-ui/src/views/WorkerView.vue b/packages/editor-ui/src/views/WorkerView.vue
index 8da48f85ce..e6ea3c5b5d 100644
--- a/packages/editor-ui/src/views/WorkerView.vue
+++ b/packages/editor-ui/src/views/WorkerView.vue
@@ -1,13 +1,15 @@
 <script setup lang="ts">
 import WorkerList from '@/components/WorkerList.ee.vue';
-import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
+import { useI18n } from '@/composables/useI18n';
 
 const settingsStore = useSettingsStore();
-const uiStore = useUIStore();
+const pageRedirectionHelper = usePageRedirectionHelper();
+const i18n = useI18n();
 
 const goToUpgrade = () => {
-	void uiStore.goToUpgrade('worker-view', 'upgrade-worker-view');
+	void pageRedirectionHelper.goToUpgrade('worker-view', 'upgrade-worker-view');
 };
 </script>
 
@@ -20,17 +22,17 @@ const goToUpgrade = () => {
 		v-else
 		data-test-id="worker-view-unlicensed"
 		:class="$style.actionBox"
-		:description="$locale.baseText('workerList.actionBox.description')"
-		:button-text="$locale.baseText('workerList.actionBox.buttonText')"
+		:description="i18n.baseText('workerList.actionBox.description')"
+		:button-text="i18n.baseText('workerList.actionBox.buttonText')"
 		@click:button="goToUpgrade"
 	>
 		<template #heading>
-			<span>{{ $locale.baseText('workerList.actionBox.title') }}</span>
+			<span>{{ i18n.baseText('workerList.actionBox.title') }}</span>
 		</template>
 		<template #description>
-			{{ $locale.baseText('workerList.actionBox.description') }}
-			<a :href="$locale.baseText('workerList.docs.url')" target="_blank">
-				{{ $locale.baseText('workerList.actionBox.description.link') }}
+			{{ i18n.baseText('workerList.actionBox.description') }}
+			<a :href="i18n.baseText('workerList.docs.url')" target="_blank">
+				{{ i18n.baseText('workerList.actionBox.description.link') }}
 			</a>
 		</template>
 	</n8n-action-box>
diff --git a/packages/editor-ui/src/views/WorkflowExecutionsView.vue b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
index d5ff4dcb6b..960379998d 100644
--- a/packages/editor-ui/src/views/WorkflowExecutionsView.vue
+++ b/packages/editor-ui/src/views/WorkflowExecutionsView.vue
@@ -25,6 +25,7 @@ const route = useRoute();
 const router = useRouter();
 const toast = useToast();
 const { callDebounced } = useDebounce();
+
 const workflowHelpers = useWorkflowHelpers({ router });
 const nodeHelpers = useNodeHelpers();
 
@@ -100,6 +101,16 @@ async function fetchExecution() {
 	} catch (error) {
 		toast.showError(error, i18n.baseText('nodeView.showError.openExecution.title'));
 	}
+
+	if (!currentExecution.value) {
+		toast.showMessage({
+			type: 'error',
+			title: i18n.baseText('openExecution.missingExeuctionId.title'),
+			message: i18n.baseText('openExecution.missingExeuctionId.message'),
+		});
+
+		return;
+	}
 }
 
 function onDocumentVisibilityChange() {
diff --git a/packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts b/packages/editor-ui/src/views/WorkflowHistory.test.ts
similarity index 100%
rename from packages/editor-ui/src/views/__tests__/WorkflowHistory.test.ts
rename to packages/editor-ui/src/views/WorkflowHistory.test.ts
diff --git a/packages/editor-ui/src/views/WorkflowHistory.vue b/packages/editor-ui/src/views/WorkflowHistory.vue
index 567cae9a41..792f6b9ef5 100644
--- a/packages/editor-ui/src/views/WorkflowHistory.vue
+++ b/packages/editor-ui/src/views/WorkflowHistory.vue
@@ -20,6 +20,7 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { telemetry } from '@/plugins/telemetry';
 import { useRootStore } from '@/stores/root.store';
 import { getResourcePermissions } from '@/permissions';
+import { usePageRedirectionHelper } from '@/composables/usePageRedirectionHelper';
 
 type WorkflowHistoryActionRecord = {
 	[K in Uppercase<WorkflowHistoryActionTypes[number]>]: Lowercase<K>;
@@ -46,6 +47,8 @@ const route = useRoute();
 const router = useRouter();
 const i18n = useI18n();
 const toast = useToast();
+const pageRedirectionHelper = usePageRedirectionHelper();
+
 const workflowHistoryStore = useWorkflowHistoryStore();
 const uiStore = useUIStore();
 const workflowsStore = useWorkflowsStore();
@@ -296,7 +299,7 @@ const onPreview = async ({ event, id }: { event: MouseEvent; id: WorkflowVersion
 };
 
 const onUpgrade = () => {
-	void uiStore.goToUpgrade('workflow-history', 'upgrade-workflow-history');
+	void pageRedirectionHelper.goToUpgrade('workflow-history', 'upgrade-workflow-history');
 };
 
 watchEffect(async () => {
diff --git a/packages/editor-ui/src/views/WorkflowOnboardingView.vue b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
index 8fa4a6367a..f467406726 100644
--- a/packages/editor-ui/src/views/WorkflowOnboardingView.vue
+++ b/packages/editor-ui/src/views/WorkflowOnboardingView.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
 import { useLoadingService } from '@/composables/useLoadingService';
 import { useI18n } from '@/composables/useI18n';
-import { VIEWS } from '@/constants';
+import { NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL, VIEWS } from '@/constants';
 import { useTemplatesStore } from '@/stores/templates.store';
 import { useWorkflowsStore } from '@/stores/workflows.store';
 import { onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
+import type { IWorkflowDataCreate } from '@/Interface';
+import { SAMPLE_SUBWORKFLOW_WORKFLOW } from '@/constants.workflows';
 
 const loadingService = useLoadingService();
 const templateStore = useTemplatesStore();
@@ -15,6 +17,10 @@ const route = useRoute();
 const i18n = useI18n();
 
 const openWorkflowTemplate = async (templateId: string) => {
+	if (templateId === SAMPLE_SUBWORKFLOW_WORKFLOW.meta.templateId) {
+		await openSampleSubworkflow();
+		return;
+	}
 	try {
 		loadingService.startLoading();
 		const template = await templateStore.getFixedWorkflowTemplate(templateId);
@@ -52,6 +58,42 @@ const openWorkflowTemplate = async (templateId: string) => {
 	}
 };
 
+const openSampleSubworkflow = async () => {
+	try {
+		loadingService.startLoading();
+
+		const projectId = route.query?.projectId;
+
+		const sampleSubWorkflows = Number(route.query?.sampleSubWorkflows ?? 0);
+
+		const workflowName = `${SAMPLE_SUBWORKFLOW_WORKFLOW.name} ${sampleSubWorkflows + 1}`;
+
+		const workflow: IWorkflowDataCreate = {
+			...SAMPLE_SUBWORKFLOW_WORKFLOW,
+			name: workflowName,
+		};
+
+		if (projectId) {
+			workflow.projectId = projectId as string;
+		}
+
+		const newWorkflow = await workflowsStore.createNewWorkflow(workflow);
+
+		const sampleSubworkflowChannel = new BroadcastChannel(NEW_SAMPLE_WORKFLOW_CREATED_CHANNEL);
+
+		sampleSubworkflowChannel.postMessage({ workflowId: newWorkflow.id });
+
+		await router.replace({
+			name: VIEWS.WORKFLOW,
+			params: { name: newWorkflow.id },
+		});
+		loadingService.stopLoading();
+	} catch (e) {
+		await router.replace({ name: VIEWS.NEW_WORKFLOW });
+		loadingService.stopLoading();
+	}
+};
+
 onMounted(async () => {
 	const templateId = route.params.id;
 	if (!templateId || typeof templateId !== 'string') {
diff --git a/packages/editor-ui/src/views/WorkflowsView.test.ts b/packages/editor-ui/src/views/WorkflowsView.test.ts
index 10472afe9c..be2aa2d546 100644
--- a/packages/editor-ui/src/views/WorkflowsView.test.ts
+++ b/packages/editor-ui/src/views/WorkflowsView.test.ts
@@ -5,10 +5,9 @@ import { useUsersStore } from '@/stores/users.store';
 import { createComponentRenderer } from '@/__tests__/render';
 import { useProjectsStore } from '@/stores/projects.store';
 import { createTestingPinia } from '@pinia/testing';
-import { STORES, MORE_ONBOARDING_OPTIONS_EXPERIMENT, VIEWS } from '@/constants';
+import { STORES, VIEWS } from '@/constants';
 import { mockedStore } from '@/__tests__/utils';
-import { usePostHog } from '@/stores/posthog.store';
-import type { Cloud, IUser, IWorkflowDb } from '@/Interface';
+import type { IUser, IWorkflowDb } from '@/Interface';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import type { Project } from '@/types/projects.types';
 import { useWorkflowsStore } from '@/stores/workflows.store';
@@ -19,6 +18,11 @@ import * as usersApi from '@/api/users';
 vi.mock('@/api/projects.api');
 vi.mock('@/api/users');
 vi.mock('@/api/sourceControl');
+vi.mock('@/composables/useGlobalEntityCreation', () => ({
+	useGlobalEntityCreation: () => ({
+		menu: [],
+	}),
+}));
 
 const router = createRouter({
 	history: createWebHistory(),
@@ -53,24 +57,22 @@ describe('WorkflowsView', () => {
 
 	describe('should show empty state', () => {
 		it('for non setup user', () => {
-			const { getByRole } = renderComponent({ pinia: createTestingPinia({ initialState }) });
-			expect(getByRole('heading').textContent).toBe('👋 Welcome!');
+			const { getByText } = renderComponent({ pinia: createTestingPinia({ initialState }) });
+			expect(getByText('👋 Welcome!')).toBeVisible();
 		});
 
 		it('for currentUser user', () => {
 			const pinia = createTestingPinia({ initialState });
 			const userStore = mockedStore(useUsersStore);
 			userStore.currentUser = { firstName: 'John' } as IUser;
-			const { getByRole } = renderComponent({ pinia });
+			const { getByText } = renderComponent({ pinia });
 
-			expect(getByRole('heading').textContent).toBe('👋 Welcome John!');
+			expect(getByText('👋 Welcome John!')).toBeVisible();
 		});
 
 		describe('when onboardingExperiment -> False', () => {
 			const pinia = createTestingPinia({ initialState });
-			const posthog = mockedStore(usePostHog);
 			const sourceControl = mockedStore(useSourceControlStore);
-			posthog.getVariant.mockReturnValue(MORE_ONBOARDING_OPTIONS_EXPERIMENT.control);
 
 			const projectsStore = mockedStore(useProjectsStore);
 
@@ -106,93 +108,6 @@ describe('WorkflowsView', () => {
 
 			expect(router.currentRoute.value.name).toBe(VIEWS.NEW_WORKFLOW);
 		});
-
-		describe('should show courses and templates link for sales users', () => {
-			it('for cloudUser', () => {
-				const pinia = createTestingPinia({ initialState });
-				const userStore = mockedStore(useUsersStore);
-				userStore.currentUserCloudInfo = { role: 'Sales' } as Cloud.UserAccount;
-				const projectsStore = mockedStore(useProjectsStore);
-				projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
-				const { getAllByTestId } = renderComponent({ pinia });
-
-				expect(getAllByTestId('browse-sales-templates-card').length).toBe(2);
-			});
-
-			it('for personalizationAnswers', () => {
-				const pinia = createTestingPinia({ initialState });
-				const userStore = mockedStore(useUsersStore);
-				userStore.currentUser = { personalizationAnswers: { role: 'Sales' } } as IUser;
-				const projectsStore = mockedStore(useProjectsStore);
-				projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
-				const { getAllByTestId } = renderComponent({ pinia });
-
-				expect(getAllByTestId('browse-sales-templates-card').length).toBe(2);
-			});
-		});
-
-		it('should show courses and templates link for onboardingExperiment', () => {
-			const pinia = createTestingPinia({ initialState });
-
-			const projectsStore = mockedStore(useProjectsStore);
-			projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
-
-			const posthog = mockedStore(usePostHog);
-			posthog.getVariant.mockReturnValue(MORE_ONBOARDING_OPTIONS_EXPERIMENT.variant);
-
-			const { getAllByTestId } = renderComponent({ pinia });
-
-			expect(getAllByTestId('browse-sales-templates-card').length).toBe(2);
-		});
-	});
-
-	describe('workflow creation button', () => {
-		it('should create global workflow', async () => {
-			const pushSpy = vi.spyOn(router, 'push');
-			const pinia = createTestingPinia({ initialState });
-			const workflowsStore = mockedStore(useWorkflowsStore);
-			workflowsStore.allWorkflows = [{ id: '1' } as IWorkflowDb];
-
-			const projectsStore = mockedStore(useProjectsStore);
-			projectsStore.fetchProject.mockResolvedValue({} as Project);
-			projectsStore.personalProject = { scopes: ['workflow:create'] } as Project;
-
-			const { getByTestId } = renderComponent({ pinia });
-			expect(getByTestId('resources-list-add')).toBeInTheDocument();
-
-			expect(getByTestId('resources-list-add').textContent).toBe('Add workflow');
-
-			await userEvent.click(getByTestId('resources-list-add'));
-
-			expect(pushSpy).toHaveBeenCalledWith({ name: VIEWS.NEW_WORKFLOW, query: { projectId: '' } });
-		});
-
-		it('should create a project specific workflow', async () => {
-			await router.replace({ path: '/project-id' });
-			const pushSpy = vi.spyOn(router, 'push');
-
-			const pinia = createTestingPinia({ initialState });
-			const workflowsStore = mockedStore(useWorkflowsStore);
-			workflowsStore.allWorkflows = [{ id: '1' } as IWorkflowDb];
-
-			const projectsStore = mockedStore(useProjectsStore);
-
-			projectsStore.currentProject = { scopes: ['workflow:create'] } as Project;
-
-			const { getByTestId } = renderComponent({ pinia });
-			expect(router.currentRoute.value.params.projectId).toBe('project-id');
-
-			expect(getByTestId('resources-list-add')).toBeInTheDocument();
-
-			expect(getByTestId('resources-list-add').textContent).toBe('Add workflow to project');
-
-			await userEvent.click(getByTestId('resources-list-add'));
-
-			expect(pushSpy).toHaveBeenCalledWith({
-				name: VIEWS.NEW_WORKFLOW,
-				query: { projectId: 'project-id' },
-			});
-		});
 	});
 
 	describe('filters', () => {
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index c629f4e318..1d5c3514d8 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -1,10 +1,18 @@
 <script lang="ts" setup>
 import { computed, onMounted, watch, ref } from 'vue';
-import ResourcesListLayout, { type IResource } from '@/components/layouts/ResourcesListLayout.vue';
+import ResourcesListLayout, {
+	type IResource,
+	type IFilters,
+} from '@/components/layouts/ResourcesListLayout.vue';
 import WorkflowCard from '@/components/WorkflowCard.vue';
 import WorkflowTagsDropdown from '@/components/WorkflowTagsDropdown.vue';
-import { EnterpriseEditionFeature, MORE_ONBOARDING_OPTIONS_EXPERIMENT, VIEWS } from '@/constants';
-import type { ITag, IUser, IWorkflowDb } from '@/Interface';
+import {
+	EASY_AI_WORKFLOW_EXPERIMENT,
+	AI_CREDITS_EXPERIMENT,
+	EnterpriseEditionFeature,
+	VIEWS,
+} from '@/constants';
+import type { IUser, IWorkflowDb } from '@/Interface';
 import { useUIStore } from '@/stores/ui.store';
 import { useSettingsStore } from '@/stores/settings.store';
 import { useUsersStore } from '@/stores/users.store';
@@ -12,8 +20,6 @@ import { useWorkflowsStore } from '@/stores/workflows.store';
 import { useSourceControlStore } from '@/stores/sourceControl.store';
 import { useTagsStore } from '@/stores/tags.store';
 import { useProjectsStore } from '@/stores/projects.store';
-import ProjectTabs from '@/components/Projects/ProjectTabs.vue';
-import { useTemplatesStore } from '@/stores/templates.store';
 import { getResourcePermissions } from '@/permissions';
 import { usePostHog } from '@/stores/posthog.store';
 import { useDocumentTitle } from '@/composables/useDocumentTitle';
@@ -21,7 +27,6 @@ import { useI18n } from '@/composables/useI18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useTelemetry } from '@/composables/useTelemetry';
 import {
-	N8nButton,
 	N8nCard,
 	N8nHeading,
 	N8nIcon,
@@ -29,9 +34,10 @@ import {
 	N8nOption,
 	N8nSelect,
 	N8nText,
-	N8nTooltip,
 } from 'n8n-design-system';
 import { pickBy } from 'lodash-es';
+import ProjectHeader from '@/components/Projects/ProjectHeader.vue';
+import { getEasyAiWorkflowJson } from '@/utils/easyAiWorkflowUtils';
 
 const i18n = useI18n();
 const route = useRoute();
@@ -43,15 +49,12 @@ const workflowsStore = useWorkflowsStore();
 const settingsStore = useSettingsStore();
 const posthogStore = usePostHog();
 const projectsStore = useProjectsStore();
-const templatesStore = useTemplatesStore();
 const telemetry = useTelemetry();
 const uiStore = useUIStore();
 const tagsStore = useTagsStore();
 const documentTitle = useDocumentTitle();
 
-interface Filters {
-	search: string;
-	homeProject: string;
+interface Filters extends IFilters {
 	status: string | boolean;
 	tags: string[];
 }
@@ -69,6 +72,7 @@ const filters = ref<Filters>({
 	status: StatusFilter.ALL,
 	tags: [],
 });
+const easyAICalloutVisible = ref(true);
 
 const readOnlyEnv = computed(() => sourceControlStore.preferences.branchReadOnly);
 const currentUser = computed(() => usersStore.currentUser ?? ({} as IUser));
@@ -92,33 +96,12 @@ const statusFilterOptions = computed(() => [
 	},
 ]);
 
-const userRole = computed(() => {
-	const role = usersStore.currentUserCloudInfo?.role;
-	if (role) return role;
-
-	const answers = usersStore.currentUser?.personalizationAnswers;
-	if (answers && 'role' in answers) {
-		return answers.role;
-	}
-
-	return undefined;
-});
-
-const isOnboardingExperimentEnabled = computed(() => {
-	return (
-		posthogStore.getVariant(MORE_ONBOARDING_OPTIONS_EXPERIMENT.name) ===
-		MORE_ONBOARDING_OPTIONS_EXPERIMENT.variant
-	);
-});
-
-const isSalesUser = computed(() => {
-	return ['Sales', 'sales-and-marketing'].includes(userRole.value || '');
-});
-
-const addWorkflowButtonText = computed(() => {
-	return projectsStore.currentProject
-		? i18n.baseText('workflows.project.add')
-		: i18n.baseText('workflows.add');
+const showEasyAIWorkflowCallout = computed(() => {
+	const isEasyAIWorkflowExperimentEnabled =
+		posthogStore.getVariant(EASY_AI_WORKFLOW_EXPERIMENT.name) ===
+		EASY_AI_WORKFLOW_EXPERIMENT.variant;
+	const easyAIWorkflowOnboardingDone = usersStore.isEasyAIWorkflowOnboardingDone;
+	return isEasyAIWorkflowExperimentEnabled && !easyAIWorkflowOnboardingDone;
 });
 
 const projectPermissions = computed(() => {
@@ -137,16 +120,13 @@ const emptyListDescription = computed(() => {
 	}
 });
 
-const onFilter = (
-	resource: IWorkflowDb,
-	newFilters: { tags: string[]; search: string; status: string | boolean },
-	matches: boolean,
-): boolean => {
-	if (settingsStore.areTagsEnabled && newFilters.tags.length > 0) {
+const onFilter = (resource: IResource, newFilters: IFilters, matches: boolean): boolean => {
+	const iFilters = newFilters as Filters;
+	if (settingsStore.areTagsEnabled && iFilters.tags.length > 0) {
 		matches =
 			matches &&
-			newFilters.tags.every((tag) =>
-				(resource.tags as ITag[])?.find((resourceTag) =>
+			iFilters.tags.every((tag) =>
+				(resource as IWorkflowDb).tags?.find((resourceTag) =>
 					typeof resourceTag === 'object'
 						? `${resourceTag.id}` === `${tag}`
 						: `${resourceTag}` === `${tag}`,
@@ -155,14 +135,14 @@ const onFilter = (
 	}
 
 	if (newFilters.status !== '') {
-		matches = matches && resource.active === newFilters.status;
+		matches = matches && (resource as IWorkflowDb).active === newFilters.status;
 	}
 
 	return matches;
 };
 
 // Methods
-const onFiltersUpdated = (newFilters: Filters) => {
+const onFiltersUpdated = (newFilters: IFilters) => {
 	Object.assign(filters.value, newFilters);
 };
 
@@ -179,22 +159,10 @@ const addWorkflow = () => {
 	trackEmptyCardClick('blank');
 };
 
-const getTemplateRepositoryURL = () => templatesStore.websiteTemplateRepositoryURL;
-
 const trackEmptyCardClick = (option: 'blank' | 'templates' | 'courses') => {
 	telemetry.track('User clicked empty page option', {
 		option,
 	});
-	if (option === 'templates' && isSalesUser.value) {
-		trackCategoryLinkClick('Sales');
-	}
-};
-
-const trackCategoryLinkClick = (category: string) => {
-	telemetry.track(`User clicked Browse ${category} Templates`, {
-		role: usersStore.currentUserCloudInfo?.role,
-		active_workflow_count: workflowsStore.activeWorkflows.length,
-	});
 };
 
 const initialize = async () => {
@@ -296,6 +264,35 @@ onMounted(async () => {
 	await setFiltersFromQueryString();
 	void usersStore.showPersonalizationSurvey();
 });
+
+const openAIWorkflow = async (source: string) => {
+	dismissEasyAICallout();
+	telemetry.track(
+		'User clicked test AI workflow',
+		{
+			source,
+		},
+		{ withPostHog: true },
+	);
+
+	const isAiCreditsExperimentEnabled =
+		posthogStore.getVariant(AI_CREDITS_EXPERIMENT.name) === AI_CREDITS_EXPERIMENT.variant;
+
+	const easyAiWorkflowJson = getEasyAiWorkflowJson({
+		isInstanceInAiFreeCreditsExperiment: isAiCreditsExperimentEnabled,
+		withOpenAiFreeCredits: settingsStore.aiCreditsQuota,
+	});
+
+	await router.push({
+		name: VIEWS.TEMPLATE_IMPORT,
+		params: { id: easyAiWorkflowJson.meta.templateId },
+		query: { fromJson: 'true' },
+	});
+};
+
+const dismissEasyAICallout = () => {
+	easyAICalloutVisible.value = false;
+};
 </script>
 
 <template>
@@ -313,31 +310,36 @@ onMounted(async () => {
 		@update:filters="onFiltersUpdated"
 	>
 		<template #header>
-			<ProjectTabs />
+			<ProjectHeader />
 		</template>
-		<template #add-button="{ disabled }">
-			<N8nTooltip :disabled="!readOnlyEnv">
-				<div>
-					<N8nButton
-						size="large"
-						block
-						:disabled="disabled"
-						data-test-id="resources-list-add"
-						@click="addWorkflow"
-					>
-						{{ addWorkflowButtonText }}
-					</N8nButton>
-				</div>
-				<template #content>
-					<i18n-t tag="span" keypath="mainSidebar.workflows.readOnlyEnv.tooltip">
-						<template #link>
-							<a target="_blank" href="https://docs.n8n.io/source-control-environments/">
-								{{ i18n.baseText('mainSidebar.workflows.readOnlyEnv.tooltip.link') }}
-							</a>
-						</template>
-					</i18n-t>
+		<template #callout>
+			<N8nCallout
+				v-if="showEasyAIWorkflowCallout && easyAICalloutVisible"
+				theme="secondary"
+				icon="robot"
+				:class="$style['easy-ai-workflow-callout']"
+			>
+				{{ i18n.baseText('workflows.list.easyAI') }}
+				<template #trailingContent>
+					<div :class="$style['callout-trailing-content']">
+						<n8n-button
+							data-test-id="easy-ai-button"
+							size="small"
+							type="secondary"
+							@click="openAIWorkflow('callout')"
+						>
+							{{ i18n.baseText('generic.tryNow') }}
+						</n8n-button>
+						<N8nIcon
+							size="small"
+							icon="times"
+							:title="i18n.baseText('generic.dismiss')"
+							class="clickable"
+							@click="dismissEasyAICallout"
+						/>
+					</div>
 				</template>
-			</N8nTooltip>
+			</N8nCallout>
 		</template>
 		<template #default="{ data, updateItemSize }">
 			<WorkflowCard
@@ -360,7 +362,7 @@ onMounted(async () => {
 							: i18n.baseText('workflows.empty.heading.userNotSetup')
 					}}
 				</N8nHeading>
-				<N8nText v-if="!isOnboardingExperimentEnabled" size="large" color="text-base">
+				<N8nText size="large" color="text-base">
 					{{ emptyListDescription }}
 				</N8nText>
 			</div>
@@ -379,40 +381,18 @@ onMounted(async () => {
 						{{ i18n.baseText('workflows.empty.startFromScratch') }}
 					</N8nText>
 				</N8nCard>
-				<a
-					v-if="isSalesUser || isOnboardingExperimentEnabled"
-					href="https://docs.n8n.io/courses/#available-courses"
+				<N8nCard
+					v-if="showEasyAIWorkflowCallout"
 					:class="$style.emptyStateCard"
-					target="_blank"
+					hoverable
+					data-test-id="easy-ai-workflow-card"
+					@click="openAIWorkflow('empty')"
 				>
-					<N8nCard
-						hoverable
-						data-test-id="browse-sales-templates-card"
-						@click="trackEmptyCardClick('courses')"
-					>
-						<N8nIcon :class="$style.emptyStateCardIcon" icon="graduation-cap" />
-						<N8nText size="large" class="mt-xs" color="text-dark">
-							{{ i18n.baseText('workflows.empty.learnN8n') }}
-						</N8nText>
-					</N8nCard>
-				</a>
-				<a
-					v-if="isSalesUser || isOnboardingExperimentEnabled"
-					:href="getTemplateRepositoryURL()"
-					:class="$style.emptyStateCard"
-					target="_blank"
-				>
-					<N8nCard
-						hoverable
-						data-test-id="browse-sales-templates-card"
-						@click="trackEmptyCardClick('templates')"
-					>
-						<N8nIcon :class="$style.emptyStateCardIcon" icon="box-open" />
-						<N8nText size="large" class="mt-xs" color="text-dark">
-							{{ i18n.baseText('workflows.empty.browseTemplates') }}
-						</N8nText>
-					</N8nCard>
-				</a>
+					<N8nIcon :class="$style.emptyStateCardIcon" icon="robot" />
+					<N8nText size="large" class="mt-xs pl-2xs pr-2xs" color="text-dark">
+						{{ i18n.baseText('workflows.empty.easyAI') }}
+					</N8nText>
+				</N8nCard>
 			</div>
 		</template>
 		<template #filters="{ setKeyValue }">
@@ -464,6 +444,19 @@ onMounted(async () => {
 	justify-content: center;
 }
 
+.easy-ai-workflow-callout {
+	// Make the callout padding in line with workflow cards
+	margin-top: var(--spacing-xs);
+	padding-left: var(--spacing-s);
+	padding-right: var(--spacing-m);
+
+	.callout-trailing-content {
+		display: flex;
+		align-items: center;
+		gap: var(--spacing-m);
+	}
+}
+
 .emptyStateCard {
 	width: 192px;
 	text-align: center;
diff --git a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts b/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
deleted file mode 100644
index c77421335d..0000000000
--- a/packages/editor-ui/src/views/__tests__/SettingsSso.test.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { createPinia, setActivePinia } from 'pinia';
-import SettingsSso from '@/views/SettingsSso.vue';
-
-import { retry } from '@/__tests__/utils';
-import { setupServer } from '@/__tests__/server';
-import { afterAll, beforeAll } from 'vitest';
-import { useSettingsStore } from '@/stores/settings.store';
-import userEvent from '@testing-library/user-event';
-import { useSSOStore } from '@/stores/sso.store';
-import { createComponentRenderer } from '@/__tests__/render';
-import { EnterpriseEditionFeature } from '@/constants';
-import { nextTick } from 'vue';
-
-let pinia: ReturnType<typeof createPinia>;
-let ssoStore: ReturnType<typeof useSSOStore>;
-let settingsStore: ReturnType<typeof useSettingsStore>;
-let server: ReturnType<typeof setupServer>;
-
-const renderComponent = createComponentRenderer(SettingsSso);
-
-describe('SettingsSso', () => {
-	beforeAll(() => {
-		server = setupServer();
-	});
-
-	beforeEach(async () => {
-		window.open = vi.fn();
-
-		pinia = createPinia();
-		setActivePinia(pinia);
-
-		ssoStore = useSSOStore();
-		settingsStore = useSettingsStore();
-
-		await settingsStore.getSettings();
-	});
-
-	afterEach(() => {
-		vi.clearAllMocks();
-	});
-
-	afterAll(() => {
-		server.shutdown();
-	});
-
-	it('should render paywall state when there is no license', () => {
-		const { getByTestId, queryByTestId, queryByRole } = renderComponent({
-			pinia,
-		});
-
-		expect(queryByRole('checkbox')).not.toBeInTheDocument();
-		expect(queryByTestId('sso-content-licensed')).not.toBeInTheDocument();
-		expect(getByTestId('sso-content-unlicensed')).toBeInTheDocument();
-	});
-
-	it('should render licensed content', async () => {
-		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
-		await nextTick();
-
-		const { getByTestId, queryByTestId, getByRole } = renderComponent({
-			pinia,
-		});
-
-		expect(getByRole('switch')).toBeInTheDocument();
-		expect(getByTestId('sso-content-licensed')).toBeInTheDocument();
-		expect(queryByTestId('sso-content-unlicensed')).not.toBeInTheDocument();
-	});
-
-	it('should enable activation checkbox and test button if data is already saved', async () => {
-		await ssoStore.getSamlConfig();
-		settingsStore.settings.enterprise[EnterpriseEditionFeature.Saml] = true;
-		await nextTick();
-
-		const { container, getByTestId, getByRole } = renderComponent({
-			pinia,
-		});
-
-		const xmlRadioButton = getByTestId('radio-button-xml');
-		await userEvent.click(xmlRadioButton);
-
-		await retry(() =>
-			expect(container.querySelector('textarea[name="metadata"]')).toHaveValue(
-				'<?xml version="1.0"?>',
-			),
-		);
-
-		expect(getByRole('switch')).toBeEnabled();
-		expect(getByTestId('sso-test')).toBeEnabled();
-	});
-});
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/editor-ui/tsconfig.json b/packages/editor-ui/tsconfig.json
index 88dc3346f6..7ba161b78d 100644
--- a/packages/editor-ui/tsconfig.json
+++ b/packages/editor-ui/tsconfig.json
@@ -20,11 +20,13 @@
 			"@/*": ["./src/*"],
 			"n8n-design-system": ["../design-system/src/main.ts"],
 			"n8n-design-system/*": ["../design-system/src/*"],
-			"@n8n/chat/*": ["../@n8n/chat/src/*"]
+			"@n8n/chat/*": ["../@n8n/chat/src/*"],
+			"@n8n/api-types*": ["../@n8n/api-types/src*"]
 		},
 		"lib": ["esnext", "dom", "dom.iterable", "scripthost"],
 		// TODO: remove all options below this line
 		"useUnknownInCatchVariables": false
 	},
-	"include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.vue"]
+	"include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.vue"],
+	"exclude": ["src/plugins/codemirror/typescript/worker/**/*.d.ts"]
 }
diff --git a/packages/editor-ui/vite.config.mts b/packages/editor-ui/vite.config.mts
index f7d81cc3cf..0a5c157c39 100644
--- a/packages/editor-ui/vite.config.mts
+++ b/packages/editor-ui/vite.config.mts
@@ -1,17 +1,22 @@
 import vue from '@vitejs/plugin-vue';
 import { resolve } from 'path';
 import { defineConfig, mergeConfig } from 'vite';
-import { sentryVitePlugin } from '@sentry/vite-plugin';
+import svgLoader from 'vite-svg-loader';
 
 import { vitestConfig } from '../design-system/vite.config.mts';
 import icons from 'unplugin-icons/vite';
 import iconsResolver from 'unplugin-icons/resolver';
 import components from 'unplugin-vue-components/vite';
+import browserslistToEsbuild from 'browserslist-to-esbuild';
+import legacy from '@vitejs/plugin-legacy';
+import browserslist from 'browserslist';
 
 const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/';
 
 const { NODE_ENV } = process.env;
 
+const browsers = browserslist.loadConfig({ path: process.cwd() });
+
 const alias = [
 	{ find: '@', replacement: resolve(__dirname, 'src') },
 	{ find: 'stream', replacement: 'stream-browserify' },
@@ -55,24 +60,15 @@ const plugins = [
 		],
 	}),
 	vue(),
+	svgLoader(),
+	legacy({
+		modernTargets: browsers,
+		modernPolyfills: true,
+		renderLegacyChunks: false,
+	}),
 ];
 
-const { SENTRY_AUTH_TOKEN: authToken, RELEASE: release } = process.env;
-if (release && authToken) {
-	plugins.push(
-		sentryVitePlugin({
-			org: 'n8nio',
-			project: 'instance-frontend',
-			// Auth tokens can be obtained from https://sentry.io/settings/account/api/auth-tokens/
-			// and needs the `project:releases` and `org:read` scopes
-			authToken,
-			telemetry: false,
-			release: {
-				name: release,
-			},
-		}),
-	);
-}
+const { RELEASE: release } = process.env;
 
 export default mergeConfig(
 	defineConfig({
@@ -89,13 +85,21 @@ export default mergeConfig(
 		css: {
 			preprocessorOptions: {
 				scss: {
-					additionalData: '\n@use "@/n8n-theme-variables.scss" as *;\n',
+					additionalData: [
+						'',
+						'@use "@/n8n-theme-variables.scss" as *;',
+						'@use "n8n-design-system/css/mixins" as mixins;',
+					].join('\n'),
 				},
 			},
 		},
 		build: {
 			minify: !!release,
 			sourcemap: !!release,
+			target: browserslistToEsbuild(browsers),
+		},
+		worker: {
+			format: 'es',
 		},
 	}),
 	vitestConfig,
diff --git a/packages/node-dev/.eslintrc.js b/packages/node-dev/.eslintrc.js
index cb14470366..cda3ce866a 100644
--- a/packages/node-dev/.eslintrc.js
+++ b/packages/node-dev/.eslintrc.js
@@ -10,7 +10,6 @@ module.exports = {
 		'templates/**', // TODO: remove this
 	],
 	rules: {
-		'import/order': 'off', // TODO: remove this
 		'@typescript-eslint/ban-ts-comment': ['warn', { 'ts-ignore': true }],
 		'n8n-local-rules/no-plain-errors': 'off',
 	},
diff --git a/packages/node-dev/commands/build.ts b/packages/node-dev/commands/build.ts
index 5a78bf27ca..042a15111d 100644
--- a/packages/node-dev/commands/build.ts
+++ b/packages/node-dev/commands/build.ts
@@ -1,4 +1,4 @@
-import { Container } from 'typedi';
+import { Container } from '@n8n/di';
 import { Command, Flags } from '@oclif/core';
 import { InstanceSettings } from 'n8n-core';
 
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 8455dfbc43..47b3b0b892 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "1.65.0",
+  "version": "1.75.0",
   "description": "CLI to simplify n8n credentials/node development",
   "main": "dist/src/index",
   "types": "dist/src/index.d.ts",
@@ -39,6 +39,7 @@
     "@types/inquirer": "^6.5.0"
   },
   "dependencies": {
+    "@n8n/di": "workspace:*",
     "@oclif/core": "4.0.7",
     "change-case": "^4.1.1",
     "fast-glob": "catalog:",
@@ -46,7 +47,6 @@
     "n8n-core": "workspace:*",
     "n8n-workflow": "workspace:*",
     "replace-in-file": "^6.0.0",
-    "tmp-promise": "^3.0.3",
-    "typedi": "catalog:"
+    "tmp-promise": "^3.0.3"
   }
 }
diff --git a/packages/node-dev/src/Build.ts b/packages/node-dev/src/Build.ts
index f600ca5297..b0446472c2 100644
--- a/packages/node-dev/src/Build.ts
+++ b/packages/node-dev/src/Build.ts
@@ -1,14 +1,14 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-import glob from 'fast-glob';
+import { Container } from '@n8n/di';
 import { spawn } from 'child_process';
+import glob from 'fast-glob';
 import { copyFile, mkdir, readFile, writeFile } from 'fs/promises';
+import { InstanceSettings } from 'n8n-core';
+import { jsonParse } from 'n8n-workflow';
 import { join, dirname, resolve as resolvePath } from 'path';
-import { Container } from 'typedi';
 import { file as tmpFile } from 'tmp-promise';
 
-import { jsonParse } from 'n8n-workflow';
-import { InstanceSettings } from 'n8n-core';
 import type { IBuildOptions } from './Interfaces';
 
 /**
@@ -85,9 +85,7 @@ export async function buildFiles({
 
 		// Forward the output of the child process to the main one
 		// that the user can see what is happening
-		// @ts-ignore
 		buildProcess.stdout.pipe(process.stdout);
-		// @ts-ignore
 		buildProcess.stderr.pipe(process.stderr);
 
 		// Make sure that the child process gets also always terminated
diff --git a/packages/nodes-base/.eslintrc.js b/packages/nodes-base/.eslintrc.js
index fb4629d9de..e99abcf38f 100644
--- a/packages/nodes-base/.eslintrc.js
+++ b/packages/nodes-base/.eslintrc.js
@@ -15,7 +15,6 @@ module.exports = {
 		eqeqeq: 'warn',
 		'id-denylist': 'warn',
 		'import/extensions': 'warn',
-		'import/order': 'warn',
 		'prefer-spread': 'warn',
 		'import/no-extraneous-dependencies': 'warn',
 
diff --git a/packages/nodes-base/credentials/Aws.credentials.ts b/packages/nodes-base/credentials/Aws.credentials.ts
index 9170657a4f..9e968fdce5 100644
--- a/packages/nodes-base/credentials/Aws.credentials.ts
+++ b/packages/nodes-base/credentials/Aws.credentials.ts
@@ -1,6 +1,5 @@
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestRequest,
@@ -330,7 +329,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 +371,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 +410,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/CiscoSecureEndpointApi.credentials.ts b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
index 7ffac61779..99e4c06f4c 100644
--- a/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
+++ b/packages/nodes-base/credentials/CiscoSecureEndpointApi.credentials.ts
@@ -1,3 +1,4 @@
+import axios from 'axios';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestRequest,
@@ -6,8 +7,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import axios from 'axios';
-
 export class CiscoSecureEndpointApi implements ICredentialType {
 	name = 'ciscoSecureEndpointApi';
 
diff --git a/packages/nodes-base/credentials/CrowdDevApi.credentials.ts b/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
index 640b3c09ff..cfb9898343 100644
--- a/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
+++ b/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
@@ -35,7 +35,7 @@ export class CrowdDevApi implements ICredentialType {
 			default: '',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			description: 'Whether to connect even if SSL certificate validation is not possible',
diff --git a/packages/nodes-base/credentials/DfirIrisApi.credentials.ts b/packages/nodes-base/credentials/DfirIrisApi.credentials.ts
index cf631fba06..c1db485bdb 100644
--- a/packages/nodes-base/credentials/DfirIrisApi.credentials.ts
+++ b/packages/nodes-base/credentials/DfirIrisApi.credentials.ts
@@ -40,7 +40,7 @@ export class DfirIrisApi implements ICredentialType {
 			default: '',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'skipSslCertificateValidation',
 			type: 'boolean',
 			default: false,
diff --git a/packages/nodes-base/credentials/ERPNextApi.credentials.ts b/packages/nodes-base/credentials/ERPNextApi.credentials.ts
index c35a748aaa..78eb6795f9 100644
--- a/packages/nodes-base/credentials/ERPNextApi.credentials.ts
+++ b/packages/nodes-base/credentials/ERPNextApi.credentials.ts
@@ -93,7 +93,7 @@ export class ERPNextApi implements ICredentialType {
 			},
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			description: 'Whether to connect even if SSL certificate validation is not possible',
diff --git a/packages/nodes-base/credentials/ElasticsearchApi.credentials.ts b/packages/nodes-base/credentials/ElasticsearchApi.credentials.ts
index 41633dc369..25811fba80 100644
--- a/packages/nodes-base/credentials/ElasticsearchApi.credentials.ts
+++ b/packages/nodes-base/credentials/ElasticsearchApi.credentials.ts
@@ -37,7 +37,7 @@ export class ElasticsearchApi implements ICredentialType {
 			description: "Referred to as Elasticsearch 'endpoint' in the Elastic deployment dashboard",
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'ignoreSSLIssues',
 			type: 'boolean',
 			default: false,
@@ -56,7 +56,7 @@ export class ElasticsearchApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: '={{$credentials.baseUrl}}',
+			baseURL: '={{$credentials.baseUrl}}'.replace(/\/$/, ''),
 			url: '/_xpack?human=false',
 			skipSslCertificateValidation: '={{$credentials.ignoreSSLIssues}}',
 		},
diff --git a/packages/nodes-base/credentials/GhostAdminApi.credentials.ts b/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
index 7c85f42527..5e1040958e 100644
--- a/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
+++ b/packages/nodes-base/credentials/GhostAdminApi.credentials.ts
@@ -1,3 +1,4 @@
+import jwt from 'jsonwebtoken';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestRequest,
@@ -6,7 +7,6 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import jwt from 'jsonwebtoken';
 export class GhostAdminApi implements ICredentialType {
 	name = 'ghostAdminApi';
 
diff --git a/packages/nodes-base/credentials/GoogleApi.credentials.ts b/packages/nodes-base/credentials/GoogleApi.credentials.ts
index 96fa9e5f40..73863c7952 100644
--- a/packages/nodes-base/credentials/GoogleApi.credentials.ts
+++ b/packages/nodes-base/credentials/GoogleApi.credentials.ts
@@ -1,3 +1,7 @@
+import type { AxiosRequestConfig } from 'axios';
+import axios from 'axios';
+import jwt from 'jsonwebtoken';
+import moment from 'moment-timezone';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialType,
@@ -6,13 +10,213 @@ import type {
 	Icon,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
-import type { AxiosRequestConfig } from 'axios';
-
-import axios from 'axios';
+const regions = [
+	{
+		name: 'africa-south1',
+		displayName: 'Africa',
+		location: 'Johannesburg',
+	},
+	{
+		name: 'asia-east1',
+		displayName: 'Asia Pacific',
+		location: 'Changhua County',
+	},
+	{
+		name: 'asia-east2',
+		displayName: 'Asia Pacific',
+		location: 'Hong Kong',
+	},
+	{
+		name: 'asia-northeast1',
+		displayName: 'Asia Pacific',
+		location: 'Tokyo',
+	},
+	{
+		name: 'asia-northeast2',
+		displayName: 'Asia Pacific',
+		location: 'Osaka',
+	},
+	{
+		name: 'asia-northeast3',
+		displayName: 'Asia Pacific',
+		location: 'Seoul',
+	},
+	{
+		name: 'asia-south1',
+		displayName: 'Asia Pacific',
+		location: 'Mumbai',
+	},
+	{
+		name: 'asia-south2',
+		displayName: 'Asia Pacific',
+		location: 'Delhi',
+	},
+	{
+		name: 'asia-southeast1',
+		displayName: 'Asia Pacific',
+		location: 'Jurong West',
+	},
+	{
+		name: 'asia-southeast2',
+		displayName: 'Asia Pacific',
+		location: 'Jakarta',
+	},
+	{
+		name: 'australia-southeast1',
+		displayName: 'Asia Pacific',
+		location: 'Sydney',
+	},
+	{
+		name: 'australia-southeast2',
+		displayName: 'Asia Pacific',
+		location: 'Melbourne',
+	},
+	{
+		name: 'europe-central2',
+		displayName: 'Europe',
+		location: 'Warsaw',
+	},
+	{
+		name: 'europe-north1',
+		displayName: 'Europe',
+		location: 'Hamina',
+	},
+	{
+		name: 'europe-southwest1',
+		displayName: 'Europe',
+		location: 'Madrid',
+	},
+	{
+		name: 'europe-west1',
+		displayName: 'Europe',
+		location: 'St. Ghislain',
+	},
+	{
+		name: 'europe-west10',
+		displayName: 'Europe',
+		location: 'Berlin',
+	},
+	{
+		name: 'europe-west12',
+		displayName: 'Europe',
+		location: 'Turin',
+	},
+	{
+		name: 'europe-west2',
+		displayName: 'Europe',
+		location: 'London',
+	},
+	{
+		name: 'europe-west3',
+		displayName: 'Europe',
+		location: 'Frankfurt',
+	},
+	{
+		name: 'europe-west4',
+		displayName: 'Europe',
+		location: 'Eemshaven',
+	},
+	{
+		name: 'europe-west6',
+		displayName: 'Europe',
+		location: 'Zurich',
+	},
+	{
+		name: 'europe-west8',
+		displayName: 'Europe',
+		location: 'Milan',
+	},
+	{
+		name: 'europe-west9',
+		displayName: 'Europe',
+		location: 'Paris',
+	},
+	{
+		name: 'me-central1',
+		displayName: 'Middle East',
+		location: 'Doha',
+	},
+	{
+		name: 'me-central2',
+		displayName: 'Middle East',
+		location: 'Dammam',
+	},
+	{
+		name: 'me-west1',
+		displayName: 'Middle East',
+		location: 'Tel Aviv',
+	},
+	{
+		name: 'northamerica-northeast1',
+		displayName: 'Americas',
+		location: 'Montréal',
+	},
+	{
+		name: 'northamerica-northeast2',
+		displayName: 'Americas',
+		location: 'Toronto',
+	},
+	{
+		name: 'northamerica-south1',
+		displayName: 'Americas',
+		location: 'Queretaro',
+	},
+	{
+		name: 'southamerica-east1',
+		displayName: 'Americas',
+		location: 'Osasco',
+	},
+	{
+		name: 'southamerica-west1',
+		displayName: 'Americas',
+		location: 'Santiago',
+	},
+	{
+		name: 'us-central1',
+		displayName: 'Americas',
+		location: 'Council Bluffs',
+	},
+	{
+		name: 'us-east1',
+		displayName: 'Americas',
+		location: 'Moncks Corner',
+	},
+	{
+		name: 'us-east4',
+		displayName: 'Americas',
+		location: 'Ashburn',
+	},
+	{
+		name: 'us-east5',
+		displayName: 'Americas',
+		location: 'Columbus',
+	},
+	{
+		name: 'us-south1',
+		displayName: 'Americas',
+		location: 'Dallas',
+	},
+	{
+		name: 'us-west1',
+		displayName: 'Americas',
+		location: 'The Dalles',
+	},
+	{
+		name: 'us-west2',
+		displayName: 'Americas',
+		location: 'Los Angeles',
+	},
+	{
+		name: 'us-west3',
+		displayName: 'Americas',
+		location: 'Salt Lake City',
+	},
+	{
+		name: 'us-west4',
+		displayName: 'Americas',
+		location: 'Las Vegas',
+	},
+] as const;
 
 export class GoogleApi implements ICredentialType {
 	name = 'googleApi';
@@ -24,6 +228,18 @@ export class GoogleApi implements ICredentialType {
 	icon: Icon = 'file:icons/Google.svg';
 
 	properties: INodeProperties[] = [
+		{
+			displayName: 'Region',
+			name: 'region',
+			type: 'options',
+			options: regions.map((r) => ({
+				name: `${r.displayName} (${r.location}) - ${r.name}`,
+				value: r.name,
+			})),
+			default: 'us-central1',
+			description:
+				'The region where the Google Cloud service is located. This applies only to specific nodes, like the Google Vertex Chat Model',
+		},
 		{
 			displayName: 'Service Account Email',
 			name: 'email',
diff --git a/packages/nodes-base/credentials/GotifyApi.credentials.ts b/packages/nodes-base/credentials/GotifyApi.credentials.ts
index 6d86c0872d..a609dce92f 100644
--- a/packages/nodes-base/credentials/GotifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/GotifyApi.credentials.ts
@@ -36,7 +36,7 @@ export class GotifyApi implements ICredentialType {
 			description: 'The URL of the Gotify host',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'ignoreSSLIssues',
 			type: 'boolean',
 			default: false,
diff --git a/packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts b/packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts
index 656cfcc0fb..f41ef76449 100644
--- a/packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/HighLevelOAuth2Api.credentials.ts
@@ -61,5 +61,15 @@ export class HighLevelOAuth2Api implements ICredentialType {
 			type: 'hidden',
 			default: 'body',
 		},
+		{
+			displayName:
+				'Make sure your credentials include the required OAuth scopes for all actions this node performs.',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+			displayOptions: {
+				hideOnCloud: true,
+			},
+		},
 	];
 }
diff --git a/packages/nodes-base/credentials/IntercomApi.credentials.ts b/packages/nodes-base/credentials/IntercomApi.credentials.ts
index 4145121d4f..b4b129ab5c 100644
--- a/packages/nodes-base/credentials/IntercomApi.credentials.ts
+++ b/packages/nodes-base/credentials/IntercomApi.credentials.ts
@@ -1,4 +1,9 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
 
 export class IntercomApi implements ICredentialType {
 	name = 'intercomApi';
@@ -16,4 +21,22 @@ export class IntercomApi implements ICredentialType {
 			default: '',
 		},
 	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.apiKey}}',
+				Accept: 'application/json',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.intercom.io',
+			url: '/me',
+			method: 'GET',
+		},
+	};
 }
diff --git a/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts b/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
index b1e22ddfd9..1f1ba72467 100644
--- a/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/LinearOAuth2Api.credentials.ts
@@ -1,7 +1,5 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
-const scopes = ['read', 'write', 'issues:create', 'comments:create'];
-
 export class LinearOAuth2Api implements ICredentialType {
 	name = 'linearOAuth2Api';
 
@@ -50,11 +48,19 @@ export class LinearOAuth2Api implements ICredentialType {
 			],
 			default: 'user',
 		},
+		{
+			displayName: 'Include Admin Scope',
+			name: 'includeAdminScope',
+			type: 'boolean',
+			default: false,
+			description: 'Grants the "Admin" scope, Needed to create webhooks',
+		},
 		{
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden',
-			default: scopes.join(' '),
+			default:
+				'={{$self["includeAdminScope"] ? "read write issues:create comments:create admin" : "read write issues:create comments:create"}}',
 			required: true,
 		},
 		{
diff --git a/packages/nodes-base/credentials/MailerLiteApi.credentials.ts b/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
index 54a97b4cc7..fa5add1b6a 100644
--- a/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
+++ b/packages/nodes-base/credentials/MailerLiteApi.credentials.ts
@@ -1,4 +1,10 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestRequest,
+	ICredentialType,
+	IHttpRequestOptions,
+	INodeProperties,
+} from 'n8n-workflow';
 
 export class MailerLiteApi implements ICredentialType {
 	name = 'mailerLiteApi';
@@ -15,5 +21,37 @@ export class MailerLiteApi implements ICredentialType {
 			typeOptions: { password: true },
 			default: '',
 		},
+		{
+			displayName: 'Classic API',
+			name: 'classicApi',
+			type: 'boolean',
+			default: true,
+			description:
+				'If the Classic API should be used, If this is your first time using this node this should be false.',
+		},
 	];
+
+	async authenticate(
+		credentials: ICredentialDataDecryptedObject,
+		requestOptions: IHttpRequestOptions,
+	): Promise<IHttpRequestOptions> {
+		if (credentials.classicApi === true) {
+			requestOptions.headers = {
+				'X-MailerLite-ApiKey': credentials.apiKey as string,
+			};
+		} else {
+			requestOptions.headers = {
+				Authorization: `Bearer ${credentials.apiKey as string}`,
+			};
+		}
+		return requestOptions;
+	}
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL:
+				'={{$credentials.classicApi ? "https://api.mailerlite.com/api/v2" : "https://connect.mailerlite.com/api"}}',
+			url: '/groups',
+		},
+	};
 }
diff --git a/packages/nodes-base/credentials/MattermostApi.credentials.ts b/packages/nodes-base/credentials/MattermostApi.credentials.ts
index 51a5d657ed..072d699a5d 100644
--- a/packages/nodes-base/credentials/MattermostApi.credentials.ts
+++ b/packages/nodes-base/credentials/MattermostApi.credentials.ts
@@ -27,7 +27,7 @@ export class MattermostApi implements ICredentialType {
 			default: '',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			description: 'Whether to connect even if SSL certificate validation is not possible',
diff --git a/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts b/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
index c1c77edb41..be1e04de19 100644
--- a/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftEntraOAuth2Api.credentials.ts
@@ -1,4 +1,4 @@
-import type { ICredentialType, INodeProperties, Icon } from 'n8n-workflow';
+import type { ICredentialType, INodeProperties } from 'n8n-workflow';
 
 export class MicrosoftEntraOAuth2Api implements ICredentialType {
 	name = 'microsoftEntraOAuth2Api';
@@ -7,8 +7,6 @@ export class MicrosoftEntraOAuth2Api implements ICredentialType {
 
 	extends = ['microsoftOAuth2Api'];
 
-	icon: Icon = 'file:icons/Azure.svg';
-
 	documentationUrl = 'microsoftentra';
 
 	properties: INodeProperties[] = [
@@ -16,8 +14,9 @@ export class MicrosoftEntraOAuth2Api implements ICredentialType {
 			displayName: 'Scope',
 			name: 'scope',
 			type: 'hidden',
+			// Sites.FullControl.All required to update user specific properties https://github.com/microsoftgraph/msgraph-sdk-dotnet/issues/1316
 			default:
-				'openid offline_access AccessReview.ReadWrite.All Directory.ReadWrite.All NetworkAccessPolicy.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All EntitlementManagement.ReadWrite.All',
+				'openid offline_access AccessReview.ReadWrite.All Directory.ReadWrite.All NetworkAccessPolicy.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All EntitlementManagement.ReadWrite.All User.ReadWrite.All Directory.AccessAsUser.All Sites.FullControl.All GroupMember.ReadWrite.All',
 		},
 	];
 }
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/MicrosoftSql.credentials.ts b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
index 2d02fa8326..0eef33a2ef 100644
--- a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
@@ -54,7 +54,7 @@ export class MicrosoftSql implements ICredentialType {
 			default: true,
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			default: false,
diff --git a/packages/nodes-base/credentials/MySql.credentials.ts b/packages/nodes-base/credentials/MySql.credentials.ts
index 73bff49be4..faea3a6f0f 100644
--- a/packages/nodes-base/credentials/MySql.credentials.ts
+++ b/packages/nodes-base/credentials/MySql.credentials.ts
@@ -1,4 +1,5 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
 import { sshTunnelProperties } from '@utils/sshTunnel.properties';
 
 export class MySql implements ICredentialType {
diff --git a/packages/nodes-base/credentials/OAuth2Api.credentials.ts b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
index ded876fe28..a6789f6820 100644
--- a/packages/nodes-base/credentials/OAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/OAuth2Api.credentials.ts
@@ -108,7 +108,7 @@ export class OAuth2Api implements ICredentialType {
 			default: 'header',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'ignoreSSLIssues',
 			type: 'boolean',
 			default: false,
diff --git a/packages/nodes-base/credentials/OpenAiApi.credentials.ts b/packages/nodes-base/credentials/OpenAiApi.credentials.ts
index b97ae856f9..226c1b7c4f 100644
--- a/packages/nodes-base/credentials/OpenAiApi.credentials.ts
+++ b/packages/nodes-base/credentials/OpenAiApi.credentials.ts
@@ -30,6 +30,13 @@ export class OpenAiApi implements ICredentialType {
 			description:
 				"For users who belong to multiple organizations, you can set which organization is used for an API request. Usage from these API requests will count against the specified organization's subscription quota.",
 		},
+		{
+			displayName: 'Base URL',
+			name: 'url',
+			type: 'string',
+			default: 'https://api.openai.com/v1',
+			description: 'Override the default base URL for the API',
+		},
 	];
 
 	authenticate: IAuthenticateGeneric = {
@@ -44,8 +51,8 @@ export class OpenAiApi implements ICredentialType {
 
 	test: ICredentialTestRequest = {
 		request: {
-			baseURL: 'https://api.openai.com',
-			url: '/v1/models',
+			baseURL: '={{$credentials?.url}}',
+			url: '/models',
 		},
 	};
 }
diff --git a/packages/nodes-base/credentials/OuraApi.credentials.ts b/packages/nodes-base/credentials/OuraApi.credentials.ts
index b101fac588..759cb71455 100644
--- a/packages/nodes-base/credentials/OuraApi.credentials.ts
+++ b/packages/nodes-base/credentials/OuraApi.credentials.ts
@@ -1,4 +1,9 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
 
 export class OuraApi implements ICredentialType {
 	name = 'ouraApi';
@@ -16,4 +21,20 @@ export class OuraApi implements ICredentialType {
 			default: '',
 		},
 	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				Authorization: '=Bearer {{$credentials.accessToken}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: 'https://api.ouraring.com',
+			url: '/v2/usercollection/personal_info',
+		},
+	};
 }
diff --git a/packages/nodes-base/credentials/Postgres.credentials.ts b/packages/nodes-base/credentials/Postgres.credentials.ts
index 12eaddd5f4..744ba3539f 100644
--- a/packages/nodes-base/credentials/Postgres.credentials.ts
+++ b/packages/nodes-base/credentials/Postgres.credentials.ts
@@ -1,4 +1,5 @@
 import type { ICredentialType, INodeProperties } from 'n8n-workflow';
+
 import { sshTunnelProperties } from '@utils/sshTunnel.properties';
 
 export class Postgres implements ICredentialType {
@@ -37,7 +38,15 @@ export class Postgres implements ICredentialType {
 			default: '',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Maximum Number of Connections',
+			name: 'maxConnections',
+			type: 'number',
+			default: 100,
+			description:
+				'Make sure this value times the number of workers you have is lower than the maximum number of connections your postgres instance allows.',
+		},
+		{
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			default: false,
diff --git a/packages/nodes-base/credentials/Rapid7InsightVmApi.credentials.ts b/packages/nodes-base/credentials/Rapid7InsightVmApi.credentials.ts
new file mode 100644
index 0000000000..8fbcf1b39f
--- /dev/null
+++ b/packages/nodes-base/credentials/Rapid7InsightVmApi.credentials.ts
@@ -0,0 +1,61 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class Rapid7InsightVmApi implements ICredentialType {
+	name = 'rapid7InsightVmApi';
+
+	displayName = 'Rapid7 InsightVM API';
+
+	documentationUrl = 'rapid7insightvm';
+
+	icon = {
+		light: 'file:icons/Rapid7InsightVm.svg',
+		dark: 'file:icons/Rapid7InsightVm.svg',
+	} as const;
+
+	httpRequestNode = {
+		name: 'Rapid7 InsightVM',
+		docsUrl: 'https://docs.rapid7.com/',
+		apiBaseUrlPlaceholder: 'https://insight.rapid7.com/',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'URL',
+			name: 'url',
+			required: true,
+			type: 'string',
+			default: '',
+		},
+		{
+			displayName: 'API Key',
+			name: 'apiKey',
+			required: true,
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			headers: {
+				'x-api-key': '={{$credentials.apiKey}}',
+				Accept: 'application/json',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}'.replace(/\/$/, ''),
+			url: '/validate',
+			method: 'GET',
+		},
+	};
+}
diff --git a/packages/nodes-base/credentials/Redis.credentials.ts b/packages/nodes-base/credentials/Redis.credentials.ts
index 194c2f59e3..9d9bbab394 100644
--- a/packages/nodes-base/credentials/Redis.credentials.ts
+++ b/packages/nodes-base/credentials/Redis.credentials.ts
@@ -17,6 +17,13 @@ export class Redis implements ICredentialType {
 			},
 			default: '',
 		},
+		{
+			displayName: 'User',
+			name: 'user',
+			type: 'string',
+			default: '',
+			hint: 'Leave blank for password-only auth',
+		},
 		{
 			displayName: 'Host',
 			name: 'host',
diff --git a/packages/nodes-base/credentials/S3.credentials.ts b/packages/nodes-base/credentials/S3.credentials.ts
index 11e6ad157f..8e9e4345d0 100644
--- a/packages/nodes-base/credentials/S3.credentials.ts
+++ b/packages/nodes-base/credentials/S3.credentials.ts
@@ -42,7 +42,7 @@ export class S3 implements ICredentialType {
 			default: false,
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'ignoreSSLIssues',
 			type: 'boolean',
 			default: false,
diff --git a/packages/nodes-base/credentials/SeaTableApi.credentials.ts b/packages/nodes-base/credentials/SeaTableApi.credentials.ts
index 69c9b7f38a..6490bf5bc6 100644
--- a/packages/nodes-base/credentials/SeaTableApi.credentials.ts
+++ b/packages/nodes-base/credentials/SeaTableApi.credentials.ts
@@ -1,4 +1,20 @@
-import type { ICredentialTestRequest, ICredentialType, INodeProperties } from 'n8n-workflow';
+import moment from 'moment-timezone';
+import type {
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+	INodePropertyOptions,
+} from 'n8n-workflow';
+
+// Get options for timezones
+const timezones: INodePropertyOptions[] = moment.tz
+	.countries()
+	.reduce((tz: INodePropertyOptions[], country: string) => {
+		const zonesForCountry = moment.tz
+			.zonesForCountry(country)
+			.map((zone) => ({ value: zone, name: zone }));
+		return tz.concat(zonesForCountry);
+	}, []);
 
 export class SeaTableApi implements ICredentialType {
 	name = 'seaTableApi';
@@ -45,6 +61,14 @@ export class SeaTableApi implements ICredentialType {
 			typeOptions: { password: true },
 			default: '',
 		},
+		{
+			displayName: 'Timezone',
+			name: 'timezone',
+			type: 'options',
+			default: '',
+			description: "Seatable server's timezone",
+			options: [...timezones],
+		},
 	];
 
 	test: ICredentialTestRequest = {
diff --git a/packages/nodes-base/credentials/SolarWindsIpamApi.credentials.ts b/packages/nodes-base/credentials/SolarWindsIpamApi.credentials.ts
new file mode 100644
index 0000000000..2980978031
--- /dev/null
+++ b/packages/nodes-base/credentials/SolarWindsIpamApi.credentials.ts
@@ -0,0 +1,85 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class SolarWindsIpamApi implements ICredentialType {
+	name = 'solarWindsIpamApi';
+
+	displayName = 'SolarWinds IPAM';
+
+	documentationUrl = 'solarwindsipam';
+
+	icon = {
+		light: 'file:icons/SolarWindsIpam.svg',
+		dark: 'file:icons/SolarWindsIpam.svg',
+	} as const;
+
+	httpRequestNode = {
+		name: 'SolarWinds IPAM',
+		docsUrl: 'https://www.solarwinds.com/ip-address-manager',
+		apiBaseUrlPlaceholder: 'https://your-ipam-server',
+	};
+
+	properties: INodeProperties[] = [
+		{
+			displayName: 'Base URL',
+			name: 'url',
+			required: true,
+			type: 'string',
+			default: '',
+			placeholder: 'https://your-ipam-server',
+			description: 'The base URL of your SolarWinds IPAM server.',
+		},
+		{
+			displayName: 'Username',
+			name: 'username',
+			required: true,
+			type: 'string',
+			default: '',
+			description: 'The username for SolarWinds IPAM API.',
+		},
+		{
+			displayName: 'Password',
+			name: 'password',
+			required: true,
+			type: 'string',
+			typeOptions: { password: true },
+			default: '',
+			description: 'The password for SolarWinds IPAM API.',
+		},
+	];
+
+	authenticate: IAuthenticateGeneric = {
+		type: 'generic',
+		properties: {
+			auth: {
+				username: '={{$credentials.username}}',
+				password: '={{$credentials.password}}',
+			},
+		},
+	};
+
+	test: ICredentialTestRequest = {
+		request: {
+			baseURL: '={{$credentials.url}}'.replace(/\/$/, ''),
+			url: '/SolarWinds/InformationService/v3/Json/Query',
+			method: 'GET',
+			qs: {
+				query: 'SELECT TOP 1 AccountID FROM IPAM.AccountRoles',
+			},
+			skipSslCertificateValidation: true,
+		},
+		rules: [
+			{
+				type: 'responseCode',
+				properties: {
+					value: 403,
+					message: 'Connection failed: Invalid credentials or unreachable server',
+				},
+			},
+		],
+	};
+}
diff --git a/packages/nodes-base/credentials/SolarWindsObservabilityApi.credentials.ts b/packages/nodes-base/credentials/SolarWindsObservabilityApi.credentials.ts
new file mode 100644
index 0000000000..0ae029e074
--- /dev/null
+++ b/packages/nodes-base/credentials/SolarWindsObservabilityApi.credentials.ts
@@ -0,0 +1,72 @@
+import type {
+	IAuthenticateGeneric,
+	ICredentialTestRequest,
+	ICredentialType,
+	INodeProperties,
+} from 'n8n-workflow';
+
+export class SolarWindsObservabilityApi implements ICredentialType {
+	name = 'solarWindsObservabilityApi';
+
+	displayName = 'SolarWinds Observability';
+
+	documentationUrl = 'solarwindsobservability';
+
+	icon = {
+		light: 'file:icons/SolarWindsObservability.svg',
+		dark: 'file:icons/SolarWindsObservability.svg',
+	} as const;
+
+	httpRequestNode = {
+		name: 'SolarWinds Observability',
+		docsUrl:
+			'https://documentation.solarwinds.com/en/success_center/observability/content/api/api-swagger.htm',
+		apiBaseUrlPlaceholder: 'https://api.xx-yy.cloud.solarwinds.com/',
+	};
+
+	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: '/v1/logs',
+			method: 'GET',
+		},
+		rules: [
+			{
+				type: 'responseSuccessBody',
+				properties: {
+					key: 'error',
+					value: 'invalid_auth',
+					message: 'Invalid access token',
+				},
+			},
+		],
+	};
+}
diff --git a/packages/nodes-base/credentials/TheHiveApi.credentials.ts b/packages/nodes-base/credentials/TheHiveApi.credentials.ts
index 694cc47967..d3353ebc7c 100644
--- a/packages/nodes-base/credentials/TheHiveApi.credentials.ts
+++ b/packages/nodes-base/credentials/TheHiveApi.credentials.ts
@@ -49,7 +49,7 @@ export class TheHiveApi implements ICredentialType {
 			],
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			description: 'Whether to connect even if SSL certificate validation is not possible',
diff --git a/packages/nodes-base/credentials/TheHiveProjectApi.credentials.ts b/packages/nodes-base/credentials/TheHiveProjectApi.credentials.ts
index 65ced26842..090c6be918 100644
--- a/packages/nodes-base/credentials/TheHiveProjectApi.credentials.ts
+++ b/packages/nodes-base/credentials/TheHiveProjectApi.credentials.ts
@@ -31,7 +31,7 @@ export class TheHiveProjectApi implements ICredentialType {
 			placeholder: 'https://localhost:9000',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			description: 'Whether to connect even if SSL certificate validation is not possible',
diff --git a/packages/nodes-base/credentials/TimescaleDb.credentials.ts b/packages/nodes-base/credentials/TimescaleDb.credentials.ts
index 04226a8d04..44b96a918c 100644
--- a/packages/nodes-base/credentials/TimescaleDb.credentials.ts
+++ b/packages/nodes-base/credentials/TimescaleDb.credentials.ts
@@ -36,7 +36,7 @@ export class TimescaleDb implements ICredentialType {
 			default: '',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			default: false,
diff --git a/packages/nodes-base/credentials/WordpressApi.credentials.ts b/packages/nodes-base/credentials/WordpressApi.credentials.ts
index 01f4761884..44cef12a68 100644
--- a/packages/nodes-base/credentials/WordpressApi.credentials.ts
+++ b/packages/nodes-base/credentials/WordpressApi.credentials.ts
@@ -36,7 +36,7 @@ export class WordpressApi implements ICredentialType {
 			placeholder: 'https://example.com',
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			description: 'Whether to connect even if SSL certificate validation is not possible',
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/ZammadBasicAuthApi.credentials.ts b/packages/nodes-base/credentials/ZammadBasicAuthApi.credentials.ts
index 5e3690b981..f50aec8687 100644
--- a/packages/nodes-base/credentials/ZammadBasicAuthApi.credentials.ts
+++ b/packages/nodes-base/credentials/ZammadBasicAuthApi.credentials.ts
@@ -35,7 +35,7 @@ export class ZammadBasicAuthApi implements ICredentialType {
 			required: true,
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			description: 'Whether to connect even if SSL certificate validation is not possible',
diff --git a/packages/nodes-base/credentials/ZammadTokenAuthApi.credentials.ts b/packages/nodes-base/credentials/ZammadTokenAuthApi.credentials.ts
index 6025b39162..48e3994ca6 100644
--- a/packages/nodes-base/credentials/ZammadTokenAuthApi.credentials.ts
+++ b/packages/nodes-base/credentials/ZammadTokenAuthApi.credentials.ts
@@ -27,7 +27,7 @@ export class ZammadTokenAuthApi implements ICredentialType {
 			required: true,
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			description: 'Whether to connect even if SSL certificate validation is not possible',
diff --git a/packages/nodes-base/credentials/icons/Rapid7InsightVm.svg b/packages/nodes-base/credentials/icons/Rapid7InsightVm.svg
new file mode 100644
index 0000000000..509f8287be
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/Rapid7InsightVm.svg
@@ -0,0 +1,14 @@
+<svg width="119" height="20" viewBox="0 0 119 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0)">
+<path d="M12.2826 8.94348H7.42609L8.47826 4.18261H12.9696C14.4478 4.18261 15.3174 4.97826 15.3174 6.13913C15.3174 7.66956 14.1957 8.94348 12.2826 8.94348ZM20.2957 5.66957C20.2957 2.4 17.7739 0 13.3652 0H4.3913L0 20H5L6.51304 13.1304H9.43913L12.3478 20H17.3348L14.2348 12.8C17.9522 12.2174 20.2957 9.23478 20.2957 5.66957Z" fill="#231F20"/>
+<path d="M28.9219 12.513L33.2089 5.13913L34.8306 12.513H28.9263H28.9219ZM31.1828 0L19.5654 20H24.5524L26.4959 16.6826H35.748L36.4785 20H41.4654L37.0872 0H31.1828ZM55.7828 8.94348H51.348L52.3915 4.18261H56.2524C57.7741 4.18261 58.7089 4.9087 58.7089 6.13913C58.7089 7.66956 57.5567 8.94348 55.7872 8.94348H55.7828ZM56.7611 0H48.3046L43.9133 20H48.9046L50.4263 13.1217H56.0002C60.7654 13.1217 63.6524 9.53043 63.6524 5.74348C63.6524 2.36957 61.0219 0.00434783 56.7567 0.00434783" fill="#231F20"/>
+<path d="M73.3131 0H68.3131L63.9131 20H68.9131L73.3131 0Z" fill="#231F20"/>
+<path d="M109.122 0H93.3566C93.5958 0.243478 93.8349 0.495652 94.0523 0.76087C95.8175 2.9 96.748 5.58696 96.748 8.54348C96.748 13.1087 94.8262 17.2261 91.7393 20H101.391L105.978 8.6H100.239L101.196 4.17826H112.596L106.609 20H108.957C114.422 20.0348 118.118 15.4957 118.118 9.98261C118.118 4.46956 114.596 0 109.118 0" fill="#E85E26"/>
+<path d="M81.2872 15.8261H78.5263L81.0915 4.18261H83.7002C86.5611 4.18261 88.1654 6.32609 88.1654 9.00869C88.1654 12.6174 85.5915 15.8261 81.2958 15.8261H81.2872ZM91.3045 3.26087C89.5915 1.17391 86.7611 0 83.4219 0H77.0132L72.6089 20H80.6741C83.8045 20 86.2132 19.3043 88.0524 18.1957C91.7915 15.9261 93.1176 11.9348 93.1176 8.54348C93.1176 6.43043 92.4567 4.63913 91.3089 3.26087" fill="#231F20"/>
+</g>
+<defs>
+<clipPath id="clip0">
+<rect width="118.261" height="20" fill="white"/>
+</clipPath>
+</defs>
+</svg>
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/SolarWindsIpam.svg b/packages/nodes-base/credentials/icons/SolarWindsIpam.svg
new file mode 100644
index 0000000000..814afbdb7c
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/SolarWindsIpam.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 200" style="enable-background:new 0 0 1000 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#6E8C96;}
+	.st1{fill:#FFFFFF;}
+	.st2{fill:#FF6200;}
+</style>
+<g>
+	<path class="st2" d="M407.028,140.266V76.349h11.212v54.047h30.623v9.87H407.028z"/>
+	<path class="st2" d="M515.476,140.266L510.781,128h-30.282l-4.695,12.266h-12.266l25.107-63.917h13.99l25.107,63.917H515.476z
+		 M495.64,85.836l-11.978,32.294h23.956L495.64,85.836z"/>
+	<path class="st2" d="M670.683,140.266l-12.457-47.147l-12.362,47.147h-11.979l-18.303-63.917h12.553l12.458,49.256l13.224-49.256
+		h8.912l13.224,49.256l12.362-49.256h12.553l-18.207,63.917H670.683z"/>
+	<path class="st2" d="M722.916,140.266V76.349h11.212v63.917H722.916z"/>
+	<path class="st2" d="M807.891,140.266l-33.348-46.573v46.573h-11.212V76.349h11.499l32.677,45.327V76.349h11.212v63.917H807.891z"
+		/>
+	<path class="st2" d="M845.474,140.266V76.349h23.765c19.932,0,33.443,13.224,33.443,32.006c0,18.783-13.511,31.911-33.443,31.911
+		H845.474z M856.685,130.396h12.553c13.895,0,21.944-9.966,21.944-22.041c0-12.362-7.666-22.136-21.944-22.136h-12.553V130.396z"/>
+	<path class="st2" d="M354.552,75.295c-18.259,0-33.061,14.802-33.061,33.061c0,18.259,14.802,33.061,33.061,33.061
+		c18.259,0,33.061-14.802,33.061-33.061C387.613,90.097,372.812,75.295,354.552,75.295z M354.552,130.253
+		c-12.094,0-21.897-9.804-21.897-21.897s9.804-21.897,21.897-21.897s21.897,9.804,21.897,21.897S366.646,130.253,354.552,130.253z"
+		/>
+	<path class="st2" d="M589.039,120.208L589.039,120.208l-0.094-0.151l-0.058-0.093l-2.99-4.805l-0.009,0l-0.59-0.945
+		c6.282-2.339,11.627-8.198,11.627-17.836c0-11.787-8.241-20.028-20.891-20.028h-28.077v63.917h11.212v-23.861h4.113h7.003h4.113
+		l14.182,23.861h12.937L589.039,120.208z M559.169,106.534V86.219h15.332c6.325,0,10.925,4.025,10.925,10.158
+		c0,6.133-4.6,10.157-10.925,10.157H559.169z"/>
+	<path class="st2" d="M282.724,101.839c-7.57-1.917-14.087-3.546-14.087-8.528c0-4.792,4.216-7.954,10.828-7.954
+		c6.335,0,12.736,2.082,17.627,6.507l7.046-7.246l0.242-0.315c-5.942-5.75-13.991-8.912-23.957-8.912
+		c-13.991,0-23.286,8.145-23.286,18.686c0,13.511,12.266,16.577,22.711,19.165c7.762,2.012,14.566,3.737,14.566,9.487
+		c0,4.217-3.642,8.72-12.841,8.72c-8.148,0-14.608-3.447-19.026-7.626l-7.325,7.534c5.654,5.982,14.151,10.06,25.872,10.06
+		c17.249,0,24.723-9.104,24.723-19.741C305.818,107.781,293.265,104.522,282.724,101.839z"/>
+	<path class="st2" d="M947.088,101.839c-7.57-1.917-14.087-3.546-14.087-8.528c0-4.792,4.216-7.954,10.828-7.954
+		c6.335,0,12.736,2.082,17.627,6.507l7.046-7.246l0.242-0.315c-5.942-5.75-13.991-8.912-23.957-8.912
+		c-13.991,0-23.286,8.145-23.286,18.686c0,13.511,12.266,16.577,22.711,19.165c7.762,2.012,14.566,3.737,14.566,9.487
+		c0,4.217-3.642,8.72-12.841,8.72c-8.148,0-14.608-3.447-19.026-7.626l-7.325,7.534c5.654,5.982,14.151,10.06,25.872,10.06
+		c17.249,0,24.723-9.104,24.723-19.741C970.182,107.781,957.628,104.522,947.088,101.839z"/>
+	<g>
+		<g>
+			<g>
+				<path class="st2" d="M982.198,81.725h-1.379V84.1h-0.778v-5.871h1.944c0.661,0,1.17,0.151,1.526,0.452
+					c0.356,0.301,0.534,0.739,0.534,1.314c0,0.366-0.099,0.684-0.297,0.956c-0.198,0.272-0.472,0.475-0.825,0.609l1.379,2.492V84.1
+					h-0.831L982.198,81.725z M980.819,81.092h1.19c0.384,0,0.69-0.1,0.917-0.299c0.227-0.199,0.341-0.466,0.341-0.8
+					c0-0.364-0.108-0.642-0.325-0.836c-0.216-0.194-0.529-0.292-0.937-0.295h-1.186V81.092z"/>
+			</g>
+			<path class="st2" d="M981.828,86.34c-2.784,0-5.049-2.265-5.049-5.049c0-2.784,2.265-5.049,5.049-5.049s5.049,2.265,5.049,5.049
+				C986.876,84.075,984.612,86.34,981.828,86.34z M981.828,76.96c-2.388,0-4.331,1.943-4.331,4.331c0,2.388,1.943,4.331,4.331,4.331
+				s4.331-1.943,4.331-4.331C986.159,78.903,984.216,76.96,981.828,76.96z"/>
+		</g>
+		<g>
+			<path class="st2" d="M140.43,173.976h-2.449v6.797h-0.999v-6.797h-2.444v-0.822h5.892V173.976z"/>
+			<path class="st2" d="M142.858,173.154l2.491,6.216l2.491-6.216h1.303v7.619h-1.005v-2.967l0.094-3.202l-2.501,6.169h-0.769
+				l-2.496-6.154l0.099,3.187v2.967h-1.005v-7.619H142.858z"/>
+		</g>
+		<g>
+			<g>
+				<g>
+					<path class="st2" d="M105.191,96.65c0.58-0.155,1.142-0.31,1.72-0.477c12.698-3.58,25.05-8.54,37.324-13.677
+						c12.016-5.028,23.901-11.067,34.342-19.565c10.715-8.717,19.334-20.009,24.091-34.012c0.67-1.949,2.04-4.76,2.171-6.898
+						c-16.685,22.815-82.873,25.17-82.873,25.17l15.619-14.329C74.794,32.981,30.977,59.633,10.902,73.887
+						c25.691,2.756,48.948,13.638,67.156,30.023C87.017,101.136,96.162,99.132,105.191,96.65z"/>
+					<path class="st2" d="M208.993,94.409c0,0-61.073-4.671-124.512,15.757c8.417,8.793,15.511,18.851,20.947,29.879
+						C138.784,121.478,185.036,97.757,208.993,94.409z"/>
+					<path class="st2" d="M109.61,149.577c3.873,9.96,6.471,20.555,7.549,31.592l58.138-59.794L109.61,149.577z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/packages/nodes-base/credentials/icons/SolarWindsObservability.svg b/packages/nodes-base/credentials/icons/SolarWindsObservability.svg
new file mode 100644
index 0000000000..65c383dc33
--- /dev/null
+++ b/packages/nodes-base/credentials/icons/SolarWindsObservability.svg
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 26.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1000 200" style="enable-background:new 0 0 1000 200;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FF6200;}
+</style>
+<g>
+	<g>
+		<path class="st0" d="M301.299,161.252c-0.583,5.361-2.5,9.464-5.752,12.308s-7.582,4.266-12.989,4.266
+			c-3.775,0-7.115-0.944-10.017-2.832c-2.902-1.888-5.146-4.562-6.73-8.024c-1.586-3.462-2.39-7.418-2.413-11.871v-6.608
+			c0-4.522,0.792-8.531,2.378-12.028c1.585-3.496,3.863-6.194,6.835-8.094c2.973-1.899,6.393-2.85,10.262-2.85
+			c5.455,0,9.761,1.468,12.92,4.406c3.158,2.937,4.994,7.004,5.507,12.202h-4.336c-1.072-8.647-5.769-12.972-14.091-12.972
+			c-4.614,0-8.292,1.727-11.03,5.179c-2.739,3.452-4.108,8.223-4.108,14.311v6.229c0,5.878,1.334,10.568,4.003,14.067
+			s6.276,5.248,10.821,5.248c4.498,0,7.89-1.077,10.175-3.233c2.284-2.156,3.694-5.391,4.23-9.703H301.299z"/>
+		<path class="st0" d="M334.422,172.336c-2.518,3.66-6.538,5.489-12.062,5.489c-4.033,0-7.098-1.171-9.196-3.514
+			c-2.098-2.343-3.17-5.81-3.217-10.402v-24.615h4.161v24.091c0,7.203,2.914,10.804,8.741,10.804c6.061,0,9.895-2.505,11.503-7.517
+			v-27.378h4.196v37.832h-4.057L334.422,172.336z"/>
+		<path class="st0" d="M371.334,167.511c0-2.074-0.834-3.741-2.5-5c-1.667-1.259-4.178-2.243-7.535-2.955
+			c-3.356-0.711-5.961-1.526-7.814-2.447c-1.853-0.921-3.229-2.045-4.126-3.375c-0.897-1.329-1.346-2.937-1.346-4.825
+			c0-2.984,1.247-5.449,3.741-7.395s5.688-2.92,9.58-2.92c4.219,0,7.605,1.043,10.157,3.129c2.553,2.086,3.829,4.808,3.829,8.165
+			h-4.196c0-2.214-0.927-4.056-2.779-5.524c-1.854-1.469-4.19-2.203-7.011-2.203c-2.751,0-4.959,0.612-6.626,1.836
+			c-1.667,1.224-2.5,2.814-2.5,4.772c0,1.888,0.693,3.351,2.081,4.388c1.387,1.038,3.916,1.987,7.587,2.85
+			c3.672,0.863,6.422,1.783,8.252,2.762c1.829,0.979,3.188,2.156,4.073,3.531c0.886,1.376,1.329,3.042,1.329,5
+			c0,3.194-1.289,5.746-3.864,7.657c-2.576,1.912-5.938,2.867-10.087,2.867c-4.406,0-7.979-1.066-10.717-3.199
+			c-2.739-2.133-4.108-4.831-4.108-8.095h4.195c0.163,2.448,1.194,4.354,3.095,5.717c1.899,1.364,4.411,2.046,7.535,2.046
+			c2.913,0,5.268-0.641,7.062-1.923S371.334,169.469,371.334,167.511z"/>
+		<path class="st0" d="M391.095,129.609v9.685h7.832v3.427h-7.832v25.237c0,2.101,0.378,3.664,1.136,4.69
+			c0.758,1.027,2.022,1.54,3.794,1.54c0.699,0,1.83-0.116,3.392-0.35l0.175,3.397c-1.096,0.393-2.587,0.589-4.476,0.589
+			c-2.867,0-4.953-0.833-6.259-2.5c-1.306-1.666-1.958-4.12-1.958-7.36v-25.244h-6.958v-3.427h6.958v-9.685H391.095z"/>
+		<path class="st0" d="M402.899,157.65c0-3.636,0.705-6.911,2.115-9.825c1.41-2.914,3.403-5.18,5.979-6.801
+			c2.575-1.62,5.494-2.43,8.759-2.43c5.034,0,9.113,1.766,12.236,5.297c3.124,3.531,4.686,8.211,4.686,14.038v0.875
+			c0,3.659-0.705,6.952-2.115,9.877c-1.41,2.926-3.397,5.181-5.962,6.766c-2.563,1.586-5.488,2.378-8.775,2.378
+			c-5.012,0-9.085-1.766-12.22-5.297c-3.136-3.531-4.703-8.211-4.703-14.039V157.65z M407.095,158.805
+			c0,4.522,1.171,8.234,3.514,11.136c2.343,2.902,5.413,4.354,9.213,4.354c3.776,0,6.836-1.451,9.178-4.354
+			c2.343-2.901,3.514-6.73,3.514-11.486v-0.804c0-2.89-0.536-5.536-1.607-7.937c-1.073-2.401-2.576-4.26-4.511-5.577
+			c-1.935-1.316-4.149-1.976-6.643-1.976c-3.73,0-6.772,1.463-9.126,4.388c-2.354,2.926-3.531,6.754-3.531,11.486V158.805z"/>
+		<path class="st0" d="M449.05,139.294l0.14,6.154c1.398-2.284,3.146-3.997,5.245-5.14c2.098-1.142,4.428-1.713,6.992-1.713
+			c5.968,0,9.756,2.448,11.364,7.343c1.352-2.354,3.158-4.167,5.419-5.437c2.261-1.27,4.755-1.906,7.482-1.906
+			c8.111,0,12.249,4.429,12.412,13.287v25.245h-4.195v-24.93c-0.023-3.38-0.752-5.886-2.186-7.518
+			c-1.434-1.631-3.771-2.448-7.011-2.448c-3.007,0.047-5.548,1.02-7.622,2.92s-3.229,4.213-3.461,6.94v25.035h-4.196v-25.245
+			c-0.023-3.24-0.786-5.658-2.29-7.255c-1.503-1.597-3.816-2.396-6.94-2.396c-2.634,0-4.895,0.752-6.783,2.255
+			c-1.888,1.503-3.286,3.736-4.195,6.696v25.944h-4.196v-37.832H449.05z"/>
+		<path class="st0" d="M523.141,177.825c-3.217,0-6.125-0.792-8.724-2.378c-2.6-1.585-4.621-3.793-6.066-6.625
+			c-1.445-2.833-2.168-6.009-2.168-9.528v-1.503c0-3.636,0.705-6.911,2.115-9.825c1.41-2.914,3.375-5.204,5.892-6.871
+			c2.518-1.666,5.245-2.5,8.183-2.5c4.592,0,8.233,1.568,10.926,4.703s4.039,7.418,4.039,12.849v2.343h-26.993v0.804
+			c0,4.289,1.229,7.861,3.688,10.717s5.554,4.283,9.283,4.283c2.238,0,4.214-0.407,5.927-1.224c1.713-0.815,3.27-2.121,4.668-3.916
+			l2.622,1.993C533.456,175.6,528.992,177.825,523.141,177.825z M522.373,142.161c-3.147,0-5.799,1.154-7.955,3.461
+			c-2.156,2.308-3.468,5.408-3.934,9.301h22.692v-0.455c-0.117-3.636-1.154-6.596-3.112-8.881
+			C528.106,143.304,525.542,142.161,522.373,142.161z"/>
+		<path class="st0" d="M562.823,142.86c-0.886-0.163-1.83-0.245-2.832-0.245c-2.61,0-4.819,0.729-6.626,2.186
+			c-1.807,1.457-3.094,3.572-3.862,6.346v25.979h-4.161v-37.832h4.091l0.07,6.014c2.213-4.476,5.769-6.713,10.663-6.713
+			c1.166,0,2.086,0.152,2.763,0.455L562.823,142.86z"/>
+		<path class="st0" d="M619.498,164.608c0-2.82-0.991-5.052-2.972-6.695c-1.981-1.644-5.606-3.205-10.874-4.686
+			c-5.269-1.48-9.114-3.094-11.538-4.843c-3.45-2.47-5.175-5.71-5.175-9.72c0-3.892,1.603-7.056,4.808-9.492
+			c3.204-2.436,7.302-3.654,12.29-3.654c3.379,0,6.404,0.653,9.073,1.958c2.669,1.306,4.737,3.124,6.206,5.455
+			c1.469,2.331,2.203,4.929,2.203,7.796h-4.336c0-3.483-1.188-6.283-3.566-8.398c-2.378-2.116-5.571-3.174-9.58-3.174
+			c-3.894,0-6.993,0.87-9.301,2.609c-2.308,1.739-3.462,4.009-3.462,6.811c0,2.592,1.037,4.705,3.112,6.339
+			c2.074,1.635,5.396,3.076,9.965,4.325c4.568,1.249,8.03,2.544,10.385,3.884c2.354,1.341,4.126,2.943,5.314,4.808
+			c1.188,1.865,1.783,4.068,1.783,6.609c0,4.009-1.603,7.226-4.808,9.649c-3.205,2.425-7.43,3.637-12.675,3.637
+			c-3.59,0-6.883-0.642-9.878-1.923c-2.995-1.282-5.268-3.077-6.817-5.385c-1.551-2.308-2.325-4.953-2.325-7.937h4.301
+			c0,3.59,1.34,6.422,4.021,8.496c2.681,2.075,6.247,3.111,10.699,3.111c3.963,0,7.145-0.874,9.546-2.622
+			C618.297,169.818,619.498,167.499,619.498,164.608z"/>
+		<path class="st0" d="M656.562,172.336c-2.518,3.66-6.538,5.489-12.062,5.489c-4.033,0-7.099-1.171-9.196-3.514
+			s-3.17-5.81-3.217-10.402v-24.615h4.161v24.091c0,7.203,2.913,10.804,8.741,10.804c6.06,0,9.894-2.505,11.502-7.517v-27.378h4.196
+			v37.832h-4.056L656.562,172.336z"/>
+		<path class="st0" d="M685.347,174.294c2.913,0,5.355-0.822,7.325-2.465c1.97-1.644,3.036-3.771,3.199-6.381h4.021
+			c-0.116,2.308-0.839,4.411-2.167,6.311c-1.329,1.9-3.095,3.386-5.298,4.458c-2.202,1.072-4.562,1.608-7.08,1.608
+			c-4.965,0-8.898-1.725-11.801-5.175c-2.902-3.449-4.353-8.088-4.353-13.916v-1.259c0-3.729,0.652-7.028,1.958-9.895
+			c1.305-2.867,3.176-5.081,5.611-6.643c2.436-1.562,5.285-2.343,8.549-2.343c4.149,0,7.57,1.236,10.263,3.707
+			c2.691,2.471,4.131,5.723,4.317,9.755h-4.021c-0.187-2.96-1.253-5.35-3.199-7.167c-1.946-1.818-4.4-2.728-7.36-2.728
+			c-3.776,0-6.708,1.364-8.794,4.091c-2.086,2.728-3.129,6.551-3.129,11.469v1.224c0,4.825,1.043,8.59,3.129,11.294
+			S681.547,174.294,685.347,174.294z"/>
+		<path class="st0" d="M722.17,174.294c2.913,0,5.355-0.822,7.325-2.465c1.97-1.644,3.036-3.771,3.199-6.381h4.021
+			c-0.116,2.308-0.839,4.411-2.167,6.311c-1.329,1.9-3.095,3.386-5.298,4.458c-2.202,1.072-4.562,1.608-7.08,1.608
+			c-4.965,0-8.898-1.725-11.801-5.175c-2.902-3.449-4.353-8.088-4.353-13.916v-1.259c0-3.729,0.652-7.028,1.958-9.895
+			c1.305-2.867,3.176-5.081,5.611-6.643c2.436-1.562,5.285-2.343,8.549-2.343c4.149,0,7.57,1.236,10.263,3.707
+			c2.691,2.471,4.131,5.723,4.317,9.755h-4.021c-0.187-2.96-1.253-5.35-3.199-7.167c-1.946-1.818-4.4-2.728-7.36-2.728
+			c-3.776,0-6.708,1.364-8.794,4.091c-2.086,2.728-3.129,6.551-3.129,11.469v1.224c0,4.825,1.043,8.59,3.129,11.294
+			S718.371,174.294,722.17,174.294z"/>
+		<path class="st0" d="M759.7,177.825c-3.217,0-6.125-0.792-8.724-2.378c-2.6-1.585-4.621-3.793-6.065-6.625
+			c-1.445-2.833-2.168-6.009-2.168-9.528v-1.503c0-3.636,0.705-6.911,2.115-9.825c1.409-2.914,3.374-5.204,5.891-6.871
+			c2.518-1.666,5.245-2.5,8.183-2.5c4.592,0,8.233,1.568,10.926,4.703s4.039,7.418,4.039,12.849v2.343h-26.993v0.804
+			c0,4.289,1.229,7.861,3.688,10.717s5.554,4.283,9.283,4.283c2.238,0,4.214-0.407,5.927-1.224c1.713-0.815,3.27-2.121,4.668-3.916
+			l2.622,1.993C770.014,175.6,765.55,177.825,759.7,177.825z M758.931,142.161c-3.147,0-5.799,1.154-7.955,3.461
+			c-2.156,2.308-3.468,5.408-3.934,9.301h22.692v-0.455c-0.117-3.636-1.154-6.596-3.112-8.881
+			C764.665,143.304,762.1,142.161,758.931,142.161z"/>
+		<path class="st0" d="M804.089,167.511c0-2.074-0.833-3.741-2.5-5c-1.666-1.259-4.178-2.243-7.534-2.955
+			c-3.357-0.711-5.962-1.526-7.815-2.447c-1.853-0.921-3.229-2.045-4.125-3.375c-0.898-1.329-1.347-2.937-1.347-4.825
+			c0-2.984,1.247-5.449,3.741-7.395s5.688-2.92,9.58-2.92c4.219,0,7.605,1.043,10.157,3.129c2.553,2.086,3.829,4.808,3.829,8.165
+			h-4.196c0-2.214-0.926-4.056-2.779-5.524c-1.854-1.469-4.19-2.203-7.011-2.203c-2.75,0-4.959,0.612-6.625,1.836
+			c-1.667,1.224-2.5,2.814-2.5,4.772c0,1.888,0.693,3.351,2.08,4.388c1.387,1.038,3.916,1.987,7.587,2.85
+			c3.672,0.863,6.422,1.783,8.252,2.762s3.188,2.156,4.073,3.531c0.886,1.376,1.329,3.042,1.329,5c0,3.194-1.288,5.746-3.864,7.657
+			c-2.575,1.912-5.938,2.867-10.087,2.867c-4.405,0-7.978-1.066-10.717-3.199s-4.108-4.831-4.108-8.095h4.196
+			c0.162,2.448,1.194,4.354,3.094,5.717c1.899,1.364,4.411,2.046,7.535,2.046c2.914,0,5.268-0.641,7.062-1.923
+			S804.089,169.469,804.089,167.511z"/>
+		<path class="st0" d="M839.804,167.511c0-2.074-0.833-3.741-2.5-5c-1.666-1.259-4.178-2.243-7.534-2.955
+			c-3.357-0.711-5.962-1.526-7.815-2.447c-1.853-0.921-3.229-2.045-4.125-3.375c-0.898-1.329-1.347-2.937-1.347-4.825
+			c0-2.984,1.247-5.449,3.741-7.395s5.688-2.92,9.58-2.92c4.219,0,7.605,1.043,10.157,3.129c2.552,2.086,3.828,4.808,3.828,8.165
+			h-4.195c0-2.214-0.926-4.056-2.779-5.524c-1.854-1.469-4.19-2.203-7.011-2.203c-2.75,0-4.959,0.612-6.625,1.836
+			c-1.667,1.224-2.5,2.814-2.5,4.772c0,1.888,0.693,3.351,2.08,4.388c1.387,1.038,3.916,1.987,7.587,2.85
+			c3.672,0.863,6.422,1.783,8.252,2.762s3.188,2.156,4.072,3.531c0.886,1.376,1.329,3.042,1.329,5c0,3.194-1.288,5.746-3.863,7.657
+			c-2.575,1.912-5.938,2.867-10.087,2.867c-4.405,0-7.978-1.066-10.717-3.199s-4.108-4.831-4.108-8.095h4.196
+			c0.162,2.448,1.194,4.354,3.094,5.717c1.899,1.364,4.411,2.046,7.535,2.046c2.914,0,5.268-0.641,7.062-1.923
+			S839.804,169.469,839.804,167.511z"/>
+	</g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<path class="st0" d="M409.642,96.429V33.558h11.028V86.72h30.122v9.709H409.642z"/>
+				</g>
+				<g>
+					<path class="st0" d="M516.316,96.429l-4.618-12.065h-29.786l-4.619,12.065h-12.065l24.696-62.871h13.761l24.696,62.871H516.316
+						z M496.804,42.89l-11.782,31.765h23.564L496.804,42.89z"/>
+				</g>
+				<g>
+					<path class="st0" d="M668.982,96.429l-12.253-46.376l-12.159,46.376h-11.783l-18.004-62.871h12.348l12.254,48.45l13.007-48.45
+						h8.766l13.007,48.45l12.159-48.45h12.348l-17.909,62.871H668.982z"/>
+				</g>
+				<g>
+					<path class="st0" d="M720.36,96.429V33.558h11.028v62.871H720.36z"/>
+				</g>
+				<g>
+					<path class="st0" d="M803.944,96.429l-32.802-45.81v45.81h-11.028V33.558h11.311l32.142,44.585V33.558h11.028v62.871H803.944z"
+						/>
+				</g>
+				<g>
+					<path class="st0" d="M840.912,96.429V33.558h23.376c19.606,0,32.896,13.008,32.896,31.482c0,18.476-13.29,31.389-32.896,31.389
+						H840.912z M851.94,86.72h12.348c13.667,0,21.585-9.803,21.585-21.68c0-12.159-7.541-21.773-21.585-21.773H851.94V86.72z"/>
+				</g>
+				<g>
+					<path class="st0" d="M358.026,32.521c-17.96,0-32.52,14.56-32.52,32.52c0,17.96,14.56,32.52,32.52,32.52
+						c17.96,0,32.52-14.56,32.52-32.52C390.546,47.081,375.986,32.521,358.026,32.521z M358.026,86.58
+						c-11.896,0-21.539-9.643-21.539-21.539s9.643-21.539,21.539-21.539s21.539,9.643,21.539,21.539S369.921,86.58,358.026,86.58z"
+						/>
+				</g>
+				<g>
+					<path class="st0" d="M588.674,76.699L588.674,76.699l-0.092-0.148l-0.057-0.091l-2.941-4.727l-0.009,0l-0.581-0.93
+						c6.179-2.3,11.436-8.063,11.436-17.544c0-11.594-8.107-19.7-20.549-19.7h-27.618v62.871h11.028V72.958h4.046h6.888h4.046
+						l13.95,23.471h12.725L588.674,76.699z M559.293,63.249V43.267h15.081c6.221,0,10.746,3.959,10.746,9.992
+						c0,6.033-4.524,9.991-10.746,9.991H559.293z"/>
+				</g>
+				<g>
+					<path class="st0" d="M287.373,58.631c-7.447-1.886-13.856-3.488-13.856-8.389c0-4.713,4.147-7.824,10.651-7.824
+						c6.231,0,12.527,2.048,17.339,6.401l6.931-7.128l0.238-0.31c-5.844-5.656-13.762-8.766-23.565-8.766
+						c-13.762,0-22.905,8.012-22.905,18.381c0,13.29,12.065,16.306,22.34,18.852c7.635,1.979,14.327,3.676,14.327,9.332
+						c0,4.148-3.582,8.577-12.631,8.577c-8.015,0-14.369-3.391-18.714-7.502l-7.205,7.41c5.562,5.885,13.919,9.895,25.448,9.895
+						c16.967,0,24.318-8.955,24.318-19.418C310.089,64.475,297.741,61.27,287.373,58.631z"/>
+				</g>
+				<g>
+					<path class="st0" d="M940.862,58.631c-7.447-1.886-13.856-3.488-13.856-8.389c0-4.713,4.147-7.824,10.651-7.824
+						c6.231,0,12.527,2.048,17.339,6.401l6.93-7.128l0.239-0.31c-5.844-5.656-13.762-8.766-23.565-8.766
+						c-13.762,0-22.905,8.012-22.905,18.381c0,13.29,12.065,16.306,22.34,18.852c7.635,1.979,14.327,3.676,14.327,9.332
+						c0,4.148-3.582,8.577-12.631,8.577c-8.015,0-14.369-3.391-18.714-7.502l-7.205,7.41c5.562,5.885,13.919,9.895,25.448,9.895
+						c16.966,0,24.318-8.955,24.318-19.418C963.579,64.475,951.231,61.27,940.862,58.631z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<g>
+				<g>
+					<g>
+						<path class="st0" d="M975.398,38.883h-1.356v2.336h-0.765v-5.775h1.912c0.65,0,1.151,0.148,1.501,0.444
+							c0.351,0.296,0.526,0.727,0.526,1.293c0,0.36-0.097,0.673-0.292,0.94c-0.194,0.267-0.465,0.467-0.811,0.599l1.356,2.451v0.048
+							h-0.817L975.398,38.883z M974.041,38.26h1.17c0.378,0,0.679-0.098,0.902-0.294c0.223-0.196,0.335-0.458,0.335-0.787
+							c0-0.358-0.107-0.632-0.319-0.822c-0.213-0.191-0.52-0.287-0.922-0.29h-1.166V38.26z"/>
+					</g>
+				</g>
+				<g>
+					<path class="st0" d="M975.034,43.422c-2.738,0-4.966-2.228-4.966-4.967c0-2.738,2.228-4.966,4.966-4.966
+						c2.738,0,4.966,2.228,4.966,4.966C980,41.194,977.772,43.422,975.034,43.422z M975.034,34.196c-2.349,0-4.26,1.911-4.26,4.26
+						c0,2.349,1.911,4.261,4.26,4.261s4.26-1.911,4.26-4.261C979.294,36.107,977.383,34.196,975.034,34.196z"/>
+				</g>
+			</g>
+		</g>
+		<g>
+			<path class="st0" d="M940.862,58.631c-7.447-1.886-13.856-3.488-13.856-8.389c0-4.713,4.147-7.824,10.651-7.824
+				c6.231,0,12.527,2.048,17.339,6.401l6.93-7.128l0.239-0.31c-5.844-5.656-13.762-8.766-23.565-8.766
+				c-13.762,0-22.905,8.012-22.905,18.381c0,13.29,12.065,16.306,22.34,18.852c7.635,1.979,14.327,3.676,14.327,9.332
+				c0,4.148-3.582,8.577-12.631,8.577c-8.015,0-14.369-3.391-18.714-7.502l-7.205,7.41c5.562,5.885,13.919,9.895,25.448,9.895
+				c16.966,0,24.318-8.955,24.318-19.418C963.579,64.475,951.231,61.27,940.862,58.631z"/>
+		</g>
+		<g>
+			<g>
+				<g>
+					<g>
+						<path class="st0" d="M975.398,38.883h-1.356v2.336h-0.765v-5.775h1.912c0.65,0,1.151,0.148,1.501,0.444
+							c0.351,0.296,0.526,0.727,0.526,1.293c0,0.36-0.097,0.673-0.292,0.94c-0.194,0.267-0.465,0.467-0.811,0.599l1.356,2.451v0.048
+							h-0.817L975.398,38.883z M974.041,38.26h1.17c0.378,0,0.679-0.098,0.902-0.294c0.223-0.196,0.335-0.458,0.335-0.787
+							c0-0.358-0.107-0.632-0.319-0.822c-0.213-0.191-0.52-0.287-0.922-0.29h-1.166V38.26z"/>
+					</g>
+				</g>
+				<g>
+					<path class="st0" d="M975.034,43.422c-2.738,0-4.966-2.228-4.966-4.967c0-2.738,2.228-4.966,4.966-4.966
+						c2.738,0,4.966,2.228,4.966,4.966C980,41.194,977.772,43.422,975.034,43.422z M975.034,34.196c-2.349,0-4.26,1.911-4.26,4.26
+						c0,2.349,1.911,4.261,4.26,4.261s4.26-1.911,4.26-4.261C979.294,36.107,977.383,34.196,975.034,34.196z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<g>
+						<path class="st0" d="M112.745,94.791c0.57-0.153,1.123-0.305,1.692-0.469c12.49-3.522,24.64-8.4,36.713-13.453
+							c11.82-4.946,23.509-10.885,33.78-19.244c10.54-8.574,19.017-19.681,23.697-33.456c0.659-1.917,2.006-4.682,2.136-6.785
+							c-16.412,22.442-81.517,24.758-81.517,24.758l15.364-14.095C82.847,32.165,39.747,58.381,20,72.401
+							c25.271,2.711,48.147,13.414,66.057,29.532C94.869,99.204,103.864,97.233,112.745,94.791z"/>
+					</g>
+					<g>
+						<path class="st0" d="M214.849,92.587c0,0-60.073-4.594-122.474,15.499c8.279,8.649,15.257,18.542,20.605,29.39
+							C145.789,119.213,191.284,95.88,214.849,92.587z"/>
+					</g>
+					<g>
+						<path class="st0" d="M117.092,146.852c3.81,9.797,6.365,20.219,7.425,31.075l57.186-58.815L117.092,146.852z"/>
+					</g>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g>
+		<g>
+			<g>
+				<g>
+					<path class="st0" d="M147.408,170.852h-2.409v6.686h-0.983v-6.686h-2.404v-0.808h5.796V170.852z"/>
+				</g>
+				<g>
+					<path class="st0" d="M149.796,170.044l2.45,6.115l2.45-6.115h1.282v7.494h-0.988v-2.918l0.093-3.15l-2.46,6.068h-0.757
+						l-2.455-6.053l0.098,3.135v2.918h-0.988v-7.494H149.796z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+	<g>
+		<path class="st0" d="M117.092,146.852c3.81,9.797,6.365,20.219,7.425,31.075l57.186-58.815L117.092,146.852z"/>
+	</g>
+</g>
+</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/credentials/test/Aws.credentials.test.ts b/packages/nodes-base/credentials/test/Aws.credentials.test.ts
index 2f7c25b8d9..1874758ecd 100644
--- a/packages/nodes-base/credentials/test/Aws.credentials.test.ts
+++ b/packages/nodes-base/credentials/test/Aws.credentials.test.ts
@@ -1,5 +1,6 @@
 import { sign, type Request } from 'aws4';
 import type { IHttpRequestOptions } from 'n8n-workflow';
+
 import { Aws, type AwsCredentialsType } from '../Aws.credentials';
 
 jest.mock('aws4', () => ({
diff --git a/packages/nodes-base/jest.config.js b/packages/nodes-base/jest.config.js
index 860b43c630..721030d49c 100644
--- a/packages/nodes-base/jest.config.js
+++ b/packages/nodes-base/jest.config.js
@@ -1,3 +1,6 @@
+// Avoid tests failing because of difference between local and GitHub actions timezone
+process.env.TZ = 'UTC';
+
 /** @type {import('jest').Config} */
 module.exports = {
 	...require('../../jest.config'),
diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
index 068cf0b902..7938489569 100644
--- a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
@@ -7,17 +7,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import {
-	actionNetworkApiRequest,
-	adjustEventPayload,
-	adjustPersonPayload,
-	adjustPetitionPayload,
-	handleListing,
-	makeOsdiLink,
-	resourceLoaders,
-	simplifyResponse,
-} from './GenericFunctions';
-
 import {
 	attendanceFields,
 	attendanceOperations,
@@ -34,7 +23,16 @@ import {
 	tagFields,
 	tagOperations,
 } from './descriptions';
-
+import {
+	actionNetworkApiRequest,
+	adjustEventPayload,
+	adjustPersonPayload,
+	adjustPetitionPayload,
+	handleListing,
+	makeOsdiLink,
+	resourceLoaders,
+	simplifyResponse,
+} from './GenericFunctions';
 import type {
 	AllFieldsUi,
 	EmailAddressUi,
diff --git a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
index a9545ffe80..55167ea7ed 100644
--- a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import flow from 'lodash/flow';
+import omit from 'lodash/omit';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -6,9 +8,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import flow from 'lodash/flow';
-import omit from 'lodash/omit';
-
 import type {
 	AllFieldsUi,
 	FieldWithPrimaryField,
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index ca7ea31c3d..8468af3a7f 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -10,35 +10,23 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import type { IProduct } from './GenericFunctions';
-import { activeCampaignApiRequest, activeCampaignApiRequestAllItems } from './GenericFunctions';
-
+import { accountContactFields, accountContactOperations } from './AccountContactDescription';
+import { accountFields, accountOperations } from './AccountDescription';
+import { connectionFields, connectionOperations } from './ConnectionDescription';
 import { contactFields, contactOperations } from './ContactDescription';
-
+import { contactListFields, contactListOperations } from './ContactListDescription';
+import { contactTagFields, contactTagOperations } from './ContactTagDescription';
 import { dealFields, dealOperations } from './DealDescription';
-
-import { ecomOrderFields, ecomOrderOperations } from './EcomOrderDescription';
-
 import { ecomCustomerFields, ecomCustomerOperations } from './EcomCustomerDescription';
-
+import { ecomOrderFields, ecomOrderOperations } from './EcomOrderDescription';
 import {
 	ecomOrderProductsFields,
 	ecomOrderProductsOperations,
 } from './EcomOrderProductsDescription';
-
-import { connectionFields, connectionOperations } from './ConnectionDescription';
-
-import { accountFields, accountOperations } from './AccountDescription';
-
-import { tagFields, tagOperations } from './TagDescription';
-
-import { accountContactFields, accountContactOperations } from './AccountContactDescription';
-
-import { contactListFields, contactListOperations } from './ContactListDescription';
-
-import { contactTagFields, contactTagOperations } from './ContactTagDescription';
-
+import { activeCampaignApiRequest, activeCampaignApiRequestAllItems } from './GenericFunctions';
+import type { IProduct } from './GenericFunctions';
 import { listFields, listOperations } from './ListDescription';
+import { tagFields, tagOperations } from './TagDescription';
 
 interface CustomProperty {
 	name: string;
diff --git a/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
index ac849a9ef5..3e9529f8f1 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/DealDescription.ts
@@ -1,7 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import { allCurrencies } from './currencies';
-
 import { activeCampaignDefaultGetAllProperties } from './GenericFunctions';
 
 export const dealOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts b/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
index cf7833bd92..c7a73f28b0 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/EcomOrderDescription.ts
@@ -1,7 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import { allCurrencies } from './currencies';
-
 import { activeCampaignDefaultGetAllProperties } from './GenericFunctions';
 
 export const ecomOrderOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Adalo/Adalo.node.ts b/packages/nodes-base/nodes/Adalo/Adalo.node.ts
index 1865f16be5..5c0ae35d46 100644
--- a/packages/nodes-base/nodes/Adalo/Adalo.node.ts
+++ b/packages/nodes-base/nodes/Adalo/Adalo.node.ts
@@ -6,6 +6,7 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
+
 import { collectionFields } from './CollectionDescription';
 import type { FieldsUiValues } from './types';
 
diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.ts b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
index d70d908704..21fecbaab6 100644
--- a/packages/nodes-base/nodes/Affinity/Affinity.node.ts
+++ b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
@@ -10,17 +10,11 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { affinityApiRequest, affinityApiRequestAllItems } from './GenericFunctions';
-
-import { organizationFields, organizationOperations } from './OrganizationDescription';
-
-import { personFields, personOperations } from './PersonDescription';
-
 import { listFields, listOperations } from './ListDescription';
-
 import { listEntryFields, listEntryOperations } from './ListEntryDescription';
-
+import { organizationFields, organizationOperations } from './OrganizationDescription';
 import type { IOrganization } from './OrganizationInterface';
-
+import { personFields, personOperations } from './PersonDescription';
 import type { IPerson } from './PersonInterface';
 
 export class Affinity implements INodeType {
diff --git a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
index 54ece184d5..5bff8e06f8 100644
--- a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
@@ -66,7 +66,6 @@ export async function affinityApiRequestAllItems(
 
 	do {
 		responseData = await affinityApiRequest.call(this, method, resource, body, query);
-		// @ts-ignore
 		query.page_token = responseData.page_token;
 		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.page_token !== undefined && responseData.page_token !== null);
@@ -84,7 +83,6 @@ export function eventsExist(subscriptions: string[], currentSubsriptions: string
 }
 
 export function mapResource(key: string) {
-	//@ts-ignore
 	return {
 		person: 'persons',
 		list: 'lists',
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
index 3e620b0b40..5762a81a30 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
@@ -7,14 +7,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, jsonParse, NodeOperationError } from 'n8n-workflow';
 
-import { contactFields, contactOperations } from './ContactDescription';
-
 import { companyFields, companyOperations } from './CompanyDescription';
-
-import { dealFields, dealOperations } from './DealDescription';
-
+import { contactFields, contactOperations } from './ContactDescription';
 import type { IContact, IContactUpdate } from './ContactInterface';
-
+import { dealFields, dealOperations } from './DealDescription';
+import type { IDeal } from './DealInterface';
+import type { IFilter, ISearchConditions } from './FilterInterface';
 import {
 	agileCrmApiRequest,
 	agileCrmApiRequestAllItems,
@@ -24,10 +22,6 @@ import {
 	validateJSON,
 } from './GenericFunctions';
 
-import type { IDeal } from './DealInterface';
-
-import type { IFilter, ISearchConditions } from './FilterInterface';
-
 export class AgileCrm implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Agile CRM',
diff --git a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
index f308b94c90..204d5dd060 100644
--- a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeApiError } from 'n8n-workflow';
 
 import type { IContactUpdate } from './ContactInterface';
-
 import type { IFilterRules, ISearchConditions } from './FilterInterface';
 
 export async function agileCrmApiRequest(
diff --git a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
index 3741fc980e..5a3cec630d 100644
--- a/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
+++ b/packages/nodes-base/nodes/AiTransform/AiTransform.node.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import {
 	NodeOperationError,
 	NodeConnectionType,
@@ -5,10 +6,10 @@ import {
 	type INodeExecutionData,
 	type INodeType,
 	type INodeTypeDescription,
+	AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT,
+	AI_TRANSFORM_JS_CODE,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
-
 import { JavaScriptSandbox } from '../Code/JavaScriptSandbox';
 import { getSandboxContext } from '../Code/Sandbox';
 import { standardizeOutput } from '../Code/utils';
@@ -29,6 +30,14 @@ export class AiTransform implements INodeType {
 		inputs: [NodeConnectionType.Main],
 		outputs: [NodeConnectionType.Main],
 		parameterPane: 'wide',
+		hints: [
+			{
+				message:
+					"This node doesn't have access to the contents of binary files. To use those contents here, use the 'Extract from File' node first.",
+				displayCondition: '={{ $input.all().some(i => i.binary) }}',
+				location: 'outputPane',
+			},
+		],
 		properties: [
 			{
 				displayName: 'Instructions',
@@ -46,36 +55,29 @@ export class AiTransform implements INodeType {
 						inputFieldMaxLength: 500,
 						action: {
 							type: 'askAiCodeGeneration',
-							target: 'jsCode',
+							target: AI_TRANSFORM_JS_CODE,
 						},
 					},
 				},
 			},
 			{
-				displayName: 'Transformation Code',
-				name: 'jsCode',
+				displayName: 'Code Generated For Prompt',
+				name: AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT,
+				type: 'hidden',
+				default: '',
+			},
+			{
+				displayName: 'Generated JavaScript',
+				name: AI_TRANSFORM_JS_CODE,
 				type: 'string',
 				typeOptions: {
 					editor: 'jsEditor',
 					editorIsReadOnly: true,
 				},
 				default: '',
-				description:
-					'Read-only. To edit this code, adjust the prompt or copy and paste it into a Code node.',
+				hint: 'Read-only. To edit this code, adjust the instructions or copy and paste it into a Code node.',
 				noDataExpression: true,
 			},
-			{
-				displayName:
-					"Click on 'Test step' to run the transformation code. Further executions will use the generated code (and not invoke AI again).",
-				name: 'hint',
-				type: 'notice',
-				default: '',
-				displayOptions: {
-					show: {
-						jsCode: [{ _cnd: { exists: true } }],
-					},
-				},
-			},
 		],
 	};
 
@@ -118,7 +120,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/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index d5235546d7..8877c5763e 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -7,7 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import type { IRecord } from './v1/GenericFunctions';
 import { apiRequestAllItems, downloadRecordAttachments } from './v1/GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
index f535def3cb..d3c6a6662f 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getMany.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as getMany from '../../../../v2/actions/base/getMany.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
index df3b8ed930..4f6bda2a89 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/base/getSchema.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as getSchema from '../../../../v2/actions/base/getSchema.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
index 1edd17cd16..80855886ea 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/helpers.ts
@@ -1,7 +1,6 @@
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
-
 import { get } from 'lodash';
 import { constructExecutionMetaData } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
 
 export const node: INode = {
 	id: '11',
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
index 1b17b25ea7..85f5d0db7e 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/create.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as create from '../../../../v2/actions/record/create.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
index 2ea8b11d75..36e8e828e6 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/deleteRecord.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as deleteRecord from '../../../../v2/actions/record/deleteRecord.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
index 3d8c709abd..eb9a612cf6 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/get.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as get from '../../../../v2/actions/record/get.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
index 83e2bab61b..b5c1215907 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/search.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as search from '../../../../v2/actions/record/search.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
index afe736c914..89cdc0d9ef 100644
--- a/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
+++ b/packages/nodes-base/nodes/Airtable/test/v2/node/record/update.test.ts
@@ -1,7 +1,6 @@
 import nock from 'nock';
 
 import * as update from '../../../../v2/actions/record/update.operation';
-
 import * as transport from '../../../../v2/transport';
 import { createMockExecuteFunction } from '../helpers';
 
diff --git a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
index 526894110a..27214c6192 100644
--- a/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
+++ b/packages/nodes-base/nodes/Airtable/v1/AirtableV1.node.ts
@@ -9,10 +9,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { oldVersionNotice } from '../../../utils/descriptions';
-import { generatePairedItemData } from '../../../utils/utilities';
 import type { IRecord } from './GenericFunctions';
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
+import { oldVersionNotice } from '../../../utils/descriptions';
+import { generatePairedItemData } from '../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Airtable',
diff --git a/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
index 4395f690eb..3c8afb0d80 100644
--- a/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/AirtableV2.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeBaseDescription,
 } from 'n8n-workflow';
 
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
 import { listSearch, loadOptions, resourceMapping } from './methods';
 
 export class AirtableV2 implements INodeType {
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
index da5f2f528e..5272be1a2a 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getMany.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeProperties,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import {
 	generatePairedItemData,
 	updateDisplayOptions,
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
index aa791f7b64..b687cac225 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/base/getSchema.operation.ts
@@ -5,10 +5,11 @@ import type {
 	IExecuteFunctions,
 	NodeApiError,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { processAirtableError } from '../../helpers/utils';
 import { apiRequest } from '../../transport';
 import { baseRLC } from '../common.descriptions';
-import { processAirtableError } from '../../helpers/utils';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
index f9b5287f4b..d061808b7e 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/Record.resource.ts
@@ -1,5 +1,4 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { baseRLC, tableRLC } from '../common.descriptions';
 
 import * as create from './create.operation';
 import * as deleteRecord from './deleteRecord.operation';
@@ -7,6 +6,7 @@ import * as get from './get.operation';
 import * as search from './search.operation';
 import * as update from './update.operation';
 import * as upsert from './upsert.operation';
+import { baseRLC, tableRLC } from '../common.descriptions';
 
 export { create, deleteRecord, get, search, update, upsert };
 
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
index 758c3b7a2f..2ae70b5d7d 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/create.operation.ts
@@ -5,10 +5,11 @@ import type {
 	IExecuteFunctions,
 	NodeApiError,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
+import { processAirtableError, removeIgnored } from '../../helpers/utils';
 import { apiRequest } from '../../transport';
 import { insertUpdateOptions } from '../common.descriptions';
-import { processAirtableError, removeIgnored } from '../../helpers/utils';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
index cbbf12ba3c..cc8ba894c0 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/deleteRecord.operation.ts
@@ -5,9 +5,10 @@ import type {
 	NodeApiError,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
-import { apiRequest } from '../../transport';
 import { processAirtableError } from '../../helpers/utils';
+import { apiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
index 73a9933076..82a6edcc95 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/get.operation.ts
@@ -5,10 +5,11 @@ import type {
 	NodeApiError,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
-import { apiRequest, downloadRecordAttachments } from '../../transport';
-import { flattenOutput, processAirtableError } from '../../helpers/utils';
 import type { IRecord } from '../../helpers/interfaces';
+import { flattenOutput, processAirtableError } from '../../helpers/utils';
+import { apiRequest, downloadRecordAttachments } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
index 29f753794f..ae698d8a7a 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/search.operation.ts
@@ -4,10 +4,11 @@ import type {
 	INodeProperties,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import { generatePairedItemData, updateDisplayOptions } from '../../../../../utils/utilities';
-import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport';
 import type { IRecord } from '../../helpers/interfaces';
 import { flattenOutput } from '../../helpers/utils';
+import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from '../../transport';
 import { viewRLC } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
index d2c4172dd5..de3a56ead8 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/update.operation.ts
@@ -5,10 +5,11 @@ import type {
 	NodeApiError,
 	IExecuteFunctions,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
-import { apiRequestAllItems, batchUpdate } from '../../transport';
-import { findMatches, processAirtableError, removeIgnored } from '../../helpers/utils';
 import type { UpdateRecord } from '../../helpers/interfaces';
+import { findMatches, processAirtableError, removeIgnored } from '../../helpers/utils';
+import { apiRequestAllItems, batchUpdate } from '../../transport';
 import { insertUpdateOptions } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
index e6266480ce..0bc0c28cac 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/record/upsert.operation.ts
@@ -5,10 +5,11 @@ import type {
 	IExecuteFunctions,
 	NodeApiError,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions, wrapData } from '../../../../../utils/utilities';
-import { apiRequest, apiRequestAllItems, batchUpdate } from '../../transport';
-import { processAirtableError, removeIgnored } from '../../helpers/utils';
 import type { UpdateRecord } from '../../helpers/interfaces';
+import { processAirtableError, removeIgnored } from '../../helpers/utils';
+import { apiRequest, apiRequestAllItems, batchUpdate } from '../../transport';
 import { insertUpdateOptions } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/router.ts b/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
index ac1216a680..6bc659f275 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/router.ts
@@ -1,9 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { AirtableType } from './node.type';
 
-import * as record from './record/Record.resource';
 import * as base from './base/Base.resource';
+import type { AirtableType } from './node.type';
+import * as record from './record/Record.resource';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
index f2ecef8726..9bbbd7345e 100644
--- a/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/actions/versionDescription.ts
@@ -1,8 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import * as record from './record/Record.resource';
 import * as base from './base/Base.resource';
+import * as record from './record/Record.resource';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Airtable',
diff --git a/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
index 0daf33b997..11e14a5bd8 100644
--- a/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/helpers/utils.ts
@@ -1,5 +1,6 @@
-import { ApplicationError, type IDataObject, type NodeApiError } from 'n8n-workflow';
 import set from 'lodash/set';
+import { ApplicationError, type IDataObject, type NodeApiError } from 'n8n-workflow';
+
 import type { UpdateRecord } from './interfaces';
 
 export function removeIgnored(data: IDataObject, ignore: string | string[]) {
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
index 10f2d89c83..b9bca910da 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/listSearch.ts
@@ -5,6 +5,7 @@ import type {
 	INodeListSearchResult,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { apiRequest } from '../transport';
 
 export async function baseSearch(
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
index 79aaabf1ef..9d7120ec2c 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/loadOptions.ts
@@ -1,5 +1,6 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { apiRequest } from '../transport';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
diff --git a/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
index e99140d251..c0d4934c3b 100644
--- a/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/methods/resourceMapping.ts
@@ -7,6 +7,7 @@ import type {
 	ResourceMapperFields,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { apiRequest } from '../transport';
 
 type AirtableSchema = {
diff --git a/packages/nodes-base/nodes/Airtable/v2/transport/index.ts b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
index 95d2c3c1f8..6d26a24118 100644
--- a/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Airtable/v2/transport/index.ts
@@ -10,6 +10,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { ApplicationError } from 'n8n-workflow';
+
 import type { IAttachment, IRecord } from '../helpers/interfaces';
 import { flattenOutput } from '../helpers/utils';
 
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
index ce711d9695..1283558d37 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
@@ -1,6 +1,3 @@
-import type { Connection, ContainerOptions, Dictionary, EventContext, Sender } from 'rhea';
-import { create_container } from 'rhea';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -13,6 +10,8 @@ import type {
 	ICredentialDataDecryptedObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Connection, ContainerOptions, Dictionary, EventContext, Sender } from 'rhea';
+import { create_container } from 'rhea';
 
 async function checkIfCredentialsValid(
 	credentials: IDataObject,
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index 249391fd9d..bd88bcbc66 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -1,6 +1,3 @@
-import type { ContainerOptions, EventContext, Message, ReceiverOptions } from 'rhea';
-import { create_container } from 'rhea';
-
 import type {
 	ITriggerFunctions,
 	IDataObject,
@@ -11,6 +8,8 @@ import type {
 	IRun,
 } from 'n8n-workflow';
 import { deepCopy, jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { ContainerOptions, EventContext, Message, ReceiverOptions } from 'rhea';
+import { create_container } from 'rhea';
 
 export class AmqpTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index c5d3401674..72b93594f3 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -1,3 +1,5 @@
+import { snakeCase } from 'change-case';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,9 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import { snakeCase } from 'change-case';
 import {
 	asanaApiRequest,
 	asanaApiRequestAllItems,
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index 72492ecb6c..73623701ad 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,8 +9,6 @@ import type {
 	INodePropertyOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 /**
  * Make an API request to Asana
  *
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.ts b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
index 38c53c4f1f..24c9f9c6d6 100644
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.ts
+++ b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
@@ -10,10 +10,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { automizyApiRequest, automizyApiRequestAllItems } from './GenericFunctions';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
+import { automizyApiRequest, automizyApiRequestAllItems } from './GenericFunctions';
 import { listFields, listOperations } from './ListDescription';
 
 export class Automizy implements INodeType {
diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
index 94e73e0388..fca83ab1ca 100644
--- a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
@@ -40,7 +40,6 @@ export async function automizyApiRequest(
 		if (Object.keys(option).length !== 0) {
 			Object.assign(options, option);
 		}
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
index 069e2dd03f..d3b123761f 100644
--- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
@@ -10,14 +10,10 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { autopilotApiRequest, autopilotApiRequestAllItems } from './GenericFunctions';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
 import { contactJourneyFields, contactJourneyOperations } from './ContactJourneyDescription';
-
 import { contactListFields, contactListOperations } from './ContactListDescription';
-
+import { autopilotApiRequest, autopilotApiRequestAllItems } from './GenericFunctions';
 import { listFields, listOperations } from './ListDescription';
 
 export class Autopilot implements INodeType {
diff --git a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
index a27ff7c1a5..29460f7851 100644
--- a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { autopilotApiRequest } from './GenericFunctions';
 
 export class AutopilotTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
index 1aee04d83b..535233bbc9 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
 import { awsApiRequestSOAP } from './GenericFunctions';
 
 export class AwsSnsTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
index 25abdb7669..80047f39a0 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { certificateFields, certificateOperations } from './CertificateDescription';
-
 import { awsApiRequestAllItems, awsApiRequestREST } from './GenericFunctions';
 
 export class AwsCertificateManager implements INodeType {
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
index bff183fcee..0a68f30c51 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
@@ -1,5 +1,4 @@
 import get from 'lodash/get';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
index 7f327518a0..bbdf813863 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import { parseString } from 'xml2js';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -8,6 +6,7 @@ import type {
 	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts b/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
index 0215ddc6da..ecedd70672 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/test/AwsComprehend.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
index cecc3aca46..57346fbc87 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
@@ -11,9 +11,7 @@ import {
 } from 'n8n-workflow';
 
 import { awsApiRequest, awsApiRequestAllItems } from './GenericFunctions';
-
 import { itemFields, itemOperations } from './ItemDescription';
-
 import type {
 	FieldsUiValues,
 	IAttributeNameUi,
@@ -22,7 +20,6 @@ import type {
 	IRequestBody,
 	PutItemUi,
 } from './types';
-
 import {
 	adjustExpressionAttributeName,
 	adjustExpressionAttributeValues,
diff --git a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
index fbc781fb6f..ab80b67e9e 100644
--- a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
@@ -11,13 +11,11 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { awsApiRequestSOAP, awsApiRequestSOAPAllItems } from './GenericFunctions';
-
-import { loadBalancerFields, loadBalancerOperations } from './LoadBalancerDescription';
-
 import {
 	listenerCertificateFields,
 	listenerCertificateOperations,
 } from './ListenerCertificateDescription';
+import { loadBalancerFields, loadBalancerOperations } from './LoadBalancerDescription';
 
 export class AwsElb implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
index 51a88f61ba..00f4bbdc69 100644
--- a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
@@ -1,7 +1,4 @@
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -13,6 +10,7 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
index 5c65217e9b..18a268f0e3 100644
--- a/packages/nodes-base/nodes/Aws/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
@@ -1,5 +1,3 @@
-import { parseString as parseXml } from 'xml2js';
-
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -10,6 +8,7 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+import { parseString as parseXml } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
index b0992162ca..db25a8b643 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
@@ -1,7 +1,5 @@
+import { pascalCase } from 'change-case';
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,8 +9,7 @@ import type {
 	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
-
-import { pascalCase } from 'change-case';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
index e9fe6debac..49b1465307 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/test/AwsRekognition.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
 
 const responseLabels = [
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index 50a4c1738a..132cd109c9 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -2,7 +2,6 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { AwsS3V1 } from './V1/AwsS3V1.node';
-
 import { AwsS3V2 } from './V2/AwsS3V2.node';
 
 export class AwsS3 extends VersionedNodeType {
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
index fa3879b71d..d467460d89 100644
--- a/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V1/AwsS3V1.node.ts
@@ -1,8 +1,5 @@
-import { createHash } from 'crypto';
 import { paramCase, snakeCase } from 'change-case';
-
-import { Builder } from 'xml2js';
-
+import { createHash } from 'crypto';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -12,13 +9,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import { Builder } from 'xml2js';
 
 import { bucketFields, bucketOperations } from './BucketDescription';
-
-import { folderFields, folderOperations } from './FolderDescription';
-
 import { fileFields, fileOperations } from './FileDescription';
-
+import { folderFields, folderOperations } from './FolderDescription';
 import {
 	awsApiRequestREST,
 	awsApiRequestSOAP,
diff --git a/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts
index 06700d283d..947a0db801 100644
--- a/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V1/GenericFunctions.ts
@@ -1,7 +1,4 @@
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,6 +8,7 @@ import type {
 	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
index 34cdef556a..bd08de167f 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/AwsS3V2.node.ts
@@ -1,9 +1,5 @@
-import { createHash } from 'crypto';
-import type { Readable } from 'stream';
 import { paramCase, snakeCase } from 'change-case';
-
-import { Builder } from 'xml2js';
-
+import { createHash } from 'crypto';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -13,13 +9,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
+import { Builder } from 'xml2js';
 
 import { bucketFields, bucketOperations } from './BucketDescription';
-
-import { folderFields, folderOperations } from './FolderDescription';
-
 import { fileFields, fileOperations } from './FileDescription';
-
+import { folderFields, folderOperations } from './FolderDescription';
 import { awsApiRequestREST, awsApiRequestRESTAllItems } from './GenericFunctions';
 
 // Minimum size 5MB for multipart upload in S3
diff --git a/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts
index c4e47a8af3..ede6895e43 100644
--- a/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/V2/GenericFunctions.ts
@@ -1,7 +1,4 @@
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,6 +8,7 @@ import type {
 	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
index c13c572ef2..a5770b0b9c 100644
--- a/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/S3/test/V1/AwsS3.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
index 7d4da16178..fe6b625331 100644
--- a/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/S3/test/V2/AwsS3.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { getWorkflowFilenames, initBinaryDataService, testWorkflows } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
index 052928a681..ebbc2496ff 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -1,4 +1,3 @@
-import qs from 'node:querystring';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import qs from 'node:querystring';
 
 import { awsApiRequestSOAP, awsApiRequestSOAPAllItems } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
index b71053bd28..b76ab07c61 100644
--- a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
@@ -1,5 +1,4 @@
-import { parseString } from 'xml2js';
-
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,8 +10,7 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
-import get from 'lodash/get';
+import { parseString } from 'xml2js';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/SES/test/AwsSes.node.test.ts b/packages/nodes-base/nodes/Aws/SES/test/AwsSes.node.test.ts
index 45ad851ca7..dfd4005fe3 100644
--- a/packages/nodes-base/nodes/Aws/SES/test/AwsSes.node.test.ts
+++ b/packages/nodes-base/nodes/Aws/SES/test/AwsSes.node.test.ts
@@ -1,9 +1,10 @@
-import qs from 'node:querystring';
-import assert from 'node:assert';
 import { NodeConnectionType } from 'n8n-workflow';
-import type { WorkflowTestData } from '@test/nodes/types';
+import assert from 'node:assert';
+import qs from 'node:querystring';
+
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('AwsSes Node', () => {
 	const tests: WorkflowTestData[] = [
diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
index ba99d9fcac..2761233a6f 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
@@ -1,4 +1,4 @@
-import { URL } from 'url';
+import { pascalCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,8 +11,8 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
+import { URL } from 'url';
 
-import { pascalCase } from 'change-case';
 import { awsApiRequestSOAP } from '../GenericFunctions';
 
 export class AwsSqs implements INodeType {
diff --git a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
index 663c82b54e..a92de20bbe 100644
--- a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
@@ -1,10 +1,5 @@
-import { URL } from 'url';
-
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
-
-import { parseString } from 'xml2js';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -18,6 +13,8 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+import { URL } from 'url';
+import { parseString } from 'xml2js';
 
 function getEndpointForService(
 	service: string,
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
index 05faeb8a83..54cf97ec58 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
@@ -1,8 +1,6 @@
-import { URL } from 'url';
-
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
-
+import get from 'lodash/get';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -15,8 +13,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
-import get from 'lodash/get';
+import { URL } from 'url';
 
 function getEndpointForService(
 	service: string,
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/index.ts
index bd99a16bdd..d3462c784e 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/index.ts
@@ -1,4 +1,4 @@
-import { get as execute } from './execute';
 import { companyReportGetDescription as description } from './description';
+import { get as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts
index ed602347d3..0650a1d9f4 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as get from './get';
 
 export { get };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/description.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/description.ts
index 9c4dd63f7e..9008ca9176 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/description.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/description.ts
@@ -1,6 +1,5 @@
-import type { EmployeeProperties } from '../../Interfaces';
-
 import { createEmployeeSharedDescription } from './shareDescription';
+import type { EmployeeProperties } from '../../Interfaces';
 
 export const employeeCreateDescription: EmployeeProperties = [
 	{
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
index 33c2982776..eaae6824e8 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
@@ -1,8 +1,7 @@
+import { capitalCase } from 'change-case';
+import moment from 'moment-timezone';
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import { capitalCase } from 'change-case';
 import { apiRequest } from '../../../transport';
 
 export async function create(
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/index.ts
index 67619d0e9e..70993e8494 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/index.ts
@@ -1,4 +1,4 @@
-import { create as execute } from './execute';
 import { employeeCreateDescription as description } from './description';
+import { create as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/index.ts
index 981c65126e..70a4f62f20 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/index.ts
@@ -1,4 +1,4 @@
-import { get as execute } from './execute';
 import { employeeGetDescription as description } from './description';
+import { get as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/index.ts
index 9ae4d1d2b1..fbd36f5263 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { employeeGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts
index 9e685756b7..f8d2c0f74d 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create';
 import * as get from './get';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/description.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/description.ts
index 83af844d74..ea215bc509 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/description.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/description.ts
@@ -1,5 +1,5 @@
-import type { EmployeeProperties } from '../../Interfaces';
 import { updateEmployeeSharedDescription } from './sharedDescription';
+import type { EmployeeProperties } from '../../Interfaces';
 
 export const employeeUpdateDescription: EmployeeProperties = [
 	{
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
index 76d1bdd562..18d56e7424 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
@@ -1,9 +1,8 @@
+import { capitalCase } from 'change-case';
+import moment from 'moment-timezone';
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import { capitalCase } from 'change-case';
 import { apiRequest } from '../../../transport';
 
 export async function update(
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/index.ts
index 9dd013c5d8..dd76ebb54e 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/index.ts
@@ -1,4 +1,4 @@
-import { update as execute } from './execute';
 import { employeeUpdateDescription as description } from './description';
+import { update as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/index.ts
index 05d70b3f50..a08a03b2c3 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { employeeDocumentDelDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/index.ts
index 67f73a986d..8393a452d3 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/index.ts
@@ -1,4 +1,4 @@
-import { download as execute } from './execute';
 import { employeeDocumentDownloadDescription as description } from './description';
+import { download as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/index.ts
index eb6a95a73e..a9975d4f50 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { employeeDocumentGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
index 3853a5e9dd..cc211f266f 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as del from './del';
 import * as download from './download';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/index.ts
index 0c86c7a29a..6769e4df26 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/index.ts
@@ -1,4 +1,4 @@
-import { update as execute } from './execute';
 import { employeeDocumentUpdateDescription as description } from './description';
+import { update as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/index.ts
index 1026bc2d27..c8a5e8adf9 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/index.ts
@@ -1,4 +1,4 @@
-import { upload as execute } from './execute';
 import { employeeDocumentUploadDescription as description } from './description';
+import { upload as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/index.ts
index 0bef7541b8..f7dd3961d7 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { fileDelDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/index.ts
index 8d736b9e28..458af9a0a6 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/index.ts
@@ -1,4 +1,4 @@
-import { download as execute } from './execute';
 import { fileDownloadDescription as description } from './description';
+import { download as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/index.ts
index ddb484a98c..5de5bb48d8 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { fileGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
index d1f8755377..a267d81861 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as del from './del';
 import * as download from './download';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/index.ts
index b1621b0679..027c26c72e 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/index.ts
@@ -1,4 +1,4 @@
-import { update as execute } from './execute';
 import { fileUpdateDescription as description } from './description';
+import { update as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/index.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/index.ts
index 20787c370b..294c00031d 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/index.ts
@@ -1,4 +1,4 @@
-import { upload as execute } from './execute';
 import { fileUploadDescription as description } from './description';
+import { upload as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
index 9e8cb85a9e..041eb7adb5 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
@@ -1,10 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
+import * as companyReport from './companyReport';
 import * as employee from './employee';
 import * as employeeDocument from './employeeDocument';
 import * as file from './file';
-import * as companyReport from './companyReport';
-
 import type { BambooHr } from './Interfaces';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[]> {
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/versionDescription.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/versionDescription.ts
index 213599b614..88a79226de 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/versionDescription.ts
@@ -1,10 +1,10 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import * as file from './file';
+import * as companyReport from './companyReport';
 import * as employee from './employee';
 import * as employeeDocument from './employeeDocument';
-import * as companyReport from './companyReport';
+import * as file from './file';
 
 export const versionDescription: INodeTypeDescription = {
 	credentials: [
diff --git a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
index 1a993e98c9..657d7dec4e 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
@@ -53,7 +53,6 @@ export async function apiRequest(
 	}
 
 	try {
-		//@ts-ignore
 		return await this.helpers.request(options);
 	} catch (error) {
 		const description = error?.response?.headers['x-bamboohr-error-messsage'] || '';
diff --git a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
index 586fed329c..d82c565d62 100644
--- a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
+++ b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
@@ -10,9 +10,7 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { bannerbearApiRequest, keysToSnakeCase } from './GenericFunctions';
-
 import { imageFields, imageOperations } from './ImageDescription';
-
 import { templateFields, templateOperations } from './TemplateDescription';
 
 export class Bannerbear implements INodeType {
diff --git a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
index 0e48b58d83..1c8a313201 100644
--- a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -10,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
 export async function bannerbearApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.ts b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
index bb378a97da..7f58cf00b1 100644
--- a/packages/nodes-base/nodes/Baserow/Baserow.node.ts
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
@@ -15,9 +15,7 @@ import {
 	TableFieldMapper,
 	toOptions,
 } from './GenericFunctions';
-
 import { operationFields } from './OperationDescription';
-
 import type {
 	BaserowCredentials,
 	FieldsUiValues,
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
index 751bb19fc0..e35e652c4f 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -10,14 +11,12 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import {
 	createDatapoint,
 	deleteDatapoint,
 	getAllDatapoints,
 	updateDatapoint,
 } from './Beeminder.node.functions';
-
 import { beeminderApiRequest } from './GenericFunctions';
 
 export class Beeminder implements INodeType {
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.ts b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
index 3a62d5f072..5b376e0b2f 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.ts
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
@@ -9,9 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { linkFields, linkOperations } from './LinkDescription';
-
 import { bitlyApiRequest, bitlyApiRequestAllItems } from './GenericFunctions';
+import { linkFields, linkOperations } from './LinkDescription';
 
 export class Bitly implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
index eaea3c48c6..c86ee2b58d 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
@@ -1,3 +1,6 @@
+import isEmpty from 'lodash/isEmpty';
+import partialRight from 'lodash/partialRight';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -6,10 +9,20 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import partialRight from 'lodash/partialRight';
+import type { CollectionUpdateFields } from './descriptions/CollectionDescription';
+import { collectionFields, collectionOperations } from './descriptions/CollectionDescription';
+import { eventFields, eventOperations } from './descriptions/EventDescription';
+import type {
+	GroupCreationAdditionalFields,
+	GroupUpdateFields,
+} from './descriptions/GroupDescription';
+import { groupFields, groupOperations } from './descriptions/GroupDescription';
+import type {
+	MemberCreationAdditionalFields,
+	MemberUpdateFields,
+} from './descriptions/MemberDescription';
+import { memberFields, memberOperations } from './descriptions/MemberDescription';
 import {
 	bitwardenApiRequest as tokenlessBitwardenApiRequest,
 	getAccessToken,
@@ -17,23 +30,6 @@ import {
 	loadResource,
 } from './GenericFunctions';
 
-import type { CollectionUpdateFields } from './descriptions/CollectionDescription';
-import { collectionFields, collectionOperations } from './descriptions/CollectionDescription';
-
-import { eventFields, eventOperations } from './descriptions/EventDescription';
-
-import type {
-	GroupCreationAdditionalFields,
-	GroupUpdateFields,
-} from './descriptions/GroupDescription';
-import { groupFields, groupOperations } from './descriptions/GroupDescription';
-
-import type {
-	MemberCreationAdditionalFields,
-	MemberUpdateFields,
-} from './descriptions/MemberDescription';
-import { memberFields, memberOperations } from './descriptions/MemberDescription';
-
 export class Bitwarden implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Bitwarden',
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index 3d9e71e3ef..d737405673 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -1,3 +1,5 @@
+import { noCase } from 'change-case';
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,13 +9,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { noCase } from 'change-case';
-import { boxApiRequest, boxApiRequestAllItems } from './GenericFunctions';
-
 import { fileFields, fileOperations } from './FileDescription';
-
 import { folderFields, folderOperations } from './FolderDescription';
+import { boxApiRequest, boxApiRequestAllItems } from './GenericFunctions';
 
 export class Box implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Box/GenericFunctions.ts b/packages/nodes-base/nodes/Box/GenericFunctions.ts
index f768a21765..759a8140c3 100644
--- a/packages/nodes-base/nodes/Box/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Box/GenericFunctions.ts
@@ -41,7 +41,6 @@ export async function boxApiRequest(
 			includeCredentialsOnRefreshOnBody: true,
 		};
 
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'boxOAuth2Api', options, oAuth2Options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Brevo/AttributeDescription.ts b/packages/nodes-base/nodes/Brevo/AttributeDescription.ts
index f51efa0579..0a5a2f4f80 100644
--- a/packages/nodes-base/nodes/Brevo/AttributeDescription.ts
+++ b/packages/nodes-base/nodes/Brevo/AttributeDescription.ts
@@ -4,6 +4,7 @@ import type {
 	INodeProperties,
 	JsonObject,
 } from 'n8n-workflow';
+
 import { BrevoNode } from './GenericFunctions';
 
 export const attributeOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Brevo/Brevo.node.ts b/packages/nodes-base/nodes/Brevo/Brevo.node.ts
index e1e22ff46f..d201d53529 100644
--- a/packages/nodes-base/nodes/Brevo/Brevo.node.ts
+++ b/packages/nodes-base/nodes/Brevo/Brevo.node.ts
@@ -1,6 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { attributeFields, attributeOperations } from './AttributeDescription';
 import { contactFields, contactOperations } from './ContactDescription';
 import { emailFields, emailOperations } from './EmailDescription';
diff --git a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
index 4e2a480291..35b86f4415 100644
--- a/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
+++ b/packages/nodes-base/nodes/Brevo/BrevoTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	type IWebhookFunctions,
 	type IWebhookResponseData,
 } from 'n8n-workflow';
+
 import { BrevoWebhookApi } from './GenericFunctions';
 
 export class BrevoTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Brevo/EmailDescription.ts b/packages/nodes-base/nodes/Brevo/EmailDescription.ts
index 63fda3ab10..0a73a1a67c 100644
--- a/packages/nodes-base/nodes/Brevo/EmailDescription.ts
+++ b/packages/nodes-base/nodes/Brevo/EmailDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { BrevoNode } from './GenericFunctions';
 
 export const emailOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Bubble/Bubble.node.ts b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
index d63c980266..70641ac106 100644
--- a/packages/nodes-base/nodes/Bubble/Bubble.node.ts
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { bubbleApiRequest, bubbleApiRequestAllItems, validateJSON } from './GenericFunctions';
-
 import { objectFields, objectOperations } from './ObjectDescription';
 
 export class Bubble implements INodeType {
diff --git a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
index 46927492e9..7c05b86227 100644
--- a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
@@ -19,15 +19,13 @@ export async function bubbleApiRequest(
 	body: IDataObject,
 	qs: IDataObject,
 ) {
-	const { apiToken, appName, domain, environment, hosting } = (await this.getCredentials(
-		'bubbleApi',
-	)) as {
+	const { apiToken, appName, domain, environment, hosting } = await this.getCredentials<{
 		apiToken: string;
 		appName: string;
 		domain: string;
 		environment: 'development' | 'live';
 		hosting: 'bubbleHosted' | 'selfHosted';
-	};
+	}>('bubbleApi');
 
 	const rootUrl = hosting === 'bubbleHosted' ? `https://${appName}.bubbleapps.io` : domain;
 	const urlSegment = environment === 'development' ? '/version-test/api/1.1' : '/api/1.1';
diff --git a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
index 37b051d7ec..12ef42d73f 100644
--- a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
+++ b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
@@ -7,9 +7,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { pipelineFields, pipelineOperations } from './PipelineDescription';
-
 import { circleciApiRequest, circleciApiRequestAllItems } from './GenericFunctions';
+import { pipelineFields, pipelineOperations } from './PipelineDescription';
 
 export class CircleCi implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
index 0d9aad5bfd..39a6140837 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,9 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { getAttachments, webexApiRequest, webexApiRequestAllItems } from './GenericFunctions';
-
 import {
 	meetingFields,
 	meetingOperations,
@@ -20,6 +18,7 @@ import {
 	messageFields,
 	messageOperations,
 } from './descriptions';
+import { getAttachments, webexApiRequest, webexApiRequestAllItems } from './GenericFunctions';
 
 export class CiscoWebex implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
index 88d2037430..2ddf4d9507 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
@@ -1,5 +1,5 @@
 import { createHash } from 'crypto';
-
+import upperFirst from 'lodash/upperFirst';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -14,8 +14,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import upperFirst from 'lodash/upperFirst';
-
 export async function webexApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
 	method: IHttpRequestMethods,
@@ -43,7 +41,6 @@ export async function webexApiRequest(
 		if (Object.keys(qs).length === 0) {
 			delete options.qs;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'ciscoWebexOAuth2Api', options, {
 			tokenType: 'Bearer',
 		});
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
index f8e72c75b3..685ac62fc2 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
@@ -7,10 +7,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { clearbitApiRequest } from './GenericFunctions';
-
 import { companyFields, companyOperations } from './CompanyDescription';
-
+import { clearbitApiRequest } from './GenericFunctions';
 import { personFields, personOperations } from './PersonDescription';
 
 export class Clearbit implements INodeType {
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
index 2e524be59a..952bd4956f 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,45 +10,23 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { clickupApiRequest, clickupApiRequestAllItems, validateJSON } from './GenericFunctions';
-
 import { checklistFields, checklistOperations } from './ChecklistDescription';
-
 import { checklistItemFields, checklistItemOperations } from './ChecklistItemDescription';
-
 import { commentFields, commentOperations } from './CommentDescription';
-
 import { folderFields, folderOperations } from './FolderDescription';
-
+import { clickupApiRequest, clickupApiRequestAllItems, validateJSON } from './GenericFunctions';
 import { goalFields, goalOperations } from './GoalDescription';
-
 import { goalKeyResultFields, goalKeyResultOperations } from './GoalKeyResultDescription';
-
-// import {
-// 	guestFields,
-// 	guestOperations,
-// } from './guestDescription';
-
-import { taskFields, taskOperations } from './TaskDescription';
-
-import { taskListFields, taskListOperations } from './TaskListDescription';
-
-import { taskTagFields, taskTagOperations } from './TaskTagDescription';
-
-import { spaceTagFields, spaceTagOperations } from './SpaceTagDescription';
-
-import { taskDependencyFields, taskDependencyOperations } from './TaskDependencyDescription';
-
-import { timeEntryFields, timeEntryOperations } from './TimeEntryDescription';
-
-import { timeEntryTagFields, timeEntryTagOperations } from './TimeEntryTagDescription';
-
 import { listFields, listOperations } from './ListDescription';
-
-import type { ITask } from './TaskInterface';
-
 import type { IList } from './ListInterface';
+import { spaceTagFields, spaceTagOperations } from './SpaceTagDescription';
+import { taskDependencyFields, taskDependencyOperations } from './TaskDependencyDescription';
+import { taskFields, taskOperations } from './TaskDescription';
+import type { ITask } from './TaskInterface';
+import { taskListFields, taskListOperations } from './TaskListDescription';
+import { taskTagFields, taskTagOperations } from './TaskTagDescription';
+import { timeEntryFields, timeEntryOperations } from './TimeEntryDescription';
+import { timeEntryTagFields, timeEntryTagOperations } from './TimeEntryTagDescription';
 
 export class ClickUp implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
index 21974d6a08..f816ff1843 100644
--- a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
@@ -42,7 +42,6 @@ export async function clickupApiRequest(
 				keepBearer: false,
 				tokenType: 'Bearer',
 			};
-			// @ts-ignore
 			return await this.helpers.requestOAuth2.call(
 				this,
 				'clickUpOAuth2Api',
diff --git a/packages/nodes-base/nodes/Clockify/Clockify.node.ts b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
index 8f5456dd67..9723dfa025 100644
--- a/packages/nodes-base/nodes/Clockify/Clockify.node.ts
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
@@ -1,3 +1,5 @@
+import moment from 'moment-timezone';
+import { NodeConnectionType } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,29 +9,17 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
-import { clockifyApiRequest, clockifyApiRequestAllItems } from './GenericFunctions';
-
-import type { IClientDto, IWorkspaceDto } from './WorkpaceInterfaces';
-
-import type { IUserDto } from './UserDtos';
-
-import type { IProjectDto } from './ProjectInterfaces';
 
 import { clientFields, clientOperations } from './ClientDescription';
-
+import { clockifyApiRequest, clockifyApiRequestAllItems } from './GenericFunctions';
 import { projectFields, projectOperations } from './ProjectDescription';
-
+import type { IProjectDto } from './ProjectInterfaces';
 import { tagFields, tagOperations } from './TagDescription';
-
 import { taskFields, taskOperations } from './TaskDescription';
-
 import { timeEntryFields, timeEntryOperations } from './TimeEntryDescription';
-
 import { userFields, userOperations } from './UserDescription';
-
+import type { IUserDto } from './UserDtos';
+import type { IClientDto, IWorkspaceDto } from './WorkpaceInterfaces';
 import { workspaceFields, workspaceOperations } from './WorkspaceDescription';
 
 export class Clockify implements INodeType {
diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
index cbca70f49c..a7ea51f512 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
@@ -1,5 +1,4 @@
 import moment from 'moment-timezone';
-
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -11,9 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { clockifyApiRequest } from './GenericFunctions';
-
 import { EntryTypeEnum } from './EntryTypeEnum';
+import { clockifyApiRequest } from './GenericFunctions';
 import type { IUserDto } from './UserDtos';
 import type { IWorkspaceDto } from './WorkpaceInterfaces';
 
diff --git a/packages/nodes-base/nodes/Clockify/UserDtos.ts b/packages/nodes-base/nodes/Clockify/UserDtos.ts
index 6365b057df..e482e47030 100644
--- a/packages/nodes-base/nodes/Clockify/UserDtos.ts
+++ b/packages/nodes-base/nodes/Clockify/UserDtos.ts
@@ -1,4 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
+
 import type { IMembershipDto } from './CommonDtos';
 
 const enum UserStatusEnum {
diff --git a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
index 93acdb0e52..bd9050029c 100644
--- a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
+++ b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { cloudflareApiRequest, cloudflareApiRequestAllItems } from './GenericFunctions';
-
 import { zoneCertificateFields, zoneCertificateOperations } from './ZoneCertificateDescription';
 
 export class Cloudflare implements INodeType {
diff --git a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
index fedf9c4204..f279f1d099 100644
--- a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
+++ b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { collectionFields, collectionOperations } from './CollectionDescription';
 import {
 	createCollectionEntry,
diff --git a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
index 07955905f2..15be38653a 100644
--- a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
@@ -1,5 +1,6 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
+
 import type { ICollection } from './CollectionInterface';
 import { cockpitApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
index 1b48287439..318a73901e 100644
--- a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
+
 import type { IForm } from './FormInterface';
 import { cockpitApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
index 464f1f2bad..cb2536ef11 100644
--- a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
+
 import { cockpitApiRequest } from './GenericFunctions';
 
 export async function getSingleton(
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index fd0da7dcf0..94ca3050c8 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -9,10 +9,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
+
+import { controlFields, controlOperations } from './ControlDescription';
+import { formulaFields, formulaOperations } from './FormulaDescription';
 import { codaApiRequest, codaApiRequestAllItems } from './GenericFunctions';
 import { tableFields, tableOperations } from './TableDescription';
-import { formulaFields, formulaOperations } from './FormulaDescription';
-import { controlFields, controlOperations } from './ControlDescription';
 import { viewFields, viewOperations } from './ViewDescription';
 
 export class Coda implements INodeType {
diff --git a/packages/nodes-base/nodes/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
index b889e7dafa..25e1aaa8df 100644
--- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
@@ -67,7 +67,6 @@ export async function codaApiRequestAllItems(
 	do {
 		responseData = await codaApiRequest.call(this, method, resource, body, query, uri);
 		uri = responseData.nextPageLink;
-		// @ts-ignore
 		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageLink !== undefined && responseData.nextPageLink !== '');
 
diff --git a/packages/nodes-base/nodes/Code/Code.node.ts b/packages/nodes-base/nodes/Code/Code.node.ts
index e1230b0786..24a26923e8 100644
--- a/packages/nodes-base/nodes/Code/Code.node.ts
+++ b/packages/nodes-base/nodes/Code/Code.node.ts
@@ -1,4 +1,5 @@
 import { TaskRunnersConfig } from '@n8n/config';
+import { Container } from '@n8n/di';
 import set from 'lodash/set';
 import {
 	NodeConnectionType,
@@ -9,7 +10,6 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-import Container from 'typedi';
 
 import { javascriptCodeDescription } from './descriptions/JavascriptCodeDescription';
 import { pythonCodeDescription } from './descriptions/PythonCodeDescription';
@@ -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;
 
@@ -108,13 +108,14 @@ export class Code implements INodeType {
 				: 'javaScript';
 		const codeParameterName = language === 'python' ? 'pythonCode' : 'jsCode';
 
-		if (!runnersConfig.disabled && language === 'javaScript') {
+		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/JavaScriptSandbox.ts b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
index 73f5ba7f75..449be97a12 100644
--- a/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
+++ b/packages/nodes-base/nodes/Code/JavaScriptSandbox.ts
@@ -1,15 +1,15 @@
 import { NodeVM, makeResolverFromLegacyOptions, type Resolver } from '@n8n/vm2';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
-import { ValidationError } from './ValidationError';
 import { ExecutionError } from './ExecutionError';
-import type { SandboxContext } from './Sandbox';
-import { Sandbox } from './Sandbox';
 import {
 	mapItemNotDefinedErrorIfNeededForRunForEach,
 	mapItemsNotDefinedErrorIfNeededForRunForAll,
 	validateNoDisallowedMethodsInRunForEach,
 } from './JsCodeValidator';
+import type { SandboxContext } from './Sandbox';
+import { Sandbox } from './Sandbox';
+import { ValidationError } from './ValidationError';
 
 const { NODE_FUNCTION_ALLOW_BUILTIN: builtIn, NODE_FUNCTION_ALLOW_EXTERNAL: external } =
 	process.env;
diff --git a/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts b/packages/nodes-base/nodes/Code/JsTaskRunnerSandbox.ts
index 80d4b32445..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,33 +40,66 @@ 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 {
-		// The error coming from task runner is not an instance of error,
-		// so we need to wrap it in an error instance.
-		if (isWrappableError(error)) {
+		if (error instanceof Error) {
+			throw error;
+		} else if (isWrappableError(error)) {
+			// The error coming from task runner is not an instance of error,
+			// so we need to wrap it in an error instance.
 			throw new WrappedExecutionError(error);
 		}
 
 		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/PythonSandbox.ts b/packages/nodes-base/nodes/Code/PythonSandbox.ts
index 13a3bb6228..6491b7d085 100644
--- a/packages/nodes-base/nodes/Code/PythonSandbox.ts
+++ b/packages/nodes-base/nodes/Code/PythonSandbox.ts
@@ -1,5 +1,6 @@
-import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { ApplicationError, type IExecuteFunctions, type INodeExecutionData } from 'n8n-workflow';
 import type { PyDict } from 'pyodide/ffi';
+
 import { LoadPyodide } from './Pyodide';
 import type { SandboxContext } from './Sandbox';
 import { Sandbox } from './Sandbox';
@@ -97,7 +98,9 @@ await __main()`;
 	private getPrettyError(error: PyodideError): Error {
 		const errorTypeIndex = error.message.indexOf(error.type);
 		if (errorTypeIndex !== -1) {
-			return new Error(error.message.slice(errorTypeIndex));
+			return new ApplicationError(error.message.slice(errorTypeIndex), {
+				level: ['TypeError', 'AttributeError'].includes(error.type) ? 'warning' : 'error',
+			});
 		}
 
 		return error;
diff --git a/packages/nodes-base/nodes/Code/Sandbox.ts b/packages/nodes-base/nodes/Code/Sandbox.ts
index 917de0ecc1..b3e3057d23 100644
--- a/packages/nodes-base/nodes/Code/Sandbox.ts
+++ b/packages/nodes-base/nodes/Code/Sandbox.ts
@@ -22,7 +22,19 @@ export interface SandboxContext extends IWorkflowDataProxyData {
 	helpers: IExecuteFunctions['helpers'];
 }
 
-export const REQUIRED_N8N_ITEM_KEYS = new Set(['json', 'binary', 'pairedItem', 'error']);
+export const REQUIRED_N8N_ITEM_KEYS = new Set([
+	'json',
+	'binary',
+	'pairedItem',
+	'error',
+
+	/**
+	 * The `index` key was added accidentally to Function, FunctionItem, Gong,
+	 * Execute Workflow, and ToolWorkflowV2, so we need to allow it temporarily.
+	 * Once we stop using it in all nodes, we can stop allowing the `index` key.
+	 */
+	'index',
+]);
 
 export function getSandboxContext(
 	this: IExecuteFunctions | ISupplyDataFunctions,
@@ -35,8 +47,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..595e4d177e 100644
--- a/packages/nodes-base/nodes/Code/test/Code.node.test.ts
+++ b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
@@ -1,11 +1,13 @@
-import { anyNumber, mock } from 'jest-mock-extended';
 import { NodeVM } from '@n8n/vm2';
+import { anyNumber, mock } from 'jest-mock-extended';
+import { normalizeItems } from 'n8n-core';
 import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
 import { ApplicationError } from 'n8n-workflow';
-import { normalizeItems } from 'n8n-core';
+
+import { testWorkflows, getWorkflowFilenames, initBinaryDataService } from '@test/nodes/Helpers';
+
 import { Code } from '../Code.node';
 import { ValidationError } from '../ValidationError';
-import { testWorkflows, getWorkflowFilenames, initBinaryDataService } from '@test/nodes/Helpers';
 
 describe('Test Code Node', () => {
 	const workflows = getWorkflowFilenames(__dirname);
@@ -38,6 +40,13 @@ describe('Code Node unit test', () => {
 					[{ json: { count: 42 } }],
 					[{ json: { count: 42 } }],
 				],
+
+				// temporarily allowed until refactored out
+				'should handle an index key': [
+					[{ json: { count: 42 }, index: 0 }],
+					[{ json: { count: 42 }, index: 0 }],
+				],
+
 				'should handle when returned data is not an array': [
 					{ json: { count: 42 } },
 					[{ json: { count: 42 } }],
@@ -57,7 +66,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 +119,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..437d8b443b
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/test/utils.test.ts
@@ -0,0 +1,49 @@
+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/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
index e31c84194b..eac35239d2 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,11 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { coinFields, coinOperations } from './CoinDescription';
-
 import { eventFields, eventOperations } from './EventDescription';
-
 import { coinGeckoApiRequest, coinGeckoRequestAllItems } from './GenericFunctions';
 
 export class CoinGecko implements INodeType {
diff --git a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
index 141ed62851..ff20558d26 100644
--- a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
@@ -37,7 +37,6 @@ export async function coinGeckoApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
index 87b0c88c72..0e1eab0b7a 100644
--- a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
@@ -6,6 +6,7 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import {
 	checkInput,
 	checkInputAndThrowError,
diff --git a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
index f8d707e3ce..12fa1a447a 100644
--- a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
@@ -1,14 +1,14 @@
-import { ApplicationError, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
-
+import { cloneDeep } from 'lodash';
 import difference from 'lodash/difference';
 import get from 'lodash/get';
 import intersection from 'lodash/intersection';
 import isEmpty from 'lodash/isEmpty';
 import omit from 'lodash/omit';
-import unset from 'lodash/unset';
-import { cloneDeep } from 'lodash';
 import set from 'lodash/set';
 import union from 'lodash/union';
+import unset from 'lodash/unset';
+import { ApplicationError, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
+
 import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 type PairToMatch = {
diff --git a/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts b/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts
index 6af3b2f294..4d10178726 100644
--- a/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/test/utils/utils.test.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData } from 'n8n-workflow';
+
 import { checkInput } from '../../GenericFunctions';
 
 describe('Test Compare Datasets Node utils', () => {
diff --git a/packages/nodes-base/nodes/Compression/Compression.node.ts b/packages/nodes-base/nodes/Compression/Compression.node.ts
index 4f816cbbae..1ecf7edb4e 100644
--- a/packages/nodes-base/nodes/Compression/Compression.node.ts
+++ b/packages/nodes-base/nodes/Compression/Compression.node.ts
@@ -1,4 +1,5 @@
-import { promisify } from 'util';
+import * as fflate from 'fflate';
+import * as mime from 'mime-types';
 import {
 	NodeConnectionType,
 	type IBinaryKeyData,
@@ -7,16 +8,13 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-
-import * as fflate from 'fflate';
+import { promisify } from 'util';
 
 const gunzip = promisify(fflate.gunzip);
 const gzip = promisify(fflate.gzip);
 const unzip = promisify(fflate.unzip);
 const zip = promisify(fflate.zip);
 
-import * as mime from 'mime-types';
-
 const ALREADY_COMPRESSED = [
 	'7z',
 	'aifc',
diff --git a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
index 65833677c7..a83d793eba 100644
--- a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
+++ b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
@@ -1,16 +1,16 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import path from 'path';
-import os from 'node:os';
 import type { IDataObject } from 'n8n-workflow';
-import type { WorkflowTestData } from '@test/nodes/types';
+import os from 'node:os';
+import path from 'path';
 
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import {
 	getResultNodeData,
 	setup,
 	initBinaryDataService,
 	readJsonFileSync,
 } from '@test/nodes/Helpers';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 if (os.platform() !== 'win32') {
 	describe('Execute Compression Node', () => {
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.ts b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
index c666ec83c2..a70e96021d 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.ts
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
@@ -7,13 +7,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { contentfulApiRequestAllItems, contentfulApiRequest } from './GenericFunctions';
-
-import * as SpaceDescription from './SpaceDescription';
+import * as AssetDescription from './AssetDescription';
 import * as ContentTypeDescription from './ContentTypeDescription';
 import * as EntryDescription from './EntryDescription';
-import * as AssetDescription from './AssetDescription';
+import { contentfulApiRequestAllItems, contentfulApiRequest } from './GenericFunctions';
 import * as LocaleDescription from './LocaleDescription';
+import * as SpaceDescription from './SpaceDescription';
 
 export class Contentful implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index a19911ae74..7f335f9791 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -9,16 +9,11 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { convertKitApiRequest } from './GenericFunctions';
-
 import { customFieldFields, customFieldOperations } from './CustomFieldDescription';
-
 import { formFields, formOperations } from './FormDescription';
-
+import { convertKitApiRequest } from './GenericFunctions';
 import { sequenceFields, sequenceOperations } from './SequenceDescription';
-
 import { tagFields, tagOperations } from './TagDescription';
-
 import { tagSubscriberFields, tagSubscriberOperations } from './TagSubscriberDescription';
 
 export class ConvertKit implements INodeType {
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
index 9c3441fd86..95161748d6 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { convertKitApiRequest } from './GenericFunctions';
 
 export class ConvertKitTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.ts b/packages/nodes-base/nodes/Copper/Copper.node.ts
index 05274dd453..ecabe2aa4a 100644
--- a/packages/nodes-base/nodes/Copper/Copper.node.ts
+++ b/packages/nodes-base/nodes/Copper/Copper.node.ts
@@ -7,15 +7,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import {
-	adjustCompanyFields,
-	adjustLeadFields,
-	adjustPersonFields,
-	adjustTaskFields,
-	copperApiRequest,
-	handleListing,
-} from './GenericFunctions';
-
 import {
 	companyFields,
 	companyOperations,
@@ -34,6 +25,14 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
+import {
+	adjustCompanyFields,
+	adjustLeadFields,
+	adjustPersonFields,
+	adjustTaskFields,
+	copperApiRequest,
+	handleListing,
+} from './GenericFunctions';
 
 export class Copper implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
index 3137471c2e..bfab720a1e 100644
--- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
@@ -1,5 +1,6 @@
 import { createHash } from 'crypto';
-
+import flow from 'lodash/flow';
+import omit from 'lodash/omit';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -13,9 +14,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import flow from 'lodash/flow';
-import omit from 'lodash/omit';
-
 import type {
 	AddressFixedCollection,
 	EmailFixedCollection,
diff --git a/packages/nodes-base/nodes/Copper/descriptions/CompanyDescription.ts b/packages/nodes-base/nodes/Copper/descriptions/CompanyDescription.ts
index 0acd63e83e..2a0f94e40f 100644
--- a/packages/nodes-base/nodes/Copper/descriptions/CompanyDescription.ts
+++ b/packages/nodes-base/nodes/Copper/descriptions/CompanyDescription.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { addressFixedCollection, phoneNumbersFixedCollection } from '../utils/sharedFields';
 import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
+import { addressFixedCollection, phoneNumbersFixedCollection } from '../utils/sharedFields';
+
 export const companyOperations: INodeProperties[] = [
 	{
 		displayName: 'Operation',
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.ts b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
index 39bfff623c..2b2e59311d 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.ts
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
@@ -1,4 +1,6 @@
+import * as changeCase from 'change-case';
 import { createHash } from 'crypto';
+import upperFirst from 'lodash/upperFirst';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,17 +11,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import upperFirst from 'lodash/upperFirst';
-import * as changeCase from 'change-case';
-import { cortexApiRequest, getEntityLabel, prepareParameters, splitTags } from './GenericFunctions';
 
 import { analyzerFields, analyzersOperations } from './AnalyzerDescriptions';
-
-import { responderFields, respondersOperations } from './ResponderDescription';
-
-import { jobFields, jobOperations } from './JobDescription';
-
 import type { IJob } from './AnalyzerInterface';
+import { cortexApiRequest, getEntityLabel, prepareParameters, splitTags } from './GenericFunctions';
+import { jobFields, jobOperations } from './JobDescription';
+import { responderFields, respondersOperations } from './ResponderDescription';
 
 export class Cortex implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
index 45f4105a10..dd074e2976 100644
--- a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,8 +8,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 export async function cortexApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index a489093425..1aba92bf30 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import pgPromise from 'pg-promise';
+
 import {
 	generateReturning,
 	getItemCopy,
diff --git a/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts b/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts
new file mode 100644
index 0000000000..0456b5ca58
--- /dev/null
+++ b/packages/nodes-base/nodes/Cron/test/Cron.node.test.ts
@@ -0,0 +1,46 @@
+import { get } from 'lodash';
+import {
+	type ITriggerFunctions,
+	type IDataObject,
+	type IGetNodeParameterOptions,
+} from 'n8n-workflow';
+
+import { Cron } from '../Cron.node';
+
+describe('Cron Node', () => {
+	const node = new Cron();
+
+	const createMockExecuteFunction = (nodeParameters: IDataObject) => {
+		const fakeExecuteFunction = {
+			getNodeParameter(
+				parameterName: string,
+				fallbackValue?: IDataObject | undefined,
+				options?: IGetNodeParameterOptions | undefined,
+			) {
+				const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+
+				const parameterValue = get(nodeParameters, parameter, fallbackValue);
+
+				return parameterValue;
+			},
+		} as unknown as ITriggerFunctions;
+		return fakeExecuteFunction;
+	};
+
+	const triggerFunctions = createMockExecuteFunction({
+		triggerTimes: {
+			item: [],
+		},
+	});
+
+	afterAll(() => {
+		jest.resetAllMocks();
+	});
+
+	it('should return a function to trigger', async () => {
+		expect(await node.trigger.call(triggerFunctions)).toEqual({
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			manualTriggerFunction: expect.any(Function),
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
index f8d94fceaf..bcea2f2b7e 100644
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
+++ b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
@@ -1,5 +1,6 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { allProperties } from './descriptions';
 
 export class CrowdDev implements INodeType {
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
index f7fe7c2050..9ca7575474 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { activityPresend } from '../GenericFunctions';
+
 import { emailsField } from './shared';
 import { getAdditionalOptions, mapWith, showFor } from './utils';
+import { activityPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['activity']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
index 3607321a64..3b28bf1de2 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { automationPresend } from '../GenericFunctions';
+
 import { mapWith, showFor } from './utils';
+import { automationPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['automation']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
index 4bc1496287..515f7f0855 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
@@ -1,11 +1,12 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { resources } from './resources';
+
 import { activityOperations, activityFields } from './activityFields';
+import { automationFields, automationOperations } from './automationFields';
 import { memberFields, memberOperations } from './memberFields';
 import { noteFields, noteOperations } from './noteFields';
 import { organizationFields, organizationOperations } from './organizationFields';
+import { resources } from './resources';
 import { taskFields, taskOperations } from './taskFields';
-import { automationFields, automationOperations } from './automationFields';
 
 export const allProperties: INodeProperties[] = [
 	resources,
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
index 08f4548b69..67a96cff7f 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { memberPresend } from '../GenericFunctions';
-import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
+
 import * as shared from './shared';
+import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
+import { memberPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['member']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
index 7184d88f0b..69c2d0da13 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { notePresend } from '../GenericFunctions';
+
 import { getId, mapWith, showFor } from './utils';
+import { notePresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['note']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
index 283c85193e..4ea7440272 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { organizationPresend } from '../GenericFunctions';
+
 import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
+import { organizationPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['organization']);
 
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
index 8a39b0031a..5de5573860 100644
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
+++ b/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { taskPresend } from '../GenericFunctions';
+
 import { getAdditionalOptions, getId, showFor } from './utils';
+import { taskPresend } from '../GenericFunctions';
 
 const displayOpts = showFor(['task']);
 
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.ts b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
index 6bbaa30e74..b0b2b21b12 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
@@ -1,7 +1,5 @@
 import type { BinaryToTextEncoding } from 'crypto';
 import { createHash, createHmac, createSign, getHashes, randomBytes } from 'crypto';
-import { pipeline } from 'stream/promises';
-import { v4 as uuid } from 'uuid';
 import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
@@ -11,6 +9,8 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { deepCopy, BINARY_ENCODING, NodeConnectionType } from 'n8n-workflow';
+import { pipeline } from 'stream/promises';
+import { v4 as uuid } from 'uuid';
 
 const unsupportedAlgorithms = [
 	'RSA-MD4',
diff --git a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
index b321d4e852..d473b0551f 100644
--- a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
+++ b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
@@ -1,6 +1,7 @@
 import fs from 'fs';
 import fsPromises from 'fs/promises';
 import { Readable } from 'stream';
+
 import { testWorkflows, getWorkflowFilenames, initBinaryDataService } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
index b9202734c3..98b4658230 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
@@ -6,10 +6,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import { customerIoApiRequest, validateJSON } from './GenericFunctions';
+
 import { campaignFields, campaignOperations } from './CampaignDescription';
 import { customerFields, customerOperations } from './CustomerDescription';
 import { eventFields, eventOperations } from './EventDescription';
+import { customerIoApiRequest, validateJSON } from './GenericFunctions';
 import { segmentFields, segmentOperations } from './SegmentDescription';
 
 export class CustomerIo implements INodeType {
diff --git a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
index dd6e356d95..bdcdaae9cf 100644
--- a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -7,8 +8,6 @@ import type {
 	IHttpRequestOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function customerIoApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
index 2b38055281..c981bdcb07 100644
--- a/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
+++ b/packages/nodes-base/nodes/DateTime/V1/DateTimeV1.node.ts
@@ -1,3 +1,6 @@
+import set from 'lodash/set';
+import { DateTime as LuxonDateTime } from 'luxon';
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,15 +11,8 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
 import { deepCopy, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import set from 'lodash/set';
-
-import moment from 'moment-timezone';
-
-import { DateTime as LuxonDateTime } from 'luxon';
-
 function parseDateByFormat(this: IExecuteFunctions, value: string, fromFormat: string) {
 	const date = moment(value, fromFormat, true);
 	if (moment(date).isValid()) return date;
@@ -65,7 +61,7 @@ const versionDescription: INodeTypeDescription = {
 	properties: [
 		{
 			displayName:
-				"More powerful date functionality is available in <a href='https://docs.n8n.io/code/expressions/luxon/' target='_blank'>expressions</a>,</br> e.g. <code>{{ $now.plus(1, 'week') }}</code>",
+				"More powerful date functionality is available in <a href='https://docs.n8n.io/code/cookbook/luxon/' target='_blank'>expressions</a>,</br> e.g. <code>{{ $now.plus(1, 'week') }}</code>",
 			name: 'noticeDateTime',
 			type: 'notice',
 			default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
index e6efc9e01c..cd606507b1 100644
--- a/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/AddToDateDescription.ts
@@ -1,10 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const AddToDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			"You can also do this using an expression, e.g. <code>{{your_date.plus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/expressions/luxon/'>More info</a>",
+			"You can also do this using an expression, e.g. <code>{{your_date.plus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/cookbook/luxon/'>More info</a>",
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
index 81e25c2f38..8d5836d186 100644
--- a/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/CurrentDateDescription.ts
@@ -1,10 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const CurrentDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			'You can also refer to the current date in n8n expressions by using <code>{{$now}}</code> or <code>{{$today}}</code>. <a target="_blank" href="https://docs.n8n.io/code/expressions/luxon/">More info</a>',
+			'You can also refer to the current date in n8n expressions by using <code>{{$now}}</code> or <code>{{$today}}</code>. <a target="_blank" href="https://docs.n8n.io/code/cookbook/luxon/">More info</a>',
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
index ca5a2d5a66..9f148a55db 100644
--- a/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/DateTimeV2.node.ts
@@ -1,3 +1,6 @@
+import type { DateTimeUnit, DurationUnit } from 'luxon';
+import { DateTime } from 'luxon';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -5,18 +8,15 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import type { DateTimeUnit, DurationUnit } from 'luxon';
-import { DateTime } from 'luxon';
-import { CurrentDateDescription } from './CurrentDateDescription';
 import { AddToDateDescription } from './AddToDateDescription';
-import { SubtractFromDateDescription } from './SubtractFromDateDescription';
-import { FormatDateDescription } from './FormatDateDescription';
-import { RoundDateDescription } from './RoundDateDescription';
-import { GetTimeBetweenDatesDescription } from './GetTimeBetweenDates';
+import { CurrentDateDescription } from './CurrentDateDescription';
 import { ExtractDateDescription } from './ExtractDateDescription';
+import { FormatDateDescription } from './FormatDateDescription';
 import { parseDate } from './GenericFunctions';
+import { GetTimeBetweenDatesDescription } from './GetTimeBetweenDates';
+import { RoundDateDescription } from './RoundDateDescription';
+import { SubtractFromDateDescription } from './SubtractFromDateDescription';
 
 export class DateTimeV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
index 2cbabc72a5..b9f490e699 100644
--- a/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/ExtractDateDescription.ts
@@ -1,10 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const ExtractDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			'You can also do this using an expression, e.g. <code>{{ your_date.extract("month") }}}</code>. <a target="_blank" href="https://docs.n8n.io/code/expressions/luxon/">More info</a>',
+			'You can also do this using an expression, e.g. <code>{{ your_date.extract("month") }}}</code>. <a target="_blank" href="https://docs.n8n.io/code/cookbook/luxon/">More info</a>',
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
index 65f578b5a6..76acf83cbf 100644
--- a/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/FormatDateDescription.ts
@@ -1,10 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const FormatDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			"You can also do this using an expression, e.g. <code>{{your_date.format('yyyy-MM-dd')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/expressions/luxon/'>More info</a>",
+			"You can also do this using an expression, e.g. <code>{{your_date.format('yyyy-MM-dd')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/cookbook/luxon/'>More info</a>",
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
index d4329c179e..e59d9c4a6d 100644
--- a/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/GetTimeBetweenDates.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const GetTimeBetweenDatesDescription: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
index 0108fa17e4..d727d23751 100644
--- a/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/RoundDateDescription.ts
@@ -1,10 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const RoundDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			"You can also do this using an expression, e.g. <code>{{ your_date.beginningOf('month') }}</code> or <code>{{ your_date.endOfMonth() }}</code>. <a target='_blank' href='https://docs.n8n.io/code/expressions/luxon/'>More info</a>",
+			"You can also do this using an expression, e.g. <code>{{ your_date.beginningOf('month') }}</code> or <code>{{ your_date.endOfMonth() }}</code>. <a target='_blank' href='https://docs.n8n.io/code/cookbook/luxon/'>More info</a>",
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
index 8de53d6b37..3bfe1b93d7 100644
--- a/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
+++ b/packages/nodes-base/nodes/DateTime/V2/SubtractFromDateDescription.ts
@@ -1,10 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { includeInputFields } from './common.descriptions';
 
 export const SubtractFromDateDescription: INodeProperties[] = [
 	{
 		displayName:
-			"You can also do this using an expression, e.g. <code>{{your_date.minus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/expressions/luxon/'>More info</a>",
+			"You can also do this using an expression, e.g. <code>{{your_date.minus(5, 'minutes')}}</code>. <a target='_blank' href='https://docs.n8n.io/code/cookbook/luxon/'>More info</a>",
 		name: 'notice',
 		type: 'notice',
 		default: '',
diff --git a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
index 60c630d076..6c98039b78 100644
--- a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
+++ b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
@@ -1,4 +1,5 @@
 import moment from 'moment-timezone';
+
 import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 const workflows = getWorkflowFilenames(__dirname);
diff --git a/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
index 77ae4d861a..b3746ead81 100644
--- a/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
+++ b/packages/nodes-base/nodes/DebugHelper/DebugHelper.node.ts
@@ -1,3 +1,4 @@
+import { setSeed, array as mfArray } from 'minifaker';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -10,7 +11,8 @@ import {
 	NodeConnectionType,
 	NodeOperationError,
 } from 'n8n-workflow';
-import { setSeed, array as mfArray } from 'minifaker';
+
+import { generateGarbageMemory, runGarbageCollector } from './functions';
 import {
 	generateCreditCard,
 	generateIPv4,
@@ -25,7 +27,6 @@ import {
 	generateUUID,
 	generateVersion,
 } from './randomData';
-import { generateGarbageMemory, runGarbageCollector } from './functions';
 
 export class DebugHelper implements INodeType {
 	description: INodeTypeDescription = {
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/DeepL/DeepL.node.ts b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
index fbf5ade3c4..f85f091ebe 100644
--- a/packages/nodes-base/nodes/DeepL/DeepL.node.ts
+++ b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { deepLApiRequest } from './GenericFunctions';
-
 import { textOperations } from './TextDescription';
 
 export class DeepL implements INodeType {
diff --git a/packages/nodes-base/nodes/Demio/Demio.node.ts b/packages/nodes-base/nodes/Demio/Demio.node.ts
index 1479d415fd..e93c32683c 100644
--- a/packages/nodes-base/nodes/Demio/Demio.node.ts
+++ b/packages/nodes-base/nodes/Demio/Demio.node.ts
@@ -9,10 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { demioApiRequest } from './GenericFunctions';
-
 import { eventFields, eventOperations } from './EventDescription';
-
+import { demioApiRequest } from './GenericFunctions';
 import { reportFields, reportOperations } from './ReportDescription';
 
 export class Demio implements INodeType {
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
index b0e0168a6d..5f7e38ed1d 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
index 4e80537759..01f523d4c3 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/deleteChannel.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
index b5049a3f85..ceb952395c 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes, IRequestOptions } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/helpers';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/helpers';
 
 // TODO: use nock
 const requestApiSpy = jest.spyOn(transport, 'requestApi');
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
index 7ad2b24113..1616cde2b0 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
index 072990d8ff..e6139f59df 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/channel/update.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
index e84dcd1ad7..7de96bc6ee 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
index 0de1100e60..febf091233 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleAdd.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
index a523f6699a..159c3e71f0 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/member/roleRemove.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
index 5afd6c6c30..6ee8d16e41 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/deleteMessage.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
index 775a266a61..78ec0f22b1 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
index 8c5a9cc479..5bb7d7ba2f 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
index 52f1653452..13c4924f4e 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/react.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
index 3ccc3ea598..95c2ca54cc 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/message/send.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
index df93c22b11..fa5487400e 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/node/webhook/sendLegacy.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport/discord.api';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport/discord.api';
 
 const discordApiRequestSpy = jest.spyOn(transport, 'discordApiRequest');
 
diff --git a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
index a54d48eee9..ff79027568 100644
--- a/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Discord/test/v2/utils.test.ts
@@ -1,4 +1,6 @@
 import type { IExecuteFunctions, INode } from 'n8n-workflow';
+
+import * as transport from '../../v2//transport/discord.api';
 import {
 	createSimplifyFunction,
 	prepareOptions,
@@ -7,8 +9,6 @@ import {
 	setupChannelGetter,
 } from '../../v2/helpers/utils';
 
-import * as transport from '../../v2//transport/discord.api';
-
 const node: INode = {
 	id: '1',
 	name: 'Discord node',
diff --git a/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
index 6f0f24ce63..e802a0dbef 100644
--- a/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
+++ b/packages/nodes-base/nodes/Discord/v1/DiscordV1.node.ts
@@ -14,8 +14,8 @@ import {
 	sleep,
 } from 'n8n-workflow';
 
-import { oldVersionNotice } from '../../../utils/descriptions';
 import type { DiscordAttachment, DiscordWebhook } from './Interfaces';
+import { oldVersionNotice } from '../../../utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Discord',
diff --git a/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts b/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
index b4409a370b..20b4cec13f 100644
--- a/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
+++ b/packages/nodes-base/nodes/Discord/v2/DiscordV2.node.ts
@@ -6,11 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { listSearch, loadOptions } from './methods';
-
 import { router } from './actions/router';
-
 import { versionDescription } from './actions/versionDescription';
+import { listSearch, loadOptions } from './methods';
 
 export class DiscordV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
index d87bad2ec2..fc797a8bd3 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/create.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts
index 57c405655f..af718bb4c6 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/deleteChannel.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts
index 585b5294d4..741960a5de 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/get.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
index 4644f4975e..20d5611d24 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/getAll.operation.ts
@@ -4,10 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { returnAllOrLimit } from '../../../../../utils/descriptions';
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
-import { returnAllOrLimit } from '../../../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts
index e866e89ac0..4d43cea64f 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/index.ts
@@ -1,11 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { guildRLC } from '../common.description';
 import * as create from './create.operation';
+import * as deleteChannel from './deleteChannel.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
 import * as update from './update.operation';
-import * as deleteChannel from './deleteChannel.operation';
+import { guildRLC } from '../common.description';
 
 export { create, get, getAll, update, deleteChannel };
 
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
index 8a07aa8efb..1acd797026 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/channel/update.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
index f2f35f4476..7acccea904 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/common.description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../utils/utilities';
 
 export const guildRLC: INodeProperties = {
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
index 1cf43b0c98..982382b1c6 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/getAll.operation.ts
@@ -4,11 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { returnAllOrLimit } from '../../../../../utils/descriptions';
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { createSimplifyFunction, parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
 import { simplifyBoolean } from '../common.description';
-import { returnAllOrLimit } from '../../../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts
index a2260b731c..5f2e87f749 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/index.ts
@@ -1,9 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { guildRLC } from '../common.description';
 import * as getAll from './getAll.operation';
 import * as roleAdd from './roleAdd.operation';
 import * as roleRemove from './roleRemove.operation';
+import { guildRLC } from '../common.description';
 
 export { getAll, roleAdd, roleRemove };
 
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts
index 4cd83fe2fd..d35cab836d 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/roleAdd.operation.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts
index 025975054b..d6048294c5 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/member/roleRemove.operation.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts
index 149d9fc9e9..11e903c663 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/deleteMessage.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
index f7405a7b99..d6246fada9 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/get.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
 	createSimplifyFunction,
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
index c818bf08d1..10086c4040 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/getAll.operation.ts
@@ -4,6 +4,8 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { returnAllOrLimit } from '../../../../../utils/descriptions';
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
 	createSimplifyFunction,
@@ -13,7 +15,6 @@ import {
 } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
 import { channelRLC, simplifyBoolean } from '../common.description';
-import { returnAllOrLimit } from '../../../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
 	channelRLC,
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
index a2fb1955a4..c040cb94e7 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/index.ts
@@ -1,11 +1,11 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { guildRLC } from '../common.description';
+import * as deleteMessage from './deleteMessage.operation';
+import * as get from './get.operation';
 import * as getAll from './getAll.operation';
 import * as react from './react.operation';
 import * as send from './send.operation';
-import * as deleteMessage from './deleteMessage.operation';
-import * as get from './get.operation';
+import { guildRLC } from '../common.description';
 
 export { getAll, react, send, deleteMessage, get };
 
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts
index 1041c5626a..9713d9e8ef 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/react.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { parseDiscordError, prepareErrorData, setupChannelGetter } from '../../helpers/utils';
 import { discordApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
index 1b29fe13ad..bcd49d7a8f 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/message/send.operation.ts
@@ -5,15 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
-import {
-	embedsFixedCollection,
-	filesFixedCollection,
-	textChannelRLC,
-	userRLC,
-} from '../common.description';
 
+import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
 	checkAccessToChannel,
 	parseDiscordError,
@@ -22,6 +15,13 @@ import {
 	prepareMultiPartForm,
 	prepareOptions,
 } from '../../helpers/utils';
+import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
+import {
+	embedsFixedCollection,
+	filesFixedCollection,
+	textChannelRLC,
+	userRLC,
+} from '../common.description';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/router.ts b/packages/nodes-base/nodes/Discord/v2/actions/router.ts
index 2a65ca6145..a43534e141 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/router.ts
@@ -1,14 +1,13 @@
 import type { IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { discordApiRequest } from '../transport';
-import { checkAccessToGuild } from '../helpers/utils';
-
-import * as message from './message';
 import * as channel from './channel';
 import * as member from './member';
-import * as webhook from './webhook';
+import * as message from './message';
 import type { Discord } from './node.type';
+import * as webhook from './webhook';
+import { checkAccessToGuild } from '../helpers/utils';
+import { discordApiRequest } from '../transport';
 
 export async function router(this: IExecuteFunctions) {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
index 7fc8c5d532..8d79650890 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/versionDescription.ts
@@ -1,9 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import * as message from './message';
 import * as channel from './channel';
 import * as member from './member';
+import * as message from './message';
 import * as webhook from './webhook';
 
 export const versionDescription: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts b/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
index cf4379f0e5..e94837fb4c 100644
--- a/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
+++ b/packages/nodes-base/nodes/Discord/v2/actions/webhook/sendLegacy.operation.ts
@@ -4,9 +4,8 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
 
+import { updateDisplayOptions } from '../../../../../utils/utilities';
 import {
 	parseDiscordError,
 	prepareEmbeds,
@@ -14,7 +13,7 @@ import {
 	prepareMultiPartForm,
 	prepareOptions,
 } from '../../helpers/utils';
-
+import { discordApiMultiPartRequest, discordApiRequest } from '../../transport';
 import { embedsFixedCollection, filesFixedCollection } from '../common.description';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
index b3852f9527..7f1922adb4 100644
--- a/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Discord/v2/helpers/utils.ts
@@ -1,3 +1,6 @@
+import FormData from 'form-data';
+import { isEmpty } from 'lodash';
+import { extension } from 'mime-types';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -6,9 +9,7 @@ import type {
 	INodeExecutionData,
 } from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
-import { isEmpty } from 'lodash';
-import FormData from 'form-data';
-import { extension } from 'mime-types';
+
 import { capitalize } from '../../../../utils/utilities';
 import { discordApiRequest } from '../transport';
 
diff --git a/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts
index abbec43040..02251f610d 100644
--- a/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Discord/v2/methods/listSearch.ts
@@ -3,8 +3,9 @@ import {
 	type ILoadOptionsFunctions,
 	type INodeListSearchResult,
 } from 'n8n-workflow';
-import { discordApiRequest } from '../transport';
+
 import { checkAccessToGuild } from '../helpers/utils';
+import { discordApiRequest } from '../transport';
 
 async function getGuildId(this: ILoadOptionsFunctions) {
 	const guildId = this.getNodeParameter('guildId', undefined, {
diff --git a/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts
index ab79a4bd1d..8cc4cfd27f 100644
--- a/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Discord/v2/methods/loadOptions.ts
@@ -1,6 +1,7 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import { discordApiRequest } from '../transport';
+
 import { checkAccessToGuild } from '../helpers/utils';
+import { discordApiRequest } from '../transport';
 
 export async function getRoles(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const guildId = this.getNodeParameter('guildId', undefined, {
diff --git a/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts b/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
index c7a066ef4d..7c95bf5d3b 100644
--- a/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
+++ b/packages/nodes-base/nodes/Discord/v2/transport/discord.api.ts
@@ -1,3 +1,4 @@
+import type FormData from 'form-data';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,10 +8,8 @@ import type {
 	ILoadOptionsFunctions,
 	IRequestOptions,
 } from 'n8n-workflow';
-
 import { sleep, NodeApiError, jsonParse } from 'n8n-workflow';
 
-import type FormData from 'form-data';
 import { getCredentialsType, requestApi } from './helpers';
 
 export async function discordApiRequest(
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.ts b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
index 2cf817d71b..92e329ca97 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.ts
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
@@ -9,16 +9,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { discourseApiRequest } from './GenericFunctions';
-
-import { postFields, postOperations } from './PostDescription';
-
 import { categoryFields, categoryOperations } from './CategoryDescription';
-
+import { discourseApiRequest } from './GenericFunctions';
 import { groupFields, groupOperations } from './GroupDescription';
-
+import { postFields, postOperations } from './PostDescription';
 import { userFields, userOperations } from './UserDescription';
-
 import { userGroupFields, userGroupOperations } from './UserGroupDescription';
 
 export class Discourse implements INodeType {
diff --git a/packages/nodes-base/nodes/Drift/Drift.node.ts b/packages/nodes-base/nodes/Drift/Drift.node.ts
index dcb62e5aff..19a29ec873 100644
--- a/packages/nodes-base/nodes/Drift/Drift.node.ts
+++ b/packages/nodes-base/nodes/Drift/Drift.node.ts
@@ -6,9 +6,10 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { driftApiRequest } from './GenericFunctions';
+
 import { contactFields, contactOperations } from './ContactDescription';
 import type { IContact } from './ContactInterface';
+import { driftApiRequest } from './GenericFunctions';
 
 export class Drift implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts b/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
index 24c121988b..cf247919a2 100644
--- a/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
+++ b/packages/nodes-base/nodes/E2eTest/E2eTest.node.ts
@@ -9,6 +9,7 @@ import {
 	type INodeTypeDescription,
 	type ResourceMapperFields,
 } from 'n8n-workflow';
+
 import { remoteOptions, resourceMapperFields, returnData, searchOptions } from './mock';
 
 export class E2eTest implements INodeType {
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
index 8217b3f22d..0d00b57032 100644
--- a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
@@ -11,9 +11,7 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { documentFields, documentOperations } from './DocumentDescription';
-
 import { erpNextApiRequest, erpNextApiRequestAllItems } from './GenericFunctions';
-
 import type { DocumentProperties } from './utils';
 import { processNames, toSQL } from './utils';
 
diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.ts b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
index 3e4544de8e..9167781af9 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -1,5 +1,6 @@
-import { parse as pathParse } from 'path';
 import { writeFile as fsWriteFile } from 'fs/promises';
+import getSystemFonts from 'get-system-fonts';
+import gm from 'gm';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,10 +11,9 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, deepCopy } from 'n8n-workflow';
-import gm from 'gm';
+import { NodeOperationError, NodeConnectionType, deepCopy } from 'n8n-workflow';
+import { parse as pathParse } from 'path';
 import { file } from 'tmp-promise';
-import getSystemFonts from 'get-system-fonts';
 
 const nodeOperations: INodePropertyOptions[] = [
 	{
@@ -849,9 +849,9 @@ export class EditImage implements INodeType {
 								typeOptions: {
 									loadOptionsMethod: 'getFonts',
 								},
-								default: 'default',
+								default: '',
 								description:
-									'The font to use. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+									'The font to use. Defaults to Arial. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
 							},
 						],
 					},
@@ -890,9 +890,9 @@ export class EditImage implements INodeType {
 						typeOptions: {
 							loadOptionsMethod: 'getFonts',
 						},
-						default: 'default',
+						default: '',
 						description:
-							'The font to use. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+							'The font to use. Defaults to Arial. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
 					},
 					{
 						displayName: 'Format',
@@ -951,7 +951,6 @@ export class EditImage implements INodeType {
 	methods = {
 		loadOptions: {
 			async getFonts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				// @ts-ignore
 				const files = await getSystemFonts();
 				const returnData: INodePropertyOptions[] = [];
 
@@ -977,11 +976,6 @@ export class EditImage implements INodeType {
 					return 0;
 				});
 
-				returnData.unshift({
-					name: 'default',
-					value: 'default',
-				});
-
 				return returnData;
 			},
 		},
@@ -1234,15 +1228,23 @@ export class EditImage implements INodeType {
 						// Combine the lines to a single string
 						const renderText = lines.join('\n');
 
-						const font = options.font || operationData.font;
+						let font = (options.font || operationData.font) as string | undefined;
+						if (!font) {
+							const fonts = await getSystemFonts();
+							font = fonts.find((_font) => _font.includes('Arial.'));
+						}
 
-						if (font && font !== 'default') {
-							gmInstance = gmInstance!.font(font as string);
+						if (!font) {
+							throw new NodeOperationError(
+								this.getNode(),
+								'Default font not found. Select a font from the options.',
+							);
 						}
 
 						gmInstance = gmInstance!
 							.fill(operationData.fontColor as string)
 							.fontSize(operationData.fontSize as number)
+							.font(font)
 							.drawText(
 								operationData.positionX as number,
 								operationData.positionY as number,
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.ts b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
index e922c7ad21..31056e97b2 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.ts
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,9 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { egoiApiRequest, egoiApiRequestAllItems, simplify } from './GenericFunctions';
-
 import type { ICreateMemberBody } from './Interfaces';
 
 export class Egoi implements INodeType {
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
index d9eb282476..f30a6f3e2a 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
@@ -9,14 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import {
-	elasticSecurityApiRequest,
-	getConnector,
-	getVersion,
-	handleListing,
-	throwOnEmptyUpdate,
-} from './GenericFunctions';
-
 import {
 	caseCommentFields,
 	caseCommentOperations,
@@ -27,7 +19,13 @@ import {
 	connectorFields,
 	connectorOperations,
 } from './descriptions';
-
+import {
+	elasticSecurityApiRequest,
+	getConnector,
+	getVersion,
+	handleListing,
+	throwOnEmptyUpdate,
+} from './GenericFunctions';
 import type { Connector, ConnectorCreatePayload, ConnectorType } from './types';
 
 export class ElasticSecurity implements INodeType {
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
index 7a055eb1e1..0da536b600 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
@@ -21,9 +21,8 @@ export async function elasticSecurityApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl: rawBaseUrl } = (await this.getCredentials(
-		'elasticSecurityApi',
-	)) as ElasticSecurityApiCredentials;
+	const { baseUrl: rawBaseUrl } =
+		await this.getCredentials<ElasticSecurityApiCredentials>('elasticSecurityApi');
 
 	const baseUrl = tolerateTrailingSlash(rawBaseUrl);
 
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index d13d237514..5fab762b88 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
@@ -1,3 +1,4 @@
+import omit from 'lodash/omit';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,15 +9,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, jsonParse, NodeApiError } from 'n8n-workflow';
 
-import omit from 'lodash/omit';
+import { documentFields, documentOperations, indexFields, indexOperations } from './descriptions';
 import {
 	elasticsearchApiRequest,
 	elasticsearchApiRequestAllItems,
 	elasticsearchBulkApiRequest,
 } from './GenericFunctions';
-
-import { documentFields, documentOperations, indexFields, indexOperations } from './descriptions';
-
 import type { DocumentGetAllOptions, FieldsUiValues } from './types';
 
 export class Elasticsearch implements INodeType {
@@ -172,7 +170,7 @@ export class Elasticsearch implements INodeType {
 						} else {
 							responseData = await elasticsearchApiRequest.call(
 								this,
-								'GET',
+								'POST',
 								`/${indexId}/_search`,
 								body,
 								qs,
@@ -184,7 +182,7 @@ export class Elasticsearch implements INodeType {
 
 						responseData = await elasticsearchApiRequest.call(
 							this,
-							'GET',
+							'POST',
 							`/${indexId}/_search`,
 							body,
 							qs,
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
index 333a412a02..29804736e2 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
@@ -10,9 +10,8 @@ import { NodeApiError } from 'n8n-workflow';
 import type { ElasticsearchApiCredentials } from './types';
 
 export async function elasticsearchBulkApiRequest(this: IExecuteFunctions, body: IDataObject) {
-	const { baseUrl, ignoreSSLIssues } = (await this.getCredentials(
-		'elasticsearchApi',
-	)) as ElasticsearchApiCredentials;
+	const { baseUrl, ignoreSSLIssues } =
+		await this.getCredentials<ElasticsearchApiCredentials>('elasticsearchApi');
 
 	const bulkBody = Object.values(body).flat().join('\n') + '\n';
 
@@ -20,7 +19,7 @@ export async function elasticsearchBulkApiRequest(this: IExecuteFunctions, body:
 		method: 'POST',
 		headers: { 'Content-Type': 'application/x-ndjson' },
 		body: bulkBody,
-		url: `${baseUrl}/_bulk`,
+		url: `${baseUrl.replace(/\/$/, '')}/_bulk`,
 		skipSslCertificateValidation: ignoreSSLIssues,
 		returnFullResponse: true,
 		ignoreHttpStatusErrors: true,
@@ -58,15 +57,14 @@ export async function elasticsearchApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl, ignoreSSLIssues } = (await this.getCredentials(
-		'elasticsearchApi',
-	)) as ElasticsearchApiCredentials;
+	const { baseUrl, ignoreSSLIssues } =
+		await this.getCredentials<ElasticsearchApiCredentials>('elasticsearchApi');
 
 	const options: IHttpRequestOptions = {
 		method,
 		body,
 		qs,
-		url: `${baseUrl}${endpoint}`,
+		url: `${baseUrl.replace(/\/$/, '')}${endpoint}`,
 		json: true,
 		skipSslCertificateValidation: ignoreSSLIssues,
 	};
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/tests/GenericFunctions.test.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/tests/GenericFunctions.test.ts
new file mode 100644
index 0000000000..a578344410
--- /dev/null
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/tests/GenericFunctions.test.ts
@@ -0,0 +1,112 @@
+import { type IExecuteFunctions, NodeApiError } from 'n8n-workflow';
+
+import { elasticsearchApiRequest } from '../GenericFunctions';
+
+describe('Elasticsearch -> elasticsearchApiRequest', () => {
+	let mockExecuteFunctions: IExecuteFunctions;
+
+	const mockHttpRequestWithAuthentication = jest.fn();
+
+	const setupMockFunctions = () => {
+		mockExecuteFunctions = {
+			getCredentials: jest.fn().mockResolvedValue({
+				baseUrl: 'https://example.com',
+				ignoreSSLIssues: false,
+			}),
+			helpers: {
+				httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+			},
+			getNode: jest.fn().mockReturnValue({}),
+		} as unknown as IExecuteFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions();
+		mockHttpRequestWithAuthentication.mockClear();
+	});
+
+	const response = { success: true };
+
+	it('should make a successful GET API request', async () => {
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		const result = await elasticsearchApiRequest.call(
+			mockExecuteFunctions,
+			'GET',
+			'/test-endpoint',
+		);
+
+		expect(result).toEqual(response);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				method: 'GET',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should make a successful POST API request', async () => {
+		const body = { key: 'value' };
+
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		const result = await elasticsearchApiRequest.call(
+			mockExecuteFunctions,
+			'POST',
+			'/test-endpoint',
+			body,
+		);
+
+		expect(result).toEqual(response);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				body,
+				method: 'POST',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should handle API request errors', async () => {
+		const errorResponse = { message: 'Error occurred' };
+		mockHttpRequestWithAuthentication.mockRejectedValue(errorResponse);
+
+		await expect(
+			elasticsearchApiRequest.call(mockExecuteFunctions, 'GET', '/test-endpoint'),
+		).rejects.toThrow(NodeApiError);
+
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				method: 'GET',
+				url: 'https://example.com/test-endpoint',
+				json: true,
+				skipSslCertificateValidation: false,
+			}),
+		);
+	});
+
+	it('should ignore trailing slashes in the base URL', async () => {
+		mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+		mockExecuteFunctions.getCredentials = jest.fn().mockResolvedValue({
+			baseUrl: 'https://elastic.domain.com/',
+			ignoreSSLIssues: false,
+		});
+		await elasticsearchApiRequest.call(mockExecuteFunctions, 'GET', '/test-endpoint');
+
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'elasticsearchApi',
+			expect.objectContaining({
+				url: 'https://elastic.domain.com/test-endpoint',
+			}),
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
index 29cac4a002..669f027e6c 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
@@ -1,3 +1,10 @@
+import type { ImapSimple, ImapSimpleOptions, Message } from '@n8n/imap';
+import { connect as imapConnect, getParts } from '@n8n/imap';
+import find from 'lodash/find';
+import isEmpty from 'lodash/isEmpty';
+import type { Source as ParserSource } from 'mailparser';
+import { simpleParser } from 'mailparser';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	ITriggerFunctions,
 	IBinaryData,
@@ -13,15 +20,6 @@ import type {
 	INodeTypeDescription,
 	ITriggerResponse,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import type { ImapSimple, ImapSimpleOptions, Message } from '@n8n/imap';
-import { connect as imapConnect, getParts } from '@n8n/imap';
-import type { Source as ParserSource } from 'mailparser';
-import { simpleParser } from 'mailparser';
-
-import isEmpty from 'lodash/isEmpty';
-import find from 'lodash/find';
 
 export async function parseRawEmail(
 	this: ITriggerFunctions,
@@ -200,7 +198,7 @@ const versionDescription: INodeTypeDescription = {
 						'Custom email fetching rules. See <a href="https://github.com/mscdex/node-imap">node-imap</a>\'s search function for more details.',
 				},
 				{
-					displayName: 'Ignore SSL Issues',
+					displayName: 'Ignore SSL Issues (Insecure)',
 					name: 'allowUnauthorizedCerts',
 					type: 'boolean',
 					default: false,
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index 74f7540188..48ce9b3766 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -1,3 +1,9 @@
+import type { ImapSimple, ImapSimpleOptions, Message, MessagePart } from '@n8n/imap';
+import { connect as imapConnect, getParts } from '@n8n/imap';
+import find from 'lodash/find';
+import isEmpty from 'lodash/isEmpty';
+import type { Source as ParserSource } from 'mailparser';
+import { simpleParser } from 'mailparser';
 import type {
 	ITriggerFunctions,
 	IBinaryData,
@@ -14,14 +20,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError, TriggerCloseError } from 'n8n-workflow';
-
-import type { ImapSimple, ImapSimpleOptions, Message, MessagePart } from '@n8n/imap';
-import { connect as imapConnect, getParts } from '@n8n/imap';
-import type { Source as ParserSource } from 'mailparser';
-import { simpleParser } from 'mailparser';
 import rfc2047 from 'rfc2047';
-import isEmpty from 'lodash/isEmpty';
-import find from 'lodash/find';
 
 import type { ICredentialsDataImap } from '../../../credentials/Imap.credentials';
 import { isCredentialsDataImap } from '../../../credentials/Imap.credentials';
diff --git a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
index 45ea02ffa6..c0dd00af01 100644
--- a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
@@ -7,7 +7,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import { createTransport } from 'nodemailer';
 import type SMTPTransport from 'nodemailer/lib/smtp-transport';
 
@@ -110,7 +109,7 @@ const versionDescription: INodeTypeDescription = {
 			default: {},
 			options: [
 				{
-					displayName: 'Ignore SSL Issues',
+					displayName: 'Ignore SSL Issues (Insecure)',
 					name: 'allowUnauthorizedCerts',
 					type: 'boolean',
 					default: false,
diff --git a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
index 0c78e6293c..b8f065a8b7 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
@@ -9,11 +9,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
 import { createTransport } from 'nodemailer';
 import type SMTPTransport from 'nodemailer/lib/smtp-transport';
 
 import { updateDisplayOptions } from '@utils/utilities';
+
 import { appendAttributionOption } from '../../../utils/descriptions';
 
 const properties: INodeProperties[] = [
@@ -167,7 +167,7 @@ const properties: INodeProperties[] = [
 				description: 'Email address of BCC recipient',
 			},
 			{
-				displayName: 'Ignore SSL Issues',
+				displayName: 'Ignore SSL Issues (Insecure)',
 				name: 'allowUnauthorizedCerts',
 				type: 'boolean',
 				default: false,
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.ts b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
index 121a5d4233..8c4b710211 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.ts
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
@@ -1,3 +1,4 @@
+import isEmpty from 'lodash/isEmpty';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -8,12 +9,9 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import { emeliaApiTest, emeliaGraphqlRequest, loadResource } from './GenericFunctions';
-
 import { campaignFields, campaignOperations } from './CampaignDescription';
-
 import { contactListFields, contactListOperations } from './ContactListDescription';
+import { emeliaApiTest, emeliaGraphqlRequest, loadResource } from './GenericFunctions';
 
 export class Emelia implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
similarity index 100%
rename from packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.json
rename to packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.json
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.test.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.test.ts
new file mode 100644
index 0000000000..f0352c9a31
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.test.ts
@@ -0,0 +1,113 @@
+import { mock } from 'jest-mock-extended';
+import type { IExecuteFunctions, IWorkflowDataProxyData } from 'n8n-workflow';
+
+import { ExecuteWorkflow } from './ExecuteWorkflow.node';
+import { getWorkflowInfo } from './GenericFunctions';
+
+jest.mock('./GenericFunctions');
+jest.mock('../../../utils/utilities');
+
+describe('ExecuteWorkflow', () => {
+	const executeWorkflow = new ExecuteWorkflow();
+	const executeFunctions = mock<IExecuteFunctions>({
+		getNodeParameter: jest.fn(),
+		getInputData: jest.fn(),
+		getWorkflowDataProxy: jest.fn(),
+		executeWorkflow: jest.fn(),
+		continueOnFail: jest.fn(),
+		setMetadata: jest.fn(),
+		getNode: jest.fn(),
+	});
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		executeFunctions.getInputData.mockReturnValue([{ json: { key: 'value' } }]);
+		executeFunctions.getWorkflowDataProxy.mockReturnValue({
+			$workflow: { id: 'workflowId' },
+			$execution: { id: 'executionId' },
+		} as unknown as IWorkflowDataProxyData);
+	});
+
+	test('should execute workflow in "each" mode and wait for sub-workflow completion', async () => {
+		executeFunctions.getNodeParameter
+			.mockReturnValueOnce('database') // source
+			.mockReturnValueOnce('each') // mode
+			.mockReturnValueOnce(true) // waitForSubWorkflow
+			.mockReturnValueOnce([]); // workflowInputs.schema
+
+		executeFunctions.getInputData.mockReturnValue([{ json: { key: 'value' } }]);
+		executeFunctions.getWorkflowDataProxy.mockReturnValue({
+			$workflow: { id: 'workflowId' },
+			$execution: { id: 'executionId' },
+		} as unknown as IWorkflowDataProxyData);
+		(getWorkflowInfo as jest.Mock).mockResolvedValue({ id: 'subWorkflowId' });
+		(executeFunctions.executeWorkflow as jest.Mock).mockResolvedValue({
+			executionId: 'subExecutionId',
+			data: [[{ json: { key: 'subValue' } }]],
+		});
+
+		const result = await executeWorkflow.execute.call(executeFunctions);
+
+		expect(result).toEqual([
+			[
+				{
+					json: { key: 'value' },
+					index: 0,
+					pairedItem: { item: 0 },
+					metadata: {
+						subExecution: { workflowId: 'subWorkflowId', executionId: 'subExecutionId' },
+					},
+				},
+			],
+		]);
+	});
+
+	test('should execute workflow in "once" mode and not wait for sub-workflow completion', async () => {
+		executeFunctions.getNodeParameter
+			.mockReturnValueOnce('database') // source
+			.mockReturnValueOnce('once') // mode
+			.mockReturnValueOnce(false) // waitForSubWorkflow
+			.mockReturnValueOnce([]); // workflowInputs.schema
+
+		executeFunctions.getInputData.mockReturnValue([{ json: { key: 'value' } }]);
+
+		executeFunctions.executeWorkflow.mockResolvedValue({
+			executionId: 'subExecutionId',
+			data: [[{ json: { key: 'subValue' } }]],
+		});
+
+		const result = await executeWorkflow.execute.call(executeFunctions);
+
+		expect(result).toEqual([[{ json: { key: 'value' }, index: 0, pairedItem: { item: 0 } }]]);
+	});
+
+	test('should handle errors and continue on fail', async () => {
+		executeFunctions.getNodeParameter
+			.mockReturnValueOnce('database') // source
+			.mockReturnValueOnce('each') // mode
+			.mockReturnValueOnce(true) // waitForSubWorkflow
+			.mockReturnValueOnce([]); // workflowInputs.schema
+
+		(getWorkflowInfo as jest.Mock).mockRejectedValue(new Error('Test error'));
+		(executeFunctions.continueOnFail as jest.Mock).mockReturnValue(true);
+
+		const result = await executeWorkflow.execute.call(executeFunctions);
+
+		expect(result).toEqual([[{ json: { error: 'Test error' }, pairedItem: { item: 0 } }]]);
+	});
+
+	test('should throw error if not continuing on fail', async () => {
+		executeFunctions.getNodeParameter
+			.mockReturnValueOnce('database') // source
+			.mockReturnValueOnce('each') // mode
+			.mockReturnValueOnce(true) // waitForSubWorkflow
+			.mockReturnValueOnce([]); // workflowInputs.schema
+
+		(getWorkflowInfo as jest.Mock).mockRejectedValue(new Error('Test error'));
+		(executeFunctions.continueOnFail as jest.Mock).mockReturnValue(false);
+
+		await expect(executeWorkflow.execute.call(executeFunctions)).rejects.toThrow(
+			'Error executing workflow with item at index 0',
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
similarity index 65%
rename from packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
rename to packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 26af55f210..a04ef4375c 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -1,13 +1,18 @@
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
+	ExecuteWorkflowData,
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { generatePairedItemData } from '../../utils/utilities';
-import { getWorkflowInfo } from './GenericFunctions';
 
+import { getWorkflowInfo } from './GenericFunctions';
+import { generatePairedItemData } from '../../../utils/utilities';
+import {
+	getCurrentWorkflowInputData,
+	loadWorkflowInputMappings,
+} from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
 export class ExecuteWorkflow implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Execute Workflow',
@@ -15,7 +20,7 @@ export class ExecuteWorkflow implements INodeType {
 		icon: 'fa:sign-in-alt',
 		iconColor: 'orange-red',
 		group: ['transform'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2],
 		subtitle: '={{"Workflow: " + $parameter["workflowId"]}}',
 		description: 'Execute another workflow',
 		defaults: {
@@ -38,6 +43,13 @@ export class ExecuteWorkflow implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'This node is out of date. Please upgrade by removing it and adding a new one',
+				name: 'outdatedVersionWarning',
+				type: 'notice',
+				displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+				default: '',
+			},
 			{
 				displayName: 'Source',
 				name: 'source',
@@ -66,6 +78,27 @@ export class ExecuteWorkflow implements INodeType {
 				],
 				default: 'database',
 				description: 'Where to get the workflow to execute from',
+				displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+			},
+			{
+				displayName: 'Source',
+				name: 'source',
+				type: 'options',
+				options: [
+					{
+						name: 'Database',
+						value: 'database',
+						description: 'Load the workflow from the database by ID',
+					},
+					{
+						name: 'Define Below',
+						value: 'parameter',
+						description: 'Pass the JSON code of a workflow',
+					},
+				],
+				default: 'database',
+				description: 'Where to get the workflow to execute from',
+				displayOptions: { show: { '@version': [{ _cnd: { gte: 1.2 } }] } },
 			},
 
 			// ----------------------------------
@@ -162,6 +195,43 @@ export class ExecuteWorkflow implements INodeType {
 				name: 'executeWorkflowNotice',
 				type: 'notice',
 				default: '',
+				displayOptions: { show: { '@version': [{ _cnd: { lte: 1.1 } }] } },
+			},
+			{
+				displayName: 'Workflow Inputs',
+				name: 'workflowInputs',
+				type: 'resourceMapper',
+				noDataExpression: true,
+				default: {
+					mappingMode: 'defineBelow',
+					value: null,
+				},
+				required: true,
+				typeOptions: {
+					loadOptionsDependsOn: ['workflowId.value'],
+					resourceMapper: {
+						localResourceMapperMethod: 'loadWorkflowInputMappings',
+						valuesLabel: 'Workflow Inputs',
+						mode: 'map',
+						fieldWords: {
+							singular: 'input',
+							plural: 'inputs',
+						},
+						addAllFields: true,
+						multiKeyMatch: false,
+						supportAutoMap: false,
+						showTypeConversionOptions: true,
+					},
+				},
+				displayOptions: {
+					show: {
+						source: ['database'],
+						'@version': [{ _cnd: { gte: 1.2 } }],
+					},
+					hide: {
+						workflowId: [''],
+					},
+				},
 			},
 			{
 				displayName: 'Mode',
@@ -204,13 +274,22 @@ export class ExecuteWorkflow implements INodeType {
 		],
 	};
 
+	methods = {
+		localResourceMapping: {
+			loadWorkflowInputMappings,
+		},
+	};
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const source = this.getNodeParameter('source', 0) as string;
 		const mode = this.getNodeParameter('mode', 0, false) as string;
-		const items = this.getInputData();
+		const items = getCurrentWorkflowInputData.call(this);
+
+		const workflowProxy = this.getWorkflowDataProxy(0);
+		const currentWorkflowId = workflowProxy.$workflow.id as string;
 
 		if (mode === 'each') {
-			let returnData: INodeExecutionData[][] = [];
+			const returnData: INodeExecutionData[][] = [];
 
 			for (let i = 0; i < items.length; i++) {
 				try {
@@ -222,14 +301,28 @@ export class ExecuteWorkflow implements INodeType {
 					const workflowInfo = await getWorkflowInfo.call(this, source, i);
 
 					if (waitForSubWorkflow) {
-						const workflowResult: INodeExecutionData[][] = await this.executeWorkflow(
+						const executionResult: ExecuteWorkflowData = await this.executeWorkflow(
 							workflowInfo,
 							[items[i]],
+							undefined,
+							{
+								parentExecution: {
+									executionId: workflowProxy.$execution.id,
+									workflowId: workflowProxy.$workflow.id,
+								},
+							},
 						);
+						const workflowResult = executionResult.data as INodeExecutionData[][];
 
 						for (const [outputIndex, outputData] of workflowResult.entries()) {
 							for (const item of outputData) {
 								item.pairedItem = { item: i };
+								item.metadata = {
+									subExecution: {
+										executionId: executionResult.executionId,
+										workflowId: workflowInfo.id ?? currentWorkflowId,
+									},
+								};
 							}
 
 							if (returnData[outputIndex] === undefined) {
@@ -239,8 +332,32 @@ export class ExecuteWorkflow implements INodeType {
 							returnData[outputIndex].push(...outputData);
 						}
 					} else {
-						void this.executeWorkflow(workflowInfo, [items[i]]);
-						returnData = [items];
+						const executionResult: ExecuteWorkflowData = await this.executeWorkflow(
+							workflowInfo,
+							[items[i]],
+							undefined,
+							{
+								doNotWaitToFinish: true,
+								parentExecution: {
+									executionId: workflowProxy.$execution.id,
+									workflowId: workflowProxy.$workflow.id,
+								},
+							},
+						);
+
+						if (returnData.length === 0) {
+							returnData.push([]);
+						}
+
+						returnData[0].push({
+							...items[i],
+							metadata: {
+								subExecution: {
+									workflowId: workflowInfo.id ?? currentWorkflowId,
+									executionId: executionResult.executionId,
+								},
+							},
+						});
 					}
 				} catch (error) {
 					if (this.continueOnFail()) {
@@ -258,6 +375,10 @@ export class ExecuteWorkflow implements INodeType {
 				}
 			}
 
+			this.setMetadata({
+				subExecutionsCount: items.length,
+			});
+
 			return returnData;
 		} else {
 			try {
@@ -268,15 +389,32 @@ export class ExecuteWorkflow implements INodeType {
 				) as boolean;
 				const workflowInfo = await getWorkflowInfo.call(this, source);
 
+				const executionResult: ExecuteWorkflowData = await this.executeWorkflow(
+					workflowInfo,
+					items,
+					undefined,
+					{
+						doNotWaitToFinish: !waitForSubWorkflow,
+						parentExecution: {
+							executionId: workflowProxy.$execution.id,
+							workflowId: workflowProxy.$workflow.id,
+						},
+					},
+				);
+
+				this.setMetadata({
+					subExecution: {
+						executionId: executionResult.executionId,
+						workflowId: workflowInfo.id ?? (workflowProxy.$workflow.id as string),
+					},
+					subExecutionsCount: 1,
+				});
+
 				if (!waitForSubWorkflow) {
-					void this.executeWorkflow(workflowInfo, items);
 					return [items];
 				}
 
-				const workflowResult: INodeExecutionData[][] = await this.executeWorkflow(
-					workflowInfo,
-					items,
-				);
+				const workflowResult = executionResult.data as INodeExecutionData[][];
 
 				const fallbackPairedItemData = generatePairedItemData(items.length);
 
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/GenericFunctions.ts
similarity index 92%
rename from packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
rename to packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/GenericFunctions.ts
index 7588040bf8..450a268dfa 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow/GenericFunctions.ts
@@ -3,11 +3,16 @@ import { NodeOperationError, jsonParse } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IExecuteWorkflowInfo,
+	ILoadOptionsFunctions,
 	INodeParameterResourceLocator,
 	IRequestOptions,
 } from 'n8n-workflow';
 
-export async function getWorkflowInfo(this: IExecuteFunctions, source: string, itemIndex = 0) {
+export async function getWorkflowInfo(
+	this: ILoadOptionsFunctions | IExecuteFunctions,
+	source: string,
+	itemIndex = 0,
+) {
 	const workflowInfo: IExecuteWorkflowInfo = {};
 	const nodeVersion = this.getNode().typeVersion;
 	if (source === 'database') {
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.json b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.json
similarity index 100%
rename from packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.json
rename to packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.json
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
new file mode 100644
index 0000000000..b479538c3a
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.test.ts
@@ -0,0 +1,53 @@
+import { mock } from 'jest-mock-extended';
+import type { FieldValueOption, IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow';
+
+import { ExecuteWorkflowTrigger } from './ExecuteWorkflowTrigger.node';
+import { WORKFLOW_INPUTS } from '../../../utils/workflowInputsResourceMapping/constants';
+import { getFieldEntries } from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
+
+jest.mock('../../../utils/workflowInputsResourceMapping/GenericFunctions', () => ({
+	getFieldEntries: jest.fn(),
+	getWorkflowInputData: jest.fn(),
+}));
+
+describe('ExecuteWorkflowTrigger', () => {
+	const mockInputData: INodeExecutionData[] = [
+		{ json: { item: 0, foo: 'bar' }, index: 0 },
+		{ json: { item: 1, foo: 'quz' }, index: 1 },
+	];
+	const mockNode = mock<INode>({ typeVersion: 1 });
+	const executeFns = mock<IExecuteFunctions>({
+		getInputData: () => mockInputData,
+		getNode: () => mockNode,
+		getNodeParameter: jest.fn(),
+	});
+
+	it('should return its input data on V1 or V1.1 passthrough', async () => {
+		// User selection in V1.1, or fallback return value in V1 with dropdown not displayed
+		executeFns.getNodeParameter.mockReturnValueOnce('passthrough');
+		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);
+
+		expect(result).toEqual([mockInputData]);
+	});
+
+	it('should filter out parent input in `Using Fields below` mode', async () => {
+		executeFns.getNodeParameter.mockReturnValueOnce(WORKFLOW_INPUTS);
+		const mockNewParams = [
+			{ name: 'value1', type: 'string' },
+			{ name: 'value2', type: 'number' },
+			{ name: 'foo', type: 'string' },
+		] as FieldValueOption[];
+		const getFieldEntriesMock = (getFieldEntries as jest.Mock).mockReturnValue(mockNewParams);
+
+		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);
+		const expected = [
+			[
+				{ index: 0, json: { value1: null, value2: null, foo: mockInputData[0].json.foo } },
+				{ index: 1, json: { value1: null, value2: null, foo: mockInputData[1].json.foo } },
+			],
+		];
+
+		expect(result).toEqual(expected);
+		expect(getFieldEntriesMock).toHaveBeenCalledWith(executeFns);
+	});
+});
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
new file mode 100644
index 0000000000..a15780a80e
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -0,0 +1,225 @@
+import _ from 'lodash';
+import {
+	type INodeExecutionData,
+	NodeConnectionType,
+	type IExecuteFunctions,
+	type INodeType,
+	type INodeTypeDescription,
+} from 'n8n-workflow';
+
+import {
+	INPUT_SOURCE,
+	WORKFLOW_INPUTS,
+	JSON_EXAMPLE,
+	VALUES,
+	TYPE_OPTIONS,
+	PASSTHROUGH,
+	FALLBACK_DEFAULT_VALUE,
+} from '../../../utils/workflowInputsResourceMapping/constants';
+import { getFieldEntries } from '../../../utils/workflowInputsResourceMapping/GenericFunctions';
+
+export class ExecuteWorkflowTrigger implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Execute Workflow Trigger',
+		name: 'executeWorkflowTrigger',
+		icon: 'fa:sign-out-alt',
+		group: ['trigger'],
+		version: [1, 1.1],
+		description:
+			'Helpers for calling other n8n workflows. Used for designing modular, microservice-like workflows.',
+		eventTriggerDescription: '',
+		maxNodes: 1,
+		defaults: {
+			name: 'Workflow Input Trigger',
+			color: '#ff6d5a',
+		},
+		inputs: [],
+		outputs: [NodeConnectionType.Main],
+		hints: [
+			{
+				message: 'Please make sure to define your input fields.',
+				// This condition checks if we have no input fields, which gets a bit awkward:
+				// For WORKFLOW_INPUTS: keys() only contains `VALUES` if at least one value is provided
+				// For JSON_EXAMPLE: We remove all whitespace and check if we're left with an empty object. Note that we already error if the example is not valid JSON
+				displayCondition:
+					`={{$parameter['${INPUT_SOURCE}'] === '${WORKFLOW_INPUTS}' && !$parameter['${WORKFLOW_INPUTS}'].keys().length ` +
+					`|| $parameter['${INPUT_SOURCE}'] === '${JSON_EXAMPLE}' && $parameter['${JSON_EXAMPLE}'].toString().replaceAll(' ', '').replaceAll('\\n', '') === '{}' }}`,
+				whenToDisplay: 'always',
+				location: 'ndv',
+			},
+		],
+		properties: [
+			{
+				displayName: 'Events',
+				name: 'events',
+				type: 'hidden',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Workflow Call',
+						value: 'worklfow_call',
+						description: 'When called by another workflow using Execute Workflow Trigger',
+						action: 'When Called by Another Workflow',
+					},
+				],
+				default: 'worklfow_call',
+			},
+			{
+				displayName:
+					"When an ‘execute workflow’ node calls this workflow, the execution starts here. Any data passed into the 'execute workflow' node will be output by this node.",
+				name: 'notice',
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: { '@version': [{ _cnd: { eq: 1 } }] },
+				},
+			},
+			{
+				displayName: 'This node is out of date. Please upgrade by removing it and adding a new one',
+				name: 'outdatedVersionWarning',
+				type: 'notice',
+				displayOptions: { show: { '@version': [{ _cnd: { eq: 1 } }] } },
+				default: '',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				displayName: 'Input data mode',
+				name: INPUT_SOURCE,
+				type: 'options',
+				options: [
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Define using fields below',
+						value: WORKFLOW_INPUTS,
+						description: 'Provide input fields via UI',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Define using JSON example',
+						value: JSON_EXAMPLE,
+						description: 'Generate a schema from an example JSON object',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'Accept all data',
+						value: PASSTHROUGH,
+						description: 'Use all incoming data from the parent workflow',
+					},
+				],
+				default: WORKFLOW_INPUTS,
+				noDataExpression: true,
+				displayOptions: {
+					show: { '@version': [{ _cnd: { gte: 1.1 } }] },
+				},
+			},
+			{
+				displayName:
+					'Provide an example object to infer fields and their types.<br>To allow any type for a given field, set the value to null.',
+				name: `${JSON_EXAMPLE}_notice`,
+				type: 'notice',
+				default: '',
+				displayOptions: {
+					show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: [JSON_EXAMPLE] },
+				},
+			},
+			{
+				displayName: 'JSON Example',
+				name: JSON_EXAMPLE,
+				type: 'json',
+				default: JSON.stringify(
+					{
+						aField: 'a string',
+						aNumber: 123,
+						thisFieldAcceptsAnyType: null,
+						anArray: [],
+					},
+					null,
+					2,
+				),
+				noDataExpression: true,
+				displayOptions: {
+					show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: [JSON_EXAMPLE] },
+				},
+			},
+			{
+				displayName: 'Workflow Inputs',
+				name: WORKFLOW_INPUTS,
+				placeholder: 'Add field',
+				type: 'fixedCollection',
+				description:
+					'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+				typeOptions: {
+					multipleValues: true,
+					sortable: true,
+					minRequiredFields: 1,
+				},
+				displayOptions: {
+					show: { '@version': [{ _cnd: { gte: 1.1 } }], inputSource: [WORKFLOW_INPUTS] },
+				},
+				default: {},
+				options: [
+					{
+						name: VALUES,
+						displayName: 'Values',
+						values: [
+							{
+								displayName: 'Name',
+								name: 'name',
+								type: 'string',
+								default: '',
+								placeholder: 'e.g. fieldName',
+								description: 'Name of the field',
+								required: true,
+								noDataExpression: true,
+							},
+							{
+								displayName: 'Type',
+								name: 'type',
+								type: 'options',
+								description: 'The field value type',
+								options: TYPE_OPTIONS,
+								required: true,
+								default: 'string',
+								noDataExpression: true,
+							},
+						],
+					},
+				],
+			},
+		],
+	};
+
+	async execute(this: IExecuteFunctions) {
+		const inputData = this.getInputData();
+		const inputSource = this.getNodeParameter(INPUT_SOURCE, 0, PASSTHROUGH) as string;
+
+		// Note on the data we receive from ExecuteWorkflow caller:
+		//
+		// The ExecuteWorkflow node typechecks all fields explicitly provided by the user here via the resourceMapper
+		// and removes all fields that are in the schema, but `removed` in the resourceMapper.
+		//
+		// In passthrough and legacy node versions, inputData will line up since the resourceMapper is empty,
+		// in which case all input is passed through.
+		// In other cases we will already have matching types and fields provided by the resource mapper,
+		// so we just need to be permissive on this end,
+		// while ensuring we provide default values for fields in our schema, which are removed in the resourceMapper.
+
+		if (inputSource === PASSTHROUGH) {
+			return [inputData];
+		} else {
+			const newParams = getFieldEntries(this);
+			const newKeys = new Set(newParams.map((x) => x.name));
+			const itemsInSchema: INodeExecutionData[] = inputData.map((row, index) => ({
+				json: {
+					...Object.fromEntries(newParams.map((x) => [x.name, FALLBACK_DEFAULT_VALUE])),
+					// Need to trim to the expected schema to support legacy Execute Workflow callers passing through all their data
+					// which we do not want to expose past this node.
+					..._.pickBy(row.json, (_value, key) => newKeys.has(key)),
+				},
+				index,
+			}));
+
+			return [itemsInSchema];
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
deleted file mode 100644
index feb33a160d..0000000000
--- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-import {
-	NodeConnectionType,
-	type IExecuteFunctions,
-	type INodeType,
-	type INodeTypeDescription,
-} from 'n8n-workflow';
-
-export class ExecuteWorkflowTrigger implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Execute Workflow Trigger',
-		name: 'executeWorkflowTrigger',
-		icon: 'fa:sign-out-alt',
-		group: ['trigger'],
-		version: 1,
-		description:
-			'Helpers for calling other n8n workflows. Used for designing modular, microservice-like workflows.',
-		eventTriggerDescription: '',
-		maxNodes: 1,
-		defaults: {
-			name: 'Execute Workflow Trigger',
-			color: '#ff6d5a',
-		},
-
-		inputs: [],
-		outputs: [NodeConnectionType.Main],
-		properties: [
-			{
-				displayName:
-					"When an ‘execute workflow’ node calls this workflow, the execution starts here. Any data passed into the 'execute workflow' node will be output by this node.",
-				name: 'notice',
-				type: 'notice',
-				default: '',
-			},
-			{
-				displayName: 'Events',
-				name: 'events',
-				type: 'hidden',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Workflow Call',
-						value: 'worklfow_call',
-						description: 'When called by another workflow using Execute Workflow Trigger',
-						action: 'When Called by Another Workflow',
-					},
-				],
-				default: 'worklfow_call',
-			},
-		],
-	};
-
-	async execute(this: IExecuteFunctions) {
-		return [this.getInputData()];
-	}
-}
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts b/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.node.test.ts
similarity index 53%
rename from packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts
rename to packages/nodes-base/nodes/ExecutionData/test/ExecutionData.node.test.ts
index ad35bff192..19496b5de0 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/test/ExecuteWorkflowTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.node.test.ts
@@ -1,9 +1,10 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
-import { ExecuteWorkflowTrigger } from '../ExecuteWorkflowTrigger.node';
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+import { ExecutionData } from '../ExecutionData.node';
 
-describe('ExecuteWorkflowTrigger', () => {
+describe('ExecutionData Node', () => {
 	it('should return its input data', async () => {
 		const mockInputData: INodeExecutionData[] = [
 			{ json: { item: 0, foo: 'bar' } },
@@ -12,8 +13,11 @@ describe('ExecuteWorkflowTrigger', () => {
 		const executeFns = mock<IExecuteFunctions>({
 			getInputData: () => mockInputData,
 		});
-		const result = await new ExecuteWorkflowTrigger().execute.call(executeFns);
+		const result = await new ExecutionData().execute.call(executeFns);
 
 		expect(result).toEqual([mockInputData]);
 	});
 });
+
+const workflows = getWorkflowFilenames(__dirname);
+describe('ExecutionData -> Should run the workflow', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.workflow.json b/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.workflow.json
new file mode 100644
index 0000000000..91835bccf8
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecutionData/test/ExecutionData.workflow.json
@@ -0,0 +1,112 @@
+{
+	"name": "[TEST] Execution Data",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [60, -240],
+			"id": "03be3862-c311-48d8-8898-2ffac5fe65b7",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"dataToSave": {
+					"values": [
+						{
+							"key": "id",
+							"value": "={{ $json.id }}"
+						}
+					]
+				}
+			},
+			"type": "n8n-nodes-base.executionData",
+			"typeVersion": 1,
+			"position": [480, -240],
+			"id": "60d009ae-0101-48bd-a0b5-f8d548b22b5d",
+			"name": "Execution Data"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "ab35ef53-bffd-43d9-99eb-289f3722999d",
+							"name": "id",
+							"value": "123456",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [280, -240],
+			"id": "32447090-1a29-45ab-b967-a80b7222bce4",
+			"name": "Edit Fields"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [720, -240],
+			"id": "59e3fc3b-de67-4b2e-9489-a0918c45fc5c",
+			"name": "No Operation, do nothing"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "123456"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Execution Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Execution Data": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "2721b08b-dd2e-4b68-8df7-6c7fedd31e5d",
+	"meta": {
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "h6wEFzHoR7UTz8JJ",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 30e3beed51..f4d9d28539 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -80,6 +80,10 @@ export class FacebookGraphApi implements INodeType {
 						name: 'Default',
 						value: '',
 					},
+					{
+						name: 'v21.0',
+						value: 'v21.0',
+					},
 					{
 						name: 'v20.0',
 						value: 'v20.0',
@@ -189,7 +193,7 @@ export class FacebookGraphApi implements INodeType {
 				placeholder: 'videos',
 			},
 			{
-				displayName: 'Ignore SSL Issues',
+				displayName: 'Ignore SSL Issues (Insecure)',
 				name: 'allowUnauthorizedCerts',
 				type: 'boolean',
 				default: false,
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index 5e0f9e897f..99066f0478 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import { createHmac } from 'crypto';
 import type {
 	IDataObject,
@@ -11,13 +12,9 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
 
-import { snakeCase } from 'change-case';
-
 import { facebookApiRequest, getAllFields, getFields } from './GenericFunctions';
-
 import type { FacebookWebhookSubscription } from './types';
 
 export class FacebookTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
index 94d36bd183..f1a4e72359 100644
--- a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
-
 export async function facebookApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
index 5a1c06f91d..752ae87830 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
+++ b/packages/nodes-base/nodes/FacebookLeadAds/FacebookLeadAdsTrigger.node.ts
@@ -9,6 +9,7 @@ import {
 	type IWebhookResponseData,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import {
 	appWebhookSubscriptionCreate,
 	appWebhookSubscriptionDelete,
@@ -273,7 +274,10 @@ export class FacebookLeadAdsTrigger implements INodeType {
 						return {
 							id: lead.id,
 							data: lead.field_data.reduce(
-								(acc, field) => ({ ...acc, [field.name]: field.values[0] }),
+								(acc, field) => ({
+									...acc,
+									[field.name]: field.values && field.values.length > 0 ? field.values[0] : null,
+								}),
 								{},
 							),
 							form: {
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts b/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts
index a608605096..bccfef3a4f 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FacebookLeadAds/GenericFunctions.ts
@@ -9,6 +9,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import type {
 	CreateFacebookAppWebhookSubscription,
 	FacebookAppWebhookSubscription,
@@ -33,7 +34,7 @@ export async function facebookApiRequest(
 		qs,
 		body,
 		gzip: true,
-		uri: `https://graph.facebook.com/v17.0${resource}`,
+		uri: `https://graph.facebook.com/v21.0${resource}`,
 		json: true,
 	};
 
@@ -89,7 +90,7 @@ export async function facebookAppApiRequest(
 		method,
 		qs,
 		gzip: true,
-		uri: `https://graph.facebook.com/v17.0${resource}`,
+		uri: `https://graph.facebook.com/v21.0${resource}`,
 		json: true,
 	};
 
@@ -181,7 +182,7 @@ export async function facebookPageApiRequest(
 		qs,
 		body,
 		gzip: true,
-		uri: `https://graph.facebook.com/v17.0${resource}`,
+		uri: `https://graph.facebook.com/v21.0${resource}`,
 		json: true,
 	};
 
diff --git a/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts b/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts
index 3f9e1f82b9..f2289d32ba 100644
--- a/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/FacebookLeadAds/methods/listSearch.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { facebookFormList, facebookPageList } from '../GenericFunctions';
 
 const filterMatches = (name: string, filter?: string): boolean =>
diff --git a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
index c76998bd11..0d87f83ef9 100644
--- a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import { randomBytes } from 'crypto';
 import type {
 	IHookFunctions,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { figmaApiRequest } from './GenericFunctions';
 
 export class FigmaTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
index 364bd629f6..460d8298e3 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/ConvertToFile.node.ts
@@ -6,11 +6,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
+import * as iCall from './actions/iCall.operation';
 import * as spreadsheet from './actions/spreadsheet.operation';
 import * as toBinary from './actions/toBinary.operation';
-import * as toText from './actions/toText.operation';
 import * as toJson from './actions/toJson.operation';
-import * as iCall from './actions/iCall.operation';
+import * as toText from './actions/toText.operation';
 
 export class ConvertToFile implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts
index 7fcca69b4c..c3fc66690a 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/iCall.operation.ts
@@ -1,9 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import * as createEvent from '../../../ICalendar/createEvent.operation';
-
 import { updateDisplayOptions } from '@utils/utilities';
 
+import * as createEvent from '../../../ICalendar/createEvent.operation';
+
 export const description: INodeProperties[] = updateDisplayOptions(
 	{
 		show: {
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
index 0bc914454d..96f87bddc6 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/spreadsheet.operation.ts
@@ -5,10 +5,9 @@ import {
 	type INodeProperties,
 } from 'n8n-workflow';
 
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 import type { JsonToSpreadsheetBinaryOptions, JsonToSpreadsheetBinaryFormat } from '@utils/binary';
-
 import { convertJsonToSpreadsheetBinary } from '@utils/binary';
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 export const operations = ['csv', 'html', 'rtf', 'ods', 'xls', 'xlsx'];
 
@@ -41,6 +40,18 @@ export const properties: INodeProperties[] = [
 				default: false,
 				description: 'Whether to reduce the output file size',
 			},
+			{
+				displayName: 'Delimiter',
+				name: 'delimiter',
+				type: 'string',
+				displayOptions: {
+					show: {
+						'/operation': ['csv'],
+					},
+				},
+				default: ',',
+				description: 'The character to use to separate fields',
+			},
 			{
 				displayName: 'File Name',
 				name: 'fileName',
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
index f2f329c160..47030bb706 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toBinary.operation.ts
@@ -1,5 +1,4 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
 import { NodeOperationError } from 'n8n-workflow';
 
 import type { JsonToBinaryOptions } from '@utils/binary';
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
index 94415d82ca..cabcfa8da1 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toJson.operation.ts
@@ -1,9 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 import { createBinaryFromJson } from '@utils/binary';
 import { encodeDecodeOptions } from '@utils/descriptions';
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
index 925bf50668..cb4ffe23e7 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/actions/toText.operation.ts
@@ -1,5 +1,4 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
 import { NodeOperationError } from 'n8n-workflow';
 
 import type { JsonToBinaryOptions } from '@utils/binary';
diff --git a/packages/nodes-base/nodes/Files/ConvertToFile/test/toText.workflow.json b/packages/nodes-base/nodes/Files/ConvertToFile/test/toText.workflow.json
index ea9b0fc6a9..478c112acf 100644
--- a/packages/nodes-base/nodes/Files/ConvertToFile/test/toText.workflow.json
+++ b/packages/nodes-base/nodes/Files/ConvertToFile/test/toText.workflow.json
@@ -1,15 +1,68 @@
 {
-  "name": "My workflow 2",
+  "name": "Test ConvertToFile",
   "nodes": [
     {
       "parameters": {},
-      "id": "59f5ae0f-52f7-4bc8-b325-29d2b0d810f8",
+      "id": "f2557b99-e65c-4136-9bc5-7cb328a62d30",
       "name": "When clicking ‘Test workflow’",
       "type": "n8n-nodes-base.manualTrigger",
       "typeVersion": 1,
       "position": [
-        460,
-        500
+        300,
+        1040
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "toBinary",
+        "sourceProperty": "base64",
+        "options": {}
+      },
+      "id": "71711ee7-9df5-456a-b1d0-def85b8d6669",
+      "name": "Convert to File2",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1.1,
+      "position": [
+        880,
+        540
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "return   {\n    \"id\": \"23423532\",\n    \"name\": \"Jay Gatsby\",\n    \"email\": \"gatsby@west-egg.com\",\n    \"notes\": \"Keeps asking about a green light??\",\n    \"country\": \"US\",\n    \"created\": \"1925-04-10\",\n  \"base64\": \"VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ=\"\n  }"
+      },
+      "id": "ff53ab4c-43dd-4c35-b066-59d59e4a8209",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 2,
+      "position": [
+        520,
+        1040
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "text",
+        "options": {}
+      },
+      "id": "6322369c-fef5-4172-bbd3-8738cbb67e05",
+      "name": "Extract From File",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1100,
+        540
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "b5aed50b-65d3-4356-b02d-cbeab7fb3d6e",
+      "name": "No Operation, do nothing",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1320,
+        540
       ]
     },
     {
@@ -18,13 +71,38 @@
         "sourceProperty": "notes",
         "options": {}
       },
-      "id": "add99ca3-7bd3-4561-a654-fac4b8ded285",
-      "name": "Convert to File",
+      "id": "65c4c4ac-da33-4ba1-b337-51ee319a8652",
+      "name": "Convert to Text File",
       "type": "n8n-nodes-base.convertToFile",
       "typeVersion": 1,
       "position": [
-        940,
-        400
+        880,
+        740
+      ]
+    },
+    {
+      "parameters": {
+        "operation": "text",
+        "options": {}
+      },
+      "id": "b2f49de3-5d0d-4eff-8156-89e5a2a0edae",
+      "name": "Extract From Text File",
+      "type": "n8n-nodes-base.extractFromFile",
+      "typeVersion": 1,
+      "position": [
+        1100,
+        740
+      ]
+    },
+    {
+      "parameters": {},
+      "id": "86d5e979-5ff0-4312-8b4f-7ff83f1eebd6",
+      "name": "Text File Result",
+      "type": "n8n-nodes-base.noOp",
+      "typeVersion": 1,
+      "position": [
+        1320,
+        740
       ]
     },
     {
@@ -34,41 +112,13 @@
           "format": true
         }
       },
-      "id": "89498c96-f1a0-49ec-890d-79f12c5554e6",
-      "name": "Convert to File1",
+      "id": "a938ea30-3acb-4618-a80a-6e759ba7d8db",
+      "name": "Convert to JSON (with Formatting)",
       "type": "n8n-nodes-base.convertToFile",
       "typeVersion": 1.1,
       "position": [
-        940,
-        580
-      ]
-    },
-    {
-      "parameters": {
-        "operation": "toBinary",
-        "sourceProperty": "base64",
-        "options": {}
-      },
-      "id": "ae06c883-f2af-4d25-bc64-4f0ecad53c85",
-      "name": "Convert to File2",
-      "type": "n8n-nodes-base.convertToFile",
-      "typeVersion": 1.1,
-      "position": [
-        940,
-        200
-      ]
-    },
-    {
-      "parameters": {
-        "jsCode": "return   {\n    \"id\": \"23423532\",\n    \"name\": \"Jay Gatsby\",\n    \"email\": \"gatsby@west-egg.com\",\n    \"notes\": \"Keeps asking about a green light??\",\n    \"country\": \"US\",\n    \"created\": \"1925-04-10\",\n  \"base64\": \"VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ=\"\n  }"
-      },
-      "id": "b14b18b0-6570-4376-85cf-f3cc74835e58",
-      "name": "Code",
-      "type": "n8n-nodes-base.code",
-      "typeVersion": 2,
-      "position": [
-        680,
-        500
+        880,
+        920
       ]
     },
     {
@@ -76,13 +126,13 @@
         "operation": "text",
         "options": {}
       },
-      "id": "76373e3f-e103-465a-8b15-dd643915c532",
-      "name": "Extract From File",
+      "id": "fa35a5ed-4746-48c5-b260-314c517cdd45",
+      "name": "Extract From JSON (1)",
       "type": "n8n-nodes-base.extractFromFile",
       "typeVersion": 1,
       "position": [
-        1160,
-        200
+        1100,
+        920
       ]
     },
     {
@@ -90,27 +140,24 @@
         "operation": "text",
         "options": {}
       },
-      "id": "d8ba3980-873d-47d7-ad88-f5ff6c66774c",
-      "name": "Extract From File1",
+      "id": "4a3c5c68-6621-4463-8623-83a6572ae760",
+      "name": "Extract From JSON (2)",
       "type": "n8n-nodes-base.extractFromFile",
       "typeVersion": 1,
       "position": [
-        1160,
-        400
+        1100,
+        1120
       ]
     },
     {
-      "parameters": {
-        "operation": "text",
-        "options": {}
-      },
-      "id": "34838f1e-aee5-4b17-a9ec-bd9e09789045",
-      "name": "Extract From File2",
-      "type": "n8n-nodes-base.extractFromFile",
+      "parameters": {},
+      "id": "dbd03dcb-435c-4af7-ada8-2492c69f1cd6",
+      "name": "JSON Result (with Formatting)",
+      "type": "n8n-nodes-base.noOp",
       "typeVersion": 1,
       "position": [
-        1160,
-        580
+        1320,
+        920
       ]
     },
     {
@@ -118,71 +165,102 @@
         "operation": "toJson",
         "options": {}
       },
-      "id": "a6617075-83f4-4157-9d07-7e5df0cbd9b6",
-      "name": "Convert to File3",
+      "id": "c461944d-3141-4a1d-abe1-a74e1f71615f",
+      "name": "Convert to JSON",
       "type": "n8n-nodes-base.convertToFile",
       "typeVersion": 1.1,
       "position": [
-        960,
-        780
+        880,
+        1120
       ]
     },
     {
       "parameters": {
-        "operation": "text",
         "options": {}
       },
-      "id": "b2deb5a4-0f7a-4a1f-858f-17235db0b94e",
-      "name": "Extract From File3",
+      "id": "c9ca03b3-0f01-49f5-ab9d-ed4497829a09",
+      "name": "Convert to CSV",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1.1,
+      "position": [
+        880,
+        1320
+      ]
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "1ad12799-7916-4780-aca9-9a966f9e5820",
+      "name": "Extract From CSV",
       "type": "n8n-nodes-base.extractFromFile",
       "typeVersion": 1,
       "position": [
-        1160,
-        780
+        1100,
+        1320
+      ]
+    },
+    {
+      "parameters": {
+        "options": {
+          "delimiter": "|"
+        }
+      },
+      "id": "58caeb17-7434-4808-b8c4-4ca443baecff",
+      "name": "Convert to CSV (custom delimiter)",
+      "type": "n8n-nodes-base.convertToFile",
+      "typeVersion": 1.1,
+      "position": [
+        880,
+        1520
       ]
     },
     {
       "parameters": {},
-      "id": "11022c53-136b-44a0-af32-faac16e2fa89",
-      "name": "No Operation, do nothing",
+      "id": "b113b6d9-7928-4de1-bf7f-e2984d124edf",
+      "name": "CSV Result",
       "type": "n8n-nodes-base.noOp",
       "typeVersion": 1,
       "position": [
-        1380,
-        200
+        1320,
+        1320
       ]
     },
     {
       "parameters": {},
-      "id": "f5ec42e5-8088-4a93-91ea-3a1cb4997eee",
-      "name": "No Operation, do nothing1",
+      "id": "12554f8d-592a-4500-80f7-42518840f718",
+      "name": "JSON Result",
       "type": "n8n-nodes-base.noOp",
       "typeVersion": 1,
       "position": [
-        1380,
-        400
+        1320,
+        1120
       ]
     },
     {
       "parameters": {},
-      "id": "d7106de2-455f-428f-bdfa-fe701136bdfa",
-      "name": "No Operation, do nothing2",
+      "id": "8a6ab018-9f38-4a5b-9483-769bf38f0b7c",
+      "name": "CSV Result (custom delimiter)",
       "type": "n8n-nodes-base.noOp",
       "typeVersion": 1,
       "position": [
-        1380,
-        580
+        1320,
+        1520
       ]
     },
     {
-      "parameters": {},
-      "id": "14dbc74c-fc0b-4339-88ea-76b3e9534de0",
-      "name": "No Operation, do nothing3",
-      "type": "n8n-nodes-base.noOp",
+      "parameters": {
+        "options": {
+          "delimiter": "|"
+        }
+      },
+      "id": "e8a4114f-5264-4255-982e-4690c950fb86",
+      "name": "Extract From Custom Delimiter",
+      "type": "n8n-nodes-base.extractFromFile",
       "typeVersion": 1,
       "position": [
-        1380,
-        780
+        1100,
+        1520
       ]
     }
   ],
@@ -194,26 +272,52 @@
         }
       }
     ],
-    "No Operation, do nothing1": [
+    "Text File Result": [
       {
         "json": {
           "data": "Keeps asking about a green light??"
         }
       }
     ],
-    "No Operation, do nothing2": [
+    "JSON Result (with Formatting)": [
       {
         "json": {
           "data": "[\n  {\n    \"id\": \"23423532\",\n    \"name\": \"Jay Gatsby\",\n    \"email\": \"gatsby@west-egg.com\",\n    \"notes\": \"Keeps asking about a green light??\",\n    \"country\": \"US\",\n    \"created\": \"1925-04-10\",\n    \"base64\": \"VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ=\"\n  }\n]"
         }
       }
     ],
-    "No Operation, do nothing3": [
+    "CSV Result": [
+      {
+        "json": {
+          "id": "23423532",
+          "name": "Jay Gatsby",
+          "email": "gatsby@west-egg.com",
+          "notes": "Keeps asking about a green light??",
+          "country": "US",
+          "created": "1925-04-10",
+          "base64": "VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ="
+        }
+      }
+    ],
+    "JSON Result": [
       {
         "json": {
           "data": "[{\"id\":\"23423532\",\"name\":\"Jay Gatsby\",\"email\":\"gatsby@west-egg.com\",\"notes\":\"Keeps asking about a green light??\",\"country\":\"US\",\"created\":\"1925-04-10\",\"base64\":\"VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ=\"}]"
         }
       }
+    ],
+    "CSV Result (custom delimiter)": [
+      {
+        "json": {
+          "id": "23423532",
+          "name": "Jay Gatsby",
+          "email": "gatsby@west-egg.com",
+          "notes": "Keeps asking about a green light??",
+          "country": "US",
+          "created": "1925-04-10",
+          "base64": "VGhpcyBpcyBzb21lIHRleHQgZW5jb2RlZCBhcyBiYXNlNjQ="
+        }
+      }
     ]
   },
   "connections": {
@@ -237,17 +341,27 @@
             "index": 0
           },
           {
-            "node": "Convert to File",
+            "node": "Convert to Text File",
             "type": "main",
             "index": 0
           },
           {
-            "node": "Convert to File1",
+            "node": "Convert to JSON (with Formatting)",
             "type": "main",
             "index": 0
           },
           {
-            "node": "Convert to File3",
+            "node": "Convert to JSON",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to CSV",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Convert to CSV (custom delimiter)",
             "type": "main",
             "index": 0
           }
@@ -265,39 +379,6 @@
         ]
       ]
     },
-    "Convert to File": {
-      "main": [
-        [
-          {
-            "node": "Extract From File1",
-            "type": "main",
-            "index": 0
-          }
-        ]
-      ]
-    },
-    "Convert to File1": {
-      "main": [
-        [
-          {
-            "node": "Extract From File2",
-            "type": "main",
-            "index": 0
-          }
-        ]
-      ]
-    },
-    "Convert to File3": {
-      "main": [
-        [
-          {
-            "node": "Extract From File3",
-            "type": "main",
-            "index": 0
-          }
-        ]
-      ]
-    },
     "Extract From File": {
       "main": [
         [
@@ -309,33 +390,110 @@
         ]
       ]
     },
-    "Extract From File3": {
+    "Convert to Text File": {
       "main": [
         [
           {
-            "node": "No Operation, do nothing3",
+            "node": "Extract From Text File",
             "type": "main",
             "index": 0
           }
         ]
       ]
     },
-    "Extract From File2": {
+    "Extract From Text File": {
       "main": [
         [
           {
-            "node": "No Operation, do nothing2",
+            "node": "Text File Result",
             "type": "main",
             "index": 0
           }
         ]
       ]
     },
-    "Extract From File1": {
+    "Convert to JSON (with Formatting)": {
       "main": [
         [
           {
-            "node": "No Operation, do nothing1",
+            "node": "Extract From JSON (1)",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From JSON (1)": {
+      "main": [
+        [
+          {
+            "node": "JSON Result (with Formatting)",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From JSON (2)": {
+      "main": [
+        [
+          {
+            "node": "JSON Result",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to JSON": {
+      "main": [
+        [
+          {
+            "node": "Extract From JSON (2)",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to CSV": {
+      "main": [
+        [
+          {
+            "node": "Extract From CSV",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From CSV": {
+      "main": [
+        [
+          {
+            "node": "CSV Result",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Convert to CSV (custom delimiter)": {
+      "main": [
+        [
+          {
+            "node": "Extract From Custom Delimiter",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Extract From Custom Delimiter": {
+      "main": [
+        [
+          {
+            "node": "CSV Result (custom delimiter)",
             "type": "main",
             "index": 0
           }
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts
index 66f6ca2c9c..c863d84818 100644
--- a/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/ExtractFromFile.node.ts
@@ -6,9 +6,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import * as spreadsheet from './actions/spreadsheet.operation';
 import * as moveTo from './actions/moveTo.operation';
 import * as pdf from './actions/pdf.operation';
+import * as spreadsheet from './actions/spreadsheet.operation';
 
 export class ExtractFromFile implements INodeType {
 	// eslint-disable-next-line n8n-nodes-base/node-class-description-missing-subtitle
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
index e4f36afc06..85cf1309b3 100644
--- a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/moveTo.operation.ts
@@ -1,21 +1,18 @@
+import iconv from 'iconv-lite';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-
 import { BINARY_ENCODING, NodeOperationError, deepCopy, jsonParse } from 'n8n-workflow';
-
-import get from 'lodash/get';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
-
-import iconv from 'iconv-lite';
-
 import { icsCalendarToObject } from 'ts-ics';
-import { updateDisplayOptions } from '@utils/utilities';
+
 import { encodeDecodeOptions } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
@@ -121,8 +118,8 @@ export async function execute(
 
 			if (!value) continue;
 
-			const encoding = (options.encoding as string) || 'utf8';
 			const buffer = await this.helpers.getBinaryDataBuffer(itemIndex, binaryPropertyName);
+			const encoding = (options.encoding as string) || this.helpers.detectBinaryEncoding(buffer);
 
 			if (options.keepSource && options.keepSource !== 'binary') {
 				newItem.json = deepCopy(item.json);
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
index e2e7f2a911..89ce5bc8fc 100644
--- a/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/actions/pdf.operation.ts
@@ -1,8 +1,6 @@
-import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-
-import { NodeOperationError, deepCopy } from 'n8n-workflow';
-
 import unset from 'lodash/unset';
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { NodeOperationError, deepCopy } from 'n8n-workflow';
 
 import { extractDataFromPDF } from '@utils/binary';
 import { updateDisplayOptions } from '@utils/utilities';
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/test/ExtractFromFile.node.test.ts b/packages/nodes-base/nodes/Files/ExtractFromFile/test/ExtractFromFile.node.test.ts
new file mode 100644
index 0000000000..aebf28eb73
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/test/ExtractFromFile.node.test.ts
@@ -0,0 +1,6 @@
+import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
+
+describe('ExtractFromFile', () => {
+	const workflows = getWorkflowFilenames(__dirname);
+	testWorkflows(workflows);
+});
diff --git a/packages/nodes-base/nodes/Files/ExtractFromFile/test/workflow.non_utf8_encoding.json b/packages/nodes-base/nodes/Files/ExtractFromFile/test/workflow.non_utf8_encoding.json
new file mode 100644
index 0000000000..8462d93b93
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ExtractFromFile/test/workflow.non_utf8_encoding.json
@@ -0,0 +1,98 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-200, -40],
+			"id": "64686c0a-64a4-4a33-9e70-038c9d23c25b",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "text",
+				"binaryPropertyName": "myfile",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.extractFromFile",
+			"typeVersion": 1,
+			"position": [420, -40],
+			"id": "aaac18d3-1e99-4c47-9de8-2dc8bf95abd7",
+			"name": "Extract from File"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "39b5f05f-85c5-499a-86d6-591d6440f147",
+							"name": "text",
+							"value": "Karlovy Vary město lázní Příliš žluťoučký kůň úpěl ďábelské ódy.",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [-20, -40],
+			"id": "e74c67f1-171a-42a7-be12-b6687935988f",
+			"name": "Edit Fields"
+		},
+		{
+			"parameters": {
+				"operation": "toText",
+				"sourceProperty": "text",
+				"binaryPropertyName": "myfile",
+				"options": {
+					"encoding": "windows1256"
+				}
+			},
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [180, -40],
+			"id": "77ddd6d4-1d75-4ad2-8301-e70213d8371e",
+			"name": "windows1256"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Extract from File": {
+			"main": [[]]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "windows1256",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"windows1256": {
+			"main": [
+				[
+					{
+						"node": "Extract from File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
index 101ca70ab7..d46c3ef648 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/read.operation.ts
@@ -1,3 +1,4 @@
+import glob from 'fast-glob';
 import { NodeApiError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
@@ -6,10 +7,10 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 
-import glob from 'fast-glob';
-import { errorMapper } from '../helpers/utils';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { errorMapper, escapeSpecialCharacters } from '../helpers/utils';
+
 export const properties: INodeProperties[] = [
 	{
 		displayName: 'File(s) Selector',
@@ -82,6 +83,8 @@ export async function execute(this: IExecuteFunctions, items: INodeExecutionData
 		try {
 			fileSelector = String(this.getNodeParameter('fileSelector', itemIndex));
 
+			fileSelector = escapeSpecialCharacters(fileSelector);
+
 			if (/^[a-zA-Z]:/.test(fileSelector)) {
 				fileSelector = fileSelector.replace(/\\\\/g, '/');
 			}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
index fd4a947617..5f4d28775a 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/actions/write.operation.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -6,9 +5,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
+import type { Readable } from 'stream';
+
+import { updateDisplayOptions } from '@utils/utilities';
 
 import { errorMapper } from '../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts
index 8ecbb66706..7e487227d0 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/helpers/utils.ts
@@ -30,3 +30,10 @@ export function errorMapper(
 
 	return new NodeOperationError(this.getNode(), error, { itemIndex, message, description });
 }
+
+export function escapeSpecialCharacters(str: string) {
+	// Escape parentheses
+	str = str.replace(/[()]/g, '\\$&');
+
+	return str;
+}
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts
index 38c8d0057e..b4ae9971b3 100644
--- a/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/test/ReadWriteFile.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test ReadWriteFile Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/Files/ReadWriteFile/test/utils.test.ts b/packages/nodes-base/nodes/Files/ReadWriteFile/test/utils.test.ts
new file mode 100644
index 0000000000..fb9dece3b2
--- /dev/null
+++ b/packages/nodes-base/nodes/Files/ReadWriteFile/test/utils.test.ts
@@ -0,0 +1,15 @@
+import { escapeSpecialCharacters } from '../helpers/utils';
+
+describe('Read/Write Files from Disk, escapeSpecialCharacters', () => {
+	it('should escape parentheses in a string', () => {
+		const input = '/home/michael/Desktop/test(1).txt';
+		const expectedOutput = '/home/michael/Desktop/test\\(1\\).txt';
+		expect(escapeSpecialCharacters(input)).toBe(expectedOutput);
+	});
+
+	it('should not modify strings that do not contain parentheses', () => {
+		const input = '/home/michael/Desktop/test.txt';
+		const expectedOutput = '/home/michael/Desktop/test.txt';
+		expect(escapeSpecialCharacters(input)).toBe(expectedOutput);
+	});
+});
diff --git a/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
index 06288535b1..cabd5d2f89 100644
--- a/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Filter/V1/GenericFunctions.ts
@@ -1,8 +1,7 @@
+import moment from 'moment-timezone';
 import type { INode, NodeParameterValue } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 const isDateObject = (value: NodeParameterValue) =>
 	Object.prototype.toString.call(value) === '[object Date]';
 
diff --git a/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
index 46c32d5912..6a50c35725 100644
--- a/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
+++ b/packages/nodes-base/nodes/Filter/V2/FilterV2.node.ts
@@ -9,9 +9,10 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
-import { getTypeValidationParameter, getTypeValidationStrictness } from '../../If/V2/utils';
 import { looseTypeValidationProperty } from '../../../utils/descriptions';
+import { getTypeValidationParameter, getTypeValidationStrictness } from '../../If/V2/utils';
 
 export class FilterV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.ts b/packages/nodes-base/nodes/Flow/Flow.node.ts
index 06caf25a82..39a3b7e564 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.ts
+++ b/packages/nodes-base/nodes/Flow/Flow.node.ts
@@ -7,6 +7,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
+
 import { flowApiRequest, FlowApiRequestAllItems } from './GenericFunctions';
 import { taskFields, taskOperations } from './TaskDescription';
 import type { ITask, TaskInfo } from './TaskInterface';
diff --git a/packages/nodes-base/nodes/Flow/GenericFunctions.ts b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
index 0f304e6415..151fe2acc5 100644
--- a/packages/nodes-base/nodes/Flow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
@@ -67,7 +67,6 @@ export async function FlowApiRequestAllItems(
 			resolveWithFullResponse: true,
 		});
 		uri = responseData.headers.link;
-		// @ts-ignore
 		returnData.push.apply(returnData, responseData.body[propertyName] as IDataObject[]);
 	} while (responseData.headers.link !== undefined && responseData.headers.link !== '');
 
diff --git a/packages/nodes-base/nodes/Form/Form.node.ts b/packages/nodes-base/nodes/Form/Form.node.ts
index a064ce016a..735cbc4065 100644
--- a/packages/nodes-base/nodes/Form/Form.node.ts
+++ b/packages/nodes-base/nodes/Form/Form.node.ts
@@ -2,12 +2,12 @@ import type {
 	FormFieldsParameter,
 	IExecuteFunctions,
 	INodeExecutionData,
+	INodeProperties,
 	INodeTypeDescription,
 	IWebhookFunctions,
 	NodeTypeAndVersion,
 } from 'n8n-workflow';
 import {
-	WAIT_TIME_UNLIMITED,
 	Node,
 	updateDisplayOptions,
 	NodeOperationError,
@@ -16,11 +16,51 @@ import {
 	tryToParseJsonToFormFields,
 	NodeConnectionType,
 	WAIT_NODE_TYPE,
+	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
 
 import { formDescription, formFields, formTitle } from '../Form/common.descriptions';
 import { prepareFormReturnItem, renderForm, resolveRawData } from '../Form/utils';
 
+export const formFieldsProperties: INodeProperties[] = [
+	{
+		displayName: 'Define Form',
+		name: 'defineForm',
+		type: 'options',
+		noDataExpression: true,
+		options: [
+			{
+				name: 'Using Fields Below',
+				value: 'fields',
+			},
+			{
+				name: 'Using JSON',
+				value: 'json',
+			},
+		],
+		default: 'fields',
+	},
+	{
+		displayName: 'Form Fields',
+		name: 'jsonOutput',
+		type: 'json',
+		typeOptions: {
+			rows: 5,
+		},
+		default:
+			'[\n   {\n      "fieldLabel":"Name",\n      "placeholder":"enter you name",\n      "requiredField":true\n   },\n   {\n      "fieldLabel":"Age",\n      "fieldType":"number",\n      "placeholder":"enter your age"\n   },\n   {\n      "fieldLabel":"Email",\n      "fieldType":"email",\n      "requiredField":true\n   }\n]',
+		validateType: 'form-fields',
+		ignoreValidationDuringExecution: true,
+		hint: '<a href="hhttps://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.form/" target="_blank">See docs</a> for field syntax',
+		displayOptions: {
+			show: {
+				defineForm: ['json'],
+			},
+		},
+	},
+	{ ...formFields, displayOptions: { show: { defineForm: ['fields'] } } },
+];
+
 const pageProperties = updateDisplayOptions(
 	{
 		show: {
@@ -28,42 +68,7 @@ const pageProperties = updateDisplayOptions(
 		},
 	},
 	[
-		{
-			displayName: 'Define Form',
-			name: 'defineForm',
-			type: 'options',
-			noDataExpression: true,
-			options: [
-				{
-					name: 'Using Fields Below',
-					value: 'fields',
-				},
-				{
-					name: 'Using JSON',
-					value: 'json',
-				},
-			],
-			default: 'fields',
-		},
-		{
-			displayName: 'Form Fields',
-			name: 'jsonOutput',
-			type: 'json',
-			typeOptions: {
-				rows: 5,
-			},
-			default:
-				'[\n   {\n      "fieldLabel":"Name",\n      "placeholder":"enter you name",\n      "requiredField":true\n   },\n   {\n      "fieldLabel":"Age",\n      "fieldType":"number",\n      "placeholder":"enter your age"\n   },\n   {\n      "fieldLabel":"Email",\n      "fieldType":"email",\n      "requiredField":true\n   }\n]',
-			validateType: 'form-fields',
-			ignoreValidationDuringExecution: true,
-			hint: '<a href="hhttps://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.form/" target="_blank">See docs</a> for field syntax',
-			displayOptions: {
-				show: {
-					defineForm: ['json'],
-				},
-			},
-		},
-		{ ...formFields, displayOptions: { show: { defineForm: ['fields'] } } },
+		...formFieldsProperties,
 		{
 			displayName: 'Options',
 			name: 'options',
@@ -266,22 +271,19 @@ export class Form extends Node {
 
 		const method = context.getRequestObject().method;
 
-		if (operation === 'completion') {
-			const respondWith = context.getNodeParameter('respondWith', '') as string;
-
-			if (respondWith === 'redirect') {
-				const redirectUrl = context.getNodeParameter('redirectUrl', '') as string;
-				res.redirect(redirectUrl);
-				return {
-					noWebhookResponse: true,
-				};
-			}
-
+		if (operation === 'completion' && method === 'GET') {
 			const completionTitle = context.getNodeParameter('completionTitle', '') as string;
 			const completionMessage = context.getNodeParameter('completionMessage', '') as string;
-			const options = context.getNodeParameter('options', {}) as {
-				formTitle: string;
-			};
+			const redirectUrl = context.getNodeParameter('redirectUrl', '') as string;
+			const options = context.getNodeParameter('options', {}) as { formTitle: string };
+
+			if (redirectUrl) {
+				res.send(
+					`<html><head><meta http-equiv="refresh" content="0; url=${redirectUrl}"></head></html>`,
+				);
+				return { noWebhookResponse: true };
+			}
+
 			let title = options.formTitle;
 			if (!title) {
 				title = context.evaluateExpression(
@@ -299,8 +301,12 @@ export class Form extends Node {
 				appendAttribution,
 			});
 
+			return { noWebhookResponse: true };
+		}
+
+		if (operation === 'completion' && method === 'POST') {
 			return {
-				noWebhookResponse: true,
+				workflowData: [context.evaluateExpression('{{ $input.all() }}') as INodeExecutionData[]],
 			};
 		}
 
@@ -340,7 +346,7 @@ export class Form extends Node {
 			const connectedNodes = context.getChildNodes(context.getNode().name);
 
 			const hasNextPage = connectedNodes.some(
-				(node) => node.type === FORM_NODE_TYPE || node.type === WAIT_NODE_TYPE,
+				(node) => !node.disabled && (node.type === FORM_NODE_TYPE || node.type === WAIT_NODE_TYPE),
 			);
 
 			if (hasNextPage) {
@@ -412,10 +418,7 @@ export class Form extends Node {
 			);
 		}
 
-		if (operation !== 'completion') {
-			const waitTill = new Date(WAIT_TIME_UNLIMITED);
-			await context.putExecutionToWait(waitTill);
-		}
+		await context.putExecutionToWait(WAIT_INDEFINITELY);
 
 		return [context.getInputData()];
 	}
diff --git a/packages/nodes-base/nodes/Form/FormTrigger.node.ts b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
index a486d1b727..1ee1399aa0 100644
--- a/packages/nodes-base/nodes/Form/FormTrigger.node.ts
+++ b/packages/nodes-base/nodes/Form/FormTrigger.node.ts
@@ -1,5 +1,6 @@
 import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
 import { VersionedNodeType } from 'n8n-workflow';
+
 import { FormTriggerV1 } from './v1/FormTriggerV1.node';
 import { FormTriggerV2 } from './v2/FormTriggerV2.node';
 
diff --git a/packages/nodes-base/nodes/Form/common.descriptions.ts b/packages/nodes-base/nodes/Form/common.descriptions.ts
index fe777edd83..ad66330c27 100644
--- a/packages/nodes-base/nodes/Form/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Form/common.descriptions.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { appendAttributionOption } from '../../utils/descriptions';
 
 export const webhookPath: INodeProperties = {
diff --git a/packages/nodes-base/nodes/Form/interfaces.ts b/packages/nodes-base/nodes/Form/interfaces.ts
index 26b5cf567a..1cf5f64c92 100644
--- a/packages/nodes-base/nodes/Form/interfaces.ts
+++ b/packages/nodes-base/nodes/Form/interfaces.ts
@@ -22,6 +22,7 @@ export type FormTriggerData = {
 	validForm: boolean;
 	formTitle: string;
 	formDescription?: string;
+	formSubmittedHeader?: string;
 	formSubmittedText?: string;
 	redirectUrl?: string;
 	n8nWebsiteLink: string;
diff --git a/packages/nodes-base/nodes/Form/test/Form.node.test.ts b/packages/nodes-base/nodes/Form/test/Form.node.test.ts
index 616e3cf8db..9dd0e4bbf2 100644
--- a/packages/nodes-base/nodes/Form/test/Form.node.test.ts
+++ b/packages/nodes-base/nodes/Form/test/Form.node.test.ts
@@ -1,3 +1,4 @@
+import type { Response, Request } from 'express';
 import type { MockProxy } from 'jest-mock-extended';
 import { mock } from 'jest-mock-extended';
 import type {
@@ -7,7 +8,7 @@ import type {
 	IWebhookFunctions,
 	NodeTypeAndVersion,
 } from 'n8n-workflow';
-import type { Response, Request } from 'express';
+
 import { Form } from '../Form.node';
 
 describe('Form Node', () => {
@@ -15,6 +16,8 @@ describe('Form Node', () => {
 	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
 	let mockWebhookFunctions: MockProxy<IWebhookFunctions>;
 
+	const formCompletionNodeName = 'Form Completion';
+	const testExecutionId = 'test_execution_id';
 	beforeEach(() => {
 		form = new Form();
 		mockExecuteFunctions = mock<IExecuteFunctions>();
@@ -68,7 +71,12 @@ describe('Form Node', () => {
 			]);
 			mockExecuteFunctions.getChildNodes.mockReturnValue([]);
 			mockExecuteFunctions.getInputData.mockReturnValue(inputData);
-			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>());
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ name: formCompletionNodeName }));
+			mockExecuteFunctions.getExecutionId.mockReturnValue(testExecutionId);
+
+			mockExecuteFunctions.getWorkflowStaticData.mockReturnValue({
+				[`${testExecutionId}-${formCompletionNodeName}`]: { redirectUrl: 'test' },
+			});
 
 			const result = await form.execute(mockExecuteFunctions);
 
@@ -86,7 +94,12 @@ describe('Form Node', () => {
 			);
 			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
 			mockWebhookFunctions.getParentNodes.mockReturnValue([
-				{ type: 'n8n-nodes-base.formTrigger', name: 'Form Trigger', typeVersion: 2.1 },
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
 			]);
 			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
 			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>());
@@ -114,7 +127,12 @@ describe('Form Node', () => {
 		it('should return form data for POST request', async () => {
 			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'POST' } as Request);
 			mockWebhookFunctions.getParentNodes.mockReturnValue([
-				{ type: 'n8n-nodes-base.formTrigger', name: 'Form Trigger', typeVersion: 2.1 },
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
 			]);
 			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
 			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>());
@@ -154,7 +172,7 @@ describe('Form Node', () => {
 			]);
 		});
 
-		it('should handle completion operation', async () => {
+		it('should handle completion operation and render completion page', async () => {
 			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
 			mockWebhookFunctions.getNodeParameter.mockImplementation((paramName) => {
 				if (paramName === 'operation') return 'completion';
@@ -163,27 +181,77 @@ describe('Form Node', () => {
 				if (paramName === 'respondWith') return 'text';
 				if (paramName === 'completionTitle') return 'Test Title';
 				if (paramName === 'completionMessage') return 'Test Message';
+				if (paramName === 'redirectUrl') return '';
 				return {};
 			});
 			mockWebhookFunctions.getParentNodes.mockReturnValue([
-				{ type: 'n8n-nodes-base.formTrigger', name: 'Form Trigger', typeVersion: 2.1 },
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
 			]);
 			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
 
 			const mockResponseObject = {
 				render: jest.fn(),
+				redirect: jest.fn(),
 			};
 			mockWebhookFunctions.getResponseObject.mockReturnValue(
 				mockResponseObject as unknown as Response,
 			);
-			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>());
+			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>({ name: formCompletionNodeName }));
+			mockWebhookFunctions.getExecutionId.mockReturnValue(testExecutionId);
 
 			const result = await form.webhook(mockWebhookFunctions);
 
 			expect(result).toEqual({ noWebhookResponse: true });
-			expect(mockResponseObject.render).toHaveBeenCalledWith(
-				'form-trigger-completion',
-				expect.any(Object),
+			expect(mockResponseObject.render).toHaveBeenCalledWith('form-trigger-completion', {
+				appendAttribution: 'test',
+				formTitle: 'test',
+				message: 'Test Message',
+				title: 'Test Title',
+			});
+		});
+
+		it('should handle completion operation and redirect', async () => {
+			mockWebhookFunctions.getRequestObject.mockReturnValue({ method: 'GET' } as Request);
+			mockWebhookFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'operation') return 'completion';
+				if (paramName === 'useJson') return false;
+				if (paramName === 'jsonOutput') return '[]';
+				if (paramName === 'respondWith') return 'text';
+				if (paramName === 'completionTitle') return 'Test Title';
+				if (paramName === 'completionMessage') return 'Test Message';
+				if (paramName === 'redirectUrl') return 'https://n8n.io';
+				return {};
+			});
+			mockWebhookFunctions.getParentNodes.mockReturnValue([
+				{
+					type: 'n8n-nodes-base.formTrigger',
+					name: 'Form Trigger',
+					typeVersion: 2.1,
+					disabled: false,
+				},
+			]);
+			mockWebhookFunctions.evaluateExpression.mockReturnValue('test');
+
+			const mockResponseObject = {
+				render: jest.fn(),
+				redirect: jest.fn(),
+				send: jest.fn(),
+			};
+			mockWebhookFunctions.getResponseObject.mockReturnValue(
+				mockResponseObject as unknown as Response,
+			);
+			mockWebhookFunctions.getNode.mockReturnValue(mock<INode>({ name: formCompletionNodeName }));
+
+			const result = await form.webhook(mockWebhookFunctions);
+
+			expect(result).toEqual({ noWebhookResponse: true });
+			expect(mockResponseObject.send).toHaveBeenCalledWith(
+				'<html><head><meta http-equiv="refresh" content="0; url=https://n8n.io"></head></html>',
 			);
 		});
 	});
diff --git a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
index d3c96783c5..63dbfd4986 100644
--- a/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
+++ b/packages/nodes-base/nodes/Form/test/FormTriggerV2.node.test.ts
@@ -201,6 +201,7 @@ describe('FormTrigger', () => {
 							name: 'Test Respond To Webhook',
 							type: 'n8n-nodes-base.respondToWebhook',
 							typeVersion: 1,
+							disabled: false,
 						},
 					],
 				}),
diff --git a/packages/nodes-base/nodes/Form/test/utils.test.ts b/packages/nodes-base/nodes/Form/test/utils.test.ts
index 3cd71b9a92..455e288ec7 100644
--- a/packages/nodes-base/nodes/Form/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Form/test/utils.test.ts
@@ -1,11 +1,12 @@
 import { mock } from 'jest-mock-extended';
+import { DateTime } from 'luxon';
 import type {
 	FormFieldsParameter,
 	INode,
 	IWebhookFunctions,
 	MultiPartFormData,
 } from 'n8n-workflow';
-import { DateTime } from 'luxon';
+
 import { formWebhook, prepareFormData, prepareFormReturnItem, resolveRawData } from '../utils';
 
 describe('FormTrigger, formWebhook', () => {
diff --git a/packages/nodes-base/nodes/Form/utils.ts b/packages/nodes-base/nodes/Form/utils.ts
index 2809024e2b..87dda98f88 100644
--- a/packages/nodes-base/nodes/Form/utils.ts
+++ b/packages/nodes-base/nodes/Form/utils.ts
@@ -1,3 +1,6 @@
+import type { Response } from 'express';
+import isbot from 'isbot';
+import { DateTime } from 'luxon';
 import type {
 	INodeExecutionData,
 	MultiPartFormData,
@@ -16,18 +19,14 @@ import {
 
 import type { FormTriggerData, FormTriggerInput } from './interfaces';
 import { FORM_TRIGGER_AUTHENTICATION_PROPERTY } from './interfaces';
-
+import { getResolvables } from '../../utils/utilities';
 import { WebhookAuthorizationError } from '../Webhook/error';
 import { validateWebhookAuthentication } from '../Webhook/utils';
 
-import { DateTime } from 'luxon';
-import isbot from 'isbot';
-import type { Response } from 'express';
-import { getResolvables } from '../../utils/utilities';
-
 export function prepareFormData({
 	formTitle,
 	formDescription,
+	formSubmittedHeader,
 	formSubmittedText,
 	redirectUrl,
 	formFields,
@@ -49,6 +48,7 @@ export function prepareFormData({
 	useResponseData?: boolean;
 	appendAttribution?: boolean;
 	buttonLabel?: string;
+	formSubmittedHeader?: string;
 }) {
 	const validForm = formFields.length > 0;
 	const utm_campaign = instanceId ? `&utm_campaign=${instanceId}` : '';
@@ -63,6 +63,7 @@ export function prepareFormData({
 		validForm,
 		formTitle,
 		formDescription,
+		formSubmittedHeader,
 		formSubmittedText,
 		n8nWebsiteLink,
 		formFields: [],
diff --git a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
index 7e09170d6a..da813c758d 100644
--- a/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
+++ b/packages/nodes-base/nodes/Form/v2/FormTriggerV2.node.ts
@@ -9,7 +9,6 @@ import {
 	type IWebhookFunctions,
 } from 'n8n-workflow';
 
-import { formWebhook } from '../utils';
 import {
 	appendAttributionToForm,
 	formDescription,
@@ -21,6 +20,7 @@ import {
 	webhookPath,
 } from '../common.descriptions';
 import { FORM_TRIGGER_AUTHENTICATION_PROPERTY } from '../interfaces';
+import { formWebhook } from '../utils';
 
 const useWorkflowTimezone: INodeProperties = {
 	displayName: 'Use Workflow Timezone',
diff --git a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
index 988c93b147..747ed095fb 100644
--- a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
+++ b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
@@ -163,7 +163,6 @@ export class FormstackTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const bodyData = this.getBodyData() as unknown as IFormstackWebhookResponseBody;
 		const simple = this.getNodeParameter('simple') as string;
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index 3f1c7d7332..1345725a69 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -9,6 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { contactFields, contactOperations } from './ContactDescription';
+import type { ICreateContactBody } from './ContactInterface';
 import {
 	capitalize,
 	freshdeskApiRequest,
@@ -16,10 +18,6 @@ import {
 	// validateJSON,
 } from './GenericFunctions';
 
-import type { ICreateContactBody } from './ContactInterface';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
 const enum Status {
 	Open = 2,
 	Pending = 3,
@@ -1205,7 +1203,6 @@ export class Freshdesk implements INodeType {
 						if (updateFields.requester) {
 							const value = updateFields.requesterIdentificationValue as string;
 							if (updateFields.requester === 'requesterId') {
-								// @ts-ignore
 								if (isNaN(parseInt(value, 10))) {
 									throw new NodeOperationError(this.getNode(), 'Requester Id must be a number', {
 										itemIndex: i,
diff --git a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
index 3a1fafc6e0..d2dd220e04 100644
--- a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
+++ b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
@@ -1,3 +1,4 @@
+import { tz } from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,21 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { tz } from 'moment-timezone';
-import {
-	adjustAddress,
-	adjustAgentRoles,
-	formatFilters,
-	freshserviceApiRequest,
-	handleListing,
-	sanitizeAssignmentScopeGroup,
-	toArray,
-	toOptions,
-	toUserOptions,
-	validateAssignmentScopeGroup,
-	validateUpdateFields,
-} from './GenericFunctions';
-
 import {
 	agentFields,
 	agentGroupFields,
@@ -56,7 +42,19 @@ import {
 	ticketFields,
 	ticketOperations,
 } from './descriptions';
-
+import {
+	adjustAddress,
+	adjustAgentRoles,
+	formatFilters,
+	freshserviceApiRequest,
+	handleListing,
+	sanitizeAssignmentScopeGroup,
+	toArray,
+	toOptions,
+	toUserOptions,
+	validateAssignmentScopeGroup,
+	validateUpdateFields,
+} from './GenericFunctions';
 import type { AddressFixedCollection, LoadedResource, LoadedUser, RolesParameter } from './types';
 
 export class Freshservice implements INodeType {
diff --git a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
index 558a34c125..359d6e1b4d 100644
--- a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { omit } from 'lodash';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { omit } from 'lodash';
 import type {
 	AddressFixedCollection,
 	FreshserviceCredentials,
@@ -24,9 +24,7 @@ export async function freshserviceApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { apiKey, domain } = (await this.getCredentials(
-		'freshserviceApi',
-	)) as FreshserviceCredentials;
+	const { apiKey, domain } = await this.getCredentials<FreshserviceCredentials>('freshserviceApi');
 	const encodedApiKey = Buffer.from(`${apiKey}:X`).toString('base64');
 
 	const options: IRequestOptions = {
diff --git a/packages/nodes-base/nodes/Freshservice/descriptions/RequesterDescription.ts b/packages/nodes-base/nodes/Freshservice/descriptions/RequesterDescription.ts
index 4a7bd830ef..1d1e508a18 100644
--- a/packages/nodes-base/nodes/Freshservice/descriptions/RequesterDescription.ts
+++ b/packages/nodes-base/nodes/Freshservice/descriptions/RequesterDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { LANGUAGES } from '../constants';
 
 export const requesterOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
index c6e828ed29..3e8a246fbd 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
@@ -1,3 +1,4 @@
+import { tz } from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -8,17 +9,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { tz } from 'moment-timezone';
-import {
-	adjustAccounts,
-	adjustAttendees,
-	freshworksCrmApiRequest,
-	getAllItemsViewId,
-	handleListing,
-	loadResource,
-	throwOnEmptyUpdate,
-} from './GenericFunctions';
-
 import {
 	accountFields,
 	accountOperations,
@@ -37,7 +27,15 @@ import {
 	taskFields,
 	taskOperations,
 } from './descriptions';
-
+import {
+	adjustAccounts,
+	adjustAttendees,
+	freshworksCrmApiRequest,
+	getAllItemsViewId,
+	handleListing,
+	loadResource,
+	throwOnEmptyUpdate,
+} from './GenericFunctions';
 import type { FreshworksConfigResponse, LoadedCurrency, LoadedUser, LoadOption } from './types';
 
 export class FreshworksCrm implements INodeType {
diff --git a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
index 0d9e7fad2c..e34aa8e160 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import omit from 'lodash/omit';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import omit from 'lodash/omit';
 import type {
 	FreshworksConfigResponse,
 	FreshworksCrmApiCredentials,
diff --git a/packages/nodes-base/nodes/FreshworksCrm/descriptions/AppointmentDescription.ts b/packages/nodes-base/nodes/FreshworksCrm/descriptions/AppointmentDescription.ts
index 65228c1c75..32922cb93c 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/descriptions/AppointmentDescription.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/descriptions/AppointmentDescription.ts
@@ -1,5 +1,4 @@
 import { tz } from 'moment-timezone';
-
 import type { INodeProperties } from 'n8n-workflow';
 
 export const appointmentOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index 99d9e4b77d..682eee343c 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -1,10 +1,4 @@
 import { createWriteStream } from 'fs';
-import { basename, dirname } from 'path';
-import type { Readable } from 'stream';
-import { pipeline } from 'stream/promises';
-import { file as tmpFile } from 'tmp-promise';
-import ftpClient from 'promise-ftp';
-import sftpClient from 'ssh2-sftp-client';
 import { BINARY_ENCODING, NodeApiError, NodeConnectionType } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
@@ -18,6 +12,13 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
+import { basename, dirname } from 'path';
+import ftpClient from 'promise-ftp';
+import sftpClient from 'ssh2-sftp-client';
+import type { Readable } from 'stream';
+import { pipeline } from 'stream/promises';
+import { file as tmpFile } from 'tmp-promise';
+
 import { formatPrivateKey, generatePairedItemData } from '@utils/utilities';
 
 interface ReturnFtpItem {
@@ -752,10 +753,20 @@ export class Ftp implements INodeType {
 
 						if (operation === 'rename') {
 							const oldPath = this.getNodeParameter('oldPath', i) as string;
-
 							const newPath = this.getNodeParameter('newPath', i) as string;
+							const options = this.getNodeParameter('options', i);
 
-							await ftp!.rename(oldPath, newPath);
+							try {
+								await ftp!.rename(oldPath, newPath);
+							} catch (error) {
+								if ([451, 550].includes(error.code) && options.createDirectories) {
+									const dirPath = newPath.replace(basename(newPath), '');
+									await ftp!.mkdir(dirPath, true);
+									await ftp!.rename(oldPath, newPath);
+								} else {
+									throw new NodeApiError(this.getNode(), error as JsonObject);
+								}
+							}
 							const executionData = this.helpers.constructExecutionMetaData(
 								[{ json: { success: true } }],
 								{ itemData: { item: i } },
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index 6f2955e754..8c56b98e6b 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy, NodeOperationError } from 'n8n-workflow';
+
 import { vmResolver } from '../Code/JavaScriptSandbox';
 
 export class Function implements INodeType {
@@ -92,8 +93,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 +158,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..f033930298 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -10,6 +10,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy, NodeOperationError } from 'n8n-workflow';
+
 import { vmResolver } from '../Code/JavaScriptSandbox';
 
 export class FunctionItem implements INodeType {
@@ -113,8 +114,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 +166,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/GetResponse/GenericFunctions.ts b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
index 1271dea98c..5083bcdcc7 100644
--- a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
@@ -41,7 +41,6 @@ export async function getresponseApiRequest(
 		if (authentication === 'apiKey') {
 			return await this.helpers.requestWithAuthentication.call(this, 'getResponseApi', options);
 		} else {
-			//@ts-ignore
 			return await this.helpers.requestOAuth2.call(this, 'getResponseOAuth2Api', options);
 		}
 	} catch (error) {
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
index 6bdf841944..74a54e61d2 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,10 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { getresponseApiRequest, getResponseApiRequestAllItems } from './GenericFunctions';
-
 import { contactFields, contactOperations } from './ContactDescription';
+import { getresponseApiRequest, getResponseApiRequestAllItems } from './GenericFunctions';
 
 export class GetResponse implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index 1ed2381045..a28e40ae5d 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,9 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { ghostApiRequest, ghostApiRequestAllItems, validateJSON } from './GenericFunctions';
-
 import { postFields, postOperations } from './PostDescription';
 
 export class Ghost implements INodeType {
diff --git a/packages/nodes-base/nodes/Git/Git.node.ts b/packages/nodes-base/nodes/Git/Git.node.ts
index 33a14be8b7..75b2631cbd 100644
--- a/packages/nodes-base/nodes/Git/Git.node.ts
+++ b/packages/nodes-base/nodes/Git/Git.node.ts
@@ -1,5 +1,4 @@
 import { access, mkdir } from 'fs/promises';
-import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -7,9 +6,10 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import type { LogOptions, SimpleGit, SimpleGitOptions } from 'simple-git';
 import simpleGit from 'simple-git';
+import { URL } from 'url';
+
 import {
 	addConfigFields,
 	addFields,
@@ -439,7 +439,6 @@ export class Git implements INodeType {
 						});
 					}
 
-					// @ts-ignore
 					returnItems.push(
 						...this.helpers.returnJsonArray(data).map((item) => {
 							return {
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 2e29b467ca..07b6826bb7 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import {
 	getFileSha,
 	githubApiRequest,
@@ -2128,7 +2128,7 @@ export class Github implements INodeType {
 							}
 						}
 
-						endpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
+						endpoint = `/repos/${owner}/${repository}/contents/${encodeURIComponent(filePath)}`;
 					} else if (operation === 'delete') {
 						// ----------------------------------
 						//         delete
@@ -2165,7 +2165,7 @@ export class Github implements INodeType {
 							body.branch as string | undefined,
 						);
 
-						endpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
+						endpoint = `/repos/${owner}/${repository}/contents/${encodeURIComponent(filePath)}`;
 					} else if (operation === 'get') {
 						requestMethod = 'GET';
 
@@ -2179,11 +2179,11 @@ export class Github implements INodeType {
 							qs.ref = additionalParameters.reference;
 						}
 
-						endpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
+						endpoint = `/repos/${owner}/${repository}/contents/${encodeURIComponent(filePath)}`;
 					} else if (operation === 'list') {
 						requestMethod = 'GET';
 						const filePath = this.getNodeParameter('filePath', i);
-						endpoint = `/repos/${owner}/${repository}/contents/${encodeURI(filePath)}`;
+						endpoint = `/repos/${owner}/${repository}/contents/${encodeURIComponent(filePath)}`;
 					}
 				} else if (resource === 'issue') {
 					if (operation === 'create') {
diff --git a/packages/nodes-base/nodes/Github/SearchFunctions.ts b/packages/nodes-base/nodes/Github/SearchFunctions.ts
index 7c2d5fed2a..ff77121464 100644
--- a/packages/nodes-base/nodes/Github/SearchFunctions.ts
+++ b/packages/nodes-base/nodes/Github/SearchFunctions.ts
@@ -3,6 +3,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
+
 import { githubApiRequest } from './GenericFunctions';
 
 type UserSearchItem = {
diff --git a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
index 6748ad78d8..da0ac5f1cd 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import * as losslessJSON from 'lossless-json';
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,10 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import * as losslessJSON from 'lossless-json';
-
 function convertLosslessNumber(_: any, value: any) {
 	if (value?.isLosslessNumber) {
 		return value.toString();
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index cd8c57c00f..96acec9be6 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
@@ -1,3 +1,7 @@
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
+import moment from 'moment-timezone';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,22 +11,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import omit from 'lodash/omit';
-
-import moment from 'moment-timezone';
-import {
-	goToWebinarApiRequest,
-	goToWebinarApiRequestAllItems,
-	handleGetAll,
-	loadAnswers,
-	loadRegistranMultiChoiceQuestions,
-	loadRegistranSimpleQuestions,
-	loadWebinars,
-	loadWebinarSessions,
-} from './GenericFunctions';
 import {
 	attendeeFields,
 	attendeeOperations,
@@ -37,6 +26,16 @@ import {
 	webinarFields,
 	webinarOperations,
 } from './descriptions';
+import {
+	goToWebinarApiRequest,
+	goToWebinarApiRequestAllItems,
+	handleGetAll,
+	loadAnswers,
+	loadRegistranMultiChoiceQuestions,
+	loadRegistranSimpleQuestions,
+	loadWebinars,
+	loadWebinarSessions,
+} from './GenericFunctions';
 
 export class GoToWebinar implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts b/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
index d4e3e307fd..cee940a5cd 100644
--- a/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
+++ b/packages/nodes-base/nodes/Gong/test/Gong.node.test.ts
@@ -1,6 +1,3 @@
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
-import * as Helpers from '@test/nodes/Helpers';
-import type { WorkflowTestData } from '@test/nodes/types';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -9,6 +6,10 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 import nock from 'nock';
 
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
 import { gongApiResponse, gongNodeResponse } from './mocks';
 import { FAKE_CREDENTIALS_DATA } from '../../../test/nodes/FakeCredentialsMap';
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
index 72a07b2f64..bc3da66d63 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -11,13 +12,12 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { reportFields, reportOperations } from './ReportDescription';
-import { userActivityFields, userActivityOperations } from './UserActivityDescription';
+import { oldVersionNotice } from '@utils/descriptions';
+
 import { googleApiRequest, googleApiRequestAllItems, merge, simplify } from './GenericFunctions';
 import type { IData } from './Interfaces';
-
-import { oldVersionNotice } from '@utils/descriptions';
+import { reportFields, reportOperations } from './ReportDescription';
+import { userActivityFields, userActivityOperations } from './UserActivityDescription';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google Analytics',
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
index 7c42fdc246..1988e4e988 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
@@ -5,9 +5,10 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { listSearch, loadOptions } from './methods';
+
 import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
+import { listSearch, loadOptions } from './methods';
 
 export class GoogleAnalyticsV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/Report.resource.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/Report.resource.ts
index 52fbee06eb..49e14b91ec 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/Report.resource.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/Report.resource.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as getga4 from './get.ga4.operation';
 import * as getuniversal from './get.universal.operation';
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
index 2faea66ef0..738b5bc547 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
@@ -4,6 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import {
+	dimensionDropdown,
+	dimensionFilterField,
+	metricDropdown,
+	metricsFilterField,
+} from './FiltersDescription';
 import {
 	checkDuplicates,
 	defaultEndDate,
@@ -13,12 +20,6 @@ import {
 	simplifyGA4,
 } from '../../helpers/utils';
 import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
-import {
-	dimensionDropdown,
-	dimensionFilterField,
-	metricDropdown,
-	metricsFilterField,
-} from './FiltersDescription';
 
 export const description: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
index 4027277123..df24f6bb12 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import type { IData, IDimension, IMetric } from '../../helpers/Interfaces';
 import {
 	checkDuplicates,
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
index 1d9cae9900..da3aa65260 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
@@ -2,8 +2,8 @@ import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import type { GoogleAnalytics, ReportBasedOnProperty } from './node.type';
-import * as userActivity from './userActivity/UserActivity.resource';
 import * as report from './report/Report.resource';
+import * as userActivity from './userActivity/UserActivity.resource';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/UserActivity.resource.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/UserActivity.resource.ts
index bbb7e3613e..11070dbc5b 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/UserActivity.resource.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/UserActivity.resource.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as search from './search.operation';
 
 export { search };
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
index 2fc8c9c368..4c28b86139 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
 import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
 
 export const description: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/versionDescription.ts
index 773eee9afb..fad6dfaa65 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/versionDescription.ts
@@ -1,7 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
-import * as userActivity from './userActivity/UserActivity.resource';
+
 import * as report from './report/Report.resource';
+import * as userActivity from './userActivity/UserActivity.resource';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Google Analytics',
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
index d0fcde930d..4de28b9ca1 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -6,7 +7,6 @@ import type {
 	INodePropertyOptions,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import { DateTime } from 'luxon';
 
 // tslint:disable-next-line:no-any
 export function simplify(responseData: any | [any]) {
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/Analytics/v2/methods/listSearch.ts
index ea060139be..13b394b4a3 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/methods/listSearch.ts
@@ -3,6 +3,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
+
 import { sortLoadOptions } from '../helpers/utils';
 import { googleApiRequest } from '../transport';
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Google/Analytics/v2/methods/loadOptions.ts
index 8a3ceffad1..084c68efbe 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { sortLoadOptions } from '../helpers/utils';
 import { googleApiRequest } from '../transport';
 
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
index f7a0965d3d..542f3206b1 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/executeQuery.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../v2/transport';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
index 4ee4627838..6a8effcb81 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.autoMapMode.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../v2/transport';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
index f4d94dda8b..4be27d3b3e 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/node/insert.manualMode.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../v2/transport';
 
 jest.mock('../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts
index 4548310140..1a8b53c80a 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/test/v2/utils/utils.test.ts
@@ -1,6 +1,7 @@
-import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
-import { constructExecutionMetaData } from 'n8n-core';
 import { mock } from 'jest-mock-extended';
+import { constructExecutionMetaData } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
+
 import { prepareOutput } from '../../../v2/helpers/utils';
 
 describe('Google BigQuery v2 Utils', () => {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
index d4456f318b..cd2fa59d38 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
index 2d29b89ce7..160360ede3 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v1/GoogleBigQueryV1.node.ts
@@ -10,15 +10,14 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
-import { generatePairedItemData } from '../../../../utils/utilities';
-import { googleApiRequest, googleApiRequestAllItems, simplify } from './GenericFunctions';
-
-import { recordFields, recordOperations } from './RecordDescription';
 
 import { oldVersionNotice } from '@utils/descriptions';
 
+import { googleApiRequest, googleApiRequestAllItems, simplify } from './GenericFunctions';
+import { recordFields, recordOperations } from './RecordDescription';
+import { generatePairedItemData } from '../../../../utils/utilities';
+
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Google BigQuery',
 	name: 'googleBigQuery',
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
index 9d55d46328..b3276e6904 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/GoogleBigQueryV2.node.ts
@@ -6,9 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { loadOptions, listSearch } from './methods';
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { loadOptions, listSearch } from './methods';
 
 export class GoogleBigQueryV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/Database.resource.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/Database.resource.ts
index 76aa6d612f..7686c890cf 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/Database.resource.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/Database.resource.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { datasetRLC, projectRLC, tableRLC } from '../commonDescriptions/RLC.description';
-import * as insert from './insert.operation';
+
 import * as executeQuery from './executeQuery.operation';
+import * as insert from './insert.operation';
+import { datasetRLC, projectRLC, tableRLC } from '../commonDescriptions/RLC.description';
 
 export { executeQuery, insert };
 
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
index a361a3517e..38dcb91f3a 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/executeQuery.operation.ts
@@ -4,13 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-
 import { ApplicationError, NodeOperationError, sleep } from 'n8n-workflow';
-import type { ResponseWithJobReference } from '../../helpers/interfaces';
 
+import { getResolvables, updateDisplayOptions } from '@utils/utilities';
+
+import type { ResponseWithJobReference } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { googleBigQueryApiRequestAllItems, googleBigQueryApiRequest } from '../../transport';
-import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
index 1eb66904b3..c0c197d96b 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/database/insert.operation.ts
@@ -6,10 +6,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
+
+import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
+
 import type { TableSchema } from '../../helpers/interfaces';
 import { checkSchema, wrapData } from '../../helpers/utils';
 import { googleBigQueryApiRequest } from '../../transport';
-import { generatePairedItemData, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -275,6 +277,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				: '';
 			throw new NodeOperationError(this.getNode(), `${failedMessage}${stoppedMessage}`, {
 				description: errors.join('\n, '),
+				itemIndex: i,
 			});
 		}
 
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts
index 9b6d45aa24..96276b487b 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/router.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { GoogleBigQuery } from './node.type';
 
 import * as record from './database/Database.resource';
+import type { GoogleBigQuery } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const resource = this.getNodeParameter<GoogleBigQuery>('resource', 0);
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts
index 202c26d88c..8e30e9ac1f 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/actions/versionDescription.ts
@@ -1,5 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
+
 import * as database from './database/Database.resource';
 
 export const versionDescription: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts
index 34fd023c6e..5030a846b2 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/helpers/utils.ts
@@ -1,6 +1,7 @@
 import { DateTime } from 'luxon';
 import type { IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
+
 import type { SchemaField, TableRawData, TableSchema } from './interfaces';
 
 function getFieldValue(schemaField: SchemaField, field: IDataObject, parseTimestamps = false) {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
index 2fb7cae03b..1d0ccc863c 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/listSearch.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { googleBigQueryApiRequest } from '../transport';
 
 export async function searchProjects(
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
index 7b69f91570..91e6f694c7 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { googleBigQueryApiRequest } from '../transport';
 
 export async function getDatasets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
diff --git a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
index 0f121b2a09..91359dd35d 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/v2/transport/index.ts
@@ -7,6 +7,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function googleBigQueryApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
index 7b64332747..4f66901ae2 100644
--- a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../GenericFunctions';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts b/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
index 68725c010e..59e4591dd5 100644
--- a/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/CalendarDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { TIMEZONE_VALIDATION_REGEX } from './GenericFunctions';
 
 export const calendarOperations: INodeProperties[] = [
@@ -83,6 +84,7 @@ export const calendarFields: INodeProperties[] = [
 			show: {
 				operation: ['availability'],
 				resource: ['calendar'],
+				'@version': [{ _cnd: { lt: 1.3 } }],
 			},
 		},
 		default: '',
@@ -97,11 +99,44 @@ export const calendarFields: INodeProperties[] = [
 			show: {
 				operation: ['availability'],
 				resource: ['calendar'],
+				'@version': [{ _cnd: { lt: 1.3 } }],
 			},
 		},
 		default: '',
 		description: 'End of the interval',
 	},
+	{
+		displayName: 'Start Time',
+		name: 'timeMin',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['availability'],
+				resource: ['calendar'],
+				'@version': [{ _cnd: { gte: 1.3 } }],
+			},
+		},
+		default: '={{ $now }}',
+		description:
+			'Start of the interval, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+	},
+	{
+		displayName: 'End Time',
+		name: 'timeMax',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['availability'],
+				resource: ['calendar'],
+				'@version': [{ _cnd: { gte: 1.3 } }],
+			},
+		},
+		default: "={{ $now.plus(1, 'hour') }}",
+		description:
+			'End of the interval, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
index 6892c88152..797445b893 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
@@ -112,6 +112,7 @@ export const eventFields: INodeProperties[] = [
 			show: {
 				operation: ['create'],
 				resource: ['event'],
+				'@version': [{ _cnd: { lt: 1.3 } }],
 			},
 		},
 		default: '',
@@ -126,11 +127,44 @@ export const eventFields: INodeProperties[] = [
 			show: {
 				operation: ['create'],
 				resource: ['event'],
+				'@version': [{ _cnd: { lt: 1.3 } }],
 			},
 		},
 		default: '',
 		description: 'End time of the event',
 	},
+	{
+		displayName: 'Start',
+		name: 'start',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['event'],
+				'@version': [{ _cnd: { gte: 1.3 } }],
+			},
+		},
+		default: '={{ $now }}',
+		description:
+			'Start time of the event, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+	},
+	{
+		displayName: 'End',
+		name: 'end',
+		type: 'dateTime',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['event'],
+				'@version': [{ _cnd: { gte: 1.3 } }],
+			},
+		},
+		default: "={{ $now.plus(1, 'hour') }}",
+		description:
+			'End time of the event, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+	},
 	{
 		displayName: 'Use Default Reminders',
 		name: 'useDefaultReminders',
@@ -553,6 +587,19 @@ export const eventFields: INodeProperties[] = [
 				description:
 					'The maximum number of attendees to include in the response. If there are more than the specified number of attendees, only the participant is returned.',
 			},
+			{
+				displayName: 'Return Next Instance of Recurring Event',
+				name: 'returnNextInstance',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to return the next instance of a recurring event instead of the event itself',
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
+			},
 			{
 				displayName: 'Timezone',
 				name: 'timeZone',
@@ -629,6 +676,36 @@ export const eventFields: INodeProperties[] = [
 		default: 50,
 		description: 'Max number of results to return',
 	},
+	{
+		displayName: 'After',
+		name: 'timeMin',
+		type: 'dateTime',
+		default: '={{ $now }}',
+		description:
+			'At least some part of the event must be after this time, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.3 } }],
+				operation: ['getAll'],
+				resource: ['event'],
+			},
+		},
+	},
+	{
+		displayName: 'Before',
+		name: 'timeMax',
+		type: 'dateTime',
+		default: '={{ $now.plus({ week: 1 }) }}',
+		description:
+			'At least some part of the event must be before this time, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.3 } }],
+				operation: ['getAll'],
+				resource: ['event'],
+			},
+		},
+	},
 	{
 		displayName: 'Options',
 		name: 'options',
@@ -647,14 +724,39 @@ export const eventFields: INodeProperties[] = [
 				name: 'timeMin',
 				type: 'dateTime',
 				default: '',
-				description: 'At least some part of the event must be after this time',
+				description:
+					'At least some part of the event must be after this time, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
 			},
 			{
 				displayName: 'Before',
 				name: 'timeMax',
 				type: 'dateTime',
 				default: '',
-				description: 'At least some part of the event must be before this time',
+				description:
+					'At least some part of the event must be before this time, use <a href="https://docs.n8n.io/code/cookbook/luxon/" target="_blank">expression</a> to set a date, or switch to fixed mode to choose date from widget',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
+			},
+			{
+				displayName: 'Expand Events',
+				name: 'singleEvents',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to expand recurring events into instances and only return single one-off events and instances of recurring events, but not the underlying recurring events themselves',
+				displayOptions: {
+					hide: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
 			},
 			{
 				displayName: 'Fields',
@@ -708,6 +810,34 @@ export const eventFields: INodeProperties[] = [
 				description:
 					'Free text search terms to find events that match these terms in any field, except for extended properties',
 			},
+			{
+				displayName: 'Recurring Event Handling',
+				name: 'recurringEventHandling',
+				type: 'options',
+				default: 'expand',
+				options: [
+					{
+						name: 'All Occurrences',
+						value: 'expand',
+						description: 'Return all instances of recurring event for specified time range',
+					},
+					{
+						name: 'First Occurrence',
+						value: 'first',
+						description: 'Return event with specified recurrence rule',
+					},
+					{
+						name: 'Next Occurrence',
+						value: 'next',
+						description: 'Return next instance of recurring event',
+					},
+				],
+				displayOptions: {
+					show: {
+						'@version': [{ _cnd: { gte: 1.3 } }],
+					},
+				},
+			},
 			{
 				displayName: 'Show Deleted',
 				name: 'showDeleted',
@@ -723,14 +853,7 @@ export const eventFields: INodeProperties[] = [
 				default: false,
 				description: 'Whether to include hidden invitations in the result',
 			},
-			{
-				displayName: 'Single Events',
-				name: 'singleEvents',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether to expand recurring events into instances and only return single one-off events and instances of recurring events, but not the underlying recurring events themselves',
-			},
+
 			{
 				displayName: 'Timezone',
 				name: 'timeZone',
@@ -797,6 +920,30 @@ export const eventFields: INodeProperties[] = [
 		},
 		default: '',
 	},
+	{
+		displayName: 'Modify',
+		name: 'modifyTarget',
+		type: 'options',
+		options: [
+			{
+				name: 'Recurring Event Instance',
+				value: 'instance',
+			},
+			{
+				name: 'Recurring Event',
+				value: 'event',
+			},
+		],
+		default: 'instance',
+		displayOptions: {
+			show: {
+				'@version': [{ _cnd: { gte: 1.3 } }],
+				resource: ['event'],
+				operation: ['update'],
+				eventId: [{ _cnd: { includes: '_' } }],
+			},
+		},
+	},
 	{
 		displayName: 'Use Default Reminders',
 		name: 'useDefaultReminders',
diff --git a/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts b/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
index d1907fbf2d..26212658d7 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventInterface.ts
@@ -34,3 +34,8 @@ export interface IEvent {
 	visibility?: string;
 	conferenceData?: IConferenceData;
 }
+
+export type RecurringEventInstance = {
+	recurringEventId?: string;
+	start: { dateTime: string; date: string };
+};
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index 819e67cd46..100800c9f6 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -1,19 +1,22 @@
+import { DateTime } from 'luxon';
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHttpRequestMethods,
 	ILoadOptionsFunctions,
+	INode,
 	INodeListSearchItems,
 	INodeListSearchResult,
 	IPollFunctions,
 	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
+import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 import { RRule } from 'rrule';
 
+import type { RecurringEventInstance } from './EventInterface';
+
 export async function googleApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	method: IHttpRequestMethods,
@@ -40,7 +43,6 @@ export async function googleApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleCalendarOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
@@ -52,7 +54,6 @@ export async function googleApiRequestAllItems(
 	propertyName: string,
 	method: IHttpRequestMethods,
 	endpoint: string,
-
 	body: any = {},
 	query: IDataObject = {},
 ): Promise<any> {
@@ -129,58 +130,75 @@ export async function getTimezones(
 	return { results };
 }
 
-type RecurentEvent = {
+export type RecurrentEvent = {
 	start: {
-		dateTime: string;
-		timeZone: string;
+		date?: string;
+		dateTime?: string;
+		timeZone?: string;
 	};
 	end: {
-		dateTime: string;
-		timeZone: string;
+		date?: string;
+		dateTime?: string;
+		timeZone?: string;
 	};
 	recurrence: string[];
 	nextOccurrence?: {
 		start: {
 			dateTime: string;
-			timeZone: string;
+			timeZone?: string;
 		};
 		end: {
 			dateTime: string;
-			timeZone: string;
+			timeZone?: string;
 		};
 	};
 };
 
-export function addNextOccurrence(items: RecurentEvent[]) {
+export function addNextOccurrence(items: RecurrentEvent[]) {
 	for (const item of items) {
 		if (item.recurrence) {
 			let eventRecurrence;
 			try {
 				eventRecurrence = item.recurrence.find((r) => r.toUpperCase().startsWith('RRULE'));
+
 				if (!eventRecurrence) continue;
 
-				const rrule = RRule.fromString(eventRecurrence);
+				const start = moment(item.start.dateTime || item.end.date).utc();
+				const end = moment(item.end.dateTime || item.end.date).utc();
+
+				const rruleWithStartDate = `DTSTART:${start.format(
+					'YYYYMMDDTHHmmss',
+				)}Z\n${eventRecurrence}`;
+
+				const rrule = RRule.fromString(rruleWithStartDate);
+
 				const until = rrule.options?.until;
 
-				const now = new Date();
-				if (until && until < now) {
+				const now = moment().utc();
+
+				if (until && moment(until).isBefore(now)) {
 					continue;
 				}
 
-				const nextOccurrence = rrule.after(new Date());
+				const nextDate = rrule.after(now.toDate(), false);
 
-				item.nextOccurrence = {
-					start: {
-						dateTime: moment(nextOccurrence).format(),
-						timeZone: item.start.timeZone,
-					},
-					end: {
-						dateTime: moment(nextOccurrence)
-							.add(moment(item.end.dateTime).diff(moment(item.start.dateTime)))
-							.format(),
-						timeZone: item.end.timeZone,
-					},
-				};
+				if (nextDate) {
+					const nextStart = moment(nextDate);
+
+					const duration = moment.duration(moment(end).diff(moment(start)));
+					const nextEnd = moment(nextStart).add(duration);
+
+					item.nextOccurrence = {
+						start: {
+							dateTime: nextStart.format(),
+							timeZone: item.start.timeZone,
+						},
+						end: {
+							dateTime: nextEnd.format(),
+							timeZone: item.end.timeZone,
+						},
+					};
+				}
 			} catch (error) {
 				console.log(`Error adding next occurrence ${eventRecurrence}`);
 			}
@@ -195,3 +213,92 @@ export function addTimezoneToDate(date: string, timezone: string) {
 	if (hasTimezone(date)) return date;
 	return moment.tz(date, timezone).utc().format();
 }
+
+async function requestWithRetries(
+	node: INode,
+	requestFn: () => Promise<any>,
+	retryCount: number = 0,
+	maxRetries: number = 10,
+	itemIndex: number = 0,
+): Promise<any> {
+	try {
+		return await requestFn();
+	} catch (error) {
+		if (!(error instanceof NodeApiError)) {
+			throw new NodeOperationError(node, error.message, { itemIndex });
+		}
+
+		if (retryCount >= maxRetries) throw error;
+
+		if (error.httpCode === '403' || error.httpCode === '429') {
+			const delay = 1000 * Math.pow(2, retryCount);
+
+			console.log(`Rate limit hit. Retrying in ${delay}ms... (Attempt ${retryCount + 1})`);
+
+			await sleep(delay);
+			return await requestWithRetries(node, requestFn, retryCount + 1, maxRetries, itemIndex);
+		}
+
+		throw error;
+	}
+}
+
+export async function googleApiRequestWithRetries({
+	context,
+	method,
+	resource,
+	body = {},
+	qs = {},
+	uri,
+	headers = {},
+	itemIndex = 0,
+}: {
+	context: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions;
+	method: IHttpRequestMethods;
+	resource: string;
+	body?: any;
+	qs?: IDataObject;
+	uri?: string;
+	headers?: IDataObject;
+	itemIndex?: number;
+}) {
+	const requestFn = async (): Promise<any> => {
+		return await googleApiRequest.call(context, method, resource, body, qs, uri, headers);
+	};
+
+	const retryCount = 0;
+	const maxRetries = 10;
+
+	return await requestWithRetries(context.getNode(), requestFn, retryCount, maxRetries, itemIndex);
+}
+
+export const eventExtendYearIntoFuture = (
+	data: RecurringEventInstance[],
+	timezone: string,
+	currentYear?: number, // for testing purposes
+) => {
+	const thisYear = currentYear || moment().tz(timezone).year();
+
+	return data.some((event) => {
+		if (!event.recurringEventId) return false;
+
+		const eventStart = event.start.dateTime || event.start.date;
+
+		const eventDateTime = moment(eventStart).tz(timezone);
+		if (!eventDateTime.isValid()) return false;
+
+		const targetYear = eventDateTime.year();
+
+		if (targetYear - thisYear >= 1) {
+			return true;
+		} else {
+			return false;
+		}
+	});
+};
+
+export function dateObjectToISO<T>(date: T): string {
+	if (date instanceof DateTime) return date.toISO();
+	if (date instanceof Date) return date.toISOString();
+	return date as string;
+}
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
index 737faf8fa1..690ea4f243 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.json
@@ -36,7 +36,7 @@
 				"url": "https://n8n.io/blog/your-business-doesnt-need-you-to-operate/"
 			},
 			{
-				"label": "5 workflow automations for Mattermost that we love at n8n",
+				"label": "5 workflow automation for Mattermost that we love at n8n",
 				"icon": "🤖",
 				"url": "https://n8n.io/blog/5-workflow-automations-for-mattermost-that-we-love-at-n8n/"
 			},
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 93866afaf9..505b1f525d 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,26 +8,33 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
+	NodeExecutionHint,
+} from 'n8n-workflow';
+import {
+	NodeConnectionType,
+	NodeApiError,
+	NodeOperationError,
+	NodeExecutionOutput,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
 import { v4 as uuid } from 'uuid';
+
+import { calendarFields, calendarOperations } from './CalendarDescription';
+import { eventFields, eventOperations } from './EventDescription';
+import type { IEvent, RecurringEventInstance } from './EventInterface';
 import {
 	addNextOccurrence,
 	addTimezoneToDate,
+	dateObjectToISO,
 	encodeURIComponentOnce,
+	eventExtendYearIntoFuture,
 	getCalendars,
 	getTimezones,
 	googleApiRequest,
 	googleApiRequestAllItems,
+	googleApiRequestWithRetries,
+	type RecurrentEvent,
 } from './GenericFunctions';
-
-import { eventFields, eventOperations } from './EventDescription';
-
-import { calendarFields, calendarOperations } from './CalendarDescription';
-
-import type { IEvent } from './EventInterface';
+import { sortItemKeysByPriorityList } from '../../../utils/utilities';
 
 export class GoogleCalendar implements INodeType {
 	description: INodeTypeDescription = {
@@ -34,7 +42,7 @@ export class GoogleCalendar implements INodeType {
 		name: 'googleCalendar',
 		icon: 'file:googleCalendar.svg',
 		group: ['input'],
-		version: [1, 1.1, 1.2],
+		version: [1, 1.1, 1.2, 1.3],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Consume Google Calendar API',
 		defaults: {
@@ -135,6 +143,7 @@ export class GoogleCalendar implements INodeType {
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
+		const hints: NodeExecutionHint[] = [];
 		let responseData;
 
 		const resource = this.getNodeParameter('resource', 0);
@@ -151,8 +160,8 @@ export class GoogleCalendar implements INodeType {
 						const calendarId = decodeURIComponent(
 							this.getNodeParameter('calendar', i, '', { extractValue: true }) as string,
 						);
-						const timeMin = this.getNodeParameter('timeMin', i) as string;
-						const timeMax = this.getNodeParameter('timeMax', i) as string;
+						const timeMin = dateObjectToISO(this.getNodeParameter('timeMin', i));
+						const timeMax = dateObjectToISO(this.getNodeParameter('timeMax', i));
 						const options = this.getNodeParameter('options', i);
 						const outputFormat = options.outputFormat || 'availability';
 						const tz = this.getNodeParameter('options.timezone', i, '', {
@@ -203,8 +212,8 @@ export class GoogleCalendar implements INodeType {
 						const calendarId = encodeURIComponentOnce(
 							this.getNodeParameter('calendar', i, '', { extractValue: true }) as string,
 						);
-						const start = this.getNodeParameter('start', i) as string;
-						const end = this.getNodeParameter('end', i) as string;
+						const start = dateObjectToISO(this.getNodeParameter('start', i));
+						const end = dateObjectToISO(this.getNodeParameter('end', i));
 						const useDefaultReminders = this.getNodeParameter('useDefaultReminders', i) as boolean;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
@@ -382,16 +391,33 @@ export class GoogleCalendar implements INodeType {
 						if (tz) {
 							qs.timeZone = tz;
 						}
-						responseData = await googleApiRequest.call(
+						responseData = (await googleApiRequest.call(
 							this,
 							'GET',
 							`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
 							{},
 							qs,
-						);
+						)) as IDataObject;
 
 						if (responseData) {
-							responseData = addNextOccurrence([responseData]);
+							if (nodeVersion >= 1.3 && options.returnNextInstance && responseData.recurrence) {
+								const eventInstances =
+									((
+										(await googleApiRequest.call(
+											this,
+											'GET',
+											`/calendar/v3/calendars/${calendarId}/events/${responseData.id}/instances`,
+											{},
+											{
+												timeMin: new Date().toISOString(),
+												maxResults: 1,
+											},
+										)) as IDataObject
+									).items as IDataObject[]) || [];
+								responseData = eventInstances[0] ? [eventInstances[0]] : [responseData];
+							} else {
+								responseData = addNextOccurrence([responseData as RecurrentEvent]);
+							}
 						}
 					}
 					//https://developers.google.com/calendar/v3/reference/events/list
@@ -404,6 +430,22 @@ export class GoogleCalendar implements INodeType {
 						const tz = this.getNodeParameter('options.timeZone', i, '', {
 							extractValue: true,
 						}) as string;
+
+						if (nodeVersion >= 1.3) {
+							const timeMin = dateObjectToISO(this.getNodeParameter('timeMin', i));
+							const timeMax = dateObjectToISO(this.getNodeParameter('timeMax', i));
+							if (timeMin) {
+								qs.timeMin = addTimezoneToDate(timeMin as string, tz || timezone);
+							}
+							if (timeMax) {
+								qs.timeMax = addTimezoneToDate(timeMax as string, tz || timezone);
+							}
+
+							if (!options.recurringEventHandling || options.recurringEventHandling === 'expand') {
+								qs.singleEvents = true;
+							}
+						}
+
 						if (options.iCalUID) {
 							qs.iCalUID = options.iCalUID as string;
 						}
@@ -426,16 +468,19 @@ export class GoogleCalendar implements INodeType {
 							qs.singleEvents = options.singleEvents as boolean;
 						}
 						if (options.timeMax) {
-							qs.timeMax = addTimezoneToDate(options.timeMax as string, tz || timezone);
+							qs.timeMax = addTimezoneToDate(dateObjectToISO(options.timeMax), tz || timezone);
 						}
 						if (options.timeMin) {
-							qs.timeMin = addTimezoneToDate(options.timeMin as string, tz || timezone);
+							qs.timeMin = addTimezoneToDate(dateObjectToISO(options.timeMin), tz || timezone);
 						}
 						if (tz) {
 							qs.timeZone = tz;
 						}
 						if (options.updatedMin) {
-							qs.updatedMin = addTimezoneToDate(options.updatedMin as string, tz || timezone);
+							qs.updatedMin = addTimezoneToDate(
+								dateObjectToISO(options.updatedMin),
+								tz || timezone,
+							);
 						}
 						if (options.fields) {
 							qs.fields = options.fields as string;
@@ -463,7 +508,76 @@ export class GoogleCalendar implements INodeType {
 						}
 
 						if (responseData) {
-							responseData = addNextOccurrence(responseData);
+							if (nodeVersion >= 1.3 && options.recurringEventHandling === 'next') {
+								const updatedEvents: IDataObject[] = [];
+
+								for (const event of responseData) {
+									if (event.recurrence) {
+										const eventInstances =
+											((
+												(await googleApiRequestWithRetries({
+													context: this,
+													method: 'GET',
+													resource: `/calendar/v3/calendars/${calendarId}/events/${event.id}/instances`,
+													qs: {
+														timeMin: new Date().toISOString(),
+														maxResults: 1,
+													},
+													itemIndex: i,
+												})) as IDataObject
+											).items as IDataObject[]) || [];
+										updatedEvents.push(eventInstances[0] || event);
+										continue;
+									}
+
+									updatedEvents.push(event);
+								}
+								responseData = updatedEvents;
+							} else if (nodeVersion >= 1.3 && options.recurringEventHandling === 'first') {
+								responseData = responseData.filter((event: IDataObject) => {
+									if (
+										qs.timeMin &&
+										event.recurrence &&
+										event.created &&
+										event.created < qs.timeMin
+									) {
+										return false;
+									}
+
+									if (
+										qs.timeMax &&
+										event.recurrence &&
+										event.created &&
+										event.created > qs.timeMax
+									) {
+										return false;
+									}
+
+									return true;
+								});
+							} else if (nodeVersion < 1.3) {
+								// in node version above or equal to 1.3, this would correspond to the 'expand' option,
+								// so no need to add the next occurrence as event instances returned by the API
+								responseData = addNextOccurrence(responseData);
+							}
+
+							if (
+								!qs.timeMax &&
+								(!options.recurringEventHandling || options.recurringEventHandling === 'expand')
+							) {
+								const suggestTrim = eventExtendYearIntoFuture(
+									responseData as RecurringEventInstance[],
+									timezone,
+								);
+
+								if (suggestTrim) {
+									hints.push({
+										message:
+											"Some events repeat far into the future. To return less of them, add a 'Before' date or change the 'Recurring Event Handling' option.",
+										location: 'outputPane',
+									});
+								}
+							}
 						}
 					}
 					//https://developers.google.com/calendar/v3/reference/events/patch
@@ -471,7 +585,22 @@ export class GoogleCalendar implements INodeType {
 						const calendarId = encodeURIComponentOnce(
 							this.getNodeParameter('calendar', i, '', { extractValue: true }) as string,
 						);
-						const eventId = this.getNodeParameter('eventId', i) as string;
+						let eventId = this.getNodeParameter('eventId', i) as string;
+
+						if (nodeVersion >= 1.3) {
+							const modifyTarget = this.getNodeParameter('modifyTarget', i, 'instance') as string;
+							if (modifyTarget === 'event') {
+								const instance = (await googleApiRequest.call(
+									this,
+									'GET',
+									`/calendar/v3/calendars/${calendarId}/events/${eventId}`,
+									{},
+									qs,
+								)) as IDataObject;
+								eventId = instance.recurringEventId as string;
+							}
+						}
+
 						const useDefaultReminders = this.getNodeParameter('useDefaultReminders', i) as boolean;
 						const updateFields = this.getNodeParameter('updateFields', i);
 						let updateTimezone = updateFields.timezone as string;
@@ -536,7 +665,7 @@ export class GoogleCalendar implements INodeType {
 									body.attendees?.push(attendee);
 								});
 							}
-							(attendees as string[]).forEach((attendee) => {
+							attendees.forEach((attendee) => {
 								body.attendees!.push.apply(
 									body.attendees,
 									attendee
@@ -661,6 +790,30 @@ export class GoogleCalendar implements INodeType {
 				}
 			}
 		}
-		return [returnData];
+
+		const keysPriorityList = [
+			'id',
+			'summary',
+			'start',
+			'end',
+			'attendees',
+			'creator',
+			'organizer',
+			'description',
+			'location',
+			'created',
+			'updated',
+		];
+
+		let nodeExecutionData = returnData;
+		if (nodeVersion >= 1.3) {
+			nodeExecutionData = sortItemKeysByPriorityList(returnData, keysPriorityList);
+		}
+
+		if (hints.length) {
+			return new NodeExecutionOutput([nodeExecutionData], hints);
+		}
+
+		return [nodeExecutionData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
index 30c890487a..5a6f1fab7d 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendarTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	INodeExecutionData,
@@ -7,8 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 import {
 	encodeURIComponentOnce,
 	getCalendars,
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts
index 1da9122e2c..6dab75ee0a 100644
--- a/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/test/GeneircFunctions.test.ts
@@ -1,4 +1,7 @@
-import { addTimezoneToDate } from '../GenericFunctions';
+import { DateTime } from 'luxon';
+
+import type { RecurringEventInstance } from '../EventInterface';
+import { addTimezoneToDate, dateObjectToISO, eventExtendYearIntoFuture } from '../GenericFunctions';
 
 describe('addTimezoneToDate', () => {
 	it('should add timezone to date', () => {
@@ -18,3 +21,87 @@ describe('addTimezoneToDate', () => {
 		expect(result4).toBe('2021-09-01T12:00:00.000+08:00');
 	});
 });
+
+describe('dateObjectToISO', () => {
+	test('should return ISO string for DateTime instance', () => {
+		const mockDateTime = DateTime.fromISO('2025-01-07T12:00:00');
+		const result = dateObjectToISO(mockDateTime);
+		expect(result).toBe('2025-01-07T12:00:00.000+00:00');
+	});
+
+	test('should return ISO string for Date instance', () => {
+		const mockDate = new Date('2025-01-07T12:00:00Z');
+		const result = dateObjectToISO(mockDate);
+		expect(result).toBe('2025-01-07T12:00:00.000Z');
+	});
+
+	test('should return string when input is not a DateTime or Date instance', () => {
+		const inputString = '2025-01-07T12:00:00';
+		const result = dateObjectToISO(inputString);
+		expect(result).toBe(inputString);
+	});
+});
+
+describe('eventExtendYearIntoFuture', () => {
+	const timezone = 'UTC';
+
+	it('should return true if any event extends into the next year', () => {
+		const events = [
+			{
+				recurringEventId: '123',
+				start: { dateTime: '2026-01-01T00:00:00Z', date: null },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(true);
+	});
+
+	it('should return false if no event extends into the next year', () => {
+		const events = [
+			{
+				recurringEventId: '123',
+				start: { dateTime: '2025-12-31T23:59:59Z', date: null },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for invalid event start dates', () => {
+		const events = [
+			{
+				recurringEventId: '123',
+				start: { dateTime: 'invalid-date', date: null },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for events without a recurringEventId', () => {
+		const events = [
+			{
+				recurringEventId: null,
+				start: { dateTime: '2025-01-01T00:00:00Z', date: null },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(false);
+	});
+
+	it('should handle events with only a date and no time', () => {
+		const events = [
+			{
+				recurringEventId: '123',
+				start: { dateTime: null, date: '2026-01-01' },
+			},
+		] as unknown as RecurringEventInstance[];
+
+		const result = eventExtendYearIntoFuture(events, timezone, 2025);
+		expect(result).toBe(true);
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/addNextOccurrence.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/addNextOccurrence.test.ts
new file mode 100644
index 0000000000..5390500ca6
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/test/addNextOccurrence.test.ts
@@ -0,0 +1,89 @@
+import moment from 'moment-timezone';
+
+import type { RecurrentEvent } from '../GenericFunctions';
+import { addNextOccurrence } from '../GenericFunctions';
+
+const mockNow = '2024-09-06T16:30:00+03:00';
+jest.spyOn(global.Date, 'now').mockImplementation(() => moment(mockNow).valueOf());
+
+describe('addNextOccurrence', () => {
+	it('should not modify event if no recurrence exists', () => {
+		const event: RecurrentEvent[] = [
+			{
+				start: {
+					dateTime: '2024-09-01T08:00:00Z',
+					timeZone: 'UTC',
+				},
+				end: {
+					dateTime: '2024-09-01T09:00:00Z',
+					timeZone: 'UTC',
+				},
+				recurrence: [],
+			},
+		];
+
+		const result = addNextOccurrence(event);
+
+		expect(result[0].nextOccurrence).toBeUndefined();
+	});
+
+	it('should handle event with no RRULE correctly', () => {
+		const event: RecurrentEvent[] = [
+			{
+				start: {
+					dateTime: '2024-09-01T08:00:00Z',
+					timeZone: 'UTC',
+				},
+				end: {
+					dateTime: '2024-09-01T09:00:00Z',
+					timeZone: 'UTC',
+				},
+				recurrence: ['FREQ=WEEKLY;COUNT=2'],
+			},
+		];
+
+		const result = addNextOccurrence(event);
+
+		expect(result[0].nextOccurrence).toBeUndefined();
+	});
+
+	it('should ignore recurrence if until date is in the past', () => {
+		const event: RecurrentEvent[] = [
+			{
+				start: {
+					dateTime: '2024-08-01T08:00:00Z',
+					timeZone: 'UTC',
+				},
+				end: {
+					dateTime: '2024-08-01T09:00:00Z',
+					timeZone: 'UTC',
+				},
+				recurrence: ['RRULE:FREQ=DAILY;UNTIL=20240805T000000Z'],
+			},
+		];
+
+		const result = addNextOccurrence(event);
+
+		expect(result[0].nextOccurrence).toBeUndefined();
+	});
+
+	it('should handle errors gracefully without breaking and return unchanged event', () => {
+		const event: RecurrentEvent[] = [
+			{
+				start: {
+					dateTime: '2024-09-06T17:30:00+03:00',
+					timeZone: 'Europe/Berlin',
+				},
+				end: {
+					dateTime: '2024-09-06T18:00:00+03:00',
+					timeZone: 'Europe/Berlin',
+				},
+				recurrence: ['xxxxx'],
+			},
+		];
+
+		const result = addNextOccurrence(event);
+
+		expect(result).toEqual(event);
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/node/event.getAll.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/node/event.getAll.test.ts
new file mode 100644
index 0000000000..5cdaf3e25b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Calendar/test/node/event.getAll.test.ts
@@ -0,0 +1,221 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import type { INode, IExecuteFunctions, IDataObject, NodeExecutionOutput } from 'n8n-workflow';
+
+import * as genericFunctions from '../../GenericFunctions';
+import { GoogleCalendar } from '../../GoogleCalendar.node';
+
+let response: IDataObject[] | undefined = [];
+let responseWithRetries: IDataObject | undefined = {};
+
+jest.mock('../../GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../GenericFunctions');
+	return {
+		...originalModule,
+		getTimezones: jest.fn(),
+		googleApiRequest: jest.fn(),
+		googleApiRequestAllItems: jest.fn(async function () {
+			return (() => response)();
+		}),
+		googleApiRequestWithRetries: jest.fn(async function () {
+			return (() => responseWithRetries)();
+		}),
+		addNextOccurrence: jest.fn(function (data: IDataObject[]) {
+			return data;
+		}),
+	};
+});
+
+describe('Google Calendar Node', () => {
+	let googleCalendar: GoogleCalendar;
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+
+	beforeEach(() => {
+		googleCalendar = new GoogleCalendar();
+		mockExecuteFunctions = mock<IExecuteFunctions>({
+			getInputData: jest.fn(),
+			getNode: jest.fn(),
+			getNodeParameter: jest.fn(),
+			getTimezone: jest.fn(),
+			helpers: {
+				constructExecutionMetaData: jest.fn().mockReturnValue([]),
+			},
+		});
+		response = undefined;
+		responseWithRetries = undefined;
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	describe('Google Calendar > Event > Get Many', () => {
+		it('should configure get all request parameters in version 1.3', async () => {
+			// pre loop setup
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('getAll');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.3 }));
+
+			//operation setup
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true); //returnAll
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar'); //calendar
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				iCalUID: 'uid',
+				maxAttendees: 25,
+				orderBy: 'startTime',
+				query: 'test query',
+				recurringEventHandling: 'expand',
+				showDeleted: true,
+				showHiddenInvitations: true,
+				updatedMin: '2024-12-21T00:00:00',
+			}); //options
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('Europe/Berlin'); //options.timeZone
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-20T00:00:00'); //timeMin
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-26T00:00:00'); //timeMax
+
+			await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(genericFunctions.googleApiRequestAllItems).toHaveBeenCalledWith(
+				'items',
+				'GET',
+				'/calendar/v3/calendars/myCalendar/events',
+				{},
+				{
+					iCalUID: 'uid',
+					maxAttendees: 25,
+					orderBy: 'startTime',
+					q: 'test query',
+					showDeleted: true,
+					showHiddenInvitations: true,
+					singleEvents: true,
+					timeMax: '2024-12-25T23:00:00Z',
+					timeMin: '2024-12-19T23:00:00Z',
+					timeZone: 'Europe/Berlin',
+					updatedMin: '2024-12-20T23:00:00Z',
+				},
+			);
+		});
+
+		it('should configure get all recurringEventHandling equals next in version 1.3', async () => {
+			// pre loop setup
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('getAll');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.3 }));
+
+			//operation setup
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true); //returnAll
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar'); //calendar
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				recurringEventHandling: 'next',
+			}); //options
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('Europe/Berlin'); //options.timeZone
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-20T00:00:00'); //timeMin
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-26T00:00:00'); //timeMax
+
+			response = [
+				{
+					recurrence: ['RRULE:FREQ=DAILY;COUNT=5'],
+				},
+			];
+
+			responseWithRetries = { items: [] };
+
+			const result = await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(genericFunctions.googleApiRequestAllItems).toHaveBeenCalledWith(
+				'items',
+				'GET',
+				'/calendar/v3/calendars/myCalendar/events',
+				{},
+				{
+					timeMax: '2024-12-25T23:00:00Z',
+					timeMin: '2024-12-19T23:00:00Z',
+					timeZone: 'Europe/Berlin',
+				},
+			);
+			expect(genericFunctions.googleApiRequestWithRetries).toHaveBeenCalledWith(
+				expect.objectContaining({
+					method: 'GET',
+					itemIndex: 0,
+					resource: '/calendar/v3/calendars/myCalendar/events/undefined/instances',
+				}),
+			);
+
+			expect(result).toEqual([[]]);
+		});
+
+		it('should configure get all recurringEventHandling equals first in version 1.3', async () => {
+			// pre loop setup
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('getAll');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.3 }));
+
+			//operation setup
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true); //returnAll
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar'); //calendar
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({
+				recurringEventHandling: 'first',
+			}); //options
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('Europe/Berlin'); //options.timeZone
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-20T00:00:00'); //timeMin
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-26T00:00:00'); //timeMax
+
+			response = [
+				{
+					recurrence: ['RRULE:FREQ=DAILY;COUNT=5'],
+					created: '2024-12-19T00:00:00',
+				},
+				{
+					recurrence: ['RRULE:FREQ=DAILY;COUNT=5'],
+					created: '2024-12-27T00:00:00',
+				},
+			];
+
+			const result = await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect(result).toEqual([[]]);
+		});
+
+		it('should configure get all should have hint in version 1.3', async () => {
+			// pre loop setup
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: {} }]);
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('event');
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('getAll');
+			mockExecuteFunctions.getTimezone.mockReturnValueOnce('Europe/Berlin');
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.3 }));
+
+			//operation setup
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(true); //returnAll
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('myCalendar'); //calendar
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce({}); //options
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('Europe/Berlin'); //options.timeZone
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce('2024-12-20T00:00:00'); //timeMin
+			mockExecuteFunctions.getNodeParameter.mockReturnValueOnce(''); //timeMax
+
+			response = [
+				{
+					recurrence: ['RRULE:FREQ=DAILY;COUNT=5'],
+					created: '2024-12-25T00:00:00',
+					recurringEventId: '1',
+					start: { dateTime: '2027-12-25T00:00:00' },
+				},
+			];
+
+			const result = await googleCalendar.execute.call(mockExecuteFunctions);
+
+			expect((result as NodeExecutionOutput).getHints()).toEqual([
+				{
+					message:
+						"Some events repeat far into the future. To return less of them, add a 'Before' date or change the 'Recurring Event Handling' option.",
+					location: 'outputPane',
+				},
+			]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts b/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
index 39fa8a3b0a..1cada0cf06 100644
--- a/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/test/node/event.update.test.ts
@@ -2,9 +2,8 @@ import type { MockProxy } from 'jest-mock-extended';
 import { mock } from 'jest-mock-extended';
 import type { INode, IExecuteFunctions } from 'n8n-workflow';
 
-import { GoogleCalendar } from '../../GoogleCalendar.node';
-
 import * as genericFunctions from '../../GenericFunctions';
+import { GoogleCalendar } from '../../GoogleCalendar.node';
 
 jest.mock('../../GenericFunctions', () => ({
 	getTimezones: jest.fn(),
@@ -15,7 +14,7 @@ jest.mock('../../GenericFunctions', () => ({
 	encodeURIComponentOnce: jest.fn(),
 }));
 
-describe('RespondToWebhook Node', () => {
+describe('Google Calendar Node', () => {
 	let googleCalendar: GoogleCalendar;
 	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
 
diff --git a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
index 4501b7b7df..7a66126762 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
@@ -1,3 +1,5 @@
+import jwt from 'jsonwebtoken';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -13,10 +15,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import jwt from 'jsonwebtoken';
-import type { IMessage, IMessageUi } from './MessageInterface';
-
 import {
 	// attachmentFields,
 	// attachmentOperations,
@@ -31,8 +29,8 @@ import {
 	spaceFields,
 	spaceOperations,
 } from './descriptions';
-
 import { googleApiRequest, googleApiRequestAllItems, validateJSON } from './GenericFunctions';
+import type { IMessage, IMessageUi } from './MessageInterface';
 
 export class GoogleChat implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
index 58cb39c8b0..c9f4ebd7f8 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
@@ -36,7 +36,6 @@ export async function googleApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(
 			this,
 			'googleCloudNaturalLanguageOAuth2Api',
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
index 25c7ad6266..674302b3d0 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
@@ -6,9 +6,8 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import type { IData } from './Interface';
-
 import { googleApiRequest } from './GenericFunctions';
+import type { IData } from './Interface';
 
 export class GoogleCloudNaturalLanguage implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/BucketDescription.ts b/packages/nodes-base/nodes/Google/CloudStorage/BucketDescription.ts
index 0cf0aabc9f..d7f012288c 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/BucketDescription.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/BucketDescription.ts
@@ -235,7 +235,7 @@ export const bucketOperations: INodeProperties[] = [
 						preSend: [parseJSONBody],
 					},
 				},
-				action: 'Create a new Bucket',
+				action: 'Update the metadata of a Bucket',
 			},
 		],
 		default: 'getAll',
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
index a4378515b9..0ccf88ee8b 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import FormData from 'form-data';
 import {
 	BINARY_ENCODING,
@@ -6,6 +5,7 @@ import {
 	type INodeExecutionData,
 	type INodeProperties,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 // Define these because we'll be using them in two separate places
 const metagenerationFilters: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
index 6c07a1a0da..0ab273c127 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
@@ -36,7 +36,6 @@ export async function googleApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleContactsOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index 7b2bfa3616..a6da7b13fb 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,7 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
+import { contactFields, contactOperations } from './ContactDescription';
 import {
 	allFields,
 	cleanData,
@@ -17,8 +18,6 @@ import {
 	googleApiRequestAllItems,
 } from './GenericFunctions';
 
-import { contactFields, contactOperations } from './ContactDescription';
-
 export class GoogleContacts implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Contacts',
diff --git a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
index 2c5fb28682..f8647cabda 100644
--- a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
@@ -10,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
 
+import { documentFields, documentOperations } from './DocumentDescription';
 import {
 	extractID,
 	googleApiRequest,
@@ -17,9 +18,6 @@ import {
 	hasKeys,
 	upperFirst,
 } from './GenericFunctions';
-
-import { documentFields, documentOperations } from './DocumentDescription';
-
 import type { IUpdateBody, IUpdateFields } from './interfaces';
 
 export class GoogleDocs implements INodeType {
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index 68c04b8799..b41d548796 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -9,10 +10,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../constants';
 import { extractId, googleApiRequest, googleApiRequestAllItems } from './v1/GenericFunctions';
 import { fileSearch, folderSearch } from './v2/methods/listSearch';
+import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../constants';
 
 export class GoogleDriveTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
index 42a17bfdad..7053c24165 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/create.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as create from '../../../../v2/actions/drive/create.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
index b249195a8a..05b5002ab5 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/deleteDrive.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as deleteDrive from '../../../../v2/actions/drive/deleteDrive.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
index 55cb301fcc..128b74a220 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/get.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as get from '../../../../v2/actions/drive/get.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
index 8865e7b303..ca8e6deb10 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/list.test.ts
@@ -1,10 +1,8 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
 
 import * as list from '../../../../v2/actions/drive/list.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
index d60521cf00..afa01998b8 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/drive/update.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as update from '../../../../v2/actions/drive/update.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
index ddc4891cbf..18812ba157 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/copy.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as copy from '../../../../v2/actions/file/copy.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
index 040c9aa880..5fc45c8d98 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/createFromText.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as createFromText from '../../../../v2/actions/file/createFromText.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
index cbfd2edf6b..13fb7ae791 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/deleteFile.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as deleteFile from '../../../../v2/actions/file/deleteFile.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
index 3061f74953..e7f4be6294 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/download.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as download from '../../../../v2/actions/file/download.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
index 51196a2858..03498e06ec 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/move.test.ts
@@ -1,10 +1,8 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
 
 import * as move from '../../../../v2/actions/file/move.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
index c7111f4e94..e8ed98a124 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/share.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as share from '../../../../v2/actions/file/share.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
index 868f727a47..a8dbfa5570 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/update.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as update from '../../../../v2/actions/file/update.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
index 1eadf887fd..fa39890cb7 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/file/upload.test.ts
@@ -1,12 +1,10 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
 
 import * as upload from '../../../../v2/actions/file/upload.operation';
-
-import * as transport from '../../../../v2/transport';
 import * as utils from '../../../../v2/helpers/utils';
-
-import { createMockExecuteFunction, driveNode } from '../helpers';
+import * as transport from '../../../../v2/transport';
+import { createMockExecuteFunction, createTestStream, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
@@ -30,7 +28,7 @@ jest.mock('../../../../v2/helpers/utils', () => {
 		getItemBinaryData: jest.fn(async function () {
 			return {
 				contentLength: '123',
-				fileContent: 'Hello Drive!',
+				fileContent: Buffer.from('Hello Drive!'),
 				originalFilename: 'original.txt',
 				mimeType: 'text/plain',
 			};
@@ -43,13 +41,17 @@ describe('test GoogleDriveV2: file upload', () => {
 		nock.disableNetConnect();
 	});
 
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
 	afterAll(() => {
 		nock.restore();
 		jest.unmock('../../../../v2/transport');
 		jest.unmock('../../../../v2/helpers/utils');
 	});
 
-	it('should be called with', async () => {
+	it('should upload buffers', async () => {
 		const nodeParameters = {
 			name: 'newFile.txt',
 			folderId: {
@@ -73,10 +75,10 @@ describe('test GoogleDriveV2: file upload', () => {
 		expect(transport.googleApiRequest).toHaveBeenCalledWith(
 			'POST',
 			'/upload/drive/v3/files',
+			expect.any(Buffer),
+			{ uploadType: 'media' },
 			undefined,
-			{ uploadType: 'resumable' },
-			undefined,
-			{ returnFullResponse: true },
+			{ headers: { 'Content-Length': '123', 'Content-Type': 'text/plain' } },
 		);
 		expect(transport.googleApiRequest).toHaveBeenCalledWith(
 			'PATCH',
@@ -94,4 +96,60 @@ describe('test GoogleDriveV2: file upload', () => {
 		expect(utils.getItemBinaryData).toBeCalledTimes(1);
 		expect(utils.getItemBinaryData).toHaveBeenCalled();
 	});
+
+	it('should stream large files in 2MB chunks', async () => {
+		const nodeParameters = {
+			name: 'newFile.jpg',
+			folderId: {
+				__rl: true,
+				value: 'folderIDxxxxxx',
+				mode: 'list',
+				cachedResultName: 'testFolder 3',
+				cachedResultUrl: 'https://drive.google.com/drive/folders/folderIDxxxxxx',
+			},
+			options: {
+				simplifyOutput: true,
+			},
+		};
+
+		const fakeExecuteFunction = createMockExecuteFunction(nodeParameters, driveNode);
+		const httpRequestSpy = jest.spyOn(fakeExecuteFunction.helpers, 'httpRequest');
+
+		const fileSize = 7 * 1024 * 1024; // 7MB
+		jest.mocked(utils.getItemBinaryData).mockResolvedValue({
+			mimeType: 'image/jpg',
+			originalFilename: 'test.jpg',
+			contentLength: fileSize,
+			fileContent: createTestStream(fileSize),
+		});
+
+		await upload.execute.call(fakeExecuteFunction, 0);
+
+		// 4 chunks: 7MB = 3x2MB + 1x1MB
+		expect(httpRequestSpy).toHaveBeenCalledTimes(4);
+		expect(httpRequestSpy).toHaveBeenCalledWith(
+			expect.objectContaining({ body: expect.any(Buffer) }),
+		);
+		expect(transport.googleApiRequest).toBeCalledTimes(2);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/upload/drive/v3/files',
+			undefined,
+			{ uploadType: 'resumable' },
+			undefined,
+			{ returnFullResponse: true },
+		);
+		expect(transport.googleApiRequest).toHaveBeenCalledWith(
+			'PATCH',
+			'/drive/v3/files/undefined',
+			{ mimeType: 'image/jpg', name: 'newFile.jpg', originalFilename: 'test.jpg' },
+			{
+				addParents: 'folderIDxxxxxx',
+				supportsAllDrives: true,
+				corpora: 'allDrives',
+				includeItemsFromAllDrives: true,
+				spaces: 'appDataFolder, drive',
+			},
+		);
+	});
 });
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
index f971edfc30..630bd9469d 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/fileFolder/search.test.ts
@@ -1,10 +1,8 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
 
 import * as search from '../../../../v2/actions/fileFolder/search.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
index ec3c17b287..26855b6e5c 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/create.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as create from '../../../../v2/actions/folder/create.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
index 36c2f0abc2..ed486720f9 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/deleteFolder.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as deleteFolder from '../../../../v2/actions/folder/deleteFolder.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
index 0f1692caac..4940b6b90a 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/folder/share.test.ts
@@ -1,9 +1,7 @@
 import nock from 'nock';
 
 import * as share from '../../../../v2/actions/folder/share.operation';
-
 import * as transport from '../../../../v2/transport';
-
 import { createMockExecuteFunction, driveNode } from '../helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts b/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts
index b04a33e2e2..780de933af 100644
--- a/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts
+++ b/packages/nodes-base/nodes/Google/Drive/test/v2/node/helpers.ts
@@ -1,7 +1,7 @@
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
-
 import { get } from 'lodash';
 import { constructExecutionMetaData, returnJsonArray } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+import { Readable } from 'stream';
 
 export const driveNode: INode = {
 	id: '11',
@@ -40,3 +40,25 @@ export const createMockExecuteFunction = (
 	} as unknown as IExecuteFunctions;
 	return fakeExecuteFunction;
 };
+
+export function createTestStream(byteSize: number) {
+	let bytesSent = 0;
+	const CHUNK_SIZE = 64 * 1024; // 64kB chunks (default NodeJS highWaterMark)
+
+	return new Readable({
+		read() {
+			const remainingBytes = byteSize - bytesSent;
+
+			if (remainingBytes <= 0) {
+				this.push(null);
+				return;
+			}
+
+			const chunkSize = Math.min(CHUNK_SIZE, remainingBytes);
+			const chunk = Buffer.alloc(chunkSize, 'A'); // Test data just a string of "A"
+
+			bytesSent += chunkSize;
+			this.push(chunk);
+		},
+	});
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
index f34426e065..61e510ccbe 100644
--- a/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v1/GoogleDriveV1.node.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -9,15 +8,15 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType } from 'n8n-workflow';
-
+import type { Readable } from 'stream';
 import { v4 as uuid } from 'uuid';
-import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../../constants';
-import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
-import { driveSearch, fileSearch, folderSearch } from './SearchFunctions';
 
 import { oldVersionNotice } from '@utils/descriptions';
 
+import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
+import { driveSearch, fileSearch, folderSearch } from './SearchFunctions';
+import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../../constants';
+
 const UPLOAD_CHUNK_SIZE = 256 * 1024;
 
 const versionDescription: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts b/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts
index 41c4da16ea..fa6f3894c8 100644
--- a/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v1/SearchFunctions.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { googleApiRequest } from './GenericFunctions';
 
 interface GoogleDriveFilesItem {
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts b/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts
index 5e147d81bf..d2b7e5fa6b 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/GoogleDriveV2.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { listSearch } from './methods';
-import { router } from './actions/router';
 
 export class GoogleDriveV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
index acdd2780d1..773f1cf9c3 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/common.descriptions.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { DRIVE, RLC_DRIVE_DEFAULT } from '../helpers/interfaces';
+
 import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_DRIVE_FOLDER_URL_REGEX } from '../../../constants';
+import { DRIVE, RLC_DRIVE_DEFAULT } from '../helpers/interfaces';
 
 export const fileRLC: INodeProperties = {
 	displayName: 'File',
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..fe72effcb3 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
@@ -4,11 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
-import { googleApiRequest } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { googleApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Name',
@@ -159,7 +160,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/Google/Drive/v2/actions/drive/deleteDrive.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
index 1c63a0f1fe..309d997c4f 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/deleteDrive.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
index 1ccf2bd745..eedbdf5d74 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/get.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
index d2cd34e901..2d6c098f87 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/list.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Return All',
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
index d80be9968b..59ba5075a9 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/drive/update.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { sharedDriveRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
index e019c7c555..f181b47d81 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/copy.operation.ts
@@ -6,10 +6,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { setParentFolder } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
 import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
-import { setParentFolder } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
index d9c92a972a..e89233fcaf 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/createFromText.operation.ts
@@ -5,11 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
-import { googleApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { DRIVE } from '../../helpers/interfaces';
 import { setFileProperties, setParentFolder, setUpdateCommonParams } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { googleApiRequest } from '../../transport';
+import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
index af8f03839d..cd1aad328c 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/deleteFile.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { fileRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
index 55e1124c58..1f011e5c07 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/download.operation.ts
@@ -6,9 +6,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { fileRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
index d6770f596c..4c1ab04de9 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/move.operation.ts
@@ -5,11 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
-import { googleApiRequest } from '../../transport';
-import { setParentFolder } from '../../helpers/utils';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { setParentFolder } from '../../helpers/utils';
+import { googleApiRequest } from '../../transport';
+import { driveRLC, fileRLC, folderRLC } from '../common.descriptions';
+
 const properties: INodeProperties[] = [
 	{
 		...fileRLC,
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
index 93a5fe77d3..7fb017ec6c 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/share.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { fileRLC, permissionsOptions, shareOptions } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
index 27f19e8b61..933fa3b46f 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/update.operation.ts
@@ -6,6 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import {
 	getItemBinaryData,
 	prepareQueryString,
@@ -14,7 +16,6 @@ import {
 } from '../../helpers/utils';
 import { googleApiRequest } from '../../transport';
 import { fileRLC, updateCommonOptions } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
index da4ca39016..c548204772 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/file/upload.operation.ts
@@ -5,15 +5,17 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { googleApiRequest } from '../../transport';
-import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import {
 	getItemBinaryData,
 	setFileProperties,
 	setUpdateCommonParams,
 	setParentFolder,
+	processInChunks,
 } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { googleApiRequest } from '../../transport';
+import { driveRLC, folderRLC, updateCommonOptions } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
 	{
@@ -129,16 +131,17 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 
 		const uploadUrl = resumableUpload.headers.location;
 
-		let offset = 0;
-		for await (const chunk of fileContent) {
-			const nextOffset = offset + Number(chunk.length);
+		// 2MB chunks, needs to be a multiple of 256kB for Google Drive API
+		const chunkSizeBytes = 2048 * 1024;
+
+		await processInChunks(fileContent, chunkSizeBytes, async (chunk, offset) => {
 			try {
 				const response = await this.helpers.httpRequest({
 					method: 'PUT',
 					url: uploadUrl,
 					headers: {
 						'Content-Length': chunk.length,
-						'Content-Range': `bytes ${offset}-${nextOffset - 1}/${contentLength}`,
+						'Content-Range': `bytes ${offset}-${offset + chunk.byteLength - 1}/${contentLength}`,
 					},
 					body: chunk,
 				});
@@ -146,8 +149,7 @@ export async function execute(this: IExecuteFunctions, i: number): Promise<INode
 			} catch (error) {
 				if (error.response?.status !== 308) throw error;
 			}
-			offset = nextOffset;
-		}
+		});
 	}
 
 	const options = this.getNodeParameter('options', i, {});
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
index 8774216197..36dc97fbb8 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/fileFolder/search.operation.ts
@@ -5,12 +5,13 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { driveRLC, fileTypesOptions, folderRLC } from '../common.descriptions';
-import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
-import { prepareQueryString, updateDriveScopes } from '../../helpers/utils';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type { SearchFilter } from '../../helpers/interfaces';
 import { DRIVE, RLC_FOLDER_DEFAULT } from '../../helpers/interfaces';
-import { updateDisplayOptions } from '@utils/utilities';
+import { prepareQueryString, updateDriveScopes } from '../../helpers/utils';
+import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
+import { driveRLC, fileTypesOptions, folderRLC } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
index 9b5e845d92..bbe0c24f3d 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/create.operation.ts
@@ -5,11 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { googleApiRequest } from '../../transport';
-import { driveRLC, folderRLC } from '../common.descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { DRIVE } from '../../helpers/interfaces';
 import { setParentFolder } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { googleApiRequest } from '../../transport';
+import { driveRLC, folderRLC } from '../common.descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
index ed85388da6..f6ef7f51e4 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/deleteFolder.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { folderNoRootRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
index a3908b2c29..3b4abfacaf 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/folder/share.operation.ts
@@ -5,9 +5,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { googleApiRequest } from '../../transport';
 import { folderNoRootRLC, permissionsOptions, shareOptions } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts
index feffd170d9..917e51e119 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/actions/router.ts
@@ -1,12 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { GoogleDriveType } from './node.type';
-
 import * as drive from './drive/Drive.resource';
 import * as file from './file/File.resource';
 import * as fileFolder from './fileFolder/FileFolder.resource';
 import * as folder from './folder/Folder.resource';
+import type { GoogleDriveType } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
index 62f029931d..aebdf5ae42 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/helpers/utils.ts
@@ -1,6 +1,6 @@
-import type { Readable } from 'stream';
 import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import { RLC_DRIVE_DEFAULT, RLC_FOLDER_DEFAULT, UPLOAD_CHUNK_SIZE } from './interfaces';
 
@@ -131,3 +131,29 @@ export function setParentFolder(
 		return 'root';
 	}
 }
+
+export async function processInChunks(
+	stream: Readable,
+	chunkSize: number,
+	process: (chunk: Buffer, offset: number) => void | Promise<void>,
+) {
+	let buffer = Buffer.alloc(0);
+	let offset = 0;
+
+	for await (const chunk of stream) {
+		buffer = Buffer.concat([buffer, chunk]);
+
+		while (buffer.length >= chunkSize) {
+			const chunkToProcess = buffer.subarray(0, chunkSize);
+			await process(chunkToProcess, offset);
+
+			buffer = buffer.subarray(chunkSize);
+			offset += chunkSize;
+		}
+	}
+
+	// Process last chunk, could be smaller than chunkSize
+	if (buffer.length > 0) {
+		await process(buffer, offset);
+	}
+}
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts
index c31502cfcc..ec1fc6cf1d 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/methods/listSearch.ts
@@ -4,10 +4,11 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
-import { googleApiRequest } from '../transport';
+
 import type { SearchFilter } from '../helpers/interfaces';
 import { DRIVE, RLC_DRIVE_DEFAULT, RLC_FOLDER_DEFAULT } from '../helpers/interfaces';
 import { updateDriveScopes } from '../helpers/utils';
+import { googleApiRequest } from '../transport';
 
 interface FilesItem {
 	id: string;
diff --git a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
index 13d20a99ac..04c5b459e9 100644
--- a/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Drive/v2/transport/index.ts
@@ -8,6 +8,7 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index 5ac452f728..672b7d1ada 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export async function googleApiRequest(
@@ -49,7 +49,6 @@ export async function googleApiRequest(
 			(options.headers as IDataObject).Authorization = `Bearer ${access_token}`;
 		}
 
-		//@ts-ignore
 		return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
index fdb80509fb..d7a3a40d61 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
@@ -9,17 +9,15 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, jsonParse } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../../utils/utilities';
+import { collectionFields, collectionOperations } from './CollectionDescription';
+import { documentFields, documentOperations } from './DocumentDescription';
 import {
 	fullDocumentToJson,
 	googleApiRequest,
 	googleApiRequestAllItems,
 	jsonToDocument,
 } from './GenericFunctions';
-
-import { collectionFields, collectionOperations } from './CollectionDescription';
-
-import { documentFields, documentOperations } from './DocumentDescription';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 export class GoogleFirebaseCloudFirestore implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
index 455c65dae3..cb2593c83c 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
@@ -10,10 +10,8 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
-import { userFields, userOperations } from './UserDescription';
-
 import { groupFields, groupOperations } from './GroupDescripion';
+import { userFields, userOperations } from './UserDescription';
 
 export class GSuiteAdmin implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
index 7f30fe6812..1e3d85aae5 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
@@ -35,7 +35,6 @@ export async function googleApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'gSuiteAdminOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GenericFunctions.ts
index 2c4781e552..6bbb177a54 100644
--- a/packages/nodes-base/nodes/Google/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/GenericFunctions.ts
@@ -1,14 +1,15 @@
-import type {
-	IExecuteFunctions,
-	ILoadOptionsFunctions,
-	ICredentialTestFunctions,
-	IDataObject,
-	IPollFunctions,
-	IRequestOptions,
-} from 'n8n-workflow';
-
-import moment from 'moment-timezone';
 import * as jwt from 'jsonwebtoken';
+import { DateTime } from 'luxon';
+import moment from 'moment-timezone';
+import {
+	type IExecuteFunctions,
+	type ILoadOptionsFunctions,
+	type ICredentialTestFunctions,
+	type IDataObject,
+	type IPollFunctions,
+	type IRequestOptions,
+	NodeOperationError,
+} from 'n8n-workflow';
 
 import { formatPrivateKey } from '@utils/utilities';
 
@@ -110,3 +111,20 @@ export async function getGoogleAccessToken(
 
 	return await this.helpers.request(options);
 }
+
+export function validateAndSetDate(
+	filter: IDataObject,
+	key: string,
+	timezone: string,
+	context: IExecuteFunctions,
+) {
+	const date = DateTime.fromISO(filter[key] as string);
+	if (date.isValid) {
+		filter[key] = date.setZone(timezone).toISO();
+	} else {
+		throw new NodeOperationError(
+			context.getNode(),
+			`The value "${filter[key] as string}" is not a valid DateTime.`,
+		);
+	}
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index e856174b38..6993ab1930 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -1,5 +1,6 @@
+import isEmpty from 'lodash/isEmpty';
+import { DateTime } from 'luxon';
 import { simpleParser } from 'mailparser';
-
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -13,10 +14,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import MailComposer from 'nodemailer/lib/mail-composer';
 
-import { DateTime } from 'luxon';
-
-import isEmpty from 'lodash/isEmpty';
+import type { IEmail } from '../../../utils/sendAndWait/interfaces';
+import { escapeHtml } from '../../../utils/utilities';
+import { getGoogleAccessToken } from '../GenericFunctions';
 
 export interface IAttachments {
 	type: string;
@@ -24,11 +26,6 @@ export interface IAttachments {
 	content: string;
 }
 
-import MailComposer from 'nodemailer/lib/mail-composer';
-import { getGoogleAccessToken } from '../GenericFunctions';
-import { escapeHtml } from '../../../utils/utilities';
-import type { IEmail } from '../../../utils/sendAndWait/interfaces';
-
 export async function googleApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
index f55b13a166..878e9c0677 100644
--- a/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
+++ b/packages/nodes-base/nodes/Google/Gmail/Gmail.node.json
@@ -52,5 +52,5 @@
 			}
 		]
 	},
-	"alias": ["email"]
+	"alias": ["email", "human", "form", "wait"]
 }
diff --git a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
index c0bacf2085..b82a578b94 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
 import {
 	googleApiRequest,
 	googleApiRequestAllItems,
@@ -24,7 +24,7 @@ export class GmailTrigger implements INodeType {
 		name: 'gmailTrigger',
 		icon: 'file:gmail.svg',
 		group: ['trigger'],
-		version: [1, 1.1],
+		version: [1, 1.1, 1.2],
 		description:
 			'Fetches emails from Gmail and starts the workflow on specified polling intervals.',
 		subtitle: '={{"Gmail Trigger"}}',
@@ -106,6 +106,13 @@ export class GmailTrigger implements INodeType {
 						default: false,
 						description: 'Whether to include messages from SPAM and TRASH in the results',
 					},
+					{
+						displayName: 'Include Drafts',
+						name: 'includeDrafts',
+						type: 'boolean',
+						default: false,
+						description: 'Whether to include email drafts in the results',
+					},
 					{
 						displayName: 'Label Names or IDs',
 						name: 'labelIds',
@@ -284,6 +291,15 @@ export class GmailTrigger implements INodeType {
 				qs.format = 'raw';
 			}
 
+			let includeDrafts;
+			if (node.typeVersion > 1.1) {
+				includeDrafts = (qs.includeDrafts as boolean) ?? false;
+			} else {
+				includeDrafts = (qs.includeDrafts as boolean) ?? true;
+			}
+			delete qs.includeDrafts;
+			const withoutDrafts = [];
+
 			for (let i = 0; i < responseData.length; i++) {
 				responseData[i] = await googleApiRequest.call(
 					this,
@@ -292,8 +308,12 @@ export class GmailTrigger implements INodeType {
 					{},
 					qs,
 				);
-
-				if (!simple) {
+				if (!includeDrafts) {
+					if (responseData[i].labelIds.includes('DRAFT')) {
+						continue;
+					}
+				}
+				if (!simple && responseData?.length) {
 					const dataPropertyNameDownload =
 						(options.dataPropertyAttachmentsPrefixName as string) || 'attachment_';
 
@@ -303,9 +323,14 @@ export class GmailTrigger implements INodeType {
 						dataPropertyNameDownload,
 					);
 				}
+				withoutDrafts.push(responseData[i]);
 			}
 
-			if (simple) {
+			if (!includeDrafts) {
+				responseData = withoutDrafts;
+			}
+
+			if (simple && responseData?.length) {
 				responseData = this.helpers.returnJsonArray(
 					await simplifyOutput.call(this, responseData as IDataObject[]),
 				);
@@ -324,17 +349,14 @@ export class GmailTrigger implements INodeType {
 				},
 			);
 		}
-
 		if (!responseData?.length) {
 			nodeStaticData.lastTimeChecked = endDate;
 			return null;
 		}
 
 		const emailsWithInvalidDate = new Set<string>();
-
 		const getEmailDateAsSeconds = (email: IDataObject): number => {
 			let date;
-
 			if (email.internalDate) {
 				date = +(email.internalDate as string) / 1000;
 			} else if (email.date) {
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
index 4cd2ae0742..9ab54ece28 100644
--- a/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/test/GmailTrigger.test.ts
@@ -1,5 +1,5 @@
-import nock from 'nock';
 import * as mailparser from 'mailparser';
+import nock from 'nock';
 
 import { testPollingTriggerNode } from '@test/nodes/TriggerHelpers';
 
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts
new file mode 100644
index 0000000000..b14fe8132c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/GmailV2.node.test.ts
@@ -0,0 +1,396 @@
+/* eslint-disable n8n-nodes-base/node-param-display-name-miscased */
+import { mock, mockDeep } from 'jest-mock-extended';
+import { jsonParse, type ILoadOptionsFunctions, type INode } from 'n8n-workflow';
+import nock from 'nock';
+
+import { testWorkflows } from '@test/nodes/Helpers';
+
+import labels from './fixtures/labels.json';
+import messages from './fixtures/messages.json';
+import { getGmailAliases, getLabels, getThreadMessages } from '../../v2/loadOptions';
+
+describe('Test Gmail Node v2', () => {
+	beforeAll(() => {
+		jest
+			.useFakeTimers({ doNotFake: ['setImmediate', 'nextTick'] })
+			.setSystemTime(new Date('2024-12-16 12:34:56.789Z'));
+
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.resetAllMocks();
+	});
+
+	describe('Messages', () => {
+		const gmailNock = nock('https://www.googleapis.com/gmail');
+
+		beforeAll(() => {
+			gmailNock.get('/v1/users/me/messages').query({ maxResults: 2 }).reply(200, {
+				messages,
+			});
+			gmailNock
+				.get('/v1/users/me/messages')
+				.query({
+					includeSpamTrash: 'true',
+					labelIds: 'CHAT',
+					q: 'test from:Test Sender after:1734393600 before:1735171200',
+					readStatus: 'both',
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: 'true',
+					maxResults: '2',
+				})
+				.reply(200, { messages });
+			gmailNock
+				.get('/v1/users/me/messages/a1b2c3d4e5f6g7h8')
+				.query({
+					maxResults: '2',
+					format: 'metadata',
+					metadataHeaders: ['From', 'To', 'Cc', 'Bcc', 'Subject'],
+				})
+				.reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/messages/a1b2c3d4e5f6g7h8')
+				.query({
+					includeSpamTrash: 'true',
+					labelIds: 'CHAT',
+					q: 'test from:Test Sender after:1734393600 before:1735171200',
+					readStatus: 'both',
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: 'true',
+					maxResults: '2',
+					format: 'raw',
+				})
+				.reply(200, {
+					...messages[0],
+					raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+				});
+			gmailNock
+				.get('/v1/users/me/messages/z9y8x7w6v5u4t3s2')
+				.query({
+					includeSpamTrash: 'true',
+					labelIds: 'CHAT',
+					q: 'test from:Test Sender after:1734393600 before:1735171200',
+					readStatus: 'both',
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: 'true',
+					maxResults: '2',
+					format: 'raw',
+				})
+				.reply(200, {
+					...messages[1],
+					raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+				});
+			gmailNock
+				.get('/v1/users/me/messages/z9y8x7w6v5u4t3s2')
+				.query({
+					maxResults: '2',
+					format: 'metadata',
+					metadataHeaders: ['From', 'To', 'Cc', 'Bcc', 'Subject'],
+				})
+				.reply(200, messages[0]);
+			gmailNock.get('/v1/users/me/labels').reply(200, {
+				labels,
+			});
+			gmailNock.get('/v1/users/me/profile').times(2).reply(200, { emailAddress: 'test@n8n.io' });
+			gmailNock
+				.post('/v1/users/me/messages/send')
+				.query({ format: 'metadata' })
+				.reply(200, messages[0]);
+			gmailNock.post('/v1/users/me/messages/send').reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/messages/send')
+				.query({ userId: 'me', uploadType: 'media' })
+				.reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/messages/test/modify', (body) => 'addLabelIds' in body)
+				.reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/messages/test/modify', (body) => 'removeLabelIds' in body)
+				.reply(200, messages[0]);
+			gmailNock.delete('/v1/users/me/messages/test').reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/messages/test')
+				.query({
+					format: 'metadata',
+					metadataHeaders: ['From', 'To', 'Cc', 'Bcc', 'Subject'],
+				})
+				.reply(200, messages[0]);
+			gmailNock.get('/v1/users/me/labels').reply(200, { labels });
+			gmailNock
+				.get('/v1/users/me/messages/test')
+				.query({ format: 'raw' })
+				.reply(200, { raw: 'test email content' });
+			gmailNock
+				.post('/v1/users/me/messages/test/modify', { removeLabelIds: ['UNREAD'] })
+				.reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/messages/test/modify', { addLabelIds: ['UNREAD'] })
+				.reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/messages/test')
+				.query({
+					format: 'metadata',
+				})
+				.reply(200, messages[0]);
+		});
+
+		testWorkflows(['nodes/Google/Gmail/test/v2/messages.workflow.json']);
+
+		it('should make the correct network calls', () => {
+			gmailNock.done();
+		});
+	});
+
+	describe('Labels', () => {
+		const gmailNock = nock('https://www.googleapis.com/gmail');
+
+		beforeAll(() => {
+			gmailNock
+				.post('/v1/users/me/labels', {
+					labelListVisibility: 'labelShow',
+					messageListVisibility: 'show',
+					name: 'Test Label Name',
+				})
+				.reply(200, labels[0]);
+			gmailNock.delete('/v1/users/me/labels/test-label-id').reply(200, labels[0]);
+			gmailNock.get('/v1/users/me/labels/test-label-id').reply(200, labels[0]);
+			gmailNock.get('/v1/users/me/labels').reply(200, {
+				labels,
+			});
+		});
+
+		testWorkflows(['nodes/Google/Gmail/test/v2/labels.workflow.json']);
+
+		it('should make the correct network calls', () => {
+			gmailNock.done();
+		});
+	});
+
+	describe('Drafts', () => {
+		const gmailNock = nock('https://www.googleapis.com/gmail');
+
+		beforeAll(() => {
+			gmailNock
+				.filteringRequestBody((body) => {
+					try {
+						const parsedBody = jsonParse<{ message: { raw: string; threadId: string } }>(body);
+						const mail = Buffer.from(parsedBody.message.raw, 'base64').toString('utf-8');
+
+						// Remove dynamic fields from mail
+						parsedBody.message.raw = Buffer.from(
+							mail
+								.replace(/boundary=".*"/g, 'boundary="--test-boundary"')
+								.replace(/----.*/g, '----test-boundary')
+								.replace(/Message-ID:.*/g, 'Message-ID: test-message-id'),
+							'utf-8',
+						).toString('base64');
+
+						return JSON.stringify(parsedBody);
+					} catch (error) {
+						return body;
+					}
+				})
+				.post('/v1/users/me/drafts', {
+					message: {
+						raw: 'Q29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5PSItLXRlc3QtYm91bmRhcnkiDQpGcm9tOiB0ZXN0LWFsaWFzQG44bi5pbw0KVG86IHRlc3QtdG9AbjhuLmlvDQpDYzogdGVzdC1jY0BuOG4uaW8NCkJjYzogdGVzdC1iY2NAbjhuLmlvDQpSZXBseS1UbzogdGVzdC1yZXBseUBuOG4uaW8NClN1YmplY3Q6IFRlc3QgRHJhZnQgU3ViamVjdA0KTWVzc2FnZS1JRDogdGVzdC1tZXNzYWdlLWlkDQpEYXRlOiBNb24sIDE2IERlYyAyMDI0IDEyOjM0OjU2ICswMDAwDQpNSU1FLVZlcnNpb246IDEuMA0KDQotLS0tdGVzdC1ib3VuZGFyeQ0KQ29udGVudC1UeXBlOiB0ZXh0L3BsYWluOyBjaGFyc2V0PXV0Zi04DQpDb250ZW50LVRyYW5zZmVyLUVuY29kaW5nOiA3Yml0DQoNClRlc3QgRHJhZnQgTWVzc2FnZQ0KLS0tLXRlc3QtYm91bmRhcnkNCkNvbnRlbnQtVHlwZTogYXBwbGljYXRpb24vanNvbjsgbmFtZT1maWxlLmpzb24NCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IGJhc2U2NA0KQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudDsgZmlsZW5hbWU9ZmlsZS5qc29uDQoNClczc2lZbWx1WVhKNUlqcDBjblZsZlYwPQ0KLS0tLXRlc3QtYm91bmRhcnkNCg==',
+						threadId: 'test-thread-id',
+					},
+				})
+				.query({ userId: 'me', uploadType: 'media' })
+				.reply(200, messages[0]);
+			gmailNock.delete('/v1/users/me/drafts/test-draft-id').reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/drafts/test-draft-id')
+				.query({ format: 'raw' })
+				.reply(200, {
+					message: {
+						...messages[0],
+						raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+					},
+				});
+			gmailNock
+				.get('/v1/users/me/drafts')
+				.query({
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: true,
+					includeSpamTrash: true,
+					maxResults: 100,
+				})
+				.reply(200, { drafts: messages });
+			gmailNock
+				.get('/v1/users/me/drafts/a1b2c3d4e5f6g7h8')
+				.query({
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: true,
+					includeSpamTrash: true,
+					maxResults: 100,
+					format: 'raw',
+				})
+				.reply(200, {
+					message: {
+						...messages[0],
+						raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+					},
+				});
+			gmailNock
+				.get('/v1/users/me/drafts/z9y8x7w6v5u4t3s2')
+				.query({
+					dataPropertyAttachmentsPrefixName: 'attachment_',
+					downloadAttachments: true,
+					includeSpamTrash: true,
+					maxResults: 100,
+					format: 'raw',
+				})
+				.reply(200, {
+					message: {
+						...messages[1],
+						raw: 'TUlNRS1WZXJzaW9uOiAxLjANCkRhdGU6IEZyaSwgMTMgRGVjIDIwMjQgMTE6MTU6MDEgKzAxMDANCk1lc3NhZ2UtSUQ6IDxDQUVHQVByb3d1ZEduS1h4cXJoTWpPdXhhbVRoN3lBcmp3UDdPRDlVQnEtSnBrYjBYOXdAbWFpbC5nbWFpbC5jb20-DQpTdWJqZWN0OiBUZXN0IGRyYWZ0DQpGcm9tOiBub2RlIHFhIDxub2RlOHFhQGdtYWlsLmNvbT4NClRvOiB0ZXN0QGdtYWlsLmNvbQ0KQ29udGVudC1UeXBlOiBtdWx0aXBhcnQvYWx0ZXJuYXRpdmU7IGJvdW5kYXJ5PSIwMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyIg0KDQotLTAwMDAwMDAwMDAwMDlkNThiNjA2MjkyNDFhMjINCkNvbnRlbnQtVHlwZTogdGV4dC9wbGFpbjsgY2hhcnNldD0iVVRGLTgiDQoNCmRyYWZ0IGJvZHkNCg0KLS0wMDAwMDAwMDAwMDA5ZDU4YjYwNjI5MjQxYTIyDQpDb250ZW50LVR5cGU6IHRleHQvaHRtbDsgY2hhcnNldD0iVVRGLTgiDQoNCjxkaXYgZGlyPSJsdHIiPmRyYWZ0IGJvZHk8YnI-PC9kaXY-DQoNCi0tMDAwMDAwMDAwMDAwOWQ1OGI2MDYyOTI0MWEyMi0t',
+					},
+				});
+		});
+
+		testWorkflows(['nodes/Google/Gmail/test/v2/drafts.workflow.json']);
+
+		it('should make the correct network calls', () => {
+			gmailNock.done();
+		});
+	});
+
+	describe('Threads', () => {
+		const gmailNock = nock('https://www.googleapis.com/gmail');
+
+		beforeAll(() => {
+			gmailNock.get('/v1/users/me/threads').query({ maxResults: 2 }).reply(200, {
+				threads: messages,
+			});
+			gmailNock
+				.get('/v1/users/me/threads')
+				.query((query) => {
+					return (
+						query.includeSpamTrash === 'true' &&
+						query.labelIds === 'CHAT' &&
+						!!query.q &&
+						query.q.includes('has:attachment') &&
+						query.q.includes('before:') &&
+						query.q.includes('after:')
+					);
+				})
+				.reply(200, { threads: messages });
+			gmailNock
+				.post('/v1/users/me/threads/test-thread-id/modify', { addLabelIds: ['CHAT'] })
+				.reply(200, messages[0]);
+			gmailNock
+				.post('/v1/users/me/threads/test-thread-id/modify', { removeLabelIds: ['CHAT'] })
+				.reply(200, messages[0]);
+			gmailNock.delete('/v1/users/me/threads/test-thread-id').reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/threads/test-thread-id')
+				.query({
+					format: 'metadata',
+					metadataHeaders: ['From', 'To', 'Cc', 'Bcc', 'Subject'],
+				})
+				.reply(200, messages[0]);
+			gmailNock.get('/v1/users/me/labels').times(2).reply(200, { labels });
+			gmailNock
+				.get('/v1/users/me/threads/test-thread-id')
+				.query({ format: 'full' })
+				.reply(200, messages[0]);
+			gmailNock.post('/v1/users/me/threads/test-thread-id/trash').reply(200, messages[0]);
+			gmailNock.post('/v1/users/me/threads/test-thread-id/untrash').reply(200, messages[0]);
+			gmailNock
+				.get('/v1/users/me/messages/test%20snippet')
+				.query({
+					userId: 'me',
+					uploadType: 'media',
+					format: 'metadata',
+				})
+				.reply(200, messages[0]);
+			gmailNock.get('/v1/users/me/profile').reply(200, { emailAddress: 'test@n8n.io' });
+			gmailNock
+				.post('/v1/users/me/messages/send')
+				.query({ userId: 'me', uploadType: 'media', format: 'metadata' })
+				.reply(200, messages[0]);
+		});
+
+		testWorkflows(['nodes/Google/Gmail/test/v2/threads.workflow.json']);
+
+		it('should make the correct network calls', () => {
+			gmailNock.done();
+		});
+	});
+
+	describe('loadOptions', () => {
+		describe('getLabels', () => {
+			it('should return a list of Gmail labels', async () => {
+				const loadOptionsFunctions = mockDeep<ILoadOptionsFunctions>({
+					getNode: jest.fn(() => mock<INode>()),
+					helpers: mock<ILoadOptionsFunctions['helpers']>({
+						requestWithAuthentication: jest
+							.fn()
+							// 2 pages of labels
+							.mockImplementationOnce(async () => ({ labels, nextPageToken: 'nextPageToken' }))
+							.mockImplementationOnce(async () => ({ labels })),
+					}),
+				});
+
+				expect(await getLabels.call(loadOptionsFunctions)).toEqual([
+					{ name: 'CHAT', value: 'CHAT' },
+					{ name: 'CHAT', value: 'CHAT' },
+					{ name: 'SENT', value: 'SENT' },
+					{ name: 'SENT', value: 'SENT' },
+				]);
+			});
+		});
+
+		describe('getThreadMessages', () => {
+			it('should return a list of Gmail thread messages', async () => {
+				const loadOptionsFunctions = mockDeep<ILoadOptionsFunctions>({
+					getNode: jest.fn(() => mock<INode>()),
+					helpers: mock<ILoadOptionsFunctions['helpers']>({
+						requestWithAuthentication: jest.fn(async () => ({ messages })),
+					}),
+				});
+
+				expect(await getThreadMessages.call(loadOptionsFunctions)).toEqual([
+					{
+						name: "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+						value: 'a1b2c3d4e5f6g7h8',
+					},
+					{
+						name: 'Your friend John just shared a new photo with you! Check it out now.',
+						value: 'z9y8x7w6v5u4t3s2',
+					},
+				]);
+			});
+		});
+
+		describe('getGmailAliases', () => {
+			it('should return a list of Gmail aliases', async () => {
+				const loadOptionsFunctions = mockDeep<ILoadOptionsFunctions>({
+					getNode: jest.fn(() => mock<INode>()),
+					helpers: mock<ILoadOptionsFunctions['helpers']>({
+						requestWithAuthentication: jest.fn(async () => ({
+							sendAs: [
+								{ isDefault: false, sendAsEmail: 'alias1@n8n.io' },
+								{ isDefault: true, sendAsEmail: 'alias2@n8n.io' },
+							],
+						})),
+					}),
+				});
+
+				expect(await getGmailAliases.call(loadOptionsFunctions)).toEqual([
+					{
+						name: 'alias1@n8n.io',
+						value: 'alias1@n8n.io',
+					},
+					{
+						name: 'alias2@n8n.io (Default)',
+						value: 'alias2@n8n.io',
+					},
+				]);
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/drafts.workflow.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/drafts.workflow.json
new file mode 100644
index 0000000000..8000286e88
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/drafts.workflow.json
@@ -0,0 +1,386 @@
+{
+	"name": "My workflow 130",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-60, 100],
+			"id": "636b40bc-2c98-4b9a-8ce2-9d1322294518",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "draft",
+				"operation": "get",
+				"messageId": "test-draft-id",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [440, 200],
+			"id": "8802fdb5-2741-407b-82a4-ccedc4055076",
+			"name": "Gmail - Drafts - Get",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "draft",
+				"operation": "delete",
+				"messageId": "test-draft-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [440, 20],
+			"id": "ed979c3a-b2ea-413e-be63-0392cc1714a5",
+			"name": "Gmail - Drafts - Delete",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "draft",
+				"subject": "Test Draft Subject",
+				"message": "Test Draft Message",
+				"options": {
+					"attachmentsUi": {
+						"attachmentsBinary": [
+							{
+								"property": "data"
+							}
+						]
+					},
+					"bccList": "test-bcc@n8n.io",
+					"ccList": "test-cc@n8n.io",
+					"fromAlias": "=test-alias@n8n.io",
+					"replyTo": "test-reply@n8n.io",
+					"threadId": "test-thread-id",
+					"sendTo": "test-to@n8n.io"
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [840, -180],
+			"id": "45758452-3b5b-478d-aece-001e117ce69d",
+			"name": "Gmail - Drafts - Create",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "draft",
+				"operation": "getAll",
+				"returnAll": true,
+				"options": {
+					"dataPropertyAttachmentsPrefixName": "attachment_",
+					"downloadAttachments": true,
+					"includeSpamTrash": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [440, 400],
+			"id": "bae81586-7641-4fdc-81a4-0006b289bf9d",
+			"name": "Gmail - Drafts - Get Many",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "491590a8-27a6-4d14-b342-493947775d16",
+							"name": "binary",
+							"value": true,
+							"type": "boolean"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [420, -180],
+			"id": "d630c018-1d7b-4779-a280-9f4a21c6a764",
+			"name": "Edit Fields"
+		},
+		{
+			"parameters": {
+				"operation": "toJson",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [640, -180],
+			"id": "fc3bdb76-c278-44f6-9aac-153b79c8177b",
+			"name": "Convert to File"
+		}
+	],
+	"pinData": {
+		"Gmail - Drafts - Create": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Drafts - Delete": [{ "json": { "success": true } }],
+		"Gmail - Drafts - Get": [
+			{
+				"json": {
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"sizeEstimate": 67890,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "a1b2c3d4e5f6g7h8"
+				}
+			}
+		],
+		"Gmail - Drafts - Get Many": [
+			{
+				"json": {
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"sizeEstimate": 67890,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "a1b2c3d4e5f6g7h8"
+				}
+			},
+			{
+				"json": {
+					"threadId": "z9y8x7w6v5u4t3s2",
+					"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+					"sizeEstimate": 54321,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "z9y8x7w6v5u4t3s2"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Drafts - Get Many",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Drafts - Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Drafts - Delete",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Convert to File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Convert to File": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Drafts - Create",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "84fb11a4-4166-45bd-bd9f-60fa378d9e68",
+	"meta": {
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"id": "09KDcfGmfDrLInDE",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/labels.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/labels.json
new file mode 100644
index 0000000000..7d211dc09c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/labels.json
@@ -0,0 +1,14 @@
+[
+	{
+		"id": "CHAT",
+		"name": "CHAT",
+		"messageListVisibility": "hide",
+		"labelListVisibility": "labelHide",
+		"type": "system"
+	},
+	{
+		"id": "SENT",
+		"name": "SENT",
+		"type": "system"
+	}
+]
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/messages.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/messages.json
new file mode 100644
index 0000000000..cb669eb88d
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/fixtures/messages.json
@@ -0,0 +1,240 @@
+[
+	{
+		"id": "a1b2c3d4e5f6g7h8",
+		"threadId": "a1b2c3d4e5f6g7h8",
+		"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+		"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+		"payload": {
+			"partId": "",
+			"mimeType": "multipart/alternative",
+			"filename": "",
+			"headers": [
+				{
+					"name": "Delivered-To",
+					"value": "exampleuser@gmail.com"
+				},
+				{
+					"name": "Received",
+					"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+				},
+				{
+					"name": "X-Google-Smtp-Source",
+					"value": "ABC12345+EXAMPLE123456789"
+				},
+				{
+					"name": "X-Received",
+					"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+				},
+				{
+					"name": "ARC-Seal",
+					"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+				},
+				{
+					"name": "ARC-Message-Signature",
+					"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+				},
+				{
+					"name": "ARC-Authentication-Results",
+					"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+				},
+				{
+					"name": "Return-Path",
+					"value": "<promo@promotion.example.com>"
+				},
+				{
+					"name": "Date",
+					"value": "Thu, 5 Dec 2024 08:30:00 -0800"
+				},
+				{
+					"name": "From",
+					"value": "Holiday Deals <promo@promotion.example.com>"
+				},
+				{
+					"name": "To",
+					"value": "exampleuser@gmail.com"
+				},
+				{
+					"name": "Message-ID",
+					"value": "<12345abc67890@promotion.example.com>"
+				},
+				{
+					"name": "Subject",
+					"value": "Exclusive Holiday Discounts!"
+				},
+				{
+					"name": "MIME-Version",
+					"value": "1.0"
+				},
+				{
+					"name": "Content-Type",
+					"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+				}
+			],
+			"body": {
+				"size": 0
+			},
+			"parts": [
+				{
+					"partId": "0",
+					"mimeType": "text/plain",
+					"filename": "",
+					"headers": [
+						{
+							"name": "Content-Type",
+							"value": "text/plain; charset=utf-8"
+						},
+						{
+							"name": "Content-Transfer-Encoding",
+							"value": "quoted-printable"
+						}
+					],
+					"body": {
+						"size": 1234,
+						"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+					}
+				},
+				{
+					"partId": "1",
+					"mimeType": "text/html",
+					"filename": "",
+					"headers": [
+						{
+							"name": "Content-Type",
+							"value": "text/html; charset=\"utf-8\""
+						},
+						{
+							"name": "Content-Transfer-Encoding",
+							"value": "quoted-printable"
+						}
+					],
+					"body": {
+						"size": 5678,
+						"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+					}
+				}
+			]
+		},
+		"sizeEstimate": 67890,
+		"historyId": "54321",
+		"internalDate": "1733405400000"
+	},
+	{
+		"id": "z9y8x7w6v5u4t3s2",
+		"threadId": "z9y8x7w6v5u4t3s2",
+		"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+		"snippet": "Your friend John just shared a new photo with you! Check it out now.",
+		"payload": {
+			"partId": "",
+			"mimeType": "multipart/alternative",
+			"filename": "",
+			"headers": [
+				{
+					"name": "Delivered-To",
+					"value": "exampleuser2@gmail.com"
+				},
+				{
+					"name": "Received",
+					"value": "by 2001:db8::abcd with SMTP id def456ghi789; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+				},
+				{
+					"name": "X-Google-Smtp-Source",
+					"value": "XYZ67890+EXAMPLE0987654321"
+				},
+				{
+					"name": "X-Received",
+					"value": "by 198.51.100.2 with SMTP id 67890def12345; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+				},
+				{
+					"name": "ARC-Seal",
+					"value": "i=1; a=rsa-sha256; t=1733490900; cv=none; d=example2.com; s=arc-20241206; b=HIJKLMN987654="
+				},
+				{
+					"name": "ARC-Message-Signature",
+					"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example2.com; s=arc-20241206; bh=EXAMPLEHASH67890="
+				},
+				{
+					"name": "ARC-Authentication-Results",
+					"value": "i=1; mx.example2.com; dkim=pass header.i=@social.example2.com; spf=pass smtp.mailfrom=notifications@social.example2.com; dmarc=pass header.from=example2.com"
+				},
+				{
+					"name": "Return-Path",
+					"value": "<notifications@social.example2.com>"
+				},
+				{
+					"name": "Date",
+					"value": "Fri, 6 Dec 2024 09:45:00 -0800"
+				},
+				{
+					"name": "From",
+					"value": "John's Photos <notifications@social.example2.com>"
+				},
+				{
+					"name": "To",
+					"value": "exampleuser2@gmail.com"
+				},
+				{
+					"name": "Message-ID",
+					"value": "<67890def12345@social.example2.com>"
+				},
+				{
+					"name": "Subject",
+					"value": "John shared a new photo with you!"
+				},
+				{
+					"name": "MIME-Version",
+					"value": "1.0"
+				},
+				{
+					"name": "Content-Type",
+					"value": "multipart/alternative; boundary=\"----=_Part_67890_12345.1733490900000\""
+				}
+			],
+			"body": {
+				"size": 0
+			},
+			"parts": [
+				{
+					"partId": "0",
+					"mimeType": "text/plain",
+					"filename": "",
+					"headers": [
+						{
+							"name": "Content-Type",
+							"value": "text/plain; charset=utf-8"
+						},
+						{
+							"name": "Content-Transfer-Encoding",
+							"value": "quoted-printable"
+						}
+					],
+					"body": {
+						"size": 4321,
+						"data": "U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gSm9obi4gV2UgaG9wZSB5b3UgbGlrZSBpdCE="
+					}
+				},
+				{
+					"partId": "1",
+					"mimeType": "text/html",
+					"filename": "",
+					"headers": [
+						{
+							"name": "Content-Type",
+							"value": "text/html; charset=\"utf-8\""
+						},
+						{
+							"name": "Content-Transfer-Encoding",
+							"value": "quoted-printable"
+						}
+					],
+					"body": {
+						"size": 8765,
+						"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gPGI+Sm9obi48L2I+IFdlIGhvcGUgeW91IGxpa2UgaXQhPC9kaXY+"
+					}
+				}
+			]
+		},
+		"sizeEstimate": 54321,
+		"historyId": "98765",
+		"internalDate": "1733490900000"
+	}
+]
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/labels.workflow.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/labels.workflow.json
new file mode 100644
index 0000000000..fecfce191c
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/labels.workflow.json
@@ -0,0 +1,163 @@
+{
+	"name": "My workflow 130",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-60, 100],
+			"id": "636b40bc-2c98-4b9a-8ce2-9d1322294518",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "label",
+				"operation": "create",
+				"name": "Test Label Name",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [220, -180],
+			"id": "45758452-3b5b-478d-aece-001e117ce69d",
+			"name": "Gmail - Labels - Create",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "label",
+				"operation": "delete",
+				"labelId": "test-label-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [220, 20],
+			"id": "ed979c3a-b2ea-413e-be63-0392cc1714a5",
+			"name": "Gmail - Labels - Delete",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "label",
+				"operation": "get",
+				"labelId": "test-label-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [220, 200],
+			"id": "8802fdb5-2741-407b-82a4-ccedc4055076",
+			"name": "Gmail - Labels - Get",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "label",
+				"limit": 2
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [220, 400],
+			"id": "bae81586-7641-4fdc-81a4-0006b289bf9d",
+			"name": "Gmail - Labels - Get Many",
+			"webhookId": "3b8b38e0-2f4b-40bc-8b67-37e7ea95cb60",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		}
+	],
+	"pinData": {
+		"Gmail - Labels - Create": [
+			{
+				"json": {
+					"id": "CHAT",
+					"name": "CHAT",
+					"messageListVisibility": "hide",
+					"labelListVisibility": "labelHide",
+					"type": "system"
+				}
+			}
+		],
+		"Gmail - Labels - Delete": [{ "json": { "success": true } }],
+		"Gmail - Labels - Get": [
+			{
+				"json": {
+					"id": "CHAT",
+					"name": "CHAT",
+					"messageListVisibility": "hide",
+					"labelListVisibility": "labelHide",
+					"type": "system"
+				}
+			}
+		],
+		"Gmail - Labels - Get Many": [
+			{
+				"json": {
+					"id": "CHAT",
+					"name": "CHAT",
+					"messageListVisibility": "hide",
+					"labelListVisibility": "labelHide",
+					"type": "system"
+				}
+			},
+			{ "json": { "id": "SENT", "name": "SENT", "type": "system" } }
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Labels - Create",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Labels - Delete",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Labels - Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Labels - Get Many",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "",
+	"meta": {
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/messages.workflow.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/messages.workflow.json
new file mode 100644
index 0000000000..ba64983183
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/messages.workflow.json
@@ -0,0 +1,1151 @@
+{
+	"name": "Gmail test - messages",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "765640dd-529f-4319-a435-a1b5411cf761",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 2,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, -600],
+			"id": "51f7694c-0d4c-4f84-9e4f-8a8fe8db18c9",
+			"name": "Gmail - Messages - All (simplified)",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 2,
+				"simple": false,
+				"filters": {
+					"includeSpamTrash": true,
+					"labelIds": ["CHAT"],
+					"q": "test",
+					"readStatus": "both",
+					"receivedAfter": "2024-12-17T00:00:00",
+					"receivedBefore": "2024-12-26T00:00:00",
+					"sender": "Test Sender"
+				},
+				"options": {
+					"dataPropertyAttachmentsPrefixName": "attachment_",
+					"downloadAttachments": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, -400],
+			"id": "2ea8db65-5e60-47dc-bdca-1981bee1b63e",
+			"name": "Gmail - Messages - All",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"sendTo": "test@n8n.io",
+				"subject": "Test Subject",
+				"message": "Test Message",
+				"options": {
+					"appendAttribution": true,
+					"attachmentsUi": {
+						"attachmentsBinary": [{}, {}]
+					},
+					"bccList": "test-bcc@n8n.io",
+					"ccList": "test-cc@n8n.io",
+					"senderName": "Test Sender",
+					"replyTo": "test-reply-to@n8n.io",
+					"replyToSenderOnly": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [1060, 1380],
+			"id": "da96a339-2df5-465f-a253-5302160ef921",
+			"name": "Gmail - Messages - Send",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "sendAndWait",
+				"sendTo": "test@n8n.io",
+				"subject": "Test Subject",
+				"message": "Test Message"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 1580],
+			"id": "b12181b3-a98d-44ba-bb71-a22ce4e4c663",
+			"name": "Gmail - Messages - Send and Wait for Approval",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "addLabels",
+				"messageId": "test",
+				"labelIds": ["CHAT"]
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, -220],
+			"id": "2f83b7ac-3e7a-466d-b269-88928da60d3a",
+			"name": "Gmail - Messages - Add Label",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "delete",
+				"messageId": "test"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 180],
+			"id": "aba867fa-bf92-4ba9-b96f-c0f74d37c144",
+			"name": "Gmail - Messages - Delete",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"messageId": "test"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 380],
+			"id": "029494b2-caf2-4a1e-b496-1ab3ac96987a",
+			"name": "Gmail - Messages - Get (simplified)",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"messageId": "test",
+				"simple": false,
+				"options": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 580],
+			"id": "86a77799-6d7b-4dd6-9afa-be3cd64e82df",
+			"name": "Gmail - Messages - Get",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "markAsRead",
+				"messageId": "test"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 760],
+			"id": "aedc33d9-cc57-4bc1-8811-8aa5fe02a363",
+			"name": "Gmail - Messages - Mark as Read",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "markAsUnread",
+				"messageId": "test"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 980],
+			"id": "a463ad5e-3fac-40c9-b9bf-0705d28aa68d",
+			"name": "Gmail - Messages - Mark as Unread",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "removeLabels",
+				"messageId": "test",
+				"labelIds": ["CHAT"]
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, -20],
+			"id": "97996089-0116-4c86-b24c-5848661efc9c",
+			"name": "Gmail - Messages - Remove Label",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "reply",
+				"messageId": "test",
+				"message": "Test reply",
+				"options": {
+					"appendAttribution": false,
+					"bccList": "test-bcc@n8n.io",
+					"senderName": "Test Sender Name",
+					"replyToSenderOnly": false
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [780, 1200],
+			"id": "aa43df3d-5de3-4663-9211-401e3040a4de",
+			"name": "Gmail - Messages - Reply",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "toJson",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [920, 1380],
+			"id": "6820a547-12dc-4146-8483-a43adf695b40",
+			"name": "Attachment"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "0a4e38fe-ed38-400e-afb1-9d430f167d54",
+							"name": "attachment",
+							"value": true,
+							"type": "boolean"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [780, 1380],
+			"id": "72bd5e27-dd43-48ad-be97-634caf883dd5",
+			"name": "Edit Fields"
+		}
+	],
+	"pinData": {
+		"Gmail - Messages - All (simplified)": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000",
+					"labels": [],
+					"Delivered-To": "exampleuser@gmail.com",
+					"Received": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"X-Google-Smtp-Source": "ABC12345+EXAMPLE123456789",
+					"X-Received": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"ARC-Seal": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456=",
+					"ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345=",
+					"ARC-Authentication-Results": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com",
+					"Return-Path": "<promo@promotion.example.com>",
+					"Date": "Thu, 5 Dec 2024 08:30:00 -0800",
+					"From": "Holiday Deals <promo@promotion.example.com>",
+					"To": "exampleuser@gmail.com",
+					"Message-ID": "<12345abc67890@promotion.example.com>",
+					"Subject": "Exclusive Holiday Discounts!",
+					"MIME-Version": "1.0",
+					"Content-Type": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+				}
+			},
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000",
+					"labels": [],
+					"Delivered-To": "exampleuser@gmail.com",
+					"Received": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"X-Google-Smtp-Source": "ABC12345+EXAMPLE123456789",
+					"X-Received": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"ARC-Seal": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456=",
+					"ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345=",
+					"ARC-Authentication-Results": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com",
+					"Return-Path": "<promo@promotion.example.com>",
+					"Date": "Thu, 5 Dec 2024 08:30:00 -0800",
+					"From": "Holiday Deals <promo@promotion.example.com>",
+					"To": "exampleuser@gmail.com",
+					"Message-ID": "<12345abc67890@promotion.example.com>",
+					"Subject": "Exclusive Holiday Discounts!",
+					"MIME-Version": "1.0",
+					"Content-Type": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+				}
+			}
+		],
+		"Gmail - Messages - All": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"sizeEstimate": 67890,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "<CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>"
+				}
+			},
+			{
+				"json": {
+					"id": "z9y8x7w6v5u4t3s2",
+					"threadId": "z9y8x7w6v5u4t3s2",
+					"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+					"sizeEstimate": 54321,
+					"headers": {
+						"mime-version": "MIME-Version: 1.0",
+						"date": "Date: Fri, 13 Dec 2024 11:15:01 +0100",
+						"message-id": "Message-ID: <CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>",
+						"subject": "Subject: Test draft",
+						"from": "From: node qa <node8qa@gmail.com>",
+						"to": "To: test@gmail.com",
+						"content-type": "Content-Type: multipart/alternative; boundary=\"0000000000009d58b60629241a22\""
+					},
+					"html": "<div dir=\"ltr\">draft body<br></div>\n",
+					"text": "draft body\n",
+					"textAsHtml": "<p>draft body</p>",
+					"subject": "Test draft",
+					"date": "2024-12-13T10:15:01.000Z",
+					"to": {
+						"value": [{ "address": "test@gmail.com", "name": "" }],
+						"html": "<span class=\"mp_address_group\"><a href=\"mailto:test@gmail.com\" class=\"mp_address_email\">test@gmail.com</a></span>",
+						"text": "test@gmail.com"
+					},
+					"from": {
+						"value": [{ "address": "node8qa@gmail.com", "name": "node qa" }],
+						"html": "<span class=\"mp_address_group\"><span class=\"mp_address_name\">node qa</span> &lt;<a href=\"mailto:node8qa@gmail.com\" class=\"mp_address_email\">node8qa@gmail.com</a>&gt;</span>",
+						"text": "\"node qa\" <node8qa@gmail.com>"
+					},
+					"messageId": "<CAEGAProwudGnKXxqrhMjOuxamTh7yArjwP7OD9UBq-Jpkb0X9w@mail.gmail.com>"
+				}
+			}
+		],
+		"Gmail - Messages - Send": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Send and Wait for Approval": [{ "json": {} }],
+		"Gmail - Messages - Add Label": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Delete": [{ "json": { "success": true } }],
+		"Gmail - Messages - Get (simplified)": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000",
+					"labels": [],
+					"Delivered-To": "exampleuser@gmail.com",
+					"Received": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"X-Google-Smtp-Source": "ABC12345+EXAMPLE123456789",
+					"X-Received": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)",
+					"ARC-Seal": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456=",
+					"ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345=",
+					"ARC-Authentication-Results": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com",
+					"Return-Path": "<promo@promotion.example.com>",
+					"Date": "Thu, 5 Dec 2024 08:30:00 -0800",
+					"From": "Holiday Deals <promo@promotion.example.com>",
+					"To": "exampleuser@gmail.com",
+					"Message-ID": "<12345abc67890@promotion.example.com>",
+					"Subject": "Exclusive Holiday Discounts!",
+					"MIME-Version": "1.0",
+					"Content-Type": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+				}
+			}
+		],
+		"Gmail - Messages - Get": [
+			{ "json": { "headers": { "": "��-zf���'���" }, "html": false } }
+		],
+		"Gmail - Messages - Mark as Read": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Mark as Unread": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Remove Label": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Messages - Reply": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Messages - All (simplified)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - All",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Send and Wait for Approval",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Add Label",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Delete",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Get (simplified)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Mark as Read",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Mark as Unread",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Remove Label",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Messages - Reply",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Attachment": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Messages - Send",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Attachment",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "f497669f-aced-4f80-8e59-381d1c9422c7",
+	"meta": {
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"id": "jOoDfyAYzh3NAli3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/threads.workflow.json b/packages/nodes-base/nodes/Google/Gmail/test/v2/threads.workflow.json
new file mode 100644
index 0000000000..e92d016877
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/threads.workflow.json
@@ -0,0 +1,1174 @@
+{
+	"name": "My workflow 130",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [20, 920],
+			"id": "cfa1d2b9-9706-48a2-9dd4-39e4c3c0ccb4",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"limit": 2,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 320],
+			"id": "7b925004-8583-4f43-b1f0-6a37331cabf4",
+			"name": "Gmail - Threads - All (simplified)",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"limit": 2,
+				"filters": {
+					"includeSpamTrash": true,
+					"labelIds": ["CHAT"],
+					"q": "has:attachment",
+					"readStatus": "unread",
+					"receivedAfter": "2024-12-05T00:00:00",
+					"receivedBefore": "2024-12-27T00:00:00"
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 520],
+			"id": "22fa66e3-ac89-4289-82c7-e3be3c271d04",
+			"name": "Gmail - Threads - All",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "addLabels",
+				"threadId": "test-thread-id",
+				"labelIds": ["CHAT"]
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 700],
+			"id": "b94b2e79-a47d-4e05-a74b-957a9efe46a5",
+			"name": "Gmail - Threads - Add Label",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "removeLabels",
+				"threadId": "test-thread-id",
+				"labelIds": ["CHAT"]
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 900],
+			"id": "5322c0f6-e040-4bb4-9014-041662e7a173",
+			"name": "Gmail - Threads - Remove Label",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "delete",
+				"threadId": "test-thread-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1100],
+			"id": "6f7139f1-9236-4d35-b7ba-48f3e00d11ec",
+			"name": "Gmail - Threads - Delete",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "get",
+				"threadId": "test-thread-id",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1300],
+			"id": "4e7bccd2-e663-4824-b870-bb5fe7ad6c57",
+			"name": "Gmail - Threads - Get (simplified)",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "get",
+				"threadId": "test-thread-id",
+				"simple": false,
+				"options": {
+					"returnOnlyMessages": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1500],
+			"id": "4084a6fd-6770-4aa2-ac4e-6108f9b159a2",
+			"name": "Gmail - Threads - Get",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "reply",
+				"threadId": "test-thread-id",
+				"messageId": "=test snippet",
+				"message": "Test reply",
+				"options": {
+					"attachmentsUi": {
+						"attachmentsBinary": [
+							{
+								"property": "data"
+							}
+						]
+					},
+					"bccList": "test-bcc@n8n.io",
+					"ccList": "test-cc@n8n.io",
+					"senderName": "Test Sender Name",
+					"replyToSenderOnly": true
+				}
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [1120, 2080],
+			"id": "d5b44033-655a-4e18-99c7-6ee19140967b",
+			"name": "Gmail - Threads - Reply",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "trash",
+				"threadId": "test-thread-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1680],
+			"id": "1503c357-043c-45f5-bbe8-1d7141a84546",
+			"name": "Gmail - Threads - Trash",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "thread",
+				"operation": "untrash",
+				"threadId": "test-thread-id"
+			},
+			"type": "n8n-nodes-base.gmail",
+			"typeVersion": 2.1,
+			"position": [800, 1880],
+			"id": "38c02fc0-2e8e-4a6b-a045-eb45f2811c0a",
+			"name": "Gmail - Threads - Untrash",
+			"webhookId": "f3cbddc1-3cfa-4217-aa73-f0e5a9309661",
+			"credentials": {
+				"gmailOAuth2": {
+					"id": "22",
+					"name": "Gmail 0auth"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "0a4e38fe-ed38-400e-afb1-9d430f167d54",
+							"name": "attachment",
+							"value": true,
+							"type": "boolean"
+						}
+					]
+				},
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [800, 2080],
+			"id": "d6a20bfa-4bee-4aef-b1b0-198ed73d1b3f",
+			"name": "Edit Fields1"
+		},
+		{
+			"parameters": {
+				"operation": "toJson",
+				"options": {}
+			},
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [960, 2080],
+			"id": "47d4a53b-6019-444b-9746-f957704cd4e0",
+			"name": "Attachment1"
+		}
+	],
+	"pinData": {
+		"Gmail - Threads - All (simplified)": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			},
+			{
+				"json": {
+					"id": "z9y8x7w6v5u4t3s2",
+					"threadId": "z9y8x7w6v5u4t3s2",
+					"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+					"snippet": "Your friend John just shared a new photo with you! Check it out now.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser2@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id def456ghi789; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "XYZ67890+EXAMPLE0987654321" },
+							{
+								"name": "X-Received",
+								"value": "by 198.51.100.2 with SMTP id 67890def12345; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733490900; cv=none; d=example2.com; s=arc-20241206; b=HIJKLMN987654="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example2.com; s=arc-20241206; bh=EXAMPLEHASH67890="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example2.com; dkim=pass header.i=@social.example2.com; spf=pass smtp.mailfrom=notifications@social.example2.com; dmarc=pass header.from=example2.com"
+							},
+							{ "name": "Return-Path", "value": "<notifications@social.example2.com>" },
+							{ "name": "Date", "value": "Fri, 6 Dec 2024 09:45:00 -0800" },
+							{ "name": "From", "value": "John's Photos <notifications@social.example2.com>" },
+							{ "name": "To", "value": "exampleuser2@gmail.com" },
+							{ "name": "Message-ID", "value": "<67890def12345@social.example2.com>" },
+							{ "name": "Subject", "value": "John shared a new photo with you!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_67890_12345.1733490900000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 4321,
+									"data": "U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gSm9obi4gV2UgaG9wZSB5b3UgbGlrZSBpdCE="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 8765,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gPGI+Sm9obi48L2I+IFdlIGhvcGUgeW91IGxpa2UgaXQhPC9kaXY+"
+								}
+							}
+						]
+					},
+					"sizeEstimate": 54321,
+					"historyId": "98765",
+					"internalDate": "1733490900000"
+				}
+			}
+		],
+		"Gmail - Threads - All": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			},
+			{
+				"json": {
+					"id": "z9y8x7w6v5u4t3s2",
+					"threadId": "z9y8x7w6v5u4t3s2",
+					"labelIds": ["UNREAD", "CATEGORY_SOCIAL", "INBOX"],
+					"snippet": "Your friend John just shared a new photo with you! Check it out now.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser2@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id def456ghi789; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "XYZ67890+EXAMPLE0987654321" },
+							{
+								"name": "X-Received",
+								"value": "by 198.51.100.2 with SMTP id 67890def12345; Fri, 6 Dec 2024 09:45:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733490900; cv=none; d=example2.com; s=arc-20241206; b=HIJKLMN987654="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example2.com; s=arc-20241206; bh=EXAMPLEHASH67890="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example2.com; dkim=pass header.i=@social.example2.com; spf=pass smtp.mailfrom=notifications@social.example2.com; dmarc=pass header.from=example2.com"
+							},
+							{ "name": "Return-Path", "value": "<notifications@social.example2.com>" },
+							{ "name": "Date", "value": "Fri, 6 Dec 2024 09:45:00 -0800" },
+							{ "name": "From", "value": "John's Photos <notifications@social.example2.com>" },
+							{ "name": "To", "value": "exampleuser2@gmail.com" },
+							{ "name": "Message-ID", "value": "<67890def12345@social.example2.com>" },
+							{ "name": "Subject", "value": "John shared a new photo with you!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_67890_12345.1733490900000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 4321,
+									"data": "U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gSm9obi4gV2UgaG9wZSB5b3UgbGlrZSBpdCE="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 8765,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+U2VlIHRoZSBhdHRhY2hlZCBwaG90byBhbmQgcmVwbHkgdG8gPGI+Sm9obi48L2I+IFdlIGhvcGUgeW91IGxpa2UgaXQhPC9kaXY+"
+								}
+							}
+						]
+					},
+					"sizeEstimate": 54321,
+					"historyId": "98765",
+					"internalDate": "1733490900000"
+				}
+			}
+		],
+		"Gmail - Threads - Add Label": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Threads - Remove Label": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Threads - Delete": [{ "json": { "success": true } }],
+		"Gmail - Threads - Get (simplified)": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000",
+					"messages": []
+				}
+			}
+		],
+		"Gmail - Threads - Get": [],
+		"Gmail - Threads - Reply": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Threads - Trash": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		],
+		"Gmail - Threads - Untrash": [
+			{
+				"json": {
+					"id": "a1b2c3d4e5f6g7h8",
+					"threadId": "a1b2c3d4e5f6g7h8",
+					"labelIds": ["UNREAD", "CATEGORY_PROMOTIONS", "INBOX"],
+					"snippet": "Don't miss our exclusive holiday discounts on all items! Act now before the sale ends.",
+					"payload": {
+						"partId": "",
+						"mimeType": "multipart/alternative",
+						"filename": "",
+						"headers": [
+							{ "name": "Delivered-To", "value": "exampleuser@gmail.com" },
+							{
+								"name": "Received",
+								"value": "by 2001:db8::abcd with SMTP id xyz123abc456; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{ "name": "X-Google-Smtp-Source", "value": "ABC12345+EXAMPLE123456789" },
+							{
+								"name": "X-Received",
+								"value": "by 192.0.2.1 with SMTP id 12345abc67890; Thu, 5 Dec 2024 08:30:00 -0800 (PST)"
+							},
+							{
+								"name": "ARC-Seal",
+								"value": "i=1; a=rsa-sha256; t=1733405400; cv=none; d=example.com; s=arc-20241205; b=ABCDEFG123456="
+							},
+							{
+								"name": "ARC-Message-Signature",
+								"value": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=example.com; s=arc-20241205; bh=EXAMPLEHASH12345="
+							},
+							{
+								"name": "ARC-Authentication-Results",
+								"value": "i=1; mx.example.com; dkim=pass header.i=@promotion.example.com; spf=pass smtp.mailfrom=promo@promotion.example.com; dmarc=pass header.from=example.com"
+							},
+							{ "name": "Return-Path", "value": "<promo@promotion.example.com>" },
+							{ "name": "Date", "value": "Thu, 5 Dec 2024 08:30:00 -0800" },
+							{ "name": "From", "value": "Holiday Deals <promo@promotion.example.com>" },
+							{ "name": "To", "value": "exampleuser@gmail.com" },
+							{ "name": "Message-ID", "value": "<12345abc67890@promotion.example.com>" },
+							{ "name": "Subject", "value": "Exclusive Holiday Discounts!" },
+							{ "name": "MIME-Version", "value": "1.0" },
+							{
+								"name": "Content-Type",
+								"value": "multipart/alternative; boundary=\"----=_Part_12345_67890.1733405400000\""
+							}
+						],
+						"body": { "size": 0 },
+						"parts": [
+							{
+								"partId": "0",
+								"mimeType": "text/plain",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/plain; charset=utf-8" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 1234,
+									"data": "VGhpcyBpcyBhbiBleGFtcGxlIG1lc3NhZ2UuIFRoYW5rIHlvdSBmb3Igc2hvcHBpbmcgd2l0aCB1cy4="
+								}
+							},
+							{
+								"partId": "1",
+								"mimeType": "text/html",
+								"filename": "",
+								"headers": [
+									{ "name": "Content-Type", "value": "text/html; charset=\"utf-8\"" },
+									{ "name": "Content-Transfer-Encoding", "value": "quoted-printable" }
+								],
+								"body": {
+									"size": 5678,
+									"data": "PGRpdiBzdHlsZT0nZm9udC1mYW1pbHk6IEFyaWFsLCBzYW5zLXNlcmlmOyc+VGhpcyBpcyBhbiBleGFtcGxlIGh0bWwgbWVzc2FnZS4gPGI+VGhhbmsgeW91IGZvciBzaG9wcGluZyB3aXRoIHVzLjwvYj48L2Rpdj4="
+								}
+							}
+						]
+					},
+					"sizeEstimate": 67890,
+					"historyId": "54321",
+					"internalDate": "1733405400000"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Threads - All (simplified)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - All",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Add Label",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Delete",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Get (simplified)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Trash",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Untrash",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Gmail - Threads - Remove Label",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Edit Fields1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields1": {
+			"main": [
+				[
+					{
+						"node": "Attachment1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Attachment1": {
+			"main": [
+				[
+					{
+						"node": "Gmail - Threads - Reply",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "84fb11a4-4166-45bd-bd9f-60fa378d9e68",
+	"meta": {
+		"instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+	},
+	"id": "09KDcfGmfDrLInDE",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Google/Gmail/test/v2/utils.test.ts b/packages/nodes-base/nodes/Google/Gmail/test/v2/utils.test.ts
index f0d0261502..3564092e85 100644
--- a/packages/nodes-base/nodes/Google/Gmail/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/test/v2/utils.test.ts
@@ -1,6 +1,7 @@
-import type { IExecuteFunctions, INode } from 'n8n-workflow';
-import { DateTime } from 'luxon';
 import { mock } from 'jest-mock-extended';
+import { DateTime } from 'luxon';
+import type { IExecuteFunctions, INode } from 'n8n-workflow';
+
 import { parseRawEmail, prepareTimestamp } from '../../GenericFunctions';
 
 const node: INode = {
diff --git a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
index c17c26eda9..402553adbe 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
@@ -1,3 +1,4 @@
+import isEmpty from 'lodash/isEmpty';
 import {
 	NodeConnectionType,
 	type IBinaryKeyData,
@@ -12,7 +13,12 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
+import { oldVersionNotice } from '@utils/descriptions';
+
+import { draftFields, draftOperations } from './DraftDescription';
+import { labelFields, labelOperations } from './LabelDescription';
+import { messageFields, messageOperations } from './MessageDescription';
+import { messageLabelFields, messageLabelOperations } from './MessageLabelDescription';
 import type { IEmail } from '../../../../utils/sendAndWait/interfaces';
 import {
 	encodeEmail,
@@ -22,16 +28,6 @@ import {
 	parseRawEmail,
 } from '../GenericFunctions';
 
-import { messageFields, messageOperations } from './MessageDescription';
-
-import { messageLabelFields, messageLabelOperations } from './MessageLabelDescription';
-
-import { labelFields, labelOperations } from './LabelDescription';
-
-import { draftFields, draftOperations } from './DraftDescription';
-
-import { oldVersionNotice } from '@utils/descriptions';
-
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Gmail',
 	name: 'gmail',
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
index c5e37263b1..ded6db9e08 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
@@ -1,9 +1,7 @@
 import type {
-	IExecuteFunctions,
 	IDataObject,
-	ILoadOptionsFunctions,
+	IExecuteFunctions,
 	INodeExecutionData,
-	INodePropertyOptions,
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
@@ -12,10 +10,20 @@ import {
 	NodeConnectionType,
 	NodeOperationError,
 	SEND_AND_WAIT_OPERATION,
-	WAIT_TIME_UNLIMITED,
+	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
 
+import { draftFields, draftOperations } from './DraftDescription';
+import { labelFields, labelOperations } from './LabelDescription';
+import { getGmailAliases, getLabels, getThreadMessages } from './loadOptions';
+import { messageFields, messageOperations } from './MessageDescription';
+import { threadFields, threadOperations } from './ThreadDescription';
 import type { IEmail } from '../../../../utils/sendAndWait/interfaces';
+import {
+	createEmail,
+	getSendAndWaitProperties,
+	sendAndWaitWebhook,
+} from '../../../../utils/sendAndWait/utils';
 import {
 	encodeEmail,
 	googleApiRequest,
@@ -30,20 +38,6 @@ import {
 	unescapeSnippets,
 } from '../GenericFunctions';
 
-import { messageFields, messageOperations } from './MessageDescription';
-
-import { labelFields, labelOperations } from './LabelDescription';
-
-import { draftFields, draftOperations } from './DraftDescription';
-
-import { threadFields, threadOperations } from './ThreadDescription';
-
-import {
-	getSendAndWaitProperties,
-	createEmail,
-	sendAndWaitWebhook,
-} from '../../../../utils/sendAndWait/utils';
-
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Gmail',
 	name: 'gmail',
@@ -88,6 +82,15 @@ const versionDescription: INodeTypeDescription = {
 			restartWebhook: true,
 			isFullPath: true,
 		},
+		{
+			name: 'default',
+			httpMethod: 'POST',
+			responseMode: 'onReceived',
+			responseData: '',
+			path: '={{ $nodeId }}',
+			restartWebhook: true,
+			isFullPath: true,
+		},
 	],
 	properties: [
 		{
@@ -178,78 +181,9 @@ export class GmailV2 implements INodeType {
 
 	methods = {
 		loadOptions: {
-			// Get all the labels to display them to user so that they can
-			// select them easily
-			async getLabels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-
-				const labels = await googleApiRequestAllItems.call(
-					this,
-					'labels',
-					'GET',
-					'/gmail/v1/users/me/labels',
-				);
-
-				for (const label of labels) {
-					returnData.push({
-						name: label.name,
-						value: label.id,
-					});
-				}
-
-				return returnData.sort((a, b) => {
-					if (a.name < b.name) {
-						return -1;
-					}
-					if (a.name > b.name) {
-						return 1;
-					}
-					return 0;
-				});
-			},
-
-			async getThreadMessages(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-
-				const id = this.getNodeParameter('threadId', 0) as string;
-				const { messages } = await googleApiRequest.call(
-					this,
-					'GET',
-					`/gmail/v1/users/me/threads/${id}`,
-					{},
-					{ format: 'minimal' },
-				);
-
-				for (const message of messages || []) {
-					returnData.push({
-						name: message.snippet,
-						value: message.id,
-					});
-				}
-
-				return returnData;
-			},
-
-			async getGmailAliases(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const { sendAs } = await googleApiRequest.call(
-					this,
-					'GET',
-					'/gmail/v1/users/me/settings/sendAs',
-				);
-
-				for (const alias of sendAs || []) {
-					const displayName = alias.isDefault
-						? `${alias.sendAsEmail} (Default)`
-						: alias.sendAsEmail;
-					returnData.push({
-						name: displayName,
-						value: alias.sendAsEmail,
-					});
-				}
-
-				return returnData;
-			},
+			getLabels,
+			getThreadMessages,
+			getGmailAliases,
 		},
 	};
 
@@ -270,7 +204,7 @@ export class GmailV2 implements INodeType {
 				raw: await encodeEmail(email),
 			});
 
-			await this.putExecutionToWait(new Date(WAIT_TIME_UNLIMITED));
+			await this.putExecutionToWait(WAIT_INDEFINITELY);
 			return [this.getInputData()];
 		}
 
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
index 83b1e6fcb0..4273561c9a 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/MessageDescription.ts
@@ -1,4 +1,5 @@
 import { SEND_AND_WAIT_OPERATION, type INodeProperties } from 'n8n-workflow';
+
 import { appendAttributionOption } from '../../../../utils/descriptions';
 
 export const messageOperations: INodeProperties[] = [
@@ -59,9 +60,9 @@ export const messageOperations: INodeProperties[] = [
 				action: 'Send a message',
 			},
 			{
-				name: 'Send and Wait for Approval',
+				name: 'Send and Wait for Response',
 				value: SEND_AND_WAIT_OPERATION,
-				action: 'Send a message and wait for approval',
+				action: 'Send message and wait for response',
 			},
 		],
 		default: 'send',
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/loadOptions.ts b/packages/nodes-base/nodes/Google/Gmail/v2/loadOptions.ts
new file mode 100644
index 0000000000..6c5a7df9aa
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/loadOptions.ts
@@ -0,0 +1,75 @@
+import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
+import { googleApiRequest, googleApiRequestAllItems } from '../GenericFunctions';
+
+/**
+ * Get all the labels to display them to user so that they can select them easily
+ */
+export async function getLabels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const labels = await googleApiRequestAllItems.call(
+		this,
+		'labels',
+		'GET',
+		'/gmail/v1/users/me/labels',
+	);
+
+	for (const label of labels) {
+		returnData.push({
+			name: label.name,
+			value: label.id,
+		});
+	}
+
+	return returnData.sort((a, b) => {
+		if (a.name < b.name) {
+			return -1;
+		}
+		if (a.name > b.name) {
+			return 1;
+		}
+		return 0;
+	});
+}
+
+export async function getThreadMessages(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+
+	const id = this.getNodeParameter('threadId', 0) as string;
+	const { messages } = await googleApiRequest.call(
+		this,
+		'GET',
+		`/gmail/v1/users/me/threads/${id}`,
+		{},
+		{ format: 'minimal' },
+	);
+
+	for (const message of messages || []) {
+		returnData.push({
+			name: message.snippet,
+			value: message.id,
+		});
+	}
+
+	return returnData;
+}
+
+export async function getGmailAliases(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const { sendAs } = await googleApiRequest.call(this, 'GET', '/gmail/v1/users/me/settings/sendAs');
+
+	for (const alias of sendAs || []) {
+		const displayName = alias.isDefault ? `${alias.sendAsEmail} (Default)` : alias.sendAsEmail;
+		returnData.push({
+			name: displayName,
+			value: alias.sendAsEmail,
+		});
+	}
+
+	return returnData;
+}
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
index 193747b01b..dcec9f093a 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
@@ -1,3 +1,4 @@
+import ISO6391 from 'iso-639-1';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -9,7 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import ISO6391 from 'iso-639-1';
+import { googleApiRequest } from './GenericFunctions';
 import type {
 	AttributesValuesUi,
 	CommentAnalyzeBody,
@@ -17,8 +18,6 @@ import type {
 	RequestedAttributes,
 } from './types';
 
-import { googleApiRequest } from './GenericFunctions';
-
 export class GooglePerspective implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Google Perspective',
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
index 1558b7fd19..b23183c29b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
@@ -7,13 +7,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../constants';
-import { apiRequest } from './v2/transport';
-import { sheetsSearch, spreadSheetsSearch } from './v2/methods/listSearch';
-import { GoogleSheet } from './v2/helpers/GoogleSheet';
-import { getSheetHeaderRowAndSkipEmpty } from './v2/methods/loadOptions';
-import type { ResourceLocator, ValueRenderOption } from './v2/helpers/GoogleSheets.types';
-
 import {
 	arrayOfArraysToJson,
 	BINARY_MIME_TYPE,
@@ -21,6 +14,12 @@ import {
 	getRevisionFile,
 	sheetBinaryToArrayOfArrays,
 } from './GoogleSheetsTrigger.utils';
+import { GoogleSheet } from './v2/helpers/GoogleSheet';
+import type { ResourceLocator, ValueRenderOption } from './v2/helpers/GoogleSheets.types';
+import { sheetsSearch, spreadSheetsSearch } from './v2/methods/listSearch';
+import { getSheetHeaderRowAndSkipEmpty } from './v2/methods/loadOptions';
+import { apiRequest } from './v2/transport';
+import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_SHEETS_SHEET_URL_REGEX } from '../constants';
 
 export class GoogleSheetsTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -137,15 +136,13 @@ export class GoogleSheetsTrigger implements INodeType {
 						type: 'string',
 						extractValue: {
 							type: 'regex',
-							regex:
-								'https:\\/\\/docs\\.google\\.com/spreadsheets\\/d\\/[0-9a-zA-Z\\-_]+\\/edit\\#gid=([0-9]+)',
+							regex: GOOGLE_SHEETS_SHEET_URL_REGEX,
 						},
 						validation: [
 							{
 								type: 'regex',
 								properties: {
-									regex:
-										'https:\\/\\/docs\\.google\\.com/spreadsheets\\/d\\/[0-9a-zA-Z\\-_]+\\/edit\\#gid=([0-9]+)',
+									regex: GOOGLE_SHEETS_SHEET_URL_REGEX,
 									errorMessage: 'Not a valid Sheet URL',
 								},
 							},
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
index 91ab4c69a8..fb6c1d908b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
@@ -1,8 +1,8 @@
-import type { IDataObject, IPollFunctions } from 'n8n-workflow';
-
-import * as XLSX from 'xlsx';
 import isEqual from 'lodash/isEqual';
 import zip from 'lodash/zip';
+import type { IDataObject, IPollFunctions } from 'n8n-workflow';
+import * as XLSX from 'xlsx';
+
 import type { SheetDataRow, SheetRangeData } from './v2/helpers/GoogleSheets.types';
 import { apiRequest } from './v2/transport';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/loadOptions.test.ts b/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/loadOptions.test.ts
new file mode 100644
index 0000000000..ce22c9783d
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/Sheet/test/v2/methods/loadOptions.test.ts
@@ -0,0 +1,169 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import {
+	getSheetHeaderRow,
+	getSheetHeaderRowAndAddColumn,
+	getSheetHeaderRowAndSkipEmpty,
+	getSheetHeaderRowWithGeneratedColumnNames,
+	getSheets,
+} from '../../../v2/methods/loadOptions';
+
+jest.mock('../../../v2/helpers/GoogleSheets.utils');
+
+const mockGoogleSheetInstance = {
+	spreadsheetGetSheets: jest.fn(),
+	spreadsheetGetSheet: jest.fn(),
+	getData: jest.fn(),
+	testFilter: jest.fn(),
+};
+
+jest.mock('../../../v2/helpers/GoogleSheet', () => ({
+	GoogleSheet: jest.fn().mockImplementation(() => mockGoogleSheetInstance),
+}));
+
+describe('Google Sheets Functions', () => {
+	let mockLoadOptionsFunctions: Partial<ILoadOptionsFunctions>;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+
+		mockLoadOptionsFunctions = {
+			getNodeParameter: jest.fn((paramName: string) => {
+				if (paramName === 'documentId') {
+					return { mode: 'mode', value: 'value' };
+				}
+				if (paramName === 'sheetName') {
+					return { mode: 'Sheet1', value: 'Sheet1' };
+				}
+			}),
+			getNode: jest.fn(),
+		};
+	});
+
+	describe('getSheets', () => {
+		it('should return an empty array if documentId is null', async () => {
+			mockLoadOptionsFunctions.getNodeParameter = jest.fn().mockReturnValue(null);
+
+			const result = await getSheets.call(mockLoadOptionsFunctions as ILoadOptionsFunctions);
+			expect(result).toEqual([]);
+		});
+
+		it('should throw an error if no data is returned', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheets.mockResolvedValue(undefined);
+
+			await expect(
+				getSheets.call(mockLoadOptionsFunctions as ILoadOptionsFunctions),
+			).rejects.toThrow(NodeOperationError);
+		});
+
+		it('should return sheets with GRID type', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheets.mockResolvedValue({
+				sheets: [
+					{ properties: { sheetType: 'GRID', title: 'Sheet1', sheetId: '123' } },
+					{ properties: { sheetType: 'OTHER', title: 'Sheet2', sheetId: '456' } },
+				],
+			});
+
+			const result = await getSheets.call(mockLoadOptionsFunctions as ILoadOptionsFunctions);
+			expect(result).toEqual([{ name: 'Sheet1', value: '123' }]);
+		});
+	});
+
+	describe('getSheetHeaderRow', () => {
+		it('should return an empty array if documentId is null', async () => {
+			mockLoadOptionsFunctions.getNodeParameter = jest.fn().mockReturnValue(null);
+
+			const result = await getSheetHeaderRow.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+			expect(result).toEqual([]);
+		});
+
+		it('should throw an error if no data is returned', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue(undefined);
+
+			await expect(
+				getSheetHeaderRow.call(mockLoadOptionsFunctions as ILoadOptionsFunctions),
+			).rejects.toThrow(NodeOperationError);
+		});
+
+		it('should return column headers', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue([['Header1', 'Header2', 'Header3']]);
+			mockGoogleSheetInstance.testFilter.mockReturnValue(['Header1', 'Header2', 'Header3']);
+
+			const result = await getSheetHeaderRow.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+			expect(result).toEqual([
+				{ name: 'Header1', value: 'Header1' },
+				{ name: 'Header2', value: 'Header2' },
+				{ name: 'Header3', value: 'Header3' },
+			]);
+		});
+	});
+
+	describe('getSheetHeaderRowAndAddColumn', () => {
+		it('should add a new column and exclude the column to match on', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue([['Header1']]);
+			mockGoogleSheetInstance.testFilter.mockReturnValue(['Header1']);
+
+			const result = await getSheetHeaderRowAndAddColumn.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+
+			expect(result).toEqual([
+				{ name: 'Header1', value: 'Header1' },
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				{ name: 'New column ...', value: 'newColumn' },
+			]);
+		});
+	});
+
+	describe('getSheetHeaderRowWithGeneratedColumnNames', () => {
+		it('should generate column names for empty values', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue([['', 'Header1', '']]);
+			mockGoogleSheetInstance.testFilter.mockReturnValue(['', 'Header1', '']);
+
+			const result = await getSheetHeaderRowWithGeneratedColumnNames.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+
+			expect(result).toEqual([
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				{ name: 'col_1', value: 'col_1' },
+				{ name: 'Header1', value: 'Header1' },
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				{ name: 'col_3', value: 'col_3' },
+			]);
+		});
+	});
+
+	describe('getSheetHeaderRowAndSkipEmpty', () => {
+		it('should skip columns with empty values', async () => {
+			mockGoogleSheetInstance.spreadsheetGetSheet.mockResolvedValue({
+				title: 'Sheet1',
+			});
+			mockGoogleSheetInstance.getData.mockResolvedValue([['', 'Header1', '']]);
+			mockGoogleSheetInstance.testFilter.mockReturnValue(['', 'Header1', '']);
+
+			const result = await getSheetHeaderRowAndSkipEmpty.call(
+				mockLoadOptionsFunctions as ILoadOptionsFunctions,
+			);
+
+			expect(result).toEqual([{ name: 'Header1', value: 'Header1' }]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
index 033f7249f8..4c3f9861be 100644
--- a/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/test/v2/utils/utils.test.ts
@@ -1,9 +1,24 @@
-import type { IExecuteFunctions, INode, ResourceMapperField } from 'n8n-workflow';
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INode,
+	type ResourceMapperField,
+} from 'n8n-workflow';
+
+import { GOOGLE_SHEETS_SHEET_URL_REGEX } from '../../../../constants';
 import { GoogleSheet } from '../../../v2/helpers/GoogleSheet';
 import {
 	addRowNumber,
 	autoMapInputData,
 	checkForSchemaChanges,
+	getColumnName,
+	getColumnNumber,
+	getExistingSheetNames,
+	getRangeString,
+	getSheetId,
+	getSpreadsheetId,
+	hexToRgb,
+	mapFields,
 	prepareSheetData,
 	removeEmptyColumns,
 	removeEmptyRows,
@@ -444,3 +459,254 @@ describe('Test Google Sheets, checkForSchemaChanges', () => {
 		).toThrow("Column names were updated after the node's setup");
 	});
 });
+
+describe('Test Google Sheets, getSpreadsheetId', () => {
+	let mockNode: INode;
+
+	beforeEach(() => {
+		mockNode = { name: 'Google Sheets' } as INode;
+		jest.clearAllMocks();
+	});
+
+	it('should throw an error if value is empty', () => {
+		expect(() => getSpreadsheetId(mockNode, 'url', '')).toThrow(NodeOperationError);
+	});
+
+	it('should return the ID from a valid URL', () => {
+		const url =
+			'https://docs.google.com/spreadsheets/d/1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms/edit#gid=0';
+		const result = getSpreadsheetId(mockNode, 'url', url);
+		expect(result).toBe('1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms');
+	});
+
+	it('should return an empty string for an invalid URL', () => {
+		const url = 'https://docs.google.com/spreadsheets/d/';
+		const result = getSpreadsheetId(mockNode, 'url', url);
+		expect(result).toBe('');
+	});
+
+	it('should return the value for documentIdType byId or byList', () => {
+		const value = '1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms';
+		expect(getSpreadsheetId(mockNode, 'id', value)).toBe(value);
+		expect(getSpreadsheetId(mockNode, 'list', value)).toBe(value);
+	});
+});
+
+describe('Test Google Sheets, Google Sheets Sheet URL Regex', () => {
+	const regex = new RegExp(GOOGLE_SHEETS_SHEET_URL_REGEX);
+
+	it('should match a valid Google Sheets URL', () => {
+		const urls = [
+			'https://docs.google.com/spreadsheets/d/1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms/edit#gid=0',
+			'https://docs.google.com/spreadsheets/d/1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms/edit#gid=123456',
+			'https://docs.google.com/spreadsheets/d/1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms/edit?gid=654321#gid=654321',
+		];
+		for (const url of urls) {
+			expect(regex.test(url)).toBe(true);
+		}
+	});
+
+	it('should not match an invalid Google Sheets URL', () => {
+		const url = 'https://docs.google.com/spreadsheets/d/';
+		expect(regex.test(url)).toBe(false);
+	});
+
+	it('should not match a URL that does not match the pattern', () => {
+		const url =
+			'https://example.com/spreadsheets/d/1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms/edit#gid=0';
+		expect(regex.test(url)).toBe(false);
+	});
+
+	it('should extract the gid from a valid Google Sheets URL', () => {
+		const urls = [
+			'https://docs.google.com/spreadsheets/d/1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms/edit#gid=12345',
+			'https://docs.google.com/spreadsheets/d/1BxiMVs0XRA5nFMdKvBdBZjgmUUqptlbs74OgvE2upms/edit?gid=12345#gid=12345',
+		];
+		for (const url of urls) {
+			const match = url.match(regex);
+			expect(match).not.toBeNull();
+			expect(match?.[1]).toBe('12345');
+		}
+	});
+});
+
+describe('Test Google Sheets, getColumnNumber', () => {
+	it('should return the correct number for single-letter columns', () => {
+		expect(getColumnNumber('A')).toBe(1);
+		expect(getColumnNumber('Z')).toBe(26);
+	});
+
+	it('should return the correct number for multi-letter columns', () => {
+		expect(getColumnNumber('AA')).toBe(27);
+		expect(getColumnNumber('AZ')).toBe(52);
+		expect(getColumnNumber('BA')).toBe(53);
+		expect(getColumnNumber('ZZ')).toBe(702);
+		expect(getColumnNumber('AAA')).toBe(703);
+	});
+});
+
+describe('Test Google Sheets, hexToRgb', () => {
+	it('should correctly convert a full hex code to RGB', () => {
+		expect(hexToRgb('#0033FF')).toEqual({ red: 0, green: 51, blue: 255 });
+		expect(hexToRgb('#FF5733')).toEqual({ red: 255, green: 87, blue: 51 });
+	});
+
+	it('should correctly convert a shorthand hex code to RGB', () => {
+		expect(hexToRgb('#03F')).toEqual({ red: 0, green: 51, blue: 255 });
+		expect(hexToRgb('#F00')).toEqual({ red: 255, green: 0, blue: 0 });
+	});
+
+	it('should return null for invalid hex codes', () => {
+		expect(hexToRgb('#XYZ123')).toBeNull(); // Invalid characters
+		expect(hexToRgb('#12345')).toBeNull(); // Incorrect length
+		expect(hexToRgb('')).toBeNull(); // Empty input
+		expect(hexToRgb('#')).toBeNull(); // Just a hash
+	});
+});
+
+describe('Test Google Sheets, getRangeString', () => {
+	it('should return the range in A1 notation when "specifyRangeA1" is set', () => {
+		const result = getRangeString('Sheet1', { rangeDefinition: 'specifyRangeA1', range: 'A1:B2' });
+		expect(result).toBe('Sheet1!A1:B2');
+	});
+
+	it('should return only the sheet name if no range is specified', () => {
+		const result = getRangeString('Sheet1', { rangeDefinition: 'specifyRangeA1', range: '' });
+		expect(result).toBe('Sheet1');
+	});
+
+	it('should return only the sheet name if rangeDefinition is not "specifyRangeA1"', () => {
+		const result = getRangeString('Sheet1', { rangeDefinition: 'detectAutomatically' });
+		expect(result).toBe('Sheet1');
+	});
+});
+
+describe('Test Google Sheets, getExistingSheetNames', () => {
+	const mockGoogleSheetInstance: Partial<GoogleSheet> = {
+		spreadsheetGetSheets: jest.fn(),
+	};
+	it('should return an array of sheet names', async () => {
+		mockGoogleSheetInstance.spreadsheetGetSheets = jest.fn().mockResolvedValue({
+			sheets: [{ properties: { title: 'Sheet1' } }, { properties: { title: 'Sheet2' } }],
+		});
+		const result = await getExistingSheetNames(mockGoogleSheetInstance as GoogleSheet);
+		expect(result).toEqual(['Sheet1', 'Sheet2']);
+	});
+
+	it('should return an empty array if no sheets are present', async () => {
+		mockGoogleSheetInstance.spreadsheetGetSheets = jest.fn().mockResolvedValue({ sheets: [] });
+		const result = await getExistingSheetNames(mockGoogleSheetInstance as GoogleSheet);
+		expect(result).toEqual([]);
+	});
+
+	it('should handle a case where sheets are undefined', async () => {
+		mockGoogleSheetInstance.spreadsheetGetSheets = jest.fn().mockResolvedValue({});
+		const result = await getExistingSheetNames(mockGoogleSheetInstance as GoogleSheet);
+		expect(result).toEqual([]);
+	});
+});
+
+describe('Test Google Sheets, mapFields', () => {
+	const fakeExecuteFunction: Partial<IExecuteFunctions> = {};
+
+	beforeEach(() => {
+		fakeExecuteFunction.getNode = jest.fn();
+		fakeExecuteFunction.getNodeParameter = jest.fn();
+	});
+
+	it('should map fields for node version < 4', () => {
+		fakeExecuteFunction.getNode = jest.fn().mockReturnValue({ typeVersion: 3 });
+		fakeExecuteFunction.getNodeParameter = jest.fn().mockImplementation((_, i) => [
+			{ fieldId: 'field1', fieldValue: `value${i}` },
+			{ fieldId: 'field2', fieldValue: `value${i * 2}` },
+		]);
+
+		const result = mapFields.call(fakeExecuteFunction as IExecuteFunctions, 2);
+		expect(result).toEqual([
+			{ field1: 'value0', field2: 'value0' },
+			{ field1: 'value1', field2: 'value2' },
+		]);
+		expect(fakeExecuteFunction.getNodeParameter).toHaveBeenCalledTimes(2);
+		expect(fakeExecuteFunction.getNodeParameter).toHaveBeenCalledWith(
+			'fieldsUi.fieldValues',
+			0,
+			[],
+		);
+	});
+
+	it('should map columns for node version >= 4', () => {
+		fakeExecuteFunction.getNode = jest.fn().mockReturnValue({ typeVersion: 4 });
+		fakeExecuteFunction.getNodeParameter = jest.fn().mockImplementation((_, i) => ({
+			column1: `value${i}`,
+			column2: `value${i * 2}`,
+		}));
+
+		const result = mapFields.call(fakeExecuteFunction as IExecuteFunctions, 2);
+		expect(result).toEqual([
+			{ column1: 'value0', column2: 'value0' },
+			{ column1: 'value1', column2: 'value2' },
+		]);
+		expect(fakeExecuteFunction.getNodeParameter).toHaveBeenCalledTimes(2);
+		expect(fakeExecuteFunction.getNodeParameter).toHaveBeenCalledWith('columns.value', 0);
+	});
+
+	it('should throw an error if no values are added in version >= 4', () => {
+		fakeExecuteFunction.getNode = jest.fn().mockReturnValue({ typeVersion: 4 });
+		fakeExecuteFunction.getNodeParameter = jest.fn().mockReturnValue({});
+
+		expect(() => mapFields.call(fakeExecuteFunction as IExecuteFunctions, 1)).toThrow(
+			"At least one value has to be added under 'Values to Send'",
+		);
+	});
+
+	it('should return an empty array when inputSize is 0', () => {
+		const result = mapFields.call(fakeExecuteFunction as IExecuteFunctions, 0);
+		expect(result).toEqual([]);
+	});
+});
+
+describe('Test Google Sheets, getSheetId', () => {
+	it('should return 0 when value is "gid=0"', () => {
+		expect(getSheetId('gid=0')).toBe(0);
+	});
+
+	it('should return a parsed integer when value is a numeric string', () => {
+		expect(getSheetId('123')).toBe(123);
+		expect(getSheetId('456')).toBe(456);
+	});
+
+	it('should return NaN for non-numeric strings', () => {
+		expect(getSheetId('abc')).toBeNaN();
+		expect(getSheetId('gid=abc')).toBeNaN();
+	});
+});
+
+describe('Test Google Sheets, getColumnName', () => {
+	it('should return "A" for column number 1', () => {
+		expect(getColumnName(1)).toBe('A');
+	});
+
+	it('should return "Z" for column number 26', () => {
+		expect(getColumnName(26)).toBe('Z');
+	});
+
+	it('should return "AA" for column number 27', () => {
+		expect(getColumnName(27)).toBe('AA');
+	});
+
+	it('should return "AZ" for column number 52', () => {
+		expect(getColumnName(52)).toBe('AZ');
+	});
+
+	it('should return "BA" for column number 53', () => {
+		expect(getColumnName(53)).toBe('BA');
+	});
+
+	it('should return "ZZ" for column number 702', () => {
+		expect(getColumnName(702)).toBe('ZZ');
+	});
+
+	it('should return "AAA" for column number 703', () => {
+		expect(getColumnName(703)).toBe('AAA');
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
index 540367aabd..90fa190a9f 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export interface IGoogleAuthCredentials {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
index 5781c51b8f..cccd5e2de5 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
@@ -1,9 +1,8 @@
+import get from 'lodash/get';
 import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-
 import { utils as xlsxUtils } from 'xlsx';
 
-import get from 'lodash/get';
 import { googleApiRequest } from './GenericFunctions';
 
 export interface ISheetOptions {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
index 6b5f4ee802..6b218c1d6a 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
@@ -13,8 +13,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { getGoogleAccessToken } from '../../GenericFunctions';
-import { generatePairedItemData } from '../../../../utils/utilities';
+import { googleApiRequest, hexToRgb } from './GenericFunctions';
 import type {
 	ILookupValues,
 	ISheetUpdateData,
@@ -23,10 +22,9 @@ import type {
 	ValueRenderOption,
 } from './GoogleSheet';
 import { GoogleSheet } from './GoogleSheet';
-
-import { googleApiRequest, hexToRgb } from './GenericFunctions';
-
 import { versionDescription } from './versionDescription';
+import { generatePairedItemData } from '../../../../utils/utilities';
+import { getGoogleAccessToken } from '../../GenericFunctions';
 
 export class GoogleSheetsV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts b/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
index 912ca8a797..681705781a 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
@@ -4,9 +4,10 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { credentialTest, listSearch, loadOptions, resourceMapping } from './methods';
-import { router } from './actions/router';
 
 export class GoogleSheetsV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
index 5159e9b76e..68b6f683b1 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
@@ -1,9 +1,10 @@
 import { type IExecuteFunctions, type IDataObject, type INodeExecutionData } from 'n8n-workflow';
-import { GoogleSheet } from '../helpers/GoogleSheet';
-import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
-import type { GoogleSheets, ResourceLocator } from '../helpers/GoogleSheets.types';
-import * as spreadsheet from './spreadsheet/SpreadSheet.resource';
+
 import * as sheet from './sheet/Sheet.resource';
+import * as spreadsheet from './spreadsheet/SpreadSheet.resource';
+import { GoogleSheet } from '../helpers/GoogleSheet';
+import type { GoogleSheets, ResourceLocator } from '../helpers/GoogleSheets.types';
+import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let operationResult: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
index 3cb7866aa5..07810d1304 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/Sheet.resource.ts
@@ -1,5 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../../../../constants';
+
 import * as append from './append.operation';
 import * as appendOrUpdate from './appendOrUpdate.operation';
 import * as clear from './clear.operation';
@@ -8,6 +8,7 @@ import * as del from './delete.operation';
 import * as read from './read.operation';
 import * as remove from './remove.operation';
 import * as update from './update.operation';
+import { GOOGLE_DRIVE_FILE_URL_REGEX, GOOGLE_SHEETS_SHEET_URL_REGEX } from '../../../../constants';
 
 export { append, appendOrUpdate, clear, create, del as delete, read, remove, update };
 
@@ -156,15 +157,13 @@ export const descriptions: INodeProperties[] = [
 				type: 'string',
 				extractValue: {
 					type: 'regex',
-					regex:
-						'https:\\/\\/docs\\.google.com\\/spreadsheets\\/d\\/[0-9a-zA-Z\\-_]+.*\\#gid=([0-9]+)',
+					regex: GOOGLE_SHEETS_SHEET_URL_REGEX,
 				},
 				validation: [
 					{
 						type: 'regex',
 						properties: {
-							regex:
-								'https:\\/\\/docs\\.google.com\\/spreadsheets\\/d\\/[0-9a-zA-Z\\-_]+.*\\#gid=([0-9]+)',
+							regex: GOOGLE_SHEETS_SHEET_URL_REGEX,
 							errorMessage: 'Not a valid Sheet URL',
 						},
 					},
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
index 1a4080c576..8615beafde 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
@@ -5,8 +5,10 @@ import {
 	NodeOperationError,
 	type ResourceMapperField,
 } from 'n8n-workflow';
-import type { SheetProperties, ValueInputOption } from '../../helpers/GoogleSheets.types';
+
+import { cellFormat, handlingExtraData, useAppendOption } from './commonDescription';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import type { SheetProperties, ValueInputOption } from '../../helpers/GoogleSheets.types';
 import {
 	autoMapInputData,
 	cellFormatDefault,
@@ -14,7 +16,6 @@ import {
 	mapFields,
 	untilSheetSelected,
 } from '../../helpers/GoogleSheets.utils';
-import { cellFormat, handlingExtraData, useAppendOption } from './commonDescription';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
index f6f3e5cd3d..0dc92f31ac 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
@@ -5,6 +5,14 @@ import type {
 	ResourceMapperField,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import {
+	cellFormat,
+	handlingExtraData,
+	locationDefine,
+	useAppendOption,
+} from './commonDescription';
+import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
 	ROW_NUMBER,
 	type ISheetUpdateData,
@@ -12,18 +20,11 @@ import {
 	type ValueInputOption,
 	type ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
 	cellFormatDefault,
 	checkForSchemaChanges,
 	untilSheetSelected,
 } from '../../helpers/GoogleSheets.utils';
-import {
-	cellFormat,
-	handlingExtraData,
-	locationDefine,
-	useAppendOption,
-} from './commonDescription';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
index f65d6a5e39..14fcd8ed69 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
@@ -1,6 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
-import type { SheetProperties } from '../../helpers/GoogleSheets.types';
+
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import {
 	getColumnName,
 	getColumnNumber,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
index 4c57bf1dea..3d6ac81d6a 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
@@ -1,9 +1,10 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import type { SheetProperties } from '../../helpers/GoogleSheets.types';
-import { apiRequest } from '../../transport';
-import type { GoogleSheet } from '../../helpers/GoogleSheet';
-import { getExistingSheetNames, hexToRgb } from '../../helpers/GoogleSheets.utils';
+
 import { wrapData } from '../../../../../../utils/utilities';
+import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import type { SheetProperties } from '../../helpers/GoogleSheets.types';
+import { getExistingSheetNames, hexToRgb } from '../../helpers/GoogleSheets.utils';
+import { apiRequest } from '../../transport';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
index 8edd179d0e..4d5479795c 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import type { SheetProperties } from '../../helpers/GoogleSheets.types';
-import type { GoogleSheet } from '../../helpers/GoogleSheet';
-import { getColumnNumber, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
+
 import { generatePairedItemData, wrapData } from '../../../../../../utils/utilities';
+import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import type { SheetProperties } from '../../helpers/GoogleSheets.types';
+import { getColumnNumber, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
index 9f65ffb52c..dfde11568d 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
@@ -4,12 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { dataLocationOnSheet, outputFormatting } from './commonDescription';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
-import {
-	getRangeString,
-	prepareSheetData,
-	untilSheetSelected,
-} from '../../helpers/GoogleSheets.utils';
 import type {
 	ILookupValues,
 	RangeDetectionOptions,
@@ -17,8 +14,11 @@ import type {
 	SheetRangeData,
 	ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-
-import { dataLocationOnSheet, outputFormatting } from './commonDescription';
+import {
+	getRangeString,
+	prepareSheetData,
+	untilSheetSelected,
+} from '../../helpers/GoogleSheets.utils';
 
 const combineFiltersOptions: INodeProperties = {
 	displayName: 'Combine Filters',
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
index 13e7fa3486..c068e4ee77 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
@@ -1,7 +1,8 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
-import { apiRequest } from '../../transport';
-import type { GoogleSheet } from '../../helpers/GoogleSheet';
+
 import { wrapData } from '../../../../../../utils/utilities';
+import type { GoogleSheet } from '../../helpers/GoogleSheet';
+import { apiRequest } from '../../transport';
 
 export async function execute(
 	this: IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
index 16478cb11c..83331ea7e5 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
@@ -1,5 +1,8 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
+import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
 	ROW_NUMBER,
 	type ISheetUpdateData,
@@ -7,9 +10,7 @@ import {
 	type ValueInputOption,
 	type ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { cellFormatDefault, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
-import { cellFormat, handlingExtraData, locationDefine } from './commonDescription';
 
 export const description: SheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/SpreadSheet.resource.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/SpreadSheet.resource.ts
index c0e7f3acfa..0e33a95667 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/SpreadSheet.resource.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/SpreadSheet.resource.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
 import * as deleteSpreadsheet from './delete.operation';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
index cc0dd57f48..ff8cac5f97 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
@@ -1,7 +1,8 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
+
+import { wrapData } from '../../../../../../utils/utilities';
 import type { SpreadSheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
-import { wrapData } from '../../../../../../utils/utilities';
 
 export const description: SpreadSheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
index 310efc8de7..71f8dfd615 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
@@ -1,8 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+
+import { wrapData } from '../../../../../../utils/utilities';
+import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../../../../constants';
 import type { SpreadSheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
-import { GOOGLE_DRIVE_FILE_URL_REGEX } from '../../../../constants';
-import { wrapData } from '../../../../../../utils/utilities';
 
 export const description: SpreadSheetProperties = [
 	{
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
index c5f8a8dc79..b129f9326c 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
@@ -8,7 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { ApplicationError, NodeOperationError } from 'n8n-workflow';
 import { utils as xlsxUtils } from 'xlsx';
-import { apiRequest } from '../transport';
+
 import type {
 	ILookupValues,
 	ISheetUpdateData,
@@ -21,6 +21,7 @@ import type {
 	ValueRenderOption,
 } from './GoogleSheets.types';
 import { getSheetId, removeEmptyColumns } from './GoogleSheets.utils';
+import { apiRequest } from '../transport';
 
 export class GoogleSheet {
 	id: string;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
index f3ad02e273..c717e5c8b6 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
@@ -8,6 +8,7 @@ import type {
 	ResourceMapperField,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import type { GoogleSheet } from './GoogleSheet';
 import type {
 	RangeDetectionOptions,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
index 6c0c8b74ca..cb8f5c05cf 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/listSearch.ts
@@ -5,6 +5,7 @@ import type {
 	INodeListSearchResult,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import type { ResourceLocator } from '../helpers/GoogleSheets.types';
 import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 import { apiRequest } from '../transport';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
index 90aa11cf90..6ec3e9d9b7 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/loadOptions.ts
@@ -1,8 +1,9 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { GoogleSheet } from '../helpers/GoogleSheet';
-import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 import type { ResourceLocator } from '../helpers/GoogleSheets.types';
+import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
 
 export async function getSheets(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const documentId = this.getNodeParameter('documentId', 0) as IDataObject | null;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
index 40ae402a64..664a44d094 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/methods/resourceMapping.ts
@@ -4,6 +4,7 @@ import type {
 	ResourceMapperField,
 	ResourceMapperFields,
 } from 'n8n-workflow';
+
 import { GoogleSheet } from '../helpers/GoogleSheet';
 import { ROW_NUMBER, type ResourceLocator } from '../helpers/GoogleSheets.types';
 import { getSpreadsheetId } from '../helpers/GoogleSheets.utils';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
index d3fe3e0762..27e080cffd 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,7 +9,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import set from 'lodash/set';
+
 import { getGoogleAccessToken } from '../../../GenericFunctions';
 
 export async function apiRequest(
diff --git a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
index c0e69151e4..2229b7608d 100644
--- a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
@@ -35,7 +35,6 @@ export async function googleApiRequest(
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleTasksOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index d7fe05561f..e053b752bd 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
 import { taskFields, taskOperations } from './TaskDescription';
 
 export class GoogleTasks implements INodeType {
diff --git a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
index acd718c1b2..50fe1b3d3a 100644
--- a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
@@ -35,7 +35,6 @@ export async function googleApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'youTubeOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 07de1d36fa..07f1b351b6 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -1,4 +1,3 @@
-import type { Readable } from 'stream';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,22 +8,18 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
-
-import { DateTime } from 'luxon';
-import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
-
-import { channelFields, channelOperations } from './ChannelDescription';
-
-import { playlistFields, playlistOperations } from './PlaylistDescription';
-
-import { playlistItemFields, playlistItemOperations } from './PlaylistItemDescription';
-
-import { videoFields, videoOperations } from './VideoDescription';
-
-import { videoCategoryFields, videoCategoryOperations } from './VideoCategoryDescription';
+import type { Readable } from 'stream';
 
 import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
+import { channelFields, channelOperations } from './ChannelDescription';
+import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
+import { playlistFields, playlistOperations } from './PlaylistDescription';
+import { playlistItemFields, playlistItemOperations } from './PlaylistItemDescription';
+import { videoCategoryFields, videoCategoryOperations } from './VideoCategoryDescription';
+import { videoFields, videoOperations } from './VideoDescription';
+import { validateAndSetDate } from '../GenericFunctions';
+
 const UPLOAD_CHUNK_SIZE = 1024 * 1024;
 
 export class YouTube implements INodeType {
@@ -763,27 +758,13 @@ export class YouTube implements INodeType {
 						qs.type = 'video';
 
 						qs.forMine = true;
+
 						if (filters.publishedAfter) {
-							const publishedAfter = DateTime.fromISO(filters.publishedAfter as string);
-							if (publishedAfter.isValid) {
-								filters.publishedAfter = publishedAfter.setZone(this.getTimezone()).toISO();
-							} else {
-								throw new NodeOperationError(
-									this.getNode(),
-									`The value "${filters.publishedAfter as string}" is not a valid DateTime.`,
-								);
-							}
+							validateAndSetDate(filters, 'publishedAfter', this.getTimezone(), this);
 						}
+
 						if (filters.publishedBefore) {
-							const publishedBefore = DateTime.fromISO(filters.publishedBefore as string);
-							if (publishedBefore.isValid) {
-								filters.publishedAfter = publishedBefore.setZone(this.getTimezone()).toISO();
-							} else {
-								throw new NodeOperationError(
-									this.getNode(),
-									`The value "${filters.publishedBefore as string}" is not a valid DateTime.`,
-								);
-							}
+							validateAndSetDate(filters, 'publishedBefore', this.getTimezone(), this);
 						}
 
 						Object.assign(qs, options, filters);
diff --git a/packages/nodes-base/nodes/Google/YouTube/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Google/YouTube/test/GenericFunctions.test.ts
new file mode 100644
index 0000000000..d56e1b452b
--- /dev/null
+++ b/packages/nodes-base/nodes/Google/YouTube/test/GenericFunctions.test.ts
@@ -0,0 +1,38 @@
+import { DateTime } from 'luxon';
+import { NodeOperationError, type IExecuteFunctions } from 'n8n-workflow';
+
+import { validateAndSetDate } from '../../GenericFunctions';
+
+const mockContext = {
+	getNode: jest.fn().mockReturnValue('Youtube'),
+} as unknown as IExecuteFunctions;
+
+describe('validateAndSetDate', () => {
+	const timezone = 'America/New_York';
+	let filter: { [key: string]: string };
+
+	beforeEach(() => {
+		filter = {};
+	});
+
+	it('should convert a valid ISO date and set it with the specified timezone', () => {
+		filter.publishedAfter = '2023-10-05T10:00:00.000Z';
+		validateAndSetDate(filter, 'publishedAfter', timezone, mockContext);
+
+		expect(filter.publishedAfter).toBe(
+			DateTime.fromISO('2023-10-05T10:00:00.000Z').setZone(timezone).toISO(),
+		);
+	});
+
+	it('should throw NodeOperationError for an invalid date', () => {
+		filter.publishedAfter = 'invalid-date';
+
+		expect(() => validateAndSetDate(filter, 'publishedAfter', timezone, mockContext)).toThrow(
+			NodeOperationError,
+		);
+
+		expect(() => validateAndSetDate(filter, 'publishedAfter', timezone, mockContext)).toThrow(
+			`The value "${filter.publishedAfter}" is not a valid DateTime.`,
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Google/constants.ts b/packages/nodes-base/nodes/Google/constants.ts
index 374cb345b5..e0cd0555c9 100644
--- a/packages/nodes-base/nodes/Google/constants.ts
+++ b/packages/nodes-base/nodes/Google/constants.ts
@@ -3,3 +3,6 @@ export const GOOGLE_DRIVE_FILE_URL_REGEX =
 
 export const GOOGLE_DRIVE_FOLDER_URL_REGEX =
 	'https:\\/\\/drive\\.google\\.com(?:\\/.*|)\\/folders\\/([0-9a-zA-Z\\-_]+)(?:\\/.*|)';
+
+export const GOOGLE_SHEETS_SHEET_URL_REGEX =
+	'https:\\/\\/docs\\.google\\.com\\/spreadsheets\\/d\\/[0-9a-zA-Z\\-_]+.*\\#gid=([0-9]+)';
diff --git a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
index 3b63797197..192dc8f7c0 100644
--- a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
@@ -37,7 +37,6 @@ export async function gotifyApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Grafana/Grafana.node.ts b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
index ce3f0b8276..28bd734229 100644
--- a/packages/nodes-base/nodes/Grafana/Grafana.node.ts
+++ b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
@@ -9,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
 
-import { deriveUid, grafanaApiRequest, throwOnEmptyUpdate } from './GenericFunctions';
-
 import {
 	dashboardFields,
 	dashboardOperations,
@@ -21,7 +19,7 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
-
+import { deriveUid, grafanaApiRequest, throwOnEmptyUpdate } from './GenericFunctions';
 import type {
 	DashboardUpdateFields,
 	DashboardUpdatePayload,
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
index 89891bd1c6..ad41f83ab1 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -19,7 +19,7 @@ export class GraphQL implements INodeType {
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
 		icon: 'file:graphql.png',
 		group: ['input'],
-		version: 1,
+		version: [1, 1.1],
 		description: 'Makes a GraphQL request and returns the received data',
 		defaults: {
 			name: 'GraphQL',
@@ -160,7 +160,7 @@ export class GraphQL implements INodeType {
 				required: true,
 			},
 			{
-				displayName: 'Ignore SSL Issues',
+				displayName: 'Ignore SSL Issues (Insecure)',
 				name: 'allowUnauthorizedCerts',
 				type: 'boolean',
 				default: false,
@@ -186,25 +186,57 @@ export class GraphQL implements INodeType {
 				displayOptions: {
 					show: {
 						requestMethod: ['POST'],
+						'@version': [1],
 					},
 				},
 				default: 'graphql',
 				description: 'The format for the query payload',
 			},
+			{
+				displayName: 'Request Format',
+				name: 'requestFormat',
+				type: 'options',
+				required: true,
+				options: [
+					{
+						name: 'JSON (Recommended)',
+						value: 'json',
+						description:
+							'JSON object with query, variables, and operationName properties. The standard and most widely supported format for GraphQL requests.',
+					},
+					{
+						name: 'GraphQL (Raw)',
+						value: 'graphql',
+						description:
+							'Raw GraphQL query string. Not all servers support this format. Use JSON for better compatibility.',
+					},
+				],
+				displayOptions: {
+					show: {
+						requestMethod: ['POST'],
+						'@version': [{ _cnd: { gte: 1.1 } }],
+					},
+				},
+				default: 'json',
+				description: 'The request format for the query payload',
+			},
 			{
 				displayName: 'Query',
 				name: 'query',
-				type: 'json',
+				type: 'string',
 				default: '',
 				description: 'GraphQL query',
 				required: true,
+				typeOptions: {
+					rows: 6,
+				},
 			},
 			{
 				displayName: 'Variables',
 				name: 'variables',
 				type: 'json',
 				default: '',
-				description: 'Query variables',
+				description: 'Query variables as JSON object',
 				displayOptions: {
 					show: {
 						requestFormat: ['json'],
@@ -350,11 +382,7 @@ export class GraphQL implements INodeType {
 					'POST',
 				) as IHttpRequestMethods;
 				const endpoint = this.getNodeParameter('endpoint', itemIndex, '') as string;
-				const requestFormat = this.getNodeParameter(
-					'requestFormat',
-					itemIndex,
-					'graphql',
-				) as string;
+				const requestFormat = this.getNodeParameter('requestFormat', itemIndex, 'json') as string;
 				const responseFormat = this.getNodeParameter('responseFormat', 0) as string;
 				const { parameter }: { parameter?: Array<{ name: string; value: string }> } =
 					this.getNodeParameter('headerParametersUi', itemIndex, {}) as IDataObject;
@@ -418,40 +446,49 @@ export class GraphQL implements INodeType {
 
 				const gqlQuery = this.getNodeParameter('query', itemIndex, '') as string;
 				if (requestMethod === 'GET') {
-					if (!requestOptions.qs) {
-						requestOptions.qs = {};
-					}
+					requestOptions.qs = requestOptions.qs ?? {};
 					requestOptions.qs.query = gqlQuery;
-				} else {
-					if (requestFormat === 'json') {
-						const jsonBody = {
-							...requestOptions.body,
-							query: gqlQuery,
-							variables: this.getNodeParameter('variables', itemIndex, {}) as object,
-							operationName: this.getNodeParameter('operationName', itemIndex) as string,
-						};
-						if (typeof jsonBody.variables === 'string') {
-							try {
-								jsonBody.variables = JSON.parse(jsonBody.variables || '{}');
-							} catch (error) {
-								throw new NodeOperationError(
-									this.getNode(),
-									'Using variables failed:\n' +
-										(jsonBody.variables as string) +
-										'\n\nWith error message:\n' +
-										(error as string),
-									{ itemIndex },
-								);
-							}
+				}
+
+				if (requestFormat === 'json') {
+					const variables = this.getNodeParameter('variables', itemIndex, {});
+
+					let parsedVariables;
+					if (typeof variables === 'string') {
+						try {
+							parsedVariables = JSON.parse(variables || '{}');
+						} catch (error) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Using variables failed:\n${variables}\n\nWith error message:\n${error}`,
+								{ itemIndex },
+							);
 						}
-						if (jsonBody.operationName === '') {
-							jsonBody.operationName = null;
-						}
-						requestOptions.json = true;
-						requestOptions.body = jsonBody;
+					} else if (typeof variables === 'object' && variables !== null) {
+						parsedVariables = variables;
 					} else {
-						requestOptions.body = gqlQuery;
+						throw new NodeOperationError(
+							this.getNode(),
+							`Using variables failed:\n${variables}\n\nGraphQL variables should be either an object or a string.`,
+							{ itemIndex },
+						);
 					}
+
+					const jsonBody = {
+						...requestOptions.body,
+						query: gqlQuery,
+						variables: parsedVariables,
+						operationName: this.getNodeParameter('operationName', itemIndex, '') as string,
+					};
+
+					if (jsonBody.operationName === '') {
+						jsonBody.operationName = null;
+					}
+
+					requestOptions.json = true;
+					requestOptions.body = jsonBody;
+				} else {
+					requestOptions.body = gqlQuery;
 				}
 
 				let response;
@@ -509,22 +546,19 @@ export class GraphQL implements INodeType {
 					throw new NodeApiError(this.getNode(), response.errors as JsonObject, { message });
 				}
 			} catch (error) {
-				if (this.continueOnFail()) {
-					const errorData = this.helpers.returnJsonArray({
-						$error: error,
-						json: this.getInputData(itemIndex),
-						itemIndex,
-					});
-					const exectionErrorWithMetaData = this.helpers.constructExecutionMetaData(errorData, {
-						itemData: { item: itemIndex },
-					});
-					returnItems.push(...exectionErrorWithMetaData);
-					continue;
+				if (!this.continueOnFail()) {
+					throw error;
 				}
-				throw error;
+
+				const errorData = this.helpers.returnJsonArray({
+					error: error.message,
+				});
+				const exectionErrorWithMetaData = this.helpers.constructExecutionMetaData(errorData, {
+					itemData: { item: itemIndex },
+				});
+				returnItems.push(...exectionErrorWithMetaData);
 			}
 		}
-
 		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts b/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts
index 4d099f5769..2b6014fcd4 100644
--- a/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts
+++ b/packages/nodes-base/nodes/GraphQL/test/GraphQL.node.test.ts
@@ -1,54 +1,83 @@
-import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
-import * as Helpers from '@test/nodes/Helpers';
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import nock from 'nock';
+
+import {
+	equalityTest,
+	getWorkflowFilenames,
+	initBinaryDataService,
+	setup,
+	workflowToTests,
+} from '@test/nodes/Helpers';
 
 describe('GraphQL Node', () => {
-	const mockResponse = {
-		data: {
-			nodes: {},
-		},
-	};
+	const workflows = getWorkflowFilenames(__dirname);
+	const workflowTests = workflowToTests(workflows);
 
-	const tests: WorkflowTestData[] = [
-		{
-			description: 'should run Request Format JSON',
-			input: {
-				workflowData: Helpers.readJsonFileSync('nodes/GraphQL/test/workflow.json'),
-			},
-			output: {
-				nodeExecutionOrder: ['Start'],
-				nodeData: {
-					'Fetch Request Format JSON': [
-						[
+	const baseUrl = 'https://api.n8n.io/';
+
+	beforeAll(async () => {
+		await initBinaryDataService();
+		nock.disableNetConnect();
+
+		nock(baseUrl)
+			.matchHeader('accept', 'application/json')
+			.matchHeader('content-type', 'application/json')
+			.matchHeader('user-agent', 'axios/1.7.4')
+			.matchHeader('content-length', '263')
+			.matchHeader('accept-encoding', 'gzip, compress, deflate, br')
+			.post(
+				'/graphql',
+				'{"query":"query {\\n  nodes(pagination: { limit: 1 }) {\\n    data {\\n      id\\n      attributes {\\n        name\\n        displayName\\n        description\\n        group\\n        codex\\n        createdAt\\n      }\\n    }\\n  }\\n}","variables":{},"operationName":null}',
+			)
+			.reply(200, {
+				data: {
+					nodes: {
+						data: [
 							{
-								json: mockResponse,
+								id: '1',
+								attributes: {
+									name: 'n8n-nodes-base.activeCampaign',
+									displayName: 'ActiveCampaign',
+									description: 'Create and edit data in ActiveCampaign',
+									group: '["transform"]',
+
+									codex: {
+										data: {
+											details:
+												'ActiveCampaign is a cloud software platform that allows customer experience automation, which combines email marketing, marketing automation, sales automation, and CRM categories. Use this node when you want to interact with your ActiveCampaign account.',
+											resources: {
+												primaryDocumentation: [
+													{
+														url: 'https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.activecampaign/',
+													},
+												],
+												credentialDocumentation: [
+													{
+														url: 'https://docs.n8n.io/integrations/builtin/credentials/activeCampaign/',
+													},
+												],
+											},
+											categories: ['Marketing'],
+											nodeVersion: '1.0',
+											codexVersion: '1.0',
+										},
+									},
+									createdAt: '2019-08-30T22:54:39.934Z',
+								},
 							},
 						],
-					],
-				},
-			},
-			nock: {
-				baseUrl: 'https://api.n8n.io',
-				mocks: [
-					{
-						method: 'post',
-						path: '/graphql',
-						statusCode: 200,
-						responseBody: mockResponse,
 					},
-				],
-			},
-		},
-	];
-
-	const nodeTypes = Helpers.setup(tests);
-
-	test.each(tests)('$description', async (testData) => {
-		const { result } = await executeWorkflow(testData, nodeTypes);
-		const resultNodeData = Helpers.getResultNodeData(result, testData);
-		resultNodeData.forEach(({ nodeName, resultData }) =>
-			expect(resultData).toEqual(testData.output.nodeData[nodeName]),
-		);
-		expect(result.finished).toEqual(true);
+				},
+			});
 	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	const nodeTypes = setup(workflowTests);
+
+	for (const workflow of workflowTests) {
+		test(workflow.description, async () => await equalityTest(workflow, nodeTypes));
+	}
 });
diff --git a/packages/nodes-base/nodes/GraphQL/test/workflow.error_invalid_expression.json b/packages/nodes-base/nodes/GraphQL/test/workflow.error_invalid_expression.json
new file mode 100644
index 0000000000..dd01638b68
--- /dev/null
+++ b/packages/nodes-base/nodes/GraphQL/test/workflow.error_invalid_expression.json
@@ -0,0 +1,32 @@
+{
+	"meta": {
+		"templateId": "216",
+		"instanceId": "ee90fdf8d57662f949e6c691dc07fa0fd2f66e1eee28ed82ef06658223e67255"
+	},
+	"nodes": [
+		{
+			"parameters": {
+				"endpoint": "https://graphql-teas-endpoint.netlify.app/",
+				"requestFormat": "json",
+				"query": "query getAllTeas($name: String) {\n   teas(name: $name) {\n     name,\n     id\n   }\n}",
+				"variables": "={{ 1 }}"
+			},
+			"id": "7aece03f-e0d9-4f49-832c-fc6465613ca7",
+			"name": "Test: Errors on unsuccessful Expression validation",
+			"type": "n8n-nodes-base.graphql",
+			"typeVersion": 1,
+			"position": [660, 200],
+			"onError": "continueRegularOutput"
+		}
+	],
+	"connections": {},
+	"pinData": {
+		"Test: Errors on unsuccessful Expression validation": [
+			{
+				"json": {
+					"error": "Using variables failed:\n1\n\nGraphQL variables should be either an object or a string."
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/GraphQL/test/workflow.json b/packages/nodes-base/nodes/GraphQL/test/workflow.json
index 690171afc5..78bb20c5bf 100644
--- a/packages/nodes-base/nodes/GraphQL/test/workflow.json
+++ b/packages/nodes-base/nodes/GraphQL/test/workflow.json
@@ -1,16 +1,16 @@
 {
 	"meta": {
-		"templateCredsSetupCompleted": true,
-		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+		"templateId": "216",
+		"instanceId": "ee90fdf8d57662f949e6c691dc07fa0fd2f66e1eee28ed82ef06658223e67255"
 	},
 	"nodes": [
 		{
 			"parameters": {},
-			"id": "fb826323-2e48-4f11-bb0e-e12de32e22ee",
+			"id": "5e2ef15b-2c6c-412f-a9da-515b5211386e",
 			"name": "When clicking ‘Test workflow’",
 			"type": "n8n-nodes-base.manualTrigger",
 			"typeVersion": 1,
-			"position": [180, 160]
+			"position": [420, 100]
 		},
 		{
 			"parameters": {
@@ -21,8 +21,8 @@
 			"name": "Fetch Request Format JSON",
 			"type": "n8n-nodes-base.graphql",
 			"typeVersion": 1,
-			"position": [420, 160],
-			"id": "7f8ceaf4-b82f-48d5-be0b-9fe3bfb35ee4"
+			"position": [700, 140],
+			"id": "e1c750a0-8d6c-4e81-8111-3218e1e6e69f"
 		}
 	],
 	"connections": {
@@ -38,5 +38,48 @@
 			]
 		}
 	},
-	"pinData": {}
+	"pinData": {
+		"Fetch Request Format JSON": [
+			{
+				"json": {
+					"data": {
+						"nodes": {
+							"data": [
+								{
+									"id": "1",
+									"attributes": {
+										"name": "n8n-nodes-base.activeCampaign",
+										"displayName": "ActiveCampaign",
+										"description": "Create and edit data in ActiveCampaign",
+										"group": "[\"transform\"]",
+										"codex": {
+											"data": {
+												"details": "ActiveCampaign is a cloud software platform that allows customer experience automation, which combines email marketing, marketing automation, sales automation, and CRM categories. Use this node when you want to interact with your ActiveCampaign account.",
+												"resources": {
+													"primaryDocumentation": [
+														{
+															"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.activecampaign/"
+														}
+													],
+													"credentialDocumentation": [
+														{
+															"url": "https://docs.n8n.io/integrations/builtin/credentials/activeCampaign/"
+														}
+													]
+												},
+												"categories": ["Marketing"],
+												"nodeVersion": "1.0",
+												"codexVersion": "1.0"
+											}
+										},
+										"createdAt": "2019-08-30T22:54:39.934Z"
+									}
+								}
+							]
+						}
+					}
+				}
+			}
+		]
+	}
 }
diff --git a/packages/nodes-base/nodes/Grist/GenericFunctions.ts b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
index 07a4505d35..73c4bc875f 100644
--- a/packages/nodes-base/nodes/Grist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
@@ -22,9 +22,8 @@ export async function gristApiRequest(
 	body: IDataObject | number[] = {},
 	qs: IDataObject = {},
 ) {
-	const { apiKey, planType, customSubdomain, selfHostedUrl } = (await this.getCredentials(
-		'gristApi',
-	)) as GristCredentials;
+	const { apiKey, planType, customSubdomain, selfHostedUrl } =
+		await this.getCredentials<GristCredentials>('gristApi');
 
 	const gristapiurl =
 		planType === 'free'
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.ts b/packages/nodes-base/nodes/Grist/Grist.node.ts
index 2ebd3cdd43..189c880f16 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.ts
+++ b/packages/nodes-base/nodes/Grist/Grist.node.ts
@@ -20,9 +20,7 @@ import {
 	parseSortProperties,
 	throwOnZeroDefinedFields,
 } from './GenericFunctions';
-
 import { operationFields } from './OperationDescription';
-
 import type {
 	FieldsToSend,
 	GristColumns,
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/HaloPSA/HaloPSA.node.ts b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
index ebf25294d7..137eda57c9 100644
--- a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
+++ b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
@@ -24,7 +24,6 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
-
 import {
 	getAccessTokens,
 	haloPSAApiRequest,
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.ts b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
index 90fc166080..1b239ff853 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.ts
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
@@ -11,25 +11,15 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { clientFields, clientOperations } from './ClientDescription';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
 import { companyOperations } from './CompanyDescription';
-
+import { contactFields, contactOperations } from './ContactDescription';
 import { estimateFields, estimateOperations } from './EstimateDescription';
-
 import { expenseFields, expenseOperations } from './ExpenseDescription';
-
 import { getAllResource, harvestApiRequest } from './GenericFunctions';
-
 import { invoiceFields, invoiceOperations } from './InvoiceDescription';
-
 import { projectFields, projectOperations } from './ProjectDescription';
-
 import { taskFields, taskOperations } from './TaskDescription';
-
 import { timeEntryFields, timeEntryOperations } from './TimeEntryDescription';
-
 import { userFields, userOperations } from './UserDescription';
 
 export class Harvest implements INodeType {
diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
index 6ad5fbdbc7..b61b8eda7d 100644
--- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function helpscoutApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: IHttpRequestMethods,
@@ -38,7 +37,6 @@ export async function helpscoutApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'helpScoutOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index cd94986b7d..6fae6b0ba0 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -10,23 +10,17 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { conversationFields, conversationOperations } from './ConversationDescription';
-
-import { customerFields, customerOperations } from './CustomerDescription';
-
-import type { ICustomer } from './CustomerInterface';
-
-import type { IConversation } from './ConversationInterface';
-
-import { helpscoutApiRequest, helpscoutApiRequestAllItems } from './GenericFunctions';
-
-import { mailboxFields, mailboxOperations } from './MailboxDescription';
-
-import { threadFields, threadOperations } from './ThreadDescription';
-
-import type { IAttachment, IThread } from './ThreadInterface';
 import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
+import { conversationFields, conversationOperations } from './ConversationDescription';
+import type { IConversation } from './ConversationInterface';
+import { customerFields, customerOperations } from './CustomerDescription';
+import type { ICustomer } from './CustomerInterface';
+import { helpscoutApiRequest, helpscoutApiRequestAllItems } from './GenericFunctions';
+import { mailboxFields, mailboxOperations } from './MailboxDescription';
+import { threadFields, threadOperations } from './ThreadDescription';
+import type { IAttachment, IThread } from './ThreadInterface';
+
 export class HelpScout implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'HelpScout',
diff --git a/packages/nodes-base/nodes/HighLevel/v1/GenericFunctions.ts b/packages/nodes-base/nodes/HighLevel/v1/GenericFunctions.ts
index bb6f977ad8..c5e08c9142 100644
--- a/packages/nodes-base/nodes/HighLevel/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HighLevel/v1/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import type { ToISOTimeOptions } from 'luxon';
+import { DateTime } from 'luxon';
 import type {
 	DeclarativeRestApiSettings,
 	IDataObject,
@@ -17,9 +19,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import type { ToISOTimeOptions } from 'luxon';
-import { DateTime } from 'luxon';
-
 const VALID_EMAIL_REGEX =
 	/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
 const VALID_PHONE_REGEX =
diff --git a/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts b/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
index d76ce3f402..0b29b34f3a 100644
--- a/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/v1/description/ContactDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { splitTagsPreSendAction, validEmailAndPhonePreSendAction } from '../GenericFunctions';
 
 export const contactOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts b/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
index 04a92c512c..1147371cfd 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import { DateTime } from 'luxon';
+import type { ToISOTimeOptions } from 'luxon';
 import type {
 	DeclarativeRestApiSettings,
 	IDataObject,
@@ -14,10 +16,7 @@ import type {
 	IPollFunctions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import type { ToISOTimeOptions } from 'luxon';
-import { DateTime } from 'luxon';
+import { ApplicationError, NodeApiError } from 'n8n-workflow';
 
 const VALID_EMAIL_REGEX =
 	/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
@@ -32,7 +31,7 @@ export function isPhoneValid(phone: string): boolean {
 	return VALID_PHONE_REGEX.test(String(phone));
 }
 
-function dateToIsoSupressMillis(dateTime: string) {
+export function dateToIsoSupressMillis(dateTime: string) {
 	const options: ToISOTimeOptions = { suppressMilliseconds: true };
 	return DateTime.fromISO(dateTime).toISO(options);
 }
@@ -64,7 +63,7 @@ export async function dueDatePreSendAction(
 		);
 	}
 	const dueDate = dateToIsoSupressMillis(dueDateParam);
-	requestOptions.body = (requestOptions.body || {}) as object;
+	requestOptions.body = (requestOptions.body ?? {}) as object;
 	Object.assign(requestOptions.body, { dueDate });
 	return requestOptions;
 }
@@ -73,7 +72,7 @@ export async function contactIdentifierPreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	requestOptions.body = (requestOptions.body || {}) as object;
+	requestOptions.body = (requestOptions.body ?? {}) as object;
 	let identifier = this.getNodeParameter('contactIdentifier', null) as string;
 	if (!identifier) {
 		const fields = this.getNodeParameter('updateFields') as { contactIdentifier: string };
@@ -93,7 +92,7 @@ export async function validEmailAndPhonePreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	const body = (requestOptions.body || {}) as { email?: string; phone?: string };
+	const body = (requestOptions.body ?? {}) as { email?: string; phone?: string };
 
 	if (body.email && !isEmailValid(body.email)) {
 		const message = `email "${body.email}" has invalid format`;
@@ -112,7 +111,7 @@ export async function dateTimeToEpochPreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	const qs = (requestOptions.qs || {}) as {
+	const qs = (requestOptions.qs ?? {}) as {
 		startDate?: string | number;
 		endDate?: string | number;
 	};
@@ -134,22 +133,22 @@ export async function addLocationIdPreSendAction(
 
 	if (resource === 'contact') {
 		if (operation === 'getAll') {
-			requestOptions.qs = requestOptions.qs || {};
+			requestOptions.qs = requestOptions.qs ?? {};
 			Object.assign(requestOptions.qs, { locationId });
 		}
 		if (operation === 'create') {
-			requestOptions.body = requestOptions.body || {};
+			requestOptions.body = requestOptions.body ?? {};
 			Object.assign(requestOptions.body, { locationId });
 		}
 	}
 
 	if (resource === 'opportunity') {
 		if (operation === 'create') {
-			requestOptions.body = requestOptions.body || {};
+			requestOptions.body = requestOptions.body ?? {};
 			Object.assign(requestOptions.body, { locationId });
 		}
 		if (operation === 'getAll') {
-			requestOptions.qs = requestOptions.qs || {};
+			requestOptions.qs = requestOptions.qs ?? {};
 			Object.assign(requestOptions.qs, { location_id: locationId });
 		}
 	}
@@ -180,7 +179,7 @@ export async function highLevelApiRequest(
 		method,
 		body,
 		qs,
-		url: url || `https://services.leadconnectorhq.com${resource}`,
+		url: url ?? `https://services.leadconnectorhq.com${resource}`,
 		json: true,
 	};
 	if (!Object.keys(body).length) {
@@ -193,11 +192,42 @@ export async function highLevelApiRequest(
 	return await this.helpers.httpRequestWithAuthentication.call(this, 'highLevelOAuth2Api', options);
 }
 
+export const addNotePostReceiveAction = async function (
+	this: IExecuteSingleFunctions,
+	items: INodeExecutionData[],
+	response: IN8nHttpFullResponse,
+): Promise<INodeExecutionData[]> {
+	const note = this.getNodeParameter('additionalFields.notes', 0) as string;
+
+	if (!note) {
+		return items;
+	}
+
+	const contact: IDataObject = (response.body as IDataObject).contact as IDataObject;
+
+	// Ensure there is a valid response and extract contactId and userId
+	if (!response || !response.body || !contact) {
+		throw new ApplicationError('No response data available to extract contact ID and user ID.');
+	}
+
+	const contactId = contact.id;
+	const userId = contact.locationId;
+
+	const requestBody = {
+		userId,
+		body: note,
+	};
+
+	await highLevelApiRequest.call(this, 'POST', `/contacts/${contactId}/notes`, requestBody, {});
+
+	return items;
+};
+
 export async function taskUpdatePreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	const body = (requestOptions.body || {}) as { title?: string; dueDate?: string };
+	const body = (requestOptions.body ?? {}) as { title?: string; dueDate?: string };
 	if (!body.title || !body.dueDate) {
 		const contactId = this.getNodeParameter('contactId');
 		const taskId = this.getNodeParameter('taskId');
@@ -215,7 +245,7 @@ export async function splitTagsPreSendAction(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ): Promise<IHttpRequestOptions> {
-	const body = (requestOptions.body || {}) as IDataObject;
+	const body = (requestOptions.body ?? {}) as IDataObject;
 	if (body.tags) {
 		if (Array.isArray(body.tags)) return requestOptions;
 		body.tags = (body.tags as string).split(',').map((tag) => tag.trim());
@@ -237,7 +267,7 @@ export async function highLevelApiPagination(
 	};
 	const rootProperty = resourceMapping[resource];
 
-	requestData.options.qs = requestData.options.qs || {};
+	requestData.options.qs = requestData.options.qs ?? {};
 	if (returnAll) requestData.options.qs.limit = 100;
 
 	let responseTotal = 0;
@@ -345,11 +375,42 @@ export async function getUsers(this: ILoadOptionsFunctions): Promise<INodeProper
 	return options;
 }
 
-export async function getTimezones(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-	const responseData = await highLevelApiRequest.call(this, 'GET', '/timezones');
-	const timezones = responseData.timezones as string[];
-	return timezones.map((zone) => ({
-		name: zone,
-		value: zone,
-	})) as INodePropertyOptions[];
+export async function addCustomFieldsPreSendAction(
+	this: IExecuteSingleFunctions,
+	requestOptions: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const requestBody = requestOptions.body as IDataObject;
+
+	if (requestBody && requestBody.customFields) {
+		const rawCustomFields = requestBody.customFields as IDataObject;
+
+		// Define the structure of fieldId
+		interface FieldIdType {
+			value: unknown;
+			cachedResultName?: string;
+		}
+
+		// Ensure rawCustomFields.values is an array of objects with fieldId and fieldValue
+		if (rawCustomFields && Array.isArray(rawCustomFields.values)) {
+			const formattedCustomFields = rawCustomFields.values.map((field: unknown) => {
+				// Assert that field is of the expected shape
+				const typedField = field as { fieldId: FieldIdType; fieldValue: unknown };
+
+				const fieldId = typedField.fieldId;
+
+				if (typeof fieldId === 'object' && fieldId !== null && 'value' in fieldId) {
+					return {
+						id: fieldId.value,
+						key: fieldId.cachedResultName ?? 'default_key',
+						field_value: typedField.fieldValue,
+					};
+				} else {
+					throw new ApplicationError('Error processing custom fields.');
+				}
+			});
+			requestBody.customFields = formattedCustomFields;
+		}
+	}
+
+	return requestOptions;
 }
diff --git a/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts b/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
index cb596319f9..be9ee5d4f7 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/HighLevelV2.node.ts
@@ -1,4 +1,8 @@
 import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
 	INodeProperties,
 	INodeType,
 	INodeTypeBaseDescription,
@@ -6,6 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
+import { calendarFields, calendarOperations } from './description/CalendarDescription';
 import { contactFields, contactNotes, contactOperations } from './description/ContactDescription';
 import { opportunityFields, opportunityOperations } from './description/OpportunityDescription';
 import { taskFields, taskOperations } from './description/TaskDescription';
@@ -13,7 +18,6 @@ import {
 	getContacts,
 	getPipelines,
 	getPipelineStages,
-	getTimezones,
 	getUsers,
 	highLevelApiPagination,
 } from './GenericFunctions';
@@ -37,6 +41,10 @@ const resources: INodeProperties[] = [
 				name: 'Task',
 				value: 'task',
 			},
+			{
+				name: 'Calendar',
+				value: 'calendar',
+			},
 		],
 		default: 'contact',
 		required: true,
@@ -82,6 +90,8 @@ const versionDescription: INodeTypeDescription = {
 		...opportunityFields,
 		...taskOperations,
 		...taskFields,
+		...calendarOperations,
+		...calendarFields,
 	],
 };
 
@@ -101,7 +111,82 @@ export class HighLevelV2 implements INodeType {
 			getContacts,
 			getPipelineStages,
 			getUsers,
-			getTimezones,
+		},
+		listSearch: {
+			async searchCustomFields(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+			): Promise<INodeListSearchResult> {
+				const { locationId } =
+					((await this.getCredentials('highLevelOAuth2Api'))?.oauthTokenData as IDataObject) ?? {};
+
+				const responseData: IDataObject = (await this.helpers.httpRequestWithAuthentication.call(
+					this,
+					'highLevelOAuth2Api',
+					{
+						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+						url: `https://services.leadconnectorhq.com/locations/${locationId}/customFields?model=contact`,
+						headers: {
+							Accept: 'application/json',
+							'Content-Type': 'application/json',
+							Version: '2021-07-28',
+						},
+					},
+				)) as IDataObject;
+
+				const customFields = responseData.customFields as Array<{ name: string; id: string }>;
+
+				const results: INodeListSearchItems[] = customFields
+					.map((a) => ({
+						name: a.name,
+						value: a.id,
+					}))
+					.filter((a) => !filter || a.name.toLowerCase().includes(filter.toLowerCase()))
+					.sort((a, b) => {
+						if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
+						if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
+						return 0;
+					});
+
+				return { results };
+			},
+			async searchTimezones(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+			): Promise<INodeListSearchResult> {
+				const { locationId } =
+					((await this.getCredentials('highLevelOAuth2Api'))?.oauthTokenData as IDataObject) ?? {};
+
+				const responseData: IDataObject = (await this.helpers.httpRequestWithAuthentication.call(
+					this,
+					'highLevelOAuth2Api',
+					{
+						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+						url: `https://services.leadconnectorhq.com/locations/${locationId}/timezones`,
+						headers: {
+							Accept: 'application/json',
+							'Content-Type': 'application/json',
+							Version: '2021-07-28',
+						},
+					},
+				)) as IDataObject;
+
+				const timezones = responseData.timeZones as string[];
+
+				const results: INodeListSearchItems[] = timezones
+					.map((zone) => ({
+						name: zone.trim(),
+						value: zone.trim(),
+					}))
+					.filter((zone) => !filter || zone.name.toLowerCase().includes(filter.toLowerCase()))
+					.sort((a, b) => {
+						if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
+						if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
+						return 0;
+					});
+
+				return { results };
+			},
 		},
 	};
 }
diff --git a/packages/nodes-base/nodes/HighLevel/v2/description/CalendarDescription.ts b/packages/nodes-base/nodes/HighLevel/v2/description/CalendarDescription.ts
new file mode 100644
index 0000000000..a30f2d0f03
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/description/CalendarDescription.ts
@@ -0,0 +1,387 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const calendarOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+			},
+		},
+		options: [
+			{
+				name: 'Book Appointment',
+				value: 'bookAppointment',
+				action: 'Book appointment in a calendar',
+				routing: {
+					request: {
+						method: 'POST',
+						url: '=/calendars/events/appointments',
+					},
+				},
+			},
+			{
+				name: 'Get Free Slots',
+				value: 'getFreeSlots',
+				action: 'Get free slots of a calendar',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '=/calendars/{{$parameter.calendarId}}/free-slots',
+					},
+				},
+			},
+		],
+		default: 'bookAppointment',
+		noDataExpression: true,
+	},
+];
+
+const bookAppointmentProperties: INodeProperties[] = [
+	{
+		displayName: 'Calendar ID',
+		name: 'calendarId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				type: 'body',
+				property: 'calendarId',
+			},
+		},
+	},
+	{
+		displayName: 'Location ID',
+		name: 'locationId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				type: 'body',
+				property: 'locationId',
+			},
+		},
+	},
+	{
+		displayName: 'Contact ID',
+		name: 'contactId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				type: 'body',
+				property: 'contactId',
+			},
+		},
+	},
+	{
+		displayName: 'Start Time',
+		name: 'startTime',
+		type: 'string',
+		required: true,
+		description: 'Example: 2021-06-23T03:30:00+05:30',
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		default: '',
+		routing: {
+			send: {
+				type: 'body',
+				property: 'startTime',
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['bookAppointment'],
+			},
+		},
+		options: [
+			{
+				displayName: 'End Time',
+				name: 'endTime',
+				type: 'string',
+				description: 'Example: 2021-06-23T04:30:00+05:30',
+				default: '',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'endTime',
+					},
+				},
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'title',
+					},
+				},
+			},
+			{
+				displayName: 'Appointment Status',
+				name: 'appointmentStatus',
+				type: 'options',
+				default: 'new',
+				description:
+					'The status of the appointment. Allowed values: new, confirmed, cancelled, showed, noshow, invalid.',
+				options: [
+					{
+						name: 'Cancelled',
+						value: 'cancelled',
+					},
+					{
+						name: 'Confirmed',
+						value: 'confirmed',
+					},
+					{
+						name: 'Invalid',
+						value: 'invalid',
+					},
+					{
+						name: 'New',
+						value: 'new',
+					},
+					{
+						name: 'No Show',
+						value: 'noshow',
+					},
+					{
+						name: 'Showed',
+						value: 'showed',
+					},
+				],
+				routing: {
+					send: {
+						type: 'body',
+						property: 'appointmentStatus',
+					},
+				},
+			},
+			{
+				displayName: 'Assigned User ID',
+				name: 'assignedUserId',
+				type: 'string',
+				default: '',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'assignedUserId',
+					},
+				},
+			},
+			{
+				displayName: 'Address',
+				name: 'address',
+				type: 'string',
+				default: '',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'address',
+					},
+				},
+			},
+			{
+				displayName: 'Ignore Date Range',
+				name: 'ignoreDateRange',
+				type: 'boolean',
+				default: false,
+				routing: {
+					send: {
+						type: 'body',
+						property: 'ignoreDateRange',
+					},
+				},
+			},
+			{
+				displayName: 'Notify',
+				name: 'toNotify',
+				type: 'boolean',
+				default: true,
+				routing: {
+					send: {
+						type: 'body',
+						property: 'toNotify',
+					},
+				},
+			},
+		],
+	},
+];
+
+const getFreeSlotsProperties: INodeProperties[] = [
+	{
+		displayName: 'Calendar ID',
+		name: 'calendarId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['getFreeSlots'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Start Date',
+		name: 'startDate',
+		type: 'number',
+		//type: 'dateTime' TODO
+		default: '',
+		required: true,
+		description: 'The start date for fetching free calendar slots. Example: 1548898600000.',
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['getFreeSlots'],
+			},
+		},
+		routing: {
+			send: {
+				type: 'query',
+				property: 'startDate',
+			},
+		},
+	},
+	{
+		displayName: 'End Date',
+		name: 'endDate',
+		type: 'number',
+		//type: 'dateTime' TODO
+		default: '',
+		required: true,
+		description: 'The end date for fetching free calendar slots. Example: 1601490599999.',
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['getFreeSlots'],
+			},
+		},
+		routing: {
+			send: {
+				type: 'query',
+				property: 'endDate',
+			},
+		},
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['calendar'],
+				operation: ['getFreeSlots'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Timezone',
+				name: 'timezone',
+				type: 'string',
+				default: '',
+				description: 'The timezone to use for the returned slots. Example: America/Chihuahua.',
+				routing: {
+					send: {
+						type: 'query',
+						property: 'timezone',
+					},
+				},
+			},
+			{
+				displayName: 'User ID',
+				name: 'userId',
+				type: 'string',
+				default: '',
+				description: 'User ID to filter the slots (optional)',
+				routing: {
+					send: {
+						type: 'query',
+						property: 'userId',
+					},
+				},
+			},
+			{
+				displayName: 'User IDs',
+				name: 'userIds',
+				type: 'collection',
+				default: {},
+				options: [
+					{
+						displayName: 'User IDs',
+						name: 'userIds',
+						type: 'string',
+						default: '',
+						description: 'Comma-separated list of user IDs to filter the slots',
+						routing: {
+							send: {
+								type: 'query',
+								property: 'userIds',
+							},
+						},
+					},
+				],
+			},
+			{
+				displayName: 'Apply Look Busy',
+				name: 'enableLookBusy',
+				type: 'boolean',
+				default: false,
+				// eslint-disable-next-line n8n-nodes-base/node-param-description-boolean-without-whether
+				description: 'Apply Look Busy to the slots',
+				routing: {
+					send: {
+						type: 'query',
+						property: 'enableLookBusy',
+					},
+				},
+			},
+		],
+	},
+];
+
+export const calendarFields: INodeProperties[] = [
+	...bookAppointmentProperties,
+	...getFreeSlotsProperties,
+];
diff --git a/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts b/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
index f3f7bc8e98..770d2ed26e 100644
--- a/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
+++ b/packages/nodes-base/nodes/HighLevel/v2/description/ContactDescription.ts
@@ -1,6 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import {
+	addCustomFieldsPreSendAction,
 	addLocationIdPreSendAction,
+	addNotePostReceiveAction,
 	splitTagsPreSendAction,
 	validEmailAndPhonePreSendAction,
 } from '../GenericFunctions';
@@ -30,6 +33,7 @@ export const contactOperations: INodeProperties[] = [
 							validEmailAndPhonePreSendAction,
 							splitTagsPreSendAction,
 							addLocationIdPreSendAction,
+							addCustomFieldsPreSendAction,
 						],
 					},
 					output: {
@@ -40,6 +44,7 @@ export const contactOperations: INodeProperties[] = [
 									property: 'contact',
 								},
 							},
+							addNotePostReceiveAction,
 						],
 					},
 				},
@@ -164,44 +169,27 @@ const customFields: INodeProperties = {
 				{
 					displayName: 'Field Name or ID',
 					name: 'fieldId',
-					type: 'options',
 					required: true,
+					type: 'resourceLocator',
 					default: '',
-					description:
-						'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-					typeOptions: {
-						loadOptions: {
-							routing: {
-								request: {
-									url: '/custom-fields',
-									method: 'GET',
-								},
-								output: {
-									postReceive: [
-										{
-											type: 'rootProperty',
-											properties: {
-												property: 'customFields',
-											},
-										},
-										{
-											type: 'setKeyValue',
-											properties: {
-												name: '={{$responseItem.name}}',
-												value: '={{$responseItem.id}}',
-											},
-										},
-										{
-											type: 'sort',
-											properties: {
-												key: 'name',
-											},
-										},
-									],
-								},
+					description: 'Choose from the list, or specify an ID using an expression',
+					modes: [
+						{
+							displayName: 'List',
+							name: 'list',
+							type: 'list',
+							typeOptions: {
+								searchListMethod: 'searchCustomFields',
+								searchable: true,
 							},
 						},
-					},
+						{
+							displayName: 'ID',
+							name: 'id',
+							type: 'string',
+							placeholder: 'Enter Custom Field ID',
+						},
+					],
 				},
 				{
 					displayName: 'Field Value',
@@ -210,15 +198,22 @@ const customFields: INodeProperties = {
 					default: '',
 					routing: {
 						send: {
-							value: '={{$value}}',
-							property: '=customField.{{$parent.fieldId}}',
 							type: 'body',
+							property: 'customFields',
+							value:
+								'={{ $parent.values.map(field => ({ fieldId: { id: field.fieldId.id }, field_value: field.fieldValue })) }}',
 						},
 					},
 				},
 			],
 		},
 	],
+	routing: {
+		send: {
+			type: 'body',
+			property: 'customFields',
+		},
+	},
 };
 
 const createProperties: INodeProperties[] = [
@@ -390,6 +385,12 @@ const createProperties: INodeProperties[] = [
 					},
 				},
 			},
+			{
+				displayName: 'Note',
+				name: 'notes',
+				type: 'string',
+				default: '',
+			},
 			{
 				displayName: 'Tags',
 				name: 'tags',
@@ -404,16 +405,29 @@ const createProperties: INodeProperties[] = [
 				},
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
 				displayName: 'Timezone',
 				name: 'timezone',
-				type: 'options',
+				placeholder: 'Select Timezone',
+				type: 'resourceLocator',
 				default: '',
-				description:
-					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getTimezones',
-				},
+				description: 'Choose from the list, or specify a timezone using an expression',
+				modes: [
+					{
+						displayName: 'List',
+						name: 'list',
+						type: 'list',
+						typeOptions: {
+							searchListMethod: 'searchTimezones',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+						placeholder: 'Enter Timezone ID',
+					},
+				],
 				routing: {
 					send: {
 						type: 'body',
@@ -607,16 +621,29 @@ const updateProperties: INodeProperties[] = [
 				},
 			},
 			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-options
 				displayName: 'Timezone',
 				name: 'timezone',
-				type: 'options',
+				placeholder: 'Select Timezone',
+				type: 'resourceLocator',
 				default: '',
-				description:
-					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-				typeOptions: {
-					loadOptionsMethod: 'getTimezones',
-				},
+				description: 'Choose from the list, or specify a timezone using an expression',
+				modes: [
+					{
+						displayName: 'List',
+						name: 'list',
+						type: 'list',
+						typeOptions: {
+							searchListMethod: 'searchTimezones',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'ID',
+						name: 'id',
+						type: 'string',
+						placeholder: 'Enter Timezone ID',
+					},
+				],
 				routing: {
 					send: {
 						type: 'body',
@@ -699,9 +726,8 @@ const getAllProperties: INodeProperties[] = [
 		},
 		typeOptions: {
 			minValue: 1,
-			maxValue: 100,
 		},
-		default: 20,
+		default: 50,
 		routing: {
 			send: {
 				type: 'query',
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/AddCustomFieldsPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/AddCustomFieldsPreSendAction.test.ts
new file mode 100644
index 0000000000..6d77177703
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/AddCustomFieldsPreSendAction.test.ts
@@ -0,0 +1,98 @@
+import type { IDataObject, IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { addCustomFieldsPreSendAction } from '../GenericFunctions';
+
+describe('addCustomFieldsPreSendAction', () => {
+	let mockThis: any;
+
+	beforeEach(() => {
+		mockThis = {
+			helpers: {
+				httpRequest: jest.fn(),
+				httpRequestWithAuthentication: jest.fn(),
+				requestWithAuthenticationPaginated: jest.fn(),
+				request: jest.fn(),
+				requestWithAuthentication: jest.fn(),
+				requestOAuth1: jest.fn(),
+				requestOAuth2: jest.fn(),
+				assertBinaryData: jest.fn(),
+				getBinaryDataBuffer: jest.fn(),
+				prepareBinaryData: jest.fn(),
+				setBinaryDataBuffer: jest.fn(),
+				copyBinaryFile: jest.fn(),
+				binaryToBuffer: jest.fn(),
+				binaryToString: jest.fn(),
+				getBinaryPath: jest.fn(),
+				getBinaryStream: jest.fn(),
+				getBinaryMetadata: jest.fn(),
+				createDeferredPromise: jest
+					.fn()
+					.mockReturnValue({ promise: Promise.resolve(), resolve: jest.fn(), reject: jest.fn() }),
+			},
+		};
+	});
+
+	it('should format custom fields correctly when provided', async () => {
+		const mockRequestOptions: IHttpRequestOptions = {
+			body: {
+				customFields: {
+					values: [
+						{
+							fieldId: { value: '123', cachedResultName: 'FieldName' },
+							fieldValue: 'TestValue',
+						},
+						{
+							fieldId: { value: '456' },
+							fieldValue: 'AnotherValue',
+						},
+					],
+				},
+			} as IDataObject,
+			url: '',
+		};
+
+		const result = await addCustomFieldsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			mockRequestOptions,
+		);
+
+		expect((result.body as IDataObject).customFields).toEqual([
+			{ id: '123', key: 'FieldName', field_value: 'TestValue' },
+			{ id: '456', key: 'default_key', field_value: 'AnotherValue' },
+		]);
+	});
+
+	it('should not modify request body if customFields is not provided', async () => {
+		const mockRequestOptions: IHttpRequestOptions = {
+			body: {
+				otherField: 'SomeValue',
+			} as IDataObject,
+			url: '',
+		};
+
+		const result = await addCustomFieldsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			mockRequestOptions,
+		);
+
+		expect(result).toEqual(mockRequestOptions);
+	});
+
+	it('should handle customFields with empty values', async () => {
+		const mockRequestOptions: IHttpRequestOptions = {
+			body: {
+				customFields: {
+					values: [],
+				},
+			} as IDataObject,
+			url: '',
+		};
+
+		const result = await addCustomFieldsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			mockRequestOptions,
+		);
+
+		expect((result.body as IDataObject).customFields).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/AddLocationIdPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/AddLocationIdPreSendAction.test.ts
new file mode 100644
index 0000000000..608a454cb3
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/AddLocationIdPreSendAction.test.ts
@@ -0,0 +1,125 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { addLocationIdPreSendAction } from '../GenericFunctions';
+
+describe('addLocationIdPreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {
+			getNodeParameter: jest.fn(),
+			getCredentials: jest.fn(),
+		};
+	});
+
+	it('should add locationId to query parameters for contact getAll operation', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('contact')
+			.mockReturnValueOnce('getAll');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({ locationId: '123' });
+	});
+
+	it('should add locationId to the body for contact create operation', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('contact')
+			.mockReturnValueOnce('create');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ locationId: '123' });
+	});
+
+	it('should add locationId to query parameters for opportunity getAll operation', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('opportunity')
+			.mockReturnValueOnce('getAll');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({ location_id: '123' });
+	});
+
+	it('should add locationId to the body for opportunity create operation', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('opportunity')
+			.mockReturnValueOnce('create');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ locationId: '123' });
+	});
+
+	it('should not modify requestOptions if no resource or operation matches', async () => {
+		(mockThis.getNodeParameter as jest.Mock)
+			.mockReturnValueOnce('unknown')
+			.mockReturnValueOnce('unknown');
+
+		(mockThis.getCredentials as jest.Mock).mockResolvedValue({
+			oauthTokenData: { locationId: '123' },
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+			qs: {},
+		};
+
+		const result = await addLocationIdPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/AddNotePostReceiveAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/AddNotePostReceiveAction.test.ts
new file mode 100644
index 0000000000..77c790782e
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/AddNotePostReceiveAction.test.ts
@@ -0,0 +1,116 @@
+import { highLevelApiRequest } from '../GenericFunctions';
+
+describe('GenericFunctions - highLevelApiRequest', () => {
+	let mockContext: any;
+	let mockHttpRequestWithAuthentication: jest.Mock;
+
+	beforeEach(() => {
+		mockHttpRequestWithAuthentication = jest.fn();
+		mockContext = {
+			helpers: {
+				httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+			},
+		};
+	});
+
+	test('should make a successful request with all parameters', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'POST';
+		const resource = '/example-resource';
+		const body = { key: 'value' };
+		const qs = { query: 'test' };
+		const url = 'https://custom-url.example.com/api';
+		const option = { headers: { Authorization: 'Bearer test-token' } };
+
+		const result = await highLevelApiRequest.call(
+			mockContext,
+			method,
+			resource,
+			body,
+			qs,
+			url,
+			option,
+		);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: { Authorization: 'Bearer test-token' },
+			method: 'POST',
+			body: { key: 'value' },
+			qs: { query: 'test' },
+			url: 'https://custom-url.example.com/api',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should default to the base URL when no custom URL is provided', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'GET';
+		const resource = '/default-resource';
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'GET',
+			url: 'https://services.leadconnectorhq.com/default-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should remove the body property if it is empty', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'DELETE';
+		const resource = '/example-resource';
+		const body = {};
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource, body);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'DELETE',
+			url: 'https://services.leadconnectorhq.com/example-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should remove the query string property if it is empty', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'PATCH';
+		const resource = '/example-resource';
+		const qs = {};
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource, {}, qs);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'PATCH',
+			url: 'https://services.leadconnectorhq.com/example-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/ContactIdentifierPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/ContactIdentifierPreSendAction.test.ts
new file mode 100644
index 0000000000..f2c7bb1672
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/ContactIdentifierPreSendAction.test.ts
@@ -0,0 +1,130 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions, INode } from 'n8n-workflow';
+
+import { contactIdentifierPreSendAction, isEmailValid, isPhoneValid } from '../GenericFunctions';
+
+jest.mock('../GenericFunctions', () => ({
+	...jest.requireActual('../GenericFunctions'),
+	isEmailValid: jest.fn(),
+	isPhoneValid: jest.fn(),
+}));
+
+describe('contactIdentifierPreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {
+			getNode: jest.fn(
+				() =>
+					({
+						id: 'mock-node-id',
+						name: 'mock-node',
+						typeVersion: 1,
+						type: 'n8n-nodes-base.mockNode',
+						position: [0, 0],
+						parameters: {},
+					}) as INode,
+			),
+			getNodeParameter: jest.fn((parameterName: string) => {
+				if (parameterName === 'contactIdentifier') return null;
+				if (parameterName === 'updateFields') return { contactIdentifier: 'default-identifier' };
+				return undefined;
+			}),
+		};
+	});
+
+	it('should add email to requestOptions.body if identifier is a valid email', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(true);
+		(isPhoneValid as jest.Mock).mockReturnValue(false);
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValue('valid@example.com'); // Mock email
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ email: 'valid@example.com' });
+	});
+
+	it('should add phone to requestOptions.body if identifier is a valid phone', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(false);
+		(isPhoneValid as jest.Mock).mockReturnValue(true);
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValue('1234567890'); // Mock phone
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ phone: '1234567890' });
+	});
+
+	it('should add contactId to requestOptions.body if identifier is neither email nor phone', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(false);
+		(isPhoneValid as jest.Mock).mockReturnValue(false);
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValue('contact-id-123'); // Mock contactId
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ contactId: 'contact-id-123' });
+	});
+
+	it('should use updateFields.contactIdentifier if contactIdentifier is not provided', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(true);
+		(isPhoneValid as jest.Mock).mockReturnValue(false);
+
+		(mockThis.getNodeParameter as jest.Mock).mockImplementation((parameterName: string) => {
+			if (parameterName === 'contactIdentifier') return null;
+			if (parameterName === 'updateFields')
+				return { contactIdentifier: 'default-email@example.com' };
+			return undefined;
+		});
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ email: 'default-email@example.com' });
+	});
+
+	it('should initialize body as an empty object if it is undefined', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(false);
+		(isPhoneValid as jest.Mock).mockReturnValue(false);
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValue('identifier-123');
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: undefined,
+		};
+
+		const result = await contactIdentifierPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({ contactId: 'identifier-123' });
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/DateTimeToEpochPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/DateTimeToEpochPreSendAction.test.ts
new file mode 100644
index 0000000000..6816504641
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/DateTimeToEpochPreSendAction.test.ts
@@ -0,0 +1,95 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { dateTimeToEpochPreSendAction } from '../GenericFunctions';
+
+describe('dateTimeToEpochPreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {};
+	});
+
+	it('should convert startDate and endDate to epoch time', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {
+				startDate: '2024-12-25T00:00:00Z',
+				endDate: '2024-12-26T00:00:00Z',
+			},
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({
+			startDate: new Date('2024-12-25T00:00:00Z').getTime(),
+			endDate: new Date('2024-12-26T00:00:00Z').getTime(),
+		});
+	});
+
+	it('should convert only startDate if endDate is not provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {
+				startDate: '2024-12-25T00:00:00Z',
+			},
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({
+			startDate: new Date('2024-12-25T00:00:00Z').getTime(),
+		});
+	});
+
+	it('should convert only endDate if startDate is not provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {
+				endDate: '2024-12-26T00:00:00Z',
+			},
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.qs).toEqual({
+			endDate: new Date('2024-12-26T00:00:00Z').getTime(),
+		});
+	});
+
+	it('should not modify requestOptions if neither startDate nor endDate are provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: {},
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should not modify requestOptions if qs is undefined', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			qs: undefined,
+		};
+
+		const result = await dateTimeToEpochPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/DateToIsoSuperssMillis.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/DateToIsoSuperssMillis.test.ts
new file mode 100644
index 0000000000..c015908a9c
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/DateToIsoSuperssMillis.test.ts
@@ -0,0 +1,33 @@
+import { dateToIsoSupressMillis } from '../GenericFunctions';
+
+describe('dateToIsoSupressMillis', () => {
+	it('should return an ISO string without milliseconds (UTC)', () => {
+		const dateTime = '2024-12-25T10:15:30.123Z';
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBe('2024-12-25T10:15:30.123+00:00');
+	});
+
+	it('should handle dates without milliseconds correctly', () => {
+		const dateTime = '2024-12-25T10:15:30Z';
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBe('2024-12-25T10:15:30+00:00');
+	});
+
+	it('should handle time zone offsets correctly', () => {
+		const dateTime = '2024-12-25T10:15:30.123+02:00';
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBe('2024-12-25T08:15:30.123+00:00');
+	});
+
+	it('should handle edge case for empty input', () => {
+		const dateTime = '';
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBeNull();
+	});
+
+	it('should handle edge case for null input', () => {
+		const dateTime = null as unknown as string;
+		const result = dateToIsoSupressMillis(dateTime);
+		expect(result).toBeNull();
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/DueDatePreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/DueDatePreSendAction.test.ts
new file mode 100644
index 0000000000..1b68bb6206
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/DueDatePreSendAction.test.ts
@@ -0,0 +1,62 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions, INode } from 'n8n-workflow';
+
+import { dueDatePreSendAction } from '../GenericFunctions';
+
+describe('dueDatePreSendAction', () => {
+	let mockThis: IExecuteSingleFunctions;
+
+	beforeEach(() => {
+		mockThis = {
+			getNode: jest.fn(
+				() =>
+					({
+						id: 'mock-node-id',
+						name: 'mock-node',
+						typeVersion: 1,
+						type: 'n8n-nodes-base.mockNode',
+						position: [0, 0],
+						parameters: {},
+					}) as INode,
+			),
+			getNodeParameter: jest.fn(),
+			getInputData: jest.fn(),
+			helpers: {} as any,
+		} as unknown as IExecuteSingleFunctions;
+
+		jest.clearAllMocks();
+	});
+
+	it('should add formatted dueDate to requestOptions.body if dueDate is provided directly', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('2024-12-25');
+
+		const requestOptions: IHttpRequestOptions = { url: 'https://example.com/api' };
+
+		const result = await dueDatePreSendAction.call(mockThis, requestOptions);
+
+		expect(result.body).toEqual({ dueDate: '2024-12-25T00:00:00+00:00' });
+	});
+
+	it('should add formatted dueDate to requestOptions.body if dueDate is provided in updateFields', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+			if (paramName === 'dueDate') return null;
+			if (paramName === 'updateFields') return { dueDate: '2024-12-25' };
+			return undefined;
+		});
+
+		const requestOptions: IHttpRequestOptions = { url: 'https://example.com/api' };
+
+		const result = await dueDatePreSendAction.call(mockThis, requestOptions);
+
+		expect(result.body).toEqual({ dueDate: '2024-12-25T00:00:00+00:00' });
+	});
+
+	it('should initialize body as an empty object if it is undefined', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('2024-12-25');
+
+		const requestOptions: IHttpRequestOptions = { url: 'https://example.com/api', body: undefined };
+
+		const result = await dueDatePreSendAction.call(mockThis, requestOptions);
+
+		expect(result.body).toEqual({ dueDate: '2024-12-25T00:00:00+00:00' });
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/GetContacts.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/GetContacts.test.ts
new file mode 100644
index 0000000000..a432bf315b
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/GetContacts.test.ts
@@ -0,0 +1,45 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { getContacts } from '../GenericFunctions';
+
+describe('getContacts', () => {
+	const mockHighLevelApiRequest = jest.fn();
+	const mockGetCredentials = jest.fn();
+	const mockContext = {
+		getCredentials: mockGetCredentials,
+		helpers: {
+			httpRequestWithAuthentication: mockHighLevelApiRequest,
+		},
+	} as unknown as ILoadOptionsFunctions;
+
+	beforeEach(() => {
+		mockHighLevelApiRequest.mockClear();
+		mockGetCredentials.mockClear();
+	});
+
+	it('should return a list of contacts', async () => {
+		const mockContacts = [
+			{ id: '1', name: 'Alice', email: 'alice@example.com' },
+			{ id: '2', name: 'Bob', email: 'bob@example.com' },
+		];
+
+		mockHighLevelApiRequest.mockResolvedValue({ contacts: mockContacts });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getContacts.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'alice@example.com', value: '1' },
+			{ name: 'bob@example.com', value: '2' },
+		]);
+	});
+
+	it('should handle empty contacts list', async () => {
+		mockHighLevelApiRequest.mockResolvedValue({ contacts: [] });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getContacts.call(mockContext);
+
+		expect(response).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelineStages.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelineStages.test.ts
new file mode 100644
index 0000000000..fa0f534f26
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelineStages.test.ts
@@ -0,0 +1,87 @@
+import { getPipelineStages } from '../GenericFunctions';
+
+const mockHighLevelApiRequest = jest.fn();
+const mockGetNodeParameter = jest.fn();
+const mockGetCurrentNodeParameter = jest.fn();
+const mockGetCredentials = jest.fn();
+
+const mockContext: any = {
+	getNodeParameter: mockGetNodeParameter,
+	getCurrentNodeParameter: mockGetCurrentNodeParameter,
+	getCredentials: mockGetCredentials,
+	helpers: {
+		httpRequestWithAuthentication: mockHighLevelApiRequest,
+	},
+};
+
+describe('getPipelineStages', () => {
+	beforeEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should return pipeline stages for create operation', async () => {
+		mockGetNodeParameter.mockReturnValue('create');
+		mockGetCurrentNodeParameter.mockReturnValue('pipeline-1');
+		mockHighLevelApiRequest.mockResolvedValue({
+			pipelines: [
+				{
+					id: 'pipeline-1',
+					stages: [
+						{ id: 'stage-1', name: 'Stage 1' },
+						{ id: 'stage-2', name: 'Stage 2' },
+					],
+				},
+			],
+		});
+
+		const response = await getPipelineStages.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'Stage 1', value: 'stage-1' },
+			{ name: 'Stage 2', value: 'stage-2' },
+		]);
+	});
+
+	it('should return pipeline stages for update operation', async () => {
+		mockGetNodeParameter.mockImplementation((param) => {
+			if (param === 'operation') return 'update';
+			if (param === 'updateFields.pipelineId') return 'pipeline-2';
+		});
+
+		mockHighLevelApiRequest.mockResolvedValue({
+			pipelines: [
+				{
+					id: 'pipeline-2',
+					stages: [
+						{ id: 'stage-3', name: 'Stage 3' },
+						{ id: 'stage-4', name: 'Stage 4' },
+					],
+				},
+			],
+		});
+
+		const response = await getPipelineStages.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'Stage 3', value: 'stage-3' },
+			{ name: 'Stage 4', value: 'stage-4' },
+		]);
+	});
+
+	it('should return an empty array if pipeline is not found', async () => {
+		mockGetNodeParameter.mockReturnValue('create');
+		mockGetCurrentNodeParameter.mockReturnValue('non-existent-pipeline');
+		mockHighLevelApiRequest.mockResolvedValue({
+			pipelines: [
+				{
+					id: 'pipeline-1',
+					stages: [{ id: 'stage-1', name: 'Stage 1' }],
+				},
+			],
+		});
+
+		const response = await getPipelineStages.call(mockContext);
+
+		expect(response).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelines.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelines.test.ts
new file mode 100644
index 0000000000..3c86568dff
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/GetPipelines.test.ts
@@ -0,0 +1,45 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { getPipelines } from '../GenericFunctions';
+
+describe('getPipelines', () => {
+	const mockHighLevelApiRequest = jest.fn();
+	const mockGetCredentials = jest.fn();
+	const mockContext = {
+		getCredentials: mockGetCredentials,
+		helpers: {
+			httpRequestWithAuthentication: mockHighLevelApiRequest,
+		},
+	} as unknown as ILoadOptionsFunctions;
+
+	beforeEach(() => {
+		mockHighLevelApiRequest.mockClear();
+		mockGetCredentials.mockClear();
+	});
+
+	it('should return a list of pipelines', async () => {
+		const mockPipelines = [
+			{ id: '1', name: 'Pipeline A' },
+			{ id: '2', name: 'Pipeline B' },
+		];
+
+		mockHighLevelApiRequest.mockResolvedValue({ pipelines: mockPipelines });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getPipelines.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'Pipeline A', value: '1' },
+			{ name: 'Pipeline B', value: '2' },
+		]);
+	});
+
+	it('should handle empty pipelines list', async () => {
+		mockHighLevelApiRequest.mockResolvedValue({ pipelines: [] });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getPipelines.call(mockContext);
+
+		expect(response).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/GetUsers.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/GetUsers.test.ts
new file mode 100644
index 0000000000..a60335d20b
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/GetUsers.test.ts
@@ -0,0 +1,45 @@
+import type { ILoadOptionsFunctions } from 'n8n-workflow';
+
+import { getUsers } from '../GenericFunctions';
+
+describe('getUsers', () => {
+	const mockHighLevelApiRequest = jest.fn();
+	const mockGetCredentials = jest.fn();
+	const mockContext = {
+		getCredentials: mockGetCredentials,
+		helpers: {
+			httpRequestWithAuthentication: mockHighLevelApiRequest,
+		},
+	} as unknown as ILoadOptionsFunctions;
+
+	beforeEach(() => {
+		mockHighLevelApiRequest.mockClear();
+		mockGetCredentials.mockClear();
+	});
+
+	it('should return a list of users', async () => {
+		const mockUsers = [
+			{ id: '1', name: 'John Doe', email: 'john.doe@example.com' },
+			{ id: '2', name: 'Jane Smith', email: 'jane.smith@example.com' },
+		];
+
+		mockHighLevelApiRequest.mockResolvedValue({ users: mockUsers });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getUsers.call(mockContext);
+
+		expect(response).toEqual([
+			{ name: 'John Doe', value: '1' },
+			{ name: 'Jane Smith', value: '2' },
+		]);
+	});
+
+	it('should handle empty users list', async () => {
+		mockHighLevelApiRequest.mockResolvedValue({ users: [] });
+		mockGetCredentials.mockResolvedValue({ oauthTokenData: { locationId: '123' } });
+
+		const response = await getUsers.call(mockContext);
+
+		expect(response).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiPagination.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiPagination.test.ts
new file mode 100644
index 0000000000..297856eac9
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiPagination.test.ts
@@ -0,0 +1,103 @@
+import type { IExecutePaginationFunctions } from 'n8n-workflow';
+
+import { highLevelApiPagination } from '../GenericFunctions';
+
+describe('highLevelApiPagination', () => {
+	let mockContext: Partial<IExecutePaginationFunctions>;
+
+	beforeEach(() => {
+		mockContext = {
+			getNodeParameter: jest.fn(),
+			makeRoutingRequest: jest.fn(),
+		};
+	});
+
+	it('should paginate and return all items when returnAll is true', async () => {
+		(mockContext.getNodeParameter as jest.Mock).mockImplementation((parameter) => {
+			if (parameter === 'resource') return 'contact';
+			if (parameter === 'returnAll') return true;
+		});
+
+		(mockContext.makeRoutingRequest as jest.Mock)
+			.mockResolvedValueOnce([
+				{
+					json: {
+						contacts: [{ id: '1' }, { id: '2' }],
+						meta: { startAfterId: '2', startAfter: 2, total: 4 },
+					},
+				},
+			])
+			.mockResolvedValueOnce([
+				{
+					json: {
+						contacts: [{ id: '3' }, { id: '4' }],
+						meta: { startAfterId: null, startAfter: null, total: 4 },
+					},
+				},
+			]);
+
+		const requestData = { options: { qs: {} } } as any;
+
+		const result = await highLevelApiPagination.call(
+			mockContext as IExecutePaginationFunctions,
+			requestData,
+		);
+
+		expect(result).toEqual([
+			{ json: { id: '1' } },
+			{ json: { id: '2' } },
+			{ json: { id: '3' } },
+			{ json: { id: '4' } },
+		]);
+	});
+
+	it('should return only the first page of items when returnAll is false', async () => {
+		(mockContext.getNodeParameter as jest.Mock).mockImplementation((parameter) => {
+			if (parameter === 'resource') return 'contact';
+			if (parameter === 'returnAll') return false;
+		});
+
+		(mockContext.makeRoutingRequest as jest.Mock).mockResolvedValueOnce([
+			{
+				json: {
+					contacts: [{ id: '1' }, { id: '2' }],
+					meta: { startAfterId: '2', startAfter: 2, total: 4 },
+				},
+			},
+		]);
+
+		const requestData = { options: { qs: {} } } as any;
+
+		const result = await highLevelApiPagination.call(
+			mockContext as IExecutePaginationFunctions,
+			requestData,
+		);
+
+		expect(result).toEqual([{ json: { id: '1' } }, { json: { id: '2' } }]);
+	});
+
+	it('should handle cases with no items', async () => {
+		(mockContext.getNodeParameter as jest.Mock).mockImplementation((parameter) => {
+			if (parameter === 'resource') return 'contact';
+			if (parameter === 'returnAll') return true;
+		});
+
+		(mockContext.makeRoutingRequest as jest.Mock).mockResolvedValueOnce([
+			{
+				json: {
+					contacts: [],
+					meta: { startAfterId: null, startAfter: null, total: 0 },
+				},
+			},
+		]);
+
+		const requestData = { options: { qs: {} } } as any;
+
+		const result = await highLevelApiPagination.call(
+			mockContext as IExecutePaginationFunctions,
+			requestData,
+		);
+
+		expect(result).toEqual([]);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiRequest.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiRequest.test.ts
new file mode 100644
index 0000000000..77c790782e
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/HighLevelApiRequest.test.ts
@@ -0,0 +1,116 @@
+import { highLevelApiRequest } from '../GenericFunctions';
+
+describe('GenericFunctions - highLevelApiRequest', () => {
+	let mockContext: any;
+	let mockHttpRequestWithAuthentication: jest.Mock;
+
+	beforeEach(() => {
+		mockHttpRequestWithAuthentication = jest.fn();
+		mockContext = {
+			helpers: {
+				httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+			},
+		};
+	});
+
+	test('should make a successful request with all parameters', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'POST';
+		const resource = '/example-resource';
+		const body = { key: 'value' };
+		const qs = { query: 'test' };
+		const url = 'https://custom-url.example.com/api';
+		const option = { headers: { Authorization: 'Bearer test-token' } };
+
+		const result = await highLevelApiRequest.call(
+			mockContext,
+			method,
+			resource,
+			body,
+			qs,
+			url,
+			option,
+		);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: { Authorization: 'Bearer test-token' },
+			method: 'POST',
+			body: { key: 'value' },
+			qs: { query: 'test' },
+			url: 'https://custom-url.example.com/api',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should default to the base URL when no custom URL is provided', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'GET';
+		const resource = '/default-resource';
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'GET',
+			url: 'https://services.leadconnectorhq.com/default-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should remove the body property if it is empty', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'DELETE';
+		const resource = '/example-resource';
+		const body = {};
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource, body);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'DELETE',
+			url: 'https://services.leadconnectorhq.com/example-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+
+	test('should remove the query string property if it is empty', async () => {
+		const mockResponse = { success: true };
+		mockHttpRequestWithAuthentication.mockResolvedValueOnce(mockResponse);
+
+		const method = 'PATCH';
+		const resource = '/example-resource';
+		const qs = {};
+
+		const result = await highLevelApiRequest.call(mockContext, method, resource, {}, qs);
+
+		expect(mockHttpRequestWithAuthentication).toHaveBeenCalledWith('highLevelOAuth2Api', {
+			headers: {
+				'Content-Type': 'application/json',
+				Version: '2021-07-28',
+			},
+			method: 'PATCH',
+			url: 'https://services.leadconnectorhq.com/example-resource',
+			json: true,
+		});
+
+		expect(result).toEqual(mockResponse);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/IsEmailValid.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/IsEmailValid.test.ts
new file mode 100644
index 0000000000..40c54ad41b
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/IsEmailValid.test.ts
@@ -0,0 +1,63 @@
+import { isEmailValid } from '../GenericFunctions';
+
+describe('isEmailValid', () => {
+	it('should return true for a valid email address', () => {
+		const email = 'test@example.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an invalid email address', () => {
+		const email = 'invalid-email';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return true for an email address with subdomain', () => {
+		const email = 'user@sub.example.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an email address without a domain', () => {
+		const email = 'user@';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for an email address without a username', () => {
+		const email = '@example.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return true for an email address with a plus sign', () => {
+		const email = 'user+alias@example.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an email address with invalid characters', () => {
+		const email = 'user@exa$mple.com';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for an email address without a top-level domain', () => {
+		const email = 'user@example';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+
+	it('should return true for an email address with a valid top-level domain', () => {
+		const email = 'user@example.co.uk';
+		const result = isEmailValid(email);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an empty email string', () => {
+		const email = '';
+		const result = isEmailValid(email);
+		expect(result).toBe(false);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/IsPhoneValid.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/IsPhoneValid.test.ts
new file mode 100644
index 0000000000..d0fef9099c
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/IsPhoneValid.test.ts
@@ -0,0 +1,33 @@
+import { isPhoneValid } from '../GenericFunctions';
+
+describe('isPhoneValid', () => {
+	it('should return true for a valid phone number', () => {
+		const phone = '+1234567890';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(true);
+	});
+
+	it('should return false for an invalid phone number', () => {
+		const phone = 'invalid-phone';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for a phone number with invalid characters', () => {
+		const phone = '+123-abc-456';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for an empty phone number', () => {
+		const phone = '';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(false);
+	});
+
+	it('should return false for a phone number with only special characters', () => {
+		const phone = '!!!@@@###';
+		const result = isPhoneValid(phone);
+		expect(result).toBe(false);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/SplitTagsPreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/SplitTagsPreSendAction.test.ts
new file mode 100644
index 0000000000..0d5a0aa729
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/SplitTagsPreSendAction.test.ts
@@ -0,0 +1,91 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { splitTagsPreSendAction } from '../GenericFunctions';
+
+describe('splitTagsPreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {};
+	});
+
+	it('should return requestOptions unchanged if tags are already an array', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {
+				tags: ['tag1', 'tag2', 'tag3'],
+			},
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should split a comma-separated string of tags into an array', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {
+				tags: 'tag1, tag2, tag3',
+			},
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			tags: ['tag1', 'tag2', 'tag3'],
+		});
+	});
+
+	it('should trim whitespace around tags when splitting a string', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {
+				tags: 'tag1 ,   tag2 , tag3  ',
+			},
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			tags: ['tag1', 'tag2', 'tag3'],
+		});
+	});
+
+	it('should return requestOptions unchanged if tags are not provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should return requestOptions unchanged if body is undefined', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: undefined,
+		};
+
+		const result = await splitTagsPreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/TaskPostReceiceAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/TaskPostReceiceAction.test.ts
new file mode 100644
index 0000000000..8b54b12f54
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/TaskPostReceiceAction.test.ts
@@ -0,0 +1,86 @@
+import type {
+	IExecuteSingleFunctions,
+	INodeExecutionData,
+	IN8nHttpFullResponse,
+} from 'n8n-workflow';
+
+import { taskPostReceiceAction } from '../GenericFunctions';
+
+describe('taskPostReceiceAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {
+			getNodeParameter: jest.fn((parameterName: string) => {
+				if (parameterName === 'contactId') return '12345';
+				return undefined;
+			}),
+		};
+	});
+
+	it('should add contactId to each item in items', async () => {
+		const items: INodeExecutionData[] = [
+			{ json: { field1: 'value1' } },
+			{ json: { field2: 'value2' } },
+		];
+
+		const response: IN8nHttpFullResponse = {
+			body: {},
+			headers: {},
+			statusCode: 200,
+		};
+
+		const result = await taskPostReceiceAction.call(
+			mockThis as IExecuteSingleFunctions,
+			items,
+			response,
+		);
+
+		expect(result).toEqual([
+			{ json: { field1: 'value1', contactId: '12345' } },
+			{ json: { field2: 'value2', contactId: '12345' } },
+		]);
+		expect(mockThis.getNodeParameter).toHaveBeenCalledWith('contactId');
+	});
+
+	it('should not modify other fields in items', async () => {
+		const items: INodeExecutionData[] = [{ json: { name: 'John Doe' } }, { json: { age: 30 } }];
+
+		const response: IN8nHttpFullResponse = {
+			body: {},
+			headers: {},
+			statusCode: 200,
+		};
+
+		const result = await taskPostReceiceAction.call(
+			mockThis as IExecuteSingleFunctions,
+			items,
+			response,
+		);
+
+		expect(result).toEqual([
+			{ json: { name: 'John Doe', contactId: '12345' } },
+			{ json: { age: 30, contactId: '12345' } },
+		]);
+		expect(mockThis.getNodeParameter).toHaveBeenCalledWith('contactId');
+	});
+
+	it('should return an empty array if items is empty', async () => {
+		const items: INodeExecutionData[] = [];
+
+		const response: IN8nHttpFullResponse = {
+			body: {},
+			headers: {},
+			statusCode: 200,
+		};
+
+		const result = await taskPostReceiceAction.call(
+			mockThis as IExecuteSingleFunctions,
+			items,
+			response,
+		);
+
+		expect(result).toEqual([]);
+		expect(mockThis.getNodeParameter).toHaveBeenCalledWith('contactId');
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/TaskUpdatePreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/TaskUpdatePreSendAction.test.ts
new file mode 100644
index 0000000000..3598126af3
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/TaskUpdatePreSendAction.test.ts
@@ -0,0 +1,126 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+import { taskUpdatePreSendAction } from '../GenericFunctions';
+
+describe('taskUpdatePreSendAction', () => {
+	let mockThis: Partial<IExecuteSingleFunctions>;
+
+	beforeEach(() => {
+		mockThis = {
+			getNodeParameter: jest.fn(),
+			helpers: {
+				httpRequestWithAuthentication: jest.fn(),
+			} as any,
+		};
+	});
+
+	it('should not modify requestOptions if title and dueDate are provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://api.example.com',
+			body: {
+				title: 'Task Title',
+				dueDate: '2024-12-25T00:00:00Z',
+			},
+		};
+
+		const result = await taskUpdatePreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should fetch missing title and dueDate from the API', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('123').mockReturnValueOnce('456');
+
+		const mockApiResponse = {
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-25T02:00:00+02:00',
+		};
+
+		(mockThis.helpers?.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			mockApiResponse,
+		);
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://api.example.com',
+			body: {
+				title: undefined,
+				dueDate: undefined,
+			},
+		};
+
+		const result = await taskUpdatePreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-25T00:00:00+00:00',
+		});
+	});
+
+	it('should only fetch title if dueDate is provided', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('123').mockReturnValueOnce('456');
+
+		const mockApiResponse = {
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-25T02:00:00+02:00',
+		};
+
+		(mockThis.helpers?.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			mockApiResponse,
+		);
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://api.example.com',
+			body: {
+				title: undefined,
+				dueDate: '2024-12-24T00:00:00Z',
+			},
+		};
+
+		const result = await taskUpdatePreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-24T00:00:00Z',
+		});
+	});
+
+	it('should only fetch dueDate if title is provided', async () => {
+		(mockThis.getNodeParameter as jest.Mock).mockReturnValueOnce('123').mockReturnValueOnce('456');
+
+		const mockApiResponse = {
+			title: 'Fetched Task Title',
+			dueDate: '2024-12-25T02:00:00+02:00',
+		};
+
+		(mockThis.helpers?.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			mockApiResponse,
+		);
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://api.example.com',
+			body: {
+				title: 'Existing Task Title',
+				dueDate: undefined,
+			},
+		};
+
+		const result = await taskUpdatePreSendAction.call(
+			mockThis as IExecuteSingleFunctions,
+			requestOptions,
+		);
+
+		expect(result.body).toEqual({
+			title: 'Existing Task Title',
+			dueDate: '2024-12-25T00:00:00+00:00',
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/HighLevel/v2/test/ValidEmailAndPhonePreSendAction.test.ts b/packages/nodes-base/nodes/HighLevel/v2/test/ValidEmailAndPhonePreSendAction.test.ts
new file mode 100644
index 0000000000..6a322e0c92
--- /dev/null
+++ b/packages/nodes-base/nodes/HighLevel/v2/test/ValidEmailAndPhonePreSendAction.test.ts
@@ -0,0 +1,70 @@
+import type { IExecuteSingleFunctions, IHttpRequestOptions, INode } from 'n8n-workflow';
+
+import { validEmailAndPhonePreSendAction, isEmailValid, isPhoneValid } from '../GenericFunctions';
+
+jest.mock('../GenericFunctions', () => ({
+	...jest.requireActual('../GenericFunctions'),
+	isEmailValid: jest.fn(),
+	isPhoneValid: jest.fn(),
+}));
+
+describe('validEmailAndPhonePreSendAction', () => {
+	let mockThis: IExecuteSingleFunctions;
+
+	beforeEach(() => {
+		mockThis = {
+			getNode: jest.fn(
+				() =>
+					({
+						id: 'mock-node-id',
+						name: 'mock-node',
+						typeVersion: 1,
+						type: 'n8n-nodes-base.mockNode',
+						position: [0, 0],
+						parameters: {},
+					}) as INode,
+			),
+		} as unknown as IExecuteSingleFunctions;
+
+		jest.clearAllMocks();
+	});
+
+	it('should return requestOptions unchanged if email and phone are valid', async () => {
+		(isEmailValid as jest.Mock).mockReturnValue(true);
+		(isPhoneValid as jest.Mock).mockReturnValue(true);
+
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {
+				email: 'valid@example.com',
+				phone: '+1234567890',
+			},
+		};
+
+		const result = await validEmailAndPhonePreSendAction.call(mockThis, requestOptions);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should not modify requestOptions if no email or phone is provided', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: {},
+		};
+
+		const result = await validEmailAndPhonePreSendAction.call(mockThis, requestOptions);
+
+		expect(result).toEqual(requestOptions);
+	});
+
+	it('should not modify requestOptions if body is undefined', async () => {
+		const requestOptions: IHttpRequestOptions = {
+			url: 'https://example.com/api',
+			body: undefined,
+		};
+
+		const result = await validEmailAndPhonePreSendAction.call(mockThis, requestOptions);
+
+		expect(result).toEqual(requestOptions);
+	});
+});
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
index ef8ad0990d..b68a857ce8 100644
--- a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -12,27 +12,19 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { configOperations } from './ConfigDescription';
-
-import { serviceFields, serviceOperations } from './ServiceDescription';
-
-import { stateFields, stateOperations } from './StateDescription';
-
-import { eventFields, eventOperations } from './EventDescription';
-
-import { logFields, logOperations } from './LogDescription';
-
-import { templateFields, templateOperations } from './TemplateDescription';
-
-import { historyFields, historyOperations } from './HistoryDescription';
-
 import { cameraProxyFields, cameraProxyOperations } from './CameraProxyDescription';
-
+import { configOperations } from './ConfigDescription';
+import { eventFields, eventOperations } from './EventDescription';
 import {
 	getHomeAssistantEntities,
 	getHomeAssistantServices,
 	homeAssistantApiRequest,
 } from './GenericFunctions';
+import { historyFields, historyOperations } from './HistoryDescription';
+import { logFields, logOperations } from './LogDescription';
+import { serviceFields, serviceOperations } from './ServiceDescription';
+import { stateFields, stateOperations } from './StateDescription';
+import { templateFields, templateOperations } from './TemplateDescription';
 
 export class HomeAssistant implements INodeType {
 	description: INodeTypeDescription = {
@@ -222,7 +214,6 @@ export class HomeAssistant implements INodeType {
 						if (Object.entries(serviceAttributes).length) {
 							if (serviceAttributes.attributes !== undefined) {
 								serviceAttributes.attributes.map((attribute) => {
-									// @ts-ignore
 									body[attribute.name as string] = attribute.value;
 								});
 							}
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
index 3d5814244e..8d80ce7928 100644
--- a/packages/nodes-base/nodes/Html/Html.node.ts
+++ b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -1,4 +1,5 @@
 import cheerio from 'cheerio';
+import get from 'lodash/get';
 import type {
 	INodeExecutionData,
 	IExecuteFunctions,
@@ -8,12 +9,13 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import get from 'lodash/get';
-import { placeholder } from './placeholder';
-import { getValue } from './utils';
-import type { IValueData } from './types';
+
 import { getResolvables, sanitizeDataPathKey } from '@utils/utilities';
 
+import { placeholder } from './placeholder';
+import type { IValueData } from './types';
+import { getValue } from './utils';
+
 export const capitalizeHeader = (header: string, capitalize?: boolean) => {
 	if (!capitalize) return header;
 	return header
diff --git a/packages/nodes-base/nodes/Html/utils.ts b/packages/nodes-base/nodes/Html/utils.ts
index 923443b2fe..a22195b0ae 100644
--- a/packages/nodes-base/nodes/Html/utils.ts
+++ b/packages/nodes-base/nodes/Html/utils.ts
@@ -1,5 +1,6 @@
-import type { IDataObject } from 'n8n-workflow';
 import { convert } from 'html-to-text';
+import type { IDataObject } from 'n8n-workflow';
+
 import type { IValueData, Cheerio } from './types';
 
 // The extraction functions
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 719c128a28..b23ab29aef 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -1,4 +1,5 @@
 import cheerio from 'cheerio';
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 type Cheerio = ReturnType<typeof cheerio>;
 
 interface IValueData {
diff --git a/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts b/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
index c7ffe7451c..76e242adfd 100644
--- a/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HttpRequest/GenericFunctions.ts
@@ -1,4 +1,7 @@
-import type { SecureContextOptions } from 'tls';
+import FormData from 'form-data';
+import get from 'lodash/get';
+import isPlainObject from 'lodash/isPlainObject';
+import set from 'lodash/set';
 import {
 	deepCopy,
 	type ICredentialDataDecryptedObject,
@@ -8,14 +11,10 @@ import {
 	type IOAuth2Options,
 	type IRequestOptions,
 } from 'n8n-workflow';
+import type { SecureContextOptions } from 'tls';
 
-import set from 'lodash/set';
-import isPlainObject from 'lodash/isPlainObject';
-
-import FormData from 'form-data';
-import get from 'lodash/get';
-import { formatPrivateKey } from '../../utils/utilities';
 import type { HttpSslAuthCredentials } from './interfaces';
+import { formatPrivateKey } from '../../utils/utilities';
 
 export type BodyParameter = {
 	name: string;
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index 740489f23c..c50d1e5ade 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -1,5 +1,3 @@
-import type { Readable } from 'stream';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -18,6 +16,7 @@ import {
 	removeCircularRefs,
 	NodeConnectionType,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import type { IAuthDataSanitizeKeys } from '../GenericFunctions';
 import { replaceNullValues, sanitizeUiMessage } from '../GenericFunctions';
@@ -196,7 +195,7 @@ export class HttpRequestV1 implements INodeType {
 					required: true,
 				},
 				{
-					displayName: 'Ignore SSL Issues',
+					displayName: 'Ignore SSL Issues (Insecure)',
 					name: 'allowUnauthorizedCerts',
 					type: 'boolean',
 					default: false,
@@ -701,7 +700,6 @@ export class HttpRequestV1 implements INodeType {
 			} satisfies IRequestOptions;
 
 			if (fullResponse) {
-				// @ts-ignore
 				requestOptions.resolveWithFullResponse = true;
 			}
 
@@ -714,7 +712,6 @@ export class HttpRequestV1 implements INodeType {
 			}
 
 			if (options.ignoreResponseCode === true) {
-				// @ts-ignore
 				requestOptions.simple = false;
 			}
 			if (options.proxy !== undefined) {
@@ -976,12 +973,10 @@ export class HttpRequestV1 implements INodeType {
 			}
 		}
 
-		// @ts-ignore
 		const promisesResponses = await Promise.allSettled(requestPromises);
 
 		let response: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			// @ts-ignore
 			response = promisesResponses.shift();
 
 			if (response!.status !== 'fulfilled') {
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index 1b08aeb096..f954dbfd19 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -1,5 +1,3 @@
-import type { Readable } from 'stream';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -18,6 +16,7 @@ import {
 	removeCircularRefs,
 	NodeConnectionType,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import type { IAuthDataSanitizeKeys } from '../GenericFunctions';
 import {
@@ -211,7 +210,7 @@ export class HttpRequestV2 implements INodeType {
 					required: true,
 				},
 				{
-					displayName: 'Ignore SSL Issues',
+					displayName: 'Ignore SSL Issues (Insecure)',
 					name: 'allowUnauthorizedCerts',
 					type: 'boolean',
 					default: false,
@@ -741,7 +740,6 @@ export class HttpRequestV2 implements INodeType {
 			};
 
 			if (fullResponse) {
-				// @ts-ignore
 				requestOptions.resolveWithFullResponse = true;
 			}
 
@@ -754,7 +752,6 @@ export class HttpRequestV2 implements INodeType {
 			}
 
 			if (options.ignoreResponseCode === true) {
-				// @ts-ignore
 				requestOptions.simple = false;
 			}
 			if (options.proxy !== undefined) {
@@ -1030,12 +1027,10 @@ export class HttpRequestV2 implements INodeType {
 			}
 		}
 
-		// @ts-ignore
 		const promisesResponses = await Promise.allSettled(requestPromises);
 
 		let response: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			// @ts-ignore
 			response = promisesResponses.shift();
 			if (response!.status !== 'fulfilled') {
 				if (!this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/Description.ts b/packages/nodes-base/nodes/HttpRequest/V3/Description.ts
index 827c8f32ea..82df705a69 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/Description.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/Description.ts
@@ -695,7 +695,7 @@ export const mainProperties: INodeProperties[] = [
 				],
 			},
 			{
-				displayName: 'Ignore SSL Issues',
+				displayName: 'Ignore SSL Issues (Insecure)',
 				name: 'allowUnauthorizedCerts',
 				type: 'boolean',
 				noDataExpression: true,
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 7ef4b5b3b6..0e9c34de6a 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -27,6 +27,7 @@ import type { Readable } from 'stream';
 
 import { keysToLowercase } from '@utils/utilities';
 
+import { mainProperties } from './Description';
 import type { BodyParameter, IAuthDataSanitizeKeys } from '../GenericFunctions';
 import {
 	binaryContentTypes,
@@ -38,7 +39,6 @@ import {
 	sanitizeUiMessage,
 	setAgentOptions,
 } from '../GenericFunctions';
-import { mainProperties } from './Description';
 
 function toText<T>(data: T) {
 	if (typeof data === 'object' && data !== null) {
@@ -106,6 +106,7 @@ export class HttpRequestV3 implements INodeType {
 		};
 
 		let returnItems: INodeExecutionData[] = [];
+		const errorItems: { [key: string]: string } = {};
 		const requestPromises = [];
 
 		let fullResponse = false;
@@ -140,203 +141,270 @@ export class HttpRequestV3 implements INodeType {
 		}> = [];
 
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
-			if (authentication === 'genericCredentialType') {
-				genericCredentialType = this.getNodeParameter('genericAuthType', 0) as string;
+			try {
+				if (authentication === 'genericCredentialType') {
+					genericCredentialType = this.getNodeParameter('genericAuthType', 0) as string;
 
-				if (genericCredentialType === 'httpBasicAuth') {
-					httpBasicAuth = await this.getCredentials('httpBasicAuth', itemIndex);
-				} else if (genericCredentialType === 'httpDigestAuth') {
-					httpDigestAuth = await this.getCredentials('httpDigestAuth', itemIndex);
-				} else if (genericCredentialType === 'httpHeaderAuth') {
-					httpHeaderAuth = await this.getCredentials('httpHeaderAuth', itemIndex);
-				} else if (genericCredentialType === 'httpQueryAuth') {
-					httpQueryAuth = await this.getCredentials('httpQueryAuth', itemIndex);
-				} else if (genericCredentialType === 'httpCustomAuth') {
-					httpCustomAuth = await this.getCredentials('httpCustomAuth', itemIndex);
-				} else if (genericCredentialType === 'oAuth1Api') {
-					oAuth1Api = await this.getCredentials('oAuth1Api', itemIndex);
-				} else if (genericCredentialType === 'oAuth2Api') {
-					oAuth2Api = await this.getCredentials('oAuth2Api', itemIndex);
-				}
-			} else if (authentication === 'predefinedCredentialType') {
-				nodeCredentialType = this.getNodeParameter('nodeCredentialType', itemIndex) as string;
-			}
-
-			const provideSslCertificates = this.getNodeParameter(
-				'provideSslCertificates',
-				itemIndex,
-				false,
-			);
-
-			if (provideSslCertificates) {
-				sslCertificates = await this.getCredentials('httpSslAuth', itemIndex);
-			}
-
-			const requestMethod = this.getNodeParameter('method', itemIndex) as IHttpRequestMethods;
-
-			const sendQuery = this.getNodeParameter('sendQuery', itemIndex, false) as boolean;
-			const queryParameters = this.getNodeParameter(
-				'queryParameters.parameters',
-				itemIndex,
-				[],
-			) as [{ name: string; value: string }];
-			const specifyQuery = this.getNodeParameter('specifyQuery', itemIndex, 'keypair') as string;
-			const jsonQueryParameter = this.getNodeParameter('jsonQuery', itemIndex, '') as string;
-
-			const sendBody = this.getNodeParameter('sendBody', itemIndex, false) as boolean;
-			const bodyContentType = this.getNodeParameter('contentType', itemIndex, '') as string;
-			const specifyBody = this.getNodeParameter('specifyBody', itemIndex, '') as string;
-			const bodyParameters = this.getNodeParameter(
-				'bodyParameters.parameters',
-				itemIndex,
-				[],
-			) as BodyParameter[];
-			const jsonBodyParameter = this.getNodeParameter('jsonBody', itemIndex, '') as string;
-			const body = this.getNodeParameter('body', itemIndex, '') as string;
-
-			const sendHeaders = this.getNodeParameter('sendHeaders', itemIndex, false) as boolean;
-
-			const headerParameters = this.getNodeParameter(
-				'headerParameters.parameters',
-				itemIndex,
-				[],
-			) as [{ name: string; value: string }];
-
-			const specifyHeaders = this.getNodeParameter(
-				'specifyHeaders',
-				itemIndex,
-				'keypair',
-			) as string;
-
-			const jsonHeadersParameter = this.getNodeParameter('jsonHeaders', itemIndex, '') as string;
-
-			const {
-				redirect,
-				batching,
-				proxy,
-				timeout,
-				allowUnauthorizedCerts,
-				queryParameterArrays,
-				response,
-				lowercaseHeaders,
-			} = this.getNodeParameter('options', itemIndex, {}) as {
-				batching: { batch: { batchSize: number; batchInterval: number } };
-				proxy: string;
-				timeout: number;
-				allowUnauthorizedCerts: boolean;
-				queryParameterArrays: 'indices' | 'brackets' | 'repeat';
-				response: {
-					response: { neverError: boolean; responseFormat: string; fullResponse: boolean };
-				};
-				redirect: { redirect: { maxRedirects: number; followRedirects: boolean } };
-				lowercaseHeaders: boolean;
-			};
-
-			const url = this.getNodeParameter('url', itemIndex) as string;
-
-			const responseFormat = response?.response?.responseFormat || 'autodetect';
-
-			fullResponse = response?.response?.fullResponse || false;
-
-			autoDetectResponseFormat = responseFormat === 'autodetect';
-
-			// defaults batch size to 1 of it's set to 0
-			const batchSize = batching?.batch?.batchSize > 0 ? batching?.batch?.batchSize : 1;
-			const batchInterval = batching?.batch.batchInterval;
-
-			if (itemIndex > 0 && batchSize >= 0 && batchInterval > 0) {
-				if (itemIndex % batchSize === 0) {
-					await sleep(batchInterval);
-				}
-			}
-
-			requestOptions = {
-				headers: {},
-				method: requestMethod,
-				uri: url,
-				gzip: true,
-				rejectUnauthorized: !allowUnauthorizedCerts || false,
-				followRedirect: false,
-				resolveWithFullResponse: true,
-			};
-
-			if (requestOptions.method !== 'GET' && nodeVersion >= 4.1) {
-				requestOptions = { ...requestOptions, followAllRedirects: false };
-			}
-
-			const defaultRedirect = nodeVersion >= 4 && redirect === undefined;
-
-			if (redirect?.redirect?.followRedirects || defaultRedirect) {
-				requestOptions.followRedirect = true;
-				requestOptions.followAllRedirects = true;
-			}
-
-			if (redirect?.redirect?.maxRedirects || defaultRedirect) {
-				requestOptions.maxRedirects = redirect?.redirect?.maxRedirects;
-			}
-
-			if (response?.response?.neverError) {
-				requestOptions.simple = false;
-			}
-
-			if (proxy) {
-				requestOptions.proxy = proxy;
-			}
-
-			if (timeout) {
-				requestOptions.timeout = timeout;
-			} else {
-				// set default timeout to 5 minutes
-				requestOptions.timeout = 300_000;
-			}
-			if (sendQuery && queryParameterArrays) {
-				Object.assign(requestOptions, {
-					qsStringifyOptions: { arrayFormat: queryParameterArrays },
-				});
-			}
-
-			const parametersToKeyValue = async (
-				accumulator: { [key: string]: any },
-				cur: { name: string; value: string; parameterType?: string; inputDataFieldName?: string },
-			) => {
-				if (cur.parameterType === 'formBinaryData') {
-					if (!cur.inputDataFieldName) return accumulator;
-					const binaryData = this.helpers.assertBinaryData(itemIndex, cur.inputDataFieldName);
-					let uploadData: Buffer | Readable;
-					const itemBinaryData = items[itemIndex].binary![cur.inputDataFieldName];
-					if (itemBinaryData.id) {
-						uploadData = await this.helpers.getBinaryStream(itemBinaryData.id);
-					} else {
-						uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+					if (genericCredentialType === 'httpBasicAuth') {
+						httpBasicAuth = await this.getCredentials('httpBasicAuth', itemIndex);
+					} else if (genericCredentialType === 'httpDigestAuth') {
+						httpDigestAuth = await this.getCredentials('httpDigestAuth', itemIndex);
+					} else if (genericCredentialType === 'httpHeaderAuth') {
+						httpHeaderAuth = await this.getCredentials('httpHeaderAuth', itemIndex);
+					} else if (genericCredentialType === 'httpQueryAuth') {
+						httpQueryAuth = await this.getCredentials('httpQueryAuth', itemIndex);
+					} else if (genericCredentialType === 'httpCustomAuth') {
+						httpCustomAuth = await this.getCredentials('httpCustomAuth', itemIndex);
+					} else if (genericCredentialType === 'oAuth1Api') {
+						oAuth1Api = await this.getCredentials('oAuth1Api', itemIndex);
+					} else if (genericCredentialType === 'oAuth2Api') {
+						oAuth2Api = await this.getCredentials('oAuth2Api', itemIndex);
 					}
-
-					accumulator[cur.name] = {
-						value: uploadData,
-						options: {
-							filename: binaryData.fileName,
-							contentType: binaryData.mimeType,
-						},
-					};
-					return accumulator;
+				} else if (authentication === 'predefinedCredentialType') {
+					nodeCredentialType = this.getNodeParameter('nodeCredentialType', itemIndex) as string;
 				}
-				accumulator[cur.name] = cur.value;
-				return accumulator;
-			};
 
-			// Get parameters defined in the UI
-			if (sendBody && bodyParameters) {
-				if (specifyBody === 'keypair' || bodyContentType === 'multipart-form-data') {
-					requestOptions.body = await prepareRequestBody(
-						bodyParameters,
-						bodyContentType,
-						nodeVersion,
-						parametersToKeyValue,
-					);
-				} else if (specifyBody === 'json') {
-					// body is specified using JSON
-					if (typeof jsonBodyParameter !== 'object' && jsonBodyParameter !== null) {
+				const provideSslCertificates = this.getNodeParameter(
+					'provideSslCertificates',
+					itemIndex,
+					false,
+				);
+
+				if (provideSslCertificates) {
+					sslCertificates = await this.getCredentials('httpSslAuth', itemIndex);
+				}
+
+				const requestMethod = this.getNodeParameter('method', itemIndex) as IHttpRequestMethods;
+
+				const sendQuery = this.getNodeParameter('sendQuery', itemIndex, false) as boolean;
+				const queryParameters = this.getNodeParameter(
+					'queryParameters.parameters',
+					itemIndex,
+					[],
+				) as [{ name: string; value: string }];
+				const specifyQuery = this.getNodeParameter('specifyQuery', itemIndex, 'keypair') as string;
+				const jsonQueryParameter = this.getNodeParameter('jsonQuery', itemIndex, '') as string;
+
+				const sendBody = this.getNodeParameter('sendBody', itemIndex, false) as boolean;
+				const bodyContentType = this.getNodeParameter('contentType', itemIndex, '') as string;
+				const specifyBody = this.getNodeParameter('specifyBody', itemIndex, '') as string;
+				const bodyParameters = this.getNodeParameter(
+					'bodyParameters.parameters',
+					itemIndex,
+					[],
+				) as BodyParameter[];
+				const jsonBodyParameter = this.getNodeParameter('jsonBody', itemIndex, '') as string;
+				const body = this.getNodeParameter('body', itemIndex, '') as string;
+
+				const sendHeaders = this.getNodeParameter('sendHeaders', itemIndex, false) as boolean;
+
+				const headerParameters = this.getNodeParameter(
+					'headerParameters.parameters',
+					itemIndex,
+					[],
+				) as [{ name: string; value: string }];
+
+				const specifyHeaders = this.getNodeParameter(
+					'specifyHeaders',
+					itemIndex,
+					'keypair',
+				) as string;
+
+				const jsonHeadersParameter = this.getNodeParameter('jsonHeaders', itemIndex, '') as string;
+
+				const {
+					redirect,
+					batching,
+					proxy,
+					timeout,
+					allowUnauthorizedCerts,
+					queryParameterArrays,
+					response,
+					lowercaseHeaders,
+				} = this.getNodeParameter('options', itemIndex, {}) as {
+					batching: { batch: { batchSize: number; batchInterval: number } };
+					proxy: string;
+					timeout: number;
+					allowUnauthorizedCerts: boolean;
+					queryParameterArrays: 'indices' | 'brackets' | 'repeat';
+					response: {
+						response: { neverError: boolean; responseFormat: string; fullResponse: boolean };
+					};
+					redirect: { redirect: { maxRedirects: number; followRedirects: boolean } };
+					lowercaseHeaders: boolean;
+				};
+
+				const url = this.getNodeParameter('url', itemIndex) as string;
+
+				const responseFormat = response?.response?.responseFormat || 'autodetect';
+
+				fullResponse = response?.response?.fullResponse || false;
+
+				autoDetectResponseFormat = responseFormat === 'autodetect';
+
+				// defaults batch size to 1 of it's set to 0
+				const batchSize = batching?.batch?.batchSize > 0 ? batching?.batch?.batchSize : 1;
+				const batchInterval = batching?.batch.batchInterval;
+
+				if (itemIndex > 0 && batchSize >= 0 && batchInterval > 0) {
+					if (itemIndex % batchSize === 0) {
+						await sleep(batchInterval);
+					}
+				}
+
+				requestOptions = {
+					headers: {},
+					method: requestMethod,
+					uri: url,
+					gzip: true,
+					rejectUnauthorized: !allowUnauthorizedCerts || false,
+					followRedirect: false,
+					resolveWithFullResponse: true,
+				};
+
+				if (requestOptions.method !== 'GET' && nodeVersion >= 4.1) {
+					requestOptions = { ...requestOptions, followAllRedirects: false };
+				}
+
+				const defaultRedirect = nodeVersion >= 4 && redirect === undefined;
+
+				if (redirect?.redirect?.followRedirects || defaultRedirect) {
+					requestOptions.followRedirect = true;
+					requestOptions.followAllRedirects = true;
+				}
+
+				if (redirect?.redirect?.maxRedirects || defaultRedirect) {
+					requestOptions.maxRedirects = redirect?.redirect?.maxRedirects;
+				}
+
+				if (response?.response?.neverError) {
+					requestOptions.simple = false;
+				}
+
+				if (proxy) {
+					requestOptions.proxy = proxy;
+				}
+
+				if (timeout) {
+					requestOptions.timeout = timeout;
+				} else {
+					// set default timeout to 5 minutes
+					requestOptions.timeout = 300_000;
+				}
+				if (sendQuery && queryParameterArrays) {
+					Object.assign(requestOptions, {
+						qsStringifyOptions: { arrayFormat: queryParameterArrays },
+					});
+				}
+
+				const parametersToKeyValue = async (
+					accumulator: { [key: string]: any },
+					cur: { name: string; value: string; parameterType?: string; inputDataFieldName?: string },
+				) => {
+					if (cur.parameterType === 'formBinaryData') {
+						if (!cur.inputDataFieldName) return accumulator;
+						const binaryData = this.helpers.assertBinaryData(itemIndex, cur.inputDataFieldName);
+						let uploadData: Buffer | Readable;
+						const itemBinaryData = items[itemIndex].binary![cur.inputDataFieldName];
+						if (itemBinaryData.id) {
+							uploadData = await this.helpers.getBinaryStream(itemBinaryData.id);
+						} else {
+							uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+						}
+
+						accumulator[cur.name] = {
+							value: uploadData,
+							options: {
+								filename: binaryData.fileName,
+								contentType: binaryData.mimeType,
+							},
+						};
+						return accumulator;
+					}
+					accumulator[cur.name] = cur.value;
+					return accumulator;
+				};
+
+				// Get parameters defined in the UI
+				if (sendBody && bodyParameters) {
+					if (specifyBody === 'keypair' || bodyContentType === 'multipart-form-data') {
+						requestOptions.body = await prepareRequestBody(
+							bodyParameters,
+							bodyContentType,
+							nodeVersion,
+							parametersToKeyValue,
+						);
+					} else if (specifyBody === 'json') {
+						// body is specified using JSON
+						if (typeof jsonBodyParameter !== 'object' && jsonBodyParameter !== null) {
+							try {
+								JSON.parse(jsonBodyParameter);
+							} catch {
+								throw new NodeOperationError(
+									this.getNode(),
+									'JSON parameter needs to be valid JSON',
+									{
+										itemIndex,
+									},
+								);
+							}
+
+							requestOptions.body = jsonParse(jsonBodyParameter);
+						} else {
+							requestOptions.body = jsonBodyParameter;
+						}
+					} else if (specifyBody === 'string') {
+						//form urlencoded
+						requestOptions.body = Object.fromEntries(new URLSearchParams(body));
+					}
+				}
+
+				// Change the way data get send in case a different content-type than JSON got selected
+				if (sendBody && ['PATCH', 'POST', 'PUT', 'GET'].includes(requestMethod)) {
+					if (bodyContentType === 'multipart-form-data') {
+						requestOptions.formData = requestOptions.body as IDataObject;
+						delete requestOptions.body;
+					} else if (bodyContentType === 'form-urlencoded') {
+						requestOptions.form = requestOptions.body as IDataObject;
+						delete requestOptions.body;
+					} else if (bodyContentType === 'binaryData') {
+						const inputDataFieldName = this.getNodeParameter(
+							'inputDataFieldName',
+							itemIndex,
+						) as string;
+
+						let uploadData: Buffer | Readable;
+						let contentLength: number;
+
+						const itemBinaryData = this.helpers.assertBinaryData(itemIndex, inputDataFieldName);
+
+						if (itemBinaryData.id) {
+							uploadData = await this.helpers.getBinaryStream(itemBinaryData.id);
+							const metadata = await this.helpers.getBinaryMetadata(itemBinaryData.id);
+							contentLength = metadata.fileSize;
+						} else {
+							uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+							contentLength = uploadData.length;
+						}
+						requestOptions.body = uploadData;
+						requestOptions.headers = {
+							...requestOptions.headers,
+							'content-length': contentLength,
+							'content-type': itemBinaryData.mimeType ?? 'application/octet-stream',
+						};
+					} else if (bodyContentType === 'raw') {
+						requestOptions.body = body;
+					}
+				}
+
+				// Get parameters defined in the UI
+				if (sendQuery && queryParameters) {
+					if (specifyQuery === 'keypair') {
+						requestOptions.qs = await reduceAsync(queryParameters, parametersToKeyValue);
+					} else if (specifyQuery === 'json') {
+						// query is specified using JSON
 						try {
-							JSON.parse(jsonBodyParameter);
+							JSON.parse(jsonQueryParameter);
 						} catch {
 							throw new NodeOperationError(
 								this.getNode(),
@@ -347,316 +415,280 @@ export class HttpRequestV3 implements INodeType {
 							);
 						}
 
-						requestOptions.body = jsonParse(jsonBodyParameter);
-					} else {
-						requestOptions.body = jsonBodyParameter;
+						requestOptions.qs = jsonParse(jsonQueryParameter);
 					}
-				} else if (specifyBody === 'string') {
-					//form urlencoded
-					requestOptions.body = Object.fromEntries(new URLSearchParams(body));
 				}
-			}
 
-			// Change the way data get send in case a different content-type than JSON got selected
-			if (sendBody && ['PATCH', 'POST', 'PUT', 'GET'].includes(requestMethod)) {
-				if (bodyContentType === 'multipart-form-data') {
-					requestOptions.formData = requestOptions.body as IDataObject;
-					delete requestOptions.body;
-				} else if (bodyContentType === 'form-urlencoded') {
-					requestOptions.form = requestOptions.body as IDataObject;
-					delete requestOptions.body;
-				} else if (bodyContentType === 'binaryData') {
-					const inputDataFieldName = this.getNodeParameter(
-						'inputDataFieldName',
-						itemIndex,
-					) as string;
+				// Get parameters defined in the UI
+				if (sendHeaders && headerParameters) {
+					let additionalHeaders: IDataObject = {};
+					if (specifyHeaders === 'keypair') {
+						additionalHeaders = await reduceAsync(
+							headerParameters.filter((header) => header.name),
+							parametersToKeyValue,
+						);
+					} else if (specifyHeaders === 'json') {
+						// body is specified using JSON
+						try {
+							JSON.parse(jsonHeadersParameter);
+						} catch {
+							throw new NodeOperationError(
+								this.getNode(),
+								'JSON parameter needs to be valid JSON',
+								{
+									itemIndex,
+								},
+							);
+						}
 
-					let uploadData: Buffer | Readable;
-					let contentLength: number;
-
-					const itemBinaryData = this.helpers.assertBinaryData(itemIndex, inputDataFieldName);
-
-					if (itemBinaryData.id) {
-						uploadData = await this.helpers.getBinaryStream(itemBinaryData.id);
-						const metadata = await this.helpers.getBinaryMetadata(itemBinaryData.id);
-						contentLength = metadata.fileSize;
-					} else {
-						uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
-						contentLength = uploadData.length;
+						additionalHeaders = jsonParse(jsonHeadersParameter);
 					}
-					requestOptions.body = uploadData;
 					requestOptions.headers = {
 						...requestOptions.headers,
-						'content-length': contentLength,
-						'content-type': itemBinaryData.mimeType ?? 'application/octet-stream',
+						...(lowercaseHeaders === undefined || lowercaseHeaders
+							? keysToLowercase(additionalHeaders)
+							: additionalHeaders),
 					};
+				}
+
+				if (autoDetectResponseFormat || responseFormat === 'file') {
+					requestOptions.encoding = null;
+					requestOptions.json = false;
+					requestOptions.useStream = true;
 				} else if (bodyContentType === 'raw') {
-					requestOptions.body = body;
+					requestOptions.json = false;
+					requestOptions.useStream = true;
+				} else {
+					requestOptions.json = true;
 				}
-			}
 
-			// Get parameters defined in the UI
-			if (sendQuery && queryParameters) {
-				if (specifyQuery === 'keypair') {
-					requestOptions.qs = await reduceAsync(queryParameters, parametersToKeyValue);
-				} else if (specifyQuery === 'json') {
-					// query is specified using JSON
-					try {
-						JSON.parse(jsonQueryParameter);
-					} catch {
-						throw new NodeOperationError(this.getNode(), 'JSON parameter needs to be valid JSON', {
-							itemIndex,
-						});
+				// Add Content Type if any are set
+				if (bodyContentType === 'raw') {
+					if (requestOptions.headers === undefined) {
+						requestOptions.headers = {};
 					}
-
-					requestOptions.qs = jsonParse(jsonQueryParameter);
+					const rawContentType = this.getNodeParameter('rawContentType', itemIndex) as string;
+					requestOptions.headers['content-type'] = rawContentType;
 				}
-			}
 
-			// Get parameters defined in the UI
-			if (sendHeaders && headerParameters) {
-				let additionalHeaders: IDataObject = {};
-				if (specifyHeaders === 'keypair') {
-					additionalHeaders = await reduceAsync(
-						headerParameters.filter((header) => header.name),
-						parametersToKeyValue,
+				const authDataKeys: IAuthDataSanitizeKeys = {};
+
+				// Add SSL certificates if any are set
+				setAgentOptions(requestOptions, sslCertificates);
+				if (requestOptions.agentOptions) {
+					authDataKeys.agentOptions = Object.keys(requestOptions.agentOptions);
+				}
+
+				// Add credentials if any are set
+				if (httpBasicAuth !== undefined) {
+					requestOptions.auth = {
+						user: httpBasicAuth.user as string,
+						pass: httpBasicAuth.password as string,
+					};
+					authDataKeys.auth = ['pass'];
+				}
+				if (httpHeaderAuth !== undefined) {
+					requestOptions.headers![httpHeaderAuth.name as string] = httpHeaderAuth.value;
+					authDataKeys.headers = [httpHeaderAuth.name as string];
+				}
+				if (httpQueryAuth !== undefined) {
+					if (!requestOptions.qs) {
+						requestOptions.qs = {};
+					}
+					requestOptions.qs[httpQueryAuth.name as string] = httpQueryAuth.value;
+					authDataKeys.qs = [httpQueryAuth.name as string];
+				}
+
+				if (httpDigestAuth !== undefined) {
+					requestOptions.auth = {
+						user: httpDigestAuth.user as string,
+						pass: httpDigestAuth.password as string,
+						sendImmediately: false,
+					};
+					authDataKeys.auth = ['pass'];
+				}
+				if (httpCustomAuth !== undefined) {
+					const customAuth = jsonParse<IRequestOptionsSimplified>(
+						(httpCustomAuth.json as string) || '{}',
+						{ errorMessage: 'Invalid Custom Auth JSON' },
 					);
-				} else if (specifyHeaders === 'json') {
-					// body is specified using JSON
-					try {
-						JSON.parse(jsonHeadersParameter);
-					} catch {
-						throw new NodeOperationError(this.getNode(), 'JSON parameter needs to be valid JSON', {
-							itemIndex,
+					if (customAuth.headers) {
+						requestOptions.headers = { ...requestOptions.headers, ...customAuth.headers };
+						authDataKeys.headers = Object.keys(customAuth.headers);
+					}
+					if (customAuth.body) {
+						requestOptions.body = { ...(requestOptions.body as IDataObject), ...customAuth.body };
+						authDataKeys.body = Object.keys(customAuth.body);
+					}
+					if (customAuth.qs) {
+						requestOptions.qs = { ...requestOptions.qs, ...customAuth.qs };
+						authDataKeys.qs = Object.keys(customAuth.qs);
+					}
+				}
+
+				if (requestOptions.headers!.accept === undefined) {
+					if (responseFormat === 'json') {
+						requestOptions.headers!.accept = 'application/json,text/*;q=0.99';
+					} else if (responseFormat === 'text') {
+						requestOptions.headers!.accept =
+							'application/json,text/html,application/xhtml+xml,application/xml,text/*;q=0.9, */*;q=0.1';
+					} else {
+						requestOptions.headers!.accept =
+							'application/json,text/html,application/xhtml+xml,application/xml,text/*;q=0.9, image/*;q=0.8, */*;q=0.7';
+					}
+				}
+
+				requests.push({
+					options: requestOptions,
+					authKeys: authDataKeys,
+					credentialType: nodeCredentialType,
+				});
+
+				if (pagination && pagination.paginationMode !== 'off') {
+					let continueExpression = '={{false}}';
+					if (pagination.paginationCompleteWhen === 'receiveSpecificStatusCodes') {
+						// Split out comma separated list of status codes into array
+						const statusCodesWhenCompleted = pagination.statusCodesWhenComplete
+							.split(',')
+							.map((item) => parseInt(item.trim()));
+
+						continueExpression = `={{ !${JSON.stringify(
+							statusCodesWhenCompleted,
+						)}.includes($response.statusCode) }}`;
+					} else if (pagination.paginationCompleteWhen === 'responseIsEmpty') {
+						continueExpression =
+							'={{ Array.isArray($response.body) ? $response.body.length : !!$response.body }}';
+					} else {
+						// Other
+						if (!pagination.completeExpression.length || pagination.completeExpression[0] !== '=') {
+							throw new NodeOperationError(this.getNode(), 'Invalid or empty Complete Expression');
+						}
+						continueExpression = `={{ !(${pagination.completeExpression.trim().slice(3, -2)}) }}`;
+					}
+
+					const paginationData: PaginationOptions = {
+						continue: continueExpression,
+						request: {},
+						requestInterval: pagination.requestInterval,
+					};
+
+					if (pagination.paginationMode === 'updateAParameterInEachRequest') {
+						// Iterate over all parameters and add them to the request
+						paginationData.request = {};
+						const { parameters } = pagination.parameters;
+						if (
+							parameters.length === 1 &&
+							parameters[0].name === '' &&
+							parameters[0].value === ''
+						) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"At least one entry with 'Name' and 'Value' filled must be included in 'Parameters' to use 'Update a Parameter in Each Request' mode ",
+							);
+						}
+						pagination.parameters.parameters.forEach((parameter, index) => {
+							if (!paginationData.request[parameter.type]) {
+								paginationData.request[parameter.type] = {};
+							}
+							const parameterName = parameter.name;
+							if (parameterName === '') {
+								throw new NodeOperationError(
+									this.getNode(),
+									`Parameter name must be set for parameter [${index + 1}] in pagination settings`,
+								);
+							}
+							const parameterValue = parameter.value;
+							if (parameterValue === '') {
+								throw new NodeOperationError(
+									this.getNode(),
+									`Some value must be provided for parameter [${
+										index + 1
+									}] in pagination settings, omitting it will result in an infinite loop`,
+								);
+							}
+							paginationData.request[parameter.type]![parameterName] = parameterValue;
 						});
+					} else if (pagination.paginationMode === 'responseContainsNextURL') {
+						paginationData.request.url = pagination.nextURL;
 					}
 
-					additionalHeaders = jsonParse(jsonHeadersParameter);
-				}
-				requestOptions.headers = {
-					...requestOptions.headers,
-					...(lowercaseHeaders === undefined || lowercaseHeaders
-						? keysToLowercase(additionalHeaders)
-						: additionalHeaders),
-				};
-			}
-
-			if (autoDetectResponseFormat || responseFormat === 'file') {
-				requestOptions.encoding = null;
-				requestOptions.json = false;
-				requestOptions.useStream = true;
-			} else if (bodyContentType === 'raw') {
-				requestOptions.json = false;
-				requestOptions.useStream = true;
-			} else {
-				requestOptions.json = true;
-			}
-
-			// Add Content Type if any are set
-			if (bodyContentType === 'raw') {
-				if (requestOptions.headers === undefined) {
-					requestOptions.headers = {};
-				}
-				const rawContentType = this.getNodeParameter('rawContentType', itemIndex) as string;
-				requestOptions.headers['content-type'] = rawContentType;
-			}
-
-			const authDataKeys: IAuthDataSanitizeKeys = {};
-
-			// Add SSL certificates if any are set
-			setAgentOptions(requestOptions, sslCertificates);
-			if (requestOptions.agentOptions) {
-				authDataKeys.agentOptions = Object.keys(requestOptions.agentOptions);
-			}
-
-			// Add credentials if any are set
-			if (httpBasicAuth !== undefined) {
-				requestOptions.auth = {
-					user: httpBasicAuth.user as string,
-					pass: httpBasicAuth.password as string,
-				};
-				authDataKeys.auth = ['pass'];
-			}
-			if (httpHeaderAuth !== undefined) {
-				requestOptions.headers![httpHeaderAuth.name as string] = httpHeaderAuth.value;
-				authDataKeys.headers = [httpHeaderAuth.name as string];
-			}
-			if (httpQueryAuth !== undefined) {
-				if (!requestOptions.qs) {
-					requestOptions.qs = {};
-				}
-				requestOptions.qs[httpQueryAuth.name as string] = httpQueryAuth.value;
-				authDataKeys.qs = [httpQueryAuth.name as string];
-			}
-
-			if (httpDigestAuth !== undefined) {
-				requestOptions.auth = {
-					user: httpDigestAuth.user as string,
-					pass: httpDigestAuth.password as string,
-					sendImmediately: false,
-				};
-				authDataKeys.auth = ['pass'];
-			}
-			if (httpCustomAuth !== undefined) {
-				const customAuth = jsonParse<IRequestOptionsSimplified>(
-					(httpCustomAuth.json as string) || '{}',
-					{ errorMessage: 'Invalid Custom Auth JSON' },
-				);
-				if (customAuth.headers) {
-					requestOptions.headers = { ...requestOptions.headers, ...customAuth.headers };
-					authDataKeys.headers = Object.keys(customAuth.headers);
-				}
-				if (customAuth.body) {
-					requestOptions.body = { ...(requestOptions.body as IDataObject), ...customAuth.body };
-					authDataKeys.body = Object.keys(customAuth.body);
-				}
-				if (customAuth.qs) {
-					requestOptions.qs = { ...requestOptions.qs, ...customAuth.qs };
-					authDataKeys.qs = Object.keys(customAuth.qs);
-				}
-			}
-
-			if (requestOptions.headers!.accept === undefined) {
-				if (responseFormat === 'json') {
-					requestOptions.headers!.accept = 'application/json,text/*;q=0.99';
-				} else if (responseFormat === 'text') {
-					requestOptions.headers!.accept =
-						'application/json,text/html,application/xhtml+xml,application/xml,text/*;q=0.9, */*;q=0.1';
-				} else {
-					requestOptions.headers!.accept =
-						'application/json,text/html,application/xhtml+xml,application/xml,text/*;q=0.9, image/*;q=0.8, */*;q=0.7';
-				}
-			}
-
-			requests.push({
-				options: requestOptions,
-				authKeys: authDataKeys,
-				credentialType: nodeCredentialType,
-			});
-
-			if (pagination && pagination.paginationMode !== 'off') {
-				let continueExpression = '={{false}}';
-				if (pagination.paginationCompleteWhen === 'receiveSpecificStatusCodes') {
-					// Split out comma separated list of status codes into array
-					const statusCodesWhenCompleted = pagination.statusCodesWhenComplete
-						.split(',')
-						.map((item) => parseInt(item.trim()));
-
-					continueExpression = `={{ !${JSON.stringify(
-						statusCodesWhenCompleted,
-					)}.includes($response.statusCode) }}`;
-				} else if (pagination.paginationCompleteWhen === 'responseIsEmpty') {
-					continueExpression =
-						'={{ Array.isArray($response.body) ? $response.body.length : !!$response.body }}';
-				} else {
-					// Other
-					if (!pagination.completeExpression.length || pagination.completeExpression[0] !== '=') {
-						throw new NodeOperationError(this.getNode(), 'Invalid or empty Complete Expression');
+					if (pagination.limitPagesFetched) {
+						paginationData.maxRequests = pagination.maxRequests;
 					}
-					continueExpression = `={{ !(${pagination.completeExpression.trim().slice(3, -2)}) }}`;
-				}
 
-				const paginationData: PaginationOptions = {
-					continue: continueExpression,
-					request: {},
-					requestInterval: pagination.requestInterval,
-				};
+					if (responseFormat === 'file') {
+						paginationData.binaryResult = true;
+					}
 
-				if (pagination.paginationMode === 'updateAParameterInEachRequest') {
-					// Iterate over all parameters and add them to the request
-					paginationData.request = {};
-					const { parameters } = pagination.parameters;
-					if (parameters.length === 1 && parameters[0].name === '' && parameters[0].value === '') {
-						throw new NodeOperationError(
-							this.getNode(),
-							"At least one entry with 'Name' and 'Value' filled must be included in 'Parameters' to use 'Update a Parameter in Each Request' mode ",
+					const requestPromise = this.helpers.requestWithAuthenticationPaginated
+						.call(
+							this,
+							requestOptions,
+							itemIndex,
+							paginationData,
+							nodeCredentialType ?? genericCredentialType,
+						)
+						.catch((error) => {
+							if (error instanceof NodeOperationError && error.type === 'invalid_url') {
+								const urlParameterName =
+									pagination.paginationMode === 'responseContainsNextURL' ? 'Next URL' : 'URL';
+								throw new NodeOperationError(this.getNode(), error.message, {
+									description: `Make sure the "${urlParameterName}" parameter evaluates to a valid URL.`,
+								});
+							}
+
+							throw error;
+						});
+					requestPromises.push(requestPromise);
+				} else if (authentication === 'genericCredentialType' || authentication === 'none') {
+					if (oAuth1Api) {
+						const requestOAuth1 = this.helpers.requestOAuth1.call(
+							this,
+							'oAuth1Api',
+							requestOptions,
 						);
+						requestOAuth1.catch(() => {});
+						requestPromises.push(requestOAuth1);
+					} else if (oAuth2Api) {
+						const requestOAuth2 = this.helpers.requestOAuth2.call(
+							this,
+							'oAuth2Api',
+							requestOptions,
+							{
+								tokenType: 'Bearer',
+							},
+						);
+						requestOAuth2.catch(() => {});
+						requestPromises.push(requestOAuth2);
+					} else {
+						// bearerAuth, queryAuth, headerAuth, digestAuth, none
+						const request = this.helpers.request(requestOptions);
+						request.catch(() => {});
+						requestPromises.push(request);
 					}
-					pagination.parameters.parameters.forEach((parameter, index) => {
-						if (!paginationData.request[parameter.type]) {
-							paginationData.request[parameter.type] = {};
-						}
-						const parameterName = parameter.name;
-						if (parameterName === '') {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Parameter name must be set for parameter [${index + 1}] in pagination settings`,
-							);
-						}
-						const parameterValue = parameter.value;
-						if (parameterValue === '') {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Some value must be provided for parameter [${
-									index + 1
-								}] in pagination settings, omitting it will result in an infinite loop`,
-							);
-						}
-						paginationData.request[parameter.type]![parameterName] = parameterValue;
-					});
-				} else if (pagination.paginationMode === 'responseContainsNextURL') {
-					paginationData.request.url = pagination.nextURL;
-				}
+				} else if (authentication === 'predefinedCredentialType' && nodeCredentialType) {
+					const additionalOAuth2Options = getOAuth2AdditionalParameters(nodeCredentialType);
 
-				if (pagination.limitPagesFetched) {
-					paginationData.maxRequests = pagination.maxRequests;
-				}
+					// service-specific cred: OAuth1, OAuth2, plain
 
-				if (responseFormat === 'file') {
-					paginationData.binaryResult = true;
-				}
-
-				const requestPromise = this.helpers.requestWithAuthenticationPaginated
-					.call(
+					const requestWithAuthentication = this.helpers.requestWithAuthentication.call(
 						this,
+						nodeCredentialType,
 						requestOptions,
+						additionalOAuth2Options && { oauth2: additionalOAuth2Options },
 						itemIndex,
-						paginationData,
-						nodeCredentialType ?? genericCredentialType,
-					)
-					.catch((error) => {
-						if (error instanceof NodeOperationError && error.type === 'invalid_url') {
-							const urlParameterName =
-								pagination.paginationMode === 'responseContainsNextURL' ? 'Next URL' : 'URL';
-							throw new NodeOperationError(this.getNode(), error.message, {
-								description: `Make sure the "${urlParameterName}" parameter evaluates to a valid URL.`,
-							});
-						}
-
-						throw error;
-					});
-				requestPromises.push(requestPromise);
-			} else if (authentication === 'genericCredentialType' || authentication === 'none') {
-				if (oAuth1Api) {
-					const requestOAuth1 = this.helpers.requestOAuth1.call(this, 'oAuth1Api', requestOptions);
-					requestOAuth1.catch(() => {});
-					requestPromises.push(requestOAuth1);
-				} else if (oAuth2Api) {
-					const requestOAuth2 = this.helpers.requestOAuth2.call(this, 'oAuth2Api', requestOptions, {
-						tokenType: 'Bearer',
-					});
-					requestOAuth2.catch(() => {});
-					requestPromises.push(requestOAuth2);
-				} else {
-					// bearerAuth, queryAuth, headerAuth, digestAuth, none
-					const request = this.helpers.request(requestOptions);
-					request.catch(() => {});
-					requestPromises.push(request);
+					);
+					requestWithAuthentication.catch(() => {});
+					requestPromises.push(requestWithAuthentication);
 				}
-			} else if (authentication === 'predefinedCredentialType' && nodeCredentialType) {
-				const additionalOAuth2Options = getOAuth2AdditionalParameters(nodeCredentialType);
+			} catch (error) {
+				if (!this.continueOnFail()) throw error;
 
-				// service-specific cred: OAuth1, OAuth2, plain
+				requestPromises.push(Promise.reject(error).catch(() => {}));
 
-				const requestWithAuthentication = this.helpers.requestWithAuthentication.call(
-					this,
-					nodeCredentialType,
-					requestOptions,
-					additionalOAuth2Options && { oauth2: additionalOAuth2Options },
-					itemIndex,
-				);
-				requestWithAuthentication.catch(() => {});
-				requestPromises.push(requestWithAuthentication);
+				errorItems[itemIndex] = error.message;
+
+				continue;
 			}
 		}
 
@@ -664,28 +696,41 @@ export class HttpRequestV3 implements INodeType {
 		const promisesResponses = await Promise.allSettled(
 			requestPromises.map(
 				async (requestPromise, itemIndex) =>
-					await requestPromise.finally(async () => {
-						try {
-							// Secrets need to be read after the request because secrets could have changed
-							// For example: OAuth token refresh, preAuthentication
-							const { options, authKeys, credentialType } = requests[itemIndex];
-							let secrets: string[] = [];
-							if (credentialType) {
-								const properties = this.getCredentialsProperties(credentialType);
-								const credentials = await this.getCredentials(credentialType, itemIndex);
-								secrets = getSecrets(properties, credentials);
-							}
-							const sanitizedRequestOptions = sanitizeUiMessage(options, authKeys, secrets);
-							sanitizedRequests.push(sanitizedRequestOptions);
-							this.sendMessageToUI(sanitizedRequestOptions);
-						} catch (e) {}
-					}),
+					await requestPromise
+						.then((response) => response)
+						.finally(async () => {
+							if (errorItems[itemIndex]) return;
+							try {
+								// Secrets need to be read after the request because secrets could have changed
+								// For example: OAuth token refresh, preAuthentication
+								const { options, authKeys, credentialType } = requests[itemIndex];
+								let secrets: string[] = [];
+								if (credentialType) {
+									const properties = this.getCredentialsProperties(credentialType);
+									const credentials = await this.getCredentials(credentialType, itemIndex);
+									secrets = getSecrets(properties, credentials);
+								}
+								const sanitizedRequestOptions = sanitizeUiMessage(options, authKeys, secrets);
+								sanitizedRequests.push(sanitizedRequestOptions);
+								this.sendMessageToUI(sanitizedRequestOptions);
+							} catch (e) {}
+						}),
 			),
 		);
 
 		let responseData: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			responseData = promisesResponses.shift();
+
+			if (errorItems[itemIndex]) {
+				returnItems.push({
+					json: { error: errorItems[itemIndex] },
+					pairedItem: { item: itemIndex },
+				});
+
+				continue;
+			}
+
 			if (responseData!.status !== 'fulfilled') {
 				if (responseData.reason.statusCode === 429) {
 					responseData.reason.message =
@@ -962,7 +1007,7 @@ export class HttpRequestV3 implements INodeType {
 				[
 					{
 						message:
-							'To split the contents of ‘data’ into separate items for easier processing, add a ‘Spilt Out’ node after this one',
+							'To split the contents of ‘data’ into separate items for easier processing, add a ‘Split Out’ node after this one',
 						location: 'outputPane',
 					},
 				],
diff --git a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
index 32734939c2..d22169e50d 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/binaryData/HttpRequest.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import {
 	setup,
 	equalityTest,
diff --git a/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
index 6ca5cfa437..d5488c6f2e 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/encoding/HttpRequest.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import {
 	setup,
 	equalityTest,
diff --git a/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts
new file mode 100644
index 0000000000..5d3a67dde9
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/HttpRequest.test.ts
@@ -0,0 +1,41 @@
+import nock from 'nock';
+
+import {
+	setup,
+	equalityTest,
+	workflowToTests,
+	getWorkflowFilenames,
+	initBinaryDataService,
+} from '@test/nodes/Helpers';
+
+describe('Test Quoted Response Encoding', () => {
+	const workflows = getWorkflowFilenames(__dirname);
+	const tests = workflowToTests(workflows);
+
+	const baseUrl = 'https://dummy.domain';
+	const payload = Buffer.from(
+		'El rápido zorro marrón salta sobre el perro perezoso. ¡Qué bello día en París! Árbol, cañón, façade.',
+		'latin1',
+	);
+
+	beforeAll(async () => {
+		await initBinaryDataService();
+
+		nock.disableNetConnect();
+
+		nock(baseUrl)
+			.persist()
+			.get('/index.html')
+			.reply(200, payload, { 'content-type': 'text/plain; charset="latin1"' });
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/encodingQuoted.test.json b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/encodingQuoted.test.json
new file mode 100644
index 0000000000..ac2a083cd4
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/encodingQuoted/encodingQuoted.test.json
@@ -0,0 +1,69 @@
+{
+	"name": "Response Encoding Test",
+	"nodes": [
+		{
+			"parameters": {},
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [180, 820],
+			"id": "635fb102-a760-4b9e-836c-82e71bba7974"
+		},
+		{
+			"parameters": {
+				"url": "https://dummy.domain/index.html",
+				"options": {}
+			},
+			"name": "HTTP Request (v3)",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 3,
+			"position": [520, 720],
+			"id": "eb243cfd-fbd6-41ef-935d-4ea98617355f"
+		},
+		{
+			"parameters": {
+				"url": "https://dummy.domain/index.html",
+				"options": {}
+			},
+			"name": "HTTP Request (v4)",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4,
+			"position": [520, 920],
+			"id": "cc2f185d-df6a-4fa3-b7f4-29f0dbad0f9b"
+		}
+	],
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "HTTP Request (v3)",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "HTTP Request (v4)",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"HTTP Request (v3)": [
+			{
+				"json": {
+					"data": "El rápido zorro marrón salta sobre el perro perezoso. ¡Qué bello día en París! Árbol, cañón, façade."
+				}
+			}
+		],
+		"HTTP Request (v4)": [
+			{
+				"json": {
+					"data": "El rápido zorro marrón salta sobre el perro perezoso. ¡Qué bello día en París! Árbol, cañón, façade."
+				}
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
index 0899ce5637..6e49794df3 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
@@ -1,5 +1,6 @@
-import { parse as parseUrl } from 'url';
 import nock from 'nock';
+import { parse as parseUrl } from 'url';
+
 import {
 	initBinaryDataService,
 	setup,
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequestV3.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequestV3.test.ts
index d245c77e7f..b15da2ba2e 100644
--- a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequestV3.test.ts
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequestV3.test.ts
@@ -182,7 +182,7 @@ describe('HttpRequestV3', () => {
 		];
 
 		it.each(authenticationTypes)(
-			'should handle %s authentication',
+			'should handle $genericCredentialType authentication',
 			async ({ genericCredentialType, credentials, authField, authValue }) => {
 				(executeFunctions.getInputData as jest.Mock).mockReturnValue([{ json: {} }]);
 				(executeFunctions.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.use_error_output.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.use_error_output.json
new file mode 100644
index 0000000000..c8d79e673d
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.use_error_output.json
@@ -0,0 +1,97 @@
+{
+	"name": "HTTP Request Node: Continue using error output not working",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6e15f2de-79fe-41f3-b76e-53ebfa2e4437",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-60, 580]
+		},
+		{
+			"parameters": {},
+			"id": "af1bb989-3c6d-4323-8e88-649e45d64c00",
+			"name": "Success path",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [460, 460]
+		},
+		{
+			"parameters": {},
+			"id": "43c4ee19-6a9d-4b1d-aefa-2c24abe45189",
+			"name": "Error path",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [460, 700]
+		},
+		{
+			"parameters": {
+				"method": "POST",
+				"url": "https://webhook.site/e18fe8f9-ec77-4574-a40d-8ae054191e1e",
+				"sendBody": true,
+				"specifyBody": "json",
+				"jsonBody": "{\n  \"q\": \"abc\",\n}",
+				"options": {}
+			},
+			"id": "31641920-7f43-473f-ad96-b121122802bb",
+			"name": "HTTP Request",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 4.2,
+			"position": [180, 580],
+			"alwaysOutputData": false,
+			"onError": "continueErrorOutput"
+		}
+	],
+	"pinData": {
+		"Error path": [
+			{
+				"json": {
+					"error": "JSON parameter needs to be valid JSON"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "HTTP Request",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"HTTP Request": {
+			"main": [
+				[
+					{
+						"node": "Success path",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Error path",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "f445a6e9-818f-4b70-8b4f-e2a68fc5d6e4",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "f3rDILaMkFqisP3P",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
index f20a3c7746..df86cc0b5f 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
@@ -2,7 +2,6 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { HubspotV1 } from './V1/HubspotV1.node';
-
 import { HubspotV2 } from './V2/HubspotV2.node';
 
 export class Hubspot extends VersionedNodeType {
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 5ce15a9b1c..ab36f08b15 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -424,14 +424,12 @@ export class HubspotTrigger implements INodeType {
 		const req = this.getRequestObject();
 		const bodyData = req.body;
 		const headerData = this.getHeaderData();
-		//@ts-ignore
 		if (headerData['x-hubspot-signature'] === undefined) {
 			return {};
 		}
 
 		const hash = `${credentials.clientSecret}${JSON.stringify(bodyData)}`;
 		const signature = createHash('sha256').update(hash).digest('hex');
-		//@ts-ignore
 		if (signature !== headerData['x-hubspot-signature']) {
 			return {};
 		}
diff --git a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
index 9fa600730d..dbca30617a 100644
--- a/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/V1/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -11,8 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 export async function hubspotApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
index de46d8a484..fa32887a84 100644
--- a/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/V1/HubspotV1.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -15,7 +16,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
+import { companyFields, companyOperations } from './CompanyDescription';
+import { contactFields, contactOperations } from './ContactDescription';
+import { contactListFields, contactListOperations } from './ContactListDescription';
+import { dealFields, dealOperations } from './DealDescription';
+import type { IAssociation, IDeal } from './DealInterface';
+import { engagementFields, engagementOperations } from './EngagementDescription';
+import { formFields, formOperations } from './FormDescription';
+import type { IForm } from './FormInterface';
 import {
 	clean,
 	getAssociations,
@@ -27,25 +35,8 @@ import {
 	hubspotApiRequestAllItems,
 	validateCredentials,
 } from './GenericFunctions';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
-import { contactListFields, contactListOperations } from './ContactListDescription';
-
-import { companyFields, companyOperations } from './CompanyDescription';
-
-import { dealFields, dealOperations } from './DealDescription';
-
-import { engagementFields, engagementOperations } from './EngagementDescription';
-
-import { formFields, formOperations } from './FormDescription';
-
 import { ticketFields, ticketOperations } from './TicketDescription';
 
-import type { IForm } from './FormInterface';
-
-import type { IAssociation, IDeal } from './DealInterface';
-
 export class HubspotV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
index c5b255ab6c..a640180dec 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -11,8 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 export async function hubspotApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
index f25f7dc0de..94d7bc67cf 100644
--- a/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/V2/HubspotV2.node.ts
@@ -1,3 +1,6 @@
+import { snakeCase } from 'change-case';
+import set from 'lodash/set';
+import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -15,11 +18,14 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-import set from 'lodash/set';
-import { generatePairedItemData } from '../../../utils/utilities';
+import { companyFields, companyOperations } from './CompanyDescription';
+import { contactFields, contactOperations } from './ContactDescription';
+import { contactListFields, contactListOperations } from './ContactListDescription';
+import { dealFields, dealOperations } from './DealDescription';
+import type { IAssociation, IDeal } from './DealInterface';
+import { engagementFields, engagementOperations } from './EngagementDescription';
+import type { IForm } from './FormInterface';
 import {
 	clean,
 	getAssociations,
@@ -31,22 +37,8 @@ import {
 	hubspotApiRequestAllItems,
 	validateCredentials,
 } from './GenericFunctions';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
-import { contactListFields, contactListOperations } from './ContactListDescription';
-
-import { companyFields, companyOperations } from './CompanyDescription';
-
-import { dealFields, dealOperations } from './DealDescription';
-
-import { engagementFields, engagementOperations } from './EngagementDescription';
-
 import { ticketFields, ticketOperations } from './TicketDescription';
-
-import type { IForm } from './FormInterface';
-
-import type { IAssociation, IDeal } from './DealInterface';
+import { generatePairedItemData } from '../../../utils/utilities';
 
 export class HubspotV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -1672,7 +1664,6 @@ export class HubspotV2 implements INodeType {
 											delete filter.type;
 											// Hacky way to get the filter value as we concat the values with a | and the type
 											filter.propertyName = filter.propertyName?.toString().split('|')[0];
-											//@ts-ignore
 										}
 										(body.filterGroups as IDataObject[]).push({ filters: filterValues });
 									}
diff --git a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
index fcbd86ef09..78d8fe20dd 100644
--- a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
+++ b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { humanticAiApiRequest } from './GenericFunctions';
-
 import { profileFields, profileOperations } from './ProfileDescription';
 
 export class HumanticAi implements INodeType {
diff --git a/packages/nodes-base/nodes/Hunter/Hunter.node.ts b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
index c8eed8e9ba..c1cda5a715 100644
--- a/packages/nodes-base/nodes/Hunter/Hunter.node.ts
+++ b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { hunterApiRequest, hunterApiRequestAllItems } from './GenericFunctions';
 
 export class Hunter implements INodeType {
diff --git a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
index 99e2bcf816..3e49879e50 100644
--- a/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
+++ b/packages/nodes-base/nodes/ICalendar/createEvent.operation.ts
@@ -1,4 +1,5 @@
-import { promisify } from 'util';
+import * as ics from 'ics';
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -6,9 +7,7 @@ import {
 	type INodeProperties,
 	NodeOperationError,
 } from 'n8n-workflow';
-
-import moment from 'moment-timezone';
-import * as ics from 'ics';
+import { promisify } from 'util';
 
 const createEvent = promisify(ics.createEvent);
 
diff --git a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
index 9757cd5f2a..65a238c735 100644
--- a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
+++ b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
@@ -1,13 +1,12 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
-import type { WorkflowTestData } from '@test/nodes/types';
-
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import {
 	getResultNodeData,
 	setup,
 	readJsonFileSync,
 	initBinaryDataService,
 } from '@test/nodes/Helpers';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('Execute iCalendar Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/If/V2/IfV2.node.ts b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
index 6ef2dcb626..3d9ca752a0 100644
--- a/packages/nodes-base/nodes/If/V2/IfV2.node.ts
+++ b/packages/nodes-base/nodes/If/V2/IfV2.node.ts
@@ -9,9 +9,10 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
+import { getTypeValidationParameter, getTypeValidationStrictness } from './utils';
 import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
 import { looseTypeValidationProperty } from '../../../utils/descriptions';
-import { getTypeValidationParameter, getTypeValidationStrictness } from './utils';
 
 export class IfV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts b/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts
index d0531ff3c2..e21f877091 100644
--- a/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts
+++ b/packages/nodes-base/nodes/If/test/v2/IfV2.node.test.ts
@@ -1,5 +1,86 @@
+import { mock } from 'jest-mock-extended';
+import { get } from 'lodash';
+import {
+	NodeOperationError,
+	type IExecuteFunctions,
+	type INodeTypeDescription,
+	type IDataObject,
+	type IGetNodeParameterOptions,
+} from 'n8n-workflow';
+
 import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
-const workflows = getWorkflowFilenames(__dirname);
+import * as IfV2 from '../../V2/IfV2.node';
 
-describe('Test IF v2 Node', () => testWorkflows(workflows));
+jest.mock('lodash/set', () => jest.fn());
+
+describe('Test IF v2 Node Tests', () => {
+	afterEach(() => jest.resetAllMocks());
+
+	describe('Test IF v2 Node Workflow Tests', () => testWorkflows(getWorkflowFilenames(__dirname)));
+
+	describe('Test IF V2 Node Unit Tests', () => {
+		const node = new IfV2.IfV2(mock<INodeTypeDescription>());
+
+		const input = [{ json: {} }];
+
+		const createMockExecuteFunction = (
+			nodeParameters: IDataObject,
+			continueOnFail: boolean = false,
+		) => {
+			const fakeExecuteFunction = {
+				getNodeParameter(
+					parameterName: string,
+					itemIndex: number,
+					fallbackValue?: IDataObject | undefined,
+					options?: IGetNodeParameterOptions | undefined,
+				) {
+					const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+
+					const parameterValue = get(nodeParameters, parameter, fallbackValue);
+
+					if ((parameterValue as IDataObject)?.nodeOperationError) {
+						throw new NodeOperationError(mock(), 'Get Options Error', { itemIndex });
+					}
+
+					return parameterValue;
+				},
+				getNode() {
+					return node;
+				},
+				continueOnFail: () => continueOnFail,
+				getInputData: () => input,
+			} as unknown as IExecuteFunctions;
+			return fakeExecuteFunction;
+		};
+
+		it('should return items if continue on fail is true', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction(
+				{ options: { nodeOperationError: true } },
+				true,
+			);
+
+			const output = await node.execute.call(fakeExecuteFunction);
+			expect(output).toEqual([[], input]);
+		});
+
+		it('should throw an error if continue on fail is false and if there is an error', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction(
+				{ options: { nodeOperationError: true } },
+				false,
+			);
+
+			await expect(node.execute.call(fakeExecuteFunction)).rejects.toThrow(NodeOperationError);
+		});
+
+		it('should assign a paired item if paired item is undefined', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction(
+				{ options: {}, conditions: true },
+				false,
+			);
+
+			const output = await node.execute.call(fakeExecuteFunction);
+			expect(output).toEqual([[], [{ json: {}, pairedItem: { item: 0 } }]]);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
index 6ebbfd0642..33bad3f4de 100644
--- a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
@@ -4,7 +4,7 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
-	IRequestOptions,
+	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
@@ -18,24 +18,16 @@ export async function intercomApiRequest(
 	query?: IDataObject,
 	uri?: string,
 ): Promise<any> {
-	const credentials = await this.getCredentials('intercomApi');
-
-	const headerWithAuthentication = Object.assign(
-		{},
-		{ Authorization: `Bearer ${credentials.apiKey}`, Accept: 'application/json' },
-	);
-
-	const options: IRequestOptions = {
-		headers: headerWithAuthentication,
+	const options: IHttpRequestOptions = {
 		method,
 		qs: query,
-		uri: uri || `https://api.intercom.io${endpoint}`,
+		url: uri ?? `https://api.intercom.io${endpoint}`,
 		body,
 		json: true,
 	};
 
 	try {
-		return await this.helpers.request(options);
+		return await this.helpers.httpRequestWithAuthentication.call(this, 'intercomApi', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index dead14c67b..26f71620c5 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -9,13 +9,14 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
-import { leadFields, leadOperations } from './LeadDescription';
+
+import { companyFields, companyOperations } from './CompanyDescription';
+import type { ICompany } from './CompanyInteface';
 import { intercomApiRequest, intercomApiRequestAllItems, validateJSON } from './GenericFunctions';
+import { leadFields, leadOperations } from './LeadDescription';
 import type { IAvatar, ILead, ILeadCompany } from './LeadInterface';
 import { userFields, userOperations } from './UserDescription';
 import type { IUser, IUserCompany } from './UserInterface';
-import { companyFields, companyOperations } from './CompanyDescription';
-import type { ICompany } from './CompanyInteface';
 
 export class Intercom implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/InvoiceNinja/BankTransactionDescription.ts b/packages/nodes-base/nodes/InvoiceNinja/BankTransactionDescription.ts
index abf39ab493..75c3f6dbf6 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/BankTransactionDescription.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/BankTransactionDescription.ts
@@ -97,6 +97,17 @@ export const bankTransactionFields: INodeProperties[] = [
 				],
 				default: '',
 			},
+			{
+				displayName: 'Currency Name or ID',
+				name: 'currencyId',
+				type: 'options',
+				description:
+					'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
+				typeOptions: {
+					loadOptionsMethod: 'getCurrencies',
+				},
+				default: '',
+			},
 			{
 				displayName: 'Date',
 				name: 'date',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/BankTransactionInterface.ts b/packages/nodes-base/nodes/InvoiceNinja/BankTransactionInterface.ts
index 735f339ab8..385009aec6 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/BankTransactionInterface.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/BankTransactionInterface.ts
@@ -2,8 +2,13 @@ export interface IBankTransaction {
 	amount?: number;
 	bank_integration_id?: number;
 	base_type?: string;
+	currency_id?: number;
 	date?: string;
 	description?: string;
 	id?: string;
-	paymentId?: string;
+	payment_id?: string;
+}
+
+export interface IBankTransactions {
+	transactions: IBankTransaction[];
 }
diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
index 76750e8fd9..ce1c3b012d 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export const eventID: { [key: string]: string } = {
 	create_client: '1',
 	create_invoice: '2',
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index ef7494d306..2b771c545f 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -9,36 +9,23 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { invoiceNinjaApiRequest, invoiceNinjaApiRequestAllItems } from './GenericFunctions';
-
-import { clientFields, clientOperations } from './ClientDescription';
-
-import { invoiceFields, invoiceOperations } from './InvoiceDescription';
-
-import type { IClient, IContact } from './ClientInterface';
-
-import type { IInvoice, IItem } from './invoiceInterface';
-
-import { taskFields, taskOperations } from './TaskDescription';
-
-import type { ITask } from './TaskInterface';
-
-import { paymentFields, paymentOperations } from './PaymentDescription';
-
-import type { IPayment } from './PaymentInterface';
-
-import { expenseFields, expenseOperations } from './ExpenseDescription';
-
-import type { IExpense } from './ExpenseInterface';
-
-import { quoteFields, quoteOperations } from './QuoteDescription';
-
-import type { IQuote } from './QuoteInterface';
 import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
 import { bankTransactionFields, bankTransactionOperations } from './BankTransactionDescription';
-
-import type { IBankTransaction } from './BankTransactionInterface';
+import type { IBankTransaction, IBankTransactions } from './BankTransactionInterface';
+import { clientFields, clientOperations } from './ClientDescription';
+import type { IClient, IContact } from './ClientInterface';
+import { expenseFields, expenseOperations } from './ExpenseDescription';
+import type { IExpense } from './ExpenseInterface';
+import { invoiceNinjaApiRequest, invoiceNinjaApiRequestAllItems } from './GenericFunctions';
+import { invoiceFields, invoiceOperations } from './InvoiceDescription';
+import type { IInvoice, IItem } from './invoiceInterface';
+import { paymentFields, paymentOperations } from './PaymentDescription';
+import type { IPayment } from './PaymentInterface';
+import { quoteFields, quoteOperations } from './QuoteDescription';
+import type { IQuote } from './QuoteInterface';
+import { taskFields, taskOperations } from './TaskDescription';
+import type { ITask } from './TaskInterface';
 
 export class InvoiceNinja implements INodeType {
 	description: INodeTypeDescription = {
@@ -295,7 +282,7 @@ export class InvoiceNinja implements INodeType {
 				}
 				return returnData;
 			},
-			// Get all the available users to display them to user so that they can
+			// Get all the matchable payments to display them to user so that they can
 			// select them easily
 			async getPayments(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
@@ -322,6 +309,29 @@ export class InvoiceNinja implements INodeType {
 				}
 				return returnData;
 			},
+			// Get all the currencies to display them to user so that they can
+			// select them easily
+			async getCurrencies(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+
+				const statics = await invoiceNinjaApiRequestAllItems.call(this, 'data', 'GET', '/statics');
+
+				Object.entries(statics)
+					.filter(([key]) => key === 'currencies')
+					.forEach(([key, value]) => {
+						if (key === 'currencies' && Array.isArray(value)) {
+							for (const currency of value) {
+								const currencyName = [currency.number, currency.code].filter((e) => e).join(' - ');
+								const currencyId = currency.id as string;
+								returnData.push({
+									name: currencyName,
+									value: currencyId,
+								});
+							}
+						}
+					});
+				return returnData;
+			},
 		},
 	};
 
@@ -986,6 +996,9 @@ export class InvoiceNinja implements INodeType {
 						if (additionalFields.client) {
 							body.date = additionalFields.date as string;
 						}
+						if (additionalFields.currencyId) {
+							body.currency_id = additionalFields.currencyId as number;
+						}
 						if (additionalFields.email) {
 							body.description = additionalFields.description as string;
 						}
@@ -1054,18 +1067,20 @@ export class InvoiceNinja implements INodeType {
 					if (operation === 'matchPayment') {
 						const bankTransactionId = this.getNodeParameter('bankTransactionId', i) as string;
 						const paymentId = this.getNodeParameter('paymentId', i) as string;
-						const body: IBankTransaction = {};
+						const body: IBankTransactions = { transactions: [] };
+						const bankTransaction: IBankTransaction = {};
 						if (bankTransactionId) {
-							body.id = bankTransactionId;
+							bankTransaction.id = bankTransactionId;
 						}
 						if (paymentId) {
-							body.paymentId = paymentId;
+							bankTransaction.payment_id = paymentId;
 						}
+						body.transactions.push(bankTransaction);
 						responseData = await invoiceNinjaApiRequest.call(
 							this,
 							'POST',
 							`${resourceEndpoint}/match`,
-							body as IDataObject,
+							body as unknown as IDataObject,
 						);
 					}
 				}
diff --git a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
index e5319eb6e2..15bfa4aaea 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
@@ -1,3 +1,11 @@
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
+import lt from 'lodash/lt';
+import pick from 'lodash/pick';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -6,20 +14,12 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import isEmpty from 'lodash/isEmpty';
-import isEqual from 'lodash/isEqual';
-import lt from 'lodash/lt';
-import pick from 'lodash/pick';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
-
-import { sortByCode } from '../V3/helpers/utils';
-import * as summarize from './summarize.operation';
 import { flattenKeys, shuffleArray, compareItems } from '@utils/utilities';
 
+import * as summarize from './summarize.operation';
+import { sortByCode } from '../V3/helpers/utils';
+
 export class ItemListsV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
index 673119063b..24e7d12406 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	GenericValue,
 	IDataObject,
@@ -7,8 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 type AggregationType =
 	| 'append'
 	| 'average'
diff --git a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
index 5447f9e95d..bc2b310441 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
@@ -1,3 +1,11 @@
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import isEqual from 'lodash/isEqual';
+import lt from 'lodash/lt';
+import pick from 'lodash/pick';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
+import { NodeConnectionType, NodeOperationError, deepCopy } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,20 +15,12 @@ import type {
 	INodeTypeDescription,
 	IPairedItemData,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError, deepCopy } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import isEmpty from 'lodash/isEmpty';
-import isEqual from 'lodash/isEqual';
-import lt from 'lodash/lt';
-import pick from 'lodash/pick';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
-
-import { sortByCode } from '../V3/helpers/utils';
-import * as summarize from './summarize.operation';
 import { flattenKeys, shuffleArray, compareItems } from '@utils/utilities';
 
+import * as summarize from './summarize.operation';
+import { sortByCode } from '../V3/helpers/utils';
+
 export class ItemListsV2 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
index f6fc2ddd72..1086be2f1c 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	GenericValue,
 	IDataObject,
@@ -7,8 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 type AggregationType =
 	| 'append'
 	| 'average'
diff --git a/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts b/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts
index d2408eb277..8cc09765bd 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/ItemListsV3.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
 
 export class ItemListsV3 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
index 138fd2d276..83b64309c1 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/concatenateItems.operation.ts
@@ -1,3 +1,6 @@
+import get from 'lodash/get';
+import isEmpty from 'lodash/isEmpty';
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,13 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import isEmpty from 'lodash/isEmpty';
-import set from 'lodash/set';
+import { updateDisplayOptions } from '@utils/utilities';
 
 import { addBinariesToItem, prepareFieldsArray } from '../../helpers/utils';
 import { disableDotNotationBoolean } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts
index 5671cf246f..1a6a6a334b 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/limit.operation.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
index 09f580b393..cd9bb20c27 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/removeDuplicates.operation.ts
@@ -1,14 +1,14 @@
-import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
 import lt from 'lodash/lt';
 import pick from 'lodash/pick';
+import { NodeOperationError } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { compareItems, flattenKeys, updateDisplayOptions } from '@utils/utilities';
 
 import { prepareFieldsArray, typeToNumber } from '../../helpers/utils';
 import { disableDotNotationBoolean } from '../common.descriptions';
-import { compareItems, flattenKeys, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
index 0bd3ec9ec9..7e09010422 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/sort.operation.ts
@@ -1,3 +1,6 @@
+import get from 'lodash/get';
+import isEqual from 'lodash/isEqual';
+import lt from 'lodash/lt';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -6,14 +9,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
-import isEqual from 'lodash/isEqual';
-import lt from 'lodash/lt';
+import { shuffleArray, updateDisplayOptions } from '@utils/utilities';
 
 import { sortByCode } from '../../helpers/utils';
 import { disableDotNotationBoolean } from '../common.descriptions';
-import { shuffleArray, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
index 544192fd99..2c437a6a74 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/splitOutItems.operation.ts
@@ -1,3 +1,5 @@
+import get from 'lodash/get';
+import unset from 'lodash/unset';
 import type {
 	IBinaryData,
 	IDataObject,
@@ -7,12 +9,11 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import unset from 'lodash/unset';
-import { disableDotNotationBoolean } from '../common.descriptions';
-import { prepareFieldsArray } from '../../helpers/utils';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { prepareFieldsArray } from '../../helpers/utils';
+import { disableDotNotationBoolean } from '../common.descriptions';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields To Split Out',
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
index d026beb2d7..7d96e58000 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/itemList/summarize.operation.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	GenericValue,
 	IDataObject,
@@ -7,10 +8,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-import { disableDotNotationBoolean } from '../common.descriptions';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { disableDotNotationBoolean } from '../common.descriptions';
+
 type AggregationType =
 	| 'append'
 	| 'average'
diff --git a/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts b/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
index 006d4f9b87..6580464c4a 100644
--- a/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
+++ b/packages/nodes-base/nodes/ItemLists/V3/actions/router.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { ItemListsType } from './node.type';
 
 import * as itemList from './itemList';
+import type { ItemListsType } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index 2159705475..7e5d7e20d2 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,13 +11,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { iterableApiRequest } from './GenericFunctions';
-
 import { eventFields, eventOperations } from './EventDescription';
-
+import { iterableApiRequest } from './GenericFunctions';
 import { userFields, userOperations } from './UserDescription';
-
 import { userListFields, userListOperations } from './UserListDescription';
 
 export class Iterable implements INodeType {
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 2c21328f78..26770e2eae 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -1,6 +1,4 @@
-import type { Readable } from 'stream';
 import mergeWith from 'lodash/mergeWith';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -13,6 +11,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import {
 	filterSortSearchListItems,
@@ -22,13 +21,9 @@ import {
 	simplifyIssueOutput,
 	validateJSON,
 } from './GenericFunctions';
-
 import { issueAttachmentFields, issueAttachmentOperations } from './IssueAttachmentDescription';
-
 import { issueCommentFields, issueCommentOperations } from './IssueCommentDescription';
-
 import { issueFields, issueOperations } from './IssueDescription';
-
 import type {
 	IFields,
 	IIssue,
@@ -36,7 +31,6 @@ import type {
 	INotify,
 	NotificationRecipientsRestrictions,
 } from './IssueInterface';
-
 import { userFields, userOperations } from './UserDescription';
 
 export class Jira implements INodeType {
diff --git a/packages/nodes-base/nodes/Jwt/Jwt.node.ts b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
index 3a0815c906..1018f97bf8 100644
--- a/packages/nodes-base/nodes/Jwt/Jwt.node.ts
+++ b/packages/nodes-base/nodes/Jwt/Jwt.node.ts
@@ -1,3 +1,4 @@
+import jwt from 'jsonwebtoken';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,8 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import jwt from 'jsonwebtoken';
-
 import { formatPrivateKey } from '../../utils/utilities';
 import { parseJsonParameter } from '../Set/v2/helpers/utils';
 
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.ts b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
index 87e9f95b0d..0306fae772 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.ts
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
@@ -1,8 +1,6 @@
+import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
 import type { KafkaConfig, SASLOptions, TopicMessages } from 'kafkajs';
 import { CompressionTypes, Kafka as apacheKafka } from 'kafkajs';
-
-import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
-
 import type {
 	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
@@ -15,6 +13,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
 import { generatePairedItemData } from '../../utils/utilities';
 
 export class Kafka implements INodeType {
diff --git a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
index 631566ffbd..628d1d1d4d 100644
--- a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
@@ -1,8 +1,6 @@
+import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
 import type { KafkaConfig, SASLOptions } from 'kafkajs';
 import { Kafka as apacheKafka, logLevel } from 'kafkajs';
-
-import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
-
 import type {
 	ITriggerFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Keap/GenericFunctions.ts b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
index 896c4449a9..b44fad91e1 100644
--- a/packages/nodes-base/nodes/Keap/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
 export async function keapApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
@@ -41,7 +40,6 @@ export async function keapApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'keapOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 43a766ab3a..065dbec746 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -1,3 +1,6 @@
+import { capitalCase, pascalCase } from 'change-case';
+import moment from 'moment-timezone';
+import { NodeConnectionType } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,28 +10,9 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-
-import { capitalCase, pascalCase } from 'change-case';
-import moment from 'moment-timezone';
-import { keapApiRequest, keapApiRequestAllItems, keysToSnakeCase } from './GenericFunctions';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
-import { contactNoteFields, contactNoteOperations } from './ContactNoteDescription';
-
-import { contactTagFields, contactTagOperations } from './ContactTagDescription';
-
-import { ecommerceOrderFields, ecommerceOrderOperations } from './EcommerceOrderDescripion';
-
-import { ecommerceProductFields, ecommerceProductOperations } from './EcommerceProductDescription';
-
-import { emailFields, emailOperations } from './EmailDescription';
-
-import { fileFields, fileOperations } from './FileDescription';
 
 import { companyFields, companyOperations } from './CompanyDescription';
-
+import type { ICompany } from './CompanyInterface';
 import type {
 	IAddress,
 	IContact,
@@ -37,18 +21,19 @@ import type {
 	IPhone,
 	ISocialAccount,
 } from './ConctactInterface';
-
-import type { IAttachment, IEmail } from './EmaiIInterface';
-
+import { contactFields, contactOperations } from './ContactDescription';
+import { contactNoteFields, contactNoteOperations } from './ContactNoteDescription';
 import type { INote } from './ContactNoteInterface';
-
+import { contactTagFields, contactTagOperations } from './ContactTagDescription';
+import { ecommerceOrderFields, ecommerceOrderOperations } from './EcommerceOrderDescripion';
 import type { IEcommerceOrder, IItem, IShippingAddress } from './EcommerceOrderInterface';
-
+import { ecommerceProductFields, ecommerceProductOperations } from './EcommerceProductDescription';
 import type { IEcommerceProduct } from './EcommerceProductInterface';
-
+import type { IAttachment, IEmail } from './EmaiIInterface';
+import { emailFields, emailOperations } from './EmailDescription';
+import { fileFields, fileOperations } from './FileDescription';
 import type { IFile } from './FileInterface';
-
-import type { ICompany } from './CompanyInterface';
+import { keapApiRequest, keapApiRequestAllItems, keysToSnakeCase } from './GenericFunctions';
 
 export class Keap implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index 066bceb0ff..7444669712 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
 import { keapApiRequest } from './GenericFunctions';
 
 export class KeapTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
index 946db3742a..87f6931dbf 100644
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
+++ b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
@@ -17,10 +17,9 @@ import {
 	workItemFields,
 	workItemOperations,
 } from './descriptions';
-
 import type { LoadOptions } from './GenericFunctions';
 import { createLoadOptions, kitemakerRequest, kitemakerRequestAllItems } from './GenericFunctions';
-
+import { createWorkItem, editWorkItem } from './mutations';
 import {
 	getAllSpaces,
 	getAllUsers,
@@ -34,8 +33,6 @@ import {
 	getWorkItems,
 } from './queries';
 
-import { createWorkItem, editWorkItem } from './mutations';
-
 export class Kitemaker implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Kitemaker',
diff --git a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
index cb9b6b6a2c..77279a338a 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
@@ -1,3 +1,18 @@
+import clone from 'lodash/clone';
+import compact from 'lodash/compact';
+import concat from 'lodash/concat';
+import escapeRegExp from 'lodash/escapeRegExp';
+import every from 'lodash/every';
+import first from 'lodash/first';
+import isArray from 'lodash/isArray';
+import isString from 'lodash/isString';
+import last from 'lodash/last';
+import set from 'lodash/set';
+import some from 'lodash/some';
+import split from 'lodash/split';
+import toNumber from 'lodash/toNumber';
+import toString from 'lodash/toString';
+import trim from 'lodash/trim';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,22 +24,6 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
-import concat from 'lodash/concat';
-import split from 'lodash/split';
-import every from 'lodash/every';
-import toString from 'lodash/toString';
-import toNumber from 'lodash/toNumber';
-import isString from 'lodash/isString';
-import compact from 'lodash/compact';
-import first from 'lodash/first';
-import last from 'lodash/last';
-import clone from 'lodash/clone';
-import some from 'lodash/some';
-import isArray from 'lodash/isArray';
-import trim from 'lodash/trim';
-import escapeRegExp from 'lodash/escapeRegExp';
-
 export async function koBoToolboxApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	option: IDataObject = {},
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
index 2bb60b2b75..d4cdb886c2 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
@@ -8,6 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
+import { fileFields, fileOperations } from './FileDescription';
+import { formFields, formOperations } from './FormDescription';
 import {
 	downloadAttachments,
 	formatSubmission,
@@ -16,14 +18,8 @@ import {
 	loadForms,
 	parseStringList,
 } from './GenericFunctions';
-
-import { formFields, formOperations } from './FormDescription';
-
-import { submissionFields, submissionOperations } from './SubmissionDescription';
-
 import { hookFields, hookOperations } from './HookDescription';
-
-import { fileFields, fileOperations } from './FileDescription';
+import { submissionFields, submissionOperations } from './SubmissionDescription';
 
 export class KoBoToolbox implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
index 503c100741..343f9d9c5b 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
@@ -15,7 +15,6 @@ import {
 	loadForms,
 	parseStringList,
 } from './GenericFunctions';
-
 import { options } from './Options';
 
 export class KoBoToolboxTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Ldap/Helpers.ts b/packages/nodes-base/nodes/Ldap/Helpers.ts
index 5e4447fa84..0b56b1b230 100644
--- a/packages/nodes-base/nodes/Ldap/Helpers.ts
+++ b/packages/nodes-base/nodes/Ldap/Helpers.ts
@@ -1,7 +1,6 @@
 import { Client } from 'ldapts';
 import type { ClientOptions, Entry } from 'ldapts';
-import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
-import { LoggerProxy as Logger } from 'n8n-workflow';
+import type { ICredentialDataDecryptedObject, IDataObject, Logger } from 'n8n-workflow';
 export const BINARY_AD_ATTRIBUTES = ['objectGUID', 'objectSid'];
 
 const resolveEntryBinaryAttributes = (entry: Entry): Entry => {
@@ -18,6 +17,7 @@ export const resolveBinaryAttributes = (entries: Entry[]): void => {
 };
 
 export async function createLdapClient(
+	context: { logger: Logger },
 	credentials: ICredentialDataDecryptedObject,
 	nodeDebug?: boolean,
 	nodeType?: string,
@@ -45,7 +45,7 @@ export async function createLdapClient(
 	}
 
 	if (nodeDebug) {
-		Logger.info(
+		context.logger.info(
 			`[${nodeType} | ${nodeName}] - LDAP Options: ${JSON.stringify(ldapOptions, null, 2)}`,
 		);
 	}
diff --git a/packages/nodes-base/nodes/Ldap/Ldap.node.ts b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
index 52e9cd9d15..6c24606a67 100644
--- a/packages/nodes-base/nodes/Ldap/Ldap.node.ts
+++ b/packages/nodes-base/nodes/Ldap/Ldap.node.ts
@@ -1,3 +1,4 @@
+import { Attribute, Change } from 'ldapts';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -12,9 +13,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { Attribute, Change } from 'ldapts';
-import { ldapFields } from './LdapDescription';
 import { BINARY_AD_ATTRIBUTES, createLdapClient, resolveBinaryAttributes } from './Helpers';
+import { ldapFields } from './LdapDescription';
 
 export class Ldap implements INodeType {
 	description: INodeTypeDescription = {
@@ -103,7 +103,7 @@ export class Ldap implements INodeType {
 				credential: ICredentialsDecrypted,
 			): Promise<INodeCredentialTestResult> {
 				const credentials = credential.data as ICredentialDataDecryptedObject;
-				const client = await createLdapClient(credentials);
+				const client = await createLdapClient(this, credentials);
 				try {
 					await client.bind(credentials.bindDN as string, credentials.bindPassword as string);
 				} catch (error) {
@@ -123,13 +123,13 @@ export class Ldap implements INodeType {
 		loadOptions: {
 			async getAttributes(this: ILoadOptionsFunctions) {
 				const credentials = await this.getCredentials('ldap');
-				const client = await createLdapClient(credentials);
+				const client = await createLdapClient(this, credentials);
 
 				try {
 					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();
@@ -153,12 +153,12 @@ export class Ldap implements INodeType {
 
 			async getObjectClasses(this: ILoadOptionsFunctions) {
 				const credentials = await this.getCredentials('ldap');
-				const client = await createLdapClient(credentials);
+				const client = await createLdapClient(this, credentials);
 				try {
 					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();
@@ -196,13 +196,13 @@ export class Ldap implements INodeType {
 
 			async getAttributesForDn(this: ILoadOptionsFunctions) {
 				const credentials = await this.getCredentials('ldap');
-				const client = await createLdapClient(credentials);
+				const client = await createLdapClient(this, credentials);
 
 				try {
 					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();
@@ -242,6 +242,7 @@ export class Ldap implements INodeType {
 
 		const credentials = await this.getCredentials('ldap');
 		const client = await createLdapClient(
+			this,
 			credentials,
 			nodeDebug,
 			this.getNode().type,
diff --git a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
index cc8875549c..a3d2d05dba 100644
--- a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -7,8 +8,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
-
 /**
  * Make an authenticated API request to Lemlist.
  */
diff --git a/packages/nodes-base/nodes/Lemlist/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Lemlist/test/GenericFunctions.test.ts
index a0538678bd..c64a845a55 100644
--- a/packages/nodes-base/nodes/Lemlist/test/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/Lemlist/test/GenericFunctions.test.ts
@@ -5,6 +5,7 @@ import type {
 	IDataObject,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
+
 import { lemlistApiRequest, lemlistApiRequestAllItems, getEvents } from '../GenericFunctions';
 
 describe('GenericFunctions', () => {
diff --git a/packages/nodes-base/nodes/Lemlist/v1/LemlistV1.node.ts b/packages/nodes-base/nodes/Lemlist/v1/LemlistV1.node.ts
index 9c313fc60f..9c95991940 100644
--- a/packages/nodes-base/nodes/Lemlist/v1/LemlistV1.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/v1/LemlistV1.node.ts
@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -9,9 +11,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import omit from 'lodash/omit';
-import { lemlistApiRequest, lemlistApiRequestAllItems } from '../GenericFunctions';
 import {
 	activityFields,
 	activityOperations,
@@ -24,6 +23,7 @@ import {
 	unsubscribeFields,
 	unsubscribeOperations,
 } from './descriptions';
+import { lemlistApiRequest, lemlistApiRequestAllItems } from '../GenericFunctions';
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Lemlist',
 	name: 'lemlist',
diff --git a/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts b/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
index d49128ea9f..7ccab5c90a 100644
--- a/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/v2/LemlistV2.node.ts
@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -9,9 +11,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import omit from 'lodash/omit';
-import { lemlistApiRequest, lemlistApiRequestAllItems } from '../GenericFunctions';
 import {
 	activityFields,
 	activityOperations,
@@ -26,6 +25,7 @@ import {
 	unsubscribeFields,
 	unsubscribeOperations,
 } from './descriptions';
+import { lemlistApiRequest, lemlistApiRequestAllItems } from '../GenericFunctions';
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Lemlist',
 	name: 'lemlist',
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index f8cd832aa5..15f4f4f36f 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { lineApiRequest } from './GenericFunctions';
-
 import { notificationFields, notificationOperations } from './NotificationDescription';
 
 export class Line implements INodeType {
diff --git a/packages/nodes-base/nodes/Linear/GenericFunctions.ts b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
index 4d008f2ac5..805fc697a6 100644
--- a/packages/nodes-base/nodes/Linear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
@@ -6,13 +7,10 @@ import type {
 	ILoadOptionsFunctions,
 	IHookFunctions,
 	IWebhookFunctions,
-	JsonObject,
-	IRequestOptions,
+	IHttpRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 import { query } from './Queries';
 
 export async function linearApiRequest(
@@ -24,24 +22,43 @@ export async function linearApiRequest(
 	const endpoint = 'https://api.linear.app/graphql';
 	const authenticationMethod = this.getNodeParameter('authentication', 0, 'apiToken') as string;
 
-	let options: IRequestOptions = {
+	let options: IHttpRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 		},
 		method: 'POST',
 		body,
-		uri: endpoint,
+		url: endpoint,
 		json: true,
 	};
 	options = Object.assign({}, options, option);
 	try {
-		return await this.helpers.requestWithAuthentication.call(
+		const response = await this.helpers.httpRequestWithAuthentication.call(
 			this,
 			authenticationMethod === 'apiToken' ? 'linearApi' : 'linearOAuth2Api',
 			options,
 		);
+
+		if (response.errors) {
+			throw new NodeApiError(this.getNode(), response.errors, {
+				message: response.errors[0].message,
+			});
+		}
+
+		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
+		throw new NodeApiError(
+			this.getNode(),
+			{},
+			{
+				message: error.errorResponse
+					? error.errorResponse[0].message
+					: error.context.data.errors[0].message,
+				description: error.errorResponse
+					? error.errorResponse[0].extensions.userPresentableMessage
+					: error.context.data.errors[0].extensions.userPresentableMessage,
+			},
+		);
 	}
 }
 
@@ -85,7 +102,7 @@ export async function validateCredentials(
 ): Promise<any> {
 	const credentials = decryptedCredentials;
 
-	const options: IRequestOptions = {
+	const options: IHttpRequestOptions = {
 		headers: {
 			'Content-Type': 'application/json',
 			Authorization: credentials.apiKey,
@@ -97,7 +114,7 @@ export async function validateCredentials(
 				first: 1,
 			},
 		},
-		uri: 'https://api.linear.app/graphql',
+		url: 'https://api.linear.app/graphql',
 		json: true,
 	};
 
diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts
index 7ea6f2aca5..23a8b9bd42 100644
--- a/packages/nodes-base/nodes/Linear/Linear.node.ts
+++ b/packages/nodes-base/nodes/Linear/Linear.node.ts
@@ -20,9 +20,7 @@ import {
 	sort,
 	validateCredentials,
 } from './GenericFunctions';
-
 import { issueFields, issueOperations } from './IssueDescription';
-
 import { query } from './Queries';
 interface IGraphqlBody {
 	query: string;
diff --git a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
index ea95e4879e..dcbbed2ce2 100644
--- a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
+++ b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
@@ -71,6 +71,12 @@ export class LinearTrigger implements INodeType {
 				],
 				default: 'apiToken',
 			},
+			{
+				displayName: 'Make sure your credential has the "Admin" scope to create webhooks.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
 			{
 				displayName: 'Team Name or ID',
 				name: 'teamId',
diff --git a/packages/nodes-base/nodes/Linear/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Linear/test/GenericFunctions.test.ts
new file mode 100644
index 0000000000..b49b59133a
--- /dev/null
+++ b/packages/nodes-base/nodes/Linear/test/GenericFunctions.test.ts
@@ -0,0 +1,135 @@
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IWebhookFunctions,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import { capitalizeFirstLetter, linearApiRequest, sort } from '../GenericFunctions';
+
+describe('Linear -> GenericFunctions', () => {
+	const mockHttpRequestWithAuthentication = jest.fn();
+
+	describe('linearApiRequest', () => {
+		let mockExecuteFunctions:
+			| IExecuteFunctions
+			| IWebhookFunctions
+			| IHookFunctions
+			| ILoadOptionsFunctions;
+
+		const setupMockFunctions = (authentication: string) => {
+			mockExecuteFunctions = {
+				getNodeParameter: jest.fn().mockReturnValue(authentication),
+				helpers: {
+					httpRequestWithAuthentication: mockHttpRequestWithAuthentication,
+				},
+				getNode: jest.fn().mockReturnValue({}),
+			} as unknown as
+				| IExecuteFunctions
+				| IWebhookFunctions
+				| IHookFunctions
+				| ILoadOptionsFunctions;
+			jest.clearAllMocks();
+		};
+
+		beforeEach(() => {
+			setupMockFunctions('apiToken');
+		});
+
+		it('should make a successful API request', async () => {
+			const response = { data: { success: true } };
+
+			mockHttpRequestWithAuthentication.mockResolvedValue(response);
+
+			const result = await linearApiRequest.call(mockExecuteFunctions, {
+				query: '{ viewer { id } }',
+			});
+
+			expect(result).toEqual(response);
+			expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+				'linearApi',
+				expect.objectContaining({
+					method: 'POST',
+					url: 'https://api.linear.app/graphql',
+					json: true,
+					body: { query: '{ viewer { id } }' },
+				}),
+			);
+		});
+
+		it('should handle API request errors', async () => {
+			const errorResponse = {
+				errors: [
+					{
+						message: 'Access denied',
+						extensions: {
+							userPresentableMessage: 'You need to have the "Admin" scope to create webhooks.',
+						},
+					},
+				],
+			};
+
+			mockHttpRequestWithAuthentication.mockResolvedValue(errorResponse);
+
+			await expect(
+				linearApiRequest.call(mockExecuteFunctions, { query: '{ viewer { id } }' }),
+			).rejects.toThrow(NodeApiError);
+
+			expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+				'linearApi',
+				expect.objectContaining({
+					method: 'POST',
+					url: 'https://api.linear.app/graphql',
+					json: true,
+					body: { query: '{ viewer { id } }' },
+				}),
+			);
+		});
+	});
+
+	describe('capitalizeFirstLetter', () => {
+		it('should capitalize the first letter of a string', () => {
+			expect(capitalizeFirstLetter('hello')).toBe('Hello');
+			expect(capitalizeFirstLetter('world')).toBe('World');
+			expect(capitalizeFirstLetter('capitalize')).toBe('Capitalize');
+		});
+
+		it('should return an empty string if input is empty', () => {
+			expect(capitalizeFirstLetter('')).toBe('');
+		});
+
+		it('should handle single character strings', () => {
+			expect(capitalizeFirstLetter('a')).toBe('A');
+			expect(capitalizeFirstLetter('b')).toBe('B');
+		});
+
+		it('should not change the case of the rest of the string', () => {
+			expect(capitalizeFirstLetter('hELLO')).toBe('HELLO');
+			expect(capitalizeFirstLetter('wORLD')).toBe('WORLD');
+		});
+	});
+
+	describe('sort', () => {
+		it('should sort objects by name in ascending order', () => {
+			const array = [{ name: 'banana' }, { name: 'apple' }, { name: 'cherry' }];
+
+			const sortedArray = array.sort(sort);
+
+			expect(sortedArray).toEqual([{ name: 'apple' }, { name: 'banana' }, { name: 'cherry' }]);
+		});
+
+		it('should handle case insensitivity', () => {
+			const array = [{ name: 'Banana' }, { name: 'apple' }, { name: 'cherry' }];
+
+			const sortedArray = array.sort(sort);
+
+			expect(sortedArray).toEqual([{ name: 'apple' }, { name: 'Banana' }, { name: 'cherry' }]);
+		});
+
+		it('should return 0 for objects with the same name', () => {
+			const result = sort({ name: 'apple' }, { name: 'apple' });
+			expect(result).toBe(0);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 9732176da9..44e8bb0585 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { linkedInApiRequest } from './GenericFunctions';
 import { postFields, postOperations } from './PostDescription';
 
diff --git a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
index d01bc1ba1a..251b2402b0 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
@@ -1,3 +1,4 @@
+import { watch } from 'chokidar';
 import {
 	type ITriggerFunctions,
 	type IDataObject,
@@ -7,8 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { watch } from 'chokidar';
-
 export class LocalFileTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Local File Trigger',
diff --git a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
index b237024c81..91f749e743 100644
--- a/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LoneScale/GenericFunctions.ts
@@ -8,6 +8,7 @@ import {
 	type IWebhookFunctions,
 	type IRequestOptions,
 } from 'n8n-workflow';
+
 import { BASE_URL } from './constants';
 
 export async function lonescaleApiRequest(
diff --git a/packages/nodes-base/nodes/MQTT/test/Mqtt.node.test.ts b/packages/nodes-base/nodes/MQTT/test/Mqtt.node.test.ts
index 67b6202520..9e86651ff2 100644
--- a/packages/nodes-base/nodes/MQTT/test/Mqtt.node.test.ts
+++ b/packages/nodes-base/nodes/MQTT/test/Mqtt.node.test.ts
@@ -1,9 +1,9 @@
-import type { MqttClient } from 'mqtt';
 import { mock } from 'jest-mock-extended';
+import type { MqttClient } from 'mqtt';
 import type { ICredentialDataDecryptedObject, IExecuteFunctions } from 'n8n-workflow';
 
-import { Mqtt } from '../Mqtt.node';
 import { createClient } from '../GenericFunctions';
+import { Mqtt } from '../Mqtt.node';
 
 jest.mock('../GenericFunctions', () => {
 	const mockMqttClient = mock<MqttClient>();
diff --git a/packages/nodes-base/nodes/MQTT/test/MqttTrigger.node.test.ts b/packages/nodes-base/nodes/MQTT/test/MqttTrigger.node.test.ts
index 05694b43c6..3862c91b5f 100644
--- a/packages/nodes-base/nodes/MQTT/test/MqttTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/MQTT/test/MqttTrigger.node.test.ts
@@ -1,10 +1,10 @@
+import { captor, mock } from 'jest-mock-extended';
 import type { MqttClient, OnMessageCallback } from 'mqtt';
 import { returnJsonArray } from 'n8n-core';
-import { captor, mock } from 'jest-mock-extended';
 import type { ICredentialDataDecryptedObject, ITriggerFunctions } from 'n8n-workflow';
 
-import { MqttTrigger } from '../MqttTrigger.node';
 import { createClient } from '../GenericFunctions';
+import { MqttTrigger } from '../MqttTrigger.node';
 
 jest.mock('../GenericFunctions', () => {
 	const mockMqttClient = mock<MqttClient>();
diff --git a/packages/nodes-base/nodes/Magento/GenericFunctions.ts b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
index 2b83721b28..2817d51ccb 100644
--- a/packages/nodes-base/nodes/Magento/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
@@ -11,6 +11,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { ApplicationError, NodeApiError } from 'n8n-workflow';
+
 import type { Filter, Address, Search, FilterGroup, ProductAttribute } from './types';
 
 export async function magentoApiRequest(
@@ -39,7 +40,6 @@ export async function magentoApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestWithAuthentication.call(this, 'magento2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Magento/Magento2.node.ts b/packages/nodes-base/nodes/Magento/Magento2.node.ts
index 0d7196eb75..ce473b16a8 100644
--- a/packages/nodes-base/nodes/Magento/Magento2.node.ts
+++ b/packages/nodes-base/nodes/Magento/Magento2.node.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,7 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
+import { customerFields, customerOperations } from './CustomerDescription';
 import {
 	adjustAddresses,
 	getFilterQuery,
@@ -20,15 +21,9 @@ import {
 	sort,
 	validateJSON,
 } from './GenericFunctions';
-
-import { customerFields, customerOperations } from './CustomerDescription';
-
-import { orderFields, orderOperations } from './OrderDescription';
-
-import { productFields, productOperations } from './ProductDescription';
-
 import { invoiceFields, invoiceOperations } from './InvoiceDescription';
-
+import { orderFields, orderOperations } from './OrderDescription';
+import { productFields, productOperations } from './ProductDescription';
 import type {
 	CustomAttribute,
 	CustomerAttributeMetadata,
diff --git a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
index ae014ceed5..23fa53e184 100644
--- a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
@@ -1,5 +1,4 @@
 import { ApplicationError } from 'n8n-workflow';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index 3c30d6c0d9..890ca72360 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import {
 	campaignFieldsMetadata,
 	mailchimpApiRequest,
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index 928296c32d..b97c9dd37f 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -10,6 +10,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
+
 import { mailchimpApiRequest } from './GenericFunctions';
 
 export class MailchimpTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
index 2459f349d1..309d81188b 100644
--- a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
@@ -3,39 +3,39 @@ import type {
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
+	INodePropertyOptions,
 	JsonObject,
-	IRequestOptions,
+	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
+import type { CustomField } from './v2/MailerLite.Interface';
+
 export async function mailerliteApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: IHttpRequestMethods,
 	path: string,
-
 	body: any = {},
 	qs: IDataObject = {},
 	_option = {},
 ): Promise<any> {
-	const credentials = await this.getCredentials('mailerLiteApi');
-
-	const options: IRequestOptions = {
-		headers: {
-			'X-MailerLite-ApiKey': credentials.apiKey,
-		},
+	const options: IHttpRequestOptions = {
 		method,
 		body,
 		qs,
-		uri: `https://api.mailerlite.com/api/v2${path}`,
+		url:
+			this.getNode().typeVersion === 1
+				? `https://api.mailerlite.com/api/v2${path}`
+				: `https://connect.mailerlite.com/api${path}`,
 		json: true,
 	};
 	try {
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
-		return await this.helpers.request.call(this, options);
+
+		return await this.helpers.httpRequestWithAuthentication.call(this, 'mailerLiteApi', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
@@ -45,21 +45,56 @@ export async function mailerliteApiRequestAllItems(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: IHttpRequestMethods,
 	endpoint: string,
-
 	body: any = {},
 	query: IDataObject = {},
 ): Promise<any> {
 	const returnData: IDataObject[] = [];
-
 	let responseData;
 
 	query.limit = 1000;
 	query.offset = 0;
 
-	do {
-		responseData = await mailerliteApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData as IDataObject[]);
-		query.offset = query.offset + query.limit;
-	} while (responseData.length !== 0);
+	if (this.getNode().typeVersion === 1) {
+		do {
+			responseData = await mailerliteApiRequest.call(this, method, endpoint, body, query);
+			returnData.push(...(responseData as IDataObject[]));
+			query.offset += query.limit;
+		} while (responseData.length !== 0);
+	} else {
+		do {
+			responseData = await mailerliteApiRequest.call(this, method, endpoint, body, query);
+			returnData.push(...(responseData.data as IDataObject[]));
+			query.cursor = responseData.meta.next_cursor;
+		} while (responseData.links.next !== null);
+	}
+
+	return returnData;
+}
+
+export async function getCustomFields(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const endpoint = '/fields';
+	const fieldsResponse = await mailerliteApiRequest.call(this, 'GET', endpoint);
+
+	if (this.getNode().typeVersion === 1) {
+		const fields = fieldsResponse as CustomField[];
+		fields.forEach((field) => {
+			returnData.push({
+				name: field.key,
+				value: field.key,
+			});
+		});
+	} else {
+		const fields = (fieldsResponse as IDataObject).data as CustomField[];
+		fields.forEach((field) => {
+			returnData.push({
+				name: field.name,
+				value: field.key,
+			});
+		});
+	}
+
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
index 6fe7c621b1..fbd9c3a125 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
@@ -1,206 +1,26 @@
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
 
-import { mailerliteApiRequest, mailerliteApiRequestAllItems } from './GenericFunctions';
+import { MailerLiteV1 } from './v1/MailerLiteV1.node';
+import { MailerLiteV2 } from './v2/MailerLiteV2.node';
 
-import { subscriberFields, subscriberOperations } from './SubscriberDescription';
+export class MailerLite extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'MailerLite',
+			name: 'mailerLite',
+			icon: 'file:MailerLite.svg',
+			group: ['input'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume MailerLite API',
+			defaultVersion: 2,
+		};
 
-export class MailerLite implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'MailerLite',
-		name: 'mailerLite',
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
-		icon: 'file:mailerLite.png',
-		group: ['input'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Mailer Lite API',
-		defaults: {
-			name: 'MailerLite',
-		},
-		inputs: [NodeConnectionType.Main],
-		outputs: [NodeConnectionType.Main],
-		credentials: [
-			{
-				name: 'mailerLiteApi',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Subscriber',
-						value: 'subscriber',
-					},
-				],
-				default: 'subscriber',
-			},
-			...subscriberOperations,
-			...subscriberFields,
-		],
-	};
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new MailerLiteV1(baseDescription),
+			2: new MailerLiteV2(baseDescription),
+		};
 
-	methods = {
-		loadOptions: {
-			// Get all the available custom fields to display them to user so that they can
-			// select them easily
-			async getCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const fields = await mailerliteApiRequest.call(this, 'GET', '/fields');
-				for (const field of fields) {
-					returnData.push({
-						name: field.key,
-						value: field.key,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const length = items.length;
-		const qs: IDataObject = {};
-		let responseData;
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-		for (let i = 0; i < length; i++) {
-			try {
-				if (resource === 'subscriber') {
-					//https://developers.mailerlite.com/reference#create-a-subscriber
-					if (operation === 'create') {
-						const email = this.getNodeParameter('email', i) as string;
-
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const body: IDataObject = {
-							email,
-							fields: [],
-						};
-
-						Object.assign(body, additionalFields);
-
-						if (additionalFields.customFieldsUi) {
-							const customFieldsValues = (additionalFields.customFieldsUi as IDataObject)
-								.customFieldsValues as IDataObject[];
-
-							if (customFieldsValues) {
-								const fields = {};
-
-								for (const customFieldValue of customFieldsValues) {
-									//@ts-ignore
-									fields[customFieldValue.fieldId] = customFieldValue.value;
-								}
-
-								body.fields = fields;
-								delete body.customFieldsUi;
-							}
-						}
-
-						responseData = await mailerliteApiRequest.call(this, 'POST', '/subscribers', body);
-					}
-					//https://developers.mailerlite.com/reference#single-subscriber
-					if (operation === 'get') {
-						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
-
-						responseData = await mailerliteApiRequest.call(
-							this,
-							'GET',
-							`/subscribers/${subscriberId}`,
-						);
-					}
-					//https://developers.mailerlite.com/reference#subscribers
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-
-						const filters = this.getNodeParameter('filters', i);
-
-						Object.assign(qs, filters);
-
-						if (returnAll) {
-							responseData = await mailerliteApiRequestAllItems.call(
-								this,
-								'GET',
-								'/subscribers',
-								{},
-								qs,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-
-							responseData = await mailerliteApiRequest.call(this, 'GET', '/subscribers', {}, qs);
-						}
-					}
-					//https://developers.mailerlite.com/reference#update-subscriber
-					if (operation === 'update') {
-						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
-
-						const updateFields = this.getNodeParameter('updateFields', i);
-
-						const body: IDataObject = {};
-
-						Object.assign(body, updateFields);
-
-						if (updateFields.customFieldsUi) {
-							const customFieldsValues = (updateFields.customFieldsUi as IDataObject)
-								.customFieldsValues as IDataObject[];
-
-							if (customFieldsValues) {
-								const fields = {};
-
-								for (const customFieldValue of customFieldsValues) {
-									//@ts-ignore
-									fields[customFieldValue.fieldId] = customFieldValue.value;
-								}
-
-								body.fields = fields;
-								delete body.customFieldsUi;
-							}
-						}
-
-						responseData = await mailerliteApiRequest.call(
-							this,
-							'PUT',
-							`/subscribers/${subscriberId}`,
-							body,
-						);
-					}
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					const executionErrorData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray({ error: error.message }),
-						{ itemData: { item: i } },
-					);
-					returnData.push(...executionErrorData);
-					continue;
-				}
-				throw error;
-			}
-
-			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData as IDataObject[]),
-				{ itemData: { item: i } },
-			);
-
-			returnData.push(...executionData);
-		}
-
-		return [returnData];
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.svg b/packages/nodes-base/nodes/MailerLite/MailerLite.svg
new file mode 100644
index 0000000000..c19029d033
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.svg
@@ -0,0 +1,33 @@
+<svg version="1.1" id="Layer_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 62.8 50.2" style="enable-background:new 0 0 62.8 50.2;" xml:space="preserve">
+ <style type="text/css">
+  .st0{fill:#09C269;}
+	.st1{fill:#FFFFFF;}
+ </style>
+ <metadata>
+  <sfw xmlns="ns_sfw;">
+   <slices>
+   </slices>
+   <sliceSourceBounds bottomLeftOrigin="true" height="50.2" width="62.8" x="236.9" y="-225.3">
+   </sliceSourceBounds>
+  </sfw>
+ </metadata>
+ <g id="mailerlite-light">
+  <g>
+   <g id="lite" transform="translate(137.000000, 0.000000)">
+    <path id="Shape-path" class="st0" d="M-81.2,0h-48.9c-3.8,0-6.9,3.1-6.9,6.8v22.8v4.5v16.2l9.5-9.3h46.4c3.8,0,6.9-3.1,6.9-6.8
+				V6.8C-74.3,3.1-77.4,0-81.2,0z">
+    </path>
+    <path id="Shape-path-3" class="st1" d="M-90.2,15.8c5.2,0,7.6,4.1,7.6,8c0,1-0.8,1.8-1.8,1.8H-94c0.5,2.3,2.1,3.6,4.7,3.6
+				c1.9,0,2.9-0.4,3.9-0.9c0.2-0.1,0.5-0.2,0.7-0.2c0.9,0,1.7,0.7,1.7,1.6c0,0.6-0.4,1.1-1,1.5c-1.3,0.7-2.7,1.4-5.5,1.4
+				c-5.2,0-8.3-3.1-8.3-8.4C-97.9,18.1-93.7,15.8-90.2,15.8z M-105.5,13.2c0.6,0,1,0.5,1,1v1.9h2.9c0.9,0,1.7,0.7,1.7,1.6
+				c0,0.9-0.7,1.6-1.7,1.6h-2.9V28c0,1.2,0.6,1.3,1.5,1.3c0.5,0,0.8-0.1,1.1-0.1c0.2,0,0.5-0.1,0.7-0.1c0.7,0,1.6,0.6,1.6,1.5
+				c0,0.6-0.4,1.1-1,1.4c-0.9,0.4-1.7,0.6-2.7,0.6c-3.2,0-4.9-1.5-4.9-4.4v-8.8h-1.7c-0.6,0-1-0.5-1-1c0-0.3,0.1-0.6,0.4-0.9l4-4
+				C-106.3,13.5-106,13.2-105.5,13.2z M-124.2,9.4c1,0,1.8,0.8,1.8,1.8v19.4c0,1-0.8,1.8-1.8,1.8s-1.8-0.8-1.8-1.8V11.2
+				C-126,10.2-125.2,9.4-124.2,9.4z M-115.6,16c1,0,1.8,0.8,1.8,1.8v12.8c0,1-0.8,1.8-1.8,1.8c-1,0-1.8-0.8-1.8-1.8V17.8
+				C-117.4,16.8-116.6,16-115.6,16z M-90.1,19.1c-1.7,0-3.6,1-3.9,3.5h7.9C-86.6,20.1-88.4,19.1-90.1,19.1z M-115.5,9.9
+				c1.1,0,2,0.9,2,2V12c0,1.1-0.9,2-2,2h-0.2c-1.1,0-2-0.9-2-2v-0.1c0-1.1,0.9-2,2-2H-115.5z">
+    </path>
+   </g>
+  </g>
+ </g>
+</svg>
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
index 697720aa72..3fcb1d34ac 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
@@ -1,180 +1,25 @@
-import type {
-	IHookFunctions,
-	IWebhookFunctions,
-	IDataObject,
-	INodeType,
-	INodeTypeDescription,
-	IWebhookResponseData,
-} from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
 
-import { mailerliteApiRequest } from './GenericFunctions';
+import { MailerLiteTriggerV1 } from './v1/MailerLiteTriggerV1.node';
+import { MailerLiteTriggerV2 } from './v2/MailerLiteTriggerV2.node';
 
-export class MailerLiteTrigger implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'MailerLite Trigger',
-		name: 'mailerLiteTrigger',
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
-		icon: 'file:mailerLite.png',
-		group: ['trigger'],
-		version: 1,
-		description: 'Starts the workflow when MailerLite events occur',
-		defaults: {
-			name: 'MailerLite Trigger',
-		},
-		inputs: [],
-		outputs: [NodeConnectionType.Main],
-		credentials: [
-			{
-				name: 'mailerLiteApi',
-				required: true,
-			},
-		],
-		webhooks: [
-			{
-				name: 'default',
-				httpMethod: 'POST',
-				responseMode: 'onReceived',
-				path: 'webhook',
-			},
-		],
-		properties: [
-			{
-				displayName: 'Event',
-				name: 'event',
-				type: 'options',
-				options: [
-					{
-						name: 'Campaign Sent',
-						value: 'campaign.sent',
-						description: 'Fired when campaign is sent',
-					},
-					{
-						name: 'Subscriber Added Throught Webform',
-						value: 'subscriber.added_through_webform',
-						description: 'Fired when a subscriber is added though a form',
-					},
-					{
-						name: 'Subscriber Added to Group',
-						value: 'subscriber.add_to_group',
-						description: 'Fired when a subscriber is added to a group',
-					},
-					{
-						name: 'Subscriber Autonomation Completed',
-						value: 'subscriber.automation_complete',
-						description: 'Fired when subscriber finishes automation',
-					},
-					{
-						name: 'Subscriber Autonomation Triggered',
-						value: 'subscriber.automation_triggered',
-						description: 'Fired when subscriber starts automation',
-					},
-					{
-						name: 'Subscriber Bounced',
-						value: 'subscriber.bounced',
-						description: 'Fired when an email address bounces',
-					},
-					{
-						name: 'Subscriber Complained',
-						value: 'subscriber.complaint',
-						description: 'Fired when subscriber marks a campaign as a spam',
-					},
-					{
-						name: 'Subscriber Created',
-						value: 'subscriber.create',
-						description: 'Fired when a new subscriber is added to an account',
-					},
-					{
-						name: 'Subscriber Removed From Group',
-						value: 'subscriber.remove_from_group',
-						description: 'Fired when a subscriber is removed from a group',
-					},
-					{
-						name: 'Subscriber Unsubscribe',
-						value: 'subscriber.unsubscribe',
-						description: 'Fired when a subscriber becomes unsubscribed',
-					},
-					{
-						name: 'Subscriber Updated',
-						value: 'subscriber.update',
-						description: "Fired when any of the subscriber's custom fields are updated",
-					},
-				],
-				required: true,
-				default: [],
-				description: 'The events to listen to',
-			},
-		],
-	};
-
-	webhookMethods = {
-		default: {
-			async checkExists(this: IHookFunctions): Promise<boolean> {
-				const webhookUrl = this.getNodeWebhookUrl('default');
-				const webhookData = this.getWorkflowStaticData('node');
-				const event = this.getNodeParameter('event') as string;
-				// Check all the webhooks which exist already if it is identical to the
-				// one that is supposed to get created.
-				const endpoint = '/webhooks';
-				const { webhooks } = await mailerliteApiRequest.call(this, 'GET', endpoint, {});
-				for (const webhook of webhooks) {
-					if (webhook.url === webhookUrl && webhook.event === event) {
-						// Set webhook-id to be sure that it can be deleted
-						webhookData.webhookId = webhook.id as string;
-						return true;
-					}
-				}
-				return false;
-			},
-			async create(this: IHookFunctions): Promise<boolean> {
-				const webhookData = this.getWorkflowStaticData('node');
-				const webhookUrl = this.getNodeWebhookUrl('default');
-				const event = this.getNodeParameter('event') as string;
-
-				const endpoint = '/webhooks';
-
-				const body = {
-					url: webhookUrl,
-					event,
-				};
-
-				const responseData = await mailerliteApiRequest.call(this, 'POST', endpoint, body);
-
-				if (responseData.id === undefined) {
-					// Required data is missing so was not successful
-					return false;
-				}
-
-				webhookData.webhookId = responseData.id as string;
-				return true;
-			},
-			async delete(this: IHookFunctions): Promise<boolean> {
-				const webhookData = this.getWorkflowStaticData('node');
-				if (webhookData.webhookId !== undefined) {
-					const endpoint = `/webhooks/${webhookData.webhookId}`;
-
-					try {
-						await mailerliteApiRequest.call(this, 'DELETE', endpoint);
-					} catch (error) {
-						return false;
-					}
-
-					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registered anymore
-					delete webhookData.webhookId;
-				}
-				return true;
-			},
-		},
-	};
-
-	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		const body = this.getBodyData();
-
-		const events = body.events as IDataObject[];
-
-		return {
-			workflowData: [this.helpers.returnJsonArray(events)],
+export class MailerLiteTrigger extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'MailerLite Trigger',
+			name: 'mailerLiteTrigger',
+			icon: 'file:MailerLite.svg',
+			group: ['trigger'],
+			description: 'Starts the workflow when MailerLite events occur',
+			defaultVersion: 2,
 		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new MailerLiteTriggerV1(baseDescription),
+			2: new MailerLiteTriggerV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/MailerLite/mailerLite.png b/packages/nodes-base/nodes/MailerLite/mailerLite.png
deleted file mode 100644
index fde7f6d6b6..0000000000
Binary files a/packages/nodes-base/nodes/MailerLite/mailerLite.png and /dev/null differ
diff --git a/packages/nodes-base/nodes/MailerLite/tests/GenericFunctions.test.ts b/packages/nodes-base/nodes/MailerLite/tests/GenericFunctions.test.ts
new file mode 100644
index 0000000000..f23963b084
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/GenericFunctions.test.ts
@@ -0,0 +1,253 @@
+/* eslint-disable n8n-nodes-base/node-param-display-name-miscased */
+import {
+	type IExecuteFunctions,
+	type ILoadOptionsFunctions,
+	type IHookFunctions,
+	NodeApiError,
+} from 'n8n-workflow';
+
+import {
+	getCustomFields,
+	mailerliteApiRequest,
+	mailerliteApiRequestAllItems,
+} from '../GenericFunctions';
+
+describe('MailerLite -> mailerliteApiRequest', () => {
+	let mockExecuteFunctions: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions;
+
+	const setupMockFunctions = (typeVersion: number) => {
+		mockExecuteFunctions = {
+			getNode: jest.fn().mockReturnValue({ typeVersion }),
+			helpers: {
+				httpRequestWithAuthentication: jest.fn(),
+			},
+		} as unknown as IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions(1);
+	});
+
+	it('should make a successful API request for type version 1', async () => {
+		const method = 'GET';
+		const path = '/test';
+		const body = {};
+		const qs = {};
+
+		const responseData = { success: true };
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			responseData,
+		);
+
+		const result = await mailerliteApiRequest.call(mockExecuteFunctions, method, path, body, qs);
+
+		expect(result).toEqual(responseData);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'mailerLiteApi',
+			{
+				method,
+				qs,
+				url: 'https://api.mailerlite.com/api/v2/test',
+				json: true,
+			},
+		);
+	});
+
+	it('should make a successful API request for type version 2', async () => {
+		setupMockFunctions(2);
+
+		const method = 'GET';
+		const path = '/test';
+		const body = {};
+		const qs = {};
+
+		const responseData = { success: true };
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			responseData,
+		);
+
+		const result = await mailerliteApiRequest.call(mockExecuteFunctions, method, path, body, qs);
+
+		expect(result).toEqual(responseData);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'mailerLiteApi',
+			{
+				method,
+				qs,
+				url: 'https://connect.mailerlite.com/api/test',
+				json: true,
+			},
+		);
+	});
+
+	it('should make an API request with an empty body', async () => {
+		const method = 'GET';
+		const path = '/test';
+		const body = {};
+		const qs = {};
+
+		const responseData = { success: true };
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(
+			responseData,
+		);
+
+		const result = await mailerliteApiRequest.call(mockExecuteFunctions, method, path, body, qs);
+
+		expect(result).toEqual(responseData);
+		expect(mockExecuteFunctions.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'mailerLiteApi',
+			{
+				method,
+				qs,
+				url: 'https://api.mailerlite.com/api/v2/test',
+				json: true,
+			},
+		);
+	});
+
+	it('should throw an error if the API request fails', async () => {
+		const method = 'GET';
+		const path = '/test';
+		const body = {};
+		const qs = {};
+
+		const errorResponse = { message: 'Error' };
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock).mockRejectedValue(
+			errorResponse,
+		);
+
+		await expect(
+			mailerliteApiRequest.call(mockExecuteFunctions, method, path, body, qs),
+		).rejects.toThrow(NodeApiError);
+	});
+});
+
+describe('MailerLite -> mailerliteApiRequestAllItems', () => {
+	let mockExecuteFunctions: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions;
+
+	const setupMockFunctions = (typeVersion: number) => {
+		mockExecuteFunctions = {
+			getNode: jest.fn().mockReturnValue({ typeVersion }),
+			helpers: {
+				httpRequestWithAuthentication: jest.fn(),
+			},
+		} as unknown as IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions(1);
+	});
+
+	it('should handle pagination for type version 1', async () => {
+		const method = 'GET';
+		const endpoint = '/test';
+		const body = {};
+		const query = {};
+
+		const responseDataPage1 = [{ id: 1 }, { id: 2 }];
+		const responseDataPage2 = [{ id: 3 }, { id: 4 }];
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock)
+			.mockResolvedValueOnce(responseDataPage1)
+			.mockResolvedValueOnce(responseDataPage2)
+			.mockResolvedValueOnce([]);
+
+		const result = await mailerliteApiRequestAllItems.call(
+			mockExecuteFunctions,
+			method,
+			endpoint,
+			body,
+			query,
+		);
+
+		expect(result).toEqual([...responseDataPage1, ...responseDataPage2]);
+	});
+
+	it('should handle pagination for type version 2', async () => {
+		setupMockFunctions(2);
+
+		const method = 'GET';
+		const endpoint = '/test';
+		const body = {};
+		const query = {};
+
+		const responseDataPage1 = {
+			data: [{ id: 1 }, { id: 2 }],
+			meta: { next_cursor: 'cursor1' },
+			links: { next: 'nextLink1' },
+		};
+		const responseDataPage2 = {
+			data: [{ id: 3 }, { id: 4 }],
+			meta: { next_cursor: null },
+			links: { next: null },
+		};
+
+		(mockExecuteFunctions.helpers.httpRequestWithAuthentication as jest.Mock)
+			.mockResolvedValueOnce(responseDataPage1)
+			.mockResolvedValueOnce(responseDataPage2);
+
+		const result = await mailerliteApiRequestAllItems.call(
+			mockExecuteFunctions,
+			method,
+			endpoint,
+			body,
+			query,
+		);
+
+		expect(result).toEqual([...responseDataPage1.data, ...responseDataPage2.data]);
+	});
+});
+
+describe('MailerLite -> getCustomFields', () => {
+	let mockExecuteFunctions: ILoadOptionsFunctions;
+
+	const v1FieldResponse = [
+		{ name: 'Field1', key: 'field1' },
+		{ name: 'Field2', key: 'field2' },
+	];
+
+	const v2FieldResponse = {
+		data: v1FieldResponse,
+	};
+
+	const setupMockFunctions = (typeVersion: number) => {
+		mockExecuteFunctions = {
+			getNode: jest.fn().mockReturnValue({ typeVersion }),
+			helpers: {
+				httpRequestWithAuthentication: jest
+					.fn()
+					.mockResolvedValue(typeVersion === 1 ? v1FieldResponse : v2FieldResponse),
+			},
+		} as unknown as ILoadOptionsFunctions;
+		jest.clearAllMocks();
+	};
+
+	beforeEach(() => {
+		setupMockFunctions(1);
+	});
+
+	it('should return custom fields for type version 1', async () => {
+		const result = await getCustomFields.call(mockExecuteFunctions);
+
+		expect(result).toEqual([
+			{ name: 'field1', value: 'field1' },
+			{ name: 'field2', value: 'field2' },
+		]);
+	});
+
+	it('should return custom fields for type version 2', async () => {
+		setupMockFunctions(2);
+		const result = await getCustomFields.call(mockExecuteFunctions);
+
+		expect(result).toEqual([
+			{ name: 'Field1', value: 'field1' },
+			{ name: 'Field2', value: 'field2' },
+		]);
+	});
+});
diff --git a/packages/nodes-base/nodes/MailerLite/tests/apiResponses.ts b/packages/nodes-base/nodes/MailerLite/tests/apiResponses.ts
new file mode 100644
index 0000000000..e1216e1ef5
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/apiResponses.ts
@@ -0,0 +1,411 @@
+export const getUpdateSubscriberResponseClassic = {
+	id: 1343965485,
+	email: 'demo@mailerlite.com',
+	sent: 0,
+	opened: 0,
+	clicked: 0,
+	type: 'unsubscribed',
+	fields: [
+		{
+			key: 'email',
+			value: 'demo@mailerlite.com',
+			type: 'TEXT',
+		},
+		{
+			key: 'name',
+			value: 'Demo',
+			type: 'TEXT',
+		},
+		{
+			key: 'last_name',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'company',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'country',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'city',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'phone',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'state',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'zip',
+			value: '',
+			type: 'TEXT',
+		},
+	],
+	date_subscribe: null,
+	date_unsubscribe: '2016-04-04 12:07:26',
+	date_created: '2016-04-04',
+	date_updated: null,
+};
+export const getSubscriberResponseClassic = {
+	id: 1343965485,
+	name: 'John',
+	email: 'demo@mailerlite.com',
+	sent: 0,
+	opened: 0,
+	clicked: 0,
+	type: 'active',
+	signup_ip: '127.0.0.1',
+	signup_timestamp: '2018-01-01 01:01:01',
+	confirmation_ip: '127.0.0.2',
+	confirmation_timestamp: '2018-01-01 01:01:02',
+	fields: [
+		{
+			key: 'email',
+			value: 'demo@mailerlite.com',
+			type: 'TEXT',
+		},
+		{
+			key: 'name',
+			value: 'John',
+			type: 'TEXT',
+		},
+		{
+			key: 'last_name',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'company',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'country',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'city',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'phone',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'state',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'zip',
+			value: '',
+			type: 'TEXT',
+		},
+	],
+	date_subscribe: null,
+	date_unsubscribe: null,
+	date_created: '2016-04-04',
+	date_updated: null,
+};
+export const getCreateResponseClassic = {
+	id: 1343965485,
+	name: 'John',
+	email: 'demo@mailerlite.com',
+	sent: 0,
+	opened: 0,
+	clicked: 0,
+	type: 'active',
+	fields: [
+		{
+			key: 'email',
+			value: 'demo@mailerlite.com',
+			type: 'TEXT',
+		},
+		{
+			key: 'name',
+			value: 'John',
+			type: 'TEXT',
+		},
+		{
+			key: 'last_name',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'company',
+			value: 'MailerLite',
+			type: 'TEXT',
+		},
+		{
+			key: 'country',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'city',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'phone',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'state',
+			value: '',
+			type: 'TEXT',
+		},
+		{
+			key: 'zip',
+			value: '',
+			type: 'TEXT',
+		},
+	],
+	date_subscribe: null,
+	date_unsubscribe: null,
+	date_created: '2016-04-04 12:00:00',
+	date_updated: '2016-04-04 12:00:00',
+};
+export const getAllSubscribersResponseClassic = [
+	{
+		id: 1343965485,
+		name: 'John',
+		email: 'demo@mailerlite.com',
+		sent: 0,
+		opened: 0,
+		clicked: 0,
+		type: 'active',
+		fields: [
+			{
+				key: 'email',
+				value: 'demo@mailerlite.com',
+				type: 'TEXT',
+			},
+			{
+				key: 'name',
+				value: 'John',
+				type: 'TEXT',
+			},
+			{
+				key: 'last_name',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'company',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'country',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'city',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'phone',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'state',
+				value: '',
+				type: 'TEXT',
+			},
+			{
+				key: 'zip',
+				value: '',
+				type: 'TEXT',
+			},
+		],
+		date_subscribe: null,
+		date_unsubscribe: null,
+		date_created: '2016-04-04',
+		date_updated: null,
+	},
+];
+
+export const getUpdateSubscriberResponseV2 = {
+	data: {
+		id: '139872142007207563',
+		email: 'user@n8n.io',
+		status: 'junk',
+		source: 'api',
+		sent: 0,
+		opens_count: 0,
+		clicks_count: 0,
+		open_rate: 0,
+		click_rate: 0,
+		ip_address: null,
+		subscribed_at: '2024-12-05 09:54:29',
+		unsubscribed_at: null,
+		created_at: '2024-12-05 09:54:29',
+		updated_at: '2024-12-05 10:20:32',
+		fields: {
+			name: null,
+			last_name: null,
+			company: null,
+			country: null,
+			city: null,
+			phone: null,
+			state: null,
+			z_i_p: null,
+		},
+		groups: [],
+		opted_in_at: null,
+		optin_ip: '8.8.8.8',
+	},
+};
+export const getCreateResponseV2 = {
+	data: {
+		id: '139872142007207563',
+		email: 'user@n8n.io',
+		status: 'junk',
+		source: 'api',
+		sent: 0,
+		opens_count: 0,
+		clicks_count: 0,
+		open_rate: 0,
+		click_rate: 0,
+		ip_address: null,
+		subscribed_at: '2024-12-05 09:54:29',
+		unsubscribed_at: null,
+		created_at: '2024-12-05 09:54:29',
+		updated_at: '2024-12-05 10:20:32',
+		fields: {
+			name: null,
+			last_name: null,
+			company: null,
+			country: null,
+			city: null,
+			phone: null,
+			state: null,
+			z_i_p: null,
+		},
+		groups: [],
+		opted_in_at: null,
+		optin_ip: '8.8.8.8',
+	},
+};
+export const getSubscriberResponseV2 = {
+	data: {
+		id: '139872142007207563',
+		email: 'user@n8n.io',
+		status: 'junk',
+		source: 'api',
+		sent: 0,
+		opens_count: 0,
+		clicks_count: 0,
+		open_rate: 0,
+		click_rate: 0,
+		ip_address: null,
+		subscribed_at: '2024-12-05 09:54:29',
+		unsubscribed_at: null,
+		created_at: '2024-12-05 09:54:29',
+		updated_at: '2024-12-05 10:20:32',
+		fields: {
+			name: null,
+			last_name: null,
+			company: null,
+			country: null,
+			city: null,
+			phone: null,
+			state: null,
+			z_i_p: null,
+		},
+		groups: [],
+		opted_in_at: null,
+		optin_ip: '8.8.8.8',
+	},
+};
+export const getAllSubscribersResponseV2 = {
+	data: [
+		{
+			id: '139872142007207563',
+			email: 'user@n8n.io',
+			status: 'junk',
+			source: 'api',
+			sent: 0,
+			opens_count: 0,
+			clicks_count: 0,
+			open_rate: 0,
+			click_rate: 0,
+			ip_address: null,
+			subscribed_at: '2024-12-05 09:54:29',
+			unsubscribed_at: null,
+			created_at: '2024-12-05 09:54:29',
+			updated_at: '2024-12-05 10:20:32',
+			fields: {
+				name: null,
+				last_name: null,
+				company: null,
+				country: null,
+				city: null,
+				phone: null,
+				state: null,
+				z_i_p: null,
+			},
+			opted_in_at: null,
+			optin_ip: '8.8.8.8',
+		},
+		{
+			id: '139059851540038710',
+			email: 'nathan@n8n.io',
+			status: 'junk',
+			source: 'api',
+			sent: 0,
+			opens_count: 0,
+			clicks_count: 0,
+			open_rate: 0,
+			click_rate: 0,
+			ip_address: null,
+			subscribed_at: null,
+			unsubscribed_at: null,
+			created_at: '2024-11-26 10:43:28',
+			updated_at: '2024-11-27 10:09:34',
+			fields: {
+				name: 'Nathan',
+				last_name: 'Workflow',
+				company: null,
+				country: null,
+				city: null,
+				phone: null,
+				state: null,
+				z_i_p: null,
+			},
+			opted_in_at: null,
+			optin_ip: null,
+		},
+	],
+	links: {
+		first: null,
+		last: null,
+		prev: null,
+		next: null,
+	},
+	meta: {
+		path: 'https://connect.mailerlite.com/api/subscribers',
+		per_page: 2,
+		next_cursor: null,
+		prev_cursor: null,
+	},
+};
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.json b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.json
new file mode 100644
index 0000000000..46f270f006
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.json
@@ -0,0 +1,460 @@
+{
+	"name": "[TEST] MailerLite v1 Node",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "be5a39ea-04bf-49a3-969f-47d4a9496f08",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-340, 280]
+		},
+		{
+			"parameters": {
+				"email": "demo@mailerlite.com",
+				"additionalFields": {}
+			},
+			"id": "98d30bbe-cbdd-4313-933e-804cdf322860",
+			"name": "Create Subscriber",
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 1,
+			"position": [-140, 40],
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [80, 40],
+			"id": "93aa764f-5101-4961-9b51-9fa92f746337",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [80, 220],
+			"id": "4dccb059-c4f6-4eae-b68a-5c5c36d0b8d4",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"subscriberId": "demo@mailerlite.com"
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 1,
+			"position": [-140, 220],
+			"id": "82115adf-edf4-4ce4-9109-3ade129294d1",
+			"name": "Get Subscriber",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "update",
+				"subscriberId": "demo@mailerlite.com",
+				"updateFields": {
+					"type": "active"
+				}
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 1,
+			"position": [-140, 420],
+			"id": "fae9c6bd-1bd1-4ee8-865d-283b7edb6004",
+			"name": "Update Subscriber",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [80, 420],
+			"id": "45937d69-3956-434d-b955-a67d77d43d57",
+			"name": "No Operation, do nothing2"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 1,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 1,
+			"position": [-180, 680],
+			"id": "6491d933-0929-44bd-89cf-977823dde650",
+			"name": "Get Many Subscrbers",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [40, 680],
+			"id": "6e35d6e1-1ce3-4410-8558-a5d573676d8a",
+			"name": "No Operation, do nothing3"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": 1343965485,
+					"name": "John",
+					"email": "demo@mailerlite.com",
+					"sent": 0,
+					"opened": 0,
+					"clicked": 0,
+					"type": "active",
+					"fields": [
+						{
+							"key": "email",
+							"value": "demo@mailerlite.com",
+							"type": "TEXT"
+						},
+						{
+							"key": "name",
+							"value": "John",
+							"type": "TEXT"
+						},
+						{
+							"key": "last_name",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "company",
+							"value": "MailerLite",
+							"type": "TEXT"
+						},
+						{
+							"key": "country",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "city",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "phone",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "state",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "zip",
+							"value": "",
+							"type": "TEXT"
+						}
+					],
+					"date_subscribe": null,
+					"date_unsubscribe": null,
+					"date_created": "2016-04-04 12:00:00",
+					"date_updated": "2016-04-04 12:00:00"
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"id": 1343965485,
+					"name": "John",
+					"email": "demo@mailerlite.com",
+					"sent": 0,
+					"opened": 0,
+					"clicked": 0,
+					"type": "active",
+					"signup_ip": "127.0.0.1",
+					"signup_timestamp": "2018-01-01 01:01:01",
+					"confirmation_ip": "127.0.0.2",
+					"confirmation_timestamp": "2018-01-01 01:01:02",
+					"fields": [
+						{
+							"key": "email",
+							"value": "demo@mailerlite.com",
+							"type": "TEXT"
+						},
+						{
+							"key": "name",
+							"value": "John",
+							"type": "TEXT"
+						},
+						{
+							"key": "last_name",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "company",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "country",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "city",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "phone",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "state",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "zip",
+							"value": "",
+							"type": "TEXT"
+						}
+					],
+					"date_subscribe": null,
+					"date_unsubscribe": null,
+					"date_created": "2016-04-04",
+					"date_updated": null
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"id": 1343965485,
+					"email": "demo@mailerlite.com",
+					"sent": 0,
+					"opened": 0,
+					"clicked": 0,
+					"type": "unsubscribed",
+					"fields": [
+						{
+							"key": "email",
+							"value": "demo@mailerlite.com",
+							"type": "TEXT"
+						},
+						{
+							"key": "name",
+							"value": "Demo",
+							"type": "TEXT"
+						},
+						{
+							"key": "last_name",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "company",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "country",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "city",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "phone",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "state",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "zip",
+							"value": "",
+							"type": "TEXT"
+						}
+					],
+					"date_subscribe": null,
+					"date_unsubscribe": "2016-04-04 12:07:26",
+					"date_created": "2016-04-04",
+					"date_updated": null
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"id": 1343965485,
+					"name": "John",
+					"email": "demo@mailerlite.com",
+					"sent": 0,
+					"opened": 0,
+					"clicked": 0,
+					"type": "active",
+					"fields": [
+						{
+							"key": "email",
+							"value": "demo@mailerlite.com",
+							"type": "TEXT"
+						},
+						{
+							"key": "name",
+							"value": "John",
+							"type": "TEXT"
+						},
+						{
+							"key": "last_name",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "company",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "country",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "city",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "phone",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "state",
+							"value": "",
+							"type": "TEXT"
+						},
+						{
+							"key": "zip",
+							"value": "",
+							"type": "TEXT"
+						}
+					],
+					"date_subscribe": null,
+					"date_unsubscribe": null,
+					"date_created": "2016-04-04",
+					"date_updated": null
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Create Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Update Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Many Subscrbers",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Create Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Update Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Many Subscrbers": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "826c1711-fcea-4564-809b-0258dbdd72f4",
+	"meta": {
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "I0absgO5t7xV2f2V",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts
new file mode 100644
index 0000000000..1430ea8ec7
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/v1/MailerLite.v1.workflow.test.ts
@@ -0,0 +1,31 @@
+import nock from 'nock';
+
+import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Helpers';
+import {
+	getCreateResponseClassic,
+	getSubscriberResponseClassic,
+	getAllSubscribersResponseClassic,
+	getUpdateSubscriberResponseClassic,
+} from '../apiResponses';
+
+describe('MailerLite', () => {
+	describe('Run v1 workflow', () => {
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			const mock = nock('https://api.mailerlite.com/api/v2');
+
+			mock.post('/subscribers').reply(200, getCreateResponseClassic);
+			mock.get('/subscribers/demo@mailerlite.com').reply(200, getSubscriberResponseClassic);
+			mock.get('/subscribers').query({ limit: 1 }).reply(200, getAllSubscribersResponseClassic);
+			mock.put('/subscribers/demo@mailerlite.com').reply(200, getUpdateSubscriberResponseClassic);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const workflows = getWorkflowFilenames(__dirname);
+		testWorkflows(workflows);
+	});
+});
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.json b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.json
new file mode 100644
index 0000000000..29630950fa
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.json
@@ -0,0 +1,370 @@
+{
+	"name": "[TEST] MailerLite v2 Node",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "3c72284b-2b88-4d5f-81bc-b1970b14f2af",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [800, 240]
+		},
+		{
+			"parameters": {
+				"email": "user@n8n.io",
+				"additionalFields": {
+					"status": "active"
+				}
+			},
+			"id": "702c6598-cbe8-403e-962e-56621ec727a4",
+			"name": "Create Subscriber",
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 2,
+			"position": [1000, 0],
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 0],
+			"id": "540b98b5-b3bf-49a1-a406-acc6872f4b50",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 180],
+			"id": "17c0b8e7-a9d7-4a4f-882f-c3fb3f6bc289",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"operation": "get",
+				"subscriberId": "user@n8n.io"
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 2,
+			"position": [1000, 180],
+			"id": "5598f2b9-4d67-4ad7-a8e4-7b7bf723cd5a",
+			"name": "Get Subscriber",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "update",
+				"subscriberId": "user@n8n.io",
+				"additionalFields": {
+					"status": "junk",
+					"optin_ip": "8.8.8.8"
+				}
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 2,
+			"position": [1000, 380],
+			"id": "223e4507-c88e-4066-a122-ccaf9cea7b49",
+			"name": "Update Subscriber",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 380],
+			"id": "94d04b52-8809-4670-a8ca-135921139fc9",
+			"name": "No Operation, do nothing2"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"limit": 2,
+				"filters": {
+					"status": "junk"
+				}
+			},
+			"type": "n8n-nodes-base.mailerLite",
+			"typeVersion": 2,
+			"position": [960, 640],
+			"id": "30c6e797-ceda-4c84-8f34-b61200ffd9e9",
+			"name": "Get Many Subscrbers",
+			"credentials": {
+				"mailerLiteApi": {
+					"id": "bm7VHS2C7lRgVOhb",
+					"name": "Mailer Lite account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1180, 640],
+			"id": "c8529a30-889b-4ac9-a509-73f5dd8eef4a",
+			"name": "No Operation, do nothing3"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "139872142007207563",
+					"email": "user@n8n.io",
+					"status": "junk",
+					"source": "api",
+					"sent": 0,
+					"opens_count": 0,
+					"clicks_count": 0,
+					"open_rate": 0,
+					"click_rate": 0,
+					"ip_address": null,
+					"subscribed_at": "2024-12-05 09:54:29",
+					"unsubscribed_at": null,
+					"created_at": "2024-12-05 09:54:29",
+					"updated_at": "2024-12-05 10:20:32",
+					"fields": {
+						"name": null,
+						"last_name": null,
+						"company": null,
+						"country": null,
+						"city": null,
+						"phone": null,
+						"state": null,
+						"z_i_p": null
+					},
+					"groups": [],
+					"opted_in_at": null,
+					"optin_ip": "8.8.8.8"
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"id": "139872142007207563",
+					"email": "user@n8n.io",
+					"status": "junk",
+					"source": "api",
+					"sent": 0,
+					"opens_count": 0,
+					"clicks_count": 0,
+					"open_rate": 0,
+					"click_rate": 0,
+					"ip_address": null,
+					"subscribed_at": "2024-12-05 09:54:29",
+					"unsubscribed_at": null,
+					"created_at": "2024-12-05 09:54:29",
+					"updated_at": "2024-12-05 10:20:32",
+					"fields": {
+						"name": null,
+						"last_name": null,
+						"company": null,
+						"country": null,
+						"city": null,
+						"phone": null,
+						"state": null,
+						"z_i_p": null
+					},
+					"groups": [],
+					"opted_in_at": null,
+					"optin_ip": "8.8.8.8"
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"data": {
+						"id": "139872142007207563",
+						"email": "user@n8n.io",
+						"status": "junk",
+						"source": "api",
+						"sent": 0,
+						"opens_count": 0,
+						"clicks_count": 0,
+						"open_rate": 0,
+						"click_rate": 0,
+						"ip_address": null,
+						"subscribed_at": "2024-12-05 09:54:29",
+						"unsubscribed_at": null,
+						"created_at": "2024-12-05 09:54:29",
+						"updated_at": "2024-12-05 10:20:32",
+						"fields": {
+							"name": null,
+							"last_name": null,
+							"company": null,
+							"country": null,
+							"city": null,
+							"phone": null,
+							"state": null,
+							"z_i_p": null
+						},
+						"groups": [],
+						"opted_in_at": null,
+						"optin_ip": "8.8.8.8"
+					}
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"id": "139872142007207563",
+					"email": "user@n8n.io",
+					"status": "junk",
+					"source": "api",
+					"sent": 0,
+					"opens_count": 0,
+					"clicks_count": 0,
+					"open_rate": 0,
+					"click_rate": 0,
+					"ip_address": null,
+					"subscribed_at": "2024-12-05 09:54:29",
+					"unsubscribed_at": null,
+					"created_at": "2024-12-05 09:54:29",
+					"updated_at": "2024-12-05 10:20:32",
+					"fields": {
+						"name": null,
+						"last_name": null,
+						"company": null,
+						"country": null,
+						"city": null,
+						"phone": null,
+						"state": null,
+						"z_i_p": null
+					},
+					"opted_in_at": null,
+					"optin_ip": "8.8.8.8"
+				}
+			},
+			{
+				"json": {
+					"id": "139059851540038710",
+					"email": "nathan@n8n.io",
+					"status": "junk",
+					"source": "api",
+					"sent": 0,
+					"opens_count": 0,
+					"clicks_count": 0,
+					"open_rate": 0,
+					"click_rate": 0,
+					"ip_address": null,
+					"subscribed_at": null,
+					"unsubscribed_at": null,
+					"created_at": "2024-11-26 10:43:28",
+					"updated_at": "2024-11-27 10:09:34",
+					"fields": {
+						"name": "Nathan",
+						"last_name": "Workflow",
+						"company": null,
+						"country": null,
+						"city": null,
+						"phone": null,
+						"state": null,
+						"z_i_p": null
+					},
+					"opted_in_at": null,
+					"optin_ip": null
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Create Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Update Subscriber",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Many Subscrbers",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Create Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Update Subscriber": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Many Subscrbers": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "338331ef-1b38-47dc-9e2b-45340ea3fe3b",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "0Ov6Vd62DUXrWWQH",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts
new file mode 100644
index 0000000000..d723e86908
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/tests/v2/MailerLite.v2.workflow.test.ts
@@ -0,0 +1,34 @@
+import nock from 'nock';
+
+import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Helpers';
+import {
+	getCreateResponseV2,
+	getSubscriberResponseV2,
+	getAllSubscribersResponseV2,
+	getUpdateSubscriberResponseV2,
+} from '../apiResponses';
+
+describe('MailerLite', () => {
+	describe('Run v2 workflow', () => {
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			const mock = nock('https://connect.mailerlite.com/api');
+
+			mock.post('/subscribers').reply(200, getCreateResponseV2);
+			mock.get('/subscribers/user@n8n.io').reply(200, getSubscriberResponseV2);
+			mock
+				.get('/subscribers')
+				.query({ 'filter[status]': 'junk', limit: 2 })
+				.reply(200, getAllSubscribersResponseV2);
+			mock.put('/subscribers/user@n8n.io').reply(200, getUpdateSubscriberResponseV2);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const workflows = getWorkflowFilenames(__dirname);
+		testWorkflows(workflows);
+	});
+});
diff --git a/packages/nodes-base/nodes/MailerLite/v1/MailerLiteTriggerV1.node.ts b/packages/nodes-base/nodes/MailerLite/v1/MailerLiteTriggerV1.node.ts
new file mode 100644
index 0000000000..faaa6db8c7
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v1/MailerLiteTriggerV1.node.ts
@@ -0,0 +1,184 @@
+import {
+	type IHookFunctions,
+	type IWebhookFunctions,
+	type IDataObject,
+	type INodeType,
+	type INodeTypeDescription,
+	type IWebhookResponseData,
+	type INodeTypeBaseDescription,
+	NodeConnectionType,
+} from 'n8n-workflow';
+
+import { mailerliteApiRequest } from '../GenericFunctions';
+
+export class MailerLiteTriggerV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'MailerLite Trigger',
+			name: 'mailerLiteTrigger',
+			group: ['trigger'],
+			version: 1,
+			description: 'Starts the workflow when MailerLite events occur',
+			defaults: {
+				name: 'MailerLite Trigger',
+			},
+			inputs: [],
+			outputs: [NodeConnectionType.Main],
+			credentials: [
+				{
+					name: 'mailerLiteApi',
+					required: true,
+				},
+			],
+			webhooks: [
+				{
+					name: 'default',
+					httpMethod: 'POST',
+					responseMode: 'onReceived',
+					path: 'webhook',
+				},
+			],
+			properties: [
+				{
+					displayName: 'Event',
+					name: 'event',
+					type: 'options',
+					options: [
+						{
+							name: 'Campaign Sent',
+							value: 'campaign.sent',
+							description: 'Fired when campaign is sent',
+						},
+						{
+							name: 'Subscriber Added Through Webform',
+							value: 'subscriber.added_through_webform',
+							description: 'Fired when a subscriber is added though a form',
+						},
+						{
+							name: 'Subscriber Added to Group',
+							value: 'subscriber.add_to_group',
+							description: 'Fired when a subscriber is added to a group',
+						},
+						{
+							name: 'Subscriber Automation Completed',
+							value: 'subscriber.automation_complete',
+							description: 'Fired when subscriber finishes automation',
+						},
+						{
+							name: 'Subscriber Automation Triggered',
+							value: 'subscriber.automation_triggered',
+							description: 'Fired when subscriber starts automation',
+						},
+						{
+							name: 'Subscriber Bounced',
+							value: 'subscriber.bounced',
+							description: 'Fired when an email address bounces',
+						},
+						{
+							name: 'Subscriber Complained',
+							value: 'subscriber.complaint',
+							description: 'Fired when subscriber marks a campaign as a spam',
+						},
+						{
+							name: 'Subscriber Created',
+							value: 'subscriber.create',
+							description: 'Fired when a new subscriber is added to an account',
+						},
+						{
+							name: 'Subscriber Removed From Group',
+							value: 'subscriber.remove_from_group',
+							description: 'Fired when a subscriber is removed from a group',
+						},
+						{
+							name: 'Subscriber Unsubscribe',
+							value: 'subscriber.unsubscribe',
+							description: 'Fired when a subscriber becomes unsubscribed',
+						},
+						{
+							name: 'Subscriber Updated',
+							value: 'subscriber.update',
+							description: "Fired when any of the subscriber's custom fields are updated",
+						},
+					],
+					required: true,
+					default: [],
+					description: 'The events to listen to',
+				},
+			],
+		};
+	}
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				const event = this.getNodeParameter('event') as string;
+				// Check all the webhooks which exist already if it is identical to the
+				// one that is supposed to get created.
+				const endpoint = '/webhooks';
+				const { webhooks } = await mailerliteApiRequest.call(this, 'GET', endpoint, {});
+				for (const webhook of webhooks) {
+					if (webhook.url === webhookUrl && webhook.event === event) {
+						// Set webhook-id to be sure that it can be deleted
+						webhookData.webhookId = webhook.id as string;
+						return true;
+					}
+				}
+				return false;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const event = this.getNodeParameter('event') as string;
+
+				const endpoint = '/webhooks';
+
+				const body = {
+					url: webhookUrl,
+					event,
+				};
+
+				const responseData = await mailerliteApiRequest.call(this, 'POST', endpoint, body);
+
+				if (responseData.id === undefined) {
+					// Required data is missing so was not successful
+					return false;
+				}
+
+				webhookData.webhookId = responseData.id as string;
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				if (webhookData.webhookId !== undefined) {
+					const endpoint = `/webhooks/${webhookData.webhookId}`;
+
+					try {
+						await mailerliteApiRequest.call(this, 'DELETE', endpoint);
+					} catch (error) {
+						return false;
+					}
+
+					// Remove from the static workflow data so that it is clear
+					// that no webhooks are registered anymore
+					delete webhookData.webhookId;
+				}
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const body = this.getBodyData();
+
+		const events = body.events as IDataObject[];
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(events)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/MailerLite/v1/MailerLiteV1.node.ts b/packages/nodes-base/nodes/MailerLite/v1/MailerLiteV1.node.ts
new file mode 100644
index 0000000000..357f8f799f
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v1/MailerLiteV1.node.ts
@@ -0,0 +1,199 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { subscriberFields, subscriberOperations } from './SubscriberDescription';
+import {
+	getCustomFields,
+	mailerliteApiRequest,
+	mailerliteApiRequestAllItems,
+} from '../GenericFunctions';
+
+export class MailerLiteV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'MailerLite',
+			name: 'mailerLite',
+			group: ['input'],
+			version: 1,
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume Mailer Lite API',
+			defaults: {
+				name: 'MailerLite',
+			},
+			inputs: [NodeConnectionType.Main],
+			outputs: [NodeConnectionType.Main],
+			credentials: [
+				{
+					name: 'mailerLiteApi',
+					required: true,
+				},
+			],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Subscriber',
+							value: 'subscriber',
+						},
+					],
+					default: 'subscriber',
+				},
+				...subscriberOperations,
+				...subscriberFields,
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			getCustomFields,
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'subscriber') {
+					//https://developers.mailerlite.com/reference#create-a-subscriber
+					if (operation === 'create') {
+						const email = this.getNodeParameter('email', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {
+							email,
+							fields: [],
+						};
+
+						Object.assign(body, additionalFields);
+
+						if (additionalFields.customFieldsUi) {
+							const customFieldsValues = (additionalFields.customFieldsUi as IDataObject)
+								.customFieldsValues as IDataObject[];
+
+							if (customFieldsValues) {
+								const fields = {};
+
+								for (const customFieldValue of customFieldsValues) {
+									//@ts-ignore
+									fields[customFieldValue.fieldId] = customFieldValue.value;
+								}
+
+								body.fields = fields;
+								delete body.customFieldsUi;
+							}
+						}
+
+						responseData = await mailerliteApiRequest.call(this, 'POST', '/subscribers', body);
+					}
+					//https://developers.mailerlite.com/reference#single-subscriber
+					if (operation === 'get') {
+						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
+
+						responseData = await mailerliteApiRequest.call(
+							this,
+							'GET',
+							`/subscribers/${subscriberId}`,
+						);
+					}
+					//https://developers.mailerlite.com/reference#subscribers
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const filters = this.getNodeParameter('filters', i);
+
+						Object.assign(qs, filters);
+
+						if (returnAll) {
+							responseData = await mailerliteApiRequestAllItems.call(
+								this,
+								'GET',
+								'/subscribers',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+
+							responseData = await mailerliteApiRequest.call(this, 'GET', '/subscribers', {}, qs);
+						}
+					}
+					//https://developers.mailerlite.com/reference#update-subscriber
+					if (operation === 'update') {
+						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
+
+						const updateFields = this.getNodeParameter('updateFields', i);
+
+						const body: IDataObject = {};
+
+						Object.assign(body, updateFields);
+
+						if (updateFields.customFieldsUi) {
+							const customFieldsValues = (updateFields.customFieldsUi as IDataObject)
+								.customFieldsValues as IDataObject[];
+
+							if (customFieldsValues) {
+								const fields = {};
+
+								for (const customFieldValue of customFieldsValues) {
+									//@ts-ignore
+									fields[customFieldValue.fieldId] = customFieldValue.value;
+								}
+
+								body.fields = fields;
+								delete body.customFieldsUi;
+							}
+						}
+
+						responseData = await mailerliteApiRequest.call(
+							this,
+							'PUT',
+							`/subscribers/${subscriberId}`,
+							body,
+						);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionErrorData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionErrorData);
+					continue;
+				}
+				throw error;
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/MailerLite/SubscriberDescription.ts b/packages/nodes-base/nodes/MailerLite/v1/SubscriberDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/MailerLite/SubscriberDescription.ts
rename to packages/nodes-base/nodes/MailerLite/v1/SubscriberDescription.ts
diff --git a/packages/nodes-base/nodes/MailerLite/v2/MailerLite.Interface.ts b/packages/nodes-base/nodes/MailerLite/v2/MailerLite.Interface.ts
new file mode 100644
index 0000000000..f408e75ebb
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v2/MailerLite.Interface.ts
@@ -0,0 +1,35 @@
+export interface CustomField {
+	name: string;
+	key: string;
+}
+
+export interface SubscriberFields {
+	city: string | null;
+	company: string | null;
+	country: string | null;
+	last_name: string | null;
+	name: string | null;
+	phone: string | null;
+	state: string | null;
+	z_i_p: string | null;
+}
+
+export interface Subscriber {
+	id: string;
+	email: string;
+	status: string;
+	source: string;
+	sent: number;
+	opens_count: number;
+	clicks_count: number;
+	open_rate: number;
+	click_rate: number;
+	ip_address: string | null;
+	subscribed_at: string;
+	unsubscribed_at: string | null;
+	created_at: string;
+	updated_at: string;
+	fields: SubscriberFields;
+	opted_in_at: string | null;
+	optin_ip: string | null;
+}
diff --git a/packages/nodes-base/nodes/MailerLite/v2/MailerLiteTriggerV2.node.ts b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteTriggerV2.node.ts
new file mode 100644
index 0000000000..f7b17316dc
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteTriggerV2.node.ts
@@ -0,0 +1,179 @@
+import {
+	type IHookFunctions,
+	type IWebhookFunctions,
+	type IDataObject,
+	type INodeType,
+	type INodeTypeDescription,
+	type IWebhookResponseData,
+	type INodeTypeBaseDescription,
+	NodeConnectionType,
+} from 'n8n-workflow';
+
+import { mailerliteApiRequest } from '../GenericFunctions';
+
+export class MailerLiteTriggerV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'MailerLite Trigger',
+			name: 'mailerLiteTrigger',
+			group: ['trigger'],
+			version: [2],
+			description: 'Starts the workflow when MailerLite events occur',
+			defaults: {
+				name: 'MailerLite Trigger',
+			},
+			inputs: [],
+			outputs: [NodeConnectionType.Main],
+			credentials: [
+				{
+					name: 'mailerLiteApi',
+					required: true,
+				},
+			],
+			webhooks: [
+				{
+					name: 'default',
+					httpMethod: 'POST',
+					responseMode: 'onReceived',
+					path: 'webhook',
+				},
+			],
+			properties: [
+				{
+					displayName: 'Events',
+					name: 'events',
+					type: 'multiOptions',
+					options: [
+						{
+							name: 'Campaign Sent',
+							value: 'campaign.sent',
+							description: 'Fired when campaign is sent',
+						},
+						{
+							name: 'Subscriber Added to Group',
+							value: 'subscriber.added_to_group',
+							description: 'Fired when a subscriber is added to a group',
+						},
+						{
+							name: 'Subscriber Automation Completed',
+							value: 'subscriber.automation_completed',
+							description: 'Fired when subscriber finishes automation',
+						},
+						{
+							name: 'Subscriber Automation Triggered',
+							value: 'subscriber.automation_triggered',
+							description: 'Fired when subscriber starts automation',
+						},
+						{
+							name: 'Subscriber Bounced',
+							value: 'subscriber.bounced',
+							description: 'Fired when an email address bounces',
+						},
+						{
+							name: 'Subscriber Created',
+							value: 'subscriber.created',
+							description: 'Fired when a new subscriber is added to an account',
+						},
+						{
+							name: 'Subscriber Removed From Group',
+							value: 'subscriber.removed_from_group',
+							description: 'Fired when a subscriber is removed from a group',
+						},
+						{
+							name: 'Subscriber Spam Reported',
+							value: 'subscriber.spam_reported',
+							description: 'Fired when subscriber marks a campaign as a spam',
+						},
+						{
+							name: 'Subscriber Unsubscribe',
+							value: 'subscriber.unsubscribed',
+							description: 'Fired when a subscriber becomes unsubscribed',
+						},
+						{
+							name: 'Subscriber Updated',
+							value: 'subscriber.updated',
+							description: "Fired when any of the subscriber's custom fields are updated",
+						},
+					],
+					required: true,
+					default: [],
+					description: 'The events to listen to',
+				},
+			],
+		};
+	}
+
+	webhookMethods = {
+		default: {
+			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const webhookData = this.getWorkflowStaticData('node');
+				const events = this.getNodeParameter('events') as string[];
+				// Check all the webhooks which exist already if it is identical to the
+				// one that is supposed to get created.
+				const endpoint = '/webhooks';
+				const { data } = await mailerliteApiRequest.call(this, 'GET', endpoint, {});
+				for (const webhook of data) {
+					if (webhook.url === webhookUrl && webhook.events === events) {
+						// Set webhook-id to be sure that it can be deleted
+						webhookData.webhookId = webhook.id as string;
+						return true;
+					}
+				}
+				return false;
+			},
+			async create(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				const webhookUrl = this.getNodeWebhookUrl('default');
+				const events = this.getNodeParameter('events') as string[];
+
+				const endpoint = '/webhooks';
+
+				const body = {
+					url: webhookUrl,
+					events,
+				};
+
+				const { data } = await mailerliteApiRequest.call(this, 'POST', endpoint, body);
+
+				if (data.id === undefined) {
+					// Required data is missing so was not successful
+					return false;
+				}
+
+				webhookData.webhookId = data.id as string;
+				return true;
+			},
+			async delete(this: IHookFunctions): Promise<boolean> {
+				const webhookData = this.getWorkflowStaticData('node');
+				if (webhookData.webhookId !== undefined) {
+					const endpoint = `/webhooks/${webhookData.webhookId}`;
+
+					try {
+						await mailerliteApiRequest.call(this, 'DELETE', endpoint);
+					} catch (error) {
+						return false;
+					}
+
+					// Remove from the static workflow data so that it is clear
+					// that no webhooks are registered anymore
+					delete webhookData.webhookId;
+				}
+				return true;
+			},
+		},
+	};
+
+	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
+		const body = this.getBodyData();
+
+		const data = body.fields as IDataObject[];
+
+		return {
+			workflowData: [this.helpers.returnJsonArray(data)],
+		};
+	}
+}
diff --git a/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts
new file mode 100644
index 0000000000..953dc7232e
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v2/MailerLiteV2.node.ts
@@ -0,0 +1,206 @@
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+	INodeTypeBaseDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import type { Subscriber } from './MailerLite.Interface';
+import { subscriberFields, subscriberOperations } from './SubscriberDescription';
+import {
+	getCustomFields,
+	mailerliteApiRequest,
+	mailerliteApiRequestAllItems,
+} from '../GenericFunctions';
+
+export class MailerLiteV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			displayName: 'MailerLite',
+			name: 'mailerLite',
+			group: ['input'],
+			version: [2],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume Mailer Lite API',
+			defaults: {
+				name: 'MailerLite',
+			},
+			inputs: [NodeConnectionType.Main],
+			outputs: [NodeConnectionType.Main],
+			credentials: [
+				{
+					name: 'mailerLiteApi',
+					required: true,
+				},
+			],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Subscriber',
+							value: 'subscriber',
+						},
+					],
+					default: 'subscriber',
+				},
+				...subscriberOperations,
+				...subscriberFields,
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			getCustomFields,
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		const qs: IDataObject = {};
+		let responseData;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		for (let i = 0; i < length; i++) {
+			try {
+				if (resource === 'subscriber') {
+					//https://developers.mailerlite.com/reference#create-a-subscriber
+					if (operation === 'create') {
+						const email = this.getNodeParameter('email', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {
+							email,
+							fields: [],
+						};
+
+						Object.assign(body, additionalFields);
+
+						if (additionalFields.customFieldsUi) {
+							const customFieldsValues = (additionalFields.customFieldsUi as IDataObject)
+								.customFieldsValues as IDataObject[];
+
+							if (customFieldsValues) {
+								const fields = {};
+
+								for (const customFieldValue of customFieldsValues) {
+									//@ts-ignore
+									fields[customFieldValue.fieldId] = customFieldValue.value;
+								}
+
+								body.fields = fields;
+								delete body.customFieldsUi;
+							}
+						}
+
+						responseData = await mailerliteApiRequest.call(this, 'POST', '/subscribers', body);
+						responseData = responseData.data;
+					}
+					//https://developers.mailerlite.com/reference#single-subscriber
+					if (operation === 'get') {
+						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
+
+						responseData = await mailerliteApiRequest.call(
+							this,
+							'GET',
+							`/subscribers/${subscriberId}`,
+						);
+
+						responseData = responseData.data as Subscriber[];
+					}
+					//https://developers.mailerlite.com/reference#subscribers
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const filters = this.getNodeParameter('filters', i);
+
+						if (filters.status) {
+							qs['filter[status]'] = filters.status as string;
+						}
+
+						if (returnAll) {
+							responseData = await mailerliteApiRequestAllItems.call(
+								this,
+								'GET',
+								'/subscribers',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+
+							responseData = await mailerliteApiRequest.call(this, 'GET', '/subscribers', {}, qs);
+							responseData = responseData.data;
+						}
+					}
+					//https://developers.mailerlite.com/reference#update-subscriber
+					if (operation === 'update') {
+						const subscriberId = this.getNodeParameter('subscriberId', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {};
+
+						Object.assign(body, additionalFields);
+
+						if (additionalFields.customFieldsUi) {
+							const customFieldsValues = (additionalFields.customFieldsUi as IDataObject)
+								.customFieldsValues as IDataObject[];
+
+							if (customFieldsValues) {
+								const fields = {};
+
+								for (const customFieldValue of customFieldsValues) {
+									//@ts-ignore
+									fields[customFieldValue.fieldId] = customFieldValue.value;
+								}
+
+								body.fields = fields;
+								delete body.customFieldsUi;
+							}
+						}
+
+						responseData = await mailerliteApiRequest.call(
+							this,
+							'PUT',
+							`/subscribers/${subscriberId}`,
+							body,
+						);
+					}
+				}
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionErrorData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionErrorData);
+					continue;
+				}
+				throw error;
+			}
+
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
+				{ itemData: { item: i } },
+			);
+
+			returnData.push(...executionData);
+		}
+
+		return [returnData];
+	}
+}
diff --git a/packages/nodes-base/nodes/MailerLite/v2/SubscriberDescription.ts b/packages/nodes-base/nodes/MailerLite/v2/SubscriberDescription.ts
new file mode 100644
index 0000000000..10ddfe22f5
--- /dev/null
+++ b/packages/nodes-base/nodes/MailerLite/v2/SubscriberDescription.ts
@@ -0,0 +1,304 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const subscriberOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a new subscriber',
+				action: 'Create a subscriber',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get an subscriber',
+				action: 'Get a subscriber',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many subscribers',
+				action: 'Get many subscribers',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update an subscriber',
+				action: 'Update a subscriber',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const subscriberFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                subscriber:create                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Email',
+		name: 'email',
+		type: 'string',
+		placeholder: 'name@email.com',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['create'],
+			},
+		},
+		description: 'Email of new subscriber',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                subscriber:update                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Subscriber Email',
+		name: 'subscriberId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['update'],
+			},
+		},
+		default: '',
+		description: 'Email of subscriber',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['update', 'create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldsUi',
+				placeholder: 'Add Custom Field',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				description: 'Filter by custom fields',
+				default: {},
+				options: [
+					{
+						name: 'customFieldsValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field Name or ID',
+								name: 'fieldId',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getCustomFields',
+								},
+								default: '',
+								description:
+									'The ID of the field to add custom field to. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'The value to set on custom field',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'active',
+					},
+					{
+						name: 'Bounced',
+						value: 'bounced',
+					},
+					{
+						name: 'Junk',
+						value: 'junk',
+					},
+					{
+						name: 'Unconfirmed',
+						value: 'unconfirmed',
+					},
+					{
+						name: 'Unsubscribed',
+						value: 'unsubscribed',
+					},
+				],
+				default: '',
+			},
+			{
+				displayName: 'Subscribed At',
+				name: 'subscribed_at',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'IP Address',
+				name: 'ip_address',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Opted In At',
+				name: 'opted_in_at',
+				type: 'dateTime',
+				default: '',
+			},
+			{
+				displayName: 'Opt In IP',
+				name: 'optin_ip',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Unsubscribed At',
+				name: 'unsubscribed_at',
+				type: 'dateTime',
+				default: '',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                subscriber:delete                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Subscriber Email',
+		name: 'subscriberId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['delete'],
+			},
+		},
+		default: '',
+		description: 'Email of subscriber to delete',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  subscriber:get                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Subscriber Email',
+		name: 'subscriberId',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['get'],
+			},
+		},
+		default: '',
+		description: 'Email of subscriber to get',
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                  subscriber:getAll                         */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['getAll'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['subscriber'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Filter',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['subscriber'],
+			},
+		},
+		default: {},
+		options: [
+			{
+				displayName: 'Status',
+				name: 'status',
+				type: 'options',
+				options: [
+					{
+						name: 'Active',
+						value: 'active',
+					},
+					{
+						name: 'Bounced',
+						value: 'bounced',
+					},
+					{
+						name: 'Junk',
+						value: 'junk',
+					},
+					{
+						name: 'Unconfirmed',
+						value: 'unconfirmed',
+					},
+					{
+						name: 'Unsubscribed',
+						value: 'unsubscribed',
+					},
+				],
+				default: '',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index 324118a46e..24a1eb9448 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -163,7 +163,6 @@ export class Mailgun implements INodeType {
 					}
 
 					if (attachments.length) {
-						// @ts-ignore
 						formData.attachment = attachments;
 					}
 				}
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
index 0b02a4590c..303ef673ef 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
@@ -9,11 +9,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { emailFields, emailOperations } from './EmailDescription';
 import type { IMessage } from './GenericFunctions';
 import { mailjetApiRequest, validateJSON } from './GenericFunctions';
-
-import { emailFields, emailOperations } from './EmailDescription';
-
 import { smsFields, smsOperations } from './SmsDescription';
 export class Mailjet implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index ddd3d4d792..43ed419ddb 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -1,3 +1,6 @@
+import isEmpty from 'lodash/isEmpty';
+import map from 'lodash/map';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,10 +13,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import map from 'lodash/map';
-import isEmpty from 'lodash/isEmpty';
 import {
 	getGoogleAnalyticsDomainsArray,
 	getTags,
@@ -838,7 +837,6 @@ export class Mandrill implements INodeType {
 								// @ts-ignore
 								attachmentsValues = map(attachmentsUi.attachmentsValues, (o: IDataObject) => {
 									const aux: IDataObject = {};
-									// @ts-ignore
 									aux.name = o.name;
 									aux.content = o.content;
 									aux.type = o.type;
diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.ts b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
index bcd270797d..dbefae8989 100644
--- a/packages/nodes-base/nodes/Markdown/Markdown.node.ts
+++ b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,13 +9,8 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy } from 'n8n-workflow';
-
-import { Converter } from 'showdown';
-
 import { NodeHtmlMarkdown } from 'node-html-markdown';
-
-import isEmpty from 'lodash/isEmpty';
-import set from 'lodash/set';
+import { Converter } from 'showdown';
 
 export class Markdown implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
index 62617ee6fa..370fdb261b 100644
--- a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
+++ b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
@@ -15,14 +15,12 @@ import {
 	tickerFields,
 	tickerOperations,
 } from './descriptions';
-
 import {
 	format,
 	marketstackApiRequest,
 	marketstackApiRequestAllItems,
 	validateTimeOptions,
 } from './GenericFunctions';
-
 import type { EndOfDayDataFilters, Operation, Resource } from './types';
 
 export class Marketstack implements INodeType {
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index 112db518da..c00d819015 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -7,7 +7,6 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
 
 export async function matrixApiRequest(
@@ -40,7 +39,6 @@ export async function matrixApiRequest(
 		const credentials = await this.getCredentials('matrixApi');
 
 		options.uri = `${credentials.homeserverUrl}/_matrix/${
-			//@ts-ignore
 			option.overridePrefix || 'client'
 		}/r0${resource}`;
 		options.headers!.Authorization = `Bearer ${credentials.accessToken}`;
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
index 141a6c5181..6a0c4b40ac 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -9,18 +9,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { handleMatrixCall, matrixApiRequest } from './GenericFunctions';
-
 import { accountOperations } from './AccountDescription';
-
 import { eventFields, eventOperations } from './EventDescription';
-
+import { handleMatrixCall, matrixApiRequest } from './GenericFunctions';
 import { mediaFields, mediaOperations } from './MediaDescription';
-
 import { messageFields, messageOperations } from './MessageDescription';
-
 import { roomFields, roomOperations } from './RoomDescription';
-
 import { roomMemberFields, roomMemberOperations } from './RoomMemberDescription';
 
 export class Matrix implements INodeType {
diff --git a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
index 744a6f3709..926be610ae 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { loadOptions } from './methods';
-import { router } from './actions/router';
 
 export class MattermostV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/index.ts
index 53e4554144..7427248462 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/index.ts
@@ -1,4 +1,4 @@
-import { addUser as execute } from './execute';
 import { channelAddUserDescription as description } from './description';
+import { addUser as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/index.ts
index 6d0b5e0298..295ea98640 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/index.ts
@@ -1,4 +1,4 @@
-import { create as execute } from './execute';
 import { channelCreateDescription as description } from './description';
+import { create as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/index.ts
index 6a1a439d78..337e950330 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { channelDeleteDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
index 26cf5301a3..2edfc23da4 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/index.ts
@@ -1,11 +1,12 @@
 import type { INodeProperties } from 'n8n-workflow';
+
+import * as addUser from './addUser';
 import * as create from './create';
 import * as del from './del';
 import * as members from './members';
 import * as restore from './restore';
-import * as addUser from './addUser';
-import * as statistics from './statistics';
 import * as search from './search';
+import * as statistics from './statistics';
 
 export { create, del as delete, members, restore, addUser, statistics, search };
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/index.ts
index 21b6549c6d..9849dbfbd8 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/index.ts
@@ -1,4 +1,4 @@
-import { members as execute } from './execute';
 import { channelMembersDescription as description } from './description';
+import { members as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/index.ts
index 7bf9f4c595..7d99464fc6 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/index.ts
@@ -1,4 +1,4 @@
-import { restore as execute } from './execute';
 import { channelRestoreDescription as description } from './description';
+import { restore as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/index.ts
index 9b3ac397d0..9c5c467bb7 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/index.ts
@@ -1,4 +1,4 @@
-import { search as execute } from './execute';
 import { channelSearchDescription as description } from './description';
+import { search as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/index.ts
index 946856f3b1..c2c2bca7a6 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/index.ts
@@ -1,4 +1,4 @@
-import { statistics as execute } from './execute';
 import { channelStatisticsDescription as description } from './description';
+import { statistics as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/index.ts
index 13161e7481..68cff0cdb7 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { messageDeleteDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts
index 433e0e95e1..e74d546d43 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as del from './del';
 import * as post from './post';
 import * as postEphemeral from './postEphemeral';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
index 38f3eb6797..82362ec0e0 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
@@ -1,7 +1,6 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
-
 import type { IAttachment } from '../../Interfaces';
 
 export async function post(this: IExecuteFunctions, index: number): Promise<INodeExecutionData[]> {
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/index.ts
index e823fd7dc2..1c3b259ab5 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/index.ts
@@ -1,4 +1,4 @@
-import { post as execute } from './execute';
 import { messagePostDescription as description } from './description';
+import { post as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/index.ts
index db3575bba9..1c2725e009 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/index.ts
@@ -1,4 +1,4 @@
-import { postEphemeral as execute } from './execute';
 import { messagePostEphemeralDescription as description } from './description';
+import { postEphemeral as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/index.ts
index d146e47a54..7b256a04f2 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/index.ts
@@ -1,4 +1,4 @@
-import { create as execute } from './execute';
 import { reactionCreateDescription as description } from './description';
+import { create as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/index.ts
index 1464e57a39..8357737725 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/index.ts
@@ -1,4 +1,4 @@
-import { del as execute } from './execute';
 import { reactionDeleteDescription as description } from './description';
+import { del as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/index.ts
index 8e2c2bcdb5..8b1e83c8ac 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { reactionGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts
index e1da062e19..a27bbf23c2 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create';
 import * as del from './del';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
index bd1af59af2..9f775e178e 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
@@ -1,10 +1,10 @@
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import * as channel from './channel';
+import type { Mattermost } from './Interfaces';
 import * as message from './message';
 import * as reaction from './reaction';
 import * as user from './user';
-import type { Mattermost } from './Interfaces';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/index.ts
index b577b89d6a..cdc5974dc1 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/index.ts
@@ -1,4 +1,4 @@
-import { create as execute } from './execute';
 import { userCreateDescription as description } from './description';
+import { create as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/index.ts
index c94f40b60d..cc7ea96d44 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/index.ts
@@ -1,4 +1,4 @@
-import { deactive as execute } from './execute';
 import { userDeactiveDescription as description } from './description';
+import { deactive as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
index 099de6e0cd..86511eda0b 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
@@ -1,7 +1,7 @@
+import { snakeCase } from 'change-case';
 import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { apiRequest, apiRequestAllItems } from '../../../transport';
 
 export async function getAll(
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/index.ts
index f0ca9da66c..6cdefb6922 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { userGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/index.ts
index cfea09fd8d..aae3018fe8 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/index.ts
@@ -1,4 +1,4 @@
-import { getByEmail as execute } from './execute';
 import { userGetByEmailDescription as description } from './description';
+import { getByEmail as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/index.ts
index c7e5dc2641..8b0bcb1dcb 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/index.ts
@@ -1,4 +1,4 @@
-import { getById as execute } from './execute';
 import { userGetByIdDescription as description } from './description';
+import { getById as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts
index 7ac78aea12..cf1859f757 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create';
 import * as deactive from './deactive';
 import * as getAll from './getAll';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/index.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/index.ts
index f6217f9156..17f51ca035 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/index.ts
@@ -1,4 +1,4 @@
-import { invite as execute } from './execute';
 import { userInviteDescription as description } from './description';
+import { invite as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/versionDescription.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/versionDescription.ts
index 787c1af46a..bdd0fc57de 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/versionDescription.ts
@@ -1,5 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
+
 import * as channel from './channel';
 import * as message from './message';
 import * as reaction from './reaction';
diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
index 415c70afc0..e612e76563 100644
--- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
@@ -37,14 +37,12 @@ export async function mauticApiRequest(
 			const baseUrl = credentials.url as string;
 
 			options.uri = `${baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl}${options.uri}`;
-			//@ts-ignore
 			returnData = await this.helpers.requestWithAuthentication.call(this, 'mauticApi', options);
 		} else {
 			const credentials = await this.getCredentials('mauticOAuth2Api');
 			const baseUrl = credentials.url as string;
 
 			options.uri = `${baseUrl.endsWith('/') ? baseUrl.slice(0, -1) : baseUrl}${options.uri}`;
-			//@ts-ignore
 			returnData = await this.helpers.requestOAuth2.call(this, 'mauticOAuth2Api', options, {
 				includeCredentialsOnRefreshOnBody: true,
 			});
@@ -83,7 +81,6 @@ export async function mauticApiRequestAllItems(
 	do {
 		responseData = await mauticApiRequest.call(this, method, endpoint, body, query);
 		const values = Object.values(responseData[propertyName] as IDataObject[]);
-		//@ts-ignore
 		returnData.push.apply(returnData, values);
 		query.start += query.limit;
 	} while (
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index 25a1aad381..0a5d61739c 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,20 +11,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-import { mauticApiRequest, mauticApiRequestAllItems, validateJSON } from './GenericFunctions';
-
-import { contactFields, contactOperations } from './ContactDescription';
-
-import { segmentEmailFields, segmentEmailOperations } from './SegmentEmailDescription';
-
-import { companyFields, companyOperations } from './CompanyDescription';
-
-import { companyContactFields, companyContactOperations } from './CompanyContactDescription';
-
-import { contactSegmentFields, contactSegmentOperations } from './ContactSegmentDescription';
-
 import { campaignContactFields, campaignContactOperations } from './CampaignContactDescription';
+import { companyContactFields, companyContactOperations } from './CompanyContactDescription';
+import { companyFields, companyOperations } from './CompanyDescription';
+import { contactFields, contactOperations } from './ContactDescription';
+import { contactSegmentFields, contactSegmentOperations } from './ContactSegmentDescription';
+import { mauticApiRequest, mauticApiRequestAllItems, validateJSON } from './GenericFunctions';
+import { segmentEmailFields, segmentEmailOperations } from './SegmentEmailDescription';
 
 export class Mautic implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
index 01a87bd7ca..cf7251b7ee 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
@@ -1,5 +1,3 @@
-import { parse as urlParse } from 'url';
-
 import {
 	type IHookFunctions,
 	type IWebhookFunctions,
@@ -11,6 +9,7 @@ import {
 	type IWebhookResponseData,
 	NodeConnectionType,
 } from 'n8n-workflow';
+import { parse as urlParse } from 'url';
 
 import { mauticApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Merge/test/v3/operations.test.ts b/packages/nodes-base/nodes/Merge/test/v3/operations.test.ts
index 17502459f6..a318885edc 100644
--- a/packages/nodes-base/nodes/Merge/test/v3/operations.test.ts
+++ b/packages/nodes-base/nodes/Merge/test/v3/operations.test.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, INode } from 'n8n-workflow';
+
 import { createMockExecuteFunction } from '../../../../test/nodes/Helpers';
 import * as mode from '../../v3/actions/mode';
 
@@ -100,7 +101,7 @@ describe('Test MergeV3, combineBySql operation', () => {
 			inputsData,
 		);
 
-		expect(returnData[0].json).toEqual({
+		expect(returnData[0][0].json).toEqual({
 			data_1: 'a',
 			id: 1,
 			data: 'aa',
@@ -120,7 +121,9 @@ describe('Test MergeV3, combineBySql operation', () => {
 			[inputsData[0], []],
 		);
 
-		expect(returnData[0].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(5);
+		expect(returnData[0][0].json).toEqual({
 			data: 'a',
 			data_1: 'a',
 			id: 1,
@@ -179,13 +182,15 @@ describe('Test MergeV3, combineBySql operation', () => {
 			inputsData,
 		);
 
-		expect(returnData[0].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(5);
+		expect(returnData[0][0].json).toEqual({
 			id: 1,
 			data: 'aa',
 			name: 'Sam',
 			country: 'PL',
 		});
-		expect(returnData[4].json).toEqual({
+		expect(returnData[0][4].json).toEqual({
 			id: 5,
 			data: 'ff',
 			country: 'ES',
@@ -203,8 +208,9 @@ describe('Test MergeV3, combineBySql operation', () => {
 			inputsData,
 		);
 
-		expect(returnData.length).toEqual(3);
-		expect(returnData[2].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(3);
+		expect(returnData[0][2].json).toEqual({
 			id: 3,
 			data: 'cc',
 			name: 'Jon',
@@ -223,8 +229,9 @@ describe('Test MergeV3, combineBySql operation', () => {
 			inputsData,
 		);
 
-		expect(returnData.length).toEqual(7);
-		expect(returnData[2].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(7);
+		expect(returnData[0][2].json).toEqual({
 			id: 3,
 			data: 'cc',
 			name: 'Jon',
@@ -242,8 +249,9 @@ describe('Test MergeV3, combineBySql operation', () => {
 			inputsData,
 		);
 
-		expect(returnData.length).toEqual(25);
-		expect(returnData[0].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(25);
+		expect(returnData[0][0].json).toEqual({
 			data_1: 'a',
 			id: 1,
 			data: 'aa',
@@ -262,8 +270,9 @@ describe('Test MergeV3, append operation', () => {
 			inputsData,
 		);
 
-		expect(returnData.length).toEqual(10);
-		expect(returnData[0].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(10);
+		expect(returnData[0][0].json).toEqual({
 			id: 1,
 			data: 'a',
 			name: 'Sam',
@@ -283,8 +292,9 @@ describe('Test MergeV3, combineByFields operation', () => {
 			inputsData,
 		);
 
-		expect(returnData.length).toEqual(3);
-		expect(returnData[1].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(3);
+		expect(returnData[0][1].json).toEqual({
 			id: 2,
 			data: 'bb',
 			name: 'Dan',
@@ -302,8 +312,9 @@ describe('Test MergeV3, combineByPosition operation', () => {
 			inputsData,
 		);
 
-		expect(returnData.length).toEqual(5);
-		expect(returnData[4].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(5);
+		expect(returnData[0][4].json).toEqual({
 			id: 5,
 			data: 'ff',
 			name: 'Joe',
@@ -325,8 +336,9 @@ describe('Test MergeV3, chooseBranch operation', () => {
 			inputsData,
 		);
 
-		expect(returnData.length).toEqual(5);
-		expect(returnData[0].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(5);
+		expect(returnData[0][0].json).toEqual({
 			id: 1,
 			data: 'aa',
 			country: 'PL',
@@ -345,8 +357,9 @@ describe('Test MergeV3, combineAll operation', () => {
 			inputsData,
 		);
 
-		expect(returnData.length).toEqual(25);
-		expect(returnData[0].json).toEqual({
+		expect(returnData.length).toEqual(1);
+		expect(returnData[0].length).toEqual(25);
+		expect(returnData[0][0].json).toEqual({
 			id: 1,
 			data: 'aa',
 			name: 'Sam',
diff --git a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
index 7105e1aa9a..069f46ba08 100644
--- a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
+++ b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
@@ -1,5 +1,4 @@
 import get from 'lodash/get';
-
 import type {
 	IExecuteFunctions,
 	GenericValue,
@@ -11,9 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../utils/utilities';
 import { oldVersionNotice } from '@utils/descriptions';
 
+import { generatePairedItemData } from '../../../utils/utilities';
+
 export class MergeV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
index 6adc63aa1e..955835dd3a 100644
--- a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
+++ b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
@@ -1,5 +1,4 @@
 import merge from 'lodash/merge';
-
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -11,13 +10,15 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { preparePairedItemDataArray } from '@utils/utilities';
+
+import { optionsDescription } from './descriptions';
 import type {
 	ClashResolveOptions,
 	MatchFieldsJoinMode,
 	MatchFieldsOptions,
 	MatchFieldsOutput,
 } from './interfaces';
-
 import {
 	addSourceField,
 	addSuffixToEntriesKeys,
@@ -28,9 +29,6 @@ import {
 	selectMergeMethod,
 } from './utils';
 
-import { optionsDescription } from './descriptions';
-import { preparePairedItemDataArray } from '@utils/utilities';
-
 export class MergeV2 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Merge/v2/utils.ts b/packages/nodes-base/nodes/Merge/v2/utils.ts
index ec5180c5a5..1f5437f663 100644
--- a/packages/nodes-base/nodes/Merge/v2/utils.ts
+++ b/packages/nodes-base/nodes/Merge/v2/utils.ts
@@ -1,4 +1,8 @@
-import { ApplicationError } from 'n8n-workflow';
+import assign from 'lodash/assign';
+import assignWith from 'lodash/assignWith';
+import get from 'lodash/get';
+import merge from 'lodash/merge';
+import mergeWith from 'lodash/mergeWith';
 import type {
 	GenericValue,
 	IBinaryKeyData,
@@ -6,15 +10,11 @@ import type {
 	INodeExecutionData,
 	IPairedItemData,
 } from 'n8n-workflow';
+import { ApplicationError } from 'n8n-workflow';
 
-import assign from 'lodash/assign';
-import assignWith from 'lodash/assignWith';
-import get from 'lodash/get';
-import merge from 'lodash/merge';
-import mergeWith from 'lodash/mergeWith';
+import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 import type { ClashResolveOptions, MatchFieldsJoinMode, MatchFieldsOptions } from './interfaces';
-import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 type PairToMatch = {
 	field1: string;
diff --git a/packages/nodes-base/nodes/Merge/v3/MergeV3.node.ts b/packages/nodes-base/nodes/Merge/v3/MergeV3.node.ts
index f194d9e54a..254d248f6e 100644
--- a/packages/nodes-base/nodes/Merge/v3/MergeV3.node.ts
+++ b/packages/nodes-base/nodes/Merge/v3/MergeV3.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
 import { loadOptions } from './methods';
 
 export class MergeV3 implements INodeType {
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts
index 1eaf58a0a8..e9f9251495 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/append.ts
@@ -4,9 +4,10 @@ import {
 	type INodeProperties,
 } from 'n8n-workflow';
 
-import { numberInputsProperty } from '../../helpers/descriptions';
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { numberInputsProperty } from '../../helpers/descriptions';
+
 export const properties: INodeProperties[] = [numberInputsProperty];
 
 const displayOptions = {
@@ -20,12 +21,12 @@ export const description = updateDisplayOptions(displayOptions, properties);
 export async function execute(
 	this: IExecuteFunctions,
 	inputsData: INodeExecutionData[][],
-): Promise<INodeExecutionData[]> {
+): Promise<INodeExecutionData[][]> {
 	const returnData: INodeExecutionData[] = [];
 
 	for (let i = 0; i < inputsData.length; i++) {
 		returnData.push.apply(returnData, inputsData[i]);
 	}
 
-	return returnData;
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts
index 5bd416ca18..dc94daaf0e 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/chooseBranch.ts
@@ -1,9 +1,10 @@
 import { NodeOperationError } from 'n8n-workflow';
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import { numberInputsProperty } from '../../helpers/descriptions';
 import { preparePairedItemDataArray, updateDisplayOptions } from '@utils/utilities';
 
+import { numberInputsProperty } from '../../helpers/descriptions';
+
 export const properties: INodeProperties[] = [
 	numberInputsProperty,
 	{
@@ -72,7 +73,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
 export async function execute(
 	this: IExecuteFunctions,
 	inputsData: INodeExecutionData[][],
-): Promise<INodeExecutionData[]> {
+): Promise<INodeExecutionData[][]> {
 	const returnData: INodeExecutionData[] = [];
 
 	const chooseBranchMode = this.getNodeParameter('chooseBranchMode', 0) as string;
@@ -105,5 +106,5 @@ export async function execute(
 		}
 	}
 
-	return returnData;
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
index 504fab3d1f..7f130de307 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineAll.ts
@@ -1,3 +1,4 @@
+import merge from 'lodash/merge';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -5,12 +6,11 @@ import type {
 	IPairedItemData,
 } from 'n8n-workflow';
 
-import merge from 'lodash/merge';
-import type { ClashResolveOptions } from '../../helpers/interfaces';
+import { updateDisplayOptions } from '@utils/utilities';
 
 import { clashHandlingProperties, fuzzyCompareProperty } from '../../helpers/descriptions';
+import type { ClashResolveOptions } from '../../helpers/interfaces';
 import { addSuffixToEntriesKeys, selectMergeMethod } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
@@ -35,7 +35,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
 export async function execute(
 	this: IExecuteFunctions,
 	inputsData: INodeExecutionData[][],
-): Promise<INodeExecutionData[]> {
+): Promise<INodeExecutionData[][]> {
 	const returnData: INodeExecutionData[] = [];
 
 	const clashHandling = this.getNodeParameter(
@@ -59,7 +59,7 @@ export async function execute(
 	const mergeIntoSingleObject = selectMergeMethod(clashHandling);
 
 	if (!input1 || !input2) {
-		return returnData;
+		return [returnData];
 	}
 
 	let entry1: INodeExecutionData;
@@ -79,5 +79,5 @@ export async function execute(
 		}
 	}
 
-	return returnData;
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
index 53620d3b05..0e848666ee 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByFields.ts
@@ -5,13 +5,15 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { clashHandlingProperties, fuzzyCompareProperty } from '../../helpers/descriptions';
 import type {
 	ClashResolveOptions,
 	MatchFieldsJoinMode,
 	MatchFieldsOptions,
 	MatchFieldsOutput,
 } from '../../helpers/interfaces';
-import { clashHandlingProperties, fuzzyCompareProperty } from '../../helpers/descriptions';
 import {
 	addSourceField,
 	addSuffixToEntriesKeys,
@@ -20,7 +22,6 @@ import {
 	findMatches,
 	mergeMatched,
 } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const multipleMatchesProperty: INodeProperties = {
 	displayName: 'Multiple Matches',
@@ -260,7 +261,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
 export async function execute(
 	this: IExecuteFunctions,
 	inputsData: INodeExecutionData[][],
-): Promise<INodeExecutionData[]> {
+): Promise<INodeExecutionData[][]> {
 	const returnData: INodeExecutionData[] = [];
 	const advanced = this.getNodeParameter('advanced', 0) as boolean;
 	let matchFields;
@@ -297,7 +298,7 @@ export async function execute(
 			options.disableDotNotation || false,
 			'Input 1',
 		);
-		if (!input1) return returnData;
+		if (!input1) return [returnData];
 
 		input2 = checkInput(
 			this.getInputData(1),
@@ -306,14 +307,14 @@ export async function execute(
 			'Input 2',
 		);
 	} else {
-		if (!input1) return returnData;
+		if (!input1) return [returnData];
 	}
 
 	if (input1.length === 0 || input2.length === 0) {
 		if (!input1.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input1')
-			return returnData;
+			return [returnData];
 		if (!input2.length && joinMode === 'keepNonMatches' && outputDataFrom === 'input2')
-			return returnData;
+			return [returnData];
 
 		if (joinMode === 'keepMatches') {
 			// Stop the execution
@@ -326,11 +327,11 @@ export async function execute(
 			return [];
 		} else {
 			// Return the data of any of the inputs that contains data
-			return [...input1, ...input2];
+			return [[...input1, ...input2]];
 		}
 	}
 
-	if (!input1) return returnData;
+	if (!input1) return [returnData];
 
 	if (!input2 || !matchFields.length) {
 		if (
@@ -338,9 +339,9 @@ export async function execute(
 			joinMode === 'keepEverything' ||
 			joinMode === 'enrichInput2'
 		) {
-			return returnData;
+			return [returnData];
 		}
-		return input1;
+		return [input1];
 	}
 
 	const matches = findMatches(input1, input2, matchFields, options);
@@ -378,16 +379,16 @@ export async function execute(
 
 	if (joinMode === 'keepNonMatches') {
 		if (outputDataFrom === 'input1') {
-			return matches.unmatched1;
+			return [matches.unmatched1];
 		}
 		if (outputDataFrom === 'input2') {
-			return matches.unmatched2;
+			return [matches.unmatched2];
 		}
 		if (outputDataFrom === 'both') {
 			let output: INodeExecutionData[] = [];
 			output = output.concat(addSourceField(matches.unmatched1, 'input1'));
 			output = output.concat(addSourceField(matches.unmatched2, 'input2'));
-			return output;
+			return [output];
 		}
 	}
 
@@ -415,5 +416,5 @@ export async function execute(
 		}
 	}
 
-	return returnData;
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
index 67ed47c15b..8b9067156c 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineByPosition.ts
@@ -1,3 +1,4 @@
+import merge from 'lodash/merge';
 import {
 	NodeExecutionOutput,
 	type IExecuteFunctions,
@@ -6,12 +7,11 @@ import {
 	type IPairedItemData,
 } from 'n8n-workflow';
 
-import merge from 'lodash/merge';
-import type { ClashResolveOptions } from '../../helpers/interfaces';
+import { updateDisplayOptions } from '@utils/utilities';
 
 import { clashHandlingProperties, numberInputsProperty } from '../../helpers/descriptions';
+import type { ClashResolveOptions } from '../../helpers/interfaces';
 import { addSuffixToEntriesKeys, selectMergeMethod } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	numberInputsProperty,
@@ -50,7 +50,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
 export async function execute(
 	this: IExecuteFunctions,
 	inputsData: INodeExecutionData[][],
-): Promise<INodeExecutionData[]> {
+): Promise<INodeExecutionData[][]> {
 	const returnData: INodeExecutionData[] = [];
 
 	const clashHandling = this.getNodeParameter(
@@ -120,5 +120,5 @@ export async function execute(
 		returnData.push({ json, binary, pairedItem });
 	}
 
-	return returnData;
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts
index 055db7572d..bd6921082f 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/combineBySql.ts
@@ -1,3 +1,5 @@
+import alasql from 'alasql';
+import type { Database } from 'alasql';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,11 +9,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import alasql from 'alasql';
-import type { Database } from 'alasql';
-import { numberInputsProperty } from '../../helpers/descriptions';
 import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
+import { numberInputsProperty } from '../../helpers/descriptions';
+
 export const properties: INodeProperties[] = [
 	numberInputsProperty,
 	{
@@ -41,7 +42,7 @@ export const description = updateDisplayOptions(displayOptions, properties);
 export async function execute(
 	this: IExecuteFunctions,
 	inputsData: INodeExecutionData[][],
-): Promise<INodeExecutionData[]> {
+): Promise<INodeExecutionData[][]> {
 	const nodeId = this.getNode().id;
 	const returnData: INodeExecutionData[] = [];
 	const pairedItem: IPairedItemData[] = [];
@@ -132,5 +133,5 @@ export async function execute(
 
 	delete alasql.databases[nodeId];
 
-	return returnData;
+	return [returnData];
 }
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/mode/index.ts b/packages/nodes-base/nodes/Merge/v3/actions/mode/index.ts
index fb10117b79..d704b11b22 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/mode/index.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/mode/index.ts
@@ -4,8 +4,8 @@ import * as append from './append';
 import * as chooseBranch from './chooseBranch';
 import * as combineAll from './combineAll';
 import * as combineByFields from './combineByFields';
-import * as combineBySql from './combineBySql';
 import * as combineByPosition from './combineByPosition';
+import * as combineBySql from './combineBySql';
 
 export { append, chooseBranch, combineAll, combineByFields, combineBySql, combineByPosition };
 
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/router.ts b/packages/nodes-base/nodes/Merge/v3/actions/router.ts
index fe87969a6f..9ecbc4f655 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/router.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/router.ts
@@ -1,7 +1,8 @@
-import { NodeExecutionOutput, type IExecuteFunctions } from 'n8n-workflow';
-import { getNodeInputsData } from '../helpers/utils';
-import type { MergeType } from './node.type';
+import type { IExecuteFunctions } from 'n8n-workflow';
+
 import * as mode from './mode';
+import type { MergeType } from './node.type';
+import { getNodeInputsData } from '../helpers/utils';
 
 export async function router(this: IExecuteFunctions) {
 	const inputsData = getNodeInputsData.call(this);
@@ -12,11 +13,5 @@ export async function router(this: IExecuteFunctions) {
 		operationMode = combineBy;
 	}
 
-	const returnData = await mode[operationMode as MergeType].execute.call(this, inputsData);
-
-	if (returnData instanceof NodeExecutionOutput) {
-		return returnData;
-	} else {
-		return [returnData];
-	}
+	return await mode[operationMode as MergeType].execute.call(this, inputsData);
 }
diff --git a/packages/nodes-base/nodes/Merge/v3/actions/versionDescription.ts b/packages/nodes-base/nodes/Merge/v3/actions/versionDescription.ts
index efcd726f82..788b45446d 100644
--- a/packages/nodes-base/nodes/Merge/v3/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/Merge/v3/actions/versionDescription.ts
@@ -1,8 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import { configuredInputs } from '../helpers/utils';
 import * as mode from './mode';
+import { configuredInputs } from '../helpers/utils';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Merge',
diff --git a/packages/nodes-base/nodes/Merge/v3/helpers/utils.ts b/packages/nodes-base/nodes/Merge/v3/helpers/utils.ts
index 0dd650f790..a8d44ce550 100644
--- a/packages/nodes-base/nodes/Merge/v3/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Merge/v3/helpers/utils.ts
@@ -1,4 +1,8 @@
-import { ApplicationError, NodeConnectionType, NodeHelpers } from 'n8n-workflow';
+import assign from 'lodash/assign';
+import assignWith from 'lodash/assignWith';
+import get from 'lodash/get';
+import merge from 'lodash/merge';
+import mergeWith from 'lodash/mergeWith';
 import type {
 	GenericValue,
 	IBinaryKeyData,
@@ -8,15 +12,11 @@ import type {
 	INodeParameters,
 	IPairedItemData,
 } from 'n8n-workflow';
+import { ApplicationError, NodeConnectionType, NodeHelpers } from 'n8n-workflow';
 
-import assign from 'lodash/assign';
-import assignWith from 'lodash/assignWith';
-import get from 'lodash/get';
-import merge from 'lodash/merge';
-import mergeWith from 'lodash/mergeWith';
+import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 import type { ClashResolveOptions, MatchFieldsJoinMode, MatchFieldsOptions } from './interfaces';
-import { fuzzyCompare, preparePairedItemDataArray } from '@utils/utilities';
 
 type PairToMatch = {
 	field1: string;
diff --git a/packages/nodes-base/nodes/Metabase/Metabase.node.ts b/packages/nodes-base/nodes/Metabase/Metabase.node.ts
index cf13c705cd..1d00a0f38a 100644
--- a/packages/nodes-base/nodes/Metabase/Metabase.node.ts
+++ b/packages/nodes-base/nodes/Metabase/Metabase.node.ts
@@ -1,13 +1,10 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { questionsFields, questionsOperations } from './QuestionsDescription';
-
-import { metricsFields, metricsOperations } from './MetricsDescription';
-
-import { databasesFields, databasesOperations } from './DatabasesDescription';
-
 import { alertsFields, alertsOperations } from './AlertsDescription';
+import { databasesFields, databasesOperations } from './DatabasesDescription';
+import { metricsFields, metricsOperations } from './MetricsDescription';
+import { questionsFields, questionsOperations } from './QuestionsDescription';
 
 export class Metabase implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
index b24a95b6a7..2ccbb82553 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
@@ -42,7 +42,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(option).length !== 0) {
 			options = Object.assign({}, options, option);
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftDynamicsOAuth2Api', options, {
 			property: 'id_token',
 		});
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
index 08ee11ae4a..3ffaacbd69 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
@@ -9,6 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
+import { accountFields, accountOperations } from './descriptions';
 import type { IField } from './GenericFunctions';
 import {
 	adjustAddresses,
@@ -19,8 +20,6 @@ import {
 	sort,
 } from './GenericFunctions';
 
-import { accountFields, accountOperations } from './descriptions';
-
 export class MicrosoftDynamicsCrm implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Microsoft Dynamics CRM',
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Entra/GenericFunctions.ts
new file mode 100644
index 0000000000..e7b2e940b7
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/GenericFunctions.ts
@@ -0,0 +1,412 @@
+import type {
+	JsonObject,
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+	IRequestOptions,
+	INodeExecutionData,
+	IN8nHttpFullResponse,
+	INodePropertyOptions,
+	INodeListSearchResult,
+	INodeListSearchItems,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+import { parseStringPromise } from 'xml2js';
+
+export async function microsoftApiRequest(
+	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	qs?: IDataObject,
+	headers?: IDataObject,
+	url?: string,
+): Promise<any> {
+	const options: IHttpRequestOptions = {
+		method,
+		url: url ?? `https://graph.microsoft.com/v1.0${endpoint}`,
+		json: true,
+		headers,
+		body,
+		qs,
+	};
+
+	return await this.helpers.requestWithAuthentication.call(
+		this,
+		'microsoftEntraOAuth2Api',
+		options,
+	);
+}
+
+export async function microsoftApiPaginateRequest(
+	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	method: IHttpRequestMethods,
+	endpoint: string,
+	body: IDataObject = {},
+	qs?: IDataObject,
+	headers?: IDataObject,
+	url?: string,
+	itemIndex: number = 0,
+): Promise<IDataObject[]> {
+	// Todo: IHttpRequestOptions doesn't have uri property which is required for requestWithAuthenticationPaginated
+	const options: IRequestOptions = {
+		method,
+		uri: url ?? `https://graph.microsoft.com/v1.0${endpoint}`,
+		json: true,
+		headers,
+		body,
+		qs,
+	};
+
+	const pages = await this.helpers.requestWithAuthenticationPaginated.call(
+		this,
+		options,
+		itemIndex,
+		{
+			continue: '={{ !!$response.body?.["@odata.nextLink"] }}',
+			request: {
+				url: '={{ $response.body?.["@odata.nextLink"] ?? $request.url }}',
+			},
+			requestInterval: 0,
+		},
+		'microsoftEntraOAuth2Api',
+	);
+
+	let results: IDataObject[] = [];
+	for (const page of pages) {
+		const items = page.body.value as IDataObject[];
+		if (items) {
+			results = results.concat(items);
+		}
+	}
+
+	return results;
+}
+
+export async function handleErrorPostReceive(
+	this: IExecuteSingleFunctions,
+	data: INodeExecutionData[],
+	response: IN8nHttpFullResponse,
+): Promise<INodeExecutionData[]> {
+	if (String(response.statusCode).startsWith('4') || String(response.statusCode).startsWith('5')) {
+		const resource = this.getNodeParameter('resource') as string;
+		const operation = this.getNodeParameter('operation') as string;
+		const {
+			code: errorCode,
+			message: errorMessage,
+			details: errorDetails,
+		} = (response.body as IDataObject)?.error as {
+			code: string;
+			message: string;
+			innerError?: {
+				code: string;
+				'request-id'?: string;
+				date?: string;
+			};
+			details?: Array<{
+				code: string;
+				message: string;
+			}>;
+		};
+
+		// Operation specific errors
+		if (resource === 'group') {
+			if (operation === 'create') {
+			} else if (operation === 'delete') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required group doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Group to Delete' and try again",
+					});
+				}
+			} else if (operation === 'get') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required group doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Group to Get' and try again",
+					});
+				}
+			} else if (operation === 'getAll') {
+			} else if (operation === 'update') {
+				if (
+					errorCode === 'BadRequest' &&
+					errorMessage === 'Empty Payload. JSON content expected.'
+				) {
+					// Ignore empty payload error. Currently n8n deletes the empty body object from the request.
+					return data;
+				}
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required group doesn't match any existing one",
+						description: "Double-check the value in the parameter 'Group to Update' and try again",
+					});
+				}
+			}
+		} else if (resource === 'user') {
+			if (operation === 'addGroup') {
+				if (
+					errorCode === 'Request_BadRequest' &&
+					errorMessage ===
+						"One or more added object references already exist for the following modified properties: 'members'."
+				) {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: 'The user is already in the group',
+						description:
+							'The specified user cannot be added to the group because they are already a member',
+					});
+				} else if (errorCode === 'Request_ResourceNotFound') {
+					const group = this.getNodeParameter('group.value') as string;
+					if (errorMessage.includes(group)) {
+						throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+							message: "The required group doesn't match any existing one",
+							description: "Double-check the value in the parameter 'Group' and try again",
+						});
+					} else {
+						throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+							message: "The required user doesn't match any existing one",
+							description: "Double-check the value in the parameter 'User to Add' and try again",
+						});
+					}
+				}
+			} else if (operation === 'create') {
+			} else if (operation === 'delete') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required user doesn't match any existing one",
+						description: "Double-check the value in the parameter 'User to Delete' and try again",
+					});
+				}
+			} else if (operation === 'get') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required user doesn't match any existing one",
+						description: "Double-check the value in the parameter 'User to Get' and try again",
+					});
+				}
+			} else if (operation === 'getAll') {
+			} else if (operation === 'removeGroup') {
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: 'The user is not in the group',
+						description:
+							'The specified user cannot be removed from the group because they are not a member of the group',
+					});
+				} else if (
+					errorCode === 'Request_UnsupportedQuery' &&
+					errorMessage ===
+						"Unsupported referenced-object resource identifier for link property 'members'."
+				) {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: 'The user ID is invalid',
+						description: 'The ID should be in the format e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+					});
+				}
+			} else if (operation === 'update') {
+				if (
+					errorCode === 'BadRequest' &&
+					errorMessage === 'Empty Payload. JSON content expected.'
+				) {
+					// Ignore empty payload error. Currently n8n deletes the empty body object from the request.
+					return data;
+				}
+				if (errorCode === 'Request_ResourceNotFound') {
+					throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+						message: "The required user doesn't match any existing one",
+						description: "Double-check the value in the parameter 'User to Update' and try again",
+					});
+				}
+			}
+		}
+
+		// Generic errors
+		if (
+			errorCode === 'Request_BadRequest' &&
+			errorMessage.startsWith('Invalid object identifier')
+		) {
+			const group = this.getNodeParameter('group.value', '') as string;
+			const parameterResource =
+				resource === 'group' || errorMessage.includes(group) ? 'group' : 'user';
+
+			throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+				message: `The ${parameterResource} ID is invalid`,
+				description: 'The ID should be in the format e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+			});
+		}
+		if (errorDetails?.some((x) => x.code === 'ObjectConflict' || x.code === 'ConflictingObjects')) {
+			throw new NodeApiError(this.getNode(), response as unknown as JsonObject, {
+				message: `The ${resource} already exists`,
+				description: errorMessage,
+			});
+		}
+
+		throw new NodeApiError(this.getNode(), response as unknown as JsonObject);
+	}
+
+	return data;
+}
+
+export async function getGroupProperties(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const response = await microsoftApiRequest.call(this, 'GET', '/$metadata#groups');
+	const metadata = await parseStringPromise(response as string, {
+		explicitArray: false,
+	});
+
+	/* eslint-disable */
+	const entities = metadata['edmx:Edmx']['edmx:DataServices']['Schema']
+		.find((x: any) => x['$']['Namespace'] === 'microsoft.graph')
+		['EntityType'].filter((x: any) =>
+			['entity', 'directoryObject', 'group'].includes(x['$']['Name']),
+		);
+	let properties = entities
+		.flatMap((x: any) => x['Property'])
+		.map((x: any) => x['$']['Name']) as string[];
+	/* eslint-enable */
+
+	properties = properties.filter(
+		(x) => !['id', 'isArchived', 'hasMembersWithLicenseErrors'].includes(x),
+	);
+
+	properties = properties.sort();
+
+	for (const property of properties) {
+		returnData.push({
+			name: property,
+			value: property,
+		});
+	}
+
+	return returnData;
+}
+
+export async function getUserProperties(
+	this: ILoadOptionsFunctions,
+): Promise<INodePropertyOptions[]> {
+	const returnData: INodePropertyOptions[] = [];
+	const response = await microsoftApiRequest.call(this, 'GET', '/$metadata#users');
+	const metadata = await parseStringPromise(response as string, {
+		explicitArray: false,
+	});
+
+	/* eslint-disable */
+	const entities = metadata['edmx:Edmx']['edmx:DataServices']['Schema']
+		.find((x: any) => x['$']['Namespace'] === 'microsoft.graph')
+		['EntityType'].filter((x: any) =>
+			['entity', 'directoryObject', 'user'].includes(x['$']['Name']),
+		);
+	let properties = entities
+		.flatMap((x: any) => x['Property'])
+		.map((x: any) => x['$']['Name']) as string[];
+	/* eslint-enable */
+
+	// signInActivity requires AuditLog.Read.All
+	// mailboxSettings MailboxSettings.Read
+	properties = properties.filter(
+		(x) =>
+			!['id', 'deviceEnrollmentLimit', 'mailboxSettings', 'print', 'signInActivity'].includes(x),
+	);
+
+	properties = properties.sort();
+
+	for (const property of properties) {
+		returnData.push({
+			name: property,
+			value: property,
+		});
+	}
+	return returnData;
+}
+
+export async function getGroups(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: any;
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'/groups',
+			{},
+			undefined,
+			undefined,
+			paginationToken,
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: 'id,displayName',
+		};
+		const headers: IDataObject = {};
+		if (filter) {
+			headers.ConsistencyLevel = 'eventual';
+			qs.$search = `"displayName:${filter}"`;
+		}
+		response = await microsoftApiRequest.call(this, 'GET', '/groups', {}, qs, headers);
+	}
+
+	const groups: Array<{
+		id: string;
+		displayName: string;
+	}> = response.value;
+
+	const results: INodeListSearchItems[] = groups
+		.map((g) => ({
+			name: g.displayName,
+			value: g.id,
+		}))
+		.sort((a, b) =>
+			a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }),
+		);
+
+	return { results, paginationToken: response['@odata.nextLink'] };
+}
+
+export async function getUsers(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	let response: any;
+	if (paginationToken) {
+		response = await microsoftApiRequest.call(
+			this,
+			'GET',
+			'/users',
+			{},
+			undefined,
+			undefined,
+			paginationToken,
+		);
+	} else {
+		const qs: IDataObject = {
+			$select: 'id,displayName',
+		};
+		const headers: IDataObject = {};
+		if (filter) {
+			qs.$filter = `startsWith(displayName, '${filter}') OR startsWith(userPrincipalName, '${filter}')`;
+		}
+		response = await microsoftApiRequest.call(this, 'GET', '/users', {}, qs, headers);
+	}
+
+	const users: Array<{
+		id: string;
+		displayName: string;
+	}> = response.value;
+
+	const results: INodeListSearchItems[] = users
+		.map((u) => ({
+			name: u.displayName,
+			value: u.id,
+		}))
+		.sort((a, b) =>
+			a.name.localeCompare(b.name, undefined, { numeric: true, sensitivity: 'base' }),
+		);
+
+	return { results, paginationToken: response['@odata.nextLink'] };
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.json b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.json
new file mode 100644
index 0000000000..3e45875d3f
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.json
@@ -0,0 +1,18 @@
+{
+	"node": "n8n-nodes-base.microsoftEntra",
+	"nodeVersion": "1.0",
+	"codexVersion": "1.0",
+	"categories": ["Development", "Developer Tools"],
+	"resources": {
+		"credentialDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/credentials/microsoft/"
+			}
+		],
+		"primaryDocumentation": [
+			{
+				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.microsoftentra/"
+			}
+		]
+	}
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts
new file mode 100644
index 0000000000..d07255b86d
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/MicrosoftEntra.node.ts
@@ -0,0 +1,115 @@
+import type {
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+
+import { groupFields, groupOperations, userFields, userOperations } from './descriptions';
+import { getGroupProperties, getGroups, getUserProperties, getUsers } from './GenericFunctions';
+
+export class MicrosoftEntra implements INodeType {
+	description: INodeTypeDescription = {
+		displayName: 'Microsoft Entra ID',
+		name: 'microsoftEntra',
+		icon: {
+			light: 'file:microsoftEntra.svg',
+			dark: 'file:microsoftEntra.dark.svg',
+		},
+		group: ['transform'],
+		version: 1,
+		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+		description: 'Interact with Micosoft Entra ID API',
+		defaults: {
+			name: 'Micosoft Entra ID',
+		},
+		inputs: [NodeConnectionType.Main],
+		outputs: [NodeConnectionType.Main],
+		credentials: [
+			{
+				name: 'microsoftEntraOAuth2Api',
+				required: true,
+			},
+		],
+		requestDefaults: {
+			baseURL: 'https://graph.microsoft.com/v1.0',
+			headers: {
+				'Content-Type': 'application/json',
+			},
+		},
+		properties: [
+			{
+				displayName: 'Resource',
+				name: 'resource',
+				type: 'options',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Group',
+						value: 'group',
+					},
+					{
+						name: 'User',
+						value: 'user',
+					},
+				],
+				default: 'user',
+			},
+
+			...groupOperations,
+			...groupFields,
+			...userOperations,
+			...userFields,
+		],
+	};
+
+	methods = {
+		loadOptions: {
+			getGroupProperties,
+
+			async getGroupPropertiesGetAll(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				// Filter items not supported for list endpoint
+				return (await getGroupProperties.call(this)).filter(
+					(x) =>
+						![
+							'allowExternalSenders',
+							'autoSubscribeNewMembers',
+							'hideFromAddressLists',
+							'hideFromOutlookClients',
+							'isSubscribedByMail',
+							'unseenCount',
+						].includes(x.value as string),
+				);
+			},
+
+			getUserProperties,
+
+			async getUserPropertiesGetAll(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				// Filter items not supported for list endpoint
+				return (await getUserProperties.call(this)).filter(
+					(x) =>
+						![
+							'aboutMe',
+							'birthday',
+							'hireDate',
+							'interests',
+							'mySite',
+							'pastProjects',
+							'preferredName',
+							'responsibilities',
+							'schools',
+							'skills',
+							'mailboxSettings',
+						].includes(x.value as string),
+				);
+			},
+		},
+
+		listSearch: {
+			getGroups,
+
+			getUsers,
+		},
+	};
+}
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/descriptions/GroupDescription.ts b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/GroupDescription.ts
new file mode 100644
index 0000000000..07f5ef908b
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/GroupDescription.ts
@@ -0,0 +1,1179 @@
+import { merge } from 'lodash';
+import type {
+	IDataObject,
+	IExecuteSingleFunctions,
+	IHttpRequestOptions,
+	IN8nHttpFullResponse,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { handleErrorPostReceive, microsoftApiRequest } from '../GenericFunctions';
+
+export const groupOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['group'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a group',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'POST',
+						url: '/groups',
+					},
+					output: {
+						postReceive: [handleErrorPostReceive],
+					},
+				},
+				action: 'Create group',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a group',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'DELETE',
+						url: '=/groups/{{ $parameter["group"] }}',
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "deleted": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Delete group',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve data for a specific group',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'GET',
+						url: '=/groups/{{ $parameter["group"] }}',
+					},
+					output: {
+						postReceive: [handleErrorPostReceive],
+					},
+				},
+				action: 'Get group',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve a list of groups',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'GET',
+						url: '/groups',
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'value',
+								},
+							},
+						],
+					},
+				},
+				action: 'Get many groups',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a group',
+				routing: {
+					request: {
+						ignoreHttpStatusErrors: true,
+						method: 'PATCH',
+						url: '=/groups/{{ $parameter["group"] }}',
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "updated": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Update group',
+			},
+		],
+		default: 'getAll',
+	},
+];
+
+const createFields: INodeProperties[] = [
+	{
+		displayName: 'Group Type',
+		name: 'groupType',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				name: 'Microsoft 365',
+				value: 'Unified',
+			},
+			{
+				name: 'Security',
+				value: '',
+			},
+		],
+		routing: {
+			send: {
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const groupType = this.getNodeParameter('groupType') as string;
+						const body = requestOptions.body as IDataObject;
+						if (groupType) {
+							body.groupTypes ??= [] as string[];
+							(body.groupTypes as string[]).push(groupType);
+						} else {
+							// Properties mailEnabled and securityEnabled are not visible for Security group, but are required. So we add them here.
+							body.mailEnabled = false;
+							body.securityEnabled = true;
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'options',
+	},
+	{
+		displayName: 'Group Name',
+		name: 'displayName',
+		default: '',
+		description: 'The name to display in the address book for the group',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				property: 'displayName',
+				type: 'body',
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const displayName = this.getNodeParameter('displayName') as string;
+						if (displayName?.length > 256) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Display Name' should have a maximum length of 256",
+							);
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Group Email Address',
+		name: 'mailNickname',
+		default: '',
+		description: 'The mail alias for the group. Only enter the local-part without the domain.',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. alias',
+		required: true,
+		routing: {
+			send: {
+				property: 'mailNickname',
+				type: 'body',
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const mailNickname = this.getNodeParameter('mailNickname') as string;
+						if (mailNickname?.includes('@')) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`'Group Email Address' should only include the local-part of the email address, without ${mailNickname.slice(mailNickname.indexOf('@'))}`,
+							);
+						}
+						if (mailNickname?.length > 64) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Group Email Address' should have a maximum length of 64",
+							);
+						}
+						if (mailNickname && !/^((?![@()\[\]"\\;:<> ,])[\x00-\x7F])*$/.test(mailNickname)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"'Group Email Address' should only contain characters in the ASCII character set 0 - 127 except the following: @ () \\ [] \" ; : <> , SPACE",
+							);
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Mail Enabled',
+		name: 'mailEnabled',
+		default: false,
+		description: 'Whether the group is mail-enabled',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+				groupType: ['Unified'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				property: 'mailEnabled',
+				type: 'body',
+			},
+		},
+		type: 'boolean',
+		validateType: 'boolean',
+	},
+	{
+		displayName: 'Membership Type',
+		name: 'membershipType',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				name: 'Assigned',
+				value: '',
+				description:
+					'Lets you add specific users as members of a group and have unique permissions',
+			},
+			{
+				name: 'Dynamic',
+				value: 'DynamicMembership',
+				description: 'Lets you use rules to automatically add and remove users as members',
+			},
+		],
+		routing: {
+			send: {
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const membershipType = this.getNodeParameter('membershipType') as string;
+						if (membershipType) {
+							const body = requestOptions.body as IDataObject;
+							body.groupTypes ??= [] as string[];
+							(body.groupTypes as string[]).push(membershipType);
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'options',
+	},
+	{
+		displayName: 'Security Enabled',
+		name: 'securityEnabled',
+		default: true,
+		description: 'Whether the group is a security group',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+				groupType: ['Unified'],
+			},
+		},
+		routing: {
+			send: {
+				property: 'securityEnabled',
+				type: 'body',
+			},
+		},
+		type: 'boolean',
+		validateType: 'boolean',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Assignable to Role',
+				name: 'isAssignableToRole',
+				default: false,
+				description: 'Whether Microsoft Entra roles can be assigned to the group',
+				displayOptions: {
+					hide: {
+						'/membershipType': ['DynamicMembership'],
+					},
+				},
+				routing: {
+					send: {
+						property: 'isAssignableToRole',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const isAssignableToRole = this.getNodeParameter(
+									'additionalFields.isAssignableToRole',
+								) as boolean;
+								if (isAssignableToRole) {
+									const securityEnabled = this.getNodeParameter('securityEnabled', true) as boolean;
+									const visibility = this.getNodeParameter(
+										'additionalFields.visibility',
+										'',
+									) as string;
+									const groupType = this.getNodeParameter('groupType') as string;
+									const mailEnabled = this.getNodeParameter('mailEnabled', false) as boolean;
+									if (!securityEnabled) {
+										throw new NodeOperationError(
+											this.getNode(),
+											"'Security Enabled' must be set to true if 'Assignable to Role' is set",
+										);
+									}
+									if (visibility !== 'Private') {
+										throw new NodeOperationError(
+											this.getNode(),
+											"'Visibility' must be set to 'Private' if 'Assignable to Role' is set",
+										);
+									}
+									if (groupType === 'Unified' && !mailEnabled) {
+										throw new NodeOperationError(
+											this.getNode(),
+											"'Mail Enabled' must be set to true if 'Assignable to Role' is set",
+										);
+									}
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				default: '',
+				description: 'Description for the group',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Membership Rule',
+				name: 'membershipRule',
+				default: '',
+				description:
+					'The <a href="https://learn.microsoft.com/en-us/entra/identity/users/groups-dynamic-membership">dynamic membership rules</a>',
+				displayOptions: {
+					show: {
+						'/membershipType': ['DynamicMembership'],
+					},
+				},
+				placeholder: 'e.g. user.department -eq "Marketing"',
+				routing: {
+					send: {
+						property: 'membershipRule',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Membership Rule Processing State',
+				name: 'membershipRuleProcessingState',
+				default: 'On',
+				description: 'Indicates whether the dynamic membership processing is on or paused',
+				displayOptions: {
+					show: {
+						'/membershipType': ['DynamicMembership'],
+					},
+				},
+				options: [
+					{
+						name: 'On',
+						value: 'On',
+					},
+					{
+						name: 'Paused',
+						value: 'Paused',
+					},
+				],
+				routing: {
+					send: {
+						property: 'membershipRuleProcessingState',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Preferred Data Location',
+				name: 'preferredDataLocation',
+				default: '',
+				description:
+					'A property set for the group that Office 365 services use to provision the corresponding data-at-rest resources (mailbox, OneDrive, groups sites, and so on)',
+				displayOptions: {
+					show: {
+						'/groupType': ['Unified'],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Unique Name',
+				name: 'uniqueName',
+				default: '',
+				description:
+					'The unique identifier for the group, can only be updated if null, and is immutable once set',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Visibility',
+				name: 'visibility',
+				default: 'Public',
+				description: 'Specifies the visibility of the group',
+				options: [
+					{
+						name: 'Private',
+						value: 'Private',
+					},
+					{
+						name: 'Public',
+						value: 'Public',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+		],
+		placeholder: 'Add Field',
+		routing: {
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						items: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						for (const item of items) {
+							const groupId = item.json.id as string;
+							const fields = this.getNodeParameter('additionalFields', item.index) as IDataObject;
+							delete fields.isAssignableToRole;
+							delete fields.membershipRule;
+							delete fields.membershipRuleProcessingState;
+							if (Object.keys(fields).length) {
+								const body: IDataObject = {
+									...fields,
+								};
+								if (body.assignedLabels) {
+									body.assignedLabels = [(body.assignedLabels as IDataObject).labelValues];
+								}
+
+								try {
+									await microsoftApiRequest.call(this, 'PATCH', `/groups/${groupId}`, body);
+									merge(item.json, body);
+								} catch (error) {
+									try {
+										await microsoftApiRequest.call(this, 'DELETE', `/groups/${groupId}`);
+									} catch {}
+									throw error;
+								}
+							}
+						}
+						return items;
+					},
+				],
+			},
+		},
+		type: 'collection',
+	},
+];
+
+const deleteFields: INodeProperties[] = [
+	{
+		displayName: 'Group to Delete',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+];
+
+const getFields: INodeProperties[] = [
+	{
+		displayName: 'Group to Get',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Output',
+		name: 'output',
+		default: 'simple',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility',
+					},
+				},
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Selected Fields',
+				value: 'fields',
+			},
+		],
+		type: 'options',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Fields',
+		name: 'fields',
+		default: [],
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['get'],
+				output: ['fields'],
+			},
+		},
+		routing: {
+			send: {
+				property: '$select',
+				type: 'query',
+				value: '={{ $value.concat("id").join(",") }}',
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getGroupProperties',
+		},
+		type: 'multiOptions',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Members',
+				name: 'includeMembers',
+				default: false,
+				routing: {
+					send: {
+						property: '$expand',
+						type: 'query',
+						value:
+							'={{ $value ? "members($select=id,accountEnabled,createdDateTime,displayName,employeeId,mail,securityIdentifier,userPrincipalName,userType)" : undefined }}',
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+		],
+		placeholder: 'Add Option',
+		type: 'collection',
+	},
+];
+
+const getAllFields: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+			},
+		},
+		routing: {
+			send: {
+				paginate: '={{ $value }}',
+			},
+			operations: {
+				pagination: {
+					type: 'generic',
+					properties: {
+						continue: '={{ !!$response.body?.["@odata.nextLink"] }}',
+						request: {
+							url: '={{ $response.body?.["@odata.nextLink"] ?? $request.url }}',
+							qs: {
+								$filter:
+									'={{ !!$response.body?.["@odata.nextLink"] ? undefined : $request.qs?.$filter }}',
+								$select:
+									'={{ !!$response.body?.["@odata.nextLink"] ? undefined : $request.qs?.$select }}',
+							},
+						},
+					},
+				},
+			},
+		},
+		type: 'boolean',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		default: 50,
+		description: 'Max number of results to return',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		routing: {
+			send: {
+				property: '$top',
+				type: 'query',
+				value: '={{ $value }}',
+			},
+		},
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		validateType: 'number',
+	},
+	{
+		displayName: 'Filter',
+		name: 'filter',
+		default: '',
+		description:
+			'<a href="https://docs.microsoft.com/en-us/graph/query-parameters#filter-parameter">Query parameter</a> to filter results by',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+			},
+		},
+		hint: 'If empty, all the groups will be returned',
+		placeholder: "e.g. startswith(displayName, 'a')",
+		routing: {
+			send: {
+				property: '$filter',
+				type: 'query',
+				value: '={{ $value ? $value : undefined }}',
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Output',
+		name: 'output',
+		default: 'simple',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility',
+					},
+				},
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+			},
+			{
+				name: 'Selected Fields',
+				value: 'fields',
+			},
+		],
+		type: 'options',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Fields',
+		name: 'fields',
+		default: [],
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['getAll'],
+				output: ['fields'],
+			},
+		},
+		routing: {
+			send: {
+				property: '$select',
+				type: 'query',
+				value: '={{ $value.concat("id").join(",") }}',
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getGroupPropertiesGetAll',
+		},
+		type: 'multiOptions',
+	},
+];
+
+const updateFields: INodeProperties[] = [
+	{
+		displayName: 'Group to Update',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['update'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['group'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Allow External Senders',
+				name: 'allowExternalSenders',
+				default: false,
+				description:
+					'Whether people external to the organization can send messages to the group. Wait a few seconds before editing this field in a newly created group.',
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Auto Subscribe New Members',
+				name: 'autoSubscribeNewMembers',
+				default: false,
+				description:
+					'Whether new members added to the group will be auto-subscribed to receive email notifications. Wait a few seconds before editing this field in a newly created group.',
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				default: '',
+				description: 'Description for the group',
+				routing: {
+					send: {
+						property: 'description',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Group Name',
+				name: 'displayName',
+				default: '',
+				description: 'The name to display in the address book for the group',
+				routing: {
+					send: {
+						property: 'displayName',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const displayName = this.getNodeParameter('updateFields.displayName') as string;
+								if (displayName?.length > 256) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Display Name' should have a maximum length of 256",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Group Email Address',
+				name: 'mailNickname',
+				default: '',
+				description: 'The mail alias for the group. Only enter the local-part without the domain.',
+				placeholder: 'e.g. alias',
+				routing: {
+					send: {
+						property: 'mailNickname',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const mailNickname = this.getNodeParameter('updateFields.mailNickname') as string;
+								if (mailNickname?.includes('@')) {
+									throw new NodeOperationError(
+										this.getNode(),
+										`'Group Email Address' should only include the local-part of the email address, without ${mailNickname.slice(mailNickname.indexOf('@'))}`,
+									);
+								}
+								if (mailNickname?.length > 64) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Group Email Address' should have a maximum length of 64",
+									);
+								}
+								if (mailNickname && !/^((?![@()\[\]"\\;:<> ,])[\x00-\x7F])*$/.test(mailNickname)) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Group Email Address' should only contain characters in the ASCII character set 0 - 127 except the following: @ () \\ [] \" ; : <> , SPACE",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Membership Rule',
+				name: 'membershipRule',
+				default: '',
+				description:
+					'The <a href="https://learn.microsoft.com/en-us/entra/identity/users/groups-dynamic-membership">dynamic membership rules</a>',
+				placeholder: 'e.g. user.department -eq "Marketing"',
+				routing: {
+					send: {
+						property: 'membershipRule',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Membership Rule Processing State',
+				name: 'membershipRuleProcessingState',
+				default: 'On',
+				description: 'Indicates whether the dynamic membership processing is on or paused',
+				options: [
+					{
+						name: 'On',
+						value: 'On',
+					},
+					{
+						name: 'Paused',
+						value: 'Paused',
+					},
+				],
+				routing: {
+					send: {
+						property: 'membershipRuleProcessingState',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Preferred Data Location',
+				name: 'preferredDataLocation',
+				default: '',
+				description:
+					'A property set for the group that Office 365 services use to provision the corresponding data-at-rest resources (mailbox, OneDrive, groups sites, and so on)',
+				routing: {
+					send: {
+						property: 'preferredDataLocation',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Security Enabled',
+				name: 'securityEnabled',
+				default: true,
+				description: 'Whether the group is a security group',
+				routing: {
+					send: {
+						property: 'securityEnabled',
+						type: 'body',
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Unique Name',
+				name: 'uniqueName',
+				default: '',
+				description:
+					'The unique identifier for the group, can only be updated if null, and is immutable once set',
+				routing: {
+					send: {
+						property: 'uniqueName',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Visibility',
+				name: 'visibility',
+				default: 'Public',
+				description: 'Specifies the visibility of the group',
+				options: [
+					{
+						name: 'Private',
+						value: 'Private',
+					},
+					{
+						name: 'Public',
+						value: 'Public',
+					},
+				],
+				routing: {
+					send: {
+						property: 'visibility',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+		],
+		placeholder: 'Add Field',
+		routing: {
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						items: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						for (const item of items) {
+							const groupId = this.getNodeParameter('group.value', item.index) as string;
+							const fields = this.getNodeParameter('updateFields', item.index) as IDataObject;
+							// To update the following properties, you must specify them in their own PATCH request, without including the other properties
+							const separateProperties = [
+								'allowExternalSenders',
+								'autoSubscribeNewMembers',
+								// 'hideFromAddressLists',
+								// 'hideFromOutlookClients',
+								// 'isSubscribedByMail',
+								// 'unseenCount',
+							];
+							const separateFields = Object.keys(fields)
+								.filter((key) => separateProperties.includes(key))
+								.reduce((obj, key) => {
+									return {
+										...obj,
+										[key]: fields[key],
+									};
+								}, {});
+							if (Object.keys(separateFields).length) {
+								const body: IDataObject = {
+									...separateFields,
+								};
+								await microsoftApiRequest.call(this, 'PATCH', `/groups/${groupId}`, body);
+							}
+						}
+						return items;
+					},
+				],
+			},
+		},
+		type: 'collection',
+	},
+];
+
+export const groupFields: INodeProperties[] = [
+	...createFields,
+	...deleteFields,
+	...getFields,
+	...getAllFields,
+	...updateFields,
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/descriptions/UserDescription.ts b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/UserDescription.ts
new file mode 100644
index 0000000000..4e4914e796
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/UserDescription.ts
@@ -0,0 +1,2109 @@
+import { merge } from 'lodash';
+import type { DateTime } from 'luxon';
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IExecuteSingleFunctions,
+	type IHttpRequestOptions,
+	type IN8nHttpFullResponse,
+	type INodeExecutionData,
+	type INodeProperties,
+} from 'n8n-workflow';
+
+import { handleErrorPostReceive, microsoftApiRequest } from '../GenericFunctions';
+
+export const userOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['user'],
+			},
+		},
+		options: [
+			{
+				name: 'Add to Group',
+				value: 'addGroup',
+				description: 'Add user to group',
+				routing: {
+					request: {
+						method: 'POST',
+						url: '=/groups/{{ $parameter["group"] }}/members/$ref',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "added": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Add user to group',
+			},
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Create a user',
+				routing: {
+					request: {
+						method: 'POST',
+						url: '/users',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [handleErrorPostReceive],
+					},
+				},
+				action: 'Create user',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a user',
+				routing: {
+					request: {
+						method: 'DELETE',
+						url: '=/users/{{ $parameter["user"] }}',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "deleted": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Delete user',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Retrieve data for a specific user',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '=/users/{{ $parameter["user"] }}',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [handleErrorPostReceive],
+					},
+				},
+				action: 'Get user',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Retrieve a list of users',
+				routing: {
+					request: {
+						method: 'GET',
+						url: '/users',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'rootProperty',
+								properties: {
+									property: 'value',
+								},
+							},
+						],
+					},
+				},
+				action: 'Get many users',
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				name: 'Remove from Group',
+				value: 'removeGroup',
+				description: 'Remove user from group',
+				routing: {
+					request: {
+						method: 'DELETE',
+						url: '=/groups/{{ $parameter["group"] }}/members/{{ $parameter["user"] }}/$ref',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "removed": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Remove user from group',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				description: 'Update a user',
+				routing: {
+					request: {
+						method: 'PATCH',
+						url: '=/users/{{ $parameter["user"] }}',
+						ignoreHttpStatusErrors: true,
+					},
+					output: {
+						postReceive: [
+							handleErrorPostReceive,
+							{
+								type: 'set',
+								properties: {
+									value: '={{ { "updated": true } }}',
+								},
+							},
+						],
+					},
+				},
+				action: 'Update user',
+			},
+		],
+		default: 'getAll',
+	},
+];
+
+const addGroupFields: INodeProperties[] = [
+	{
+		displayName: 'Group',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['addGroup'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'User to Add',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['addGroup'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		routing: {
+			send: {
+				property: '@odata.id',
+				propertyInDotNotation: false,
+				type: 'body',
+				value: '=https://graph.microsoft.com/v1.0/directoryObjects/{{ $value }}',
+			},
+		},
+		type: 'resourceLocator',
+	},
+];
+
+const createFields: INodeProperties[] = [
+	{
+		displayName: 'Account Enabled',
+		name: 'accountEnabled',
+		default: true,
+		description: 'Whether the account is enabled',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				property: 'accountEnabled',
+				type: 'body',
+			},
+		},
+		type: 'boolean',
+		validateType: 'boolean',
+	},
+	{
+		displayName: 'Display Name',
+		name: 'displayName',
+		default: '',
+		description: 'The name to display in the address book for the user',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. Nathan Smith',
+		required: true,
+		routing: {
+			send: {
+				property: 'displayName',
+				type: 'body',
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'User Principal Name',
+		name: 'userPrincipalName',
+		default: '',
+		description: 'The user principal name (UPN)',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. NathanSmith@contoso.com',
+		required: true,
+		routing: {
+			send: {
+				property: 'userPrincipalName',
+				type: 'body',
+				preSend: [
+					async function (
+						this: IExecuteSingleFunctions,
+						requestOptions: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> {
+						const userPrincipalName = this.getNodeParameter('userPrincipalName') as string;
+						if (!/^[A-Za-z0-9'._\-!#^~@]+$/.test(userPrincipalName)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								"Only the following characters are allowed for 'User Principal Name': A-Z, a-z, 0-9, ' . - _ ! # ^ ~",
+							);
+						}
+						return requestOptions;
+					},
+				],
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Mail Nickname',
+		name: 'mailNickname',
+		default: '',
+		description: 'The mail alias for the user',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		placeholder: 'e.g. NathanSmith',
+		required: true,
+		routing: {
+			send: {
+				property: 'mailNickname',
+				type: 'body',
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Password',
+		name: 'password',
+		default: '',
+		description: 'The password for the user',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		required: true,
+		routing: {
+			send: {
+				property: 'passwordProfile.password',
+				type: 'body',
+			},
+		},
+		type: 'string',
+		typeOptions: {
+			password: true,
+		},
+		validateType: 'string',
+	},
+	{
+		displayName: 'Additional Fields',
+		name: 'additionalFields',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'About Me',
+				name: 'aboutMe',
+				default: '',
+				description: 'A freeform text entry field for the user to describe themselves',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Age Group',
+				name: 'ageGroup',
+				default: 'Adult',
+				description: 'Sets the age group of the user',
+				options: [
+					{
+						name: 'Adult',
+						value: 'Adult',
+					},
+					{
+						name: 'Minor',
+						value: 'Minor',
+					},
+					{
+						name: 'Not Adult',
+						value: 'NotAdult',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Birthday',
+				name: 'birthday',
+				default: '',
+				description: 'The birthday of the user',
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Business Phone',
+				name: 'businessPhones',
+				default: '',
+				description: 'The telephone number for the user',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				default: '',
+				description: 'The city in which the user is located',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Company Name',
+				name: 'companyName',
+				default: '',
+				description: 'The name of the company associated with the user',
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const companyName = this.getNodeParameter('additionalFields.companyName') as string;
+								if (companyName?.length > 64) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Company Name' should have a maximum length of 64",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Consent Provided',
+				name: 'consentProvidedForMinor',
+				default: 'Denied',
+				description: 'Specifies if consent is provided for minors',
+				options: [
+					{
+						name: 'Denied',
+						value: 'Denied',
+					},
+					{
+						name: 'Granted',
+						value: 'Granted',
+					},
+					{
+						name: 'Not Required',
+						value: 'NotRequired',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Country',
+				name: 'country',
+				default: '',
+				description: 'The country/region of the user',
+				placeholder: 'e.g. US',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Department',
+				name: 'department',
+				default: '',
+				description: 'The department name where the user works',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee ID',
+				name: 'employeeId',
+				default: '',
+				description: 'Employee identifier assigned by the organization',
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const employeeId = this.getNodeParameter('additionalFields.employeeId') as string;
+								if (employeeId?.length > 16) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Employee ID' should have a maximum length of 16",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee Type',
+				name: 'employeeType',
+				default: '',
+				description: 'Defines enterprise worker type',
+				placeholder: 'e.g. Contractor',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee Hire Date',
+				name: 'employeeHireDate',
+				default: '',
+				description: 'The hire date of the user',
+				placeholder: 'e.g. 2014-01-01T00:00:00Z',
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Employee Leave Date',
+				name: 'employeeLeaveDateTime',
+				default: '',
+				description: 'The date and time when the user left or will leave the organization',
+				placeholder: 'e.g. 2014-01-01T00:00:00Z',
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Employee Organization Data',
+				name: 'employeeOrgData',
+				default: {},
+				description:
+					'Represents organization data (for example, division and costCenter) associated with a user',
+				options: [
+					{
+						displayName: 'Employee Organization Data',
+						name: 'employeeOrgValues',
+						values: [
+							{
+								displayName: 'Cost Center',
+								name: 'costCenter',
+								description: 'The cost center associated with the user',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Division',
+								name: 'division',
+								description: 'The name of the division in which the user works',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+				type: 'fixedCollection',
+				validateType: 'string',
+			},
+			{
+				displayName: 'First Name',
+				name: 'givenName',
+				default: '',
+				description: 'The given name (first name) of the user',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Force Change Password',
+				name: 'forceChangePassword',
+				default: 'forceChangePasswordNextSignIn',
+				description: 'Whether the user must change their password on the next sign-in',
+				options: [
+					{
+						name: 'Next Sign In',
+						value: 'forceChangePasswordNextSignIn',
+					},
+					{
+						name: 'Next Sign In with MFA',
+						value: 'forceChangePasswordNextSignInWithMfa',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Interests',
+				name: 'interests',
+				default: [],
+				description: 'A list for the user to describe their interests',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Job Title',
+				name: 'jobTitle',
+				default: '',
+				description: "The user's job title",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'surname',
+				default: '',
+				description: "The user's last name (family name)",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mail',
+				name: 'mail',
+				default: '',
+				description: 'The SMTP address for the user',
+				placeholder: 'e.g. jeff@contoso.com',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mobile Phone',
+				name: 'mobilePhone',
+				default: '',
+				description: 'The primary cellular telephone number for the user',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'My Site',
+				name: 'mySite',
+				default: '',
+				description: "The URL for the user's personal site",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Office Location',
+				name: 'officeLocation',
+				default: '',
+				description: 'The office location for the user',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'On Premises Immutable ID',
+				name: 'onPremisesImmutableId',
+				default: '',
+				description:
+					'This property is used to associate an on-premises Active Directory user account to their Microsoft Entra user object',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Other Emails',
+				name: 'otherMails',
+				default: [],
+				description: 'Additional email addresses for the user',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Password Policies',
+				name: 'passwordPolicies',
+				default: [],
+				description: 'Specifies password policies',
+				options: [
+					{
+						name: 'Disable Password Expiration',
+						value: 'DisablePasswordExpiration',
+					},
+					{
+						name: 'Disable Strong Password',
+						value: 'DisableStrongPassword',
+					},
+				],
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Past Projects',
+				name: 'pastProjects',
+				default: [],
+				description: 'A list of past projects the user has worked on',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				default: '',
+				description: "The postal code for the user's address",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Preferred Language',
+				name: 'preferredLanguage',
+				default: '',
+				description: "User's preferred language in ISO 639-1 code",
+				placeholder: 'e.g. en-US',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Responsibilities',
+				name: 'responsibilities',
+				default: [],
+				description: 'A list of responsibilities the user has',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Schools Attended',
+				name: 'schools',
+				default: [],
+				description: 'A list of schools the user attended',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Skills',
+				name: 'skills',
+				default: [],
+				description: 'A list of skills the user possesses',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				default: '',
+				description: "The state or province of the user's address",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				default: '',
+				description: "The street address of the user's place of business",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Usage Location',
+				name: 'usageLocation',
+				default: '',
+				description: 'Two-letter country code where the user is located',
+				placeholder: 'e.g. US',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'User Type',
+				name: 'userType',
+				default: 'Guest',
+				description: 'Classifies the user type',
+				options: [
+					{
+						name: 'Guest',
+						value: 'Guest',
+					},
+					{
+						name: 'Member',
+						value: 'Member',
+					},
+				],
+				type: 'options',
+				validateType: 'options',
+			},
+		],
+		placeholder: 'Add Field',
+		routing: {
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						items: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						for (const item of items) {
+							const userId = item.json.id as string;
+							const fields = this.getNodeParameter('additionalFields', item.index) as IDataObject;
+							if (Object.keys(fields).length) {
+								const body: IDataObject = {
+									...fields,
+								};
+								if (body.birthday) {
+									body.birthday = (body.birthday as DateTime).toUTC().toISO();
+								}
+								if (body.businessPhones) {
+									body.businessPhones = [body.businessPhones as string];
+								}
+								if (body.employeeHireDate) {
+									body.employeeHireDate = (body.employeeHireDate as DateTime).toUTC().toISO();
+								}
+								if (body.employeeLeaveDateTime) {
+									body.employeeLeaveDateTime = (body.employeeLeaveDateTime as DateTime)
+										.toUTC()
+										.toISO();
+								}
+								if (body.employeeOrgData) {
+									body.employeeOrgData = (body.employeeOrgData as IDataObject).employeeOrgValues;
+								}
+								if (body.passwordPolicies) {
+									body.passwordPolicies = (body.passwordPolicies as string[]).join(',');
+								}
+								// forceChangePasswordNextSignInWithMfa doesn't seem to take effect when providing it in the initial create request,
+								// so we add it in the update request
+								if (body.forceChangePassword) {
+									if (body.forceChangePassword === 'forceChangePasswordNextSignIn') {
+										body.passwordProfile ??= {};
+										(body.passwordProfile as IDataObject).forceChangePasswordNextSignIn = true;
+									} else if (body.forceChangePassword === 'forceChangePasswordNextSignInWithMfa') {
+										body.passwordProfile ??= {};
+										(body.passwordProfile as IDataObject).forceChangePasswordNextSignInWithMfa =
+											true;
+									}
+									delete body.forceChangePassword;
+								}
+
+								// To update the following properties, you must specify them in their own PATCH request, without including the other properties
+								const separateProperties = [
+									'aboutMe',
+									'birthday',
+									'interests',
+									'mySite',
+									'pastProjects',
+									'responsibilities',
+									'schools',
+									'skills',
+								];
+								const separateBody: IDataObject = {};
+								for (const [key, value] of Object.entries(body)) {
+									if (separateProperties.includes(key)) {
+										separateBody[key] = value;
+										delete body[key];
+									}
+								}
+
+								try {
+									if (Object.keys(separateBody).length) {
+										await microsoftApiRequest.call(this, 'PATCH', `/users/${userId}`, separateBody);
+										merge(item.json, separateBody);
+									}
+									if (Object.keys(body).length) {
+										await microsoftApiRequest.call(this, 'PATCH', `/users/${userId}`, body);
+										merge(item.json, body);
+									}
+								} catch (error) {
+									try {
+										await microsoftApiRequest.call(this, 'DELETE', `/users/${userId}`);
+									} catch {}
+									throw error;
+								}
+							}
+						}
+						return items;
+					},
+				],
+			},
+		},
+		type: 'collection',
+	},
+];
+
+const deleteFields: INodeProperties[] = [
+	{
+		displayName: 'User to Delete',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['delete'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+];
+
+const getFields: INodeProperties[] = [
+	{
+		displayName: 'User to Get',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['get'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Output',
+		name: 'output',
+		default: 'simple',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier',
+					},
+				},
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType',
+					},
+				},
+			},
+			{
+				name: 'Selected Fields',
+				value: 'fields',
+			},
+		],
+		type: 'options',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Fields',
+		name: 'fields',
+		default: [],
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['get'],
+				output: ['fields'],
+			},
+		},
+		routing: {
+			send: {
+				property: '$select',
+				type: 'query',
+				value: '={{ $value.concat("id").join(",") }}',
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getUserProperties',
+		},
+		type: 'multiOptions',
+	},
+];
+
+const getAllFields: INodeProperties[] = [
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		routing: {
+			send: {
+				paginate: '={{ $value }}',
+			},
+			operations: {
+				pagination: {
+					type: 'generic',
+					properties: {
+						continue: '={{ !!$response.body?.["@odata.nextLink"] }}',
+						request: {
+							url: '={{ $response.body?.["@odata.nextLink"] ?? $request.url }}',
+							qs: {
+								$filter:
+									'={{ !!$response.body?.["@odata.nextLink"] ? undefined : $request.qs?.$filter }}',
+								$select:
+									'={{ !!$response.body?.["@odata.nextLink"] ? undefined : $request.qs?.$select }}',
+							},
+						},
+					},
+				},
+			},
+		},
+		type: 'boolean',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		default: 50,
+		description: 'Max number of results to return',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		routing: {
+			send: {
+				property: '$top',
+				type: 'query',
+				value: '={{ $value }}',
+			},
+		},
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		validateType: 'number',
+	},
+	{
+		displayName: 'Filter',
+		name: 'filter',
+		default: '',
+		description:
+			'<a href="https://docs.microsoft.com/en-us/graph/query-parameters#filter-parameter">Query parameter</a> to filter results by',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		placeholder: "e.g. startswith(displayName, 'a')",
+		routing: {
+			send: {
+				property: '$filter',
+				type: 'query',
+				value: '={{ $value ? $value : undefined }}',
+			},
+		},
+		type: 'string',
+		validateType: 'string',
+	},
+	{
+		displayName: 'Output',
+		name: 'output',
+		default: 'simple',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				name: 'Simplified',
+				value: 'simple',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier',
+					},
+				},
+			},
+			{
+				name: 'Raw',
+				value: 'raw',
+				routing: {
+					send: {
+						property: '$select',
+						type: 'query',
+						value:
+							'id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType',
+					},
+				},
+			},
+			{
+				name: 'Selected Fields',
+				value: 'fields',
+			},
+		],
+		type: 'options',
+	},
+	{
+		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
+		displayName: 'Fields',
+		name: 'fields',
+		default: [],
+		// eslint-disable-next-line n8n-nodes-base/node-param-description-wrong-for-dynamic-multi-options
+		description: 'The fields to add to the output',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+				output: ['fields'],
+			},
+		},
+		routing: {
+			send: {
+				property: '$select',
+				type: 'query',
+				value: '={{ $value.concat("id").join(",") }}',
+			},
+		},
+		typeOptions: {
+			loadOptionsMethod: 'getUserPropertiesGetAll',
+		},
+		type: 'multiOptions',
+	},
+];
+
+const removeGroupFields: INodeProperties[] = [
+	{
+		displayName: 'Group',
+		name: 'group',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['removeGroup'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getGroups',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'User to Remove',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['removeGroup'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+];
+
+const updateFields: INodeProperties[] = [
+	{
+		displayName: 'User to Update',
+		name: 'user',
+		default: {
+			mode: 'list',
+			value: '',
+		},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['update'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				placeholder: 'e.g. 02bd9fd6-8f93-4758-87c3-1fb73740a315',
+				type: 'string',
+			},
+		],
+		required: true,
+		type: 'resourceLocator',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'About Me',
+				name: 'aboutMe',
+				default: '',
+				description: 'A freeform text entry field for the user to describe themselves',
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Account Enabled',
+				name: 'accountEnabled',
+				default: true,
+				description: 'Whether the account is enabled',
+				routing: {
+					send: {
+						property: 'accountEnabled',
+						type: 'body',
+					},
+				},
+				type: 'boolean',
+				validateType: 'boolean',
+			},
+			{
+				displayName: 'Age Group',
+				name: 'ageGroup',
+				default: 'Adult',
+				description: 'Sets the age group of the user',
+				options: [
+					{
+						name: 'Adult',
+						value: 'Adult',
+					},
+					{
+						name: 'Minor',
+						value: 'Minor',
+					},
+					{
+						name: 'Not Adult',
+						value: 'NotAdult',
+					},
+				],
+				routing: {
+					send: {
+						property: 'ageGroup',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Birthday',
+				name: 'birthday',
+				default: '',
+				description: 'The birthday of the user',
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Business Phone',
+				name: 'businessPhones',
+				default: '',
+				description: 'The telephone number for the user',
+				routing: {
+					send: {
+						property: 'businessPhones',
+						type: 'body',
+						value: '={{ $value ? [$value] : [] }}',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'City',
+				name: 'city',
+				default: '',
+				description: 'The city in which the user is located',
+				routing: {
+					send: {
+						property: 'city',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Company Name',
+				name: 'companyName',
+				default: '',
+				description: 'The name of the company associated with the user',
+				routing: {
+					send: {
+						property: 'companyName',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const companyName = this.getNodeParameter('updateFields.companyName') as string;
+								if (companyName?.length > 64) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Company Name' should have a maximum length of 64",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Consent Provided',
+				name: 'consentProvidedForMinor',
+				default: 'Denied',
+				description: 'Specifies if consent is provided for minors',
+				options: [
+					{
+						name: 'Denied',
+						value: 'Denied',
+					},
+					{
+						name: 'Granted',
+						value: 'Granted',
+					},
+					{
+						name: 'Not Required',
+						value: 'NotRequired',
+					},
+				],
+				routing: {
+					send: {
+						property: 'consentProvidedForMinor',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Country',
+				name: 'country',
+				default: '',
+				description: 'The country/region of the user',
+				placeholder: 'e.g. US',
+				routing: {
+					send: {
+						property: 'country',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Department',
+				name: 'department',
+				default: '',
+				description: 'The department name where the user works',
+				routing: {
+					send: {
+						property: 'department',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Display Name',
+				name: 'displayName',
+				default: '',
+				description: 'The name to display in the address book for the user',
+				routing: {
+					send: {
+						property: 'displayName',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+
+			{
+				displayName: 'Employee ID',
+				name: 'employeeId',
+				default: '',
+				description: 'Employee identifier assigned by the organization',
+				routing: {
+					send: {
+						property: 'employeeId',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const employeeId = this.getNodeParameter('updateFields.employeeId') as string;
+								if (employeeId?.length > 16) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"'Employee ID' should have a maximum length of 16",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee Type',
+				name: 'employeeType',
+				default: '',
+				description: 'Defines enterprise worker type',
+				placeholder: 'e.g. Contractor',
+				routing: {
+					send: {
+						property: 'employeeType',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'First Name',
+				name: 'givenName',
+				default: '',
+				description: 'The given name (first name) of the user',
+				routing: {
+					send: {
+						property: 'givenName',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Employee Hire Date',
+				name: 'employeeHireDate',
+				default: '',
+				description: 'The hire date of the user',
+				placeholder: 'e.g. 2014-01-01T00:00:00Z',
+				routing: {
+					send: {
+						property: 'employeeHireDate',
+						type: 'body',
+						value: '={{ $value?.toUTC().toISO() }}',
+					},
+				},
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Employee Leave Date',
+				name: 'employeeLeaveDateTime',
+				default: '',
+				description: 'The date and time when the user left or will leave the organization',
+				placeholder: 'e.g. 2014-01-01T00:00:00Z',
+				routing: {
+					send: {
+						property: 'employeeLeaveDateTime',
+						type: 'body',
+						value: '={{ $value?.toUTC().toISO() }}',
+					},
+				},
+				type: 'dateTime',
+				validateType: 'dateTime',
+			},
+			{
+				displayName: 'Employee Organization Data',
+				name: 'employeeOrgData',
+				default: {},
+				description:
+					'Represents organization data (for example, division and costCenter) associated with a user',
+				options: [
+					{
+						displayName: 'Employee Organization Data',
+						name: 'employeeOrgValues',
+						values: [
+							{
+								displayName: 'Cost Center',
+								name: 'costCenter',
+								description: 'The cost center associated with the user',
+								routing: {
+									send: {
+										property: 'employeeOrgData.costCenter',
+										type: 'body',
+									},
+								},
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Division',
+								name: 'division',
+								description: 'The name of the division in which the user works',
+								routing: {
+									send: {
+										property: 'employeeOrgData.division',
+										type: 'body',
+									},
+								},
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+				type: 'fixedCollection',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Force Change Password',
+				name: 'forceChangePassword',
+				default: 'forceChangePasswordNextSignIn',
+				description: 'Whether the user must change their password on the next sign-in',
+				options: [
+					{
+						name: 'Next Sign In',
+						value: 'forceChangePasswordNextSignIn',
+					},
+					{
+						name: 'Next Sign In with MFA',
+						value: 'forceChangePasswordNextSignInWithMfa',
+					},
+				],
+				routing: {
+					send: {
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const forceChangePassword = this.getNodeParameter(
+									'updateFields.forceChangePassword',
+								) as string;
+								if (forceChangePassword === 'forceChangePasswordNextSignIn') {
+									(requestOptions.body as IDataObject).passwordProfile ??= {};
+									(
+										(requestOptions.body as IDataObject).passwordProfile as IDataObject
+									).forceChangePasswordNextSignIn = true;
+								} else if (forceChangePassword === 'forceChangePasswordNextSignInWithMfa') {
+									(
+										(requestOptions.body as IDataObject).passwordProfile as IDataObject
+									).forceChangePasswordNextSignInWithMfa = true;
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+			{
+				displayName: 'Interests',
+				name: 'interests',
+				default: [],
+				description: 'A list for the user to describe their interests',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Job Title',
+				name: 'jobTitle',
+				default: '',
+				description: "The user's job title",
+				routing: {
+					send: {
+						property: 'jobTitle',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'surname',
+				default: '',
+				description: "The user's last name (family name)",
+				routing: {
+					send: {
+						property: 'surname',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mail',
+				name: 'mail',
+				default: '',
+				description: 'The SMTP address for the user',
+				placeholder: 'e.g. jeff@contoso.com',
+				routing: {
+					send: {
+						property: 'mail',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mail Nickname',
+				name: 'mailNickname',
+				default: '',
+				description: 'The mail alias for the user',
+				routing: {
+					send: {
+						property: 'mailNickname',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Mobile Phone',
+				name: 'mobilePhone',
+				default: '',
+				description: 'The primary cellular telephone number for the user',
+				routing: {
+					send: {
+						property: 'mobilePhone',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'My Site',
+				name: 'mySite',
+				default: '',
+				description: "The URL for the user's personal site",
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Office Location',
+				name: 'officeLocation',
+				default: '',
+				description: 'The office location for the user',
+				routing: {
+					send: {
+						property: 'officeLocation',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'On Premises Immutable ID',
+				name: 'onPremisesImmutableId',
+				default: '',
+				description:
+					'This property is used to associate an on-premises Active Directory user account to their Microsoft Entra user object',
+				routing: {
+					send: {
+						property: 'onPremisesImmutableId',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Other Emails',
+				name: 'otherMails',
+				default: [],
+				description: 'Additional email addresses for the user',
+				routing: {
+					send: {
+						property: 'otherMails',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Password',
+				name: 'password',
+				default: '',
+				description:
+					'The password for the user. The password must satisfy minimum requirements as specified by the passwordPolicies property.',
+				routing: {
+					send: {
+						property: 'passwordProfile.password',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				typeOptions: {
+					password: true,
+				},
+				validateType: 'string',
+			},
+			{
+				displayName: 'Password Policies',
+				name: 'passwordPolicies',
+				default: [],
+				description: 'Specifies password policies',
+				options: [
+					{
+						name: 'Disable Password Expiration',
+						value: 'DisablePasswordExpiration',
+					},
+					{
+						name: 'Disable Strong Password',
+						value: 'DisableStrongPassword',
+					},
+				],
+				routing: {
+					send: {
+						property: 'passwordPolicies',
+						type: 'body',
+						value: '={{ $value?.join(",") }}',
+					},
+				},
+				type: 'multiOptions',
+			},
+			{
+				displayName: 'Past Projects',
+				name: 'pastProjects',
+				default: [],
+				description: 'A list of past projects the user has worked on',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Postal Code',
+				name: 'postalCode',
+				default: '',
+				description: "The postal code for the user's address",
+				routing: {
+					send: {
+						property: 'postalCode',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Preferred Language',
+				name: 'preferredLanguage',
+				default: '',
+				description: "User's preferred language in ISO 639-1 code",
+				placeholder: 'e.g. en-US',
+				routing: {
+					send: {
+						property: 'preferredLanguage',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Responsibilities',
+				name: 'responsibilities',
+				default: [],
+				description: 'A list of responsibilities the user has',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Schools Attended',
+				name: 'schools',
+				default: [],
+				description: 'A list of schools the user attended',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'Skills',
+				name: 'skills',
+				default: [],
+				description: 'A list of skills the user possesses',
+				type: 'string',
+				typeOptions: {
+					multipleValues: true,
+				},
+				validateType: 'array',
+			},
+			{
+				displayName: 'State',
+				name: 'state',
+				default: '',
+				description: "The state or province of the user's address",
+				routing: {
+					send: {
+						property: 'state',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Street Address',
+				name: 'streetAddress',
+				default: '',
+				description: "The street address of the user's place of business",
+				routing: {
+					send: {
+						property: 'streetAddress',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'Usage Location',
+				name: 'usageLocation',
+				default: '',
+				description: 'Two-letter country code where the user is located',
+				placeholder: 'e.g. US',
+				routing: {
+					send: {
+						property: 'usageLocation',
+						type: 'body',
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'User Principal Name',
+				name: 'userPrincipalName',
+				default: '',
+				description: 'The user principal name (UPN)',
+				placeholder: 'e.g. AdeleV@contoso.com',
+				routing: {
+					send: {
+						property: 'userPrincipalName',
+						type: 'body',
+						preSend: [
+							async function (
+								this: IExecuteSingleFunctions,
+								requestOptions: IHttpRequestOptions,
+							): Promise<IHttpRequestOptions> {
+								const userPrincipalName = this.getNodeParameter(
+									'updateFields.userPrincipalName',
+								) as string;
+								if (!/^[A-Za-z0-9'._\-!#^~@]+$/.test(userPrincipalName)) {
+									throw new NodeOperationError(
+										this.getNode(),
+										"Only the following characters are allowed for 'User Principal Name': A-Z, a-z, 0-9, ' . - _ ! # ^ ~",
+									);
+								}
+								return requestOptions;
+							},
+						],
+					},
+				},
+				type: 'string',
+				validateType: 'string',
+			},
+			{
+				displayName: 'User Type',
+				name: 'userType',
+				default: 'Guest',
+				description: 'Classifies the user type',
+				options: [
+					{
+						name: 'Guest',
+						value: 'Guest',
+					},
+					{
+						name: 'Member',
+						value: 'Member',
+					},
+				],
+				routing: {
+					send: {
+						property: 'userType',
+						type: 'body',
+					},
+				},
+				type: 'options',
+				validateType: 'options',
+			},
+		],
+		placeholder: 'Add Field',
+		routing: {
+			output: {
+				postReceive: [
+					async function (
+						this: IExecuteSingleFunctions,
+						items: INodeExecutionData[],
+						_response: IN8nHttpFullResponse,
+					): Promise<INodeExecutionData[]> {
+						for (const item of items) {
+							const userId = this.getNodeParameter('user.value', item.index) as string;
+							const fields = this.getNodeParameter('updateFields', item.index) as IDataObject;
+							// To update the following properties, you must specify them in their own PATCH request, without including the other properties
+							const separateProperties = [
+								'aboutMe',
+								'birthday',
+								'interests',
+								'mySite',
+								'pastProjects',
+								'responsibilities',
+								'schools',
+								'skills',
+							];
+							const separateFields = Object.keys(fields)
+								.filter((key) => separateProperties.includes(key))
+								.reduce((obj, key) => {
+									return {
+										...obj,
+										[key]: fields[key],
+									};
+								}, {});
+							if (Object.keys(separateFields).length) {
+								const body: IDataObject = {
+									...separateFields,
+								};
+								if (body.birthday) {
+									body.birthday = (body.birthday as DateTime).toUTC().toISO();
+								}
+								await microsoftApiRequest.call(this, 'PATCH', `/users/${userId}`, body);
+							}
+						}
+						return items;
+					},
+				],
+			},
+		},
+		type: 'collection',
+	},
+];
+
+export const userFields: INodeProperties[] = [
+	...addGroupFields,
+	...createFields,
+	...deleteFields,
+	...getFields,
+	...getAllFields,
+	...removeGroupFields,
+	...updateFields,
+];
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/descriptions/index.ts b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/index.ts
new file mode 100644
index 0000000000..ee8ab1abc0
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/descriptions/index.ts
@@ -0,0 +1,2 @@
+export * from './GroupDescription';
+export * from './UserDescription';
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.dark.svg b/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.dark.svg
new file mode 100644
index 0000000000..25b70ef180
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.dark.svg
@@ -0,0 +1,4 @@
+<svg width="42" height="40" viewBox="0 0 42 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M40.2158 22.1487C41.5024 23.6021 41.1669 25.7976 39.498 26.8398V26.8376L22.8313 37.2554C22.33 37.5682 21.7635 37.7399 21.189 37.7704L21.1882 37.7906C20.5527 37.7906 19.7243 37.6044 19.1687 37.2577L9.44873 31.1821C10.311 31.7199 11.7443 32.3177 13.2598 32.3177C14.6398 32.3177 15.9221 31.9177 16.9843 31.2355C16.9843 31.2355 16.9865 31.2355 16.9887 31.2332L21.5727 28.3589L21.5723 28.3681L30.7024 22.6621L21.0047 11.7198L21.2469 11.4465C22.4691 10.0532 24.3069 9.1665 26.3624 9.1665C27.4091 9.1665 28.398 9.40206 29.2802 9.81317L40.2158 22.1487Z" stroke="white" stroke-width="1.2" stroke-linejoin="round"/>
+<path d="M21.0022 2.22439V2.22217L21 2.22439L21.0022 2.22439ZM21.0022 2.22439C21.9415 2.22498 22.8827 2.60054 23.5467 3.35106L29.2778 9.8155C28.3956 9.40661 27.4089 9.16883 26.36 9.16883C24.3044 9.16883 22.4667 10.0555 21.2444 11.4488L21.0703 11.6453L21.0703 11.6484L11.3022 22.6644L21 28.7266L16.9889 31.2333C16.9867 31.2355 16.9844 31.2355 16.9844 31.2355C15.9222 31.9177 14.64 32.3177 13.26 32.3177C11.7444 32.3177 10.3111 31.7199 9.44888 31.1822C8.6711 30.6955 2.50221 26.8399 2.50221 26.8399C0.833325 25.7977 0.49777 23.6022 1.78444 22.1488L18.4511 3.34883C19.1091 2.60751 20.0714 2.2363 21.0022 2.22675V2.22439Z" stroke="white" stroke-width="1.2" stroke-linejoin="round"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.svg b/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.svg
new file mode 100644
index 0000000000..de31695579
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/microsoftEntra.svg
@@ -0,0 +1,8 @@
+<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.44824 30.9595C9.31047 31.4972 10.7438 32.095 12.2594 32.095C13.6394 32.095 14.9216 31.695 15.9838 31.0128C15.9838 31.0128 15.986 31.0128 15.9883 31.0106L19.9994 28.5039V37.555C19.3638 37.555 18.7238 37.3817 18.1683 37.035L8.44824 30.9595Z" fill="#225086"/>
+<path d="M17.4511 3.12667L0.784438 21.9267C-0.502231 23.38 -0.166675 25.5756 1.50222 26.6178C1.50222 26.6178 7.67112 30.4734 8.44889 30.96C9.31112 31.4978 10.7445 32.0956 12.26 32.0956C13.64 32.0956 14.9222 31.6956 15.9845 31.0134C15.9845 31.0134 15.9867 31.0134 15.9889 31.0112L20 28.5045L10.3022 22.4423L20.0022 11.5V2C19.06 2 18.1178 2.37556 17.4511 3.12667Z" fill="#66DDFF"/>
+<path d="M10.3027 22.4422L10.4183 22.5133L20.0005 28.5045H20.0027V11.5022L20.0005 11.5L10.3027 22.4422Z" fill="#CBF8FF"/>
+<path d="M38.498 26.6177C40.1669 25.5755 40.5025 23.3799 39.2158 21.9266L28.2802 9.591C27.398 9.17989 26.4091 8.94434 25.3624 8.94434C23.3069 8.94434 21.4691 9.831 20.2469 11.2243L20.0047 11.4977L29.7025 22.4399L20.0024 28.5021V37.5533C20.6402 37.5533 21.2758 37.3799 21.8313 37.0333L38.498 26.6155V26.6177Z" fill="#074793"/>
+<path d="M20.0022 2V11.5L20.2444 11.2267C21.4667 9.83334 23.3044 8.94668 25.36 8.94668C26.4089 8.94668 27.3956 9.18445 28.2778 9.59334L22.5467 3.12889C21.8822 2.37778 20.94 2.00222 20 2.00222L20.0022 2Z" fill="#0294E4"/>
+<path d="M29.7002 22.442L20.0024 11.502V28.502L29.7002 22.442Z" fill="#96BCC2"/>
+</svg>
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts
new file mode 100644
index 0000000000..632792ea96
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/GroupDescription.test.ts
@@ -0,0 +1,775 @@
+import { NodeConnectionType } from 'n8n-workflow';
+import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
+import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
+
+describe('Gong Node', () => {
+	const baseUrl = 'https://graph.microsoft.com/v1.0';
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('Group description', () => {
+		const tests: WorkflowTestData[] = [
+			{
+				description: 'should create group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'create',
+									displayName: 'Group Display Name',
+									groupType: 'Unified',
+									mailEnabled: true,
+									mailNickname: 'MailNickname',
+									membershipType: 'DynamicMembership',
+									securityEnabled: true,
+									additionalFields: {
+										isAssignableToRole: true,
+										description: 'Group Description',
+										membershipRule: 'department -eq "Marketing"',
+										membershipRuleProcessingState: 'On',
+										preferredDataLocation: 'Preferred Data Location',
+										uniqueName: 'UniqueName',
+										visibility: 'Public',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.createGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'post',
+							path: '/groups',
+							statusCode: 201,
+							requestBody: {
+								displayName: 'Group Display Name',
+								mailNickname: 'MailNickname',
+								mailEnabled: true,
+								membershipRule: 'department -eq "Marketing"',
+								membershipRuleProcessingState: 'On',
+								securityEnabled: true,
+								groupTypes: ['Unified', 'DynamicMembership'],
+							},
+							responseBody: microsoftEntraApiResponse.postGroup,
+						},
+						{
+							method: 'patch',
+							path: `/groups/${microsoftEntraApiResponse.postGroup.id}`,
+							statusCode: 204,
+							requestBody: {
+								description: 'Group Description',
+								preferredDataLocation: 'Preferred Data Location',
+								uniqueName: 'UniqueName',
+								visibility: 'Public',
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should delete group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'delete',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									options: {},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.deleteGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'delete',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b',
+							statusCode: 204,
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'get',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.getGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b',
+							statusCode: 200,
+							responseBody: microsoftEntraApiResponse.getGroup,
+						},
+					],
+				},
+			},
+			{
+				description: 'should get group with fields output and members',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'get',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									output: 'fields',
+									fields: [
+										'assignedLabels',
+										'assignedLicenses',
+										'createdDateTime',
+										'classification',
+										'deletedDateTime',
+										'description',
+										'displayName',
+										'expirationDateTime',
+										'groupTypes',
+										'visibility',
+										'unseenCount',
+										'theme',
+										'uniqueName',
+										'serviceProvisioningErrors',
+										'securityIdentifier',
+										'renewedDateTime',
+										'securityEnabled',
+										'autoSubscribeNewMembers',
+										'allowExternalSenders',
+										'licenseProcessingState',
+										'isManagementRestricted',
+										'isSubscribedByMail',
+										'isAssignableToRole',
+										'id',
+										'hideFromOutlookClients',
+										'hideFromAddressLists',
+										'onPremisesProvisioningErrors',
+										'onPremisesSecurityIdentifier',
+										'onPremisesSamAccountName',
+										'onPremisesNetBiosName',
+										'onPremisesSyncEnabled',
+										'preferredDataLocation',
+										'preferredLanguage',
+										'proxyAddresses',
+										'onPremisesLastSyncDateTime',
+										'onPremisesDomainName',
+										'membershipRuleProcessingState',
+										'membershipRule',
+										'mailNickname',
+										'mailEnabled',
+										'mail',
+									],
+									options: {
+										includeMembers: true,
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.getGroupWithProperties],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b?$select=assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,unseenCount,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,autoSubscribeNewMembers,allowExternalSenders,licenseProcessingState,isManagementRestricted,isSubscribedByMail,isAssignableToRole,id,hideFromOutlookClients,hideFromAddressLists,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,id&$expand=members($select=id,accountEnabled,createdDateTime,displayName,employeeId,mail,securityIdentifier,userPrincipalName,userType)',
+							statusCode: 200,
+							responseBody: microsoftEntraApiResponse.getGroupWithProperties,
+						},
+					],
+				},
+			},
+			{
+				description: 'should get all groups with simple output',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'getAll',
+									returnAll: true,
+									filter: '',
+									output: 'simple',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [new Array(102).fill(microsoftEntraNodeResponse.getGroup[0])],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/groups?$select=id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								'@odata.nextLink':
+									'https://graph.microsoft.com/v1.0/groups?$select=id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+								value: new Array(100).fill(microsoftEntraApiResponse.getGroup),
+							},
+						},
+						{
+							method: 'get',
+							path: '/groups?$select=id,createdDateTime,description,displayName,mail,mailEnabled,mailNickname,securityEnabled,securityIdentifier,visibility&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								value: new Array(2).fill(microsoftEntraApiResponse.getGroup),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get limit 10 groups with raw output',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'getAll',
+									limit: 10,
+									filter: '',
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [new Array(10).fill(microsoftEntraNodeResponse.getGroup[0])],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/groups?$top=10',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								'@odata.nextLink':
+									'https://graph.microsoft.com/v1.0/groups?$top=10&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+								value: new Array(10).fill(microsoftEntraApiResponse.getGroup),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get all groups with options and filter',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'getAll',
+									returnAll: true,
+									filter: "startswith(displayName,'group')",
+									output: 'fields',
+									fields: [
+										'assignedLabels',
+										'assignedLicenses',
+										'createdDateTime',
+										'classification',
+										'deletedDateTime',
+										'description',
+										'displayName',
+										'expirationDateTime',
+										'groupTypes',
+										'visibility',
+										'theme',
+										'uniqueName',
+										'serviceProvisioningErrors',
+										'securityIdentifier',
+										'renewedDateTime',
+										'securityEnabled',
+										'licenseProcessingState',
+										'isManagementRestricted',
+										'isAssignableToRole',
+										'onPremisesProvisioningErrors',
+										'onPremisesSecurityIdentifier',
+										'onPremisesSamAccountName',
+										'onPremisesNetBiosName',
+										'onPremisesSyncEnabled',
+										'preferredDataLocation',
+										'preferredLanguage',
+										'proxyAddresses',
+										'onPremisesLastSyncDateTime',
+										'onPremisesDomainName',
+										'membershipRuleProcessingState',
+										'membershipRule',
+										'mailNickname',
+										'mailEnabled',
+										'mail',
+									],
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [
+							new Array(102).fill(microsoftEntraNodeResponse.getGroupWithProperties[0]),
+						],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: "/groups?$filter=startswith(displayName,'group')&$select=assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,licenseProcessingState,isManagementRestricted,isAssignableToRole,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,id",
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								'@odata.nextLink':
+									"https://graph.microsoft.com/v1.0/groups?$filter=startswith(displayName,'group')&$select=assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,licenseProcessingState,isManagementRestricted,isAssignableToRole,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,id&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA",
+								value: new Array(100).fill(microsoftEntraApiResponse.getGroupWithProperties),
+							},
+						},
+						{
+							method: 'get',
+							path: "/groups?$filter=startswith(displayName,'group')&$select=assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,licenseProcessingState,isManagementRestricted,isAssignableToRole,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,id&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA",
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups',
+								value: new Array(2).fill(microsoftEntraApiResponse.getGroupWithProperties),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should update group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'update',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									updateFields: {
+										allowExternalSenders: true,
+										autoSubscribeNewMembers: true,
+										description: 'Group Description',
+										displayName: 'Group Display Name',
+										mailNickname: 'MailNickname',
+										membershipRule: 'department -eq "Marketing"',
+										membershipRuleProcessingState: 'On',
+										preferredDataLocation: 'Preferred Data Location',
+										securityEnabled: true,
+										uniqueName: 'UniqueName',
+										visibility: 'Public',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.updateGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'patch',
+							path: `/groups/${microsoftEntraApiResponse.postGroup.id}`,
+							statusCode: 204,
+							requestBody: {
+								description: 'Group Description',
+								displayName: 'Group Display Name',
+								mailNickname: 'MailNickname',
+								membershipRule: 'department -eq "Marketing"',
+								membershipRuleProcessingState: 'On',
+								preferredDataLocation: 'Preferred Data Location',
+								securityEnabled: true,
+								uniqueName: 'UniqueName',
+								visibility: 'Public',
+							},
+							responseBody: {},
+						},
+						{
+							method: 'patch',
+							path: `/groups/${microsoftEntraApiResponse.postGroup.id}`,
+							statusCode: 204,
+							requestBody: {
+								allowExternalSenders: true,
+								autoSubscribeNewMembers: true,
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+		];
+
+		const nodeTypes = Helpers.setup(tests);
+
+		test.each(tests)('$description', async (testData) => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+			expect(result.status).toEqual('success');
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
new file mode 100644
index 0000000000..5b15152624
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/MicrosoftEntra.node.test.ts
@@ -0,0 +1,249 @@
+import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
+import { NodeConnectionType } from 'n8n-workflow';
+import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
+import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
+import { FAKE_CREDENTIALS_DATA } from '../../../../test/nodes/FakeCredentialsMap';
+import { MicrosoftEntra } from '../MicrosoftEntra.node';
+
+describe('Gong Node', () => {
+	const baseUrl = 'https://graph.microsoft.com/v1.0';
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('Credentials', () => {
+		const tests: WorkflowTestData[] = [
+			{
+				description: 'should use correct credentials',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								type: 'n8n-nodes-base.manualTrigger',
+								typeVersion: 1,
+								position: [0, 0],
+								id: '1307e408-a8a5-464e-b858-494953e2f43b',
+								name: "When clicking 'Test workflow'",
+							},
+							{
+								parameters: {
+									resource: 'group',
+									operation: 'get',
+									group: {
+										__rl: true,
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+										mode: 'id',
+									},
+									filter: '',
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.getGroup],
+					},
+				},
+			},
+		];
+
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			jest
+				.spyOn(Helpers.CredentialsHelper.prototype, 'authenticate')
+				.mockImplementation(
+					async (
+						credentials: ICredentialDataDecryptedObject,
+						typeName: string,
+						requestParams: IHttpRequestOptions,
+					): Promise<IHttpRequestOptions> => {
+						if (typeName === 'microsoftEntraOAuth2Api') {
+							return {
+								...requestParams,
+								headers: {
+									authorization:
+										'bearer ' + (credentials.oauthTokenData as IDataObject).access_token,
+								},
+							};
+						} else {
+							return requestParams;
+						}
+					},
+				);
+		});
+
+		afterAll(() => {
+			nock.restore();
+			jest.restoreAllMocks();
+		});
+
+		nock(baseUrl)
+			.get(`/groups/${microsoftEntraApiResponse.getGroup.id}`)
+			.matchHeader(
+				'authorization',
+				'bearer ' + FAKE_CREDENTIALS_DATA.microsoftEntraOAuth2Api.oauthTokenData.access_token,
+			)
+			.reply(200, {
+				...microsoftEntraApiResponse.getGroup,
+			});
+
+		const nodeTypes = Helpers.setup(tests);
+
+		test.each(tests)('$description', async (testData) => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+			expect(result.status).toEqual('success');
+		});
+	});
+
+	describe('Load options', () => {
+		it('should load group properties', async () => {
+			const mockContext = {
+				helpers: {
+					requestWithAuthentication: jest
+						.fn()
+						.mockReturnValue(microsoftEntraApiResponse.metadata.groups),
+				},
+				getCurrentNodeParameter: jest.fn(),
+			} as unknown as ILoadOptionsFunctions;
+			const node = new MicrosoftEntra();
+
+			const properties = await node.methods.loadOptions.getGroupProperties.call(mockContext);
+
+			expect(properties).toEqual(microsoftEntraNodeResponse.loadOptions.getGroupProperties);
+		});
+
+		it('should load user properties', async () => {
+			const mockContext = {
+				helpers: {
+					requestWithAuthentication: jest
+						.fn()
+						.mockReturnValue(microsoftEntraApiResponse.metadata.users),
+				},
+				getCurrentNodeParameter: jest.fn(),
+			} as unknown as ILoadOptionsFunctions;
+			const node = new MicrosoftEntra();
+
+			const properties = await node.methods.loadOptions.getUserProperties.call(mockContext);
+
+			expect(properties).toEqual(microsoftEntraNodeResponse.loadOptions.getUserProperties);
+		});
+	});
+
+	describe('List search', () => {
+		it('should list search groups', async () => {
+			const mockResponse = {
+				value: Array.from({ length: 2 }, (_, i) => ({
+					id: (i + 1).toString(),
+					displayName: `Group ${i + 1}`,
+				})),
+				'@odata.nextLink': '',
+			};
+			const mockRequestWithAuthentication = jest.fn().mockReturnValue(mockResponse);
+			const mockContext = {
+				helpers: {
+					requestWithAuthentication: mockRequestWithAuthentication,
+				},
+			} as unknown as ILoadOptionsFunctions;
+			const node = new MicrosoftEntra();
+
+			const listSearchResult = await node.methods.listSearch.getGroups.call(mockContext);
+
+			expect(mockRequestWithAuthentication).toHaveBeenCalledWith('microsoftEntraOAuth2Api', {
+				method: 'GET',
+				url: 'https://graph.microsoft.com/v1.0/groups',
+				json: true,
+				headers: {},
+				body: {},
+				qs: {
+					$select: 'id,displayName',
+				},
+			});
+			expect(listSearchResult).toEqual({
+				results: mockResponse.value.map((x) => ({ name: x.displayName, value: x.id })),
+				paginationToken: mockResponse['@odata.nextLink'],
+			});
+		});
+
+		it('should list search users', async () => {
+			const mockResponse = {
+				value: Array.from({ length: 2 }, (_, i) => ({
+					id: (i + 1).toString(),
+					displayName: `User ${i + 1}`,
+				})),
+				'@odata.nextLink': '',
+			};
+			const mockRequestWithAuthentication = jest.fn().mockReturnValue(mockResponse);
+			const mockContext = {
+				helpers: {
+					requestWithAuthentication: mockRequestWithAuthentication,
+				},
+			} as unknown as ILoadOptionsFunctions;
+			const node = new MicrosoftEntra();
+
+			const listSearchResult = await node.methods.listSearch.getUsers.call(mockContext);
+
+			expect(mockRequestWithAuthentication).toHaveBeenCalledWith('microsoftEntraOAuth2Api', {
+				method: 'GET',
+				url: 'https://graph.microsoft.com/v1.0/users',
+				json: true,
+				headers: {},
+				body: {},
+				qs: {
+					$select: 'id,displayName',
+				},
+			});
+			expect(listSearchResult).toEqual({
+				results: mockResponse.value.map((x) => ({ name: x.displayName, value: x.id })),
+				paginationToken: mockResponse['@odata.nextLink'],
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts
new file mode 100644
index 0000000000..b245e12f70
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/UserDescription.test.ts
@@ -0,0 +1,1161 @@
+import { NodeConnectionType } from 'n8n-workflow';
+import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
+import { microsoftEntraApiResponse, microsoftEntraNodeResponse } from './mocks';
+
+describe('Gong Node', () => {
+	const baseUrl = 'https://graph.microsoft.com/v1.0';
+
+	beforeEach(() => {
+		// https://github.com/nock/nock/issues/2057#issuecomment-663665683
+		if (!nock.isActive()) {
+			nock.activate();
+		}
+	});
+
+	describe('User description', () => {
+		const tests: WorkflowTestData[] = [
+			{
+				description: 'should add user to group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'addGroup',
+									group: {
+										__rl: true,
+										mode: 'id',
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+									},
+									user: {
+										__rl: true,
+										mode: 'id',
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.addUserToGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'post',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b/members/$ref',
+							statusCode: 204,
+							requestBody: {
+								'@odata.id':
+									'https://graph.microsoft.com/v1.0/directoryObjects/87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should create user',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									operation: 'create',
+									displayName: 'John Doe',
+									mailNickname: 'johndoe',
+									password: 'Test!12345',
+									userPrincipalName: 'johndoe@contoso.com',
+									additionalFields: {
+										aboutMe: 'About me',
+										ageGroup: 'Adult',
+										birthday: '2024-11-12T00:00:00Z',
+										businessPhones: '0123456789',
+										city: 'New York',
+										companyName: 'Contoso',
+										consentProvidedForMinor: 'Granted',
+										country: 'US',
+										department: 'IT',
+										employeeId: 'employee-id-123',
+										employeeType: 'Contractor',
+										forceChangePassword: 'forceChangePasswordNextSignInWithMfa',
+										givenName: 'John',
+										employeeHireDate: '2024-11-13T00:00:00Z',
+										employeeLeaveDateTime: '2024-11-18T00:00:00Z',
+										employeeOrgData: {
+											employeeOrgValues: {
+												costCenter: 'Cost Center 1',
+												division: 'Division 1',
+											},
+										},
+										interests: ['interest1', 'interest2'],
+										jobTitle: 'Project manager',
+										surname: 'Doe',
+										mail: 'johndoe@contoso.com',
+										mobilePhone: '+123456789',
+										mySite: 'My Site',
+										officeLocation: 'New York',
+										onPremisesImmutableId: 'premiseid123',
+										otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+										passwordPolicies: ['DisablePasswordExpiration', 'DisableStrongPassword'],
+										pastProjects: ['project1', 'project2'],
+										postalCode: '0123456',
+										preferredLanguage: 'en-US',
+										responsibilities: ['responsibility1', 'responsibility2'],
+										schools: ['school1', 'school2'],
+										skills: ['skill1', 'skill2'],
+										state: 'New York',
+										streetAddress: 'Street 123',
+										usageLocation: 'US',
+										userType: 'Guest',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.createUser],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'post',
+							path: '/users',
+							statusCode: 201,
+							requestBody: {
+								accountEnabled: true,
+								displayName: 'John Doe',
+								mailNickname: 'johndoe',
+								passwordProfile: {
+									password: 'Test!12345',
+								},
+								userPrincipalName: 'johndoe@contoso.com',
+							},
+							responseBody: microsoftEntraApiResponse.postUser,
+						},
+						{
+							method: 'patch',
+							path: `/users/${microsoftEntraApiResponse.postUser.id}`,
+							statusCode: 204,
+							requestBody: {
+								ageGroup: 'Adult',
+								businessPhones: ['0123456789'],
+								city: 'New York',
+								companyName: 'Contoso',
+								consentProvidedForMinor: 'Granted',
+								country: 'US',
+								department: 'IT',
+								employeeId: 'employee-id-123',
+								employeeType: 'Contractor',
+								givenName: 'John',
+								employeeHireDate: '2024-11-13T00:00:00.000Z',
+								employeeLeaveDateTime: '2024-11-18T00:00:00.000Z',
+								employeeOrgData: {
+									costCenter: 'Cost Center 1',
+									division: 'Division 1',
+								},
+								jobTitle: 'Project manager',
+								surname: 'Doe',
+								mail: 'johndoe@contoso.com',
+								mobilePhone: '+123456789',
+								officeLocation: 'New York',
+								onPremisesImmutableId: 'premiseid123',
+								otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+								passwordPolicies: 'DisablePasswordExpiration,DisableStrongPassword',
+								passwordProfile: {
+									forceChangePasswordNextSignInWithMfa: true,
+								},
+								postalCode: '0123456',
+								preferredLanguage: 'en-US',
+								state: 'New York',
+								streetAddress: 'Street 123',
+								usageLocation: 'US',
+								userType: 'Guest',
+							},
+							responseBody: {},
+						},
+						{
+							method: 'patch',
+							path: `/users/${microsoftEntraApiResponse.postUser.id}`,
+							statusCode: 204,
+							requestBody: {
+								aboutMe: 'About me',
+								birthday: '2024-11-12T00:00:00.000Z',
+								interests: ['interest1', 'interest2'],
+								mySite: 'My Site',
+								pastProjects: ['project1', 'project2'],
+								responsibilities: ['responsibility1', 'responsibility2'],
+								schools: ['school1', 'school2'],
+								skills: ['skill1', 'skill2'],
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should delete user',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'delete',
+									user: {
+										__rl: true,
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+										mode: 'id',
+									},
+									options: {},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.deleteUser],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'delete',
+							path: '/users/87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+							statusCode: 204,
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get user',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'get',
+									user: {
+										__rl: true,
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+										mode: 'id',
+									},
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.getUser],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/users/87d349ed-44d7-43e1-9a83-5f2406dee5bd?$select=id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType',
+							statusCode: 200,
+							responseBody: microsoftEntraApiResponse.getUser,
+						},
+					],
+				},
+			},
+			{
+				description: 'should get user with options',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'get',
+									user: {
+										__rl: true,
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+										mode: 'id',
+									},
+									output: 'fields',
+									fields: [
+										'aboutMe',
+										'accountEnabled',
+										'ageGroup',
+										'assignedLicenses',
+										'assignedPlans',
+										'authorizationInfo',
+										'birthday',
+										'businessPhones',
+										'city',
+										'companyName',
+										'consentProvidedForMinor',
+										'country',
+										'createdDateTime',
+										'creationType',
+										'customSecurityAttributes',
+										'deletedDateTime',
+										'department',
+										'displayName',
+										'employeeHireDate',
+										'employeeId',
+										'employeeLeaveDateTime',
+										'employeeOrgData',
+										'externalUserStateChangeDateTime',
+										'externalUserState',
+										'employeeType',
+										'faxNumber',
+										'givenName',
+										'hireDate',
+										'identities',
+										'imAddresses',
+										'interests',
+										'isManagementRestricted',
+										'isResourceAccount',
+										'jobTitle',
+										'lastPasswordChangeDateTime',
+										'legalAgeGroupClassification',
+										'licenseAssignmentStates',
+										'mail',
+										'mailNickname',
+										'mobilePhone',
+										'mySite',
+										'officeLocation',
+										'onPremisesDistinguishedName',
+										'onPremisesDomainName',
+										'onPremisesExtensionAttributes',
+										'onPremisesImmutableId',
+										'onPremisesLastSyncDateTime',
+										'onPremisesProvisioningErrors',
+										'onPremisesSamAccountName',
+										'onPremisesSecurityIdentifier',
+										'onPremisesSyncEnabled',
+										'onPremisesUserPrincipalName',
+										'otherMails',
+										'passwordPolicies',
+										'passwordProfile',
+										'pastProjects',
+										'postalCode',
+										'preferredDataLocation',
+										'preferredLanguage',
+										'preferredName',
+										'provisionedPlans',
+										'proxyAddresses',
+										'userType',
+										'userPrincipalName',
+										'usageLocation',
+										'surname',
+										'streetAddress',
+										'state',
+										'skills',
+										'signInSessionsValidFromDateTime',
+										'showInAddressList',
+										'serviceProvisioningErrors',
+										'securityIdentifier',
+										'schools',
+										'responsibilities',
+									],
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [
+							[
+								{
+									json: {
+										'@odata.context':
+											'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+										id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+									},
+								},
+							],
+						],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/users/87d349ed-44d7-43e1-9a83-5f2406dee5bd?$select=aboutMe,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,birthday,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,externalUserStateChangeDateTime,externalUserState,employeeType,faxNumber,givenName,hireDate,identities,imAddresses,interests,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,mySite,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,pastProjects,postalCode,preferredDataLocation,preferredLanguage,preferredName,provisionedPlans,proxyAddresses,userType,userPrincipalName,usageLocation,surname,streetAddress,state,skills,signInSessionsValidFromDateTime,showInAddressList,serviceProvisioningErrors,securityIdentifier,schools,responsibilities,id',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+								id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get all users with simple output',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'getAll',
+									returnAll: true,
+									filter: '',
+									output: 'simple',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [new Array(102).fill(microsoftEntraNodeResponse.getUser[0])],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/users?$select=id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								'@odata.nextLink':
+									'https://graph.microsoft.com/v1.0/users?$select=id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+								value: new Array(100).fill(microsoftEntraApiResponse.getUser),
+							},
+						},
+						{
+							method: 'get',
+							path: '/users?$select=id,createdDateTime,displayName,userPrincipalName,mail,mailNickname,securityIdentifier&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								value: new Array(2).fill(microsoftEntraApiResponse.getUser),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get limit 10 users with raw output',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'getAll',
+									limit: 10,
+									filter: '',
+									output: 'raw',
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [new Array(10).fill(microsoftEntraNodeResponse.getUser[0])],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: '/users?$top=10&$select=id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType',
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								'@odata.nextLink':
+									'https://graph.microsoft.com/v1.0/users?$top=10&$select=id,accountEnabled,ageGroup,assignedLicenses,assignedPlans,authorizationInfo,businessPhones,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mail,mailNickname,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesDomainName,onPremisesExtensionAttributes,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSamAccountName,onPremisesSecurityIdentifier,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,securityIdentifier,serviceProvisioningErrors,showInAddressList,signInSessionsValidFromDateTime,state,streetAddress,surname,usageLocation,userPrincipalName,userType&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA',
+								value: new Array(10).fill(microsoftEntraApiResponse.getUser),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should get all users with options and filter',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'getAll',
+									returnAll: true,
+									filter: "startswith(displayName,'user')",
+									output: 'fields',
+									fields: [
+										'accountEnabled',
+										'ageGroup',
+										'assignedLicenses',
+										'assignedPlans',
+										'businessPhones',
+										'authorizationInfo',
+										'city',
+										'companyName',
+										'consentProvidedForMinor',
+										'country',
+										'createdDateTime',
+										'creationType',
+										'customSecurityAttributes',
+										'deletedDateTime',
+										'department',
+										'displayName',
+										'employeeHireDate',
+										'employeeId',
+										'employeeLeaveDateTime',
+										'employeeOrgData',
+										'employeeType',
+										'externalUserState',
+										'externalUserStateChangeDateTime',
+										'faxNumber',
+										'givenName',
+										'identities',
+										'imAddresses',
+										'isManagementRestricted',
+										'isResourceAccount',
+										'jobTitle',
+										'lastPasswordChangeDateTime',
+										'legalAgeGroupClassification',
+										'licenseAssignmentStates',
+										'mailNickname',
+										'mail',
+										'mobilePhone',
+										'officeLocation',
+										'onPremisesDistinguishedName',
+										'onPremisesExtensionAttributes',
+										'onPremisesDomainName',
+										'onPremisesImmutableId',
+										'onPremisesLastSyncDateTime',
+										'onPremisesProvisioningErrors',
+										'onPremisesSecurityIdentifier',
+										'onPremisesSamAccountName',
+										'onPremisesSyncEnabled',
+										'onPremisesUserPrincipalName',
+										'otherMails',
+										'passwordPolicies',
+										'passwordProfile',
+										'postalCode',
+										'preferredDataLocation',
+										'preferredLanguage',
+										'provisionedPlans',
+										'proxyAddresses',
+										'signInSessionsValidFromDateTime',
+										'showInAddressList',
+										'serviceProvisioningErrors',
+										'securityIdentifier',
+										'state',
+										'streetAddress',
+										'surname',
+										'usageLocation',
+										'userPrincipalName',
+										'userType',
+									],
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [
+							new Array(102).fill({
+								json: {
+									'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+									id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+								},
+							}),
+						],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'get',
+							path: "/users?$filter=startswith(displayName,'user')&$select=accountEnabled,ageGroup,assignedLicenses,assignedPlans,businessPhones,authorizationInfo,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mailNickname,mail,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesExtensionAttributes,onPremisesDomainName,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,signInSessionsValidFromDateTime,showInAddressList,serviceProvisioningErrors,securityIdentifier,state,streetAddress,surname,usageLocation,userPrincipalName,userType,id",
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								'@odata.nextLink':
+									"https://graph.microsoft.com/v1.0/users?$filter=startswith(displayName,'user')&$select=accountEnabled,ageGroup,assignedLicenses,assignedPlans,businessPhones,authorizationInfo,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mailNickname,mail,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesExtensionAttributes,onPremisesDomainName,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,signInSessionsValidFromDateTime,showInAddressList,serviceProvisioningErrors,securityIdentifier,state,streetAddress,surname,usageLocation,userPrincipalName,userType,id&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA",
+								value: new Array(100).fill({
+									'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+									id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+								}),
+							},
+						},
+						{
+							method: 'get',
+							path: "/users?$filter=startswith(displayName,'user')&$select=accountEnabled,ageGroup,assignedLicenses,assignedPlans,businessPhones,authorizationInfo,city,companyName,consentProvidedForMinor,country,createdDateTime,creationType,customSecurityAttributes,deletedDateTime,department,displayName,employeeHireDate,employeeId,employeeLeaveDateTime,employeeOrgData,employeeType,externalUserState,externalUserStateChangeDateTime,faxNumber,givenName,identities,imAddresses,isManagementRestricted,isResourceAccount,jobTitle,lastPasswordChangeDateTime,legalAgeGroupClassification,licenseAssignmentStates,mailNickname,mail,mobilePhone,officeLocation,onPremisesDistinguishedName,onPremisesExtensionAttributes,onPremisesDomainName,onPremisesImmutableId,onPremisesLastSyncDateTime,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesSyncEnabled,onPremisesUserPrincipalName,otherMails,passwordPolicies,passwordProfile,postalCode,preferredDataLocation,preferredLanguage,provisionedPlans,proxyAddresses,signInSessionsValidFromDateTime,showInAddressList,serviceProvisioningErrors,securityIdentifier,state,streetAddress,surname,usageLocation,userPrincipalName,userType,id&$skiptoken=RFNwdAIAAQAAACpHcm91cF9jYzEzY2Y5Yy1lOWNiLTQ3NjUtODMzYS05MDIzZDhhMjhlZjMqR3JvdXBfY2MxM2NmOWMtZTljYi00NzY1LTgzM2EtOTAyM2Q4YTI4ZWYzAAAAAAAAAAAAAAA",
+							statusCode: 200,
+							responseBody: {
+								'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users',
+								value: new Array(2).fill({
+									'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users(id)/$entity',
+									id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+								}),
+							},
+						},
+					],
+				},
+			},
+			{
+				description: 'should remove user from group',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'removeGroup',
+									group: {
+										__rl: true,
+										mode: 'id',
+										value: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+									},
+									user: {
+										__rl: true,
+										mode: 'id',
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.removeUserFromGroup],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'delete',
+							path: '/groups/a8eb60e3-0145-4d7e-85ef-c6259784761b/members/87d349ed-44d7-43e1-9a83-5f2406dee5bd/$ref',
+							statusCode: 204,
+							responseBody: {},
+						},
+					],
+				},
+			},
+			{
+				description: 'should update user',
+				input: {
+					workflowData: {
+						nodes: [
+							{
+								parameters: {},
+								id: '416e4fc1-5055-4e61-854e-a6265256ac26',
+								name: "When clicking 'Test workflow'",
+								type: 'n8n-nodes-base.manualTrigger',
+								position: [820, 380],
+								typeVersion: 1,
+							},
+							{
+								parameters: {
+									resource: 'user',
+									operation: 'update',
+									user: {
+										__rl: true,
+										value: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+										mode: 'id',
+									},
+									updateFields: {
+										aboutMe: 'About me',
+										accountEnabled: true,
+										ageGroup: 'Adult',
+										birthday: '2024-11-12T00:00:00Z',
+										businessPhones: '0123456789',
+										city: 'New York',
+										companyName: 'Contoso',
+										consentProvidedForMinor: 'Granted',
+										country: 'US',
+										department: 'IT',
+										displayName: 'Group Display Name',
+										employeeId: 'employee-id-123',
+										employeeType: 'Contractor',
+										forceChangePassword: 'forceChangePasswordNextSignInWithMfa',
+										givenName: 'John',
+										employeeHireDate: '2024-11-13T00:00:00Z',
+										employeeLeaveDateTime: '2024-11-18T00:00:00Z',
+										employeeOrgData: {
+											employeeOrgValues: {
+												costCenter: 'Cost Center 1',
+												division: 'Division 1',
+											},
+										},
+										interests: ['interest1', 'interest2'],
+										jobTitle: 'Project manager',
+										surname: 'Doe',
+										mail: 'johndoe@contoso.com',
+										mailNickname: 'MailNickname',
+										mobilePhone: '+123456789',
+										mySite: 'My Site',
+										officeLocation: 'New York',
+										onPremisesImmutableId: 'premiseid123',
+										otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+										password: 'Test!12345',
+										passwordPolicies: ['DisablePasswordExpiration', 'DisableStrongPassword'],
+										pastProjects: ['project1', 'project2'],
+										postalCode: '0123456',
+										preferredLanguage: 'en-US',
+										responsibilities: ['responsibility1', 'responsibility2'],
+										schools: ['school1', 'school2'],
+										skills: ['skill1', 'skill2'],
+										state: 'New York',
+										streetAddress: 'Street 123',
+										usageLocation: 'US',
+										userPrincipalName: 'johndoe@contoso.com',
+										userType: 'Guest',
+									},
+									requestOptions: {},
+								},
+								type: 'n8n-nodes-base.microsoftEntra',
+								typeVersion: 1,
+								position: [220, 0],
+								id: '3429f7f2-dfca-4b72-8913-43a582e96e66',
+								name: 'Micosoft Entra ID',
+								credentials: {
+									microsoftEntraOAuth2Api: {
+										id: 'Hot2KwSMSoSmMVqd',
+										name: 'Microsoft Entra ID (Azure Active Directory) account',
+									},
+								},
+							},
+						],
+						connections: {
+							"When clicking 'Test workflow'": {
+								main: [
+									[
+										{
+											node: 'Micosoft Entra ID',
+											type: NodeConnectionType.Main,
+											index: 0,
+										},
+									],
+								],
+							},
+						},
+					},
+				},
+				output: {
+					nodeExecutionOrder: ['Start'],
+					nodeData: {
+						'Micosoft Entra ID': [microsoftEntraNodeResponse.updateUser],
+					},
+				},
+				nock: {
+					baseUrl,
+					mocks: [
+						{
+							method: 'patch',
+							path: `/users/${microsoftEntraApiResponse.postUser.id}`,
+							statusCode: 204,
+							requestBody: {
+								accountEnabled: true,
+								ageGroup: 'Adult',
+								businessPhones: ['0123456789'],
+								city: 'New York',
+								companyName: 'Contoso',
+								consentProvidedForMinor: 'Granted',
+								country: 'US',
+								department: 'IT',
+								displayName: 'Group Display Name',
+								employeeId: 'employee-id-123',
+								employeeType: 'Contractor',
+								givenName: 'John',
+								employeeHireDate: null,
+								employeeLeaveDateTime: null,
+								employeeOrgData: {
+									costCenter: 'Cost Center 1',
+									division: 'Division 1',
+								},
+								jobTitle: 'Project manager',
+								surname: 'Doe',
+								mail: 'johndoe@contoso.com',
+								mailNickname: 'MailNickname',
+								mobilePhone: '+123456789',
+								officeLocation: 'New York',
+								onPremisesImmutableId: 'premiseid123',
+								otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+								passwordProfile: {
+									password: 'Test!12345',
+									forceChangePasswordNextSignInWithMfa: true,
+								},
+								passwordPolicies: 'DisablePasswordExpiration,DisableStrongPassword',
+								postalCode: '0123456',
+								preferredLanguage: 'en-US',
+								state: 'New York',
+								streetAddress: 'Street 123',
+								usageLocation: 'US',
+								userPrincipalName: 'johndoe@contoso.com',
+								userType: 'Guest',
+							},
+							responseBody: {},
+						},
+						{
+							method: 'patch',
+							path: `/users/${microsoftEntraApiResponse.postUser.id}`,
+							statusCode: 204,
+							requestBody: {
+								aboutMe: 'About me',
+								birthday: '2024-11-12T00:00:00.000Z',
+								interests: ['interest1', 'interest2'],
+								mySite: 'My Site',
+								pastProjects: ['project1', 'project2'],
+								responsibilities: ['responsibility1', 'responsibility2'],
+								schools: ['school1', 'school2'],
+								skills: ['skill1', 'skill2'],
+							},
+							responseBody: {},
+						},
+					],
+				},
+			},
+		];
+
+		const nodeTypes = Helpers.setup(tests);
+
+		test.each(tests)('$description', async (testData) => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+			expect(result.status).toEqual('success');
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Microsoft/Entra/test/mocks.ts b/packages/nodes-base/nodes/Microsoft/Entra/test/mocks.ts
new file mode 100644
index 0000000000..003df7f193
--- /dev/null
+++ b/packages/nodes-base/nodes/Microsoft/Entra/test/mocks.ts
@@ -0,0 +1,1270 @@
+/* eslint-disable n8n-nodes-base/node-param-display-name-miscased-id */
+/* eslint-disable n8n-nodes-base/node-param-display-name-miscased */
+
+export const microsoftEntraApiResponse = {
+	postGroup: {
+		'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups/$entity',
+		id: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+		deletedDateTime: null,
+		classification: null,
+		createdDateTime: '2024-11-17T15:46:32Z',
+		creationOptions: [],
+		description: null,
+		displayName: 'Group Display Name',
+		expirationDateTime: null,
+		groupTypes: ['DynamicMembership', 'Unified'],
+		isAssignableToRole: true,
+		mail: null,
+		mailEnabled: true,
+		mailNickname: 'MailNickname',
+		membershipRule: 'department -eq "Marketing"',
+		membershipRuleProcessingState: 'On',
+		onPremisesDomainName: null,
+		onPremisesLastSyncDateTime: null,
+		onPremisesNetBiosName: null,
+		onPremisesSamAccountName: null,
+		onPremisesSecurityIdentifier: null,
+		onPremisesSyncEnabled: null,
+		preferredDataLocation: null,
+		preferredLanguage: null,
+		proxyAddresses: [],
+		renewedDateTime: '2024-11-17T15:46:32Z',
+		resourceBehaviorOptions: [],
+		resourceProvisioningOptions: [],
+		securityEnabled: true,
+		securityIdentifier: 'S-1-12-1-2833998051-1300103493-633794437-460752023',
+		theme: null,
+		uniqueName: null,
+		visibility: null,
+		onPremisesProvisioningErrors: [],
+		serviceProvisioningErrors: [],
+	},
+
+	getGroup: {
+		'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups/$entity',
+		id: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+		deletedDateTime: null,
+		classification: null,
+		createdDateTime: '2024-11-04T16:00:21Z',
+		creationOptions: ['YammerProvisioning'],
+		description: 'This is the default group for everyone in the network',
+		displayName: 'All Company',
+		expirationDateTime: null,
+		groupTypes: ['Unified'],
+		isAssignableToRole: null,
+		mail: 'HRTaskforce@contoso.com',
+		mailEnabled: true,
+		mailNickname: 'allcompany',
+		membershipRule: 'department -eq "Marketing"',
+		membershipRuleProcessingState: 'On',
+		onPremisesDomainName: null,
+		onPremisesLastSyncDateTime: null,
+		onPremisesNetBiosName: null,
+		onPremisesSamAccountName: null,
+		onPremisesSecurityIdentifier: null,
+		onPremisesSyncEnabled: null,
+		preferredDataLocation: null,
+		preferredLanguage: null,
+		proxyAddresses: ['SMTP:HRTaskforce@contoso.com'],
+		renewedDateTime: '2024-11-04T16:00:21Z',
+		resourceBehaviorOptions: ['CalendarMemberReadOnly'],
+		resourceProvisioningOptions: [],
+		securityEnabled: false,
+		securityIdentifier: 'S-1-12-1-1394793482-1222919313-3222267053-1234900903',
+		theme: null,
+		uniqueName: null,
+		visibility: 'Public',
+		onPremisesProvisioningErrors: [],
+		serviceProvisioningErrors: [],
+	},
+
+	getGroupWithProperties: {
+		'@odata.context':
+			'https://graph.microsoft.com/v1.0/$metadata#groups(assignedLabels,assignedLicenses,createdDateTime,classification,deletedDateTime,description,displayName,expirationDateTime,groupTypes,visibility,unseenCount,theme,uniqueName,serviceProvisioningErrors,securityIdentifier,renewedDateTime,securityEnabled,autoSubscribeNewMembers,allowExternalSenders,licenseProcessingState,isManagementRestricted,isSubscribedByMail,isAssignableToRole,id,hideFromOutlookClients,hideFromAddressLists,onPremisesProvisioningErrors,onPremisesSecurityIdentifier,onPremisesSamAccountName,onPremisesNetBiosName,onPremisesSyncEnabled,preferredDataLocation,preferredLanguage,proxyAddresses,onPremisesLastSyncDateTime,onPremisesDomainName,membershipRuleProcessingState,membershipRule,mailNickname,mailEnabled,mail,members())/$entity',
+		createdDateTime: '2024-11-04T16:00:21Z',
+		classification: null,
+		deletedDateTime: null,
+		description: 'This is the default group for everyone in the network',
+		displayName: 'All Company',
+		expirationDateTime: null,
+		groupTypes: ['Unified'],
+		visibility: 'Public',
+		theme: null,
+		uniqueName: null,
+		securityIdentifier: 'S-1-12-1-1394793482-1222919313-3222267053-1234900903',
+		renewedDateTime: '2024-11-04T16:00:21Z',
+		securityEnabled: false,
+		isManagementRestricted: null,
+		isAssignableToRole: null,
+		id: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+		onPremisesSecurityIdentifier: null,
+		onPremisesSamAccountName: null,
+		onPremisesNetBiosName: null,
+		onPremisesSyncEnabled: null,
+		preferredDataLocation: null,
+		preferredLanguage: null,
+		proxyAddresses: ['SMTP:HRTaskforce@contoso.com'],
+		onPremisesLastSyncDateTime: null,
+		onPremisesDomainName: null,
+		membershipRule: 'department -eq "Marketing"',
+		membershipRuleProcessingState: 'On',
+		mailNickname: 'allcompany',
+		mailEnabled: true,
+		mail: 'HRTaskforce@contoso.com',
+		licenseProcessingState: null,
+		allowExternalSenders: false,
+		autoSubscribeNewMembers: false,
+		isSubscribedByMail: false,
+		unseenCount: 0,
+		hideFromOutlookClients: false,
+		hideFromAddressLists: false,
+		assignedLabels: [],
+		assignedLicenses: [],
+		serviceProvisioningErrors: [],
+		onPremisesProvisioningErrors: [],
+		members: [
+			{
+				'@odata.type': '#microsoft.graph.user',
+				id: '5f7afebb-121d-4664-882b-a09fe6584ce0',
+				deletedDateTime: null,
+				accountEnabled: true,
+				ageGroup: null,
+				businessPhones: ['4917600000000'],
+				city: null,
+				companyName: null,
+				consentProvidedForMinor: null,
+				country: 'US',
+				createdDateTime: '2024-11-03T16:15:19Z',
+				creationType: null,
+				department: null,
+				displayName: 'John Doe',
+				employeeId: null,
+				employeeHireDate: null,
+				employeeLeaveDateTime: null,
+				employeeType: null,
+				externalUserState: null,
+				externalUserStateChangeDateTime: null,
+				faxNumber: null,
+				givenName: 'John',
+				isLicenseReconciliationNeeded: false,
+				jobTitle: null,
+				legalAgeGroupClassification: null,
+				mail: 'john.doe@contoso.com',
+				mailNickname: 'johndoe',
+				mobilePhone: null,
+				onPremisesDistinguishedName: null,
+				onPremisesDomainName: null,
+				onPremisesImmutableId: null,
+				onPremisesLastSyncDateTime: null,
+				onPremisesSecurityIdentifier: null,
+				onPremisesSamAccountName: null,
+				onPremisesSyncEnabled: null,
+				onPremisesUserPrincipalName: null,
+				otherMails: ['matstallmann@gmail.com'],
+				passwordPolicies: null,
+				officeLocation: null,
+				postalCode: null,
+				preferredDataLocation: null,
+				preferredLanguage: 'en',
+				proxyAddresses: ['SMTP:john.doe@contoso.com'],
+				refreshTokensValidFromDateTime: '2024-11-03T16:15:18Z',
+				imAddresses: ['john.doe@contoso.com'],
+				isResourceAccount: null,
+				showInAddressList: null,
+				securityIdentifier: 'S-1-12-1-1601896123-1180963357-2678074248-3763099878',
+				signInSessionsValidFromDateTime: '2024-11-03T16:15:18Z',
+				state: null,
+				streetAddress: null,
+				surname: 'Doe',
+				usageLocation: 'US',
+				userPrincipalName: 'john.doe@contoso.com',
+				userType: 'Member',
+				employeeOrgData: null,
+				passwordProfile: null,
+				assignedLicenses: [
+					{
+						disabledPlans: [],
+						skuId: 'cbdc14ab-d96c-4c30-b9f4-6ada7cdc1d46',
+					},
+				],
+				assignedPlans: [
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'WhiteboardServices',
+						servicePlanId: 'b8afc642-032e-4de5-8c0a-507a7bba7e5d',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: 'a6520331-d7d4-4276-95f5-15c0933bc757',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'DynamicsNAV',
+						servicePlanId: '39b5c996-467e-4e60-bd62-46066f572726',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'WindowsDefenderATP',
+						servicePlanId: 'bfc1bbd9-981b-4f71-9b82-17c35fd0e2a4',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SharePoint',
+						servicePlanId: 'e95bec33-7c88-4a70-8e19-b10bd9d0c014',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '176a09a6-7ec5-4039-ac02-b2791c6ba793',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'AADPremiumService',
+						servicePlanId: '41781fb2-bc02-4b7c-bd55-b576c07bb09d',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '33c4f319-9bdd-48d6-9c4d-410b750a4a5a',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftKaizala',
+						servicePlanId: '54fc630f-5a40-48ee-8965-af0503c1386e',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'To-Do',
+						servicePlanId: '5e62787c-c316-451f-b873-1d05acd4d12c',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Bing',
+						servicePlanId: '0d0c0d31-fae7-41f2-b909-eaf4d7f26dba',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'ccibotsprod',
+						servicePlanId: 'ded3d325-1bdc-453e-8432-5bac26d7a014',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SharePoint',
+						servicePlanId: 'a1ace008-72f3-4ea0-8dac-33b3a23a2472',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '9aaf7827-d63c-4b61-89c3-182f06f82e5c',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '9bec7e34-c9fa-40b7-a9d1-bd6d1165c7ed',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MixedRealityCollaborationServices',
+						servicePlanId: 'f0ff6ac6-297d-49cd-be34-6dfef97f0c28',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'RMSOnline',
+						servicePlanId: '6c57d4b6-3b23-47a5-9bc9-69f17b4947b3',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'RMSOnline',
+						servicePlanId: 'bea4c11e-220a-4e6d-8eb8-8ea15d019f90',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftOffice',
+						servicePlanId: '094e7854-93fc-4d55-b2c0-3ab5369ebdc1',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Sway',
+						servicePlanId: 'a23b959c-7ce8-4e57-9140-b90eb88a9e97',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Microsoft.ProjectBabylon',
+						servicePlanId: 'c948ea65-2053-4a5a-8a62-9eaaaf11b522',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '5bfe124c-bbdc-4494-8835-f1297d457d79',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'PowerAppsService',
+						servicePlanId: '92f7a6f3-b89b-4bbd-8c30-809e6da5ad1c',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MixedRealityCollaborationServices',
+						servicePlanId: '3efbd4ed-8958-4824-8389-1321f8730af8',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'CRM',
+						servicePlanId: '28b0fa46-c39a-4188-89e2-58e979a6b014',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MixedRealityCollaborationServices',
+						servicePlanId: 'dcf9d2f4-772e-4434-b757-77a453cfbc02',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'ProcessSimple',
+						servicePlanId: '0f9b09cb-62d1-4ff4-9129-43f4996f83f4',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'YammerEnterprise',
+						servicePlanId: 'a82fbf69-b4d7-49f4-83a6-915b2cf354f4',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MultiFactorService',
+						servicePlanId: '8a256a2b-b617-496d-b51b-e76466e88db0',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'OfficeForms',
+						servicePlanId: '159f4cd6-e380-449f-a816-af1a9ef76344',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftCommunicationsOnline',
+						servicePlanId: '0feaeb32-d00e-4d66-bd5a-43b5b83db82c',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Windows',
+						servicePlanId: '8e229017-d77b-43d5-9305-903395523b99',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'ProjectProgramsAndPortfolios',
+						servicePlanId: 'b21a6b06-1988-436e-a07b-51ec6d9f52ad',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SCO',
+						servicePlanId: 'c1ec4a95-1f05-45b3-a911-aa3fa01094f5',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'WindowsUpdateforBusinessCloudExtensions',
+						servicePlanId: '7bf960f6-2cd9-443a-8046-5dbff9558365',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'YammerEnterprise',
+						servicePlanId: '7547a3fe-08ee-4ccb-b430-5077c5041653',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'CRM',
+						servicePlanId: 'afa73018-811e-46e9-988f-f75d2b1b8430',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SharePoint',
+						servicePlanId: 'c7699d2e-19aa-44de-8edf-1736da088ca1',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'AADPremiumService',
+						servicePlanId: 'de377cbc-0019-4ec2-b77c-3f223947e102',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'exchange',
+						servicePlanId: '199a5c09-e0ca-4e37-8f7c-b05d533e1ea2',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Adallom',
+						servicePlanId: '932ad362-64a8-4783-9106-97849a1a30b9',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Chapter5FluidApp',
+						servicePlanId: 'c4b8c31a-fb44-4c65-9837-a21f55fcabda',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'LearningAppServiceInTeams',
+						servicePlanId: 'b76fb638-6ba6-402a-b9f9-83d28acb3d86',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'Deskless',
+						servicePlanId: '8c7d2df8-86f0-4902-b2ed-a0458298f3b3',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftStream',
+						servicePlanId: '743dd19e-1ce3-4c62-a3ad-49ba8f63a2f6',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'TeamspaceAPI',
+						servicePlanId: '57ff2da0-773e-42df-b2af-ffb7a2317929',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftOffice',
+						servicePlanId: '276d6e8a-f056-4f70-b7e8-4fc27f79f809',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'SCO',
+						servicePlanId: '8e9ff0ff-aa7a-4b20-83c1-2f636b600ac2',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'MicrosoftPrint',
+						servicePlanId: '795f6fe0-cc4d-4773-b050-5dde4dc704c9',
+					},
+					{
+						assignedDateTime: '2024-11-04T15:54:26Z',
+						capabilityStatus: 'Enabled',
+						service: 'ProjectWorkManagement',
+						servicePlanId: 'b737dad2-2f6c-4c65-90e3-ca563267e8b9',
+					},
+				],
+				authorizationInfo: {
+					certificateUserIds: [],
+				},
+				identities: [
+					{
+						signInType: 'userPrincipalName',
+						issuer: 'contoso.com',
+						issuerAssignedId: 'john.doe@contoso.com',
+					},
+				],
+				onPremisesProvisioningErrors: [],
+				onPremisesExtensionAttributes: {
+					extensionAttribute1: null,
+					extensionAttribute2: null,
+					extensionAttribute3: null,
+					extensionAttribute4: null,
+					extensionAttribute5: null,
+					extensionAttribute6: null,
+					extensionAttribute7: null,
+					extensionAttribute8: null,
+					extensionAttribute9: null,
+					extensionAttribute10: null,
+					extensionAttribute11: null,
+					extensionAttribute12: null,
+					extensionAttribute13: null,
+					extensionAttribute14: null,
+					extensionAttribute15: null,
+				},
+				provisionedPlans: [
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'exchange',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'MicrosoftCommunicationsOnline',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'SharePoint',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'SharePoint',
+					},
+					{
+						capabilityStatus: 'Enabled',
+						provisioningStatus: 'Success',
+						service: 'SharePoint',
+					},
+				],
+				serviceProvisioningErrors: [],
+			},
+		],
+	},
+
+	postUser: {
+		'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users/$entity',
+		id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+		businessPhones: [],
+		displayName: 'John Doe',
+		givenName: null,
+		jobTitle: null,
+		mail: null,
+		mobilePhone: null,
+		officeLocation: null,
+		preferredLanguage: null,
+		surname: null,
+		userPrincipalName: 'johndoe@contoso.com',
+	},
+
+	getUser: {
+		'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users/$entity',
+		businessPhones: ['0123456789'],
+		displayName: 'John Doe',
+		givenName: 'John',
+		jobTitle: 'Project manager',
+		mail: 'johndoe@contoso.com',
+		mobilePhone: '+123456789',
+		officeLocation: 'New York',
+		preferredLanguage: 'en-US',
+		surname: 'Doe',
+		userPrincipalName: 'johndoe@contoso.com',
+		id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+	},
+
+	metadata: {
+		groups:
+			'<?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="microsoft.graph.identityGovernance" xmlns="http://docs.oasis-open.org/odata/ns/edm"></Schema><Schema Namespace="microsoft.graph" Alias="graph" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="entity" Abstract="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.String" Nullable="false"/></EntityType><EntityType Name="directoryObject" BaseType="graph.entity" OpenType="true"><Property Name="deletedDateTime" Type="Edm.DateTimeOffset"/></EntityType><EntityType Name="group" BaseType="graph.directoryObject" OpenType="true"><Property Name="assignedLabels" Type="Collection(graph.assignedLabel)"/><Property Name="assignedLicenses" Type="Collection(graph.assignedLicense)"/><Property Name="classification" Type="Edm.String"/><Property Name="createdDateTime" Type="Edm.DateTimeOffset"/><Property Name="description" Type="Edm.String"/><Property Name="displayName" Type="Edm.String"/><Property Name="expirationDateTime" Type="Edm.DateTimeOffset"/><Property Name="groupTypes" Type="Collection(Edm.String)" Nullable="false"/><Property Name="hasMembersWithLicenseErrors" Type="Edm.Boolean"/><Property Name="isAssignableToRole" Type="Edm.Boolean"/><Property Name="isManagementRestricted" Type="Edm.Boolean"/><Property Name="licenseProcessingState" Type="graph.licenseProcessingState"/><Property Name="mail" Type="Edm.String"/><Property Name="mailEnabled" Type="Edm.Boolean"/><Property Name="mailNickname" Type="Edm.String"/><Property Name="membershipRule" Type="Edm.String"/><Property Name="membershipRuleProcessingState" Type="Edm.String"/><Property Name="onPremisesDomainName" Type="Edm.String"/><Property Name="onPremisesLastSyncDateTime" Type="Edm.DateTimeOffset"/><Property Name="onPremisesNetBiosName" Type="Edm.String"/><Property Name="onPremisesProvisioningErrors" Type="Collection(graph.onPremisesProvisioningError)"/><Property Name="onPremisesSamAccountName" Type="Edm.String"/><Property Name="onPremisesSecurityIdentifier" Type="Edm.String"/><Property Name="onPremisesSyncEnabled" Type="Edm.Boolean"/><Property Name="preferredDataLocation" Type="Edm.String"/><Property Name="preferredLanguage" Type="Edm.String"/><Property Name="proxyAddresses" Type="Collection(Edm.String)" Nullable="false"/><Property Name="renewedDateTime" Type="Edm.DateTimeOffset"/><Property Name="securityEnabled" Type="Edm.Boolean"/><Property Name="securityIdentifier" Type="Edm.String"/><Property Name="serviceProvisioningErrors" Type="Collection(graph.serviceProvisioningError)"/><Property Name="theme" Type="Edm.String"/><Property Name="uniqueName" Type="Edm.String"/><Property Name="visibility" Type="Edm.String"/><Property Name="allowExternalSenders" Type="Edm.Boolean"/><Property Name="autoSubscribeNewMembers" Type="Edm.Boolean"/><Property Name="hideFromAddressLists" Type="Edm.Boolean"/><Property Name="hideFromOutlookClients" Type="Edm.Boolean"/><Property Name="isSubscribedByMail" Type="Edm.Boolean"/><Property Name="unseenCount" Type="Edm.Int32"/><Property Name="isArchived" Type="Edm.Boolean"/><NavigationProperty Name="appRoleAssignments" Type="Collection(graph.appRoleAssignment)" ContainsTarget="true"/><NavigationProperty Name="createdOnBehalfOf" Type="graph.directoryObject"/><NavigationProperty Name="memberOf" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="members" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="membersWithLicenseErrors" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="owners" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="permissionGrants" Type="Collection(graph.resourceSpecificPermissionGrant)" ContainsTarget="true"/><NavigationProperty Name="settings" Type="Collection(graph.groupSetting)" ContainsTarget="true"/><NavigationProperty Name="transitiveMemberOf" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="transitiveMembers" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="acceptedSenders" Type="Collection(graph.directoryObject)" ContainsTarget="true"/><NavigationProperty Name="calendar" Type="graph.calendar" ContainsTarget="true"/><NavigationProperty Name="calendarView" Type="Collection(graph.event)" ContainsTarget="true"/><NavigationProperty Name="conversations" Type="Collection(graph.conversation)" ContainsTarget="true"/><NavigationProperty Name="events" Type="Collection(graph.event)" ContainsTarget="true"/><NavigationProperty Name="rejectedSenders" Type="Collection(graph.directoryObject)" ContainsTarget="true"/><NavigationProperty Name="threads" Type="Collection(graph.conversationThread)" ContainsTarget="true"/><NavigationProperty Name="drive" Type="graph.drive" ContainsTarget="true"/><NavigationProperty Name="drives" Type="Collection(graph.drive)" ContainsTarget="true"/><NavigationProperty Name="sites" Type="Collection(graph.site)" ContainsTarget="true"/><NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true"/><NavigationProperty Name="groupLifecyclePolicies" Type="Collection(graph.groupLifecyclePolicy)" ContainsTarget="true"/><NavigationProperty Name="planner" Type="graph.plannerGroup" ContainsTarget="true"/><NavigationProperty Name="onenote" Type="graph.onenote" ContainsTarget="true"/><NavigationProperty Name="photo" Type="graph.profilePhoto" ContainsTarget="true"/><NavigationProperty Name="photos" Type="Collection(graph.profilePhoto)" ContainsTarget="true"/><NavigationProperty Name="team" Type="graph.team" ContainsTarget="true"/><Annotation Term="Org.OData.Core.V1.AlternateKeys"><Collection><Record Type="Org.OData.Core.V1.AlternateKey"><PropertyValue Property="Key"><Collection><Record Type="Org.OData.Core.V1.PropertyRef"><PropertyValue Property="Alias" String="uniqueName"/><PropertyValue Property="Name" PropertyPath="uniqueName"/></Record></Collection></PropertyValue></Record></Collection></Annotation></EntityType></Schema></edmx:DataServices></edmx:Edmx>',
+		users:
+			'<?xml version="1.0" encoding="utf-8"?><edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx"><edmx:DataServices><Schema Namespace="microsoft.graph.identityGovernance" xmlns="http://docs.oasis-open.org/odata/ns/edm"></Schema><Schema Namespace="microsoft.graph" Alias="graph" xmlns="http://docs.oasis-open.org/odata/ns/edm"><EntityType Name="entity" Abstract="true"><Key><PropertyRef Name="id"/></Key><Property Name="id" Type="Edm.String" Nullable="false"/></EntityType><EntityType Name="directoryObject" BaseType="graph.entity" OpenType="true"><Property Name="deletedDateTime" Type="Edm.DateTimeOffset"/></EntityType><EntityType Name="user" BaseType="graph.directoryObject" OpenType="true"><Property Name="signInActivity" Type="graph.signInActivity"/><Property Name="accountEnabled" Type="Edm.Boolean"/><Property Name="ageGroup" Type="Edm.String"/><Property Name="assignedLicenses" Type="Collection(graph.assignedLicense)" Nullable="false"/><Property Name="assignedPlans" Type="Collection(graph.assignedPlan)" Nullable="false"/><Property Name="authorizationInfo" Type="graph.authorizationInfo"/><Property Name="businessPhones" Type="Collection(Edm.String)" Nullable="false"/><Property Name="city" Type="Edm.String"/><Property Name="companyName" Type="Edm.String"/><Property Name="consentProvidedForMinor" Type="Edm.String"/><Property Name="country" Type="Edm.String"/><Property Name="createdDateTime" Type="Edm.DateTimeOffset"/><Property Name="creationType" Type="Edm.String"/><Property Name="customSecurityAttributes" Type="graph.customSecurityAttributeValue"/><Property Name="department" Type="Edm.String"/><Property Name="displayName" Type="Edm.String"/><Property Name="employeeHireDate" Type="Edm.DateTimeOffset"/><Property Name="employeeId" Type="Edm.String"/><Property Name="employeeLeaveDateTime" Type="Edm.DateTimeOffset"/><Property Name="employeeOrgData" Type="graph.employeeOrgData"/><Property Name="employeeType" Type="Edm.String"/><Property Name="externalUserState" Type="Edm.String"/><Property Name="externalUserStateChangeDateTime" Type="Edm.DateTimeOffset"/><Property Name="faxNumber" Type="Edm.String"/><Property Name="givenName" Type="Edm.String"/><Property Name="identities" Type="Collection(graph.objectIdentity)"/><Property Name="imAddresses" Type="Collection(Edm.String)"/><Property Name="isManagementRestricted" Type="Edm.Boolean"/><Property Name="isResourceAccount" Type="Edm.Boolean"/><Property Name="jobTitle" Type="Edm.String"/><Property Name="lastPasswordChangeDateTime" Type="Edm.DateTimeOffset"/><Property Name="legalAgeGroupClassification" Type="Edm.String"/><Property Name="licenseAssignmentStates" Type="Collection(graph.licenseAssignmentState)"/><Property Name="mail" Type="Edm.String"/><Property Name="mailNickname" Type="Edm.String"/><Property Name="mobilePhone" Type="Edm.String"/><Property Name="officeLocation" Type="Edm.String"/><Property Name="onPremisesDistinguishedName" Type="Edm.String"/><Property Name="onPremisesDomainName" Type="Edm.String"/><Property Name="onPremisesExtensionAttributes" Type="graph.onPremisesExtensionAttributes"/><Property Name="onPremisesImmutableId" Type="Edm.String"/><Property Name="onPremisesLastSyncDateTime" Type="Edm.DateTimeOffset"/><Property Name="onPremisesProvisioningErrors" Type="Collection(graph.onPremisesProvisioningError)"/><Property Name="onPremisesSamAccountName" Type="Edm.String"/><Property Name="onPremisesSecurityIdentifier" Type="Edm.String"/><Property Name="onPremisesSyncEnabled" Type="Edm.Boolean"/><Property Name="onPremisesUserPrincipalName" Type="Edm.String"/><Property Name="otherMails" Type="Collection(Edm.String)" Nullable="false"/><Property Name="passwordPolicies" Type="Edm.String"/><Property Name="passwordProfile" Type="graph.passwordProfile"/><Property Name="postalCode" Type="Edm.String"/><Property Name="preferredDataLocation" Type="Edm.String"/><Property Name="preferredLanguage" Type="Edm.String"/><Property Name="provisionedPlans" Type="Collection(graph.provisionedPlan)" Nullable="false"/><Property Name="proxyAddresses" Type="Collection(Edm.String)" Nullable="false"/><Property Name="securityIdentifier" Type="Edm.String"/><Property Name="serviceProvisioningErrors" Type="Collection(graph.serviceProvisioningError)"/><Property Name="showInAddressList" Type="Edm.Boolean"/><Property Name="signInSessionsValidFromDateTime" Type="Edm.DateTimeOffset"/><Property Name="state" Type="Edm.String"/><Property Name="streetAddress" Type="Edm.String"/><Property Name="surname" Type="Edm.String"/><Property Name="usageLocation" Type="Edm.String"/><Property Name="userPrincipalName" Type="Edm.String"/><Property Name="userType" Type="Edm.String"/><Property Name="mailboxSettings" Type="graph.mailboxSettings"/><Property Name="deviceEnrollmentLimit" Type="Edm.Int32" Nullable="false"/><Property Name="print" Type="graph.userPrint"/><Property Name="aboutMe" Type="Edm.String"/><Property Name="birthday" Type="Edm.DateTimeOffset" Nullable="false"/><Property Name="hireDate" Type="Edm.DateTimeOffset" Nullable="false"/><Property Name="interests" Type="Collection(Edm.String)"/><Property Name="mySite" Type="Edm.String"/><Property Name="pastProjects" Type="Collection(Edm.String)"/><Property Name="preferredName" Type="Edm.String"/><Property Name="responsibilities" Type="Collection(Edm.String)"/><Property Name="schools" Type="Collection(Edm.String)"/><Property Name="skills" Type="Collection(Edm.String)"/><NavigationProperty Name="appRoleAssignments" Type="Collection(graph.appRoleAssignment)" ContainsTarget="true"/><NavigationProperty Name="createdObjects" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="directReports" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="licenseDetails" Type="Collection(graph.licenseDetails)" ContainsTarget="true"/><NavigationProperty Name="manager" Type="graph.directoryObject"/><NavigationProperty Name="memberOf" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="oauth2PermissionGrants" Type="Collection(graph.oAuth2PermissionGrant)"/><NavigationProperty Name="ownedDevices" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="ownedObjects" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="registeredDevices" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="scopedRoleMemberOf" Type="Collection(graph.scopedRoleMembership)" ContainsTarget="true"/><NavigationProperty Name="sponsors" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="transitiveMemberOf" Type="Collection(graph.directoryObject)"/><NavigationProperty Name="calendar" Type="graph.calendar" ContainsTarget="true"/><NavigationProperty Name="calendarGroups" Type="Collection(graph.calendarGroup)" ContainsTarget="true"/><NavigationProperty Name="calendars" Type="Collection(graph.calendar)" ContainsTarget="true"/><NavigationProperty Name="calendarView" Type="Collection(graph.event)" ContainsTarget="true"/><NavigationProperty Name="contactFolders" Type="Collection(graph.contactFolder)" ContainsTarget="true"/><NavigationProperty Name="contacts" Type="Collection(graph.contact)" ContainsTarget="true"/><NavigationProperty Name="events" Type="Collection(graph.event)" ContainsTarget="true"/><NavigationProperty Name="inferenceClassification" Type="graph.inferenceClassification" ContainsTarget="true"/><NavigationProperty Name="mailFolders" Type="Collection(graph.mailFolder)" ContainsTarget="true"/><NavigationProperty Name="messages" Type="Collection(graph.message)" ContainsTarget="true"/><NavigationProperty Name="outlook" Type="graph.outlookUser" ContainsTarget="true"/><NavigationProperty Name="people" Type="Collection(graph.person)" ContainsTarget="true"/><NavigationProperty Name="drive" Type="graph.drive" ContainsTarget="true"/><NavigationProperty Name="drives" Type="Collection(graph.drive)" ContainsTarget="true"/><NavigationProperty Name="followedSites" Type="Collection(graph.site)"/><NavigationProperty Name="extensions" Type="Collection(graph.extension)" ContainsTarget="true"/><NavigationProperty Name="agreementAcceptances" Type="Collection(graph.agreementAcceptance)"/><NavigationProperty Name="managedDevices" Type="Collection(graph.managedDevice)" ContainsTarget="true"/><NavigationProperty Name="managedAppRegistrations" Type="Collection(graph.managedAppRegistration)"/><NavigationProperty Name="deviceManagementTroubleshootingEvents" Type="Collection(graph.deviceManagementTroubleshootingEvent)" ContainsTarget="true"/><NavigationProperty Name="planner" Type="graph.plannerUser" ContainsTarget="true"/><NavigationProperty Name="insights" Type="graph.itemInsights" ContainsTarget="true"/><NavigationProperty Name="settings" Type="graph.userSettings" ContainsTarget="true"/><NavigationProperty Name="onenote" Type="graph.onenote" ContainsTarget="true"/><NavigationProperty Name="cloudClipboard" Type="graph.cloudClipboardRoot" ContainsTarget="true"/><NavigationProperty Name="photo" Type="graph.profilePhoto" ContainsTarget="true"/><NavigationProperty Name="photos" Type="Collection(graph.profilePhoto)" ContainsTarget="true"/><NavigationProperty Name="activities" Type="Collection(graph.userActivity)" ContainsTarget="true"/><NavigationProperty Name="onlineMeetings" Type="Collection(graph.onlineMeeting)" ContainsTarget="true"/><NavigationProperty Name="presence" Type="graph.presence" ContainsTarget="true"/><NavigationProperty Name="authentication" Type="graph.authentication" ContainsTarget="true"/><NavigationProperty Name="chats" Type="Collection(graph.chat)" ContainsTarget="true"/><NavigationProperty Name="joinedTeams" Type="Collection(graph.team)" ContainsTarget="true"/><NavigationProperty Name="permissionGrants" Type="Collection(graph.resourceSpecificPermissionGrant)" ContainsTarget="true"/><NavigationProperty Name="teamwork" Type="graph.userTeamwork" ContainsTarget="true"/><NavigationProperty Name="solutions" Type="graph.userSolutionRoot" ContainsTarget="true"/><NavigationProperty Name="todo" Type="graph.todo" ContainsTarget="true"/><NavigationProperty Name="employeeExperience" Type="graph.employeeExperienceUser" ContainsTarget="true"/><Annotation Term="Org.OData.Core.V1.AlternateKeys"><Collection><Record Type="Org.OData.Core.V1.AlternateKey"><PropertyValue Property="Key"><Collection><Record Type="Org.OData.Core.V1.PropertyRef"><PropertyValue Property="Alias" String="userPrincipalName"/><PropertyValue Property="Name" PropertyPath="userPrincipalName"/></Record></Collection></PropertyValue></Record></Collection></Annotation></EntityType></Schema></edmx:DataServices></edmx:Edmx>',
+	},
+};
+
+export const microsoftEntraNodeResponse = {
+	createGroup: [
+		{
+			json: {
+				'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#groups/$entity',
+				id: 'a8eb60e3-0145-4d7e-85ef-c6259784761b',
+				deletedDateTime: null,
+				classification: null,
+				createdDateTime: '2024-11-17T15:46:32Z',
+				creationOptions: [],
+				displayName: 'Group Display Name',
+				expirationDateTime: null,
+				groupTypes: ['DynamicMembership', 'Unified'],
+				isAssignableToRole: true,
+				mail: null,
+				mailEnabled: true,
+				mailNickname: 'MailNickname',
+				membershipRule: 'department -eq "Marketing"',
+				membershipRuleProcessingState: 'On',
+				onPremisesDomainName: null,
+				onPremisesLastSyncDateTime: null,
+				onPremisesNetBiosName: null,
+				onPremisesSamAccountName: null,
+				onPremisesSecurityIdentifier: null,
+				onPremisesSyncEnabled: null,
+				preferredLanguage: null,
+				proxyAddresses: [],
+				renewedDateTime: '2024-11-17T15:46:32Z',
+				resourceBehaviorOptions: [],
+				resourceProvisioningOptions: [],
+				securityEnabled: true,
+				securityIdentifier: 'S-1-12-1-2833998051-1300103493-633794437-460752023',
+				theme: null,
+				onPremisesProvisioningErrors: [],
+				serviceProvisioningErrors: [],
+				description: 'Group Description',
+				preferredDataLocation: 'Preferred Data Location',
+				uniqueName: 'UniqueName',
+				visibility: 'Public',
+			},
+		},
+	],
+
+	deleteGroup: [
+		{
+			json: {
+				deleted: true,
+			},
+		},
+	],
+
+	getGroup: [{ json: { ...microsoftEntraApiResponse.getGroup } }],
+
+	getGroupWithProperties: [{ json: { ...microsoftEntraApiResponse.getGroupWithProperties } }],
+
+	updateGroup: [
+		{
+			json: {
+				updated: true,
+			},
+		},
+	],
+
+	addUserToGroup: [
+		{
+			json: {
+				added: true,
+			},
+		},
+	],
+
+	createUser: [
+		{
+			json: {
+				'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users/$entity',
+				id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+				businessPhones: ['0123456789'],
+				displayName: 'John Doe',
+				givenName: 'John',
+				jobTitle: 'Project manager',
+				mail: 'johndoe@contoso.com',
+				mobilePhone: '+123456789',
+				officeLocation: 'New York',
+				preferredLanguage: 'en-US',
+				// mailNickname: 'johndoe',
+				userPrincipalName: 'johndoe@contoso.com',
+				aboutMe: 'About me',
+				ageGroup: 'Adult',
+				birthday: '2024-11-12T00:00:00.000Z',
+				city: 'New York',
+				companyName: 'Contoso',
+				consentProvidedForMinor: 'Granted',
+				country: 'US',
+				department: 'IT',
+				employeeId: 'employee-id-123',
+				employeeType: 'Contractor',
+				employeeHireDate: '2024-11-13T00:00:00.000Z',
+				employeeLeaveDateTime: '2024-11-18T00:00:00.000Z',
+				employeeOrgData: {
+					costCenter: 'Cost Center 1',
+					division: 'Division 1',
+				},
+				interests: ['interest1', 'interest2'],
+				surname: 'Doe',
+				mySite: 'My Site',
+				onPremisesImmutableId: 'premiseid123',
+				otherMails: ['johndoe2@contoso.com', 'johndoe3@contoso.com'],
+				passwordPolicies: 'DisablePasswordExpiration,DisableStrongPassword',
+				passwordProfile: {
+					forceChangePasswordNextSignInWithMfa: true,
+				},
+				pastProjects: ['project1', 'project2'],
+				postalCode: '0123456',
+				responsibilities: ['responsibility1', 'responsibility2'],
+				schools: ['school1', 'school2'],
+				skills: ['skill1', 'skill2'],
+				state: 'New York',
+				streetAddress: 'Street 123',
+				usageLocation: 'US',
+				userType: 'Guest',
+			},
+		},
+	],
+
+	deleteUser: [
+		{
+			json: {
+				deleted: true,
+			},
+		},
+	],
+
+	getUser: [
+		{
+			json: {
+				'@odata.context': 'https://graph.microsoft.com/v1.0/$metadata#users/$entity',
+				businessPhones: ['0123456789'],
+				displayName: 'John Doe',
+				givenName: 'John',
+				jobTitle: 'Project manager',
+				mail: 'johndoe@contoso.com',
+				mobilePhone: '+123456789',
+				officeLocation: 'New York',
+				preferredLanguage: 'en-US',
+				surname: 'Doe',
+				userPrincipalName: 'johndoe@contoso.com',
+				id: '87d349ed-44d7-43e1-9a83-5f2406dee5bd',
+			},
+		},
+	],
+
+	removeUserFromGroup: [
+		{
+			json: {
+				removed: true,
+			},
+		},
+	],
+
+	updateUser: [
+		{
+			json: {
+				updated: true,
+			},
+		},
+	],
+
+	loadOptions: {
+		getGroupProperties: [
+			{
+				name: 'allowExternalSenders',
+				value: 'allowExternalSenders',
+			},
+			{
+				name: 'assignedLabels',
+				value: 'assignedLabels',
+			},
+			{
+				name: 'assignedLicenses',
+				value: 'assignedLicenses',
+			},
+			{
+				name: 'autoSubscribeNewMembers',
+				value: 'autoSubscribeNewMembers',
+			},
+			{
+				name: 'classification',
+				value: 'classification',
+			},
+			{
+				name: 'createdDateTime',
+				value: 'createdDateTime',
+			},
+			{
+				name: 'deletedDateTime',
+				value: 'deletedDateTime',
+			},
+			{
+				name: 'description',
+				value: 'description',
+			},
+			{
+				name: 'displayName',
+				value: 'displayName',
+			},
+			{
+				name: 'expirationDateTime',
+				value: 'expirationDateTime',
+			},
+			{
+				name: 'groupTypes',
+				value: 'groupTypes',
+			},
+			{
+				name: 'hideFromAddressLists',
+				value: 'hideFromAddressLists',
+			},
+			{
+				name: 'hideFromOutlookClients',
+				value: 'hideFromOutlookClients',
+			},
+			// {
+			// 	name: 'id',
+			// 	value: 'id',
+			// },
+			{
+				name: 'isAssignableToRole',
+				value: 'isAssignableToRole',
+			},
+			{
+				name: 'isManagementRestricted',
+				value: 'isManagementRestricted',
+			},
+			{
+				name: 'isSubscribedByMail',
+				value: 'isSubscribedByMail',
+			},
+			{
+				name: 'licenseProcessingState',
+				value: 'licenseProcessingState',
+			},
+			{
+				name: 'mail',
+				value: 'mail',
+			},
+			{
+				name: 'mailEnabled',
+				value: 'mailEnabled',
+			},
+			{
+				name: 'mailNickname',
+				value: 'mailNickname',
+			},
+			{
+				name: 'membershipRule',
+				value: 'membershipRule',
+			},
+			{
+				name: 'membershipRuleProcessingState',
+				value: 'membershipRuleProcessingState',
+			},
+			{
+				name: 'onPremisesDomainName',
+				value: 'onPremisesDomainName',
+			},
+			{
+				name: 'onPremisesLastSyncDateTime',
+				value: 'onPremisesLastSyncDateTime',
+			},
+			{
+				name: 'onPremisesNetBiosName',
+				value: 'onPremisesNetBiosName',
+			},
+			{
+				name: 'onPremisesProvisioningErrors',
+				value: 'onPremisesProvisioningErrors',
+			},
+			{
+				name: 'onPremisesSamAccountName',
+				value: 'onPremisesSamAccountName',
+			},
+			{
+				name: 'onPremisesSecurityIdentifier',
+				value: 'onPremisesSecurityIdentifier',
+			},
+			{
+				name: 'onPremisesSyncEnabled',
+				value: 'onPremisesSyncEnabled',
+			},
+			{
+				name: 'preferredDataLocation',
+				value: 'preferredDataLocation',
+			},
+			{
+				name: 'preferredLanguage',
+				value: 'preferredLanguage',
+			},
+			{
+				name: 'proxyAddresses',
+				value: 'proxyAddresses',
+			},
+			{
+				name: 'renewedDateTime',
+				value: 'renewedDateTime',
+			},
+			{
+				name: 'securityEnabled',
+				value: 'securityEnabled',
+			},
+			{
+				name: 'securityIdentifier',
+				value: 'securityIdentifier',
+			},
+			{
+				name: 'serviceProvisioningErrors',
+				value: 'serviceProvisioningErrors',
+			},
+			{
+				name: 'theme',
+				value: 'theme',
+			},
+			{
+				name: 'uniqueName',
+				value: 'uniqueName',
+			},
+			{
+				name: 'unseenCount',
+				value: 'unseenCount',
+			},
+			{
+				name: 'visibility',
+				value: 'visibility',
+			},
+		],
+
+		getUserProperties: [
+			{
+				name: 'aboutMe',
+				value: 'aboutMe',
+			},
+			{
+				name: 'accountEnabled',
+				value: 'accountEnabled',
+			},
+			{
+				name: 'ageGroup',
+				value: 'ageGroup',
+			},
+			{
+				name: 'assignedLicenses',
+				value: 'assignedLicenses',
+			},
+			{
+				name: 'assignedPlans',
+				value: 'assignedPlans',
+			},
+			{
+				name: 'authorizationInfo',
+				value: 'authorizationInfo',
+			},
+			{
+				name: 'birthday',
+				value: 'birthday',
+			},
+			{
+				name: 'businessPhones',
+				value: 'businessPhones',
+			},
+			{
+				name: 'city',
+				value: 'city',
+			},
+			{
+				name: 'companyName',
+				value: 'companyName',
+			},
+			{
+				name: 'consentProvidedForMinor',
+				value: 'consentProvidedForMinor',
+			},
+			{
+				name: 'country',
+				value: 'country',
+			},
+			{
+				name: 'createdDateTime',
+				value: 'createdDateTime',
+			},
+			{
+				name: 'creationType',
+				value: 'creationType',
+			},
+			{
+				name: 'customSecurityAttributes',
+				value: 'customSecurityAttributes',
+			},
+			{
+				name: 'deletedDateTime',
+				value: 'deletedDateTime',
+			},
+			{
+				name: 'department',
+				value: 'department',
+			},
+			{
+				name: 'displayName',
+				value: 'displayName',
+			},
+			{
+				name: 'employeeHireDate',
+				value: 'employeeHireDate',
+			},
+			{
+				name: 'employeeId',
+				value: 'employeeId',
+			},
+			{
+				name: 'employeeLeaveDateTime',
+				value: 'employeeLeaveDateTime',
+			},
+			{
+				name: 'employeeOrgData',
+				value: 'employeeOrgData',
+			},
+			{
+				name: 'employeeType',
+				value: 'employeeType',
+			},
+			{
+				name: 'externalUserState',
+				value: 'externalUserState',
+			},
+			{
+				name: 'externalUserStateChangeDateTime',
+				value: 'externalUserStateChangeDateTime',
+			},
+			{
+				name: 'faxNumber',
+				value: 'faxNumber',
+			},
+			{
+				name: 'givenName',
+				value: 'givenName',
+			},
+			{
+				name: 'hireDate',
+				value: 'hireDate',
+			},
+			// {
+			// 	name: 'id',
+			// 	value: 'id',
+			// },
+			{
+				name: 'identities',
+				value: 'identities',
+			},
+			{
+				name: 'imAddresses',
+				value: 'imAddresses',
+			},
+			{
+				name: 'interests',
+				value: 'interests',
+			},
+			{
+				name: 'isManagementRestricted',
+				value: 'isManagementRestricted',
+			},
+			{
+				name: 'isResourceAccount',
+				value: 'isResourceAccount',
+			},
+			{
+				name: 'jobTitle',
+				value: 'jobTitle',
+			},
+			{
+				name: 'lastPasswordChangeDateTime',
+				value: 'lastPasswordChangeDateTime',
+			},
+			{
+				name: 'legalAgeGroupClassification',
+				value: 'legalAgeGroupClassification',
+			},
+			{
+				name: 'licenseAssignmentStates',
+				value: 'licenseAssignmentStates',
+			},
+			{
+				name: 'mail',
+				value: 'mail',
+			},
+			{
+				name: 'mailNickname',
+				value: 'mailNickname',
+			},
+			// {
+			// 	name: 'mailboxSettings',
+			// 	value: 'mailboxSettings',
+			// },
+			{
+				name: 'mobilePhone',
+				value: 'mobilePhone',
+			},
+			{
+				name: 'mySite',
+				value: 'mySite',
+			},
+			{
+				name: 'officeLocation',
+				value: 'officeLocation',
+			},
+			{
+				name: 'onPremisesDistinguishedName',
+				value: 'onPremisesDistinguishedName',
+			},
+			{
+				name: 'onPremisesDomainName',
+				value: 'onPremisesDomainName',
+			},
+			{
+				name: 'onPremisesExtensionAttributes',
+				value: 'onPremisesExtensionAttributes',
+			},
+			{
+				name: 'onPremisesImmutableId',
+				value: 'onPremisesImmutableId',
+			},
+			{
+				name: 'onPremisesLastSyncDateTime',
+				value: 'onPremisesLastSyncDateTime',
+			},
+			{
+				name: 'onPremisesProvisioningErrors',
+				value: 'onPremisesProvisioningErrors',
+			},
+			{
+				name: 'onPremisesSamAccountName',
+				value: 'onPremisesSamAccountName',
+			},
+			{
+				name: 'onPremisesSecurityIdentifier',
+				value: 'onPremisesSecurityIdentifier',
+			},
+			{
+				name: 'onPremisesSyncEnabled',
+				value: 'onPremisesSyncEnabled',
+			},
+			{
+				name: 'onPremisesUserPrincipalName',
+				value: 'onPremisesUserPrincipalName',
+			},
+			{
+				name: 'otherMails',
+				value: 'otherMails',
+			},
+			{
+				name: 'passwordPolicies',
+				value: 'passwordPolicies',
+			},
+			{
+				name: 'passwordProfile',
+				value: 'passwordProfile',
+			},
+			{
+				name: 'pastProjects',
+				value: 'pastProjects',
+			},
+			{
+				name: 'postalCode',
+				value: 'postalCode',
+			},
+			{
+				name: 'preferredDataLocation',
+				value: 'preferredDataLocation',
+			},
+			{
+				name: 'preferredLanguage',
+				value: 'preferredLanguage',
+			},
+			{
+				name: 'preferredName',
+				value: 'preferredName',
+			},
+			{
+				name: 'provisionedPlans',
+				value: 'provisionedPlans',
+			},
+			{
+				name: 'proxyAddresses',
+				value: 'proxyAddresses',
+			},
+			{
+				name: 'responsibilities',
+				value: 'responsibilities',
+			},
+			{
+				name: 'schools',
+				value: 'schools',
+			},
+			{
+				name: 'securityIdentifier',
+				value: 'securityIdentifier',
+			},
+			{
+				name: 'serviceProvisioningErrors',
+				value: 'serviceProvisioningErrors',
+			},
+			{
+				name: 'showInAddressList',
+				value: 'showInAddressList',
+			},
+			// {
+			// 	name: 'signInActivity',
+			// 	value: 'signInActivity',
+			// },
+			{
+				name: 'signInSessionsValidFromDateTime',
+				value: 'signInSessionsValidFromDateTime',
+			},
+			{
+				name: 'skills',
+				value: 'skills',
+			},
+			{
+				name: 'state',
+				value: 'state',
+			},
+			{
+				name: 'streetAddress',
+				value: 'streetAddress',
+			},
+			{
+				name: 'surname',
+				value: 'surname',
+			},
+			{
+				name: 'usageLocation',
+				value: 'usageLocation',
+			},
+			{
+				name: 'userPrincipalName',
+				value: 'userPrincipalName',
+			},
+			{
+				name: 'userType',
+				value: 'userType',
+			},
+		],
+	},
+};
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
index cb0054e315..d53a43bd04 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/addTable.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
index 446abb5b5e..04c51e71cd 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/append.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
index faba8409ef..797e6c9de4 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/convertToRange.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
index 62616cf156..a771b77b5a 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/deleteTable.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
index e69bd72165..815c9581a1 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getColumns.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
index e9627700c9..d46d1a48a7 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/getRows.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
index e468b62336..1dd75ce25c 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/table/lookup.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
index 2c62bd6967..3ecc29f3ae 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/addWorksheet.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
index 007f579d21..0f4ba9e4b5 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/deleteWorkbook.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
index bdcf6a6333..f87820ebcd 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/workbook/getAll.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
index dd1752ce79..8cac626c00 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/append.test.ts
@@ -1,5 +1,6 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
index 7d60587541..aed1657626 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/clear.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
index 06711c0183..54b1ae221e 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/deleteWorksheet.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
index dbdd0a2ac7..1f9057a687 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/getAll.test.ts
@@ -1,10 +1,11 @@
 import type { IHttpRequestMethods, INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
index 17a8549dc1..181913cc89 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/readRows.test.ts
@@ -1,5 +1,6 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
index 3fef581c7c..0433d968db 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/update.test.ts
@@ -1,5 +1,6 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
index 9a81d34eb1..5de97bf39d 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/node/worksheet/upsert.test.ts
@@ -1,5 +1,6 @@
-import nock from 'nock';
 import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
 import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
 
 jest.mock('../../../../v2/transport', () => {
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts
index 8a67dbcf18..55deec3a00 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/test/v2/utils/utils.test.ts
@@ -1,7 +1,8 @@
-import { get } from 'lodash';
 import { mock } from 'jest-mock-extended';
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+import { get } from 'lodash';
 import { constructExecutionMetaData } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+
 import {
 	checkRange,
 	prepareOutput,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
index 9eecb99e2b..53d7764dfc 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v1/MicrosoftExcelV1.node.ts
@@ -11,20 +11,17 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../../utils/utilities';
+import { oldVersionNotice } from '@utils/descriptions';
+
 import {
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 	microsoftApiRequestAllItemsSkip,
 } from './GenericFunctions';
-
-import { workbookFields, workbookOperations } from './WorkbookDescription';
-
-import { worksheetFields, worksheetOperations } from './WorksheetDescription';
-
 import { tableFields, tableOperations } from './TableDescription';
-
-import { oldVersionNotice } from '@utils/descriptions';
+import { workbookFields, workbookOperations } from './WorkbookDescription';
+import { worksheetFields, worksheetOperations } from './WorksheetDescription';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Excel',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
index e3bfcbac95..bcec8f6354 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/MicrosoftExcelV2.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { listSearch, loadOptions } from './methods';
-import { versionDescription } from './actions/versionDescription';
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { listSearch, loadOptions } from './methods';
 
 export class MicrosoftExcelV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts
index a868bfa2c7..d2bd7a12f5 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/router.ts
@@ -1,7 +1,7 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { MicrosoftExcel } from './node.type';
 
+import type { MicrosoftExcel } from './node.type';
 import * as table from './table/Table.resource';
 import * as workbook from './workbook/Workbook.resource';
 import * as worksheet from './worksheet/Worksheet.resource';
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts
index 6fc4497805..f2f56b34a1 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/Table.resource.ts
@@ -1,7 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import * as append from './append.operation';
 import * as addTable from './addTable.operation';
+import * as append from './append.operation';
 import * as convertToRange from './convertToRange.operation';
 import * as deleteTable from './deleteTable.operation';
 import * as getColumns from './getColumns.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
index 6ab2109211..80db436622 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/addTable.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
index 11095e27cf..11e345c28b 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/append.operation.ts
@@ -4,11 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
index 9b20ab77c3..a09cb8b36a 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/convertToRange.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC, tableRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
index 5e1ec86f4f..fb1673ea21 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/deleteTable.operation.ts
@@ -1,7 +1,9 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC, tableRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
index e91596a402..17aa9da13b 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getColumns.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
index 059c195a2b..90ae8d6903 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/getRows.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest, microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
index 9e2f9f3cef..ccc11f6b74 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/table/lookup.operation.ts
@@ -6,9 +6,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequestAllItemsSkip } from '../../transport';
 import { tableRLC, workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
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/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
index 69294c0911..ca1ce95ae3 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/addWorksheet.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
index 297fbc37c4..ee389316db 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/deleteWorkbook.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
index 81a2081572..a506bf14bc 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/workbook/getAll.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Return All',
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
index e8af1938c8..94680f80dd 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/append.operation.ts
@@ -4,11 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
index 8299ee18b1..427a6ab8e1 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/clear.operation.ts
@@ -1,7 +1,9 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
index 0ecae73b46..0d2271a5a1 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/deleteWorksheet.operation.ts
@@ -1,7 +1,9 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [workbookRLC, worksheetRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
index 3681b60270..c22b87f331 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/getAll.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
 import { workbookRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
index 7b6389d814..26977a8078 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/readRows.operation.ts
@@ -4,11 +4,13 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse } from '../../helpers/interfaces';
 import { checkRange, prepareOutput } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
index 40a08a975e..b21a6b039e 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/update.operation.ts
@@ -5,6 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
 import {
 	checkRange,
@@ -14,7 +17,6 @@ import {
 } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
index 3745c76cac..c27feae6d5 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/actions/worksheet/upsert.operation.ts
@@ -5,6 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
+
 import type { ExcelResponse, UpdateSummary } from '../../helpers/interfaces';
 import {
 	checkRange,
@@ -14,7 +17,6 @@ import {
 } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
 import { workbookRLC, worksheetRLC } from '../common.descriptions';
-import { generatePairedItemData, processJsonInput, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	workbookRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
index 2303147ab3..12151a471a 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/helpers/utils.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INode, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { ExcelResponse, SheetData, UpdateSummary } from './interfaces';
+
 import { generatePairedItemData, wrapData } from '@utils/utilities';
 
+import type { ExcelResponse, SheetData, UpdateSummary } from './interfaces';
+
 type PrepareOutputConfig = {
 	rawData: boolean;
 	dataProperty?: string;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
index fa30a1ead5..f4d440c7f7 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/listSearch.ts
@@ -4,6 +4,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
+
 import { microsoftApiRequest } from '../transport';
 
 export async function searchWorkbooks(
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts
index 576f02c8c2..825ffd32e7 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/v2/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { microsoftApiRequest } from '../transport';
 
 export async function getWorksheetColumnRow(
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
index 0f465b0b52..293e847582 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
@@ -7,18 +7,17 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import {
-	msGraphSecurityApiRequest,
-	throwOnEmptyUpdate,
-	tolerateDoubleQuotes,
-} from './GenericFunctions';
-
 import {
 	secureScoreControlProfileFields,
 	secureScoreControlProfileOperations,
 	secureScoreFields,
 	secureScoreOperations,
 } from './descriptions';
+import {
+	msGraphSecurityApiRequest,
+	throwOnEmptyUpdate,
+	tolerateDoubleQuotes,
+} from './GenericFunctions';
 
 export class MicrosoftGraphSecurity implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
index 31381e65e3..8949db933c 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -8,7 +9,6 @@ import type {
 	IPollFunctions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-import { DateTime } from 'luxon';
 
 export async function microsoftApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
@@ -41,7 +41,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftOneDriveOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index bc067531ec..555d6faea2 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -8,11 +8,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { microsoftApiRequest, microsoftApiRequestAllItems } from './GenericFunctions';
-
 import { fileFields, fileOperations } from './FileDescription';
-
 import { folderFields, folderOperations } from './FolderDescription';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from './GenericFunctions';
 
 export class MicrosoftOneDrive implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts
index 3c49766adf..49bf57c686 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDriveTrigger.node.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import {
 	type IPollFunctions,
 	type IDataObject,
@@ -7,9 +8,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
-import { triggerDescription } from './TriggerDescription';
 import { getPath, microsoftApiRequest, microsoftApiRequestAllItemsDelta } from './GenericFunctions';
+import { triggerDescription } from './TriggerDescription';
 
 export class MicrosoftOneDriveTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
index 3c7c5e2674..8677a02d86 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/TriggerDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { MICROSOFT_DRIVE_FILE_URL_REGEX, MICROSOFT_DRIVE_FOLDER_URL_REGEX } from './constants';
 
 export const fileRLC: INodeProperties = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts
index 6c1e6805ff..b455de45c0 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlookTrigger.node.ts
@@ -1,3 +1,4 @@
+import { DateTime } from 'luxon';
 import {
 	type IPollFunctions,
 	type INodeExecutionData,
@@ -6,11 +7,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
-
-import { properties as messageProperties } from './trigger/MessageDescription';
-
 import { getPollResponse } from './trigger/GenericFunctions';
+import { properties as messageProperties } from './trigger/MessageDescription';
 import { loadOptions } from './v2/methods';
 
 export class MicrosoftOutlookTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
index 234d008fe7..822f20ca8a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
index 8ec751632f..bf14756f73 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/delete.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
index b579d89955..4f8b34c9ea 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/get.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
index 1e85bc12b7..4c8176a05a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/getAll.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
index 2ebea471cf..80a2acd1ab 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/calendar/update.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
index 364da5918d..0dae646594 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
index 13832486e0..239d8bb42d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/contact/update.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
index b9ca16b504..5f1dccf1ed 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
index d87f1b66fe..f88e8b2151 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/draft/send.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
index 9ac1296aa4..3fec538f0b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/event/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
index bcc5826bea..f9e2026c9d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folder/create.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
index 694bb3d103..c97a9895f3 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/folderMessage/getAll.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
index ac1415d23c..1673027104 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/move.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
index 2f4af23db7..c7d106847c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/reply.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
index cc5b6e5a43..0ce4e7f674 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/test/v2/node/message/send.test.ts
@@ -1,10 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 jest.mock('../../../../v2/transport', () => {
 	const originalModule = jest.requireActual('../../../../v2/transport');
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts
index 7999c1b8a5..0edbc78796 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/GenericFunctions.ts
@@ -1,14 +1,13 @@
 import { NodeApiError } from 'n8n-workflow';
 import type { JsonObject, IDataObject, INodeExecutionData, IPollFunctions } from 'n8n-workflow';
 
+import { prepareFilterString, simplifyOutputMessages } from '../v2/helpers/utils';
 import {
 	downloadAttachments,
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 } from '../v2/transport';
 
-import { prepareFilterString, simplifyOutputMessages } from '../v2/helpers/utils';
-
 export async function getPollResponse(
 	this: IPollFunctions,
 	pollStartDate: string,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
index 7c65cf37bb..6e78e9f83e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/trigger/MessageDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { messageFields } from '../v2/helpers/utils';
 
 export const properties: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts
index e9f8362116..e83174ef1a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v1/MicrosoftOutlookV1.node.ts
@@ -12,6 +12,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { oldVersionNotice } from '@utils/descriptions';
+
+import { draftFields, draftOperations } from './DraftDescription';
+import { draftMessageSharedFields } from './DraftMessageSharedDescription';
+import { folderFields, folderOperations } from './FolderDescription';
+import { folderMessageFields, folderMessageOperations } from './FolderMessageDecription';
 import {
 	createMessage,
 	downloadAttachments,
@@ -19,23 +25,11 @@ import {
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 } from './GenericFunctions';
-
-import { draftFields, draftOperations } from './DraftDescription';
-
-import { draftMessageSharedFields } from './DraftMessageSharedDescription';
-
-import { messageFields, messageOperations } from './MessageDescription';
-
 import {
 	messageAttachmentFields,
 	messageAttachmentOperations,
 } from './MessageAttachmentDescription';
-
-import { folderFields, folderOperations } from './FolderDescription';
-
-import { folderMessageFields, folderMessageOperations } from './FolderMessageDecription';
-
-import { oldVersionNotice } from '@utils/descriptions';
+import { messageFields, messageOperations } from './MessageDescription';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Outlook',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
index 7ac465f0b2..481c868b35 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/MicrosoftOutlookV2.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { loadOptions, listSearch } from './methods';
 import { description } from './actions/node.description';
 import { router } from './actions/router';
+import { loadOptions, listSearch } from './methods';
 
 export class MicrosoftOutlookV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts
index 87239e12c0..2bbba5d5d2 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/create.operation.ts
@@ -1,7 +1,9 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	{
 		displayName: 'Name',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
index 1110077676..acbe8736a8 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { calendarRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { calendarRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [calendarRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
index 826147db03..a237380db4 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { calendarRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { calendarRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [calendarRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
index e122863905..3568137445 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { returnAllOrLimit } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { returnAllOrLimit } from '../../descriptions';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts
index 132fa72b4e..686b06185a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
+import * as del from './delete.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
-import * as del from './delete.operation';
 import * as update from './update.operation';
 
 export { create, del as delete, get, getAll, update };
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
index 0564a5dc9e..3e3f076e02 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/calendar/update.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { calendarRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { calendarRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	calendarRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts
index 223dbfb378..72f3eb97ff 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/create.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { contactFields } from '../../descriptions';
 import { prepareContactFields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { contactFields } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
index 1037021149..ca8537b5cd 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { contactRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { contactRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [contactRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
index 6849d04d46..a4999f98e3 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { contactRLC } from '../../descriptions';
 import { contactFields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { contactRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	contactRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
index dec28b9dd7..071e358ee8 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { returnAllOrLimit } from '../../descriptions';
 import { contactFields } from '../../helpers/utils';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { returnAllOrLimit } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts
index 81d2bbcf4e..9a7299b29b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
 import * as del from './delete.operation';
-import * as getAll from './getAll.operation';
 import * as get from './get.operation';
+import * as getAll from './getAll.operation';
 import * as update from './update.operation';
 
 export { create, del as delete, get, getAll, update };
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts
index 07ffde1fda..5ee6a2524a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/contact/update.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { contactFields, contactRLC } from '../../descriptions';
 import { prepareContactFields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { contactFields, contactRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	contactRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts
index 7f7f7d4771..ea0249891e 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/create.operation.ts
@@ -5,9 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
index 1ff992d821..12e17e6abe 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { draftRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { draftRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [draftRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
index d8321768a9..b82810ac0c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { draftRLC } from '../../descriptions';
 import { messageFields, simplifyOutputMessages } from '../../helpers/utils';
 import { downloadAttachments, microsoftApiRequest } from '../../transport';
-import { draftRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts
index 9e8cc5cd11..a66b3509a3 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
 import * as del from './delete.operation';
 import * as get from './get.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
index a97d8a12c5..cc37dd4d5a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/send.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { draftRLC } from '../../descriptions';
 import { makeRecipient } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { draftRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
index 9f8f100d13..2be5f91413 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/draft/update.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { draftRLC } from '../../descriptions';
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { draftRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	draftRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
index 774110002d..f3d87d1f75 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/create.operation.ts
@@ -1,11 +1,13 @@
-import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 import { DateTime } from 'luxon';
 import moment from 'moment-timezone';
-import { microsoftApiRequest } from '../../transport';
-import { calendarRLC } from '../../descriptions';
+import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { calendarRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	calendarRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
index b211ef8c1c..2fa4311a57 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { calendarRLC, eventRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [calendarRLC, eventRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
index 54f32d7935..d3a9107762 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { calendarRLC, eventRLC } from '../../descriptions';
 import { decodeOutlookId, eventfields } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { calendarRLC, eventRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	calendarRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
index 60246daffa..85d21ea1e5 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { calendarRLC, returnAllOrLimit } from '../../descriptions';
 import { eventfields } from '../../helpers/utils';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { calendarRLC, returnAllOrLimit } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts
index d2881a1858..a725e64930 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
+import * as del from './delete.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
-import * as del from './delete.operation';
 import * as update from './update.operation';
 
 export { create, del as delete, get, getAll, update };
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
index 12bb952469..362434ed66 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/event/update.operation.ts
@@ -1,10 +1,11 @@
+import { DateTime } from 'luxon';
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
-import { microsoftApiRequest } from '../../transport';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { calendarRLC, eventRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [
 	calendarRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
index 521cdbeae9..c4e48e5f88 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/create.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
index 2441cf69e4..f50cc5d1e1 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [folderRLC];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
index b3f1c9014e..362174b0ea 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { folderFields, folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [
 	folderRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
index 91df451340..265f451986 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { getSubfolders, microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { folderFields, folderRLC, returnAllOrLimit } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { folderFields, folderRLC, returnAllOrLimit } from '../../descriptions';
+import { getSubfolders, microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts
index 46fd4c038f..4b21065565 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as create from './create.operation';
 import * as del from './delete.operation';
 import * as get from './get.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
index 41322e4961..b3cc85805c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folder/update.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { folderRLC } from '../../descriptions';
 import { decodeOutlookId } from '../../helpers/utils';
-import { updateDisplayOptions } from '@utils/utilities';
+import { microsoftApiRequest } from '../../transport';
 
 export const properties: INodeProperties[] = [
 	folderRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
index eec59b5061..7280553986 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/getAll.operation.ts
@@ -4,6 +4,10 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { folderRLC, returnAllOrLimit } from '../../descriptions';
 import {
 	decodeOutlookId,
 	messageFields,
@@ -16,9 +20,6 @@ import {
 	microsoftApiRequestAllItems,
 } from '../../transport';
 
-import { folderRLC, returnAllOrLimit } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
-
 export const properties: INodeProperties[] = [
 	folderRLC,
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts
index 6e20612378..91165e4c7c 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/folderMessage/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as getAll from './getAll.operation';
 
 export { getAll };
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts
index 8ee7511b41..71c00cb38d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/delete.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [messageRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
index a69ca7efb8..69a6516654 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/get.operation.ts
@@ -5,10 +5,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { messageRLC } from '../../descriptions';
 import { messageFields, simplifyOutputMessages } from '../../helpers/utils';
 import { downloadAttachments, getMimeContent, microsoftApiRequest } from '../../transport';
-import { messageRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
index dad68701e8..dba8d41cf5 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/getAll.operation.ts
@@ -4,14 +4,16 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { returnAllOrLimit } from '../../descriptions';
 import { messageFields, prepareFilterString, simplifyOutputMessages } from '../../helpers/utils';
 import {
 	downloadAttachments,
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 } from '../../transport';
-import { returnAllOrLimit } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
index bc81ba47d1..4002ed6538 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as del from './delete.operation';
 import * as get from './get.operation';
 import * as getAll from './getAll.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts
index 55c0f634e4..5f4900253f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/move.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { folderRLC, messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { folderRLC, messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	{ ...folderRLC, displayName: 'Parent Folder' },
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts
index c55f89c965..1961cf760b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/reply.operation.ts
@@ -5,10 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { messageRLC } from '../../descriptions';
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { messageRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts
index 54b8b5108e..b9baf4ce12 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/send.operation.ts
@@ -5,9 +5,11 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { createMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts
index 18d2114804..8d7935294f 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/message/update.operation.ts
@@ -1,9 +1,11 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { folderRLC, messageRLC } from '../../descriptions';
 import { createMessage, decodeOutlookId } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { folderRLC, messageRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 export const properties: INodeProperties[] = [
 	messageRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
index a2216b7255..f014595473 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/add.operation.ts
@@ -6,10 +6,12 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
index 7892b24ffa..89afe6f5eb 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/download.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { attachmentRLC, messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { attachmentRLC, messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	attachmentRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
index 16d1b4e749..932d51145d 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/get.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { attachmentRLC, messageRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { attachmentRLC, messageRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	attachmentRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
index be250c309a..80a215e67b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { IDataObject, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { messageRLC, returnAllOrLimit } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { messageRLC, returnAllOrLimit } from '../../descriptions';
+import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
+
 export const properties: INodeProperties[] = [
 	messageRLC,
 	...returnAllOrLimit,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts
index 24beaf050e..02722102fb 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/messageAttachment/index.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import * as add from './add.operation';
 import * as download from './download.operation';
 import * as get from './get.operation';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
index cbcc328fd0..50d0349683 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/node.description.ts
@@ -1,5 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
+
 import * as calendar from './calendar';
 import * as contact from './contact';
 import * as draft from './draft';
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
index d6033e3ec8..7fd67db228 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/actions/router.ts
@@ -1,7 +1,6 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { MicrosoftOutlook } from './node.type';
 import * as calendar from './calendar';
 import * as contact from './contact';
 import * as draft from './draft';
@@ -10,6 +9,7 @@ import * as folder from './folder';
 import * as folderMessage from './folderMessage';
 import * as message from './message';
 import * as messageAttachment from './messageAttachment';
+import type { MicrosoftOutlook } from './node.type';
 
 export async function router(this: IExecuteFunctions) {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts
index c0110ac8bc..ecdd99bf37 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/listSearch.ts
@@ -1,6 +1,7 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
-import { getSubfolders, microsoftApiRequest } from '../transport';
+
 import { encodeOutlookId } from '../helpers/utils';
+import { getSubfolders, microsoftApiRequest } from '../transport';
 
 async function search(
 	this: ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts
index 389d8b49a0..7e32e8ba0a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/methods/loadOptions.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+
 import { getSubfolders, microsoftApiRequestAllItems } from '../transport';
 
 export async function getCategoriesNames(
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts b/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts
index db85f5b60a..ef2d372185 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/v2/transport/index.ts
@@ -8,6 +8,7 @@ import type {
 	INodeExecutionData,
 	IPollFunctions,
 } from 'n8n-workflow';
+
 import { prepareApiError } from '../helpers/utils';
 
 export async function microsoftApiRequest(
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
index 4148028551..cea94648c3 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
index 8e972d8b0d..dfd9701049 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/deleteChannel.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
index b7ec5e9e0e..fa54945b7e 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
index 1b26d0b8f8..6ffa8ade53 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
index f3114f5978..364b4df799 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channel/update.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
index 4cf330bf3e..ec15aa2b13 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
index db13528329..8c1152e82d 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/channelMessage/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
index 5fac7c0d66..305c0069b0 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
index 8f9d2a660f..20c20ba4b9 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
index a4c89a0777..4d340a763a 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/chatMessage/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
index 2ee3a02f19..f550bd075b 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/create.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
index f991d91697..f7694b1cf0 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/deleteTask.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
index 7d768ee2ae..f70d458efb 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/get.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
index 0e6f63804e..42ce214d85 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/getAll.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestAllItemsSpy = jest.spyOn(transport, 'microsoftApiRequestAllItems');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
index 3f763dd307..9ec11c99bb 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/test/v2/node/task/update.test.ts
@@ -1,9 +1,11 @@
 import type { INodeTypes } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../../../../v2/transport';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+
+import * as transport from '../../../../v2/transport';
 
 const microsoftApiRequestSpy = jest.spyOn(transport, 'microsoftApiRequest');
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts
index 0449ead6cb..b4fe1631f1 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/GenericFunctions.ts
@@ -32,7 +32,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftTeamsOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts
index 88e4b71357..c3f4e778e3 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v1/MicrosoftTeamsV1.node.ts
@@ -10,20 +10,16 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { oldVersionNotice } from '../../../../utils/descriptions';
+import { channelFields, channelOperations } from './ChannelDescription';
+import { channelMessageFields, channelMessageOperations } from './ChannelMessageDescription';
+import { chatMessageFields, chatMessageOperations } from './ChatMessageDescription';
 import {
 	microsoftApiRequest,
 	microsoftApiRequestAllItems,
 	prepareMessage,
 } from './GenericFunctions';
-
-import { channelFields, channelOperations } from './ChannelDescription';
-
-import { channelMessageFields, channelMessageOperations } from './ChannelMessageDescription';
-
-import { chatMessageFields, chatMessageOperations } from './ChatMessageDescription';
-
 import { taskFields, taskOperations } from './TaskDescription';
+import { oldVersionNotice } from '../../../../utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Microsoft Teams',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
index c953de95a9..fbb54a05a0 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/MicrosoftTeamsV2.node.ts
@@ -5,9 +5,9 @@ import type {
 	INodeTypeBaseDescription,
 } from 'n8n-workflow';
 
-import { listSearch } from './methods';
 import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
+import { listSearch } from './methods';
 
 export class MicrosoftTeamsV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
index e41110a0b6..d40cef0ad7 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/create.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { teamRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { teamRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	teamRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts
index 2923170273..605b6db66a 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/deleteChannel.operation.ts
@@ -1,8 +1,10 @@
 import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { channelRLC, teamRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [teamRLC, channelRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts
index a7954ade28..4abeabfc87 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/get.operation.ts
@@ -1,8 +1,10 @@
 import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { channelRLC, teamRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [teamRLC, channelRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts
index 3a9ecf1056..195caefa9b 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequestAllItems } from '../../transport';
-import { teamRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
+
 import { returnAllOrLimit } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { teamRLC } from '../../descriptions';
+import { microsoftApiRequestAllItems } from '../../transport';
 
 const properties: INodeProperties[] = [teamRLC, ...returnAllOrLimit];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
index a88b19981d..22333e1639 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channel/update.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { channelRLC, teamRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	teamRLC,
 	channelRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
index 8054bccbd6..a32497a9af 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/create.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { channelRLC, teamRLC } from '../../descriptions';
 import { prepareMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	teamRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts
index 1384b508f3..0846673e66 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/channelMessage/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequestAllItems } from '../../transport';
-import { channelRLC, teamRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
+
 import { returnAllOrLimit } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { channelRLC, teamRLC } from '../../descriptions';
+import { microsoftApiRequestAllItems } from '../../transport';
 
 const properties: INodeProperties[] = [teamRLC, channelRLC, ...returnAllOrLimit];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
index de4cf5dcab..afef101ac1 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/create.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { chatRLC } from '../../descriptions';
 import { prepareMessage } from '../../helpers/utils';
 import { microsoftApiRequest } from '../../transport';
-import { chatRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	chatRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts
index 3aa27f7818..68f714b7bf 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/get.operation.ts
@@ -1,8 +1,10 @@
 import { type INodeProperties, type IExecuteFunctions, NodeOperationError } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
-import { chatRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { chatRLC } from '../../descriptions';
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	chatRLC,
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts
index a9ab2767d7..7d47d3f76e 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/chatMessage/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequestAllItems } from '../../transport';
-import { chatRLC } from '../../descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
+
 import { returnAllOrLimit } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
+import { chatRLC } from '../../descriptions';
+import { microsoftApiRequestAllItems } from '../../transport';
 
 const properties: INodeProperties[] = [chatRLC, ...returnAllOrLimit];
 
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
index d3111a95e3..6e4d966b3e 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/router.ts
@@ -5,11 +5,10 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import type { MicrosoftTeamsType } from './node.type';
-
 import * as channel from './channel';
 import * as channelMessage from './channelMessage';
 import * as chatMessage from './chatMessage';
+import type { MicrosoftTeamsType } from './node.type';
 import * as task from './task';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
index 29b7e46e45..5b4ed9e610 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/create.operation.ts
@@ -1,8 +1,10 @@
-import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
 import { DateTime } from 'luxon';
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { bucketRLC, groupRLC, memberRLC, planRLC } from '../../descriptions';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	groupRLC,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts
index 4873aa777b..c52f01f8e6 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/deleteTask.operation.ts
@@ -1,7 +1,9 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Task ID',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts
index db48178f4d..d2c02630b1 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/get.operation.ts
@@ -1,7 +1,9 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
-import { microsoftApiRequest } from '../../transport';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { microsoftApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Task ID',
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts
index d7a2894e19..4174d14f7e 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/getAll.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeProperties, IExecuteFunctions } from 'n8n-workflow';
+
+import { returnAllOrLimit } from '@utils/descriptions';
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { groupRLC, planRLC } from '../../descriptions';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
-import { returnAllOrLimit } from '@utils/descriptions';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts
index 56522b8a06..016c1f2bc7 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/actions/task/update.operation.ts
@@ -1,8 +1,10 @@
-import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
 import { DateTime } from 'luxon';
+import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
+import { updateDisplayOptions } from '@utils/utilities';
+
 import { bucketRLC, groupRLC, memberRLC, planRLC } from '../../descriptions';
 import { microsoftApiRequest } from '../../transport';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts
index 3b7c0ba125..6965740853 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/methods/listSearch.ts
@@ -6,8 +6,9 @@ import {
 	type INodeListSearchResult,
 	sleep,
 } from 'n8n-workflow';
-import { microsoftApiRequest } from '../transport';
+
 import { filterSortSearchListItems } from '../helpers/utils';
+import { microsoftApiRequest } from '../transport';
 
 export async function getChats(
 	this: ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts b/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts
index 4b0e4fb1d4..4e53faeb76 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/v2/transport/index.ts
@@ -7,6 +7,7 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import { capitalize } from '../../../../../utils/utilities';
 
 export async function microsoftApiRequest(
@@ -32,7 +33,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftTeamsOAuth2Api', options);
 	} catch (error) {
 		const errorOptions: IDataObject = {};
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
index 4f5e4deb71..0e21aae05d 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
@@ -35,7 +35,6 @@ export async function microsoftApiRequest(
 		if (Object.keys(body).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftToDoOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
index eb8622ee6f..390f38d57a 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,14 +10,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { microsoftApiRequest, microsoftApiRequestAllItems } from './GenericFunctions';
-
 import { linkedResourceFields, linkedResourceOperations } from './LinkedResourceDescription';
-
-import { taskFields, taskOperations } from './TaskDescription';
-
 import { listFields, listOperations } from './ListDescription';
+import { taskFields, taskOperations } from './TaskDescription';
 
 export class MicrosoftToDo implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Misp/GenericFunctions.ts b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
index e7e994f174..ecbc398060 100644
--- a/packages/nodes-base/nodes/Misp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
@@ -1,4 +1,3 @@
-import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,6 +7,8 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, jsonParse } from 'n8n-workflow';
+import { URL } from 'url';
+
 import type { MispCredentials } from './types';
 
 export async function mispApiRequest(
@@ -17,9 +18,7 @@ export async function mispApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl, allowUnauthorizedCerts } = (await this.getCredentials(
-		'mispApi',
-	)) as MispCredentials;
+	const { baseUrl, allowUnauthorizedCerts } = await this.getCredentials<MispCredentials>('mispApi');
 
 	const options: IRequestOptions = {
 		method,
diff --git a/packages/nodes-base/nodes/Misp/Misp.node.ts b/packages/nodes-base/nodes/Misp/Misp.node.ts
index 59ce7b8095..0e42e15bcf 100644
--- a/packages/nodes-base/nodes/Misp/Misp.node.ts
+++ b/packages/nodes-base/nodes/Misp/Misp.node.ts
@@ -8,15 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import {
-	mispApiRequest,
-	mispApiRequestAllItems,
-	mispApiRestSearch,
-	throwOnEmptyUpdate,
-	throwOnInvalidUrl,
-	throwOnMissingSharingGroup,
-} from './GenericFunctions';
-
 import {
 	attributeFields,
 	attributeOperations,
@@ -41,7 +32,14 @@ import {
 	warninglistFields,
 	warninglistOperations,
 } from './descriptions';
-
+import {
+	mispApiRequest,
+	mispApiRequestAllItems,
+	mispApiRestSearch,
+	throwOnEmptyUpdate,
+	throwOnInvalidUrl,
+	throwOnMissingSharingGroup,
+} from './GenericFunctions';
 import type { LoadedOrgs, LoadedSharingGroups, LoadedTags, LoadedUsers } from './types';
 
 export class Misp implements INodeType {
diff --git a/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
index a04d76eb11..27e4de28cd 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/AttributeDescription.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../utils/utilities';
+
 import { searchProperties } from './common.descriptions';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const searchDisplayOptions = {
 	show: {
diff --git a/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
index 94d2a1a1e5..62a7a24010 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/EventDescription.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../utils/utilities';
+
 import { searchProperties } from './common.descriptions';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const searchDisplayOptions = {
 	show: {
diff --git a/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts b/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts
index ad38ede1c8..f65e438951 100644
--- a/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Misp/descriptions/ObjectDescription.ts
@@ -1,6 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { updateDisplayOptions } from '../../../utils/utilities';
+
 import { searchProperties } from './common.descriptions';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const searchDisplayOptions = {
 	show: {
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index ff993c7d1c..24d5a71c07 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function mondayComApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	body: any = {},
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
index c84cd9d872..a9064ae047 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
@@ -1,3 +1,5 @@
+import { snakeCase } from 'change-case';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,23 +9,17 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
+import { boardColumnFields, boardColumnOperations } from './BoardColumnDescription';
+import { boardFields, boardOperations } from './BoardDescription';
+import { boardGroupFields, boardGroupOperations } from './BoardGroupDescription';
+import { boardItemFields, boardItemOperations } from './BoardItemDescription';
 import {
 	mondayComApiPaginatedRequest,
 	mondayComApiRequest,
 	mondayComApiRequestAllItems,
 } from './GenericFunctions';
 
-import { boardFields, boardOperations } from './BoardDescription';
-
-import { boardColumnFields, boardColumnOperations } from './BoardColumnDescription';
-
-import { boardGroupFields, boardGroupOperations } from './BoardGroupDescription';
-
-import { boardItemFields, boardItemOperations } from './BoardItemDescription';
-
 interface IGraphqlBody {
 	query: string;
 	variables: IDataObject;
diff --git a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
index 32adcf0b79..68edc03e1d 100644
--- a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
@@ -1,21 +1,21 @@
-import { createSecureContext } from 'tls';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import { MongoClient, ObjectId } from 'mongodb';
+import { NodeOperationError } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	IExecuteFunctions,
 	INodeExecutionData,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { createSecureContext } from 'tls';
 
-import get from 'lodash/get';
-import set from 'lodash/set';
-import { MongoClient, ObjectId } from 'mongodb';
-import { formatPrivateKey } from '../../utils/utilities';
 import type {
 	IMongoCredentials,
 	IMongoCredentialsType,
 	IMongoParametricCredentials,
 } from './mongoDb.types';
+import { formatPrivateKey } from '../../utils/utilities';
 
 /**
  * Standard way of building the MongoDB connection string, unless overridden with a provided string
@@ -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/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 14d8718b92..349e56fd43 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -1,3 +1,11 @@
+import type {
+	FindOneAndReplaceOptions,
+	FindOneAndUpdateOptions,
+	UpdateOptions,
+	Sort,
+} from 'mongodb';
+import { ObjectId } from 'mongodb';
+import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -9,17 +17,6 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { ApplicationError, NodeConnectionType } from 'n8n-workflow';
-
-import type {
-	FindOneAndReplaceOptions,
-	FindOneAndUpdateOptions,
-	UpdateOptions,
-	Sort,
-} from 'mongodb';
-import { ObjectId } from 'mongodb';
-import { generatePairedItemData } from '../../utils/utilities';
-import { nodeProperties } from './MongoDbProperties';
 
 import {
 	buildParameterizedConnString,
@@ -29,8 +26,9 @@ import {
 	stringifyObjectIDs,
 	validateAndResolveMongoCredentials,
 } from './GenericFunctions';
-
 import type { IMongoParametricCredentials } from './mongoDb.types';
+import { nodeProperties } from './MongoDbProperties';
+import { generatePairedItemData } from '../../utils/utilities';
 
 export class MongoDb implements INodeType {
 	description: INodeTypeDescription = {
@@ -210,7 +208,11 @@ export class MongoDb implements INodeType {
 						query = query.sort(sort);
 					}
 
-					if (projection && projection instanceof Document) {
+					if (
+						projection &&
+						Object.keys(projection).length !== 0 &&
+						projection.constructor === Object
+					) {
 						query = query.project(projection);
 					}
 
diff --git a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
index 32ef253ef8..30bb08789b 100644
--- a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
@@ -8,13 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import {
-	getDateParts,
-	monicaCrmApiRequest,
-	monicaCrmApiRequestAllItems,
-	toOptions,
-} from './GenericFunctions';
-
 import {
 	activityFields,
 	activityOperations,
@@ -41,7 +34,12 @@ import {
 	taskFields,
 	taskOperations,
 } from './descriptions';
-
+import {
+	getDateParts,
+	monicaCrmApiRequest,
+	monicaCrmApiRequestAllItems,
+	toOptions,
+} from './GenericFunctions';
 import type { LoaderGetResponse, Option } from './types';
 
 export class MonicaCrm implements INodeType {
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
index fa2597a341..0c379ad591 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
@@ -1,7 +1,7 @@
+import iconv from 'iconv-lite';
 import get from 'lodash/get';
 import set from 'lodash/set';
 import unset from 'lodash/unset';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -18,8 +18,6 @@ import {
 	NodeOperationError,
 } from 'n8n-workflow';
 
-import iconv from 'iconv-lite';
-
 iconv.encodingExists('utf8');
 
 // Create options for bomAware and encoding
diff --git a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
index 698284f9be..087c1f461c 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test Move Binary Data Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
index 55c4007eda..b9dff77153 100644
--- a/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v1/executeQuery.test.ts
@@ -1,9 +1,9 @@
 import type { INodeTypes } from 'n8n-workflow';
-
 import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 const queryMock = jest.fn(async function () {
 	return [{ success: true }];
diff --git a/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts b/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts
index 359c21c465..97ba52cc77 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/operations.test.ts
@@ -1,17 +1,16 @@
+import mysql2 from 'mysql2/promise';
 import type { IDataObject, INode } from 'n8n-workflow';
 
-import mysql2 from 'mysql2/promise';
-import * as deleteTable from '../../v2/actions/database/deleteTable.operation';
+import { createMockExecuteFunction } from '@test/nodes/Helpers';
 
+import * as deleteTable from '../../v2/actions/database/deleteTable.operation';
 import * as executeQuery from '../../v2/actions/database/executeQuery.operation';
 import * as insert from '../../v2/actions/database/insert.operation';
 import * as select from '../../v2/actions/database/select.operation';
 import * as update from '../../v2/actions/database/update.operation';
 import * as upsert from '../../v2/actions/database/upsert.operation';
-
 import type { Mysql2Pool, QueryRunner } from '../../v2/helpers/interfaces';
 import { configureQueryRunner } from '../../v2/helpers/utils';
-import { createMockExecuteFunction } from '@test/nodes/Helpers';
 
 const mySqlMockNode: INode = {
 	id: '1',
diff --git a/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts b/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
index b84a5cf66b..3b07456a96 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/runQueries.test.ts
@@ -1,11 +1,12 @@
-import type { IDataObject, INode } from 'n8n-workflow';
 import mysql2 from 'mysql2/promise';
-import { configureQueryRunner } from '../../v2/helpers/utils';
-import type { Mysql2Pool, QueryRunner } from '../../v2/helpers/interfaces';
-import { BATCH_MODE } from '../../v2/helpers/interfaces';
+import type { IDataObject, INode } from 'n8n-workflow';
 
 import { createMockExecuteFunction } from '@test/nodes/Helpers';
 
+import type { Mysql2Pool, QueryRunner } from '../../v2/helpers/interfaces';
+import { BATCH_MODE } from '../../v2/helpers/interfaces';
+import { configureQueryRunner } from '../../v2/helpers/utils';
+
 const mySqlMockNode: INode = {
 	id: '1',
 	name: 'MySQL node',
diff --git a/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts b/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts
index 92bfa58ed0..0fb385488f 100644
--- a/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/MySql/test/v2/utils.test.ts
@@ -1,6 +1,6 @@
 import type { INode } from 'n8n-workflow';
-import type { SortRule, WhereClause } from '../../v2/helpers/interfaces';
 
+import type { SortRule, WhereClause } from '../../v2/helpers/interfaces';
 import {
 	prepareQueryAndReplacements,
 	wrapData,
diff --git a/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts b/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
index 0cdf6ce19d..68b35a980d 100644
--- a/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MySql/v1/GenericFunctions.ts
@@ -1,10 +1,10 @@
+import mysql2 from 'mysql2/promise';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeListSearchResult,
 } from 'n8n-workflow';
-import mysql2 from 'mysql2/promise';
 
 export async function createConnection(
 	credentials: ICredentialDataDecryptedObject,
diff --git a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
index 6209111b67..977c37b3a6 100644
--- a/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
+++ b/packages/nodes-base/nodes/MySql/v1/MySqlV1.node.ts
@@ -1,3 +1,4 @@
+import type mysql2 from 'mysql2/promise';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -12,13 +13,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import type mysql2 from 'mysql2/promise';
-
-import { createConnection, searchTables } from './GenericFunctions';
-
 import { oldVersionNotice } from '@utils/descriptions';
 import { getResolvables } from '@utils/utilities';
 
+import { createConnection, searchTables } from './GenericFunctions';
+
 const versionDescription: INodeTypeDescription = {
 	displayName: 'MySQL',
 	name: 'mySql',
diff --git a/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts b/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
index 2adf717a5c..f14a7f0b74 100644
--- a/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
+++ b/packages/nodes-base/nodes/MySql/v2/MySqlV2.node.ts
@@ -6,11 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import { listSearch, credentialTest, loadOptions } from './methods';
-
-import { versionDescription } from './actions/versionDescription';
-
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { listSearch, credentialTest, loadOptions } from './methods';
 
 export class MySqlV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
index 6591e62233..0cc86008a6 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/common.descriptions.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { BATCH_MODE, SINGLE } from '../helpers/interfaces';
 
 export const tableRLC: INodeProperties = {
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/Database.resource.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/Database.resource.ts
index 90e07ae7d2..88e93664e0 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/Database.resource.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/Database.resource.ts
@@ -1,12 +1,12 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { tableRLC } from '../common.descriptions';
 import * as deleteTable from './deleteTable.operation';
 import * as executeQuery from './executeQuery.operation';
 import * as insert from './insert.operation';
 import * as select from './select.operation';
 import * as update from './update.operation';
 import * as upsert from './upsert.operation';
+import { tableRLC } from '../common.descriptions';
 
 export { deleteTable, executeQuery, insert, select, update, upsert };
 
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts
index 3b72573977..385c9eb93f 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/deleteTable.operation.ts
@@ -6,21 +6,20 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	QueryRunner,
 	QueryValues,
 	QueryWithValues,
 	WhereClause,
 } from '../../helpers/interfaces';
-
 import { addWhereClauses, escapeSqlIdentifier } from '../../helpers/utils';
-
 import {
 	optionsCollection,
 	selectRowsFixedCollection,
 	combineConditionsCollection,
 } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts
index 9af1b9eaa3..8991f4590e 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/executeQuery.operation.ts
@@ -6,13 +6,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { QueryRunner, QueryWithValues } from '../../helpers/interfaces';
-
-import { prepareQueryAndReplacements, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
-import { optionsCollection } from '../common.descriptions';
 import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
+import type { QueryRunner, QueryWithValues } from '../../helpers/interfaces';
+import { prepareQueryAndReplacements, replaceEmptyStringsByNulls } from '../../helpers/utils';
+import { optionsCollection } from '../common.descriptions';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Query',
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts
index 5ff05181ed..4646b73a00 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/insert.operation.ts
@@ -5,19 +5,17 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	QueryMode,
 	QueryRunner,
 	QueryValues,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
 import { AUTO_MAP, BATCH_MODE, DATA_MODE } from '../../helpers/interfaces';
-
 import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts
index 7b16574f75..d8d5341c36 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/select.operation.ts
@@ -5,6 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	QueryRunner,
 	QueryValues,
@@ -12,16 +14,13 @@ import type {
 	SortRule,
 	WhereClause,
 } from '../../helpers/interfaces';
-
 import { addSortRules, addWhereClauses, escapeSqlIdentifier } from '../../helpers/utils';
-
 import {
 	optionsCollection,
 	sortFixedCollection,
 	selectRowsFixedCollection,
 	combineConditionsCollection,
 } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts
index 62ba0c23ab..e21cf8ee3a 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/update.operation.ts
@@ -5,13 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type { QueryRunner, QueryValues, QueryWithValues } from '../../helpers/interfaces';
 import { AUTO_MAP, DATA_MODE } from '../../helpers/interfaces';
-
 import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts b/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts
index 7009edecc2..746441188b 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/database/upsert.operation.ts
@@ -5,13 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type { QueryRunner, QueryValues, QueryWithValues } from '../../helpers/interfaces';
 import { AUTO_MAP, DATA_MODE } from '../../helpers/interfaces';
-
 import { escapeSqlIdentifier, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/MySql/v2/actions/router.ts b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
index e9ef6a8591..722d9bb06f 100644
--- a/packages/nodes-base/nodes/MySql/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/MySql/v2/actions/router.ts
@@ -1,11 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { createPool } from '../transport';
-import type { MysqlNodeCredentials, QueryRunner } from '../helpers/interfaces';
-import { configureQueryRunner } from '../helpers/utils';
 import * as database from './database/Database.resource';
 import type { MySqlType } from './node.type';
+import type { MysqlNodeCredentials, QueryRunner } from '../helpers/interfaces';
+import { configureQueryRunner } from '../helpers/utils';
+import { createPool } from '../transport';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
index 60df354528..7d7bbda262 100644
--- a/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/MySql/v2/helpers/utils.ts
@@ -6,10 +6,8 @@ import type {
 	IPairedItemData,
 	NodeExecutionWithMetadata,
 } from 'n8n-workflow';
-
 import { NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	Mysql2Pool,
 	QueryMode,
@@ -18,8 +16,8 @@ import type {
 	SortRule,
 	WhereClause,
 } from './interfaces';
-
 import { BATCH_MODE } from './interfaces';
+import { generatePairedItemData } from '../../../../utils/utilities';
 
 export function escapeSqlIdentifier(identifier: string): string {
 	const parts = identifier.match(/(`[^`]*`|[^.`]+)/g) ?? [];
diff --git a/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
index b89e18f691..0a8bb34d51 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/credentialTest.ts
@@ -4,8 +4,8 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
-import { createPool } from '../transport';
 import type { MysqlNodeCredentials } from '../helpers/interfaces';
+import { createPool } from '../transport';
 
 export async function mysqlConnectionTest(
 	this: ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts b/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts
index bf4af6b612..65ec2f5306 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/listSearch.ts
@@ -1,6 +1,7 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
-import { createPool } from '../transport';
+
 import type { MysqlNodeCredentials } from '../helpers/interfaces';
+import { createPool } from '../transport';
 
 export async function searchTables(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
 	const credentials = await this.getCredentials<MysqlNodeCredentials>('mySql');
diff --git a/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
index f74da247ab..08aa444b0f 100644
--- a/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/MySql/v2/methods/loadOptions.ts
@@ -1,7 +1,8 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import { createPool } from '../transport';
-import { escapeSqlIdentifier } from '../helpers/utils';
+
 import type { MysqlNodeCredentials } from '../helpers/interfaces';
+import { escapeSqlIdentifier } from '../helpers/utils';
+import { createPool } from '../transport';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const credentials = await this.getCredentials<MysqlNodeCredentials>('mySql');
diff --git a/packages/nodes-base/nodes/MySql/v2/transport/index.ts b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
index ca7d55bcb6..49b6434f12 100644
--- a/packages/nodes-base/nodes/MySql/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/MySql/v2/transport/index.ts
@@ -1,4 +1,3 @@
-import { createServer, type AddressInfo } from 'node:net';
 import mysql2 from 'mysql2/promise';
 import type {
 	ICredentialTestFunctions,
@@ -6,10 +5,12 @@ import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-workflow';
+import { createServer, type AddressInfo } from 'node:net';
+
+import { LOCALHOST } from '@utils/constants';
+import { formatPrivateKey } from '@utils/utilities';
 
 import type { Mysql2Pool, MysqlNodeCredentials } from '../helpers/interfaces';
-import { formatPrivateKey } from '@utils/utilities';
-import { LOCALHOST } from '@utils/constants';
 
 export async function createPool(
 	this: IExecuteFunctions | ICredentialTestFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/N8n/CredentialDescription.ts b/packages/nodes-base/nodes/N8n/CredentialDescription.ts
index fa701d0815..6ca1ef502b 100644
--- a/packages/nodes-base/nodes/N8n/CredentialDescription.ts
+++ b/packages/nodes-base/nodes/N8n/CredentialDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { parseAndSetBodyJson } from './GenericFunctions';
 
 export const credentialOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
index b37184c772..e4c7eaf854 100644
--- a/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
+++ b/packages/nodes-base/nodes/N8n/ExecutionDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { getCursorPaginator } from './GenericFunctions';
 import { workflowIdLocator } from './WorkflowLocator';
 
diff --git a/packages/nodes-base/nodes/N8n/N8n.node.ts b/packages/nodes-base/nodes/N8n/N8n.node.ts
index a58c855164..12e976af73 100644
--- a/packages/nodes-base/nodes/N8n/N8n.node.ts
+++ b/packages/nodes-base/nodes/N8n/N8n.node.ts
@@ -1,4 +1,5 @@
 import { NodeConnectionType, type INodeType, type INodeTypeDescription } from 'n8n-workflow';
+
 import { auditFields, auditOperations } from './AuditDescription';
 import { credentialFields, credentialOperations } from './CredentialDescription';
 import { executionFields, executionOperations } from './ExecutionDescription';
diff --git a/packages/nodes-base/nodes/N8n/WorkflowDescription.ts b/packages/nodes-base/nodes/N8n/WorkflowDescription.ts
index 20a97719b0..9b8d4360b7 100644
--- a/packages/nodes-base/nodes/N8n/WorkflowDescription.ts
+++ b/packages/nodes-base/nodes/N8n/WorkflowDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import {
 	getCursorPaginator,
 	parseAndSetBodyJson,
diff --git a/packages/nodes-base/nodes/N8n/WorkflowLocator.ts b/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
index 612a12c275..7b55435231 100644
--- a/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
+++ b/packages/nodes-base/nodes/N8n/WorkflowLocator.ts
@@ -1,4 +1,5 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult, INodeProperties } from 'n8n-workflow';
+
 import { apiRequestAllItems } from './GenericFunctions';
 
 type DataItemsResponse<T> = {
diff --git a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
index e4b0b4d930..d477668662 100644
--- a/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
+++ b/packages/nodes-base/nodes/N8n/test/node/N8n.test.ts
@@ -1,9 +1,8 @@
-import nock from 'nock';
 import type { INodeTypes } from 'n8n-workflow';
-import { setup, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
+import nock from 'nock';
 
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
-
+import { setup, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('Test N8n Node, expect base_url to be received from credentials', () => {
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 7088465009..36e33e5ed3 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,7 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { nasaApiRequest, nasaApiRequestAllItems } from './GenericFunctions';
 
 export class Nasa implements INodeType {
diff --git a/packages/nodes-base/nodes/Netlify/Netlify.node.ts b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
index c2f6f93320..43894ea130 100644
--- a/packages/nodes-base/nodes/Netlify/Netlify.node.ts
+++ b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
@@ -9,10 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { netlifyApiRequest, netlifyRequestAllItems } from './GenericFunctions';
-
 import { deployFields, deployOperations } from './DeployDescription';
-
+import { netlifyApiRequest, netlifyRequestAllItems } from './GenericFunctions';
 import { siteFields, siteOperations } from './SiteDescription';
 
 export class Netlify implements INodeType {
diff --git a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
index 4723001318..ac8b6b5294 100644
--- a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { netlifyApiRequest } from './GenericFunctions';
 
 export class NetlifyTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts b/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts
index 2f7fff154d..19b067b027 100644
--- a/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts
+++ b/packages/nodes-base/nodes/Netscaler/ADC/NetscalerAdc.node.ts
@@ -9,11 +9,9 @@ import {
 	type JsonObject,
 } from 'n8n-workflow';
 
-import { netscalerADCApiRequest } from './GenericFunctions';
-
-import { fileDescription } from './FileDescription';
-
 import { certificateDescription } from './CertificateDescription';
+import { fileDescription } from './FileDescription';
+import { netscalerADCApiRequest } from './GenericFunctions';
 
 export class NetscalerAdc implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index 9a710c2a9c..bcae490194 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -1,4 +1,3 @@
-import { URLSearchParams } from 'url';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -10,11 +9,11 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
+import { URLSearchParams } from 'url';
 import { parseString } from 'xml2js';
 
-import { wrapData } from '../../utils/utilities';
 import { nextCloudApiRequest } from './GenericFunctions';
+import { wrapData } from '../../utils/utilities';
 
 export class NextCloud implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
index 0cadbc5b1d..77775f082b 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
@@ -12,7 +12,6 @@ import type {
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
-
 import { operationFields } from './OperationDescription';
 
 export class NocoDB implements INodeType {
diff --git a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
index 49079c3c81..3d83fed7f1 100644
--- a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
+++ b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IPollFunctions,
 	type IDataObject,
@@ -7,16 +8,14 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { notionApiRequest, simplifyObjects } from './shared/GenericFunctions';
-
-import { listSearch } from './shared/methods';
 import {
 	databaseUrlExtractionRegexp,
 	databaseUrlValidationRegexp,
 	idExtractionRegexp,
 	idValidationRegexp,
 } from './shared/constants';
+import { notionApiRequest, simplifyObjects } from './shared/GenericFunctions';
+import { listSearch } from './shared/methods';
 
 export class NotionTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
index 2fd594756f..b7404b0400 100644
--- a/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Notion/shared/GenericFunctions.ts
@@ -1,3 +1,6 @@
+import { camelCase, capitalCase, snakeCase } from 'change-case';
+import set from 'lodash/set';
+import moment from 'moment-timezone';
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -8,6 +11,7 @@ import type {
 	ILoadOptionsFunctions,
 	INode,
 	INodeExecutionData,
+	INodeParameterResourceLocator,
 	INodeProperties,
 	IPairedItemData,
 	IPollFunctions,
@@ -15,15 +19,10 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-
-import { camelCase, capitalCase, snakeCase } from 'change-case';
-
-import moment from 'moment-timezone';
-
 import { validate as uuidValidate } from 'uuid';
-import set from 'lodash/set';
+
+import { blockUrlExtractionRegexp, databasePageUrlValidationRegexp } from './constants';
 import { filters } from './descriptions/Filters';
-import { blockUrlExtractionRegexp } from './constants';
 
 function uuidValidateWithoutDashes(this: IExecuteFunctions, value: string) {
 	if (uuidValidate(value)) return true;
@@ -574,7 +573,7 @@ export function mapFilters(filtersList: IDataObject[], timezone: string) {
 		}
 
 		return Object.assign(obj, {
-			['property']: getNameAndType(value.key as string).name,
+			['property']: getNameAndType(value.key as string)?.name,
 			[key]: { [`${value.condition}`]: valuePropertyName },
 		});
 	}, {});
@@ -605,7 +604,7 @@ function simplifyProperty(property: any) {
 	) {
 		result = property[type];
 	} else if (['created_by', 'last_edited_by', 'select'].includes(property.type as string)) {
-		result = property[type] ? property[type].name : null;
+		result = property[type] ? property[type]?.name : null;
 	} else if (['people'].includes(property.type as string)) {
 		if (Array.isArray(property[type])) {
 			result = property[type].map((person: any) => person.person?.email || {});
@@ -614,35 +613,35 @@ function simplifyProperty(property: any) {
 		}
 	} else if (['multi_select'].includes(property.type as string)) {
 		if (Array.isArray(property[type])) {
-			result = property[type].map((e: IDataObject) => e.name || {});
+			result = property[type].map((e: IDataObject) => e?.name || {});
 		} else {
-			result = property[type].options.map((e: IDataObject) => e.name || {});
+			result = property[type].options.map((e: IDataObject) => e?.name || {});
 		}
 	} else if (['relation'].includes(property.type as string)) {
 		if (Array.isArray(property[type])) {
-			result = property[type].map((e: IDataObject) => e.id || {});
+			result = property[type].map((e: IDataObject) => e?.id || {});
 		} else {
-			result = property[type].database_id;
+			result = property[type]?.database_id;
 		}
 	} else if (['formula'].includes(property.type as string)) {
-		result = property[type][property[type].type];
+		result = property[type]?.[property[type]?.type];
 	} else if (['rollup'].includes(property.type as string)) {
-		const rollupFunction = property[type].function as string;
+		const rollupFunction = property[type]?.function as string;
 		if (rollupFunction.startsWith('count') || rollupFunction.includes('empty')) {
-			result = property[type].number;
+			result = property[type]?.number;
 			if (rollupFunction.includes('percent')) {
 				result = result * 100;
 			}
-		} else if (rollupFunction.startsWith('show') && property[type].type === 'array') {
+		} else if (rollupFunction.startsWith('show') && property[type]?.type === 'array') {
 			const elements = property[type].array.map(simplifyProperty).flat();
 			result = rollupFunction === 'show_unique' ? [...new Set(elements as string)] : elements;
 		}
 	} else if (['files'].includes(property.type as string)) {
 		result = property[type].map(
-			(file: { type: string; [key: string]: any }) => file[file.type].url,
+			(file: { type: string; [key: string]: any }) => file[file.type]?.url,
 		);
 	} else if (['status'].includes(property.type as string)) {
-		result = property[type].name;
+		result = property[type]?.name;
 	}
 	return result;
 }
@@ -916,6 +915,32 @@ export function extractPageId(page = '') {
 	return page;
 }
 
+export function getPageId(this: IExecuteFunctions, i: number) {
+	const page = this.getNodeParameter('pageId', i, {}) as INodeParameterResourceLocator;
+	let pageId = '';
+
+	if (page.value && typeof page.value === 'string') {
+		if (page.mode === 'id') {
+			pageId = page.value;
+		} else if (page.value.includes('p=')) {
+			// e.g https://www.notion.so/xxxxx?v=xxxxx&p=xxxxx&pm=s
+			pageId = new URLSearchParams(page.value).get('p') || '';
+		} else {
+			// e.g https://www.notion.so/page_name-xxxxx
+			pageId = page.value.match(databasePageUrlValidationRegexp)?.[1] || '';
+		}
+	}
+
+	if (!pageId) {
+		throw new NodeOperationError(
+			this.getNode(),
+			'Could not extract page ID from URL: ' + page.value,
+		);
+	}
+
+	return pageId;
+}
+
 export function extractDatabaseId(database: string) {
 	if (database.includes('?v=')) {
 		const data = database.split('?v=')[0].split('/');
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts
index 3b49e23fbe..59f4560162 100644
--- a/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/Blocks.ts
@@ -1,4 +1,5 @@
 import type { IDisplayOptions, INodeProperties } from 'n8n-workflow';
+
 import {
 	databaseUrlExtractionRegexp,
 	databaseUrlValidationRegexp,
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
index f814139603..81dc932f0a 100644
--- a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabaseDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import {
 	databaseUrlExtractionRegexp,
 	databaseUrlValidationRegexp,
diff --git a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
index 1a590457da..581863f87f 100644
--- a/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/shared/descriptions/DatabasePageDescription.ts
@@ -1,9 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { getConditions, getSearchFilters } from '../GenericFunctions';
-
 import { blocks, text } from './Blocks';
-
 import { filters } from './Filters';
 import {
 	databaseUrlExtractionRegexp,
@@ -13,6 +10,7 @@ import {
 	idExtractionRegexp,
 	idValidationRegexp,
 } from '../constants';
+import { getConditions, getSearchFilters } from '../GenericFunctions';
 
 export const databasePageOperations: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts b/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts
index 1caba20dcf..557f77052f 100644
--- a/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Notion/shared/methods/listSearch.ts
@@ -4,6 +4,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 } from 'n8n-workflow';
+
 import { notionApiRequestAllItems } from '../GenericFunctions';
 
 export async function getDatabases(
diff --git a/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts
index 40b01ea18b..5db400afa2 100644
--- a/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/Notion/test/GenericFunctions.test.ts
@@ -1,5 +1,10 @@
+import type { MockProxy } from 'jest-mock-extended';
+import { mock } from 'jest-mock-extended';
+import type { IExecuteFunctions, INode, INodeParameterResourceLocator } from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
 import { databasePageUrlExtractionRegexp } from '../shared/constants';
-import { extractPageId, formatBlocks } from '../shared/GenericFunctions';
+import { extractPageId, formatBlocks, getPageId } from '../shared/GenericFunctions';
 
 describe('Test NotionV2, formatBlocks', () => {
 	it('should format to_do block', () => {
@@ -89,3 +94,113 @@ describe('Test Notion', () => {
 		});
 	});
 });
+
+describe('Test Notion, getPageId', () => {
+	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+	const id = '3ab5bc794647496dac48feca926813fd';
+
+	beforeEach(() => {
+		mockExecuteFunctions = mock<IExecuteFunctions>();
+	});
+
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('should return page ID directly when mode is id', () => {
+		const page = {
+			mode: 'id',
+			value: id,
+		} as INodeParameterResourceLocator;
+
+		mockExecuteFunctions.getNodeParameter.mockReturnValue(page);
+
+		const result = getPageId.call(mockExecuteFunctions, 0);
+		expect(result).toBe(id);
+		expect(mockExecuteFunctions.getNodeParameter).toHaveBeenCalledWith('pageId', 0, {});
+	});
+
+	it('should extract page ID from URL with p parameter', () => {
+		const page = {
+			mode: 'url',
+			value: `https://www.notion.so/xxxxx?v=xxxxx&p=${id}&pm=s`,
+		} as INodeParameterResourceLocator;
+
+		mockExecuteFunctions.getNodeParameter.mockReturnValue(page);
+
+		const result = getPageId.call(mockExecuteFunctions, 0);
+		expect(result).toBe(id);
+	});
+
+	it('should extract page ID from URL using regex', () => {
+		const page = {
+			mode: 'url',
+			value: `https://www.notion.so/page-name-${id}`,
+		} as INodeParameterResourceLocator;
+
+		mockExecuteFunctions.getNodeParameter.mockReturnValue(page);
+
+		const result = getPageId.call(mockExecuteFunctions, 0);
+		expect(result).toBe(id);
+	});
+
+	it('should throw error when page ID cannot be extracted', () => {
+		const page = {
+			mode: 'url',
+			value: 'https://www.notion.so/invalid-url',
+		} as INodeParameterResourceLocator;
+
+		mockExecuteFunctions.getNodeParameter.mockReturnValue(page);
+		mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ name: 'Notion', type: 'notion' }));
+
+		expect(() => getPageId.call(mockExecuteFunctions, 0)).toThrow(NodeOperationError);
+		expect(() => getPageId.call(mockExecuteFunctions, 0)).toThrow(
+			'Could not extract page ID from URL: https://www.notion.so/invalid-url',
+		);
+	});
+
+	it('should throw error when page value is empty', () => {
+		const page = {
+			mode: 'url',
+			value: '',
+		} as INodeParameterResourceLocator;
+
+		mockExecuteFunctions.getNodeParameter.mockReturnValue(page);
+		mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ name: 'Notion', type: 'notion' }));
+
+		expect(() => getPageId.call(mockExecuteFunctions, 0)).toThrow(NodeOperationError);
+		expect(() => getPageId.call(mockExecuteFunctions, 0)).toThrow(
+			'Could not extract page ID from URL: ',
+		);
+	});
+
+	it('should throw error when page value is undefined', () => {
+		const page = {
+			mode: 'url',
+			value: undefined,
+		} as INodeParameterResourceLocator;
+
+		mockExecuteFunctions.getNodeParameter.mockReturnValue(page);
+		mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ name: 'Notion', type: 'notion' }));
+
+		expect(() => getPageId.call(mockExecuteFunctions, 0)).toThrow(NodeOperationError);
+		expect(() => getPageId.call(mockExecuteFunctions, 0)).toThrow(
+			'Could not extract page ID from URL: undefined',
+		);
+	});
+
+	it('should throw error when page value is not a string', () => {
+		const page = {
+			mode: 'url',
+			value: 123 as any,
+		} as INodeParameterResourceLocator;
+
+		mockExecuteFunctions.getNodeParameter.mockReturnValue(page);
+		mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ name: 'Notion', type: 'notion' }));
+
+		expect(() => getPageId.call(mockExecuteFunctions, 0)).toThrow(NodeOperationError);
+		expect(() => getPageId.call(mockExecuteFunctions, 0)).toThrow(
+			'Could not extract page ID from URL: 123',
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts
new file mode 100644
index 0000000000..5bd576ae4c
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.test.ts
@@ -0,0 +1,445 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'list',
+	results: [
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-8162-bd53-fc201157675f',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'paragraph',
+			paragraph: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'new text',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'new text',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-8104-8d3f-c8ca8919e791',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'heading_1',
+			heading_1: {
+				is_toggleable: false,
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'h1',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'h1',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-814d-b4ad-f65a2c558bb9',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'heading_2',
+			heading_2: {
+				is_toggleable: false,
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'h2',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'h2',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-8135-9e43-f3f8a21e2e86',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'heading_3',
+			heading_3: {
+				is_toggleable: false,
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'h3',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'h3',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-816b-9457-efba183a957c',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'toggle',
+			toggle: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'toggle',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'toggle',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-814f-9928-ed87ed0d9470',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'to_do',
+			to_do: {
+				checked: false,
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'todo',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'todo',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-812d-95e9-dc8ddc3153dd',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'bulleted_list_item',
+			bulleted_list_item: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'bullet 1',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'bullet 1',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-8106-9a25-d3859984ce34',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'numbered_list_item',
+			numbered_list_item: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: 'point 1',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'point 1',
+						href: null,
+					},
+				],
+			},
+		},
+		{
+			object: 'block',
+			id: '15bfb9cb-4cf0-81b1-a6f1-eac377c4d163',
+			parent: {
+				type: 'block_id',
+				block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+			},
+			created_time: '2024-12-13T03:40:00.000Z',
+			last_edited_time: '2024-12-13T03:40:00.000Z',
+			created_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			last_edited_by: {
+				object: 'user',
+				id: 'f215e49c-4677-40c0-9adc-87440d341324',
+			},
+			has_children: false,
+			archived: false,
+			in_trash: false,
+			type: 'paragraph',
+			paragraph: {
+				color: 'default',
+				text: [
+					{
+						type: 'text',
+						text: {
+							content: '',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: '',
+						href: null,
+					},
+				],
+			},
+		},
+	],
+	next_cursor: null,
+	has_more: false,
+	request_id: '33358f1b-fc4d-4387-8d95-43c7d03519a5',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'PATCH') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, block => append', () => {
+	const workflows = ['nodes/Notion/test/node/v2/block/append.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/append.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.workflow.json
new file mode 100644
index 0000000000..413962cbce
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/append.workflow.json
@@ -0,0 +1,535 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "block",
+				"blockId": {
+					"__rl": true,
+					"value": "https://www.notion.so/Block-Test-88188cbb303e4f44847f27d24bd7ad8e?pvs=4#90e03468f8aa457695da02ccad963040",
+					"mode": "url"
+				},
+				"blockUi": {
+					"blockValues": [
+						{
+							"richText": true,
+							"text": {
+								"text": [
+									{
+										"text": "new text",
+										"annotationUi": {}
+									}
+								]
+							}
+						},
+						{
+							"type": "heading_1",
+							"textContent": "h1"
+						},
+						{
+							"type": "heading_2",
+							"textContent": "h2"
+						},
+						{
+							"type": "heading_3",
+							"textContent": "h3"
+						},
+						{
+							"type": "toggle",
+							"textContent": "toggle"
+						},
+						{
+							"type": "to_do",
+							"textContent": "todo"
+						},
+						{
+							"type": "bulleted_list_item",
+							"textContent": "bullet 1"
+						},
+						{
+							"type": "numbered_list_item",
+							"textContent": "point 1"
+						},
+						{}
+					]
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "list",
+					"results": [
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-8162-bd53-fc201157675f",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "paragraph",
+							"paragraph": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "new text",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "new text",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-8104-8d3f-c8ca8919e791",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "heading_1",
+							"heading_1": {
+								"is_toggleable": false,
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "h1",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "h1",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-814d-b4ad-f65a2c558bb9",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "heading_2",
+							"heading_2": {
+								"is_toggleable": false,
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "h2",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "h2",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-8135-9e43-f3f8a21e2e86",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "heading_3",
+							"heading_3": {
+								"is_toggleable": false,
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "h3",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "h3",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-816b-9457-efba183a957c",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "toggle",
+							"toggle": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "toggle",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "toggle",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-814f-9928-ed87ed0d9470",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "to_do",
+							"to_do": {
+								"checked": false,
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "todo",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "todo",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-812d-95e9-dc8ddc3153dd",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "bulleted_list_item",
+							"bulleted_list_item": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "bullet 1",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "bullet 1",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-8106-9a25-d3859984ce34",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "numbered_list_item",
+							"numbered_list_item": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "point 1",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "point 1",
+										"href": null
+									}
+								]
+							}
+						},
+						{
+							"object": "block",
+							"id": "15bfb9cb-4cf0-81b1-a6f1-eac377c4d163",
+							"parent": {
+								"type": "block_id",
+								"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+							},
+							"created_time": "2024-12-13T03:40:00.000Z",
+							"last_edited_time": "2024-12-13T03:40:00.000Z",
+							"created_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"last_edited_by": {
+								"object": "user",
+								"id": "f215e49c-4677-40c0-9adc-87440d341324"
+							},
+							"has_children": false,
+							"archived": false,
+							"in_trash": false,
+							"type": "paragraph",
+							"paragraph": {
+								"color": "default",
+								"text": [
+									{
+										"type": "text",
+										"text": {
+											"content": "",
+											"link": null
+										},
+										"annotations": {
+											"bold": false,
+											"italic": false,
+											"strikethrough": false,
+											"underline": false,
+											"code": false,
+											"color": "default"
+										},
+										"plain_text": "",
+										"href": null
+									}
+								]
+							}
+						}
+					],
+					"next_cursor": null,
+					"has_more": false,
+					"request_id": "33358f1b-fc4d-4387-8d95-43c7d03519a5"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "87575721-cf21-472f-a9f0-24aa31c8100f",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts
new file mode 100644
index 0000000000..a482d97a06
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.test.ts
@@ -0,0 +1,241 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'block',
+		id: 'b14bdaaf-b7e9-48c9-a7fa-1b9e1e2092ae',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2023-11-23T10:42:00.000Z',
+		last_edited_time: '2024-12-13T03:35:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		has_children: true,
+		archived: false,
+		in_trash: false,
+		type: 'toggle',
+		toggle: {
+			color: 'default',
+			text: [
+				{
+					type: 'text',
+					text: {
+						content: 'Drop down First',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Drop down First',
+					href: null,
+				},
+			],
+		},
+	},
+	{
+		object: 'block',
+		id: 'de572f5d-ff5c-4c13-a879-efc20fe47db0',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2023-11-23T10:42:00.000Z',
+		last_edited_time: '2024-03-11T12:39:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		has_children: true,
+		archived: false,
+		in_trash: false,
+		type: 'bulleted_list_item',
+		bulleted_list_item: {
+			color: 'default',
+			text: [
+				{
+					type: 'text',
+					text: {
+						content: 'Bullet Point Second',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Bullet Point Second',
+					href: null,
+				},
+			],
+		},
+	},
+	{
+		object: 'block',
+		id: 'c98cf981-c967-47f5-9948-4aa1be9ce9d0',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2023-11-24T04:41:00.000Z',
+		last_edited_time: '2024-12-13T03:35:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		has_children: false,
+		archived: false,
+		in_trash: false,
+		type: 'heading_2',
+		heading_2: {
+			is_toggleable: false,
+			color: 'default',
+			text: [
+				{
+					type: 'text',
+					text: {
+						content: 'Hello World',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Hello World',
+					href: null,
+				},
+			],
+		},
+	},
+	{
+		object: 'block',
+		id: '527a0555-a486-401e-93a8-19819615c132',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2023-11-23T10:42:00.000Z',
+		last_edited_time: '2023-11-23T10:43:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		has_children: false,
+		archived: false,
+		in_trash: false,
+		type: 'child_page',
+		child_page: {
+			title: 'Page Third',
+		},
+	},
+	{
+		object: 'block',
+		id: '15bfb9cb-4cf0-81b1-a6f1-eac377c4d163',
+		parent: {
+			type: 'block_id',
+			block_id: '90e03468-f8aa-4576-95da-02ccad963040',
+		},
+		created_time: '2024-12-13T03:40:00.000Z',
+		last_edited_time: '2024-12-13T06:15:00.000Z',
+		created_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		has_children: false,
+		archived: false,
+		in_trash: false,
+		type: 'paragraph',
+		paragraph: {
+			color: 'default',
+			text: [
+				{
+					type: 'text',
+					text: {
+						content: '',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: '',
+					href: null,
+				},
+			],
+		},
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, block => getAll', () => {
+	const workflows = ['nodes/Notion/test/node/v2/block/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.workflow.json
new file mode 100644
index 0000000000..9d4c041365
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/block/getAll.workflow.json
@@ -0,0 +1,188 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "block",
+				"operation": "getAll",
+				"blockId": {
+					"__rl": true,
+					"value": "https://www.notion.so/Block-Test-88188cbb303e4f44847f27d24bd7ad8e?pvs=4#90e03468f8aa457695da02ccad963040",
+					"mode": "url"
+				},
+				"returnAll": true
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "b14bdaaf-b7e9-48c9-a7fa-1b9e1e2092ae",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"has_children": true,
+					"archived": false,
+					"in_trash": false,
+					"type": "toggle",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": "Drop down First"
+				}
+			},
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "de572f5d-ff5c-4c13-a879-efc20fe47db0",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "f215e49c-4677-40c0-9adc-87440d341324"
+					},
+					"has_children": true,
+					"archived": false,
+					"in_trash": false,
+					"type": "bulleted_list_item",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": "Bullet Point Second"
+				}
+			},
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "c98cf981-c967-47f5-9948-4aa1be9ce9d0",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"has_children": false,
+					"archived": false,
+					"in_trash": false,
+					"type": "heading_2",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": "Hello World"
+				}
+			},
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "527a0555-a486-401e-93a8-19819615c132",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"has_children": false,
+					"archived": false,
+					"in_trash": false,
+					"type": "child_page",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": "Page Third"
+				}
+			},
+			{
+				"json": {
+					"object": "block",
+					"parent_id": "90e03468f8aa457695da02ccad963040",
+					"id": "15bfb9cb-4cf0-81b1-a6f1-eac377c4d163",
+					"parent": {
+						"type": "block_id",
+						"block_id": "90e03468-f8aa-4576-95da-02ccad963040"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"has_children": false,
+					"archived": false,
+					"in_trash": false,
+					"type": "paragraph",
+					"root_id": "90e03468f8aa457695da02ccad963040",
+					"content": ""
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "3edb0c05-7e84-4953-a6a5-86c3c6824403",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts
new file mode 100644
index 0000000000..b4a36f8629
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.test.ts
@@ -0,0 +1,99 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'database',
+	id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	cover: null,
+	icon: null,
+	created_time: '2024-11-08T07:59:00.000Z',
+	created_by: {
+		object: 'user',
+		id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+	},
+	last_edited_time: '2024-11-08T07:59:00.000Z',
+	title: [
+		{
+			type: 'text',
+			text: {
+				content: 'TEST_DB',
+				link: null,
+			},
+			annotations: {
+				bold: false,
+				italic: false,
+				strikethrough: false,
+				underline: false,
+				code: false,
+				color: 'default',
+			},
+			plain_text: 'TEST_DB',
+			href: null,
+		},
+	],
+	description: [],
+	is_inline: false,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			name: 'Tags',
+			type: 'multi_select',
+			multi_select: {
+				options: [],
+			},
+		},
+		Name: {
+			id: 'title',
+			name: 'Name',
+			type: 'title',
+			title: {},
+		},
+	},
+	parent: {
+		type: 'page_id',
+		page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+	},
+	url: 'https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f',
+	public_url: null,
+	archived: false,
+	in_trash: false,
+	request_id: 'd22a9046-be0d-4ef5-b551-8691da552d47',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, database => get', () => {
+	const workflows = ['nodes/Notion/test/node/v2/database/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/get.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.workflow.json
new file mode 100644
index 0000000000..55c052683a
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/get.workflow.json
@@ -0,0 +1,90 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "database",
+				"databaseId": {
+					"__rl": true,
+					"value": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"mode": "list",
+					"cachedResultName": "TEST_DB",
+					"cachedResultUrl": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"name": "TEST_DB",
+					"url": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "9f59436f-17e7-4c9d-a550-a594bb15618f",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts
new file mode 100644
index 0000000000..467b630060
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.test.ts
@@ -0,0 +1,340 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'database',
+		id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+		cover: null,
+		icon: null,
+		created_time: '2024-11-08T07:59:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2024-11-08T07:59:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'TEST_DB',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'TEST_DB',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Tags: {
+				id: '%40~Tp',
+				name: 'Tags',
+				type: 'multi_select',
+				multi_select: {
+					options: [],
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f',
+		public_url: null,
+		archived: false,
+		in_trash: false,
+	},
+	{
+		object: 'database',
+		id: 'f7216195-e0d4-46cd-a2d3-587a05baf472',
+		cover: null,
+		icon: null,
+		created_time: '2022-03-07T11:25:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2024-11-08T07:54:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'ListDatabase',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'ListDatabase',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Email: {
+				id: 'Fitu',
+				name: 'Email',
+				type: 'email',
+				email: {},
+			},
+			'Last edited by': {
+				id: 'XZ~H',
+				name: 'Last edited by',
+				type: 'last_edited_by',
+				last_edited_by: {},
+			},
+			Tags: {
+				id: 'a%7BRG',
+				name: 'Tags',
+				type: 'multi_select',
+				multi_select: {
+					options: [],
+				},
+			},
+			Created: {
+				id: 'eqq~',
+				name: 'Created',
+				type: 'created_time',
+				created_time: {},
+			},
+			Status: {
+				id: 'nZEQ',
+				name: 'Status',
+				type: 'status',
+				status: {
+					options: [
+						{
+							id: '70312bf9-84d5-40e6-b1eb-d71798ee556f',
+							name: 'Not started',
+							color: 'default',
+							description: null,
+						},
+						{
+							id: '02a6bb40-3f4b-47d6-818d-6a4129cc6091',
+							name: 'In progress',
+							color: 'gray',
+							description: null,
+						},
+						{
+							id: 'a3c13d01-63b2-4571-8a02-8c1801649af7',
+							name: 'Done',
+							color: 'green',
+							description: null,
+						},
+					],
+					groups: [
+						{
+							id: '82e2022c-001d-47ac-a8b8-243ef7fac352',
+							name: 'To-do',
+							color: 'gray',
+							option_ids: ['70312bf9-84d5-40e6-b1eb-d71798ee556f'],
+						},
+						{
+							id: '296000d7-287e-4121-9445-98fa8f7de298',
+							name: 'In progress',
+							color: 'blue',
+							option_ids: ['02a6bb40-3f4b-47d6-818d-6a4129cc6091'],
+						},
+						{
+							id: 'db7689ae-127d-4218-8b3c-306e59e02070',
+							name: 'Complete',
+							color: 'green',
+							option_ids: ['a3c13d01-63b2-4571-8a02-8c1801649af7'],
+						},
+					],
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/f7216195e0d446cda2d3587a05baf472',
+		public_url: 'https://pleasant-halloumi-63e.notion.site/f7216195e0d446cda2d3587a05baf472',
+		archived: false,
+		in_trash: false,
+	},
+	{
+		object: 'database',
+		id: 'e9c354e3-e506-4c42-83e2-d9c81a083f05',
+		cover: null,
+		icon: null,
+		created_time: '2022-03-07T11:05:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2023-09-29T08:00:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'n8n-trigger',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'n8n-trigger',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Total: {
+				id: 'A%3DdW',
+				name: 'Total',
+				type: 'formula',
+				formula: {
+					expression:
+						'((({{notion:block_property:n%7DI%5E:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}} + {{notion:block_property:MH~%3B:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:MwMd:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) + {{notion:block_property:fJea:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:rSrM:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}',
+				},
+			},
+			'Total Incomes': {
+				id: 'MH~%3B',
+				name: 'Total Incomes',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Total Expenses': {
+				id: 'MwMd',
+				name: 'Total Expenses',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Created time': {
+				id: 'Z%3BGM',
+				name: 'Created time',
+				type: 'created_time',
+				created_time: {},
+			},
+			'Last edited time': {
+				id: '%60%5ElG',
+				name: 'Last edited time',
+				type: 'last_edited_time',
+				last_edited_time: {},
+			},
+			'Total Transfer-In': {
+				id: 'fJea',
+				name: 'Total Transfer-In',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Starting Balance': {
+				id: 'n%7DI%5E',
+				name: 'Starting Balance',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Total Transfer-Out': {
+				id: 'rSrM',
+				name: 'Total Transfer-Out',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/e9c354e3e5064c4283e2d9c81a083f05',
+		public_url: null,
+		archived: false,
+		in_trash: false,
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, database => getAll', () => {
+	const workflows = ['nodes/Notion/test/node/v2/database/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.workflow.json
new file mode 100644
index 0000000000..380ef6ef93
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/getAll.workflow.json
@@ -0,0 +1,99 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "database",
+				"operation": "getAll",
+				"returnAll": true
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"name": "TEST_DB",
+					"url": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				}
+			},
+			{
+				"json": {
+					"id": "f7216195-e0d4-46cd-a2d3-587a05baf472",
+					"name": "ListDatabase",
+					"url": "https://www.notion.so/f7216195e0d446cda2d3587a05baf472"
+				}
+			},
+			{
+				"json": {
+					"id": "e9c354e3-e506-4c42-83e2-d9c81a083f05",
+					"name": "n8n-trigger",
+					"url": "https://www.notion.so/e9c354e3e5064c4283e2d9c81a083f05"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "c9094e39-7195-4d4c-9e08-928415e1902b",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts
new file mode 100644
index 0000000000..4208d1524e
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.test.ts
@@ -0,0 +1,214 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'database',
+		id: 'e9c354e3-e506-4c42-83e2-d9c81a083f05',
+		cover: null,
+		icon: null,
+		created_time: '2022-03-07T11:05:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2023-09-29T08:00:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'n8n-trigger',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'n8n-trigger',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Total: {
+				id: 'A%3DdW',
+				name: 'Total',
+				type: 'formula',
+				formula: {
+					expression:
+						'((({{notion:block_property:n%7DI%5E:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}} + {{notion:block_property:MH~%3B:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:MwMd:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) + {{notion:block_property:fJea:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:rSrM:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}',
+				},
+			},
+			'Total Incomes': {
+				id: 'MH~%3B',
+				name: 'Total Incomes',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Total Expenses': {
+				id: 'MwMd',
+				name: 'Total Expenses',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Created time': {
+				id: 'Z%3BGM',
+				name: 'Created time',
+				type: 'created_time',
+				created_time: {},
+			},
+			'Last edited time': {
+				id: '%60%5ElG',
+				name: 'Last edited time',
+				type: 'last_edited_time',
+				last_edited_time: {},
+			},
+			'Total Transfer-In': {
+				id: 'fJea',
+				name: 'Total Transfer-In',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Starting Balance': {
+				id: 'n%7DI%5E',
+				name: 'Starting Balance',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			'Total Transfer-Out': {
+				id: 'rSrM',
+				name: 'Total Transfer-Out',
+				type: 'number',
+				number: {
+					format: 'number',
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/e9c354e3e5064c4283e2d9c81a083f05',
+		public_url: null,
+		archived: false,
+		in_trash: false,
+	},
+	{
+		object: 'database',
+		id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+		cover: null,
+		icon: null,
+		created_time: '2024-11-08T07:59:00.000Z',
+		created_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: '88f72c1a-07ed-4bae-9fa0-231365d813d9',
+		},
+		last_edited_time: '2024-11-08T07:59:00.000Z',
+		title: [
+			{
+				type: 'text',
+				text: {
+					content: 'TEST_DB',
+					link: null,
+				},
+				annotations: {
+					bold: false,
+					italic: false,
+					strikethrough: false,
+					underline: false,
+					code: false,
+					color: 'default',
+				},
+				plain_text: 'TEST_DB',
+				href: null,
+			},
+		],
+		description: [],
+		is_inline: false,
+		properties: {
+			Tags: {
+				id: '%40~Tp',
+				name: 'Tags',
+				type: 'multi_select',
+				multi_select: {
+					options: [],
+				},
+			},
+			Name: {
+				id: 'title',
+				name: 'Name',
+				type: 'title',
+				title: {},
+			},
+		},
+		parent: {
+			type: 'page_id',
+			page_id: 'cc3d2b3c-f31a-4773-ab39-17a60c54567a',
+		},
+		url: 'https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f',
+		public_url: null,
+		archived: false,
+		in_trash: false,
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, database => search', () => {
+	const workflows = ['nodes/Notion/test/node/v2/database/search.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/database/search.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.workflow.json
new file mode 100644
index 0000000000..b04abcc5ab
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/database/search.workflow.json
@@ -0,0 +1,265 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "database",
+				"operation": "search",
+				"text": "t",
+				"limit": 2,
+				"simple": false,
+				"options": {
+					"sort": {
+						"sortValue": {
+							"direction": "ascending"
+						}
+					}
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "database",
+					"id": "e9c354e3-e506-4c42-83e2-d9c81a083f05",
+					"cover": null,
+					"icon": null,
+					"created_time": "2022-03-07T11:05:00.000Z",
+					"created_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"last_edited_time": "2023-09-29T08:00:00.000Z",
+					"title": [
+						{
+							"type": "text",
+							"text": {
+								"content": "n8n-trigger",
+								"link": null
+							},
+							"annotations": {
+								"bold": false,
+								"italic": false,
+								"strikethrough": false,
+								"underline": false,
+								"code": false,
+								"color": "default"
+							},
+							"plain_text": "n8n-trigger",
+							"href": null
+						}
+					],
+					"description": [],
+					"is_inline": false,
+					"properties": {
+						"Total": {
+							"id": "A%3DdW",
+							"name": "Total",
+							"type": "formula",
+							"formula": {
+								"expression": "((({{notion:block_property:n%7DI%5E:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}} + {{notion:block_property:MH~%3B:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:MwMd:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) + {{notion:block_property:fJea:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}) - {{notion:block_property:rSrM:00000000-0000-0000-0000-000000000000:fe91914e-2dc5-4510-82f8-399dd9b2daf8}}"
+							}
+						},
+						"Total Incomes": {
+							"id": "MH~%3B",
+							"name": "Total Incomes",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Total Expenses": {
+							"id": "MwMd",
+							"name": "Total Expenses",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Created time": {
+							"id": "Z%3BGM",
+							"name": "Created time",
+							"type": "created_time",
+							"created_time": {}
+						},
+						"Last edited time": {
+							"id": "%60%5ElG",
+							"name": "Last edited time",
+							"type": "last_edited_time",
+							"last_edited_time": {}
+						},
+						"Total Transfer-In": {
+							"id": "fJea",
+							"name": "Total Transfer-In",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Starting Balance": {
+							"id": "n%7DI%5E",
+							"name": "Starting Balance",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Total Transfer-Out": {
+							"id": "rSrM",
+							"name": "Total Transfer-Out",
+							"type": "number",
+							"number": {
+								"format": "number"
+							}
+						},
+						"Name": {
+							"id": "title",
+							"name": "Name",
+							"type": "title",
+							"title": {}
+						}
+					},
+					"parent": {
+						"type": "page_id",
+						"page_id": "cc3d2b3c-f31a-4773-ab39-17a60c54567a"
+					},
+					"url": "https://www.notion.so/e9c354e3e5064c4283e2d9c81a083f05",
+					"public_url": null,
+					"archived": false,
+					"in_trash": false
+				}
+			},
+			{
+				"json": {
+					"object": "database",
+					"id": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"cover": null,
+					"icon": null,
+					"created_time": "2024-11-08T07:59:00.000Z",
+					"created_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"last_edited_by": {
+						"object": "user",
+						"id": "88f72c1a-07ed-4bae-9fa0-231365d813d9"
+					},
+					"last_edited_time": "2024-11-08T07:59:00.000Z",
+					"title": [
+						{
+							"type": "text",
+							"text": {
+								"content": "TEST_DB",
+								"link": null
+							},
+							"annotations": {
+								"bold": false,
+								"italic": false,
+								"strikethrough": false,
+								"underline": false,
+								"code": false,
+								"color": "default"
+							},
+							"plain_text": "TEST_DB",
+							"href": null
+						}
+					],
+					"description": [],
+					"is_inline": false,
+					"properties": {
+						"Tags": {
+							"id": "%40~Tp",
+							"name": "Tags",
+							"type": "multi_select",
+							"multi_select": {
+								"options": []
+							}
+						},
+						"Name": {
+							"id": "title",
+							"name": "Name",
+							"type": "title",
+							"title": {}
+						}
+					},
+					"parent": {
+						"type": "page_id",
+						"page_id": "cc3d2b3c-f31a-4773-ab39-17a60c54567a"
+					},
+					"url": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f",
+					"public_url": null,
+					"archived": false,
+					"in_trash": false
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "08dad8e3-abcc-42d1-8ad3-c026644d1280",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts
new file mode 100644
index 0000000000..f2c010e75a
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.test.ts
@@ -0,0 +1,115 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	created_time: '2024-12-13T04:45:00.000Z',
+	last_edited_time: '2024-12-13T04:45:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😗',
+	},
+	parent: {
+		type: 'database_id',
+		database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	},
+	archived: false,
+	in_trash: false,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			type: 'multi_select',
+			multi_select: [],
+		},
+		Name: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'new name 1',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'new name 1',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+	public_url: null,
+	request_id: '1416702d-daa8-4f8d-9be3-c55fe52486b5',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return {
+					properties: {
+						Tags: {
+							id: '%40~Tp',
+							name: 'Tags',
+							type: 'multi_select',
+							multi_select: {
+								options: [],
+							},
+						},
+						Name: {
+							id: 'title',
+							name: 'Name',
+							type: 'title',
+							title: {},
+						},
+					},
+				};
+			}
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, databasePage => create', () => {
+	const workflows = ['nodes/Notion/test/node/v2/databasePage/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.workflow.json
new file mode 100644
index 0000000000..80022b8c19
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/create.workflow.json
@@ -0,0 +1,116 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "databasePage",
+				"databaseId": {
+					"__rl": true,
+					"value": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"mode": "list",
+					"cachedResultName": "TEST_DB",
+					"cachedResultUrl": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				},
+				"title": "new page",
+				"propertiesUi": {
+					"propertyValues": [
+						{
+							"key": "Name|title",
+							"title": "new name 1"
+						}
+					]
+				},
+				"blockUi": {
+					"blockValues": [
+						{
+							"textContent": "new text"
+						},
+						{
+							"type": "toggle",
+							"textContent": "new toggle"
+						}
+					]
+				},
+				"options": {
+					"iconType": "emoji",
+					"icon": "😗"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "new name 1",
+					"url": "https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "new name 1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "5f4f1112-c094-44b6-bc05-005b54190852",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts
new file mode 100644
index 0000000000..5b2d5d2eb5
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.test.ts
@@ -0,0 +1,95 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	created_time: '2024-12-13T04:45:00.000Z',
+	last_edited_time: '2024-12-13T04:45:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😗',
+	},
+	parent: {
+		type: 'database_id',
+		database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	},
+	archived: false,
+	in_trash: false,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			type: 'multi_select',
+			multi_select: [],
+		},
+		Name: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'new name 1',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'new name 1',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+	public_url: null,
+	request_id: 'c01d3a3e-d9c3-4e48-8d73-077a8503c3ba',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, databasePage => get', () => {
+	const workflows = ['nodes/Notion/test/node/v2/databasePage/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.workflow.json
new file mode 100644
index 0000000000..7180d48521
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/get.workflow.json
@@ -0,0 +1,91 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "databasePage",
+				"operation": "get",
+				"pageId": {
+					"__rl": true,
+					"value": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f?v=7bcc03614eed4c95a9e6168c040e9c58&p=15bfb9cb4cf081c7aab4c5855b8cb6c3&pm=s",
+					"mode": "url"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "new name 1",
+					"url": "https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "new name 1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "68afba7e-c066-458c-984b-c758ef92463c",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts
new file mode 100644
index 0000000000..1160e6c971
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.test.ts
@@ -0,0 +1,96 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'page',
+		id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+		created_time: '2024-12-13T04:45:00.000Z',
+		last_edited_time: '2024-12-13T04:45:00.000Z',
+		created_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		cover: null,
+		icon: {
+			type: 'emoji',
+			emoji: '😗',
+		},
+		parent: {
+			type: 'database_id',
+			database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+		},
+		archived: false,
+		in_trash: false,
+		properties: {
+			Tags: {
+				id: '%40~Tp',
+				type: 'multi_select',
+				multi_select: [],
+			},
+			Name: {
+				id: 'title',
+				type: 'title',
+				title: [
+					{
+						type: 'text',
+						text: {
+							content: 'new name 1',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'new name 1',
+						href: null,
+					},
+				],
+			},
+		},
+		url: 'https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+		public_url: null,
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, databasePage => getAll', () => {
+	const workflows = ['nodes/Notion/test/node/v2/databasePage/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.workflow.json
new file mode 100644
index 0000000000..6efd1f3c07
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/getAll.workflow.json
@@ -0,0 +1,114 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "databasePage",
+				"operation": "getAll",
+				"databaseId": {
+					"__rl": true,
+					"value": "138fb9cb-4cf0-804c-8663-d8ecdd5e692f",
+					"mode": "list",
+					"cachedResultName": "TEST_DB",
+					"cachedResultUrl": "https://www.notion.so/138fb9cb4cf0804c8663d8ecdd5e692f"
+				},
+				"returnAll": true,
+				"filterType": "manual",
+				"filters": {
+					"conditions": [
+						{
+							"key": "Name|title",
+							"condition": "contains",
+							"titleValue": "new"
+						}
+					]
+				},
+				"options": {
+					"sort": {
+						"sortValue": [
+							{
+								"key": "Name|title",
+								"direction": "ascending"
+							}
+						]
+					}
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "new name 1",
+					"url": "https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "new name 1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "c69706eb-f8e8-4fe0-b456-23e482743d1c",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts
new file mode 100644
index 0000000000..39531dbac7
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.test.ts
@@ -0,0 +1,95 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	created_time: '2024-12-13T04:45:00.000Z',
+	last_edited_time: '2024-12-13T05:21:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😗',
+	},
+	parent: {
+		type: 'database_id',
+		database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	},
+	archived: false,
+	in_trash: false,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			type: 'multi_select',
+			multi_select: [],
+		},
+		Name: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'Updated Name',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Updated Name',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/Updated-Name-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+	public_url: null,
+	request_id: 'a4683091-f165-4f10-92b4-a629b8b1266e',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'PATCH') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, databasePage => update', () => {
+	const workflows = ['nodes/Notion/test/node/v2/databasePage/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.workflow.json
new file mode 100644
index 0000000000..0d9705dc22
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/databasePage/update.workflow.json
@@ -0,0 +1,100 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "databasePage",
+				"operation": "update",
+				"pageId": {
+					"__rl": true,
+					"value": "https://www.notion.so/new-name-1-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"mode": "url"
+				},
+				"propertiesUi": {
+					"propertyValues": [
+						{
+							"key": "Name|title",
+							"title": "Updated Name"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "Updated Name",
+					"url": "https://www.notion.so/Updated-Name-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "Updated Name"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "ab4a62f2-5d45-456a-ac7a-97cf84e78815",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts
new file mode 100644
index 0000000000..72ae18ae01
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.test.ts
@@ -0,0 +1,95 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	created_time: '2024-12-13T04:45:00.000Z',
+	last_edited_time: '2024-12-13T05:52:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😗',
+	},
+	parent: {
+		type: 'database_id',
+		database_id: '138fb9cb-4cf0-804c-8663-d8ecdd5e692f',
+	},
+	archived: true,
+	in_trash: true,
+	properties: {
+		Tags: {
+			id: '%40~Tp',
+			type: 'multi_select',
+			multi_select: [],
+		},
+		Name: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'Updated Name',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Updated Name',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/Updated-Name-15bfb9cb4cf081c7aab4c5855b8cb6c3',
+	public_url: null,
+	request_id: 'ce91abaa-261f-43c3-9237-57c0f28af682',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'PATCH') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, page => archive', () => {
+	const workflows = ['nodes/Notion/test/node/v2/page/archive.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.workflow.json
new file mode 100644
index 0000000000..1aeb758f5e
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/archive.workflow.json
@@ -0,0 +1,90 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "archive",
+				"pageId": {
+					"__rl": true,
+					"value": "15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"mode": "id"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3",
+					"name": "Updated Name",
+					"url": "https://www.notion.so/Updated-Name-15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"property_tags": [],
+					"property_name": "Updated Name"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "aae2fbb6-0277-449a-9f26-d8d3cf53d2c4",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts
new file mode 100644
index 0000000000..85090c7938
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.test.ts
@@ -0,0 +1,90 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'page',
+	id: '15bfb9cb-4cf0-812b-b4bc-c85cd00727f8',
+	created_time: '2024-12-13T06:01:00.000Z',
+	last_edited_time: '2024-12-13T06:01:00.000Z',
+	created_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	last_edited_by: {
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+	},
+	cover: null,
+	icon: {
+		type: 'emoji',
+		emoji: '😊',
+	},
+	parent: {
+		type: 'page_id',
+		page_id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+	},
+	archived: false,
+	in_trash: false,
+	properties: {
+		title: {
+			id: 'title',
+			type: 'title',
+			title: [
+				{
+					type: 'text',
+					text: {
+						content: 'Child page',
+						link: null,
+					},
+					annotations: {
+						bold: false,
+						italic: false,
+						strikethrough: false,
+						underline: false,
+						code: false,
+						color: 'default',
+					},
+					plain_text: 'Child page',
+					href: null,
+				},
+			],
+		},
+	},
+	url: 'https://www.notion.so/Child-page-15bfb9cb4cf0812bb4bcc85cd00727f8',
+	public_url: null,
+	request_id: 'df28ec00-4361-46af-a3b6-add18c8d1295',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, page => create', () => {
+	const workflows = ['nodes/Notion/test/node/v2/page/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/create.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.workflow.json
new file mode 100644
index 0000000000..ab2c6b8f62
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/create.workflow.json
@@ -0,0 +1,111 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"pageId": {
+					"__rl": true,
+					"value": "15bfb9cb4cf081c7aab4c5855b8cb6c3",
+					"mode": "id",
+					"__regex": "^([0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12})"
+				},
+				"title": "Child page",
+				"blockUi": {
+					"blockValues": [
+						{
+							"type": "heading_1",
+							"richText": true,
+							"text": {
+								"text": [
+									{
+										"text": "Title",
+										"annotationUi": {}
+									}
+								]
+							}
+						},
+						{
+							"textContent": "text"
+						}
+					]
+				},
+				"options": {
+					"icon": "😊"
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-812b-b4bc-c85cd00727f8",
+					"name": "Child page",
+					"url": "https://www.notion.so/Child-page-15bfb9cb4cf0812bb4bcc85cd00727f8"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "f8f473ad-4d37-49c4-95f3-187b3a70a6f1",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts
new file mode 100644
index 0000000000..bc4c2d7a92
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.test.ts
@@ -0,0 +1,91 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'page',
+		id: '15bfb9cb-4cf0-812b-b4bc-c85cd00727f8',
+		created_time: '2024-12-13T06:01:00.000Z',
+		last_edited_time: '2024-12-13T06:01:00.000Z',
+		created_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		last_edited_by: {
+			object: 'user',
+			id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		},
+		cover: null,
+		icon: {
+			type: 'emoji',
+			emoji: '😊',
+		},
+		parent: {
+			type: 'page_id',
+			page_id: '15bfb9cb-4cf0-81c7-aab4-c5855b8cb6c3',
+		},
+		archived: false,
+		in_trash: false,
+		properties: {
+			title: {
+				id: 'title',
+				type: 'title',
+				title: [
+					{
+						type: 'text',
+						text: {
+							content: 'Child page',
+							link: null,
+						},
+						annotations: {
+							bold: false,
+							italic: false,
+							strikethrough: false,
+							underline: false,
+							code: false,
+							color: 'default',
+						},
+						plain_text: 'Child page',
+						href: null,
+					},
+				],
+			},
+		},
+		url: 'https://www.notion.so/Child-page-15bfb9cb4cf0812bb4bcc85cd00727f8',
+		public_url: null,
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, page => search', () => {
+	const workflows = ['nodes/Notion/test/node/v2/page/search.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/page/search.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.workflow.json
new file mode 100644
index 0000000000..84a14c1f85
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/page/search.workflow.json
@@ -0,0 +1,97 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "search",
+				"text": "child",
+				"returnAll": true,
+				"options": {
+					"filter": {
+						"filters": {
+							"value": "page"
+						}
+					},
+					"sort": {
+						"sortValue": {
+							"direction": "ascending"
+						}
+					}
+				}
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "15bfb9cb-4cf0-812b-b4bc-c85cd00727f8",
+					"name": "Child page",
+					"url": "https://www.notion.so/Child-page-15bfb9cb4cf0812bb4bcc85cd00727f8"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "75e271ec-4d76-4094-b283-9a3f61a0c111",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts
new file mode 100644
index 0000000000..62ed0ef6e2
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.test.ts
@@ -0,0 +1,46 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	object: 'user',
+	id: '34a945c6-de97-4efc-90d6-6d7cc14a6583',
+	name: 'second',
+	avatar_url: null,
+	type: 'bot',
+	bot: {},
+	request_id: 'ad2a00c0-fa6a-4a14-bf9a-68e1715b51a1',
+};
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, user => get', () => {
+	const workflows = ['nodes/Notion/test/node/v2/user/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/get.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.workflow.json
new file mode 100644
index 0000000000..208927f05e
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/get.workflow.json
@@ -0,0 +1,88 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "user",
+				"userId": "34a945c6-de97-4efc-90d6-6d7cc14a6583"
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "user",
+					"id": "34a945c6-de97-4efc-90d6-6d7cc14a6583",
+					"name": "second",
+					"avatar_url": null,
+					"type": "bot",
+					"bot": {},
+					"request_id": "ad2a00c0-fa6a-4a14-bf9a-68e1715b51a1"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "d654cac7-21b8-4d6e-99ce-c5c980d9f49d",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts
new file mode 100644
index 0000000000..46816dfea2
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.test.ts
@@ -0,0 +1,70 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = [
+	{
+		object: 'user',
+		id: 'f215e49c-4677-40c0-9adc-87440d341324',
+		name: 'n8n-test',
+		avatar_url: null,
+		type: 'bot',
+		bot: {
+			owner: {
+				type: 'workspace',
+				workspace: true,
+			},
+			workspace_name: "Michael Kret's Notion",
+		},
+	},
+	{
+		object: 'user',
+		id: '34a945c6-de97-4efc-90d6-6d7cc14a6583',
+		name: 'second',
+		avatar_url: null,
+		type: 'bot',
+		bot: {},
+	},
+	{
+		object: 'user',
+		id: '2598a5de-49b3-4acd-adad-20f6b18c9fbe',
+		name: 'DryMerge',
+		avatar_url:
+			'https://s3-us-west-2.amazonaws.com/public.notion-static.com/e67863a3-a867-4355-a602-c9830dbb1828/Primary_(recommended).jpg',
+		type: 'bot',
+		bot: {},
+	},
+];
+
+jest.mock('../../../../shared/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../shared/GenericFunctions');
+	return {
+		...originalModule,
+		notionApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test NotionV2, user => getAll', () => {
+	const workflows = ['nodes/Notion/test/node/v2/user/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../shared/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.workflow.json b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.workflow.json
new file mode 100644
index 0000000000..97ce5d332f
--- /dev/null
+++ b/packages/nodes-base/nodes/Notion/test/node/v2/user/getAll.workflow.json
@@ -0,0 +1,104 @@
+{
+	"name": "tests notion",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "4260fdbd-e92f-4712-8114-38b85f8289ea",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "user",
+				"operation": "getAll",
+				"limit": 2
+			},
+			"id": "5ab80e6a-c9c4-4cc5-9332-2fc7a3f8ae24",
+			"name": "Notion",
+			"type": "n8n-nodes-base.notion",
+			"typeVersion": 2.2,
+			"position": [1040, 360],
+			"credentials": {
+				"notionApi": {
+					"id": "CiZXWkDmjiZzpcL1",
+					"name": "Notion account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "a664f506-72a5-4e50-80b4-97ed2e6eb334",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"object": "user",
+					"id": "f215e49c-4677-40c0-9adc-87440d341324",
+					"name": "n8n-test",
+					"avatar_url": null,
+					"type": "bot",
+					"bot": {
+						"owner": {
+							"type": "workspace",
+							"workspace": true
+						},
+						"workspace_name": "Michael Kret's Notion"
+					}
+				}
+			},
+			{
+				"json": {
+					"object": "user",
+					"id": "34a945c6-de97-4efc-90d6-6d7cc14a6583",
+					"name": "second",
+					"avatar_url": null,
+					"type": "bot",
+					"bot": {}
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Notion",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Notion": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "702bd2aa-53d0-4c82-bbc2-a95a153953b0",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "Ucav6QC99JNMCkd3",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
index 587094b91b..1cc7a81734 100644
--- a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
+++ b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,7 +10,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
+import { versionDescription } from './VersionDescription';
 import type { SortData } from '../shared/GenericFunctions';
 import {
 	extractDatabaseId,
@@ -25,9 +26,7 @@ import {
 	notionApiRequestAllItems,
 	simplifyObjects,
 } from '../shared/GenericFunctions';
-
 import { listSearch } from '../shared/methods';
-import { versionDescription } from './VersionDescription';
 
 export class NotionV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
index 3d0334a04f..f8f9fe5f4a 100644
--- a/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v1/VersionDescription.ts
@@ -1,17 +1,14 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
-import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
-
-import { userFields, userOperations } from '../shared/descriptions/UserDescription';
-
-import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
 
 import { blockFields, blockOperations } from '../shared/descriptions/BlockDescription';
-
+import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
 import {
 	databasePageFields,
 	databasePageOperations,
 } from '../shared/descriptions/DatabasePageDescription';
+import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
+import { userFields, userOperations } from '../shared/descriptions/UserDescription';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Notion',
diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
index 6c5205f9d0..a5b08b3fe3 100644
--- a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
+++ b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
@@ -8,13 +8,15 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 
+import { loadOptions } from './methods';
+import { versionDescription } from './VersionDescription';
 import type { SortData, FileRecord } from '../shared/GenericFunctions';
 import {
 	downloadFiles,
 	extractBlockId,
 	extractDatabaseId,
 	extractDatabaseMentionRLC,
-	extractPageId,
+	getPageId,
 	formatBlocks,
 	formatTitle,
 	mapFilters,
@@ -28,10 +30,7 @@ import {
 	simplifyObjects,
 	validateJSON,
 } from '../shared/GenericFunctions';
-
 import { listSearch } from '../shared/methods';
-import { loadOptions } from './methods';
-import { versionDescription } from './VersionDescription';
 
 export class NotionV2 implements INodeType {
 	description: INodeTypeDescription;
@@ -401,9 +400,8 @@ export class NotionV2 implements INodeType {
 			if (operation === 'get') {
 				for (let i = 0; i < itemsLength; i++) {
 					try {
-						const pageId = extractPageId(
-							this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
-						);
+						const pageId = getPageId.call(this, i);
+
 						const simple = this.getNodeParameter('simple', i) as boolean;
 						responseData = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
 						if (simple) {
@@ -526,9 +524,7 @@ export class NotionV2 implements INodeType {
 			if (operation === 'update') {
 				for (let i = 0; i < itemsLength; i++) {
 					try {
-						const pageId = extractPageId(
-							this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
-						);
+						const pageId = getPageId.call(this, i);
 						const simple = this.getNodeParameter('simple', i) as boolean;
 						const properties = this.getNodeParameter(
 							'propertiesUi.propertyValues',
@@ -635,9 +631,7 @@ export class NotionV2 implements INodeType {
 			if (operation === 'archive') {
 				for (let i = 0; i < itemsLength; i++) {
 					try {
-						const pageId = extractPageId(
-							this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
-						);
+						const pageId = getPageId.call(this, i);
 						const simple = this.getNodeParameter('simple', i) as boolean;
 						responseData = await notionApiRequest.call(this, 'PATCH', `/pages/${pageId}`, {
 							archived: true,
@@ -672,9 +666,7 @@ export class NotionV2 implements INodeType {
 							parent: {},
 							properties: {},
 						};
-						body.parent.page_id = extractPageId(
-							this.getNodeParameter('pageId', i, '', { extractValue: true }) as string,
-						);
+						body.parent.page_id = getPageId.call(this, i);
 						body.properties = formatTitle(this.getNodeParameter('title', i) as string);
 						const blockValues = this.getNodeParameter(
 							'blockUi.blockValues',
diff --git a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
index 4114d681db..d109920c89 100644
--- a/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
+++ b/packages/nodes-base/nodes/Notion/v2/VersionDescription.ts
@@ -1,17 +1,14 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
-import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
-
-import { userFields, userOperations } from '../shared/descriptions/UserDescription';
-
-import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
 
 import { blockFields, blockOperations } from '../shared/descriptions/BlockDescription';
-
+import { databaseFields, databaseOperations } from '../shared/descriptions/DatabaseDescription';
 import {
 	databasePageFields,
 	databasePageOperations,
 } from '../shared/descriptions/DatabasePageDescription';
+import { pageFields, pageOperations } from '../shared/descriptions/PageDescription';
+import { userFields, userOperations } from '../shared/descriptions/UserDescription';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'Notion',
diff --git a/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts
index 1e0de23836..0410032a29 100644
--- a/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Notion/v2/methods/loadOptions.ts
@@ -1,6 +1,5 @@
-import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-
 import moment from 'moment-timezone';
+import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 
 import {
 	extractPageId,
diff --git a/packages/nodes-base/nodes/Npm/Npm.node.ts b/packages/nodes-base/nodes/Npm/Npm.node.ts
index d86c82fe0d..2eeca1ec30 100644
--- a/packages/nodes-base/nodes/Npm/Npm.node.ts
+++ b/packages/nodes-base/nodes/Npm/Npm.node.ts
@@ -1,7 +1,8 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { packageFields, packageOperations } from './PackageDescription';
+
 import { distTagFields, distTagOperations } from './DistTagDescription';
+import { packageFields, packageOperations } from './PackageDescription';
 
 export class Npm implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Npm/PackageDescription.ts b/packages/nodes-base/nodes/Npm/PackageDescription.ts
index 75ebf7ed75..d5b673522a 100644
--- a/packages/nodes-base/nodes/Npm/PackageDescription.ts
+++ b/packages/nodes-base/nodes/Npm/PackageDescription.ts
@@ -1,5 +1,5 @@
-import { valid as isValidSemver } from 'semver';
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { valid as isValidSemver } from 'semver';
 
 interface PackageJson {
 	name: string;
diff --git a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
index 95d621240b..2ae6f93a2b 100644
--- a/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
+++ b/packages/nodes-base/nodes/Npm/test/Npm.node.test.ts
@@ -1,6 +1,7 @@
 import nock from 'nock';
-import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
+
 import { FAKE_CREDENTIALS_DATA } from '@test/nodes/FakeCredentialsMap';
+import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 describe('Test npm Node', () => {
 	beforeAll(() => {
diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
index 58472d9340..54ca0621cb 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
@@ -1,3 +1,4 @@
+import { capitalCase } from 'change-case';
 import type {
 	IExecuteFunctions,
 	ICredentialsDecrypted,
@@ -13,7 +14,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy, randomInt } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
 import {
 	contactDescription,
 	contactOperations,
@@ -24,7 +24,6 @@ import {
 	opportunityDescription,
 	opportunityOperations,
 } from './descriptions';
-
 import type { IOdooFilterOperations } from './GenericFunctions';
 import {
 	odooCreate,
diff --git a/packages/nodes-base/nodes/Odoo/descriptions/index.ts b/packages/nodes-base/nodes/Odoo/descriptions/index.ts
index 12094d57ee..d1af6f9201 100644
--- a/packages/nodes-base/nodes/Odoo/descriptions/index.ts
+++ b/packages/nodes-base/nodes/Odoo/descriptions/index.ts
@@ -1,6 +1,6 @@
+import { contactDescription, contactOperations } from './ContactDescription';
 import { customResourceDescription, customResourceOperations } from './CustomResourceDescription';
 import { noteDescription, noteOperations } from './NoteDescription';
-import { contactDescription, contactOperations } from './ContactDescription';
 import { opportunityDescription, opportunityOperations } from './OpportunityDescription';
 
 export {
diff --git a/packages/nodes-base/nodes/Okta/Okta.node.ts b/packages/nodes-base/nodes/Okta/Okta.node.ts
index 550cffcd67..18ec90fb22 100644
--- a/packages/nodes-base/nodes/Okta/Okta.node.ts
+++ b/packages/nodes-base/nodes/Okta/Okta.node.ts
@@ -1,5 +1,6 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
+
 import { userFields, userOperations } from './UserDescription';
 import { getUsers } from './UserFunctions';
 
diff --git a/packages/nodes-base/nodes/Okta/UserDescription.ts b/packages/nodes-base/nodes/Okta/UserDescription.ts
index b10d580339..0990e86d7c 100644
--- a/packages/nodes-base/nodes/Okta/UserDescription.ts
+++ b/packages/nodes-base/nodes/Okta/UserDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { getCursorPaginator, simplifyGetAllResponse, simplifyGetResponse } from './UserFunctions';
 const BASE_API_URL = '/api/v1/users/';
 export const userOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts b/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts
index 9e5262db67..1695f8e35e 100644
--- a/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts
+++ b/packages/nodes-base/nodes/Okta/test/UserFunctions.test.ts
@@ -8,6 +8,7 @@ import type {
 	IN8nHttpFullResponse,
 	INodeExecutionData,
 } from 'n8n-workflow';
+
 import {
 	getCursorPaginator,
 	getUsers,
diff --git a/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts b/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
index 87c1b0be28..a70d12879a 100644
--- a/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,8 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 export async function onfleetApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
index fa6848da69..e6c18b9026 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
@@ -11,31 +11,16 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { taskFields, taskOperations } from './descriptions/TaskDescription';
-
-import { destinationFields, destinationOperations } from './descriptions/DestinationDescription';
-
-import { resourceLoaders } from './GenericFunctions';
-
-import { recipientFields, recipientOperations } from './descriptions/RecipientDescription';
-
-import { organizationFields, organizationOperations } from './descriptions/OrganizationDescription';
-
 import { adminFields, adminOperations } from './descriptions/AdministratorDescription';
-
-import { hubFields, hubOperations } from './descriptions/HubDescription';
-
-import { workerFields, workerOperations } from './descriptions/WorkerDescription';
-
-// import {
-// 	webhookFields,
-// 	webhookOperations,
-// } from './descriptions/WebhookDescription';
-
 import { containerFields, containerOperations } from './descriptions/ContainerDescription';
-
+import { destinationFields, destinationOperations } from './descriptions/DestinationDescription';
+import { hubFields, hubOperations } from './descriptions/HubDescription';
+import { organizationFields, organizationOperations } from './descriptions/OrganizationDescription';
+import { recipientFields, recipientOperations } from './descriptions/RecipientDescription';
+import { taskFields, taskOperations } from './descriptions/TaskDescription';
 import { teamFields, teamOperations } from './descriptions/TeamDescription';
-
+import { workerFields, workerOperations } from './descriptions/WorkerDescription';
+import { resourceLoaders } from './GenericFunctions';
 import { Onfleet as OnfleetMethods } from './Onfleet';
 export class Onfleet implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.ts
index b5c17186c5..9fc02b2c46 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,7 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
+import { onfleetApiRequest, onfleetApiRequestAllItems } from './GenericFunctions';
 import type {
 	OnfleetAdmins,
 	OnfleetCloneOverrideTaskOptions,
@@ -31,8 +32,6 @@ import type {
 	OnfleetWorkerScheduleEntry,
 } from './interfaces';
 
-import { onfleetApiRequest, onfleetApiRequestAllItems } from './GenericFunctions';
-
 const formatAddress = (
 	unparsed: boolean,
 	address: string | undefined,
@@ -789,7 +788,6 @@ export class Onfleet {
 			const tasksData = {
 				tasks: items.map((_item, index) => Onfleet.getTaskFields.call(this, index, operation)),
 			};
-			//@ts-ignore
 			const { tasks: tasksCreated } = await onfleetApiRequest.call(this, 'POST', path, tasksData);
 			return tasksCreated;
 		}
diff --git a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
index 24a1079cb4..3309734562 100644
--- a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
@@ -10,9 +10,7 @@ import type {
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { eventDisplay, eventNameField } from './descriptions/OnfleetWebhookDescription';
-
 import { onfleetApiRequest } from './GenericFunctions';
-
 import { webhookMapping } from './WebhookMapping';
 
 export class OnfleetTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Onfleet/descriptions/TaskDescription.ts b/packages/nodes-base/nodes/Onfleet/descriptions/TaskDescription.ts
index a967ed0007..bbb3affc79 100644
--- a/packages/nodes-base/nodes/Onfleet/descriptions/TaskDescription.ts
+++ b/packages/nodes-base/nodes/Onfleet/descriptions/TaskDescription.ts
@@ -1,7 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import { destinationExternalField } from './DestinationDescription';
-
 import { recipientExternalField } from './RecipientDescription';
 
 export const taskOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
index 2b0ef3e8df..35db57f4bd 100644
--- a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { sendErrorPostReceive } from './GenericFunctions';
 
 export const chatOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
index 1cb5ceb89d..1b66be886c 100644
--- a/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ImageDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { sendErrorPostReceive } from './GenericFunctions';
 
 export const imageOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
index dd2d221868..0594353d04 100644
--- a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
+++ b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
@@ -1,9 +1,10 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { oldVersionNotice } from '../../utils/descriptions';
+
+import { chatFields, chatOperations } from './ChatDescription';
 import { imageFields, imageOperations } from './ImageDescription';
 import { textFields, textOperations } from './TextDescription';
-import { chatFields, chatOperations } from './ChatDescription';
+import { oldVersionNotice } from '../../utils/descriptions';
 
 export class OpenAi implements INodeType {
 	description: INodeTypeDescription = {
@@ -28,7 +29,8 @@ export class OpenAi implements INodeType {
 		],
 		requestDefaults: {
 			ignoreHttpStatusErrors: true,
-			baseURL: 'https://api.openai.com',
+			baseURL:
+				'={{ $credentials.url?.split("/").slice(0,-1).join("/") ?? "https://api.openai.com" }}',
 		},
 		properties: [
 			oldVersionNotice,
diff --git a/packages/nodes-base/nodes/OpenAi/TextDescription.ts b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
index 30b533e90e..e22eb0d72a 100644
--- a/packages/nodes-base/nodes/OpenAi/TextDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
 import { sendErrorPostReceive } from './GenericFunctions';
 
 export const textOperations: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts b/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts
new file mode 100644
index 0000000000..70fe54bbb8
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenWeatherMap/test/OpenWeatherMap.test.ts
@@ -0,0 +1,31 @@
+import nock from 'nock';
+
+import { setup, equalityTest, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+import { currentWeatherResponse } from './apiResponses';
+
+describe('OpenWeatherMap', () => {
+	describe('Run OpenWeatherMap workflow', () => {
+		const workflows = getWorkflowFilenames(__dirname);
+		const tests = workflowToTests(workflows);
+
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			nock('https://api.openweathermap.org')
+				.get('/data/2.5/weather')
+				.query({ units: 'metric', q: 'berlin,de', lang: 'en' })
+				.reply(200, currentWeatherResponse);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const nodeTypes = setup(tests);
+
+		for (const testData of tests) {
+			test(testData.description, async () => await equalityTest(testData, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/test/apiResponses.ts b/packages/nodes-base/nodes/OpenWeatherMap/test/apiResponses.ts
new file mode 100644
index 0000000000..2e020d58ad
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenWeatherMap/test/apiResponses.ts
@@ -0,0 +1,45 @@
+export const currentWeatherResponse = {
+	coord: {
+		lon: 13.4105,
+		lat: 52.5244,
+	},
+	weather: [
+		{
+			id: 804,
+			main: 'Clouds',
+			description: 'overcast clouds',
+			icon: '04n',
+		},
+	],
+	base: 'stations',
+	main: {
+		temp: 4.85,
+		feels_like: 3.42,
+		temp_min: 3.9,
+		temp_max: 5.5,
+		pressure: 1034,
+		humidity: 85,
+		sea_level: 1034,
+		grnd_level: 1028,
+	},
+	visibility: 10000,
+	wind: {
+		speed: 1.79,
+		deg: 270,
+	},
+	clouds: {
+		all: 100,
+	},
+	dt: 1732901176,
+	sys: {
+		type: 2,
+		id: 2011538,
+		country: 'DE',
+		sunrise: 1732863129,
+		sunset: 1732892267,
+	},
+	timezone: 3600,
+	id: 2950159,
+	name: 'Berlin',
+	cod: 200,
+};
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/test/workflow.json b/packages/nodes-base/nodes/OpenWeatherMap/test/workflow.json
new file mode 100644
index 0000000000..bf21740df9
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenWeatherMap/test/workflow.json
@@ -0,0 +1,173 @@
+{
+	"name": "[Test] OpenWeatherMap",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "862c8413-520e-41bd-8cca-b340d537700e",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"cityName": "berlin,de",
+				"language": "en"
+			},
+			"type": "n8n-nodes-base.openWeatherMap",
+			"typeVersion": 1,
+			"position": [220, 0],
+			"id": "db67aa22-5bde-4beb-a7f9-2fe74d65528d",
+			"name": "OpenWeatherMap",
+			"credentials": {
+				"openWeatherMapApi": {
+					"id": "202",
+					"name": "OpenWeatherMap account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [440, 0],
+			"id": "cd149629-a752-4a59-9916-785c764ae449",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {
+				"cityName": "invalid",
+				"language": "en"
+			},
+			"type": "n8n-nodes-base.openWeatherMap",
+			"typeVersion": 1,
+			"position": [220, 200],
+			"id": "34663e6d-cf4c-4db8-b175-768d3ae97ca0",
+			"name": "OpenWeatherMap - Error",
+			"credentials": {
+				"openWeatherMapApi": {
+					"id": "202",
+					"name": "OpenWeatherMap account"
+				}
+			},
+			"onError": "continueErrorOutput"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [500, 220],
+			"id": "d0b80f33-3718-47a3-8be1-f7053281465b",
+			"name": "No Operation, do nothing1"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"coord": {
+						"lon": 13.4105,
+						"lat": 52.5244
+					},
+					"weather": [
+						{
+							"id": 804,
+							"main": "Clouds",
+							"description": "overcast clouds",
+							"icon": "04n"
+						}
+					],
+					"base": "stations",
+					"main": {
+						"temp": 4.85,
+						"feels_like": 3.42,
+						"temp_min": 3.9,
+						"temp_max": 5.5,
+						"pressure": 1034,
+						"humidity": 85,
+						"sea_level": 1034,
+						"grnd_level": 1028
+					},
+					"visibility": 10000,
+					"wind": {
+						"speed": 1.79,
+						"deg": 270
+					},
+					"clouds": {
+						"all": 100
+					},
+					"dt": 1732901176,
+					"sys": {
+						"type": 2,
+						"id": 2011538,
+						"country": "DE",
+						"sunrise": 1732863129,
+						"sunset": 1732892267
+					},
+					"timezone": 3600,
+					"id": 2950159,
+					"name": "Berlin",
+					"cod": 200
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"error": "The resource you are requesting could not be found"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "OpenWeatherMap",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "OpenWeatherMap - Error",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"OpenWeatherMap": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"OpenWeatherMap - Error": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "e7733656-9648-41e3-aea4-e2fcf15fb187",
+	"meta": {
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "dWewBVG7jz2iI020",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index 81141b3be4..1f938b9456 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.ts
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
@@ -6,15 +6,11 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
 
 import { activityFields, activityOperations } from './ActivityDescription';
-
 import { memberFields, memberOperations } from './MemberDescription';
-
 import { noteFields, noteOperations } from './NoteDescription';
-
 import { postFields, postOperations } from './PostDescription';
 
 export class Orbit implements INodeType {
diff --git a/packages/nodes-base/nodes/Oura/GenericFunctions.ts b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
index 9fb9691822..cbc562274d 100644
--- a/packages/nodes-base/nodes/Oura/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
@@ -4,7 +4,7 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	JsonObject,
-	IRequestOptions,
+	IHttpRequestOptions,
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
@@ -18,15 +18,11 @@ export async function ouraApiRequest(
 	uri?: string,
 	option: IDataObject = {},
 ) {
-	const credentials = await this.getCredentials('ouraApi');
-	let options: IRequestOptions = {
-		headers: {
-			Authorization: `Bearer ${credentials.accessToken}`,
-		},
+	let options: IHttpRequestOptions = {
 		method,
 		qs,
 		body,
-		uri: uri || `https://api.ouraring.com/v1${resource}`,
+		url: uri ?? `https://api.ouraring.com/v2${resource}`,
 		json: true,
 	};
 
@@ -41,7 +37,7 @@ export async function ouraApiRequest(
 	options = Object.assign({}, options, option);
 
 	try {
-		return await this.helpers.request(options);
+		return await this.helpers.httpRequestWithAuthentication.call(this, 'ouraApi', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
diff --git a/packages/nodes-base/nodes/Oura/Oura.node.ts b/packages/nodes-base/nodes/Oura/Oura.node.ts
index 17ef612cc4..ce522996d7 100644
--- a/packages/nodes-base/nodes/Oura/Oura.node.ts
+++ b/packages/nodes-base/nodes/Oura/Oura.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,11 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { ouraApiRequest } from './GenericFunctions';
-
 import { profileOperations } from './ProfileDescription';
-
 import { summaryFields, summaryOperations } from './SummaryDescription';
 
 export class Oura implements INodeType {
@@ -63,94 +61,126 @@ export class Oura implements INodeType {
 		const length = items.length;
 
 		let responseData;
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 
 		for (let i = 0; i < length; i++) {
-			if (resource === 'profile') {
-				// *********************************************************************
-				//                             profile
-				// *********************************************************************
+			try {
+				if (resource === 'profile') {
+					// *********************************************************************
+					//                             profile
+					// *********************************************************************
 
-				// https://cloud.ouraring.com/docs/personal-info
+					// https://cloud.ouraring.com/docs/personal-info
 
-				if (operation === 'get') {
-					// ----------------------------------
-					//         profile: get
-					// ----------------------------------
+					if (operation === 'get') {
+						// ----------------------------------
+						//         profile: get
+						// ----------------------------------
 
-					responseData = await ouraApiRequest.call(this, 'GET', '/userinfo');
-				}
-			} else if (resource === 'summary') {
-				// *********************************************************************
-				//                             summary
-				// *********************************************************************
-
-				// https://cloud.ouraring.com/docs/daily-summaries
-
-				const qs: IDataObject = {};
-
-				const { start, end } = this.getNodeParameter('filters', i) as {
-					start: string;
-					end: string;
-				};
-
-				const returnAll = this.getNodeParameter('returnAll', 0);
-
-				if (start) {
-					qs.start = moment(start).format('YYYY-MM-DD');
-				}
-
-				if (end) {
-					qs.end = moment(end).format('YYYY-MM-DD');
-				}
-
-				if (operation === 'getActivity') {
-					// ----------------------------------
-					//       profile: getActivity
-					// ----------------------------------
-
-					responseData = await ouraApiRequest.call(this, 'GET', '/activity', {}, qs);
-					responseData = responseData.activity;
-
-					if (!returnAll) {
-						const limit = this.getNodeParameter('limit', 0);
-						responseData = responseData.splice(0, limit);
+						responseData = await ouraApiRequest.call(this, 'GET', '/usercollection/personal_info');
 					}
-				} else if (operation === 'getReadiness') {
-					// ----------------------------------
-					//       profile: getReadiness
-					// ----------------------------------
+				} else if (resource === 'summary') {
+					// *********************************************************************
+					//                             summary
+					// *********************************************************************
 
-					responseData = await ouraApiRequest.call(this, 'GET', '/readiness', {}, qs);
-					responseData = responseData.readiness;
+					// https://cloud.ouraring.com/docs/daily-summaries
 
-					if (!returnAll) {
-						const limit = this.getNodeParameter('limit', 0);
-						responseData = responseData.splice(0, limit);
+					const qs: IDataObject = {};
+
+					const { start, end } = this.getNodeParameter('filters', i) as {
+						start: string;
+						end: string;
+					};
+
+					const returnAll = this.getNodeParameter('returnAll', 0);
+
+					if (start) {
+						qs.start_date = moment(start).format('YYYY-MM-DD');
 					}
-				} else if (operation === 'getSleep') {
-					// ----------------------------------
-					//         profile: getSleep
-					// ----------------------------------
 
-					responseData = await ouraApiRequest.call(this, 'GET', '/sleep', {}, qs);
-					responseData = responseData.sleep;
+					if (end) {
+						qs.end_date = moment(end).format('YYYY-MM-DD');
+					}
 
-					if (!returnAll) {
-						const limit = this.getNodeParameter('limit', 0);
-						responseData = responseData.splice(0, limit);
+					if (operation === 'getActivity') {
+						// ----------------------------------
+						//       profile: getActivity
+						// ----------------------------------
+
+						responseData = await ouraApiRequest.call(
+							this,
+							'GET',
+							'/usercollection/daily_activity',
+							{},
+							qs,
+						);
+						responseData = responseData.data;
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', 0);
+							responseData = responseData.splice(0, limit);
+						}
+					} else if (operation === 'getReadiness') {
+						// ----------------------------------
+						//       profile: getReadiness
+						// ----------------------------------
+
+						responseData = await ouraApiRequest.call(
+							this,
+							'GET',
+							'/usercollection/daily_readiness',
+							{},
+							qs,
+						);
+						responseData = responseData.data;
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', 0);
+							responseData = responseData.splice(0, limit);
+						}
+					} else if (operation === 'getSleep') {
+						// ----------------------------------
+						//         profile: getSleep
+						// ----------------------------------
+
+						responseData = await ouraApiRequest.call(
+							this,
+							'GET',
+							'/usercollection/daily_sleep',
+							{},
+							qs,
+						);
+						responseData = responseData.data;
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', 0);
+							responseData = responseData.splice(0, limit);
+						}
 					}
 				}
+
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
+					{ itemData: { item: i } },
+				);
+
+				returnData.push(...executionData);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					const executionErrorData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionErrorData);
+					continue;
+				}
+				throw error;
 			}
-
-			Array.isArray(responseData)
-				? returnData.push(...(responseData as IDataObject[]))
-				: returnData.push(responseData as IDataObject);
 		}
-
-		return [this.helpers.returnJsonArray(returnData)];
+		return [returnData];
 	}
 }
diff --git a/packages/nodes-base/nodes/Oura/test/apiResponses.ts b/packages/nodes-base/nodes/Oura/test/apiResponses.ts
new file mode 100644
index 0000000000..5003d94a7a
--- /dev/null
+++ b/packages/nodes-base/nodes/Oura/test/apiResponses.ts
@@ -0,0 +1,8 @@
+export const profileResponse = {
+	id: 'some-id',
+	age: 30,
+	weight: 168,
+	height: 80,
+	biological_sex: 'male',
+	email: 'nathan@n8n.io',
+};
diff --git a/packages/nodes-base/nodes/Oura/test/oura.node.test.ts b/packages/nodes-base/nodes/Oura/test/oura.node.test.ts
new file mode 100644
index 0000000000..19c1e8c2b4
--- /dev/null
+++ b/packages/nodes-base/nodes/Oura/test/oura.node.test.ts
@@ -0,0 +1,76 @@
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IHttpRequestMethods,
+	INode,
+} from 'n8n-workflow';
+import nock from 'nock';
+
+import { setup, equalityTest, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
+
+import { profileResponse } from './apiResponses';
+import { ouraApiRequest } from '../GenericFunctions';
+
+const node: INode = {
+	id: '2cdb46cf-b561-4537-a982-b8d26dd7718b',
+	name: 'Oura',
+	type: 'n8n-nodes-base.oura',
+	typeVersion: 1,
+	position: [0, 0],
+	parameters: {
+		resource: 'profile',
+		operation: 'get',
+	},
+};
+
+const mockThis = {
+	helpers: {
+		httpRequestWithAuthentication: jest
+			.fn()
+			.mockResolvedValue({ statusCode: 200, data: profileResponse }),
+	},
+	getNode() {
+		return node;
+	},
+	getNodeParameter: jest.fn(),
+} as unknown as IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions;
+
+describe('Oura', () => {
+	describe('ouraApiRequest', () => {
+		it('should make an authenticated API request to Oura', async () => {
+			const method: IHttpRequestMethods = 'GET';
+			const resource = '/usercollection/personal_info';
+
+			await ouraApiRequest.call(mockThis, method, resource);
+
+			expect(mockThis.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith('ouraApi', {
+				method: 'GET',
+				url: 'https://api.ouraring.com/v2/usercollection/personal_info',
+				json: true,
+			});
+		});
+	});
+	describe('Run Oura workflow', () => {
+		const workflows = getWorkflowFilenames(__dirname);
+		const tests = workflowToTests(workflows);
+
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			nock('https://api.ouraring.com/v2')
+				.get('/usercollection/personal_info')
+				.reply(200, profileResponse);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const nodeTypes = setup(tests);
+
+		for (const testData of tests) {
+			test(testData.description, async () => await equalityTest(testData, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Oura/test/oura_test_workflow.json b/packages/nodes-base/nodes/Oura/test/oura_test_workflow.json
new file mode 100644
index 0000000000..98ec58473e
--- /dev/null
+++ b/packages/nodes-base/nodes/Oura/test/oura_test_workflow.json
@@ -0,0 +1,86 @@
+{
+	"name": "Oura Test Workflow",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "c1e3b825-a9a8-4def-986b-9108d9441992",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"position": [720, 400],
+			"typeVersion": 1
+		},
+		{
+			"parameters": {
+				"resource": "profile"
+			},
+			"id": "7969bf78-9343-4f81-8f79-dc415a60e168",
+			"name": "Oura",
+			"type": "n8n-nodes-base.oura",
+			"typeVersion": 1,
+			"position": [940, 400],
+			"credentials": {
+				"ouraApi": {
+					"id": "r083EOdhFatkVvFy",
+					"name": "Oura account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "9b97fa0e-51a6-41d3-8a7d-cff0531e5527",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 400]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "some-id",
+					"age": 30,
+					"weight": 168,
+					"height": 80,
+					"biological_sex": "male",
+					"email": "nathan@n8n.io"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Oura",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Oura": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "bd108f46-f6fc-4c22-8655-ade2f51c4b33",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "0fa937d34dcabeff4bd6480d3b42cc95edf3bc20e6810819086ef1ce2623639d"
+	},
+	"id": "SrUileWU90mQeo02",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index cb9ce4b76a..1bdedf2338 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -10,17 +11,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { couponFields, couponOperations } from './CouponDescription';
-
 import { paddleApiRequest, paddleApiRequestAllItems, validateJSON } from './GenericFunctions';
-
 import { paymentFields, paymentOperations } from './PaymentDescription';
-
 import { planFields, planOperations } from './PlanDescription';
-
 import { productFields, productOperations } from './ProductDescription';
-
 import { userFields, userOperations } from './UserDescription';
 
 // import {
diff --git a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
index 3206e20587..3f21331d71 100644
--- a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	JsonObject,
 	IDataObject,
@@ -10,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
 export async function pagerDutyApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
index 4a1cfbbe67..d00742dec1 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
@@ -1,3 +1,5 @@
+import { snakeCase } from 'change-case';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,23 +11,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-import moment from 'moment-timezone';
 import {
 	keysToSnakeCase,
 	pagerDutyApiRequest,
 	pagerDutyApiRequestAllItems,
 } from './GenericFunctions';
-
 import { incidentFields, incidentOperations } from './IncidentDescription';
-
-import { incidentNoteFields, incidentNoteOperations } from './IncidentNoteDescription';
-
-import { logEntryFields, logEntryOperations } from './LogEntryDescription';
-
-import { userFields, userOperations } from './UserDescription';
-
 import type { IIncident } from './IncidentInterface';
+import { incidentNoteFields, incidentNoteOperations } from './IncidentNoteDescription';
+import { logEntryFields, logEntryOperations } from './LogEntryDescription';
+import { userFields, userOperations } from './UserDescription';
 
 export class PagerDuty implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.ts b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
index c046226a3e..a10001b652 100644
--- a/packages/nodes-base/nodes/PayPal/PayPal.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
@@ -10,6 +10,8 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+import { payPalApiRequest, payPalApiRequestAllItems, validateJSON } from './GenericFunctions';
 import {
 	payoutFields,
 	payoutItemFields,
@@ -24,7 +26,6 @@ import type {
 	RecipientType,
 	RecipientWallet,
 } from './PaymentInteface';
-import { payPalApiRequest, payPalApiRequestAllItems, validateJSON } from './GenericFunctions';
 
 export class PayPal implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
index 6d409202d4..7fb8987ef5 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
@@ -10,6 +10,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
+
 import { payPalApiRequest, upperFist } from './GenericFunctions';
 
 export class PayPalTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts b/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts
index 1bfa540ee2..4c06cf620f 100644
--- a/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts
+++ b/packages/nodes-base/nodes/Peekalink/test/Peekalink.node.test.ts
@@ -1,8 +1,10 @@
 import { NodeConnectionType } from 'n8n-workflow';
-import { apiUrl } from '../Peekalink.node';
-import type { WorkflowTestData } from '@test/nodes/types';
+
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
+
+import { apiUrl } from '../Peekalink.node';
 
 describe('Peekalink Node', () => {
 	const exampleComPreview = {
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index 33a323830d..facb21aa46 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -9,9 +9,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { phantombusterApiRequest, validateJSON } from './GenericFunctions';
-
 import { agentFields, agentOperations } from './AgentDescription';
+import { phantombusterApiRequest, validateJSON } from './GenericFunctions';
 
 // import {
 // 	sentenceCase,
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index 63634980b6..83c90c3068 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { getUser, philipsHueApiRequest } from './GenericFunctions';
-
 import { lightFields, lightOperations } from './LightDescription';
 
 export class PhilipsHue implements INodeType {
diff --git a/packages/nodes-base/nodes/PhilipsHue/test/apiResponses.ts b/packages/nodes-base/nodes/PhilipsHue/test/apiResponses.ts
new file mode 100644
index 0000000000..9edfbbc332
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/test/apiResponses.ts
@@ -0,0 +1,108 @@
+export const getLightsResponse = {
+	'1': {
+		state: {
+			on: false,
+			bri: 1,
+			hue: 33761,
+			sat: 254,
+			effect: 'none',
+			xy: [0.3171, 0.3366],
+			ct: 159,
+			alert: 'none',
+			colormode: 'xy',
+			mode: 'homeautomation',
+			reachable: true,
+		},
+		swupdate: {
+			state: 'noupdates',
+			lastinstall: '2018-01-02T19:24:20',
+		},
+		type: 'Extended color light',
+		name: 'Hue color lamp 7',
+		modelid: 'LCT007',
+		manufacturername: 'Philips',
+		productname: 'Hue color lamp',
+		capabilities: {
+			certified: true,
+			control: {
+				mindimlevel: 5000,
+				maxlumen: 600,
+				colorgamuttype: 'B',
+				colorgamut: [
+					[0.675, 0.322],
+					[0.409, 0.518],
+					[0.167, 0.04],
+				],
+				ct: {
+					min: 153,
+					max: 500,
+				},
+			},
+			streaming: {
+				renderer: true,
+				proxy: false,
+			},
+		},
+		config: {
+			archetype: 'sultanbulb',
+			function: 'mixed',
+			direction: 'omnidirectional',
+		},
+		uniqueid: '00:17:88:01:00:bd:c7:b9-0b',
+		swversion: '5.105.0.21169',
+	},
+};
+
+export const getConfigResponse = {
+	name: 'Philips hue',
+	zigbeechannel: 15,
+	mac: '00:17:88:00:00:00',
+	dhcp: true,
+	ipaddress: '192.168.1.7',
+	netmask: '255.255.255.0',
+	gateway: '192.168.1.1',
+	proxyaddress: 'none',
+	proxyport: 0,
+	UTC: '2014-07-17T09:27:35',
+	localtime: '2014-07-17T11:27:35',
+	timezone: 'Europe/Madrid',
+	whitelist: {
+		ffffffffe0341b1b376a2389376a2389: {
+			'last use date': '2014-07-17T07:21:38',
+			'create date': '2014-04-08T08:55:10',
+			name: 'PhilipsHueAndroidApp#TCT ALCATEL ONE TOU',
+		},
+		pAtwdCV8NZId25Gk: {
+			'last use date': '2014-05-07T18:28:29',
+			'create date': '2014-04-09T17:29:16',
+			name: 'n8n',
+		},
+	},
+	swversion: '01012917',
+	apiversion: '1.3.0',
+	swupdate: {
+		updatestate: 0,
+		url: '',
+		text: '',
+		notify: false,
+	},
+	linkbutton: false,
+	portalservices: false,
+	portalconnection: 'connected',
+	portalstate: {
+		signedon: true,
+		incoming: false,
+		outgoing: true,
+		communication: 'disconnected',
+	},
+};
+
+export const updateLightResponse = [
+	{ success: { '/lights/1/state/bri': 200 } },
+	{ success: { '/lights/1/state/on': true } },
+	{ success: { '/lights/1/state/hue': 50000 } },
+];
+
+export const deleteLightResponse = {
+	success: '/lights/1 deleted.',
+};
diff --git a/packages/nodes-base/nodes/PhilipsHue/test/workflow.json b/packages/nodes-base/nodes/PhilipsHue/test/workflow.json
new file mode 100644
index 0000000000..39df6bd1aa
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/test/workflow.json
@@ -0,0 +1,227 @@
+{
+	"name": "[TEST] Hue",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "9e687c5d-e3a5-436d-a96d-7bfde1110f40",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"operation": "getAll",
+				"returnAll": true
+			},
+			"type": "n8n-nodes-base.philipsHue",
+			"typeVersion": 1,
+			"position": [260, 0],
+			"id": "063bcf31-3055-42f1-904f-d517f85db182",
+			"name": "Philips Hue",
+			"credentials": {
+				"philipsHueOAuth2Api": {
+					"id": "s6tRicNTKQoa9TDq",
+					"name": "PhilipHue account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 0],
+			"id": "d6c4f99a-d660-4113-aa08-a7bcc9391236",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {
+				"lightId": "=1",
+				"additionalFields": {
+					"bri": 200,
+					"hue": 50000
+				}
+			},
+			"type": "n8n-nodes-base.philipsHue",
+			"typeVersion": 1,
+			"position": [260, 200],
+			"id": "c8311112-d24e-4787-80b1-cc5397aea98e",
+			"name": "Philips Hue1",
+			"credentials": {
+				"philipsHueOAuth2Api": {
+					"id": "s6tRicNTKQoa9TDq",
+					"name": "PhilipHue account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 200],
+			"id": "c438bf28-0cf8-459a-bd3a-28f6c30b3f2f",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"operation": "delete",
+				"lightId": "=1"
+			},
+			"type": "n8n-nodes-base.philipsHue",
+			"typeVersion": 1,
+			"position": [280, 400],
+			"id": "fd197627-9221-4e6d-ab51-53d262004db8",
+			"name": "Philips Hue2",
+			"credentials": {
+				"philipsHueOAuth2Api": {
+					"id": "s6tRicNTKQoa9TDq",
+					"name": "PhilipHue account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [500, 400],
+			"id": "19796164-8527-462b-b01b-71d7f60c94af",
+			"name": "No Operation, do nothing2"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"state": {
+						"on": false,
+						"bri": 1,
+						"hue": 33761,
+						"sat": 254,
+						"effect": "none",
+						"xy": [0.3171, 0.3366],
+						"ct": 159,
+						"alert": "none",
+						"colormode": "xy",
+						"mode": "homeautomation",
+						"reachable": true
+					},
+					"swupdate": {
+						"state": "noupdates",
+						"lastinstall": "2018-01-02T19:24:20"
+					},
+					"type": "Extended color light",
+					"name": "Hue color lamp 7",
+					"modelid": "LCT007",
+					"manufacturername": "Philips",
+					"productname": "Hue color lamp",
+					"capabilities": {
+						"certified": true,
+						"control": {
+							"mindimlevel": 5000,
+							"maxlumen": 600,
+							"colorgamuttype": "B",
+							"colorgamut": [[0.675, 0.322], [0.409, 0.518], [0.167, 0.04]],
+							"ct": {
+								"min": 153,
+								"max": 500
+							}
+						},
+						"streaming": {
+							"renderer": true,
+							"proxy": false
+						}
+					},
+					"config": {
+						"archetype": "sultanbulb",
+						"function": "mixed",
+						"direction": "omnidirectional"
+					},
+					"uniqueid": "00:17:88:01:00:bd:c7:b9-0b",
+					"swversion": "5.105.0.21169"
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"/lights/1/state/bri": 200,
+					"/lights/1/state/on": true,
+					"/lights/1/state/hue": 50000
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"success": "/lights/1 deleted."
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Philips Hue",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Philips Hue1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Philips Hue2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Philips Hue": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Philips Hue1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Philips Hue2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "2c19891b-ba8e-4026-b8c2-b5f3f508b54a",
+	"meta": {
+		"instanceId": "0fa937d34dcabeff4bd6480d3b42cc95edf3bc20e6810819086ef1ce2623639d"
+	},
+	"id": "LAngRPRzm3OGrfh0",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts b/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts
new file mode 100644
index 0000000000..26f6796632
--- /dev/null
+++ b/packages/nodes-base/nodes/PhilipsHue/test/workflow.test.ts
@@ -0,0 +1,41 @@
+import nock from 'nock';
+
+import {
+	deleteLightResponse,
+	getLightsResponse,
+	getConfigResponse,
+	updateLightResponse,
+} from './apiResponses';
+import {
+	setup,
+	equalityTest,
+	workflowToTests,
+	getWorkflowFilenames,
+} from '../../../test/nodes/Helpers';
+
+describe('PhilipsHue', () => {
+	describe('Run workflow', () => {
+		const workflows = getWorkflowFilenames(__dirname);
+		const tests = workflowToTests(workflows);
+
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			const mock = nock('https://api.meethue.com/route');
+			mock.persist().get('/api/0/config').reply(200, getConfigResponse);
+			mock.get('/api/pAtwdCV8NZId25Gk/lights').reply(200, getLightsResponse);
+			mock.put('/api/pAtwdCV8NZId25Gk/lights/1/state').reply(200, updateLightResponse);
+			mock.delete('/api/pAtwdCV8NZId25Gk/lights/1').reply(200, deleteLightResponse);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const nodeTypes = setup(tests);
+
+		for (const testData of tests) {
+			test(testData.description, async () => await equalityTest(testData, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index a92578a4d1..bdca4a33f4 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -19,7 +19,6 @@ import {
 	pipedriveResolveCustomProperties,
 	sortOptionParameters,
 } from './GenericFunctions';
-
 import { currencies } from './utils';
 
 interface CustomProperty {
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index 0ebe6792cb..aba0297bd7 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -1,3 +1,5 @@
+import basicAuth from 'basic-auth';
+import type { Response } from 'express';
 import {
 	type IHookFunctions,
 	type IWebhookFunctions,
@@ -9,9 +11,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import basicAuth from 'basic-auth';
-
-import type { Response } from 'express';
 import { pipedriveApiRequest } from './GenericFunctions';
 
 function authorizationError(resp: Response, realm: string, responseCode: number, message?: string) {
diff --git a/packages/nodes-base/nodes/Plivo/Plivo.node.ts b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
index d6ce65de0e..53f651a31c 100644
--- a/packages/nodes-base/nodes/Plivo/Plivo.node.ts
+++ b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
@@ -7,13 +7,10 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { smsFields, smsOperations } from './SmsDescription';
-
-import { mmsFields, mmsOperations } from './MmsDescription';
-
 import { callFields, callOperations } from './CallDescription';
-
 import { plivoApiRequest } from './GenericFunctions';
+import { mmsFields, mmsOperations } from './MmsDescription';
+import { smsFields, smsOperations } from './SmsDescription';
 
 export class Plivo implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/PostBin/PostBin.node.ts b/packages/nodes-base/nodes/PostBin/PostBin.node.ts
index ccad7205dc..4547ca1fc5 100644
--- a/packages/nodes-base/nodes/PostBin/PostBin.node.ts
+++ b/packages/nodes-base/nodes/PostBin/PostBin.node.ts
@@ -2,7 +2,6 @@ import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { binFields, binOperations } from './BinDescription';
-
 import { requestFields, requestOperations } from './RequestDescription';
 
 export class PostBin implements INodeType {
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index 603bddcc02..3a894815a8 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,17 +8,12 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
+import { aliasFields, aliasOperations } from './AliasDescription';
+import { eventFields, eventOperations } from './EventDescription';
 import type { IAlias, IEvent, IIdentity, ITrack } from './GenericFunctions';
 import { posthogApiRequest } from './GenericFunctions';
-
-import { aliasFields, aliasOperations } from './AliasDescription';
-
-import { eventFields, eventOperations } from './EventDescription';
-
-import { trackFields, trackOperations } from './TrackDescription';
-
 import { identityFields, identityOperations } from './IdentityDescription';
+import { trackFields, trackOperations } from './TrackDescription';
 
 export class PostHog implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
index f46eba1481..4465cea975 100644
--- a/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.functions.ts
@@ -7,8 +7,8 @@ import type {
 	INodeListSearchItems,
 } from 'n8n-workflow';
 
+import { configurePostgres } from './transport';
 import type { PgpDatabase, PostgresNodeCredentials } from './v2/helpers/interfaces';
-import { configurePostgres } from './v2/transport';
 
 export function prepareNames(id: string, mode: string, additionalFields: IDataObject) {
 	let suffix = id.replace(/-/g, '_');
@@ -102,7 +102,6 @@ export async function searchSchema(this: ILoadOptionsFunctions): Promise<INodeLi
 		name: s.schema_name as string,
 		value: s.schema_name as string,
 	}));
-	await db.$pool.end();
 	return { results };
 }
 
@@ -122,6 +121,5 @@ export async function searchTables(this: ILoadOptionsFunctions): Promise<INodeLi
 		name: s.table_name as string,
 		value: s.table_name as string,
 	}));
-	await db.$pool.end();
 	return { results };
 }
diff --git a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
index 1bf2334071..4b4b424da2 100644
--- a/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postgres/PostgresTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	type ITriggerResponse,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import {
 	pgTriggerFunction,
 	initDB,
@@ -320,7 +321,6 @@ export class PostgresTrigger implements INodeType {
 				}
 			} finally {
 				connection.client.removeListener('notification', onNotification);
-				if (!db.$pool.ending) await db.$pool.end();
 			}
 		};
 
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
index 0f97966769..a2c0055590 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/operations.test.ts
@@ -1,3 +1,4 @@
+import { get } from 'lodash';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,9 +6,7 @@ import type {
 	INode,
 	INodeParameters,
 } from 'n8n-workflow';
-
-import { get } from 'lodash';
-import type { ColumnInfo, PgpDatabase, QueriesRunner } from '../../v2/helpers/interfaces';
+import pgPromise from 'pg-promise';
 
 import * as deleteTable from '../../v2/actions/database/deleteTable.operation';
 import * as executeQuery from '../../v2/actions/database/executeQuery.operation';
@@ -15,6 +14,8 @@ import * as insert from '../../v2/actions/database/insert.operation';
 import * as select from '../../v2/actions/database/select.operation';
 import * as update from '../../v2/actions/database/update.operation';
 import * as upsert from '../../v2/actions/database/upsert.operation';
+import type { ColumnInfo, PgpDatabase, QueriesRunner } from '../../v2/helpers/interfaces';
+import * as utils from '../../v2/helpers/utils';
 
 const runQueries: QueriesRunner = jest.fn();
 
@@ -217,7 +218,7 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
-			[{ query: 'select * from $1:name;', values: ['my_table'] }],
+			[{ query: 'select * from $1:name;', values: ['my_table'], options: { partial: true } }],
 			items,
 			nodeOptions,
 		);
@@ -239,7 +240,7 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
-			[{ query: 'select $1;', values: ['$1'] }],
+			[{ query: 'select $1;', values: ['$1'], options: { partial: true } }],
 			items,
 			nodeOptions,
 		);
@@ -263,7 +264,7 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
-			[{ query: "select '$1';", values: ['my_table'] }],
+			[{ query: "select '$1';", values: ['my_table'], options: { partial: true } }],
 			items,
 			nodeOptions,
 		);
@@ -288,7 +289,7 @@ describe('Test PostgresV2, executeQuery operation', () => {
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
-			[{ query: 'select $2;', values: ['my_table', '$1'] }],
+			[{ query: 'select $2;', values: ['my_table', '$1'], options: { partial: true } }],
 			items,
 			nodeOptions,
 		);
@@ -313,6 +314,147 @@ describe('Test PostgresV2, executeQuery operation', () => {
 			);
 		}).not.toThrow();
 	});
+
+	it('should allow users to use $$ instead of strings', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'INSERT INTO dollar_bug (description) VALUES ($$34test$$);',
+			options: {},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		expect(async () => {
+			await executeQuery.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				items,
+				nodeOptions,
+			);
+		}).not.toThrow();
+	});
+
+	it('should allow users to use $$ instead of strings while using query parameters', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'INSERT INTO dollar_bug (description) VALUES ($1 || $$4more text$$)',
+			options: {
+				queryReplacement: '={{ $3This is a test }}',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[
+				{
+					query: 'INSERT INTO dollar_bug (description) VALUES ($1 || $$4more text$$)',
+					values: [' $3This is a test '],
+					options: { partial: true },
+				},
+			],
+			items,
+			nodeOptions,
+		);
+	});
+
+	it('should execute queries with multiple json key/value pairs', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)',
+			options: {
+				queryReplacement:
+					'={{ JSON.stringify({id: "7",id2: "848da11d-e72e-44c5-yyyy-c6fb9f17d366"}) }}',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		expect(async () => {
+			await executeQuery.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				items,
+				nodeOptions,
+			);
+		}).not.toThrow();
+	});
+
+	it('should execute queries with single json key/value pair', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query: 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)',
+			options: {
+				queryReplacement: '={{ {"id": "7"} }}',
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		expect(async () => {
+			await executeQuery.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				items,
+				nodeOptions,
+			);
+		}).not.toThrow();
+	});
+
+	it('should not parse out expressions if there are valid JSON query parameters', async () => {
+		const query = 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)';
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query,
+			options: {
+				queryReplacement: '={{ {"id": "7"} }}',
+				nodeVersion: 2.6,
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		jest.spyOn(utils, 'isJSON');
+		jest.spyOn(utils, 'stringToArray');
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(utils.isJSON).toHaveBeenCalledTimes(1);
+		expect(utils.stringToArray).toHaveBeenCalledTimes(0);
+	});
+
+	it('should parse out expressions if is invalid JSON in query parameters', async () => {
+		const query = 'SELECT *\nFROM users\nWHERE username IN ($1, $2, $3)';
+		const nodeParameters: IDataObject = {
+			operation: 'executeQuery',
+			query,
+			options: {
+				queryReplacement: '={{ JSON.stringify({"id": "7"}}) }}',
+				nodeVersion: 2.6,
+			},
+		};
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		jest.spyOn(utils, 'isJSON');
+		jest.spyOn(utils, 'stringToArray');
+
+		await executeQuery.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			items,
+			nodeOptions,
+		);
+
+		expect(utils.isJSON).toHaveBeenCalledTimes(1);
+		expect(utils.stringToArray).toHaveBeenCalledTimes(1);
+	});
 });
 
 describe('Test PostgresV2, insert operation', () => {
@@ -365,6 +507,7 @@ describe('Test PostgresV2, insert operation', () => {
 			items,
 			nodeOptions,
 			createMockDb(columnsInfo),
+			pgPromise(),
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
@@ -438,6 +581,7 @@ describe('Test PostgresV2, insert operation', () => {
 			inputItems,
 			nodeOptions,
 			createMockDb(columnsInfo),
+			pgPromise(),
 		);
 
 		expect(runQueries).toHaveBeenCalledWith(
@@ -459,6 +603,96 @@ describe('Test PostgresV2, insert operation', () => {
 			nodeOptions,
 		);
 	});
+
+	it('dataMode: define, should accept an array with values if column is of type json', async () => {
+		const convertValuesToJsonWithPgpSpy = jest.spyOn(utils, 'convertValuesToJsonWithPgp');
+		const hasJsonDataTypeInSchemaSpy = jest.spyOn(utils, 'hasJsonDataTypeInSchema');
+
+		const values = [
+			{ value: { id: 1, json: [], foo: 'data 1' }, expected: { id: 1, json: '[]', foo: 'data 1' } },
+			{
+				value: {
+					id: 2,
+					json: [0, 1],
+					foo: 'data 2',
+				},
+				expected: {
+					id: 2,
+					json: '[0,1]',
+					foo: 'data 2',
+				},
+			},
+			{
+				value: {
+					id: 2,
+					json: [0],
+					foo: 'data 2',
+				},
+				expected: {
+					id: 2,
+					json: '[0]',
+					foo: 'data 2',
+				},
+			},
+		];
+
+		values.forEach(async (value) => {
+			const valuePassedIn = value.value;
+			const nodeParameters: IDataObject = {
+				schema: {
+					__rl: true,
+					mode: 'list',
+					value: 'public',
+				},
+				table: {
+					__rl: true,
+					value: 'my_table',
+					mode: 'list',
+				},
+				columns: {
+					mappingMode: 'defineBelow',
+					value: valuePassedIn,
+				},
+				options: { nodeVersion: 2.5 },
+			};
+			const columnsInfo: ColumnInfo[] = [
+				{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+				{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+				{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
+			];
+
+			const inputItems = [
+				{
+					json: valuePassedIn,
+				},
+			];
+
+			const nodeOptions = nodeParameters.options as IDataObject;
+			const pg = pgPromise();
+
+			await insert.execute.call(
+				createMockExecuteFunction(nodeParameters),
+				runQueries,
+				inputItems,
+				nodeOptions,
+				createMockDb(columnsInfo),
+				pg,
+			);
+
+			expect(runQueries).toHaveBeenCalledWith(
+				[
+					{
+						query: 'INSERT INTO $1:name.$2:name($3:name) VALUES($3:csv) RETURNING *',
+						values: ['public', 'my_table', value.expected],
+					},
+				],
+				inputItems,
+				nodeOptions,
+			);
+			expect(convertValuesToJsonWithPgpSpy).toHaveBeenCalledWith(pg, columnsInfo, valuePassedIn);
+			expect(hasJsonDataTypeInSchemaSpy).toHaveBeenCalledWith(columnsInfo);
+		});
+	});
 });
 
 describe('Test PostgresV2, select operation', () => {
@@ -917,3 +1151,184 @@ describe('Test PostgresV2, upsert operation', () => {
 		);
 	});
 });
+
+describe('When matching on all columns', () => {
+	it('dataMode: define, should call runQueries with', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'upsert',
+			schema: {
+				__rl: true,
+				mode: 'list',
+				value: 'public',
+			},
+			table: {
+				__rl: true,
+				value: 'my_table',
+				mode: 'list',
+			},
+			columns: {
+				matchingColumns: ['id', 'json', 'foo'],
+				value: { id: '5', json: '{ "test": 5 }', foo: 'data 5' },
+				mappingMode: 'defineBelow',
+			},
+			options: {
+				outputColumns: ['json'],
+				nodeVersion: 2.5,
+			},
+		};
+		const columnsInfo: ColumnInfo[] = [
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
+		];
+		const inputItems = [
+			{
+				json: {
+					id: 1,
+					json: {
+						test: 15,
+					},
+					foo: 'data 1',
+				},
+			},
+		];
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await upsert.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			inputItems,
+			nodeOptions,
+			createMockDb(columnsInfo),
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[
+				{
+					query:
+						'INSERT INTO $1:name.$2:name($6:name) VALUES($6:csv) ON CONFLICT ($3:name,$4:name,$5:name) DO NOTHING  RETURNING $7:name',
+					values: [
+						'public',
+						'my_table',
+						'id',
+						'json',
+						'foo',
+						{ id: '5', json: '{ "test": 5 }', foo: 'data 5' },
+						['json'],
+					],
+				},
+			],
+			inputItems,
+			nodeOptions,
+		);
+	});
+
+	it('dataMode: autoMapInputData, should call runQueries with', async () => {
+		const nodeParameters: IDataObject = {
+			operation: 'upsert',
+			schema: {
+				__rl: true,
+				mode: 'list',
+				value: 'public',
+			},
+			table: {
+				__rl: true,
+				value: 'my_table',
+				mode: 'list',
+			},
+			columns: {
+				matchingColumns: ['id', 'json', 'foo'],
+				mappingMode: 'autoMapInputData',
+			},
+			options: { nodeVersion: 2.5 },
+		};
+		const columnsInfo: ColumnInfo[] = [
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'json', data_type: 'json', is_nullable: 'NO', udt_name: '' },
+			{ column_name: 'foo', data_type: 'text', is_nullable: 'NO', udt_name: '' },
+		];
+
+		const inputItems = [
+			{
+				json: {
+					id: 1,
+					json: {
+						test: 15,
+					},
+					foo: 'data 1',
+				},
+			},
+			{
+				json: {
+					id: 2,
+					json: {
+						test: 10,
+					},
+					foo: 'data 2',
+				},
+			},
+			{
+				json: {
+					id: 3,
+					json: {
+						test: 5,
+					},
+					foo: 'data 3',
+				},
+			},
+		];
+
+		const nodeOptions = nodeParameters.options as IDataObject;
+
+		await upsert.execute.call(
+			createMockExecuteFunction(nodeParameters),
+			runQueries,
+			inputItems,
+			nodeOptions,
+			createMockDb(columnsInfo),
+		);
+
+		expect(runQueries).toHaveBeenCalledWith(
+			[
+				{
+					query:
+						'INSERT INTO $1:name.$2:name($6:name) VALUES($6:csv) ON CONFLICT ($3:name,$4:name,$5:name) DO NOTHING  RETURNING *',
+					values: [
+						'public',
+						'my_table',
+						'id',
+						'json',
+						'foo',
+						{ id: 1, json: { test: 15 }, foo: 'data 1' },
+					],
+				},
+				{
+					query:
+						'INSERT INTO $1:name.$2:name($6:name) VALUES($6:csv) ON CONFLICT ($3:name,$4:name,$5:name) DO NOTHING  RETURNING *',
+					values: [
+						'public',
+						'my_table',
+						'id',
+						'json',
+						'foo',
+						{ id: 2, json: { test: 10 }, foo: 'data 2' },
+					],
+				},
+				{
+					query:
+						'INSERT INTO $1:name.$2:name($6:name) VALUES($6:csv) ON CONFLICT ($3:name,$4:name,$5:name) DO NOTHING  RETURNING *',
+					values: [
+						'public',
+						'my_table',
+						'id',
+						'json',
+						'foo',
+						{ id: 3, json: { test: 5 }, foo: 'data 3' },
+					],
+				},
+			],
+			inputItems,
+			nodeOptions,
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
index d8dc12b01f..86689890f2 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/runQueries.test.ts
@@ -1,7 +1,7 @@
-import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
-
-import pgPromise from 'pg-promise';
 import { mock } from 'jest-mock-extended';
+import type { IDataObject, IExecuteFunctions, INode } from 'n8n-workflow';
+import pgPromise from 'pg-promise';
+
 import type { PgpDatabase } from '../../v2/helpers/interfaces';
 import { configureQueryRunner } from '../../v2/helpers/utils';
 
diff --git a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
index 39cdaf16ec..60cd74e085 100644
--- a/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Postgres/test/v2/utils.test.ts
@@ -1,5 +1,8 @@
 import type { IDataObject, INode } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+import pgPromise from 'pg-promise';
+
+import type { ColumnInfo } from '../../v2/helpers/interfaces';
 import {
 	addSortRules,
 	addReturning,
@@ -11,8 +14,10 @@ import {
 	replaceEmptyStringsByNulls,
 	wrapData,
 	convertArraysToPostgresFormat,
+	isJSON,
+	convertValuesToJsonWithPgp,
+	hasJsonDataTypeInSchema,
 } from '../../v2/helpers/utils';
-import type { ColumnInfo } from '../../v2/helpers/interfaces';
 
 const node: INode = {
 	id: '1',
@@ -25,6 +30,15 @@ const node: INode = {
 	},
 };
 
+describe('Test PostgresV2, isJSON', () => {
+	it('should return true for valid JSON', () => {
+		expect(isJSON('{"key": "value"}')).toEqual(true);
+	});
+	it('should return false for invalid JSON', () => {
+		expect(isJSON('{"key": "value"')).toEqual(false);
+	});
+});
+
 describe('Test PostgresV2, wrapData', () => {
 	it('should wrap object in json', () => {
 		const data = {
@@ -376,6 +390,57 @@ describe('Test PostgresV2, checkItemAgainstSchema', () => {
 	});
 });
 
+describe('Test PostgresV2, hasJsonDataType', () => {
+	it('returns true if there are columns which are of type json', () => {
+		const schema: ColumnInfo[] = [
+			{ column_name: 'data', data_type: 'json', is_nullable: 'YES' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
+		];
+
+		expect(hasJsonDataTypeInSchema(schema)).toEqual(true);
+	});
+
+	it('returns false if there are columns which are of type json', () => {
+		const schema: ColumnInfo[] = [{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' }];
+
+		expect(hasJsonDataTypeInSchema(schema)).toEqual(false);
+	});
+});
+
+describe('Test PostgresV2, convertValuesToJsonWithPgp', () => {
+	it('should use pgp to properly convert values to JSON', () => {
+		const pgp = pgPromise();
+		const pgpJsonSpy = jest.spyOn(pgp.as, 'json');
+
+		const schema: ColumnInfo[] = [
+			{ column_name: 'data', data_type: 'json', is_nullable: 'YES' },
+			{ column_name: 'id', data_type: 'integer', is_nullable: 'NO' },
+		];
+		const values = [
+			{
+				value: { data: [], id: 1 },
+				expected: { data: '[]', id: 1 },
+			},
+			{
+				value: { data: [0], id: 1 },
+				expected: { data: '[0]', id: 1 },
+			},
+			{
+				value: { data: { key: 2 }, id: 1 },
+				expected: { data: '{"key":2}', id: 1 },
+			},
+		];
+
+		values.forEach((value) => {
+			const data = value.value.data;
+
+			expect(convertValuesToJsonWithPgp(pgp, schema, value.value)).toEqual(value.expected);
+			expect(value.value).toEqual(value.expected);
+			expect(pgpJsonSpy).toHaveBeenCalledWith(data, true);
+		});
+	});
+});
+
 describe('Test PostgresV2, convertArraysToPostgresFormat', () => {
 	it('should convert js arrays to postgres format', () => {
 		const item = {
diff --git a/packages/nodes-base/nodes/Postgres/transport/index.ts b/packages/nodes-base/nodes/Postgres/transport/index.ts
new file mode 100644
index 0000000000..71684ddf95
--- /dev/null
+++ b/packages/nodes-base/nodes/Postgres/transport/index.ts
@@ -0,0 +1,192 @@
+import type {
+	IExecuteFunctions,
+	ICredentialTestFunctions,
+	ILoadOptionsFunctions,
+	ITriggerFunctions,
+} from 'n8n-workflow';
+import { createServer, type AddressInfo } from 'node:net';
+import pgPromise from 'pg-promise';
+
+import { ConnectionPoolManager } from '@utils/connection-pool-manager';
+import { LOCALHOST } from '@utils/constants';
+import { formatPrivateKey } from '@utils/utilities';
+
+import type {
+	ConnectionsData,
+	PgpConnectionParameters,
+	PostgresNodeCredentials,
+	PostgresNodeOptions,
+} from '../v2/helpers/interfaces';
+
+const getPostgresConfig = (
+	credentials: PostgresNodeCredentials,
+	options: PostgresNodeOptions = {},
+) => {
+	const dbConfig: PgpConnectionParameters = {
+		host: credentials.host,
+		port: credentials.port,
+		database: credentials.database,
+		user: credentials.user,
+		password: credentials.password,
+		keepAlive: true,
+		max: credentials.maxConnections,
+	};
+
+	if (options.connectionTimeout) {
+		dbConfig.connectionTimeoutMillis = options.connectionTimeout * 1000;
+	}
+
+	if (options.delayClosingIdleConnection) {
+		dbConfig.keepAliveInitialDelayMillis = options.delayClosingIdleConnection * 1000;
+	}
+
+	if (credentials.allowUnauthorizedCerts === true) {
+		dbConfig.ssl = {
+			rejectUnauthorized: false,
+		};
+	} else {
+		dbConfig.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
+		// @ts-ignore these typings need to be updated
+		dbConfig.sslmode = credentials.ssl || 'disable';
+	}
+
+	return dbConfig;
+};
+
+export async function configurePostgres(
+	this: IExecuteFunctions | ICredentialTestFunctions | ILoadOptionsFunctions | ITriggerFunctions,
+	credentials: PostgresNodeCredentials,
+	options: PostgresNodeOptions = {},
+): Promise<ConnectionsData> {
+	const poolManager = ConnectionPoolManager.getInstance();
+
+	const fallBackHandler = async () => {
+		const pgp = pgPromise({
+			// prevent spam in console "WARNING: Creating a duplicate database object for the same connection."
+			// duplicate connections created when auto loading parameters, they are closed immediately after, but several could be open at the same time
+			noWarnings: true,
+		});
+
+		if (typeof options.nodeVersion === 'number' && options.nodeVersion >= 2.1) {
+			// Always return dates as ISO strings
+			[pgp.pg.types.builtins.TIMESTAMP, pgp.pg.types.builtins.TIMESTAMPTZ].forEach((type) => {
+				pgp.pg.types.setTypeParser(type, (value: string) => {
+					const parsedDate = new Date(value);
+
+					if (isNaN(parsedDate.getTime())) {
+						return value;
+					}
+
+					return parsedDate.toISOString();
+				});
+			});
+		}
+
+		if (options.largeNumbersOutput === 'numbers') {
+			pgp.pg.types.setTypeParser(20, (value: string) => {
+				return parseInt(value, 10);
+			});
+			pgp.pg.types.setTypeParser(1700, (value: string) => {
+				return parseFloat(value);
+			});
+		}
+
+		const dbConfig = getPostgresConfig(credentials, options);
+
+		if (!credentials.sshTunnel) {
+			const db = pgp(dbConfig);
+
+			return { db, pgp };
+		} else {
+			if (credentials.sshAuthenticateWith === 'privateKey' && credentials.privateKey) {
+				credentials.privateKey = formatPrivateKey(credentials.privateKey);
+			}
+			const sshClient = await this.helpers.getSSHClient(credentials);
+
+			// Create a TCP proxy listening on a random available port
+			const proxy = createServer();
+			const proxyPort = await new Promise<number>((resolve) => {
+				proxy.listen(0, LOCALHOST, () => {
+					resolve((proxy.address() as AddressInfo).port);
+				});
+			});
+
+			const close = () => {
+				proxy.close();
+				sshClient.off('end', close);
+				sshClient.off('error', close);
+			};
+			sshClient.on('end', close);
+			sshClient.on('error', close);
+
+			await new Promise<void>((resolve, reject) => {
+				proxy.on('error', (err) => reject(err));
+				proxy.on('connection', (localSocket) => {
+					sshClient.forwardOut(
+						LOCALHOST,
+						localSocket.remotePort!,
+						credentials.host,
+						credentials.port,
+						(err, clientChannel) => {
+							if (err) {
+								proxy.close();
+								localSocket.destroy();
+							} else {
+								localSocket.pipe(clientChannel);
+								clientChannel.pipe(localSocket);
+							}
+						},
+					);
+				});
+				resolve();
+			}).catch((err) => {
+				proxy.close();
+
+				let message = err.message;
+				let description = err.description;
+
+				if (err.message.includes('ECONNREFUSED')) {
+					message = 'Connection refused';
+					try {
+						description = err.message.split('ECONNREFUSED ')[1].trim();
+					} catch (e) {}
+				}
+
+				if (err.message.includes('ENOTFOUND')) {
+					message = 'Host not found';
+					try {
+						description = err.message.split('ENOTFOUND ')[1].trim();
+					} catch (e) {}
+				}
+
+				if (err.message.includes('ETIMEDOUT')) {
+					message = 'Connection timed out';
+					try {
+						description = err.message.split('ETIMEDOUT ')[1].trim();
+					} catch (e) {}
+				}
+
+				err.message = message;
+				err.description = description;
+				throw err;
+			});
+
+			const db = pgp({
+				...dbConfig,
+				port: proxyPort,
+				host: LOCALHOST,
+			});
+			return { db, pgp };
+		}
+	};
+
+	return await poolManager.getConnection({
+		credentials,
+		nodeType: 'postgres',
+		nodeVersion: options.nodeVersion as unknown as string,
+		fallBackHandler,
+		cleanUpHandler: async ({ db }) => {
+			if (!db.$pool.ended) await db.$pool.end();
+		},
+	});
+}
diff --git a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
index e45f5232c9..a716ddcc33 100644
--- a/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/PostgresV1.node.ts
@@ -1,7 +1,6 @@
 import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
-	IDataObject,
 	IExecuteFunctions,
 	INodeCredentialTestResult,
 	INodeExecutionData,
@@ -11,11 +10,11 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import pgPromise from 'pg-promise';
+import { oldVersionNotice } from '@utils/descriptions';
 
 import { pgInsertV2, pgQueryV2, pgUpdate, wrapData } from './genericFunctions';
-
-import { oldVersionNotice } from '@utils/descriptions';
+import { configurePostgres } from '../transport';
+import type { PgpConnection, PostgresNodeCredentials } from '../v2/helpers/interfaces';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Postgres',
@@ -299,34 +298,27 @@ export class PostgresV1 implements INodeType {
 				this: ICredentialTestFunctions,
 				credential: ICredentialsDecrypted,
 			): Promise<INodeCredentialTestResult> {
-				const credentials = credential.data as IDataObject;
+				const credentials = credential.data as PostgresNodeCredentials;
+
+				let connection: PgpConnection | undefined;
+
 				try {
-					const pgp = pgPromise();
-					const config: IDataObject = {
-						host: credentials.host as string,
-						port: credentials.port as number,
-						database: credentials.database as string,
-						user: credentials.user as string,
-						password: credentials.password as string,
-					};
+					const { db } = await configurePostgres.call(this, credentials, {});
 
-					if (credentials.allowUnauthorizedCerts === true) {
-						config.ssl = {
-							rejectUnauthorized: false,
-						};
-					} else {
-						config.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
-						config.sslmode = (credentials.ssl as string) || 'disable';
-					}
-
-					const db = pgp(config);
-					await db.connect();
-					await db.$pool.end();
+					// Acquires a new connection that can be used to to run multiple
+					// queries on the same connection and must be released again
+					// manually.
+					connection = await db.connect();
 				} catch (error) {
 					return {
 						status: 'Error',
 						message: error.message,
 					};
+				} finally {
+					if (connection) {
+						// release connection
+						await connection.done();
+					}
 				}
 				return {
 					status: 'OK',
@@ -337,42 +329,19 @@ export class PostgresV1 implements INodeType {
 	};
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const credentials = await this.getCredentials('postgres');
+		const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
 		const largeNumbersOutput = this.getNodeParameter(
 			'additionalFields.largeNumbersOutput',
 			0,
 			'',
 		) as string;
 
-		const pgp = pgPromise();
-
-		if (largeNumbersOutput === 'numbers') {
-			pgp.pg.types.setTypeParser(20, (value: string) => {
-				return parseInt(value, 10);
-			});
-			pgp.pg.types.setTypeParser(1700, (value: string) => {
-				return parseFloat(value);
-			});
-		}
-
-		const config: IDataObject = {
-			host: credentials.host as string,
-			port: credentials.port as number,
-			database: credentials.database as string,
-			user: credentials.user as string,
-			password: credentials.password as string,
-		};
-
-		if (credentials.allowUnauthorizedCerts === true) {
-			config.ssl = {
-				rejectUnauthorized: false,
-			};
-		} else {
-			config.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
-			config.sslmode = (credentials.ssl as string) || 'disable';
-		}
-
-		const db = pgp(config);
+		const { db, pgp } = await configurePostgres.call(this, credentials, {
+			largeNumbersOutput:
+				largeNumbersOutput === 'numbers' || largeNumbersOutput === 'text'
+					? largeNumbersOutput
+					: undefined,
+		});
 
 		let returnItems: INodeExecutionData[] = [];
 
@@ -410,16 +379,12 @@ export class PostgresV1 implements INodeType {
 
 			returnItems = wrapData(updateItems);
 		} else {
-			await db.$pool.end();
 			throw new NodeOperationError(
 				this.getNode(),
 				`The operation "${operation}" is not supported!`,
 			);
 		}
 
-		// shuts down the connection pool associated with the db object to allow the process to finish
-		await db.$pool.end();
-
 		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts b/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
index 834779d1a0..3fb2982a6a 100644
--- a/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
+++ b/packages/nodes-base/nodes/Postgres/v1/genericFunctions.ts
@@ -2,6 +2,7 @@ import { ApplicationError } from 'n8n-workflow';
 import type { IExecuteFunctions, IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import type pgPromise from 'pg-promise';
 import type pg from 'pg-promise/typescript/pg-subset';
+
 import { getResolvables } from '@utils/utilities';
 
 /**
diff --git a/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts b/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
index a8f5c03965..ff18184d5c 100644
--- a/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/PostgresV2.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { router } from './actions/router';
 
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { credentialTest, listSearch, loadOptions, resourceMapping } from './methods';
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/Database.resource.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/Database.resource.ts
index 125ebaa1d7..36b935293d 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/Database.resource.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/Database.resource.ts
@@ -1,5 +1,4 @@
 import type { INodeProperties } from 'n8n-workflow';
-import { schemaRLC, tableRLC } from '../common.descriptions';
 
 import * as deleteTable from './deleteTable.operation';
 import * as executeQuery from './executeQuery.operation';
@@ -7,6 +6,7 @@ import * as insert from './insert.operation';
 import * as select from './select.operation';
 import * as update from './update.operation';
 import * as upsert from './upsert.operation';
+import { schemaRLC, tableRLC } from '../common.descriptions';
 
 export { deleteTable, executeQuery, insert, select, update, upsert };
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
index badede9f53..a2bfc9329d 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/deleteTable.operation.ts
@@ -6,6 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -14,15 +16,12 @@ import type {
 	QueryWithValues,
 	WhereClause,
 } from '../../helpers/interfaces';
-
 import { addWhereClauses } from '../../helpers/utils';
-
 import {
 	combineConditionsCollection,
 	optionsCollection,
 	whereFixedCollection,
 } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
index d103abd399..75e0c78587 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/executeQuery.operation.ts
@@ -3,21 +3,19 @@ import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
-	NodeParameterValueType,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { getResolvables, updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
 	QueriesRunner,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
-import { replaceEmptyStringsByNulls } from '../../helpers/utils';
-
+import { isJSON, replaceEmptyStringsByNulls, stringToArray } from '../../helpers/utils';
 import { optionsCollection } from '../common.descriptions';
-import { getResolvables, updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -55,20 +53,19 @@ export async function execute(
 	nodeOptions: PostgresNodeOptions,
 	_db?: PgpDatabase,
 ): Promise<INodeExecutionData[]> {
-	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
-
-	const queries: QueryWithValues[] = [];
-
-	for (let i = 0; i < items.length; i++) {
-		let query = this.getNodeParameter('query', i) as string;
+	const queries: QueryWithValues[] = replaceEmptyStringsByNulls(
+		items,
+		nodeOptions.replaceEmptyStrings as boolean,
+	).map((_, index) => {
+		let query = this.getNodeParameter('query', index) as string;
 
 		for (const resolvable of getResolvables(query)) {
-			query = query.replace(resolvable, this.evaluateExpression(resolvable, i) as string);
+			query = query.replace(resolvable, this.evaluateExpression(resolvable, index) as string);
 		}
 
 		let values: Array<IDataObject | string> = [];
 
-		let queryReplacement = this.getNodeParameter('options.queryReplacement', i, '');
+		let queryReplacement = this.getNodeParameter('options.queryReplacement', index, '');
 
 		if (typeof queryReplacement === 'number') {
 			queryReplacement = String(queryReplacement);
@@ -79,14 +76,6 @@ export async function execute(
 
 			const rawReplacements = (node.parameters.options as IDataObject)?.queryReplacement as string;
 
-			const stringToArray = (str: NodeParameterValueType | undefined) => {
-				if (str === undefined) return [];
-				return String(str)
-					.split(',')
-					.filter((entry) => entry)
-					.map((entry) => entry.trim());
-			};
-
 			if (rawReplacements) {
 				const nodeVersion = nodeOptions.nodeVersion as number;
 
@@ -95,7 +84,12 @@ export async function execute(
 					const resolvables = getResolvables(rawValues);
 					if (resolvables.length) {
 						for (const resolvable of resolvables) {
-							const evaluatedValues = stringToArray(this.evaluateExpression(`${resolvable}`, i));
+							const evaluatedExpression =
+								this.evaluateExpression(`${resolvable}`, index)?.toString() ?? '';
+							const evaluatedValues = isJSON(evaluatedExpression)
+								? [evaluatedExpression]
+								: stringToArray(evaluatedExpression);
+
 							if (evaluatedValues.length) values.push(...evaluatedValues);
 						}
 					} else {
@@ -113,7 +107,7 @@ export async function execute(
 
 						if (resolvables.length) {
 							for (const resolvable of resolvables) {
-								values.push(this.evaluateExpression(`${resolvable}`, i) as IDataObject);
+								values.push(this.evaluateExpression(`${resolvable}`, index) as IDataObject);
 							}
 						} else {
 							values.push(rawValue);
@@ -128,7 +122,7 @@ export async function execute(
 				throw new NodeOperationError(
 					this.getNode(),
 					'Query Parameters must be a string of comma-separated values or an array of values',
-					{ itemIndex: i },
+					{ itemIndex: index },
 				);
 			}
 		}
@@ -143,8 +137,8 @@ export async function execute(
 			}
 		}
 
-		queries.push({ query, values });
-	}
+		return { query, values, options: { partial: true } };
+	});
 
 	return await runQueries(queries, items, nodeOptions);
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
index e76c4f95cb..23d221d848 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/insert.operation.ts
@@ -1,18 +1,20 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	INodeExecutionData,
-	INodeProperties,
+import {
+	type IDataObject,
+	type IExecuteFunctions,
+	type INodeExecutionData,
+	type INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
+	PgpClient,
 	PgpDatabase,
 	PostgresNodeOptions,
 	QueriesRunner,
 	QueryValues,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
 import {
 	addReturning,
 	checkItemAgainstSchema,
@@ -21,10 +23,10 @@ import {
 	prepareItem,
 	convertArraysToPostgresFormat,
 	replaceEmptyStringsByNulls,
+	hasJsonDataTypeInSchema,
+	convertValuesToJsonWithPgp,
 } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -161,6 +163,7 @@ export async function execute(
 	items: INodeExecutionData[],
 	nodeOptions: PostgresNodeOptions,
 	db: PgpDatabase,
+	pgp: PgpClient,
 ): Promise<INodeExecutionData[]> {
 	items = replaceEmptyStringsByNulls(items, nodeOptions.replaceEmptyStrings as boolean);
 	const nodeVersion = nodeOptions.nodeVersion as number;
@@ -216,11 +219,16 @@ export async function execute(
 					: ((this.getNodeParameter('columns.values', i, []) as IDataObject)
 							.values as IDataObject[]);
 
-			if (nodeVersion < 2.2) {
-				item = prepareItem(valuesToSend);
-			} else {
-				item = this.getNodeParameter('columns.value', i) as IDataObject;
-			}
+			item =
+				nodeVersion < 2.2
+					? prepareItem(valuesToSend)
+					: hasJsonDataTypeInSchema(tableSchema)
+						? convertValuesToJsonWithPgp(
+								pgp,
+								tableSchema,
+								(this.getNodeParameter('columns', i) as IDataObject)?.value as IDataObject,
+							)
+						: (this.getNodeParameter('columns.value', i) as IDataObject);
 		}
 
 		tableSchema = await updateTableSchema(db, tableSchema, schema, table);
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts
index b0848f2a6b..b41f0c98c5 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/select.operation.ts
@@ -5,6 +5,8 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -14,16 +16,13 @@ import type {
 	SortRule,
 	WhereClause,
 } from '../../helpers/interfaces';
-
 import { addSortRules, addWhereClauses, replaceEmptyStringsByNulls } from '../../helpers/utils';
-
 import {
 	combineConditionsCollection,
 	optionsCollection,
 	sortFixedCollection,
 	whereFixedCollection,
 } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
index e04b845e2f..e15169b0d2 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/update.operation.ts
@@ -6,6 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -13,7 +15,6 @@ import type {
 	QueryValues,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
 import {
 	addReturning,
 	checkItemAgainstSchema,
@@ -24,9 +25,7 @@ import {
 	convertArraysToPostgresFormat,
 	replaceEmptyStringsByNulls,
 } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
index 5ccc01a9e3..4a9567e5c2 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/database/upsert.operation.ts
@@ -6,6 +6,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '@utils/utilities';
+
 import type {
 	PgpDatabase,
 	PostgresNodeOptions,
@@ -13,7 +15,6 @@ import type {
 	QueryValues,
 	QueryWithValues,
 } from '../../helpers/interfaces';
-
 import {
 	addReturning,
 	checkItemAgainstSchema,
@@ -23,9 +24,7 @@ import {
 	configureTableSchemaUpdater,
 	convertArraysToPostgresFormat,
 } from '../../helpers/utils';
-
 import { optionsCollection } from '../common.descriptions';
-import { updateDisplayOptions } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
@@ -286,7 +285,7 @@ export async function execute(
 			valuesLength = valuesLength + 1;
 			values.push(column);
 		});
-		const onConflict = ` ON CONFLICT (${conflictColumns.join(',')}) DO UPDATE `;
+		const onConflict = ` ON CONFLICT (${conflictColumns.join(',')})`;
 
 		const insertQuery = `INSERT INTO $1:name.$2:name($${valuesLength}:name) VALUES($${valuesLength}:csv)${onConflict}`;
 		valuesLength = valuesLength + 1;
@@ -301,7 +300,9 @@ export async function execute(
 			values.push(column, item[column] as string);
 		}
 
-		let query = `${insertQuery} SET ${updates.join(', ')}`;
+		const updateQuery =
+			updates?.length > 0 ? ` DO UPDATE  SET ${updates.join(', ')}` : ' DO NOTHING ';
+		let query = `${insertQuery}${updateQuery}`;
 
 		const outputColumns = this.getNodeParameter('options.outputColumns', i, ['*']) as string[];
 
diff --git a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
index f48060ec3b..4d64a7bba1 100644
--- a/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/actions/router.ts
@@ -1,12 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeExecutionOutput, NodeOperationError } from 'n8n-workflow';
 
-import { configurePostgres } from '../transport';
-import { configureQueryRunner } from '../helpers/utils';
-import type { PostgresNodeCredentials, PostgresNodeOptions } from '../helpers/interfaces';
-import type { PostgresType } from './node.type';
-
 import * as database from './database/Database.resource';
+import type { PostgresType } from './node.type';
+import { configurePostgres } from '../../transport';
+import type { PostgresNodeCredentials, PostgresNodeOptions } from '../helpers/interfaces';
+import { configureQueryRunner } from '../helpers/utils';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
@@ -36,25 +35,22 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 		operation,
 	} as PostgresType;
 
-	try {
-		switch (postgresNodeData.resource) {
-			case 'database':
-				returnData = await database[postgresNodeData.operation].execute.call(
-					this,
-					runQueries,
-					items,
-					options,
-					db,
-				);
-				break;
-			default:
-				throw new NodeOperationError(
-					this.getNode(),
-					`The operation "${operation}" is not supported!`,
-				);
-		}
-	} finally {
-		if (!db.$pool.ending) await db.$pool.end();
+	switch (postgresNodeData.resource) {
+		case 'database':
+			returnData = await database[postgresNodeData.operation].execute.call(
+				this,
+				runQueries,
+				items,
+				options,
+				db,
+				pgp,
+			);
+			break;
+		default:
+			throw new NodeOperationError(
+				this.getNode(),
+				`The operation "${operation}" is not supported!`,
+			);
 	}
 
 	if (operation === 'select' && items.length > 1 && !node.executeOnce) {
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
index 8aadf14ddc..0cd3cfdb74 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/interfaces.ts
@@ -1,12 +1,13 @@
 import type { IDataObject, INodeExecutionData, SSHCredentials } from 'n8n-workflow';
 import type pgPromise from 'pg-promise';
+import { type IFormattingOptions } from 'pg-promise';
 import type pg from 'pg-promise/typescript/pg-subset';
 
 export type QueryMode = 'single' | 'transaction' | 'independently';
 
 export type QueryValue = string | number | IDataObject | string[];
 export type QueryValues = QueryValue[];
-export type QueryWithValues = { query: string; values?: QueryValues };
+export type QueryWithValues = { query: string; values?: QueryValues; options?: IFormattingOptions };
 
 export type WhereClause = { column: string; condition: string; value: string | number };
 export type SortRule = { column: string; direction: string };
@@ -27,6 +28,7 @@ export type EnumInfo = {
 export type PgpClient = pgPromise.IMain<{}, pg.IClient>;
 export type PgpDatabase = pgPromise.IDatabase<{}, pg.IClient>;
 export type PgpConnectionParameters = pg.IConnectionParameters<pg.IClient>;
+export type PgpConnection = pgPromise.IConnected<{}, pg.IClient>;
 export type ConnectionsData = { db: PgpDatabase; pgp: PgpClient };
 
 export type QueriesRunner = (
@@ -56,6 +58,7 @@ export type PostgresNodeCredentials = {
 	database: string;
 	user: string;
 	password: string;
+	maxConnections: number;
 	allowUnauthorizedCerts?: boolean;
 	ssl?: 'disable' | 'allow' | 'require' | 'verify' | 'verify-full';
 } & (
diff --git a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
index 5f01e6b6a6..289c8fe351 100644
--- a/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/helpers/utils.ts
@@ -4,10 +4,10 @@ import type {
 	INode,
 	INodeExecutionData,
 	INodePropertyOptions,
+	NodeParameterValueType,
 } from 'n8n-workflow';
 import { NodeOperationError, jsonParse } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../../../utils/utilities';
 import type {
 	ColumnInfo,
 	EnumInfo,
@@ -19,6 +19,24 @@ import type {
 	SortRule,
 	WhereClause,
 } from './interfaces';
+import { generatePairedItemData } from '../../../../utils/utilities';
+
+export function isJSON(str: string) {
+	try {
+		JSON.parse(str.trim());
+		return true;
+	} catch {
+		return false;
+	}
+}
+
+export function stringToArray(str: NodeParameterValueType | undefined) {
+	if (str === undefined) return [];
+	return String(str)
+		.split(',')
+		.filter((entry) => entry)
+		.map((entry) => entry.trim());
+}
 
 export function wrapData(data: IDataObject | IDataObject[]): INodeExecutionData[] {
 	if (!Array.isArray(data)) {
@@ -376,6 +394,24 @@ export function prepareItem(values: IDataObject[]) {
 	return item;
 }
 
+export function hasJsonDataTypeInSchema(schema: ColumnInfo[]) {
+	return schema.some(({ data_type }) => data_type === 'json');
+}
+
+export function convertValuesToJsonWithPgp(
+	pgp: PgpClient,
+	schema: ColumnInfo[],
+	values: IDataObject,
+) {
+	schema
+		.filter(({ data_type }: { data_type: string }) => data_type === 'json')
+		.forEach(({ column_name }) => {
+			values[column_name] = pgp.as.json(values[column_name], true);
+		});
+
+	return values;
+}
+
 export async function columnFeatureSupport(
 	db: PgpDatabase,
 ): Promise<{ identity_generation: boolean; is_generated: boolean }> {
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
index 59cb83b5da..103d25b9c4 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/credentialTest.ts
@@ -4,9 +4,8 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 
-import { configurePostgres } from '../transport';
-
-import type { PgpClient, PostgresNodeCredentials } from '../helpers/interfaces';
+import { configurePostgres } from '../../transport';
+import type { PgpConnection, PostgresNodeCredentials } from '../helpers/interfaces';
 
 export async function postgresConnectionTest(
 	this: ICredentialTestFunctions,
@@ -14,14 +13,12 @@ export async function postgresConnectionTest(
 ): Promise<INodeCredentialTestResult> {
 	const credentials = credential.data as PostgresNodeCredentials;
 
-	let pgpClientCreated: PgpClient | undefined;
+	let connection: PgpConnection | undefined;
 
 	try {
-		const { db, pgp } = await configurePostgres.call(this, credentials, {});
+		const { db } = await configurePostgres.call(this, credentials, {});
 
-		pgpClientCreated = pgp;
-
-		await db.connect();
+		connection = await db.connect();
 	} catch (error) {
 		let message = error.message as string;
 
@@ -42,8 +39,8 @@ export async function postgresConnectionTest(
 			message,
 		};
 	} finally {
-		if (pgpClientCreated) {
-			pgpClientCreated.end();
+		if (connection) {
+			await connection.done();
 		}
 	}
 	return {
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
index f81a66700f..f6d62c124e 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/listSearch.ts
@@ -1,6 +1,6 @@
 import type { ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
 
-import { configurePostgres } from '../transport';
+import { configurePostgres } from '../../transport';
 import type { PostgresNodeCredentials } from '../helpers/interfaces';
 
 export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
@@ -9,18 +9,14 @@ export async function schemaSearch(this: ILoadOptionsFunctions): Promise<INodeLi
 
 	const { db } = await configurePostgres.call(this, credentials, options);
 
-	try {
-		const response = await db.any('SELECT schema_name FROM information_schema.schemata');
+	const response = await db.any('SELECT schema_name FROM information_schema.schemata');
 
-		return {
-			results: response.map((schema) => ({
-				name: schema.schema_name as string,
-				value: schema.schema_name as string,
-			})),
-		};
-	} finally {
-		if (!db.$pool.ending) await db.$pool.end();
-	}
+	return {
+		results: response.map((schema) => ({
+			name: schema.schema_name as string,
+			value: schema.schema_name as string,
+		})),
+	};
 }
 export async function tableSearch(this: ILoadOptionsFunctions): Promise<INodeListSearchResult> {
 	const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
@@ -32,19 +28,15 @@ export async function tableSearch(this: ILoadOptionsFunctions): Promise<INodeLis
 		extractValue: true,
 	}) as string;
 
-	try {
-		const response = await db.any(
-			'SELECT table_name FROM information_schema.tables WHERE table_schema=$1',
-			[schema],
-		);
+	const response = await db.any(
+		'SELECT table_name FROM information_schema.tables WHERE table_schema=$1',
+		[schema],
+	);
 
-		return {
-			results: response.map((table) => ({
-				name: table.table_name as string,
-				value: table.table_name as string,
-			})),
-		};
-	} finally {
-		if (!db.$pool.ending) await db.$pool.end();
-	}
+	return {
+		results: response.map((table) => ({
+			name: table.table_name as string,
+			value: table.table_name as string,
+		})),
+	};
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
index ac4f783541..ecd7f374f3 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/loadOptions.ts
@@ -1,8 +1,8 @@
 import type { ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 
-import { getTableSchema } from '../helpers/utils';
-import { configurePostgres } from '../transport';
+import { configurePostgres } from '../../transport';
 import type { PostgresNodeCredentials } from '../helpers/interfaces';
+import { getTableSchema } from '../helpers/utils';
 
 export async function getColumns(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	const credentials = await this.getCredentials<PostgresNodeCredentials>('postgres');
@@ -18,17 +18,13 @@ export async function getColumns(this: ILoadOptionsFunctions): Promise<INodeProp
 		extractValue: true,
 	}) as string;
 
-	try {
-		const columns = await getTableSchema(db, schema, table);
+	const columns = await getTableSchema(db, schema, table);
 
-		return columns.map((column) => ({
-			name: column.column_name,
-			value: column.column_name,
-			description: `Type: ${column.data_type.toUpperCase()}, Nullable: ${column.is_nullable}`,
-		}));
-	} finally {
-		if (!db.$pool.ending) await db.$pool.end();
-	}
+	return columns.map((column) => ({
+		name: column.column_name,
+		value: column.column_name,
+		description: `Type: ${column.data_type.toUpperCase()}, Nullable: ${column.is_nullable}`,
+	}));
 }
 
 export async function getColumnsMultiOptions(
diff --git a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
index dac7dc678d..3319bdf2f6 100644
--- a/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/Postgres/v2/methods/resourceMapping.ts
@@ -1,7 +1,8 @@
 import type { ILoadOptionsFunctions, ResourceMapperFields, FieldType } from 'n8n-workflow';
-import { getEnumValues, getEnums, getTableSchema, uniqueColumns } from '../helpers/utils';
-import { configurePostgres } from '../transport';
+
+import { configurePostgres } from '../../transport';
 import type { PostgresNodeCredentials } from '../helpers/interfaces';
+import { getEnumValues, getEnums, getTableSchema, uniqueColumns } from '../helpers/utils';
 
 const fieldTypeMapping: Partial<Record<FieldType, string[]>> = {
 	string: ['text', 'varchar', 'character varying', 'character', 'char'],
@@ -62,34 +63,30 @@ export async function getMappingColumns(
 		extractValue: true,
 	}) as string;
 
-	try {
-		const columns = await getTableSchema(db, schema, table, { getColumnsForResourceMapper: true });
-		const unique = operation === 'upsert' ? await uniqueColumns(db, table, schema) : [];
-		const enumInfo = await getEnums(db);
-		const fields = await Promise.all(
-			columns.map(async (col) => {
-				const canBeUsedToMatch =
-					operation === 'upsert' ? unique.some((u) => u.attname === col.column_name) : true;
-				const type = mapPostgresType(col.data_type);
-				const options =
-					type === 'options' ? getEnumValues(enumInfo, col.udt_name as string) : undefined;
-				const hasDefault = Boolean(col.column_default);
-				const isGenerated = col.is_generated === 'ALWAYS' || col.identity_generation === 'ALWAYS';
-				const nullable = col.is_nullable === 'YES';
-				return {
-					id: col.column_name,
-					displayName: col.column_name,
-					required: !nullable && !hasDefault && !isGenerated,
-					defaultMatch: (col.column_name === 'id' && canBeUsedToMatch) || false,
-					display: true,
-					type,
-					canBeUsedToMatch,
-					options,
-				};
-			}),
-		);
-		return { fields };
-	} finally {
-		if (!db.$pool.ending) await db.$pool.end();
-	}
+	const columns = await getTableSchema(db, schema, table, { getColumnsForResourceMapper: true });
+	const unique = operation === 'upsert' ? await uniqueColumns(db, table, schema) : [];
+	const enumInfo = await getEnums(db);
+	const fields = await Promise.all(
+		columns.map(async (col) => {
+			const canBeUsedToMatch =
+				operation === 'upsert' ? unique.some((u) => u.attname === col.column_name) : true;
+			const type = mapPostgresType(col.data_type);
+			const options =
+				type === 'options' ? getEnumValues(enumInfo, col.udt_name as string) : undefined;
+			const hasDefault = Boolean(col.column_default);
+			const isGenerated = col.is_generated === 'ALWAYS' || col.identity_generation === 'ALWAYS';
+			const nullable = col.is_nullable === 'YES';
+			return {
+				id: col.column_name,
+				displayName: col.column_name,
+				required: !nullable && !hasDefault && !isGenerated,
+				defaultMatch: (col.column_name === 'id' && canBeUsedToMatch) || false,
+				display: true,
+				type,
+				canBeUsedToMatch,
+				options,
+			};
+		}),
+	);
+	return { fields };
 }
diff --git a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts b/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
deleted file mode 100644
index 895c5738ab..0000000000
--- a/packages/nodes-base/nodes/Postgres/v2/transport/index.ts
+++ /dev/null
@@ -1,174 +0,0 @@
-import { createServer, type AddressInfo } from 'node:net';
-import pgPromise from 'pg-promise';
-import type {
-	IExecuteFunctions,
-	ICredentialTestFunctions,
-	ILoadOptionsFunctions,
-	ITriggerFunctions,
-} from 'n8n-workflow';
-
-import type {
-	ConnectionsData,
-	PgpConnectionParameters,
-	PostgresNodeCredentials,
-	PostgresNodeOptions,
-} from '../helpers/interfaces';
-import { formatPrivateKey } from '@utils/utilities';
-import { LOCALHOST } from '@utils/constants';
-
-const getPostgresConfig = (
-	credentials: PostgresNodeCredentials,
-	options: PostgresNodeOptions = {},
-) => {
-	const dbConfig: PgpConnectionParameters = {
-		host: credentials.host,
-		port: credentials.port,
-		database: credentials.database,
-		user: credentials.user,
-		password: credentials.password,
-		keepAlive: true,
-	};
-
-	if (options.connectionTimeout) {
-		dbConfig.connectionTimeoutMillis = options.connectionTimeout * 1000;
-	}
-
-	if (options.delayClosingIdleConnection) {
-		dbConfig.keepAliveInitialDelayMillis = options.delayClosingIdleConnection * 1000;
-	}
-
-	if (credentials.allowUnauthorizedCerts === true) {
-		dbConfig.ssl = {
-			rejectUnauthorized: false,
-		};
-	} else {
-		dbConfig.ssl = !['disable', undefined].includes(credentials.ssl as string | undefined);
-		// @ts-ignore these typings need to be updated
-		dbConfig.sslmode = credentials.ssl || 'disable';
-	}
-
-	return dbConfig;
-};
-
-export async function configurePostgres(
-	this: IExecuteFunctions | ICredentialTestFunctions | ILoadOptionsFunctions | ITriggerFunctions,
-	credentials: PostgresNodeCredentials,
-	options: PostgresNodeOptions = {},
-): Promise<ConnectionsData> {
-	const pgp = pgPromise({
-		// prevent spam in console "WARNING: Creating a duplicate database object for the same connection."
-		// duplicate connections created when auto loading parameters, they are closed immediately after, but several could be open at the same time
-		noWarnings: true,
-	});
-
-	if (typeof options.nodeVersion === 'number' && options.nodeVersion >= 2.1) {
-		// Always return dates as ISO strings
-		[pgp.pg.types.builtins.TIMESTAMP, pgp.pg.types.builtins.TIMESTAMPTZ].forEach((type) => {
-			pgp.pg.types.setTypeParser(type, (value: string) => {
-				const parsedDate = new Date(value);
-
-				if (isNaN(parsedDate.getTime())) {
-					return value;
-				}
-
-				return parsedDate.toISOString();
-			});
-		});
-	}
-
-	if (options.largeNumbersOutput === 'numbers') {
-		pgp.pg.types.setTypeParser(20, (value: string) => {
-			return parseInt(value, 10);
-		});
-		pgp.pg.types.setTypeParser(1700, (value: string) => {
-			return parseFloat(value);
-		});
-	}
-
-	const dbConfig = getPostgresConfig(credentials, options);
-
-	if (!credentials.sshTunnel) {
-		const db = pgp(dbConfig);
-		return { db, pgp };
-	} else {
-		if (credentials.sshAuthenticateWith === 'privateKey' && credentials.privateKey) {
-			credentials.privateKey = formatPrivateKey(credentials.privateKey);
-		}
-		const sshClient = await this.helpers.getSSHClient(credentials);
-
-		// Create a TCP proxy listening on a random available port
-		const proxy = createServer();
-		const proxyPort = await new Promise<number>((resolve) => {
-			proxy.listen(0, LOCALHOST, () => {
-				resolve((proxy.address() as AddressInfo).port);
-			});
-		});
-
-		const close = () => {
-			proxy.close();
-			sshClient.off('end', close);
-			sshClient.off('error', close);
-		};
-		sshClient.on('end', close);
-		sshClient.on('error', close);
-
-		await new Promise<void>((resolve, reject) => {
-			proxy.on('error', (err) => reject(err));
-			proxy.on('connection', (localSocket) => {
-				sshClient.forwardOut(
-					LOCALHOST,
-					localSocket.remotePort!,
-					credentials.host,
-					credentials.port,
-					(err, clientChannel) => {
-						if (err) {
-							proxy.close();
-							localSocket.destroy();
-						} else {
-							localSocket.pipe(clientChannel);
-							clientChannel.pipe(localSocket);
-						}
-					},
-				);
-			});
-			resolve();
-		}).catch((err) => {
-			proxy.close();
-
-			let message = err.message;
-			let description = err.description;
-
-			if (err.message.includes('ECONNREFUSED')) {
-				message = 'Connection refused';
-				try {
-					description = err.message.split('ECONNREFUSED ')[1].trim();
-				} catch (e) {}
-			}
-
-			if (err.message.includes('ENOTFOUND')) {
-				message = 'Host not found';
-				try {
-					description = err.message.split('ENOTFOUND ')[1].trim();
-				} catch (e) {}
-			}
-
-			if (err.message.includes('ETIMEDOUT')) {
-				message = 'Connection timed out';
-				try {
-					description = err.message.split('ETIMEDOUT ')[1].trim();
-				} catch (e) {}
-			}
-
-			err.message = message;
-			err.description = description;
-			throw err;
-		});
-
-		const db = pgp({
-			...dbConfig,
-			port: proxyPort,
-			host: LOCALHOST,
-		});
-		return { db, pgp };
-	}
-}
diff --git a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
index 8298e68340..d12b74076a 100644
--- a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
+++ b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
@@ -9,15 +9,13 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { companyOperations } from './CompanyDescription';
 import type { Metrics } from './GenericFunctions';
 import {
 	profitWellApiRequest,
 	simplifyDailyMetrics,
 	simplifyMontlyMetrics,
 } from './GenericFunctions';
-
-import { companyOperations } from './CompanyDescription';
-
 import { metricFields, metricOperations } from './MetricDescription';
 
 export class ProfitWell implements INodeType {
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 1393d07ccd..3217524e86 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,7 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { pushbulletApiRequest, pushbulletApiRequestAllItems } from './GenericFunctions';
 
 export class Pushbullet implements INodeType {
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 5a26bfcfa7..677fe785e9 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -5,7 +5,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import pgPromise from 'pg-promise';
 
 import { pgInsert, pgQueryV2 } from '../Postgres/v1/genericFunctions';
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index fcd71125ce..4e4b7d29ba 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -10,20 +10,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../utils/utilities';
+import { fieldFields, fieldOperations } from './FieldDescription';
+import { fileFields, fileOperations } from './FileDescription';
 import {
 	getFieldsObject,
 	quickbaseApiRequest,
 	quickbaseApiRequestAllItems,
 } from './GenericFunctions';
-
-import { fieldFields, fieldOperations } from './FieldDescription';
-
-import { fileFields, fileOperations } from './FileDescription';
-
 import { recordFields, recordOperations } from './RecordDescription';
-
 import { reportFields, reportOperations } from './ReportDescription';
+import { generatePairedItemData } from '../../utils/utilities';
 
 export class QuickBase implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
index 16ef41b80e..a92b24b8ea 100644
--- a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
@@ -1,3 +1,7 @@
+import { capitalCase } from 'change-case';
+import omit from 'lodash/omit';
+import pickBy from 'lodash/pickBy';
+import { NodeApiError } from 'n8n-workflow';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,15 +13,8 @@ import type {
 	IRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-import { capitalCase } from 'change-case';
-
-import omit from 'lodash/omit';
-import pickBy from 'lodash/pickBy';
 
 import type { CustomField, GeneralAddress, Ref } from './descriptions/Shared.interface';
-
 import type { DateFieldsUi, Option, QuickBooksOAuth2Credentials, TransactionReport } from './types';
 
 /**
@@ -43,9 +40,7 @@ export async function quickBooksApiRequest(
 	const productionUrl = 'https://quickbooks.api.intuit.com';
 	const sandboxUrl = 'https://sandbox-quickbooks.api.intuit.com';
 
-	const credentials = (await this.getCredentials(
-		'quickBooksOAuth2Api',
-	)) as QuickBooksOAuth2Credentials;
+	const credentials = await this.getCredentials<QuickBooksOAuth2Credentials>('quickBooksOAuth2Api');
 
 	const options: IRequestOptions = {
 		headers: {
@@ -236,9 +231,9 @@ export async function handleBinaryData(
 	const data = await quickBooksApiRequest.call(this, 'GET', endpoint, {}, {}, { encoding: null });
 
 	items[i].binary = items[i].binary ?? {};
-	items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(data as Buffer);
-	items[i].binary![binaryProperty].fileName = fileName;
-	items[i].binary![binaryProperty].fileExtension = 'pdf';
+	items[i].binary[binaryProperty] = await this.helpers.prepareBinaryData(data as Buffer);
+	items[i].binary[binaryProperty].fileName = fileName;
+	items[i].binary[binaryProperty].fileExtension = 'pdf';
 
 	return items;
 }
@@ -254,9 +249,7 @@ export async function loadResource(this: ILoadOptionsFunctions, resource: string
 		oauthTokenData: {
 			callbackQueryString: { realmId },
 		},
-	} = await this.getCredentials<{
-		oauthTokenData: { callbackQueryString: { realmId: string } };
-	}>('quickBooksOAuth2Api');
+	} = await this.getCredentials<QuickBooksOAuth2Credentials>('quickBooksOAuth2Api');
 	const endpoint = `/v3/company/${realmId}/query`;
 
 	const resourceItems = await quickBooksApiRequestAllItems.call(
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index 17e1e01e9d..2f73fe28e7 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
@@ -1,4 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import { capitalCase } from 'change-case';
+import isEmpty from 'lodash/isEmpty';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,8 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { capitalCase } from 'change-case';
-import isEmpty from 'lodash/isEmpty';
 import {
 	billFields,
 	billOperations,
@@ -33,7 +33,6 @@ import {
 	vendorFields,
 	vendorOperations,
 } from './descriptions';
-
 import {
 	adjustTransactionDates,
 	getRefAndSyncToken,
@@ -46,7 +45,6 @@ import {
 	quickBooksApiRequest,
 	simplifyTransactionReport,
 } from './GenericFunctions';
-
 import type { QuickBooksOAuth2Credentials, TransactionFields, TransactionReport } from './types';
 
 export class QuickBooks implements INodeType {
@@ -191,9 +189,8 @@ export class QuickBooks implements INodeType {
 		let responseData;
 		const returnData: INodeExecutionData[] = [];
 
-		const { oauthTokenData } = (await this.getCredentials(
-			'quickBooksOAuth2Api',
-		)) as QuickBooksOAuth2Credentials;
+		const { oauthTokenData } =
+			await this.getCredentials<QuickBooksOAuth2Credentials>('quickBooksOAuth2Api');
 		const companyId = oauthTokenData.callbackQueryString.realmId;
 
 		for (let i = 0; i < items.length; i++) {
diff --git a/packages/nodes-base/nodes/QuickBooks/descriptions/Transaction/TransactionDescription.ts b/packages/nodes-base/nodes/QuickBooks/descriptions/Transaction/TransactionDescription.ts
index 18c46098ca..f93132a33d 100644
--- a/packages/nodes-base/nodes/QuickBooks/descriptions/Transaction/TransactionDescription.ts
+++ b/packages/nodes-base/nodes/QuickBooks/descriptions/Transaction/TransactionDescription.ts
@@ -1,7 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { toDisplayName, toOptions } from '../../GenericFunctions';
-
 import {
 	GROUP_BY_OPTIONS,
 	PAYMENT_METHODS,
@@ -10,6 +8,7 @@ import {
 	TRANSACTION_REPORT_COLUMNS,
 	TRANSACTION_TYPES,
 } from './constants';
+import { toDisplayName, toOptions } from '../../GenericFunctions';
 
 export const transactionOperations: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
index b46bc920c0..1305611046 100644
--- a/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
+++ b/packages/nodes-base/nodes/QuickChart/test/QuickChart.node.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import nock from 'nock';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test QuickChart Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
index c551e61863..cca2cd9e6f 100644
--- a/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import * as amqplib from 'amqplib';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,8 +6,9 @@ import type {
 	ITriggerFunctions,
 } from 'n8n-workflow';
 import { jsonParse, sleep } from 'n8n-workflow';
-import * as amqplib from 'amqplib';
+
 import { formatPrivateKey } from '@utils/utilities';
+
 import type { ExchangeType, Options, RabbitMQCredentials, TriggerOptions } from './types';
 
 const credentialKeys = ['hostname', 'port', 'username', 'password', 'vhost'] as const;
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index 29475c1ace..28e802214f 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -436,7 +436,6 @@ export class RabbitMQ implements INodeType {
 					);
 				}
 
-				// @ts-ignore
 				const promisesResponses = await Promise.allSettled(queuePromises);
 
 				// @ts-ignore
@@ -507,7 +506,6 @@ export class RabbitMQ implements INodeType {
 					);
 				}
 
-				// @ts-ignore
 				const promisesResponses = await Promise.allSettled(exchangePromises);
 
 				// @ts-ignore
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
index c57659b2c7..3257833cdf 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
@@ -13,7 +13,6 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { rabbitDefaultOptions } from './DefaultOptions';
-
 import { MessageTracker, rabbitmqConnectQueue, parseMessage } from './GenericFunctions';
 import type { TriggerOptions } from './types';
 
diff --git a/packages/nodes-base/nodes/RabbitMQ/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/RabbitMQ/test/GenericFunctions.test.ts
index 0532e67ae4..62fb7d8f6c 100644
--- a/packages/nodes-base/nodes/RabbitMQ/test/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/test/GenericFunctions.test.ts
@@ -8,7 +8,6 @@ mockChannel.connection = mockConnection;
 const connect = jest.fn().mockReturnValue(mockConnection);
 jest.mock('amqplib', () => ({ connect }));
 
-import type { TriggerOptions } from '../types';
 import {
 	parseMessage,
 	rabbitmqConnect,
@@ -17,6 +16,7 @@ import {
 	rabbitmqCreateChannel,
 	MessageTracker,
 } from '../GenericFunctions';
+import type { TriggerOptions } from '../types';
 
 describe('RabbitMQ GenericFunctions', () => {
 	const credentials = {
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index 9a14e77854..8d6a96cd69 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -1,3 +1,5 @@
+import isEmpty from 'lodash/isEmpty';
+import omit from 'lodash/omit';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,11 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-import omit from 'lodash/omit';
-
-import { raindropApiRequest } from './GenericFunctions';
-
 import {
 	bookmarkFields,
 	bookmarkOperations,
@@ -23,6 +20,7 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
+import { raindropApiRequest } from './GenericFunctions';
 
 export class Raindrop implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
index c94feb97cf..4f7a8e7846 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test Read Binary File Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
index b81530f62a..d3687a6557 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
@@ -1,3 +1,4 @@
+import glob from 'fast-glob';
 import {
 	NodeConnectionType,
 	type IExecuteFunctions,
@@ -6,7 +7,6 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import glob from 'fast-glob';
 import { generatePairedItemData } from '../../utils/utilities';
 
 export class ReadBinaryFiles implements INodeType {
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
index 76235ae1e2..ae76d88185 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/test/ReadBinaryFiles.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test Read Binary Files Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
index c7a1485cb1..fbc6e7753f 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
@@ -6,6 +6,7 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
+
 import { extractDataFromPDF } from '@utils/binary';
 
 export class ReadPDF implements INodeType {
diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.ts b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
index d04e6406aa..d160daedfa 100644
--- a/packages/nodes-base/nodes/Reddit/Reddit.node.ts
+++ b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
@@ -9,15 +9,10 @@ import type {
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
 
 import { handleListing, redditApiRequest } from './GenericFunctions';
-
 import { postCommentFields, postCommentOperations } from './PostCommentDescription';
-
 import { postFields, postOperations } from './PostDescription';
-
 import { profileFields, profileOperations } from './ProfileDescription';
-
 import { subredditFields, subredditOperations } from './SubredditDescription';
-
 import { userFields, userOperations } from './UserDescription';
 
 export class Reddit implements INodeType {
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index 59d1582fdb..baa0aeceb1 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -1,13 +1,13 @@
+import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType } from 'n8n-workflow';
-
-import set from 'lodash/set';
+import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import type { RedisCredential } from './types';
 import {
 	setupRedisClient,
 	redisConnectionTest,
@@ -512,7 +512,7 @@ export class Redis implements INodeType {
 		//       have a parameter field for a path. Because it is not possible to set
 		//       array, object via parameter directly (should maybe be possible?!?!)
 		//       Should maybe have a parameter which is JSON.
-		const credentials = await this.getCredentials('redis');
+		const credentials = await this.getCredentials<RedisCredential>('redis');
 
 		const client = setupRedisClient(credentials);
 		await client.connect();
@@ -521,17 +521,30 @@ export class Redis implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 		const returnItems: INodeExecutionData[] = [];
 
-		try {
-			if (operation === 'info') {
+		if (operation === 'info') {
+			try {
 				const result = await client.info();
 				returnItems.push({ json: convertInfoToObject(result) });
-			} else if (
-				['delete', 'get', 'keys', 'set', 'incr', 'publish', 'push', 'pop'].includes(operation)
-			) {
-				const items = this.getInputData();
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnItems.push({
+						json: {
+							error: error.message,
+						},
+					});
+				} else {
+					await client.quit();
+					throw new NodeOperationError(this.getNode(), error);
+				}
+			}
+		} else if (
+			['delete', 'get', 'keys', 'set', 'incr', 'publish', 'push', 'pop'].includes(operation)
+		) {
+			const items = this.getInputData();
 
-				let item: INodeExecutionData;
-				for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+			let item: INodeExecutionData;
+			for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
+				try {
 					item = { json: {}, pairedItem: { item: itemIndex } };
 
 					if (operation === 'delete') {
@@ -625,14 +638,24 @@ export class Redis implements INodeType {
 						}
 						returnItems.push(item);
 					}
+				} catch (error) {
+					if (this.continueOnFail()) {
+						returnItems.push({
+							json: {
+								error: error.message,
+							},
+							pairedItem: {
+								item: itemIndex,
+							},
+						});
+						continue;
+					}
+					await client.quit();
+					throw new NodeOperationError(this.getNode(), error, { itemIndex });
 				}
 			}
-		} catch (error) {
-			throw error;
-		} finally {
-			await client.quit();
 		}
-
+		await client.quit();
 		return [returnItems];
 	}
 }
diff --git a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
index 34b4bb8d62..d39444059a 100644
--- a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
+++ b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
@@ -6,6 +6,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import type { RedisCredential } from './types';
 import { redisConnectionTest, setupRedisClient } from './utils';
 
 interface Options {
@@ -74,7 +75,7 @@ export class RedisTrigger implements INodeType {
 	};
 
 	async trigger(this: ITriggerFunctions): Promise<ITriggerResponse> {
-		const credentials = await this.getCredentials('redis');
+		const credentials = await this.getCredentials<RedisCredential>('redis');
 
 		const channels = (this.getNodeParameter('channels') as string).split(',');
 		const options = this.getNodeParameter('options') as Options;
diff --git a/packages/nodes-base/nodes/Redis/__tests__/Redis.node.test.ts b/packages/nodes-base/nodes/Redis/__tests__/Redis.node.test.ts
new file mode 100644
index 0000000000..c676c27c12
--- /dev/null
+++ b/packages/nodes-base/nodes/Redis/__tests__/Redis.node.test.ts
@@ -0,0 +1,390 @@
+import { mock } from 'jest-mock-extended';
+import type {
+	ICredentialsDecrypted,
+	ICredentialTestFunctions,
+	IExecuteFunctions,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+const mockClient = mock<RedisClient>();
+const createClient = jest.fn().mockReturnValue(mockClient);
+jest.mock('redis', () => ({ createClient }));
+
+import { Redis } from '../Redis.node';
+import type { RedisClient } from '../types';
+import { redisConnectionTest, setupRedisClient } from '../utils';
+
+describe('Redis Node', () => {
+	const node = new Redis();
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		createClient.mockReturnValue(mockClient);
+	});
+
+	afterEach(() => jest.resetAllMocks());
+
+	describe('setupRedisClient', () => {
+		it('should not configure TLS by default', () => {
+			setupRedisClient({
+				host: 'redis.domain',
+				port: 1234,
+				database: 0,
+			});
+			expect(createClient).toHaveBeenCalledWith({
+				database: 0,
+				socket: {
+					host: 'redis.domain',
+					port: 1234,
+					tls: false,
+				},
+			});
+		});
+
+		it('should configure TLS', () => {
+			setupRedisClient({
+				host: 'redis.domain',
+				port: 1234,
+				database: 0,
+				ssl: true,
+			});
+			expect(createClient).toHaveBeenCalledWith({
+				database: 0,
+				socket: {
+					host: 'redis.domain',
+					port: 1234,
+					tls: true,
+				},
+			});
+		});
+
+		it('should set user on auth', () => {
+			setupRedisClient({
+				host: 'redis.domain',
+				port: 1234,
+				database: 0,
+				user: 'test_user',
+				password: 'test_password',
+			});
+			expect(createClient).toHaveBeenCalledWith({
+				database: 0,
+				username: 'test_user',
+				password: 'test_password',
+				socket: {
+					host: 'redis.domain',
+					port: 1234,
+					tls: false,
+				},
+			});
+		});
+	});
+
+	describe('redisConnectionTest', () => {
+		const thisArg = mock<ICredentialTestFunctions>({});
+		const credentials = mock<ICredentialsDecrypted>({
+			data: {
+				host: 'localhost',
+				port: 6379,
+				user: 'username',
+				password: 'password',
+				database: 0,
+			},
+		});
+		const redisOptions = {
+			socket: {
+				host: 'localhost',
+				port: 6379,
+				tls: false,
+			},
+			database: 0,
+			username: 'username',
+			password: 'password',
+		};
+
+		it('should return success when connection is established', async () => {
+			const result = await redisConnectionTest.call(thisArg, credentials);
+
+			expect(result).toEqual({
+				status: 'OK',
+				message: 'Connection successful!',
+			});
+			expect(createClient).toHaveBeenCalledWith(redisOptions);
+			expect(mockClient.connect).toHaveBeenCalled();
+			expect(mockClient.ping).toHaveBeenCalled();
+		});
+
+		it('should return error when connection fails', async () => {
+			mockClient.connect.mockRejectedValue(new Error('Connection failed'));
+
+			const result = await redisConnectionTest.call(thisArg, credentials);
+
+			expect(result).toEqual({
+				status: 'Error',
+				message: 'Connection failed',
+			});
+			expect(createClient).toHaveBeenCalledWith(redisOptions);
+			expect(mockClient.connect).toHaveBeenCalled();
+			expect(mockClient.ping).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('operations', () => {
+		const thisArg = mock<IExecuteFunctions>({});
+
+		beforeEach(() => {
+			setupRedisClient({
+				host: 'redis.domain',
+				port: 1234,
+				database: 0,
+				ssl: true,
+			});
+
+			const mockCredential = {
+				host: 'redis',
+				port: 1234,
+				database: 0,
+				password: 'random',
+			};
+
+			thisArg.getCredentials.calledWith('redis').mockResolvedValue(mockCredential);
+		});
+
+		afterEach(() => {
+			expect(createClient).toHaveBeenCalled();
+			expect(mockClient.connect).toHaveBeenCalled();
+			expect(mockClient.ping).toHaveBeenCalled();
+			expect(mockClient.quit).toHaveBeenCalled();
+		});
+
+		describe('info operation', () => {
+			it('should return info', async () => {
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('info');
+				mockClient.info.mockResolvedValue(`
+# Server
+redis_version:6.2.14
+redis_git_sha1:00000000
+redis_git_dirty:0
+redis_mode:standalone
+arch_bits:64
+tcp_port:6379
+uptime_in_seconds:429905
+uptime_in_days:4
+
+# Clients
+connected_clients:1
+cluster_connections:0
+max_clients:10000
+
+# Memory
+used_memory:876648
+
+# Replication
+role:master
+connected_slaves:0
+master_failover_state:no-failover
+	`);
+
+				const output = await node.execute.call(thisArg);
+
+				expect(mockClient.info).toHaveBeenCalled();
+				expect(output[0][0].json).toEqual({
+					redis_version: 6.2,
+					redis_git_sha1: 0,
+					redis_git_dirty: 0,
+					redis_mode: 'standalone',
+					arch_bits: 64,
+					tcp_port: 6379,
+					uptime_in_seconds: 429905,
+					uptime_in_days: 4,
+					connected_clients: 1,
+					cluster_connections: 0,
+					max_clients: 10000,
+					used_memory: 876648,
+					role: 'master',
+					connected_slaves: 0,
+					master_failover_state: 'no-failover',
+				});
+			});
+
+			it('should continue and return an error when continue on fail is enabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('info');
+				thisArg.continueOnFail.mockReturnValue(true);
+				mockClient.info.mockRejectedValue(new Error('Redis error'));
+
+				const output = await node.execute.call(thisArg);
+
+				expect(mockClient.info).toHaveBeenCalled();
+				expect(output[0][0].json).toEqual({ error: 'Redis error' });
+			});
+
+			it('should throw an error when continue on fail is disabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('info');
+				thisArg.continueOnFail.mockReturnValue(false);
+				mockClient.info.mockRejectedValue(new Error('Redis error'));
+
+				await expect(node.execute.call(thisArg)).rejects.toThrow(NodeOperationError);
+
+				expect(mockClient.info).toHaveBeenCalled();
+				expect(mockClient.quit).toHaveBeenCalled();
+			});
+		});
+
+		describe('delete operation', () => {
+			it('should delete', async () => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('delete');
+				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
+				mockClient.del.calledWith('key1').mockResolvedValue(1);
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.del).toHaveBeenCalledWith('key1');
+				expect(output[0][0].json).toEqual({ x: 1 });
+			});
+
+			it('should continue and return an error when continue on fail is enabled and an error is thrown', async () => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('delete');
+				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
+				thisArg.continueOnFail.mockReturnValue(true);
+
+				mockClient.del.mockRejectedValue(new Error('Redis error'));
+
+				const output = await node.execute.call(thisArg);
+
+				expect(mockClient.del).toHaveBeenCalled();
+				expect(output[0][0].json).toEqual({ error: 'Redis error' });
+			});
+
+			it('should throw an error when continue on fail is disabled and an error is thrown', async () => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('delete');
+				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
+
+				mockClient.del.mockRejectedValue(new Error('Redis error'));
+
+				await expect(node.execute.call(thisArg)).rejects.toThrow(NodeOperationError);
+
+				expect(mockClient.del).toHaveBeenCalled();
+				expect(mockClient.quit).toHaveBeenCalled();
+			});
+		});
+
+		describe('get operation', () => {
+			beforeEach(() => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('get');
+				thisArg.getNodeParameter.calledWith('options', 0).mockReturnValue({ dotNotation: true });
+				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
+				thisArg.getNodeParameter.calledWith('propertyName', 0).mockReturnValue('x.y');
+			});
+
+			it('keyType = automatic', async () => {
+				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('automatic');
+				mockClient.type.calledWith('key1').mockResolvedValue('string');
+				mockClient.get.calledWith('key1').mockResolvedValue('value');
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.type).toHaveBeenCalledWith('key1');
+				expect(mockClient.get).toHaveBeenCalledWith('key1');
+				expect(output[0][0].json).toEqual({ x: { y: 'value' } });
+			});
+
+			it('keyType = hash', async () => {
+				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('hash');
+				mockClient.hGetAll.calledWith('key1').mockResolvedValue({
+					field1: '1',
+					field2: '2',
+				});
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.hGetAll).toHaveBeenCalledWith('key1');
+				expect(output[0][0].json).toEqual({
+					x: {
+						y: {
+							field1: '1',
+							field2: '2',
+						},
+					},
+				});
+			});
+
+			it('should continue and return an error when continue on fail is enabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('automatic');
+				thisArg.continueOnFail.mockReturnValue(true);
+
+				mockClient.type.calledWith('key1').mockResolvedValue('string');
+				mockClient.get.mockRejectedValue(new Error('Redis error'));
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.get).toHaveBeenCalled();
+
+				expect(output[0][0].json).toEqual({ error: 'Redis error' });
+			});
+
+			it('should throw an error when continue on fail is disabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('automatic');
+
+				mockClient.type.calledWith('key1').mockResolvedValue('string');
+				mockClient.get.mockRejectedValue(new Error('Redis error'));
+
+				await expect(node.execute.call(thisArg)).rejects.toThrow(NodeOperationError);
+
+				expect(mockClient.get).toHaveBeenCalled();
+				expect(mockClient.quit).toHaveBeenCalled();
+			});
+		});
+
+		describe('keys operation', () => {
+			beforeEach(() => {
+				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
+				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('keys');
+				thisArg.getNodeParameter.calledWith('keyPattern', 0).mockReturnValue('key*');
+				mockClient.keys.calledWith('key*').mockResolvedValue(['key1', 'key2']);
+			});
+
+			it('getValues = false', async () => {
+				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(false);
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.keys).toHaveBeenCalledWith('key*');
+				expect(output[0][0].json).toEqual({ keys: ['key1', 'key2'] });
+			});
+
+			it('getValues = true', async () => {
+				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(true);
+				mockClient.type.mockResolvedValue('string');
+				mockClient.get.calledWith('key1').mockResolvedValue('value1');
+				mockClient.get.calledWith('key2').mockResolvedValue('value2');
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.keys).toHaveBeenCalledWith('key*');
+				expect(output[0][0].json).toEqual({ key1: 'value1', key2: 'value2' });
+			});
+
+			it('should continue and return an error when continue on fail is enabled and an error is thrown', async () => {
+				thisArg.continueOnFail.mockReturnValue(true);
+				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(true);
+
+				mockClient.type.mockResolvedValue('string');
+				mockClient.get.mockRejectedValue(new Error('Redis error'));
+
+				const output = await node.execute.call(thisArg);
+				expect(mockClient.get).toHaveBeenCalled();
+
+				expect(output[0][0].json).toEqual({ error: 'Redis error' });
+			});
+
+			it('should throw an error when continue on fail is disabled and an error is thrown', async () => {
+				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(true);
+
+				mockClient.type.mockResolvedValue('string');
+				mockClient.get.mockRejectedValue(new Error('Redis error'));
+
+				await expect(node.execute.call(thisArg)).rejects.toThrow(NodeOperationError);
+
+				expect(mockClient.get).toHaveBeenCalled();
+				expect(mockClient.quit).toHaveBeenCalled();
+			});
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Redis/test/RedisTrigger.node.test.ts b/packages/nodes-base/nodes/Redis/__tests__/RedisTrigger.node.test.ts
similarity index 97%
rename from packages/nodes-base/nodes/Redis/test/RedisTrigger.node.test.ts
rename to packages/nodes-base/nodes/Redis/__tests__/RedisTrigger.node.test.ts
index eadad5fe90..c2287d675d 100644
--- a/packages/nodes-base/nodes/Redis/test/RedisTrigger.node.test.ts
+++ b/packages/nodes-base/nodes/Redis/__tests__/RedisTrigger.node.test.ts
@@ -1,12 +1,13 @@
-import { returnJsonArray } from 'n8n-core';
 import { captor, mock } from 'jest-mock-extended';
+import { returnJsonArray } from 'n8n-core';
 import type { ICredentialDataDecryptedObject, ITriggerFunctions } from 'n8n-workflow';
 
 import { RedisTrigger } from '../RedisTrigger.node';
-import { type RedisClientType, setupRedisClient } from '../utils';
+import type { RedisClient } from '../types';
+import { setupRedisClient } from '../utils';
 
 jest.mock('../utils', () => {
-	const mockRedisClient = mock<RedisClientType>();
+	const mockRedisClient = mock<RedisClient>();
 	return {
 		setupRedisClient: jest.fn().mockReturnValue(mockRedisClient),
 	};
diff --git a/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts b/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts
deleted file mode 100644
index 029b85f4d4..0000000000
--- a/packages/nodes-base/nodes/Redis/test/Redis.node.test.ts
+++ /dev/null
@@ -1,205 +0,0 @@
-import { mock } from 'jest-mock-extended';
-import type { RedisClientType } from '@redis/client';
-import type { IExecuteFunctions } from 'n8n-workflow';
-
-const mockClient = mock<RedisClientType>();
-const createClient = jest.fn().mockReturnValue(mockClient);
-jest.mock('redis', () => ({ createClient }));
-
-import { Redis } from '../Redis.node';
-import { setupRedisClient } from '../utils';
-
-describe('Redis Node', () => {
-	const node = new Redis();
-
-	beforeEach(() => jest.clearAllMocks());
-
-	describe('setupRedisClient', () => {
-		it('should not configure TLS by default', () => {
-			setupRedisClient({
-				host: 'redis.domain',
-				port: 1234,
-				database: 0,
-			});
-			expect(createClient).toHaveBeenCalledWith({
-				database: 0,
-				password: undefined,
-				socket: {
-					host: 'redis.domain',
-					port: 1234,
-					tls: false,
-				},
-			});
-		});
-
-		it('should configure TLS', () => {
-			setupRedisClient({
-				host: 'redis.domain',
-				port: 1234,
-				database: 0,
-				ssl: true,
-			});
-			expect(createClient).toHaveBeenCalledWith({
-				database: 0,
-				password: undefined,
-				socket: {
-					host: 'redis.domain',
-					port: 1234,
-					tls: true,
-				},
-			});
-		});
-	});
-
-	describe('operations', () => {
-		const thisArg = mock<IExecuteFunctions>({});
-
-		const mockCredential = {
-			host: 'redis',
-			port: 1234,
-			database: 0,
-			password: 'random',
-		};
-
-		thisArg.getCredentials.calledWith('redis').mockResolvedValue(mockCredential);
-
-		afterEach(() => {
-			expect(createClient).toHaveBeenCalled();
-			expect(mockClient.connect).toHaveBeenCalled();
-			expect(mockClient.ping).toHaveBeenCalled();
-			expect(mockClient.quit).toHaveBeenCalled();
-		});
-
-		describe('info operation', () => {
-			it('should return info', async () => {
-				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('info');
-				mockClient.info.mockResolvedValue(`
-# Server
-redis_version:6.2.14
-redis_git_sha1:00000000
-redis_git_dirty:0
-redis_mode:standalone
-arch_bits:64
-tcp_port:6379
-uptime_in_seconds:429905
-uptime_in_days:4
-
-# Clients
-connected_clients:1
-cluster_connections:0
-max_clients:10000
-
-# Memory
-used_memory:876648
-
-# Replication
-role:master
-connected_slaves:0
-master_failover_state:no-failover
-	`);
-
-				const output = await node.execute.call(thisArg);
-
-				expect(mockClient.info).toHaveBeenCalled();
-				expect(output[0][0].json).toEqual({
-					redis_version: 6.2,
-					redis_git_sha1: 0,
-					redis_git_dirty: 0,
-					redis_mode: 'standalone',
-					arch_bits: 64,
-					tcp_port: 6379,
-					uptime_in_seconds: 429905,
-					uptime_in_days: 4,
-					connected_clients: 1,
-					cluster_connections: 0,
-					max_clients: 10000,
-					used_memory: 876648,
-					role: 'master',
-					connected_slaves: 0,
-					master_failover_state: 'no-failover',
-				});
-			});
-		});
-
-		describe('delete operation', () => {
-			it('should delete', async () => {
-				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
-				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('delete');
-				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
-				mockClient.del.calledWith('key1').mockResolvedValue(1);
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.del).toHaveBeenCalledWith('key1');
-				expect(output[0][0].json).toEqual({ x: 1 });
-			});
-		});
-
-		describe('get operation', () => {
-			beforeEach(() => {
-				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
-				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('get');
-				thisArg.getNodeParameter.calledWith('options', 0).mockReturnValue({ dotNotation: true });
-				thisArg.getNodeParameter.calledWith('key', 0).mockReturnValue('key1');
-				thisArg.getNodeParameter.calledWith('propertyName', 0).mockReturnValue('x.y');
-			});
-
-			it('keyType = automatic', async () => {
-				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('automatic');
-				mockClient.type.calledWith('key1').mockResolvedValue('string');
-				mockClient.get.calledWith('key1').mockResolvedValue('value');
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.type).toHaveBeenCalledWith('key1');
-				expect(mockClient.get).toHaveBeenCalledWith('key1');
-				expect(output[0][0].json).toEqual({ x: { y: 'value' } });
-			});
-
-			it('keyType = hash', async () => {
-				thisArg.getNodeParameter.calledWith('keyType', 0).mockReturnValue('hash');
-				mockClient.hGetAll.calledWith('key1').mockResolvedValue({
-					field1: '1',
-					field2: '2',
-				});
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.hGetAll).toHaveBeenCalledWith('key1');
-				expect(output[0][0].json).toEqual({
-					x: {
-						y: {
-							field1: '1',
-							field2: '2',
-						},
-					},
-				});
-			});
-		});
-
-		describe('keys operation', () => {
-			beforeEach(() => {
-				thisArg.getInputData.mockReturnValue([{ json: { x: 1 } }]);
-				thisArg.getNodeParameter.calledWith('operation', 0).mockReturnValue('keys');
-				thisArg.getNodeParameter.calledWith('keyPattern', 0).mockReturnValue('key*');
-				mockClient.keys.calledWith('key*').mockResolvedValue(['key1', 'key2']);
-			});
-
-			it('getValues = false', async () => {
-				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(false);
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.keys).toHaveBeenCalledWith('key*');
-				expect(output[0][0].json).toEqual({ keys: ['key1', 'key2'] });
-			});
-
-			it('getValues = true', async () => {
-				thisArg.getNodeParameter.calledWith('getValues', 0).mockReturnValue(true);
-				mockClient.type.mockResolvedValue('string');
-				mockClient.get.calledWith('key1').mockResolvedValue('value1');
-				mockClient.get.calledWith('key2').mockResolvedValue('value2');
-
-				const output = await node.execute.call(thisArg);
-				expect(mockClient.keys).toHaveBeenCalledWith('key*');
-				expect(output[0][0].json).toEqual({ key1: 'value1', key2: 'value2' });
-			});
-		});
-	});
-});
diff --git a/packages/nodes-base/nodes/Redis/types.ts b/packages/nodes-base/nodes/Redis/types.ts
new file mode 100644
index 0000000000..63e873acce
--- /dev/null
+++ b/packages/nodes-base/nodes/Redis/types.ts
@@ -0,0 +1,12 @@
+import type { createClient } from 'redis';
+
+export type RedisClient = ReturnType<typeof createClient>;
+
+export type RedisCredential = {
+	host: string;
+	port: number;
+	ssl?: boolean;
+	database: number;
+	user?: string;
+	password?: string;
+};
diff --git a/packages/nodes-base/nodes/Redis/utils.ts b/packages/nodes-base/nodes/Redis/utils.ts
index effdd99778..4364bab892 100644
--- a/packages/nodes-base/nodes/Redis/utils.ts
+++ b/packages/nodes-base/nodes/Redis/utils.ts
@@ -1,5 +1,4 @@
 import type {
-	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	ICredentialsDecrypted,
 	IDataObject,
@@ -7,29 +6,28 @@ import type {
 	INodeCredentialTestResult,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+import { createClient } from 'redis';
 
-import { type RedisClientOptions, createClient } from 'redis';
-export type RedisClientType = ReturnType<typeof createClient>;
+import type { RedisCredential, RedisClient } from './types';
 
-export function setupRedisClient(credentials: ICredentialDataDecryptedObject): RedisClientType {
-	const redisOptions: RedisClientOptions = {
+export function setupRedisClient(credentials: RedisCredential): RedisClient {
+	return createClient({
 		socket: {
-			host: credentials.host as string,
-			port: credentials.port as number,
+			host: credentials.host,
+			port: credentials.port,
 			tls: credentials.ssl === true,
 		},
-		database: credentials.database as number,
-		password: (credentials.password as string) || undefined,
-	};
-
-	return createClient(redisOptions);
+		database: credentials.database,
+		username: credentials.user || undefined,
+		password: credentials.password || undefined,
+	});
 }
 
 export async function redisConnectionTest(
 	this: ICredentialTestFunctions,
 	credential: ICredentialsDecrypted,
 ): Promise<INodeCredentialTestResult> {
-	const credentials = credential.data as ICredentialDataDecryptedObject;
+	const credentials = credential.data as RedisCredential;
 
 	try {
 		const client = setupRedisClient(credentials);
@@ -88,7 +86,7 @@ export function convertInfoToObject(stringData: string): IDataObject {
 	return returnData;
 }
 
-export async function getValue(client: RedisClientType, keyName: string, type?: string) {
+export async function getValue(client: RedisClient, keyName: string, type?: string) {
 	if (type === undefined || type === 'automatic') {
 		// Request the type first
 		type = await client.type(keyName);
@@ -107,7 +105,7 @@ export async function getValue(client: RedisClientType, keyName: string, type?:
 
 export async function setValue(
 	this: IExecuteFunctions,
-	client: RedisClientType,
+	client: RedisClient,
 	keyName: string,
 	value: string | number | object | string[] | number[],
 	expire: boolean,
diff --git a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
index 7e53e9b0cb..4f216945f7 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
@@ -1,3 +1,7 @@
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
+import { NodeConnectionType, deepCopy } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -5,11 +9,6 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeConnectionType, deepCopy } from 'n8n-workflow';
-
-import get from 'lodash/get';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
 
 interface IRenameKey {
 	currentKey: string;
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index 0ad0dd85c3..b8038d9163 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -1,4 +1,5 @@
-import type { Readable } from 'stream';
+import jwt from 'jsonwebtoken';
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -18,8 +19,8 @@ import {
 	CHAT_TRIGGER_NODE_TYPE,
 	WAIT_NODE_TYPE,
 } from 'n8n-workflow';
-import set from 'lodash/set';
-import jwt from 'jsonwebtoken';
+import type { Readable } from 'stream';
+
 import { formatPrivateKey, generatePairedItemData } from '../../utils/utilities';
 
 export class RespondToWebhook implements INodeType {
@@ -355,14 +356,12 @@ export class RespondToWebhook implements INodeType {
 				}
 			} else if (respondWith === 'jwt') {
 				try {
-					const { keyType, secret, algorithm, privateKey } = (await this.getCredentials(
-						'jwtAuth',
-					)) as {
+					const { keyType, secret, algorithm, privateKey } = await this.getCredentials<{
 						keyType: 'passphrase' | 'pemKey';
 						privateKey: string;
 						secret: string;
 						algorithm: jwt.Algorithm;
-					};
+					}>('jwtAuth');
 
 					let secretOrPrivateKey;
 
diff --git a/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts b/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
index c090511552..797d1ea304 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/test/RespondToWebhook.test.ts
@@ -1,9 +1,12 @@
-import type { MockProxy } from 'jest-mock-extended';
-import { mock } from 'jest-mock-extended';
+import type { DeepMockProxy } from 'jest-mock-extended';
+import { mock, mockDeep } from 'jest-mock-extended';
+import { constructExecutionMetaData } from 'n8n-core';
 import {
+	BINARY_ENCODING,
 	WAIT_NODE_TYPE,
 	type IExecuteFunctions,
 	type INode,
+	type INodeExecutionData,
 	type NodeTypeAndVersion,
 } from 'n8n-workflow';
 
@@ -11,11 +14,13 @@ import { RespondToWebhook } from '../RespondToWebhook.node';
 
 describe('RespondToWebhook Node', () => {
 	let respondToWebhook: RespondToWebhook;
-	let mockExecuteFunctions: MockProxy<IExecuteFunctions>;
+	let mockExecuteFunctions: DeepMockProxy<IExecuteFunctions>;
 
 	beforeEach(() => {
 		respondToWebhook = new RespondToWebhook();
-		mockExecuteFunctions = mock<IExecuteFunctions>();
+		mockExecuteFunctions = mockDeep<IExecuteFunctions>({
+			helpers: { constructExecutionMetaData },
+		});
 	});
 
 	describe('execute method', () => {
@@ -30,6 +35,7 @@ describe('RespondToWebhook Node', () => {
 				'No Webhook node found in the workflow',
 			);
 		});
+
 		it('should not throw an error if WEBHOOK_NODE_TYPES is in parents', async () => {
 			mockExecuteFunctions.getInputData.mockReturnValue([]);
 			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
@@ -43,5 +49,215 @@ describe('RespondToWebhook Node', () => {
 
 			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
 		});
+
+		it('should correctly apply response options', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'firstIncomingItem';
+				if (paramName === 'options')
+					return {
+						responseHeaders: { entries: [{ name: 'X-My-Header', value: 'X-My-Header' }] },
+						responseCode: 201,
+						responseKey: 'data',
+					};
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: { data: { input: true } },
+				headers: { 'x-my-header': 'X-My-Header' },
+				statusCode: 201,
+			});
+		});
+
+		it('should correctly return a json response', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'json';
+				if (paramName === 'options') return {};
+				if (paramName === 'responseBody') return { response: true };
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: { response: true },
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return a stringified json response', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'json';
+				if (paramName === 'options') return {};
+				if (paramName === 'responseBody') return JSON.stringify({ response: true });
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: { response: true },
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return a jwt response', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getCredentials.mockResolvedValue(
+				mock({
+					keyType: 'passphrase',
+					privateKey: 'privateKey',
+					secret: 'secret',
+					algorithm: 'HS256',
+				}),
+			);
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'jwt';
+				if (paramName === 'options') return {};
+				if (paramName === 'payload') return 'payload';
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: {
+					token: 'eyJhbGciOiJIUzI1NiJ9.cGF5bG9hZA.4GMt2k_zZryxhKgC8_HvdSZtYxyEyDa0AFIL-n60a8M',
+				},
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return a text response', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'text';
+				if (paramName === 'options') return {};
+				if (paramName === 'responseBody') return 'responseBody';
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: 'responseBody',
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return a redirect', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'redirect';
+				if (paramName === 'options') return {};
+				if (paramName === 'redirectURL') return 'https://n8n.io';
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				headers: { location: 'https://n8n.io' },
+				statusCode: 307,
+			});
+		});
+
+		it('should correctly return incoming items', async () => {
+			const inputItems = [{ json: { index: 0, input: true } }, { json: { index: 1, input: true } }];
+			mockExecuteFunctions.getInputData.mockReturnValue(inputItems);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'allIncomingItems';
+				if (paramName === 'options') return {};
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: inputItems.map((item) => item.json),
+				headers: {},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly return binary', async () => {
+			const binary = { data: 'text', mimeType: 'text/plain' };
+			const inputItems: INodeExecutionData[] = [{ binary: { data: binary }, json: {} }];
+			mockExecuteFunctions.getInputData.mockReturnValue(inputItems);
+			mockExecuteFunctions.helpers.assertBinaryData.mockReturnValue(binary);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'binary';
+				if (paramName === 'options') return {};
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.not.toThrow();
+			expect(mockExecuteFunctions.sendResponse).toHaveBeenCalledWith({
+				body: Buffer.from('text', BINARY_ENCODING),
+				headers: {
+					'content-length': 3,
+					'content-type': 'text/plain',
+				},
+				statusCode: 200,
+			});
+		});
+
+		it('should correctly handle continue on fail', async () => {
+			mockExecuteFunctions.getInputData.mockReturnValue([{ json: { input: true } }]);
+			mockExecuteFunctions.getNode.mockReturnValue(mock<INode>({ typeVersion: 1.1 }));
+			mockExecuteFunctions.continueOnFail.mockReturnValue(true);
+			mockExecuteFunctions.getParentNodes.mockReturnValue([
+				mock<NodeTypeAndVersion>({ type: WAIT_NODE_TYPE }),
+			]);
+			mockExecuteFunctions.getNodeParameter.mockImplementation((paramName) => {
+				if (paramName === 'respondWith') return 'notSupportedRespondWith';
+				if (paramName === 'options') return {};
+			});
+			mockExecuteFunctions.sendResponse.mockReturnValue();
+
+			await expect(respondToWebhook.execute.call(mockExecuteFunctions)).resolves.toEqual([
+				[
+					{
+						json: { error: 'The Response Data option "notSupportedRespondWith" is not supported!' },
+						pairedItem: [{ item: 0 }],
+					},
+				],
+			]);
+			expect(mockExecuteFunctions.sendResponse).not.toHaveBeenCalled();
+		});
 	});
 });
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
index de9f602b81..b29255d34a 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
@@ -1,4 +1,3 @@
-import { URL } from 'url';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,8 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import Parser from 'rss-parser';
+import { URL } from 'url';
+
 import { generatePairedItemData } from '../../utils/utilities';
 
 // Utility function
@@ -54,7 +54,7 @@ export class RssFeedRead implements INodeType {
 				default: {},
 				options: [
 					{
-						displayName: 'Ignore SSL Issues',
+						displayName: 'Ignore SSL Issues (Insecure)',
 						name: 'ignoreSSL',
 						type: 'boolean',
 						default: false,
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
index 523860ddd1..a3f7849e91 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedReadTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	INodeExecutionData,
@@ -7,7 +8,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import Parser from 'rss-parser';
-import moment from 'moment-timezone';
 
 interface PollData {
 	lastItemDate?: string;
diff --git a/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
index d942859764..7e10c21ce8 100644
--- a/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/test/RssFeedRead.test.ts
@@ -1,7 +1,8 @@
 import { mock } from 'jest-mock-extended';
+import { returnJsonArray } from 'n8n-core';
 import type { IPollFunctions } from 'n8n-workflow';
 import Parser from 'rss-parser';
-import { returnJsonArray } from 'n8n-core';
+
 import { RssFeedReadTrigger } from '../RssFeedReadTrigger.node';
 
 jest.mock('rss-parser');
diff --git a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
index 7238dcfa00..f68c8db965 100644
--- a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { setup, equalityTest, workflowToTests, getWorkflowFilenames } from '@test/nodes/Helpers';
 
 // eslint-disable-next-line n8n-local-rules/no-unneeded-backticks
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index 631853a8ec..bd36d74e16 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
 import { RundeckApi } from './RundeckApi';
 
 export class Rundeck implements INodeType {
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index a31eb6ddd5..34fe6242e0 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -1,11 +1,6 @@
-import { URL } from 'url';
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
-
 import get from 'lodash/get';
-
-import { parseString } from 'xml2js';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -17,6 +12,8 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { URL } from 'url';
+import { parseString } from 'xml2js';
 
 function queryToString(params: IDataObject) {
 	return Object.keys(params)
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index bfb581447c..d7e9d5d75c 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -1,8 +1,5 @@
-import { createHash } from 'crypto';
 import { paramCase, snakeCase } from 'change-case';
-
-import { Builder } from 'xml2js';
-
+import { createHash } from 'crypto';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -12,14 +9,12 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import { bucketFields, bucketOperations } from '../Aws/S3/V1/BucketDescription';
-
-import { folderFields, folderOperations } from '../Aws/S3/V1/FolderDescription';
-
-import { fileFields, fileOperations } from '../Aws/S3/V1/FileDescription';
+import { Builder } from 'xml2js';
 
 import { s3ApiRequestREST, s3ApiRequestSOAP, s3ApiRequestSOAPAllItems } from './GenericFunctions';
+import { bucketFields, bucketOperations } from '../Aws/S3/V1/BucketDescription';
+import { fileFields, fileOperations } from '../Aws/S3/V1/FileDescription';
+import { folderFields, folderOperations } from '../Aws/S3/V1/FolderDescription';
 
 export class S3 implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index 78454e3519..275f92b6f6 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import jwt from 'jsonwebtoken';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -10,10 +12,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
-import jwt from 'jsonwebtoken';
-
 function getOptions(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	method: IHttpRequestMethods,
@@ -114,14 +112,13 @@ export async function salesforceApiRequest(
 			);
 			options.headers!.Authorization = `Bearer ${access_token}`;
 			Object.assign(options, option);
-			//@ts-ignore
 			return await this.helpers.request(options);
 		} else {
 			// https://help.salesforce.com/articleView?id=remoteaccess_oauth_web_server_flow.htm&type=5
 			const credentialsType = 'salesforceOAuth2Api';
-			const credentials = (await this.getCredentials(credentialsType)) as {
+			const credentials = await this.getCredentials<{
 				oauthTokenData: { instance_url: string };
-			};
+			}>(credentialsType);
 			const options = getOptions.call(
 				this,
 				method,
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index df0fd29515..351c6f27a2 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -12,54 +12,33 @@ import type {
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { accountFields, accountOperations } from './AccountDescription';
-
 import type { IAccount } from './AccountInterface';
-
 import { attachmentFields, attachmentOperations } from './AttachmentDescription';
-
 import type { IAttachment } from './AttachmentInterface';
-
 import type { ICampaignMember } from './CampaignMemberInterface';
-
 import { caseFields, caseOperations } from './CaseDescription';
-
 import type { ICase, ICaseComment } from './CaseInterface';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
 import type { IContact } from './ContactInterface';
-
 import { customObjectFields, customObjectOperations } from './CustomObjectDescription';
-
+import { documentFields, documentOperations } from './DocumentDescription';
 import { flowFields, flowOperations } from './FlowDescription';
-
 import {
 	getQuery,
 	salesforceApiRequest,
 	salesforceApiRequestAllItems,
 	sortOptions,
 } from './GenericFunctions';
-
 import { leadFields, leadOperations } from './LeadDescription';
-
 import type { ILead } from './LeadInterface';
-
 import type { INote } from './NoteInterface';
-
 import { opportunityFields, opportunityOperations } from './OpportunityDescription';
-
 import type { IOpportunity } from './OpportunityInterface';
-
 import { searchFields, searchOperations } from './SearchDescription';
-
 import { taskFields, taskOperations } from './TaskDescription';
-
 import type { ITask } from './TaskInterface';
-
 import { userFields, userOperations } from './UserDescription';
 
-import { documentFields, documentOperations } from './DocumentDescription';
-
 export class Salesforce implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Salesforce',
@@ -1039,7 +1018,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/Salesforce/SalesforceTrigger.node.ts b/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts
index 257a778ba3..895c5cbc78 100644
--- a/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/SalesforceTrigger.node.ts
@@ -1,5 +1,5 @@
+import { DateTime } from 'luxon';
 import { NodeApiError, NodeConnectionType } from 'n8n-workflow';
-
 import type {
 	IDataObject,
 	IPollFunctions,
@@ -11,7 +11,6 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 
-import { DateTime } from 'luxon';
 import {
 	getQuery,
 	salesforceApiRequest,
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
index c0b8d00029..f3f7f406db 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
@@ -8,18 +8,19 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+
+import { activityFields, activityOperations } from './ActivityDescription';
+import type { IActivity } from './ActivityInterface';
+import { companyFields, companyOperations } from './CompanyDescription';
+import type { ICompany } from './CompanyInterface';
+import { dealFields, dealOperations } from './DealDescription';
+import type { IDeal } from './DealInterface';
 import {
 	salesmateApiRequest,
 	salesmateApiRequestAllItems,
 	simplifySalesmateData,
 	validateJSON,
 } from './GenericFunctions';
-import { companyFields, companyOperations } from './CompanyDescription';
-import { activityFields, activityOperations } from './ActivityDescription';
-import type { ICompany } from './CompanyInterface';
-import type { IActivity } from './ActivityInterface';
-import type { IDeal } from './DealInterface';
-import { dealFields, dealOperations } from './DealDescription';
 
 export class Salesmate implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
index 42d31bd582..4a6453985b 100644
--- a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
@@ -1,5 +1,6 @@
 import moment from 'moment-timezone';
 import { type CronExpression, randomInt } from 'n8n-workflow';
+
 import type { IRecurrenceRule, ScheduleInterval } from './SchedulerInterface';
 
 export function recurrenceCheck(
diff --git a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
index 904c5f6567..34b0f462c7 100644
--- a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
+++ b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
@@ -1,3 +1,5 @@
+import { sendAt } from 'cron';
+import moment from 'moment-timezone';
 import type {
 	ITriggerFunctions,
 	INodeType,
@@ -5,11 +7,9 @@ import type {
 	ITriggerResponse,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import moment from 'moment-timezone';
-import { sendAt } from 'cron';
 
-import type { IRecurrenceRule, Rule } from './SchedulerInterface';
 import { intervalToRecurrence, recurrenceCheck, toCronExpression } from './GenericFunctions';
+import type { IRecurrenceRule, Rule } from './SchedulerInterface';
 
 export class ScheduleTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Schedule/test/GenericFunctions.test.ts b/packages/nodes-base/nodes/Schedule/test/GenericFunctions.test.ts
index d6c124cc4c..4c953b9e40 100644
--- a/packages/nodes-base/nodes/Schedule/test/GenericFunctions.test.ts
+++ b/packages/nodes-base/nodes/Schedule/test/GenericFunctions.test.ts
@@ -1,4 +1,5 @@
 import * as n8nWorkflow from 'n8n-workflow';
+
 import { intervalToRecurrence, recurrenceCheck, toCronExpression } from '../GenericFunctions';
 import type { IRecurrenceRule } from '../SchedulerInterface';
 
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
index a1e533f6c9..520489b524 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,22 +8,15 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { companyFields, companyOperations } from './descriptions/CompanyDescription';
-
 import { industryFields, industryOperations } from './descriptions/IndustryDescription';
-
 import { inviteFields, inviteOperations } from './descriptions/InviteDescription';
-
-import { portfolioFields, portfolioOperations } from './descriptions/PortfolioDescription';
-
 import {
 	portfolioCompanyFields,
 	portfolioCompanyOperations,
 } from './descriptions/PortfolioCompanyDescription';
-
+import { portfolioFields, portfolioOperations } from './descriptions/PortfolioDescription';
 import { reportFields, reportOperations } from './descriptions/ReportDescription';
-
 import { scorecardApiRequest, simplify } from './GenericFunctions';
 
 export class SecurityScorecard implements INodeType {
diff --git a/packages/nodes-base/nodes/Segment/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts
index bfef2985a5..5699e22535 100644
--- a/packages/nodes-base/nodes/Segment/Segment.node.ts
+++ b/packages/nodes-base/nodes/Segment/Segment.node.ts
@@ -6,18 +6,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
+
 import { segmentApiRequest } from './GenericFunctions';
-
 import { groupFields, groupOperations } from './GroupDescription';
-
 import { identifyFields, identifyOperations } from './IdentifyDescription';
-
 import type { IIdentify } from './IdentifyInterface';
-
 import { trackFields, trackOperations } from './TrackDescription';
-
 import type { IGroup, ITrack } from './TrackInterface';
 
 export class Segment implements INodeType {
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
index c803521206..560f1f36b3 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	NodeConnectionType,
 	type IDataObject,
@@ -10,16 +11,12 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { listFields, listOperations } from './ListDescription';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
+import { sendGridApiRequest, sendGridApiRequestAllItems } from './GenericFunctions';
+import { listFields, listOperations } from './ListDescription';
 import type { SendMailBody } from './MailDescription';
 import { mailFields, mailOperations } from './MailDescription';
 
-import { sendGridApiRequest, sendGridApiRequestAllItems } from './GenericFunctions';
-
 export class SendGrid implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'SendGrid',
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index 9bf36b2e82..6ca6b76bd3 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -8,10 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { sendyApiRequest } from './GenericFunctions';
-
 import { campaignFields, campaignOperations } from './CampaignDescription';
-
+import { sendyApiRequest } from './GenericFunctions';
 import { subscriberFields, subscriberOperations } from './SubscriberDescription';
 
 export class Sendy implements INodeType {
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index ad83f771b6..edd53b83ea 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -10,20 +10,13 @@ import {
 } from 'n8n-workflow';
 
 import { eventFields, eventOperations } from './EventDescription';
-
-import { issueFields, issueOperations } from './IssueDescription';
-
-import { organizationFields, organizationOperations } from './OrganizationDescription';
-
-import { projectFields, projectOperations } from './ProjectDescription';
-
-import { releaseFields, releaseOperations } from './ReleaseDescription';
-
-import { teamFields, teamOperations } from './TeamDescription';
-
 import { sentryApiRequestAllItems, sentryIoApiRequest } from './GenericFunctions';
-
 import type { ICommit, IPatchSet, IRef } from './Interface';
+import { issueFields, issueOperations } from './IssueDescription';
+import { organizationFields, organizationOperations } from './OrganizationDescription';
+import { projectFields, projectOperations } from './ProjectDescription';
+import { releaseFields, releaseOperations } from './ReleaseDescription';
+import { teamFields, teamOperations } from './TeamDescription';
 
 export class SentryIo implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
index 50d78a31f5..15ef436497 100644
--- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
@@ -9,6 +9,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { attachmentFields, attachmentOperations } from './AttachmentDescription';
+import { businessServiceFields, businessServiceOperations } from './BusinessServiceDescription';
+import {
+	configurationItemsFields,
+	configurationItemsOperations,
+} from './ConfigurationItemsDescription';
+import { departmentFields, departmentOperations } from './DepartmentDescription';
+import { dictionaryFields, dictionaryOperations } from './DictionaryDescription';
 import {
 	mapEndpoint,
 	serviceNowApiRequest,
@@ -16,28 +24,10 @@ import {
 	serviceNowRequestAllItems,
 	sortData,
 } from './GenericFunctions';
-
-import { attachmentFields, attachmentOperations } from './AttachmentDescription';
-
-import { businessServiceFields, businessServiceOperations } from './BusinessServiceDescription';
-
-import {
-	configurationItemsFields,
-	configurationItemsOperations,
-} from './ConfigurationItemsDescription';
-
-import { departmentFields, departmentOperations } from './DepartmentDescription';
-
-import { dictionaryFields, dictionaryOperations } from './DictionaryDescription';
-
 import { incidentFields, incidentOperations } from './IncidentDescription';
-
 import { tableRecordFields, tableRecordOperations } from './TableRecordDescription';
-
 import { userFields, userOperations } from './UserDescription';
-
 import { userGroupFields, userGroupOperations } from './UserGroupDescription';
-
 import { userRoleFields, userRoleOperations } from './UserRoleDescription';
 
 export class ServiceNow implements INodeType {
diff --git a/packages/nodes-base/nodes/Set/test/v2/raw.test.ts b/packages/nodes-base/nodes/Set/test/v2/raw.test.ts
new file mode 100644
index 0000000000..5cebfbfcab
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/test/v2/raw.test.ts
@@ -0,0 +1,145 @@
+import { get } from 'lodash';
+import { constructExecutionMetaData } from 'n8n-core';
+import {
+	NodeOperationError,
+	type IDataObject,
+	type IExecuteFunctions,
+	type IGetNodeParameterOptions,
+	type INode,
+} from 'n8n-workflow';
+
+import { type SetNodeOptions } from '../../v2/helpers/interfaces';
+import * as utils from '../../v2/helpers/utils';
+import { execute } from '../../v2/raw.mode';
+
+const node: INode = {
+	id: '11',
+	name: 'Set Node',
+	type: 'n8n-nodes-base.set',
+	typeVersion: 3,
+	position: [42, 42],
+	parameters: {
+		mode: 'manual',
+		fields: {
+			values: [],
+		},
+		include: 'none',
+		options: {},
+	},
+};
+
+const createMockExecuteFunction = (
+	nodeParameters: IDataObject,
+	continueOnFail: boolean = false,
+) => {
+	const fakeExecuteFunction = {
+		getNodeParameter(
+			parameterName: string,
+			_itemIndex: number,
+			fallbackValue?: IDataObject | undefined,
+			options?: IGetNodeParameterOptions | undefined,
+		) {
+			const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+			return get(nodeParameters, parameter, fallbackValue);
+		},
+		getNode() {
+			return node;
+		},
+		helpers: { constructExecutionMetaData },
+		continueOnFail: () => continueOnFail,
+	} as unknown as IExecuteFunctions;
+	return fakeExecuteFunction;
+};
+
+describe('test Set2, rawMode/json Mode', () => {
+	const item = {
+		json: {
+			input1: 'value1',
+			input2: 2,
+			input3: [1, 2, 3],
+		},
+		pairedItem: {
+			item: 0,
+			input: undefined,
+		},
+	};
+
+	const options: SetNodeOptions = {
+		include: 'none',
+	};
+
+	afterEach(() => jest.resetAllMocks());
+
+	describe('fixed mode', () => {
+		const jsonData = { jsonData: 1 };
+		const fakeExecuteFunction = createMockExecuteFunction({ jsonOutput: jsonData });
+		const rawData = {
+			num1: 55,
+			str1: '42',
+			arr1: ['foo', 'bar'],
+			obj: {
+				key: 'value',
+			},
+		};
+
+		it('should parse json with the jsonOutput in node parameter and compose a return item', async () => {
+			jest.spyOn(utils, 'parseJsonParameter');
+			jest.spyOn(utils, 'composeReturnItem');
+
+			const result = await execute.call(fakeExecuteFunction, item, 0, options, rawData, node);
+
+			expect(result).toEqual({ json: jsonData, pairedItem: { item: 0 } });
+			expect(utils.parseJsonParameter).toHaveBeenCalledWith(jsonData, node, 0);
+			expect(utils.composeReturnItem).toHaveBeenCalledWith(0, item, jsonData, options, 3);
+		});
+	});
+
+	describe('expression mode', () => {
+		const jsonData = { my_field_1: 'value' };
+		const jsonDataString = '{"my_field_1": "value"}';
+		const fakeExecuteFunction = createMockExecuteFunction({ jsonOutput: jsonDataString });
+		const rawData = {
+			num1: 55,
+			str1: '42',
+			arr1: ['foo', 'bar'],
+			obj: {
+				key: 'value',
+			},
+			jsonOutput: jsonDataString,
+		};
+
+		it('should parse json with resolved expression data and compose a return item', async () => {
+			jest.spyOn(utils, 'parseJsonParameter');
+			jest.spyOn(utils, 'composeReturnItem');
+			jest.spyOn(utils, 'resolveRawData');
+
+			const result = await execute.call(fakeExecuteFunction, item, 0, options, rawData, node);
+
+			expect(utils.parseJsonParameter).toHaveBeenCalledWith(jsonDataString, node, 0);
+			expect(utils.composeReturnItem).toHaveBeenCalledWith(0, item, jsonData, options, 3);
+			expect(utils.resolveRawData).toHaveBeenCalledWith(jsonDataString, 0);
+			expect(result).toEqual({ json: jsonData, pairedItem: { item: 0 } });
+		});
+	});
+
+	describe('error handling', () => {
+		it('should return an error object with pairedItem when continueOnFail is true', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction({ jsonOutput: 'jsonData' }, true);
+
+			const output = await execute.call(fakeExecuteFunction, item, 0, options, {}, node);
+
+			expect(output).toEqual({
+				json: { error: "The 'JSON Output' in item 0 contains invalid JSON" },
+				pairedItem: { item: 0 },
+			});
+		});
+
+		it('should throw an error when continueOnFail is false', async () => {
+			const fakeExecuteFunction = createMockExecuteFunction({ jsonOutput: 'jsonData' }, false);
+
+			await expect(execute.call(fakeExecuteFunction, item, 0, options, {}, node)).rejects.toThrow(
+				NodeOperationError,
+			);
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Set/test/v2/utils.test.ts b/packages/nodes-base/nodes/Set/test/v2/utils.test.ts
index fc84d08129..a982a6006b 100644
--- a/packages/nodes-base/nodes/Set/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Set/test/v2/utils.test.ts
@@ -1,8 +1,9 @@
-import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
-import { constructExecutionMetaData } from 'n8n-core';
 import get from 'lodash/get';
-import { composeReturnItem, parseJsonParameter, validateEntry } from '../../v2/helpers/utils';
+import { constructExecutionMetaData } from 'n8n-core';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+
 import type { SetNodeOptions } from '../../v2/helpers/interfaces';
+import { composeReturnItem, parseJsonParameter, validateEntry } from '../../v2/helpers/utils';
 
 export const node: INode = {
 	id: '11',
diff --git a/packages/nodes-base/nodes/Set/v1/SetV1.node.ts b/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
index 55e92a5337..649218799f 100644
--- a/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
+++ b/packages/nodes-base/nodes/Set/v1/SetV1.node.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -8,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, deepCopy } from 'n8n-workflow';
 
-import set from 'lodash/set';
-
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Set',
 	name: 'set',
diff --git a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
index b1dd055590..ac4083b355 100644
--- a/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
+++ b/packages/nodes-base/nodes/Set/v2/SetV2.node.ts
@@ -10,9 +10,8 @@ import { NodeConnectionType } from 'n8n-workflow';
 
 import type { IncludeMods, SetField, SetNodeOptions } from './helpers/interfaces';
 import { INCLUDE } from './helpers/interfaces';
-
-import * as raw from './raw.mode';
 import * as manual from './manual.mode';
+import * as raw from './raw.mode';
 
 type Mode = 'manual' | 'raw';
 
diff --git a/packages/nodes-base/nodes/Set/v2/helpers/utils.ts b/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
index d6754914ce..6ec6dd647b 100644
--- a/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Set/v2/helpers/utils.ts
@@ -1,11 +1,6 @@
-import type {
-	FieldType,
-	IDataObject,
-	IExecuteFunctions,
-	INode,
-	INodeExecutionData,
-	ISupplyDataFunctions,
-} from 'n8n-workflow';
+import get from 'lodash/get';
+import set from 'lodash/set';
+import unset from 'lodash/unset';
 import {
 	ApplicationError,
 	NodeOperationError,
@@ -14,14 +9,18 @@ import {
 	jsonParse,
 	validateFieldType,
 } from 'n8n-workflow';
+import type {
+	FieldType,
+	IDataObject,
+	IExecuteFunctions,
+	INode,
+	INodeExecutionData,
+	ISupplyDataFunctions,
+} from 'n8n-workflow';
 
-import get from 'lodash/get';
-import set from 'lodash/set';
-import unset from 'lodash/unset';
-
-import { getResolvables, sanitizeDataPathKey } from '../../../../utils/utilities';
 import type { SetNodeOptions } from './interfaces';
 import { INCLUDE } from './interfaces';
+import { getResolvables, sanitizeDataPathKey } from '../../../../utils/utilities';
 
 const configureFieldHelper = (dotNotation?: boolean) => {
 	if (dotNotation !== false) {
diff --git a/packages/nodes-base/nodes/Set/v2/manual.mode.ts b/packages/nodes-base/nodes/Set/v2/manual.mode.ts
index 0865e2c4ee..5ee7454e65 100644
--- a/packages/nodes-base/nodes/Set/v2/manual.mode.ts
+++ b/packages/nodes-base/nodes/Set/v2/manual.mode.ts
@@ -10,14 +10,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '../../../utils/utilities';
+import type { SetField, SetNodeOptions } from './helpers/interfaces';
 import {
 	parseJsonParameter,
 	validateEntry,
 	composeReturnItem,
 	resolveRawData,
 } from './helpers/utils';
-import type { SetField, SetNodeOptions } from './helpers/interfaces';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Set/v2/raw.mode.ts b/packages/nodes-base/nodes/Set/v2/raw.mode.ts
index b24a5e2dd5..bd00fa4c73 100644
--- a/packages/nodes-base/nodes/Set/v2/raw.mode.ts
+++ b/packages/nodes-base/nodes/Set/v2/raw.mode.ts
@@ -7,9 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { updateDisplayOptions } from '../../../utils/utilities';
-import { parseJsonParameter, composeReturnItem, resolveRawData } from './helpers/utils';
 import type { SetNodeOptions } from './helpers/interfaces';
+import { parseJsonParameter, composeReturnItem, resolveRawData } from './helpers/utils';
+import { updateDisplayOptions } from '../../../utils/utilities';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index ff515edfb1..1993bbba80 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,8 +9,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
 export async function shopifyApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index f2c70184e6..830dc051c2 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -10,13 +10,9 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { keysToSnakeCase, shopifyApiRequest, shopifyApiRequestAllItems } from './GenericFunctions';
-
 import { orderFields, orderOperations } from './OrderDescription';
-
-import { productFields, productOperations } from './ProductDescription';
-
 import type { IAddress, IDiscountCode, ILineItem, IOrder } from './OrderInterface';
-
+import { productFields, productOperations } from './ProductDescription';
 import type { IProduct } from './ProductInterface';
 
 export class Shopify implements INodeType {
diff --git a/packages/nodes-base/nodes/Simulate/Simulate.node.ts b/packages/nodes-base/nodes/Simulate/Simulate.node.ts
index a80924551c..3dc2b6015c 100644
--- a/packages/nodes-base/nodes/Simulate/Simulate.node.ts
+++ b/packages/nodes-base/nodes/Simulate/Simulate.node.ts
@@ -7,13 +7,13 @@ import type {
 	IDataObject,
 } from 'n8n-workflow';
 
-import { loadOptions } from './methods';
 import {
 	executionDurationProperty,
 	iconSelector,
 	jsonOutputProperty,
 	subtitleProperty,
 } from './descriptions';
+import { loadOptions } from './methods';
 
 export class Simulate implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts b/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts
index d793434ee1..766c86417a 100644
--- a/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts
+++ b/packages/nodes-base/nodes/Simulate/SimulateTrigger.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeTypeDescription,
 	ITriggerResponse,
 } from 'n8n-workflow';
+
 import {
 	executionDurationProperty,
 	iconSelector,
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.json b/packages/nodes-base/nodes/Slack/Slack.node.json
index a81eeef453..3ac416b245 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.json
+++ b/packages/nodes-base/nodes/Slack/Slack.node.json
@@ -3,6 +3,7 @@
 	"nodeVersion": "1.0",
 	"codexVersion": "1.0",
 	"categories": ["Communication"],
+	"alias": ["human", "form", "wait"],
 	"resources": {
 		"credentialDocumentation": [
 			{
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.ts b/packages/nodes-base/nodes/Slack/Slack.node.ts
index 0eac92e536..fd33d2a9cc 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.ts
+++ b/packages/nodes-base/nodes/Slack/Slack.node.ts
@@ -2,7 +2,6 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { SlackV1 } from './V1/SlackV1.node';
-
 import { SlackV2 } from './V2/SlackV2.node';
 
 export class Slack extends VersionedNodeType {
@@ -14,7 +13,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 +21,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/SlackTrigger.node.ts b/packages/nodes-base/nodes/Slack/SlackTrigger.node.ts
index 9dbe79d8d4..c5efc880fd 100644
--- a/packages/nodes-base/nodes/Slack/SlackTrigger.node.ts
+++ b/packages/nodes-base/nodes/Slack/SlackTrigger.node.ts
@@ -13,8 +13,8 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { slackApiRequestAllItems } from './V2/GenericFunctions';
 import { downloadFile, getChannelInfo, getUserInfo } from './SlackTriggerHelpers';
+import { slackApiRequestAllItems } from './V2/GenericFunctions';
 
 export class SlackTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Slack/SlackTriggerHelpers.ts b/packages/nodes-base/nodes/Slack/SlackTriggerHelpers.ts
index a7f565c3f3..f5281dd29d 100644
--- a/packages/nodes-base/nodes/Slack/SlackTriggerHelpers.ts
+++ b/packages/nodes-base/nodes/Slack/SlackTriggerHelpers.ts
@@ -1,5 +1,6 @@
 import type { IHttpRequestOptions, IWebhookFunctions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import { slackApiRequest } from './V2/GenericFunctions';
 
 export async function getUserInfo(this: IWebhookFunctions, userId: string): Promise<any> {
diff --git a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
index c31607dc0c..42f618eddf 100644
--- a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function slackApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
index 585bde58e4..60dfcf79d2 100644
--- a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
+++ b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,20 +12,19 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { channelFields, channelOperations } from './ChannelDescription';
-import { messageFields, messageOperations } from './MessageDescription';
-import { starFields, starOperations } from './StarDescription';
-import { fileFields, fileOperations } from './FileDescription';
-import { reactionFields, reactionOperations } from './ReactionDescription';
-import { userGroupFields, userGroupOperations } from './UserGroupDescription';
-import { userFields, userOperations } from './UserDescription';
-import { userProfileFields, userProfileOperations } from './UserProfileDescription';
-import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
-import type { IAttachment } from './MessageInterface';
-
 import { oldVersionNotice } from '@utils/descriptions';
 
+import { channelFields, channelOperations } from './ChannelDescription';
+import { fileFields, fileOperations } from './FileDescription';
+import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
+import { messageFields, messageOperations } from './MessageDescription';
+import type { IAttachment } from './MessageInterface';
+import { reactionFields, reactionOperations } from './ReactionDescription';
+import { starFields, starOperations } from './StarDescription';
+import { userFields, userOperations } from './UserDescription';
+import { userGroupFields, userGroupOperations } from './UserGroupDescription';
+import { userProfileFields, userProfileOperations } from './UserProfileDescription';
+
 interface Attachment {
 	fields: {
 		item?: object[];
diff --git a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
index 44c555b9ab..3260259ce7 100644
--- a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
@@ -94,7 +94,7 @@ export const fileFields: INodeProperties[] = [
 			show: {
 				operation: ['upload'],
 				resource: ['file'],
-				'@version': [2.2],
+				'@version': [{ _cnd: { gte: 2.2 } }],
 			},
 		},
 		placeholder: '',
@@ -139,7 +139,7 @@ export const fileFields: INodeProperties[] = [
 				},
 				displayOptions: {
 					show: {
-						'@version': [2.2],
+						'@version': [{ _cnd: { gte: 2.2 } }],
 					},
 				},
 				default: [],
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/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
index de31614b44..93d1cfc4e2 100644
--- a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
@@ -33,9 +33,9 @@ export const messageOperations: INodeProperties[] = [
 				action: 'Send a message',
 			},
 			{
-				name: 'Send and Wait for Approval',
+				name: 'Send and Wait for Response',
 				value: SEND_AND_WAIT_OPERATION,
-				action: 'Send a message and wait for approval',
+				action: 'Send message and wait for response',
 			},
 			{
 				name: 'Update',
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..524a36d7b5 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -1,5 +1,4 @@
-import type { Readable } from 'stream';
-
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -14,29 +13,17 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-
 import {
 	BINARY_ENCODING,
 	NodeConnectionType,
 	NodeOperationError,
 	SEND_AND_WAIT_OPERATION,
-	WAIT_TIME_UNLIMITED,
+	WAIT_INDEFINITELY,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
-import moment from 'moment-timezone';
 import { channelFields, channelOperations } from './ChannelDescription';
-import {
-	channelRLC,
-	messageFields,
-	messageOperations,
-	sendToSelector,
-	userRLC,
-} from './MessageDescription';
-import { starFields, starOperations } from './StarDescription';
 import { fileFields, fileOperations } from './FileDescription';
-import { reactionFields, reactionOperations } from './ReactionDescription';
-import { userGroupFields, userGroupOperations } from './UserGroupDescription';
-import { userFields, userOperations } from './UserDescription';
 import {
 	slackApiRequest,
 	slackApiRequestAllItems,
@@ -44,6 +31,17 @@ import {
 	getTarget,
 	createSendAndWaitMessageBody,
 } from './GenericFunctions';
+import {
+	channelRLC,
+	messageFields,
+	messageOperations,
+	sendToSelector,
+	userRLC,
+} from './MessageDescription';
+import { reactionFields, reactionOperations } from './ReactionDescription';
+import { starFields, starOperations } from './StarDescription';
+import { userFields, userOperations } from './UserDescription';
+import { userGroupFields, userGroupOperations } from './UserGroupDescription';
 import { getSendAndWaitProperties, sendAndWaitWebhook } from '../../../utils/sendAndWait/utils';
 
 export class SlackV2 implements INodeType {
@@ -52,7 +50,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',
 			},
@@ -89,6 +87,15 @@ export class SlackV2 implements INodeType {
 					restartWebhook: true,
 					isFullPath: true,
 				},
+				{
+					name: 'default',
+					httpMethod: 'POST',
+					responseMode: 'onReceived',
+					responseData: '',
+					path: '={{ $nodeId }}',
+					restartWebhook: true,
+					isFullPath: true,
+				},
 			],
 			properties: [
 				{
@@ -379,7 +386,7 @@ export class SlackV2 implements INodeType {
 				createSendAndWaitMessageBody(this),
 			);
 
-			await this.putExecutionToWait(new Date(WAIT_TIME_UNLIMITED));
+			await this.putExecutionToWait(WAIT_INDEFINITELY);
 			return [this.getInputData()];
 		}
 
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts
new file mode 100644
index 0000000000..f3eefc4bfa
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.test.ts
@@ -0,0 +1,40 @@
+import type { IHttpRequestMethods } from 'n8n-workflow';
+import nock from 'nock';
+
+import { equalityTest, setup, workflowToTests } from '@test/nodes/Helpers';
+
+const API_RESPONSE = {
+	ok: true,
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => append', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/archive.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => await equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.workflow.json
new file mode 100644
index 0000000000..af38bc5814
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/archive.workflow.json
@@ -0,0 +1,89 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"operation": "archive",
+				"channelId": {
+					"__rl": true,
+					"value": "C084ZURRQPL",
+					"mode": "list",
+					"cachedResultName": "test-001"
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "13de7d28-7e93-4602-a4d1-5389e8ccc4dc",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts
new file mode 100644
index 0000000000..81f23e284f
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.test.ts
@@ -0,0 +1,100 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: {
+		id: 'C085WNEHP4Y',
+		name: 'test-003',
+		is_channel: true,
+		is_group: false,
+		is_im: false,
+		is_mpim: false,
+		is_private: false,
+		created: 1734325731,
+		is_archived: false,
+		is_general: false,
+		unlinked: 0,
+		name_normalized: 'test-003',
+		is_shared: false,
+		is_org_shared: false,
+		is_pending_ext_shared: false,
+		pending_shared: [],
+		context_team_id: 'T0364MSFHV2',
+		updated: 1734325731240,
+		parent_conversation: null,
+		creator: 'U0362BXQYJW',
+		is_ext_shared: false,
+		shared_team_ids: ['T0364MSFHV2'],
+		pending_connected_team_ids: [],
+		is_member: true,
+		last_read: '0000000000.000000',
+		topic: {
+			value: '',
+			creator: '',
+			last_set: 0,
+		},
+		purpose: {
+			value: '',
+			creator: '',
+			last_set: 0,
+		},
+		previous_names: [],
+		priority: 0,
+	},
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => create', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/create.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/conversations.create',
+			{ is_private: false, name: 'test-003' },
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.workflow.json
new file mode 100644
index 0000000000..fcb12a7f89
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/create.workflow.json
@@ -0,0 +1,119 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"channelId": "test-003"
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "C085WNEHP4Y",
+					"name": "test-003",
+					"is_channel": true,
+					"is_group": false,
+					"is_im": false,
+					"is_mpim": false,
+					"is_private": false,
+					"created": 1734325731,
+					"is_archived": false,
+					"is_general": false,
+					"unlinked": 0,
+					"name_normalized": "test-003",
+					"is_shared": false,
+					"is_org_shared": false,
+					"is_pending_ext_shared": false,
+					"pending_shared": [],
+					"context_team_id": "T0364MSFHV2",
+					"updated": 1734325731240,
+					"parent_conversation": null,
+					"creator": "U0362BXQYJW",
+					"is_ext_shared": false,
+					"shared_team_ids": ["T0364MSFHV2"],
+					"pending_connected_team_ids": [],
+					"is_member": true,
+					"last_read": "0000000000.000000",
+					"topic": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"purpose": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"previous_names": [],
+					"priority": 0
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "297d0c4b-32e6-4b08-8818-af5e64762521",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts
new file mode 100644
index 0000000000..9e53394c33
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.test.ts
@@ -0,0 +1,99 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: {
+		id: 'C085WNEHP4Y',
+		name: 'test-003',
+		is_channel: true,
+		is_group: false,
+		is_im: false,
+		is_mpim: false,
+		is_private: false,
+		created: 1734325731,
+		is_archived: false,
+		is_general: false,
+		unlinked: 0,
+		name_normalized: 'test-003',
+		is_shared: false,
+		is_org_shared: false,
+		is_pending_ext_shared: false,
+		pending_shared: [],
+		context_team_id: 'T0364MSFHV2',
+		updated: 1734325731240,
+		parent_conversation: null,
+		creator: 'U0362BXQYJW',
+		is_ext_shared: false,
+		shared_team_ids: ['T0364MSFHV2'],
+		pending_connected_team_ids: [],
+		is_member: true,
+		last_read: '0000000000.000000',
+		topic: {
+			value: '',
+			creator: '',
+			last_set: 0,
+		},
+		purpose: {
+			value: '',
+			creator: '',
+			last_set: 0,
+		},
+		previous_names: [],
+	},
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => get', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/get.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/conversations.info',
+			{},
+			{ channel: 'C085WNEHP4Y' },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.workflow.json
new file mode 100644
index 0000000000..d0a64a9e0f
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/get.workflow.json
@@ -0,0 +1,127 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"operation": "get",
+				"channelId": {
+					"__rl": true,
+					"value": "C085WNEHP4Y",
+					"mode": "list",
+					"cachedResultName": "test-003"
+				},
+				"options": {
+					"includeNumMembers": true
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "C085WNEHP4Y",
+					"name": "test-003",
+					"is_channel": true,
+					"is_group": false,
+					"is_im": false,
+					"is_mpim": false,
+					"is_private": false,
+					"created": 1734325731,
+					"is_archived": false,
+					"is_general": false,
+					"unlinked": 0,
+					"name_normalized": "test-003",
+					"is_shared": false,
+					"is_org_shared": false,
+					"is_pending_ext_shared": false,
+					"pending_shared": [],
+					"context_team_id": "T0364MSFHV2",
+					"updated": 1734325731240,
+					"parent_conversation": null,
+					"creator": "U0362BXQYJW",
+					"is_ext_shared": false,
+					"shared_team_ids": ["T0364MSFHV2"],
+					"pending_connected_team_ids": [],
+					"is_member": true,
+					"last_read": "0000000000.000000",
+					"topic": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"purpose": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"previous_names": []
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "753332eb-25d1-443a-acef-92993e89751a",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts
new file mode 100644
index 0000000000..4b816693ba
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.test.ts
@@ -0,0 +1,162 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channels: [
+		{
+			id: 'C0362BX17TM',
+			name: 'general',
+			is_channel: true,
+			is_group: false,
+			is_im: false,
+			is_mpim: false,
+			is_private: false,
+			created: 1646724991,
+			is_archived: false,
+			is_general: true,
+			unlinked: 0,
+			name_normalized: 'general',
+			is_shared: false,
+			is_org_shared: false,
+			is_pending_ext_shared: false,
+			pending_shared: [],
+			context_team_id: 'T0364MSFHV2',
+			updated: 1734075560630,
+			parent_conversation: null,
+			creator: 'U0362BXQYJW',
+			is_ext_shared: false,
+			shared_team_ids: ['T0364MSFHV2'],
+			pending_connected_team_ids: [],
+			is_member: true,
+			topic: {
+				value: '',
+				creator: '',
+				last_set: 0,
+			},
+			purpose: {
+				value:
+					'This is the one channel that will always include everyone. It’s a great spot for announcements and team-wide conversations.',
+				creator: 'U0362BXQYJW',
+				last_set: 1646724991,
+			},
+			properties: {
+				use_case: 'welcome',
+			},
+			previous_names: [],
+			num_members: 1,
+		},
+		{
+			id: 'C0362BXRZQA',
+			name: 'random',
+			is_channel: true,
+			is_group: false,
+			is_im: false,
+			is_mpim: false,
+			is_private: false,
+			created: 1646724991,
+			is_archived: false,
+			is_general: false,
+			unlinked: 0,
+			name_normalized: 'random',
+			is_shared: false,
+			is_org_shared: false,
+			is_pending_ext_shared: false,
+			pending_shared: [],
+			context_team_id: 'T0364MSFHV2',
+			updated: 1725415586388,
+			parent_conversation: null,
+			creator: 'U0362BXQYJW',
+			is_ext_shared: false,
+			shared_team_ids: ['T0364MSFHV2'],
+			pending_connected_team_ids: [],
+			is_member: true,
+			topic: {
+				value: '',
+				creator: '',
+				last_set: 0,
+			},
+			purpose: {
+				value:
+					'This channel is for... well, everything else. It’s a place for team jokes, spur-of-the-moment ideas, and funny GIFs. Go wild!',
+				creator: 'U0362BXQYJW',
+				last_set: 1646724991,
+			},
+			properties: {
+				tabs: [
+					{
+						id: 'files',
+						label: '',
+						type: 'files',
+					},
+				],
+				tabz: [
+					{
+						type: 'files',
+					},
+				],
+				use_case: 'random',
+			},
+			previous_names: [],
+			num_members: 2,
+		},
+	],
+	response_metadata: {
+		next_cursor: 'dGVhbTpDMDM2MkMyM1RSOA==',
+	},
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => getAll', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/getAll.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/conversations.list',
+			{},
+			{ exclude_archived: true, limit: 2, types: 'public_channel,private_channel,im,mpim' },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.workflow.json
new file mode 100644
index 0000000000..e90a9a9a85
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/getAll.workflow.json
@@ -0,0 +1,181 @@
+{
+	"name": "slack new tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"operation": "getAll",
+				"limit": 2,
+				"filters": {
+					"excludeArchived": true,
+					"types": ["public_channel", "private_channel", "im", "mpim"]
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "C0362BX17TM",
+					"name": "general",
+					"is_channel": true,
+					"is_group": false,
+					"is_im": false,
+					"is_mpim": false,
+					"is_private": false,
+					"created": 1646724991,
+					"is_archived": false,
+					"is_general": true,
+					"unlinked": 0,
+					"name_normalized": "general",
+					"is_shared": false,
+					"is_org_shared": false,
+					"is_pending_ext_shared": false,
+					"pending_shared": [],
+					"context_team_id": "T0364MSFHV2",
+					"updated": 1734075560630,
+					"parent_conversation": null,
+					"creator": "U0362BXQYJW",
+					"is_ext_shared": false,
+					"shared_team_ids": ["T0364MSFHV2"],
+					"pending_connected_team_ids": [],
+					"is_member": true,
+					"topic": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"purpose": {
+						"value": "This is the one channel that will always include everyone. It’s a great spot for announcements and team-wide conversations.",
+						"creator": "U0362BXQYJW",
+						"last_set": 1646724991
+					},
+					"properties": {
+						"use_case": "welcome"
+					},
+					"previous_names": [],
+					"num_members": 1
+				}
+			},
+			{
+				"json": {
+					"id": "C0362BXRZQA",
+					"name": "random",
+					"is_channel": true,
+					"is_group": false,
+					"is_im": false,
+					"is_mpim": false,
+					"is_private": false,
+					"created": 1646724991,
+					"is_archived": false,
+					"is_general": false,
+					"unlinked": 0,
+					"name_normalized": "random",
+					"is_shared": false,
+					"is_org_shared": false,
+					"is_pending_ext_shared": false,
+					"pending_shared": [],
+					"context_team_id": "T0364MSFHV2",
+					"updated": 1725415586388,
+					"parent_conversation": null,
+					"creator": "U0362BXQYJW",
+					"is_ext_shared": false,
+					"shared_team_ids": ["T0364MSFHV2"],
+					"pending_connected_team_ids": [],
+					"is_member": true,
+					"topic": {
+						"value": "",
+						"creator": "",
+						"last_set": 0
+					},
+					"purpose": {
+						"value": "This channel is for... well, everything else. It’s a place for team jokes, spur-of-the-moment ideas, and funny GIFs. Go wild!",
+						"creator": "U0362BXQYJW",
+						"last_set": 1646724991
+					},
+					"properties": {
+						"tabs": [
+							{
+								"id": "files",
+								"label": "",
+								"type": "files"
+							}
+						],
+						"tabz": [
+							{
+								"type": "files"
+							}
+						],
+						"use_case": "random"
+					},
+					"previous_names": [],
+					"num_members": 2
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "f74e9c2c-83f4-4ef8-b436-704e1a27a9ef",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts
new file mode 100644
index 0000000000..99878cb691
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.test.ts
@@ -0,0 +1,219 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = [
+	{
+		user: 'U0362BXQYJW',
+		type: 'message',
+		ts: '1734322597.935429',
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			deleted: false,
+			name: 'blocks-test',
+			updated: 1648028754,
+			app_id: 'A037UTP0Z39',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: 'piR',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'test message\n',
+							},
+							{
+								type: 'text',
+								text: 'Automated with this ',
+								style: {
+									italic: true,
+								},
+							},
+							{
+								type: 'link',
+								url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+								text: 'n8n workflow',
+								style: {
+									italic: true,
+								},
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		user: 'U0362BXQYJW',
+		type: 'message',
+		ts: '1734322341.161179',
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			app_id: 'A037UTP0Z39',
+			name: 'blocks-test',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			deleted: false,
+			updated: 1648028754,
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: '2BN',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'test message\n',
+							},
+							{
+								type: 'text',
+								text: 'Automated with this ',
+								style: {
+									italic: true,
+								},
+							},
+							{
+								type: 'link',
+								url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+								text: 'n8n workflow',
+								style: {
+									italic: true,
+								},
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		user: 'U0362BXQYJW',
+		type: 'message',
+		ts: '1734321960.507649',
+		edited: {
+			user: 'B0382SHFM46',
+			ts: '1734324905.000000',
+		},
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'updated message',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			app_id: 'A037UTP0Z39',
+			name: 'blocks-test',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			deleted: false,
+			updated: 1648028754,
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: 'wR+',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'updated message',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		subtype: 'channel_join',
+		user: 'U0362BXQYJW',
+		text: '<@U0362BXQYJW> has joined the channel',
+		type: 'message',
+		ts: '1734321942.689159',
+	},
+];
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequestAllItems: jest.fn(async function (_: string, method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, channel => history', () => {
+	const workflows = ['nodes/Slack/test/v2/node/channel/history.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequestAllItems).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequestAllItems).toHaveBeenCalledWith(
+			'messages',
+			'GET',
+			'/conversations.history',
+			{},
+			{ channel: 'C08514ZPKB8', inclusive: true },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.workflow.json
new file mode 100644
index 0000000000..2647ee99fe
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/channel/history.workflow.json
@@ -0,0 +1,254 @@
+{
+	"name": "slack new tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "channel",
+				"operation": "history",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"returnAll": true,
+				"filters": {
+					"inclusive": true
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"user": "U0362BXQYJW",
+					"type": "message",
+					"ts": "1734322597.935429",
+					"bot_id": "B0382SHFM46",
+					"app_id": "A037UTP0Z39",
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"team": "T0364MSFHV2",
+					"bot_profile": {
+						"id": "B0382SHFM46",
+						"deleted": false,
+						"name": "blocks-test",
+						"updated": 1648028754,
+						"app_id": "A037UTP0Z39",
+						"icons": {
+							"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+							"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+							"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+						},
+						"team_id": "T0364MSFHV2"
+					},
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "piR",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"user": "U0362BXQYJW",
+					"type": "message",
+					"ts": "1734322341.161179",
+					"bot_id": "B0382SHFM46",
+					"app_id": "A037UTP0Z39",
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"team": "T0364MSFHV2",
+					"bot_profile": {
+						"id": "B0382SHFM46",
+						"app_id": "A037UTP0Z39",
+						"name": "blocks-test",
+						"icons": {
+							"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+							"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+							"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+						},
+						"deleted": false,
+						"updated": 1648028754,
+						"team_id": "T0364MSFHV2"
+					},
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "2BN",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"user": "U0362BXQYJW",
+					"type": "message",
+					"ts": "1734321960.507649",
+					"edited": {
+						"user": "B0382SHFM46",
+						"ts": "1734324905.000000"
+					},
+					"bot_id": "B0382SHFM46",
+					"app_id": "A037UTP0Z39",
+					"text": "updated message",
+					"team": "T0364MSFHV2",
+					"bot_profile": {
+						"id": "B0382SHFM46",
+						"app_id": "A037UTP0Z39",
+						"name": "blocks-test",
+						"icons": {
+							"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+							"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+							"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+						},
+						"deleted": false,
+						"updated": 1648028754,
+						"team_id": "T0364MSFHV2"
+					},
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "wR+",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "updated message"
+										}
+									]
+								}
+							]
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"subtype": "channel_join",
+					"user": "U0362BXQYJW",
+					"text": "<@U0362BXQYJW> has joined the channel",
+					"type": "message",
+					"ts": "1734321942.689159"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "6b7102c7-d3c5-4b88-b67d-4ee6ae51b581",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts
new file mode 100644
index 0000000000..154b137bfc
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.test.ts
@@ -0,0 +1,83 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = { files: { test: 'OK' } };
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+			if (method === 'GET') {
+				return { upload_url: 'https://slack.com/api/files.upload' };
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, file => upload', () => {
+	const workflows = ['nodes/Slack/test/v2/node/file/upload.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(3);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/files.getUploadURLExternal',
+			{},
+			{ filename: 'test _name.txt', length: 25 },
+		);
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'https://slack.com/api/files.upload',
+			{},
+			{},
+			{ 'Content-Type': 'multipart/form-data' },
+			expect.objectContaining({
+				formData: expect.any(Object),
+			}),
+		);
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/files.completeUploadExternal',
+			{
+				files: [{ id: undefined, title: 'Test Title' }],
+				initial_comment: 'test inline',
+				thread_ts: '1734322671.726339',
+			},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.workflow.json
new file mode 100644
index 0000000000..b22096a310
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/file/upload.workflow.json
@@ -0,0 +1,147 @@
+{
+	"name": "slack new tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [440, 360]
+		},
+		{
+			"parameters": {
+				"resource": "file",
+				"options": {
+					"fileName": "test _name.txt",
+					"initialComment": "test inline",
+					"threadTs": "1734322671.726339",
+					"title": "Test Title"
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1100, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1320, 360]
+		},
+		{
+			"parameters": {
+				"operation": "toJson",
+				"options": {}
+			},
+			"id": "76e317ed-7f2b-46b9-8c9b-f91a0b5d0fdd",
+			"name": "Convert to File",
+			"type": "n8n-nodes-base.convertToFile",
+			"typeVersion": 1.1,
+			"position": [860, 360]
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "a60db675-c351-49fc-bbad-555a70ee5d6d",
+							"name": "f1",
+							"value": "123",
+							"type": "string"
+						},
+						{
+							"id": "b96e7f11-a0ea-4a7f-b803-5ab3238af054",
+							"name": "f2",
+							"value": "456",
+							"type": "string"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "773453a7-2bdc-4d50-a3e6-be5e1b86d820",
+			"name": "Edit Fields",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [660, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"test": "OK"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Convert to File": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Convert to File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "3a19732a-4416-487c-9f76-1291c610b5d1",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts
new file mode 100644
index 0000000000..c18f17ba54
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.test.ts
@@ -0,0 +1,63 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: 'C08514ZPKB8',
+	message_timestamp: '1734322671.726339',
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => delete', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/delete.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/chat.delete',
+			{ channel: 'C08514ZPKB8', ts: '1734322671.726339' },
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.workflow.json
new file mode 100644
index 0000000000..19687b7ebc
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/delete.workflow.json
@@ -0,0 +1,92 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "delete",
+				"select": "channel",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"timestamp": 1734322671.726339
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"channel": "C08514ZPKB8",
+					"message_timestamp": "1734322671.726339"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "cf10cd01-6650-48ca-b4a2-ec07be9d026c",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts
new file mode 100644
index 0000000000..78735d0fc6
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.test.ts
@@ -0,0 +1,63 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	permalink: 'https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322671726339',
+	channel: 'C08514ZPKB8',
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'GET') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => getPermalink', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/getPermalink.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/chat.getPermalink',
+			{},
+			{ channel: 'C08514ZPKB8', message_ts: '1734322671.726339' },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.workflow.json
new file mode 100644
index 0000000000..812e8be6cd
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/getPermalink.workflow.json
@@ -0,0 +1,91 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "getPermalink",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"timestamp": 1734322671.726339
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"permalink": "https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322671726339",
+					"channel": "C08514ZPKB8"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "64c251c3-afe5-4636-a3fc-de769f8a9ea0",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts
new file mode 100644
index 0000000000..2cfff4b6d0
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.test.ts
@@ -0,0 +1,111 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: 'C08514ZPKB8',
+	message: {
+		user: 'U0362BXQYJW',
+		type: 'message',
+		ts: '1734322671.726339',
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'test message',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			app_id: 'A037UTP0Z39',
+			name: 'blocks-test',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			deleted: false,
+			updated: 1648028754,
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: 't02Ox',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'test message',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	message_timestamp: '1734322671.726339',
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => post', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/post.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/chat.postMessage',
+			{
+				channel: 'C08514ZPKB8',
+				icon_emoji: '😁',
+				includeLinkToWorkflow: false,
+				link_names: true,
+				mrkdwn: true,
+				text: 'test message',
+				unfurl_links: true,
+				unfurl_media: true,
+			},
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/post.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.workflow.json
new file mode 100644
index 0000000000..0f3d797f8a
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/post.workflow.json
@@ -0,0 +1,143 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"select": "channel",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"text": "test message",
+				"otherOptions": {
+					"includeLinkToWorkflow": false,
+					"botProfile": {
+						"imageValues": {
+							"profilePhotoType": "emoji",
+							"icon_emoji": "😁"
+						}
+					},
+					"link_names": true,
+					"mrkdwn": true,
+					"unfurl_links": true,
+					"unfurl_media": true
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"channel": "C08514ZPKB8",
+					"message": {
+						"user": "U0362BXQYJW",
+						"type": "message",
+						"ts": "1734322671.726339",
+						"bot_id": "B0382SHFM46",
+						"app_id": "A037UTP0Z39",
+						"text": "test message",
+						"team": "T0364MSFHV2",
+						"bot_profile": {
+							"id": "B0382SHFM46",
+							"app_id": "A037UTP0Z39",
+							"name": "blocks-test",
+							"icons": {
+								"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+								"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+								"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+							},
+							"deleted": false,
+							"updated": 1648028754,
+							"team_id": "T0364MSFHV2"
+						},
+						"blocks": [
+							{
+								"type": "rich_text",
+								"block_id": "t02Ox",
+								"elements": [
+									{
+										"type": "rich_text_section",
+										"elements": [
+											{
+												"type": "text",
+												"text": "test message"
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					"message_timestamp": "1734322671.726339"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "2bc19572-58f0-4cb9-91c3-78b4b3e0cd95",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts
new file mode 100644
index 0000000000..03179ebede
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.test.ts
@@ -0,0 +1,255 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	query: 'test in:test-002',
+	messages: {
+		total: 3,
+		pagination: {
+			total_count: 3,
+			page: 1,
+			per_page: 2,
+			page_count: 1,
+			first: 1,
+			last: 3,
+		},
+		paging: {
+			count: 2,
+			total: 3,
+			page: 1,
+			pages: 1,
+		},
+		matches: [
+			{
+				iid: 'a60ff37e-5653-4c53-8a44-783ea4315476',
+				team: 'T0364MSFHV2',
+				score: 0,
+				channel: {
+					id: 'C08514ZPKB8',
+					is_channel: true,
+					is_group: false,
+					is_im: false,
+					is_mpim: false,
+					is_shared: false,
+					is_org_shared: false,
+					is_ext_shared: false,
+					is_private: false,
+					name: 'test-002',
+					pending_shared: [],
+					is_pending_ext_shared: false,
+				},
+				type: 'message',
+				user: 'U0362BXQYJW',
+				username: 'michael.k',
+				ts: '1734322597.935429',
+				blocks: [
+					{
+						type: 'rich_text',
+						block_id: '+bc',
+						elements: [
+							{
+								type: 'rich_text_section',
+								elements: [
+									{
+										type: 'text',
+										text: 'test message\n',
+									},
+									{
+										type: 'text',
+										text: 'Automated with this ',
+										style: {
+											italic: true,
+										},
+									},
+									{
+										type: 'link',
+										url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+										text: 'n8n workflow',
+										style: {
+											italic: true,
+										},
+									},
+								],
+							},
+						],
+					},
+				],
+				text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+				permalink: 'https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322597935429',
+				no_reactions: true,
+			},
+			{
+				iid: '96ee0d2e-1a7d-40bf-b4b2-71ee15f004a8',
+				team: 'T0364MSFHV2',
+				score: 0,
+				channel: {
+					id: 'C08514ZPKB8',
+					is_channel: true,
+					is_group: false,
+					is_im: false,
+					is_mpim: false,
+					is_shared: false,
+					is_org_shared: false,
+					is_ext_shared: false,
+					is_private: false,
+					name: 'test-002',
+					pending_shared: [],
+					is_pending_ext_shared: false,
+				},
+				type: 'message',
+				user: 'U0362BXQYJW',
+				username: 'michael.k',
+				ts: '1734322341.161179',
+				blocks: [
+					{
+						type: 'rich_text',
+						block_id: 'FGAKN',
+						elements: [
+							{
+								type: 'rich_text_section',
+								elements: [
+									{
+										type: 'text',
+										text: 'test message\n',
+									},
+									{
+										type: 'text',
+										text: 'Automated with this ',
+										style: {
+											italic: true,
+										},
+									},
+									{
+										type: 'link',
+										url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+										text: 'n8n workflow',
+										style: {
+											italic: true,
+										},
+									},
+								],
+							},
+						],
+					},
+				],
+				text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+				permalink: 'https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322341161179',
+				no_reactions: true,
+			},
+			{
+				iid: '72f79902-65f7-4bf3-b64b-3fd0b0c3746c',
+				team: 'T0364MSFHV2',
+				score: 0,
+				channel: {
+					id: 'C08514ZPKB8',
+					is_channel: true,
+					is_group: false,
+					is_im: false,
+					is_mpim: false,
+					is_shared: false,
+					is_org_shared: false,
+					is_ext_shared: false,
+					is_private: false,
+					name: 'test-002',
+					pending_shared: [],
+					is_pending_ext_shared: false,
+				},
+				type: 'message',
+				user: 'U0362BXQYJW',
+				username: 'michael.k',
+				ts: '1734321960.507649',
+				blocks: [
+					{
+						type: 'rich_text',
+						block_id: 'fnjm',
+						elements: [
+							{
+								type: 'rich_text_section',
+								elements: [
+									{
+										type: 'text',
+										text: 'test message\n',
+									},
+									{
+										type: 'text',
+										text: 'Automated with this ',
+										style: {
+											italic: true,
+										},
+									},
+									{
+										type: 'link',
+										url: 'http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd',
+										text: 'n8n workflow',
+										style: {
+											italic: true,
+										},
+									},
+								],
+							},
+						],
+					},
+				],
+				text: 'test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_',
+				permalink: 'https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734321960507649',
+				no_reactions: true,
+			},
+		],
+	},
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => search', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/search.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/search.messages',
+			{},
+			{ count: 2, query: 'test in:test-002', sort: 'timestamp', sort_dir: 'desc' },
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/search.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.workflow.json
new file mode 100644
index 0000000000..56d63bc20c
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/search.workflow.json
@@ -0,0 +1,262 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "search",
+				"query": "test",
+				"limit": 2,
+				"options": {
+					"searchChannel": ["test-002"]
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"iid": "a60ff37e-5653-4c53-8a44-783ea4315476",
+					"team": "T0364MSFHV2",
+					"score": 0,
+					"channel": {
+						"id": "C08514ZPKB8",
+						"is_channel": true,
+						"is_group": false,
+						"is_im": false,
+						"is_mpim": false,
+						"is_shared": false,
+						"is_org_shared": false,
+						"is_ext_shared": false,
+						"is_private": false,
+						"name": "test-002",
+						"pending_shared": [],
+						"is_pending_ext_shared": false
+					},
+					"type": "message",
+					"user": "U0362BXQYJW",
+					"username": "michael.k",
+					"ts": "1734322597.935429",
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "+bc",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					],
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"permalink": "https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322597935429",
+					"no_reactions": true
+				}
+			},
+			{
+				"json": {
+					"iid": "96ee0d2e-1a7d-40bf-b4b2-71ee15f004a8",
+					"team": "T0364MSFHV2",
+					"score": 0,
+					"channel": {
+						"id": "C08514ZPKB8",
+						"is_channel": true,
+						"is_group": false,
+						"is_im": false,
+						"is_mpim": false,
+						"is_shared": false,
+						"is_org_shared": false,
+						"is_ext_shared": false,
+						"is_private": false,
+						"name": "test-002",
+						"pending_shared": [],
+						"is_pending_ext_shared": false
+					},
+					"type": "message",
+					"user": "U0362BXQYJW",
+					"username": "michael.k",
+					"ts": "1734322341.161179",
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "FGAKN",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					],
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"permalink": "https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734322341161179",
+					"no_reactions": true
+				}
+			},
+			{
+				"json": {
+					"iid": "72f79902-65f7-4bf3-b64b-3fd0b0c3746c",
+					"team": "T0364MSFHV2",
+					"score": 0,
+					"channel": {
+						"id": "C08514ZPKB8",
+						"is_channel": true,
+						"is_group": false,
+						"is_im": false,
+						"is_mpim": false,
+						"is_shared": false,
+						"is_org_shared": false,
+						"is_ext_shared": false,
+						"is_private": false,
+						"name": "test-002",
+						"pending_shared": [],
+						"is_pending_ext_shared": false
+					},
+					"type": "message",
+					"user": "U0362BXQYJW",
+					"username": "michael.k",
+					"ts": "1734321960.507649",
+					"blocks": [
+						{
+							"type": "rich_text",
+							"block_id": "fnjm",
+							"elements": [
+								{
+									"type": "rich_text_section",
+									"elements": [
+										{
+											"type": "text",
+											"text": "test message\n"
+										},
+										{
+											"type": "text",
+											"text": "Automated with this ",
+											"style": {
+												"italic": true
+											}
+										},
+										{
+											"type": "link",
+											"url": "http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd",
+											"text": "n8n workflow",
+											"style": {
+												"italic": true
+											}
+										}
+									]
+								}
+							]
+						}
+					],
+					"text": "test message\n_Automated with this <http://localhost:5678/workflow/qJdEfiBgYLdfYOTs?utm_source=n8n-internal&amp;utm_medium=powered_by&amp;utm_campaign=n8n-nodes-base.slack_be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd|n8n workflow>_",
+					"permalink": "https://myspace-qhg7381.slack.com/archives/C08514ZPKB8/p1734321960507649",
+					"no_reactions": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "0ea58133-0522-40ae-ab51-ec3c1eced057",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts
new file mode 100644
index 0000000000..acf00fbd95
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.test.ts
@@ -0,0 +1,112 @@
+import type { IHttpRequestMethods, INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = {
+	ok: true,
+	channel: 'C08514ZPKB8',
+	text: 'updated message',
+	message: {
+		user: 'U0362BXQYJW',
+		type: 'message',
+		edited: {
+			user: 'B0382SHFM46',
+			ts: '1734324905.000000',
+		},
+		bot_id: 'B0382SHFM46',
+		app_id: 'A037UTP0Z39',
+		text: 'updated message',
+		team: 'T0364MSFHV2',
+		bot_profile: {
+			id: 'B0382SHFM46',
+			app_id: 'A037UTP0Z39',
+			name: 'blocks-test',
+			icons: {
+				image_36: 'https://a.slack-edge.com/80588/img/plugins/app/bot_36.png',
+				image_48: 'https://a.slack-edge.com/80588/img/plugins/app/bot_48.png',
+				image_72: 'https://a.slack-edge.com/80588/img/plugins/app/service_72.png',
+			},
+			deleted: false,
+			updated: 1648028754,
+			team_id: 'T0364MSFHV2',
+		},
+		blocks: [
+			{
+				type: 'rich_text',
+				block_id: 'Akc',
+				elements: [
+					{
+						type: 'rich_text_section',
+						elements: [
+							{
+								type: 'text',
+								text: 'updated message',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	message_timestamp: '1734321960.507649',
+};
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function (method: IHttpRequestMethods) {
+			if (method === 'POST') {
+				return API_RESPONSE;
+			}
+		}),
+	};
+});
+
+describe('Test SlackV2, message => update', () => {
+	const workflows = ['nodes/Slack/test/v2/node/message/update.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/chat.update',
+			{
+				channel: 'C08514ZPKB8',
+				link_names: true,
+				parse: 'none',
+				text: 'updated message',
+				ts: '1734321960.507649',
+			},
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/message/update.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.workflow.json
new file mode 100644
index 0000000000..9a9472fdce
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/message/update.workflow.json
@@ -0,0 +1,142 @@
+{
+	"name": "slack tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"operation": "update",
+				"channelId": {
+					"__rl": true,
+					"value": "C08514ZPKB8",
+					"mode": "list",
+					"cachedResultName": "test-002"
+				},
+				"ts": 1734321960.507649,
+				"text": "updated message",
+				"updateFields": {
+					"link_names": true,
+					"parse": "none"
+				},
+				"otherOptions": {
+					"includeLinkToWorkflow": false
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"channel": "C08514ZPKB8",
+					"text": "updated message",
+					"message": {
+						"user": "U0362BXQYJW",
+						"type": "message",
+						"edited": {
+							"user": "B0382SHFM46",
+							"ts": "1734324905.000000"
+						},
+						"bot_id": "B0382SHFM46",
+						"app_id": "A037UTP0Z39",
+						"text": "updated message",
+						"team": "T0364MSFHV2",
+						"bot_profile": {
+							"id": "B0382SHFM46",
+							"app_id": "A037UTP0Z39",
+							"name": "blocks-test",
+							"icons": {
+								"image_36": "https://a.slack-edge.com/80588/img/plugins/app/bot_36.png",
+								"image_48": "https://a.slack-edge.com/80588/img/plugins/app/bot_48.png",
+								"image_72": "https://a.slack-edge.com/80588/img/plugins/app/service_72.png"
+							},
+							"deleted": false,
+							"updated": 1648028754,
+							"team_id": "T0364MSFHV2"
+						},
+						"blocks": [
+							{
+								"type": "rich_text",
+								"block_id": "Akc",
+								"elements": [
+									{
+										"type": "rich_text_section",
+										"elements": [
+											{
+												"type": "text",
+												"text": "updated message"
+											}
+										]
+									}
+								]
+							}
+						]
+					},
+					"message_timestamp": "1734321960.507649"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "27133240-8ff6-4115-b330-9cbc9aa95b25",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts
new file mode 100644
index 0000000000..62577de3b9
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.test.ts
@@ -0,0 +1,71 @@
+import type { INodeTypes, WorkflowTestData } from 'n8n-workflow';
+import nock from 'nock';
+
+import { getResultNodeData, setup, workflowToTests } from '@test/nodes/Helpers';
+
+import { executeWorkflow } from '../../../../../../test/nodes/ExecuteWorkflow';
+import * as genericFunctions from '../../../../V2/GenericFunctions';
+
+const API_RESPONSE = { profile: { test: 'OK' } };
+
+jest.mock('../../../../V2/GenericFunctions', () => {
+	const originalModule = jest.requireActual('../../../../V2/GenericFunctions');
+	return {
+		...originalModule,
+		slackApiRequest: jest.fn(async function () {
+			return API_RESPONSE;
+		}),
+	};
+});
+
+describe('Test SlackV2, user => updateProfile', () => {
+	const workflows = ['nodes/Slack/test/v2/node/user/updateProfile.workflow.json'];
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+	});
+
+	afterAll(() => {
+		nock.restore();
+		jest.unmock('../../../../V2/GenericFunctions');
+	});
+
+	const nodeTypes = setup(tests);
+
+	const testNode = async (testData: WorkflowTestData, types: INodeTypes) => {
+		const { result } = await executeWorkflow(testData, types);
+
+		const resultNodeData = getResultNodeData(result, testData);
+
+		resultNodeData.forEach(({ nodeName, resultData }) => {
+			return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+		});
+
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledTimes(1);
+		expect(genericFunctions.slackApiRequest).toHaveBeenCalledWith(
+			'POST',
+			'/users.profile.set',
+			{
+				profile: {
+					customFieldUi: {
+						customFieldValues: [{ alt: '', id: 'Xf05SGHVUDKM', value: 'TEST title' }],
+					},
+					email: 'some@email.com',
+					fields: { Xf05SGHVUDKM: { alt: '', value: 'TEST title' } },
+					first_name: 'first',
+					last_name: 'last',
+					status_emoji: '👶',
+					status_expiration: 1734670800,
+					status_text: 'test status',
+				},
+				user: 'id-new',
+			},
+			{},
+		);
+	};
+
+	for (const testData of tests) {
+		test(testData.description, async () => await testNode(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.workflow.json b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.workflow.json
new file mode 100644
index 0000000000..d835db0b71
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/test/v2/node/user/updateProfile.workflow.json
@@ -0,0 +1,106 @@
+{
+	"name": "slack new tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e679c883-1839-47dc-9511-8f7dc370e6b0",
+			"name": "When clicking ‘Test workflow’",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"resource": "user",
+				"operation": "updateProfile",
+				"options": {
+					"customFieldUi": {
+						"customFieldValues": [
+							{
+								"id": "Xf05SGHVUDKM",
+								"value": "TEST title"
+							}
+						]
+					},
+					"email": "some@email.com",
+					"first_name": "first",
+					"last_name": "last",
+					"status": {
+						"set_status": [
+							{
+								"status_emoji": "👶",
+								"status_expiration": "2024-12-20T00:00:00",
+								"status_text": "test status"
+							}
+						]
+					},
+					"user": "id-new"
+				}
+			},
+			"id": "2e1937a6-4c8f-4cd1-ae42-11b2bd12cc4c",
+			"name": "Slack",
+			"type": "n8n-nodes-base.slack",
+			"typeVersion": 2.3,
+			"position": [1040, 360],
+			"webhookId": "04c5e584-45f4-48d0-bcd2-0ecacecb0f53",
+			"credentials": {
+				"slackApi": {
+					"id": "Bg0bWXf8apAimCqJ",
+					"name": "Slack account 2"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"id": "06652908-6b8e-443a-9508-ab229b011b73",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1260, 360]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"test": "OK"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Slack",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Slack": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "297af4ef-eca5-493d-8a1f-c735fcb805f2",
+	"meta": {
+		"templateCredsSetupCompleted": true,
+		"instanceId": "be251a83c052a9862eeac953816fbb1464f89dfbf79d7ac490a8e336a8cc8bfd"
+	},
+	"id": "qJdEfiBgYLdfYOTs",
+	"tags": []
+}
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/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index 83406e1b51..475d27fff0 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -6,12 +6,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import snowflake from 'snowflake-sdk';
-import { connect, destroy, execute } from './GenericFunctions';
 
 import { getResolvables } from '@utils/utilities';
 
+import { connect, destroy, execute } from './GenericFunctions';
+
 export class Snowflake implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Snowflake',
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/node/alert.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/node/alert.test.ts
index 5857e14cd4..1fc0b92831 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/node/alert.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/node/alert.test.ts
@@ -1,5 +1,6 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
 import * as alert from '../../../v2/actions/alert';
 import * as transport from '../../../v2/transport';
 
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/node/report.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/node/report.test.ts
index 118ca8dd60..d63056ba89 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/node/report.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/node/report.test.ts
@@ -1,8 +1,9 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
+import { SPLUNK } from '../../../v1/types';
 import * as report from '../../../v2/actions/report';
 import * as transport from '../../../v2/transport';
-import { SPLUNK } from '../../../v1/types';
 
 jest.mock('../../../v2/transport', () => ({
 	splunkApiJsonRequest: jest.fn(),
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/node/search.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/node/search.test.ts
index d8e02ec86b..3cc4a40cd6 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/node/search.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/node/search.test.ts
@@ -1,5 +1,6 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
 import * as search from '../../../v2/actions/search';
 import * as transport from '../../../v2/transport';
 
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/node/user.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/node/user.test.ts
index c33a38dc56..b4e930a608 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/node/user.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/node/user.test.ts
@@ -1,8 +1,9 @@
 import { mock } from 'jest-mock-extended';
 import type { IExecuteFunctions } from 'n8n-workflow';
+
+import { SPLUNK } from '../../../v1/types';
 import * as user from '../../../v2/actions/user';
 import * as transport from '../../../v2/transport';
-import { SPLUNK } from '../../../v1/types';
 
 jest.mock('../../../v2/transport', () => ({
 	splunkApiJsonRequest: jest.fn(),
diff --git a/packages/nodes-base/nodes/Splunk/test/v2/utils.test.ts b/packages/nodes-base/nodes/Splunk/test/v2/utils.test.ts
index 425c52daab..2fdaafdd99 100644
--- a/packages/nodes-base/nodes/Splunk/test/v2/utils.test.ts
+++ b/packages/nodes-base/nodes/Splunk/test/v2/utils.test.ts
@@ -1,5 +1,7 @@
 import { mock } from 'jest-mock-extended';
 import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
+
+import { SPLUNK } from '../../v1/types';
 import {
 	formatEntry,
 	extractErrorDescription,
@@ -9,7 +11,6 @@ import {
 	setReturnAllOrLimit,
 	parseXml,
 } from '../../v2/helpers/utils';
-import { SPLUNK } from '../../v1/types';
 
 describe('Splunk, formatEntry', () => {
 	test('should format the entry correctly when doNotFormatContent is false', () => {
diff --git a/packages/nodes-base/nodes/Splunk/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Splunk/v1/GenericFunctions.ts
index c6594e1403..a7ca5f9abe 100644
--- a/packages/nodes-base/nodes/Splunk/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Splunk/v1/GenericFunctions.ts
@@ -7,7 +7,6 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
-
 import { parseString } from 'xml2js';
 
 import {
diff --git a/packages/nodes-base/nodes/Splunk/v1/SplunkV1.node.ts b/packages/nodes-base/nodes/Splunk/v1/SplunkV1.node.ts
index b6d793fc63..d9e790809a 100644
--- a/packages/nodes-base/nodes/Splunk/v1/SplunkV1.node.ts
+++ b/packages/nodes-base/nodes/Splunk/v1/SplunkV1.node.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,19 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import set from 'lodash/set';
-import { oldVersionNotice } from '../../../utils/descriptions';
-import {
-	formatFeed,
-	formatResults,
-	formatSearch,
-	getId,
-	populate,
-	setCount,
-	splunkApiRequest,
-	toUnixEpoch,
-} from './GenericFunctions';
-
 import {
 	firedAlertOperations,
 	searchConfigurationFields,
@@ -33,8 +21,18 @@ import {
 	userFields,
 	userOperations,
 } from './descriptions';
-
+import {
+	formatFeed,
+	formatResults,
+	formatSearch,
+	getId,
+	populate,
+	setCount,
+	splunkApiRequest,
+	toUnixEpoch,
+} from './GenericFunctions';
 import type { SplunkFeedResponse } from './types';
+import { oldVersionNotice } from '../../../utils/descriptions';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Splunk',
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/alert/getMetrics.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/alert/getMetrics.operation.ts
index aef07773c3..bb22daf006 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/alert/getMetrics.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/alert/getMetrics.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { splunkApiJsonRequest } from '../../transport';
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/alert/getReport.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/alert/getReport.operation.ts
index b76a3506d5..d7a4390f76 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/alert/getReport.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/alert/getReport.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { splunkApiJsonRequest } from '../../transport';
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/alert/index.ts b/packages/nodes-base/nodes/Splunk/v2/actions/alert/index.ts
index 8d3a1f3342..74458ea544 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/alert/index.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/alert/index.ts
@@ -1,7 +1,7 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import * as getReport from './getReport.operation';
 import * as getMetrics from './getMetrics.operation';
+import * as getReport from './getReport.operation';
 
 export { getReport, getMetrics };
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/create.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/create.operation.ts
index 1f3b59e273..bf7bb84798 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/create.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/create.operation.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest, splunkApiRequest } from '../../transport';
 import { searchJobRLC } from '../../helpers/descriptions';
 import { formatFeed } from '../../helpers/utils';
+import { splunkApiJsonRequest, splunkApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	searchJobRLC,
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/deleteReport.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/deleteReport.operation.ts
index 41aad443d1..86ca26ae11 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/deleteReport.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/deleteReport.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiRequest } from '../../transport';
 import { reportRLC } from '../../helpers/descriptions';
+import { splunkApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [reportRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/get.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/get.operation.ts
index 32972c08f3..ba71140e80 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/get.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/get.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
 import { reportRLC } from '../../helpers/descriptions';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [reportRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
index c667d9ad93..0c3a86837f 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/report/getAll.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { populate, setReturnAllOrLimit } from '../../helpers/utils';
 import { splunkApiJsonRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/router.ts b/packages/nodes-base/nodes/Splunk/v2/actions/router.ts
index 3b0d3965e8..36e06ccc00 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/router.ts
@@ -1,14 +1,13 @@
+import set from 'lodash/set';
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import set from 'lodash/set';
 import * as alert from './alert';
+import type { SplunkType } from './node.type';
 import * as report from './report';
 import * as search from './search';
 import * as user from './user';
 
-import type { SplunkType } from './node.type';
-
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/create.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/create.operation.ts
index b617b162aa..5191e106ee 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/create.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/create.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { populate, toUnixEpoch } from '../../helpers/utils';
 import { splunkApiJsonRequest, splunkApiRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/deleteJob.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/deleteJob.operation.ts
index 1bb463a515..7f00a4e55b 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/deleteJob.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/deleteJob.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiRequest } from '../../transport';
 import { searchJobRLC } from '../../helpers/descriptions';
+import { splunkApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [searchJobRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/get.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/get.operation.ts
index 1df3721de1..0175d8a7b7 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/get.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/get.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
 import { searchJobRLC } from '../../helpers/descriptions';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [searchJobRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/getAll.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/getAll.operation.ts
index 5ea3bb3685..3cb1a7243b 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/getAll.operation.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
 import { populate, setReturnAllOrLimit } from '../../helpers/utils';
 import { splunkApiJsonRequest } from '../../transport';
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
index 246cce383e..f79ab5aebd 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/search/getResult.operation.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
-import { populate, setReturnAllOrLimit } from '../../helpers/utils';
 import { searchJobRLC } from '../../helpers/descriptions';
+import { populate, setReturnAllOrLimit } from '../../helpers/utils';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	searchJobRLC,
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/create.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/create.operation.ts
index 950391e611..3d232c4d4f 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/create.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/create.operation.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
+import type { SplunkFeedResponse } from '../../helpers/interfaces';
 import { formatFeed, populate } from '../../helpers/utils';
 import { splunkApiRequest } from '../../transport';
-import type { SplunkFeedResponse } from '../../helpers/interfaces';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/deleteUser.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/deleteUser.operation.ts
index e3d9a05605..bf68be0366 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/deleteUser.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/deleteUser.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiRequest } from '../../transport';
 import { userRLC } from '../../helpers/descriptions';
+import { splunkApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [userRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/get.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/get.operation.ts
index 46ffad1e9d..d0430fd934 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/get.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/get.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
 import { userRLC } from '../../helpers/descriptions';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [userRLC];
 
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/getAll.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/getAll.operation.ts
index 822a40f269..57ebe3fe7f 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/getAll.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/getAll.operation.ts
@@ -1,7 +1,8 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
-import { splunkApiJsonRequest } from '../../transport';
 import { setReturnAllOrLimit } from '../../helpers/utils';
+import { splunkApiJsonRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/Splunk/v2/actions/user/update.operation.ts b/packages/nodes-base/nodes/Splunk/v2/actions/user/update.operation.ts
index e680a8214e..8ecf0ce619 100644
--- a/packages/nodes-base/nodes/Splunk/v2/actions/user/update.operation.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/actions/user/update.operation.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties, IExecuteFunctions, IDataObject } from 'n8n-workflow';
+
 import { updateDisplayOptions } from '../../../../../utils/utilities';
+import { userRLC } from '../../helpers/descriptions';
 import { formatFeed, populate } from '../../helpers/utils';
 import { splunkApiRequest } from '../../transport';
-import { userRLC } from '../../helpers/descriptions';
 
 const properties: INodeProperties[] = [
 	userRLC,
diff --git a/packages/nodes-base/nodes/Splunk/v2/helpers/utils.ts b/packages/nodes-base/nodes/Splunk/v2/helpers/utils.ts
index 7515ba509f..3512c38776 100644
--- a/packages/nodes-base/nodes/Splunk/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/helpers/utils.ts
@@ -1,9 +1,8 @@
 import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
-
 import { parseString } from 'xml2js';
 
-import { SPLUNK } from '../../v1/types';
 import type { SplunkError, SplunkFeedResponse } from './interfaces';
+import { SPLUNK } from '../../v1/types';
 
 function compactEntryContent(splunkObject: any): any {
 	if (typeof splunkObject !== 'object') {
diff --git a/packages/nodes-base/nodes/Splunk/v2/methods/listSearch.ts b/packages/nodes-base/nodes/Splunk/v2/methods/listSearch.ts
index 087163cb72..758e54c5c9 100644
--- a/packages/nodes-base/nodes/Splunk/v2/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/methods/listSearch.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { splunkApiJsonRequest } from '../transport';
 
 export async function searchReports(
diff --git a/packages/nodes-base/nodes/Splunk/v2/transport/index.ts b/packages/nodes-base/nodes/Splunk/v2/transport/index.ts
index ee6fd8ea4f..665121eeb5 100644
--- a/packages/nodes-base/nodes/Splunk/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Splunk/v2/transport/index.ts
@@ -19,9 +19,8 @@ export async function splunkApiRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ): Promise<any> {
-	const { baseUrl, allowUnauthorizedCerts } = (await this.getCredentials(
-		'splunkApi',
-	)) as SplunkCredentials;
+	const { baseUrl, allowUnauthorizedCerts } =
+		await this.getCredentials<SplunkCredentials>('splunkApi');
 
 	const options: IRequestOptions = {
 		headers: {
@@ -95,9 +94,8 @@ export async function splunkApiJsonRequest(
 	body: IDataObject = {},
 	qs: IDataObject = {},
 ) {
-	const { baseUrl, allowUnauthorizedCerts } = (await this.getCredentials(
-		'splunkApi',
-	)) as SplunkCredentials;
+	const { baseUrl, allowUnauthorizedCerts } =
+		await this.getCredentials<SplunkCredentials>('splunkApi');
 
 	qs.output_mode = 'json';
 
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.ts b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
index 9e20cd87cd..cb2ad23db5 100644
--- a/packages/nodes-base/nodes/Spontit/Spontit.node.ts
+++ b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,9 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { spontitApiRequest } from './GenericFunctions';
-
 import { pushFields, pushOperations } from './PushDescription';
 
 export class Spontit implements INodeType {
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index 6b61655ee3..3fe3bcf948 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -1,15 +1,14 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	JsonObject,
 	IHttpRequestMethods,
-	IRequestOptions,
+	IHttpRequestOptions,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 /**
  * Make an API request to Spotify
  *
@@ -22,7 +21,7 @@ export async function spotifyApiRequest(
 	query?: IDataObject,
 	uri?: string,
 ): Promise<any> {
-	const options: IRequestOptions = {
+	const options: IHttpRequestOptions = {
 		method,
 		headers: {
 			'User-Agent': 'n8n',
@@ -30,7 +29,7 @@ export async function spotifyApiRequest(
 			Accept: ' application/json',
 		},
 		qs: query,
-		uri: uri || `https://api.spotify.com/v1${endpoint}`,
+		url: uri ?? `https://api.spotify.com/v1${endpoint}`,
 		json: true,
 	};
 
@@ -38,7 +37,7 @@ export async function spotifyApiRequest(
 		options.body = body;
 	}
 	try {
-		return await this.helpers.requestOAuth2.call(this, 'spotifyOAuth2Api', options);
+		return await this.helpers.httpRequestWithAuthentication.call(this, 'spotifyOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index b951831c3b..772a6a7c69 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -8,10 +8,10 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { spotifyApiRequest, spotifyApiRequestAllItems } from './GenericFunctions';
-
 import { isoCountryCodes } from '@utils/ISOCountryCodes';
 
+import { spotifyApiRequest, spotifyApiRequestAllItems } from './GenericFunctions';
+
 export class Spotify implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Spotify',
@@ -1308,6 +1308,10 @@ export class Spotify implements INodeType {
 					);
 				}
 
+				// Remove null values from the response
+				if (operation === 'getUserPlaylists') {
+					responseData = responseData.filter((item: IDataObject) => item !== null);
+				}
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
diff --git a/packages/nodes-base/nodes/Spotify/__tests__/GenericFunctions.test.ts b/packages/nodes-base/nodes/Spotify/__tests__/GenericFunctions.test.ts
new file mode 100644
index 0000000000..e61b4a10a2
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__tests__/GenericFunctions.test.ts
@@ -0,0 +1,62 @@
+import type { IExecuteFunctions, IHookFunctions } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
+
+import { spotifyApiRequest } from '../GenericFunctions';
+
+describe('Spotify -> GenericFunctions', () => {
+	let mockThis: IHookFunctions | IExecuteFunctions;
+
+	beforeEach(() => {
+		mockThis = {
+			helpers: {
+				httpRequestWithAuthentication: jest.fn(),
+			},
+			getNode: jest.fn().mockReturnValue({}),
+		} as unknown as IHookFunctions | IExecuteFunctions;
+	});
+
+	it('should make a request with the correct options', async () => {
+		const method = 'GET';
+		const endpoint = '/me';
+		const body = {};
+		const query = { limit: 10 };
+		const response = { data: 'test' };
+
+		(mockThis.helpers.httpRequestWithAuthentication as jest.Mock).mockResolvedValue(response);
+
+		const result = await spotifyApiRequest.call(mockThis, method, endpoint, body, query);
+
+		expect(mockThis.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'spotifyOAuth2Api',
+			{
+				method,
+				headers: {
+					'User-Agent': 'n8n',
+					'Content-Type': 'text/plain',
+					Accept: ' application/json',
+				},
+				qs: query,
+				url: `https://api.spotify.com/v1${endpoint}`,
+				json: true,
+			},
+		);
+
+		expect(result).toEqual(response);
+	});
+
+	it('should throw a NodeApiError on request failure', async () => {
+		const method = 'GET';
+		const endpoint = '/me';
+		const body = {};
+		const query = { limit: 10 };
+		const error = new Error('Request failed');
+
+		(mockThis.helpers.httpRequestWithAuthentication as jest.Mock).mockRejectedValue(error);
+
+		await expect(spotifyApiRequest.call(mockThis, method, endpoint, body, query)).rejects.toThrow(
+			NodeApiError,
+		);
+
+		expect(mockThis.getNode).toHaveBeenCalled();
+	});
+});
diff --git a/packages/nodes-base/nodes/Spotify/__tests__/workflow/Spotify.workflow.json b/packages/nodes-base/nodes/Spotify/__tests__/workflow/Spotify.workflow.json
new file mode 100644
index 0000000000..b0962bd4bc
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__tests__/workflow/Spotify.workflow.json
@@ -0,0 +1,5941 @@
+{
+	"name": "[TEST] Spotify",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [40, 140],
+			"id": "08d02705-0913-46e1-9916-5f319c190127",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"resource": "album",
+				"operation": "search",
+				"query": "From Xero",
+				"limit": 2,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.spotify",
+			"typeVersion": 1,
+			"position": [460, -100],
+			"id": "a3c57688-3368-48ea-977a-3092ff6da385",
+			"name": "Spotify",
+			"credentials": {
+				"spotifyOAuth2Api": {
+					"id": "hHQKInC4oVrsBebI",
+					"name": "Spotify account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [640, -100],
+			"id": "bd6ad825-697b-465f-bda8-79e4db65c18e",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {
+				"resource": "album",
+				"operation": "getNewReleases",
+				"limit": 2,
+				"filters": {}
+			},
+			"type": "n8n-nodes-base.spotify",
+			"typeVersion": 1,
+			"position": [460, 80],
+			"id": "9f67f24d-6a80-4ca2-aefe-0efbf65054e2",
+			"name": "Spotify1",
+			"credentials": {
+				"spotifyOAuth2Api": {
+					"id": "hHQKInC4oVrsBebI",
+					"name": "Spotify account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [640, 80],
+			"id": "c0049cfc-67b3-43c6-bdb2-0249b8531e63",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"resource": "album",
+				"operation": "getTracks",
+				"id": "spotify:album:4R6FV9NSzhPihHR0h4pI93",
+				"returnAll": true
+			},
+			"type": "n8n-nodes-base.spotify",
+			"typeVersion": 1,
+			"position": [460, 260],
+			"id": "3f04a285-fecf-4d8b-9a54-dd45483072cb",
+			"name": "Spotify2",
+			"credentials": {
+				"spotifyOAuth2Api": {
+					"id": "hHQKInC4oVrsBebI",
+					"name": "Spotify account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [640, 260],
+			"id": "e1ec2e5e-cd8b-4c45-9202-95027a50029c",
+			"name": "No Operation, do nothing2"
+		},
+		{
+			"parameters": {
+				"resource": "album",
+				"id": "4R6FV9NSzhPihHR0h4pI93"
+			},
+			"type": "n8n-nodes-base.spotify",
+			"typeVersion": 1,
+			"position": [460, 620],
+			"id": "e2d26e12-a308-4d30-8908-46da973885ad",
+			"name": "Spotify4",
+			"credentials": {
+				"spotifyOAuth2Api": {
+					"id": "hHQKInC4oVrsBebI",
+					"name": "Spotify account"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [680, 620],
+			"id": "55478529-904e-4da8-9f96-1d5a391e9468",
+			"name": "No Operation, do nothing4"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"album_type": "album",
+					"total_tracks": 11,
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/4R6FV9NSzhPihHR0h4pI93"
+					},
+					"href": "https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93",
+					"id": "4R6FV9NSzhPihHR0h4pI93",
+					"images": [
+						{
+							"height": 640,
+							"url": "https://i.scdn.co/image/ab67616d0000b273b11a5489e8cb11dd22b930a0",
+							"width": 640
+						},
+						{
+							"height": 300,
+							"url": "https://i.scdn.co/image/ab67616d00001e02b11a5489e8cb11dd22b930a0",
+							"width": 300
+						},
+						{
+							"height": 64,
+							"url": "https://i.scdn.co/image/ab67616d00004851b11a5489e8cb11dd22b930a0",
+							"width": 64
+						}
+					],
+					"name": "From Zero",
+					"release_date": "2024-11-15",
+					"release_date_precision": "day",
+					"type": "album",
+					"uri": "spotify:album:4R6FV9NSzhPihHR0h4pI93",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"album_type": "single",
+					"total_tracks": 3,
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"BY",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/5v5KesD6W6Ptlid6iyGxSq"
+					},
+					"href": "https://api.spotify.com/v1/albums/5v5KesD6W6Ptlid6iyGxSq",
+					"id": "5v5KesD6W6Ptlid6iyGxSq",
+					"images": [
+						{
+							"height": 640,
+							"url": "https://i.scdn.co/image/ab67616d0000b273b554768192043c597c31133a",
+							"width": 640
+						},
+						{
+							"height": 300,
+							"url": "https://i.scdn.co/image/ab67616d00001e02b554768192043c597c31133a",
+							"width": 300
+						},
+						{
+							"height": 64,
+							"url": "https://i.scdn.co/image/ab67616d00004851b554768192043c597c31133a",
+							"width": 64
+						}
+					],
+					"name": "From Xero",
+					"release_date": "2021-11-15",
+					"release_date_precision": "day",
+					"type": "album",
+					"uri": "spotify:album:5v5KesD6W6Ptlid6iyGxSq",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/1EGVsuJeCpKQf69Io9kz1T"
+							},
+							"href": "https://api.spotify.com/v1/artists/1EGVsuJeCpKQf69Io9kz1T",
+							"id": "1EGVsuJeCpKQf69Io9kz1T",
+							"name": "HJY",
+							"type": "artist",
+							"uri": "spotify:artist:1EGVsuJeCpKQf69Io9kz1T"
+						}
+					]
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"album_type": "album",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/3eVa5w3URK5duf6eyVDbu9"
+							},
+							"href": "https://api.spotify.com/v1/artists/3eVa5w3URK5duf6eyVDbu9",
+							"id": "3eVa5w3URK5duf6eyVDbu9",
+							"name": "ROSÉ",
+							"type": "artist",
+							"uri": "spotify:artist:3eVa5w3URK5duf6eyVDbu9"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/7kFyd5oyJdVX2pIi6P4iHE"
+					},
+					"href": "https://api.spotify.com/v1/albums/7kFyd5oyJdVX2pIi6P4iHE",
+					"id": "7kFyd5oyJdVX2pIi6P4iHE",
+					"images": [
+						{
+							"height": 300,
+							"url": "https://i.scdn.co/image/ab67616d00001e025074bd0894cb1340b8d8a678",
+							"width": 300
+						},
+						{
+							"height": 64,
+							"url": "https://i.scdn.co/image/ab67616d000048515074bd0894cb1340b8d8a678",
+							"width": 64
+						},
+						{
+							"height": 640,
+							"url": "https://i.scdn.co/image/ab67616d0000b2735074bd0894cb1340b8d8a678",
+							"width": 640
+						}
+					],
+					"name": "rosie",
+					"release_date": "2024-12-06",
+					"release_date_precision": "day",
+					"total_tracks": 12,
+					"type": "album",
+					"uri": "spotify:album:7kFyd5oyJdVX2pIi6P4iHE"
+				}
+			},
+			{
+				"json": {
+					"album_type": "album",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/2FXC3k01G6Gw61bmprjgqS"
+							},
+							"href": "https://api.spotify.com/v1/artists/2FXC3k01G6Gw61bmprjgqS",
+							"id": "2FXC3k01G6Gw61bmprjgqS",
+							"name": "Hozier",
+							"type": "artist",
+							"uri": "spotify:artist:2FXC3k01G6Gw61bmprjgqS"
+						}
+					],
+					"available_markets": ["AU", "CA", "PR", "US"],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/10MWtR7jwqRTLQAvmTU7uQ"
+					},
+					"href": "https://api.spotify.com/v1/albums/10MWtR7jwqRTLQAvmTU7uQ",
+					"id": "10MWtR7jwqRTLQAvmTU7uQ",
+					"images": [
+						{
+							"height": 300,
+							"url": "https://i.scdn.co/image/ab67616d00001e028044f38f15837e87e2b65222",
+							"width": 300
+						},
+						{
+							"height": 64,
+							"url": "https://i.scdn.co/image/ab67616d000048518044f38f15837e87e2b65222",
+							"width": 64
+						},
+						{
+							"height": 640,
+							"url": "https://i.scdn.co/image/ab67616d0000b2738044f38f15837e87e2b65222",
+							"width": 640
+						}
+					],
+					"name": "Unreal Unearth: Unending",
+					"release_date": "2024-12-06",
+					"release_date_precision": "day",
+					"total_tracks": 26,
+					"type": "album",
+					"uri": "spotify:album:10MWtR7jwqRTLQAvmTU7uQ"
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 22174,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/1uhces29ApKuQWFdpiUsvH"
+					},
+					"href": "https://api.spotify.com/v1/tracks/1uhces29ApKuQWFdpiUsvH",
+					"id": "1uhces29ApKuQWFdpiUsvH",
+					"name": "From Zero (Intro)",
+					"preview_url": null,
+					"track_number": 1,
+					"type": "track",
+					"uri": "spotify:track:1uhces29ApKuQWFdpiUsvH",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 190427,
+					"explicit": true,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/1EDPVGbyPKJPeGqATwXZvN"
+					},
+					"href": "https://api.spotify.com/v1/tracks/1EDPVGbyPKJPeGqATwXZvN",
+					"id": "1EDPVGbyPKJPeGqATwXZvN",
+					"name": "The Emptiness Machine",
+					"preview_url": null,
+					"track_number": 2,
+					"type": "track",
+					"uri": "spotify:track:1EDPVGbyPKJPeGqATwXZvN",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 228606,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/5mFZipkX1HZ4Idz5LOWpzq"
+					},
+					"href": "https://api.spotify.com/v1/tracks/5mFZipkX1HZ4Idz5LOWpzq",
+					"id": "5mFZipkX1HZ4Idz5LOWpzq",
+					"name": "Cut the Bridge",
+					"preview_url": null,
+					"track_number": 3,
+					"type": "track",
+					"uri": "spotify:track:5mFZipkX1HZ4Idz5LOWpzq",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 167012,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/2HBBM75Xv3o2Mqdyh1NcM0"
+					},
+					"href": "https://api.spotify.com/v1/tracks/2HBBM75Xv3o2Mqdyh1NcM0",
+					"id": "2HBBM75Xv3o2Mqdyh1NcM0",
+					"name": "Heavy Is the Crown",
+					"preview_url": null,
+					"track_number": 4,
+					"type": "track",
+					"uri": "spotify:track:2HBBM75Xv3o2Mqdyh1NcM0",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 170445,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/3k4gjmYNJugQRlh2aounZ9"
+					},
+					"href": "https://api.spotify.com/v1/tracks/3k4gjmYNJugQRlh2aounZ9",
+					"id": "3k4gjmYNJugQRlh2aounZ9",
+					"name": "Over Each Other",
+					"preview_url": null,
+					"track_number": 5,
+					"type": "track",
+					"uri": "spotify:track:3k4gjmYNJugQRlh2aounZ9",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 140915,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/7BkzAHnNW7WfrT4NcLaUDx"
+					},
+					"href": "https://api.spotify.com/v1/tracks/7BkzAHnNW7WfrT4NcLaUDx",
+					"id": "7BkzAHnNW7WfrT4NcLaUDx",
+					"name": "Casualty",
+					"preview_url": null,
+					"track_number": 6,
+					"type": "track",
+					"uri": "spotify:track:7BkzAHnNW7WfrT4NcLaUDx",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 211027,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/7diOv6wm3ngF7Vt6ubK0Sf"
+					},
+					"href": "https://api.spotify.com/v1/tracks/7diOv6wm3ngF7Vt6ubK0Sf",
+					"id": "7diOv6wm3ngF7Vt6ubK0Sf",
+					"name": "Overflow",
+					"preview_url": null,
+					"track_number": 7,
+					"type": "track",
+					"uri": "spotify:track:7diOv6wm3ngF7Vt6ubK0Sf",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 183584,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/6i5qhmmF9UNUBRyrPSGn4m"
+					},
+					"href": "https://api.spotify.com/v1/tracks/6i5qhmmF9UNUBRyrPSGn4m",
+					"id": "6i5qhmmF9UNUBRyrPSGn4m",
+					"name": "Two Faced",
+					"preview_url": null,
+					"track_number": 8,
+					"type": "track",
+					"uri": "spotify:track:6i5qhmmF9UNUBRyrPSGn4m",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 185414,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/0J1IJsMbKWb5g2sJArTkGF"
+					},
+					"href": "https://api.spotify.com/v1/tracks/0J1IJsMbKWb5g2sJArTkGF",
+					"id": "0J1IJsMbKWb5g2sJArTkGF",
+					"name": "Stained",
+					"preview_url": null,
+					"track_number": 9,
+					"type": "track",
+					"uri": "spotify:track:0J1IJsMbKWb5g2sJArTkGF",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 209083,
+					"explicit": false,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/7M8eZBRTD9QNasEVReEM0H"
+					},
+					"href": "https://api.spotify.com/v1/tracks/7M8eZBRTD9QNasEVReEM0H",
+					"id": "7M8eZBRTD9QNasEVReEM0H",
+					"name": "IGYEIH",
+					"preview_url": null,
+					"track_number": 10,
+					"type": "track",
+					"uri": "spotify:track:7M8eZBRTD9QNasEVReEM0H",
+					"is_local": false
+				}
+			},
+			{
+				"json": {
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"disc_number": 1,
+					"duration_ms": 209844,
+					"explicit": true,
+					"external_urls": {
+						"spotify": "https://open.spotify.com/track/6aCBjSb87RizdH8lVBIRW7"
+					},
+					"href": "https://api.spotify.com/v1/tracks/6aCBjSb87RizdH8lVBIRW7",
+					"id": "6aCBjSb87RizdH8lVBIRW7",
+					"name": "Good Things Go",
+					"preview_url": null,
+					"track_number": 11,
+					"type": "track",
+					"uri": "spotify:track:6aCBjSb87RizdH8lVBIRW7",
+					"is_local": false
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"album_type": "album",
+					"total_tracks": 11,
+					"available_markets": [
+						"AR",
+						"AU",
+						"AT",
+						"BE",
+						"BO",
+						"BR",
+						"BG",
+						"CA",
+						"CL",
+						"CO",
+						"CR",
+						"CY",
+						"CZ",
+						"DK",
+						"DO",
+						"DE",
+						"EC",
+						"EE",
+						"SV",
+						"FI",
+						"FR",
+						"GR",
+						"GT",
+						"HN",
+						"HK",
+						"HU",
+						"IS",
+						"IE",
+						"IT",
+						"LV",
+						"LT",
+						"LU",
+						"MY",
+						"MT",
+						"MX",
+						"NL",
+						"NZ",
+						"NI",
+						"NO",
+						"PA",
+						"PY",
+						"PE",
+						"PH",
+						"PL",
+						"PT",
+						"SG",
+						"SK",
+						"ES",
+						"SE",
+						"CH",
+						"TW",
+						"TR",
+						"UY",
+						"US",
+						"GB",
+						"AD",
+						"LI",
+						"MC",
+						"ID",
+						"JP",
+						"TH",
+						"VN",
+						"RO",
+						"IL",
+						"ZA",
+						"SA",
+						"AE",
+						"BH",
+						"QA",
+						"OM",
+						"KW",
+						"EG",
+						"MA",
+						"DZ",
+						"TN",
+						"LB",
+						"JO",
+						"PS",
+						"IN",
+						"KZ",
+						"MD",
+						"UA",
+						"AL",
+						"BA",
+						"HR",
+						"ME",
+						"MK",
+						"RS",
+						"SI",
+						"KR",
+						"BD",
+						"PK",
+						"LK",
+						"GH",
+						"KE",
+						"NG",
+						"TZ",
+						"UG",
+						"AG",
+						"AM",
+						"BS",
+						"BB",
+						"BZ",
+						"BT",
+						"BW",
+						"BF",
+						"CV",
+						"CW",
+						"DM",
+						"FJ",
+						"GM",
+						"GE",
+						"GD",
+						"GW",
+						"GY",
+						"HT",
+						"JM",
+						"KI",
+						"LS",
+						"LR",
+						"MW",
+						"MV",
+						"ML",
+						"MH",
+						"FM",
+						"NA",
+						"NR",
+						"NE",
+						"PW",
+						"PG",
+						"PR",
+						"WS",
+						"SM",
+						"ST",
+						"SN",
+						"SC",
+						"SL",
+						"SB",
+						"KN",
+						"LC",
+						"VC",
+						"SR",
+						"TL",
+						"TO",
+						"TT",
+						"TV",
+						"VU",
+						"AZ",
+						"BN",
+						"BI",
+						"KH",
+						"CM",
+						"TD",
+						"KM",
+						"GQ",
+						"SZ",
+						"GA",
+						"GN",
+						"KG",
+						"LA",
+						"MO",
+						"MR",
+						"MN",
+						"NP",
+						"RW",
+						"TG",
+						"UZ",
+						"ZW",
+						"BJ",
+						"MG",
+						"MU",
+						"MZ",
+						"AO",
+						"CI",
+						"DJ",
+						"ZM",
+						"CD",
+						"CG",
+						"IQ",
+						"LY",
+						"TJ",
+						"VE",
+						"ET",
+						"XK"
+					],
+					"external_urls": {
+						"spotify": "https://open.spotify.com/album/4R6FV9NSzhPihHR0h4pI93"
+					},
+					"href": "https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93",
+					"id": "4R6FV9NSzhPihHR0h4pI93",
+					"images": [
+						{
+							"url": "https://i.scdn.co/image/ab67616d0000b273b11a5489e8cb11dd22b930a0",
+							"height": 640,
+							"width": 640
+						},
+						{
+							"url": "https://i.scdn.co/image/ab67616d00001e02b11a5489e8cb11dd22b930a0",
+							"height": 300,
+							"width": 300
+						},
+						{
+							"url": "https://i.scdn.co/image/ab67616d00004851b11a5489e8cb11dd22b930a0",
+							"height": 64,
+							"width": 64
+						}
+					],
+					"name": "From Zero",
+					"release_date": "2024-11-15",
+					"release_date_precision": "day",
+					"type": "album",
+					"uri": "spotify:album:4R6FV9NSzhPihHR0h4pI93",
+					"artists": [
+						{
+							"external_urls": {
+								"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+							},
+							"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+							"id": "6XyY86QOPPrYVGvF9ch6wz",
+							"name": "Linkin Park",
+							"type": "artist",
+							"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+						}
+					],
+					"tracks": {
+						"href": "https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93/tracks",
+						"limit": 50,
+						"next": null,
+						"offset": 0,
+						"previous": null,
+						"total": 11,
+						"items": [
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 22174,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/1uhces29ApKuQWFdpiUsvH"
+								},
+								"href": "https://api.spotify.com/v1/tracks/1uhces29ApKuQWFdpiUsvH",
+								"id": "1uhces29ApKuQWFdpiUsvH",
+								"name": "From Zero (Intro)",
+								"preview_url": null,
+								"track_number": 1,
+								"type": "track",
+								"uri": "spotify:track:1uhces29ApKuQWFdpiUsvH",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 190427,
+								"explicit": true,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/1EDPVGbyPKJPeGqATwXZvN"
+								},
+								"href": "https://api.spotify.com/v1/tracks/1EDPVGbyPKJPeGqATwXZvN",
+								"id": "1EDPVGbyPKJPeGqATwXZvN",
+								"name": "The Emptiness Machine",
+								"preview_url": null,
+								"track_number": 2,
+								"type": "track",
+								"uri": "spotify:track:1EDPVGbyPKJPeGqATwXZvN",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 228606,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/5mFZipkX1HZ4Idz5LOWpzq"
+								},
+								"href": "https://api.spotify.com/v1/tracks/5mFZipkX1HZ4Idz5LOWpzq",
+								"id": "5mFZipkX1HZ4Idz5LOWpzq",
+								"name": "Cut the Bridge",
+								"preview_url": null,
+								"track_number": 3,
+								"type": "track",
+								"uri": "spotify:track:5mFZipkX1HZ4Idz5LOWpzq",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 167012,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/2HBBM75Xv3o2Mqdyh1NcM0"
+								},
+								"href": "https://api.spotify.com/v1/tracks/2HBBM75Xv3o2Mqdyh1NcM0",
+								"id": "2HBBM75Xv3o2Mqdyh1NcM0",
+								"name": "Heavy Is the Crown",
+								"preview_url": null,
+								"track_number": 4,
+								"type": "track",
+								"uri": "spotify:track:2HBBM75Xv3o2Mqdyh1NcM0",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 170445,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/3k4gjmYNJugQRlh2aounZ9"
+								},
+								"href": "https://api.spotify.com/v1/tracks/3k4gjmYNJugQRlh2aounZ9",
+								"id": "3k4gjmYNJugQRlh2aounZ9",
+								"name": "Over Each Other",
+								"preview_url": null,
+								"track_number": 5,
+								"type": "track",
+								"uri": "spotify:track:3k4gjmYNJugQRlh2aounZ9",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 140915,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/7BkzAHnNW7WfrT4NcLaUDx"
+								},
+								"href": "https://api.spotify.com/v1/tracks/7BkzAHnNW7WfrT4NcLaUDx",
+								"id": "7BkzAHnNW7WfrT4NcLaUDx",
+								"name": "Casualty",
+								"preview_url": null,
+								"track_number": 6,
+								"type": "track",
+								"uri": "spotify:track:7BkzAHnNW7WfrT4NcLaUDx",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 211027,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/7diOv6wm3ngF7Vt6ubK0Sf"
+								},
+								"href": "https://api.spotify.com/v1/tracks/7diOv6wm3ngF7Vt6ubK0Sf",
+								"id": "7diOv6wm3ngF7Vt6ubK0Sf",
+								"name": "Overflow",
+								"preview_url": null,
+								"track_number": 7,
+								"type": "track",
+								"uri": "spotify:track:7diOv6wm3ngF7Vt6ubK0Sf",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 183584,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/6i5qhmmF9UNUBRyrPSGn4m"
+								},
+								"href": "https://api.spotify.com/v1/tracks/6i5qhmmF9UNUBRyrPSGn4m",
+								"id": "6i5qhmmF9UNUBRyrPSGn4m",
+								"name": "Two Faced",
+								"preview_url": null,
+								"track_number": 8,
+								"type": "track",
+								"uri": "spotify:track:6i5qhmmF9UNUBRyrPSGn4m",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 185414,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/0J1IJsMbKWb5g2sJArTkGF"
+								},
+								"href": "https://api.spotify.com/v1/tracks/0J1IJsMbKWb5g2sJArTkGF",
+								"id": "0J1IJsMbKWb5g2sJArTkGF",
+								"name": "Stained",
+								"preview_url": null,
+								"track_number": 9,
+								"type": "track",
+								"uri": "spotify:track:0J1IJsMbKWb5g2sJArTkGF",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 209083,
+								"explicit": false,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/7M8eZBRTD9QNasEVReEM0H"
+								},
+								"href": "https://api.spotify.com/v1/tracks/7M8eZBRTD9QNasEVReEM0H",
+								"id": "7M8eZBRTD9QNasEVReEM0H",
+								"name": "IGYEIH",
+								"preview_url": null,
+								"track_number": 10,
+								"type": "track",
+								"uri": "spotify:track:7M8eZBRTD9QNasEVReEM0H",
+								"is_local": false
+							},
+							{
+								"artists": [
+									{
+										"external_urls": {
+											"spotify": "https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz"
+										},
+										"href": "https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz",
+										"id": "6XyY86QOPPrYVGvF9ch6wz",
+										"name": "Linkin Park",
+										"type": "artist",
+										"uri": "spotify:artist:6XyY86QOPPrYVGvF9ch6wz"
+									}
+								],
+								"available_markets": [
+									"AR",
+									"AU",
+									"AT",
+									"BE",
+									"BO",
+									"BR",
+									"BG",
+									"CA",
+									"CL",
+									"CO",
+									"CR",
+									"CY",
+									"CZ",
+									"DK",
+									"DO",
+									"DE",
+									"EC",
+									"EE",
+									"SV",
+									"FI",
+									"FR",
+									"GR",
+									"GT",
+									"HN",
+									"HK",
+									"HU",
+									"IS",
+									"IE",
+									"IT",
+									"LV",
+									"LT",
+									"LU",
+									"MY",
+									"MT",
+									"MX",
+									"NL",
+									"NZ",
+									"NI",
+									"NO",
+									"PA",
+									"PY",
+									"PE",
+									"PH",
+									"PL",
+									"PT",
+									"SG",
+									"SK",
+									"ES",
+									"SE",
+									"CH",
+									"TW",
+									"TR",
+									"UY",
+									"US",
+									"GB",
+									"AD",
+									"LI",
+									"MC",
+									"ID",
+									"JP",
+									"TH",
+									"VN",
+									"RO",
+									"IL",
+									"ZA",
+									"SA",
+									"AE",
+									"BH",
+									"QA",
+									"OM",
+									"KW",
+									"EG",
+									"MA",
+									"DZ",
+									"TN",
+									"LB",
+									"JO",
+									"PS",
+									"IN",
+									"KZ",
+									"MD",
+									"UA",
+									"AL",
+									"BA",
+									"HR",
+									"ME",
+									"MK",
+									"RS",
+									"SI",
+									"KR",
+									"BD",
+									"PK",
+									"LK",
+									"GH",
+									"KE",
+									"NG",
+									"TZ",
+									"UG",
+									"AG",
+									"AM",
+									"BS",
+									"BB",
+									"BZ",
+									"BT",
+									"BW",
+									"BF",
+									"CV",
+									"CW",
+									"DM",
+									"FJ",
+									"GM",
+									"GE",
+									"GD",
+									"GW",
+									"GY",
+									"HT",
+									"JM",
+									"KI",
+									"LS",
+									"LR",
+									"MW",
+									"MV",
+									"ML",
+									"MH",
+									"FM",
+									"NA",
+									"NR",
+									"NE",
+									"PW",
+									"PG",
+									"PR",
+									"WS",
+									"SM",
+									"ST",
+									"SN",
+									"SC",
+									"SL",
+									"SB",
+									"KN",
+									"LC",
+									"VC",
+									"SR",
+									"TL",
+									"TO",
+									"TT",
+									"TV",
+									"VU",
+									"AZ",
+									"BN",
+									"BI",
+									"KH",
+									"CM",
+									"TD",
+									"KM",
+									"GQ",
+									"SZ",
+									"GA",
+									"GN",
+									"KG",
+									"LA",
+									"MO",
+									"MR",
+									"MN",
+									"NP",
+									"RW",
+									"TG",
+									"UZ",
+									"ZW",
+									"BJ",
+									"MG",
+									"MU",
+									"MZ",
+									"AO",
+									"CI",
+									"DJ",
+									"ZM",
+									"CD",
+									"CG",
+									"IQ",
+									"LY",
+									"TJ",
+									"VE",
+									"ET",
+									"XK"
+								],
+								"disc_number": 1,
+								"duration_ms": 209844,
+								"explicit": true,
+								"external_urls": {
+									"spotify": "https://open.spotify.com/track/6aCBjSb87RizdH8lVBIRW7"
+								},
+								"href": "https://api.spotify.com/v1/tracks/6aCBjSb87RizdH8lVBIRW7",
+								"id": "6aCBjSb87RizdH8lVBIRW7",
+								"name": "Good Things Go",
+								"preview_url": null,
+								"track_number": 11,
+								"type": "track",
+								"uri": "spotify:track:6aCBjSb87RizdH8lVBIRW7",
+								"is_local": false
+							}
+						]
+					},
+					"copyrights": [
+						{
+							"text": "© 2024 Linkin Park, LLC under exclusive license to Warner Records Inc.",
+							"type": "C"
+						},
+						{
+							"text": "℗ 2024 Linkin Park, LLC under exclusive license to Warner Records Inc.",
+							"type": "P"
+						}
+					],
+					"external_ids": {
+						"upc": "093624839811"
+					},
+					"genres": [],
+					"label": "Warner Records",
+					"popularity": 91
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Spotify",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Spotify1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Spotify2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Spotify4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Spotify": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Spotify1": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Spotify2": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Operation, do nothing2": {
+			"main": [[]]
+		},
+		"Spotify4": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "e9413658-28ab-43a4-9ab6-409d60326b7e",
+	"meta": {
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "EygPNhavSktkheN2",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Spotify/__tests__/workflow/apiResponses.ts b/packages/nodes-base/nodes/Spotify/__tests__/workflow/apiResponses.ts
new file mode 100644
index 0000000000..aac0c1f00f
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__tests__/workflow/apiResponses.ts
@@ -0,0 +1,1146 @@
+const available_markets = [
+	'AR',
+	'AU',
+	'AT',
+	'BE',
+	'BO',
+	'BR',
+	'BG',
+	'CA',
+	'CL',
+	'CO',
+	'CR',
+	'CY',
+	'CZ',
+	'DK',
+	'DO',
+	'DE',
+	'EC',
+	'EE',
+	'SV',
+	'FI',
+	'FR',
+	'GR',
+	'GT',
+	'HN',
+	'HK',
+	'HU',
+	'IS',
+	'IE',
+	'IT',
+	'LV',
+	'LT',
+	'LU',
+	'MY',
+	'MT',
+	'MX',
+	'NL',
+	'NZ',
+	'NI',
+	'NO',
+	'PA',
+	'PY',
+	'PE',
+	'PH',
+	'PL',
+	'PT',
+	'SG',
+	'SK',
+	'ES',
+	'SE',
+	'CH',
+	'TW',
+	'TR',
+	'UY',
+	'US',
+	'GB',
+	'AD',
+	'LI',
+	'MC',
+	'ID',
+	'JP',
+	'TH',
+	'VN',
+	'RO',
+	'IL',
+	'ZA',
+	'SA',
+	'AE',
+	'BH',
+	'QA',
+	'OM',
+	'KW',
+	'EG',
+	'MA',
+	'DZ',
+	'TN',
+	'LB',
+	'JO',
+	'PS',
+	'IN',
+	'KZ',
+	'MD',
+	'UA',
+	'AL',
+	'BA',
+	'HR',
+	'ME',
+	'MK',
+	'RS',
+	'SI',
+	'KR',
+	'BD',
+	'PK',
+	'LK',
+	'GH',
+	'KE',
+	'NG',
+	'TZ',
+	'UG',
+	'AG',
+	'AM',
+	'BS',
+	'BB',
+	'BZ',
+	'BT',
+	'BW',
+	'BF',
+	'CV',
+	'CW',
+	'DM',
+	'FJ',
+	'GM',
+	'GE',
+	'GD',
+	'GW',
+	'GY',
+	'HT',
+	'JM',
+	'KI',
+	'LS',
+	'LR',
+	'MW',
+	'MV',
+	'ML',
+	'MH',
+	'FM',
+	'NA',
+	'NR',
+	'NE',
+	'PW',
+	'PG',
+	'PR',
+	'WS',
+	'SM',
+	'ST',
+	'SN',
+	'SC',
+	'SL',
+	'SB',
+	'KN',
+	'LC',
+	'VC',
+	'SR',
+	'TL',
+	'TO',
+	'TT',
+	'TV',
+	'VU',
+	'AZ',
+	'BN',
+	'BI',
+	'KH',
+	'CM',
+	'TD',
+	'KM',
+	'GQ',
+	'SZ',
+	'GA',
+	'GN',
+	'KG',
+	'LA',
+	'MO',
+	'MR',
+	'MN',
+	'NP',
+	'RW',
+	'TG',
+	'UZ',
+	'ZW',
+	'BJ',
+	'MG',
+	'MU',
+	'MZ',
+	'AO',
+	'CI',
+	'DJ',
+	'ZM',
+	'CD',
+	'CG',
+	'IQ',
+	'LY',
+	'TJ',
+	'VE',
+	'ET',
+	'XK',
+];
+
+export const searchForAlbum = {
+	albums: {
+		href: 'https://api.spotify.com/v1/search?offset=0&limit=2&query=From%20Xero&type=album&locale=en-GB,en-US;q%3D0.9,en;q%3D0.8',
+		limit: 2,
+		next: 'https://api.spotify.com/v1/search?offset=2&limit=2&query=From%20Xero&type=album&locale=en-GB,en-US;q%3D0.9,en;q%3D0.8',
+		offset: 0,
+		previous: null,
+		total: 787,
+		items: [
+			{
+				album_type: 'album',
+				total_tracks: 11,
+				available_markets,
+				external_urls: {
+					spotify: 'https://open.spotify.com/album/4R6FV9NSzhPihHR0h4pI93',
+				},
+				href: 'https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93',
+				id: '4R6FV9NSzhPihHR0h4pI93',
+				images: [
+					{
+						height: 640,
+						url: 'https://i.scdn.co/image/ab67616d0000b273b11a5489e8cb11dd22b930a0',
+						width: 640,
+					},
+					{
+						height: 300,
+						url: 'https://i.scdn.co/image/ab67616d00001e02b11a5489e8cb11dd22b930a0',
+						width: 300,
+					},
+					{
+						height: 64,
+						url: 'https://i.scdn.co/image/ab67616d00004851b11a5489e8cb11dd22b930a0',
+						width: 64,
+					},
+				],
+				name: 'From Zero',
+				release_date: '2024-11-15',
+				release_date_precision: 'day',
+				type: 'album',
+				uri: 'spotify:album:4R6FV9NSzhPihHR0h4pI93',
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+			},
+			{
+				album_type: 'single',
+				total_tracks: 3,
+				available_markets: [
+					...available_markets.slice(0, 79),
+					'BY',
+					...available_markets.slice(79),
+				],
+				external_urls: {
+					spotify: 'https://open.spotify.com/album/5v5KesD6W6Ptlid6iyGxSq',
+				},
+				href: 'https://api.spotify.com/v1/albums/5v5KesD6W6Ptlid6iyGxSq',
+				id: '5v5KesD6W6Ptlid6iyGxSq',
+				images: [
+					{
+						height: 640,
+						url: 'https://i.scdn.co/image/ab67616d0000b273b554768192043c597c31133a',
+						width: 640,
+					},
+					{
+						height: 300,
+						url: 'https://i.scdn.co/image/ab67616d00001e02b554768192043c597c31133a',
+						width: 300,
+					},
+					{
+						height: 64,
+						url: 'https://i.scdn.co/image/ab67616d00004851b554768192043c597c31133a',
+						width: 64,
+					},
+				],
+				name: 'From Xero',
+				release_date: '2021-11-15',
+				release_date_precision: 'day',
+				type: 'album',
+				uri: 'spotify:album:5v5KesD6W6Ptlid6iyGxSq',
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/1EGVsuJeCpKQf69Io9kz1T',
+						},
+						href: 'https://api.spotify.com/v1/artists/1EGVsuJeCpKQf69Io9kz1T',
+						id: '1EGVsuJeCpKQf69Io9kz1T',
+						name: 'HJY',
+						type: 'artist',
+						uri: 'spotify:artist:1EGVsuJeCpKQf69Io9kz1T',
+					},
+				],
+			},
+		],
+	},
+};
+
+export const getNewReleases = {
+	albums: {
+		href: 'https://api.spotify.com/v1/browse/new-releases?offset=0&limit=2&locale=en-GB,en-US;q%3D0.9,en;q%3D0.8',
+		items: [
+			{
+				album_type: 'album',
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/3eVa5w3URK5duf6eyVDbu9',
+						},
+						href: 'https://api.spotify.com/v1/artists/3eVa5w3URK5duf6eyVDbu9',
+						id: '3eVa5w3URK5duf6eyVDbu9',
+						name: 'ROSÉ',
+						type: 'artist',
+						uri: 'spotify:artist:3eVa5w3URK5duf6eyVDbu9',
+					},
+				],
+				available_markets: available_markets.filter((market) => market !== 'KR'),
+				external_urls: {
+					spotify: 'https://open.spotify.com/album/7kFyd5oyJdVX2pIi6P4iHE',
+				},
+				href: 'https://api.spotify.com/v1/albums/7kFyd5oyJdVX2pIi6P4iHE',
+				id: '7kFyd5oyJdVX2pIi6P4iHE',
+				images: [
+					{
+						height: 300,
+						url: 'https://i.scdn.co/image/ab67616d00001e025074bd0894cb1340b8d8a678',
+						width: 300,
+					},
+					{
+						height: 64,
+						url: 'https://i.scdn.co/image/ab67616d000048515074bd0894cb1340b8d8a678',
+						width: 64,
+					},
+					{
+						height: 640,
+						url: 'https://i.scdn.co/image/ab67616d0000b2735074bd0894cb1340b8d8a678',
+						width: 640,
+					},
+				],
+				name: 'rosie',
+				release_date: '2024-12-06',
+				release_date_precision: 'day',
+				total_tracks: 12,
+				type: 'album',
+				uri: 'spotify:album:7kFyd5oyJdVX2pIi6P4iHE',
+			},
+			{
+				album_type: 'album',
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/2FXC3k01G6Gw61bmprjgqS',
+						},
+						href: 'https://api.spotify.com/v1/artists/2FXC3k01G6Gw61bmprjgqS',
+						id: '2FXC3k01G6Gw61bmprjgqS',
+						name: 'Hozier',
+						type: 'artist',
+						uri: 'spotify:artist:2FXC3k01G6Gw61bmprjgqS',
+					},
+				],
+				available_markets: ['AU', 'CA', 'PR', 'US'],
+				external_urls: {
+					spotify: 'https://open.spotify.com/album/10MWtR7jwqRTLQAvmTU7uQ',
+				},
+				href: 'https://api.spotify.com/v1/albums/10MWtR7jwqRTLQAvmTU7uQ',
+				id: '10MWtR7jwqRTLQAvmTU7uQ',
+				images: [
+					{
+						height: 300,
+						url: 'https://i.scdn.co/image/ab67616d00001e028044f38f15837e87e2b65222',
+						width: 300,
+					},
+					{
+						height: 64,
+						url: 'https://i.scdn.co/image/ab67616d000048518044f38f15837e87e2b65222',
+						width: 64,
+					},
+					{
+						height: 640,
+						url: 'https://i.scdn.co/image/ab67616d0000b2738044f38f15837e87e2b65222',
+						width: 640,
+					},
+				],
+				name: 'Unreal Unearth: Unending',
+				release_date: '2024-12-06',
+				release_date_precision: 'day',
+				total_tracks: 26,
+				type: 'album',
+				uri: 'spotify:album:10MWtR7jwqRTLQAvmTU7uQ',
+			},
+		],
+		limit: 2,
+		next: 'https://api.spotify.com/v1/browse/new-releases?offset=2&limit=2&locale=en-GB,en-US;q%3D0.9,en;q%3D0.8',
+		offset: 0,
+		previous: null,
+		total: 100,
+	},
+};
+
+export const getAlbumTracks = {
+	href: 'https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93/tracks?offset=0&limit=20',
+	items: [
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 22174,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/1uhces29ApKuQWFdpiUsvH',
+			},
+			href: 'https://api.spotify.com/v1/tracks/1uhces29ApKuQWFdpiUsvH',
+			id: '1uhces29ApKuQWFdpiUsvH',
+			name: 'From Zero (Intro)',
+			preview_url: null,
+			track_number: 1,
+			type: 'track',
+			uri: 'spotify:track:1uhces29ApKuQWFdpiUsvH',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 190427,
+			explicit: true,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/1EDPVGbyPKJPeGqATwXZvN',
+			},
+			href: 'https://api.spotify.com/v1/tracks/1EDPVGbyPKJPeGqATwXZvN',
+			id: '1EDPVGbyPKJPeGqATwXZvN',
+			name: 'The Emptiness Machine',
+			preview_url: null,
+			track_number: 2,
+			type: 'track',
+			uri: 'spotify:track:1EDPVGbyPKJPeGqATwXZvN',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 228606,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/5mFZipkX1HZ4Idz5LOWpzq',
+			},
+			href: 'https://api.spotify.com/v1/tracks/5mFZipkX1HZ4Idz5LOWpzq',
+			id: '5mFZipkX1HZ4Idz5LOWpzq',
+			name: 'Cut the Bridge',
+			preview_url: null,
+			track_number: 3,
+			type: 'track',
+			uri: 'spotify:track:5mFZipkX1HZ4Idz5LOWpzq',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 167012,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/2HBBM75Xv3o2Mqdyh1NcM0',
+			},
+			href: 'https://api.spotify.com/v1/tracks/2HBBM75Xv3o2Mqdyh1NcM0',
+			id: '2HBBM75Xv3o2Mqdyh1NcM0',
+			name: 'Heavy Is the Crown',
+			preview_url: null,
+			track_number: 4,
+			type: 'track',
+			uri: 'spotify:track:2HBBM75Xv3o2Mqdyh1NcM0',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 170445,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/3k4gjmYNJugQRlh2aounZ9',
+			},
+			href: 'https://api.spotify.com/v1/tracks/3k4gjmYNJugQRlh2aounZ9',
+			id: '3k4gjmYNJugQRlh2aounZ9',
+			name: 'Over Each Other',
+			preview_url: null,
+			track_number: 5,
+			type: 'track',
+			uri: 'spotify:track:3k4gjmYNJugQRlh2aounZ9',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 140915,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/7BkzAHnNW7WfrT4NcLaUDx',
+			},
+			href: 'https://api.spotify.com/v1/tracks/7BkzAHnNW7WfrT4NcLaUDx',
+			id: '7BkzAHnNW7WfrT4NcLaUDx',
+			name: 'Casualty',
+			preview_url: null,
+			track_number: 6,
+			type: 'track',
+			uri: 'spotify:track:7BkzAHnNW7WfrT4NcLaUDx',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 211027,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/7diOv6wm3ngF7Vt6ubK0Sf',
+			},
+			href: 'https://api.spotify.com/v1/tracks/7diOv6wm3ngF7Vt6ubK0Sf',
+			id: '7diOv6wm3ngF7Vt6ubK0Sf',
+			name: 'Overflow',
+			preview_url: null,
+			track_number: 7,
+			type: 'track',
+			uri: 'spotify:track:7diOv6wm3ngF7Vt6ubK0Sf',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 183584,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/6i5qhmmF9UNUBRyrPSGn4m',
+			},
+			href: 'https://api.spotify.com/v1/tracks/6i5qhmmF9UNUBRyrPSGn4m',
+			id: '6i5qhmmF9UNUBRyrPSGn4m',
+			name: 'Two Faced',
+			preview_url: null,
+			track_number: 8,
+			type: 'track',
+			uri: 'spotify:track:6i5qhmmF9UNUBRyrPSGn4m',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 185414,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/0J1IJsMbKWb5g2sJArTkGF',
+			},
+			href: 'https://api.spotify.com/v1/tracks/0J1IJsMbKWb5g2sJArTkGF',
+			id: '0J1IJsMbKWb5g2sJArTkGF',
+			name: 'Stained',
+			preview_url: null,
+			track_number: 9,
+			type: 'track',
+			uri: 'spotify:track:0J1IJsMbKWb5g2sJArTkGF',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 209083,
+			explicit: false,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/7M8eZBRTD9QNasEVReEM0H',
+			},
+			href: 'https://api.spotify.com/v1/tracks/7M8eZBRTD9QNasEVReEM0H',
+			id: '7M8eZBRTD9QNasEVReEM0H',
+			name: 'IGYEIH',
+			preview_url: null,
+			track_number: 10,
+			type: 'track',
+			uri: 'spotify:track:7M8eZBRTD9QNasEVReEM0H',
+			is_local: false,
+		},
+		{
+			artists: [
+				{
+					external_urls: {
+						spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+					},
+					href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+					id: '6XyY86QOPPrYVGvF9ch6wz',
+					name: 'Linkin Park',
+					type: 'artist',
+					uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+				},
+			],
+			available_markets,
+			disc_number: 1,
+			duration_ms: 209844,
+			explicit: true,
+			external_urls: {
+				spotify: 'https://open.spotify.com/track/6aCBjSb87RizdH8lVBIRW7',
+			},
+			href: 'https://api.spotify.com/v1/tracks/6aCBjSb87RizdH8lVBIRW7',
+			id: '6aCBjSb87RizdH8lVBIRW7',
+			name: 'Good Things Go',
+			preview_url: null,
+			track_number: 11,
+			type: 'track',
+			uri: 'spotify:track:6aCBjSb87RizdH8lVBIRW7',
+			is_local: false,
+		},
+	],
+	limit: 20,
+	next: null,
+	offset: 0,
+	previous: null,
+	total: 11,
+};
+
+export const getArtist = {
+	external_urls: {
+		spotify: 'https://open.spotify.com/artist/12Chz98pHFMPJEknJQMWvI',
+	},
+	followers: {
+		href: null,
+		total: 8063570,
+	},
+	genres: ['alternative rock', 'modern rock', 'permanent wave', 'rock'],
+	href: 'https://api.spotify.com/v1/artists/12Chz98pHFMPJEknJQMWvI?locale=en-GB%2Cen-US%3Bq%3D0.9%2Cen%3Bq%3D0.8',
+	id: '12Chz98pHFMPJEknJQMWvI',
+	images: [
+		{
+			url: 'https://i.scdn.co/image/ab6761610000e5eb0accbbe13e1aa147dd27671c',
+			height: 640,
+			width: 640,
+		},
+		{
+			url: 'https://i.scdn.co/image/ab676161000051740accbbe13e1aa147dd27671c',
+			height: 320,
+			width: 320,
+		},
+		{
+			url: 'https://i.scdn.co/image/ab6761610000f1780accbbe13e1aa147dd27671c',
+			height: 160,
+			width: 160,
+		},
+	],
+	name: 'Muse',
+	popularity: 77,
+	type: 'artist',
+	uri: 'spotify:artist:12Chz98pHFMPJEknJQMWvI',
+};
+
+export const getAlbum = {
+	album_type: 'album',
+	total_tracks: 11,
+	available_markets,
+	external_urls: {
+		spotify: 'https://open.spotify.com/album/4R6FV9NSzhPihHR0h4pI93',
+	},
+	href: 'https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93',
+	id: '4R6FV9NSzhPihHR0h4pI93',
+	images: [
+		{
+			url: 'https://i.scdn.co/image/ab67616d0000b273b11a5489e8cb11dd22b930a0',
+			height: 640,
+			width: 640,
+		},
+		{
+			url: 'https://i.scdn.co/image/ab67616d00001e02b11a5489e8cb11dd22b930a0',
+			height: 300,
+			width: 300,
+		},
+		{
+			url: 'https://i.scdn.co/image/ab67616d00004851b11a5489e8cb11dd22b930a0',
+			height: 64,
+			width: 64,
+		},
+	],
+	name: 'From Zero',
+	release_date: '2024-11-15',
+	release_date_precision: 'day',
+	type: 'album',
+	uri: 'spotify:album:4R6FV9NSzhPihHR0h4pI93',
+	artists: [
+		{
+			external_urls: {
+				spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+			},
+			href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+			id: '6XyY86QOPPrYVGvF9ch6wz',
+			name: 'Linkin Park',
+			type: 'artist',
+			uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+		},
+	],
+	tracks: {
+		href: 'https://api.spotify.com/v1/albums/4R6FV9NSzhPihHR0h4pI93/tracks',
+		limit: 50,
+		next: null,
+		offset: 0,
+		previous: null,
+		total: 11,
+		items: [
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 22174,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/1uhces29ApKuQWFdpiUsvH',
+				},
+				href: 'https://api.spotify.com/v1/tracks/1uhces29ApKuQWFdpiUsvH',
+				id: '1uhces29ApKuQWFdpiUsvH',
+				name: 'From Zero (Intro)',
+				preview_url: null,
+				track_number: 1,
+				type: 'track',
+				uri: 'spotify:track:1uhces29ApKuQWFdpiUsvH',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 190427,
+				explicit: true,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/1EDPVGbyPKJPeGqATwXZvN',
+				},
+				href: 'https://api.spotify.com/v1/tracks/1EDPVGbyPKJPeGqATwXZvN',
+				id: '1EDPVGbyPKJPeGqATwXZvN',
+				name: 'The Emptiness Machine',
+				preview_url: null,
+				track_number: 2,
+				type: 'track',
+				uri: 'spotify:track:1EDPVGbyPKJPeGqATwXZvN',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 228606,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/5mFZipkX1HZ4Idz5LOWpzq',
+				},
+				href: 'https://api.spotify.com/v1/tracks/5mFZipkX1HZ4Idz5LOWpzq',
+				id: '5mFZipkX1HZ4Idz5LOWpzq',
+				name: 'Cut the Bridge',
+				preview_url: null,
+				track_number: 3,
+				type: 'track',
+				uri: 'spotify:track:5mFZipkX1HZ4Idz5LOWpzq',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 167012,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/2HBBM75Xv3o2Mqdyh1NcM0',
+				},
+				href: 'https://api.spotify.com/v1/tracks/2HBBM75Xv3o2Mqdyh1NcM0',
+				id: '2HBBM75Xv3o2Mqdyh1NcM0',
+				name: 'Heavy Is the Crown',
+				preview_url: null,
+				track_number: 4,
+				type: 'track',
+				uri: 'spotify:track:2HBBM75Xv3o2Mqdyh1NcM0',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 170445,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/3k4gjmYNJugQRlh2aounZ9',
+				},
+				href: 'https://api.spotify.com/v1/tracks/3k4gjmYNJugQRlh2aounZ9',
+				id: '3k4gjmYNJugQRlh2aounZ9',
+				name: 'Over Each Other',
+				preview_url: null,
+				track_number: 5,
+				type: 'track',
+				uri: 'spotify:track:3k4gjmYNJugQRlh2aounZ9',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 140915,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/7BkzAHnNW7WfrT4NcLaUDx',
+				},
+				href: 'https://api.spotify.com/v1/tracks/7BkzAHnNW7WfrT4NcLaUDx',
+				id: '7BkzAHnNW7WfrT4NcLaUDx',
+				name: 'Casualty',
+				preview_url: null,
+				track_number: 6,
+				type: 'track',
+				uri: 'spotify:track:7BkzAHnNW7WfrT4NcLaUDx',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 211027,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/7diOv6wm3ngF7Vt6ubK0Sf',
+				},
+				href: 'https://api.spotify.com/v1/tracks/7diOv6wm3ngF7Vt6ubK0Sf',
+				id: '7diOv6wm3ngF7Vt6ubK0Sf',
+				name: 'Overflow',
+				preview_url: null,
+				track_number: 7,
+				type: 'track',
+				uri: 'spotify:track:7diOv6wm3ngF7Vt6ubK0Sf',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 183584,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/6i5qhmmF9UNUBRyrPSGn4m',
+				},
+				href: 'https://api.spotify.com/v1/tracks/6i5qhmmF9UNUBRyrPSGn4m',
+				id: '6i5qhmmF9UNUBRyrPSGn4m',
+				name: 'Two Faced',
+				preview_url: null,
+				track_number: 8,
+				type: 'track',
+				uri: 'spotify:track:6i5qhmmF9UNUBRyrPSGn4m',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 185414,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/0J1IJsMbKWb5g2sJArTkGF',
+				},
+				href: 'https://api.spotify.com/v1/tracks/0J1IJsMbKWb5g2sJArTkGF',
+				id: '0J1IJsMbKWb5g2sJArTkGF',
+				name: 'Stained',
+				preview_url: null,
+				track_number: 9,
+				type: 'track',
+				uri: 'spotify:track:0J1IJsMbKWb5g2sJArTkGF',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 209083,
+				explicit: false,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/7M8eZBRTD9QNasEVReEM0H',
+				},
+				href: 'https://api.spotify.com/v1/tracks/7M8eZBRTD9QNasEVReEM0H',
+				id: '7M8eZBRTD9QNasEVReEM0H',
+				name: 'IGYEIH',
+				preview_url: null,
+				track_number: 10,
+				type: 'track',
+				uri: 'spotify:track:7M8eZBRTD9QNasEVReEM0H',
+				is_local: false,
+			},
+			{
+				artists: [
+					{
+						external_urls: {
+							spotify: 'https://open.spotify.com/artist/6XyY86QOPPrYVGvF9ch6wz',
+						},
+						href: 'https://api.spotify.com/v1/artists/6XyY86QOPPrYVGvF9ch6wz',
+						id: '6XyY86QOPPrYVGvF9ch6wz',
+						name: 'Linkin Park',
+						type: 'artist',
+						uri: 'spotify:artist:6XyY86QOPPrYVGvF9ch6wz',
+					},
+				],
+				available_markets,
+				disc_number: 1,
+				duration_ms: 209844,
+				explicit: true,
+				external_urls: {
+					spotify: 'https://open.spotify.com/track/6aCBjSb87RizdH8lVBIRW7',
+				},
+				href: 'https://api.spotify.com/v1/tracks/6aCBjSb87RizdH8lVBIRW7',
+				id: '6aCBjSb87RizdH8lVBIRW7',
+				name: 'Good Things Go',
+				preview_url: null,
+				track_number: 11,
+				type: 'track',
+				uri: 'spotify:track:6aCBjSb87RizdH8lVBIRW7',
+				is_local: false,
+			},
+		],
+	},
+	copyrights: [
+		{
+			text: '© 2024 Linkin Park, LLC under exclusive license to Warner Records Inc.',
+			type: 'C',
+		},
+		{
+			text: '℗ 2024 Linkin Park, LLC under exclusive license to Warner Records Inc.',
+			type: 'P',
+		},
+	],
+	external_ids: {
+		upc: '093624839811',
+	},
+	genres: [],
+	label: 'Warner Records',
+	popularity: 91,
+};
diff --git a/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts b/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts
new file mode 100644
index 0000000000..393fd511b4
--- /dev/null
+++ b/packages/nodes-base/nodes/Spotify/__tests__/workflow/workflow.test.ts
@@ -0,0 +1,46 @@
+import nock from 'nock';
+
+import {
+	getAlbum,
+	getAlbumTracks,
+	getArtist,
+	getNewReleases,
+	searchForAlbum,
+} from './apiResponses';
+import {
+	setup,
+	equalityTest,
+	workflowToTests,
+	getWorkflowFilenames,
+} from '../../../../test/nodes/Helpers';
+
+describe('Spotify', () => {
+	describe('Run workflow', () => {
+		const workflows = getWorkflowFilenames(__dirname);
+		const tests = workflowToTests(workflows);
+
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			const mock = nock('https://api.spotify.com/v1');
+			mock
+				.get('/search')
+				.query({ q: 'From Xero', type: 'album', limit: 2 })
+				.reply(200, searchForAlbum);
+			mock.get('/browse/new-releases').query({ limit: 2 }).reply(200, getNewReleases);
+			mock.get('/albums/4R6FV9NSzhPihHR0h4pI93/tracks').reply(200, getAlbumTracks);
+			mock.get('/albums/4R6FV9NSzhPihHR0h4pI93').reply(200, getAlbum);
+			mock.get('/artists/12Chz98pHFMPJEknJQMWvI').reply(200, getArtist);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const nodeTypes = setup(tests);
+
+		for (const testData of tests) {
+			test(testData.description, async () => await equalityTest(testData, nodeTypes));
+		}
+	});
+});
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
index 24ad710612..e599515315 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
@@ -1,9 +1,10 @@
-import path from 'path';
 import { readFileSync } from 'fs';
 import type { IWorkflowBase } from 'n8n-workflow';
+import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Execute Spreadsheet File Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
index 99c7cc80bb..e575c756b1 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v1/SpreadsheetFileV1.node.ts
@@ -7,7 +7,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import type {
 	JSON2SheetOpts,
 	ParsingOptions,
@@ -22,6 +21,9 @@ import {
 	write as xlsxWrite,
 } from 'xlsx';
 
+import { oldVersionNotice } from '@utils/descriptions';
+import { flattenObject, generatePairedItemData } from '@utils/utilities';
+
 import {
 	operationProperty,
 	binaryProperty,
@@ -29,8 +31,6 @@ import {
 	fromFileOptions,
 	toFileOptions,
 } from '../description';
-import { flattenObject, generatePairedItemData } from '@utils/utilities';
-import { oldVersionNotice } from '@utils/descriptions';
 
 export class SpreadsheetFileV1 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
index 4694c3efa9..20c885ab06 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/SpreadsheetFileV2.node.ts
@@ -7,9 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { operationProperty } from '../description';
 import * as fromFile from './fromFile.operation';
 import * as toFile from './toFile.operation';
+import { operationProperty } from '../description';
 
 export class SpreadsheetFileV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts
index 719faeb478..7ec6ae2b68 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/fromFile.operation.ts
@@ -1,10 +1,9 @@
+import { parse as createCSVParser } from 'csv-parse';
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
-
 import type { Sheet2JSONOpts, WorkBook, ParsingOptions } from 'xlsx';
 import { read as xlsxRead, readFile as xlsxReadFile, utils as xlsxUtils } from 'xlsx';
 
-import { parse as createCSVParser } from 'csv-parse';
 import { binaryProperty, fromFileOptions } from '../description';
 
 export const description: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
index 61f8f8509e..d89d1e9c23 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/v2/toFile.operation.ts
@@ -1,9 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
 
-import { toFileOptions, toFileProperties } from '../description';
-import { generatePairedItemData } from '@utils/utilities';
 import type { JsonToSpreadsheetBinaryFormat, JsonToSpreadsheetBinaryOptions } from '@utils/binary';
 import { convertJsonToSpreadsheetBinary } from '@utils/binary';
+import { generatePairedItemData } from '@utils/utilities';
+
+import { toFileOptions, toFileProperties } from '../description';
 
 export const description: INodeProperties[] = [...toFileProperties, toFileOptions];
 
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index 322e53bd75..7c856f967e 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -1,5 +1,4 @@
 import { writeFile } from 'fs/promises';
-import type { Readable } from 'stream';
 import type {
 	ICredentialTestFunctions,
 	ICredentialsDecrypted,
@@ -11,11 +10,11 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
-import { file as tmpFile } from 'tmp-promise';
-
 import type { Config } from 'node-ssh';
 import { NodeSSH } from 'node-ssh';
+import type { Readable } from 'stream';
+import { file as tmpFile } from 'tmp-promise';
+
 import { formatPrivateKey } from '@utils/utilities';
 
 async function resolveHomeDir(
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index 72c9ef4a18..f9b54e2a87 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -7,9 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { generatePairedItemData } from '../../utils/utilities';
 import type { IRecord } from './GenericFunction';
 import { apiRequest, apiRequestAllItems } from './GenericFunction';
+import { generatePairedItemData } from '../../utils/utilities';
 
 export class Stackby implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts b/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts
index 4cc003fa7f..32066af72c 100644
--- a/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts
+++ b/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import { NodeConnectionType, type IDataObject } from 'n8n-workflow';
-import type { WorkflowTestData } from '@test/nodes/types';
+
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
+import type { WorkflowTestData } from '@test/nodes/types';
 
 describe('Execute Stop and Error Node', () => {
 	const tests: WorkflowTestData[] = [
diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
index c921e6a26d..488a333bb8 100644
--- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
+++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
@@ -10,9 +10,7 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { storyblokApiRequest, storyblokApiRequestAllItems } from './GenericFunctions';
-
 import { storyContentFields, storyContentOperations } from './StoryContentDescription';
-
 import { storyManagementFields, storyManagementOperations } from './StoryManagementDescription';
 
 export class Storyblok implements INodeType {
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index c3ff781b6f..5980e16dfc 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -11,6 +11,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
+import { entryFields, entryOperations } from './EntryDescription';
 import {
 	getToken,
 	removeTrailingSlash,
@@ -19,8 +20,6 @@ import {
 	validateJSON,
 } from './GenericFunctions';
 
-import { entryFields, entryOperations } from './EntryDescription';
-
 export class Strapi implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Strapi',
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index 48f01c78f5..e613945ced 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,10 +8,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { stravaApiRequest, stravaApiRequestAllItems } from './GenericFunctions';
-
 import { activityFields, activityOperations } from './ActivityDescription';
+import { stravaApiRequest, stravaApiRequestAllItems } from './GenericFunctions';
 
 export class Strava implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
index 2c8b3042a1..61435fada5 100644
--- a/packages/nodes-base/nodes/Stripe/Stripe.node.ts
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
@@ -1,3 +1,4 @@
+import isEmpty from 'lodash/isEmpty';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,17 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import isEmpty from 'lodash/isEmpty';
-
-import {
-	adjustChargeFields,
-	adjustCustomerFields,
-	adjustMetadata,
-	handleListing,
-	loadResource,
-	stripeApiRequest,
-} from './helpers';
-
 import {
 	balanceOperations,
 	chargeFields,
@@ -35,6 +25,14 @@ import {
 	tokenFields,
 	tokenOperations,
 } from './descriptions';
+import {
+	adjustChargeFields,
+	adjustCustomerFields,
+	adjustMetadata,
+	handleListing,
+	loadResource,
+	stripeApiRequest,
+} from './helpers';
 
 export class Stripe implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
index 929da0ad30..eac85e6232 100644
--- a/packages/nodes-base/nodes/Supabase/Supabase.node.ts
+++ b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
@@ -21,7 +21,6 @@ import {
 	supabaseApiRequest,
 	validateCredentials,
 } from './GenericFunctions';
-
 import { rowFields, rowOperations } from './RowDescription';
 
 export type FieldsUiValues = Array<{
@@ -124,14 +123,16 @@ export class Supabase implements INodeType {
 		const items = this.getInputData();
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
-		const qs: IDataObject = {};
+		let qs: IDataObject = {};
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 
 		if (resource === 'row') {
+			const tableId = this.getNodeParameter('tableId', 0) as string;
+
 			if (operation === 'create') {
 				const records: IDataObject[] = [];
-				const tableId = this.getNodeParameter('tableId', 0) as string;
+
 				for (let i = 0; i < length; i++) {
 					const record: IDataObject = {};
 					const dataToSend = this.getNodeParameter('dataToSend', 0) as
@@ -185,7 +186,6 @@ export class Supabase implements INodeType {
 			}
 
 			if (operation === 'delete') {
-				const tableId = this.getNodeParameter('tableId', 0) as string;
 				const filterType = this.getNodeParameter('filterType', 0) as string;
 				for (let i = 0; i < length; i++) {
 					let endpoint = `/${tableId}`;
@@ -241,7 +241,6 @@ export class Supabase implements INodeType {
 			}
 
 			if (operation === 'get') {
-				const tableId = this.getNodeParameter('tableId', 0) as string;
 				const endpoint = `/${tableId}`;
 
 				for (let i = 0; i < length; i++) {
@@ -281,19 +280,21 @@ export class Supabase implements INodeType {
 			}
 
 			if (operation === 'getAll') {
-				const tableId = this.getNodeParameter('tableId', 0) as string;
 				const returnAll = this.getNodeParameter('returnAll', 0);
 				const filterType = this.getNodeParameter('filterType', 0) as string;
+
 				let endpoint = `/${tableId}`;
 				for (let i = 0; i < length; i++) {
+					qs = {}; // reset qs
+
 					if (filterType === 'manual') {
 						const matchType = this.getNodeParameter('matchType', 0) as string;
 						const keys = this.getNodeParameter('filters.conditions', i, []) as IDataObject[];
 
 						if (keys.length !== 0) {
 							if (matchType === 'allFilters') {
-								const data = keys.reduce((obj, value) => buildQuery(obj, value), {});
-								Object.assign(qs, data);
+								const data = keys.map((key) => buildOrQuery(key));
+								Object.assign(qs, { and: `(${data.join(',')})` });
 							}
 							if (matchType === 'anyFilter') {
 								const data = keys.map((key) => buildOrQuery(key));
@@ -342,7 +343,6 @@ export class Supabase implements INodeType {
 			}
 
 			if (operation === 'update') {
-				const tableId = this.getNodeParameter('tableId', 0) as string;
 				const filterType = this.getNodeParameter('filterType', 0) as string;
 				let endpoint = `/${tableId}`;
 				for (let i = 0; i < length; i++) {
diff --git a/packages/nodes-base/nodes/Supabase/tests/Supabase.node.test.ts b/packages/nodes-base/nodes/Supabase/tests/Supabase.node.test.ts
new file mode 100644
index 0000000000..f786426b3d
--- /dev/null
+++ b/packages/nodes-base/nodes/Supabase/tests/Supabase.node.test.ts
@@ -0,0 +1,99 @@
+import { mock } from 'jest-mock-extended';
+import { get } from 'lodash';
+import {
+	type IDataObject,
+	type IExecuteFunctions,
+	type IGetNodeParameterOptions,
+	type INodeExecutionData,
+	type IPairedItemData,
+	NodeOperationError,
+} from 'n8n-workflow';
+
+import * as utils from '../GenericFunctions';
+import { Supabase } from '../Supabase.node';
+
+describe('Test Supabase Node', () => {
+	const node = new Supabase();
+
+	const input = [{ json: {} }];
+
+	const createMockExecuteFunction = (
+		nodeParameters: IDataObject,
+		continueOnFail: boolean = false,
+	) => {
+		const fakeExecuteFunction = {
+			getNodeParameter(
+				parameterName: string,
+				itemIndex: number,
+				fallbackValue?: IDataObject | undefined,
+				options?: IGetNodeParameterOptions | undefined,
+			) {
+				const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+
+				const parameterValue = get(nodeParameters, parameter, fallbackValue);
+
+				if ((parameterValue as IDataObject)?.nodeOperationError) {
+					throw new NodeOperationError(mock(), 'Get Options Error', { itemIndex });
+				}
+
+				return parameterValue;
+			},
+			getNode() {
+				return node;
+			},
+			continueOnFail: () => continueOnFail,
+			getInputData: () => input,
+			helpers: {
+				constructExecutionMetaData: (
+					_inputData: INodeExecutionData[],
+					_options: { itemData: IPairedItemData | IPairedItemData[] },
+				) => [],
+				returnJsonArray: (_jsonData: IDataObject | IDataObject[]) => [],
+			},
+		} as unknown as IExecuteFunctions;
+		return fakeExecuteFunction;
+	};
+
+	it('should allow filtering on the same field multiple times', async () => {
+		const supabaseApiRequest = jest
+			.spyOn(utils, 'supabaseApiRequest')
+			.mockImplementation(async () => {
+				return [];
+			});
+
+		const fakeExecuteFunction = createMockExecuteFunction({
+			resource: 'row',
+			operation: 'getAll',
+			returnAll: true,
+			filterType: 'manual',
+			matchType: 'allFilters',
+			tableId: 'my_table',
+			filters: {
+				conditions: [
+					{
+						condition: 'gt',
+						keyName: 'created_at',
+						keyValue: '2025-01-02 08:03:43.952051+00',
+					},
+					{
+						condition: 'lt',
+						keyName: 'created_at',
+						keyValue: '2025-01-02 08:07:36.102231+00',
+					},
+				],
+			},
+		});
+
+		await node.execute.call(fakeExecuteFunction);
+
+		expect(supabaseApiRequest).toHaveBeenCalledWith(
+			'GET',
+			'/my_table',
+			{},
+			{
+				and: '(created_at.gt.2025-01-02 08:03:43.952051+00,created_at.lt.2025-01-02 08:07:36.102231+00)',
+				offset: 0,
+			},
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 264b7eb314..6f3fcf2f91 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -13,7 +13,6 @@ import type {
 import { deepCopy, jsonParse, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { idsExist, surveyMonkeyApiRequest, surveyMonkeyRequestAllItems } from './GenericFunctions';
-
 import type { IAnswer, IChoice, IOther, IQuestion, IRow } from './Interfaces';
 
 export class SurveyMonkeyTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
index ccc634597b..6cfe758601 100644
--- a/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
+++ b/packages/nodes-base/nodes/Switch/V3/SwitchV3.node.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -10,11 +11,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { ApplicationError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
+
+import { capitalize } from '@utils/utilities';
+
 import { ENABLE_LESS_STRICT_TYPE_VALIDATION } from '../../../utils/constants';
 import { looseTypeValidationProperty } from '../../../utils/descriptions';
 import { getTypeValidationParameter, getTypeValidationStrictness } from '../../If/V2/utils';
-import { capitalize } from '@utils/utilities';
 
 const configuredOutputs = (parameters: INodeParameters) => {
 	const mode = parameters.mode as string;
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
index 18f6568d04..a8bf3b59af 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
@@ -9,9 +9,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import { router } from './actions/router';
 import { versionDescription } from './actions/versionDescription';
 import { loadOptions } from './methods';
-import { router } from './actions/router';
 import { validateCredentials } from './transport';
 
 export class SyncroMspV1 implements INodeType {
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/description.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/description.ts
index 69a0dc8448..25a1dcae3c 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/description.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/description.ts
@@ -1,6 +1,5 @@
-import type { ContactProperties } from '../../Interfaces';
-
 import { addressFixedCollection } from '../../../methods/sharedFields';
+import type { ContactProperties } from '../../Interfaces';
 
 export const contactCreateDescription: ContactProperties = [
 	{
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/index.ts
index 37a8c233e9..8d29244729 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/index.ts
@@ -1,4 +1,4 @@
-import { createContact as execute } from './execute';
 import { contactCreateDescription as description } from './description';
+import { createContact as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/index.ts
index 59582e0e22..168905dbcb 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/index.ts
@@ -1,4 +1,4 @@
-import { deleteContact as execute } from './execute';
 import { contactDeleteDescription as description } from './description';
+import { deleteContact as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/index.ts
index e5e9388e5f..ad369cda9b 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/index.ts
@@ -1,4 +1,4 @@
-import { getContact as execute } from './execute';
 import { contactGetDescription as description } from './description';
+import { getContact as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/index.ts
index d6471c173d..5c1817412f 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { contactGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
index 92652e7bac..cf82ea1390 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/index.ts
@@ -1,9 +1,10 @@
 import type { INodeProperties } from 'n8n-workflow';
-import * as getAll from './getAll';
+
 import * as create from './create';
-import * as get from './get';
-import * as update from './update';
 import * as del from './del';
+import * as get from './get';
+import * as getAll from './getAll';
+import * as update from './update';
 
 export { getAll, create, del as delete, update, get };
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/description.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/description.ts
index ae805a1a8c..133c2a6327 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/description.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/description.ts
@@ -1,6 +1,5 @@
-import type { ContactProperties } from '../../Interfaces';
-
 import { addressFixedCollection } from '../../../methods/sharedFields';
+import type { ContactProperties } from '../../Interfaces';
 
 export const contactUpdateDescription: ContactProperties = [
 	{
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/index.ts
index 55a3a16158..748a0d7780 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/index.ts
@@ -1,4 +1,4 @@
-import { updateContact as execute } from './execute';
 import { contactUpdateDescription as description } from './description';
+import { updateContact as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/description.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/description.ts
index a7353e5fe9..641b6f0dae 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/description.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/description.ts
@@ -1,6 +1,5 @@
-import type { CustomerProperties } from '../../Interfaces';
-
 import { addressFixedCollection } from '../../../methods/sharedFields';
+import type { CustomerProperties } from '../../Interfaces';
 
 export const customerCreateDescription: CustomerProperties = [
 	{
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/index.ts
index 2d14aaa37a..58490575c3 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/index.ts
@@ -1,4 +1,4 @@
-import { addCustomer as execute } from './execute';
 import { customerCreateDescription as description } from './description';
+import { addCustomer as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/index.ts
index b2a8983763..41e70e438c 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/index.ts
@@ -1,4 +1,4 @@
-import { deleteCustomer as execute } from './execute';
 import { customerDeleteDescription as description } from './description';
+import { deleteCustomer as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/index.ts
index bbe397550b..e4e98c2829 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/index.ts
@@ -1,4 +1,4 @@
-import { getCustomer as execute } from './execute';
 import { customerGetDescription as description } from './description';
+import { getCustomer as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/index.ts
index 974c0543b3..f1ef5c8696 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { customerGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts
index be3c8fd202..461649d884 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/index.ts
@@ -1,9 +1,10 @@
 import type { INodeProperties } from 'n8n-workflow';
-import * as getAll from './getAll';
+
 import * as create from './create';
 import * as del from './del';
-import * as update from './update';
 import * as get from './get';
+import * as getAll from './getAll';
+import * as update from './update';
 
 export { getAll, create, del as delete, update, get };
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/description.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/description.ts
index 380aa0e9dd..e97f0b0c47 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/description.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/description.ts
@@ -1,6 +1,5 @@
-import type { CustomerProperties } from '../../Interfaces';
-
 import { addressFixedCollection } from '../../../methods/sharedFields';
+import type { CustomerProperties } from '../../Interfaces';
 
 export const customerUpdateDescription: CustomerProperties = [
 	{
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/index.ts
index 145cbcc32b..506191d3a1 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/index.ts
@@ -1,4 +1,4 @@
-import { updateCustomer as execute } from './execute';
 import { customerUpdateDescription as description } from './description';
+import { updateCustomer as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/index.ts
index 6b44825e55..35c2f00e85 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/index.ts
@@ -1,4 +1,4 @@
-import { addAlert as execute } from './execute';
 import { rmmCreateDescription as description } from './description';
+import { addAlert as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/index.ts
index cfedcddc59..5e3e5f5c77 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/index.ts
@@ -1,4 +1,4 @@
-import { deleteAlert as execute } from './execute';
 import { rmmDeleteDescription as description } from './description';
+import { deleteAlert as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/index.ts
index df6bf2174c..6f870e9ed5 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/index.ts
@@ -1,4 +1,4 @@
-import { getAlert as execute } from './execute';
 import { rmmGetDescription as description } from './description';
+import { getAlert as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/index.ts
index ad77601d55..1e08b22825 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { rmmGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts
index 5eaeaf3ec3..ea16363f51 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
-import * as get from './get';
-import * as getAll from './getAll';
+
 import * as create from './create';
 import * as del from './del';
+import * as get from './get';
+import * as getAll from './getAll';
 import * as mute from './mute';
 
 export { getAll, get, mute, del as delete, create };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/index.ts
index d39e22fffb..7c42ee4df2 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/index.ts
@@ -1,4 +1,4 @@
-import { muteAlert as execute } from './execute';
 import { rmmMuteDescription as description } from './description';
+import { muteAlert as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
index 3b5a5b3210..e69c37e532 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
@@ -1,12 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import * as customer from './customer';
-import * as ticket from './ticket';
 import * as contact from './contact';
-import * as rmm from './rmm';
-
+import * as customer from './customer';
 import type { SyncroMsp } from './Interfaces';
+import * as rmm from './rmm';
+import * as ticket from './ticket';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	const items = this.getInputData();
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/index.ts
index 0a3b178def..88fc8bd1ec 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/index.ts
@@ -1,4 +1,4 @@
-import { createTicket as execute } from './execute';
 import { ticketCreateDescription as description } from './description';
+import { createTicket as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/index.ts
index 8919e1726f..c67a6d1c34 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/index.ts
@@ -1,4 +1,4 @@
-import { deleteTicket as execute } from './execute';
 import { ticketDeleteDescription as description } from './description';
+import { deleteTicket as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/index.ts
index 530eec20d8..1a77b36563 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/index.ts
@@ -1,4 +1,4 @@
-import { getTicket as execute } from './execute';
 import { ticketGetDescription as description } from './description';
+import { getTicket as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/index.ts
index 93420f25d4..116e1a925f 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/index.ts
@@ -1,4 +1,4 @@
-import { getAll as execute } from './execute';
 import { ticketGetAllDescription as description } from './description';
+import { getAll as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
index 49dfc1d67c..b9a98c1a0a 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/index.ts
@@ -1,8 +1,9 @@
 import type { INodeProperties } from 'n8n-workflow';
-import * as getAll from './getAll';
+
 import * as create from './create';
-import * as get from './get';
 import * as del from './del';
+import * as get from './get';
+import * as getAll from './getAll';
 import * as update from './update';
 
 export { getAll, create, get, del as delete, update };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/index.ts
index 98547072fe..5cc0fdf169 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/index.ts
@@ -1,4 +1,4 @@
-import { updateTicket as execute } from './execute';
 import { ticketUpdateDescription as description } from './description';
+import { updateTicket as execute } from './execute';
 
 export { description, execute };
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/versionDescription.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/versionDescription.ts
index cfb9711917..c112fe9ec5 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/versionDescription.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/versionDescription.ts
@@ -1,10 +1,10 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import { NodeConnectionType, type INodeTypeDescription } from 'n8n-workflow';
 
-import * as customer from './customer';
-import * as ticket from './ticket';
 import * as contact from './contact';
+import * as customer from './customer';
 import * as rmm from './rmm';
+import * as ticket from './ticket';
 
 export const versionDescription: INodeTypeDescription = {
 	displayName: 'SyncroMSP',
diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
index d01e36cdd4..70c6f70b55 100644
--- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -1,5 +1,4 @@
 import { createHash } from 'crypto';
-
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.ts b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
index d49be81d24..d27502ffd3 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.ts
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
@@ -9,14 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import {
-	getVersionForUpdate,
-	handleListing,
-	taigaApiRequest,
-	throwOnEmptyUpdate,
-	toOptions,
-} from './GenericFunctions';
-
 import {
 	epicFields,
 	epicOperations,
@@ -27,6 +19,13 @@ import {
 	userStoryFields,
 	userStoryOperations,
 } from './descriptions';
+import {
+	getVersionForUpdate,
+	handleListing,
+	taigaApiRequest,
+	throwOnEmptyUpdate,
+	toOptions,
+} from './GenericFunctions';
 
 export class Taiga implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
index 87c3bb8bcb..fd6e958477 100644
--- a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
@@ -10,15 +10,12 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { affiliateFields, affiliateOperations } from './AffiliateDescription';
-
 import {
 	affiliateMetadataFields,
 	affiliateMetadataOperations,
 } from './AffiliateMetadataDescription';
-
-import { programAffiliateFields, programAffiliateOperations } from './ProgramAffiliateDescription';
-
 import { tapfiliateApiRequest, tapfiliateApiRequestAllItems } from './GenericFunctions';
+import { programAffiliateFields, programAffiliateOperations } from './ProgramAffiliateDescription';
 
 export class Tapfiliate implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 5ae67465bf..7d1d37b09f 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -1,5 +1,3 @@
-import type { Readable } from 'stream';
-
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -9,9 +7,10 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
-import { appendAttributionOption } from '../../utils/descriptions';
 import { addAdditionalFields, apiRequest, getPropertyName } from './GenericFunctions';
+import { appendAttributionOption } from '../../utils/descriptions';
 
 export class Telegram implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index aec3dc4dc4..85752afbeb 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -10,7 +10,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { apiRequest, getImageBySize, getSecretToken } from './GenericFunctions';
-
 import type { IEvent } from './IEvent';
 
 export class TelegramTrigger implements INodeType {
@@ -238,7 +237,10 @@ export class TelegramTrigger implements INodeType {
 			const headerSecretBuffer = Buffer.from(
 				String(headerData['x-telegram-bot-api-secret-token'] ?? ''),
 			);
-			if (!crypto.timingSafeEqual(secretBuffer, headerSecretBuffer)) {
+			if (
+				secretBuffer.byteLength !== headerSecretBuffer.byteLength ||
+				!crypto.timingSafeEqual(secretBuffer, headerSecretBuffer)
+			) {
 				const res = this.getResponseObject();
 				res.status(403).json({ message: 'Provided secret is not valid' });
 				return {
@@ -276,7 +278,7 @@ export class TelegramTrigger implements INodeType {
 					) as IDataObject;
 
 					// When the image is sent from the desktop app telegram does not resize the image
-					// So return the only image avaiable
+					// So return the only image available
 					// Basically the Image Size parameter would work just when the images comes from the mobile app
 					if (image === undefined) {
 						image = bodyData[key]!.photo![0];
diff --git a/packages/nodes-base/nodes/Telegram/tests/GenericFunctions.test.ts b/packages/nodes-base/nodes/Telegram/tests/GenericFunctions.test.ts
new file mode 100644
index 0000000000..12f73b6d60
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/tests/GenericFunctions.test.ts
@@ -0,0 +1,335 @@
+import {
+	NodeApiError,
+	type IDataObject,
+	type IExecuteFunctions,
+	type IHookFunctions,
+	type IHttpRequestMethods,
+	type ILoadOptionsFunctions,
+	type IWebhookFunctions,
+} from 'n8n-workflow';
+
+import {
+	addAdditionalFields,
+	apiRequest,
+	getPropertyName,
+	getSecretToken,
+} from '../GenericFunctions';
+
+describe('Telegram > GenericFunctions', () => {
+	describe('apiRequest', () => {
+		let mockThis: IHookFunctions & IExecuteFunctions & ILoadOptionsFunctions & IWebhookFunctions;
+		const credentials = { baseUrl: 'https://api.telegram.org', accessToken: 'testToken' };
+		beforeEach(() => {
+			mockThis = {
+				getCredentials: jest.fn(),
+				helpers: {
+					request: jest.fn(),
+				},
+				getNode: jest.fn(),
+			} as unknown as IHookFunctions &
+				IExecuteFunctions &
+				ILoadOptionsFunctions &
+				IWebhookFunctions;
+
+			jest.clearAllMocks();
+		});
+
+		it('should make a successful API request', async () => {
+			const method: IHttpRequestMethods = 'POST';
+			const endpoint = 'sendMessage';
+			const body: IDataObject = { text: 'Hello, world!' };
+			const query: IDataObject = { chat_id: '12345' };
+			const option: IDataObject = { headers: { 'Custom-Header': 'value' } };
+
+			(mockThis.getCredentials as jest.Mock).mockResolvedValue(credentials);
+			(mockThis.helpers.request as jest.Mock).mockResolvedValue({ success: true });
+
+			const result = await apiRequest.call(mockThis, method, endpoint, body, query, option);
+
+			expect(mockThis.getCredentials).toHaveBeenCalledWith('telegramApi');
+			expect(mockThis.helpers.request).toHaveBeenCalledWith({
+				headers: { 'Custom-Header': 'value' },
+				method: 'POST',
+				uri: 'https://api.telegram.org/bottestToken/sendMessage',
+				body: { text: 'Hello, world!' },
+				qs: { chat_id: '12345' },
+				json: true,
+			});
+			expect(result).toEqual({ success: true });
+		});
+
+		it('should handle an API request with no body and query', async () => {
+			const method: IHttpRequestMethods = 'GET';
+			const endpoint = 'getMe';
+			const body: IDataObject = {};
+			const query: IDataObject = {};
+
+			(mockThis.getCredentials as jest.Mock).mockResolvedValue(credentials);
+			(mockThis.helpers.request as jest.Mock).mockResolvedValue({ success: true });
+
+			const result = await apiRequest.call(mockThis, method, endpoint, body, query);
+
+			expect(mockThis.getCredentials).toHaveBeenCalledWith('telegramApi');
+			expect(mockThis.helpers.request).toHaveBeenCalledWith({
+				headers: {},
+				method: 'GET',
+				uri: 'https://api.telegram.org/bottestToken/getMe',
+				json: true,
+			});
+			expect(result).toEqual({ success: true });
+		});
+
+		it('should handle an API request with no additional options', async () => {
+			const method: IHttpRequestMethods = 'POST';
+			const endpoint = 'sendMessage';
+			const body: IDataObject = { text: 'Hello, world!' };
+
+			(mockThis.getCredentials as jest.Mock).mockResolvedValue(credentials);
+			(mockThis.helpers.request as jest.Mock).mockResolvedValue({ success: true });
+
+			const result = await apiRequest.call(mockThis, method, endpoint, body);
+
+			expect(mockThis.getCredentials).toHaveBeenCalledWith('telegramApi');
+			expect(mockThis.helpers.request).toHaveBeenCalledWith({
+				headers: {},
+				method: 'POST',
+				uri: 'https://api.telegram.org/bottestToken/sendMessage',
+				body: { text: 'Hello, world!' },
+				json: true,
+			});
+			expect(result).toEqual({ success: true });
+		});
+
+		it('should throw a NodeApiError on request failure', async () => {
+			const method: IHttpRequestMethods = 'POST';
+			const endpoint = 'sendMessage';
+			const body: IDataObject = { text: 'Hello, world!' };
+
+			(mockThis.getCredentials as jest.Mock).mockResolvedValue(credentials);
+			(mockThis.helpers.request as jest.Mock).mockRejectedValue(new Error('Request failed'));
+
+			await expect(apiRequest.call(mockThis, method, endpoint, body)).rejects.toThrow(NodeApiError);
+
+			expect(mockThis.getCredentials).toHaveBeenCalledWith('telegramApi');
+			expect(mockThis.helpers.request).toHaveBeenCalledWith({
+				headers: {},
+				method: 'POST',
+				uri: 'https://api.telegram.org/bottestToken/sendMessage',
+				body: { text: 'Hello, world!' },
+				json: true,
+			});
+		});
+	});
+	describe('addAdditionalFields', () => {
+		let mockThis: IExecuteFunctions;
+
+		beforeEach(() => {
+			mockThis = {
+				getNodeParameter: jest.fn(),
+			} as unknown as IExecuteFunctions;
+
+			jest.clearAllMocks();
+		});
+
+		it('should add additional fields and attribution for sendMessage operation', () => {
+			const body: IDataObject = { text: 'Hello, world!' };
+			const index = 0;
+			const nodeVersion = 1.1;
+			const instanceId = '45';
+
+			(mockThis.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+				switch (paramName) {
+					case 'operation':
+						return 'sendMessage';
+					case 'additionalFields':
+						return { appendAttribution: true };
+					case 'replyMarkup':
+						return 'none';
+					default:
+						return '';
+				}
+			});
+
+			addAdditionalFields.call(mockThis, body, index, nodeVersion, instanceId);
+
+			expect(body).toEqual({
+				text: 'Hello, world!\n\n_This message was sent automatically with _[n8n](https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.telegram_45)',
+				parse_mode: 'Markdown',
+				disable_web_page_preview: true,
+			});
+		});
+
+		it('should add reply markup for inlineKeyboard', () => {
+			const body: IDataObject = { text: 'Hello, world!' };
+			const index = 0;
+
+			(mockThis.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+				switch (paramName) {
+					case 'operation':
+						return 'sendMessage';
+					case 'additionalFields':
+						return {};
+					case 'replyMarkup':
+						return 'inlineKeyboard';
+					case 'inlineKeyboard':
+						return {
+							rows: [
+								{
+									row: {
+										buttons: [
+											{ text: 'Button 1', additionalFields: { url: 'https://example.com' } },
+											{ text: 'Button 2' },
+										],
+									},
+								},
+							],
+						};
+					default:
+						return '';
+				}
+			});
+
+			addAdditionalFields.call(mockThis, body, index);
+
+			expect(body).toEqual({
+				text: 'Hello, world!',
+				disable_web_page_preview: true,
+				parse_mode: 'Markdown',
+				reply_markup: {
+					inline_keyboard: [
+						[{ text: 'Button 1', url: 'https://example.com' }, { text: 'Button 2' }],
+					],
+				},
+			});
+		});
+
+		it('should add reply markup for forceReply', () => {
+			const body: IDataObject = { text: 'Hello, world!' };
+			const index = 0;
+
+			(mockThis.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+				switch (paramName) {
+					case 'operation':
+						return 'sendMessage';
+					case 'additionalFields':
+						return {};
+					case 'replyMarkup':
+						return 'forceReply';
+					case 'forceReply':
+						return { force_reply: true };
+					default:
+						return '';
+				}
+			});
+
+			addAdditionalFields.call(mockThis, body, index);
+
+			expect(body).toEqual({
+				text: 'Hello, world!',
+				disable_web_page_preview: true,
+				parse_mode: 'Markdown',
+				reply_markup: { force_reply: true },
+			});
+		});
+
+		it('should add reply markup for replyKeyboardRemove', () => {
+			const body: IDataObject = { text: 'Hello, world!' };
+			const index = 0;
+
+			(mockThis.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+				switch (paramName) {
+					case 'operation':
+						return 'sendMessage';
+					case 'additionalFields':
+						return {};
+					case 'replyMarkup':
+						return 'replyKeyboardRemove';
+					case 'replyKeyboardRemove':
+						return { remove_keyboard: true };
+					default:
+						return '';
+				}
+			});
+
+			addAdditionalFields.call(mockThis, body, index);
+
+			expect(body).toEqual({
+				text: 'Hello, world!',
+				disable_web_page_preview: true,
+				parse_mode: 'Markdown',
+				reply_markup: { remove_keyboard: true },
+			});
+		});
+
+		it('should handle nodeVersion 1.2 and set disable_web_page_preview', () => {
+			const body: IDataObject = { text: 'Hello, world!' };
+			const index = 0;
+			const nodeVersion = 1.2;
+
+			(mockThis.getNodeParameter as jest.Mock).mockImplementation((paramName: string) => {
+				switch (paramName) {
+					case 'operation':
+						return 'sendMessage';
+					case 'additionalFields':
+						return {};
+					case 'replyMarkup':
+						return 'none';
+					default:
+						return '';
+				}
+			});
+
+			addAdditionalFields.call(mockThis, body, index, nodeVersion);
+
+			expect(body).toEqual({
+				disable_web_page_preview: true,
+				parse_mode: 'Markdown',
+				text: 'Hello, world!\n\n_This message was sent automatically with _[n8n](https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.telegram)',
+			});
+		});
+	});
+	describe('getPropertyName', () => {
+		it('should return the property name by removing "send" and converting to lowercase', () => {
+			expect(getPropertyName('sendMessage')).toBe('message');
+			expect(getPropertyName('sendEmail')).toBe('email');
+			expect(getPropertyName('sendNotification')).toBe('notification');
+		});
+
+		it('should return the original string in lowercase if it does not contain "send"', () => {
+			expect(getPropertyName('receiveMessage')).toBe('receivemessage');
+			expect(getPropertyName('fetchData')).toBe('fetchdata');
+		});
+
+		it('should return an empty string if the input is "send"', () => {
+			expect(getPropertyName('send')).toBe('');
+		});
+
+		it('should handle empty strings', () => {
+			expect(getPropertyName('')).toBe('');
+		});
+	});
+	describe('getSecretToken', () => {
+		const mockThis = {
+			getWorkflow: jest.fn().mockReturnValue({ id: 'workflow123' }),
+			getNode: jest.fn().mockReturnValue({ id: 'node123' }),
+		} as unknown as IHookFunctions & IWebhookFunctions;
+
+		beforeEach(() => {
+			jest.clearAllMocks();
+		});
+
+		it('should return a valid secret token', () => {
+			const secretToken = getSecretToken.call(mockThis);
+
+			expect(secretToken).toBe('workflow123_node123');
+		});
+
+		it('should remove invalid characters from the secret token', () => {
+			mockThis.getNode().id = 'node@123';
+			mockThis.getWorkflow().id = 'workflow#123';
+
+			const secretToken = getSecretToken.call(mockThis);
+			expect(secretToken).toBe('workflow123_node123');
+		});
+	});
+});
diff --git a/packages/nodes-base/nodes/Telegram/tests/Helpers.ts b/packages/nodes-base/nodes/Telegram/tests/Helpers.ts
new file mode 100644
index 0000000000..d5527cc4b0
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/tests/Helpers.ts
@@ -0,0 +1,37 @@
+import { get } from 'lodash';
+import type { IDataObject, IExecuteFunctions, IGetNodeParameterOptions, INode } from 'n8n-workflow';
+
+export const telegramNode: INode = {
+	id: 'b3039263-29ad-4476-9894-51dfcc5a706d',
+	name: 'Telegram node',
+	typeVersion: 1.2,
+	type: 'n8n-nodes-base.telegram',
+	position: [0, 0],
+	parameters: {
+		resource: 'callback',
+		operation: 'answerQuery',
+	},
+};
+
+export const createMockExecuteFunction = (nodeParameters: IDataObject) => {
+	const fakeExecuteFunction = {
+		getInputData() {
+			return [{ json: {} }];
+		},
+		getNodeParameter(
+			parameterName: string,
+			_itemIndex: number,
+			fallbackValue?: IDataObject | undefined,
+			options?: IGetNodeParameterOptions | undefined,
+		) {
+			const parameter = options?.extractValue ? `${parameterName}.value` : parameterName;
+			return get(nodeParameters, parameter, fallbackValue);
+		},
+		getNode() {
+			return telegramNode;
+		},
+		helpers: {},
+		continueOnFail: () => false,
+	} as unknown as IExecuteFunctions;
+	return fakeExecuteFunction;
+};
diff --git a/packages/nodes-base/nodes/Telegram/tests/Workflow/apiResponses.ts b/packages/nodes-base/nodes/Telegram/tests/Workflow/apiResponses.ts
new file mode 100644
index 0000000000..d0befde80c
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/tests/Workflow/apiResponses.ts
@@ -0,0 +1,399 @@
+export const getChatResponse = {
+	ok: true,
+	result: {
+		id: 123456789,
+		first_name: 'Nathan',
+		last_name: 'W',
+		username: 'n8n',
+		type: 'private',
+		active_usernames: ['n8n'],
+		bio: 'Automation',
+		has_private_forwards: true,
+		max_reaction_count: 11,
+		accent_color_id: 3,
+	},
+};
+
+export const sendMessageResponse = {
+	ok: true,
+	result: {
+		message_id: 40,
+		from: {
+			id: 9876543210,
+			is_bot: true,
+			first_name: '@n8n',
+			username: 'n8n_test_bot',
+		},
+		chat: {
+			id: 123456789,
+			first_name: 'Nathan',
+			last_name: 'W',
+			username: 'n8n',
+			type: 'private',
+		},
+		date: 1732960606,
+		text: 'a\n\nThis message was sent automatically with n8n',
+		entities: [
+			{
+				offset: 3,
+				length: 41,
+				type: 'italic',
+			},
+			{
+				offset: 44,
+				length: 3,
+				type: 'text_link',
+				url: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.telegram_8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd',
+			},
+		],
+		link_preview_options: {
+			is_disabled: true,
+		},
+	},
+};
+
+export const sendMediaGroupResponse = {
+	ok: true,
+	result: [
+		{
+			message_id: 41,
+			from: {
+				id: 9876543210,
+				is_bot: true,
+				first_name: '@n8n',
+				username: 'n8n_test_bot',
+			},
+			chat: {
+				id: 123456789,
+				first_name: 'Nathan',
+				last_name: 'W',
+				username: 'n8n',
+				type: 'private',
+			},
+			date: 1732963445,
+			photo: [
+				{
+					file_id:
+						'AgACAgQAAxkDAAMpZ0rsde8lw0E3xttFxGpPdwkExZIAAv21MRvcM11S26tCdFbflv4BAAMCAANzAAM2BA',
+					file_unique_id: 'AQAD_bUxG9wzXVJ4',
+					file_size: 919,
+					width: 90,
+					height: 24,
+				},
+				{
+					file_id:
+						'AgACAgQAAxkDAAMpZ0rsde8lw0E3xttFxGpPdwkExZIAAv21MRvcM11S26tCdFbflv4BAAMCAANtAAM2BA',
+					file_unique_id: 'AQAD_bUxG9wzXVJy',
+					file_size: 6571,
+					width: 320,
+					height: 87,
+				},
+				{
+					file_id:
+						'AgACAgQAAxkDAAMpZ0rsde8lw0E3xttFxGpPdwkExZIAAv21MRvcM11S26tCdFbflv4BAAMCAAN4AAM2BA',
+					file_unique_id: 'AQAD_bUxG9wzXVJ9',
+					file_size: 9639,
+					width: 458,
+					height: 124,
+				},
+			],
+		},
+	],
+};
+
+export const sendLocationMessageResponse = {
+	ok: true,
+	result: {
+		message_id: 42,
+		from: {
+			id: 9876543210,
+			is_bot: true,
+			first_name: '@n8n',
+			username: 'n8n_test_bot',
+		},
+		chat: {
+			id: 123456789,
+			first_name: 'Nathan',
+			last_name: 'W',
+			username: 'n8n',
+			type: 'private',
+		},
+		date: 1732963630,
+		reply_to_message: {
+			message_id: 40,
+			from: {
+				id: 9876543210,
+				is_bot: true,
+				first_name: '@n8n',
+				username: 'n8n_test_bot',
+			},
+			chat: {
+				id: 123456789,
+				first_name: 'Nathan',
+				last_name: 'W',
+				username: 'n8n',
+				type: 'private',
+			},
+			date: 1732960606,
+			text: 'a\n\nThis message was sent automatically with n8n',
+			entities: [
+				{
+					offset: 3,
+					length: 41,
+					type: 'italic',
+				},
+				{
+					offset: 44,
+					length: 3,
+					type: 'text_link',
+					url: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.telegram_8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd',
+				},
+			],
+			link_preview_options: {
+				is_disabled: true,
+			},
+		},
+		location: {
+			latitude: 0.00001,
+			longitude: 0.000003,
+		},
+	},
+};
+
+export const okTrueResponse = {
+	ok: true,
+	result: true,
+};
+
+export const sendStickerResponse = {
+	ok: true,
+	result: {
+		message_id: 44,
+		from: {
+			id: 9876543210,
+			is_bot: true,
+			first_name: '@n8n',
+			username: 'n8n_test_bot',
+		},
+		chat: {
+			id: 123456789,
+			first_name: 'Nathan',
+			last_name: 'W',
+			username: 'n8n',
+			type: 'private',
+		},
+		date: 1732965815,
+		document: {
+			file_name: '1_webp_ll.png',
+			mime_type: 'image/png',
+			thumbnail: {
+				file_id: 'AAMCBAADGQMAAyxnSvW31uMAAWa2AAFl0vD1zqc_3xXeAAIbBwACJ95cUvzVqVKE_cXTAQAHbQADNgQ',
+				file_unique_id: 'AQADGwcAAifeXFJy',
+				file_size: 12534,
+				width: 320,
+				height: 241,
+			},
+			thumb: {
+				file_id: 'AAMCBAADGQMAAyxnSvW31uMAAWa2AAFl0vD1zqc_3xXeAAIbBwACJ95cUvzVqVKE_cXTAQAHbQADNgQ',
+				file_unique_id: 'AQADGwcAAifeXFJy',
+				file_size: 12534,
+				width: 320,
+				height: 241,
+			},
+			file_id: 'BQACAgQAAxkDAAMsZ0r1t9bjAAFmtgABZdLw9c6nP98V3gACGwcAAifeXFL81alShP3F0zYE',
+			file_unique_id: 'AgADGwcAAifeXFI',
+			file_size: 122750,
+		},
+	},
+};
+
+export const editMessageTextResponse = {
+	ok: true,
+	result: {
+		message_id: 40,
+		from: {
+			id: 9876543210,
+			is_bot: true,
+			first_name: '@n8n',
+			username: 'n8n_test_bot',
+		},
+		chat: {
+			id: 123456789,
+			first_name: 'Nathan',
+			last_name: 'W',
+			username: 'n8n',
+			type: 'private',
+		},
+		date: 1732960606,
+		edit_date: 1732967008,
+		text: 'test',
+		reply_markup: {
+			inline_keyboard: [
+				[
+					{
+						text: 'foo',
+						callback_data: 'callback',
+					},
+					{
+						text: 'n8n',
+						url: 'https://n8n.io/',
+					},
+				],
+			],
+		},
+	},
+};
+
+export const chatAdministratorsResponse = {
+	ok: true,
+	result: [
+		{
+			user: {
+				id: 9876543210,
+				is_bot: true,
+				first_name: '@n8n',
+				username: 'n8n_test_bot',
+			},
+			status: 'administrator',
+			can_be_edited: false,
+			can_manage_chat: true,
+			can_change_info: true,
+			can_post_messages: true,
+			can_edit_messages: true,
+			can_delete_messages: true,
+			can_invite_users: true,
+			can_restrict_members: true,
+			can_promote_members: false,
+			can_manage_video_chats: true,
+			can_post_stories: true,
+			can_edit_stories: true,
+			can_delete_stories: true,
+			is_anonymous: false,
+			can_manage_voice_chats: true,
+		},
+		{
+			user: {
+				id: 123456789,
+				is_bot: false,
+				first_name: 'Nathan',
+				last_name: 'W',
+				username: 'n8n',
+				language_code: 'en',
+			},
+			status: 'creator',
+			is_anonymous: false,
+		},
+	],
+};
+
+export const sendAnimationMessageResponse = {
+	ok: true,
+	result: {
+		message_id: 45,
+		from: {
+			id: 9876543210,
+			is_bot: true,
+			first_name: '@n8n',
+			username: 'n8n_test_bot',
+		},
+		chat: {
+			id: 123456789,
+			first_name: 'Nathan',
+			last_name: 'W',
+			username: 'n8n',
+			type: 'private',
+		},
+		date: 1732968868,
+		animation: {
+			file_name: 'Telegram---Opening-Image.gif.mp4',
+			mime_type: 'video/mp4',
+			duration: 6,
+			width: 320,
+			height: 320,
+			thumbnail: {
+				file_id: 'AAMCBAADGQMAAy1nSwGkq99SDYaaS1VR0EMAAUrOw1cAAiYEAALzCVxR7jIYS8d3HycBAAdtAAM2BA',
+				file_unique_id: 'AQADJgQAAvMJXFFy',
+				file_size: 36480,
+				width: 320,
+				height: 320,
+			},
+			thumb: {
+				file_id: 'AAMCBAADGQMAAy1nSwGkq99SDYaaS1VR0EMAAUrOw1cAAiYEAALzCVxR7jIYS8d3HycBAAdtAAM2BA',
+				file_unique_id: 'AQADJgQAAvMJXFFy',
+				file_size: 36480,
+				width: 320,
+				height: 320,
+			},
+			file_id: 'CgACAgQAAxkDAAMtZ0sBpKvfUg2GmktVUdBDAAFKzsNXAAImBAAC8wlcUe4yGEvHdx8nNgQ',
+			file_unique_id: 'AgADJgQAAvMJXFE',
+			file_size: 309245,
+		},
+		document: {
+			file_name: 'Telegram---Opening-Image.gif.mp4',
+			mime_type: 'video/mp4',
+			thumbnail: {
+				file_id: 'AAMCBAADGQMAAy1nSwGkq99SDYaaS1VR0EMAAUrOw1cAAiYEAALzCVxR7jIYS8d3HycBAAdtAAM2BA',
+				file_unique_id: 'AQADJgQAAvMJXFFy',
+				file_size: 36480,
+				width: 320,
+				height: 320,
+			},
+			thumb: {
+				file_id: 'AAMCBAADGQMAAy1nSwGkq99SDYaaS1VR0EMAAUrOw1cAAiYEAALzCVxR7jIYS8d3HycBAAdtAAM2BA',
+				file_unique_id: 'AQADJgQAAvMJXFFy',
+				file_size: 36480,
+				width: 320,
+				height: 320,
+			},
+			file_id: 'CgACAgQAAxkDAAMtZ0sBpKvfUg2GmktVUdBDAAFKzsNXAAImBAAC8wlcUe4yGEvHdx8nNgQ',
+			file_unique_id: 'AgADJgQAAvMJXFE',
+			file_size: 309245,
+		},
+		caption: 'Animation',
+	},
+};
+
+export const sendAudioResponse = {
+	ok: true,
+	result: {
+		message_id: 46,
+		from: {
+			id: 9876543210,
+			is_bot: true,
+			first_name: '@n8n',
+			username: 'n8n_test_bot',
+		},
+		chat: {
+			id: 123456789,
+			first_name: 'Nathan',
+			last_name: 'W',
+			username: 'n8n',
+			type: 'private',
+		},
+		date: 1732969291,
+		audio: {
+			duration: 3,
+			file_name: 'sample-3s.mp3',
+			mime_type: 'audio/mpeg',
+			file_id: 'CQACAgQAAxkDAAMuZ0sDSxCh3hW89NQa-eTpxKioqGAAAjsEAAIBCU1SGtsPA4N9TSo2BA',
+			file_unique_id: 'AgADOwQAAgEJTVI',
+			file_size: 52079,
+		},
+	},
+};
+
+export const getMemberResponse = {
+	ok: true,
+	result: {
+		user: {
+			id: 123456789,
+			is_bot: false,
+			first_name: 'Nathan',
+			last_name: 'W',
+			username: 'n8n',
+			language_code: 'en',
+		},
+		status: 'creator',
+		is_anonymous: false,
+	},
+};
diff --git a/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.json b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.json
new file mode 100644
index 0000000000..990b7edf16
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.json
@@ -0,0 +1,1326 @@
+{
+	"name": "[TEST] Telegram",
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-60, 2000],
+			"id": "c4d16e3b-b442-4497-87ca-b946f7106da8",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, -760],
+			"id": "c9ff68b5-7b2c-4b7a-b7ff-03a8f5ffac0c",
+			"name": "No Operation, do nothing"
+		},
+		{
+			"parameters": {
+				"resource": "chat",
+				"chatId": "123456789"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [260, -760],
+			"id": "d6151630-28f8-4b08-9e84-8e43ace5465e",
+			"name": "Chat > Get",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "chat",
+				"chatId": "FAIL"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [260, -580],
+			"id": "14a0a29a-e0cf-43c1-a8df-da60e90e7f54",
+			"name": "Continue on fail",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			},
+			"onError": "continueErrorOutput"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, -560],
+			"id": "855ec4d7-aca7-4070-adc1-b35ff4271072",
+			"name": "No Operation, do nothing1"
+		},
+		{
+			"parameters": {
+				"chatId": "123456789",
+				"text": "a",
+				"additionalFields": {}
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [260, -380],
+			"id": "d1925d73-74b2-4208-ba61-40cec6ad3b1b",
+			"name": "SendMessage",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [540, -380],
+			"id": "e6dccee0-d653-46fd-989f-b808f46d8bc2",
+			"name": "No Operation, do nothing2"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [460, -200],
+			"id": "4020c961-b8a3-4887-8cf4-574a255eafca",
+			"name": "No Operation, do nothing3"
+		},
+		{
+			"parameters": {
+				"operation": "sendMediaGroup",
+				"chatId": "123456789",
+				"media": {
+					"media": [
+						{
+							"media": "https://raw.githubusercontent.com/n8n-io/n8n/refs/heads/master/assets/n8n-logo.png",
+							"additionalFields": {}
+						}
+					]
+				},
+				"additionalFields": {
+					"disable_notification": true
+				}
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, -200],
+			"id": "9f9615f1-1c64-4f45-aac1-666194ed4f1f",
+			"name": "Send Media Group",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "sendLocation",
+				"chatId": "123456789",
+				"additionalFields": {
+					"reply_to_message_id": 40
+				}
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 0],
+			"id": "5c7de253-68b0-4046-9278-e432c4481679",
+			"name": "Send a Location",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [460, 0],
+			"id": "f237f864-1fa5-450d-b468-e688b3b3f3da",
+			"name": "No Operation, do nothing4"
+		},
+		{
+			"parameters": {
+				"operation": "deleteMessage",
+				"chatId": "123456789",
+				"messageId": "41"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 180],
+			"id": "479b1be2-7f2d-4dfe-b687-e3da070a92ff",
+			"name": "Delete Message",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 180],
+			"id": "8b26df1c-4afc-4fa2-bd4b-618dde510ce9",
+			"name": "No Operation, do nothing5"
+		},
+		{
+			"parameters": {
+				"operation": "pinChatMessage",
+				"chatId": "123456789",
+				"messageId": "40",
+				"additionalFields": {
+					"disable_notification": true
+				}
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 380],
+			"id": "a90a5b1e-aca1-4871-81f4-afe9f1b54ac3",
+			"name": "Pin Message",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 380],
+			"id": "a8ab2e08-1aa6-46c3-bc9e-f5cc66d27c0d",
+			"name": "No Operation, do nothing6"
+		},
+		{
+			"parameters": {
+				"operation": "sendSticker",
+				"chatId": "123456789",
+				"file": "https://www.gstatic.com/webp/gallery3/1_webp_ll.png",
+				"replyMarkup": "forceReply",
+				"forceReply": {
+					"force_reply": true,
+					"selective": true
+				},
+				"additionalFields": {}
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 580],
+			"id": "6aad1200-b0f2-4783-b1e0-4f59d1251258",
+			"name": "Send Sticker",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 580],
+			"id": "e69ee02f-9b67-46c0-a628-c1affe0abdd7",
+			"name": "No Operation, do nothing7"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 760],
+			"id": "ee592083-2274-4d38-be07-581828b2522d",
+			"name": "No Operation, do nothing8"
+		},
+		{
+			"parameters": {
+				"operation": "editMessageText",
+				"chatId": "123456789",
+				"messageId": "40",
+				"replyMarkup": "inlineKeyboard",
+				"text": "test",
+				"inlineKeyboard": {
+					"rows": [
+						{
+							"row": {
+								"buttons": [
+									{
+										"text": "foo",
+										"additionalFields": {
+											"callback_data": "callback",
+											"pay": true
+										}
+									},
+									{
+										"text": "n8n",
+										"additionalFields": {
+											"url": "https://n8n.io"
+										}
+									}
+								]
+							}
+						}
+					]
+				},
+				"additionalFields": {
+					"disable_web_page_preview": true,
+					"parse_mode": "HTML"
+				}
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 760],
+			"id": "520c74fa-e332-485e-b02e-fa0f5c2e7078",
+			"name": "Edit Message Text",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "chat",
+				"operation": "setDescription",
+				"chatId": "-1000000000000",
+				"description": "Chat description"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 960],
+			"id": "933dd9a4-ce49-4f35-85ec-6fd7820c2686",
+			"name": "Set Description",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [480, 960],
+			"id": "791ca8fe-bd4f-4285-a89d-27f5567dcd11",
+			"name": "No Operation, do nothing9"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [500, 1140],
+			"id": "044d6f3e-b9cf-4a4c-b6d4-5d6afe03132a",
+			"name": "No Operation, do nothing10"
+		},
+		{
+			"parameters": {
+				"resource": "chat",
+				"operation": "administrators",
+				"chatId": "-1000000000000"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 1320],
+			"id": "5b538ca7-dff1-4f6a-b0d9-aa5ce8ca8c7a",
+			"name": "Get Administrators",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789 - -1000000000000"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"resource": "chat",
+				"operation": "setTitle",
+				"chatId": "-1000000000000",
+				"title": "Test Chat Title"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 1140],
+			"id": "8024fed5-f5c7-4cd0-8c16-0a29565b6d4b",
+			"name": "Set Title",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789 - -1000000000000"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [460, 1320],
+			"id": "3ad12afe-633e-4866-a243-eccde83d3e30",
+			"name": "No Operation, do nothing11"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [460, 1500],
+			"id": "79797b7d-85fd-4a46-b87e-ccd584b18177",
+			"name": "No Operation, do nothing12"
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [460, 1680],
+			"id": "341f6b75-0773-45fc-8e5b-f5cb74ff3e7c",
+			"name": "No Operation, do nothing13"
+		},
+		{
+			"parameters": {
+				"operation": "unpinChatMessage",
+				"chatId": "123456789",
+				"messageId": "40"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 1500],
+			"id": "975c435f-7a1d-46b8-8646-6df9fb457803",
+			"name": "Unpin Message",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789 - -1000000000000"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "sendAnimation",
+				"chatId": "123456789",
+				"file": "https://blog.emojipedia.org/content/images/2023/07/Telegram---Opening-Image.gif",
+				"additionalFields": {
+					"caption": "Animation",
+					"disable_notification": true
+				}
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 1680],
+			"id": "1efff378-5d28-41c9-8011-e9337c1d0fa6",
+			"name": "Send Animation",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789 - -1000000000000"
+				}
+			}
+		},
+		{
+			"parameters": {
+				"operation": "sendAudio",
+				"chatId": "123456789",
+				"file": "https://download.samplelib.com/mp3/sample-3s.mp3",
+				"additionalFields": {}
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [240, 1860],
+			"id": "3ee62b00-8faa-4ed5-aa9a-91b381f6880f",
+			"name": "Send Audio",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789 - -1000000000000"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [460, 1860],
+			"id": "ff9a84a7-5def-47c8-b29c-b0a3450a7661",
+			"name": "No Operation, do nothing14"
+		},
+		{
+			"parameters": {
+				"operation": "sendChatAction",
+				"chatId": "123456789"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [220, 2020],
+			"id": "f8dd78ee-4090-47ab-9fb1-2fb5530c78db",
+			"name": "Send Chat Action",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789 - -1000000000000"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [440, 2020],
+			"id": "47117767-0f12-4ecf-9a64-f0bda661c1aa",
+			"name": "No Operation, do nothing15"
+		},
+		{
+			"parameters": {
+				"resource": "chat",
+				"operation": "leave",
+				"chatId": "-1000000000000"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [220, 2200],
+			"id": "abc0591b-cd27-4603-8635-9cc90be1f87a",
+			"name": "Leave Chat",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789 - -1000000000000"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [440, 2200],
+			"id": "4222cedf-6267-46a2-a9da-542ff1f709c4",
+			"name": "No Operation, do nothing16"
+		},
+		{
+			"parameters": {
+				"resource": "chat",
+				"operation": "member",
+				"chatId": "-1000000000000",
+				"userId": "123456789"
+			},
+			"type": "n8n-nodes-base.telegram",
+			"typeVersion": 1.2,
+			"position": [220, 2380],
+			"id": "2057b4b7-1bde-4dcd-9fb3-da3a1dae8afd",
+			"name": "Chat Get Member",
+			"credentials": {
+				"telegramApi": {
+					"id": "2nAyfFQ9FBSmeiBn",
+					"name": "n8n_com_test_bot - 123456789 - -1000000000000"
+				}
+			}
+		},
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [440, 2380],
+			"id": "ff742218-5832-4f5b-8e2b-bf5cd4231dc1",
+			"name": "No Operation, do nothing17"
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"ok": true,
+					"result": {
+						"id": 123456789,
+						"first_name": "Nathan",
+						"last_name": "W",
+						"username": "n8n",
+						"type": "private",
+						"active_usernames": ["n8n"],
+						"bio": "Automation",
+						"has_private_forwards": true,
+						"max_reaction_count": 11,
+						"accent_color_id": 3
+					}
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"ok": true,
+					"result": {
+						"message_id": 40,
+						"from": {
+							"id": 9876543210,
+							"is_bot": true,
+							"first_name": "@n8n",
+							"username": "n8n_test_bot"
+						},
+						"chat": {
+							"id": 123456789,
+							"first_name": "Nathan",
+							"last_name": "W",
+							"username": "n8n",
+							"type": "private"
+						},
+						"date": 1732960606,
+						"text": "a\n\nThis message was sent automatically with n8n",
+						"entities": [
+							{
+								"offset": 3,
+								"length": 41,
+								"type": "italic"
+							},
+							{
+								"offset": 44,
+								"length": 3,
+								"type": "text_link",
+								"url": "https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.telegram_8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+							}
+						],
+						"link_preview_options": {
+							"is_disabled": true
+						}
+					}
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"ok": true,
+					"result": [
+						{
+							"message_id": 41,
+							"from": {
+								"id": 9876543210,
+								"is_bot": true,
+								"first_name": "@n8n",
+								"username": "n8n_test_bot"
+							},
+							"chat": {
+								"id": 123456789,
+								"first_name": "Nathan",
+								"last_name": "W",
+								"username": "n8n",
+								"type": "private"
+							},
+							"date": 1732963445,
+							"photo": [
+								{
+									"file_id": "AgACAgQAAxkDAAMpZ0rsde8lw0E3xttFxGpPdwkExZIAAv21MRvcM11S26tCdFbflv4BAAMCAANzAAM2BA",
+									"file_unique_id": "AQAD_bUxG9wzXVJ4",
+									"file_size": 919,
+									"width": 90,
+									"height": 24
+								},
+								{
+									"file_id": "AgACAgQAAxkDAAMpZ0rsde8lw0E3xttFxGpPdwkExZIAAv21MRvcM11S26tCdFbflv4BAAMCAANtAAM2BA",
+									"file_unique_id": "AQAD_bUxG9wzXVJy",
+									"file_size": 6571,
+									"width": 320,
+									"height": 87
+								},
+								{
+									"file_id": "AgACAgQAAxkDAAMpZ0rsde8lw0E3xttFxGpPdwkExZIAAv21MRvcM11S26tCdFbflv4BAAMCAAN4AAM2BA",
+									"file_unique_id": "AQAD_bUxG9wzXVJ9",
+									"file_size": 9639,
+									"width": 458,
+									"height": 124
+								}
+							]
+						}
+					]
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"ok": true,
+					"result": {
+						"message_id": 42,
+						"from": {
+							"id": 9876543210,
+							"is_bot": true,
+							"first_name": "@n8n",
+							"username": "n8n_test_bot"
+						},
+						"chat": {
+							"id": 123456789,
+							"first_name": "Nathan",
+							"last_name": "W",
+							"username": "n8n",
+							"type": "private"
+						},
+						"date": 1732963630,
+						"reply_to_message": {
+							"message_id": 40,
+							"from": {
+								"id": 9876543210,
+								"is_bot": true,
+								"first_name": "@n8n",
+								"username": "n8n_test_bot"
+							},
+							"chat": {
+								"id": 123456789,
+								"first_name": "Nathan",
+								"last_name": "W",
+								"username": "n8n",
+								"type": "private"
+							},
+							"date": 1732960606,
+							"text": "a\n\nThis message was sent automatically with n8n",
+							"entities": [
+								{
+									"offset": 3,
+									"length": 41,
+									"type": "italic"
+								},
+								{
+									"offset": 44,
+									"length": 3,
+									"type": "text_link",
+									"url": "https://n8n.io/?utm_source=n8n-internal&utm_medium=powered_by&utm_campaign=n8n-nodes-base.telegram_8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+								}
+							],
+							"link_preview_options": {
+								"is_disabled": true
+							}
+						},
+						"location": {
+							"latitude": 0.00001,
+							"longitude": 0.000003
+						}
+					}
+				}
+			}
+		],
+		"No Operation, do nothing5": [
+			{
+				"json": {
+					"ok": true,
+					"result": true
+				}
+			}
+		],
+		"No Operation, do nothing6": [
+			{
+				"json": {
+					"ok": true,
+					"result": true
+				}
+			}
+		],
+		"No Operation, do nothing7": [
+			{
+				"json": {
+					"ok": true,
+					"result": {
+						"message_id": 44,
+						"from": {
+							"id": 9876543210,
+							"is_bot": true,
+							"first_name": "@n8n",
+							"username": "n8n_test_bot"
+						},
+						"chat": {
+							"id": 123456789,
+							"first_name": "Nathan",
+							"last_name": "W",
+							"username": "n8n",
+							"type": "private"
+						},
+						"date": 1732965815,
+						"document": {
+							"file_name": "1_webp_ll.png",
+							"mime_type": "image/png",
+							"thumbnail": {
+								"file_id": "AAMCBAADGQMAAyxnSvW31uMAAWa2AAFl0vD1zqc_3xXeAAIbBwACJ95cUvzVqVKE_cXTAQAHbQADNgQ",
+								"file_unique_id": "AQADGwcAAifeXFJy",
+								"file_size": 12534,
+								"width": 320,
+								"height": 241
+							},
+							"thumb": {
+								"file_id": "AAMCBAADGQMAAyxnSvW31uMAAWa2AAFl0vD1zqc_3xXeAAIbBwACJ95cUvzVqVKE_cXTAQAHbQADNgQ",
+								"file_unique_id": "AQADGwcAAifeXFJy",
+								"file_size": 12534,
+								"width": 320,
+								"height": 241
+							},
+							"file_id": "BQACAgQAAxkDAAMsZ0r1t9bjAAFmtgABZdLw9c6nP98V3gACGwcAAifeXFL81alShP3F0zYE",
+							"file_unique_id": "AgADGwcAAifeXFI",
+							"file_size": 122750
+						}
+					}
+				}
+			}
+		],
+		"No Operation, do nothing8": [
+			{
+				"json": {
+					"ok": true,
+					"result": {
+						"message_id": 40,
+						"from": {
+							"id": 9876543210,
+							"is_bot": true,
+							"first_name": "@n8n",
+							"username": "n8n_test_bot"
+						},
+						"chat": {
+							"id": 123456789,
+							"first_name": "Nathan",
+							"last_name": "W",
+							"username": "n8n",
+							"type": "private"
+						},
+						"date": 1732960606,
+						"edit_date": 1732967008,
+						"text": "test",
+						"reply_markup": {
+							"inline_keyboard": [
+								[
+									{
+										"text": "foo",
+										"callback_data": "callback"
+									},
+									{
+										"text": "n8n",
+										"url": "https://n8n.io/"
+									}
+								]
+							]
+						}
+					}
+				}
+			}
+		],
+		"No Operation, do nothing9": [
+			{
+				"json": {
+					"ok": true,
+					"result": true
+				}
+			}
+		],
+		"No Operation, do nothing10": [
+			{
+				"json": {
+					"ok": true,
+					"result": true
+				}
+			}
+		],
+		"No Operation, do nothing11": [
+			{
+				"json": {
+					"user": {
+						"id": 9876543210,
+						"is_bot": true,
+						"first_name": "@n8n",
+						"username": "n8n_test_bot"
+					},
+					"status": "administrator",
+					"can_be_edited": false,
+					"can_manage_chat": true,
+					"can_change_info": true,
+					"can_post_messages": true,
+					"can_edit_messages": true,
+					"can_delete_messages": true,
+					"can_invite_users": true,
+					"can_restrict_members": true,
+					"can_promote_members": false,
+					"can_manage_video_chats": true,
+					"can_post_stories": true,
+					"can_edit_stories": true,
+					"can_delete_stories": true,
+					"is_anonymous": false,
+					"can_manage_voice_chats": true
+				}
+			},
+			{
+				"json": {
+					"user": {
+						"id": 123456789,
+						"is_bot": false,
+						"first_name": "Nathan",
+						"last_name": "W",
+						"username": "n8n",
+						"language_code": "en"
+					},
+					"status": "creator",
+					"is_anonymous": false
+				}
+			}
+		],
+		"No Operation, do nothing12": [
+			{
+				"json": {
+					"ok": true,
+					"result": true
+				}
+			}
+		],
+		"No Operation, do nothing13": [
+			{
+				"json": {
+					"ok": true,
+					"result": {
+						"message_id": 45,
+						"from": {
+							"id": 9876543210,
+							"is_bot": true,
+							"first_name": "@n8n",
+							"username": "n8n_test_bot"
+						},
+						"chat": {
+							"id": 123456789,
+							"first_name": "Nathan",
+							"last_name": "W",
+							"username": "n8n",
+							"type": "private"
+						},
+						"date": 1732968868,
+						"animation": {
+							"file_name": "Telegram---Opening-Image.gif.mp4",
+							"mime_type": "video/mp4",
+							"duration": 6,
+							"width": 320,
+							"height": 320,
+							"thumbnail": {
+								"file_id": "AAMCBAADGQMAAy1nSwGkq99SDYaaS1VR0EMAAUrOw1cAAiYEAALzCVxR7jIYS8d3HycBAAdtAAM2BA",
+								"file_unique_id": "AQADJgQAAvMJXFFy",
+								"file_size": 36480,
+								"width": 320,
+								"height": 320
+							},
+							"thumb": {
+								"file_id": "AAMCBAADGQMAAy1nSwGkq99SDYaaS1VR0EMAAUrOw1cAAiYEAALzCVxR7jIYS8d3HycBAAdtAAM2BA",
+								"file_unique_id": "AQADJgQAAvMJXFFy",
+								"file_size": 36480,
+								"width": 320,
+								"height": 320
+							},
+							"file_id": "CgACAgQAAxkDAAMtZ0sBpKvfUg2GmktVUdBDAAFKzsNXAAImBAAC8wlcUe4yGEvHdx8nNgQ",
+							"file_unique_id": "AgADJgQAAvMJXFE",
+							"file_size": 309245
+						},
+						"document": {
+							"file_name": "Telegram---Opening-Image.gif.mp4",
+							"mime_type": "video/mp4",
+							"thumbnail": {
+								"file_id": "AAMCBAADGQMAAy1nSwGkq99SDYaaS1VR0EMAAUrOw1cAAiYEAALzCVxR7jIYS8d3HycBAAdtAAM2BA",
+								"file_unique_id": "AQADJgQAAvMJXFFy",
+								"file_size": 36480,
+								"width": 320,
+								"height": 320
+							},
+							"thumb": {
+								"file_id": "AAMCBAADGQMAAy1nSwGkq99SDYaaS1VR0EMAAUrOw1cAAiYEAALzCVxR7jIYS8d3HycBAAdtAAM2BA",
+								"file_unique_id": "AQADJgQAAvMJXFFy",
+								"file_size": 36480,
+								"width": 320,
+								"height": 320
+							},
+							"file_id": "CgACAgQAAxkDAAMtZ0sBpKvfUg2GmktVUdBDAAFKzsNXAAImBAAC8wlcUe4yGEvHdx8nNgQ",
+							"file_unique_id": "AgADJgQAAvMJXFE",
+							"file_size": 309245
+						},
+						"caption": "Animation"
+					}
+				}
+			}
+		],
+		"No Operation, do nothing14": [
+			{
+				"json": {
+					"ok": true,
+					"result": {
+						"message_id": 46,
+						"from": {
+							"id": 9876543210,
+							"is_bot": true,
+							"first_name": "@n8n",
+							"username": "n8n_test_bot"
+						},
+						"chat": {
+							"id": 123456789,
+							"first_name": "Nathan",
+							"last_name": "W",
+							"username": "n8n",
+							"type": "private"
+						},
+						"date": 1732969291,
+						"audio": {
+							"duration": 3,
+							"file_name": "sample-3s.mp3",
+							"mime_type": "audio/mpeg",
+							"file_id": "CQACAgQAAxkDAAMuZ0sDSxCh3hW89NQa-eTpxKioqGAAAjsEAAIBCU1SGtsPA4N9TSo2BA",
+							"file_unique_id": "AgADOwQAAgEJTVI",
+							"file_size": 52079
+						}
+					}
+				}
+			}
+		],
+		"No Operation, do nothing15": [
+			{
+				"json": {
+					"ok": true,
+					"result": true
+				}
+			}
+		],
+		"No Operation, do nothing16": [
+			{
+				"json": {
+					"ok": true,
+					"result": true
+				}
+			}
+		],
+		"No Operation, do nothing17": [
+			{
+				"json": {
+					"ok": true,
+					"result": {
+						"user": {
+							"id": 123456789,
+							"is_bot": false,
+							"first_name": "Nathan",
+							"last_name": "W",
+							"username": "n8n",
+							"language_code": "en"
+						},
+						"status": "creator",
+						"is_anonymous": false
+					}
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "Chat > Get",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Continue on fail",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "SendMessage",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Send Media Group",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Send a Location",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Delete Message",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Pin Message",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Send Sticker",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Edit Message Text",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set Description",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set Title",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Get Administrators",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Unpin Message",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Send Animation",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Send Audio",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Send Chat Action",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Leave Chat",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Chat Get Member",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Chat > Get": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Continue on fail": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"SendMessage": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Send Media Group": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Send a Location": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Delete Message": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Pin Message": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing6",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Send Sticker": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing7",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Message Text": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing8",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set Description": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing9",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set Title": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing10",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Get Administrators": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing11",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Unpin Message": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing12",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Send Animation": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing13",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Send Audio": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing14",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Send Chat Action": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing15",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Leave Chat": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing16",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Chat Get Member": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing17",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"executionOrder": "v1"
+	},
+	"versionId": "364f5fce-de4b-42fb-a586-a05cf3551f13",
+	"meta": {
+		"instanceId": "8c8c5237b8e37b006a7adce87f4369350c58e41f3ca9de16196d3197f69eabcd"
+	},
+	"id": "JcxRMMgCHCSdXeBC",
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts
new file mode 100644
index 0000000000..ad6a04dba3
--- /dev/null
+++ b/packages/nodes-base/nodes/Telegram/tests/Workflow/workflow.test.ts
@@ -0,0 +1,53 @@
+import nock from 'nock';
+
+import {
+	getChatResponse,
+	sendMediaGroupResponse,
+	sendMessageResponse,
+	sendLocationMessageResponse,
+	okTrueResponse,
+	sendStickerResponse,
+	editMessageTextResponse,
+	chatAdministratorsResponse,
+	sendAnimationMessageResponse,
+	sendAudioResponse,
+	getMemberResponse,
+} from './apiResponses';
+import { FAKE_CREDENTIALS_DATA } from '../../../../test/nodes/FakeCredentialsMap';
+import { getWorkflowFilenames, testWorkflows } from '../../../../test/nodes/Helpers';
+
+describe('Telegram', () => {
+	describe('Run Telegram workflow', () => {
+		beforeAll(() => {
+			nock.disableNetConnect();
+
+			const { baseUrl } = FAKE_CREDENTIALS_DATA.telegramApi;
+			const mock = nock(baseUrl);
+
+			mock.post('/bottestToken/getChat').reply(200, getChatResponse);
+			mock.post('/bottestToken/sendMessage').reply(200, sendMessageResponse);
+			mock.post('/bottestToken/sendMediaGroup').reply(200, sendMediaGroupResponse);
+			mock.post('/bottestToken/sendLocation').reply(200, sendLocationMessageResponse);
+			mock.post('/bottestToken/deleteMessage').reply(200, okTrueResponse);
+			mock.post('/bottestToken/pinChatMessage').reply(200, okTrueResponse);
+			mock.post('/bottestToken/setChatDescription').reply(200, okTrueResponse);
+			mock.post('/bottestToken/setChatTitle').reply(200, okTrueResponse);
+			mock.post('/bottestToken/unpinChatMessage').reply(200, okTrueResponse);
+			mock.post('/bottestToken/sendChatAction').reply(200, okTrueResponse);
+			mock.post('/bottestToken/leaveChat').reply(200, okTrueResponse);
+			mock.post('/bottestToken/sendSticker').reply(200, sendStickerResponse);
+			mock.post('/bottestToken/editMessageText').reply(200, editMessageTextResponse);
+			mock.post('/bottestToken/getChatAdministrators').reply(200, chatAdministratorsResponse);
+			mock.post('/bottestToken/sendAnimation').reply(200, sendAnimationMessageResponse);
+			mock.post('/bottestToken/sendAudio').reply(200, sendAudioResponse);
+			mock.post('/bottestToken/getChatMember').reply(200, getMemberResponse);
+		});
+
+		afterAll(() => {
+			nock.restore();
+		});
+
+		const workflows = getWorkflowFilenames(__dirname);
+		testWorkflows(workflows);
+	});
+});
diff --git a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
index ab9a4cd445..6c3c99d363 100644
--- a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -8,7 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { Eq } from './QueryFunctions';
 
 export async function theHiveApiRequest(
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index e405191423..26946664a8 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/dot-notation */
+import set from 'lodash/set';
 import {
 	NodeConnectionType,
 	type IDataObject,
@@ -12,20 +13,11 @@ import {
 	type INodeTypeDescription,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
 import { alertFields, alertOperations } from './descriptions/AlertDescription';
-
-import { observableFields, observableOperations } from './descriptions/ObservableDescription';
-
 import { caseFields, caseOperations } from './descriptions/CaseDescription';
-
-import { taskFields, taskOperations } from './descriptions/TaskDescription';
-
 import { logFields, logOperations } from './descriptions/LogDescription';
-
-import type { IQueryObject } from './QueryFunctions';
-import { And, Between, ContainsString, Eq, Id, In, Parent } from './QueryFunctions';
-
+import { observableFields, observableOperations } from './descriptions/ObservableDescription';
+import { taskFields, taskOperations } from './descriptions/TaskDescription';
 import {
 	buildCustomFieldSearch,
 	mapResource,
@@ -36,6 +28,8 @@ import {
 	splitTags,
 	theHiveApiRequest,
 } from './GenericFunctions';
+import type { IQueryObject } from './QueryFunctions';
+import { And, Between, ContainsString, Eq, Id, In, Parent } from './QueryFunctions';
 
 export class TheHive implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
index 7cc84868c1..6c7b2ce8bf 100644
--- a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
@@ -7,6 +7,7 @@ import {
 	type IWebhookResponseData,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import { eventsDescription } from './descriptions/EventsDescription';
 
 export class TheHiveTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/TheHive/interfaces/CaseInterface.ts b/packages/nodes-base/nodes/TheHive/interfaces/CaseInterface.ts
index 297ae58f51..3eeee45b48 100644
--- a/packages/nodes-base/nodes/TheHive/interfaces/CaseInterface.ts
+++ b/packages/nodes-base/nodes/TheHive/interfaces/CaseInterface.ts
@@ -1,4 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
+
 import type { TLP } from './AlertInterface';
 export interface ICase {
 	// Required attributes
diff --git a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
index 5550fdf201..6df7b41d65 100644
--- a/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/TheHiveProjectTrigger.node.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import {
 	type IWebhookFunctions,
 	type IDataObject,
@@ -8,8 +9,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export class TheHiveProjectTrigger implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'TheHive 5 Trigger',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
index e7a6fc6f9e..3361088fb2 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/create.operation.ts
@@ -1,3 +1,5 @@
+import FormData from 'form-data';
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,14 +7,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
-
-import FormData from 'form-data';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem, splitAndTrim } from '../../helpers/utils';
-import { observableTypeOptions } from '../../descriptions';
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { observableTypeOptions } from '../../descriptions';
+import { fixFieldType, prepareInputItem, splitAndTrim } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
index 2e914b5f58..bc92d46832 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/deleteAlert.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [alertRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
index 4a5712152a..e7282c2366 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { alertRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...alertRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
index f634780025..27429580e5 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	alertRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts
index 4e3801bf7c..e1550561d8 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/index.ts
@@ -1,13 +1,13 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import * as create from './create.operation';
-import * as executeResponder from './executeResponder.operation';
 import * as deleteAlert from './deleteAlert.operation';
+import * as executeResponder from './executeResponder.operation';
 import * as get from './get.operation';
-import * as search from './search.operation';
-import * as status from './status.operation';
 import * as merge from './merge.operation';
 import * as promote from './promote.operation';
+import * as search from './search.operation';
+import * as status from './status.operation';
 import * as update from './update.operation';
 
 export { create, executeResponder, deleteAlert, get, search, status, merge, promote, update };
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
index 9be2833a4e..1be21dc225 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/merge.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC, caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC, caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [alertRLC, caseRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
index d59821e8f6..4dfb9bb997 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/promote.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	alertRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
index f74cb70b9a..c5e80c24f8 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	genericFiltersCollection,
 	returnAllAndLimit,
@@ -11,7 +14,6 @@ import {
 	sortCollection,
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	...returnAllAndLimit,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
index 5244b79dfb..0835ff91c1 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/status.operation.ts
@@ -1,8 +1,10 @@
 import type { INodeExecutionData, IExecuteFunctions, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	alertRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
index aaf0b398ed..a57cb4f3d7 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/alert/update.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
index cae32b71b5..c62eeb3b95 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/addAttachment.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { attachmentsUi, caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { attachmentsUi, caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	caseRLC,
 	attachmentsUi,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
index 7e212c3c62..fe9973ac36 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/create.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,10 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiRequest } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
index 7491cfcb51..013092454f 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteAttachment.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	caseRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
index 077b45ad9b..c46a2558bf 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/deleteCase.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [caseRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
index 3132266005..d9d4c1c3d6 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { caseRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...caseRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
index 2c516f05ab..fbb2e7d196 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [caseRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
index 0a3566f154..55e8696300 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getAttachment.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	caseRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
index 3b945856f9..6a5584810d 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/getTimeline.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [caseRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts
index 9a2ec7c3ae..9031d8592d 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/index.ts
@@ -1,15 +1,14 @@
 import type { INodeProperties } from 'n8n-workflow';
 
 import * as addAttachment from './addAttachment.operation';
-
 import * as create from './create.operation';
 import * as deleteAttachment from './deleteAttachment.operation';
 import * as deleteCase from './deleteCase.operation';
 import * as executeResponder from './executeResponder.operation';
 import * as get from './get.operation';
 import * as getAttachment from './getAttachment.operation';
-import * as search from './search.operation';
 import * as getTimeline from './getTimeline.operation';
+import * as search from './search.operation';
 import * as update from './update.operation';
 
 export {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
index c7f44f5e40..dccfda95ee 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	genericFiltersCollection,
 	returnAllAndLimit,
@@ -11,7 +14,6 @@ import {
 	sortCollection,
 } from '../../descriptions';
 import { theHiveApiQuery } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	...returnAllAndLimit,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
index 4b3539bc2e..dc25891740 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/case/update.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
index 572db21959..bc689dd553 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/add.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { alertRLC, caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC, caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
index e178729c61..e483422b14 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/deleteComment.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { commentRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { commentRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [commentRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
index 86bcd95d61..17d6c6ee78 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/search.operation.ts
@@ -5,6 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	alertRLC,
 	caseRLC,
@@ -13,9 +16,8 @@ import {
 	searchOptions,
 	sortCollection,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
index 5379ce91a4..ac3084f704 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/comment/update.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { commentRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { commentRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	commentRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
index 31e84c5dc9..5226f84295 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/addAttachment.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { attachmentsUi, logRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { attachmentsUi, logRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [logRLC, attachmentsUi];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
index 2f73eeaed0..859e6ee00a 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/create.operation.ts
@@ -5,12 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { theHiveApiRequest } from '../../transport';
-
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import { attachmentsUi, taskRLC } from '../../descriptions';
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { attachmentsUi, taskRLC } from '../../descriptions';
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	taskRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
index 017d7b4999..8766b0c3da 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteAttachment.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { logRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { logRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	logRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
index 44fb4e5aed..db1df28fd9 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/deleteLog.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { logRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { logRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [logRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
index 8eceb9660b..76b3f69d72 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { logRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...logRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
index b110db32ac..993b916869 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { logRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { logRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [logRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
index 9aed510404..8cb49fbfca 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/log/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	taskRLC,
 	genericFiltersCollection,
@@ -11,9 +14,8 @@ import {
 	sortCollection,
 	searchOptions,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts b/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
index bd6ca8cf59..9763d3e46d 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/node.description.ts
@@ -6,9 +6,9 @@ import * as case_ from './case';
 import * as comment from './comment';
 import * as log from './log';
 import * as observable from './observable';
+import * as page from './page';
 import * as query from './query';
 import * as task from './task';
-import * as page from './page';
 
 export const description: INodeTypeDescription = {
 	displayName: 'TheHive 5',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
index ba515bbb78..889422f45b 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/create.operation.ts
@@ -1,3 +1,4 @@
+import FormData from 'form-data';
 import {
 	NodeOperationError,
 	type IDataObject,
@@ -5,13 +6,13 @@ import {
 	type INodeExecutionData,
 	type INodeProperties,
 } from 'n8n-workflow';
-import FormData from 'form-data';
-import { theHiveApiRequest } from '../../transport';
 
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import { alertRLC, attachmentsUi, caseRLC } from '../../descriptions';
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { alertRLC, attachmentsUi, caseRLC } from '../../descriptions';
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
index e8e6567b5a..b1cf8fe0a1 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/deleteObservable.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { observableRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { observableRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [observableRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
index 54deac7c0b..f547b67a70 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeAnalyzer.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { observableRLC, observableTypeOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [
 	observableRLC,
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
index 5f75bc9367..a02da30cdb 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { observableRLC, responderOptions } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...observableRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
index 7dc729b56d..1d540732e3 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { observableRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { observableRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [observableRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
index e27c8e8331..1975fbb36b 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/search.operation.ts
@@ -5,6 +5,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	alertRLC,
 	caseRLC,
@@ -13,9 +16,8 @@ import {
 	searchOptions,
 	sortCollection,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
index 9c3ef4243f..3680aeefc9 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/observable/update.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
index 0c2531d8df..ab773de4cc 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/create.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
index 3522404168..84967ae027 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/deletePage.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC, pageRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC, pageRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Delete From ...',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
index 796da7b682..b060f3cbd0 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	caseRLC,
 	genericFiltersCollection,
@@ -11,9 +14,8 @@ import {
 	sortCollection,
 	searchOptions,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
index 8d41f9ba97..f03f17ec41 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/page/update.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { caseRLC, pageRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC, pageRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
index f4772aacad..e96e195cae 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/query/executeQuery.operation.ts
@@ -6,9 +6,10 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError, jsonParse } from 'n8n-workflow';
 
-import { theHiveApiRequest } from '../../transport';
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Query',
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/router.ts b/packages/nodes-base/nodes/TheHiveProject/actions/router.ts
index 03fe0a25e4..b6ac961627 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/router.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/router.ts
@@ -1,11 +1,11 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { TheHiveType } from './node.type';
 
 import * as alert from './alert';
 import * as case_ from './case';
 import * as comment from './comment';
 import * as log from './log';
+import type { TheHiveType } from './node.type';
 import * as observable from './observable';
 import * as page from './page';
 import * as query from './query';
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
index 414549e690..a04c6c24f1 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/create.operation.ts
@@ -5,12 +5,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 
-import { theHiveApiRequest } from '../../transport';
-
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
-import { caseRLC } from '../../descriptions';
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { caseRLC } from '../../descriptions';
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	caseRLC,
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
index 213e4794cf..62c44daba2 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/deleteTask.operation.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { taskRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { taskRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [taskRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
index d3f540baad..eb767ecbb4 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/executeResponder.operation.ts
@@ -4,9 +4,11 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import { responderOptions, taskRLC } from '../../descriptions';
 import { theHiveApiRequest } from '../../transport';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
 const properties: INodeProperties[] = [{ ...taskRLC, name: 'id' }, responderOptions];
 
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
index f88853e614..ec4f0ef35f 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/get.operation.ts
@@ -4,10 +4,12 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
-import { theHiveApiRequest } from '../../transport';
-import { taskRLC } from '../../descriptions';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { taskRLC } from '../../descriptions';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [taskRLC];
 
 const displayOptions = {
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
index 0954fc8856..ce7d00e8e7 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/search.operation.ts
@@ -4,6 +4,9 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 } from 'n8n-workflow';
+
+import { updateDisplayOptions, wrapData } from '@utils/utilities';
+
 import {
 	caseRLC,
 	genericFiltersCollection,
@@ -11,9 +14,8 @@ import {
 	searchOptions,
 	sortCollection,
 } from '../../descriptions';
-import { theHiveApiQuery } from '../../transport';
 import type { QueryScope } from '../../helpers/interfaces';
-import { updateDisplayOptions, wrapData } from '@utils/utilities';
+import { theHiveApiQuery } from '../../transport';
 
 const properties: INodeProperties[] = [
 	{
diff --git a/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts b/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
index 80875d27f6..c5a26fefcb 100644
--- a/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/actions/task/update.operation.ts
@@ -1,3 +1,4 @@
+import set from 'lodash/set';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -5,11 +6,12 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import set from 'lodash/set';
-import { theHiveApiRequest } from '../../transport';
-import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+
 import { updateDisplayOptions, wrapData } from '@utils/utilities';
 
+import { fixFieldType, prepareInputItem } from '../../helpers/utils';
+import { theHiveApiRequest } from '../../transport';
+
 const properties: INodeProperties[] = [
 	{
 		displayName: 'Fields',
diff --git a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
index 7a7d316a78..5653375dd4 100644
--- a/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/descriptions/common.description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { TLP } from '../helpers/interfaces';
 
 export const returnAllAndLimit: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts b/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
index 8c392043b8..b4768123a2 100644
--- a/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/helpers/utils.ts
@@ -1,7 +1,6 @@
-import { ApplicationError, type IDataObject } from 'n8n-workflow';
-
 import get from 'lodash/get';
 import set from 'lodash/set';
+import { ApplicationError, type IDataObject } from 'n8n-workflow';
 
 export function splitAndTrim(str: string | string[]) {
 	if (typeof str === 'string') {
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts b/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts
index ce35c11a48..cd3ca6d9ab 100644
--- a/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/listSearch.ts
@@ -1,4 +1,5 @@
 import type { IDataObject, ILoadOptionsFunctions, INodeListSearchResult } from 'n8n-workflow';
+
 import { theHiveApiRequest } from '../transport';
 
 async function listResource(
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts b/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts
index 3e7c925257..7884b78104 100644
--- a/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/loadOptions.ts
@@ -1,11 +1,12 @@
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
-import { theHiveApiRequest } from '../transport';
+
 import {
 	alertCommonFields,
 	caseCommonFields,
 	observableCommonFields,
 	taskCommonFields,
 } from '../helpers/constants';
+import { theHiveApiRequest } from '../transport';
 
 export async function loadResponders(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 	let resource = this.getNodeParameter('resource') as string;
diff --git a/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts b/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
index 84703409ba..59c5636091 100644
--- a/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/methods/resourceMapping.ts
@@ -6,14 +6,6 @@ import type {
 	ResourceMapperFields,
 } from 'n8n-workflow';
 
-import { theHiveApiRequest } from '../transport';
-
-import {
-	alertCommonFields,
-	caseCommonFields,
-	observableCommonFields,
-	taskCommonFields,
-} from '../helpers/constants';
 import {
 	loadAlertStatus,
 	loadCaseStatus,
@@ -21,6 +13,13 @@ import {
 	loadObservableTypes,
 	loadUsers,
 } from './loadOptions';
+import {
+	alertCommonFields,
+	caseCommonFields,
+	observableCommonFields,
+	taskCommonFields,
+} from '../helpers/constants';
+import { theHiveApiRequest } from '../transport';
 
 async function getCustomFields(this: ILoadOptionsFunctions) {
 	const customFields = (await theHiveApiRequest.call(this, 'POST', '/v1/query', {
diff --git a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
index 442cb2739f..0d370dc675 100644
--- a/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/test/transport.test.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions } from 'n8n-workflow';
 import nock from 'nock';
-import * as transport from '../transport/requestApi';
 
 import { theHiveApiQuery } from '../transport/queryHelper';
+import * as transport from '../transport/requestApi';
 
 jest.mock('../transport/requestApi', () => {
 	const originalModule = jest.requireActual('../transport/requestApi');
diff --git a/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts b/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts
index 69cd05f3e8..28d5f67408 100644
--- a/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts
+++ b/packages/nodes-base/nodes/TheHiveProject/transport/queryHelper.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
 
+import { theHiveApiRequest } from './requestApi';
 import type { QueryScope } from '../helpers/interfaces';
 import { constructFilter } from '../helpers/utils';
-import { theHiveApiRequest } from './requestApi';
 
 export async function theHiveApiQuery(
 	this: IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 15461efdf4..f485f9c8de 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -5,8 +5,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import pgPromise from 'pg-promise';
+
 import { pgInsert, pgQueryV2, pgUpdate } from '../Postgres/v1/genericFunctions';
 
 export class TimescaleDb implements INodeType {
diff --git a/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
index b4cd4f2ec1..d2c48a5d07 100644
--- a/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
@@ -1,9 +1,10 @@
 import type { IDataObject } from 'n8n-workflow';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
+
+import type { Section, TodoistResponse } from './Service';
 import type { Context } from '../GenericFunctions';
 import { FormatDueDatetime, todoistApiRequest, todoistSyncRequest } from '../GenericFunctions';
-import type { Section, TodoistResponse } from './Service';
 
 export interface OperationHandler {
 	handleOperation(ctx: Context, itemIndex: number): Promise<TodoistResponse>;
diff --git a/packages/nodes-base/nodes/Todoist/v1/Service.ts b/packages/nodes-base/nodes/Todoist/v1/Service.ts
index fa5112a5bf..348f6a1e7d 100644
--- a/packages/nodes-base/nodes/Todoist/v1/Service.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/Service.ts
@@ -1,5 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
-import type { Context } from '../GenericFunctions';
+
 import {
 	CloseHandler,
 	CreateHandler,
@@ -11,6 +11,7 @@ import {
 	SyncHandler,
 	UpdateHandler,
 } from './OperationHandler';
+import type { Context } from '../GenericFunctions';
 
 export class TodoistService implements Service {
 	async execute(
diff --git a/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts b/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
index fccfa3f679..40ebfad5a3 100644
--- a/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
@@ -11,10 +11,9 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { todoistApiRequest } from '../GenericFunctions';
-
 import type { OperationType } from './Service';
 import { TodoistService } from './Service';
+import { todoistApiRequest } from '../GenericFunctions';
 
 // interface IBodyCreateTask {
 // 	content?: string;
diff --git a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
index a1b706cac1..d1b3009a9f 100644
--- a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
@@ -1,9 +1,10 @@
 import type { IDataObject } from 'n8n-workflow';
 import { ApplicationError, jsonParse } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
+
+import type { Section, TodoistResponse } from './Service';
 import type { Context } from '../GenericFunctions';
 import { FormatDueDatetime, todoistApiRequest, todoistSyncRequest } from '../GenericFunctions';
-import type { Section, TodoistResponse } from './Service';
 
 export interface OperationHandler {
 	handleOperation(ctx: Context, itemIndex: number): Promise<TodoistResponse>;
diff --git a/packages/nodes-base/nodes/Todoist/v2/Service.ts b/packages/nodes-base/nodes/Todoist/v2/Service.ts
index b9fdb75ec3..cd6fb5f1b9 100644
--- a/packages/nodes-base/nodes/Todoist/v2/Service.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/Service.ts
@@ -1,5 +1,5 @@
 import type { IDataObject } from 'n8n-workflow';
-import type { Context } from '../GenericFunctions';
+
 import {
 	CloseHandler,
 	CreateHandler,
@@ -11,6 +11,7 @@ import {
 	SyncHandler,
 	UpdateHandler,
 } from './OperationHandler';
+import type { Context } from '../GenericFunctions';
 
 export class TodoistService implements Service {
 	async execute(
diff --git a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
index 585b205e0b..57812697a0 100644
--- a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
@@ -11,10 +11,9 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { todoistApiRequest } from '../GenericFunctions';
-
 import type { OperationType, TodoistProjectType } from './Service';
 import { TodoistService } from './Service';
+import { todoistApiRequest } from '../GenericFunctions';
 
 // interface IBodyCreateTask {
 // 	content?: string;
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index bfa368c1c4..dbaf861ad0 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -1,3 +1,5 @@
+import { DateTime } from 'luxon';
+import moment from 'moment-timezone';
 import type {
 	IPollFunctions,
 	IDataObject,
@@ -8,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { DateTime } from 'luxon';
 import { togglApiRequest } from './GenericFunctions';
 
 export class TogglTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Totp/Totp.node.ts b/packages/nodes-base/nodes/Totp/Totp.node.ts
index 60196b9b67..191e4486b4 100644
--- a/packages/nodes-base/nodes/Totp/Totp.node.ts
+++ b/packages/nodes-base/nodes/Totp/Totp.node.ts
@@ -4,9 +4,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-
 import OTPAuth from 'otpauth';
 
 export class Totp implements INodeType {
diff --git a/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts b/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts
index f454daeba3..f3ada2fa36 100644
--- a/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts
+++ b/packages/nodes-base/nodes/Totp/test/Totp.node.test.ts
@@ -1,5 +1,5 @@
-import * as Helpers from '@test/nodes/Helpers';
 import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
+import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
 
 jest.mock('otpauth', () => {
diff --git a/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts
index 711146f74b..36791d57f7 100644
--- a/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts
+++ b/packages/nodes-base/nodes/Transform/Aggregate/Aggregate.node.ts
@@ -1,7 +1,6 @@
 import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
 import set from 'lodash/set';
-
 import {
 	NodeOperationError,
 	type IDataObject,
@@ -14,8 +13,9 @@ import {
 	type NodeExecutionHint,
 	NodeExecutionOutput,
 } from 'n8n-workflow';
-import { prepareFieldsArray } from '../utils/utils';
+
 import { addBinariesToItem } from './utils';
+import { prepareFieldsArray } from '../utils/utils';
 
 export class Aggregate implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts b/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts
index e2e3fa4f58..38c225d3c7 100644
--- a/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts
+++ b/packages/nodes-base/nodes/Transform/Sort/Sort.node.ts
@@ -10,9 +10,11 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
-import { sortByCode } from './utils';
+
 import { shuffleArray } from '@utils/utilities';
 
+import { sortByCode } from './utils';
+
 export class Sort implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Sort',
diff --git a/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts b/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts
index 5c2a9e3a68..57b77527e6 100644
--- a/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts
+++ b/packages/nodes-base/nodes/Transform/SplitOut/SplitOut.node.ts
@@ -15,6 +15,7 @@ import type {
 	INodeTypeDescription,
 	NodeExecutionHint,
 } from 'n8n-workflow';
+
 import { prepareFieldsArray } from '../utils/utils';
 
 export class SplitOut implements INodeType {
diff --git a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
index 12d0e06f22..83ded6d7af 100644
--- a/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
+++ b/packages/nodes-base/nodes/Transform/Summarize/Summarize.node.ts
@@ -6,7 +6,7 @@ import {
 	type INodeType,
 	type INodeTypeDescription,
 } from 'n8n-workflow';
-import { generatePairedItemData } from '../../../utils/utilities';
+
 import {
 	type Aggregations,
 	NUMERICAL_AGGREGATIONS,
@@ -16,6 +16,7 @@ import {
 	fieldValueGetter,
 	splitData,
 } from './utils';
+import { generatePairedItemData } from '../../../utils/utilities';
 
 export class Summarize implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
index b089998eb8..b4421dbf54 100644
--- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -9,8 +10,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function travisciApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
index fbc109dc86..6c6274839b 100644
--- a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
+++ b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { buildFields, buildOperations } from './BuildDescription';
-
 import { travisciApiRequest, travisciApiRequestAllItems } from './GenericFunctions';
 
 export class TravisCi implements INodeType {
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.ts b/packages/nodes-base/nodes/Trello/Trello.node.ts
index ac599663d7..0554a99939 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.ts
+++ b/packages/nodes-base/nodes/Trello/Trello.node.ts
@@ -10,22 +10,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { apiRequest, apiRequestAllItems } from './GenericFunctions';
-
 import { attachmentFields, attachmentOperations } from './AttachmentDescription';
-
 import { boardFields, boardOperations } from './BoardDescription';
-
 import { boardMemberFields, boardMemberOperations } from './BoardMemberDescription';
-
-import { cardFields, cardOperations } from './CardDescription';
-
 import { cardCommentFields, cardCommentOperations } from './CardCommentDescription';
-
+import { cardFields, cardOperations } from './CardDescription';
 import { checklistFields, checklistOperations } from './ChecklistDescription';
-
+import { apiRequest, apiRequestAllItems } from './GenericFunctions';
 import { labelFields, labelOperations } from './LabelDescription';
-
 import { listFields, listOperations } from './ListDescription';
 
 interface TrelloBoardType {
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index 16d6d530ea..a11c29c16e 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,20 +9,16 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
 import { v4 as uuid } from 'uuid';
-import moment from 'moment-timezone';
-import { twistApiRequest } from './GenericFunctions';
 
 import { channelFields, channelOperations } from './ChannelDescription';
-
+import { commentFields, commentOperations } from './CommentDescription';
+import { twistApiRequest } from './GenericFunctions';
 import {
 	messageConversationFields,
 	messageConversationOperations,
 } from './MessageConversationDescription';
-
 import { threadFields, threadOperations } from './ThreadDescription';
-import { commentFields, commentOperations } from './CommentDescription';
 
 export class Twist implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.ts b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
index 0cfb9b296b..92e485d610 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.ts
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
@@ -2,7 +2,6 @@ import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow'
 import { VersionedNodeType } from 'n8n-workflow';
 
 import { TwitterV1 } from './V1/TwitterV1.node';
-
 import { TwitterV2 } from './V2/TwitterV2.node';
 
 export class Twitter extends VersionedNodeType {
diff --git a/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts b/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
index 1b0bfd61c6..7b42390e72 100644
--- a/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
+++ b/packages/nodes-base/nodes/Twitter/V1/TwitterV1.node.ts
@@ -1,3 +1,4 @@
+import ISO6391 from 'iso-639-1';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -11,17 +12,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import ISO6391 from 'iso-639-1';
 import { directMessageFields, directMessageOperations } from './DirectMessageDescription';
-
-import { tweetFields, tweetOperations } from './TweetDescription';
-
 import {
 	twitterApiRequest,
 	twitterApiRequestAllItems,
 	uploadAttachments,
 } from './GenericFunctions';
-
+import { tweetFields, tweetOperations } from './TweetDescription';
 import type { ITweet, ITweetCreate } from './TweetInterface';
 
 export class TwitterV1 implements INodeType {
diff --git a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
index bf2ea40568..e210689346 100644
--- a/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
+++ b/packages/nodes-base/nodes/Twitter/V2/TwitterV2.node.ts
@@ -1,3 +1,5 @@
+import ISO6391 from 'iso-639-1';
+import { DateTime } from 'luxon';
 import {
 	NodeConnectionType,
 	type IDataObject,
@@ -12,19 +14,16 @@ import {
 	type JsonObject,
 } from 'n8n-workflow';
 
-import ISO6391 from 'iso-639-1';
-import { DateTime } from 'luxon';
 import { directMessageFields, directMessageOperations } from './DirectMessageDescription';
-import { listFields, listOperations } from './ListDescription';
-import { tweetFields, tweetOperations } from './TweetDescription';
-import { userFields, userOperations } from './UserDescription';
-
 import {
 	returnId,
 	returnIdFromUsername,
 	twitterApiRequest,
 	twitterApiRequestAllItems,
 } from './GenericFunctions';
+import { listFields, listOperations } from './ListDescription';
+import { tweetFields, tweetOperations } from './TweetDescription';
+import { userFields, userOperations } from './UserDescription';
 
 export class TwitterV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
index fc7486ce57..b653d691fe 100644
--- a/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
+++ b/packages/nodes-base/nodes/Twitter/test/Twitter.test.ts
@@ -1,8 +1,10 @@
-import nock from 'nock';
 import type { INodeParameterResourceLocator } from 'n8n-workflow';
-import { returnId } from '../V2/GenericFunctions';
+import nock from 'nock';
+
 import { getWorkflowFilenames, testWorkflows } from '@test/nodes/Helpers';
 
+import { returnId } from '../V2/GenericFunctions';
+
 const searchResult = {
 	data: [
 		{
diff --git a/packages/nodes-base/nodes/UProc/ToolDescription.ts b/packages/nodes-base/nodes/UProc/ToolDescription.ts
index 0a6cd206a9..4be6f454a4 100644
--- a/packages/nodes-base/nodes/UProc/ToolDescription.ts
+++ b/packages/nodes-base/nodes/UProc/ToolDescription.ts
@@ -2,7 +2,6 @@ import type { IDataObject, INodeProperties } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
 import { groups } from './Json/Groups';
-
 import { tools } from './Json/Tools';
 
 function capitalize(str: string): string {
@@ -75,10 +74,7 @@ for (const tool of (tools as IDataObject).processors as IDataObject[]) {
 			options: param.o,
 			displayOptions: {
 				show: {
-					group: [
-						//@ts-ignore
-						tool.g,
-					],
+					group: [tool.g],
 					tool: [tool.k],
 				},
 			},
@@ -96,7 +92,6 @@ for (const tool of (tools as IDataObject).processors as IDataObject[]) {
 		//if exists, other wise
 		if (modifiedParam) {
 			//Assign new group and tool
-			//@ts-ignore
 			modifiedParam.displayOptions.show.group.push(tool.g);
 			modifiedParam.displayOptions.show.tool.push(tool.k);
 
diff --git a/packages/nodes-base/nodes/UProc/UProc.node.ts b/packages/nodes-base/nodes/UProc/UProc.node.ts
index f48e247583..2aeccd5e9f 100644
--- a/packages/nodes-base/nodes/UProc/UProc.node.ts
+++ b/packages/nodes-base/nodes/UProc/UProc.node.ts
@@ -9,9 +9,7 @@ import type {
 import { NodeConnectionType } from 'n8n-workflow';
 
 import { uprocApiRequest } from './GenericFunctions';
-
 import { groupOptions } from './GroupDescription';
-
 import { toolOperations, toolParameters } from './ToolDescription';
 
 export class UProc implements INodeType {
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
index 23c0b1d8c6..52407c6c5e 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
@@ -9,7 +9,6 @@ import type {
 	IHttpRequestMethods,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
-
 import qs from 'qs';
 
 export async function unleashedApiRequest(
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
index 9fd7fd1a97..1d6e90a16d 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -7,15 +8,12 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import {
 	convertNETDates,
 	unleashedApiRequest,
 	unleashedApiRequestAllItems,
 } from './GenericFunctions';
-
 import { salesOrderFields, salesOrderOperations } from './SalesOrderDescription';
-
 import { stockOnHandFields, stockOnHandOperations } from './StockOnHandDescription';
 
 export class UnleashedSoftware implements INodeType {
diff --git a/packages/nodes-base/nodes/Uplead/Uplead.node.ts b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
index ca111ca57b..ffa3df226d 100644
--- a/packages/nodes-base/nodes/Uplead/Uplead.node.ts
+++ b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
@@ -6,8 +6,9 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { upleadApiRequest } from './GenericFunctions';
+
 import { companyFields, companyOperations } from './CompanyDesciption';
+import { upleadApiRequest } from './GenericFunctions';
 import { personFields, personOperations } from './PersonDescription';
 
 export class Uplead implements INodeType {
diff --git a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
index 4ab99039c0..48637dd7c0 100644
--- a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -7,18 +8,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-import { uptimeRobotApiRequest } from './GenericFunctions';
-
-import { monitorFields, monitorOperations } from './MonitorDescription';
-
 import { alertContactFields, alertContactOperations } from './AlertContactDescription';
-
+import { uptimeRobotApiRequest } from './GenericFunctions';
 import {
 	maintenanceWindowFields,
 	maintenanceWindowOperations,
 } from './MaintenanceWindowDescription';
-
+import { monitorFields, monitorOperations } from './MonitorDescription';
 import { publicStatusPageFields, publicStatusPageOperations } from './PublicStatusPageDescription';
 
 export class UptimeRobot implements INodeType {
diff --git a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
index d51ff9d498..1862b9e8ae 100644
--- a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
+++ b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
@@ -8,7 +8,6 @@ import type {
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
 import { scanFields, scanOperations } from './descriptions';
-
 import { handleListing, normalizeId, urlScanIoApiRequest } from './GenericFunctions';
 
 export class UrlScanIo implements INodeType {
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
index 8db5cc2f7f..4c3438b3a4 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import get from 'lodash/get';
 import { ApplicationError } from 'n8n-workflow';
 import type {
 	IDataObject,
@@ -8,8 +9,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
 export async function venafiApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IPollFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
index c749cb2402..381e6da551 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
@@ -7,10 +7,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { venafiApiRequest, venafiApiRequestAllItems } from './GenericFunctions';
-
 import { certificateFields, certificateOperations } from './CertificateDescription';
-
+import { venafiApiRequest, venafiApiRequestAllItems } from './GenericFunctions';
 import { policyFields, policyOperations } from './PolicyDescription';
 
 export class VenafiTlsProtectDatacenter implements INodeType {
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
index bf6bb6e9a1..e31bf8924d 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IPollFunctions,
 	type IDataObject,
@@ -7,8 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
-
 import { venafiApiRequest } from './GenericFunctions';
 
 export class VenafiTlsProtectDatacenterTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
index 933f8175cc..9841596504 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import * as nacl_factory from 'js-nacl';
+import get from 'lodash/get';
 import type {
 	IExecuteFunctions,
 	ILoadOptionsFunctions,
@@ -9,10 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import get from 'lodash/get';
-
-import * as nacl_factory from 'js-nacl';
-
 export async function venafiApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
index fc0d0ea4a9..fad5bac766 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
@@ -9,15 +9,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { encryptPassphrase, venafiApiRequest, venafiApiRequestAllItems } from './GenericFunctions';
-
 import { certificateFields, certificateOperations } from './CertificateDescription';
-
-import {
-	certificateRequestFields,
-	certificateRequestOperations,
-} from './CertificateRequestDescription';
-
 import type {
 	ICertficateKeystoreRequest,
 	ICertficateRequest,
@@ -25,6 +17,11 @@ import type {
 	IKeyTypeParameters,
 	ISubjectAltNamesByType,
 } from './CertificateInterface';
+import {
+	certificateRequestFields,
+	certificateRequestOperations,
+} from './CertificateRequestDescription';
+import { encryptPassphrase, venafiApiRequest, venafiApiRequestAllItems } from './GenericFunctions';
 
 export class VenafiTlsProtectCloud implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index bcb279c279..ebf9144118 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -7,9 +7,10 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeApiError } from 'n8n-workflow';
+
+import { eventFields, eventOperations } from './EventDescripion';
 import { validateJSON, veroApiRequest } from './GenericFunctions';
 import { userFields, userOperations } from './UserDescription';
-import { eventFields, eventOperations } from './EventDescripion';
 
 export class Vero implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index 43c092beed..45922270c2 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -7,8 +7,18 @@ import type {
 	IDisplayOptions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
-import { WAIT_TIME_UNLIMITED, NodeOperationError, NodeConnectionType } from 'n8n-workflow';
+import { NodeOperationError, NodeConnectionType, WAIT_INDEFINITELY } from 'n8n-workflow';
 
+import { updateDisplayOptions } from '../../utils/utilities';
+import {
+	formDescription,
+	formFields,
+	respondWithOptions,
+	formRespondMode,
+	formTitle,
+	appendAttributionToForm,
+} from '../Form/common.descriptions';
+import { formWebhook } from '../Form/utils';
 import {
 	authenticationProperty,
 	credentialsProperty,
@@ -20,17 +30,6 @@ import {
 	responseDataProperty,
 	responseModeProperty,
 } from '../Webhook/description';
-
-import {
-	formDescription,
-	formFields,
-	respondWithOptions,
-	formRespondMode,
-	formTitle,
-	appendAttributionToForm,
-} from '../Form/common.descriptions';
-import { formWebhook } from '../Form/utils';
-import { updateDisplayOptions } from '../../utils/utilities';
 import { Webhook } from '../Webhook/Webhook.node';
 
 const toWaitAmount: INodeProperties = {
@@ -516,7 +515,7 @@ export class Wait extends Webhook {
 	}
 
 	private async configureAndPutToWait(context: IExecuteFunctions) {
-		let waitTill = new Date(WAIT_TIME_UNLIMITED);
+		let waitTill = WAIT_INDEFINITELY;
 		const limitWaitTime = context.getNodeParameter('limitWaitTime', 0);
 
 		if (limitWaitTime === true) {
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/V1/WebflowV1.node.ts b/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
index 2985cd7369..9384692563 100644
--- a/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
+++ b/packages/nodes-base/nodes/Webflow/V1/WebflowV1.node.ts
@@ -8,6 +8,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
+import { itemFields, itemOperations } from './ItemDescription';
 import {
 	webflowApiRequest,
 	webflowApiRequestAllItems,
@@ -16,8 +17,6 @@ import {
 	getFields,
 } from '../GenericFunctions';
 
-import { itemFields, itemOperations } from './ItemDescription';
-
 export class WebflowV1 implements INodeType {
 	description: INodeTypeDescription;
 
diff --git a/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts b/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
index ad17ff9e05..3c9e6c56a6 100644
--- a/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
+++ b/packages/nodes-base/nodes/Webflow/V2/WebflowV2.node.ts
@@ -4,9 +4,10 @@ import type {
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { getSites, getCollections, getFields } from '../GenericFunctions';
-import { versionDescription } from './actions/versionDescription';
+
 import { router } from './actions/router';
+import { versionDescription } from './actions/versionDescription';
+import { getSites, getCollections, getFields } from '../GenericFunctions';
 
 export class WebflowV2 implements INodeType {
 	description: INodeTypeDescription;
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/Item/create.operation.ts b/packages/nodes-base/nodes/Webflow/V2/actions/Item/create.operation.ts
index da816d56f9..8189ade81c 100644
--- a/packages/nodes-base/nodes/Webflow/V2/actions/Item/create.operation.ts
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/Item/create.operation.ts
@@ -115,9 +115,8 @@ export async function execute(
 			responseData = await webflowApiRequest.call(
 				this,
 				'POST',
-				`/collections/${collectionId}/items`,
+				`/collections/${collectionId}/items${live ? '/live' : ''}`,
 				body,
-				{ live },
 			);
 
 			const executionData = this.helpers.constructExecutionMetaData(
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/Item/update.operation.ts b/packages/nodes-base/nodes/Webflow/V2/actions/Item/update.operation.ts
index 37e716c783..a25db5e1bc 100644
--- a/packages/nodes-base/nodes/Webflow/V2/actions/Item/update.operation.ts
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/Item/update.operation.ts
@@ -124,9 +124,8 @@ export async function execute(
 			responseData = await webflowApiRequest.call(
 				this,
 				'PATCH',
-				`/collections/${collectionId}/items/${itemId}`,
+				`/collections/${collectionId}/items/${itemId}${live ? '/live' : ''}`,
 				body,
-				{ live },
 			);
 
 			const executionData = this.helpers.constructExecutionMetaData(
diff --git a/packages/nodes-base/nodes/Webflow/V2/actions/router.ts b/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
index 371a9df3c6..59eb4c552e 100644
--- a/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
+++ b/packages/nodes-base/nodes/Webflow/V2/actions/router.ts
@@ -1,8 +1,8 @@
 import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { WebflowType } from './node.type';
 
 import * as item from './Item/Item.resource';
+import type { WebflowType } from './node.type';
 
 export async function router(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 	let returnData: INodeExecutionData[] = [];
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index cdd2ee3814..1da016bd9b 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -1,5 +1,6 @@
 import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
 import { VersionedNodeType } from 'n8n-workflow';
+
 import { WebflowTriggerV1 } from './V1/WebflowTriggerV1.node';
 import { WebflowTriggerV2 } from './V2/WebflowTriggerV2.node';
 
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..473c887116
--- /dev/null
+++ b/packages/nodes-base/nodes/Webflow/test/GenericFunctions.test.ts
@@ -0,0 +1,149 @@
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IHttpRequestMethods,
+	ILoadOptionsFunctions,
+	INode,
+} from 'n8n-workflow';
+
+import { webflowApiRequest, 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);
+	});
+});
+
+describe('Webflow -> webflowApiRequest', () => {
+	const node: INode = {
+		id: '8e3c489c-4905-4bc4-9fc6-f1912d0766ec',
+		name: 'Webflow',
+		type: 'n8n-nodes-base.webflow',
+		typeVersion: 2,
+		position: [0, 0],
+		credentials: {
+			webflowOAuth2Api: {
+				id: 'xxyyzz',
+				name: 'credential name',
+			},
+		},
+		parameters: {
+			operation: 'update',
+			itemId: 'xxx',
+			siteId: 'yyy',
+			collectionId: 'zzz',
+			live: true,
+		},
+	};
+	it('should use live in the url for v2 when live is true', async () => {
+		const mockThis = {
+			helpers: {
+				httpRequestWithAuthentication: jest.fn().mockResolvedValue({ statusCode: 200, data: 'x' }),
+			},
+			getNode() {
+				return node;
+			},
+			getNodeParameter: jest.fn(),
+		} as unknown as IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions;
+
+		const method: IHttpRequestMethods = 'PATCH';
+		const resource = `/collections/${node.parameters.collectionId}/items/${node.parameters.itemId}${node.parameters.live ? '/live' : ''}`;
+
+		await webflowApiRequest.call(mockThis, method, resource);
+
+		expect(mockThis.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'webflowOAuth2Api',
+			{
+				method: 'PATCH',
+				returnFullResponse: true,
+				url: 'https://api.webflow.com/v2/collections/zzz/items/xxx/live',
+				json: true,
+			},
+		);
+	});
+	it('should skip live in the url for v2 when live is false', async () => {
+		const mockThis = {
+			helpers: {
+				httpRequestWithAuthentication: jest.fn().mockResolvedValue({ statusCode: 200, data: 'x' }),
+			},
+			getNode() {
+				return node;
+			},
+			getNodeParameter: jest.fn(),
+		} as unknown as IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions;
+
+		node.parameters.live = false;
+
+		const method: IHttpRequestMethods = 'PATCH';
+		const resource = `/collections/${node.parameters.collectionId}/items/${node.parameters.itemId}${node.parameters.live ? '/live' : ''}`;
+
+		await webflowApiRequest.call(mockThis, method, resource);
+
+		expect(mockThis.helpers.httpRequestWithAuthentication).toHaveBeenCalledWith(
+			'webflowOAuth2Api',
+			{
+				method: 'PATCH',
+				returnFullResponse: true,
+				url: 'https://api.webflow.com/v2/collections/zzz/items/xxx',
+				json: true,
+			},
+		);
+	});
+});
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.ts b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
index 9938f4eaa1..9255dab346 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -1,7 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-execute-block-wrong-error-thrown */
-import { pipeline } from 'stream/promises';
 import { createWriteStream } from 'fs';
 import { stat } from 'fs/promises';
+import isbot from 'isbot';
 import type {
 	IWebhookFunctions,
 	IDataObject,
@@ -12,10 +12,9 @@ import type {
 	INodeProperties,
 } from 'n8n-workflow';
 import { BINARY_ENCODING, NodeOperationError, Node } from 'n8n-workflow';
-
-import { v4 as uuid } from 'uuid';
-import isbot from 'isbot';
+import { pipeline } from 'stream/promises';
 import { file as tmpFile } from 'tmp-promise';
+import { v4 as uuid } from 'uuid';
 
 import {
 	authenticationProperty,
diff --git a/packages/nodes-base/nodes/Webhook/description.ts b/packages/nodes-base/nodes/Webhook/description.ts
index c0cd992c8e..42a81aab71 100644
--- a/packages/nodes-base/nodes/Webhook/description.ts
+++ b/packages/nodes-base/nodes/Webhook/description.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties, INodeTypeDescription, IWebhookDescription } from 'n8n-workflow';
+
 import { getResponseCode, getResponseData } from './utils';
 
 export const defaultWebhookDescription: IWebhookDescription = {
diff --git a/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts b/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
index 97fd23e90e..250ad3af8a 100644
--- a/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
+++ b/packages/nodes-base/nodes/Webhook/test/Webhook.test.ts
@@ -1,9 +1,11 @@
 import type { Request } from 'express';
-import type { IWebhookFunctions } from 'n8n-workflow';
 import { mock } from 'jest-mock-extended';
-import { Webhook } from '../Webhook.node';
+import type { IWebhookFunctions } from 'n8n-workflow';
+
 import { testWorkflows, getWorkflowFilenames } from '@test/nodes/Helpers';
 
+import { Webhook } from '../Webhook.node';
+
 const workflows = getWorkflowFilenames(__dirname);
 
 describe('Test Webhook Node', () => {
diff --git a/packages/nodes-base/nodes/Webhook/test/utils.test.ts b/packages/nodes-base/nodes/Webhook/test/utils.test.ts
index 91a244aa41..b2fc3f84e2 100644
--- a/packages/nodes-base/nodes/Webhook/test/utils.test.ts
+++ b/packages/nodes-base/nodes/Webhook/test/utils.test.ts
@@ -1,5 +1,6 @@
 import jwt from 'jsonwebtoken';
 import { ApplicationError, type IWebhookFunctions } from 'n8n-workflow';
+
 import type { WebhookParameters } from '../utils';
 import {
 	checkResponseModeConfiguration,
diff --git a/packages/nodes-base/nodes/Webhook/utils.ts b/packages/nodes-base/nodes/Webhook/utils.ts
index 3f6b78e552..08a588a5a8 100644
--- a/packages/nodes-base/nodes/Webhook/utils.ts
+++ b/packages/nodes-base/nodes/Webhook/utils.ts
@@ -1,3 +1,5 @@
+import basicAuth from 'basic-auth';
+import jwt from 'jsonwebtoken';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 import type {
 	IWebhookFunctions,
@@ -5,10 +7,9 @@ import type {
 	IDataObject,
 	ICredentialDataDecryptedObject,
 } from 'n8n-workflow';
-import basicAuth from 'basic-auth';
-import jwt from 'jsonwebtoken';
-import { formatPrivateKey } from '../../utils/utilities';
+
 import { WebhookAuthorizationError } from './error';
+import { formatPrivateKey } from '../../utils/utilities';
 
 export type WebhookParameters = {
 	httpMethod: string | string[];
@@ -59,7 +60,7 @@ export const getResponseData = (parameters: WebhookParameters) => {
 };
 
 export const configuredOutputs = (parameters: WebhookParameters) => {
-	const httpMethod = parameters.httpMethod as string | string[];
+	const httpMethod = parameters.httpMethod;
 
 	if (!Array.isArray(httpMethod))
 		return [
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index 184f03a150..6e54c46ed1 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -10,20 +10,14 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { wrapData } from '../../utils/utilities';
-import { apiRequest } from './GenericFunctions';
-
 import { boardFields, boardOperations } from './BoardDescription';
-
-import { cardFields, cardOperations } from './CardDescription';
-
 import { cardCommentFields, cardCommentOperations } from './CardCommentDescription';
-
+import { cardFields, cardOperations } from './CardDescription';
 import { checklistFields, checklistOperations } from './ChecklistDescription';
-
 import { checklistItemFields, checklistItemOperations } from './ChecklistItemDescription';
-
+import { apiRequest } from './GenericFunctions';
 import { listFields, listOperations } from './ListDescription';
+import { wrapData } from '../../utils/utilities';
 
 // https://wekan.github.io/api/v4.41/
 
diff --git a/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts b/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
index b50c9adad9..6f027ccd8e 100644
--- a/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/GenericFunctions.ts
@@ -9,6 +9,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
+
 import type {
 	WhatsAppAppWebhookSubscriptionsResponse,
 	WhatsAppAppWebhookSubscription,
diff --git a/packages/nodes-base/nodes/WhatsApp/MediaDescription.ts b/packages/nodes-base/nodes/WhatsApp/MediaDescription.ts
index 48ef7dd377..e22498b35b 100644
--- a/packages/nodes-base/nodes/WhatsApp/MediaDescription.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MediaDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { setupUpload } from './MediaFunctions';
 
 export const mediaFields: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts b/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
index 643c543f4d..f1b47900c1 100644
--- a/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
@@ -1,8 +1,7 @@
+import FormData from 'form-data';
 import type { IDataObject, IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import FormData from 'form-data';
-
 export async function getUploadFormData(
 	this: IExecuteSingleFunctions,
 ): Promise<{ fileName: string; formData: FormData }> {
diff --git a/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts b/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
index d3a087903c..10fdc64d3d 100644
--- a/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
@@ -1,5 +1,6 @@
 import countryCodes from 'currency-codes';
 import type { INodeProperties } from 'n8n-workflow';
+
 import {
 	cleanPhoneNumber,
 	componentsRequest,
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
index 7275a9b43e..2947b4a60d 100644
--- a/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsApp.node.ts
@@ -1,8 +1,8 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { messageFields, messageTypeFields } from './MessagesDescription';
 import { mediaFields, mediaTypeFields } from './MediaDescription';
+import { messageFields, messageTypeFields } from './MessagesDescription';
 
 export class WhatsApp implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
index fb0f0e40f4..a9603fb25f 100644
--- a/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
+++ b/packages/nodes-base/nodes/WhatsApp/WhatsAppTrigger.node.ts
@@ -9,6 +9,7 @@ import {
 	type IWebhookResponseData,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
 import {
 	appWebhookSubscriptionCreate,
 	appWebhookSubscriptionDelete,
diff --git a/packages/nodes-base/nodes/Wise/GenericFunctions.ts b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
index a5fe553803..129ef4e8a9 100644
--- a/packages/nodes-base/nodes/Wise/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
@@ -1,5 +1,4 @@
 import { createSign } from 'crypto';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index 59ce8beff9..22432a3422 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.ts
+++ b/packages/nodes-base/nodes/Wise/Wise.node.ts
@@ -1,3 +1,5 @@
+import omit from 'lodash/omit';
+import moment from 'moment-timezone';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,10 +10,8 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-
-import omit from 'lodash/omit';
-import moment from 'moment-timezone';
 import { v4 as uuid } from 'uuid';
+
 import {
 	accountFields,
 	accountOperations,
@@ -26,7 +26,6 @@ import {
 	transferFields,
 	transferOperations,
 } from './descriptions';
-
 import type {
 	BorderlessAccount,
 	ExchangeRateAdditionalFields,
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index f2519b17e5..a4ef46ffd3 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -1,5 +1,6 @@
+import { snakeCase } from 'change-case';
 import { createHash } from 'crypto';
-
+import omit from 'lodash/omit';
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
@@ -11,9 +12,6 @@ import type {
 	IRequestOptions,
 } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
-
-import omit from 'lodash/omit';
 import type { ICouponLine, IFeeLine, ILineItem, IShoppingLine } from './OrderInterface';
 
 export async function woocommerceApiRequest(
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
index 3fb4ac5830..0aaab6b978 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -8,6 +8,8 @@ import {
 	type INodeTypeDescription,
 	NodeConnectionType,
 } from 'n8n-workflow';
+
+import { customerFields, customerOperations } from './descriptions';
 import {
 	adjustMetadata,
 	setFields,
@@ -16,9 +18,7 @@ import {
 	woocommerceApiRequest,
 	woocommerceApiRequestAllItems,
 } from './GenericFunctions';
-import { productFields, productOperations } from './ProductDescription';
 import { orderFields, orderOperations } from './OrderDescription';
-import type { IDimension, IImage, IProduct } from './ProductInterface';
 import type {
 	IAddress,
 	ICouponLine,
@@ -27,8 +27,8 @@ import type {
 	IOrder,
 	IShoppingLine,
 } from './OrderInterface';
-
-import { customerFields, customerOperations } from './descriptions';
+import { productFields, productOperations } from './ProductDescription';
+import type { IDimension, IImage, IProduct } from './ProductInterface';
 
 export class WooCommerce implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
index 52257110c1..4178e23b31 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -8,13 +8,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
-import { wordpressApiRequest, wordpressApiRequestAllItems } from './GenericFunctions';
-import { postFields, postOperations } from './PostDescription';
-import { pageFields, pageOperations } from './PageDescription';
-import { userFields, userOperations } from './UserDescription';
 
-import type { IPost } from './PostInterface';
+import { wordpressApiRequest, wordpressApiRequestAllItems } from './GenericFunctions';
+import { pageFields, pageOperations } from './PageDescription';
 import type { IPage } from './PageInterface';
+import { postFields, postOperations } from './PostDescription';
+import type { IPost } from './PostInterface';
+import { userFields, userOperations } from './UserDescription';
 import type { IUser } from './UserInterface';
 
 export class Wordpress implements INodeType {
diff --git a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
index 121ead0dc2..5ccc7f0fa2 100644
--- a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IHookFunctions,
 	IWebhookFunctions,
@@ -10,7 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType } from 'n8n-workflow';
 
-import { snakeCase } from 'change-case';
 import { workableApiRequest } from './GenericFunctions';
 
 export class WorkableTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
index 21cc48221b..0ef83bbe9d 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -1,5 +1,3 @@
-import type { Readable } from 'stream';
-
 import { BINARY_ENCODING, NodeConnectionType } from 'n8n-workflow';
 import type {
 	IExecuteFunctions,
@@ -7,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 export class WriteBinaryFile implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
index 4a06f8d0e3..1e5ac8e6c2 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import path from 'path';
+
+import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 import * as Helpers from '@test/nodes/Helpers';
 import type { WorkflowTestData } from '@test/nodes/types';
-import { executeWorkflow } from '@test/nodes/ExecuteWorkflow';
 
 describe('Test Write Binary File Node', () => {
 	beforeEach(async () => {
diff --git a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
index 7cb91c179c..63e7212e4c 100644
--- a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
+++ b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
@@ -12,7 +12,6 @@ import type {
 import { NodeConnectionType, jsonParse } from 'n8n-workflow';
 
 import { wufooApiRequest } from './GenericFunctions';
-
 import type { IField, IWebhook } from './Interface';
 
 export class WufooTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
index fade7c1334..894242fe7c 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.ts
+++ b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -10,15 +10,11 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import { xeroApiRequest, xeroApiRequestAllItems } from './GenericFunctions';
-
-import { invoiceFields, invoiceOperations } from './InvoiceDescription';
-
 import { contactFields, contactOperations } from './ContactDescription';
-
-import type { IInvoice, ILineItem } from './InvoiceInterface';
-
+import { xeroApiRequest, xeroApiRequestAllItems } from './GenericFunctions';
 import type { IAddress, IContact, IPhone } from './IContactInterface';
+import { invoiceFields, invoiceOperations } from './InvoiceDescription';
+import type { IInvoice, ILineItem } from './InvoiceInterface';
 
 export class Xero implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Xml/Xml.node.ts b/packages/nodes-base/nodes/Xml/Xml.node.ts
index 6b05660f24..d83eb3b82c 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml/Xml.node.ts
@@ -1,4 +1,3 @@
-import { Builder, Parser } from 'xml2js';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
@@ -6,6 +5,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError, deepCopy } from 'n8n-workflow';
+import { Builder, Parser } from 'xml2js';
 
 export class Xml implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Yourls/Yourls.node.ts b/packages/nodes-base/nodes/Yourls/Yourls.node.ts
index e4fee71eca..c611ab2819 100644
--- a/packages/nodes-base/nodes/Yourls/Yourls.node.ts
+++ b/packages/nodes-base/nodes/Yourls/Yourls.node.ts
@@ -8,7 +8,6 @@ import {
 } from 'n8n-workflow';
 
 import { yourlsApiRequest } from './GenericFunctions';
-
 import { urlFields, urlOperations } from './UrlDescription';
 
 export class Yourls implements INodeType {
diff --git a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
index aad3fa3d84..85ef2d7a6b 100644
--- a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
@@ -1,3 +1,4 @@
+import flow from 'lodash/flow';
 import type {
 	IExecuteFunctions,
 	IDataObject,
@@ -8,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import flow from 'lodash/flow';
-
 import type { Zammad } from './types';
 
 export function tolerateTrailingSlash(url: string) {
@@ -34,9 +33,8 @@ export async function zammadApiRequest(
 	const authentication = this.getNodeParameter('authentication', 0) as 'basicAuth' | 'tokenAuth';
 
 	if (authentication === 'basicAuth') {
-		const credentials = (await this.getCredentials(
-			'zammadBasicAuthApi',
-		)) as Zammad.BasicAuthCredentials;
+		const credentials =
+			await this.getCredentials<Zammad.BasicAuthCredentials>('zammadBasicAuthApi');
 
 		const baseUrl = tolerateTrailingSlash(credentials.baseUrl);
 
@@ -49,9 +47,8 @@ export async function zammadApiRequest(
 
 		options.rejectUnauthorized = !credentials.allowUnauthorizedCerts;
 	} else {
-		const credentials = (await this.getCredentials(
-			'zammadTokenAuthApi',
-		)) as Zammad.TokenAuthCredentials;
+		const credentials =
+			await this.getCredentials<Zammad.TokenAuthCredentials>('zammadTokenAuthApi');
 
 		const baseUrl = tolerateTrailingSlash(credentials.baseUrl);
 
diff --git a/packages/nodes-base/nodes/Zammad/Zammad.node.ts b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
index 5b006b444d..07f64c680b 100644
--- a/packages/nodes-base/nodes/Zammad/Zammad.node.ts
+++ b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
@@ -18,7 +18,6 @@ import {
 	ticketDescription,
 	userDescription,
 } from './descriptions';
-
 import {
 	doesNotBelongToZammad,
 	fieldToLoadOption,
@@ -38,7 +37,6 @@ import {
 	zammadApiRequest,
 	zammadApiRequestAllItems,
 } from './GenericFunctions';
-
 import type { Zammad as ZammadTypes } from './types';
 
 export class Zammad implements INodeType {
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
index b83e50c290..8c492275a8 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -11,16 +11,11 @@ import type {
 import { NodeApiError, NodeOperationError, NodeConnectionType } from 'n8n-workflow';
 
 import { validateJSON, zendeskApiRequest, zendeskApiRequestAllItems } from './GenericFunctions';
-
-import { ticketFields, ticketOperations } from './TicketDescription';
-
-import { ticketFieldFields, ticketFieldOperations } from './TicketFieldDescription';
-
-import { userFields, userOperations } from './UserDescription';
-
 import { organizationFields, organizationOperations } from './OrganizationDescription';
-
+import { ticketFields, ticketOperations } from './TicketDescription';
+import { ticketFieldFields, ticketFieldOperations } from './TicketFieldDescription';
 import type { IComment, ITicket } from './TicketInterface';
+import { userFields, userOperations } from './UserDescription';
 
 export class Zendesk implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index 72115e073e..1a0b5f59d0 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -10,9 +10,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
 
-import { zendeskApiRequest, zendeskApiRequestAllItems } from './GenericFunctions';
 import { conditionFields } from './ConditionDescription';
-
+import { zendeskApiRequest, zendeskApiRequestAllItems } from './GenericFunctions';
 import { triggerPlaceholders } from './TriggerPlaceholders';
 
 export class ZendeskTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index 7b025bfcda..554cb49425 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -1,3 +1,5 @@
+import flow from 'lodash/flow';
+import sortBy from 'lodash/sortBy';
 import type {
 	IExecuteFunctions,
 	IHookFunctions,
@@ -9,9 +11,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import flow from 'lodash/flow';
-import sortBy from 'lodash/sortBy';
-
 import type {
 	AllFields,
 	CamelCaseResource,
@@ -47,9 +46,7 @@ export async function zohoApiRequest(
 	qs: IDataObject = {},
 	uri?: string,
 ) {
-	const { oauthTokenData } = (await this.getCredentials(
-		'zohoOAuth2Api',
-	)) as ZohoOAuth2ApiCredentials;
+	const { oauthTokenData } = await this.getCredentials<ZohoOAuth2ApiCredentials>('zohoOAuth2Api');
 
 	const options: IRequestOptions = {
 		body: {
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index e1cd2135be..67d76a33ab 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -8,41 +8,6 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import {
-	addGetAllFilterOptions,
-	adjustAccountPayload,
-	adjustContactPayload,
-	adjustDealPayload,
-	adjustInvoicePayload,
-	adjustInvoicePayloadOnUpdate,
-	adjustLeadPayload,
-	adjustProductDetails,
-	adjustProductPayload,
-	adjustPurchaseOrderPayload,
-	adjustQuotePayload,
-	adjustSalesOrderPayload,
-	adjustVendorPayload,
-	getFields,
-	getPicklistOptions,
-	handleListing,
-	throwOnEmptyUpdate,
-	throwOnMissingProducts,
-	toLoadOptions,
-	zohoApiRequest,
-	zohoApiRequestAllItems,
-} from './GenericFunctions';
-
-import type {
-	CamelCaseResource,
-	GetAllFilterOptions,
-	LoadedAccounts,
-	LoadedContacts,
-	LoadedDeals,
-	LoadedProducts,
-	LoadedVendors,
-	ProductDetails,
-} from './types';
-
 import {
 	accountFields,
 	accountOperations,
@@ -65,6 +30,39 @@ import {
 	vendorFields,
 	vendorOperations,
 } from './descriptions';
+import {
+	addGetAllFilterOptions,
+	adjustAccountPayload,
+	adjustContactPayload,
+	adjustDealPayload,
+	adjustInvoicePayload,
+	adjustInvoicePayloadOnUpdate,
+	adjustLeadPayload,
+	adjustProductDetails,
+	adjustProductPayload,
+	adjustPurchaseOrderPayload,
+	adjustQuotePayload,
+	adjustSalesOrderPayload,
+	adjustVendorPayload,
+	getFields,
+	getPicklistOptions,
+	handleListing,
+	throwOnEmptyUpdate,
+	throwOnMissingProducts,
+	toLoadOptions,
+	zohoApiRequest,
+	zohoApiRequestAllItems,
+} from './GenericFunctions';
+import type {
+	CamelCaseResource,
+	GetAllFilterOptions,
+	LoadedAccounts,
+	LoadedContacts,
+	LoadedDeals,
+	LoadedProducts,
+	LoadedVendors,
+	ProductDetails,
+} from './types';
 
 export class ZohoCrm implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
index 6e79c724b1..aa62792041 100644
--- a/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
+++ b/packages/nodes-base/nodes/Zoho/descriptions/SharedFields.ts
@@ -1,4 +1,5 @@
 import type { INodeProperties } from 'n8n-workflow';
+
 import { capitalizeInitial } from '../GenericFunctions';
 import type { CamelCaseResource } from '../types';
 
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index 2937ffa2f9..2a9f051765 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.ts
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
@@ -1,3 +1,4 @@
+import moment from 'moment-timezone';
 import {
 	type IExecuteFunctions,
 	type IDataObject,
@@ -9,9 +10,7 @@ import {
 	NodeConnectionType,
 } from 'n8n-workflow';
 
-import moment from 'moment-timezone';
 import { zoomApiRequest, zoomApiRequestAllItems } from './GenericFunctions';
-
 import { meetingFields, meetingOperations } from './MeetingDescription';
 
 // import {
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index 7caa98132c..67fab2e467 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -1,3 +1,4 @@
+import { snakeCase } from 'change-case';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,13 +9,13 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeConnectionType, NodeOperationError } from 'n8n-workflow';
-import { snakeCase } from 'change-case';
+
 import { validateJSON, zulipApiRequest } from './GenericFunctions';
 import { messageFields, messageOperations } from './MessageDescription';
 import type { IMessage } from './MessageInterface';
 import { streamFields, streamOperations } from './StreamDescription';
-import { userFields, userOperations } from './UserDescription';
 import type { IPrincipal, IStream } from './StreamInterface';
+import { userFields, userOperations } from './UserDescription';
 import type { IUser } from './UserInterface';
 
 export class Zulip implements INodeType {
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index f81ce3b248..a48736238b 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,19 +1,18 @@
 {
   "name": "n8n-nodes-base",
-  "version": "1.65.0",
+  "version": "1.75.0",
   "description": "Base nodes of n8n",
   "main": "index.js",
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
     "typecheck": "tsc --noEmit",
-    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm n8n-generate-translations && pnpm build:metadata",
-    "build:metadata": "pnpm n8n-generate-known && pnpm n8n-generate-ui-types",
+    "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && pnpm n8n-copy-icons && pnpm n8n-generate-translations && pnpm n8n-generate-metadata",
     "format": "biome format --write .",
     "format:check": "biome ci .",
-    "lint": "eslint . --quiet && node ./scripts/validate-load-options-methods.js",
-    "lintfix": "eslint . --fix",
-    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\" --onSuccess \"pnpm n8n-generate-ui-types\"",
+    "lint": "eslint nodes credentials utils test --quiet && node ./scripts/validate-load-options-methods.js",
+    "lintfix": "eslint nodes credentials utils test --fix",
+    "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\" --onSuccess \"pnpm n8n-generate-metadata\"",
     "test": "jest"
   },
   "files": [
@@ -225,6 +224,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",
@@ -286,6 +286,7 @@
       "dist/credentials/QuickBooksOAuth2Api.credentials.js",
       "dist/credentials/RabbitMQ.credentials.js",
       "dist/credentials/RaindropOAuth2Api.credentials.js",
+      "dist/credentials/Rapid7InsightVmApi.credentials.js",
       "dist/credentials/RecordedFutureApi.credentials.js",
       "dist/credentials/RedditOAuth2Api.credentials.js",
       "dist/credentials/Redis.credentials.js",
@@ -317,6 +318,8 @@
       "dist/credentials/Sms77Api.credentials.js",
       "dist/credentials/Smtp.credentials.js",
       "dist/credentials/Snowflake.credentials.js",
+      "dist/credentials/SolarWindsIpamApi.credentials.js",
+      "dist/credentials/SolarWindsObservabilityApi.credentials.js",
       "dist/credentials/SplunkApi.credentials.js",
       "dist/credentials/SpontitApi.credentials.js",
       "dist/credentials/SpotifyOAuth2Api.credentials.js",
@@ -379,6 +382,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",
@@ -489,8 +493,8 @@
       "dist/nodes/ErrorTrigger/ErrorTrigger.node.js",
       "dist/nodes/Eventbrite/EventbriteTrigger.node.js",
       "dist/nodes/ExecuteCommand/ExecuteCommand.node.js",
-      "dist/nodes/ExecuteWorkflow/ExecuteWorkflow.node.js",
-      "dist/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.js",
+      "dist/nodes/ExecuteWorkflow/ExecuteWorkflow/ExecuteWorkflow.node.js",
+      "dist/nodes/ExecuteWorkflow/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.js",
       "dist/nodes/ExecutionData/ExecutionData.node.js",
       "dist/nodes/Facebook/FacebookGraphApi.node.js",
       "dist/nodes/Facebook/FacebookTrigger.node.js",
@@ -622,6 +626,7 @@
       "dist/nodes/MessageBird/MessageBird.node.js",
       "dist/nodes/Metabase/Metabase.node.js",
       "dist/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.js",
+      "dist/nodes/Microsoft/Entra/MicrosoftEntra.node.js",
       "dist/nodes/Microsoft/Excel/MicrosoftExcel.node.js",
       "dist/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.js",
       "dist/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.js",
@@ -847,6 +852,7 @@
     "@aws-sdk/client-sso-oidc": "3.666.0",
     "@kafkajs/confluent-schema-registry": "1.0.6",
     "@n8n/config": "workspace:*",
+    "@n8n/di": "workspace:*",
     "@n8n/imap": "workspace:*",
     "@n8n/vm2": "3.9.25",
     "alasql": "4.4.0",
@@ -863,9 +869,10 @@
     "fast-glob": "catalog:",
     "fflate": "0.7.4",
     "get-system-fonts": "2.0.2",
+    "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",
@@ -879,7 +886,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",
@@ -905,7 +912,6 @@
     "ssh2-sftp-client": "7.2.3",
     "tmp-promise": "3.0.3",
     "ts-ics": "1.2.2",
-    "typedi": "catalog:",
     "uuid": "catalog:",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz",
     "xml2js": "catalog:"
diff --git a/packages/nodes-base/scripts/validate-load-options-methods.js b/packages/nodes-base/scripts/validate-load-options-methods.js
index 9fa11a7822..b043365b93 100644
--- a/packages/nodes-base/scripts/validate-load-options-methods.js
+++ b/packages/nodes-base/scripts/validate-load-options-methods.js
@@ -6,7 +6,7 @@ try {
 	definedMethods = require('../dist/methods/defined.json');
 } catch (error) {
 	console.error(
-		'Failed to find methods to validate. Please run `npm run n8n-generate-ui-types` first.',
+		'Failed to find methods to validate. Please run `npm run n8n-generate-metadata` first.',
 	);
 	process.exit(1);
 }
diff --git a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
index 82b20eaf82..3573edf2d4 100644
--- a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
+++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
@@ -1,4 +1,5 @@
 import nock from 'nock';
+
 import { executeWorkflow } from '../ExecuteWorkflow';
 import * as Helpers from '../Helpers';
 import type { WorkflowTestData } from '../types';
diff --git a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
index ffb79a78ed..969001e619 100644
--- a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
+++ b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
@@ -1,7 +1,8 @@
-import nock from 'nock';
 import { WorkflowExecute } from 'n8n-core';
 import type { INodeTypes, IRun, IRunExecutionData } from 'n8n-workflow';
 import { createDeferredPromise, Workflow } from 'n8n-workflow';
+import nock from 'nock';
+
 import * as Helpers from './Helpers';
 import type { WorkflowTestData } from './types';
 
diff --git a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
index eaccd22fdc..e7fee750f8 100644
--- a/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
+++ b/packages/nodes-base/test/nodes/FakeCredentialsMap.ts
@@ -80,6 +80,30 @@ BQIDAQAB
 		},
 		baseUrl: 'https://api.gong.io',
 	},
+	microsoftEntraOAuth2Api: {
+		grantType: 'authorizationCode',
+		authUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/authorize',
+		accessTokenUrl: 'https://login.microsoftonline.com/common/oauth2/v2.0/token',
+		clientId: 'CLIENTID',
+		clientSecret: 'CLIENTSECRET',
+		scope:
+			'openid offline_access AccessReview.ReadWrite.All Directory.ReadWrite.All NetworkAccessPolicy.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All EntitlementManagement.ReadWrite.All User.ReadWrite.All Directory.AccessAsUser.All Sites.FullControl.All',
+		authQueryParameters: 'response_mode=query',
+		authentication: 'body',
+		oauthTokenData: {
+			token_type: 'Bearer',
+			scope:
+				'AccessReview.ReadWrite.All DelegatedAdminRelationship.ReadWrite.All Directory.AccessAsUser.All Directory.Read.All Directory.ReadWrite.All EntitlementManagement.ReadWrite.All Group.ReadWrite.All NetworkAccessPolicy.ReadWrite.All openid Sites.FullControl.All User.DeleteRestore.All User.EnableDisableAccount.All User.Export.All User.Invite.All User.ManageIdentities.All User.Read User.Read.All User.ReadBasic.All User.ReadWrite User.ReadWrite.All User.RevokeSessions.All profile email',
+			expires_in: 4822,
+			ext_expires_in: 4822,
+			access_token: 'ACCESSTOKEN',
+			refresh_token: 'REFRESHTOKEN',
+			id_token: 'IDTOKEN',
+			callbackQueryString: {
+				session_state: 'SESSIONSTATE',
+			},
+		},
+	},
 	n8nApi: {
 		apiKey: 'key123',
 		baseUrl: 'https://test.app.n8n.cloud/api/v1',
@@ -121,4 +145,66 @@ BQIDAQAB
 		secret: 'baz',
 		algorithm: 'HS256',
 	},
+	telegramApi: {
+		accessToken: 'testToken',
+		baseUrl: 'https://api.telegram.org',
+	},
+	gmailOAuth2: {
+		grantType: 'authorizationCode',
+		authUrl: 'https://accounts.google.com/o/oauth2/v2/auth',
+		accessTokenUrl: 'https://oauth2.googleapis.com/token',
+		clientId: 'CLIENTID',
+		clientSecret: 'CLIENTSECRET',
+		scope:
+			'https://www.googleapis.com/auth/gmail.labels https://www.googleapis.com/auth/gmail.addons.current.action.compose https://www.googleapis.com/auth/gmail.addons.current.message.action https://mail.google.com/ https://www.googleapis.com/auth/gmail.modify https://www.googleapis.com/auth/gmail.compose',
+		authQueryParameters: 'access_type=offline&prompt=consent',
+		authentication: 'body',
+		oauthTokenData: {
+			access_token: 'ACCESSTOKEN',
+			refresh_token: 'REFRESHTOKEN',
+			scope:
+				'https://www.googleapis.com/auth/gmail.labels https://www.googleapis.com/auth/gmail.addons.current.action.compose https://www.googleapis.com/auth/gmail.addons.current.message.action https://mail.google.com/ https://www.googleapis.com/auth/gmail.modify https://www.googleapis.com/auth/gmail.compose',
+			token_type: 'bearer',
+			expires_in: 86400,
+		},
+	},
+	notionApi: {
+		apiKey: 'key123',
+	},
+	philipsHueOAuth2Api: {
+		grantType: 'authorizationCode',
+		appId: 'APPID',
+		authUrl: 'https://api.meethue.com/v2/oauth2/authorize',
+		accessTokenUrl: 'https://api.meethue.com/v2/oauth2/token',
+		authQueryParameters: 'appid=APPID',
+		scope: '',
+		authentication: 'header',
+		oauthTokenData: {
+			access_token: 'ACCESSTOKEN',
+			refresh_token: 'REFRESHTOKEN',
+			scope: '',
+			token_type: 'bearer',
+			expires_in: 86400,
+		},
+	},
+	spotifyOAuth2Api: {
+		accessTokenUrl: 'https://accounts.spotify.com/api/token',
+		authQueryParameters: '',
+		authUrl: 'https://accounts.spotify.com/authorize',
+		authentication: 'header',
+		clientId: 'CLIENT_ID',
+		clientSecret: 'CLIENT_SECRET',
+		grantType: 'authorizationCode',
+		oauthTokenData: {
+			access_token: 'ACCESS_TOKEN',
+			expires_in: 3600,
+			refresh_token: 'REFRESH_TOKEN',
+			scope:
+				'playlist-read-private playlist-read-collaborative user-modify-playback-state user-library-read user-follow-read playlist-modify-private playlist-modify-public user-read-playback-state user-read-currently-playing user-read-recently-played',
+			token_type: 'Bearer',
+		},
+		scope:
+			'user-read-playback-state playlist-read-collaborative user-modify-playback-state playlist-modify-public user-read-currently-playing playlist-read-private user-read-recently-played playlist-modify-private user-library-read user-follow-read',
+		server: 'https://api.spotify.com/',
+	},
 } as const;
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index 98e8ebf918..017e2058f9 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -1,12 +1,14 @@
+import { Container } from '@n8n/di';
 import { readFileSync, readdirSync, mkdtempSync } from 'fs';
-import path from 'path';
-import { tmpdir } from 'os';
-import nock from 'nock';
-import { isEmpty } from 'lodash';
-import { get } from 'lodash';
-import { BinaryDataService, Credentials, constructExecutionMetaData } from 'n8n-core';
-import { Container } from 'typedi';
 import { mock } from 'jest-mock-extended';
+import { get } from 'lodash';
+import { isEmpty } from 'lodash';
+import {
+	BinaryDataService,
+	Credentials,
+	UnrecognizedNodeTypeError,
+	constructExecutionMetaData,
+} from 'n8n-core';
 import type {
 	CredentialLoadingDetails,
 	ICredentialDataDecryptedObject,
@@ -34,8 +36,11 @@ import type {
 	WorkflowTestData,
 } from 'n8n-workflow';
 import { ApplicationError, ICredentialsHelper, NodeHelpers, WorkflowHooks } from 'n8n-workflow';
-import { executeWorkflow } from './ExecuteWorkflow';
+import nock from 'nock';
+import { tmpdir } from 'os';
+import path from 'path';
 
+import { executeWorkflow } from './ExecuteWorkflow';
 import { FAKE_CREDENTIALS_DATA } from './FakeCredentialsMap';
 
 const baseDir = path.resolve(__dirname, '../..');
@@ -251,12 +256,9 @@ export function setup(testData: WorkflowTestData[] | WorkflowTestData) {
 
 	const nodeNames = nodes.map((n) => n.type);
 	for (const nodeName of nodeNames) {
-		if (!nodeName.startsWith('n8n-nodes-base.')) {
-			throw new ApplicationError(`Unknown node type: ${nodeName}`, { level: 'warning' });
-		}
 		const loadInfo = knownNodes[nodeName.replace('n8n-nodes-base.', '')];
 		if (!loadInfo) {
-			throw new ApplicationError(`Unknown node type: ${nodeName}`, { level: 'warning' });
+			throw new UnrecognizedNodeTypeError('n8n-nodes-base', nodeName);
 		}
 		const sourcePath = loadInfo.sourcePath.replace(/^dist\//, './').replace(/\.js$/, '.ts');
 		const nodeSourcePath = path.join(baseDir, sourcePath);
@@ -330,7 +332,7 @@ export const equalityTest = async (testData: WorkflowTestData, types: INodeTypes
 		return expect(resultData, msg).toEqual(testData.output.nodeData[nodeName]);
 	});
 
-	expect(result.finished).toEqual(true);
+	expect(result.finished || result.status === 'waiting').toEqual(true);
 };
 
 const preparePinData = (pinData: IDataObject) => {
diff --git a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
index 8080c711fb..42b88b7338 100644
--- a/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
+++ b/packages/nodes-base/test/nodes/Postgres/Postgres.node.functions.test.ts
@@ -1,4 +1,5 @@
 const pgPromise = require('pg-promise');
+
 const PostgresFun = require('../../../nodes/Postgres/v1/genericFunctions');
 
 type NodeParams = Record<string, string | {}>;
diff --git a/packages/nodes-base/test/nodes/Start/StartNode.test.ts b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
index c399bd4554..f56806b8b4 100644
--- a/packages/nodes-base/test/nodes/Start/StartNode.test.ts
+++ b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
@@ -1,6 +1,6 @@
+import { executeWorkflow } from '../ExecuteWorkflow';
 import * as Helpers from '../Helpers';
 import type { WorkflowTestData } from '../types';
-import { executeWorkflow } from '../ExecuteWorkflow';
 
 describe('Execute Start Node', () => {
 	const tests: WorkflowTestData[] = [
diff --git a/packages/nodes-base/test/nodes/TriggerHelpers.ts b/packages/nodes-base/test/nodes/TriggerHelpers.ts
index 93b4dfae9e..5348cab08c 100644
--- a/packages/nodes-base/test/nodes/TriggerHelpers.ts
+++ b/packages/nodes-base/test/nodes/TriggerHelpers.ts
@@ -3,8 +3,8 @@ import { mock } from 'jest-mock-extended';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
 import set from 'lodash/set';
-import { getExecutePollFunctions, returnJsonArray, type InstanceSettings } from 'n8n-core';
-import { ScheduledTaskManager } from 'n8n-core/dist/ScheduledTaskManager';
+import { PollContext, returnJsonArray, type InstanceSettings } from 'n8n-core';
+import { ScheduledTaskManager } from 'n8n-core/dist/execution-engine/scheduled-task-manager';
 import type {
 	IBinaryData,
 	ICredentialDataDecryptedObject,
@@ -13,7 +13,6 @@ import type {
 	INode,
 	INodeType,
 	INodeTypes,
-	IPollFunctions,
 	ITriggerFunctions,
 	IWebhookFunctions,
 	IWorkflowExecuteAdditionalData,
@@ -193,14 +192,15 @@ export async function testPollingTriggerNode(
 		options.node,
 	) as INode;
 	const workflow = mock<Workflow>({
-		timezone: options.timezone ?? 'Europe/Berlin',
+		timezone,
 		nodeTypes: mock<INodeTypes>({
 			getByNameAndVersion: () => mock<INodeType>({ description: trigger.description }),
 		}),
+		getStaticData: () => options.workflowStaticData ?? {},
 	});
 	const mode = options.mode ?? 'trigger';
 
-	const originalPollingFunctions = getExecutePollFunctions(
+	const pollContext = new PollContext(
 		workflow,
 		node,
 		mock<IWorkflowExecuteAdditionalData>({
@@ -218,22 +218,13 @@ export async function testPollingTriggerNode(
 		'init',
 	);
 
-	async function getCredentials<T extends object = ICredentialDataDecryptedObject>(): Promise<T> {
-		return (options.credential ?? {}) as T;
-	}
+	pollContext.getNode = () => node;
+	pollContext.getCredentials = async <T extends object = ICredentialDataDecryptedObject>() =>
+		(options.credential ?? {}) as T;
+	pollContext.getNodeParameter = (parameterName, fallback) =>
+		get(node.parameters, parameterName) ?? fallback;
 
-	const pollingFunctions = mock<IPollFunctions>({
-		...originalPollingFunctions,
-		getCredentials,
-		getTimezone: () => timezone,
-		getNode: () => node,
-		getMode: () => mode,
-		getInstanceId: () => 'instanceId',
-		getWorkflowStaticData: () => options.workflowStaticData ?? {},
-		getNodeParameter: (parameterName, fallback) => get(node.parameters, parameterName) ?? fallback,
-	});
-
-	const response = await trigger.poll?.call(pollingFunctions);
+	const response = await trigger.poll?.call(pollContext);
 
 	return {
 		response,
diff --git a/packages/nodes-base/test/utils/utilities.test.ts b/packages/nodes-base/test/utils/utilities.test.ts
index 4ffc0835bb..a30552f6f5 100644
--- a/packages/nodes-base/test/utils/utilities.test.ts
+++ b/packages/nodes-base/test/utils/utilities.test.ts
@@ -1,3 +1,5 @@
+import type { INodeExecutionData } from 'n8n-workflow';
+
 import {
 	compareItems,
 	flattenKeys,
@@ -5,6 +7,7 @@ import {
 	getResolvables,
 	keysToLowercase,
 	shuffleArray,
+	sortItemKeysByPriorityList,
 	wrapData,
 } from '@utils/utilities';
 
@@ -252,3 +255,60 @@ describe('compareItems', () => {
 		expect(result).toBe(true);
 	});
 });
+
+describe('sortItemKeysByPriorityList', () => {
+	it('should reorder keys based on priority list', () => {
+		const data: INodeExecutionData[] = [{ json: { c: 3, a: 1, b: 2 } }];
+		const priorityList = ['b', 'a'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['b', 'a', 'c']);
+	});
+
+	it('should sort keys not in the priority list alphabetically', () => {
+		const data: INodeExecutionData[] = [{ json: { c: 3, a: 1, b: 2, d: 4 } }];
+		const priorityList = ['b', 'a'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['b', 'a', 'c', 'd']);
+	});
+
+	it('should sort all keys alphabetically when priority list is empty', () => {
+		const data: INodeExecutionData[] = [{ json: { c: 3, a: 1, b: 2 } }];
+		const priorityList: string[] = [];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['a', 'b', 'c']);
+	});
+
+	it('should handle an empty data array', () => {
+		const data: INodeExecutionData[] = [];
+		const priorityList = ['b', 'a'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		// Expect an empty array since there is no data
+		expect(result).toEqual([]);
+	});
+
+	it('should handle a single object in the data array', () => {
+		const data: INodeExecutionData[] = [{ json: { d: 4, b: 2, a: 1 } }];
+		const priorityList = ['a', 'b', 'c'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['a', 'b', 'd']);
+	});
+
+	it('should handle duplicate keys in the priority list gracefully', () => {
+		const data: INodeExecutionData[] = [{ json: { d: 4, b: 2, a: 1 } }];
+		const priorityList = ['a', 'b', 'a'];
+
+		const result = sortItemKeysByPriorityList(data, priorityList);
+
+		expect(Object.keys(result[0].json)).toEqual(['a', 'b', 'd']);
+	});
+});
diff --git a/packages/nodes-base/tsconfig.build.json b/packages/nodes-base/tsconfig.build.json
index 3a26457c9c..d92417abdd 100644
--- a/packages/nodes-base/tsconfig.build.json
+++ b/packages/nodes-base/tsconfig.build.json
@@ -8,7 +8,8 @@
 		"credentials/**/*.ts",
 		"nodes/**/*.ts",
 		"nodes/**/*.json",
-		"credentials/translations/**/*.json"
+		"credentials/translations/**/*.json",
+		"types/**/*.ts"
 	],
 	"exclude": ["nodes/**/*.test.ts", "credentials/**/*.test.ts", "test/**"]
 }
diff --git a/packages/nodes-base/tsconfig.json b/packages/nodes-base/tsconfig.json
index b5a7282ff9..2cbb72109a 100644
--- a/packages/nodes-base/tsconfig.json
+++ b/packages/nodes-base/tsconfig.json
@@ -10,7 +10,13 @@
 		"noImplicitReturns": false,
 		"useUnknownInCatchVariables": false
 	},
-	"include": ["credentials/**/*.ts", "nodes/**/*.ts", "test/**/*.ts", "utils/**/*.ts"],
+	"include": [
+		"credentials/**/*.ts",
+		"nodes/**/*.ts",
+		"test/**/*.ts",
+		"utils/**/*.ts",
+		"types/**/*.ts"
+	],
 	"references": [
 		{ "path": "../@n8n/imap/tsconfig.build.json" },
 		{ "path": "../workflow/tsconfig.build.json" },
diff --git a/packages/nodes-base/types/generate-schema.d.ts b/packages/nodes-base/types/generate-schema.d.ts
new file mode 100644
index 0000000000..90e0e15b05
--- /dev/null
+++ b/packages/nodes-base/types/generate-schema.d.ts
@@ -0,0 +1,27 @@
+declare module 'generate-schema' {
+	export interface SchemaObject {
+		$schema: string;
+		title?: string;
+		type: string;
+		properties?: {
+			[key: string]: SchemaObject | SchemaArray | SchemaProperty;
+		};
+		required?: string[];
+		items?: SchemaObject | SchemaArray;
+	}
+
+	export interface SchemaArray {
+		type: string;
+		items?: SchemaObject | SchemaArray | SchemaProperty;
+		oneOf?: Array<SchemaObject | SchemaArray | SchemaProperty>;
+		required?: string[];
+	}
+
+	export interface SchemaProperty {
+		type: string | string[];
+		format?: string;
+	}
+
+	export function json(title: string, schema: SchemaObject): SchemaObject;
+	export function json(schema: SchemaObject): SchemaObject;
+}
diff --git a/packages/nodes-base/utils/__tests__/binary.test.ts b/packages/nodes-base/utils/__tests__/binary.test.ts
new file mode 100644
index 0000000000..b8e9e6ddba
--- /dev/null
+++ b/packages/nodes-base/utils/__tests__/binary.test.ts
@@ -0,0 +1,92 @@
+import { mock } from 'jest-mock-extended';
+import type { IBinaryData, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
+import { type WorkSheet, utils as xlsxUtils, write as xlsxWrite } from 'xlsx';
+
+import { convertJsonToSpreadsheetBinary } from '@utils/binary';
+
+jest.mock('xlsx', () => ({
+	utils: {
+		json_to_sheet: jest.fn(),
+	},
+	write: jest.fn(),
+}));
+
+describe('convertJsonToSpreadsheetBinary', () => {
+	const helpers = mock<IExecuteFunctions['helpers']>();
+	const executeFunctions = mock<IExecuteFunctions>({ helpers });
+	const items = [
+		{ json: { key1: 'value1', key2: 'value2' } },
+		{ json: { key1: 'value3', key2: 'value4' } },
+	] as INodeExecutionData[];
+	const mockSheet = mock<WorkSheet>();
+	const workBook = {
+		SheetNames: ['Sheet'],
+		Sheets: {
+			Sheet: mockSheet,
+		},
+	};
+	const mockBuffer = mock<Buffer>();
+	const mockBinaryData = mock<IBinaryData>({ id: 'binaryId' });
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+		(xlsxUtils.json_to_sheet as jest.Mock).mockReturnValue(mockSheet);
+		(xlsxWrite as jest.Mock).mockReturnValue(mockBuffer);
+		helpers.prepareBinaryData.mockResolvedValue(mockBinaryData);
+	});
+
+	describe('for fileFormat xlsx', () => {
+		it('should convert from JSON', async () => {
+			const result = await convertJsonToSpreadsheetBinary.call(executeFunctions, items, 'xlsx', {});
+
+			expect(result).toEqual(mockBinaryData);
+			expect(xlsxUtils.json_to_sheet).toHaveBeenCalledWith(
+				items.map((item) => item.json),
+				undefined,
+			);
+			expect(xlsxWrite).toHaveBeenCalledWith(workBook, {
+				bookType: 'xlsx',
+				bookSST: false,
+				type: 'buffer',
+			});
+			expect(helpers.prepareBinaryData).toHaveBeenCalledWith(mockBuffer, 'spreadsheet.xlsx');
+		});
+	});
+
+	describe('for fileFormat csv', () => {
+		it('should convert from JSON', async () => {
+			const result = await convertJsonToSpreadsheetBinary.call(executeFunctions, items, 'csv', {});
+
+			expect(result).toEqual(mockBinaryData);
+			expect(xlsxUtils.json_to_sheet).toHaveBeenCalledWith(
+				items.map((item) => item.json),
+				undefined,
+			);
+			expect(xlsxWrite).toHaveBeenCalledWith(workBook, {
+				bookType: 'csv',
+				bookSST: false,
+				type: 'buffer',
+			});
+			expect(helpers.prepareBinaryData).toHaveBeenCalledWith(mockBuffer, 'spreadsheet.csv');
+		});
+
+		it('should handle custom delimiter', async () => {
+			const result = await convertJsonToSpreadsheetBinary.call(executeFunctions, items, 'csv', {
+				delimiter: ';',
+			});
+
+			expect(result).toEqual(mockBinaryData);
+			expect(xlsxUtils.json_to_sheet).toHaveBeenCalledWith(
+				items.map((item) => item.json),
+				undefined,
+			);
+			expect(xlsxWrite).toHaveBeenCalledWith(workBook, {
+				bookType: 'csv',
+				bookSST: false,
+				type: 'buffer',
+				FS: ';',
+			});
+			expect(helpers.prepareBinaryData).toHaveBeenCalledWith(mockBuffer, 'spreadsheet.csv');
+		});
+	});
+});
diff --git a/packages/nodes-base/utils/__tests__/connection-pool-manager.test.ts b/packages/nodes-base/utils/__tests__/connection-pool-manager.test.ts
new file mode 100644
index 0000000000..fe2c814582
--- /dev/null
+++ b/packages/nodes-base/utils/__tests__/connection-pool-manager.test.ts
@@ -0,0 +1,179 @@
+import { ConnectionPoolManager } from '@utils/connection-pool-manager';
+
+const ttl = 5 * 60 * 1000;
+const cleanUpInterval = 60 * 1000;
+
+let cpm: ConnectionPoolManager;
+
+beforeAll(() => {
+	jest.useFakeTimers();
+	cpm = ConnectionPoolManager.getInstance();
+});
+
+beforeEach(async () => {
+	await cpm.purgeConnections();
+});
+
+afterAll(() => {
+	cpm.onShutdown();
+});
+
+test('getInstance returns a singleton', () => {
+	const instance1 = ConnectionPoolManager.getInstance();
+	const instance2 = ConnectionPoolManager.getInstance();
+
+	expect(instance1).toBe(instance2);
+});
+
+describe('getConnection', () => {
+	test('calls fallBackHandler only once and returns the first value', async () => {
+		// ARRANGE
+		const connectionType = {};
+		const fallBackHandler = jest.fn().mockResolvedValue(connectionType);
+		const cleanUpHandler = jest.fn();
+		const options = {
+			credentials: {},
+			nodeType: 'example',
+			nodeVersion: '1',
+			fallBackHandler,
+			cleanUpHandler,
+		};
+
+		// ACT 1
+		const connection = await cpm.getConnection<string>(options);
+
+		// ASSERT 1
+		expect(fallBackHandler).toHaveBeenCalledTimes(1);
+		expect(connection).toBe(connectionType);
+
+		// ACT 2
+		const connection2 = await cpm.getConnection<string>(options);
+		// ASSERT 2
+		expect(fallBackHandler).toHaveBeenCalledTimes(1);
+		expect(connection2).toBe(connectionType);
+	});
+
+	test('creates different pools for different node versions', async () => {
+		// ARRANGE
+		const connectionType1 = {};
+		const fallBackHandler1 = jest.fn().mockResolvedValue(connectionType1);
+		const cleanUpHandler1 = jest.fn();
+
+		const connectionType2 = {};
+		const fallBackHandler2 = jest.fn().mockResolvedValue(connectionType2);
+		const cleanUpHandler2 = jest.fn();
+
+		// ACT 1
+		const connection1 = await cpm.getConnection<string>({
+			credentials: {},
+			nodeType: 'example',
+			nodeVersion: '1',
+			fallBackHandler: fallBackHandler1,
+			cleanUpHandler: cleanUpHandler1,
+		});
+		const connection2 = await cpm.getConnection<string>({
+			credentials: {},
+			nodeType: 'example',
+			nodeVersion: '2',
+			fallBackHandler: fallBackHandler2,
+			cleanUpHandler: cleanUpHandler2,
+		});
+
+		// ASSERT
+		expect(fallBackHandler1).toHaveBeenCalledTimes(1);
+		expect(connection1).toBe(connectionType1);
+
+		expect(fallBackHandler2).toHaveBeenCalledTimes(1);
+		expect(connection2).toBe(connectionType2);
+
+		expect(connection1).not.toBe(connection2);
+	});
+
+	test('calls cleanUpHandler after TTL expires', async () => {
+		// ARRANGE
+		const connectionType = {};
+		const fallBackHandler = jest.fn().mockResolvedValue(connectionType);
+		const cleanUpHandler = jest.fn();
+		await cpm.getConnection<string>({
+			credentials: {},
+			nodeType: 'example',
+			nodeVersion: '1',
+			fallBackHandler,
+			cleanUpHandler,
+		});
+
+		// ACT
+		jest.advanceTimersByTime(ttl + cleanUpInterval * 2);
+
+		// ASSERT
+		expect(cleanUpHandler).toHaveBeenCalledTimes(1);
+	});
+});
+
+describe('onShutdown', () => {
+	test('calls all clean up handlers', async () => {
+		// ARRANGE
+		const connectionType1 = {};
+		const fallBackHandler1 = jest.fn().mockResolvedValue(connectionType1);
+		const cleanUpHandler1 = jest.fn();
+		await cpm.getConnection<string>({
+			credentials: {},
+			nodeType: 'example',
+			nodeVersion: '1',
+			fallBackHandler: fallBackHandler1,
+			cleanUpHandler: cleanUpHandler1,
+		});
+
+		const connectionType2 = {};
+		const fallBackHandler2 = jest.fn().mockResolvedValue(connectionType2);
+		const cleanUpHandler2 = jest.fn();
+		await cpm.getConnection<string>({
+			credentials: {},
+			nodeType: 'example',
+			nodeVersion: '2',
+			fallBackHandler: fallBackHandler2,
+			cleanUpHandler: cleanUpHandler2,
+		});
+
+		// ACT 1
+		cpm.onShutdown();
+
+		// ASSERT
+		expect(cleanUpHandler1).toHaveBeenCalledTimes(1);
+		expect(cleanUpHandler2).toHaveBeenCalledTimes(1);
+	});
+
+	test('calls all clean up handlers when `exit` is emitted on process', async () => {
+		// ARRANGE
+		const connectionType1 = {};
+		const fallBackHandler1 = jest.fn().mockResolvedValue(connectionType1);
+		const cleanUpHandler1 = jest.fn();
+		await cpm.getConnection<string>({
+			credentials: {},
+			nodeType: 'example',
+			nodeVersion: '1',
+			fallBackHandler: fallBackHandler1,
+			cleanUpHandler: cleanUpHandler1,
+		});
+
+		const connectionType2 = {};
+		const fallBackHandler2 = jest.fn().mockResolvedValue(connectionType2);
+		const cleanUpHandler2 = jest.fn();
+		await cpm.getConnection<string>({
+			credentials: {},
+			nodeType: 'example',
+			nodeVersion: '2',
+			fallBackHandler: fallBackHandler2,
+			cleanUpHandler: cleanUpHandler2,
+		});
+
+		// ACT 1
+		// @ts-expect-error we're not supposed to emit `exit` so it's missing from
+		// the type definition
+		process.emit('exit');
+
+		// ASSERT
+		expect(cleanUpHandler1).toHaveBeenCalledTimes(1);
+		expect(cleanUpHandler2).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/nodes-base/utils/binary.ts b/packages/nodes-base/utils/binary.ts
index 1a7b16f24d..fadbd147ce 100644
--- a/packages/nodes-base/utils/binary.ts
+++ b/packages/nodes-base/utils/binary.ts
@@ -1,13 +1,12 @@
+import iconv from 'iconv-lite';
+import get from 'lodash/get';
 import type { IBinaryData, IDataObject, IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError, BINARY_ENCODING } from 'n8n-workflow';
+import { getDocument as readPDF, version as pdfJsVersion } from 'pdfjs-dist';
+import type { DocumentInitParameters } from 'pdfjs-dist/types/src/display/api';
 import type { WorkBook, WritingOptions } from 'xlsx';
 import { utils as xlsxUtils, write as xlsxWrite } from 'xlsx';
 
-import get from 'lodash/get';
-import iconv from 'iconv-lite';
-
-import { getDocument as readPDF, version as pdfJsVersion } from 'pdfjs-dist';
-import type { DocumentInitParameters } from 'pdfjs-dist/types/src/display/api';
 import { flattenObject } from '@utils/utilities';
 
 export type JsonToSpreadsheetBinaryFormat = 'csv' | 'html' | 'rtf' | 'ods' | 'xls' | 'xlsx';
@@ -17,6 +16,7 @@ export type JsonToSpreadsheetBinaryOptions = {
 	compression?: boolean;
 	fileName?: string;
 	sheetName?: string;
+	delimiter?: string;
 };
 
 export type JsonToBinaryOptions = {
@@ -59,6 +59,10 @@ export async function convertJsonToSpreadsheetBinary(
 		type: 'buffer',
 	};
 
+	if (fileFormat === 'csv' && options.delimiter?.length) {
+		writingOptions.FS = options.delimiter ?? ',';
+	}
+
 	if (['xlsx', 'ods'].includes(fileFormat) && options.compression) {
 		writingOptions.compression = true;
 	}
diff --git a/packages/nodes-base/utils/connection-pool-manager.ts b/packages/nodes-base/utils/connection-pool-manager.ts
new file mode 100644
index 0000000000..9cdf86b0b4
--- /dev/null
+++ b/packages/nodes-base/utils/connection-pool-manager.ts
@@ -0,0 +1,137 @@
+import { createHash } from 'crypto';
+
+let instance: ConnectionPoolManager;
+
+// 5 minutes
+const ttl = 5 * 60 * 1000;
+
+// 1 minute
+const cleanUpInterval = 60 * 1000;
+
+type RegistrationOptions = {
+	credentials: unknown;
+	nodeType: string;
+	nodeVersion?: string;
+};
+
+type GetConnectionOption<Pool> = RegistrationOptions & {
+	/** When a node requests for a connection pool, but none is available, this handler is called to create new instance of the pool, which then cached and re-used until it goes stale.  */
+	fallBackHandler: () => Promise<Pool>;
+
+	/** When a pool hasn't been used in a while, or when the server is shutting down, this handler is invoked to close the pool */
+	cleanUpHandler: (pool: Pool) => Promise<void>;
+};
+
+type Registration<Pool> = {
+	/** This is an instance of a Connection Pool class, that gets reused across multiple executions */
+	pool: Pool;
+
+	/** @see GetConnectionOption['closeHandler'] */
+	cleanUpHandler: (pool: Pool) => Promise<void>;
+
+	/** We keep this timestamp to check if a pool hasn't been used in a while, and if it needs to be closed */
+	lastUsed: number;
+};
+
+export class ConnectionPoolManager {
+	/**
+	 * Gets the singleton instance of the ConnectionPoolManager.
+	 * Creates a new instance if one doesn't exist.
+	 */
+	static getInstance(): ConnectionPoolManager {
+		if (!instance) {
+			instance = new ConnectionPoolManager();
+		}
+		return instance;
+	}
+
+	private map = new Map<string, Registration<unknown>>();
+
+	/**
+	 * Private constructor that initializes the connection pool manager.
+	 * Sets up cleanup handlers for process exit and stale connections.
+	 */
+	private constructor() {
+		// Close all open pools when the process exits
+		process.on('exit', () => this.onShutdown());
+
+		// Regularly close stale pools
+		setInterval(() => this.cleanupStaleConnections(), cleanUpInterval);
+	}
+
+	/**
+	 * Generates a unique key for connection pool identification.
+	 * Hashes the credentials and node information for security.
+	 */
+	private makeKey({ credentials, nodeType, nodeVersion }: RegistrationOptions): string {
+		// The credential contains decrypted secrets, that's why we hash it.
+		return createHash('sha1')
+			.update(
+				JSON.stringify({
+					credentials,
+					nodeType,
+					nodeVersion,
+				}),
+			)
+			.digest('base64');
+	}
+
+	/**
+	 * Gets or creates a connection pool for the given options.
+	 * Updates the last used timestamp for existing connections.
+	 */
+	async getConnection<T>(options: GetConnectionOption<T>): Promise<T> {
+		const key = this.makeKey(options);
+
+		let value = this.map.get(key);
+		if (!value) {
+			value = {
+				pool: await options.fallBackHandler(),
+				cleanUpHandler: options.cleanUpHandler,
+			} as Registration<unknown>;
+		}
+
+		this.map.set(key, { ...value, lastUsed: Date.now() });
+		return value.pool as T;
+	}
+
+	/**
+	 * Removes and cleans up connection pools that haven't been used within the
+	 * TTL.
+	 */
+	private cleanupStaleConnections() {
+		const now = Date.now();
+		for (const [key, { cleanUpHandler, lastUsed, pool }] of this.map.entries()) {
+			if (now - lastUsed > ttl) {
+				void cleanUpHandler(pool);
+				this.map.delete(key);
+			}
+		}
+	}
+
+	/**
+	 * Removes and cleans up all existing connection pools.
+	 */
+	async purgeConnections(): Promise<void> {
+		await Promise.all(
+			[...this.map.entries()].map(async ([key, value]) => {
+				this.map.delete(key);
+
+				return await value.cleanUpHandler(value.pool);
+			}),
+		);
+	}
+
+	/**
+	 * Cleans up all connection pools when the process is shutting down.
+	 * Does not wait for cleanup promises to resolve also does not remove the
+	 * references from the pool.
+	 *
+	 * Only call this on process shutdown.
+	 */
+	onShutdown() {
+		for (const { cleanUpHandler, pool } of this.map.values()) {
+			void cleanUpHandler(pool);
+		}
+	}
+}
diff --git a/packages/nodes-base/utils/sendAndWait/email-templates.ts b/packages/nodes-base/utils/sendAndWait/email-templates.ts
index 0ae8d7689a..1b0bc6153d 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'
 		/>
@@ -103,7 +103,7 @@ export function createEmailBody(message: string, buttons: string, instanceId?: s
 					<tr>
 						<td
 							style="text-align: center; padding-top: 8px; font-family: Arial, sans-serif; font-size: 14px; color: #7e8186;">
-							<p>${message}</p>
+							<p style="white-space: pre-line;">${message}</p>
 						</td>
 					</tr>
 					<tr>
diff --git a/packages/nodes-base/utils/sendAndWait/test/util.test.ts b/packages/nodes-base/utils/sendAndWait/test/util.test.ts
index 16e37c7790..5194887f2f 100644
--- a/packages/nodes-base/utils/sendAndWait/test/util.test.ts
+++ b/packages/nodes-base/utils/sendAndWait/test/util.test.ts
@@ -1,12 +1,12 @@
 import { type MockProxy, mock } from 'jest-mock-extended';
 import type { IExecuteFunctions, INodeProperties, IWebhookFunctions } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+
 import {
 	getSendAndWaitProperties,
 	getSendAndWaitConfig,
 	createEmail,
 	sendAndWaitWebhook,
-	MESSAGE_PREFIX,
 } from '../utils';
 
 describe('Send and Wait utils tests', () => {
@@ -159,7 +159,7 @@ describe('Send and Wait utils tests', () => {
 
 			expect(email).toEqual({
 				to: 'test@example.com',
-				subject: `${MESSAGE_PREFIX}Test subject`,
+				subject: 'Test subject',
 				body: '',
 				htmlBody: expect.stringContaining('Test message'),
 			});
@@ -208,5 +208,162 @@ describe('Send and Wait utils tests', () => {
 				workflowData: [[{ json: { data: { approved: false } } }]],
 			});
 		});
+
+		it('should handle freeText GET webhook', async () => {
+			const mockRender = jest.fn();
+
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				method: 'GET',
+			} as any);
+
+			mockWebhookFunctions.getResponseObject.mockReturnValue({
+				render: mockRender,
+			} as any);
+
+			mockWebhookFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					responseType: 'freeText',
+					message: 'Test message',
+					options: {},
+				};
+				return params[parameterName];
+			});
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result).toEqual({
+				noWebhookResponse: true,
+			});
+
+			expect(mockRender).toHaveBeenCalledWith('form-trigger', {
+				testRun: false,
+				validForm: true,
+				formTitle: '',
+				formDescription: 'Test message',
+				formSubmittedHeader: 'Got it, thanks',
+				formSubmittedText: 'This page can be closed now',
+				n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
+				formFields: [
+					{
+						id: 'field-0',
+						errorId: 'error-field-0',
+						label: 'Response',
+						inputRequired: 'form-required',
+						defaultValue: '',
+						isTextarea: true,
+					},
+				],
+				appendAttribution: true,
+				buttonLabel: 'Submit',
+			});
+		});
+
+		it('should handle freeText POST webhook', async () => {
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				method: 'POST',
+			} as any);
+
+			mockWebhookFunctions.getBodyData.mockReturnValue({
+				data: {
+					'field-0': 'test value',
+				},
+			} as any);
+
+			mockWebhookFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					responseType: 'freeText',
+				};
+				return params[parameterName];
+			});
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result.workflowData).toEqual([[{ json: { data: { text: 'test value' } } }]]);
+		});
+
+		it('should handle customForm GET webhook', async () => {
+			const mockRender = jest.fn();
+
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				method: 'GET',
+			} as any);
+
+			mockWebhookFunctions.getResponseObject.mockReturnValue({
+				render: mockRender,
+			} as any);
+
+			mockWebhookFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					responseType: 'customForm',
+					message: 'Test message',
+					defineForm: 'fields',
+					'formFields.values': [{ label: 'Field 1', fieldType: 'text', requiredField: true }],
+					options: {
+						responseFormTitle: 'Test title',
+						responseFormDescription: 'Test description',
+						responseFormButtonLabel: 'Test button',
+					},
+				};
+				return params[parameterName];
+			});
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result).toEqual({
+				noWebhookResponse: true,
+			});
+
+			expect(mockRender).toHaveBeenCalledWith('form-trigger', {
+				testRun: false,
+				validForm: true,
+				formTitle: 'Test title',
+				formDescription: 'Test description',
+				formSubmittedHeader: 'Got it, thanks',
+				formSubmittedText: 'This page can be closed now',
+				n8nWebsiteLink: 'https://n8n.io/?utm_source=n8n-internal&utm_medium=form-trigger',
+				formFields: [
+					{
+						id: 'field-0',
+						errorId: 'error-field-0',
+						inputRequired: 'form-required',
+						defaultValue: '',
+						isInput: true,
+						type: 'text',
+					},
+				],
+				appendAttribution: true,
+				buttonLabel: 'Test button',
+			});
+		});
+
+		it('should handle customForm POST webhook', async () => {
+			mockWebhookFunctions.getRequestObject.mockReturnValue({
+				method: 'POST',
+			} as any);
+
+			mockWebhookFunctions.getNodeParameter.mockImplementation((parameterName: string) => {
+				const params: { [key: string]: any } = {
+					responseType: 'customForm',
+					defineForm: 'fields',
+					'formFields.values': [
+						{
+							fieldLabel: 'test 1',
+							fieldType: 'text',
+						},
+					],
+				};
+				return params[parameterName];
+			});
+
+			mockWebhookFunctions.getBodyData.mockReturnValue({
+				data: {
+					'field-0': 'test value',
+				},
+			} as any);
+
+			const result = await sendAndWaitWebhook.call(mockWebhookFunctions);
+
+			expect(result.workflowData).toEqual([[{ json: { data: { 'test 1': 'test value' } } }]]);
+		});
 	});
 });
diff --git a/packages/nodes-base/utils/sendAndWait/utils.ts b/packages/nodes-base/utils/sendAndWait/utils.ts
index fd633fe519..5328c2c8d3 100644
--- a/packages/nodes-base/utils/sendAndWait/utils.ts
+++ b/packages/nodes-base/utils/sendAndWait/utils.ts
@@ -1,13 +1,27 @@
-import { NodeOperationError, SEND_AND_WAIT_OPERATION, updateDisplayOptions } from 'n8n-workflow';
-import type { INodeProperties, IExecuteFunctions, IWebhookFunctions } from 'n8n-workflow';
-import type { IEmail } from './interfaces';
-import { escapeHtml } from '../utilities';
+import {
+	NodeOperationError,
+	SEND_AND_WAIT_OPERATION,
+	tryToParseJsonToFormFields,
+	updateDisplayOptions,
+} from 'n8n-workflow';
+import type {
+	INodeProperties,
+	IExecuteFunctions,
+	IWebhookFunctions,
+	IDataObject,
+	FormFieldsParameter,
+} from 'n8n-workflow';
+
 import {
 	ACTION_RECORDED_PAGE,
 	BUTTON_STYLE_PRIMARY,
 	BUTTON_STYLE_SECONDARY,
 	createEmailBody,
 } from './email-templates';
+import type { IEmail } from './interfaces';
+import { formFieldsProperties } from '../../nodes/Form/Form.node';
+import { prepareFormData, prepareFormReturnItem, resolveRawData } from '../../nodes/Form/utils';
+import { escapeHtml } from '../utilities';
 
 type SendAndWaitConfig = {
 	title: string;
@@ -16,7 +30,14 @@ type SendAndWaitConfig = {
 	options: Array<{ label: string; value: string; style: string }>;
 };
 
-export const MESSAGE_PREFIX = 'ACTION REQUIRED: ';
+type FormResponseTypeOptions = {
+	messageButtonLabel?: string;
+	responseFormTitle?: string;
+	responseFormDescription?: string;
+	responseFormButtonLabel?: string;
+};
+
+const INPUT_FIELD_IDENTIFIER = 'field-0';
 
 // Operation Properties ----------------------------------------------------------
 export function getSendAndWaitProperties(
@@ -57,9 +78,32 @@ export function getSendAndWaitProperties(
 			default: '',
 			required: true,
 			typeOptions: {
-				rows: 5,
+				rows: 4,
 			},
 		},
+		{
+			displayName: 'Response Type',
+			name: 'responseType',
+			type: 'options',
+			default: 'approval',
+			options: [
+				{
+					name: 'Approval',
+					value: 'approval',
+					description: 'User can approve/disapprove from within the message',
+				},
+				{
+					name: 'Free Text',
+					value: 'freeText',
+					description: 'User can submit a response via a form',
+				},
+				{
+					name: 'Custom Form',
+					value: 'customForm',
+					description: 'User can submit a response via a custom form',
+				},
+			],
+		},
 		{
 			displayName: 'Approval Options',
 			name: 'approvalOptions',
@@ -134,15 +178,61 @@ export function getSendAndWaitProperties(
 					],
 				},
 			],
+			displayOptions: {
+				show: {
+					responseType: ['approval'],
+				},
+			},
+		},
+		...updateDisplayOptions(
+			{
+				show: {
+					responseType: ['customForm'],
+				},
+			},
+			formFieldsProperties,
+		),
+		{
+			displayName: 'Options',
+			name: 'options',
+			type: 'collection',
+			placeholder: 'Add option',
+			default: {},
+			options: [
+				{
+					displayName: 'Message Button Label',
+					name: 'messageButtonLabel',
+					type: 'string',
+					default: 'Respond',
+				},
+				{
+					displayName: 'Response Form Title',
+					name: 'responseFormTitle',
+					description: 'Title of the form that the user can access to provide their response',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Response Form Description',
+					name: 'responseFormDescription',
+					description: 'Description of the form that the user can access to provide their response',
+					type: 'string',
+					default: '',
+				},
+				{
+					displayName: 'Response Form Button Label',
+					name: 'responseFormButtonLabel',
+					type: 'string',
+					default: 'Submit',
+				},
+			],
+			displayOptions: {
+				show: {
+					responseType: ['freeText', 'customForm'],
+				},
+			},
 		},
 		...additionalProperties,
-		{
-			displayName:
-				'Use the wait node for more complex approval flows. <a href="https://docs.n8n.io/nodes/n8n-nodes-base.wait" target="_blank">More info</a>',
-			name: 'useWaitNotice',
-			type: 'notice',
-			default: '',
-		},
 	];
 
 	return updateDisplayOptions(
@@ -157,7 +247,136 @@ export function getSendAndWaitProperties(
 }
 
 // Webhook Function --------------------------------------------------------------
+const getFormResponseCustomizations = (context: IWebhookFunctions) => {
+	const message = context.getNodeParameter('message', '') as string;
+	const options = context.getNodeParameter('options', {}) as FormResponseTypeOptions;
+
+	let formTitle = '';
+	if (options.responseFormTitle) {
+		formTitle = options.responseFormTitle;
+	}
+
+	let formDescription = message;
+	if (options.responseFormDescription) {
+		formDescription = options.responseFormDescription;
+	}
+	formDescription = formDescription.replace(/\\n/g, '\n').replace(/<br>/g, '\n');
+
+	let buttonLabel = 'Submit';
+	if (options.responseFormButtonLabel) {
+		buttonLabel = options.responseFormButtonLabel;
+	}
+
+	return {
+		formTitle,
+		formDescription,
+		buttonLabel,
+	};
+};
+
 export async function sendAndWaitWebhook(this: IWebhookFunctions) {
+	const method = this.getRequestObject().method;
+	const res = this.getResponseObject();
+	const responseType = this.getNodeParameter('responseType', 'approval') as
+		| 'approval'
+		| 'freeText'
+		| 'customForm';
+
+	if (responseType === 'freeText') {
+		if (method === 'GET') {
+			const { formTitle, formDescription, buttonLabel } = getFormResponseCustomizations(this);
+
+			const data = prepareFormData({
+				formTitle,
+				formDescription,
+				formSubmittedHeader: 'Got it, thanks',
+				formSubmittedText: 'This page can be closed now',
+				buttonLabel,
+				redirectUrl: undefined,
+				formFields: [
+					{
+						fieldLabel: 'Response',
+						fieldType: 'textarea',
+						requiredField: true,
+					},
+				],
+				testRun: false,
+				query: {},
+			});
+
+			res.render('form-trigger', data);
+
+			return {
+				noWebhookResponse: true,
+			};
+		}
+		if (method === 'POST') {
+			const data = this.getBodyData().data as IDataObject;
+
+			return {
+				webhookResponse: ACTION_RECORDED_PAGE,
+				workflowData: [[{ json: { data: { text: data[INPUT_FIELD_IDENTIFIER] } } }]],
+			};
+		}
+	}
+
+	if (responseType === 'customForm') {
+		const defineForm = this.getNodeParameter('defineForm', 'fields') as 'fields' | 'json';
+		let fields: FormFieldsParameter = [];
+
+		if (defineForm === 'json') {
+			try {
+				const jsonOutput = this.getNodeParameter('jsonOutput', '', {
+					rawExpressions: true,
+				}) as string;
+
+				fields = tryToParseJsonToFormFields(resolveRawData(this, jsonOutput));
+			} catch (error) {
+				throw new NodeOperationError(this.getNode(), error.message, {
+					description: error.message,
+				});
+			}
+		} else {
+			fields = this.getNodeParameter('formFields.values', []) as FormFieldsParameter;
+		}
+
+		if (method === 'GET') {
+			const { formTitle, formDescription, buttonLabel } = getFormResponseCustomizations(this);
+
+			const data = prepareFormData({
+				formTitle,
+				formDescription,
+				formSubmittedHeader: 'Got it, thanks',
+				formSubmittedText: 'This page can be closed now',
+				buttonLabel,
+				redirectUrl: undefined,
+				formFields: fields,
+				testRun: false,
+				query: {},
+			});
+
+			res.render('form-trigger', data);
+
+			return {
+				noWebhookResponse: true,
+			};
+		}
+		if (method === 'POST') {
+			const returnItem = await prepareFormReturnItem(this, fields, 'production', true);
+			const json = returnItem.json;
+
+			delete json.submittedAt;
+			delete json.formMode;
+
+			returnItem.json = { data: json };
+
+			return {
+				webhookResponse: ACTION_RECORDED_PAGE,
+				workflowData: [[returnItem]],
+			};
+		}
+	}
+
 	const query = this.getRequestObject().query as { approved: 'false' | 'true' };
 	const approved = query.approved === 'true';
 	return {
@@ -168,7 +387,9 @@ export async function sendAndWaitWebhook(this: IWebhookFunctions) {
 
 // Send and Wait Config -----------------------------------------------------------
 export function getSendAndWaitConfig(context: IExecuteFunctions): SendAndWaitConfig {
-	const message = escapeHtml((context.getNodeParameter('message', 0, '') as string).trim());
+	const message = escapeHtml((context.getNodeParameter('message', 0, '') as string).trim())
+		.replace(/\\n/g, '\n')
+		.replace(/<br>/g, '\n');
 	const subject = escapeHtml(context.getNodeParameter('subject', 0, '') as string);
 	const resumeUrl = context.evaluateExpression('{{ $execution?.resumeUrl }}', 0) as string;
 	const nodeId = context.evaluateExpression('{{ $nodeId }}', 0) as string;
@@ -187,7 +408,16 @@ export function getSendAndWaitConfig(context: IExecuteFunctions): SendAndWaitCon
 		options: [],
 	};
 
-	if (approvalOptions.approvalType === 'double') {
+	const responseType = context.getNodeParameter('responseType', 0, 'approval') as string;
+
+	if (responseType === 'freeText' || responseType === 'customForm') {
+		const label = context.getNodeParameter('options.messageButtonLabel', 0, 'Respond') as string;
+		config.options.push({
+			label,
+			value: 'true',
+			style: 'primary',
+		});
+	} else if (approvalOptions.approvalType === 'double') {
 		const approveLabel = escapeHtml(approvalOptions.approveLabel || 'Approve');
 		const buttonApprovalStyle = approvalOptions.buttonApprovalStyle || 'primary';
 		const disapproveLabel = escapeHtml(approvalOptions.disapproveLabel || 'Disapprove');
@@ -245,7 +475,7 @@ export function createEmail(context: IExecuteFunctions) {
 
 	const email: IEmail = {
 		to,
-		subject: `${MESSAGE_PREFIX}${config.title}`,
+		subject: config.title,
 		body: '',
 		htmlBody: createEmailBody(config.message, buttons.join('\n'), instanceId),
 	};
diff --git a/packages/nodes-base/utils/utilities.ts b/packages/nodes-base/utils/utilities.ts
index 5c0b7f9d2b..74834b2aab 100644
--- a/packages/nodes-base/utils/utilities.ts
+++ b/packages/nodes-base/utils/utilities.ts
@@ -1,3 +1,4 @@
+import { isEqual, isNull, merge, isObject, reduce, get } from 'lodash';
 import type {
 	IDataObject,
 	IDisplayOptions,
@@ -5,11 +6,8 @@ import type {
 	INodeProperties,
 	IPairedItemData,
 } from 'n8n-workflow';
-
 import { ApplicationError, jsonParse, randomInt } from 'n8n-workflow';
 
-import { isEqual, isNull, merge, isObject, reduce, get } from 'lodash';
-
 /**
  * Creates an array of elements split into groups the length of `size`.
  * If `array` can't be split evenly, the final chunk will be the remaining
@@ -429,3 +427,37 @@ export function escapeHtml(text: string): string {
 		}
 	});
 }
+
+/**
+ * Sorts each item json's keys by a priority list
+ *
+ * @param {INodeExecutionData[]} data The array of items which keys will be sorted
+ * @param {string[]} priorityList The priority list, keys of item.json will be sorted in this order first then alphabetically
+ */
+export function sortItemKeysByPriorityList(data: INodeExecutionData[], priorityList: string[]) {
+	return data.map((item) => {
+		const itemKeys = Object.keys(item.json);
+
+		const updatedKeysOrder = itemKeys.sort((a, b) => {
+			const indexA = priorityList.indexOf(a);
+			const indexB = priorityList.indexOf(b);
+
+			if (indexA !== -1 && indexB !== -1) {
+				return indexA - indexB;
+			} else if (indexA !== -1) {
+				return -1;
+			} else if (indexB !== -1) {
+				return 1;
+			}
+			return a.localeCompare(b);
+		});
+
+		const updatedItem: IDataObject = {};
+		for (const key of updatedKeysOrder) {
+			updatedItem[key] = item.json[key];
+		}
+
+		item.json = updatedItem;
+		return item;
+	});
+}
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/.readme b/packages/nodes-base/utils/workflowInputsResourceMapping/.readme
new file mode 100644
index 0000000000..e5556cc0cc
--- /dev/null
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/.readme
@@ -0,0 +1,5 @@
+These files contain reusable logic for workflow inputs mapping used in these nodes:
+
+    - n8n-nodes-base.executeWorkflow
+    - n8n-nodes-base.executeWorkflowTrigger
+    - @n8n/n8n-nodes-langchain.toolWorkflow
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
new file mode 100644
index 0000000000..cd12e3be3d
--- /dev/null
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/GenericFunctions.ts
@@ -0,0 +1,168 @@
+import { json as generateSchemaFromExample, type SchemaObject } from 'generate-schema';
+import type { JSONSchema7 } from 'json-schema';
+import _ from 'lodash';
+import type {
+	FieldValueOption,
+	FieldType,
+	IWorkflowNodeContext,
+	INodeExecutionData,
+	IDataObject,
+	ResourceMapperField,
+	ILocalLoadOptionsFunctions,
+	ResourceMapperFields,
+	ISupplyDataFunctions,
+} from 'n8n-workflow';
+import { jsonParse, NodeOperationError, EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE } from 'n8n-workflow';
+
+import {
+	JSON_EXAMPLE,
+	INPUT_SOURCE,
+	WORKFLOW_INPUTS,
+	VALUES,
+	TYPE_OPTIONS,
+	PASSTHROUGH,
+} from './constants';
+
+const SUPPORTED_TYPES = TYPE_OPTIONS.map((x) => x.value);
+
+function parseJsonSchema(schema: JSONSchema7): FieldValueOption[] | string {
+	if (!schema?.properties) {
+		return 'Invalid JSON schema. Missing key `properties` in schema';
+	}
+
+	if (typeof schema.properties !== 'object') {
+		return 'Invalid JSON schema. Key `properties` is not an object';
+	}
+
+	const result: FieldValueOption[] = [];
+	for (const [name, v] of Object.entries(schema.properties)) {
+		if (typeof v !== 'object') {
+			return `Invalid JSON schema. Value for property '${name}' is not an object`;
+		}
+
+		const type = v?.type;
+
+		if (type === 'null') {
+			result.push({ name, type: 'any' });
+		} else if (Array.isArray(type)) {
+			// Schema allows an array of types, but we don't
+			return `Invalid JSON schema. Array of types for property '${name}' is not supported by n8n. Either provide a single type or use type 'any' to allow any type`;
+		} else if (typeof type !== 'string') {
+			return `Invalid JSON schema. Unexpected non-string type ${type} for property '${name}'`;
+		} else if (!SUPPORTED_TYPES.includes(type as never)) {
+			return `Invalid JSON schema. Unsupported type ${type} for property '${name}'. Supported types are ${JSON.stringify(SUPPORTED_TYPES, null, 1)}`;
+		} else {
+			result.push({ name, type: type as FieldType });
+		}
+	}
+	return result;
+}
+
+function parseJsonExample(context: IWorkflowNodeContext): JSONSchema7 {
+	const jsonString = context.getNodeParameter(JSON_EXAMPLE, 0, '') as string;
+	const json = jsonParse<SchemaObject>(jsonString);
+
+	return generateSchemaFromExample(json) as JSONSchema7;
+}
+
+export function getFieldEntries(context: IWorkflowNodeContext): FieldValueOption[] {
+	const inputSource = context.getNodeParameter(INPUT_SOURCE, 0, PASSTHROUGH);
+	let result: FieldValueOption[] | string = 'Internal Error: Invalid input source';
+	try {
+		if (inputSource === WORKFLOW_INPUTS) {
+			result = context.getNodeParameter(
+				`${WORKFLOW_INPUTS}.${VALUES}`,
+				0,
+				[],
+			) as FieldValueOption[];
+		} else if (inputSource === JSON_EXAMPLE) {
+			const schema = parseJsonExample(context);
+			result = parseJsonSchema(schema);
+		} else if (inputSource === PASSTHROUGH) {
+			result = [];
+		}
+	} catch (e: unknown) {
+		result =
+			e && typeof e === 'object' && 'message' in e && typeof e.message === 'string'
+				? e.message
+				: `Unknown error occurred: ${JSON.stringify(e)}`;
+	}
+
+	if (Array.isArray(result)) {
+		return result;
+	}
+	throw new NodeOperationError(context.getNode(), result);
+}
+
+export function getWorkflowInputValues(this: ISupplyDataFunctions): INodeExecutionData[] {
+	const inputData = this.getInputData();
+
+	return inputData.map(({ json, binary }, itemIndex) => {
+		const itemFieldValues = this.getNodeParameter(
+			'workflowInputs.value',
+			itemIndex,
+			{},
+		) as IDataObject;
+
+		return {
+			json: {
+				...json,
+				...itemFieldValues,
+			},
+			index: itemIndex,
+			pairedItem: {
+				item: itemIndex,
+			},
+			binary,
+		};
+	});
+}
+
+export function getCurrentWorkflowInputData(this: ISupplyDataFunctions) {
+	const inputData: INodeExecutionData[] = getWorkflowInputValues.call(this);
+
+	const schema = this.getNodeParameter('workflowInputs.schema', 0, []) as ResourceMapperField[];
+
+	if (schema.length === 0) {
+		return inputData;
+	} else {
+		const removedKeys = new Set(schema.filter((x) => x.removed).map((x) => x.displayName));
+
+		const filteredInputData: INodeExecutionData[] = inputData.map((item, index) => ({
+			index,
+			pairedItem: { item: index },
+			json: _.pickBy(item.json, (_v, key) => !removedKeys.has(key)),
+		}));
+
+		return filteredInputData;
+	}
+}
+
+export async function loadWorkflowInputMappings(
+	this: ILocalLoadOptionsFunctions,
+): Promise<ResourceMapperFields> {
+	const nodeLoadContext = await this.getWorkflowNodeContext(EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE);
+	let fields: ResourceMapperField[] = [];
+
+	if (nodeLoadContext) {
+		const fieldValues = getFieldEntries(nodeLoadContext);
+
+		fields = fieldValues.map((currentWorkflowInput) => {
+			const field: ResourceMapperField = {
+				id: currentWorkflowInput.name,
+				displayName: currentWorkflowInput.name,
+				required: false,
+				defaultMatch: false,
+				display: true,
+				canBeUsedToMatch: true,
+			};
+
+			if (currentWorkflowInput.type !== 'any') {
+				field.type = currentWorkflowInput.type;
+			}
+
+			return field;
+		});
+	}
+	return { fields };
+}
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/__tests__/GenericFunctions.test.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/__tests__/GenericFunctions.test.ts
new file mode 100644
index 0000000000..31b286ac15
--- /dev/null
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/__tests__/GenericFunctions.test.ts
@@ -0,0 +1,63 @@
+import { mock } from 'jest-mock-extended';
+import type { ISupplyDataFunctions } from 'n8n-workflow';
+
+import { getWorkflowInputValues } from '../GenericFunctions';
+
+describe('getWorkflowInputValues', () => {
+	const supplyDataFunctions = mock<ISupplyDataFunctions>();
+
+	it('should correctly map the binary property', () => {
+		supplyDataFunctions.getInputData.mockReturnValue([
+			{
+				json: { key1: 'value1' },
+				binary: { file1: { data: 'binaryData1', mimeType: 'image/png' } },
+			},
+			{
+				json: { key2: 'value2' },
+				binary: { file2: { data: 'binaryData2', mimeType: 'image/jpeg' } },
+			},
+		]);
+
+		supplyDataFunctions.getNodeParameter
+			.calledWith('workflowInputs.value', 0)
+			.mockReturnValueOnce({ additionalKey1: 'additionalValue1' });
+		supplyDataFunctions.getNodeParameter
+			.calledWith('workflowInputs.value', 1)
+			.mockReturnValueOnce({ additionalKey2: 'additionalValue2' });
+
+		const result = getWorkflowInputValues.call(supplyDataFunctions);
+
+		expect(result).toEqual([
+			{
+				json: {
+					key1: 'value1',
+					additionalKey1: 'additionalValue1',
+				},
+				binary: { file1: { data: 'binaryData1', mimeType: 'image/png' } },
+				index: 0,
+				pairedItem: { item: 0 },
+			},
+			{
+				json: {
+					key2: 'value2',
+					additionalKey2: 'additionalValue2',
+				},
+				binary: { file2: { data: 'binaryData2', mimeType: 'image/jpeg' } },
+				index: 1,
+				pairedItem: { item: 1 },
+			},
+		]);
+
+		expect(supplyDataFunctions.getInputData).toHaveBeenCalled();
+		expect(supplyDataFunctions.getNodeParameter).toHaveBeenCalledWith(
+			'workflowInputs.value',
+			0,
+			{},
+		);
+		expect(supplyDataFunctions.getNodeParameter).toHaveBeenCalledWith(
+			'workflowInputs.value',
+			1,
+			{},
+		);
+	});
+});
diff --git a/packages/nodes-base/utils/workflowInputsResourceMapping/constants.ts b/packages/nodes-base/utils/workflowInputsResourceMapping/constants.ts
new file mode 100644
index 0000000000..409d8d703e
--- /dev/null
+++ b/packages/nodes-base/utils/workflowInputsResourceMapping/constants.ts
@@ -0,0 +1,36 @@
+import type { FieldType } from 'n8n-workflow';
+
+export const INPUT_SOURCE = 'inputSource';
+export const WORKFLOW_INPUTS = 'workflowInputs';
+export const VALUES = 'values';
+export const JSON_EXAMPLE = 'jsonExample';
+export const PASSTHROUGH = 'passthrough';
+export const TYPE_OPTIONS: Array<{ name: string; value: FieldType | 'any' }> = [
+	{
+		name: 'Allow Any Type',
+		value: 'any',
+	},
+	{
+		name: 'String',
+		value: 'string',
+	},
+	{
+		name: 'Number',
+		value: 'number',
+	},
+	{
+		name: 'Boolean',
+		value: 'boolean',
+	},
+	{
+		name: 'Array',
+		value: 'array',
+	},
+	{
+		name: 'Object',
+		value: 'object',
+	},
+	// Intentional omission of `dateTime`, `time`, `string-alphanumeric`, `form-fields`, `jwt` and `url`
+];
+
+export const FALLBACK_DEFAULT_VALUE = null;
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index b2bd21f35c..7515af68ee 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "1.64.0",
+  "version": "1.74.0",
   "description": "Workflow base code of n8n",
   "main": "dist/index.js",
   "module": "src/index.ts",
@@ -31,6 +31,7 @@
   ],
   "devDependencies": {
     "@langchain/core": "catalog:",
+    "@n8n/config": "workspace:*",
     "@types/deep-equal": "^1.0.1",
     "@types/express": "catalog:",
     "@types/jmespath": "^0.15.0",
@@ -40,11 +41,11 @@
     "@types/xml2js": "catalog:"
   },
   "dependencies": {
-    "@n8n/tournament": "1.0.5",
+    "@n8n/tournament": "1.0.6",
     "@n8n_io/riot-tmpl": "4.0.0",
     "ast-types": "0.15.2",
     "axios": "catalog:",
-    "callsites": "3.1.0",
+    "callsites": "catalog:",
     "deep-equal": "2.2.0",
     "esprima-next": "5.8.4",
     "form-data": "catalog:",
diff --git a/packages/workflow/src/AugmentObject.ts b/packages/workflow/src/AugmentObject.ts
index 4334071e71..24d6ca0a16 100644
--- a/packages/workflow/src/AugmentObject.ts
+++ b/packages/workflow/src/AugmentObject.ts
@@ -2,6 +2,9 @@ import type { IDataObject } from './Interfaces';
 
 const defaultPropertyDescriptor = Object.freeze({ enumerable: true, configurable: true });
 
+// eslint-disable-next-line @typescript-eslint/unbound-method
+const { hasOwnProperty } = Object.prototype;
+
 const augmentedObjects = new WeakSet<object>();
 
 function augment<T>(value: T): T {
@@ -84,7 +87,7 @@ export function augmentObject<T extends object>(data: T): T {
 				return undefined;
 			}
 
-			if (newData[key] !== undefined) {
+			if (hasOwnProperty.call(newData, key)) {
 				return newData[key];
 			}
 
@@ -102,11 +105,11 @@ export function augmentObject<T extends object>(data: T): T {
 
 			return value;
 		},
-		deleteProperty(target, key: string) {
-			if (key in newData) {
+		deleteProperty(_target, key: string) {
+			if (hasOwnProperty.call(newData, key)) {
 				delete newData[key];
 			}
-			if (key in target) {
+			if (hasOwnProperty.call(data, key)) {
 				deletedProperties.add(key);
 			}
 
@@ -131,9 +134,10 @@ export function augmentObject<T extends object>(data: T): T {
 
 			return true;
 		},
-		has(target, key) {
+		has(_target, key) {
 			if (deletedProperties.has(key)) return false;
-			return Reflect.has(newData, key) || Reflect.has(target, key);
+			const target = hasOwnProperty.call(newData, key) ? newData : data;
+			return Reflect.has(target, key);
 		},
 		ownKeys(target) {
 			const originalKeys = Reflect.ownKeys(target);
@@ -145,7 +149,8 @@ export function augmentObject<T extends object>(data: T): T {
 
 		getOwnPropertyDescriptor(_target, key) {
 			if (deletedProperties.has(key)) return undefined;
-			return Object.getOwnPropertyDescriptor(key in newData ? newData : data, key);
+			const target = hasOwnProperty.call(newData, key) ? newData : data;
+			return Object.getOwnPropertyDescriptor(target, key);
 		},
 	});
 
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
index f8d028ae91..453b9be748 100644
--- a/packages/workflow/src/Constants.ts
+++ b/packages/workflow/src/Constants.ts
@@ -1,12 +1,10 @@
-import type { NodeParameterValue } from './Interfaces';
-
 export const DIGITS = '0123456789';
 export const UPPERCASE_LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
 export const LOWERCASE_LETTERS = UPPERCASE_LETTERS.toLowerCase();
 export const ALPHABET = [DIGITS, UPPERCASE_LETTERS, LOWERCASE_LETTERS].join('');
 
 export const BINARY_ENCODING = 'base64';
-export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
+export const WAIT_INDEFINITELY = new Date('3000-01-01T00:00:00.000Z');
 
 export const LOG_LEVELS = ['silent', 'error', 'warn', 'info', 'debug'] as const;
 
@@ -87,33 +85,17 @@ export const LANGCHAIN_CUSTOM_TOOLS = [
 	HTTP_REQUEST_TOOL_LANGCHAIN_NODE_TYPE,
 ];
 
-//nodes that would execute only once with such parameters
-//add 'undefined' to parameters values if it is parameter's default value
-export const SINGLE_EXECUTION_NODES: { [key: string]: { [key: string]: NodeParameterValue[] } } = {
-	'n8n-nodes-base.code': {
-		mode: [undefined, 'runOnceForAllItems'],
-	},
-	'n8n-nodes-base.executeWorkflow': {
-		mode: [undefined, 'once'],
-	},
-	'n8n-nodes-base.crateDb': {
-		operation: [undefined, 'update'], // default insert
-	},
-	'n8n-nodes-base.timescaleDb': {
-		operation: [undefined, 'update'], // default insert
-	},
-	'n8n-nodes-base.microsoftSql': {
-		operation: [undefined, 'update', 'delete'], // default insert
-	},
-	'n8n-nodes-base.questDb': {
-		operation: [undefined], // default insert
-	},
-	'n8n-nodes-base.mongoDb': {
-		operation: ['insert', 'update'],
-	},
-	'n8n-nodes-base.redis': {
-		operation: [undefined], // default info
-	},
-};
-
 export const SEND_AND_WAIT_OPERATION = 'sendAndWait';
+export const AI_TRANSFORM_CODE_GENERATED_FOR_PROMPT = 'codeGeneratedForPrompt';
+export const AI_TRANSFORM_JS_CODE = 'jsCode';
+
+/**
+ * Key for an item standing in for a manual execution data item too large to be
+ * sent live via pubsub. See {@link TRIMMED_TASK_DATA_CONNECTIONS} in constants
+ * in `cli` package.
+ */
+export const TRIMMED_TASK_DATA_CONNECTIONS_KEY = '__isTrimmedManualExecutionDataItem';
+
+export const OPEN_AI_API_CREDENTIAL_TYPE = 'openAiApi';
+export const FREE_AI_CREDITS_ERROR_TYPE = 'free_ai_credits_request_error';
+export const FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE = 400;
diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts
deleted file mode 100644
index cedb921d5e..0000000000
--- a/packages/workflow/src/ErrorReporterProxy.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { ApplicationError, type ReportingOptions } from './errors/application.error';
-import * as Logger from './LoggerProxy';
-
-interface ErrorReporter {
-	report: (error: Error | string, options?: ReportingOptions) => void;
-}
-
-const instance: ErrorReporter = {
-	report: (error, options) => {
-		if (error instanceof Error) {
-			let e = error;
-
-			const { executionId } = options ?? {};
-			const context = executionId ? ` (execution ${executionId})` : '';
-
-			do {
-				const msg = [e.message + context, e.stack ? `\n${e.stack}\n` : ''].join('');
-				const meta = e instanceof ApplicationError ? e.extra : undefined;
-				Logger.error(msg, meta);
-				e = e.cause as Error;
-			} while (e);
-		}
-	},
-};
-
-export function init(errorReporter: ErrorReporter) {
-	instance.report = errorReporter.report;
-}
-
-const wrap = (e: unknown) => {
-	if (e instanceof Error) return e;
-	if (typeof e === 'string') return new ApplicationError(e);
-	return;
-};
-
-export const error = (e: unknown, options?: ReportingOptions) => {
-	const toReport = wrap(e);
-	if (toReport) instance.report(toReport, options);
-};
-
-export const info = (msg: string, options?: ReportingOptions) => {
-	Logger.info(msg);
-	instance.report(msg, { ...options, level: 'info' });
-};
-
-export const warn = (warning: Error | string, options?: ReportingOptions) =>
-	error(warning, { ...options, level: 'warning' });
diff --git a/packages/workflow/src/Extensions/ExpressionExtension.ts b/packages/workflow/src/Extensions/ExpressionExtension.ts
index 2c8d745bd8..1f3b8d2fc0 100644
--- a/packages/workflow/src/Extensions/ExpressionExtension.ts
+++ b/packages/workflow/src/Extensions/ExpressionExtension.ts
@@ -137,7 +137,6 @@ export const extendTransform = (expression: string): { code: string } | undefine
 				// This is to match our fork of tmpl
 				const globalIdentifier = types.builders.identifier(
 					// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-					// @ts-ignore
 					typeof window !== 'object' ? 'global' : 'window',
 				);
 				// We want to define all of our commonly used identifiers and member
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 4f92a219e6..2161569b7d 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-
 import type { CallbackManager as CallbackManagerLC } from '@langchain/core/callbacks/manager';
-import type { AxiosProxyConfig } from 'axios';
+import type { LogScope } from '@n8n/config';
+import type { AxiosProxyConfig, GenericAbortSignal } from 'axios';
 import type * as express from 'express';
 import type FormData from 'form-data';
 import type { PathLike } from 'fs';
@@ -14,7 +14,7 @@ import type { URLSearchParams } from 'url';
 
 import type { CODE_EXECUTION_MODES, CODE_LANGUAGES, LOG_LEVELS } from './Constants';
 import type { IDeferredPromise } from './DeferredPromise';
-import type { ExecutionCancelledError } from './errors';
+import { ApplicationError, type ExecutionCancelledError } from './errors';
 import type { ExpressionError } from './errors/expression.error';
 import type { NodeApiError } from './errors/node-api.error';
 import type { NodeOperationError } from './errors/node-operation.error';
@@ -125,6 +125,7 @@ export interface IUser {
 export type ProjectSharingData = {
 	id: string;
 	name: string | null;
+	icon: { type: 'emoji' | 'icon'; value: string } | null;
 	type: 'personal' | 'team' | 'public';
 	createdAt: string;
 	updatedAt: string;
@@ -364,7 +365,8 @@ export interface ICredentialDataDecryptedObject {
 
 // First array index: The output/input-index (if node has multiple inputs/outputs of the same type)
 // Second array index: The different connections (if one node is connected to multiple nodes)
-export type NodeInputConnections = IConnection[][];
+// Any index can be null, for example in a switch node with multiple indexes some of which are not connected
+export type NodeInputConnections = Array<IConnection[] | null>;
 
 export interface INodeConnection {
 	sourceIndex: number;
@@ -420,60 +422,6 @@ export interface IRunNodeResponse {
 	data: INodeExecutionData[][] | NodeExecutionOutput | null | undefined;
 	closeFunction?: CloseFunction;
 }
-export interface IGetExecuteFunctions {
-	(
-		workflow: Workflow,
-		runExecutionData: IRunExecutionData,
-		runIndex: number,
-		connectionInputData: INodeExecutionData[],
-		inputData: ITaskDataConnections,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		executeData: IExecuteData,
-		mode: WorkflowExecuteMode,
-		closeFunctions: CloseFunction[],
-		abortSignal?: AbortSignal,
-	): IExecuteFunctions;
-}
-
-export interface IGetExecuteSingleFunctions {
-	(
-		workflow: Workflow,
-		runExecutionData: IRunExecutionData,
-		runIndex: number,
-		connectionInputData: INodeExecutionData[],
-		inputData: ITaskDataConnections,
-		node: INode,
-		itemIndex: number,
-		additionalData: IWorkflowExecuteAdditionalData,
-		executeData: IExecuteData,
-		mode: WorkflowExecuteMode,
-		abortSignal?: AbortSignal,
-	): IExecuteSingleFunctions;
-}
-
-export interface IGetExecuteHookFunctions {
-	(
-		workflow: Workflow,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-		webhookData?: IWebhookData,
-	): IHookFunctions;
-}
-
-export interface IGetExecuteWebhookFunctions {
-	(
-		workflow: Workflow,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		webhookData: IWebhookData,
-		closeFunctions: CloseFunction[],
-		runExecutionData: IRunExecutionData | null,
-	): IWebhookFunctions;
-}
 
 export interface ISourceDataConnections {
 	// Key for each input type and because there can be multiple inputs of the same type it is an array
@@ -484,6 +432,7 @@ export interface ISourceDataConnections {
 
 export interface IExecuteData {
 	data: ITaskDataConnections;
+	metadata?: ITaskMetadata;
 	node: INode;
 	source: ITaskDataConnectionsSource | null;
 }
@@ -529,6 +478,7 @@ export interface IHttpRequestOptions {
 	};
 	timeout?: number;
 	json?: boolean;
+	abortSignal?: GenericAbortSignal;
 }
 
 /**
@@ -726,16 +676,14 @@ export type ICredentialTestFunction = (
 ) => Promise<INodeCredentialTestResult>;
 
 export interface ICredentialTestFunctions {
+	logger: Logger;
 	helpers: SSHTunnelFunctions & {
 		request: (uriOrObject: string | object, options?: object) => Promise<any>;
 	};
 }
 
-interface BaseHelperFunctions {
+export interface BaseHelperFunctions {
 	createDeferredPromise: <T = void>() => IDeferredPromise<T>;
-}
-
-interface JsonHelperFunctions {
 	returnJsonArray(jsonData: IDataObject | IDataObject[]): INodeExecutionData[];
 }
 
@@ -756,6 +704,7 @@ export interface BinaryHelperFunctions {
 		mimeType?: string,
 	): Promise<IBinaryData>;
 	setBinaryDataBuffer(data: IBinaryData, binaryData: Buffer): Promise<IBinaryData>;
+	/** @deprecated */
 	copyBinaryFile(): Promise<never>;
 	binaryToBuffer(body: Buffer | Readable): Promise<Buffer>;
 	binaryToString(body: Buffer | Readable, encoding?: BufferEncoding): Promise<string>;
@@ -902,6 +851,7 @@ export type NodeTypeAndVersion = {
 	name: string;
 	type: string;
 	typeVersion: number;
+	disabled: boolean;
 };
 
 export interface FunctionsBase {
@@ -937,11 +887,12 @@ export type ContextType = 'flow' | 'node';
 
 type BaseExecutionFunctions = FunctionsBaseWithRequiredKeys<'getMode'> & {
 	continueOnFail(): boolean;
+	setMetadata(metadata: ITaskMetadata): void;
 	evaluateExpression(expression: string, itemIndex: number): NodeParameterValueType;
 	getContext(type: ContextType): IContextObject;
 	getExecuteData(): IExecuteData;
 	getWorkflowDataProxy(itemIndex: number): IWorkflowDataProxyData;
-	getInputSourceData(inputIndex?: number, inputName?: string): ISourceData;
+	getInputSourceData(inputIndex?: number, connectionType?: NodeConnectionType): ISourceData;
 	getExecutionCancelSignal(): AbortSignal | undefined;
 	onExecutionCancellation(handler: () => unknown): void;
 	logAiEvent(eventName: AiEvent, msg?: string | undefined): void;
@@ -954,13 +905,17 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 			workflowInfo: IExecuteWorkflowInfo,
 			inputData?: INodeExecutionData[],
 			parentCallbackManager?: CallbackManager,
-		): Promise<any>;
+			options?: {
+				doNotWaitToFinish?: boolean;
+				parentExecution?: RelatedExecution;
+			},
+		): Promise<ExecuteWorkflowData>;
 		getInputConnectionData(
-			inputName: NodeConnectionType,
+			connectionType: AINodeConnectionType,
 			itemIndex: number,
 			inputIndex?: number,
 		): Promise<unknown>;
-		getInputData(inputIndex?: number, inputName?: string): INodeExecutionData[];
+		getInputData(inputIndex?: number, connectionType?: NodeConnectionType): INodeExecutionData[];
 		getNodeInputs(): INodeInputConfiguration[];
 		getNodeOutputs(): INodeOutputConfiguration[];
 		putExecutionToWait(waitTill: Date): Promise<void>;
@@ -977,6 +932,7 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 			connectionType: NodeConnectionType,
 			currentNodeRunIndex: number,
 			data: INodeExecutionData[][] | ExecutionError,
+			metadata?: ITaskMetadata,
 		): void;
 
 		nodeHelpers: NodeHelperFunctions;
@@ -985,8 +941,7 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 			BinaryHelperFunctions &
 			DeduplicationHelperFunctions &
 			FileSystemHelperFunctions &
-			SSHTunnelFunctions &
-			JsonHelperFunctions & {
+			SSHTunnelFunctions & {
 				normalizeItems(items: INodeExecutionData | INodeExecutionData[]): INodeExecutionData[];
 				constructExecutionMetaData(
 					inputData: INodeExecutionData[],
@@ -994,6 +949,7 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 				): NodeExecutionWithMetadata[];
 				assertBinaryData(itemIndex: number, propertyName: string): IBinaryData;
 				getBinaryDataBuffer(itemIndex: number, propertyName: string): Promise<Buffer>;
+				detectBinaryEncoding(buffer: Buffer): string;
 				copyInputItems(items: INodeExecutionData[], properties: string[]): IDataObject[];
 			};
 
@@ -1007,7 +963,7 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 	};
 
 export interface IExecuteSingleFunctions extends BaseExecutionFunctions {
-	getInputData(inputIndex?: number, inputName?: string): INodeExecutionData;
+	getInputData(inputIndex?: number, connectionType?: NodeConnectionType): INodeExecutionData;
 	getItemIndex(): number;
 	getNodeParameter(
 		parameterName: string,
@@ -1020,6 +976,7 @@ export interface IExecuteSingleFunctions extends BaseExecutionFunctions {
 		BinaryHelperFunctions & {
 			assertBinaryData(propertyName: string, inputIndex?: number): IBinaryData;
 			getBinaryDataBuffer(propertyName: string, inputIndex?: number): Promise<Buffer>;
+			detectBinaryEncoding(buffer: Buffer): string;
 		};
 }
 
@@ -1062,9 +1019,23 @@ export interface ILoadOptionsFunctions extends FunctionsBase {
 		options?: IGetNodeParameterOptions,
 	): NodeParameterValueType | object | undefined;
 	getCurrentNodeParameters(): INodeParameters | undefined;
+
 	helpers: RequestHelperFunctions & SSHTunnelFunctions;
 }
 
+export type FieldValueOption = { name: string; type: FieldType | 'any' };
+
+export type IWorkflowNodeContext = ExecuteFunctions.GetNodeParameterFn &
+	Pick<FunctionsBase, 'getNode'>;
+
+export interface ILocalLoadOptionsFunctions {
+	getWorkflowNodeContext(nodeType: string): Promise<IWorkflowNodeContext | null>;
+}
+
+export interface IWorkflowLoader {
+	get(workflowId: string): Promise<IWorkflowBase>;
+}
+
 export interface IPollFunctions
 	extends FunctionsBaseWithRequiredKeys<'getMode' | 'getActivationMode'> {
 	__emit(
@@ -1081,8 +1052,7 @@ export interface IPollFunctions
 	helpers: RequestHelperFunctions &
 		BaseHelperFunctions &
 		BinaryHelperFunctions &
-		SchedulingFunctions &
-		JsonHelperFunctions;
+		SchedulingFunctions;
 }
 
 export interface ITriggerFunctions
@@ -1102,15 +1072,14 @@ export interface ITriggerFunctions
 		BaseHelperFunctions &
 		BinaryHelperFunctions &
 		SSHTunnelFunctions &
-		SchedulingFunctions &
-		JsonHelperFunctions;
+		SchedulingFunctions;
 }
 
 export interface IHookFunctions
 	extends FunctionsBaseWithRequiredKeys<'getMode' | 'getActivationMode'> {
 	getWebhookName(): string;
-	getWebhookDescription(name: string): IWebhookDescription | undefined;
-	getNodeWebhookUrl: (name: string) => string | undefined;
+	getWebhookDescription(name: WebhookType): IWebhookDescription | undefined;
+	getNodeWebhookUrl: (name: WebhookType) => string | undefined;
 	getNodeParameter(
 		parameterName: string,
 		fallbackValue?: any,
@@ -1123,7 +1092,7 @@ export interface IWebhookFunctions extends FunctionsBaseWithRequiredKeys<'getMod
 	getBodyData(): IDataObject;
 	getHeaderData(): IncomingHttpHeaders;
 	getInputConnectionData(
-		inputName: NodeConnectionType,
+		connectionType: AINodeConnectionType,
 		itemIndex: number,
 		inputIndex?: number,
 	): Promise<unknown>;
@@ -1132,7 +1101,7 @@ export interface IWebhookFunctions extends FunctionsBaseWithRequiredKeys<'getMod
 		fallbackValue?: any,
 		options?: IGetNodeParameterOptions,
 	): NodeParameterValueType | object;
-	getNodeWebhookUrl: (name: string) => string | undefined;
+	getNodeWebhookUrl: (name: WebhookType) => string | undefined;
 	evaluateExpression(expression: string, itemIndex?: number): NodeParameterValueType;
 	getParamsData(): object;
 	getQueryData(): object;
@@ -1140,10 +1109,7 @@ export interface IWebhookFunctions extends FunctionsBaseWithRequiredKeys<'getMod
 	getResponseObject(): express.Response;
 	getWebhookName(): string;
 	nodeHelpers: NodeHelperFunctions;
-	helpers: RequestHelperFunctions &
-		BaseHelperFunctions &
-		BinaryHelperFunctions &
-		JsonHelperFunctions;
+	helpers: RequestHelperFunctions & BaseHelperFunctions & BinaryHelperFunctions;
 }
 
 export interface INodeCredentialsDetails {
@@ -1215,16 +1181,20 @@ export interface INodeExecutionData {
 	binary?: IBinaryKeyData;
 	error?: NodeApiError | NodeOperationError;
 	pairedItem?: IPairedItemData | IPairedItemData[] | number;
+	metadata?: {
+		subExecution: RelatedExecution;
+	};
+
+	/**
+	 * @deprecated This key was added by accident and should not be used as it
+	 * will be removed in future. For more information see PR #12469.
+	 */
 	index?: number;
 }
 
 export interface INodeExecuteFunctions {
 	getExecutePollFunctions: IGetExecutePollFunctions;
 	getExecuteTriggerFunctions: IGetExecuteTriggerFunctions;
-	getExecuteFunctions: IGetExecuteFunctions;
-	getExecuteSingleFunctions: IGetExecuteSingleFunctions;
-	getExecuteHookFunctions: IGetExecuteHookFunctions;
-	getExecuteWebhookFunctions: IGetExecuteWebhookFunctions;
 }
 
 export type NodeParameterValue = string | number | boolean | undefined | null;
@@ -1344,14 +1314,18 @@ export interface INodePropertyTypeOptions {
 	resourceMapper?: ResourceMapperTypeOptions;
 	filter?: FilterTypeOptions;
 	assignment?: AssignmentTypeOptions;
+	minRequiredFields?: number; // Supported by: fixedCollection
+	maxAllowedFields?: number; // Supported by: fixedCollection
 	[key: string]: any;
 }
 
-export interface ResourceMapperTypeOptions {
-	resourceMapperMethod: string;
-	mode: 'add' | 'update' | 'upsert';
+export interface ResourceMapperTypeOptionsBase {
+	mode: 'add' | 'update' | 'upsert' | 'map';
 	valuesLabel?: string;
-	fieldWords?: { singular: string; plural: string };
+	fieldWords?: {
+		singular: string;
+		plural: string;
+	};
 	addAllFields?: boolean;
 	noFieldsError?: string;
 	multiKeyMatch?: boolean;
@@ -1361,8 +1335,23 @@ export interface ResourceMapperTypeOptions {
 		description?: string;
 		hint?: string;
 	};
+	showTypeConversionOptions?: boolean;
 }
 
+// Enforce at least one of resourceMapperMethod or localResourceMapperMethod
+export type ResourceMapperTypeOptionsLocal = {
+	resourceMapperMethod: string;
+	localResourceMapperMethod?: never; // Explicitly disallows this property
+};
+
+export type ResourceMapperTypeOptionsExternal = {
+	localResourceMapperMethod: string;
+	resourceMapperMethod?: never; // Explicitly disallows this property
+};
+
+export type ResourceMapperTypeOptions = ResourceMapperTypeOptionsBase &
+	(ResourceMapperTypeOptionsLocal | ResourceMapperTypeOptionsExternal);
+
 type NonEmptyArray<T> = [T, ...T[]];
 
 export type FilterTypeCombinator = 'and' | 'or';
@@ -1425,6 +1414,7 @@ export interface INodeProperties {
 	default: NodeParameterValueType;
 	description?: string;
 	hint?: string;
+	disabledOptions?: IDisplayOptions;
 	displayOptions?: IDisplayOptions;
 	options?: Array<INodePropertyOptions | INodeProperties | INodePropertyCollection>;
 	placeholder?: string;
@@ -1499,6 +1489,7 @@ export interface INodePropertyOptions {
 	action?: string;
 	description?: string;
 	routing?: INodePropertyRouting;
+	outputConnectionType?: NodeConnectionType;
 }
 
 export interface INodeListSearchItems extends INodePropertyOptions {
@@ -1551,6 +1542,12 @@ export interface ITriggerResponse {
 	manualTriggerResponse?: Promise<INodeExecutionData[][]>;
 }
 
+export interface ExecuteWorkflowData {
+	executionId: string;
+	data: Array<INodeExecutionData[] | null>;
+	waitTill?: Date | null;
+}
+
 export type WebhookSetupMethodNames = 'checkExists' | 'create' | 'delete';
 
 export namespace MultiPartFormData {
@@ -1578,17 +1575,25 @@ export interface SupplyData {
 	closeFunction?: CloseFunction;
 }
 
-export class NodeExecutionOutput extends Array {
-	private hints: NodeExecutionHint[];
-
+export class NodeExecutionOutput extends Array<INodeExecutionData[]> {
 	constructor(data: INodeExecutionData[][], hints: NodeExecutionHint[] = []) {
 		super();
-		this.push(...data);
-		this.hints = hints;
+		// TODO: This is a temporary solution for NODE-1740, until we move away from extending native Array class
+		Object.defineProperty(data, 'getHints', {
+			value: () => hints,
+			enumerable: false,
+			writable: false,
+			configurable: false,
+		});
+		return data as NodeExecutionOutput;
 	}
 
-	public getHints(): NodeExecutionHint[] {
-		return this.hints;
+	static [Symbol.hasInstance](instance: unknown) {
+		return Array.isArray(instance) && 'getHints' in instance;
+	}
+
+	getHints(): NodeExecutionHint[] {
+		throw new ApplicationError('This should not have been called');
 	}
 }
 
@@ -1619,6 +1624,9 @@ export interface INodeType {
 		resourceMapping?: {
 			[functionName: string]: (this: ILoadOptionsFunctions) => Promise<ResourceMapperFields>;
 		};
+		localResourceMapping?: {
+			[functionName: string]: (this: ILocalLoadOptionsFunctions) => Promise<ResourceMapperFields>;
+		};
 		actionHandler?: {
 			[functionName: string]: (
 				this: ILoadOptionsFunctions,
@@ -1627,7 +1635,7 @@ export interface INodeType {
 		};
 	};
 	webhookMethods?: {
-		[name in IWebhookDescription['name']]?: {
+		[name in WebhookType]?: {
 			[method in WebhookSetupMethodNames]: (this: IHookFunctions) => Promise<boolean>;
 		};
 	};
@@ -1641,6 +1649,7 @@ export abstract class Node {
 	abstract description: INodeTypeDescription;
 	execute?(context: IExecuteFunctions): Promise<INodeExecutionData[][]>;
 	webhook?(context: IWebhookFunctions): Promise<IWebhookResponseData>;
+	poll?(context: IPollFunctions): Promise<INodeExecutionData[][] | null>;
 }
 
 export interface IVersionedNodeType {
@@ -1664,6 +1673,7 @@ export interface INodeCredentialDescription {
 	name: string;
 	required?: boolean;
 	displayName?: string;
+	disabledOptions?: ICredentialsDisplayOptions;
 	displayOptions?: ICredentialsDisplayOptions;
 	testedBy?: ICredentialTestRequest | string; // Name of a function inside `loadOptions.credentialTest`
 }
@@ -1841,30 +1851,21 @@ export interface IPostReceiveSort extends IPostReceiveBase {
 
 export const enum NodeConnectionType {
 	AiAgent = 'ai_agent',
-
 	AiChain = 'ai_chain',
-
 	AiDocument = 'ai_document',
-
 	AiEmbedding = 'ai_embedding',
-
 	AiLanguageModel = 'ai_languageModel',
-
 	AiMemory = 'ai_memory',
-
 	AiOutputParser = 'ai_outputParser',
-
 	AiRetriever = 'ai_retriever',
-
 	AiTextSplitter = 'ai_textSplitter',
-
 	AiTool = 'ai_tool',
-
 	AiVectorStore = 'ai_vectorStore',
-
 	Main = 'main',
 }
 
+export type AINodeConnectionType = Exclude<NodeConnectionType, NodeConnectionType.Main>;
+
 export const nodeConnectionTypes: NodeConnectionType[] = [
 	NodeConnectionType.AiAgent,
 	NodeConnectionType.AiChain,
@@ -1979,11 +1980,13 @@ export interface IWebhookData {
 	staticData?: Workflow['staticData'];
 }
 
+export type WebhookType = 'default' | 'setup';
+
 export interface IWebhookDescription {
 	[key: string]: IHttpRequestMethods | WebhookResponseMode | boolean | string | undefined;
 	httpMethod: IHttpRequestMethods | string;
 	isFullPath?: boolean;
-	name: 'default' | 'setup';
+	name: WebhookType;
 	path: string;
 	responseBinaryPropertyName?: string;
 	responseContentType?: string;
@@ -1992,7 +1995,6 @@ export interface IWebhookDescription {
 	responseData?: WebhookResponseData | string;
 	restartWebhook?: boolean;
 	isForm?: boolean;
-	hasLifecycleMethods?: boolean; // set automatically by generate-ui-types
 	ndvHideUrl?: string | boolean; // If true the webhook will not be displayed in the editor
 	ndvHideMethod?: string | boolean; // If true the method will not be displayed in the editor
 }
@@ -2034,7 +2036,28 @@ export interface IWorkflowDataProxyData {
 	constructor: any;
 }
 
-export type IWorkflowDataProxyAdditionalKeys = IDataObject;
+export type IWorkflowDataProxyAdditionalKeys = IDataObject & {
+	$execution?: {
+		id: string;
+		mode: 'test' | 'production';
+		resumeUrl: string;
+		resumeFormUrl: string;
+		customData?: {
+			set(key: string, value: string): void;
+			setAll(obj: Record<string, string>): void;
+			get(key: string): string;
+			getAll(): Record<string, string>;
+		};
+	};
+	$vars?: IDataObject;
+	$secrets?: IDataObject;
+	$pageCount?: number;
+
+	/** @deprecated */
+	$executionId?: string;
+	/** @deprecated */
+	$resumeWebhookUrl?: string;
+};
 
 export interface IWorkflowMetadata {
 	id?: string;
@@ -2085,6 +2108,9 @@ export type INodeTypeData = LoadedData<INodeType | IVersionedNodeType>;
 
 export interface IRun {
 	data: IRunExecutionData;
+	/**
+	 * @deprecated Use status instead
+	 */
 	finished?: boolean;
 	mode: WorkflowExecuteMode;
 	waitTill?: Date | null;
@@ -2098,6 +2124,7 @@ export interface IRun {
 // The RunData, ExecuteData and WaitForExecution contain often the same data.
 export interface IRunExecutionData {
 	startData?: {
+		startNodes?: StartNodeData[];
 		destinationNode?: string;
 		runNodeFilter?: string[];
 	};
@@ -2118,7 +2145,18 @@ export interface IRunExecutionData {
 		waitingExecution: IWaitingForExecution;
 		waitingExecutionSource: IWaitingForExecutionSource | null;
 	};
+	parentExecution?: RelatedExecution;
 	waitTill?: Date;
+	pushRef?: string;
+
+	/** Whether this execution was started by a test webhook call. */
+	isTestWebhook?: boolean;
+
+	/** Data needed for a worker to run a manual execution. */
+	manualData?: Pick<
+		IWorkflowExecutionDataProcess,
+		'partialExecutionVersion' | 'dirtyNodeNames' | 'triggerToStartFrom' | 'userId'
+	>;
 }
 
 export interface IRunData {
@@ -2131,8 +2169,16 @@ export interface ITaskSubRunMetadata {
 	runIndex: number;
 }
 
+export interface RelatedExecution {
+	executionId: string;
+	workflowId: string;
+}
+
 export interface ITaskMetadata {
 	subRun?: ITaskSubRunMetadata[];
+	parentExecution?: RelatedExecution;
+	subExecution?: RelatedExecution;
+	subExecutionsCount?: number;
 }
 
 // The data that gets returned when a node runs
@@ -2219,7 +2265,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>>;
 }
 
@@ -2249,6 +2295,11 @@ export interface IWorkflowExecutionDataProcess {
 	 *      PARTIAL_EXECUTION_VERSION_DEFAULT
 	 */
 	partialExecutionVersion?: string;
+	dirtyNodeNames?: string[];
+	triggerToStartFrom?: {
+		name: string;
+		data?: ITaskData;
+	};
 }
 
 export interface ExecuteWorkflowOptions {
@@ -2259,6 +2310,8 @@ export interface ExecuteWorkflowOptions {
 	loadedRunData?: IWorkflowExecutionDataProcess;
 	parentWorkflowSettings?: IWorkflowSettings;
 	parentCallbackManager?: CallbackManager;
+	doNotWaitToFinish?: boolean;
+	parentExecution?: RelatedExecution;
 }
 
 export type AiEvent =
@@ -2292,7 +2345,7 @@ export interface IWorkflowExecuteAdditionalData {
 		workflowInfo: IExecuteWorkflowInfo,
 		additionalData: IWorkflowExecuteAdditionalData,
 		options: ExecuteWorkflowOptions,
-	) => Promise<any>;
+	) => Promise<ExecuteWorkflowData>;
 	executionId?: string;
 	restartExecutionId?: string;
 	hooks?: WorkflowHooks;
@@ -2313,7 +2366,7 @@ export interface IWorkflowExecuteAdditionalData {
 	secretsHelpers: SecretsHelpersBase;
 	logAiEvent: (eventName: AiEvent, payload: AiEventPayload) => void;
 	parentCallbackManager?: CallbackManager;
-	startAgentJob<T, E = unknown>(
+	startRunnerTask<T, E = unknown>(
 		additionalData: IWorkflowExecuteAdditionalData,
 		jobType: string,
 		settings: unknown,
@@ -2330,9 +2383,6 @@ export interface IWorkflowExecuteAdditionalData {
 		mode: WorkflowExecuteMode,
 		envProviderState: EnvProviderState,
 		executeData?: IExecuteData,
-		defaultReturnRunIndex?: number,
-		selfData?: IDataObject,
-		contextNodeName?: string,
 	): Promise<Result<T, E>>;
 }
 
@@ -2344,7 +2394,8 @@ export type WorkflowExecuteMode =
 	| 'manual'
 	| 'retry'
 	| 'trigger'
-	| 'webhook';
+	| 'webhook'
+	| 'evaluation';
 
 export type WorkflowActivateMode =
 	| 'init'
@@ -2400,7 +2451,7 @@ export interface WorkflowTestData {
 	nock?: {
 		baseUrl: string;
 		mocks: Array<{
-			method: 'delete' | 'get' | 'post' | 'put';
+			method: 'delete' | 'get' | 'patch' | 'post' | 'put';
 			path: string;
 			requestBody?: RequestBodyMatcher;
 			statusCode: number;
@@ -2414,7 +2465,17 @@ export interface WorkflowTestData {
 }
 
 export type LogLevel = (typeof LOG_LEVELS)[number];
-export type Logger = Record<Exclude<LogLevel, 'silent'>, (message: string, meta?: object) => void>;
+export type LogMetadata = {
+	[key: string]: unknown;
+	scopes?: LogScope[];
+	file?: string;
+	function?: string;
+};
+export type Logger = Record<
+	Exclude<LogLevel, 'silent'>,
+	(message: string, metadata?: LogMetadata) => void
+>;
+export type LogLocationMetadata = Pick<LogMetadata, 'file' | 'function'>;
 
 export interface IStatusCodeMessages {
 	[key: string]: string;
@@ -2556,12 +2617,15 @@ export type AnnotationVote = 'up' | 'down';
 
 export interface ExecutionSummary {
 	id: string;
+	/**
+	 * @deprecated Use status instead
+	 */
 	finished?: boolean;
 	mode: WorkflowExecuteMode;
 	retryOf?: string | null;
 	retrySuccessId?: string | null;
 	waitTill?: Date;
-	createdAt?: Date;
+	createdAt: Date;
 	startedAt: Date;
 	stoppedAt?: Date;
 	workflowId: string;
@@ -2651,6 +2715,8 @@ export type ResourceMapperValue = {
 	value: { [key: string]: string | number | boolean | null } | null;
 	matchingColumns: string[];
 	schema: ResourceMapperField[];
+	attemptToConvertTypes: boolean;
+	convertFieldsToString: boolean;
 };
 
 export type FilterOperatorType =
@@ -2705,6 +2771,9 @@ export interface ExecutionOptions {
 }
 
 export interface ExecutionFilters {
+	/**
+	 * @deprecated Use status instead
+	 */
 	finished?: boolean;
 	mode?: WorkflowExecuteMode[];
 	retryOf?: string;
@@ -2729,6 +2798,8 @@ export interface IUserSettings {
 	userActivatedAt?: number;
 	allowSSOManualLogin?: boolean;
 	npsSurvey?: NpsSurveyState;
+	easyAIWorkflowOnboarded?: boolean;
+	userClaimedAiCredits?: boolean;
 }
 
 export interface IProcessedDataConfig {
@@ -2786,13 +2857,6 @@ export interface SecretsHelpersBase {
 	listSecrets(provider: string): string[];
 }
 
-export type BannerName =
-	| 'V1'
-	| 'TRIAL_OVER'
-	| 'TRIAL'
-	| 'NON_PRODUCTION_LICENSE'
-	| 'EMAIL_CONFIRMATION';
-
 export type Functionality = 'regular' | 'configuration-node' | 'pairedItem';
 
 export type CallbackManager = CallbackManagerLC;
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 85431c6897..bbeeca87c0 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1,22 +1,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-
 /* eslint-disable prefer-spread */
-
 import get from 'lodash/get';
 import isEqual from 'lodash/isEqual';
-import uniqBy from 'lodash/uniqBy';
 
-import { SINGLE_EXECUTION_NODES } from './Constants';
 import { ApplicationError } from './errors/application.error';
 import { NodeConnectionType } from './Interfaces';
 import type {
 	FieldType,
 	IContextObject,
-	IHttpRequestMethods,
 	INode,
 	INodeCredentialDescription,
 	INodeIssueObjectProperty,
@@ -33,12 +27,9 @@ import type {
 	IParameterDependencies,
 	IRunExecutionData,
 	IVersionedNodeType,
-	IWebhookData,
-	IWorkflowExecuteAdditionalData,
 	NodeParameterValue,
 	ResourceMapperValue,
 	INodeTypeDescription,
-	INodeTypeBaseDescription,
 	INodeOutputConfiguration,
 	INodeInputConfiguration,
 	GenericValue,
@@ -243,33 +234,6 @@ export const cronNodeOptions: INodePropertyCollection[] = [
 	},
 ];
 
-const commonPollingParameters: INodeProperties[] = [
-	{
-		displayName: 'Poll Times',
-		name: 'pollTimes',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-			multipleValueButtonText: 'Add Poll Time',
-		},
-		default: { item: [{ mode: 'everyMinute' }] },
-		description: 'Time at which polling should occur',
-		placeholder: 'Add Poll Time',
-		options: cronNodeOptions,
-	},
-];
-
-export const commonCORSParameters: INodeProperties[] = [
-	{
-		displayName: 'Allowed Origins (CORS)',
-		name: 'allowedOrigins',
-		type: 'string',
-		default: '*',
-		description:
-			'Comma-separated list of URLs allowed for cross-origin non-preflight requests. Use * (default) to allow all origins.',
-	},
-];
-
 const declarativeNodeOptionParameters: INodeProperties = {
 	displayName: 'Request Options',
 	name: 'requestOptions',
@@ -320,7 +284,7 @@ const declarativeNodeOptionParameters: INodeProperties = {
 			],
 		},
 		{
-			displayName: 'Ignore SSL Issues',
+			displayName: 'Ignore SSL Issues (Insecure)',
 			name: 'allowUnauthorizedCerts',
 			type: 'boolean',
 			noDataExpression: true,
@@ -351,97 +315,6 @@ const declarativeNodeOptionParameters: INodeProperties = {
 	],
 };
 
-/**
- * Modifies the description of the passed in object, such that it can be used
- * as an AI Agent Tool.
- * Returns the modified item (not copied)
- */
-export function convertNodeToAiTool<
-	T extends object & { description: INodeTypeDescription | INodeTypeBaseDescription },
->(item: T): T {
-	// quick helper function for type-guard down below
-	function isFullDescription(obj: unknown): obj is INodeTypeDescription {
-		return typeof obj === 'object' && obj !== null && 'properties' in obj;
-	}
-
-	if (isFullDescription(item.description)) {
-		item.description.name += 'Tool';
-		item.description.inputs = [];
-		item.description.outputs = [NodeConnectionType.AiTool];
-		item.description.displayName += ' Tool';
-		delete item.description.usableAsTool;
-
-		const hasResource = item.description.properties.some((prop) => prop.name === 'resource');
-		const hasOperation = item.description.properties.some((prop) => prop.name === 'operation');
-
-		if (!item.description.properties.map((prop) => prop.name).includes('toolDescription')) {
-			const descriptionType: INodeProperties = {
-				displayName: 'Tool Description',
-				name: 'descriptionType',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Set Automatically',
-						value: 'auto',
-						description: 'Automatically set based on resource and operation',
-					},
-					{
-						name: 'Set Manually',
-						value: 'manual',
-						description: 'Manually set the description',
-					},
-				],
-				default: 'auto',
-			};
-
-			const descProp: INodeProperties = {
-				displayName: 'Description',
-				name: 'toolDescription',
-				type: 'string',
-				default: item.description.description,
-				required: true,
-				typeOptions: { rows: 2 },
-				description:
-					'Explain to the LLM what this tool does, a good, specific description would allow LLMs to produce expected results much more often',
-				placeholder: `e.g. ${item.description.description}`,
-			};
-
-			const noticeProp: INodeProperties = {
-				displayName: 'Use the expression {{ $fromAI() }} for any data to be filled by the model',
-				name: 'notice',
-				type: 'notice',
-				default: '',
-			};
-
-			item.description.properties.unshift(descProp);
-
-			// If node has resource or operation we can determine pre-populate tool description based on it
-			// so we add the descriptionType property as the first property
-			if (hasResource || hasOperation) {
-				item.description.properties.unshift(descriptionType);
-
-				descProp.displayOptions = {
-					show: {
-						descriptionType: ['manual'],
-					},
-				};
-			}
-
-			item.description.properties.unshift(noticeProp);
-		}
-	}
-
-	item.description.codex = {
-		categories: ['AI'],
-		subcategories: {
-			AI: ['Tools'],
-			Tools: ['Other Tools'],
-		},
-	};
-	return item;
-}
-
 /**
  * Determines if the provided node type has any output types other than the main connection type.
  * @param typeDescription The node's type description to check.
@@ -514,27 +387,6 @@ export function applyDeclarativeNodeOptionParameters(nodeType: INodeType): void
 	return;
 }
 
-/**
- * Apply special parameters which should be added to nodeTypes depending on their type or configuration
- */
-export function applySpecialNodeParameters(nodeType: INodeType): void {
-	const { properties, polling, supportsCORS } = nodeType.description;
-	if (polling) {
-		properties.unshift(...commonPollingParameters);
-	}
-	if (nodeType.webhook && supportsCORS) {
-		const optionsProperty = properties.find(({ name }) => name === 'options');
-		if (optionsProperty)
-			optionsProperty.options = [
-				...commonCORSParameters,
-				...(optionsProperty.options as INodePropertyOptions[]),
-			];
-		else properties.push(...commonCORSParameters);
-	}
-
-	applyDeclarativeNodeOptionParameters(nodeType);
-}
-
 const getPropertyValues = (
 	nodeValues: INodeParameters,
 	propertyName: string,
@@ -635,12 +487,13 @@ export function displayParameter(
 	parameter: INodeProperties | INodeCredentialDescription,
 	node: Pick<INode, 'typeVersion'> | null, // Allow null as it does also get used by credentials and they do not have versioning yet
 	nodeValuesRoot?: INodeParameters,
+	displayKey: 'displayOptions' | 'disabledOptions' = 'displayOptions',
 ) {
-	if (!parameter.displayOptions) {
+	if (!parameter[displayKey]) {
 		return true;
 	}
 
-	const { show, hide } = parameter.displayOptions;
+	const { show, hide } = parameter[displayKey];
 
 	nodeValuesRoot = nodeValuesRoot || nodeValues;
 
@@ -687,6 +540,7 @@ export function displayParameterPath(
 	parameter: INodeProperties | INodeCredentialDescription,
 	path: string,
 	node: Pick<INode, 'typeVersion'> | null,
+	displayKey: 'displayOptions' | 'disabledOptions' = 'displayOptions',
 ) {
 	let resolvedNodeValues = nodeValues;
 	if (path !== '') {
@@ -699,7 +553,7 @@ export function displayParameterPath(
 		nodeValuesRoot = get(nodeValues, 'parameters') as INodeParameters;
 	}
 
-	return displayParameter(resolvedNodeValues, parameter, node, nodeValuesRoot);
+	return displayParameter(resolvedNodeValues, parameter, node, nodeValuesRoot, displayKey);
 }
 
 /**
@@ -745,7 +599,6 @@ export function getContext(
 
 /**
  * Returns which parameters are dependent on which
- *
  */
 function getParameterDependencies(nodePropertiesArray: INodeProperties[]): IParameterDependencies {
 	const dependencies: IParameterDependencies = {};
@@ -781,7 +634,6 @@ function getParameterDependencies(nodePropertiesArray: INodeProperties[]): IPara
 /**
  * Returns in which order the parameters should be resolved
  * to have the parameters available they depend on
- *
  */
 export function getParameterResolveOrder(
 	nodePropertiesArray: INodeProperties[],
@@ -1175,121 +1027,8 @@ export function getNodeParameters(
 	return nodeParameters;
 }
 
-/**
- * Returns all the webhooks which should be created for the give node
- */
-export function getNodeWebhooks(
-	workflow: Workflow,
-	node: INode,
-	additionalData: IWorkflowExecuteAdditionalData,
-	ignoreRestartWebhooks = false,
-): IWebhookData[] {
-	if (node.disabled === true) {
-		// Node is disabled so webhooks will also not be enabled
-		return [];
-	}
-
-	const nodeType = workflow.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-	if (nodeType.description.webhooks === undefined) {
-		// Node does not have any webhooks so return
-		return [];
-	}
-
-	const workflowId = workflow.id || '__UNSAVED__';
-	const mode = 'internal';
-
-	const returnData: IWebhookData[] = [];
-	for (const webhookDescription of nodeType.description.webhooks) {
-		if (ignoreRestartWebhooks && webhookDescription.restartWebhook === true) {
-			continue;
-		}
-
-		let nodeWebhookPath = workflow.expression.getSimpleParameterValue(
-			node,
-			webhookDescription.path,
-			mode,
-			{},
-		);
-		if (nodeWebhookPath === undefined) {
-			// TODO: Use a proper logger
-			console.error(
-				`No webhook path could be found for node "${node.name}" in workflow "${workflowId}".`,
-			);
-			continue;
-		}
-
-		nodeWebhookPath = nodeWebhookPath.toString();
-
-		if (nodeWebhookPath.startsWith('/')) {
-			nodeWebhookPath = nodeWebhookPath.slice(1);
-		}
-		if (nodeWebhookPath.endsWith('/')) {
-			nodeWebhookPath = nodeWebhookPath.slice(0, -1);
-		}
-
-		const isFullPath: boolean = workflow.expression.getSimpleParameterValue(
-			node,
-			webhookDescription.isFullPath,
-			'internal',
-			{},
-			undefined,
-			false,
-		) as boolean;
-		const restartWebhook: boolean = workflow.expression.getSimpleParameterValue(
-			node,
-			webhookDescription.restartWebhook,
-			'internal',
-			{},
-			undefined,
-			false,
-		) as boolean;
-		const path = getNodeWebhookPath(workflowId, node, nodeWebhookPath, isFullPath, restartWebhook);
-
-		const webhookMethods = workflow.expression.getSimpleParameterValue(
-			node,
-			webhookDescription.httpMethod,
-			mode,
-			{},
-			undefined,
-			'GET',
-		);
-
-		if (webhookMethods === undefined) {
-			// TODO: Use a proper logger
-			console.error(
-				`The webhook "${path}" for node "${node.name}" in workflow "${workflowId}" could not be added because the httpMethod is not defined.`,
-			);
-			continue;
-		}
-
-		let webhookId: string | undefined;
-		if ((path.startsWith(':') || path.includes('/:')) && node.webhookId) {
-			webhookId = node.webhookId;
-		}
-
-		String(webhookMethods)
-			.split(',')
-			.forEach((httpMethod) => {
-				if (!httpMethod) return;
-				returnData.push({
-					httpMethod: httpMethod.trim() as IHttpRequestMethods,
-					node: node.name,
-					path,
-					webhookDescription,
-					workflowId,
-					workflowExecuteAdditionalData: additionalData,
-					webhookId,
-				});
-			});
-	}
-
-	return returnData;
-}
-
 /**
  * Returns the webhook path
- *
  */
 export function getNodeWebhookPath(
 	workflowId: string,
@@ -1315,7 +1054,6 @@ export function getNodeWebhookPath(
 
 /**
  * Returns the webhook URL
- *
  */
 export function getNodeWebhookUrl(
 	baseUrl: string,
@@ -1559,9 +1297,8 @@ export function nodeIssuesToString(issues: INodeIssues, node?: INode): string[]
 
 /*
  * Validates resource locator node parameters based on validation ruled defined in each parameter mode
- *
  */
-export const validateResourceLocatorParameter = (
+const validateResourceLocatorParameter = (
 	value: INodeParameterResourceLocator,
 	parameterMode: INodePropertyMode,
 ): string[] => {
@@ -1590,9 +1327,8 @@ export const validateResourceLocatorParameter = (
 
 /*
  * Validates resource mapper values based on service schema
- *
  */
-export const validateResourceMapperParameter = (
+const validateResourceMapperParameter = (
 	nodeProperties: INodeProperties,
 	value: ResourceMapperValue,
 	skipRequiredCheck = false,
@@ -1631,7 +1367,7 @@ export const validateResourceMapperParameter = (
 	return issues;
 };
 
-export const validateParameter = (
+const validateParameter = (
 	nodeProperties: INodeProperties,
 	value: GenericValue,
 	type: FieldType,
@@ -1659,7 +1395,7 @@ export const validateParameter = (
  * @param {INodeProperties} nodeProperties The properties of the node
  * @param {NodeParameterValue} value The value of the parameter
  */
-export function addToIssuesIfMissing(
+function addToIssuesIfMissing(
 	foundIssues: INodeIssues,
 	nodeProperties: INodeProperties,
 	value: NodeParameterValue | INodeParameterResourceLocator,
@@ -1668,7 +1404,7 @@ export function addToIssuesIfMissing(
 	if (
 		(nodeProperties.type === 'string' && (value === '' || value === undefined)) ||
 		(nodeProperties.type === 'multiOptions' && Array.isArray(value) && value.length === 0) ||
-		(nodeProperties.type === 'dateTime' && value === undefined) ||
+		(nodeProperties.type === 'dateTime' && (value === '' || value === undefined)) ||
 		(nodeProperties.type === 'options' && (value === '' || value === undefined)) ||
 		((nodeProperties.type === 'resourceLocator' || nodeProperties.type === 'workflowSelector') &&
 			!isValidResourceLocatorParameterValue(value as INodeParameterResourceLocator))
@@ -1832,7 +1568,7 @@ export function getParameterIssues(
 				data: option as INodeProperties,
 			});
 		}
-	} else if (nodeProperties.type === 'fixedCollection') {
+	} else if (nodeProperties.type === 'fixedCollection' && isDisplayed) {
 		basePath = basePath ? `${basePath}.` : `${nodeProperties.name}.`;
 
 		let propertyOptions: INodePropertyCollection;
@@ -1843,6 +1579,24 @@ export function getParameterIssues(
 				propertyOptions.name,
 				basePath.slice(0, -1),
 			);
+
+			// Validate allowed field counts
+			const valueArray = Array.isArray(value) ? value : [];
+			const { minRequiredFields, maxAllowedFields } = nodeProperties.typeOptions ?? {};
+			let error = '';
+
+			if (minRequiredFields && valueArray.length < minRequiredFields) {
+				error = `At least ${minRequiredFields} ${minRequiredFields === 1 ? 'field is' : 'fields are'} required.`;
+			}
+			if (maxAllowedFields && valueArray.length > maxAllowedFields) {
+				error = `At most ${maxAllowedFields} ${maxAllowedFields === 1 ? 'field is' : 'fields are'} allowed.`;
+			}
+			if (error) {
+				foundIssues.parameters ??= {};
+				foundIssues.parameters[nodeProperties.name] ??= [];
+				foundIssues.parameters[nodeProperties.name].push(error);
+			}
+
 			if (value === undefined) {
 				continue;
 			}
@@ -1934,7 +1688,6 @@ export function mergeIssues(destination: INodeIssues, source: INodeIssues | null
 
 /**
  * Merges the given node properties
- *
  */
 export function mergeNodeProperties(
 	mainProperties: INodeProperties[],
@@ -1965,53 +1718,3 @@ export function getVersionedNodeType(
 	}
 	return object;
 }
-
-export function getVersionedNodeTypeAll(object: IVersionedNodeType | INodeType): INodeType[] {
-	if ('nodeVersions' in object) {
-		return uniqBy(
-			Object.values(object.nodeVersions)
-				.map((element) => {
-					element.description.name = object.description.name;
-					element.description.codex = object.description.codex;
-					return element;
-				})
-				.reverse(),
-			(node) => {
-				const { version } = node.description;
-				return Array.isArray(version) ? version.join(',') : version.toString();
-			},
-		);
-	}
-	return [object];
-}
-
-export function getCredentialsForNode(
-	object: IVersionedNodeType | INodeType,
-): INodeCredentialDescription[] {
-	if ('nodeVersions' in object) {
-		return uniqBy(
-			Object.values(object.nodeVersions).flatMap(
-				(version) => version.description.credentials ?? [],
-			),
-			'name',
-		);
-	}
-
-	return object.description.credentials ?? [];
-}
-
-export function isSingleExecution(type: string, parameters: INodeParameters): boolean {
-	const singleExecutionCase = SINGLE_EXECUTION_NODES[type];
-
-	if (singleExecutionCase) {
-		for (const parameter of Object.keys(singleExecutionCase)) {
-			if (!singleExecutionCase[parameter].includes(parameters[parameter] as NodeParameterValue)) {
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	return false;
-}
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 705e07cd46..51d56ef154 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -4,16 +4,20 @@ import {
 	CHAIN_LLM_LANGCHAIN_NODE_TYPE,
 	CHAIN_SUMMARIZATION_LANGCHAIN_NODE_TYPE,
 	EXECUTE_WORKFLOW_NODE_TYPE,
+	FREE_AI_CREDITS_ERROR_TYPE,
+	FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE,
 	HTTP_REQUEST_NODE_TYPE,
 	HTTP_REQUEST_TOOL_LANGCHAIN_NODE_TYPE,
 	LANGCHAIN_CUSTOM_TOOLS,
 	MERGE_NODE_TYPE,
+	OPEN_AI_API_CREDENTIAL_TYPE,
 	OPENAI_LANGCHAIN_NODE_TYPE,
 	STICKY_NODE_TYPE,
 	WEBHOOK_NODE_TYPE,
 	WORKFLOW_TOOL_LANGCHAIN_NODE_TYPE,
 } from './Constants';
 import { ApplicationError } from './errors/application.error';
+import type { NodeApiError } from './errors/node-api.error';
 import type {
 	IConnection,
 	INode,
@@ -26,8 +30,13 @@ import type {
 	IDataObject,
 	IRunData,
 	ITaskData,
+	IRun,
 } from './Interfaces';
 import { getNodeParameters } from './NodeHelpers';
+import { jsonParse } from './utils';
+
+const isNodeApiError = (error: unknown): error is NodeApiError =>
+	typeof error === 'object' && error !== null && 'name' in error && error?.name === 'NodeApiError';
 
 export function getNodeTypeForName(workflow: IWorkflowBase, nodeName: string): INode | undefined {
 	return workflow.nodes.find((node) => node.name === nodeName);
@@ -470,3 +479,49 @@ export function generateNodesGraph(
 
 	return { nodeGraph, nameIndices, webhookNodeNames };
 }
+
+export function extractLastExecutedNodeCredentialData(
+	runData: IRun,
+): null | { credentialId: string; credentialType: string } {
+	const nodeCredentials = runData?.data?.executionData?.nodeExecutionStack?.[0]?.node?.credentials;
+
+	if (!nodeCredentials) return null;
+
+	const credentialType = Object.keys(nodeCredentials)[0] ?? null;
+
+	if (!credentialType) return null;
+
+	const { id } = nodeCredentials[credentialType];
+
+	if (!id) return null;
+
+	return { credentialId: id, credentialType };
+}
+
+export const userInInstanceRanOutOfFreeAiCredits = (runData: IRun): boolean => {
+	const credentials = extractLastExecutedNodeCredentialData(runData);
+
+	if (!credentials) return false;
+
+	if (credentials.credentialType !== OPEN_AI_API_CREDENTIAL_TYPE) return false;
+
+	const { error } = runData.data.resultData;
+
+	if (!isNodeApiError(error) || !error.messages[0]) return false;
+
+	const rawErrorResponse = error.messages[0].replace(`${error.httpCode} -`, '');
+
+	try {
+		const errorResponse = jsonParse<{ error: { code: number; type: string } }>(rawErrorResponse);
+		if (
+			errorResponse?.error?.type === FREE_AI_CREDITS_ERROR_TYPE &&
+			errorResponse.error.code === FREE_AI_CREDITS_USED_ALL_CREDITS_ERROR_CODE
+		) {
+			return true;
+		}
+	} catch {
+		return false;
+	}
+
+	return false;
+};
diff --git a/packages/workflow/src/Workflow.ts b/packages/workflow/src/Workflow.ts
index c60b949449..b63a83105a 100644
--- a/packages/workflow/src/Workflow.ts
+++ b/packages/workflow/src/Workflow.ts
@@ -1,62 +1,36 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
-
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-for-in-array */
-
-/* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
-
 import {
 	MANUAL_CHAT_TRIGGER_LANGCHAIN_NODE_TYPE,
 	NODES_WITH_RENAMABLE_CONTENT,
 	STARTING_NODE_TYPES,
 } from './Constants';
-import type { IDeferredPromise } from './DeferredPromise';
 import { ApplicationError } from './errors/application.error';
 import { Expression } from './Expression';
 import { getGlobalState } from './GlobalState';
 import type {
 	IConnections,
-	IExecuteResponsePromiseData,
-	IGetExecuteTriggerFunctions,
 	INode,
-	INodeExecuteFunctions,
 	INodeExecutionData,
-	INodeIssues,
 	INodeParameters,
 	INodes,
 	INodeType,
 	INodeTypes,
 	IPinData,
-	IPollFunctions,
-	IRunExecutionData,
-	ITaskDataConnections,
-	ITriggerResponse,
-	IWebhookData,
-	IWebhookResponseData,
-	IWorkflowIssues,
-	IWorkflowExecuteAdditionalData,
 	IWorkflowSettings,
-	WebhookSetupMethodNames,
-	WorkflowActivateMode,
-	WorkflowExecuteMode,
 	IConnection,
 	IConnectedNode,
 	IDataObject,
-	IExecuteData,
 	INodeConnection,
 	IObservableObject,
-	IRun,
-	IRunNodeResponse,
 	NodeParameterValueType,
-	CloseFunction,
 	INodeOutputConfiguration,
 } from './Interfaces';
-import { Node, NodeConnectionType } from './Interfaces';
+import { NodeConnectionType } from './Interfaces';
 import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
-import { RoutingNode } from './RoutingNode';
 
 function dedupe<T>(arr: T[]): T[] {
 	return [...new Set(arr)];
@@ -157,6 +131,13 @@ export class Workflow {
 		this.expression = new Expression(this);
 	}
 
+	overrideStaticData(staticData?: IDataObject) {
+		this.staticData = ObservableObject.create(staticData || {}, undefined, {
+			ignoreEmptyOnFirstChild: true,
+		});
+		this.staticData.__dataChanged = true;
+	}
+
 	/**
 	 * The default connections are by source node. This function rewrites them by destination nodes
 	 * to easily find parent nodes.
@@ -180,7 +161,8 @@ export class Workflow {
 					if (!connections[sourceNode][type].hasOwnProperty(inputIndex)) {
 						continue;
 					}
-					for (connectionInfo of connections[sourceNode][type][inputIndex]) {
+
+					for (connectionInfo of connections[sourceNode][type][inputIndex] ?? []) {
 						if (!returnConnection.hasOwnProperty(connectionInfo.node)) {
 							returnConnection[connectionInfo.node] = {};
 						}
@@ -193,7 +175,7 @@ export class Workflow {
 							returnConnection[connectionInfo.node][connectionInfo.type].push([]);
 						}
 
-						returnConnection[connectionInfo.node][connectionInfo.type][connectionInfo.index].push({
+						returnConnection[connectionInfo.node][connectionInfo.type][connectionInfo.index]?.push({
 							node: sourceNode,
 							type,
 							index: parseInt(inputIndex, 10),
@@ -206,112 +188,6 @@ export class Workflow {
 		return returnConnection;
 	}
 
-	/**
-	 * A workflow can only be activated if it has a node which has either triggers
-	 * or webhooks defined.
-	 *
-	 * @param {string[]} [ignoreNodeTypes] Node-types to ignore in the check
-	 */
-	checkIfWorkflowCanBeActivated(ignoreNodeTypes?: string[]): boolean {
-		let node: INode;
-		let nodeType: INodeType | undefined;
-
-		for (const nodeName of Object.keys(this.nodes)) {
-			node = this.nodes[nodeName];
-
-			if (node.disabled === true) {
-				// Deactivated nodes can not trigger a run so ignore
-				continue;
-			}
-
-			if (ignoreNodeTypes !== undefined && ignoreNodeTypes.includes(node.type)) {
-				continue;
-			}
-
-			nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-			if (nodeType === undefined) {
-				// Type is not known so check is not possible
-				continue;
-			}
-
-			if (
-				nodeType.poll !== undefined ||
-				nodeType.trigger !== undefined ||
-				nodeType.webhook !== undefined
-			) {
-				// Is a trigger node. So workflow can be activated.
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Checks if everything in the workflow is complete
-	 * and ready to be executed. If it returns null everything
-	 * is fine. If there are issues it returns the issues
-	 * which have been found for the different nodes.
-	 * TODO: Does currently not check for credential issues!
-	 */
-	checkReadyForExecution(
-		inputData: {
-			startNode?: string;
-			destinationNode?: string;
-			pinDataNodeNames?: string[];
-		} = {},
-	): IWorkflowIssues | null {
-		const workflowIssues: IWorkflowIssues = {};
-
-		let checkNodes: string[] = [];
-		if (inputData.destinationNode) {
-			// If a destination node is given we have to check all the nodes
-			// leading up to it
-			checkNodes = this.getParentNodes(inputData.destinationNode);
-			checkNodes.push(inputData.destinationNode);
-		} else if (inputData.startNode) {
-			// If a start node is given we have to check all nodes which
-			// come after it
-			checkNodes = this.getChildNodes(inputData.startNode);
-			checkNodes.push(inputData.startNode);
-		}
-
-		for (const nodeName of checkNodes) {
-			let nodeIssues: INodeIssues | null = null;
-			const node = this.nodes[nodeName];
-
-			if (node.disabled === true) {
-				continue;
-			}
-
-			const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-			if (nodeType === undefined) {
-				// Node type is not known
-				nodeIssues = {
-					typeUnknown: true,
-				};
-			} else {
-				nodeIssues = NodeHelpers.getNodeParametersIssues(
-					nodeType.description.properties,
-					node,
-					inputData.pinDataNodeNames,
-				);
-			}
-
-			if (nodeIssues !== null) {
-				workflowIssues[node.name] = nodeIssues;
-			}
-		}
-
-		if (Object.keys(workflowIssues).length === 0) {
-			return null;
-		}
-
-		return workflowIssues;
-	}
-
 	/**
 	 * Returns the static data of the workflow.
 	 * It gets saved with the workflow and will be the same for
@@ -434,7 +310,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)
 
@@ -550,18 +426,18 @@ export class Workflow {
 		let type: string;
 		let sourceIndex: string;
 		let connectionIndex: string;
-		let connectionData: IConnection;
+		let connectionData: IConnection | undefined;
 		for (sourceNode of Object.keys(this.connectionsBySourceNode)) {
 			for (type of Object.keys(this.connectionsBySourceNode[sourceNode])) {
 				for (sourceIndex of Object.keys(this.connectionsBySourceNode[sourceNode][type])) {
 					for (connectionIndex of Object.keys(
-						this.connectionsBySourceNode[sourceNode][type][parseInt(sourceIndex, 10)],
+						this.connectionsBySourceNode[sourceNode][type][parseInt(sourceIndex, 10)] || [],
 					)) {
 						connectionData =
-							this.connectionsBySourceNode[sourceNode][type][parseInt(sourceIndex, 10)][
+							this.connectionsBySourceNode[sourceNode][type][parseInt(sourceIndex, 10)]?.[
 								parseInt(connectionIndex, 10)
 							];
-						if (connectionData.node === currentName) {
+						if (connectionData?.node === currentName) {
 							connectionData.node = newName;
 						}
 					}
@@ -614,7 +490,7 @@ export class Workflow {
 		const returnNodes: string[] = [];
 		let addNodes: string[];
 
-		let connectionsByIndex: IConnection[];
+		let connectionsByIndex: IConnection[] | null;
 		for (
 			let connectionIndex = 0;
 			connectionIndex < this.connectionsByDestinationNode[nodeName][type].length;
@@ -626,7 +502,7 @@ export class Workflow {
 			}
 			connectionsByIndex = this.connectionsByDestinationNode[nodeName][type][connectionIndex];
 			// eslint-disable-next-line @typescript-eslint/no-loop-func
-			connectionsByIndex.forEach((connection) => {
+			connectionsByIndex?.forEach((connection) => {
 				if (checkedNodes.includes(connection.node)) {
 					// Node got checked already before
 					return;
@@ -741,7 +617,7 @@ export class Workflow {
 			checkedNodes.push(nodeName);
 
 			connections[nodeName][type].forEach((connectionsByIndex) => {
-				connectionsByIndex.forEach((connection) => {
+				connectionsByIndex?.forEach((connection) => {
 					if (checkedNodes.includes(connection.node)) {
 						// Node got checked already before
 						return;
@@ -838,7 +714,7 @@ export class Workflow {
 				}
 
 				connections[curr.name][type].forEach((connectionsByIndex) => {
-					connectionsByIndex.forEach((connection) => {
+					connectionsByIndex?.forEach((connection) => {
 						queue.push({
 							name: connection.node,
 							indicies: [connection.index],
@@ -942,6 +818,10 @@ export class Workflow {
 
 		let outputIndex: INodeConnection | undefined;
 		for (const connectionsByIndex of this.connectionsByDestinationNode[nodeName][type]) {
+			if (!connectionsByIndex) {
+				continue;
+			}
+
 			for (
 				let destinationIndex = 0;
 				destinationIndex < connectionsByIndex.length;
@@ -1053,437 +933,6 @@ export class Workflow {
 
 		return this.__getStartNode(Object.keys(this.nodes));
 	}
-
-	async createWebhookIfNotExists(
-		webhookData: IWebhookData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): Promise<void> {
-		const webhookExists = await this.runWebhookMethod(
-			'checkExists',
-			webhookData,
-			nodeExecuteFunctions,
-			mode,
-			activation,
-		);
-		if (!webhookExists) {
-			// If webhook does not exist yet create it
-			await this.runWebhookMethod('create', webhookData, nodeExecuteFunctions, mode, activation);
-		}
-	}
-
-	async deleteWebhook(
-		webhookData: IWebhookData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	) {
-		await this.runWebhookMethod('delete', webhookData, nodeExecuteFunctions, mode, activation);
-	}
-
-	private async runWebhookMethod(
-		method: WebhookSetupMethodNames,
-		webhookData: IWebhookData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): Promise<boolean | undefined> {
-		const node = this.getNode(webhookData.node);
-
-		if (!node) return;
-
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-		const webhookFn = nodeType.webhookMethods?.[webhookData.webhookDescription.name]?.[method];
-		if (webhookFn === undefined) return;
-
-		const thisArgs = nodeExecuteFunctions.getExecuteHookFunctions(
-			this,
-			node,
-			webhookData.workflowExecuteAdditionalData,
-			mode,
-			activation,
-			webhookData,
-		);
-
-		return await webhookFn.call(thisArgs);
-	}
-
-	/**
-	 * Runs the given trigger node so that it can trigger the workflow
-	 * when the node has data.
-	 *
-	 */
-	async runTrigger(
-		node: INode,
-		getTriggerFunctions: IGetExecuteTriggerFunctions,
-		additionalData: IWorkflowExecuteAdditionalData,
-		mode: WorkflowExecuteMode,
-		activation: WorkflowActivateMode,
-	): Promise<ITriggerResponse | undefined> {
-		const triggerFunctions = getTriggerFunctions(this, node, additionalData, mode, activation);
-
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-		if (nodeType === undefined) {
-			throw new ApplicationError('Node with unknown node type', {
-				extra: { nodeName: node.name },
-				tags: { nodeType: node.type },
-			});
-		}
-
-		if (!nodeType.trigger) {
-			throw new ApplicationError('Node type does not have a trigger function defined', {
-				extra: { nodeName: node.name },
-				tags: { nodeType: node.type },
-			});
-		}
-
-		if (mode === 'manual') {
-			// In manual mode we do not just start the trigger function we also
-			// want to be able to get informed as soon as the first data got emitted
-			const triggerResponse = await nodeType.trigger.call(triggerFunctions);
-
-			// Add the manual trigger response which resolves when the first time data got emitted
-			triggerResponse!.manualTriggerResponse = new Promise((resolve, reject) => {
-				triggerFunctions.emit = (
-					(resolveEmit) =>
-					(
-						data: INodeExecutionData[][],
-						responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>,
-						donePromise?: IDeferredPromise<IRun>,
-					) => {
-						additionalData.hooks!.hookFunctions.sendResponse = [
-							async (response: IExecuteResponsePromiseData): Promise<void> => {
-								if (responsePromise) {
-									responsePromise.resolve(response);
-								}
-							},
-						];
-
-						if (donePromise) {
-							additionalData.hooks!.hookFunctions.workflowExecuteAfter?.unshift(
-								async (runData: IRun): Promise<void> => {
-									return donePromise.resolve(runData);
-								},
-							);
-						}
-
-						resolveEmit(data);
-					}
-				)(resolve);
-				triggerFunctions.emitError = (
-					(rejectEmit) =>
-					(error: Error, responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>) => {
-						additionalData.hooks!.hookFunctions.sendResponse = [
-							async (): Promise<void> => {
-								if (responsePromise) {
-									responsePromise.reject(error);
-								}
-							},
-						];
-
-						rejectEmit(error);
-					}
-				)(reject);
-			});
-
-			return triggerResponse;
-		}
-		// In all other modes simply start the trigger
-		return await nodeType.trigger.call(triggerFunctions);
-	}
-
-	/**
-	 * Runs the given trigger node so that it can trigger the workflow
-	 * when the node has data.
-	 *
-	 */
-
-	async runPoll(
-		node: INode,
-		pollFunctions: IPollFunctions,
-	): Promise<INodeExecutionData[][] | null> {
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-
-		if (nodeType === undefined) {
-			throw new ApplicationError('Node with unknown node type', {
-				extra: { nodeName: node.name },
-				tags: { nodeType: node.type },
-			});
-		}
-
-		if (!nodeType.poll) {
-			throw new ApplicationError('Node type does not have a poll function defined', {
-				extra: { nodeName: node.name },
-				tags: { nodeType: node.type },
-			});
-		}
-
-		return await nodeType.poll.call(pollFunctions);
-	}
-
-	/**
-	 * Executes the webhook data to see what it should return and if the
-	 * workflow should be started or not
-	 *
-	 */
-	async runWebhook(
-		webhookData: IWebhookData,
-		node: INode,
-		additionalData: IWorkflowExecuteAdditionalData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		runExecutionData: IRunExecutionData | null,
-	): Promise<IWebhookResponseData> {
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-		if (nodeType === undefined) {
-			throw new ApplicationError('Unknown node type of webhook node', {
-				extra: { nodeName: node.name },
-			});
-		} else if (nodeType.webhook === undefined) {
-			throw new ApplicationError('Node does not have any webhooks defined', {
-				extra: { nodeName: node.name },
-			});
-		}
-
-		const closeFunctions: CloseFunction[] = [];
-
-		const context = nodeExecuteFunctions.getExecuteWebhookFunctions(
-			this,
-			node,
-			additionalData,
-			mode,
-			webhookData,
-			closeFunctions,
-			runExecutionData,
-		);
-		return nodeType instanceof Node
-			? await nodeType.webhook(context)
-			: await nodeType.webhook.call(context);
-	}
-
-	/**
-	 * Executes the given node.
-	 *
-	 */
-	// eslint-disable-next-line complexity
-	async runNode(
-		executionData: IExecuteData,
-		runExecutionData: IRunExecutionData,
-		runIndex: number,
-		additionalData: IWorkflowExecuteAdditionalData,
-		nodeExecuteFunctions: INodeExecuteFunctions,
-		mode: WorkflowExecuteMode,
-		abortSignal?: AbortSignal,
-	): Promise<IRunNodeResponse> {
-		const { node } = executionData;
-		let inputData = executionData.data;
-
-		if (node.disabled === true) {
-			// If node is disabled simply pass the data through
-			// return NodeRunHelpers.
-			if (inputData.hasOwnProperty('main') && inputData.main.length > 0) {
-				// If the node is disabled simply return the data from the first main input
-				if (inputData.main[0] === null) {
-					return { data: undefined };
-				}
-				return { data: [inputData.main[0]] };
-			}
-			return { data: undefined };
-		}
-
-		const nodeType = this.nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
-		if (nodeType === undefined) {
-			throw new ApplicationError('Node type is unknown so cannot run it', {
-				tags: { nodeType: node.type },
-			});
-		}
-
-		let connectionInputData: INodeExecutionData[] = [];
-		if (nodeType.execute || (!nodeType.poll && !nodeType.trigger && !nodeType.webhook)) {
-			// Only stop if first input is empty for execute runs. For all others run anyways
-			// because then it is a trigger node. As they only pass data through and so the input-data
-			// becomes output-data it has to be possible.
-
-			if (inputData.main?.length > 0) {
-				// We always use the data of main input and the first input for execute
-				connectionInputData = inputData.main[0] as INodeExecutionData[];
-			}
-
-			const forceInputNodeExecution = this.settings.executionOrder !== 'v1';
-			if (!forceInputNodeExecution) {
-				// If the nodes do not get force executed data of some inputs may be missing
-				// for that reason do we use the data of the first one that contains any
-				for (const mainData of inputData.main) {
-					if (mainData?.length) {
-						connectionInputData = mainData;
-						break;
-					}
-				}
-			}
-
-			if (connectionInputData.length === 0) {
-				// No data for node so return
-				return { data: undefined };
-			}
-		}
-
-		if (
-			runExecutionData.resultData.lastNodeExecuted === node.name &&
-			runExecutionData.resultData.error !== undefined
-		) {
-			// The node did already fail. So throw an error here that it displays and logs it correctly.
-			// Does get used by webhook and trigger nodes in case they throw an error that it is possible
-			// to log the error and display in Editor-UI.
-			if (
-				runExecutionData.resultData.error.name === 'NodeOperationError' ||
-				runExecutionData.resultData.error.name === 'NodeApiError'
-			) {
-				throw runExecutionData.resultData.error;
-			}
-
-			const error = new Error(runExecutionData.resultData.error.message);
-			error.stack = runExecutionData.resultData.error.stack;
-			throw error;
-		}
-
-		if (node.executeOnce === true) {
-			// If node should be executed only once so use only the first input item
-			const newInputData: ITaskDataConnections = {};
-			for (const inputName of Object.keys(inputData)) {
-				newInputData[inputName] = inputData[inputName].map((input) => {
-					// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
-					return input && input.slice(0, 1);
-				});
-			}
-			inputData = newInputData;
-		}
-
-		if (nodeType.execute) {
-			const closeFunctions: CloseFunction[] = [];
-			const context = nodeExecuteFunctions.getExecuteFunctions(
-				this,
-				runExecutionData,
-				runIndex,
-				connectionInputData,
-				inputData,
-				node,
-				additionalData,
-				executionData,
-				mode,
-				closeFunctions,
-				abortSignal,
-			);
-			const data =
-				nodeType instanceof Node
-					? await nodeType.execute(context)
-					: await nodeType.execute.call(context);
-
-			const closeFunctionsResults = await Promise.allSettled(
-				closeFunctions.map(async (fn) => await fn()),
-			);
-
-			const closingErrors = closeFunctionsResults
-				.filter((result): result is PromiseRejectedResult => result.status === 'rejected')
-				.map((result) => result.reason);
-
-			if (closingErrors.length > 0) {
-				if (closingErrors[0] instanceof Error) throw closingErrors[0];
-				throw new ApplicationError("Error on execution node's close function(s)", {
-					extra: { nodeName: node.name },
-					tags: { nodeType: node.type },
-					cause: closingErrors,
-				});
-			}
-
-			return { data };
-		} else if (nodeType.poll) {
-			if (mode === 'manual') {
-				// In manual mode run the poll function
-				const thisArgs = nodeExecuteFunctions.getExecutePollFunctions(
-					this,
-					node,
-					additionalData,
-					mode,
-					'manual',
-				);
-				return { data: await nodeType.poll.call(thisArgs) };
-			}
-			// In any other mode pass data through as it already contains the result of the poll
-			return { data: inputData.main as INodeExecutionData[][] };
-		} else if (nodeType.trigger) {
-			if (mode === 'manual') {
-				// In manual mode start the trigger
-				const triggerResponse = await this.runTrigger(
-					node,
-					nodeExecuteFunctions.getExecuteTriggerFunctions,
-					additionalData,
-					mode,
-					'manual',
-				);
-
-				if (triggerResponse === undefined) {
-					return { data: null };
-				}
-
-				let closeFunction;
-				if (triggerResponse.closeFunction) {
-					// In manual mode we return the trigger closeFunction. That allows it to be called directly
-					// but we do not have to wait for it to finish. That is important for things like queue-nodes.
-					// There the full close will may be delayed till a message gets acknowledged after the execution.
-					// If we would not be able to wait for it to close would it cause problems with "own" mode as the
-					// process would be killed directly after it and so the acknowledge would not have been finished yet.
-					closeFunction = triggerResponse.closeFunction;
-
-					// Manual testing of Trigger nodes creates an execution. If the execution is cancelled, `closeFunction` should be called to cleanup any open connections/consumers
-					abortSignal?.addEventListener('abort', closeFunction);
-				}
-
-				if (triggerResponse.manualTriggerFunction !== undefined) {
-					// If a manual trigger function is defined call it and wait till it did run
-					await triggerResponse.manualTriggerFunction();
-				}
-
-				const response = await triggerResponse.manualTriggerResponse!;
-
-				if (response.length === 0) {
-					return { data: null, closeFunction };
-				}
-
-				return { data: response, closeFunction };
-			}
-			// For trigger nodes in any mode except "manual" do we simply pass the data through
-			return { data: inputData.main as INodeExecutionData[][] };
-		} else if (nodeType.webhook) {
-			// For webhook nodes always simply pass the data through
-			return { data: inputData.main as INodeExecutionData[][] };
-		} else {
-			// For nodes which have routing information on properties
-
-			const routingNode = new RoutingNode(
-				this,
-				node,
-				connectionInputData,
-				runExecutionData ?? null,
-				additionalData,
-				mode,
-			);
-
-			return {
-				data: await routingNode.runNode(
-					inputData,
-					runIndex,
-					nodeType,
-					executionData,
-					nodeExecuteFunctions,
-					undefined,
-					abortSignal,
-				),
-			};
-		}
-	}
 }
 
 function hasDotNotationBannedChar(nodeName: string) {
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index f140edc98f..63353ca10d 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -388,8 +388,13 @@ export class WorkflowDataProxy {
 	 * @private
 	 * @param {string} nodeName The name of the node query data from
 	 * @param {boolean} [shortSyntax=false] If short syntax got used
+	 * @param {boolean} [throwOnMissingExecutionData=true] If an error should get thrown if no execution data is available
 	 */
-	private nodeDataGetter(nodeName: string, shortSyntax = false) {
+	private nodeDataGetter(
+		nodeName: string,
+		shortSyntax = false,
+		throwOnMissingExecutionData = true,
+	) {
 		const that = this;
 		const node = this.workflow.nodes[nodeName];
 
@@ -416,6 +421,10 @@ export class WorkflowDataProxy {
 							shortSyntax,
 						});
 
+						if (executionData.length === 0 && !throwOnMissingExecutionData) {
+							return undefined;
+						}
+
 						if (executionData.length === 0) {
 							if (that.workflow.getParentNodes(nodeName).length === 0) {
 								throw new ExpressionError('No execution data available', {
@@ -613,7 +622,7 @@ export class WorkflowDataProxy {
 	 * Returns the data proxy object which allows to query data from current run
 	 *
 	 */
-	getDataProxy(): IWorkflowDataProxyData {
+	getDataProxy(opts?: { throwOnMissingExecutionData: boolean }): IWorkflowDataProxyData {
 		const that = this;
 
 		// replacing proxies with the actual data.
@@ -694,17 +703,19 @@ export class WorkflowDataProxy {
 			});
 		};
 
-		const createMissingPairedItemError = (nodeCause: string) => {
-			return createExpressionError("Can't get data for expression", {
-				messageTemplate: 'Info for expression missing from previous node',
+		const createMissingPairedItemError = (
+			nodeCause: string,
+			usedMethodName: 'itemMatching' | 'pairedItem' | 'item' | '$getPairedItem' = 'pairedItem',
+		) => {
+			const message = `Using the ${usedMethodName} method doesn't work with pinned data in this scenario. Please unpin '${nodeCause}' and try again.`;
+			return new ExpressionError(message, {
+				runIndex: that.runIndex,
+				itemIndex: that.itemIndex,
 				functionality: 'pairedItem',
-				functionOverrides: {
-					message: "Can't get data",
-				},
-				nodeCause,
 				descriptionKey: isScriptingNode(nodeCause, that.workflow)
 					? 'pairedItemNoInfoCodeNode'
 					: 'pairedItemNoInfo',
+				nodeCause,
 				causeDetailed: `Missing pairedItem data (node '${nodeCause}' probably didn't supply it)`,
 				type: 'paired_item_no_info',
 			});
@@ -728,6 +739,7 @@ export class WorkflowDataProxy {
 			destinationNodeName: string,
 			incomingSourceData: ISourceData | null,
 			pairedItem: IPairedItemData,
+			usedMethodName: 'pairedItem' | 'itemMatching' | 'item' | '$getPairedItem' = '$getPairedItem',
 		): INodeExecutionData | null => {
 			let taskData: ITaskData | undefined;
 
@@ -781,7 +793,7 @@ export class WorkflowDataProxy {
 				const itemPreviousNode: INodeExecutionData = previousNodeOutputData[pairedItem.item];
 
 				if (itemPreviousNode.pairedItem === undefined) {
-					throw createMissingPairedItemError(sourceData.previousNode);
+					throw createMissingPairedItemError(sourceData.previousNode, usedMethodName);
 				}
 
 				if (Array.isArray(itemPreviousNode.pairedItem)) {
@@ -797,7 +809,7 @@ export class WorkflowDataProxy {
 									throw new ApplicationError('Not found');
 								}
 
-								return getPairedItem(destinationNodeName, source[itemInput], item);
+								return getPairedItem(destinationNodeName, source[itemInput], item, usedMethodName);
 							} catch (error) {
 								// Means pairedItem could not be found
 								return null;
@@ -849,6 +861,7 @@ export class WorkflowDataProxy {
 						// A trigger node got reached, so looks like that that item can not be resolved
 						throw createNoConnectionError(destinationNodeName);
 					}
+
 					throw createExpressionError('Can’t get data for expression', {
 						messageTemplate: 'Can’t get data for expression under ‘%%PARAMETER%%’ field',
 						functionality: 'pairedItem',
@@ -936,10 +949,11 @@ export class WorkflowDataProxy {
 			_type: string = 'string',
 			defaultValue?: unknown,
 		) => {
+			const { itemIndex, runIndex } = that;
 			if (!name || name === '') {
-				throw new ExpressionError('Please provide a key', {
-					runIndex: that.runIndex,
-					itemIndex: that.itemIndex,
+				throw new ExpressionError("Add a key, e.g. $fromAI('placeholder_name')", {
+					runIndex,
+					itemIndex,
 				});
 			}
 			const nameValidationRegex = /^[a-zA-Z0-9_-]{0,64}$/;
@@ -947,24 +961,29 @@ export class WorkflowDataProxy {
 				throw new ExpressionError(
 					'Invalid parameter key, must be between 1 and 64 characters long and only contain lowercase letters, uppercase letters, numbers, underscores, and hyphens',
 					{
-						runIndex: that.runIndex,
-						itemIndex: that.itemIndex,
+						runIndex,
+						itemIndex,
 					},
 				);
 			}
+			const inputData =
+				that.runExecutionData?.resultData.runData[that.activeNodeName]?.[runIndex].inputOverride;
 			const placeholdersDataInputData =
-				that.runExecutionData?.resultData.runData[that.activeNodeName]?.[0].inputOverride?.[
-					NodeConnectionType.AiTool
-				]?.[0]?.[0].json;
+				inputData?.[NodeConnectionType.AiTool]?.[0]?.[itemIndex].json;
 
 			if (Boolean(!placeholdersDataInputData)) {
 				throw new ExpressionError('No execution data available', {
-					runIndex: that.runIndex,
-					itemIndex: that.itemIndex,
+					runIndex,
+					itemIndex,
 					type: 'no_execution_data',
 				});
 			}
-			return placeholdersDataInputData?.[name] ?? defaultValue;
+			return (
+				// TS does not know that the key exists, we need to address this in refactor
+				(placeholdersDataInputData?.query as Record<string, unknown>)?.[name] ??
+				placeholdersDataInputData?.[name] ??
+				defaultValue
+			);
 		};
 
 		const base = {
@@ -1024,7 +1043,7 @@ export class WorkflowDataProxy {
 								);
 							}
 
-							if (['pairedItem', 'itemMatching', 'item'].includes(property as string)) {
+							if (property === 'pairedItem' || property === 'itemMatching' || property === 'item') {
 								// Before resolving the pairedItem make sure that the requested node comes in the
 								// graph before the current one
 								const activeNode = that.workflow.getNode(that.activeNodeName);
@@ -1086,7 +1105,7 @@ export class WorkflowDataProxy {
 									const pairedItem = input.pairedItem as IPairedItemData;
 
 									if (pairedItem === undefined) {
-										throw createMissingPairedItemError(that.activeNodeName);
+										throw createMissingPairedItemError(that.activeNodeName, property);
 									}
 
 									if (!that.executeData?.source) {
@@ -1107,7 +1126,7 @@ export class WorkflowDataProxy {
 										that.executeData.source.main[pairedItem.input || 0] ??
 										that.executeData.source.main[0];
 
-									return getPairedItem(nodeName, sourceData, pairedItem);
+									return getPairedItem(nodeName, sourceData, pairedItem, property);
 								};
 
 								if (property === 'item') {
@@ -1367,6 +1386,7 @@ export class WorkflowDataProxy {
 			$nodeId: that.workflow.getNode(that.activeNodeName)?.id,
 			$webhookId: that.workflow.getNode(that.activeNodeName)?.webhookId,
 		};
+		const throwOnMissingExecutionData = opts?.throwOnMissingExecutionData ?? true;
 
 		return new Proxy(base, {
 			has: () => true,
@@ -1374,10 +1394,11 @@ export class WorkflowDataProxy {
 				if (name === 'isProxy') return true;
 
 				if (['$data', '$json'].includes(name as string)) {
-					return that.nodeDataGetter(that.contextNodeName, true)?.json;
+					return that.nodeDataGetter(that.contextNodeName, true, throwOnMissingExecutionData)?.json;
 				}
 				if (name === '$binary') {
-					return that.nodeDataGetter(that.contextNodeName, true)?.binary;
+					return that.nodeDataGetter(that.contextNodeName, true, throwOnMissingExecutionData)
+						?.binary;
 				}
 
 				return Reflect.get(target, name, receiver);
diff --git a/packages/workflow/src/errors/expression.error.ts b/packages/workflow/src/errors/expression.error.ts
index 02b3c74444..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;
@@ -40,7 +40,6 @@ export class ExpressionError extends ExecutionBaseError {
 			'causeDetailed',
 			'descriptionTemplate',
 			'descriptionKey',
-			'functionality',
 			'itemIndex',
 			'messageTemplate',
 			'nodeCause',
@@ -48,7 +47,12 @@ export class ExpressionError extends ExecutionBaseError {
 			'runIndex',
 			'type',
 		];
+
 		if (options !== undefined) {
+			if (options.functionality !== undefined) {
+				this.functionality = options.functionality;
+			}
+
 			Object.keys(options as IDataObject).forEach((key) => {
 				if (allowedKeys.includes(key)) {
 					this.context[key] = (options as IDataObject)[key];
diff --git a/packages/workflow/src/errors/index.ts b/packages/workflow/src/errors/index.ts
index 5dea5b9e6d..653f4d2f00 100644
--- a/packages/workflow/src/errors/index.ts
+++ b/packages/workflow/src/errors/index.ts
@@ -1,4 +1,4 @@
-export { ApplicationError } from './application.error';
+export { ApplicationError, type ReportingOptions } from './application.error';
 export { ExpressionError } from './expression.error';
 export { CredentialAccessError } from './credential-access-error';
 export { ExecutionCancelledError } from './execution-cancelled.error';
diff --git a/packages/workflow/src/errors/node-api.error.ts b/packages/workflow/src/errors/node-api.error.ts
index f18f2e6fed..aeae1c754e 100644
--- a/packages/workflow/src/errors/node-api.error.ts
+++ b/packages/workflow/src/errors/node-api.error.ts
@@ -261,7 +261,7 @@ export class NodeApiError extends NodeError {
 			messageMapping,
 		);
 
-		if (functionality !== undefined) this.context.functionality = functionality;
+		if (functionality !== undefined) this.functionality = functionality;
 		if (runIndex !== undefined) this.context.runIndex = runIndex;
 		if (itemIndex !== undefined) this.context.itemIndex = itemIndex;
 	}
diff --git a/packages/workflow/src/errors/node-operation.error.ts b/packages/workflow/src/errors/node-operation.error.ts
index 00a7a179cc..ce038ab054 100644
--- a/packages/workflow/src/errors/node-operation.error.ts
+++ b/packages/workflow/src/errors/node-operation.error.ts
@@ -29,7 +29,7 @@ export class NodeOperationError extends NodeError {
 		}
 
 		if (options.message) this.message = options.message;
-		if (options.level) this.level = options.level;
+		this.level = options.level ?? 'warning';
 		if (options.functionality) this.functionality = options.functionality;
 		if (options.type) this.type = options.type;
 		this.description = options.description;
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 8c304664f1..992a27921f 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -1,5 +1,4 @@
 import * as LoggerProxy from './LoggerProxy';
-export * as ErrorReporterProxy from './ErrorReporterProxy';
 export * as ExpressionEvaluatorProxy from './ExpressionEvaluatorProxy';
 import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
@@ -15,7 +14,6 @@ export * from './MessageEventBus';
 export * from './ExecutionStatus';
 export * from './Expression';
 export * from './NodeHelpers';
-export * from './RoutingNode';
 export * from './Workflow';
 export * from './WorkflowDataProxy';
 export * from './WorkflowDataProxyEnvProvider';
diff --git a/packages/workflow/test/AugmentObject.test.ts b/packages/workflow/test/AugmentObject.test.ts
index 457567b993..1bbe64561f 100644
--- a/packages/workflow/test/AugmentObject.test.ts
+++ b/packages/workflow/test/AugmentObject.test.ts
@@ -572,5 +572,22 @@ describe('AugmentObject', () => {
 			expect('z' in augmentedObject.x).toBe(true);
 			expect('y' in augmentedObject.x).toBe(true);
 		});
+
+		test('should ignore non-enumerable keys', () => {
+			const originalObject: { toString?: string } = { toString: '123' };
+			const augmentedObject = augmentObject(originalObject);
+			expect('toString' in augmentedObject).toBe(true);
+			expect(Object.keys(augmentedObject)).toEqual(['toString']);
+			expect(Object.getOwnPropertyDescriptor(augmentedObject, 'toString')?.value).toEqual(
+				originalObject.toString,
+			);
+			expect(augmentedObject.toString).toEqual(originalObject.toString);
+
+			augmentedObject.toString = '456';
+			expect(augmentedObject.toString).toBe('456');
+
+			delete augmentedObject.toString;
+			expect(augmentedObject.toString).toBeUndefined();
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
index d85ec4a257..bec75c3f6a 100644
--- a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
@@ -2,8 +2,9 @@
  * @jest-environment jsdom
  */
 
+import { arrayExtensions } from '@/Extensions/ArrayExtensions';
+
 import { evaluate } from './Helpers';
-import { arrayExtensions } from '../../src/Extensions/ArrayExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Array Data Transformation Functions', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
index 842158a5b3..8aeb57fb20 100644
--- a/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/BooleanExtensions.test.ts
@@ -2,8 +2,9 @@
  * @jest-environment jsdom
  */
 
+import { booleanExtensions } from '@/Extensions/BooleanExtensions';
+
 import { evaluate } from './Helpers';
-import { booleanExtensions } from '../../src/Extensions/BooleanExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Boolean Data Transformation Functions', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
index 09a5761d65..3ac22f96ec 100644
--- a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
@@ -4,10 +4,10 @@
 
 import { DateTime } from 'luxon';
 
+import { dateExtensions } from '@/Extensions/DateExtensions';
 import { getGlobalState } from '@/GlobalState';
 
 import { evaluate, getLocalISOString } from './Helpers';
-import { dateExtensions } from '../../src/Extensions/DateExtensions';
 
 const { defaultTimezone } = getGlobalState();
 
@@ -20,41 +20,43 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 23).isWeekend() }}')).toBe(false);
 		});
 
-		test('.beginningOf("week") should work correctly on a date', () => {
-			expect(evaluate('={{ DateTime.local(2023, 1, 20).beginningOf("week") }}')).toEqual(
-				DateTime.local(2023, 1, 16, { zone: defaultTimezone }),
-			);
+		describe('.beginningOf', () => {
+			test('.beginningOf("week") should work correctly on a date', () => {
+				expect(evaluate('={{ DateTime.local(2023, 1, 20).beginningOf("week") }}')).toEqual(
+					DateTime.local(2023, 1, 16, { zone: defaultTimezone }),
+				);
 
-			expect(evaluate('={{ new Date(2023, 0, 20).beginningOf("week") }}')).toEqual(
-				DateTime.local(2023, 1, 16, { zone: defaultTimezone }).toJSDate(),
-			);
-		});
+				expect(evaluate('={{ new Date(2023, 0, 20).beginningOf("week") }}')).toEqual(
+					DateTime.local(2023, 1, 16, { zone: defaultTimezone }).toJSDate(),
+				);
+			});
 
-		test('.beginningOf("week") should work correctly on a string', () => {
-			const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("week") }}');
-			const expectedDate = DateTime.local(2023, 1, 23, { zone: defaultTimezone }).toJSDate();
+			test('.beginningOf("week") should work correctly on a string', () => {
+				const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("week") }}');
+				const expectedDate = DateTime.local(2023, 1, 23, { zone: defaultTimezone }).toJSDate();
 
-			if (evaluatedDate && evaluatedDate instanceof Date) {
-				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
-			}
-		});
+				if (evaluatedDate && evaluatedDate instanceof Date) {
+					expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+				}
+			});
 
-		test('.beginningOf("month") should work correctly on a string', () => {
-			const evaluatedDate = evaluate('={{ "2023-06-16".toDate().beginningOf("month") }}');
-			const expectedDate = DateTime.local(2023, 6, 1, { zone: defaultTimezone }).toJSDate();
+			test('.beginningOf("month") should work correctly on a string', () => {
+				const evaluatedDate = evaluate('={{ "2023-06-16".toDate().beginningOf("month") }}');
+				const expectedDate = DateTime.local(2023, 6, 1, { zone: defaultTimezone }).toJSDate();
 
-			if (evaluatedDate && evaluatedDate instanceof Date) {
-				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
-			}
-		});
+				if (evaluatedDate && evaluatedDate instanceof Date) {
+					expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+				}
+			});
 
-		test('.beginningOf("year") should work correctly on a string', () => {
-			const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("year") }}');
-			const expectedDate = DateTime.local(2023, 1, 1, { zone: defaultTimezone }).toJSDate();
+			test('.beginningOf("year") should work correctly on a string', () => {
+				const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("year") }}');
+				const expectedDate = DateTime.local(2023, 1, 1, { zone: defaultTimezone }).toJSDate();
 
-			if (evaluatedDate && evaluatedDate instanceof Date) {
-				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
-			}
+				if (evaluatedDate && evaluatedDate instanceof Date) {
+					expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+				}
+			});
 		});
 
 		test('.endOfMonth() should work correctly on a date', () => {
@@ -66,18 +68,75 @@ describe('Data Transformation Functions', () => {
 			);
 		});
 
-		test('.extract("day") should work correctly on a date', () => {
-			expect(evaluate('={{ DateTime.local(2023, 1, 20).extract("day") }}')).toEqual(20);
+		describe('.extract', () => {
+			test('.extract("day") should work correctly on a date', () => {
+				expect(evaluate('={{ DateTime.local(2023, 1, 20).extract("day") }}')).toEqual(20);
+			});
+
+			test('should extract year from a date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49").extract("year") }}')).toEqual(2024);
+			});
+
+			test('should extract yearDayNumber from a date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49").extract("yearDayNumber") }}')).toEqual(
+					90,
+				);
+			});
+
+			test('should extract month from a date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49").extract("month") }}')).toEqual(3);
+			});
+
+			test('should extract week from a date', () => {
+				expect(evaluate('={{ DateTime.local(2023, 1, 20).extract() }}')).toEqual(3);
+				expect(evaluate('={{ DateTime.local(2023, 1, 20).extract("week") }}')).toEqual(3);
+			});
+
+			test('should extract day from a date', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("day") }}')).toEqual(30);
+			});
+
+			test('should extract hour from a date', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("hour") }}')).toEqual(18);
+			});
+
+			test('should extract minute from a date', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("minute") }}')).toEqual(
+					49,
+				);
+			});
+
+			test('should extract second from a date', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("second") }}')).toEqual(
+					0,
+				);
+			});
+
+			test('should extract millisecond from a date', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49:00.123Z").extract("millisecond") }}'),
+				).toEqual(123);
+			});
+
+			test('should return undefined for invalid unit', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-03-30T18:49").extract("invalid") }}')).toBe(
+					null,
+				);
+			});
 		});
 
-		test('.extract() should extract week for no args', () => {
-			expect(evaluate('={{ DateTime.local(2023, 1, 20).extract() }}')).toEqual(3);
-		});
+		describe('.format', () => {
+			test('should format date with custom format', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49").format("yyyy LLL dd") }}'),
+				).toEqual('2024 Mar 30');
+			});
 
-		test('.format("yyyy LLL dd") should work correctly on a date', () => {
-			expect(evaluate('={{ DateTime.local(2023, 1, 16).format("yyyy LLL dd") }}')).toEqual(
-				'2023 Jan 16',
-			);
+			test('should format date with ISO format', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49").format("yyyy-MM-dd\'T\'HH:mm:ss") }}'),
+				).toEqual('2024-03-30T18:49:00');
+			});
 		});
 
 		test('.toDate() should work on a string', () => {
@@ -85,49 +144,103 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate(`={{ "${getLocalISOString(date)}".toDate() }}`)).toEqual(date);
 		});
 
-		test('.inBetween() should work on string and Date', () => {
-			expect(evaluate("={{ $now.isBetween('2023-06-23'.toDate(), '2023-06-23') }}")).toBeDefined();
+		describe('.inBetween', () => {
+			test('should work on string and Date', () => {
+				expect(
+					evaluate("={{ $now.isBetween('2023-06-23'.toDate(), '2023-06-23') }}"),
+				).toBeDefined();
+			});
+
+			test('should work on string and DateTime', () => {
+				expect(evaluate("={{ $now.isBetween($now, '2023-06-23') }}")).toBeDefined();
+			});
+
+			test('should not work for invalid strings', () => {
+				expect(evaluate("={{ $now.isBetween($now, 'invalid') }}")).toBeUndefined();
+			});
+
+			test('should not work for numbers', () => {
+				expect(evaluate('={{ $now.isBetween($now, 1) }}')).toBeUndefined();
+			});
+
+			test('should not work for a single argument', () => {
+				expect(() => evaluate('={{ $now.isBetween($now) }}')).toThrow();
+			});
+
+			test('should not work for a more than two arguments', () => {
+				expect(() =>
+					evaluate("={{ $now.isBetween($now, '2023-06-23', '2023-09-21'.toDate()) }}"),
+				).toThrow();
+			});
 		});
 
-		test('.inBetween() should work on string and DateTime', () => {
-			expect(evaluate("={{ $now.isBetween($now, '2023-06-23') }}")).toBeDefined();
+		describe('.diffTo', () => {
+			test('should work with a single unit', () => {
+				expect(
+					evaluate(
+						"={{ '2025-01-01'.toDateTime().diffTo('2024-03-30T18:49:07.234', 'days').floor() }}",
+					),
+				).toEqual(276);
+			});
+
+			test('should work with an array of units', () => {
+				expect(
+					evaluate(
+						"={{ '2025-01-01T00:00:00.000'.toDateTime().diffTo('2024-03-30T18:49:07.234', ['months', 'days']) }}",
+					),
+				).toEqual({ months: 9, days: 1.2158884953703704 });
+			});
+
+			test('should return difference in days', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-25T18:49:00Z", "days") }}',
+					),
+				).toEqual(5);
+			});
+
+			test('should return difference in hours', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-30T12:49:00Z", "hours") }}',
+					),
+				).toEqual(6);
+			});
+
+			test('should return difference in minutes', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-30T18:44:00Z", "minutes") }}',
+					),
+				).toEqual(5);
+			});
+
+			test('should return difference in seconds', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-30T18:48:55Z", "seconds") }}',
+					),
+				).toEqual(5);
+			});
+
+			test('should return difference in milliseconds', () => {
+				expect(
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00.500Z").diffTo("2024-03-30T18:49:00.000Z", "milliseconds") }}',
+					),
+				).toEqual(500);
+			});
+
+			test('should throw for invalid unit', () => {
+				expect(() =>
+					evaluate(
+						'={{ DateTime.fromISO("2024-03-30T18:49:00Z").diffTo("2024-03-30T18:49:00Z", "invalid") }}',
+					),
+				).toThrow('Unsupported unit');
+			});
 		});
 
-		test('.inBetween() should not work for invalid strings', () => {
-			expect(evaluate("={{ $now.isBetween($now, 'invalid') }}")).toBeUndefined();
-		});
-
-		test('.inBetween() should not work for numbers', () => {
-			expect(evaluate('={{ $now.isBetween($now, 1) }}')).toBeUndefined();
-		});
-
-		test('.inBetween() should not work for a single argument', () => {
-			expect(() => evaluate('={{ $now.isBetween($now) }}')).toThrow();
-		});
-
-		test('.inBetween() should not work for a more than two arguments', () => {
-			expect(() =>
-				evaluate("={{ $now.isBetween($now, '2023-06-23', '2023-09-21'.toDate()) }}"),
-			).toThrow();
-		});
-
-		test('.diffTo() should work with a single unit', () => {
-			expect(
-				evaluate(
-					"={{ '2025-01-01'.toDateTime().diffTo('2024-03-30T18:49:07.234', 'days').floor() }}",
-				),
-			).toEqual(276);
-		});
-
-		test('.diffTo() should work with an array of units', () => {
-			expect(
-				evaluate(
-					"={{ '2025-01-01T00:00:00.000'.toDateTime().diffTo('2024-03-30T18:49:07.234', ['months', 'days']) }}",
-				),
-			).toEqual({ months: 9, days: 1.2158884953703704 });
-		});
-
-		describe('toDateTime', () => {
+		describe('.toDateTime', () => {
 			test('should return itself for DateTime', () => {
 				const result = evaluate(
 					"={{ DateTime.fromFormat('01-01-2024', 'dd-MM-yyyy').toDateTime() }}",
@@ -149,7 +262,7 @@ describe('Data Transformation Functions', () => {
 			});
 		});
 
-		describe('toInt/toFloat', () => {
+		describe('.toInt/.toFloat', () => {
 			test('should return milliseconds for DateTime', () => {
 				expect(evaluate("={{ DateTime.fromISO('2024-01-01T00:00:00.000Z').toInt() }}")).toEqual(
 					1704067200000,
@@ -168,7 +281,7 @@ describe('Data Transformation Functions', () => {
 			});
 		});
 
-		describe('toBoolean', () => {
+		describe('.toBoolean', () => {
 			test('should return undefined', () => {
 				expect(evaluate('={{ new Date("2024-01-01T00:00:00.000Z").toBoolean() }}')).toBeUndefined();
 			});
@@ -177,5 +290,93 @@ describe('Data Transformation Functions', () => {
 				expect(dateExtensions.functions.toBoolean.doc).toBeUndefined();
 			});
 		});
+
+		describe('.isInLast', () => {
+			it('should return true if the date is within the last n minutes', () => {
+				expect(
+					evaluate(
+						`={{ new Date("${DateTime.now().minus({ minutes: 5 }).toISO()}").isInLast(10, "minutes") }}`,
+					),
+				).toBe(true);
+			});
+
+			it('should return false if the date is not within the last n minutes', () => {
+				expect(
+					evaluate(
+						`={{ new Date("${DateTime.now().minus({ minutes: 15 }).toISO()}").isInLast(10, "minutes") }}`,
+					),
+				).toBe(false);
+			});
+
+			it('should handle default unit as minutes', () => {
+				expect(
+					evaluate(
+						`={{ new Date("${DateTime.now().minus({ minutes: 5 }).toISO()}").isInLast(10) }}`,
+					),
+				).toBe(true);
+			});
+		});
+
+		describe('.minus', () => {
+			it('should subtract days from the date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").minus(7, "days") }}')).toEqual(
+					new Date('2024-03-23T18:49:00.000Z'),
+				);
+			});
+
+			it('should subtract years from the date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").minus(4, "years") }}')).toEqual(
+					new Date('2020-03-30T18:49:00.000Z'),
+				);
+			});
+
+			it('should handle default unit as milliseconds', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").minus(1000) }}')).toEqual(
+					new Date('2024-03-30T18:48:59.000Z'),
+				);
+			});
+
+			it('should handle DateTime instances', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49:00Z").minus(1, "day").toJSDate() }}'),
+				).toEqual(new Date('2024-03-29T18:49:00.000Z'));
+			});
+		});
+
+		describe('.plus', () => {
+			it('should subtract days from the date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").plus(7, "days") }}')).toEqual(
+					new Date('2024-04-06T18:49:00.000Z'),
+				);
+			});
+
+			it('should subtract years from the date', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").plus(4, "years") }}')).toEqual(
+					new Date('2028-03-30T18:49:00.000Z'),
+				);
+			});
+
+			it('should handle default unit as milliseconds', () => {
+				expect(evaluate('={{ new Date("2024-03-30T18:49:00Z").plus(1000) }}')).toEqual(
+					new Date('2024-03-30T18:49:01.000Z'),
+				);
+			});
+
+			it('should handle DateTime instances', () => {
+				expect(
+					evaluate('={{ DateTime.fromISO("2024-03-30T18:49:00Z").plus(1, "day").toJSDate() }}'),
+				).toEqual(new Date('2024-03-31T18:49:00.000Z'));
+			});
+		});
+
+		describe('.isDst', () => {
+			test('should return true for a date in DST', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-06-30T18:49:00Z").isDst() }}')).toBe(true);
+			});
+
+			test('should return false for a date not in DST', () => {
+				expect(evaluate('={{ DateTime.fromISO("2024-01-30T18:49:00Z").isDst() }}')).toBe(false);
+			});
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index e08f4f05c4..fc107484cb 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -4,11 +4,11 @@
 
 /* eslint-disable n8n-local-rules/no-interpolation-in-regular-string */
 
+import { ExpressionExtensionError } from '@/errors/expression-extension.error';
 import { extendTransform, extend } from '@/Extensions';
 import { joinExpression, splitExpression } from '@/Extensions/ExpressionParser';
 
 import { evaluate } from './Helpers';
-import { ExpressionExtensionError } from '../../src/errors/expression-extension.error';
 
 describe('Expression Extension Transforms', () => {
 	describe('extend() transform', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
index 1107ceae54..120e5aa9d7 100644
--- a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
@@ -1,16 +1,31 @@
+import { objectExtensions } from '@/Extensions/ObjectExtensions';
+
 import { evaluate } from './Helpers';
-import { objectExtensions } from '../../src/Extensions/ObjectExtensions';
 
 describe('Data Transformation Functions', () => {
 	describe('Object Data Transformation Functions', () => {
-		test('.isEmpty() should work correctly on an object', () => {
-			expect(evaluate('={{({}).isEmpty()}}')).toEqual(true);
-			expect(evaluate('={{({ test1: 1 }).isEmpty()}}')).toEqual(false);
+		describe('.isEmpty', () => {
+			test('should return true for an empty object', () => {
+				expect(evaluate('={{ ({}).isEmpty() }}')).toBe(true);
+			});
+
+			test('should return false for a non-empty object', () => {
+				expect(evaluate('={{ ({ test: 1 }).isEmpty() }}')).toBe(false);
+			});
+
+			test('should return true for an object with only null/undefined values', () => {
+				expect(evaluate('={{ ({ test1: null, test2: undefined }).isEmpty() }}')).toBe(false);
+			});
 		});
 
-		test('.hasField should work on an object', () => {
-			expect(evaluate('={{ ({ test1: 1 }).hasField("test1") }}')).toEqual(true);
-			expect(evaluate('={{ ({ test1: 1 }).hasField("test2") }}')).toEqual(false);
+		describe('.hasField', () => {
+			test('should return true if the key exists in the object', () => {
+				expect(evaluate('={{ ({ test1: 1 }).hasField("test1") }}')).toBe(true);
+			});
+
+			test('should return false if the key does not exist in the object', () => {
+				expect(evaluate('={{ ({ test1: 1 }).hasField("test2") }}')).toBe(false);
+			});
 		});
 
 		test('.removeField should work on an object', () => {
@@ -27,68 +42,119 @@ describe('Data Transformation Functions', () => {
 			});
 		});
 
-		test('.removeFieldsContaining should work on an object', () => {
-			expect(
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("removed") }}',
-				),
-			).toEqual({
-				test1: 'i exist',
+		describe('.removeFieldsContaining', () => {
+			test('should work on an object', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("removed") }}',
+					),
+				).toEqual({
+					test1: 'i exist',
+				});
+			});
+
+			test('should not work for empty string', () => {
+				expect(() =>
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("") }}',
+					),
+				).toThrow();
 			});
 		});
 
-		test('.removeFieldsContaining should not work for empty string', () => {
-			expect(() =>
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("") }}',
-				),
-			).toThrow();
-		});
+		describe('.keepFieldsContaining', () => {
+			test('.keepFieldsContaining should work on an object', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("exist") }}',
+					),
+				).toEqual({
+					test1: 'i exist',
+				});
+			});
 
-		test('.keepFieldsContaining should work on an object', () => {
-			expect(
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("exist") }}',
-				),
-			).toEqual({
-				test1: 'i exist',
+			test('.keepFieldsContaining should work on a nested object', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: { test4: "me too" } }).keepFieldsContaining("exist") }}',
+					),
+				).toEqual({
+					test1: 'i exist',
+				});
+			});
+
+			test('.keepFieldsContaining should not work for empty string', () => {
+				expect(() =>
+					evaluate(
+						'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("") }}',
+					),
+				).toThrow();
 			});
 		});
 
-		test('.keepFieldsContaining should work on a nested object', () => {
-			expect(
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: { test4: "me too" } }).keepFieldsContaining("exist") }}',
-				),
-			).toEqual({
-				test1: 'i exist',
+		describe('.compact', () => {
+			test('should work on an object', () => {
+				expect(
+					evaluate('={{ ({ test1: 1, test2: "2", test3: undefined, test4: null }).compact() }}'),
+				).toEqual({ test1: 1, test2: '2' });
 			});
-		});
 
-		test('.keepFieldsContaining should not work for empty string', () => {
-			expect(() =>
-				evaluate(
-					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("") }}',
-				),
-			).toThrow();
-		});
+			test('should remove fields with null, undefined, empty string, or "nil"', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: 0, test2: false, test3: "", test4: "nil", test5: NaN }).compact() }}',
+					),
+				).toEqual({ test1: 0, test2: false, test5: NaN });
+			});
 
-		test('.compact should work on an object', () => {
-			expect(
-				evaluate('={{ ({ test1: 1, test2: "2", test3: undefined, test4: null }).compact() }}'),
-			).toEqual({ test1: 1, test2: '2' });
+			test('should work on an empty object', () => {
+				expect(evaluate('={{ ({}).compact() }}')).toEqual({});
+			});
+
+			test('should work on an object with all null/undefined values', () => {
+				expect(evaluate('={{ ({ test1: undefined, test2: null }).compact() }}')).toEqual({});
+			});
+
+			test('should work on an object with nested null/undefined values', () => {
+				expect(
+					evaluate(
+						'={{ ({ test1: 1, test2: { nested1: null, nested2: "value" }, test3: undefined }).compact() }}',
+					),
+				).toEqual({ test1: 1, test2: { nested2: 'value' } });
+			});
+
+			test('should not allow prototype pollution', () => {
+				['{__proto__: {polluted: true}}', '{constructor: {prototype: {polluted: true}}}'].forEach(
+					(testExpression) => {
+						expect(evaluate(`={{ (${testExpression}).compact() }}`)).toEqual(null);
+						expect(({} as any).polluted).toBeUndefined();
+					},
+				);
+			});
 		});
 
 		test('.urlEncode should work on an object', () => {
 			expect(evaluate('={{ ({ test1: 1, test2: "2" }).urlEncode() }}')).toEqual('test1=1&test2=2');
 		});
 
-		test('.keys should work on an object', () => {
-			expect(evaluate('={{ ({ test1: 1, test2: "2" }).keys() }}')).toEqual(['test1', 'test2']);
+		describe('.keys', () => {
+			test('should return an array of keys from the object', () => {
+				expect(evaluate('={{ ({ test1: 1, test2: 2 }).keys() }}')).toEqual(['test1', 'test2']);
+			});
+
+			test('should return an empty array for an empty object', () => {
+				expect(evaluate('={{ ({}).keys() }}')).toEqual([]);
+			});
 		});
 
-		test('.values should work on an object', () => {
-			expect(evaluate('={{ ({ test1: 1, test2: "2" }).values() }}')).toEqual([1, '2']);
+		describe('.values', () => {
+			test('should return an array of values from the object', () => {
+				expect(evaluate('={{ ({ test1: 1, test2: "value" }).values() }}')).toEqual([1, 'value']);
+			});
+
+			test('should return an empty array for an empty object', () => {
+				expect(evaluate('={{ ({}).values() }}')).toEqual([]);
+			});
 		});
 
 		test('.toJsonString() should work on an object', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
index 35b2318868..8986e5ad0e 100644
--- a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
@@ -3,21 +3,39 @@
  */
 import { DateTime } from 'luxon';
 
+import { ExpressionExtensionError } from '@/errors';
+
 import { evaluate } from './Helpers';
-import { ExpressionExtensionError } from '../../src/errors';
 
 describe('Data Transformation Functions', () => {
 	describe('String Data Transformation Functions', () => {
-		test('.isEmpty() should work correctly on a string that is not empty', () => {
-			expect(evaluate('={{"NotBlank".isEmpty()}}')).toEqual(false);
+		describe('.isEmpty', () => {
+			test('should work correctly on a string that is not empty', () => {
+				expect(evaluate('={{"NotBlank".isEmpty()}}')).toEqual(false);
+			});
+
+			test('should work correctly on a string that is empty', () => {
+				expect(evaluate('={{"".isEmpty()}}')).toEqual(true);
+			});
 		});
 
-		test('.isEmpty() should work correctly on a string that is empty', () => {
-			expect(evaluate('={{"".isEmpty()}}')).toEqual(true);
+		describe('.isNotEmpty', () => {
+			test('should work correctly on a string that is not empty', () => {
+				expect(evaluate('={{"NotBlank".isNotEmpty()}}')).toEqual(true);
+			});
+
+			test('should work correctly on a string that is empty', () => {
+				expect(evaluate('={{"".isNotEmpty()}}')).toEqual(false);
+			});
+		});
+
+		test('.length should return the string length', () => {
+			expect(evaluate('={{"String".length()}}')).toEqual(6);
 		});
 
 		describe('.hash()', () => {
 			test.each([
+				['base64', 'MTIzNDU='],
 				['md5', '827ccb0eea8a706c4c34a16891f84e7b'],
 				['sha1', '8cb2237d0679ca88db6464eac60da96345513964'],
 				['sha224', 'a7470858e79c282bc2f6adfd831b132672dfd1224c1e78cbf5bcd057'],
@@ -38,6 +56,10 @@ describe('Data Transformation Functions', () => {
 				expect(evaluate(`={{ "12345".hash("${hashFn}") }}`)).toEqual(hashValue);
 				expect(evaluate(`={{ "12345".hash("${hashFn.toLowerCase()}") }}`)).toEqual(hashValue);
 			});
+
+			test('should throw on invalid algorithm', () => {
+				expect(() => evaluate('={{ "12345".hash("invalid") }}')).toThrow('Unknown algorithm');
+			});
 		});
 
 		test('.urlDecode should work correctly on a string', () => {
@@ -64,10 +86,18 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ "TEST".toLowerCase() }}')).toEqual('test');
 		});
 
-		test('.toDate should work correctly on a date string', () => {
-			expect(evaluate('={{ "2022-09-01T19:42:28.164Z".toDate() }}')).toEqual(
-				new Date('2022-09-01T19:42:28.164Z'),
-			);
+		describe('.toDate', () => {
+			test('should work correctly on a date string', () => {
+				expect(evaluate('={{ "2022-09-01T19:42:28.164Z".toDate() }}')).toEqual(
+					new Date('2022-09-01T19:42:28.164Z'),
+				);
+			});
+
+			test('should throw on invalid date', () => {
+				expect(() => evaluate('={{ "2022-09-32T19:42:28.164Z".toDate() }}')).toThrow(
+					'cannot convert to date',
+				);
+			});
 		});
 
 		test('.toFloat should work correctly on a string', () => {
diff --git a/packages/workflow/test/Helpers.ts b/packages/workflow/test/Helpers.ts
index f72c041c69..c8b1c200e3 100644
--- a/packages/workflow/test/Helpers.ts
+++ b/packages/workflow/test/Helpers.ts
@@ -1,70 +1,16 @@
 import { readFileSync } from 'fs';
-import { mock } from 'jest-mock-extended';
-import get from 'lodash/get';
 import path from 'path';
 
-import type {
-	IExecuteSingleFunctions,
-	IHttpRequestOptions,
-	IN8nHttpFullResponse,
-	IN8nHttpResponse,
-	INode,
-	INodeTypes,
-	IRunExecutionData,
-} from '@/Interfaces';
-import type { Workflow } from '@/Workflow';
+import type { INodeTypes } from '@/Interfaces';
 
 import { NodeTypes as NodeTypesClass } from './NodeTypes';
 
-export function getExecuteSingleFunctions(
-	workflow: Workflow,
-	runExecutionData: IRunExecutionData,
-	runIndex: number,
-	node: INode,
-	itemIndex: number,
-): IExecuteSingleFunctions {
-	return mock<IExecuteSingleFunctions>({
-		getItemIndex: () => itemIndex,
-		getNodeParameter: (parameterName: string) => {
-			return workflow.expression.getParameterValue(
-				get(node.parameters, parameterName),
-				runExecutionData,
-				runIndex,
-				itemIndex,
-				node.name,
-				[],
-				'internal',
-				{},
-			);
-		},
-		getWorkflow: () => ({
-			id: workflow.id,
-			name: workflow.name,
-			active: workflow.active,
-		}),
-		helpers: mock<IExecuteSingleFunctions['helpers']>({
-			async httpRequest(
-				requestOptions: IHttpRequestOptions,
-			): Promise<IN8nHttpFullResponse | IN8nHttpResponse> {
-				return {
-					body: {
-						headers: {},
-						statusCode: 200,
-						requestOptions,
-					},
-				};
-			},
-		}),
-	});
-}
-
 let nodeTypesInstance: NodeTypesClass | undefined;
 
 export function NodeTypes(): INodeTypes {
 	if (nodeTypesInstance === undefined) {
 		nodeTypesInstance = new NodeTypesClass();
 	}
-
 	return nodeTypesInstance;
 }
 
diff --git a/packages/workflow/test/NodeErrors.test.ts b/packages/workflow/test/NodeErrors.test.ts
index 04aafb1610..e7e4def835 100644
--- a/packages/workflow/test/NodeErrors.test.ts
+++ b/packages/workflow/test/NodeErrors.test.ts
@@ -1,9 +1,8 @@
+import { UNKNOWN_ERROR_DESCRIPTION, UNKNOWN_ERROR_MESSAGE } from '@/Constants';
 import { NodeOperationError } from '@/errors';
 import { NodeApiError } from '@/errors/node-api.error';
 import type { INode, JsonObject } from '@/Interfaces';
 
-import { UNKNOWN_ERROR_DESCRIPTION, UNKNOWN_ERROR_MESSAGE } from '../src/Constants';
-
 const node: INode = {
 	id: '1',
 	name: 'Postgres node',
diff --git a/packages/workflow/test/NodeHelpers.test.ts b/packages/workflow/test/NodeHelpers.test.ts
index 81b7af5de6..964dedc6a9 100644
--- a/packages/workflow/test/NodeHelpers.test.ts
+++ b/packages/workflow/test/NodeHelpers.test.ts
@@ -1,5 +1,6 @@
 import {
 	NodeConnectionType,
+	type INodeIssues,
 	type INode,
 	type INodeParameters,
 	type INodeProperties,
@@ -9,10 +10,9 @@ import {
 import {
 	getNodeParameters,
 	getNodeHints,
-	isSingleExecution,
 	isSubNodeType,
 	applyDeclarativeNodeOptionParameters,
-	convertNodeToAiTool,
+	getParameterIssues,
 } from '@/NodeHelpers';
 import type { Workflow } from '@/Workflow';
 
@@ -3542,34 +3542,6 @@ describe('NodeHelpers', () => {
 		});
 	});
 
-	describe('isSingleExecution', () => {
-		test('should determine based on node parameters if it would be executed once', () => {
-			expect(isSingleExecution('n8n-nodes-base.code', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.code', { mode: 'runOnceForEachItem' })).toEqual(
-				false,
-			);
-			expect(isSingleExecution('n8n-nodes-base.executeWorkflow', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.executeWorkflow', { mode: 'each' })).toEqual(false);
-			expect(isSingleExecution('n8n-nodes-base.crateDb', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.crateDb', { operation: 'update' })).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.timescaleDb', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.timescaleDb', { operation: 'update' })).toEqual(
-				true,
-			);
-			expect(isSingleExecution('n8n-nodes-base.microsoftSql', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.microsoftSql', { operation: 'update' })).toEqual(
-				true,
-			);
-			expect(isSingleExecution('n8n-nodes-base.microsoftSql', { operation: 'delete' })).toEqual(
-				true,
-			);
-			expect(isSingleExecution('n8n-nodes-base.questDb', {})).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.mongoDb', { operation: 'insert' })).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.mongoDb', { operation: 'update' })).toEqual(true);
-			expect(isSingleExecution('n8n-nodes-base.redis', {})).toEqual(true);
-		});
-	});
-
 	describe('isSubNodeType', () => {
 		const tests: Array<[boolean, Pick<INodeTypeDescription, 'outputs'> | null]> = [
 			[false, null],
@@ -3638,169 +3610,642 @@ describe('NodeHelpers', () => {
 		});
 	});
 
-	describe('convertNodeToAiTool', () => {
-		let fullNodeWrapper: { description: INodeTypeDescription };
-
-		beforeEach(() => {
-			fullNodeWrapper = {
-				description: {
-					displayName: 'Test Node',
-					name: 'testNode',
-					group: ['test'],
-					description: 'A test node',
-					version: 1,
-					defaults: {},
-					inputs: [NodeConnectionType.Main],
-					outputs: [NodeConnectionType.Main],
-					properties: [],
-				},
+	describe('getParameterIssues', () => {
+		const tests: Array<{
+			description: string;
+			input: {
+				nodeProperties: INodeProperties;
+				nodeValues: INodeParameters;
+				path: string;
+				node: INode;
 			};
-		});
+			output: INodeIssues;
+		}> = [
+			{
+				description:
+					'Fixed collection::Should not return issues if minimum or maximum field count is not set',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'workflowInputs',
+						workflowInputs: {},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
+				},
+				output: {},
+			},
+			{
+				description:
+					'Fixed collection::Should not return issues if field count is within the specified range',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+							minRequiredFields: 1,
+							maxAllowedFields: 3,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'workflowInputs',
+						workflowInputs: {
+							values: [
+								{
+									name: 'field1',
+									type: 'string',
+								},
+								{
+									name: 'field2',
+									type: 'string',
+								},
+							],
+						},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
+				},
+				output: {},
+			},
+			{
+				description:
+					'Fixed collection::Should return an issue if field count is lower than minimum specified',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+							minRequiredFields: 1,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'workflowInputs',
+						workflowInputs: {},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
+				},
+				output: {
+					parameters: {
+						workflowInputs: ['At least 1 field is required.'],
+					},
+				},
+			},
+			{
+				description:
+					'Fixed collection::Should return an issue if field count is higher than maximum specified',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+							maxAllowedFields: 1,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'workflowInputs',
+						workflowInputs: {
+							values: [
+								{
+									name: 'field1',
+									type: 'string',
+								},
+								{
+									name: 'field2',
+									type: 'string',
+								},
+							],
+						},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
+				},
+				output: {
+					parameters: {
+						workflowInputs: ['At most 1 field is allowed.'],
+					},
+				},
+			},
+			{
+				description: 'Fixed collection::Should not return issues if the collection is hidden',
+				input: {
+					nodeProperties: {
+						displayName: 'Workflow Inputs',
+						name: 'workflowInputs',
+						placeholder: 'Add Field',
+						type: 'fixedCollection',
+						description:
+							'Define expected input fields. If no inputs are provided, all data from the calling workflow will be passed through.',
+						typeOptions: {
+							multipleValues: true,
+							sortable: true,
+							maxAllowedFields: 1,
+						},
+						displayOptions: {
+							show: {
+								'@version': [
+									{
+										_cnd: {
+											gte: 1.1,
+										},
+									},
+								],
+								inputSource: ['workflowInputs'],
+							},
+						},
+						default: {},
+						options: [
+							{
+								name: 'values',
+								displayName: 'Values',
+								values: [
+									{
+										displayName: 'Name',
+										name: 'name',
+										type: 'string',
+										default: '',
+										placeholder: 'e.g. fieldName',
+										description: 'Name of the field',
+										noDataExpression: true,
+									},
+									{
+										displayName: 'Type',
+										name: 'type',
+										type: 'options',
+										description: 'The field value type',
+										options: [
+											{
+												name: 'Allow Any Type',
+												value: 'any',
+											},
+											{
+												name: 'String',
+												value: 'string',
+											},
+											{
+												name: 'Number',
+												value: 'number',
+											},
+											{
+												name: 'Boolean',
+												value: 'boolean',
+											},
+											{
+												name: 'Array',
+												value: 'array',
+											},
+											{
+												name: 'Object',
+												value: 'object',
+											},
+										],
+										default: 'string',
+										noDataExpression: true,
+									},
+								],
+							},
+						],
+					},
+					nodeValues: {
+						events: 'worklfow_call',
+						inputSource: 'somethingElse',
+						workflowInputs: {
+							values: [
+								{
+									name: 'field1',
+									type: 'string',
+								},
+								{
+									name: 'field2',
+									type: 'string',
+								},
+							],
+						},
+						inputOptions: {},
+					},
+					path: '',
+					node: {
+						parameters: {
+							events: 'worklfow_call',
+							inputSource: 'workflowInputs',
+							workflowInputs: {},
+							inputOptions: {},
+						},
+						type: 'n8n-nodes-base.executeWorkflowTrigger',
+						typeVersion: 1.1,
+						position: [-140, -20],
+						id: '9abdbdac-5f32-4876-b4d5-895d8ca4cb00',
+						name: 'Test Node',
+					} as INode,
+				},
+				output: {},
+			},
+		];
 
-		it('should modify the name and displayName correctly', () => {
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.name).toBe('testNodeTool');
-			expect(result.description.displayName).toBe('Test Node Tool');
-		});
+		for (const testData of tests) {
+			test(testData.description, () => {
+				const result = getParameterIssues(
+					testData.input.nodeProperties,
+					testData.input.nodeValues,
+					testData.input.path,
+					testData.input.node,
+				);
+				expect(result).toEqual(testData.output);
+			});
+		}
+	});
 
-		it('should update inputs and outputs', () => {
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.inputs).toEqual([]);
-			expect(result.description.outputs).toEqual([NodeConnectionType.AiTool]);
-		});
+	describe('getParameterIssues, required parameters validation', () => {
+		const testNode: INode = {
+			id: '12345',
+			name: 'Test Node',
+			typeVersion: 1,
+			type: 'n8n-nodes-base.testNode',
+			position: [1, 1],
+			parameters: {},
+		};
 
-		it('should remove the usableAsTool property', () => {
-			fullNodeWrapper.description.usableAsTool = true;
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.usableAsTool).toBeUndefined();
-		});
+		it('Should validate required dateTime parameters if empty string', () => {
+			const nodeProperties: INodeProperties = {
+				displayName: 'Date Time',
+				name: 'testDateTime',
+				type: 'dateTime',
+				default: '',
+				required: true,
+			};
+			const nodeValues: INodeParameters = {
+				testDateTime: '',
+			};
 
-		it("should add toolDescription property if it doesn't exist", () => {
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			const toolDescriptionProp = result.description.properties.find(
-				(prop) => prop.name === 'toolDescription',
-			);
-			expect(toolDescriptionProp).toBeDefined();
-			expect(toolDescriptionProp?.type).toBe('string');
-			expect(toolDescriptionProp?.default).toBe(fullNodeWrapper.description.description);
-		});
+			const result = getParameterIssues(nodeProperties, nodeValues, '', testNode);
 
-		it('should set codex categories correctly', () => {
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.codex).toEqual({
-				categories: ['AI'],
-				subcategories: {
-					AI: ['Tools'],
-					Tools: ['Other Tools'],
+			expect(result).toEqual({
+				parameters: {
+					testDateTime: ['Parameter "Date Time" is required.'],
 				},
 			});
 		});
 
-		it('should preserve existing properties', () => {
-			const existingProp: INodeProperties = {
-				displayName: 'Existing Prop',
-				name: 'existingProp',
-				type: 'string',
-				default: 'test',
+		it('Should validate required dateTime parameters if empty undefined', () => {
+			const nodeProperties: INodeProperties = {
+				displayName: 'Date Time',
+				name: 'testDateTime',
+				type: 'dateTime',
+				default: '',
+				required: true,
+			};
+			const nodeValues: INodeParameters = {
+				testDateTime: undefined,
 			};
-			fullNodeWrapper.description.properties = [existingProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties).toHaveLength(3); // Existing prop + toolDescription + notice
-			expect(result.description.properties).toContainEqual(existingProp);
-		});
 
-		it('should handle nodes with resource property', () => {
-			const resourceProp: INodeProperties = {
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				options: [{ name: 'User', value: 'user' }],
-				default: 'user',
-			};
-			fullNodeWrapper.description.properties = [resourceProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(resourceProp);
-		});
+			const result = getParameterIssues(nodeProperties, nodeValues, '', testNode);
 
-		it('should handle nodes with operation property', () => {
-			const operationProp: INodeProperties = {
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				options: [{ name: 'Create', value: 'create' }],
-				default: 'create',
-			};
-			fullNodeWrapper.description.properties = [operationProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(operationProp);
-		});
-
-		it('should handle nodes with both resource and operation properties', () => {
-			const resourceProp: INodeProperties = {
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				options: [{ name: 'User', value: 'user' }],
-				default: 'user',
-			};
-			const operationProp: INodeProperties = {
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				options: [{ name: 'Create', value: 'create' }],
-				default: 'create',
-			};
-			fullNodeWrapper.description.properties = [resourceProp, operationProp];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties[1].name).toBe('descriptionType');
-			expect(result.description.properties[2].name).toBe('toolDescription');
-			expect(result.description.properties[3]).toEqual(resourceProp);
-			expect(result.description.properties[4]).toEqual(operationProp);
-		});
-
-		it('should handle nodes with empty properties', () => {
-			fullNodeWrapper.description.properties = [];
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.properties).toHaveLength(2);
-			expect(result.description.properties[1].name).toBe('toolDescription');
-		});
-
-		it('should handle nodes with existing codex property', () => {
-			fullNodeWrapper.description.codex = {
-				categories: ['Existing'],
-				subcategories: {
-					Existing: ['Category'],
-				},
-			};
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.codex).toEqual({
-				categories: ['AI'],
-				subcategories: {
-					AI: ['Tools'],
-					Tools: ['Other Tools'],
+			expect(result).toEqual({
+				parameters: {
+					testDateTime: ['Parameter "Date Time" is required.'],
 				},
 			});
 		});
-
-		it('should handle nodes with very long names', () => {
-			fullNodeWrapper.description.name = 'veryLongNodeNameThatExceedsNormalLimits'.repeat(10);
-			fullNodeWrapper.description.displayName =
-				'Very Long Node Name That Exceeds Normal Limits'.repeat(10);
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.name.endsWith('Tool')).toBe(true);
-			expect(result.description.displayName.endsWith('Tool')).toBe(true);
-		});
-
-		it('should handle nodes with special characters in name and displayName', () => {
-			fullNodeWrapper.description.name = 'special@#$%Node';
-			fullNodeWrapper.description.displayName = 'Special @#$% Node';
-			const result = convertNodeToAiTool(fullNodeWrapper);
-			expect(result.description.name).toBe('special@#$%NodeTool');
-			expect(result.description.displayName).toBe('Special @#$% Node Tool');
-		});
 	});
 });
diff --git a/packages/workflow/test/TelemetryHelpers.test.ts b/packages/workflow/test/TelemetryHelpers.test.ts
index bedf12f231..4cb923bb9d 100644
--- a/packages/workflow/test/TelemetryHelpers.test.ts
+++ b/packages/workflow/test/TelemetryHelpers.test.ts
@@ -2,15 +2,17 @@ import { mock } from 'jest-mock-extended';
 import { v5 as uuidv5, v3 as uuidv3, v4 as uuidv4, v1 as uuidv1 } from 'uuid';
 
 import { STICKY_NODE_TYPE } from '@/Constants';
-import { ApplicationError } from '@/errors';
-import type { IRunData } from '@/Interfaces';
+import { ApplicationError, ExpressionError, NodeApiError } from '@/errors';
+import type { IRun, IRunData } from '@/Interfaces';
 import { NodeConnectionType, type IWorkflowBase } from '@/Interfaces';
 import * as nodeHelpers from '@/NodeHelpers';
 import {
 	ANONYMIZATION_CHARACTER as CHAR,
+	extractLastExecutedNodeCredentialData,
 	generateNodesGraph,
 	getDomainBase,
 	getDomainPath,
+	userInInstanceRanOutOfFreeAiCredits,
 } from '@/TelemetryHelpers';
 import { randomInt } from '@/utils';
 
@@ -885,6 +887,271 @@ describe('generateNodesGraph', () => {
 	});
 });
 
+describe('extractLastExecutedNodeCredentialData', () => {
+	const cases: Array<[string, IRun]> = [
+		['no data', mock<IRun>({ data: {} })],
+		['no executionData', mock<IRun>({ data: { executionData: undefined } })],
+		[
+			'no nodeExecutionStack',
+			mock<IRun>({ data: { executionData: { nodeExecutionStack: undefined } } }),
+		],
+		[
+			'no node',
+			mock<IRun>({
+				data: { executionData: { nodeExecutionStack: [{ node: undefined }] } },
+			}),
+		],
+		[
+			'no credentials',
+			mock<IRun>({
+				data: { executionData: { nodeExecutionStack: [{ node: { credentials: undefined } }] } },
+			}),
+		],
+	];
+
+	test.each(cases)(
+		'should return credentialId and credentialsType with null if %s',
+		(_, runData) => {
+			expect(extractLastExecutedNodeCredentialData(runData)).toBeNull();
+		},
+	);
+
+	it('should return correct credentialId and credentialsType when last node executed has credential', () => {
+		const runData = mock<IRun>({
+			data: {
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+			},
+		});
+
+		expect(extractLastExecutedNodeCredentialData(runData)).toMatchObject(
+			expect.objectContaining({ credentialId: 'nhu-l8E4hX', credentialType: 'openAiApi' }),
+		);
+	});
+});
+
+describe('userInInstanceRanOutOfFreeAiCredits', () => {
+	it('should return false if could not find node credentials', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: {} } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new NodeApiError(
+						{
+							id: '1',
+							typeVersion: 1,
+							name: 'OpenAI',
+							type: 'n8n-nodes-base.openAi',
+							parameters: {},
+							position: [100, 200],
+						},
+						{
+							message: `400 - ${JSON.stringify({
+								error: {
+									message: 'error message',
+									type: 'free_ai_credits_request_error',
+									code: 200,
+								},
+							})}`,
+							error: {
+								message: 'error message',
+								type: 'free_ai_credits_request_error',
+								code: 200,
+							},
+						},
+						{
+							httpCode: '400',
+						},
+					),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(false);
+	});
+
+	it('should return false if could not credential type it is not openAiApi', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { jiraApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new NodeApiError(
+						{
+							id: '1',
+							typeVersion: 1,
+							name: 'OpenAI',
+							type: 'n8n-nodes-base.openAi',
+							parameters: {},
+							position: [100, 200],
+						},
+						{
+							message: `400 - ${JSON.stringify({
+								error: {
+									message: 'error message',
+									type: 'free_ai_credits_request_error',
+									code: 200,
+								},
+							})}`,
+							error: {
+								message: 'error message',
+								type: 'free_ai_credits_request_error',
+								code: 200,
+							},
+						},
+						{
+							httpCode: '400',
+						},
+					),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(false);
+	});
+
+	it('should return false if error is not NodeApiError', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new ExpressionError('error'),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(false);
+	});
+
+	it('should return false if error is not a free ai credit error', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new NodeApiError(
+						{
+							id: '1',
+							typeVersion: 1,
+							name: 'OpenAI',
+							type: 'n8n-nodes-base.openAi',
+							parameters: {},
+							position: [100, 200],
+						},
+						{
+							message: `400 - ${JSON.stringify({
+								error: {
+									message: 'error message',
+									type: 'error_type',
+									code: 200,
+								},
+							})}`,
+							error: {
+								message: 'error message',
+								type: 'error_type',
+								code: 200,
+							},
+						},
+						{
+							httpCode: '400',
+						},
+					),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(false);
+	});
+
+	it('should return true if the user has ran out of free AI credits', () => {
+		const runData = {
+			status: 'error',
+			mode: 'manual',
+			data: {
+				startData: {
+					destinationNode: 'OpenAI',
+					runNodeFilter: ['OpenAI'],
+				},
+				executionData: {
+					nodeExecutionStack: [{ node: { credentials: { openAiApi: { id: 'nhu-l8E4hX' } } } }],
+				},
+				resultData: {
+					runData: {},
+					lastNodeExecuted: 'OpenAI',
+					error: new NodeApiError(
+						{
+							id: '1',
+							typeVersion: 1,
+							name: 'OpenAI',
+							type: 'n8n-nodes-base.openAi',
+							parameters: {},
+							position: [100, 200],
+						},
+						{
+							message: `400 - ${JSON.stringify({
+								error: {
+									message: 'error message',
+									type: 'free_ai_credits_request_error',
+									code: 400,
+								},
+							})}`,
+							error: {
+								message: 'error message',
+								type: 'free_ai_credits_request_error',
+								code: 400,
+							},
+						},
+						{
+							httpCode: '400',
+						},
+					),
+				},
+			},
+		} as unknown as IRun;
+
+		expect(userInInstanceRanOutOfFreeAiCredits(runData)).toBe(true);
+	});
+});
+
 function validUrls(idMaker: typeof alphanumericId | typeof email, char = CHAR) {
 	const firstId = idMaker();
 	const secondId = idMaker();
@@ -990,11 +1257,8 @@ function alphanumericId() {
 
 const chooseRandomly = <T>(array: T[]) => array[randomInt(array.length)];
 
-function generateTestWorkflowAndRunData(): { workflow: IWorkflowBase; runData: IRunData } {
-	const workflow: IWorkflowBase = {
-		meta: {
-			instanceId: 'a786b722078489c1fa382391a9f3476c2784761624deb2dfb4634827256d51a0',
-		},
+function generateTestWorkflowAndRunData(): { workflow: Partial<IWorkflowBase>; runData: IRunData } {
+	const workflow: Partial<IWorkflowBase> = {
 		nodes: [
 			{
 				parameters: {},
@@ -1096,9 +1360,7 @@ function generateTestWorkflowAndRunData(): { workflow: IWorkflowBase; runData: I
 			},
 			Switch: {
 				main: [
-					// @ts-ignore
 					null,
-					// @ts-ignore
 					null,
 					[
 						{
diff --git a/packages/workflow/test/Workflow.test.ts b/packages/workflow/test/Workflow.test.ts
index bdd5fec8b9..88c41e8d9f 100644
--- a/packages/workflow/test/Workflow.test.ts
+++ b/packages/workflow/test/Workflow.test.ts
@@ -1,26 +1,19 @@
 import { mock } from 'jest-mock-extended';
 
 import { NodeConnectionType } from '@/Interfaces';
+import type { IConnection } from '@/Interfaces';
 import type {
 	IBinaryKeyData,
 	IConnections,
 	IDataObject,
-	IExecuteData,
 	INode,
-	INodeExecuteFunctions,
 	INodeExecutionData,
 	INodeParameters,
-	INodeType,
-	INodeTypeDescription,
 	INodeTypes,
 	IRunExecutionData,
-	ITriggerFunctions,
-	ITriggerResponse,
-	IWorkflowExecuteAdditionalData,
 	NodeParameterValueType,
 } from '@/Interfaces';
-import * as NodeHelpers from '@/NodeHelpers';
-import { Workflow, type WorkflowParameters } from '@/Workflow';
+import { Workflow } from '@/Workflow';
 
 process.env.TEST_VARIABLE_1 = 'valueEnvVariable1';
 
@@ -32,126 +25,6 @@ interface StubNode {
 }
 
 describe('Workflow', () => {
-	describe('checkIfWorkflowCanBeActivated', () => {
-		const disabledNode = mock<INode>({ type: 'triggerNode', disabled: true });
-		const unknownNode = mock<INode>({ type: 'unknownNode' });
-		const noTriggersNode = mock<INode>({ type: 'noTriggersNode' });
-		const pollNode = mock<INode>({ type: 'pollNode' });
-		const triggerNode = mock<INode>({ type: 'triggerNode' });
-		const webhookNode = mock<INode>({ type: 'webhookNode' });
-
-		const nodeTypes = mock<INodeTypes>();
-		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
-			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
-			if (type === 'unknownNode') return undefined as unknown as INodeType;
-			const partial: Partial<INodeType> = {
-				poll: undefined,
-				trigger: undefined,
-				webhook: undefined,
-				description: mock<INodeTypeDescription>({
-					properties: [],
-				}),
-			};
-			if (type === 'pollNode') partial.poll = jest.fn();
-			if (type === 'triggerNode') partial.trigger = jest.fn();
-			if (type === 'webhookNode') partial.webhook = jest.fn();
-			return mock(partial);
-		});
-
-		test.each([
-			['should skip disabled nodes', disabledNode, [], false],
-			['should skip nodes marked as ignored', triggerNode, ['triggerNode'], false],
-			['should skip unknown nodes', unknownNode, [], false],
-			['should skip nodes with no trigger method', noTriggersNode, [], false],
-			['should activate if poll method exists', pollNode, [], true],
-			['should activate if trigger method exists', triggerNode, [], true],
-			['should activate if webhook method exists', webhookNode, [], true],
-		])('%s', async (_, node, ignoredNodes, expected) => {
-			const params = mock<WorkflowParameters>({ nodeTypes });
-			params.nodes = [node];
-			const workflow = new Workflow(params);
-			expect(workflow.checkIfWorkflowCanBeActivated(ignoredNodes)).toBe(expected);
-		});
-	});
-
-	describe('checkReadyForExecution', () => {
-		const disabledNode = mock<INode>({ name: 'Disabled Node', disabled: true });
-		const startNode = mock<INode>({ name: 'Start Node' });
-		const unknownNode = mock<INode>({ name: 'Unknown Node', type: 'unknownNode' });
-
-		const nodeParamIssuesSpy = jest.spyOn(NodeHelpers, 'getNodeParametersIssues');
-
-		const nodeTypes = mock<INodeTypes>();
-		nodeTypes.getByNameAndVersion.mockImplementation((type) => {
-			// TODO: getByNameAndVersion signature needs to be updated to allow returning undefined
-			if (type === 'unknownNode') return undefined as unknown as INodeType;
-			return mock<INodeType>({
-				description: {
-					properties: [],
-				},
-			});
-		});
-
-		beforeEach(() => jest.clearAllMocks());
-
-		it('should return null if there are no nodes', () => {
-			const workflow = new Workflow({
-				nodes: [],
-				connections: {},
-				active: false,
-				nodeTypes,
-			});
-
-			const issues = workflow.checkReadyForExecution();
-			expect(issues).toBe(null);
-			expect(nodeTypes.getByNameAndVersion).not.toHaveBeenCalled();
-			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
-		});
-
-		it('should return null if there are no enabled nodes', () => {
-			const workflow = new Workflow({
-				nodes: [disabledNode],
-				connections: {},
-				active: false,
-				nodeTypes,
-			});
-
-			const issues = workflow.checkReadyForExecution({ startNode: disabledNode.name });
-			expect(issues).toBe(null);
-			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(1);
-			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
-		});
-
-		it('should return typeUnknown for unknown nodes', () => {
-			const workflow = new Workflow({
-				nodes: [unknownNode],
-				connections: {},
-				active: false,
-				nodeTypes,
-			});
-
-			const issues = workflow.checkReadyForExecution({ startNode: unknownNode.name });
-			expect(issues).toEqual({ [unknownNode.name]: { typeUnknown: true } });
-			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(2);
-			expect(nodeParamIssuesSpy).not.toHaveBeenCalled();
-		});
-
-		it('should return issues for regular nodes', () => {
-			const workflow = new Workflow({
-				nodes: [startNode],
-				connections: {},
-				active: false,
-				nodeTypes,
-			});
-			nodeParamIssuesSpy.mockReturnValue({ execution: false });
-
-			const issues = workflow.checkReadyForExecution({ startNode: startNode.name });
-			expect(issues).toEqual({ [startNode.name]: { execution: false } });
-			expect(nodeTypes.getByNameAndVersion).toHaveBeenCalledTimes(2);
-			expect(nodeParamIssuesSpy).toHaveBeenCalled();
-		});
-	});
-
 	describe('renameNodeInParameterValue', () => {
 		describe('for expressions', () => {
 			const tests = [
@@ -2022,66 +1895,153 @@ describe('Workflow', () => {
 		});
 	});
 
-	describe('runNode', () => {
-		const nodeTypes = mock<INodeTypes>();
-		const triggerNode = mock<INode>();
-		const triggerResponse = mock<ITriggerResponse>({
-			closeFunction: jest.fn(),
-			// This node should never trigger, or return
-			manualTriggerFunction: async () => await new Promise(() => {}),
-		});
-		const triggerNodeType = mock<INodeType>({
-			description: {
-				properties: [],
-			},
-			execute: undefined,
-			poll: undefined,
-			webhook: undefined,
-			async trigger(this: ITriggerFunctions) {
-				return triggerResponse;
-			},
-		});
-
-		nodeTypes.getByNameAndVersion.mockReturnValue(triggerNodeType);
-
-		const workflow = new Workflow({
-			nodeTypes,
-			nodes: [triggerNode],
-			connections: {},
-			active: false,
-		});
-
-		const executionData = mock<IExecuteData>();
-		const runExecutionData = mock<IRunExecutionData>();
-		const additionalData = mock<IWorkflowExecuteAdditionalData>();
-		const nodeExecuteFunctions = mock<INodeExecuteFunctions>();
-		const triggerFunctions = mock<ITriggerFunctions>();
-		nodeExecuteFunctions.getExecuteTriggerFunctions.mockReturnValue(triggerFunctions);
-		const abortController = new AbortController();
-
-		test('should call closeFunction when manual trigger is aborted', async () => {
-			const runPromise = workflow.runNode(
-				executionData,
-				runExecutionData,
-				0,
-				additionalData,
-				nodeExecuteFunctions,
-				'manual',
-				abortController.signal,
-			);
-			// Yield back to the event-loop to let async parts of `runNode` execute
-			await new Promise((resolve) => setImmediate(resolve));
-
-			let isSettled = false;
-			void runPromise.then(() => {
-				isSettled = true;
+	describe('__getConnectionsByDestination', () => {
+		it('should return empty object when there are no connections', () => {
+			const workflow = new Workflow({
+				nodes: [],
+				connections: {},
+				active: false,
+				nodeTypes: mock<INodeTypes>(),
 			});
-			expect(isSettled).toBe(false);
-			expect(abortController.signal.aborted).toBe(false);
-			expect(triggerResponse.closeFunction).not.toHaveBeenCalled();
 
-			abortController.abort();
-			expect(triggerResponse.closeFunction).toHaveBeenCalled();
+			const result = workflow.__getConnectionsByDestination({});
+
+			expect(result).toEqual({});
+		});
+
+		it('should return connections by destination node', () => {
+			const connections: IConnections = {
+				Node1: {
+					[NodeConnectionType.Main]: [
+						[
+							{ node: 'Node2', type: NodeConnectionType.Main, index: 0 },
+							{ node: 'Node3', type: NodeConnectionType.Main, index: 1 },
+						],
+					],
+				},
+			};
+			const workflow = new Workflow({
+				nodes: [],
+				connections,
+				active: false,
+				nodeTypes: mock<INodeTypes>(),
+			});
+			const result = workflow.__getConnectionsByDestination(connections);
+			expect(result).toEqual({
+				Node2: {
+					[NodeConnectionType.Main]: [[{ node: 'Node1', type: NodeConnectionType.Main, index: 0 }]],
+				},
+				Node3: {
+					[NodeConnectionType.Main]: [
+						[],
+						[{ node: 'Node1', type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			});
+		});
+
+		it('should handle multiple connection types', () => {
+			const connections: IConnections = {
+				Node1: {
+					[NodeConnectionType.Main]: [[{ node: 'Node2', type: NodeConnectionType.Main, index: 0 }]],
+					[NodeConnectionType.AiAgent]: [
+						[{ node: 'Node3', type: NodeConnectionType.AiAgent, index: 0 }],
+					],
+				},
+			};
+
+			const workflow = new Workflow({
+				nodes: [],
+				connections,
+				active: false,
+				nodeTypes: mock<INodeTypes>(),
+			});
+
+			const result = workflow.__getConnectionsByDestination(connections);
+			expect(result).toEqual({
+				Node2: {
+					[NodeConnectionType.Main]: [[{ node: 'Node1', type: NodeConnectionType.Main, index: 0 }]],
+				},
+				Node3: {
+					[NodeConnectionType.AiAgent]: [
+						[{ node: 'Node1', type: NodeConnectionType.AiAgent, index: 0 }],
+					],
+				},
+			});
+		});
+
+		it('should handle nodes with no connections', () => {
+			const connections: IConnections = {
+				Node1: {
+					[NodeConnectionType.Main]: [[]],
+				},
+			};
+
+			const workflow = new Workflow({
+				nodes: [],
+				connections,
+				active: false,
+				nodeTypes: mock<INodeTypes>(),
+			});
+
+			const result = workflow.__getConnectionsByDestination(connections);
+			expect(result).toEqual({});
+		});
+
+		// @issue https://linear.app/n8n/issue/N8N-7880/cannot-load-some-templates
+		it('should handle nodes with null connections', () => {
+			const connections: IConnections = {
+				Node1: {
+					[NodeConnectionType.Main]: [
+						null as unknown as IConnection[],
+						[{ node: 'Node2', type: NodeConnectionType.Main, index: 0 }],
+					],
+				},
+			};
+
+			const workflow = new Workflow({
+				nodes: [],
+				connections,
+				active: false,
+				nodeTypes: mock<INodeTypes>(),
+			});
+
+			const result = workflow.__getConnectionsByDestination(connections);
+			expect(result).toEqual({
+				Node2: {
+					[NodeConnectionType.Main]: [[{ node: 'Node1', type: NodeConnectionType.Main, index: 1 }]],
+				},
+			});
+		});
+
+		it('should handle nodes with multiple input connections', () => {
+			const connections: IConnections = {
+				Node1: {
+					[NodeConnectionType.Main]: [[{ node: 'Node2', type: NodeConnectionType.Main, index: 0 }]],
+				},
+				Node3: {
+					[NodeConnectionType.Main]: [[{ node: 'Node2', type: NodeConnectionType.Main, index: 0 }]],
+				},
+			};
+
+			const workflow = new Workflow({
+				nodes: [],
+				connections,
+				active: false,
+				nodeTypes: mock<INodeTypes>(),
+			});
+
+			const result = workflow.__getConnectionsByDestination(connections);
+			expect(result).toEqual({
+				Node2: {
+					[NodeConnectionType.Main]: [
+						[
+							{ node: 'Node1', type: NodeConnectionType.Main, index: 0 },
+							{ node: 'Node3', type: NodeConnectionType.Main, index: 0 },
+						],
+					],
+				},
+			});
 		});
 	});
 });
diff --git a/packages/workflow/test/WorkflowDataProxy.test.ts b/packages/workflow/test/WorkflowDataProxy.test.ts
index ac9504dcd8..85c26c79d6 100644
--- a/packages/workflow/test/WorkflowDataProxy.test.ts
+++ b/packages/workflow/test/WorkflowDataProxy.test.ts
@@ -1,11 +1,13 @@
+import { ensureError } from '@/errors/ensure-error';
 import { ExpressionError } from '@/errors/expression.error';
-import type {
-	IExecuteData,
-	INode,
-	IPinData,
-	IRun,
-	IWorkflowBase,
-	WorkflowExecuteMode,
+import {
+	NodeConnectionType,
+	type IExecuteData,
+	type INode,
+	type IPinData,
+	type IRun,
+	type IWorkflowBase,
+	type WorkflowExecuteMode,
 } from '@/Interfaces';
 import { Workflow } from '@/Workflow';
 import { WorkflowDataProxy } from '@/WorkflowDataProxy';
@@ -26,9 +28,15 @@ const getProxyFromFixture = (
 	run: IRun | null,
 	activeNode: string,
 	mode?: WorkflowExecuteMode,
+	opts?: {
+		throwOnMissingExecutionData: boolean;
+		connectionType?: NodeConnectionType;
+		runIndex?: number;
+	},
 ) => {
-	const taskData = run?.data.resultData.runData[activeNode]?.[0];
-	const lastNodeConnectionInputData = taskData?.data?.main[0];
+	const taskData = run?.data.resultData.runData[activeNode]?.[opts?.runIndex ?? 0];
+	const lastNodeConnectionInputData =
+		taskData?.data?.[opts?.connectionType ?? NodeConnectionType.Main]?.[0];
 
 	let executeData: IExecuteData | undefined;
 
@@ -37,7 +45,7 @@ const getProxyFromFixture = (
 			data: taskData.data!,
 			node: workflow.nodes.find((node) => node.name === activeNode) as INode,
 			source: {
-				main: taskData.source,
+				[opts?.connectionType ?? NodeConnectionType.Main]: taskData.source,
 			},
 		};
 	}
@@ -63,7 +71,7 @@ const getProxyFromFixture = (
 			pinData,
 		}),
 		run?.data ?? null,
-		0,
+		opts?.runIndex ?? 0,
 		0,
 		activeNode,
 		lastNodeConnectionInputData ?? [],
@@ -73,7 +81,7 @@ const getProxyFromFixture = (
 		executeData,
 	);
 
-	return dataProxy.getDataProxy();
+	return dataProxy.getDataProxy(opts);
 };
 
 describe('WorkflowDataProxy', () => {
@@ -327,7 +335,9 @@ describe('WorkflowDataProxy', () => {
 			} catch (error) {
 				expect(error).toBeInstanceOf(ExpressionError);
 				const exprError = error as ExpressionError;
-				expect(exprError.message).toEqual("Can't get data for expression");
+				expect(exprError.message).toEqual(
+					"Using the item method doesn't work with pinned data in this scenario. Please unpin 'Break pairedItem chain' and try again.",
+				);
 				expect(exprError.context.type).toEqual('paired_item_no_info');
 				done();
 			}
@@ -404,4 +414,139 @@ describe('WorkflowDataProxy', () => {
 			expect(proxy.$node.PinnedSet.json.firstName).toBe('Joe');
 		});
 	});
+
+	describe('Pinned data with paired items', () => {
+		const fixture = loadFixture('pindata_paireditem');
+		const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'Set', 'manual', {
+			runIndex: 0,
+			throwOnMissingExecutionData: false,
+		});
+
+		test.each([{ methodName: 'itemMatching' }, { methodName: 'pairedItem' }])(
+			'$methodName should throw when it cannot find a paired item',
+			async ({ methodName }) => {
+				try {
+					proxy.$('DebugHelper')[methodName](0);
+					fail('should throw');
+				} catch (e) {
+					const error = ensureError(e);
+					expect(error.message).toEqual(
+						`Using the ${methodName} method doesn't work with pinned data in this scenario. Please unpin 'Edit Fields' and try again.`,
+					);
+
+					expect(error).toMatchObject({
+						functionality: 'pairedItem',
+						context: {
+							runIndex: 0,
+							itemIndex: 0,
+							type: 'paired_item_no_info',
+							descriptionKey: 'pairedItemNoInfo',
+							nodeCause: 'Edit Fields',
+							causeDetailed:
+								"Missing pairedItem data (node 'Edit Fields' probably didn't supply it)",
+						},
+					});
+				}
+			},
+		);
+
+		test('item should throw when it cannot find a paired item', async () => {
+			try {
+				proxy.$('DebugHelper').item;
+				fail('should throw');
+			} catch (e) {
+				const error = ensureError(e);
+				expect(error.message).toEqual(
+					"Using the item method doesn't work with pinned data in this scenario. Please unpin 'Edit Fields' and try again.",
+				);
+
+				expect(error).toMatchObject({
+					functionality: 'pairedItem',
+					context: {
+						runIndex: 0,
+						itemIndex: 0,
+						type: 'paired_item_no_info',
+						descriptionKey: 'pairedItemNoInfo',
+						nodeCause: 'Edit Fields',
+						causeDetailed: "Missing pairedItem data (node 'Edit Fields' probably didn't supply it)",
+					},
+				});
+			}
+		});
+	});
+
+	describe('Partial data', () => {
+		const fixture = loadFixture('partial_data');
+
+		describe('Default behaviour (throw on missing execution data)', () => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'End');
+
+			test('$binary', () => {
+				expect(() => proxy.$binary).toThrowError(ExpressionError);
+			});
+
+			test('$json', () => {
+				expect(() => proxy.$json).toThrowError(ExpressionError);
+			});
+
+			test('$data', () => {
+				expect(() => proxy.$data).toThrowError(ExpressionError);
+			});
+		});
+
+		describe("Don't throw on missing execution data)", () => {
+			const proxy = getProxyFromFixture(fixture.workflow, fixture.run, 'End', undefined, {
+				throwOnMissingExecutionData: false,
+			});
+
+			test('$binary', () => {
+				expect(proxy.$binary).toBeUndefined();
+			});
+
+			test('$json', () => {
+				expect(proxy.$json).toBeUndefined();
+			});
+
+			test('$data', () => {
+				expect(proxy.$data).toBeUndefined();
+			});
+		});
+	});
+
+	describe('$fromAI', () => {
+		const fixture = loadFixture('from_ai_multiple_items');
+		const getFromAIProxy = (runIndex = 0) =>
+			getProxyFromFixture(fixture.workflow, fixture.run, 'Google Sheets1', 'manual', {
+				connectionType: NodeConnectionType.AiTool,
+				throwOnMissingExecutionData: false,
+				runIndex,
+			});
+
+		test('Retrieves values for first item', () => {
+			expect(getFromAIProxy().$fromAI('full_name')).toEqual('Mr. Input 1');
+			expect(getFromAIProxy().$fromAI('email')).toEqual('input1@n8n.io');
+		});
+
+		test('Retrieves values for second item', () => {
+			expect(getFromAIProxy(1).$fromAI('full_name')).toEqual('Mr. Input 2');
+			expect(getFromAIProxy(1).$fromAI('email')).toEqual('input2@n8n.io');
+		});
+
+		test('Case variants: $fromAi and $fromai', () => {
+			expect(getFromAIProxy().$fromAi('full_name')).toEqual('Mr. Input 1');
+			expect(getFromAIProxy().$fromai('email')).toEqual('input1@n8n.io');
+		});
+
+		test('Returns default value when key not found', () => {
+			expect(
+				getFromAIProxy().$fromAI('non_existent_key', 'description', 'string', 'default_value'),
+			).toEqual('default_value');
+		});
+
+		test('Throws an error when a key is invalid (e.g. empty string)', () => {
+			expect(() => getFromAIProxy().$fromAI('')).toThrow(ExpressionError);
+			expect(() => getFromAIProxy().$fromAI('invalid key')).toThrow(ExpressionError);
+			expect(() => getFromAIProxy().$fromAI('invalid!')).toThrow(ExpressionError);
+		});
+	});
 });
diff --git a/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts b/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts
index 15ce485140..81049b1f55 100644
--- a/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts
+++ b/packages/workflow/test/WorkflowDataProxyEnvProvider.test.ts
@@ -1,5 +1,5 @@
-import { ExpressionError } from '../src/errors/expression.error';
-import { createEnvProvider, createEnvProviderState } from '../src/WorkflowDataProxyEnvProvider';
+import { ExpressionError } from '@/errors/expression.error';
+import { createEnvProvider, createEnvProviderState } from '@/WorkflowDataProxyEnvProvider';
 
 describe('createEnvProviderState', () => {
 	afterEach(() => {
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_run.json b/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_run.json
new file mode 100644
index 0000000000..563e52f15a
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_run.json
@@ -0,0 +1,221 @@
+{
+	"data": {
+		"startData": {},
+		"resultData": {
+			"runData": {
+				"When clicking ‘Test workflow’": [
+					{
+						"hints": [],
+						"startTime": 1733478795595,
+						"executionTime": 0,
+						"source": [],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Code": [
+					{
+						"hints": [
+							{
+								"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"
+							}
+						],
+						"startTime": 1733478795595,
+						"executionTime": 2,
+						"source": [
+							{
+								"previousNode": "When clicking ‘Test workflow’"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"full_name": "Mr. Input 1",
+											"email": "input1@n8n.io"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"full_name": "Mr. Input 2",
+											"email": "input2@n8n.io"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Google Sheets1": [
+					{
+						"startTime": 1733478796468,
+						"executionTime": 1417,
+						"executionStatus": "success",
+						"source": [null],
+						"data": {
+							"ai_tool": [
+								[
+									{
+										"json": {
+											"response": [
+												{
+													"full name": "Mr. Input 1",
+													"email": "input1@n8n.io"
+												},
+												{},
+												{}
+											]
+										}
+									}
+								]
+							]
+						},
+						"inputOverride": {
+							"ai_tool": [
+								[
+									{
+										"json": {
+											"full_name": "Mr. Input 1",
+											"email": "input1@n8n.io"
+										}
+									}
+								]
+							]
+						},
+						"metadata": {
+							"subRun": [
+								{
+									"node": "Google Sheets1",
+									"runIndex": 0
+								},
+								{
+									"node": "Google Sheets1",
+									"runIndex": 1
+								}
+							]
+						}
+					},
+					{
+						"startTime": 1733478799915,
+						"executionTime": 1271,
+						"executionStatus": "success",
+						"source": [null],
+						"data": {
+							"ai_tool": [
+								[
+									{
+										"json": {
+											"response": [
+												{
+													"full name": "Mr. Input 1",
+													"email": "input1@n8n.io"
+												},
+												{},
+												{}
+											]
+										}
+									}
+								]
+							]
+						},
+						"inputOverride": {
+							"ai_tool": [
+								[
+									{
+										"json": {
+											"full_name": "Mr. Input 2",
+											"email": "input2@n8n.io"
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Agent single list with multiple tool calls": [
+					{
+						"hints": [],
+						"startTime": 1733478795597,
+						"executionTime": 9157,
+						"source": [
+							{
+								"previousNode": "Code"
+							}
+						],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"output": "The user \"Mr. Input 1\" with the email \"input1@n8n.io\" has been successfully added to your Users sheet."
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"output": "The user \"Mr. Input 2\" with the email \"input2@n8n.io\" has been successfully added to your Users sheet."
+										},
+										"pairedItem": {
+											"item": 1
+										}
+									}
+								]
+							]
+						}
+					}
+				]
+			},
+			"pinData": {},
+			"lastNodeExecuted": "Agent single list with multiple tool calls"
+		},
+		"executionData": {
+			"contextData": {},
+			"nodeExecutionStack": [],
+			"metadata": {
+				"Google Sheets1": [
+					{
+						"subRun": [
+							{
+								"node": "Google Sheets1",
+								"runIndex": 0
+							},
+							{
+								"node": "Google Sheets1",
+								"runIndex": 1
+							}
+						]
+					}
+				]
+			},
+			"waitingExecution": {},
+			"waitingExecutionSource": {}
+		}
+	},
+	"mode": "manual",
+	"startedAt": "2024-02-08T15:45:18.848Z",
+	"stoppedAt": "2024-02-08T15:45:18.862Z",
+	"status": "running"
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_workflow.json b/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_workflow.json
new file mode 100644
index 0000000000..9f3f75970e
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/from_ai_multiple_items_workflow.json
@@ -0,0 +1,112 @@
+{
+	"id": "8d7lUG8IdEyvIUim",
+	"name": "Multiple items tool",
+	"active": false,
+	"nodes": [
+		{
+			"parameters": {
+				"mode": "runOnceForAllItems",
+				"language": "javaScript",
+				"jsCode": "return [\n  { \"full_name\": \"Mr. Input 1\", \"email\": \"input1@n8n.io\" }, \n  { \"full_name\": \"Mr. Input 2\", \"email\": \"input2@n8n.io\" }\n]",
+				"notice": ""
+			},
+			"id": "cb19a188-12ae-4d46-86df-4a2044ec3346",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 2,
+			"position": [-160, 480]
+		},
+		{
+			"parameters": { "notice": "", "model": "gpt-4o-mini", "options": {} },
+			"id": "c448b6b4-9e11-4044-96e5-f4138534ae52",
+			"name": "OpenAI Chat Model1",
+			"type": "@n8n/n8n-nodes-langchain.lmChatOpenAi",
+			"typeVersion": 1,
+			"position": [40, 700]
+		},
+		{
+			"parameters": {
+				"descriptionType": "manual",
+				"toolDescription": "Add row to Users sheet",
+				"authentication": "oAuth2",
+				"resource": "sheet",
+				"operation": "append",
+				"columns": {
+					"mappingMode": "defineBelow",
+					"value": {
+						"full name": "={{ $fromAI('full_name') }}",
+						"email": "={{ $fromAI('email') }}"
+					},
+					"matchingColumns": [],
+					"schema": [
+						{
+							"id": "full name",
+							"displayName": "full name",
+							"required": false,
+							"defaultMatch": false,
+							"display": true,
+							"type": "string",
+							"canBeUsedToMatch": true
+						},
+						{
+							"id": "email",
+							"displayName": "email",
+							"required": false,
+							"defaultMatch": false,
+							"display": true,
+							"type": "string",
+							"canBeUsedToMatch": true
+						}
+					]
+				},
+				"options": { "useAppend": true }
+			},
+			"id": "d8b40267-9397-45b6-8a64-ee7e8f9eb8a8",
+			"name": "Google Sheets1",
+			"type": "n8n-nodes-base.googleSheetsTool",
+			"typeVersion": 4.5,
+			"position": [240, 700]
+		},
+		{
+			"parameters": {
+				"notice_tip": "",
+				"agent": "toolsAgent",
+				"promptType": "define",
+				"text": "=Add this user to my Users sheet:\n{{ $json.toJsonString() }}",
+				"hasOutputParser": false,
+				"options": {},
+				"credentials": ""
+			},
+			"id": "0d6c1bd7-cc91-4571-8fdb-c875a1af44c7",
+			"name": "Agent single list with multiple tool calls",
+			"type": "@n8n/n8n-nodes-langchain.agent",
+			"typeVersion": 1.7,
+			"position": [40, 480]
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": { "main": [[{ "node": "Code", "type": "main", "index": 0 }]] },
+		"Code": {
+			"main": [
+				[{ "node": "Agent single list with multiple tool calls", "type": "main", "index": 0 }]
+			]
+		},
+		"OpenAI Chat Model1": {
+			"ai_languageModel": [
+				[
+					{
+						"node": "Agent single list with multiple tool calls",
+						"type": "ai_languageModel",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Google Sheets1": {
+			"ai_tool": [
+				[{ "node": "Agent single list with multiple tool calls", "type": "ai_tool", "index": 0 }]
+			]
+		}
+	},
+	"pinData": {}
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/partial_data_run.json b/packages/workflow/test/fixtures/WorkflowDataProxy/partial_data_run.json
new file mode 100644
index 0000000000..ae1a51d0b8
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/partial_data_run.json
@@ -0,0 +1,71 @@
+{
+	"data": {
+		"startData": {},
+		"resultData": {
+			"runData": {
+				"Start": [
+					{
+						"startTime": 1,
+						"executionTime": 1,
+						"data": {
+							"main": [
+								[
+									{
+										"json": {}
+									}
+								]
+							]
+						},
+						"source": []
+					}
+				],
+				"Function": [
+					{
+						"startTime": 1,
+						"executionTime": 1,
+						"data": {
+							"main": [[]]
+						},
+						"source": [
+							{
+								"previousNode": "Start"
+							}
+						]
+					}
+				],
+				"Rename": [
+					{
+						"startTime": 1,
+						"executionTime": 1,
+						"data": {
+							"main": [[]]
+						},
+						"source": [
+							{
+								"previousNode": "Function"
+							}
+						]
+					}
+				],
+				"End": [
+					{
+						"startTime": 1,
+						"executionTime": 1,
+						"data": {
+							"main": [[]]
+						},
+						"source": [
+							{
+								"previousNode": "Rename"
+							}
+						]
+					}
+				]
+			}
+		}
+	},
+	"mode": "manual",
+	"startedAt": "2024-02-08T15:45:18.848Z",
+	"stoppedAt": "2024-02-08T15:45:18.862Z",
+	"status": "running"
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/partial_data_workflow.json b/packages/workflow/test/fixtures/WorkflowDataProxy/partial_data_workflow.json
new file mode 100644
index 0000000000..9894b66626
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/partial_data_workflow.json
@@ -0,0 +1,86 @@
+{
+	"name": "",
+	"nodes": [
+		{
+			"name": "Start",
+			"type": "test.set",
+			"parameters": {},
+			"typeVersion": 1,
+			"id": "uuid-1",
+			"position": [100, 200]
+		},
+		{
+			"name": "Function",
+			"type": "test.set",
+			"parameters": {
+				"functionCode": "// Code here will run only once, no matter how many input items there are.\n// More info and help: https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.function/\nconst { DateTime, Duration, Interval } = require(\"luxon\");\n\nconst data = [\n  {\n  \"length\": 105\n  },\n  {\n  \"length\": 160\n  },\n  {\n  \"length\": 121\n  },\n  {\n  \"length\": 275\n  },\n  {\n  \"length\": 950\n  },\n];\n\nreturn data.map(fact => ({json: fact}));"
+			},
+			"typeVersion": 1,
+			"id": "uuid-2",
+			"position": [280, 200]
+		},
+		{
+			"name": "Rename",
+			"type": "test.set",
+			"parameters": {
+				"value1": "data",
+				"value2": "initialName"
+			},
+			"typeVersion": 1,
+			"id": "uuid-3",
+			"position": [460, 200]
+		},
+		{
+			"name": "Set",
+			"type": "test.set",
+			"parameters": {},
+			"typeVersion": 1,
+			"id": "uuid-4",
+			"position": [640, 200]
+		},
+		{
+			"name": "End",
+			"type": "test.set",
+			"parameters": {},
+			"typeVersion": 1,
+			"id": "uuid-5",
+			"position": [640, 200]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"Start": {
+			"main": [
+				[
+					{
+						"node": "Function",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function": {
+			"main": [
+				[
+					{
+						"node": "Rename",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Rename": {
+			"main": [
+				[
+					{
+						"node": "End",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_run.json b/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_run.json
new file mode 100644
index 0000000000..9a3b02a0ab
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_run.json
@@ -0,0 +1,216 @@
+{
+	"data": {
+		"startData": {},
+		"resultData": {
+			"runData": {
+				"When clicking ‘Test workflow’": [
+					{
+						"hints": [],
+						"startTime": 1737031584297,
+						"executionTime": 1,
+						"source": [],
+						"executionStatus": "success",
+						"data": { "main": [[{ "json": {}, "pairedItem": { "item": 0 } }]] }
+					}
+				],
+				"DebugHelper": [
+					{
+						"hints": [],
+						"startTime": 1737031584299,
+						"executionTime": 1,
+						"source": [{ "previousNode": "When clicking ‘Test workflow’" }],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"uid": "3c54ac5d-5c75-409d-9975-76ee151e5fc9",
+											"email": "Troy.Volkman@gmail.com",
+											"firstname": "Betty",
+											"lastname": "Wolf",
+											"password": "c~837Nv"
+										},
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": {
+											"uid": "5b0d9bd7-2ecf-47fb-b484-3eb1e76fa901",
+											"email": "Martha.Moore@hotmail.com",
+											"firstname": "Shannon",
+											"lastname": "Champlin",
+											"password": "48FF,6dnx"
+										},
+										"pairedItem": { "item": 0 }
+									},
+									{
+										"json": {
+											"uid": "76437ebe-d406-447a-ab89-3b10f5183480",
+											"email": "Wanda_Witting@hotmail.com",
+											"firstname": "Alma",
+											"lastname": "Conn",
+											"password": "6$G2R3nT"
+										},
+										"pairedItem": { "item": 0 }
+									}
+								]
+							]
+						}
+					}
+				],
+				"Edit Fields": [
+					{
+						"hints": [],
+						"startTime": 1737031584301,
+						"executionTime": 0,
+						"source": [{ "previousNode": "DebugHelper" }],
+						"executionStatus": "success",
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+											"email": "Joanna_Willms@yahoo.com",
+											"firstname": "Laurie",
+											"lastname": "Krajcik",
+											"password": "k%Y2I9oq",
+											"test": "1"
+										}
+									},
+									{
+										"json": {
+											"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+											"email": "Elaine_Feeney@gmail.com",
+											"firstname": "Tracy",
+											"lastname": "Mraz",
+											"password": "t48s3-r",
+											"test": "1"
+										}
+									}
+								]
+							]
+						}
+					}
+				],
+				"Set": [
+					{
+						"hints": [],
+						"startTime": 1737031584301,
+						"executionTime": 0,
+						"source": [{ "previousNode": "Edit Fields" }],
+						"data": {
+							"main": [
+								[
+									{
+										"json": {
+											"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+											"email": "Joanna_Willms@yahoo.com",
+											"firstname": "Laurie",
+											"lastname": "Krajcik",
+											"password": "k%Y2I9oq",
+											"test": "1"
+										},
+										"pairedItem": {
+											"item": 0
+										}
+									},
+									{
+										"json": {
+											"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+											"email": "Elaine_Feeney@gmail.com",
+											"firstname": "Tracy",
+											"lastname": "Mraz",
+											"password": "t48s3-r",
+											"test": "1"
+										},
+										"pairedItem": {
+											"item": 1
+										}
+									}
+								]
+							]
+						}
+					}
+				]
+			},
+			"pinData": {
+				"Edit Fields": [
+					{
+						"json": {
+							"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+							"email": "Joanna_Willms@yahoo.com",
+							"firstname": "Laurie",
+							"lastname": "Krajcik",
+							"password": "k%Y2I9oq",
+							"test": "1"
+						}
+					},
+					{
+						"json": {
+							"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+							"email": "Elaine_Feeney@gmail.com",
+							"firstname": "Tracy",
+							"lastname": "Mraz",
+							"password": "t48s3-r",
+							"test": "1"
+						}
+					}
+				]
+			},
+			"lastNodeExecuted": "Set"
+		},
+		"executionData": {
+			"contextData": {},
+			"nodeExecutionStack": [
+				{
+					"node": {
+						"parameters": {
+							"mode": "runOnceForAllItems",
+							"language": "javaScript",
+							"jsCode": "for (let i = 0; i < $input.all().length; i++) {   $(\"DebugHelper\").itemMatching(i) }  return []",
+							"notice": ""
+						},
+						"type": "n8n-nodes-base.code",
+						"typeVersion": 2,
+						"position": [720, 0],
+						"id": "d4e8b6a2-cd73-452d-b5f0-986753f5dc4a",
+						"name": "Set"
+					},
+					"data": {
+						"main": [
+							[
+								{
+									"json": {
+										"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+										"email": "Joanna_Willms@yahoo.com",
+										"firstname": "Laurie",
+										"lastname": "Krajcik",
+										"password": "k%Y2I9oq",
+										"test": "1"
+									},
+									"pairedItem": { "item": 0 }
+								},
+								{
+									"json": {
+										"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+										"email": "Elaine_Feeney@gmail.com",
+										"firstname": "Tracy",
+										"lastname": "Mraz",
+										"password": "t48s3-r",
+										"test": "1"
+									},
+									"pairedItem": { "item": 1 }
+								}
+							]
+						]
+					},
+					"source": { "main": [{ "previousNode": "Edit Fields" }] }
+				}
+			],
+			"metadata": {},
+			"waitingExecution": {},
+			"waitingExecutionSource": {}
+		}
+	}
+}
diff --git a/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_workflow.json b/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_workflow.json
new file mode 100644
index 0000000000..8ae5af273e
--- /dev/null
+++ b/packages/workflow/test/fixtures/WorkflowDataProxy/pindata_paireditem_workflow.json
@@ -0,0 +1,106 @@
+{
+	"nodes": [
+		{
+			"parameters": {},
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 0],
+			"id": "df3ea0b2-913b-4736-a3c6-f61b35abd1e1",
+			"name": "When clicking ‘Test workflow’"
+		},
+		{
+			"parameters": {
+				"category": "randomData",
+				"randomDataCount": 3
+			},
+			"type": "n8n-nodes-base.debugHelper",
+			"typeVersion": 1,
+			"position": [280, 0],
+			"id": "e31f942c-876a-43ae-b883-0b7566d44750",
+			"name": "DebugHelper"
+		},
+		{
+			"parameters": {
+				"assignments": {
+					"assignments": [
+						{
+							"id": "049c69e3-969d-4df9-bf93-e44c1da06ba1",
+							"name": "test",
+							"value": "1",
+							"type": "string"
+						}
+					]
+				},
+				"includeOtherFields": true,
+				"options": {}
+			},
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 3.4,
+			"position": [500, 0],
+			"id": "eb20f04e-875f-4a2d-853c-f2e30014b821",
+			"name": "Edit Fields"
+		},
+		{
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 2,
+			"position": [720, 0],
+			"id": "d4e8b6a2-cd73-452d-b5f0-986753f5dc4a",
+			"name": "Set"
+		}
+	],
+	"connections": {
+		"When clicking ‘Test workflow’": {
+			"main": [
+				[
+					{
+						"node": "DebugHelper",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"DebugHelper": {
+			"main": [
+				[
+					{
+						"node": "Edit Fields",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Edit Fields": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"pinData": {
+		"Edit Fields": [
+			{
+				"uid": "d42c6385-12f2-4486-92b5-eebd2e95d161",
+				"email": "Joanna_Willms@yahoo.com",
+				"firstname": "Laurie",
+				"lastname": "Krajcik",
+				"password": "k%Y2I9oq",
+				"test": "1"
+			},
+			{
+				"uid": "53fc09df-5463-4f48-9fda-6500b1b77c82",
+				"email": "Elaine_Feeney@gmail.com",
+				"firstname": "Tracy",
+				"lastname": "Mraz",
+				"password": "t48s3-r",
+				"test": "1"
+			}
+		]
+	}
+}
diff --git a/patches/@langchain__core@0.3.3.patch b/patches/@langchain__core@0.3.3.patch
deleted file mode 100644
index d356b52a4b..0000000000
--- a/patches/@langchain__core@0.3.3.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/dist/memory.cjs b/dist/memory.cjs
-index f5bceead9a5533ff71e0c6f6960384ced2ee0060..5085269a58493c29e36ea7384368cd64a0e979a5 100644
---- a/dist/memory.cjs
-+++ b/dist/memory.cjs
-@@ -41,7 +41,7 @@ exports.getInputValue = getInputValue;
-  */
- const getOutputValue = (outputValues, outputKey) => {
-     const value = getValue(outputValues, outputKey);
--    if (!value) {
-+    if (!value && value !== '') {
-         const keys = Object.keys(outputValues);
-         throw new Error(`output values have ${keys.length} keys, you must specify an output key or pass only 1 key as output`);
-     }
-diff --git a/dist/memory.js b/dist/memory.js
-index 8e221f55b151d0ff7592b30ca34363b9ec577e01..a3ff2a514eda6c7e606e8f6d7305535b29ab671e 100644
---- a/dist/memory.js
-+++ b/dist/memory.js
-@@ -36,7 +36,7 @@ export const getInputValue = (inputValues, inputKey) => {
-  */
- export const getOutputValue = (outputValues, outputKey) => {
-     const value = getValue(outputValues, outputKey);
--    if (!value) {
-+    if (!value && value !== '') {
-         const keys = Object.keys(outputValues);
-         throw new Error(`output values have ${keys.length} keys, you must specify an output key or pass only 1 key as output`);
-     }
diff --git a/patches/@sentry__cli@2.36.2.patch b/patches/@sentry__cli@2.36.2.patch
deleted file mode 100644
index 04882a4fa0..0000000000
--- a/patches/@sentry__cli@2.36.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/js/helper.js b/js/helper.js
-index 37798b9444d39a8713327ed12adf3e76f03188a4..08d49b7a5c058c4d29c9929c0c524c85b14b330e 100644
---- a/js/helper.js
-+++ b/js/helper.js
-@@ -15,6 +15,7 @@ function getBinaryPath() {
-   const parts = [];
-   parts.push(__dirname);
-   parts.push('..');
-+  parts.push('bin');
-   parts.push(`sentry-cli${process.platform === 'win32' ? '.exe' : ''}`);
-   return path.resolve(...parts);
- }
\ No newline at end of file
diff --git a/patches/bull@4.12.1.patch b/patches/bull@4.12.1.patch
new file mode 100644
index 0000000000..2c68a33865
--- /dev/null
+++ b/patches/bull@4.12.1.patch
@@ -0,0 +1,21 @@
+diff --git a/lib/job.js b/lib/job.js
+index 6a3606974fd3e397c6c5b2b6e65b20670c68f753..4cdbed1d564ceeb5a80c92eb605e49cfd3c8ccdd 100644
+--- a/lib/job.js
++++ b/lib/job.js
+@@ -511,9 +511,14 @@ Job.prototype.finished = async function() {
+         }
+       };
+
+-      const onFailed = (jobId, failedReason) => {
++      const onFailed = async (jobId, failedReason) => {
+         if (String(jobId) === String(this.id)) {
+-          reject(new Error(failedReason));
++					const job = await Job.fromId(this.queue, this.id);
++					const error = new Error(failedReason);
++					if (job && job.stacktrace && job.stacktrace.length > 0) {
++						error.stack = job.stacktrace.join('\n');
++					}
++          reject(error);
+           removeListeners();
+         }
+       };
diff --git a/patches/typedi@0.10.0.patch b/patches/typedi@0.10.0.patch
deleted file mode 100644
index d9b4ab659c..0000000000
--- a/patches/typedi@0.10.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/cjs/container-instance.class.js b/cjs/container-instance.class.js
-index e473b1e652aa0b6e7462f7ba93fcef2812483b20..9e57857e5584373b88a9fad3fbb37bbcc56b554a 100644
---- a/cjs/container-instance.class.js
-+++ b/cjs/container-instance.class.js
-@@ -234,6 +234,9 @@ class ContainerInstance {
-      */
-     initializeParams(target, paramTypes) {
-         return paramTypes.map((paramType, index) => {
-+            if (paramType === undefined) {
-+                throw new ReferenceError(`Circular dependency: Target${target.name}. Index: ${index} `);
-+            }
-             const paramHandler = container_class_1.Container.handlers.find(handler => {
-                 /**
-                  * @Inject()-ed values are stored as parameter handlers and they reference their target
diff --git a/patches/vue-tsc@2.1.10.patch b/patches/vue-tsc@2.1.10.patch
new file mode 100644
index 0000000000..4603d9e89f
--- /dev/null
+++ b/patches/vue-tsc@2.1.10.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 9341fbaf3a..aa786aa2a7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,8 +7,11 @@ settings:
 catalogs:
   default:
     '@langchain/core':
-      specifier: 0.3.3
-      version: 0.3.3
+      specifier: 0.3.19
+      version: 0.3.19
+    '@sentry/node':
+      specifier: 8.42.0
+      version: 8.42.0
     '@types/basic-auth':
       specifier: ^1.1.3
       version: 1.1.3
@@ -30,12 +33,21 @@ catalogs:
     basic-auth:
       specifier: 2.0.1
       version: 2.0.1
+    callsites:
+      specifier: 3.1.0
+      version: 3.1.0
     fast-glob:
       specifier: 3.2.12
       version: 3.2.12
+    flatted:
+      specifier: 3.2.7
+      version: 3.2.7
     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
@@ -43,11 +55,14 @@ catalogs:
       specifier: 3.4.4
       version: 3.4.4
     nanoid:
-      specifier: 3.3.6
-      version: 3.3.6
-    typedi:
-      specifier: 0.10.0
-      version: 0.10.0
+      specifier: 3.3.8
+      version: 3.3.8
+    picocolors:
+      specifier: 1.0.1
+      version: 1.0.1
+    reflect-metadata:
+      specifier: 0.2.2
+      version: 0.2.2
     uuid:
       specifier: 10.0.0
       version: 10.0.0
@@ -64,30 +79,33 @@ catalogs:
     '@sentry/vue':
       specifier: ^8.33.1
       version: 8.33.1
+    '@vitejs/plugin-vue':
+      specifier: ^5.2.1
+      version: 5.2.1
     '@vitest/coverage-v8':
-      specifier: ^2.1.2
-      version: 2.1.2
+      specifier: ^2.1.6
+      version: 2.1.8
     highlight.js:
       specifier: ^11.8.0
       version: 11.9.0
     vite:
-      specifier: ^5.4.8
-      version: 5.4.8
+      specifier: ^6.0.2
+      version: 6.0.2
     vitest:
-      specifier: ^2.1.2
-      version: 2.1.2
+      specifier: ^2.1.8
+      version: 2.1.8
     vitest-mock-extended:
       specifier: ^2.0.2
       version: 2.0.2
     vue:
-      specifier: ^3.5.11
-      version: 3.5.11
+      specifier: ^3.5.13
+      version: 3.5.13
     vue-markdown-render:
       specifier: ^2.2.1
       version: 2.2.1
     vue-router:
-      specifier: ^4.4.5
-      version: 4.4.5
+      specifier: ^4.5.0
+      version: 4.5.0
 
 overrides:
   '@types/node': ^18.16.16
@@ -98,17 +116,11 @@ overrides:
   semver: ^7.5.4
   tslib: ^2.6.2
   tsconfig-paths: ^4.2.0
-  typescript: ^5.6.2
-  vue-tsc: ^2.1.6
+  typescript: ^5.7.2
+  vue-tsc: ^2.1.10
   ws: '>=8.17.1'
 
 patchedDependencies:
-  '@langchain/core@0.3.3':
-    hash: ekay3bw7hexufl733lypqvmx2e
-    path: patches/@langchain__core@0.3.3.patch
-  '@sentry/cli@2.36.2':
-    hash: saib6xuadkfhahfipsdedqib2i
-    path: patches/@sentry__cli@2.36.2.patch
   '@types/express-serve-static-core@4.17.43':
     hash: 5orrj4qleu2iko5t27vl44u4we
     path: patches/@types__express-serve-static-core@4.17.43.patch
@@ -118,15 +130,18 @@ patchedDependencies:
   '@types/ws@8.5.4':
     hash: nbzuqaoyqbrfwipijj5qriqqju
     path: patches/@types__ws@8.5.4.patch
+  bull@4.12.1:
+    hash: ep6h4rqtpclldfcdohxlgcb3aq
+    path: patches/bull@4.12.1.patch
   pkce-challenge@3.0.0:
     hash: dypouzb3lve7vncq25i5fuanki
     path: patches/pkce-challenge@3.0.0.patch
   pyodide@0.23.4:
     hash: kzcwsjcayy5m6iezu7r4tdimjq
     path: patches/pyodide@0.23.4.patch
-  typedi@0.10.0:
-    hash: sk6omkefrosihg7lmqbzh7vfxe
-    path: patches/typedi@0.10.0.patch
+  vue-tsc@2.1.10:
+    hash: z2iuqlt7ype4qnrwd5eymeecl4
+    path: patches/vue-tsc@2.1.10.patch
 
 importers:
 
@@ -147,9 +162,12 @@ importers:
       '@types/supertest':
         specifier: ^6.0.2
         version: 6.0.2
+      cross-env:
+        specifier: ^7.0.3
+        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
@@ -161,7 +179,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
@@ -171,6 +189,9 @@ importers:
       nodemon:
         specifier: ^3.0.1
         version: 3.0.1
+      npm-run-all2:
+        specifier: ^7.0.2
+        version: 7.0.2
       p-limit:
         specifier: ^3.1.0
         version: 3.1.0
@@ -185,19 +206,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
@@ -219,12 +240,15 @@ importers:
       cypress-real-events:
         specifier: ^1.13.0
         version: 1.13.0(cypress@13.14.2)
+      flatted:
+        specifier: 'catalog:'
+        version: 3.2.7
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
       nanoid:
         specifier: 'catalog:'
-        version: 3.3.6
+        version: 3.3.8
       start-server-and-test:
         specifier: ^2.0.8
         version: 2.0.8
@@ -251,9 +275,12 @@ importers:
         specifier: 'catalog:'
         version: 3.23.8
       zod-class:
-        specifier: 0.0.15
-        version: 0.0.15(zod@3.23.8)
+        specifier: 0.0.16
+        version: 0.0.16(zod@3.23.8)
     devDependencies:
+      '@n8n/config':
+        specifier: workspace:*
+        version: link:../config
       n8n-workflow:
         specifier: workspace:*
         version: link:../../workflow
@@ -271,7 +298,7 @@ importers:
         version: 8.6.0
       nanoid:
         specifier: 'catalog:'
-        version: 3.3.6
+        version: 3.3.8
       zx:
         specifier: ^8.1.4
         version: 8.1.4
@@ -287,7 +314,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.13(typescript@5.7.2))
       highlight.js:
         specifier: catalog:frontend
         version: 11.9.0
@@ -299,10 +326,10 @@ importers:
         version: 10.0.0
       vue:
         specifier: catalog:frontend
-        version: 3.5.11(typescript@5.6.2)
+        version: 3.5.13(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.13(typescript@5.7.2))
     devDependencies:
       '@iconify-json/mdi':
         specifier: ^1.1.54
@@ -310,24 +337,27 @@ importers:
       '@n8n/storybook':
         specifier: workspace:*
         version: link:../storybook
+      '@vitejs/plugin-vue':
+        specifier: catalog:frontend
+        version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.2(vitest@2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       unplugin-icons:
         specifier: ^0.19.0
-        version: 0.19.0(@vue/compiler-sfc@3.5.11)
+        version: 0.19.0(@vue/compiler-sfc@3.5.13)
       vite:
         specifier: catalog:frontend
-        version: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
       vite-plugin-dts:
-        specifier: ^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))
+        specifier: ^4.3.0
+        version: 4.3.0(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.7.2)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
       vitest:
         specifier: catalog:frontend
-        version: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 2.1.8(@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)
+        specifier: ^2.1.10
+        version: 2.1.10(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
 
   packages/@n8n/client-oauth2:
     dependencies:
@@ -353,17 +383,23 @@ importers:
 
   packages/@n8n/config:
     dependencies:
+      '@n8n/di':
+        specifier: workspace:*
+        version: link:../di
       reflect-metadata:
-        specifier: 0.2.2
-        version: 0.2.2
-      typedi:
         specifier: 'catalog:'
-        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
+        version: 0.2.2
+
+  packages/@n8n/di:
+    dependencies:
+      reflect-metadata:
+        specifier: 'catalog:'
+        version: 0.2.2
 
   packages/@n8n/imap:
     dependencies:
       iconv-lite:
-        specifier: 0.6.3
+        specifier: 'catalog:'
         version: 0.6.3
       imap:
         specifier: 0.8.19
@@ -407,7 +443,7 @@ importers:
         version: 3.666.0(@aws-sdk/client-sts@3.666.0)
       '@getzep/zep-cloud':
         specifier: 1.0.12
-        version: 1.0.12(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(cbdnlo2gcodz2gzix466oterhe))
+        version: 1.0.12(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.11(ppo73pxbxzh4gygvo2i6vjkife))
       '@getzep/zep-js':
         specifier: 0.9.0
         version: 0.9.0
@@ -418,56 +454,56 @@ importers:
         specifier: 5.3.0
         version: 5.3.0(encoding@0.1.13)
       '@google/generative-ai':
-        specifier: 0.19.0
-        version: 0.19.0
+        specifier: 0.21.0
+        version: 0.21.0
       '@huggingface/inference':
         specifier: 2.8.0
         version: 2.8.0
       '@langchain/anthropic':
-        specifier: 0.3.1
-        version: 0.3.1(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        specifier: 0.3.11
+        version: 0.3.11(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/aws':
-        specifier: 0.1.0
-        version: 0.1.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
+        specifier: 0.1.3
+        version: 0.1.3(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
       '@langchain/cohere':
-        specifier: 0.3.0
-        version: 0.3.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/community':
         specifier: 0.3.2
-        version: 0.3.2(rx3iiky3qnn44pzlnyiooyzaly)
+        version: 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/community':
+        specifier: 0.3.24
+        version: 0.3.24(l2droam2fsjs4mc7x4hehsyzcy)
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+        version: 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       '@langchain/google-genai':
-        specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
+        specifier: 0.1.6
+        version: 0.1.6(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
       '@langchain/google-vertexai':
-        specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
+        specifier: 0.1.8
+        version: 0.1.8(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
       '@langchain/groq':
-        specifier: 0.1.2
-        version: 0.1.2(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        specifier: 0.1.3
+        version: 0.1.3(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/mistralai':
-        specifier: 0.1.1
-        version: 0.1.1(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        specifier: 0.2.0
+        version: 0.2.0(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
       '@langchain/ollama':
-        specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
+        specifier: 0.1.4
+        version: 0.1.4(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
       '@langchain/openai':
-        specifier: 0.3.0
-        version: 0.3.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+        specifier: 0.3.17
+        version: 0.3.17(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       '@langchain/pinecone':
-        specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
+        specifier: 0.1.3
+        version: 0.1.3(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
       '@langchain/qdrant':
-        specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(typescript@5.6.2)
+        specifier: 0.1.1
+        version: 0.1.1(@langchain/core@0.3.19(openai@4.78.1(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.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
+        version: 0.1.0(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
       '@langchain/textsplitters':
         specifier: 0.1.0
-        version: 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
+        version: 0.1.0(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
       '@mozilla/readability':
         specifier: 0.5.0
         version: 0.5.0
@@ -476,22 +512,22 @@ 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@8.42.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
       '@pinecone-database/pinecone':
-        specifier: 3.0.3
-        version: 3.0.3
+        specifier: 4.0.0
+        version: 4.0.0
       '@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
@@ -499,8 +535,8 @@ importers:
         specifier: 1.0.0
         version: 1.0.0
       cohere-ai:
-        specifier: 7.13.2
-        version: 7.13.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
+        specifier: 7.14.0
+        version: 7.14.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
       d3-dsv:
         specifier: 2.0.0
         version: 2.0.0
@@ -520,8 +556,8 @@ importers:
         specifier: 23.0.1
         version: 23.0.1
       langchain:
-        specifier: 0.3.2
-        version: 0.3.2(cbdnlo2gcodz2gzix466oterhe)
+        specifier: 0.3.11
+        version: 0.3.11(ppo73pxbxzh4gygvo2i6vjkife)
       lodash:
         specifier: 'catalog:'
         version: 4.17.21
@@ -538,8 +574,8 @@ importers:
         specifier: workspace:*
         version: link:../../workflow
       openai:
-        specifier: 4.63.0
-        version: 4.63.0(encoding@0.1.13)(zod@3.23.8)
+        specifier: 4.78.1
+        version: 4.78.1(encoding@0.1.13)(zod@3.23.8)
       pdf-parse:
         specifier: 1.1.1
         version: 1.1.1
@@ -595,50 +631,71 @@ importers:
   packages/@n8n/storybook:
     devDependencies:
       '@chromatic-com/storybook':
-        specifier: ^2.0.2
-        version: 2.0.2(react@18.2.0)
+        specifier: ^3.2.2
+        version: 3.2.2(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
       '@storybook/addon-a11y':
-        specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
       '@storybook/addon-actions':
-        specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
       '@storybook/addon-docs':
-        specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))
       '@storybook/addon-essentials':
-        specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))
       '@storybook/addon-interactions':
-        specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
       '@storybook/addon-links':
-        specifier: ^8.3.5
-        version: 8.3.5(react@18.2.0)(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
       '@storybook/addon-themes':
-        specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
       '@storybook/blocks':
-        specifier: ^8.3.5
-        version: 8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
       '@storybook/test':
-        specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)
+        specifier: ^8.4.6
+        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))
       '@storybook/vue3':
-        specifier: ^8.3.5
-        version: 8.3.5(storybook@8.3.5)(vue@3.5.11(typescript@5.6.2))
+        specifier: ^8.4.6
+        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))(vue@3.5.13(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))
+        specifier: ^8.4.6
+        version: 8.4.6(storybook@8.4.6(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       chromatic:
-        specifier: ^11.10.2
-        version: 11.10.2
+        specifier: ^11.20.0
+        version: 11.20.0
       storybook:
-        specifier: ^8.3.5
-        version: 8.3.5
+        specifier: ^8.4.6
+        version: 8.4.6(prettier@3.3.3)
 
   packages/@n8n/task-runner:
     dependencies:
+      '@n8n/config':
+        specifier: workspace:*
+        version: link:../config
+      '@n8n/di':
+        specifier: workspace:*
+        version: link:../di
+      '@sentry/node':
+        specifier: 'catalog:'
+        version: 8.42.0
+      acorn:
+        specifier: 8.14.0
+        version: 8.14.0
+      acorn-walk:
+        specifier: 8.3.4
+        version: 8.3.4
+      lodash:
+        specifier: 'catalog:'
+        version: 4.17.21
+      luxon:
+        specifier: 'catalog:'
+        version: 3.4.4
       n8n-core:
         specifier: workspace:*
         version: link:../../core
@@ -646,15 +703,15 @@ importers:
         specifier: workspace:*
         version: link:../../workflow
       nanoid:
-        specifier: ^3.3.6
-        version: 3.3.7
+        specifier: 'catalog:'
+        version: 3.3.8
       ws:
         specifier: '>=8.17.1'
         version: 8.17.1
     devDependencies:
-      luxon:
+      '@types/lodash':
         specifier: 'catalog:'
-        version: 3.4.4
+        version: 4.14.195
 
   packages/@n8n_io/eslint-config:
     devDependencies:
@@ -663,28 +720,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)(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)
@@ -696,7 +753,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)
@@ -724,6 +781,9 @@ importers:
       '@n8n/config':
         specifier: workspace:*
         version: link:../@n8n/config
+      '@n8n/di':
+        specifier: workspace:*
+        version: link:../@n8n/di
       '@n8n/localtunnel':
         specifier: 3.0.0
         version: 3.0.0
@@ -738,10 +798,10 @@ 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@8.42.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
+        specifier: 1.13.0
+        version: 1.13.0
       '@n8n_io/license-sdk':
         specifier: 2.13.1
         version: 2.13.1
@@ -751,12 +811,9 @@ importers:
       '@rudderstack/rudder-sdk-node':
         specifier: 2.0.9
         version: 2.0.9(tslib@2.6.2)
-      '@sentry/integrations':
-        specifier: 7.87.0
-        version: 7.87.0
       '@sentry/node':
-        specifier: 7.87.0
-        version: 7.87.0
+        specifier: 'catalog:'
+        version: 8.42.0
       aws4:
         specifier: 1.11.0
         version: 1.11.0
@@ -768,13 +825,10 @@ importers:
         version: 2.4.3
       bull:
         specifier: 4.12.1
-        version: 4.12.1
+        version: 4.12.1(patch_hash=ep6h4rqtpclldfcdohxlgcb3aq)
       cache-manager:
         specifier: 5.2.3
         version: 5.2.3
-      callsites:
-        specifier: 3.1.0
-        version: 3.1.0
       change-case:
         specifier: 4.1.2
         version: 4.1.2
@@ -827,7 +881,7 @@ importers:
         specifier: 5.0.2
         version: 5.0.2
       flatted:
-        specifier: 3.2.7
+        specifier: 'catalog:'
         version: 3.2.7
       formidable:
         specifier: 3.5.1
@@ -882,7 +936,7 @@ importers:
         version: link:../workflow
       nanoid:
         specifier: 'catalog:'
-        version: 3.3.6
+        version: 3.3.8
       nodemailer:
         specifier: 6.9.9
         version: 6.9.9
@@ -908,7 +962,7 @@ importers:
         specifier: 8.12.0
         version: 8.12.0
       picocolors:
-        specifier: 1.0.1
+        specifier: 'catalog:'
         version: 1.0.1
       pkce-challenge:
         specifier: 3.0.0
@@ -926,7 +980,7 @@ importers:
         specifier: 2.5.1
         version: 2.5.1
       reflect-metadata:
-        specifier: 0.2.2
+        specifier: 'catalog:'
         version: 0.2.2
       replacestream:
         specifier: 4.0.3
@@ -958,18 +1012,12 @@ importers:
       syslog-client:
         specifier: 1.1.1
         version: 1.1.1
-      typedi:
-        specifier: 'catalog:'
-        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
         specifier: 'catalog:'
         version: 10.0.0
       validator:
         specifier: 13.7.0
         version: 13.7.0
-      winston:
-        specifier: 3.14.2
-        version: 3.14.2
       ws:
         specifier: '>=8.17.1'
         version: 8.17.1
@@ -1075,25 +1123,37 @@ 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:
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(zod@3.23.8))
+        version: 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       '@n8n/client-oauth2':
         specifier: workspace:*
         version: link:../@n8n/client-oauth2
       '@n8n/config':
         specifier: workspace:*
         version: link:../@n8n/config
+      '@n8n/di':
+        specifier: workspace:*
+        version: link:../@n8n/di
+      '@sentry/node':
+        specifier: 'catalog:'
+        version: 8.42.0
       aws4:
         specifier: 1.11.0
         version: 1.11.0
       axios:
         specifier: 'catalog:'
         version: 1.7.4
+      callsites:
+        specifier: 'catalog:'
+        version: 3.1.0
+      chardet:
+        specifier: 2.0.0
+        version: 2.0.0
       concat-stream:
         specifier: 2.0.0
         version: 2.0.0
@@ -1109,6 +1169,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
@@ -1123,13 +1186,16 @@ importers:
         version: link:../workflow
       nanoid:
         specifier: 'catalog:'
-        version: 3.3.6
+        version: 3.3.8
       oauth-1.0a:
         specifier: 2.2.6
         version: 2.2.6
       p-cancelable:
         specifier: 2.1.1
         version: 2.1.1
+      picocolors:
+        specifier: 'catalog:'
+        version: 1.0.1
       pretty-bytes:
         specifier: 5.6.0
         version: 5.6.0
@@ -1139,12 +1205,12 @@ importers:
       ssh2:
         specifier: 1.15.0
         version: 1.15.0
-      typedi:
-        specifier: 'catalog:'
-        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
         specifier: 'catalog:'
         version: 10.0.0
+      winston:
+        specifier: 3.14.2
+        version: 3.14.2
       xml2js:
         specifier: 'catalog:'
         version: 0.6.2
@@ -1184,10 +1250,16 @@ 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.13(typescript@5.7.2))
+      '@vueuse/core':
+        specifier: '*'
+        version: 10.11.0(vue@3.5.13(typescript@5.7.2))
       element-plus:
         specifier: 2.4.3
-        version: 2.4.3(vue@3.5.11(typescript@5.6.2))
+        version: 2.4.3(vue@3.5.13(typescript@5.7.2))
+      is-emoji-supported:
+        specifier: ^0.0.5
+        version: 0.0.5
       markdown-it:
         specifier: ^13.0.2
         version: 13.0.2
@@ -1208,13 +1280,13 @@ importers:
         version: 2.12.1
       vue:
         specifier: catalog:frontend
-        version: 3.5.11(typescript@5.6.2)
+        version: 3.5.13(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.13(typescript@5.7.2))
       vue-router:
         specifier: catalog:frontend
-        version: 4.4.5(vue@3.5.11(typescript@5.6.2))
+        version: 4.5.0(vue@3.5.13(typescript@5.7.2))
       xss:
         specifier: 'catalog:'
         version: 1.0.15
@@ -1230,7 +1302,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.13)(vue@3.5.13(typescript@5.7.2))
       '@types/markdown-it':
         specifier: ^13.0.9
         version: 13.0.9
@@ -1244,11 +1316,11 @@ importers:
         specifier: ^2.11.0
         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))
+        specifier: catalog:frontend
+        version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.2(vitest@2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+        version: 2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
       autoprefixer:
         specifier: ^10.4.19
         version: 10.4.19(postcss@8.4.38)
@@ -1260,25 +1332,25 @@ 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)
+        version: 0.19.0(@vue/compiler-sfc@3.5.13)
       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.26.3)(rollup@4.24.0)(vue@3.5.13(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)
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
       vitest:
         specifier: catalog:frontend
-        version: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 2.1.8(@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.8(@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)
+        specifier: ^2.1.10
+        version: 2.1.10(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
 
   packages/editor-ui:
     dependencies:
@@ -1303,6 +1375,9 @@ importers:
       '@codemirror/lint':
         specifier: ^6.8.0
         version: 6.8.0
+      '@codemirror/search':
+        specifier: ^6.5.6
+        version: 6.5.6
       '@codemirror/state':
         specifier: ^6.4.1
         version: 6.4.1
@@ -1323,7 +1398,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.13(typescript@5.7.2))
       '@jsplumb/browser-ui':
         specifier: ^5.13.2
         version: 5.13.2
@@ -1357,30 +1432,36 @@ importers:
       '@n8n/permissions':
         specifier: workspace:*
         version: link:../@n8n/permissions
+      '@replit/codemirror-indentation-markers':
+        specifier: ^6.5.3
+        version: 6.5.3(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)
       '@sentry/vue':
         specifier: catalog:frontend
-        version: 8.33.1(vue@3.5.11(typescript@5.6.2))
+        version: 8.33.1(vue@3.5.13(typescript@5.7.2))
+      '@typescript/vfs':
+        specifier: ^1.6.0
+        version: 1.6.0(typescript@5.7.2)
       '@vue-flow/background':
-        specifier: ^1.3.0
-        version: 1.3.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
+        specifier: ^1.3.2
+        version: 1.3.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/controls':
         specifier: ^1.1.2
-        version: 1.1.2(@vue-flow/core@1.41.2(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.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/core':
-        specifier: ^1.41.2
-        version: 1.41.2(vue@3.5.11(typescript@5.6.2))
+        specifier: ^1.41.6
+        version: 1.41.6(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/minimap':
         specifier: ^1.5.0
-        version: 1.5.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))
+        version: 1.5.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vue-flow/node-resizer':
         specifier: ^1.4.0
-        version: 1.4.0(@vue-flow/core@1.41.2(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.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@vueuse/components':
         specifier: ^10.11.0
-        version: 10.11.0(vue@3.5.11(typescript@5.6.2))
+        version: 10.11.0(vue@3.5.13(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.13(typescript@5.7.2))
       axios:
         specifier: 'catalog:'
         version: 1.7.4
@@ -1396,6 +1477,9 @@ importers:
       codemirror-lang-html-n8n:
         specifier: ^1.0.0
         version: 1.0.0
+      comlink:
+        specifier: ^4.4.1
+        version: 4.4.1
       dateformat:
         specifier: ^3.0.3
         version: 3.0.3
@@ -1412,7 +1496,7 @@ importers:
         specifier: ^2.0.2
         version: 2.0.5
       flatted:
-        specifier: ^3.2.4
+        specifier: 'catalog:'
         version: 3.2.7
       highlight.js:
         specifier: catalog:frontend
@@ -1437,19 +1521,22 @@ 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.13(typescript@5.7.2))
       prettier:
         specifier: ^3.3.3
         version: 3.3.3
       qrcode.vue:
         specifier: ^3.3.4
-        version: 3.3.4(vue@3.5.11(typescript@5.6.2))
+        version: 3.3.4(vue@3.5.13(typescript@5.7.2))
       stream-browserify:
         specifier: ^3.0.0
         version: 3.0.0
       timeago.js:
         specifier: ^4.0.2
         version: 4.0.2
+      typescript:
+        specifier: ^5.7.2
+        version: 5.7.2
       uuid:
         specifier: 'catalog:'
         version: 10.0.0
@@ -1458,28 +1545,37 @@ importers:
         version: 1.2.2
       vue:
         specifier: catalog:frontend
-        version: 3.5.11(typescript@5.6.2)
+        version: 3.5.13(typescript@5.7.2)
       vue-agile:
         specifier: ^2.0.0
         version: 2.0.0
       vue-chartjs:
         specifier: ^5.2.0
-        version: 5.2.0(chart.js@4.4.0)(vue@3.5.11(typescript@5.6.2))
+        version: 5.2.0(chart.js@4.4.0)(vue@3.5.13(typescript@5.7.2))
+      vue-github-button:
+        specifier: ^3.1.3
+        version: 3.1.3
       vue-i18n:
         specifier: ^9.2.2
-        version: 9.2.2(vue@3.5.11(typescript@5.6.2))
+        version: 9.2.2(vue@3.5.13(typescript@5.7.2))
       vue-json-pretty:
         specifier: 2.2.4
-        version: 2.2.4(vue@3.5.11(typescript@5.6.2))
+        version: 2.2.4(vue@3.5.13(typescript@5.7.2))
       vue-markdown-render:
         specifier: catalog:frontend
-        version: 2.2.1(vue@3.5.11(typescript@5.6.2))
+        version: 2.2.1(vue@3.5.13(typescript@5.7.2))
       vue-router:
         specifier: catalog:frontend
-        version: 4.4.5(vue@3.5.11(typescript@5.6.2))
+        version: 4.5.0(vue@3.5.13(typescript@5.7.2))
+      vue-virtual-scroller:
+        specifier: 2.0.0-beta.8
+        version: 2.0.0-beta.8(vue@3.5.13(typescript@5.7.2))
       vue3-touch-events:
         specifier: ^4.1.3
         version: 4.1.3
+      vuedraggable:
+        specifier: 4.1.0
+        version: 4.1.0(vue@3.5.13(typescript@5.7.2))
       xss:
         specifier: 'catalog:'
         version: 1.0.15
@@ -1492,10 +1588,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))
-      '@sentry/vite-plugin':
-        specifier: ^2.22.5
-        version: 2.22.5(encoding@0.1.13)
+        version: 0.1.6(pinia@2.2.4(typescript@5.7.2)(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))
       '@types/dateformat':
         specifier: ^3.0.0
         version: 3.0.1
@@ -1517,36 +1610,48 @@ importers:
       '@types/uuid':
         specifier: 'catalog:'
         version: 10.0.0
+      '@vitejs/plugin-legacy':
+        specifier: ^6.0.0
+        version: 6.0.0(terser@5.16.1)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
+      '@vitejs/plugin-vue':
+        specifier: catalog:frontend
+        version: 5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))
       '@vitest/coverage-v8':
         specifier: catalog:frontend
-        version: 2.1.2(vitest@2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
-      cross-env:
-        specifier: ^7.0.3
-        version: 7.0.3
+        version: 2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))
+      browserslist-to-esbuild:
+        specifier: ^2.1.1
+        version: 2.1.1(browserslist@4.24.2)
       miragejs:
         specifier: ^0.1.48
         version: 0.1.48
       unplugin-icons:
         specifier: ^0.19.0
-        version: 0.19.0(@vue/compiler-sfc@3.5.11)
+        version: 0.19.0(@vue/compiler-sfc@3.5.13)
       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.26.3)(rollup@4.24.0)(vue@3.5.13(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)
+        version: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vite-svg-loader:
+        specifier: 5.1.0
+        version: 5.1.0(vue@3.5.13(typescript@5.7.2))
       vitest:
         specifier: catalog:frontend
-        version: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+        version: 2.1.8(@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.8(@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)
+        specifier: ^2.1.10
+        version: 2.1.10(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2)
 
   packages/node-dev:
     dependencies:
+      '@n8n/di':
+        specifier: workspace:*
+        version: link:../@n8n/di
       '@oclif/core':
         specifier: 4.0.7
         version: 4.0.7
@@ -1571,9 +1676,6 @@ importers:
       tmp-promise:
         specifier: ^3.0.3
         version: 3.0.3
-      typedi:
-        specifier: 'catalog:'
-        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
     devDependencies:
       '@types/inquirer':
         specifier: ^6.5.0
@@ -1590,6 +1692,9 @@ importers:
       '@n8n/config':
         specifier: workspace:*
         version: link:../@n8n/config
+      '@n8n/di':
+        specifier: workspace:*
+        version: link:../@n8n/di
       '@n8n/imap':
         specifier: workspace:*
         version: link:../@n8n/imap
@@ -1635,6 +1740,9 @@ importers:
       fflate:
         specifier: 0.7.4
         version: 0.7.4
+      generate-schema:
+        specifier: 2.6.0
+        version: 2.6.0
       get-system-fonts:
         specifier: 2.0.2
         version: 2.0.2
@@ -1645,7 +1753,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
@@ -1687,8 +1795,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
@@ -1764,9 +1872,6 @@ importers:
       ts-ics:
         specifier: 1.2.2
         version: 1.2.2(date-fns@2.30.0)(lodash@4.17.21)(zod@3.23.8)
-      typedi:
-        specifier: 'catalog:'
-        version: 0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe)
       uuid:
         specifier: 'catalog:'
         version: 10.0.0
@@ -1848,7 +1953,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
@@ -1856,8 +1961,8 @@ importers:
   packages/workflow:
     dependencies:
       '@n8n/tournament':
-        specifier: 1.0.5
-        version: 1.0.5
+        specifier: 1.0.6
+        version: 1.0.6
       '@n8n_io/riot-tmpl':
         specifier: 4.0.0
         version: 4.0.0
@@ -1868,7 +1973,7 @@ importers:
         specifier: 'catalog:'
         version: 1.7.4
       callsites:
-        specifier: 3.1.0
+        specifier: 'catalog:'
         version: 3.1.0
       deep-equal:
         specifier: 2.2.0
@@ -1912,7 +2017,10 @@ importers:
     devDependencies:
       '@langchain/core':
         specifier: 'catalog:'
-        version: 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0)
+        version: 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@n8n/config':
+        specifier: workspace:*
+        version: link:../@n8n/config
       '@types/deep-equal':
         specifier: ^1.0.1
         version: 1.0.1
@@ -1968,6 +2076,9 @@ packages:
   '@anthropic-ai/sdk@0.27.3':
     resolution: {integrity: sha512-IjLt0gd3L4jlOfilxVXTifn42FnVffMgDC04RJK1KDZpmkBWLv0XC92MVVmkxrFZNS/7l3xWgP/I3nqtX1sQHw==}
 
+  '@anthropic-ai/sdk@0.32.1':
+    resolution: {integrity: sha512-U9JwTrDvdQ9iWuABVsMLj8nJVwAyQz6QXvgLsVhryhCEPkLsbcP/MXxm+jYcAwLoV8ESbaTTjnD4kuAFa+Hyjg==}
+
   '@apidevtools/json-schema-ref-parser@11.7.0':
     resolution: {integrity: sha512-pRrmXMCwnmrkS3MLgAIW5dXRzeTv6GLjkjb4HmxNnvAKXN1Nfzp4KmGADBQvlVUcqi+a5D+hfGDLLnd5NnYxog==}
     engines: {node: '>= 16'}
@@ -2218,7 +2329,7 @@ packages:
   '@azure/core-http@3.0.4':
     resolution: {integrity: sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ==}
     engines: {node: '>=14.0.0'}
-    deprecated: deprecating as we migrated to core v2
+    deprecated: This package is no longer supported. Please migrate to use @azure/core-rest-pipeline
 
   '@azure/core-lro@2.4.0':
     resolution: {integrity: sha512-F65+rYkll1dpw3RGm8/SSiSj+/QkMeYDanzS/QKlM1dmuneVyXbO46C88V1MRHluLGdMP6qfD3vDRYALn0z0tQ==}
@@ -2284,14 +2395,26 @@ packages:
     resolution: {integrity: sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/code-frame@7.26.2':
+    resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/compat-data@7.23.5':
     resolution: {integrity: sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/compat-data@7.26.3':
+    resolution: {integrity: sha512-nHIxvKPniQXpmQLb0vhY3VaFb3S0YrTAwpOWJZh1wn3oJPjJk9Asva204PsBdmAE8vpzfHudT8DB0scYvy9q0g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/core@7.24.0':
     resolution: {integrity: sha512-fQfkg0Gjkza3nf0c7/w6Xf34BW4YvzNfACRLmmb7XRLa6XHdR+K9AlJlxneFfWYf6uhOzuzZVTjF/8KfndZANw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/core@7.26.0':
+    resolution: {integrity: sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/generator@7.22.9':
     resolution: {integrity: sha512-KtLMbmicyuK2Ak/FTCJVbDnkN1SlT8/kceFTiuDiiRUUSMnHMidxSCdG4ndkTOHHpoomWe/4xkvHkEOncwjYIw==}
     engines: {node: '>=6.9.0'}
@@ -2300,10 +2423,39 @@ packages:
     resolution: {integrity: sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/generator@7.26.3':
+    resolution: {integrity: sha512-6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-annotate-as-pure@7.25.9':
+    resolution: {integrity: sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-compilation-targets@7.23.6':
     resolution: {integrity: sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-compilation-targets@7.25.9':
+    resolution: {integrity: sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-create-class-features-plugin@7.25.9':
+    resolution: {integrity: sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-create-regexp-features-plugin@7.26.3':
+    resolution: {integrity: sha512-G7ZRb40uUgdKOQqPLjfD12ZmGA54PzqDFUv2BKImnC9QIfGhIHKvVML0oN8IUiDq4iRqpq74ABpvOaerfWdong==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-define-polyfill-provider@0.6.3':
+    resolution: {integrity: sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
   '@babel/helper-environment-visitor@7.22.20':
     resolution: {integrity: sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==}
     engines: {node: '>=6.9.0'}
@@ -2316,24 +2468,62 @@ packages:
     resolution: {integrity: sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    resolution: {integrity: sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-imports@7.22.15':
     resolution: {integrity: sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-module-imports@7.25.9':
+    resolution: {integrity: sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-module-transforms@7.23.3':
     resolution: {integrity: sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==}
     engines: {node: '>=6.9.0'}
     peerDependencies:
       '@babel/core': ^7.0.0
 
+  '@babel/helper-module-transforms@7.26.0':
+    resolution: {integrity: sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-optimise-call-expression@7.25.9':
+    resolution: {integrity: sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-plugin-utils@7.22.5':
     resolution: {integrity: sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-plugin-utils@7.25.9':
+    resolution: {integrity: sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-remap-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/helper-replace-supers@7.25.9':
+    resolution: {integrity: sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
   '@babel/helper-simple-access@7.22.5':
     resolution: {integrity: sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    resolution: {integrity: sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-split-export-declaration@7.22.6':
     resolution: {integrity: sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==}
     engines: {node: '>=6.9.0'}
@@ -2342,6 +2532,10 @@ packages:
     resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-string-parser@7.25.9':
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-identifier@7.22.20':
     resolution: {integrity: sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==}
     engines: {node: '>=6.9.0'}
@@ -2350,14 +2544,30 @@ packages:
     resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-identifier@7.25.9':
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helper-validator-option@7.23.5':
     resolution: {integrity: sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helper-validator-option@7.25.9':
+    resolution: {integrity: sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/helper-wrap-function@7.25.9':
+    resolution: {integrity: sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/helpers@7.24.0':
     resolution: {integrity: sha512-ulDZdc0Aj5uLc5nETsa7EPx2L7rM0YJM8r7ck7U73AXi7qOV44IHHRAYZHY6iU1rr3C5N4NtTmMRUJP6kwCWeA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/helpers@7.26.0':
+    resolution: {integrity: sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/highlight@7.24.6':
     resolution: {integrity: sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==}
     engines: {node: '>=6.9.0'}
@@ -2367,6 +2577,52 @@ packages:
     engines: {node: '>=6.0.0'}
     hasBin: true
 
+  '@babel/parser@7.26.2':
+    resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/parser@7.26.3':
+    resolution: {integrity: sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9':
+    resolution: {integrity: sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9':
+    resolution: {integrity: sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9':
+    resolution: {integrity: sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.13.0
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9':
+    resolution: {integrity: sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2':
+    resolution: {integrity: sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-syntax-async-generators@7.8.4':
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -2382,6 +2638,18 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-syntax-import-assertions@7.26.0':
+    resolution: {integrity: sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-syntax-import-attributes@7.26.0':
+    resolution: {integrity: sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
   '@babel/plugin-syntax-import-meta@7.10.4':
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
@@ -2440,6 +2708,323 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
 
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6':
+    resolution: {integrity: sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-arrow-functions@7.25.9':
+    resolution: {integrity: sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-async-generator-functions@7.25.9':
+    resolution: {integrity: sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-async-to-generator@7.25.9':
+    resolution: {integrity: sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoped-functions@7.25.9':
+    resolution: {integrity: sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-block-scoping@7.25.9':
+    resolution: {integrity: sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-properties@7.25.9':
+    resolution: {integrity: sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-class-static-block@7.26.0':
+    resolution: {integrity: sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+
+  '@babel/plugin-transform-classes@7.25.9':
+    resolution: {integrity: sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-computed-properties@7.25.9':
+    resolution: {integrity: sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-destructuring@7.25.9':
+    resolution: {integrity: sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-dotall-regex@7.25.9':
+    resolution: {integrity: sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-duplicate-keys@7.25.9':
+    resolution: {integrity: sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-dynamic-import@7.25.9':
+    resolution: {integrity: sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-exponentiation-operator@7.26.3':
+    resolution: {integrity: sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-export-namespace-from@7.25.9':
+    resolution: {integrity: sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-for-of@7.25.9':
+    resolution: {integrity: sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-function-name@7.25.9':
+    resolution: {integrity: sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-json-strings@7.25.9':
+    resolution: {integrity: sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-literals@7.25.9':
+    resolution: {integrity: sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9':
+    resolution: {integrity: sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-member-expression-literals@7.25.9':
+    resolution: {integrity: sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-amd@7.25.9':
+    resolution: {integrity: sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-commonjs@7.26.3':
+    resolution: {integrity: sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-systemjs@7.25.9':
+    resolution: {integrity: sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-modules-umd@7.25.9':
+    resolution: {integrity: sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9':
+    resolution: {integrity: sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-new-target@7.25.9':
+    resolution: {integrity: sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.25.9':
+    resolution: {integrity: sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-numeric-separator@7.25.9':
+    resolution: {integrity: sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9':
+    resolution: {integrity: sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-object-super@7.25.9':
+    resolution: {integrity: sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9':
+    resolution: {integrity: sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-optional-chaining@7.25.9':
+    resolution: {integrity: sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-parameters@7.25.9':
+    resolution: {integrity: sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-methods@7.25.9':
+    resolution: {integrity: sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-private-property-in-object@7.25.9':
+    resolution: {integrity: sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-property-literals@7.25.9':
+    resolution: {integrity: sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regenerator@7.25.9':
+    resolution: {integrity: sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-regexp-modifiers@7.26.0':
+    resolution: {integrity: sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/plugin-transform-reserved-words@7.25.9':
+    resolution: {integrity: sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-shorthand-properties@7.25.9':
+    resolution: {integrity: sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-spread@7.25.9':
+    resolution: {integrity: sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-sticky-regex@7.25.9':
+    resolution: {integrity: sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-template-literals@7.25.9':
+    resolution: {integrity: sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-typeof-symbol@7.25.9':
+    resolution: {integrity: sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9':
+    resolution: {integrity: sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9':
+    resolution: {integrity: sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-regex@7.25.9':
+    resolution: {integrity: sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9':
+    resolution: {integrity: sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+
+  '@babel/preset-env@7.26.0':
+    resolution: {integrity: sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+
+  '@babel/preset-modules@0.1.6-no-external-plugins':
+    resolution: {integrity: sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
+
   '@babel/runtime@7.24.7':
     resolution: {integrity: sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==}
     engines: {node: '>=6.9.0'}
@@ -2448,14 +3033,30 @@ packages:
     resolution: {integrity: sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/template@7.25.9':
+    resolution: {integrity: sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/traverse@7.24.0':
     resolution: {integrity: sha512-HfuJlI8qq3dEDmNU5ChzzpZRWq+oxCZQyMzIMEqLho+AQnhMnKQUzH6ydo3RBl/YjPCuk68Y6s0Gx0AeyULiWw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/traverse@7.26.3':
+    resolution: {integrity: sha512-yTmc8J+Sj8yLzwr4PD5Xb/WF3bOYu2C2OoSZPzbuqRm4n98XirsbzaX+GloeO376UnSYIYJ4NCanwV5/ugZkwA==}
+    engines: {node: '>=6.9.0'}
+
   '@babel/types@7.25.6':
     resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==}
     engines: {node: '>=6.9.0'}
 
+  '@babel/types@7.26.0':
+    resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
+    engines: {node: '>=6.9.0'}
+
+  '@babel/types@7.26.3':
+    resolution: {integrity: sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==}
+    engines: {node: '>=6.9.0'}
+
   '@bcoe/v8-coverage@0.2.3':
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
 
@@ -2512,6 +3113,18 @@ packages:
     cpu: [x64]
     os: [win32]
 
+  '@browserbasehq/sdk@2.0.0':
+    resolution: {integrity: sha512-BdPlZyn0dpXlL70gNK4acpqWIRB+edo2z0/GalQdWghRq8iQjySd9fVIF3evKH1p2wCYekZJRK6tm29YfXB67g==}
+
+  '@browserbasehq/stagehand@1.9.0':
+    resolution: {integrity: sha512-0wIFnwOVnUEgVkPKW0RX7NoOt98qaRJ8+l1m9ppk1f5E03GtefDQTMiQwwT9WQn163bpZT5cOhyA1I3jZNfFeA==}
+    peerDependencies:
+      '@playwright/test': ^1.42.1
+      deepmerge: ^4.3.1
+      dotenv: ^16.4.5
+      openai: ^4.62.1
+      zod: ^3.23.8
+
   '@cfaester/enzyme-adapter-react-18@0.8.0':
     resolution: {integrity: sha512-3Z3ThTUouHwz8oIyhTYQljEMNRFtlVyc3VOOHCbxs47U6cnXs8K9ygi/c1tv49s7MBlTXeIcuN+Ttd9aPtILFQ==}
     peerDependencies:
@@ -2519,9 +3132,11 @@ packages:
       react: '>=18'
       react-dom: '>=18'
 
-  '@chromatic-com/storybook@2.0.2':
-    resolution: {integrity: sha512-7bPIliISedeIpnVKbzktysFYW5n56bN91kxuOj1XXKixmjbUHRUMvcXd4K2liN6MiR5ZqJtmtcPsZ6CebbGlEA==}
+  '@chromatic-com/storybook@3.2.2':
+    resolution: {integrity: sha512-xmXt/GW0hAPbzNTrxYuVo43Adrtjue4DeVrsoIIEeJdGaPNNeNf+DHMlJKOBdlHmCnFUoe9R/0mLM9zUp5bKWw==}
     engines: {node: '>=16.0.0', yarn: '>=1.22.18'}
+    peerDependencies:
+      storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
 
   '@codemirror/autocomplete@6.16.0':
     resolution: {integrity: sha512-P/LeCTtZHRTCU4xQsa89vSKWecYv1ZqwzOd5topheGRf+qtacFgBeIMQi3eL8Kt/BUNvxUWkx+5qP2jlGoARrg==}
@@ -2555,6 +3170,9 @@ packages:
   '@codemirror/lint@6.8.0':
     resolution: {integrity: sha512-lsFofvaw0lnPRJlQylNsC4IRt/1lI4OD/yYslrSGVndOJfStc58v+8p9dgGiD90ktOfL7OhBWns1ZETYgz0EJA==}
 
+  '@codemirror/search@6.5.6':
+    resolution: {integrity: sha512-rpMgcsh7o0GuCDUXKPvww+muLA1pDJaFrpq/CCHtpQJYz8xopu4D1hPcKRoDD0YlF8gZaqTNIRa4VRBWyhyy7Q==}
+
   '@codemirror/state@6.3.3':
     resolution: {integrity: sha512-0wufKcTw2dEwEaADajjHf6hBy1sh3M6V0e+q4JKIhLuiMSe5td5HOWpUdvKth1fT1M9VYOboajoBHpkCd7PG7A==}
 
@@ -2610,6 +3228,9 @@ packages:
     peerDependencies:
       vue: ^3.2.0
 
+  '@emnapi/runtime@1.3.1':
+    resolution: {integrity: sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==}
+
   '@emotion/is-prop-valid@1.2.1':
     resolution: {integrity: sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw==}
 
@@ -2876,12 +3497,8 @@ packages:
     resolution: {integrity: sha512-Z3ZzOnF3YKLuvpkvF+TjQ6lztxcAyTILp+FjKonmVpEwPa9vFvxpZjubLR4sB6bf19i/8HL2AXRjA0YFgHFRmQ==}
     engines: {node: '>=14'}
 
-  '@google/generative-ai@0.19.0':
-    resolution: {integrity: sha512-iGf/62v3sTwtEJGJY6S5m7PfkglU8hi1URaxqIjiRg1OItV27xyc4aVeR0og8cDkZFkUlGZKv+23bJtT1QWFzQ==}
-    engines: {node: '>=18.0.0'}
-
-  '@google/generative-ai@0.7.1':
-    resolution: {integrity: sha512-WTjMLLYL/xfA5BW6xAycRPiAX7FNHKAxrid/ayqC1QMam0KAK0NbMeS9Lubw80gVg5xFMLE+H7pw4wdNzTOlxw==}
+  '@google/generative-ai@0.21.0':
+    resolution: {integrity: sha512-7XhUbtnlkSEZK15kN3t+tzIMxsbKm/dSkKBFalj+20NvPKe1kBY7mR2P7vuijEn+f06z5+A8bVGKO0v39cr6Wg==}
     engines: {node: '>=18.0.0'}
 
   '@grpc/grpc-js@1.10.8':
@@ -2919,6 +3536,10 @@ packages:
     resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
     deprecated: Use @eslint/object-schema instead
 
+  '@ibm-cloud/watsonx-ai@1.1.2':
+    resolution: {integrity: sha512-0+ClK12jk1Jk28Hwc2BDmKkTXPjFkQOfCKzUk82TsoPwAIEVN+rlM1cny52d3oSMXXbeKorVDmnIEbXPseHiQA==}
+    engines: {node: '>=18.0.0'}
+
   '@icetee/ftp@0.3.15':
     resolution: {integrity: sha512-RxSa9VjcDWgWCYsaLdZItdCnJj7p4LxggaEk+Y3MP0dHKoxez8ioG07DVekVbZZqccsrL+oPB/N9AzVPxj4blg==}
     engines: {node: '>=0.8.0'}
@@ -2935,6 +3556,111 @@ packages:
   '@iconify/utils@2.1.25':
     resolution: {integrity: sha512-Y+iGko8uv/Fz5bQLLJyNSZGOdMW0G7cnlEX1CiNcKsRXX9cq/y/vwxrIAtLCZhKHr3m0VJmsjVPsvnM4uX8YLg==}
 
+  '@img/sharp-darwin-arm64@0.33.5':
+    resolution: {integrity: sha512-UT4p+iz/2H4twwAoLCqfA9UH5pI6DggwKEGuaPy7nCVQ8ZsiY5PIcrRvD1DzuY3qYL07NtIQcWnBSY/heikIFQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-darwin-x64@0.33.5':
+    resolution: {integrity: sha512-fyHac4jIc1ANYGRDxtiqelIbdWkIuQaI84Mv45KvGRRxSAa7o7d1ZKAOBaYbnepLC1WqxfpimdeWfvqqSGwR2Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-arm64@1.0.4':
+    resolution: {integrity: sha512-XblONe153h0O2zuFfTAbQYAX2JhYmDHeWikp1LM9Hul9gVPjFY427k6dFEcOL72O01QxQsWi761svJ/ev9xEDg==}
+    cpu: [arm64]
+    os: [darwin]
+
+  '@img/sharp-libvips-darwin-x64@1.0.4':
+    resolution: {integrity: sha512-xnGR8YuZYfJGmWPvmlunFaWJsb9T/AO2ykoP3Fz/0X5XV2aoYBPkX6xqCQvUTKKiLddarLaxpzNe+b1hjeWHAQ==}
+    cpu: [x64]
+    os: [darwin]
+
+  '@img/sharp-libvips-linux-arm64@1.0.4':
+    resolution: {integrity: sha512-9B+taZ8DlyyqzZQnoeIvDVR/2F4EbMepXMc/NdVbkzsJbzkUjhXv/70GQJ7tdLA4YJgNP25zukcxpX2/SueNrA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-arm@1.0.5':
+    resolution: {integrity: sha512-gvcC4ACAOPRNATg/ov8/MnbxFDJqf/pDePbBnuBDcjsI8PssmjoKMAz4LtLaVi+OnSb5FK/yIOamqDwGmXW32g==}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-s390x@1.0.4':
+    resolution: {integrity: sha512-u7Wz6ntiSSgGSGcjZ55im6uvTrOxSIS8/dgoVMoiGE9I6JAfU50yH5BoDlYA1tcuGS7g/QNtetJnxA6QEsCVTA==}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-libvips-linux-x64@1.0.4':
+    resolution: {integrity: sha512-MmWmQ3iPFZr0Iev+BAgVMb3ZyC4KeFc3jFxnNbEPas60e1cIfevbtuyf9nDGIzOaW9PdnDciJm+wFFaTlj5xYw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+    resolution: {integrity: sha512-9Ti+BbTYDcsbp4wfYib8Ctm1ilkugkA/uscUn6UXK1ldpC1JjiXbLfFZtRlBhjPZ5o1NCLiDbg8fhUPKStHoTA==}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+    resolution: {integrity: sha512-viYN1KX9m+/hGkJtvYYp+CCLgnJXwiQB39damAO7WMdKWlIhmYTfHjwSbQeUK/20vY154mwezd9HflVFM1wVSw==}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linux-arm64@0.33.5':
+    resolution: {integrity: sha512-JMVv+AMRyGOHtO1RFBiJy/MBsgz0x4AWrT6QoEVVTyh1E39TrCUpTRI7mx9VksGX4awWASxqCYLCV4wBZHAYxA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linux-arm@0.33.5':
+    resolution: {integrity: sha512-JTS1eldqZbJxjvKaAkxhZmBqPRGmxgu+qFKSInv8moZ2AmT5Yib3EQ1c6gp493HvrvV8QgdOXdyaIBrhvFhBMQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm]
+    os: [linux]
+
+  '@img/sharp-linux-s390x@0.33.5':
+    resolution: {integrity: sha512-y/5PCd+mP4CA/sPDKl2961b+C9d+vPAveS33s6Z3zfASk2j5upL6fXVPZi7ztePZ5CuH+1kW8JtvxgbuXHRa4Q==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [s390x]
+    os: [linux]
+
+  '@img/sharp-linux-x64@0.33.5':
+    resolution: {integrity: sha512-opC+Ok5pRNAzuvq1AG0ar+1owsu842/Ab+4qvU879ippJBHvyY5n2mxF1izXqkPYlGuP/M556uh53jRLJmzTWA==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-arm64@0.33.5':
+    resolution: {integrity: sha512-XrHMZwGQGvJg2V/oRSUfSAfjfPxO+4DkiRh6p2AFjLQztWUuY/o8Mq0eMQVIY7HJ1CDQUJlxGGZRw1a5bqmd1g==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [arm64]
+    os: [linux]
+
+  '@img/sharp-linuxmusl-x64@0.33.5':
+    resolution: {integrity: sha512-WT+d/cgqKkkKySYmqoZ8y3pxx7lx9vVejxW/W4DOFMYVSkErR+w7mf2u8m/y4+xHe7yY9DAXQMWQhpnMuFfScw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [linux]
+
+  '@img/sharp-wasm32@0.33.5':
+    resolution: {integrity: sha512-ykUW4LVGaMcU9lu9thv85CbRMAwfeadCJHRsg2GmeRa/cJxsVY9Rbd57JcMxBkKHag5U/x7TSBpScF4U8ElVzg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [wasm32]
+
+  '@img/sharp-win32-ia32@0.33.5':
+    resolution: {integrity: sha512-T36PblLaTwuVJ/zw/LaH0PdZkRz5rd3SmMHX8GSmR7vtNSP5Z6bQkExdSK7xGWyxLw4sUknBuugTelgw2faBbQ==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [ia32]
+    os: [win32]
+
+  '@img/sharp-win32-x64@0.33.5':
+    resolution: {integrity: sha512-MpY/o8/8kj+EcnxwvrP4aTJSWw/aZ7JIGR4aBeZkZw5B7/Jn+tY9/VNwtcoGmdT7GfggGIU4kygOMSbYnOrAbg==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+    cpu: [x64]
+    os: [win32]
+
   '@intlify/core-base@9.2.2':
     resolution: {integrity: sha512-JjUpQtNfn+joMbrXvpR4hTF8iJQ2sEFzzK3KIESOx+f+uwIjgw20igOyaIdhfsVVBCds8ZM64MoeNSx+PHQMkA==}
     engines: {node: '>= 14'}
@@ -3051,10 +3777,6 @@ packages:
     resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
     engines: {node: '>=6.0.0'}
 
-  '@jridgewell/resolve-uri@3.1.0':
-    resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
-    engines: {node: '>=6.0.0'}
-
   '@jridgewell/resolve-uri@3.1.2':
     resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
     engines: {node: '>=6.0.0'}
@@ -3118,26 +3840,26 @@ packages:
   '@kwsites/promise-deferred@1.1.1':
     resolution: {integrity: sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw==}
 
-  '@langchain/anthropic@0.3.1':
-    resolution: {integrity: sha512-mE2zfv2IeogDgP53IYlfqZuXbmACkQDtBkg1Nriasrzvr1g+1Q85pfyUCnxc05p4S2IplbJhvoBtgdQUTGenqw==}
+  '@langchain/anthropic@0.3.11':
+    resolution: {integrity: sha512-rYjDZjMwVQ+cYeJd9IoSESdkkG8fc0m3siGRYKNy6qgYMnqCz8sUPKBanXwbZAs6wvspPCGgNK9WONfaCeX97A==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/aws@0.1.0':
-    resolution: {integrity: sha512-EIrDmR7wvo9PdcITjBJ0PnNSblgOLOxmBwX0uhfdxFA4AYmp1i4peaFcLqCrziMqR1w4Ndr2+soPFkghuKRX2Q==}
+  '@langchain/aws@0.1.3':
+    resolution: {integrity: sha512-OjS6V/virzRvOX1D2xgTyyHkYzdepjes77dU2bBS53jt4mp0DT8vzgclZQ/16DA20YgNFtMKYiFbOfMI+RTHyg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/cohere@0.3.0':
-    resolution: {integrity: sha512-JlevgVK4oUwHiPcP7Xw55Xlp8FdbCsjDuWbcjWgeYcdTTH1sIItG/nDREZa8Z+MfXYca2njk4sZjCIuGsY7fVA==}
+  '@langchain/cohere@0.3.2':
+    resolution: {integrity: sha512-AWUH6DPUnn7jmuFvNMtS0VDL+fW06edQmXFxGvWvIlXFSezqECnV4opni8zCAlWgh5NGSROLtqAZc879dt5TGg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/community@0.3.2':
-    resolution: {integrity: sha512-NoniVM+LUJC3zTPEe1l5cSzr//iDhpKP92Q3LEsV0l168AtrwHxmOvN6MgT0xfM4BouyPlILHX28NSADUC2AXQ==}
+  '@langchain/community@0.3.24':
+    resolution: {integrity: sha512-lHio63Bi5mxO6aMzLfXq5ouo6gKpSs7JWJ3Fi2Sl1fdH0AdCEqQZyLG0Fjinx/T815aPBb8eUIdjUlQIrPE2eA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@arcjet/redact': ^v1.0.0-alpha.23
@@ -3154,6 +3876,7 @@ packages:
       '@azure/search-documents': ^12.0.0
       '@azure/storage-blob': ^12.15.0
       '@browserbasehq/sdk': '*'
+      '@browserbasehq/stagehand': ^1.0.0
       '@clickhouse/client': ^0.2.5
       '@cloudflare/ai': '*'
       '@datastax/astra-db-ts': ^1.0.0
@@ -3167,9 +3890,13 @@ packages:
       '@google-cloud/storage': ^6.10.1 || ^7.7.0
       '@gradientai/nodejs-sdk': ^1.2.0
       '@huggingface/inference': ^2.6.4
+      '@huggingface/transformers': ^3.2.3
+      '@ibm-cloud/watsonx-ai': '*'
+      '@lancedb/lancedb': ^0.12.0
       '@langchain/core': '>=0.2.21 <0.4.0'
       '@layerup/layerup-security': ^1.5.12
-      '@mendable/firecrawl-js': ^0.0.13
+      '@libsql/client': ^0.14.0
+      '@mendable/firecrawl-js': ^1.4.3
       '@mlc-ai/web-llm': '*'
       '@mozilla/readability': '*'
       '@neondatabase/serverless': '*'
@@ -3190,14 +3917,13 @@ packages:
       '@tensorflow-models/universal-sentence-encoder': '*'
       '@tensorflow/tfjs-converter': '*'
       '@tensorflow/tfjs-core': '*'
-      '@upstash/ratelimit': ^1.1.3
+      '@upstash/ratelimit': ^1.1.3 || ^2.0.3
       '@upstash/redis': ^1.20.6
       '@upstash/vector': ^1.1.1
-      '@vercel/kv': ^0.2.3
-      '@vercel/postgres': ^0.5.0
+      '@vercel/kv': '*'
+      '@vercel/postgres': '*'
       '@writerai/writer-sdk': ^0.40.2
       '@xata.io/client': ^0.28.0
-      '@xenova/transformers': ^2.17.2
       '@zilliz/milvus2-sdk-node': '>=2.3.5'
       apify-client: ^2.7.1
       assemblyai: ^4.6.0
@@ -3211,7 +3937,6 @@ packages:
       closevector-web: 0.1.6
       cohere-ai: '*'
       convex: ^1.3.1
-      couchbase: ^4.3.0
       crypto-js: ^4.2.0
       d3-dsv: ^2.0.0
       discord.js: ^14.14.1
@@ -3219,11 +3944,13 @@ packages:
       duck-duck-scrape: ^2.2.5
       epub2: ^3.0.1
       faiss-node: ^0.5.1
+      fast-xml-parser: '*'
       firebase-admin: ^11.9.0 || ^12.0.0
       google-auth-library: '*'
       googleapis: '*'
       hnswlib-node: ^3.0.0
       html-to-text: ^9.0.5
+      ibm-cloud-sdk-core: '*'
       ignore: ^5.2.0
       interface-datastore: ^8.2.11
       ioredis: ^5.3.2
@@ -3237,9 +3964,9 @@ packages:
       mongodb: '>=5.2.0'
       mysql2: ^3.9.8
       neo4j-driver: '*'
-      node-llama-cpp: '*'
       notion-to-md: ^3.1.0
       officeparser: ^4.0.4
+      openai: '*'
       pdf-parse: 1.1.1
       pg: ^8.11.0
       pg-copy-streams: ^6.0.5
@@ -3255,13 +3982,12 @@ packages:
       typeorm: ^0.3.20
       typesense: ^1.5.3
       usearch: ^1.1.1
-      vectordb: ^0.1.4
       voy-search: 0.6.2
       weaviate-ts-client: '*'
       web-auth-library: ^1.0.3
+      word-extractor: '*'
       ws: '>=8.17.1'
-      youtube-transcript: ^1.0.6
-      youtubei.js: ^9.1.0
+      youtubei.js: '*'
     peerDependenciesMeta:
       '@arcjet/redact':
         optional: true
@@ -3317,8 +4043,14 @@ packages:
         optional: true
       '@huggingface/inference':
         optional: true
+      '@huggingface/transformers':
+        optional: true
+      '@lancedb/lancedb':
+        optional: true
       '@layerup/layerup-security':
         optional: true
+      '@libsql/client':
+        optional: true
       '@mendable/firecrawl-js':
         optional: true
       '@mlc-ai/web-llm':
@@ -3375,8 +4107,6 @@ packages:
         optional: true
       '@xata.io/client':
         optional: true
-      '@xenova/transformers':
-        optional: true
       '@zilliz/milvus2-sdk-node':
         optional: true
       apify-client:
@@ -3403,8 +4133,6 @@ packages:
         optional: true
       convex:
         optional: true
-      couchbase:
-        optional: true
       crypto-js:
         optional: true
       d3-dsv:
@@ -3419,6 +4147,8 @@ packages:
         optional: true
       faiss-node:
         optional: true
+      fast-xml-parser:
+        optional: true
       firebase-admin:
         optional: true
       google-auth-library:
@@ -3455,8 +4185,6 @@ packages:
         optional: true
       neo4j-driver:
         optional: true
-      node-llama-cpp:
-        optional: true
       notion-to-md:
         optional: true
       officeparser:
@@ -3491,81 +4219,79 @@ packages:
         optional: true
       usearch:
         optional: true
-      vectordb:
-        optional: true
       voy-search:
         optional: true
       weaviate-ts-client:
         optional: true
       web-auth-library:
         optional: true
-      ws:
+      word-extractor:
         optional: true
-      youtube-transcript:
+      ws:
         optional: true
       youtubei.js:
         optional: true
 
-  '@langchain/core@0.3.3':
-    resolution: {integrity: sha512-WAtkmhbdl2T41qzimTzhb3pXCHQxO4onqxzPxgdf3KftQdTwLq0YYBDhozRMZLNAd/+cfH0ymZGaZSsnc9Ogsg==}
+  '@langchain/core@0.3.19':
+    resolution: {integrity: sha512-pJVOAHShefu1SRO8uhzUs0Pexah/Ib66WETLMScIC2w9vXlpwQy3DzXJPJ5X7ixry9N666jYO5cHtM2Z1DnQIQ==}
     engines: {node: '>=18'}
 
-  '@langchain/google-common@0.1.1':
-    resolution: {integrity: sha512-oT/6lBev/Ufkp1dJbOTJ2S7xD9c+w9CqnqKqFOSxuZJbM4G8hzJtt7PDBOGfamIwtQP8dR7ORKXs1sCl+f5Tig==}
+  '@langchain/google-common@0.1.8':
+    resolution: {integrity: sha512-8auqWw2PMPhcHQHS+nMN3tVZrUPgSLckUaFeOHDOeSBiDvBd4KCybPwyl2oCwMDGvmyIxvOOckkMdeGaJ92vpQ==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/google-gauth@0.1.0':
-    resolution: {integrity: sha512-0kps1NmaNiSl4n3lRw+7xsyhrEfIxNqBjih0kNYWPjLg55f9I9+QAlz7F1Sz/628HF1WQLFLQcBQA4geGzvenQ==}
+  '@langchain/google-gauth@0.1.8':
+    resolution: {integrity: sha512-2QK7d5SQMrnSv7X4j05BGfO74hiA8FJuNwSsQKZvzlGoVnNXil3x2aqD5V+zsYOPpxhkDCpNlmh2Pue2Wzy1rQ==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/google-genai@0.1.0':
-    resolution: {integrity: sha512-6rIba77zJVMj+048tLfkCBrkFbfAMiT+AfLEsu5s+CFoFmXMiI/dbKeDL4vhUWrJVb9uL4ZZyrnl0nKxyEKYgA==}
+  '@langchain/google-genai@0.1.6':
+    resolution: {integrity: sha512-LF3fan9pvgFa1vw2/IYGhi5KjppE0OvPFX3QQBUshBLpXWERP+BSpSD7jcXyqm9Kf7DcFj7w5/2knKeEwih8Xg==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@langchain/core': '>=0.3.17 <0.4.0'
+
+  '@langchain/google-vertexai@0.1.8':
+    resolution: {integrity: sha512-n06ohihopz38agOm7BTASHMmFLz+XAZlzEvqtPC4Qa1fhYhzETQg2gCzEapIJ1yVk5MhrWqwKnVOQ+tIsFE88Q==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/google-vertexai@0.1.0':
-    resolution: {integrity: sha512-xTi5NvNGSLQl/7OTsj4QTT0DkNbZ7cYDrEB0HqpZOwo6I5dulh/h2payGVQ6hdXj7Yyv78dRc5FdQSbyHui/WQ==}
+  '@langchain/groq@0.1.3':
+    resolution: {integrity: sha512-dMzvBVaLf/0IQoHdAOAN8W/PbOcwgbvgUMCn02CqvCC90mxZ45LI0Tipzqnoaam0hiKALR5hLc3dNj1oCYV92w==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/groq@0.1.2':
-    resolution: {integrity: sha512-bgQ9yGoNHOwG6LG2ngGvSNxF/1U1c1u3vKmFWmzecFIcBoQQOJY0jb0MrL3g1uTife0Sr3zxkWKXQg2aK/U4Sg==}
+  '@langchain/mistralai@0.2.0':
+    resolution: {integrity: sha512-VdfbKZopAuSXf/vlXbriGWLK3c7j5s47DoB3S31xpprY2BMSKZZiX9vE9TsgxMfAPuIDPIYcfgU7p1upvTYt8g==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@langchain/core': '>=0.3.7 <0.4.0'
+
+  '@langchain/ollama@0.1.4':
+    resolution: {integrity: sha512-olHPViUurGcmOI3IbhIGK/EJ7QxDlZru4j98V269PiEFTIVlciRULltgI/t3voHYTdvB8R+HV8pMo/Y3UVzvzA==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/mistralai@0.1.1':
-    resolution: {integrity: sha512-gnHdQRfn+iBReKD0u1nydGqHgVOjnKHpd0Q2qEN61ZuxiqFOOauWYkrbyml7tzcOdMv2vUAr5+pjpXip+ez59w==}
+  '@langchain/openai@0.3.17':
+    resolution: {integrity: sha512-uw4po32OKptVjq+CYHrumgbfh4NuD7LqyE+ZgqY9I/LrLc6bHLMc+sisHmI17vgek0K/yqtarI0alPJbzrwyag==}
+    engines: {node: '>=18'}
+    peerDependencies:
+      '@langchain/core': '>=0.3.29 <0.4.0'
+
+  '@langchain/pinecone@0.1.3':
+    resolution: {integrity: sha512-1DPZvkg3Ve1TJSUfmpf7GF2SvRyg8cLjKjffkuW/C3oPONti2a9W7Q+F18YgBf1Swk0bPJ7A1EtMvlsU+NOQmw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
 
-  '@langchain/ollama@0.1.0':
-    resolution: {integrity: sha512-TI4DGenLf1ApoxFf4Bx/VPyO+a+poJKIul8AGm/FEyORtw3JPq1UDR6SdkGETrkDqzzdK9R0DvFRStd1MSTE/w==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      '@langchain/core': '>=0.2.21 <0.4.0'
-
-  '@langchain/openai@0.3.0':
-    resolution: {integrity: sha512-yXrz5Qn3t9nq3NQAH2l4zZOI4ev2CFdLC5kvmi5SdW4bggRuM40SXTUAY3VRld4I5eocYfk82VbrlA+6dvN5EA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      '@langchain/core': '>=0.2.26 <0.4.0'
-
-  '@langchain/pinecone@0.1.0':
-    resolution: {integrity: sha512-bxt8c4Fpdre8E7HrO8SU4nAJ2dbOpiEsFOyrJ524vUo57UkXbd5WD2v8AjFM7Wf3hH5O1elaxLVxLv8fK4c5OA==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      '@langchain/core': '>=0.2.21 <0.4.0'
-
-  '@langchain/qdrant@0.1.0':
-    resolution: {integrity: sha512-6XiURYm9ININpcPhSukCM7e3GQaUfMnJ8eAjUKOPfnBuaRNn/a5nUsg+aVQuIElKgrWn+Z6WRlFgx+wgKEWpKQ==}
+  '@langchain/qdrant@0.1.1':
+    resolution: {integrity: sha512-v0A8wMO6x1XnYKgaXoqWUQAkeOvwcUIQPc1tM5sDTuU3JdQrhZDfuaSg7LJAh0wXJ9Eud7MwpkjYHWUiuE17/A==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/core': '>=0.2.21 <0.4.0'
@@ -3619,24 +4345,26 @@ packages:
       '@types/react': '>=16'
       react: '>=16'
 
-  '@microsoft/api-extractor-model@7.29.6':
-    resolution: {integrity: sha512-gC0KGtrZvxzf/Rt9oMYD2dHvtN/1KPEYsrQPyMKhLHnlVuO/f4AFN3E4toqZzD2pt4LhkKoYmL2H9tX3yCOyRw==}
+  '@microsoft/api-extractor-model@7.30.0':
+    resolution: {integrity: sha512-26/LJZBrsWDKAkOWRiQbdVgcfd1F3nyJnAiJzsAgpouPk7LtOIj7PK9aJtBaw/pUXrkotEg27RrT+Jm/q0bbug==}
 
-  '@microsoft/api-extractor@7.47.7':
-    resolution: {integrity: sha512-fNiD3G55ZJGhPOBPMKD/enozj8yxJSYyVJWxRWdcUtw842rvthDHJgUWq9gXQTensFlMHv2wGuCjjivPv53j0A==}
+  '@microsoft/api-extractor@7.48.0':
+    resolution: {integrity: sha512-FMFgPjoilMUWeZXqYRlJ3gCVRhB7WU/HN88n8OLqEsmsG4zBdX/KQdtJfhq95LQTQ++zfu0Em1LLb73NqRCLYQ==}
     hasBin: true
 
-  '@microsoft/tsdoc-config@0.17.0':
-    resolution: {integrity: sha512-v/EYRXnCAIHxOHW+Plb6OWuUoMotxTN0GLatnpOb1xq0KuTNw/WI3pamJx/UbsoJP5k9MCw1QxvvhPcF9pH3Zg==}
+  '@microsoft/tsdoc-config@0.17.1':
+    resolution: {integrity: sha512-UtjIFe0C6oYgTnad4q1QP4qXwLhe6tIpNTRStJ2RZEPIkqQPREAwE5spzVxsdn9UaEMUqhh0AqSx3X4nWAKXWw==}
 
-  '@microsoft/tsdoc@0.15.0':
-    resolution: {integrity: sha512-HZpPoABogPvjeJOdzCOSJsXeL/SMCBgBZMVC3X3d7YYp2gf31MfxhUoYUNwf1ERPJOnQc0wkFn9trqI6ZEdZuA==}
+  '@microsoft/tsdoc@0.15.1':
+    resolution: {integrity: sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw==}
 
   '@miragejs/pretender-node-polyfill@0.1.2':
     resolution: {integrity: sha512-M/BexG/p05C5lFfMunxo/QcgIJnMT2vDVCd00wNqK2ImZONIlEETZwWJu1QtLxtmYlSHlCFl3JNzp0tLe7OJ5g==}
 
-  '@mistralai/mistralai@0.4.0':
-    resolution: {integrity: sha512-KmFzNro1RKxIFh19J3osmUQhucefBBauMXN5fa9doG6dT9OHR/moBvvn+riVlR7c0AVfuxO8Dfa03AyLYYzbyg==}
+  '@mistralai/mistralai@1.3.4':
+    resolution: {integrity: sha512-db5UhCXqH0N05XbXMR/2bSiGKIFUzS6p0sI9Nl2XDmJuDZIm+WRGTlsq60ALwhvKpHcQKzN5L58HIneksRrn9g==}
+    peerDependencies:
+      zod: '>= 3'
 
   '@mongodb-js/saslprep@1.1.9':
     resolution: {integrity: sha512-tVkljjeEaAhCqTzajSdgbQ6gE6f3oneVwa3iXR6csiEwXXOFsiC6Uh9iAjAhXPtqa/XMDHWjjeNH/77m/Yq2dw==}
@@ -3686,8 +4414,8 @@ packages:
     resolution: {integrity: sha512-rbnMnSdEwq2yuYMgzOQ4jTXm+oH7yjN/0ISfB/7O6pUcEPsZt9UW60BYfQ1WWHkKa/evI8vgER2zV5/RC1BupQ==}
     engines: {node: '>=18.10'}
 
-  '@n8n/tournament@1.0.5':
-    resolution: {integrity: sha512-IPBHa7gC0wwHVct/dnBquHz+uMCDZaZ05cor1D/rjlwaOe/PVu5mtoZaPHYuR98R3W1/IyxC5PuBd0JizDP9gg==}
+  '@n8n/tournament@1.0.6':
+    resolution: {integrity: sha512-UGSxYXXVuOX0yL6HTLBStKYwLIa0+JmRKiSZSCMcM2s2Wax984KWT6XIA1TR/27i7yYpDk1MY14KsTPnuEp27A==}
     engines: {node: '>=20.15', pnpm: '>=9.5'}
 
   '@n8n/typeorm@0.3.20-12':
@@ -3759,8 +4487,8 @@ packages:
     engines: {node: '>=18.10', pnpm: '>=9.6'}
     hasBin: true
 
-  '@n8n_io/ai-assistant-sdk@1.10.3':
-    resolution: {integrity: sha512-oHuYryPoWa+KcIf7ihrlXSVpi3XhVPmZX4tUX4TMvgAeipu7yhf7ZSXQFeBUx6zD1oa2zOXIs4b0NsXELrZWqg==}
+  '@n8n_io/ai-assistant-sdk@1.13.0':
+    resolution: {integrity: sha512-16kftFTeX3/lBinHJaBK0OL1lB4FpPaUoHX4h25AkvgHvmjUHpWNY2ZtKos0rY89+pkzDsNxMZqSUkeKU45iRg==}
     engines: {node: '>=20.15', pnpm: '>=8.14'}
 
   '@n8n_io/license-sdk@2.13.1':
@@ -3803,10 +4531,236 @@ packages:
   '@one-ini/wasm@0.1.1':
     resolution: {integrity: sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==}
 
+  '@opentelemetry/api-logs@0.52.1':
+    resolution: {integrity: sha512-qnSqB2DQ9TPP96dl8cDubDvrUyWc0/sK81xHTK8eSUspzDM3bsewX903qclQFvVhgStjRWdC5bLb3kQqMkfV5A==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/api-logs@0.53.0':
+    resolution: {integrity: sha512-8HArjKx+RaAI8uEIgcORbZIPklyh1YLjPSBus8hjRmvLi6DeFzgOcdZ7KwPabKj8mXF8dX0hyfAyGfycz0DbFw==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/api-logs@0.54.2':
+    resolution: {integrity: sha512-4MTVwwmLgUh5QrJnZpYo6YRO5IBLAggf2h8gWDblwRagDStY13aEvt7gGk3jewrMaPlHiF83fENhIx0HO97/cQ==}
+    engines: {node: '>=14'}
+
   '@opentelemetry/api@1.2.0':
     resolution: {integrity: sha512-0nBr+VZNKm9tvNDZFstI3Pq1fCTEDK5OZTnVKNvBNAKgd0yIvmwsP4m61rEv7ZP+tOUjWJhROpxK5MsnlF911g==}
     engines: {node: '>=8.0.0'}
 
+  '@opentelemetry/api@1.9.0':
+    resolution: {integrity: sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==}
+    engines: {node: '>=8.0.0'}
+
+  '@opentelemetry/context-async-hooks@1.29.0':
+    resolution: {integrity: sha512-TKT91jcFXgHyIDF1lgJF3BHGIakn6x0Xp7Tq3zoS3TMPzT9IlP0xEavWP8C1zGjU9UmZP2VR1tJhW9Az1A3w8Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@1.26.0':
+    resolution: {integrity: sha512-1iKxXXE8415Cdv0yjG3G6hQnB5eVEsJce3QaawX8SjDn0mAS0ZM8fAbZZJD4ajvhC15cePvosSCut404KrIIvQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/core@1.29.0':
+    resolution: {integrity: sha512-gmT7vAreXl0DTHD2rVZcw3+l2g84+5XiHIqdBUxXbExymPCvSsGOpiwMmn8nkiJur28STV31wnhIDrzWDPzjfA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/instrumentation-amqplib@0.43.0':
+    resolution: {integrity: sha512-ALjfQC+0dnIEcvNYsbZl/VLh7D2P1HhFF4vicRKHhHFIUV3Shpg4kXgiek5PLhmeKSIPiUB25IYH5RIneclL4A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-connect@0.40.0':
+    resolution: {integrity: sha512-3aR/3YBQ160siitwwRLjwqrv2KBT16897+bo6yz8wIfel6nWOxTZBJudcbsK3p42pTC7qrbotJ9t/1wRLpv79Q==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-dataloader@0.12.0':
+    resolution: {integrity: sha512-pnPxatoFE0OXIZDQhL2okF//dmbiWFzcSc8pUg9TqofCLYZySSxDCgQc69CJBo5JnI3Gz1KP+mOjS4WAeRIH4g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-express@0.44.0':
+    resolution: {integrity: sha512-GWgibp6Q0wxyFaaU8ERIgMMYgzcHmGrw3ILUtGchLtLncHNOKk0SNoWGqiylXWWT4HTn5XdV8MGawUgpZh80cA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-fastify@0.41.0':
+    resolution: {integrity: sha512-pNRjFvf0mvqfJueaeL/qEkuGJwgtE5pgjIHGYwjc2rMViNCrtY9/Sf+Nu8ww6dDd/Oyk2fwZZP7i0XZfCnETrA==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-fs@0.16.0':
+    resolution: {integrity: sha512-hMDRUxV38ln1R3lNz6osj3YjlO32ykbHqVrzG7gEhGXFQfu7LJUx8t9tEwE4r2h3CD4D0Rw4YGDU4yF4mP3ilg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-generic-pool@0.39.0':
+    resolution: {integrity: sha512-y4v8Y+tSfRB3NNBvHjbjrn7rX/7sdARG7FuK6zR8PGb28CTa0kHpEGCJqvL9L8xkTNvTXo+lM36ajFGUaK1aNw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-graphql@0.44.0':
+    resolution: {integrity: sha512-FYXTe3Bv96aNpYktqm86BFUTpjglKD0kWI5T5bxYkLUPEPvFn38vWGMJTGrDMVou/i55E4jlWvcm6hFIqLsMbg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-hapi@0.41.0':
+    resolution: {integrity: sha512-jKDrxPNXDByPlYcMdZjNPYCvw0SQJjN+B1A+QH+sx+sAHsKSAf9hwFiJSrI6C4XdOls43V/f/fkp9ITkHhKFbQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-http@0.53.0':
+    resolution: {integrity: sha512-H74ErMeDuZfj7KgYCTOFGWF5W9AfaPnqLQQxeFq85+D29wwV2yqHbz2IKLYpkOh7EI6QwDEl7rZCIxjJLyc/CQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-ioredis@0.43.0':
+    resolution: {integrity: sha512-i3Dke/LdhZbiUAEImmRG3i7Dimm/BD7t8pDDzwepSvIQ6s2X6FPia7561gw+64w+nx0+G9X14D7rEfaMEmmjig==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-kafkajs@0.4.0':
+    resolution: {integrity: sha512-I9VwDG314g7SDL4t8kD/7+1ytaDBRbZQjhVaQaVIDR8K+mlsoBhLsWH79yHxhHQKvwCSZwqXF+TiTOhoQVUt7A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-knex@0.41.0':
+    resolution: {integrity: sha512-OhI1SlLv5qnsnm2dOVrian/x3431P75GngSpnR7c4fcVFv7prXGYu29Z6ILRWJf/NJt6fkbySmwdfUUnFnHCTg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-koa@0.43.0':
+    resolution: {integrity: sha512-lDAhSnmoTIN6ELKmLJBplXzT/Jqs5jGZehuG22EdSMaTwgjMpxMDI1YtlKEhiWPWkrz5LUsd0aOO0ZRc9vn3AQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.40.0':
+    resolution: {integrity: sha512-21xRwZsEdMPnROu/QsaOIODmzw59IYpGFmuC4aFWvMj6stA8+Ei1tX67nkarJttlNjoM94um0N4X26AD7ff54A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongodb@0.48.0':
+    resolution: {integrity: sha512-9YWvaGvrrcrydMsYGLu0w+RgmosLMKe3kv/UNlsPy8RLnCkN2z+bhhbjjjuxtUmvEuKZMCoXFluABVuBr1yhjw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mongoose@0.42.0':
+    resolution: {integrity: sha512-AnWv+RaR86uG3qNEMwt3plKX1ueRM7AspfszJYVkvkehiicC3bHQA6vWdb6Zvy5HAE14RyFbu9+2hUUjR2NSyg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql2@0.41.0':
+    resolution: {integrity: sha512-REQB0x+IzVTpoNgVmy5b+UnH1/mDByrneimP6sbDHkp1j8QOl1HyWOrBH/6YWR0nrbU3l825Em5PlybjT3232g==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-mysql@0.41.0':
+    resolution: {integrity: sha512-jnvrV6BsQWyHS2qb2fkfbfSb1R/lmYwqEZITwufuRl37apTopswu9izc0b1CYRp/34tUG/4k/V39PND6eyiNvw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-nestjs-core@0.40.0':
+    resolution: {integrity: sha512-WF1hCUed07vKmf5BzEkL0wSPinqJgH7kGzOjjMAiTGacofNXjb/y4KQ8loj2sNsh5C/NN7s1zxQuCgbWbVTGKg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-pg@0.44.0':
+    resolution: {integrity: sha512-oTWVyzKqXud1BYEGX1loo2o4k4vaU1elr3vPO8NZolrBtFvQ34nx4HgUaexUDuEog00qQt+MLR5gws/p+JXMLQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-redis-4@0.42.0':
+    resolution: {integrity: sha512-NaD+t2JNcOzX/Qa7kMy68JbmoVIV37fT/fJYzLKu2Wwd+0NCxt+K2OOsOakA8GVg8lSpFdbx4V/suzZZ2Pvdjg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-tedious@0.15.0':
+    resolution: {integrity: sha512-Kb7yo8Zsq2TUwBbmwYgTAMPK0VbhoS8ikJ6Bup9KrDtCx2JC01nCb+M0VJWXt7tl0+5jARUbKWh5jRSoImxdCw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation-undici@0.6.0':
+    resolution: {integrity: sha512-ABJBhm5OdhGmbh0S/fOTE4N69IZ00CsHC5ijMYfzbw3E5NwLgpQk5xsljaECrJ8wz1SfXbO03FiSuu5AyRAkvQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.7.0
+
+  '@opentelemetry/instrumentation@0.52.1':
+    resolution: {integrity: sha512-uXJbYU/5/MBHjMp1FqrILLRuiJCs3Ofk0MeRDk8g1S1gD47U8X3JnSwcMO1rtRo1x1a7zKaQHaoYu49p/4eSKw==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.53.0':
+    resolution: {integrity: sha512-DMwg0hy4wzf7K73JJtl95m/e0boSoWhH07rfvHvYzQtBD3Bmv0Wc1x733vyZBqmFm8OjJD0/pfiUg1W3JjFX0A==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/instrumentation@0.54.2':
+    resolution: {integrity: sha512-go6zpOVoZVztT9r1aPd79Fr3OWiD4N24bCPJsIKkBses8oyFo12F/Ew3UBTdIu6hsW4HC4MVEJygG6TEyJI/lg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.3.0
+
+  '@opentelemetry/redis-common@0.36.2':
+    resolution: {integrity: sha512-faYX1N0gpLhej/6nyp6bgRjzAKXn5GOEMYY7YhciSfCoITAktLUtQ36d24QEWNA1/WA1y6qQunCe0OhHRkVl9g==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/resources@1.29.0':
+    resolution: {integrity: sha512-s7mLXuHZE7RQr1wwweGcaRp3Q4UJJ0wazeGlc/N5/XSe6UyXfsh1UQGMADYeg7YwD+cEdMtU1yJAUXdnFzYzyQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/sdk-trace-base@1.29.0':
+    resolution: {integrity: sha512-hEOpAYLKXF3wGJpXOtWsxEtqBgde0SCv+w+jvr3/UusR4ll3QrENEGnSl1WDCyRrpqOQ5NCNOvZch9UFVa7MnQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': '>=1.0.0 <1.10.0'
+
+  '@opentelemetry/semantic-conventions@1.27.0':
+    resolution: {integrity: sha512-sAay1RrB+ONOem0OZanAR1ZI/k7yDpnOQSQmTMuGImUQb2y8EbSaCJ94FQluM74xoU03vlb2d2U90hZluL6nQg==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/semantic-conventions@1.28.0':
+    resolution: {integrity: sha512-lp4qAiMTD4sNWW4DbKLBkfiMZ4jbAboJIGOQr5DvciMRI494OapieI9qiODpOt0XBr1LjIDy1xAGAnVs5supTA==}
+    engines: {node: '>=14'}
+
+  '@opentelemetry/sql-common@0.40.1':
+    resolution: {integrity: sha512-nSDlnHSqzC3pXn/wZEZVLuAuJ1MYMXPBwtv2qAbCa3847SaHItdE7SzUq/Jtb0KZmh1zfAbNi3AAMjztTT4Ugg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.1.0
+
   '@otplib/core@12.0.1':
     resolution: {integrity: sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==}
 
@@ -3822,8 +4776,8 @@ packages:
   '@otplib/preset-v11@12.0.1':
     resolution: {integrity: sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==}
 
-  '@pinecone-database/pinecone@3.0.3':
-    resolution: {integrity: sha512-0cAG0d/6knVZgVyXM1II4qG3dyOepLuAQsCXTOJomdA7iQxf+/Om9mq9Cw4QObr56oZ+lqtptlw5qz0BQaBX2Q==}
+  '@pinecone-database/pinecone@4.0.0':
+    resolution: {integrity: sha512-INYS+GBys9v5BRTyn0tv8srVsPTlSRvE3BPE4Wkc/lOEyAIyB9F7DEMXbeF19FOLEgRwCuHTLjzm1niENl+4FA==}
     engines: {node: '>=18.0.0'}
 
   '@pinia/testing@0.1.6':
@@ -3835,6 +4789,14 @@ packages:
     resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
     engines: {node: '>=14'}
 
+  '@playwright/test@1.49.1':
+    resolution: {integrity: sha512-Ky+BVzPz8pL6PQxHqNRW1k3mIyv933LML7HktS8uik0bUXNCdPhoS/kLihiO1tMf/egaJb4IutXd7UywvXEW+g==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  '@prisma/instrumentation@5.19.1':
+    resolution: {integrity: sha512-VLnzMQq7CWroL5AeaW0Py2huiNKeoMfCH3SUxstdzPrlWQi6UQ9UrfcbUkNHlVFqOMacqy8X/8YtE0kuKDpD9w==}
+
   '@protobufjs/aspromise@1.1.2':
     resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==}
 
@@ -3869,7 +4831,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==}
@@ -3923,6 +4885,13 @@ packages:
     resolution: {integrity: sha512-BNgXjqesJu4L5f8F73c2hkkH5IdvjYCKYFgIl+m9oNgqGRIPBJjtiEGOx7jkQ6nElN4311z7Z4aTECtklaaHwg==}
     engines: {node: '>=14.19.0', npm: '>=7.0.0'}
 
+  '@replit/codemirror-indentation-markers@6.5.3':
+    resolution: {integrity: sha512-hL5Sfvw3C1vgg7GolLe/uxX5T3tmgOA3ZzqlMv47zjU1ON51pzNWiVbS22oh6crYhtVhv8b3gdXwoYp++2ilHw==}
+    peerDependencies:
+      '@codemirror/language': ^6.0.0
+      '@codemirror/state': ^6.0.0
+      '@codemirror/view': ^6.0.0
+
   '@rollup/pluginutils@5.1.0':
     resolution: {integrity: sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==}
     engines: {node: '>=14.0.0'}
@@ -4018,8 +4987,8 @@ packages:
     peerDependencies:
       tslib: ^2.6.2
 
-  '@rushstack/node-core-library@5.7.0':
-    resolution: {integrity: sha512-Ff9Cz/YlWu9ce4dmqNBZpA45AEya04XaBFIjV7xTVeEf+y/kTjEasmozqFELXlNG4ROdevss75JrrZ5WgufDkQ==}
+  '@rushstack/node-core-library@5.10.0':
+    resolution: {integrity: sha512-2pPLCuS/3x7DCd7liZkqOewGM0OzLyCacdvOe8j6Yrx9LkETGnxul1t7603bIaB8nUAooORcct9fFDOQMbWAgw==}
     peerDependencies:
       '@types/node': ^18.16.16
     peerDependenciesMeta:
@@ -4029,16 +4998,16 @@ packages:
   '@rushstack/rig-package@0.5.3':
     resolution: {integrity: sha512-olzSSjYrvCNxUFZowevC3uz8gvKr3WTpHQ7BkpjtRpA3wK+T0ybep/SRUMfr195gBzJm5gaXw0ZMgjIyHqJUow==}
 
-  '@rushstack/terminal@0.14.0':
-    resolution: {integrity: sha512-juTKMAMpTIJKudeFkG5slD8Z/LHwNwGZLtU441l/u82XdTBfsP+LbGKJLCNwP5se+DMCT55GB8x9p6+C4UL7jw==}
+  '@rushstack/terminal@0.14.3':
+    resolution: {integrity: sha512-csXbZsAdab/v8DbU1sz7WC2aNaKArcdS/FPmXMOXEj/JBBZMvDK0+1b4Qao0kkG0ciB1Qe86/Mb68GjH6/TnMw==}
     peerDependencies:
       '@types/node': ^18.16.16
     peerDependenciesMeta:
       '@types/node':
         optional: true
 
-  '@rushstack/ts-command-line@4.22.6':
-    resolution: {integrity: sha512-QSRqHT/IfoC5nk9zn6+fgyqOPXHME0BfchII9EUPR19pocsNp/xSbeBCbD3PIR2Lg+Q5qk7OFqk1VhWPMdKHJg==}
+  '@rushstack/ts-command-line@4.23.1':
+    resolution: {integrity: sha512-40jTmYoiu/xlIpkkRsVfENtBq4CW3R4azbL0Vmda+fMwHWqss6wwf/Cy/UJmMqIzpfYc2OTnjYP1ZLD3CmyeCA==}
 
   '@selderee/plugin-htmlparser2@0.11.0':
     resolution: {integrity: sha512-P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==}
@@ -4059,104 +5028,40 @@ packages:
     resolution: {integrity: sha512-fm4coIOjmanU29NOVN9MyaP4fUCOYytbtFqVSKRFNZQ/xAgNeySiBIbUd6IjujMmnOk9bY0WEUMcdm3Uotjdog==}
     engines: {node: '>=14.18'}
 
-  '@sentry-internal/tracing@7.87.0':
-    resolution: {integrity: sha512-HYa0+rfFmYQ/DadXoiuarTSxrcnYDCd/fm0pFuOHjICtfja8IcLegVYP2/r3CgwB+IjquCtJ5kDcqS/NTgUcpA==}
-    engines: {node: '>=8'}
-
-  '@sentry/babel-plugin-component-annotate@2.22.5':
-    resolution: {integrity: sha512-+93qwB9vTX1nj4hD8AMWowXZsZVkvmP9OwTqSh5d4kOeiJ+dZftUk4+FKeKkAX9lvY2reyHV8Gms5mo67c27RQ==}
-    engines: {node: '>= 14'}
-
   '@sentry/browser@8.33.1':
     resolution: {integrity: sha512-c6zI/igexkLwZuGk+u8Rj26ChjxGgkhe6ZbKFsXCYaKAp5ep5X7HQRkkqgbxApiqlC0LduHdd/ymzh139JLg8w==}
     engines: {node: '>=14.18'}
 
-  '@sentry/bundler-plugin-core@2.22.5':
-    resolution: {integrity: sha512-nfvTthV0aNM9/MwgnCi1WjAlCtau1I4kw6+oZIDOwJRDqGNziz517mYRXSsvCUebtGxDZtPcF7hSEBMSHjpncA==}
-    engines: {node: '>= 14'}
-
-  '@sentry/cli-darwin@2.36.2':
-    resolution: {integrity: sha512-To64Pq+pcmecEr+gFXiqaZy8oKhyLQLXO/SVDdf16CUL2qpuahE3bO5h9kFacMxPPxOWcgc2btF+4gYa1+bQTA==}
-    engines: {node: '>=10'}
-    os: [darwin]
-
-  '@sentry/cli-linux-arm64@2.36.2':
-    resolution: {integrity: sha512-g+FFmj1oJ2iRMsfs1ORz6THOO6MiAR55K9YxdZUBvqfoHLjSMt7Jst43sbZ3O0u55hnfixSKLNzDaTGaM/jxIQ==}
-    engines: {node: '>=10'}
-    cpu: [arm64]
-    os: [linux, freebsd]
-
-  '@sentry/cli-linux-arm@2.36.2':
-    resolution: {integrity: sha512-cRSvOQK97WM0m03k/c+LVAWT042Qz887WP/2Gy64eUi/PfArwb+QZZnsu4FCygxK9jnzgLTo4+ewoJVi17xaLQ==}
-    engines: {node: '>=10'}
-    cpu: [arm]
-    os: [linux, freebsd]
-
-  '@sentry/cli-linux-i686@2.36.2':
-    resolution: {integrity: sha512-rjxTw/CMd0Q7qlOb7gWFiwn3hJIxNkhbn1bOU54xj9CZvQSCvh10l7l4Y9o8znJLl41c5kMXVq8yuYws9A7AGQ==}
-    engines: {node: '>=10'}
-    cpu: [x86, ia32]
-    os: [linux, freebsd]
-
-  '@sentry/cli-linux-x64@2.36.2':
-    resolution: {integrity: sha512-cF8IPFTlwiC7JgVvSW4rS99sxb1W1N//iANxuzqaDswUnmJLi0AJy/jES87qE5GRB6ljaPVMvH7Kq0OCp3bvPA==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [linux, freebsd]
-
-  '@sentry/cli-win32-i686@2.36.2':
-    resolution: {integrity: sha512-YDH/Kcd8JAo1Bg4jtSwF8dr7FZZ8QbYLMx8q/5eenHpq6VdOgPENsTvayLW3cAjWLcm44u8Ed/gcEK0z1IxQmQ==}
-    engines: {node: '>=10'}
-    cpu: [x86, ia32]
-    os: [win32]
-
-  '@sentry/cli-win32-x64@2.36.2':
-    resolution: {integrity: sha512-Kac8WPbkFSVAJqPAVRBiW0uij9PVoXo0owf+EDeIIDLs9yxZat0d1xgyQPlUWrCGdxowMSbDvaSUz1YnE7MUmg==}
-    engines: {node: '>=10'}
-    cpu: [x64]
-    os: [win32]
-
-  '@sentry/cli@2.36.2':
-    resolution: {integrity: sha512-QoijP9TnO1UVNnRKtH718jlu/F9bBki6ffrOfmcjxkvLT6Q3nBMmqhYNH/AJV/RcgqLd6noWss4fbDMXZLzgIQ==}
-    engines: {node: '>= 10'}
-    hasBin: true
-
-  '@sentry/core@7.87.0':
-    resolution: {integrity: sha512-jkoXqK/nuYh8DYS+n7uaSuSIdw4HJemyRkXsWjAEPtEgD7taGMafZGbP5pl+XE38SE59jTBxmKnkUEZOFMgZGA==}
-    engines: {node: '>=8'}
-
   '@sentry/core@8.33.1':
     resolution: {integrity: sha512-3SS41suXLFzxL3OQvTMZ6q92ZapELVq2l2SoWlZopcamWhog2Ru0dp2vkunq97kFHb2TzKRTlFH4+4gbT8SJug==}
     engines: {node: '>=14.18'}
 
-  '@sentry/integrations@7.87.0':
-    resolution: {integrity: sha512-xbyOQeyfG1sF2PBMIOz3c3i0Y3+8q4UlxoeOhpFe6Vpjek+I/g7onZT6YevT6cWG083cg+rS0VCgPQSUV2lxIw==}
-    engines: {node: '>=8'}
+  '@sentry/core@8.42.0':
+    resolution: {integrity: sha512-ac6O3pgoIbU6rpwz6LlwW0wp3/GAHuSI0C5IsTgIY6baN8rOBnlAtG6KrHDDkGmUQ2srxkDJu9n1O6Td3cBCqw==}
+    engines: {node: '>=14.18'}
 
-  '@sentry/node@7.87.0':
-    resolution: {integrity: sha512-mGcZMCL3/IMTLIRcWLF+H9z2Bb2d34gKmg2rhXqI8BqhhUA551jMRlZv/y4za2Osjy550KwVoNsA1qtEe5mYyQ==}
-    engines: {node: '>=8'}
+  '@sentry/node@8.42.0':
+    resolution: {integrity: sha512-MsNrmAIwDaxf1jTX1FsgZ+3mUq6G6IuU6FAqyp7TDnvUTsbWUtr0OM6EvVUz0zCImybIh9dcTQ+6KTmUyA7URw==}
+    engines: {node: '>=14.18'}
 
-  '@sentry/types@7.87.0':
-    resolution: {integrity: sha512-w8jKFHq/Llupmr2FezmFgQsnm3y/CnqLjb7s6PstI78E409wrhH7p7oqX/OEuzccH1qNCNwes/3QKvPTRQDB4Q==}
-    engines: {node: '>=8'}
+  '@sentry/opentelemetry@8.42.0':
+    resolution: {integrity: sha512-QPb9kMFgl35TIwIz0u+BFTbPG461CofMiloidJ44GFZ9cB33T5cB0oIN7ut/5tsH/AvqUmucydsV/Nj3HNQx9g==}
+    engines: {node: '>=14.18'}
+    peerDependencies:
+      '@opentelemetry/api': ^1.9.0
+      '@opentelemetry/core': ^1.25.1
+      '@opentelemetry/instrumentation': ^0.54.0
+      '@opentelemetry/sdk-trace-base': ^1.26.0
+      '@opentelemetry/semantic-conventions': ^1.27.0
 
   '@sentry/types@8.33.1':
     resolution: {integrity: sha512-GjoAMvwtpIemoF/IiwZ7A60g4nQv3qwzR21GvJqDVUoKD0e8pv9OLX+HyXoUat4wEDGSuDUcUyUKD2G+od73QA==}
     engines: {node: '>=14.18'}
 
-  '@sentry/utils@7.87.0':
-    resolution: {integrity: sha512-7xgtPTnTNP/4IznFMFXxltuaXfLvzznrYCDMv9ny8EeUjJqlLX3CVA8Qq3YALsLCQCKcrGRARbAcd/EGG//w2w==}
-    engines: {node: '>=8'}
-
   '@sentry/utils@8.33.1':
     resolution: {integrity: sha512-uzuYpiiJuFY3N4WNHMBWUQX5oNv2t/TbG0OHRp3Rr7yeu+HSfD542TIp9/gMZ+G0Cxd8AmVO3wkKIFbk0TL4Qg==}
     engines: {node: '>=14.18'}
 
-  '@sentry/vite-plugin@2.22.5':
-    resolution: {integrity: sha512-dFARM360varU+hdU1MCpl0VTL03FkVIC+A9egCE+ureuOryjVNe3cm2mUjv/gnDHHNTOxWC2H2c8BlOkqTGP/w==}
-    engines: {node: '>= 14'}
-
   '@sentry/vue@8.33.1':
     resolution: {integrity: sha512-Ec3Z/KM96PhSdc3NSQUkKRETSipnIy55M35ujGCbdMnlGr95TjmInxVIxQGZap8S0EVzcpGCWFTGlzUR/pmVJQ==}
     engines: {node: '>=14.18'}
@@ -4477,120 +5382,115 @@ packages:
   '@sqltools/formatter@1.2.5':
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
 
-  '@storybook/addon-a11y@8.3.5':
-    resolution: {integrity: sha512-/19UO8IXbyfcYK5K8ejSYF+hC+EK79c0bBPHMNeYSFOHSqQM3KoMo+TLIcLsuhuRClmlM+4Zs+VSIYDwc+d3ig==}
+  '@storybook/addon-a11y@8.4.6':
+    resolution: {integrity: sha512-Z6x/yfStplSROgmBTtiJ8LJgTqPgzW3Q7KXi+l+KoZ0pht6Nz9cYfcyygLCaftBk1ZaL7SDDIrjCP0H1NwfYiQ==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-actions@8.3.5':
-    resolution: {integrity: sha512-t8D5oo+4XfD+F8091wLa2y/CDd/W2lExCeol5Vm1tp5saO+u6f2/d7iykLhTowWV84Uohi3D073uFeyTAlGebg==}
+  '@storybook/addon-actions@8.4.6':
+    resolution: {integrity: sha512-vbplwjMj7UXbdzoFhQkqFHLQAPJX8OVGTM9Q+yjuWDHViaKKUlgRWp0jclT7aIDNJQU2a6wJbTimHgJeF16Vhg==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-backgrounds@8.3.5':
-    resolution: {integrity: sha512-IQGjDujuw8+iSqKREdkL8I5E/5CAHZbfOWd4A75PQK2D6qZ0fu/xRwTOQOH4jP6xn/abvfACOdL6A0d5bU90ag==}
+  '@storybook/addon-backgrounds@8.4.6':
+    resolution: {integrity: sha512-RSjJ3iElxlQXebZrz1s5LeoLpAXr9LAGifX7w0abMzN5sg6QSwNeUHko2eT3V57M3k1Fa/5Eelso/QBQifFEog==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-controls@8.3.5':
-    resolution: {integrity: sha512-2eCVobUUvY1Rq7sp1U8Mx8t44VXwvi0E+hqyrsqOx5TTSC/FUQ+hNAX6GSYUcFIyQQ1ORpKNlUjAAdjxBv1ZHQ==}
+  '@storybook/addon-controls@8.4.6':
+    resolution: {integrity: sha512-70pEGWh0C2g8s0DYsISElOzsMbQS6p/K9iU5EqfotDF+hvEqstjsV/bTbR5f3OK4vR/7Gxamk7j8RVd14Nql6A==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-docs@8.3.5':
-    resolution: {integrity: sha512-MOVfo1bY8kXTzbvmWnx3UuSO4WNykFz7Edvb3mxltNyuW7UDRZGuIuSe32ddT/EtLJfurrC9Ja3yBy4KBUGnMA==}
+  '@storybook/addon-docs@8.4.6':
+    resolution: {integrity: sha512-olxz61W7PW/EsXrKhLrYbI3rn9GMBhY3KIOF/6tumbRkh0Siu/qe4EAImaV9NNwiC1R7+De/1OIVMY6o0EIZVw==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-essentials@8.3.5':
-    resolution: {integrity: sha512-hXTtPuN4/IsXjUrkMPAuz1qKAl8DovdXpjQgjQs7jSAVx3kc4BZaGqJ3gaVenKtO8uDchmA92BoQygpkc8eWhw==}
+  '@storybook/addon-essentials@8.4.6':
+    resolution: {integrity: sha512-TbFqyvWFUKw8LBpVcZuGQydzVB/3kSuHxDHi+Wj3Qas3cxBl7+w4/HjwomT2D2Tni1dZ1uPDOsAtNLmwp1POsg==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-highlight@8.3.5':
-    resolution: {integrity: sha512-ku0epul9aReCR3Gv/emwYnsqg3vgux5OmYMjoDcJC7s+LyfweSzLV/f5t9gSHazikJElh5TehtVkWbC4QfbGSw==}
+  '@storybook/addon-highlight@8.4.6':
+    resolution: {integrity: sha512-m8wedbqDMbwkP99dNHkHAiAUkx5E7FEEEyLPX1zfkhZWOGtTkavXHH235SGp50zD75LQ6eC/BvgegrzxSQa9Wg==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-interactions@8.3.5':
-    resolution: {integrity: sha512-GtTy/A+mG7vDOahQr2avT4dpWtCRiFDSYcWyuQOZm10y8VDDw157HQM+FuhxjV9Owrrohy9F24oBUwRG8H3b5A==}
+  '@storybook/addon-interactions@8.4.6':
+    resolution: {integrity: sha512-sR2oUSYIGUoAdrHT+fM1zgykhad98bsJ11c79r7HfBMXEPWc1yRcjIMmz8Xz06FMROMfebqduYDf60V++/I0Jw==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-links@8.3.5':
-    resolution: {integrity: sha512-giRCpn6cfJMYPnVJkojoQDO5ae6098fgY9YgAhwaJej/9dufNcioFdbiyfK1vyzbG6TGeTmJ9ncWCXgWRtzxPQ==}
+  '@storybook/addon-links@8.4.6':
+    resolution: {integrity: sha512-1KoG9ytEWWwdF/dheu1O0dayQTMsHw++Qk8afqw7bwW1Cxz5LuAJH5ZscFWMiE5f4Xq1NgaJdeAUaIavyoOcdg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.3.5
+      storybook: ^8.4.6
     peerDependenciesMeta:
       react:
         optional: true
 
-  '@storybook/addon-measure@8.3.5':
-    resolution: {integrity: sha512-6GVehgbHhFIFS69xSfRV+12VK0cnuIAtZdp1J3eUCc2ATrcigqVjTM6wzZz6kBuX6O3dcusr7Wg46KtNliqLqg==}
+  '@storybook/addon-measure@8.4.6':
+    resolution: {integrity: sha512-N2IRpr39g5KpexCAS1vIHJT+phc9Yilwm3PULds2rQ66VMTbkxobXJDdt0NS05g5n9/eDniroNQwdCeLg4tkpw==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-outline@8.3.5':
-    resolution: {integrity: sha512-dwmK6GzjEnQP9Yo0VnBUQtJkXZlXdfjWyskZ/IlUVc+IFdeeCtIiMyA92oMfHo8eXt0k1g21ZqMaIn7ZltOuHw==}
+  '@storybook/addon-outline@8.4.6':
+    resolution: {integrity: sha512-EhcWx8OpK85HxQulLWzpWUHEwQpDYuAiKzsFj9ivAbfeljkIWNTG04mierfaH1xX016uL9RtLJL/zwBS5ChnFg==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-themes@8.3.5':
-    resolution: {integrity: sha512-kXHKAZvAtMoOR1XFGTo5/T8anE9x7W8Ddpof2wyi+du5HscFiEW7TesWdvNgBUR7wAaiR21aW2S4jC72a6gTCw==}
+  '@storybook/addon-themes@8.4.6':
+    resolution: {integrity: sha512-0Eyh7jxxQ8hc7KIO2bJF8BKY1CRJ9zPo2DKoRiUKDoSGSP8qdlj4V/ks892GcUffdhTjoFAJCRzG7Ff+TnVKrA==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-toolbars@8.3.5':
-    resolution: {integrity: sha512-Ml2gc9q8WbteDvmuAZGgBxt5SqWMXzuTkMjlsA8EB53hlkN1w9esX4s8YtBeNqC3HKoUzcdq8uexSBqU8fDbSA==}
+  '@storybook/addon-toolbars@8.4.6':
+    resolution: {integrity: sha512-+Xao/uGa8FnYsyUiREUkYXWNysm3Aba8tL/Bwd+HufHtdiKJGa9lrXaC7VLCqBUaEjwqM3aaPwqEWIROsthmPQ==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/addon-viewport@8.3.5':
-    resolution: {integrity: sha512-FSWydoPiVWFXEittG7O1YgvuaqoU9Vb+qoq9XfP/hvQHHMDcMZvC40JaV8AnJeTXaM7ngIjcn9XDEfGbFfOzXw==}
+  '@storybook/addon-viewport@8.4.6':
+    resolution: {integrity: sha512-BuQll5YzOCpMS7p5Rsw9wcmi8hTnEKyg6+qAbkZNfiZ2JhXCa1GFUqX725fF1whpYVQULtkQxU8r+vahoRn7Yg==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/blocks@8.3.5':
-    resolution: {integrity: sha512-8cHTdTywolTHlgwN8I7YH7saWAIjGzV617AwjhJ95AKlC0VtpO1gAFcAgCqr4DU9eMc+LZuvbnaU/RSvA5eCCQ==}
+  '@storybook/blocks@8.4.6':
+    resolution: {integrity: sha512-Gzbx8hM7ZQIHlQELcFIMbY1v+r1Po4mlinq0QVPtKS4lBcW4eZIsesbxOaL+uFNrxb583TLFzXo0DbRPzS46sg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.3.5
+      storybook: ^8.4.6
     peerDependenciesMeta:
       react:
         optional: true
       react-dom:
         optional: true
 
-  '@storybook/builder-vite@8.3.5':
-    resolution: {integrity: sha512-paGX8tEmAeAKFU5Cnwkq3RAi3LFCnmjAxMJikT09jUi6jDpNa0VzH8jbLxKdjsPMAsz0Wv3mrLvL2b8hyxLWAw==}
+  '@storybook/builder-vite@8.4.6':
+    resolution: {integrity: sha512-PyJsaEPyuRFFEplpNUi+nbuJd7d1DC2dAZjpsaHTXyqg5iPIbkIgsbCJLUDeIXnUDqM/utjmMpN0sQKJuhIc6w==}
     peerDependencies:
-      '@preact/preset-vite': '*'
-      storybook: ^8.3.5
-      typescript: ^5.6.2
-      vite: ^4.0.0 || ^5.0.0
-      vite-plugin-glimmerx: '*'
+      storybook: ^8.4.6
+      vite: ^4.0.0 || ^5.0.0 || ^6.0.0
+
+  '@storybook/components@8.4.6':
+    resolution: {integrity: sha512-9tKSJJCyFT5RZMRGyozTBJkr9C9Yfk1nuOE9XbDEE1Z+3/IypKR9+iwc5mfNBStDNY+rxtYWNLKBb5GPR2yhzA==}
+    peerDependencies:
+      storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+
+  '@storybook/core@8.4.6':
+    resolution: {integrity: sha512-WeojVtHy0/t50tzw/15S+DLzKsj8BN9yWdo3vJMvm+nflLFvfq1XvD9WGOWeaFp8E/o3AP+4HprXG0r42KEJtA==}
+    peerDependencies:
+      prettier: ^2 || ^3
     peerDependenciesMeta:
-      '@preact/preset-vite':
-        optional: true
-      typescript:
-        optional: true
-      vite-plugin-glimmerx:
+      prettier:
         optional: true
 
-  '@storybook/components@8.3.5':
-    resolution: {integrity: sha512-Rq28YogakD3FO4F8KwAtGpo1g3t4V/gfCLqTQ8B6oQUFoxLqegkWk/DlwCzvoJndXuQJfdSyM6+r1JcA4Nql5A==}
+  '@storybook/csf-plugin@8.4.6':
+    resolution: {integrity: sha512-JDIT0czC4yMgKGNf39KTZr3zm5MusAZdn6LBrTfvWb7CrTCR4iVHa4lp2yb7EJk41vHsBec0QUYDDuiFH/vV0g==}
     peerDependencies:
-      storybook: ^8.3.5
-
-  '@storybook/core@8.3.5':
-    resolution: {integrity: sha512-GOGfTvdioNa/n+Huwg4u/dsyYyBcM+gEcdxi3B7i5x4yJ3I912KoVshumQAOF2myKSRdI8h8aGWdx7nnjd0+5Q==}
-
-  '@storybook/csf-plugin@8.3.5':
-    resolution: {integrity: sha512-ODVqNXwJt90hG7QW8I9w/XUyOGlr0l7XltmIJgXwB/2cYDvaGu3JV5Ybg7O0fxPV8uXk7JlRuUD8ZYv5Low6pA==}
-    peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
   '@storybook/csf@0.1.11':
     resolution: {integrity: sha512-dHYFQH3mA+EtnCkHXzicbLgsvzYjcDJ1JWsogbItZogkPHgSJM/Wr71uMkcvw8v9mmCyP4NpXJuu6bPoVsOnzg==}
@@ -4598,57 +5498,57 @@ packages:
   '@storybook/global@5.0.0':
     resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
 
-  '@storybook/icons@1.2.10':
-    resolution: {integrity: sha512-310apKdDcjbbX2VSLWPwhEwAgjxTzVagrwucVZIdGPErwiAppX8KvBuWZgPo+rQLVrtH8S+pw1dbUwjcE6d7og==}
+  '@storybook/icons@1.2.12':
+    resolution: {integrity: sha512-UxgyK5W3/UV4VrI3dl6ajGfHM4aOqMAkFLWe2KibeQudLf6NJpDrDMSHwZj+3iKC4jFU7dkKbbtH2h/al4sW3Q==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
 
-  '@storybook/instrumenter@8.3.5':
-    resolution: {integrity: sha512-NLDXai5y2t1ITgHVK9chyL0rMFZbICCOGcnTbyWhkLbiEWZKPJ8FuB8+g+Ba6zwtCve1A1Cnb4O2LOWy7TgWQw==}
+  '@storybook/instrumenter@8.4.6':
+    resolution: {integrity: sha512-snXjlgbp065A6KoK9zkjBYEIMCSlN5JefPKzt1FC0rbcbtahhD+iPpqISKhDSczwgOku/JVhVUDp/vU7AIf4mg==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/manager-api@8.3.5':
-    resolution: {integrity: sha512-fEQoKKi7h7pzh2z9RfuzatJxubrsfL/CB99fNXQ0wshMSY/7O4ckd18pK4fzG9ErnCtLAO9qsim4N/4eQC+/8Q==}
+  '@storybook/manager-api@8.4.6':
+    resolution: {integrity: sha512-TsXlQ5m5rTl2KNT9icPFyy822AqXrx1QplZBt/L7cFn7SpqQKDeSta21FH7MG0piAvzOweXebVSqKngJ6cCWWQ==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
 
-  '@storybook/preview-api@8.3.5':
-    resolution: {integrity: sha512-VPqpudE8pmjTLvdNJoW/2//nqElDgUOmIn3QxbbCmdZTHDg5tFtxuqwdlNfArF0TxvTSBDIulXt/Q6K56TAfTg==}
+  '@storybook/preview-api@8.4.6':
+    resolution: {integrity: sha512-LbD+lR1FGvWaJBXteVx5xdgs1x1D7tyidBg2CsW2ex+cP0iJ176JgjPfutZxlWOfQnhfRYNnJ3WKoCIfxFOTKA==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
 
-  '@storybook/react-dom-shim@8.3.5':
-    resolution: {integrity: sha512-Hf0UitJ/K0C7ajooooUK/PxOR4ihUWqsC7iCV1Gqth8U37dTeLMbaEO4PBwu0VQ+Ufg0N8BJLWfg7o6G4hrODw==}
+  '@storybook/react-dom-shim@8.4.6':
+    resolution: {integrity: sha512-f7RM8GO++fqMxbjNdEzeGS1P821jXuwRnAraejk5hyjB5SqetauFxMwoFYEYfJXPaLX2qIubnIJ78hdJ/IBaEA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/test@8.3.5':
-    resolution: {integrity: sha512-1BXWsUGWk9FiKKelZZ55FDJdeoL8uRBHbjTYBRM2xJLhdNSvGzI4Tb3bkmxPpGn72Ua6AyldhlTxr2BpUFKOHA==}
+  '@storybook/test@8.4.6':
+    resolution: {integrity: sha512-MeU1g65YgU66M2NtmEIL9gVeHk+en0k9Hp0wfxEO7NT/WLfaOD5RXLRDJVhbAlrH/6tLeWKIPNh/D26y27vO/g==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
 
-  '@storybook/theming@8.3.5':
-    resolution: {integrity: sha512-9HmDDyC691oqfg4RziIM9ElsS2HITaxmH7n/yeUPtuirkPdAQzqOzhvH/Sa0qOhifzs8VjR+Gd/a/ZQ+S38r7w==}
+  '@storybook/theming@8.4.6':
+    resolution: {integrity: sha512-q7vDPN/mgj7cXIVQ9R1/V75hrzNgKkm2G0LjMo57//9/djQ+7LxvBsR1iScbFIRSEqppvMiBFzkts+2uXidySA==}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
 
-  '@storybook/vue3-vite@8.3.5':
-    resolution: {integrity: sha512-y2/fJ8FlhbXZ09nLA/WrYnBFbMyLKlHo+f4fE4Pp/Yk+5OU3z2oCphChc8bwcCseSgbMG1ZY0wwyN3UbH/sRpA==}
+  '@storybook/vue3-vite@8.4.6':
+    resolution: {integrity: sha512-XmCM1+BeLSAdfgfMX1Yr8GfJlU7mW/AwCR30e2R8FG2wUoBxT24PVTj0nMhQsa4RC9GGQ7RNHCbuRNNwHIdQdQ==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      storybook: ^8.3.5
-      vite: ^4.0.0 || ^5.0.0
+      storybook: ^8.4.6
+      vite: ^4.0.0 || ^5.0.0 || ^6.0.0
 
-  '@storybook/vue3@8.3.5':
-    resolution: {integrity: sha512-qm/c3CFvMlSCy2TCRTT8xEuEgDiSlaQnMq/ywig5xAiExZBdgxMxARRq3FOiXjRJ00F5nEQ5fT9yMftcJhJo6w==}
+  '@storybook/vue3@8.4.6':
+    resolution: {integrity: sha512-mIGTaIBejxquh8UndGpAYRUFzdt3LfP3olaqZzOAOF9bNhxU6E8napZ52aXRFyHiT77Cs2+dhYLwPWdY+9+10g==}
     engines: {node: '>=18.0.0'}
     peerDependencies:
-      storybook: ^8.3.5
+      storybook: ^8.4.6
       vue: ^3.0.0
 
   '@supabase/auth-js@2.65.0':
@@ -4690,8 +5590,8 @@ packages:
     resolution: {integrity: sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==}
     engines: {node: '>=18'}
 
-  '@testing-library/dom@9.3.3':
-    resolution: {integrity: sha512-fB0R+fa3AUqbLHWyxXa2kGVtf1Fe1ZZFr0Zp6AIbIAzXb2mKbEXl+PCQNUOaq5lbTab5tfctfXRNsWXxa2f7Aw==}
+  '@testing-library/dom@9.3.4':
+    resolution: {integrity: sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==}
     engines: {node: '>=14'}
 
   '@testing-library/jest-dom@6.5.0':
@@ -4725,6 +5625,10 @@ packages:
     resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
     engines: {node: '>= 10'}
 
+  '@trysound/sax@0.2.0':
+    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
+    engines: {node: '>=10.13.0'}
+
   '@tsconfig/node10@1.0.11':
     resolution: {integrity: sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==}
 
@@ -4788,8 +5692,8 @@ packages:
   '@types/concat-stream@2.0.0':
     resolution: {integrity: sha512-t3YCerNM7NTVjLuICZo5gYAXYoDvpuuTceCcFQWcDQz26kxUR5uIWolxbIR5jRNIXpMqhOpW/b8imCR1LEmuJw==}
 
-  '@types/connect@3.4.35':
-    resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
+  '@types/connect@3.4.36':
+    resolution: {integrity: sha512-P63Zd/JUGq+PdrM1lv0Wv5SBYeA2+CORvbrXbngriYY0jzLUWfQMQQxOhjONEz/wlHOAxOdY7CY65rgQdTjq2w==}
 
   '@types/convict@6.1.1':
     resolution: {integrity: sha512-R+JLaTvhsD06p4jyjUDtbd5xMtZTRE3c0iI+lrFWZogSVEjgTWPYwvJPVf+t92E+yrlbXa4X4Eg9ro6gPdUt4w==}
@@ -4803,6 +5707,9 @@ packages:
   '@types/dateformat@3.0.1':
     resolution: {integrity: sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g==}
 
+  '@types/debug@4.1.12':
+    resolution: {integrity: sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==}
+
   '@types/deep-equal@1.0.1':
     resolution: {integrity: sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==}
 
@@ -4827,9 +5734,6 @@ packages:
   '@types/file-saver@2.0.5':
     resolution: {integrity: sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==}
 
-  '@types/find-cache-dir@3.2.1':
-    resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
-
   '@types/flat@5.0.5':
     resolution: {integrity: sha512-nPLljZQKSnac53KDUDzuzdRfGI0TDb5qPrb+SrQyN3MtdQrOnGsKniHN1iYZsJEBIVQve94Y6gNz22sgISZq+Q==}
 
@@ -4851,9 +5755,6 @@ packages:
   '@types/graceful-fs@4.1.6':
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
 
-  '@types/hast@3.0.4':
-    resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
-
   '@types/html-to-text@9.0.4':
     resolution: {integrity: sha512-pUY3cKH/Nm2yYrEmDlPR1mR7yszjGx4DrwPjQ702C4/D5CwHuZTgZdIdwPkRbcuhs7BAh2L5rg3CL5cbRiGTCQ==}
 
@@ -4965,12 +5866,18 @@ packages:
   '@types/minimatch@5.1.2':
     resolution: {integrity: sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==}
 
+  '@types/ms@0.7.34':
+    resolution: {integrity: sha512-nG96G3Wp6acyAgJqGasjODb+acrI7KltPiRxzHPXnP3NgI28bpQDRv53olbqGXbfcgF5aiiHmO3xpwEpS5Ld9g==}
+
   '@types/mssql@9.1.5':
     resolution: {integrity: sha512-Q9EsgXwuRoX5wvUSu24YfbKMbFChv7pZ/jeCzPkj47ehcuXYsBcfogwrtVFosSjinD4Q/MY2YPGk9Yy1cM2Ywg==}
 
   '@types/multer@1.4.12':
     resolution: {integrity: sha512-pQ2hoqvXiJt2FP9WQVLPRO+AmiIm/ZYkavPlIQnx282u4ZrVdztx0pkh3jjpQt0Kz+YI0YhSG264y08UJKoUQg==}
 
+  '@types/mysql@2.15.26':
+    resolution: {integrity: sha512-DSLCOXhkvfS5WNNPbfn2KdICAmk8lLc+/PNvnPnF7gOdMZCxopXduqv0OQ13y/yA/zXTSikZZqVgybUxOEg6YQ==}
+
   '@types/node-fetch@2.6.4':
     resolution: {integrity: sha512-1ZX9fcN4Rvkvgv4E6PAY5WXUFWFcRWxZa3EW83UjycOB9ljJCedb2CupIP4RZMEwF/M3eTcCihbBRgwtGbg5Rg==}
 
@@ -4983,9 +5890,15 @@ packages:
   '@types/normalize-package-data@2.4.1':
     resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==}
 
+  '@types/pg-pool@2.0.6':
+    resolution: {integrity: sha512-TaAUE5rq2VQYxab5Ts7WZhKNmuN78Q6PiFonTDdpbx8a1H0M1vhy3rhiMjl+e2iHmogyMw7jZF4FrE6eJUy5HQ==}
+
   '@types/pg@8.11.6':
     resolution: {integrity: sha512-/2WmmBXHLsfRqzfHW7BNZ8SbYzE8OSk7i3WjFYvfgRHj7S1xj+16Je5fUKv3lVdVzk/zn9TXOqf+avFCFIE0yQ==}
 
+  '@types/pg@8.6.1':
+    resolution: {integrity: sha512-1Kc4oAGzAl7uqUStZCDvaLFqZrW9qWSjXOmBfdgyBP5La7Us6Mg4GBvRlSoaZMhQF/zSj1C8CtKMBkoiT8eL8w==}
+
   '@types/phoenix@1.6.4':
     resolution: {integrity: sha512-B34A7uot1Cv0XtaHRYDATltAdKx0BvVKNgYNqE4WjtPUa4VQJM7kxeXcVKaH+KS+kCmZ+6w+QaUdcljiheiBJA==}
 
@@ -5001,8 +5914,8 @@ packages:
   '@types/psl@1.1.0':
     resolution: {integrity: sha512-HhZnoLAvI2koev3czVPzBNRYvdrzJGLjQbWZhqFmS9Q6a0yumc5qtfSahBGb5g+6qWvA8iiQktqGkwoIXa/BNQ==}
 
-  '@types/qs@6.9.7':
-    resolution: {integrity: sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==}
+  '@types/qs@6.9.15':
+    resolution: {integrity: sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==}
 
   '@types/quoted-printable@1.0.2':
     resolution: {integrity: sha512-3B28oB1rRaZNb3N5dlxysm8lH1ujzvReDuYBiIO4jvpTIg9ksrILCNgPxSGVyTWE/qwuxzgHaVehwMK3CVqAtA==}
@@ -5049,6 +5962,9 @@ packages:
   '@types/shelljs@0.8.11':
     resolution: {integrity: sha512-x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw==}
 
+  '@types/shimmer@1.2.0':
+    resolution: {integrity: sha512-UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==}
+
   '@types/showdown@1.9.4':
     resolution: {integrity: sha512-50ehC3IAijfkvoNqmQ+VL73S7orOxmAK8ljQAFBv8o7G66lAZyxQj1L3BAv2dD86myLXI+sgKP1kcxAaxW356w==}
 
@@ -5088,6 +6004,9 @@ packages:
   '@types/syslog-client@1.1.2':
     resolution: {integrity: sha512-X8MwGedXYNmYltPDaZQCM9X6cSdfFbJZWhrU81gWKsg+Q6mSgRWs/12Mq9nHaUV4wqMYDNrnytbwbMUiVnWegw==}
 
+  '@types/tedious@4.0.14':
+    resolution: {integrity: sha512-KHPsfX/FoVbUGbyYvk1q9MMQHLPeRZhRJZdO45Q4YjvFkv4hMNghCWTvy7rdKessBsmtz4euWCWAB6/tVpI1Iw==}
+
   '@types/tedious@4.0.9':
     resolution: {integrity: sha512-ipwFvfy9b2m0gjHsIX0D6NAAwGCKokzf5zJqUZHUGt+7uWVlBIy6n2eyMgiKQ8ChLFVxic/zwQUhjLYNzbHDRA==}
 
@@ -5106,9 +6025,6 @@ packages:
   '@types/tunnel@0.0.3':
     resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==}
 
-  '@types/unist@3.0.2':
-    resolution: {integrity: sha512-dqId9J8K/vGi5Zr7oo212BGii5m3q5Hxlkwy3WpYuKPklmBEvsbMYYyLxAQpSffdLl/gdW0XUpKWFvYmyoWCoQ==}
-
   '@types/utf8@3.0.3':
     resolution: {integrity: sha512-+lqLGxWZsEe4Z6OrzBI7Ym4SMUTaMS5yOrHZ0/IL0bpIye1Qbs4PpobJL2mLDbftUXlPFZR7fu6d1yM+bHLX1w==}
 
@@ -5248,21 +6164,33 @@ packages:
     resolution: {integrity: sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==}
     engines: {node: ^16.0.0 || >=18.0.0}
 
+  '@typescript/vfs@1.6.0':
+    resolution: {integrity: sha512-hvJUjNVeBMp77qPINuUvYXj4FyWeeMMKZkxEATEU3hqBAQ7qdTBCUFT7Sp0Zu0faeEtFf+ldXxMEDr/bk73ISg==}
+    peerDependencies:
+      typescript: ^5.7.2
+
   '@ungap/structured-clone@1.2.0':
     resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==}
 
-  '@vitejs/plugin-vue@5.1.4':
-    resolution: {integrity: sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==}
+  '@vitejs/plugin-legacy@6.0.0':
+    resolution: {integrity: sha512-pWt9cWaGJAKYw+67VLpN8hSP+G+yAQnrf5Pqh/NzSDKFl/4KpxTtwb5OLQezHoZOxghahO/ha3IpvblBbX/t6A==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    peerDependencies:
+      terser: ^5.16.0
+      vite: ^6.0.0
+
+  '@vitejs/plugin-vue@5.2.1':
+    resolution: {integrity: sha512-cxh314tzaWwOLqVes2gnnCtvBDcM1UMdn+iFR+UjAn411dPT3tOmqrJjbMd7koZpMAmBM/GqeV4n9ge7JSiJJQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
-      vite: ^5.0.0
+      vite: ^5.0.0 || ^6.0.0
       vue: ^3.2.25
 
-  '@vitest/coverage-v8@2.1.2':
-    resolution: {integrity: sha512-b7kHrFrs2urS0cOk5N10lttI8UdJ/yP3nB4JYTREvR5o18cR99yPpK4gK8oQgI42BVv0ILWYUSYB7AXkAUDc0g==}
+  '@vitest/coverage-v8@2.1.8':
+    resolution: {integrity: sha512-2Y7BPlKH18mAZYAW1tYByudlCYrQyl5RGvnnDYJKW5tCiO5qg3KSAy3XAxcxKz900a0ZXxWtKrMuZLe3lKBpJw==}
     peerDependencies:
-      '@vitest/browser': 2.1.2
-      vitest: 2.1.2
+      '@vitest/browser': 2.1.8
+      vitest: 2.1.8
     peerDependenciesMeta:
       '@vitest/browser':
         optional: true
@@ -5270,14 +6198,13 @@ packages:
   '@vitest/expect@2.0.5':
     resolution: {integrity: sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==}
 
-  '@vitest/expect@2.1.2':
-    resolution: {integrity: sha512-FEgtlN8mIUSEAAnlvn7mP8vzaWhEaAEvhSXCqrsijM7K6QqjB11qoRZYEd4AKSCDz8p0/+yH5LzhZ47qt+EyPg==}
+  '@vitest/expect@2.1.8':
+    resolution: {integrity: sha512-8ytZ/fFHq2g4PJVAtDX57mayemKgDR6X3Oa2Foro+EygiOJHUXhCqBAAKQYYajZpFoIfvBCF1j6R6IYRSIUFuw==}
 
-  '@vitest/mocker@2.1.2':
-    resolution: {integrity: sha512-ExElkCGMS13JAJy+812fw1aCv2QO/LBK6CyO4WOPAzLTmve50gydOlWhgdBJPx2ztbADUq3JVI0C5U+bShaeEA==}
+  '@vitest/mocker@2.1.8':
+    resolution: {integrity: sha512-7guJ/47I6uqfttp33mgo6ga5Gr1VnL58rcqYKyShoRK9ebu8T5Rs6HN3s1NABiBeVTdWNrwUMcHH54uXZBN4zA==}
     peerDependencies:
-      '@vitest/spy': 2.1.2
-      msw: ^2.3.5
+      msw: ^2.4.9
       vite: ^5.0.0
     peerDependenciesMeta:
       msw:
@@ -5288,38 +6215,38 @@ packages:
   '@vitest/pretty-format@2.0.5':
     resolution: {integrity: sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==}
 
-  '@vitest/pretty-format@2.1.2':
-    resolution: {integrity: sha512-FIoglbHrSUlOJPDGIrh2bjX1sNars5HbxlcsFKCtKzu4+5lpsRhOCVcuzp0fEhAGHkPZRIXVNzPcpSlkoZ3LuA==}
+  '@vitest/pretty-format@2.1.8':
+    resolution: {integrity: sha512-9HiSZ9zpqNLKlbIDRWOnAWqgcA7xu+8YxXSekhr0Ykab7PAYFkhkwoqVArPOtJhPmYeE2YHgKZlj3CP36z2AJQ==}
 
-  '@vitest/runner@2.1.2':
-    resolution: {integrity: sha512-UCsPtvluHO3u7jdoONGjOSil+uON5SSvU9buQh3lP7GgUXHp78guN1wRmZDX4wGK6J10f9NUtP6pO+SFquoMlw==}
+  '@vitest/runner@2.1.8':
+    resolution: {integrity: sha512-17ub8vQstRnRlIU5k50bG+QOMLHRhYPAna5tw8tYbj+jzjcspnwnwtPtiOlkuKC4+ixDPTuLZiqiWWQ2PSXHVg==}
 
-  '@vitest/snapshot@2.1.2':
-    resolution: {integrity: sha512-xtAeNsZ++aRIYIUsek7VHzry/9AcxeULlegBvsdLncLmNCR6tR8SRjn8BbDP4naxtccvzTqZ+L1ltZlRCfBZFA==}
+  '@vitest/snapshot@2.1.8':
+    resolution: {integrity: sha512-20T7xRFbmnkfcmgVEz+z3AU/3b0cEzZOt/zmnvZEctg64/QZbSDJEVm9fLnnlSi74KibmRsO9/Qabi+t0vCRPg==}
 
   '@vitest/spy@2.0.5':
     resolution: {integrity: sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==}
 
-  '@vitest/spy@2.1.2':
-    resolution: {integrity: sha512-GSUi5zoy+abNRJwmFhBDC0yRuVUn8WMlQscvnbbXdKLXX9dE59YbfwXxuJ/mth6eeqIzofU8BB5XDo/Ns/qK2A==}
+  '@vitest/spy@2.1.8':
+    resolution: {integrity: sha512-5swjf2q95gXeYPevtW0BLk6H8+bPlMb4Vw/9Em4hFxDcaOxS+e0LOX4yqNxoHzMR2akEB2xfpnWUzkZokmgWDg==}
 
   '@vitest/utils@2.0.5':
     resolution: {integrity: sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==}
 
-  '@vitest/utils@2.1.2':
-    resolution: {integrity: sha512-zMO2KdYy6mx56btx9JvAqAZ6EyS3g49krMPPrgOp1yxGZiA93HumGk+bZ5jIZtOg5/VBYl5eBmGRQHqq4FG6uQ==}
+  '@vitest/utils@2.1.8':
+    resolution: {integrity: sha512-dwSoui6djdwbfFmIgbIjX2ZhIoG7Ex/+xpxyiEgIGzjliY8xGkcpITKTlp6B4MgtGkF2ilvm97cPM96XZaAgcA==}
 
-  '@volar/language-core@2.4.6':
-    resolution: {integrity: sha512-FxUfxaB8sCqvY46YjyAAV6c3mMIq/NWQMVvJ+uS4yxr1KzOvyg61gAuOnNvgCvO4TZ7HcLExBEsWcDu4+K4E8A==}
+  '@volar/language-core@2.4.10':
+    resolution: {integrity: sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==}
 
-  '@volar/source-map@2.4.6':
-    resolution: {integrity: sha512-Nsh7UW2ruK+uURIPzjJgF0YRGP5CX9nQHypA2OMqdM2FKy7rh+uv3XgPnWPw30JADbKvZ5HuBzG4gSbVDYVtiw==}
+  '@volar/source-map@2.4.10':
+    resolution: {integrity: sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==}
 
-  '@volar/typescript@2.4.6':
-    resolution: {integrity: sha512-NMIrA7y5OOqddL9VtngPWYmdQU03htNKFtAYidbYfWA0TOhyGVd9tfcP4TsLWQ+RBWDZCbBqsr8xzU0ZOxYTCQ==}
+  '@volar/typescript@2.4.10':
+    resolution: {integrity: sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==}
 
-  '@vue-flow/background@1.3.0':
-    resolution: {integrity: sha512-fu/8s9wzSOQIitnSTI10XT3bzTtagh4h8EF2SWwtlDklOZjAaKy75lqv4htHa3wigy/r4LGCOGwLw3Pk88/AxA==}
+  '@vue-flow/background@1.3.2':
+    resolution: {integrity: sha512-eJPhDcLj1wEo45bBoqTXw1uhl0yK2RaQGnEINqvvBsAFKh/camHJd5NPmOdS1w+M9lggc9igUewxaEd3iCQX2w==}
     peerDependencies:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
@@ -5330,8 +6257,8 @@ packages:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
 
-  '@vue-flow/core@1.41.2':
-    resolution: {integrity: sha512-nRGMXPH4oOyC5I1W8HLqGarBFYZZMNhuHlLaai7+LkDmzvGark+c/ucnJfwYaI2ho/CzQQ8q1J3jMcr+Np2kFA==}
+  '@vue-flow/core@1.41.6':
+    resolution: {integrity: sha512-8zxcGRqiudra0obDMLTg9L89WxdlV0QrDOdyPYOKWDcD/UK5aT0MIL3Br9TF9AJmHW2z8QZq4cmmgroREL0jgQ==}
     peerDependencies:
       vue: ^3.3.0
 
@@ -5347,17 +6274,17 @@ packages:
       '@vue-flow/core': ^1.23.0
       vue: ^3.3.0
 
-  '@vue/compiler-core@3.5.11':
-    resolution: {integrity: sha512-PwAdxs7/9Hc3ieBO12tXzmTD+Ln4qhT/56S+8DvrrZ4kLDn4Z/AMUr8tXJD0axiJBS0RKIoNaR0yMuQB9v9Udg==}
+  '@vue/compiler-core@3.5.13':
+    resolution: {integrity: sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==}
 
-  '@vue/compiler-dom@3.5.11':
-    resolution: {integrity: sha512-pyGf8zdbDDRkBrEzf8p7BQlMKNNF5Fk/Cf/fQ6PiUz9at4OaUfyXW0dGJTo2Vl1f5U9jSLCNf0EZJEogLXoeew==}
+  '@vue/compiler-dom@3.5.13':
+    resolution: {integrity: sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==}
 
-  '@vue/compiler-sfc@3.5.11':
-    resolution: {integrity: sha512-gsbBtT4N9ANXXepprle+X9YLg2htQk1sqH/qGJ/EApl+dgpUBdTv3yP7YlR535uHZY3n6XaR0/bKo0BgwwDniw==}
+  '@vue/compiler-sfc@3.5.13':
+    resolution: {integrity: sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==}
 
-  '@vue/compiler-ssr@3.5.11':
-    resolution: {integrity: sha512-P4+GPjOuC2aFTk1Z4WANvEhyOykcvEd5bIj2KVNGKGfM745LaXGr++5njpdBTzVz5pZifdlR1kpYSJJpIlSePA==}
+  '@vue/compiler-ssr@3.5.13':
+    resolution: {integrity: sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==}
 
   '@vue/compiler-vue2@2.7.16':
     resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
@@ -5374,7 +6301,15 @@ packages:
     peerDependencies:
       eslint: ^8.56.0
       eslint-plugin-vue: ^9.0.0
-      typescript: ^5.6.2
+      typescript: ^5.7.2
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@vue/language-core@2.1.10':
+    resolution: {integrity: sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==}
+    peerDependencies:
+      typescript: ^5.7.2
     peerDependenciesMeta:
       typescript:
         optional: true
@@ -5382,27 +6317,27 @@ 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
 
-  '@vue/reactivity@3.5.11':
-    resolution: {integrity: sha512-Nqo5VZEn8MJWlCce8XoyVqHZbd5P2NH+yuAaFzuNSR96I+y1cnuUiq7xfSG+kyvLSiWmaHTKP1r3OZY4mMD50w==}
+  '@vue/reactivity@3.5.13':
+    resolution: {integrity: sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==}
 
-  '@vue/runtime-core@3.5.11':
-    resolution: {integrity: sha512-7PsxFGqwfDhfhh0OcDWBG1DaIQIVOLgkwA5q6MtkPiDFjp5gohVnJEahSktwSFLq7R5PtxDKy6WKURVN1UDbzA==}
+  '@vue/runtime-core@3.5.13':
+    resolution: {integrity: sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==}
 
-  '@vue/runtime-dom@3.5.11':
-    resolution: {integrity: sha512-GNghjecT6IrGf0UhuYmpgaOlN7kxzQBhxWEn08c/SQDxv1yy4IXI1bn81JgEpQ4IXjRxWtPyI8x0/7TF5rPfYQ==}
+  '@vue/runtime-dom@3.5.13':
+    resolution: {integrity: sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==}
 
-  '@vue/server-renderer@3.5.11':
-    resolution: {integrity: sha512-cVOwYBxR7Wb1B1FoxYvtjJD8X/9E5nlH4VSkJy2uMA1MzYNdzAAB//l8nrmN9py/4aP+3NjWukf9PZ3TeWULaA==}
+  '@vue/server-renderer@3.5.13':
+    resolution: {integrity: sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==}
     peerDependencies:
-      vue: 3.5.11
+      vue: 3.5.13
 
-  '@vue/shared@3.5.11':
-    resolution: {integrity: sha512-W8GgysJVnFo81FthhzurdRAWP/byq3q2qIw70e0JWblzVhjgOMiC2GyovXrZTFQJnFVryYaKGP3Tc9vYzYm6PQ==}
+  '@vue/shared@3.5.13':
+    resolution: {integrity: sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==}
 
   '@vue/test-utils@2.4.6':
     resolution: {integrity: sha512-FMxEjOpYNYiFe0GkaHsnJPXFHxQ6m4t8vI/ElPGpMWxZKpmRvQ33OIrvRXemy6yha03RxhOlQuy+gZMC3CQSow==}
@@ -5434,11 +6369,12 @@ 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==}
     engines: {node: '>=10.0.0'}
+    deprecated: this version has critical issues, please update to the latest version
 
   a-sync-waterfall@1.0.1:
     resolution: {integrity: sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==}
@@ -5461,15 +6397,16 @@ packages:
   acorn-globals@7.0.1:
     resolution: {integrity: sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==}
 
+  acorn-import-attributes@1.9.5:
+    resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==}
+    peerDependencies:
+      acorn: ^8
+
   acorn-jsx@5.3.2:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
 
-  acorn-walk@8.3.2:
-    resolution: {integrity: sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==}
-    engines: {node: '>=0.4.0'}
-
   acorn-walk@8.3.4:
     resolution: {integrity: sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==}
     engines: {node: '>=0.4.0'}
@@ -5484,6 +6421,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  acorn@8.14.0:
+    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   adm-zip@0.5.10:
     resolution: {integrity: sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==}
     engines: {node: '>=6.0'}
@@ -5545,6 +6487,9 @@ packages:
     engines: {node: '>=15'}
     hasBin: true
 
+  alien-signals@0.2.2:
+    resolution: {integrity: sha512-cZIRkbERILsBOXTQmMrxc9hgpxglstn69zm+F1ARf4aPAzdAFYd6sBq87ErO0Fj3DV94tglcyHG5kQz9nDC/8A==}
+
   amqplib@0.10.3:
     resolution: {integrity: sha512-UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw==}
     engines: {node: '>=10'}
@@ -5781,9 +6726,6 @@ packages:
   axios-retry@3.7.0:
     resolution: {integrity: sha512-ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ==}
 
-  axios@1.7.3:
-    resolution: {integrity: sha512-Ar7ND9pU99eJ9GpoGQKhKf58GpUOgnzuaB7ueNQ5BMi0p+LZ5oaEnfF999fAArcTIBwXTCHAmGcHOZJaWPq9Nw==}
-
   axios@1.7.4:
     resolution: {integrity: sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==}
 
@@ -5804,6 +6746,21 @@ packages:
     resolution: {integrity: sha512-zSuuuAlTMT4mzLj2nPnUm6fsE6270vdOfnpbJ+RmruU75UhLFvL0N2NgI7xpeS7NaB6hGqmd5pVpGTDYvi4Q3w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
 
+  babel-plugin-polyfill-corejs2@0.4.12:
+    resolution: {integrity: sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-corejs3@0.10.6:
+    resolution: {integrity: sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
+  babel-plugin-polyfill-regenerator@0.6.3:
+    resolution: {integrity: sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==}
+    peerDependencies:
+      '@babel/core': ^7.4.0 || ^8.0.0-0 <8.0.0
+
   babel-preset-current-node-syntax@1.0.1:
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
@@ -5913,11 +6870,23 @@ packages:
     resolution: {integrity: sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==}
     engines: {'0': node}
 
+  browserslist-to-esbuild@2.1.1:
+    resolution: {integrity: sha512-KN+mty6C3e9AN8Z5dI1xeN15ExcRNeISoC3g7V0Kax/MMF9MSoYA2G7lkTTcVUFntiEjkpI0HNgqJC1NjdyNUw==}
+    engines: {node: '>=18'}
+    hasBin: true
+    peerDependencies:
+      browserslist: '*'
+
   browserslist@4.23.0:
     resolution: {integrity: sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
 
+  browserslist@4.24.2:
+    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
   bs-logger@0.2.6:
     resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
     engines: {node: '>= 6'}
@@ -5925,8 +6894,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:
@@ -6025,14 +6994,17 @@ packages:
   caniuse-lite@1.0.30001667:
     resolution: {integrity: sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==}
 
+  caniuse-lite@1.0.30001677:
+    resolution: {integrity: sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==}
+
   capital-case@1.0.4:
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
 
   caseless@0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
 
-  chai@5.1.1:
-    resolution: {integrity: sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==}
+  chai@5.1.2:
+    resolution: {integrity: sha512-aGtmf24DW6MLHHG5gCx4zaI3uBq3KRtxeVs0DjFH6Z0rDNbsvTxFASFvdj79pxjxZ8/5u3PIiN3IwEIQkiiuPw==}
     engines: {node: '>=12'}
 
   chalk@2.4.2:
@@ -6063,6 +7035,9 @@ packages:
   chardet@0.7.0:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
 
+  chardet@2.0.0:
+    resolution: {integrity: sha512-xVgPpulCooDjY6zH4m9YW3jbkaBe3FKIAvF5sj5t7aBNsVl2ljIE+xwJ4iNgiDZHFQvNIpjdKdVOQvvk5ZfxbQ==}
+
   charenc@0.0.2:
     resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
 
@@ -6107,8 +7082,8 @@ packages:
     resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
     engines: {node: '>=10'}
 
-  chromatic@11.10.2:
-    resolution: {integrity: sha512-EbVlhmOLGdx9QRX3RMOTF3UzoyC1aaXNRjlzm1mc++2OI5+6C5Bzwt2ZUYJ3Jnf/pJa23q0y5Y3QEDcfRVqIbg==}
+  chromatic@11.20.0:
+    resolution: {integrity: sha512-Btdli1qoAI01UKmk3Iqe6vKhAhePRXqNI/2uKKy2R16q7SN/5kLTqhd1JI20LFOZSnH3xSJaUXeJ2xZOJB//3A==}
     hasBin: true
     peerDependencies:
       '@chromatic-com/cypress': ^0.*.* || ^1.0.0
@@ -6197,8 +7172,8 @@ packages:
   codemirror-lang-html-n8n@1.0.0:
     resolution: {integrity: sha512-ofNP6VTDGJ5rue+kTCZlDZdF1PnE0sl2cAkfrsCAd5MlBgDmqTwuFJIkTI6KXOJXs0ucdTYH6QLhy9BSW7EaOQ==}
 
-  cohere-ai@7.13.2:
-    resolution: {integrity: sha512-VCEzlwo/SYCBtDWpCTs9JsEn6jLAPxOvFcqdhT+urCl32hQhs1ENH20c5tvNPupTN/UdP8tkOPJdlrxfBRh5Yw==}
+  cohere-ai@7.14.0:
+    resolution: {integrity: sha512-hSo2/tFV29whjFFtVtdS7kHmtUsjfMO1sgwE/d5bhOE4O7Vkj5G1R9lLIqkIprp/+rrvCq3HGvEaOgry7xRcDA==}
 
   collect-v8-coverage@1.0.1:
     resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
@@ -6226,6 +7201,10 @@ packages:
   color@3.2.1:
     resolution: {integrity: sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==}
 
+  color@4.2.3:
+    resolution: {integrity: sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==}
+    engines: {node: '>=12.5.0'}
+
   colorette@1.4.0:
     resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==}
 
@@ -6243,6 +7222,9 @@ packages:
     resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
     engines: {node: '>= 0.8'}
 
+  comlink@4.4.1:
+    resolution: {integrity: sha512-+1dlx0aY5Jo1vHy/tSsIGpSkN4tS9rZSW8FIhG0JH/crs9wwweswIo/POr451r7bZww3hFbPAKnTpimzL/mm4Q==}
+
   commander@10.0.1:
     resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
     engines: {node: '>=14'}
@@ -6266,6 +7248,10 @@ packages:
     resolution: {integrity: sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==}
     engines: {node: '>= 6'}
 
+  commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+
   commander@9.4.1:
     resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==}
     engines: {node: ^12.20.0 || >=14}
@@ -6277,9 +7263,6 @@ packages:
     resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
     engines: {node: '>=4.0.0'}
 
-  commondir@1.0.1:
-    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
-
   compare-versions@6.1.1:
     resolution: {integrity: sha512-4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==}
 
@@ -6377,9 +7360,15 @@ packages:
   core-js-compat@3.36.0:
     resolution: {integrity: sha512-iV9Pd/PsgjNWBXeq8XRtWVSgz2tKAfhfvBs7qxYty+RlRd+OCksaWmOnc4JKrTc1cToXL1N0s3l/vwlxPtdElw==}
 
+  core-js-compat@3.39.0:
+    resolution: {integrity: sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==}
+
   core-js@3.35.0:
     resolution: {integrity: sha512-ntakECeqg81KqMueeGJ79Q5ZgQNR+6eaE8sxGCx62zMbAIj65q+uYvatToew3m6eAGdU4gNZwpZ34NMe4GYswg==}
 
+  core-js@3.39.0:
+    resolution: {integrity: sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==}
+
   core-util-is@1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
 
@@ -6417,8 +7406,8 @@ packages:
   cross-spawn@4.0.2:
     resolution: {integrity: sha512-yAXz/pA1tD8Gtg2S98Ekf/sewp3Lcp3YoFKJ4Hkp5h5yLWnKVTDU0kwjKJ8NDCYcfTLfyGkzTikst+jWypT1iA==}
 
-  cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+  cross-spawn@7.0.6:
+    resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
 
   crypt@0.0.2:
@@ -6444,6 +7433,14 @@ packages:
   css-to-react-native@3.2.0:
     resolution: {integrity: sha512-e8RKaLXMOFii+02mOlqwjbD00KSEKqblnpO9e++1aXS1fPQOpS1YoqdVHBqPjHNoxeF2mimzVqawm2KCbEdtHQ==}
 
+  css-tree@2.2.1:
+    resolution: {integrity: sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
+  css-tree@2.3.1:
+    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
   css-what@6.1.0:
     resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
     engines: {node: '>= 6'}
@@ -6459,6 +7456,10 @@ packages:
   cssfilter@0.0.10:
     resolution: {integrity: sha512-FAaLDaplstoRsDR8XGYH51znUN0UY7nMc6Z9/fvE8EXGwvJE9hu7W2vHwx1+bd6gCYnln9nLbzxFTrcO9YQDZw==}
 
+  csso@5.0.5:
+    resolution: {integrity: sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0, npm: '>=7.0.0'}
+
   cssom@0.3.8:
     resolution: {integrity: sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==}
 
@@ -6733,6 +7734,10 @@ packages:
     resolution: {integrity: sha512-463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w==}
     engines: {node: '>=8'}
 
+  detect-libc@2.0.3:
+    resolution: {integrity: sha512-bwy0MGW55bG41VqxxypOsdSdGqLwXPI/focwgTYCFMbdUiBAxLg9CFzG08sz2aqzknwiX7Hkl0bQENjg8iLByw==}
+    engines: {node: '>=8'}
+
   detect-newline@3.1.0:
     resolution: {integrity: sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==}
     engines: {node: '>=8'}
@@ -6833,6 +7838,10 @@ packages:
     resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
     engines: {node: '>=12'}
 
+  dotenv@16.4.5:
+    resolution: {integrity: sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==}
+    engines: {node: '>=12'}
+
   dotenv@8.6.0:
     resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
     engines: {node: '>=10'}
@@ -6878,6 +7887,9 @@ packages:
   electron-to-chromium@1.4.703:
     resolution: {integrity: sha512-094ZZC4nHXPKl/OwPinSMtLN9+hoFkdfQGKnvXbY+3WEAYtVDpz9UhJIViiY6Zb8agvqxiaJzNG9M+pRZWvSZw==}
 
+  electron-to-chromium@1.5.51:
+    resolution: {integrity: sha512-kKeWV57KSS8jH4alKt/jKnvHPmJgBxXzGUSbMd4eQF+iOsVPl7bz2KUmu6eo80eMP8wVioTfTyTzdMgM15WXNg==}
+
   element-plus@2.4.3:
     resolution: {integrity: sha512-b3q26j+lM4SBqiyzw8HybybGnP2pk4MWgrnzzzYW5qKQUgV6EG1Zg7nMCfgCVccI8tNvZoTiUHb2mFaiB9qT8w==}
     peerDependencies:
@@ -6993,8 +8005,8 @@ packages:
   es-get-iterator@1.1.3:
     resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
 
-  es-module-lexer@1.5.3:
-    resolution: {integrity: sha512-i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==}
+  es-module-lexer@1.5.4:
+    resolution: {integrity: sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==}
 
   es-object-atoms@1.0.0:
     resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
@@ -7032,6 +8044,10 @@ packages:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
     engines: {node: '>=6'}
 
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
   escape-goat@3.0.0:
     resolution: {integrity: sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==}
     engines: {node: '>=10'}
@@ -7286,6 +8302,10 @@ packages:
     resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
     engines: {node: '>=0.10.0'}
 
+  expect-type@1.1.0:
+    resolution: {integrity: sha512-bFi65yM+xZgk+u/KRIpekdSYkTB5W1pEf0Lt8Q8Msh7b+eQ7LXVtIB1Bkm4fvclDEL1b2CZkMhv2mOeF8tMdkA==}
+    engines: {node: '>=12.0.0'}
+
   expect@29.5.0:
     resolution: {integrity: sha512-yM7xqUrCO2JdpFo4XpM82t+PJBFybdqoQuJLDGeDX2ij8NZzqRHyu3Hp188/JX7SWqud+7t4MUdvcgGBICMHZg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -7444,10 +8464,6 @@ packages:
     resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==}
     engines: {node: '>= 0.8'}
 
-  find-cache-dir@3.3.2:
-    resolution: {integrity: sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==}
-    engines: {node: '>=8'}
-
   find-package-json@1.2.0:
     resolution: {integrity: sha512-+SOGcLGYDJHtyqHd87ysBhmaeQ95oWspDKnMXBrnQ9Eq4OkLNqejgoaD8xVWu6GPa0B6roa6KinCMEMcVeqONw==}
 
@@ -7549,10 +8565,6 @@ packages:
   fs-constants@1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
 
-  fs-extra@11.1.1:
-    resolution: {integrity: sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ==}
-    engines: {node: '>=14.14'}
-
   fs-extra@7.0.1:
     resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
     engines: {node: '>=6 <7 || >=8'}
@@ -7568,6 +8580,11 @@ packages:
   fs.realpath@1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
+  fsevents@2.3.2:
+    resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
   fsevents@2.3.3:
     resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -7627,9 +8644,6 @@ packages:
     resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
     engines: {node: 6.* || 8.* || >= 10.*}
 
-  get-func-name@2.0.2:
-    resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==}
-
   get-intrinsic@1.2.4:
     resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
     engines: {node: '>= 0.4'}
@@ -7674,12 +8688,12 @@ packages:
   getpass@0.1.7:
     resolution: {integrity: sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==}
 
+  github-buttons@2.29.1:
+    resolution: {integrity: sha512-TV3YgAKda5hPz75n7QXmGCsSzgVya1vvmBieebg3EB5ScmashTZ0FldViG1aU2d4V5rcAGrtQ7k5uAaCo0A4PA==}
+
   github-from-package@0.0.0:
     resolution: {integrity: sha512-SyHy3T1v2NUXn29OsWdxmK6RwHD+vkj3v8en8AOBZ1wBQ/hCAQ5bAQTD02kW4W9tUp/3Qh6J8r9EvntiyCmOOw==}
 
-  github-slugger@2.0.0:
-    resolution: {integrity: sha512-IaOQ9puYtjrkq7Y0Ygl9KDZnrf/aiUJYUpVf89y8kyaxbRG7Y1SrX/jaumrv81vc61+kiMempujsM3Yw7w5qcw==}
-
   glob-parent@5.1.2:
     resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
     engines: {node: '>= 6'}
@@ -7706,10 +8720,6 @@ packages:
     engines: {node: '>=12'}
     deprecated: Glob versions prior to v9 are no longer supported
 
-  glob@9.3.2:
-    resolution: {integrity: sha512-BTv/JhKXFEHsErMte/AnfiSv8yYOLLiyH2lTg8vn02O21zWFgHPTfxtgn1QRe7NRgggUhC8hacR2Re94svHqeA==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
   global-dirs@3.0.0:
     resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==}
     engines: {node: '>=10'}
@@ -7832,15 +8842,6 @@ packages:
     resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
     engines: {node: '>= 0.4'}
 
-  hast-util-heading-rank@3.0.0:
-    resolution: {integrity: sha512-EJKb8oMUXVHcWZTDepnr+WNbfnXKFNf9duMesmr4S8SXTJBJ9M4Yok08pu9vxdJwdlGRhVumk9mEhkEvKGifwA==}
-
-  hast-util-is-element@3.0.0:
-    resolution: {integrity: sha512-Val9mnv2IWpLbNPqc/pUem+a7Ipj2aHacCwgNfTiK0vJKl0LF+4Ba4+v1oPHFpf3bLYmreq0/l3Gud9S5OH42g==}
-
-  hast-util-to-string@3.0.0:
-    resolution: {integrity: sha512-OGkAxX1Ua3cbcW6EJ5pT/tslVb90uViVkcJ4ZZIMW/R33DX/AkcJcRrPebPwJkHYwlDHXz4aIwvAAaAdtrACFA==}
-
   he@1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
@@ -7963,6 +8964,10 @@ packages:
   humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
 
+  ibm-cloud-sdk-core@5.1.0:
+    resolution: {integrity: sha512-KJCbPz3tiXB1NGAD7cL4JtwpWV8yd/C7jsaHsxvedMo2ZblNG8emMyvSpGhiKAQVZmi3c0ujz6eJdy22NHuUWQ==}
+    engines: {node: '>=18'}
+
   iconv-lite@0.4.24:
     resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
     engines: {node: '>=0.10.0'}
@@ -8002,6 +9007,9 @@ packages:
     resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
     engines: {node: '>=6'}
 
+  import-in-the-middle@1.11.3:
+    resolution: {integrity: sha512-tNpKEb4AjZrCyrxi+Eyu43h5ig0O8ZRFSXPHh/00/o+4P4pKzVEW/m5lsVtsAT7fCIgmQOAPjdqecGDsBXRxsw==}
+
   import-lazy@4.0.0:
     resolution: {integrity: sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==}
     engines: {node: '>=8'}
@@ -8074,17 +9082,14 @@ 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==}
     engines: {node: '>= 0.10'}
 
-  is-absolute-url@4.0.1:
-    resolution: {integrity: sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
   is-arguments@1.1.1:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
@@ -8140,6 +9145,9 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
+  is-emoji-supported@0.0.5:
+    resolution: {integrity: sha512-WOlXUhDDHxYqcSmFZis+xWhhqXiK2SU0iYiqmth5Ip0FHLZQAt9rKL5ahnilE8/86WH8tZ3bmNNNC+bTzamqlw==}
+
   is-expression@4.0.0:
     resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==}
 
@@ -8283,6 +9291,10 @@ packages:
   isexe@2.0.0:
     resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
 
+  isexe@3.1.1:
+    resolution: {integrity: sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==}
+    engines: {node: '>=16'}
+
   iso-639-1@2.1.15:
     resolution: {integrity: sha512-7c7mBznZu2ktfvyT582E2msM+Udc1EjOyhVRE/0ZsjD9LBtWSm23h3PtiRh2a35XoUsTQQjJXaJzuLjXsOdFDg==}
     engines: {node: '>=6.0'}
@@ -8420,7 +9432,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==}
@@ -8550,6 +9562,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'}
@@ -8596,6 +9611,10 @@ packages:
   json-parse-even-better-errors@2.3.1:
     resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
 
+  json-parse-even-better-errors@4.0.0:
+    resolution: {integrity: sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+
   json-pointer@0.6.2:
     resolution: {integrity: sha512-vLWcKbOaXlO+jvRy4qNd+TI1QUPZzfJj1tpJ3vAXDych5XJf93ftpUKe5pKCrzyIIwgBJcOcCVRUfqQP25afBw==}
 
@@ -8689,16 +9708,18 @@ packages:
   kuler@2.0.0:
     resolution: {integrity: sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==}
 
-  langchain@0.3.2:
-    resolution: {integrity: sha512-kd2kz1cS/PIVrLEDFlrZsAasQfPLbY1UqCZbRKa3/QcpB33/n6xPDvXSMfBuKhvNj0bjW6MXDR9HZTduXjJBgg==}
+  langchain@0.3.11:
+    resolution: {integrity: sha512-PgAG4ZLeuSRkKsyf98cmWGdwKv3I1hOFC8a4fr7e+bm7E+F6Fx6xUkgbuC78ff0N/Cjs5BBryZIFMrqoKPqsvg==}
     engines: {node: '>=18'}
     peerDependencies:
       '@langchain/anthropic': '*'
       '@langchain/aws': '*'
+      '@langchain/cerebras': '*'
       '@langchain/cohere': '*'
       '@langchain/core': '>=0.2.21 <0.4.0'
       '@langchain/google-genai': '*'
       '@langchain/google-vertexai': '*'
+      '@langchain/google-vertexai-web': '*'
       '@langchain/groq': '*'
       '@langchain/mistralai': '*'
       '@langchain/ollama': '*'
@@ -8712,12 +9733,16 @@ packages:
         optional: true
       '@langchain/aws':
         optional: true
+      '@langchain/cerebras':
+        optional: true
       '@langchain/cohere':
         optional: true
       '@langchain/google-genai':
         optional: true
       '@langchain/google-vertexai':
         optional: true
+      '@langchain/google-vertexai-web':
+        optional: true
       '@langchain/groq':
         optional: true
       '@langchain/mistralai':
@@ -8735,8 +9760,16 @@ packages:
       typeorm:
         optional: true
 
-  langsmith@0.1.59:
-    resolution: {integrity: sha512-dW+z6s538zBswFFP2w/xzvVef7y2+yNt6GkmRCeLtwfpbMaM4di7JboK3vmnZ+0/LjNb2ukiMmgsTNKu/Y43cg==}
+  langsmith@0.2.15:
+    resolution: {integrity: sha512-homtJU41iitqIZVuuLW7iarCzD4f39KcfP9RTBWav9jifhrsDa1Ez89Ejr+4qi72iuBu8Y5xykchsGVgiEZ93w==}
+    peerDependencies:
+      openai: '*'
+    peerDependenciesMeta:
+      openai:
+        optional: true
+
+  langsmith@0.2.3:
+    resolution: {integrity: sha512-SPMYPVqR9kwXZVmJ2PXC61HeBnXIFHrjfjDxQ14H0+n5p4gqjLzgSHIQyxBlFeWQUQzArJxe65Ap+s+Xo1cZog==}
     peerDependencies:
       openai: '*'
     peerDependenciesMeta:
@@ -8835,9 +9868,6 @@ packages:
   libqp@2.0.1:
     resolution: {integrity: sha512-Ka0eC5LkF3IPNQHJmYBWljJsw0UvM6j+QdKRbWyCdTmYwvIDE6a7bCm0UkTAL/K+3KXK5qXT/ClcInU01OpdLg==}
 
-  lie@3.1.1:
-    resolution: {integrity: sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==}
-
   lie@3.3.0:
     resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
 
@@ -8871,9 +9901,6 @@ packages:
     resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
     engines: {node: '>=14'}
 
-  localforage@1.10.0:
-    resolution: {integrity: sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==}
-
   locate-path@5.0.0:
     resolution: {integrity: sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==}
     engines: {node: '>=8'}
@@ -8898,6 +9925,9 @@ packages:
   lodash.clonedeep@4.5.0:
     resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
 
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
   lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
@@ -8980,8 +10010,8 @@ packages:
   lossless-json@1.0.5:
     resolution: {integrity: sha512-RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA==}
 
-  loupe@3.1.1:
-    resolution: {integrity: sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==}
+  loupe@3.1.2:
+    resolution: {integrity: sha512-23I4pFZHmAemUnz8WZXbYRSKYj801VDaNv9ETuMh7IrMc7VuVVSo+Z9iLE3ni30+U48iDWfi30d3twAXBYmnCg==}
 
   lower-case@1.1.4:
     resolution: {integrity: sha512-2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==}
@@ -9033,12 +10063,8 @@ packages:
   magic-string@0.30.10:
     resolution: {integrity: sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==}
 
-  magic-string@0.30.11:
-    resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==}
-
-  magic-string@0.30.8:
-    resolution: {integrity: sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==}
-    engines: {node: '>=12'}
+  magic-string@0.30.14:
+    resolution: {integrity: sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==}
 
   magicast@0.3.5:
     resolution: {integrity: sha512-L0WhttDl+2BOsybvEOLK7fW3UA0OQ0IQ2d6Zl2x/a6vVRs3bAY0ECOSHHeL5jD+SbOpOCUEi0y1DgHEn9Qn1AQ==}
@@ -9097,12 +10123,6 @@ packages:
     resolution: {integrity: sha512-FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==}
     hasBin: true
 
-  markdown-to-jsx@7.5.0:
-    resolution: {integrity: sha512-RrBNcMHiFPcz/iqIj0n3wclzHXjwS7mzjBNWecKKVhNTIxQepIix6Il/wZCn2Cg5Y1ow2Qi84+eJrryFRWBEWw==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      react: '>= 0.14.0'
-
   marked@4.3.0:
     resolution: {integrity: sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==}
     engines: {node: '>= 12'}
@@ -9111,6 +10131,12 @@ packages:
   md5@2.3.0:
     resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
 
+  mdn-data@2.0.28:
+    resolution: {integrity: sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==}
+
+  mdn-data@2.0.30:
+    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
+
   mdurl@1.0.1:
     resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==}
 
@@ -9131,9 +10157,17 @@ packages:
   memory-pager@1.5.0:
     resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==}
 
+  memorystream@0.3.1:
+    resolution: {integrity: sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==}
+    engines: {node: '>= 0.10.0'}
+
   mensch@0.3.4:
     resolution: {integrity: sha512-IAeFvcOnV9V0Yk+bFhYR07O3yNina9ANIN5MoXBKYJ/RLYPurd2d0yw14MDhpr9/momp0WofT1bPUh3hkzdi/g==}
 
+  meow@13.2.0:
+    resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
+    engines: {node: '>=18'}
+
   merge-descriptors@1.0.3:
     resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
 
@@ -9203,10 +10237,6 @@ packages:
     resolution: {integrity: sha512-CI8wwdrll4ehjPAqs8TL8lBPyNnpZlQI02Wn8C1weNz/QbUbjh3OMxgMKSnvqfKFdLlks3EzHB9tO0BqGc3phQ==}
     engines: {node: '>=10'}
 
-  minimatch@7.4.2:
-    resolution: {integrity: sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==}
-    engines: {node: '>=10'}
-
   minimatch@9.0.1:
     resolution: {integrity: sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -9246,10 +10276,6 @@ packages:
     resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
     engines: {node: '>=8'}
 
-  minipass@4.2.5:
-    resolution: {integrity: sha512-+yQl7SX3bIT83Lhb4BVorMAHVuqsskxRdlmO9kTpyukp8vsm2Sn/fUOV9xlnG8/a5JsypJzap21lz/y3FBMJ8Q==}
-    engines: {node: '>=8'}
-
   minipass@5.0.0:
     resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
     engines: {node: '>=8'}
@@ -9266,6 +10292,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==}
 
@@ -9417,6 +10446,9 @@ packages:
   mobx@6.12.0:
     resolution: {integrity: sha512-Mn6CN6meXEnMa0a5u6a5+RKrqRedHBhZGd15AWLk9O6uFY4KYHzImdt8JI8WODo1bjTSRnwXhJox+FCUZhCKCQ==}
 
+  module-details-from-path@1.0.3:
+    resolution: {integrity: sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==}
+
   moment-timezone@0.5.37:
     resolution: {integrity: sha512-uEDzDNFhfaywRl+vwXxffjjq1q0Vzr+fcQpQ1bU0kbzorfS7zVtZnCnGc8mhWmF39d4g4YriF6kwA75mJKE/Zg==}
 
@@ -9426,8 +10458,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
@@ -9520,13 +10552,8 @@ packages:
   nanoclone@0.2.1:
     resolution: {integrity: sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA==}
 
-  nanoid@3.3.6:
-    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
-  nanoid@3.3.7:
-    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+  nanoid@3.3.8:
+    resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -9635,6 +10662,9 @@ packages:
   node-releases@2.0.14:
     resolution: {integrity: sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==}
 
+  node-releases@2.0.18:
+    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
+
   node-rsa@1.1.1:
     resolution: {integrity: sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==}
 
@@ -9679,6 +10709,15 @@ packages:
   normalize-wheel-es@1.2.0:
     resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==}
 
+  npm-normalize-package-bin@4.0.0:
+    resolution: {integrity: sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+
+  npm-run-all2@7.0.2:
+    resolution: {integrity: sha512-7tXR+r9hzRNOPNTvXegM+QzCuMjzUIIq66VDunL6j60O4RrExx32XUhlrS7UK4VcdGw5/Wxzb3kfNcFix9JKDA==}
+    engines: {node: ^18.17.0 || >=20.5.0, npm: '>= 9'}
+    hasBin: true
+
   npm-run-path@4.0.1:
     resolution: {integrity: sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==}
     engines: {node: '>=8'}
@@ -9786,8 +10825,8 @@ packages:
   obuf@1.1.2:
     resolution: {integrity: sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==}
 
-  ollama@0.5.6:
-    resolution: {integrity: sha512-4BySAMt96+OCt4emL6DE78UBCGqC7GvteM9LRCd6WwJyefn0x9w2BrcUcLm9nJ9bYpRsmkhf0Au18Q5MhsA14w==}
+  ollama@0.5.9:
+    resolution: {integrity: sha512-F/KZuDRC+ZsVCuMvcOYuQ6zj42/idzCkkuknGyyGVmNStMZ/sU3jQpvhnl4SyC0+zBzLiKNZJnJeuPFuieWZvQ==}
 
   on-finished@2.4.1:
     resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
@@ -9818,8 +10857,8 @@ packages:
     resolution: {integrity: sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==}
     engines: {node: '>=12'}
 
-  openai@4.63.0:
-    resolution: {integrity: sha512-Y9V4KODbmrOpqiOmCDVnPfMxMqKLOx8Hwcdn/r8mePq4yv7FSXGnxCs8/jZKO7zCB/IVPWihpJXwJNAIOEiZ2g==}
+  openai@4.78.1:
+    resolution: {integrity: sha512-drt0lHZBd2lMyORckOXFPQTmnGLWSLt8VK0W9BhOKWpMFBEoHMoz5gxMPmVq5icp+sOrsbMnsmZTVHUlKvD1Ow==}
     hasBin: true
     peerDependencies:
       zod: ^3.23.8
@@ -10087,13 +11126,18 @@ packages:
   picocolors@1.0.1:
     resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
 
-  picocolors@1.1.0:
-    resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
   picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
     engines: {node: '>=8.6'}
 
+  pidtree@0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
   pify@2.3.0:
     resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
     engines: {node: '>=0.10.0'}
@@ -10102,7 +11146,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':
@@ -10127,6 +11171,16 @@ packages:
   pkg-types@1.1.3:
     resolution: {integrity: sha512-+JrgthZG6m3ckicaOB74TwQ+tBWsFl3qVQg7mN8ulwSOElJ7gBhKzj2VkCPnZ4NlF6kEquYU+RIYNVAvzd54UA==}
 
+  playwright-core@1.49.1:
+    resolution: {integrity: sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  playwright@1.49.1:
+    resolution: {integrity: sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==}
+    engines: {node: '>=18'}
+    hasBin: true
+
   plimit-lit@1.4.1:
     resolution: {integrity: sha512-bK14ePAod0XWhXwjT6XvYfjcQ9PbCUkZXnDCAKRMZTJCaDIV9VFya1S/I+3WSbpdR8uBhCDh8TS4lQ/JQvhNFA==}
 
@@ -10187,8 +11241,8 @@ packages:
     resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
     engines: {node: ^10 || ^12 || >=14}
 
-  postcss@8.4.47:
-    resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
+  postcss@8.4.49:
+    resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
     engines: {node: ^10 || ^12 || >=14}
 
   postgres-array@2.0.0:
@@ -10278,10 +11332,6 @@ packages:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
 
-  progress@2.0.3:
-    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
-    engines: {node: '>=0.4.0'}
-
   prom-client@13.2.0:
     resolution: {integrity: sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==}
     engines: {node: '>=10'}
@@ -10482,12 +11532,6 @@ packages:
     resolution: {integrity: sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==}
     hasBin: true
 
-  react-colorful@5.6.1:
-    resolution: {integrity: sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==}
-    peerDependencies:
-      react: '>=16.8.0'
-      react-dom: '>=16.8.0'
-
   react-confetti@6.1.0:
     resolution: {integrity: sha512-7Ypx4vz0+g8ECVxr88W9zhcQpbeujJAVqL14ZnXJ3I23mOI9/oBVTQ3dkJhUmB0D6XOtCZEM6N0Gm9PMngkORw==}
     engines: {node: '>=10.18'}
@@ -10525,6 +11569,10 @@ packages:
   read-cache@1.0.0:
     resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
 
+  read-package-json-fast@4.0.0:
+    resolution: {integrity: sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+
   read-pkg-up@7.0.1:
     resolution: {integrity: sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==}
     engines: {node: '>=8'}
@@ -10613,9 +11661,19 @@ packages:
   reftools@1.1.9:
     resolution: {integrity: sha512-OVede/NQE13xBQ+ob5CKd5KyeJYU2YInb1bmV4nRoOfquZPkAkxuOXicSe1PvqIuZZ4kD13sPKBbR7UFDmli6w==}
 
+  regenerate-unicode-properties@10.2.0:
+    resolution: {integrity: sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==}
+    engines: {node: '>=4'}
+
+  regenerate@1.4.2:
+    resolution: {integrity: sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==}
+
   regenerator-runtime@0.14.1:
     resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
 
+  regenerator-transform@0.15.2:
+    resolution: {integrity: sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==}
+
   regexp-tree@0.1.27:
     resolution: {integrity: sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==}
     hasBin: true
@@ -10632,15 +11690,20 @@ packages:
     resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
     engines: {node: '>= 0.4'}
 
+  regexpu-core@6.2.0:
+    resolution: {integrity: sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==}
+    engines: {node: '>=4'}
+
+  regjsgen@0.8.0:
+    resolution: {integrity: sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==}
+
   regjsparser@0.10.0:
     resolution: {integrity: sha512-qx+xQGZVsy55CH0a1hiVwHmqjLryfh7wQyF5HO07XJ9f7dQMY/gPQHhlyDkIzJKC+x2fUCpCcUODUUUFrm7SHA==}
     hasBin: true
 
-  rehype-external-links@3.0.0:
-    resolution: {integrity: sha512-yp+e5N9V3C6bwBeAC4n796kc86M4gJCdlVhiMTxIrJG5UHDMh+PJANf9heqORJbt1nrCbDwIlAZKjANIaVBbvw==}
-
-  rehype-slug@6.0.0:
-    resolution: {integrity: sha512-lWyvf/jwu+oS5+hL5eClVd3hNdmwM1kAC0BUvEGD19pajQMIzcNUd/k9GsfQ+FfECvX+JE+e9/btsKH0EjJT6A==}
+  regjsparser@0.12.0:
+    resolution: {integrity: sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==}
+    hasBin: true
 
   reinterval@1.1.0:
     resolution: {integrity: sha512-QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==}
@@ -10671,6 +11734,10 @@ packages:
     resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
     engines: {node: '>=0.10.0'}
 
+  require-in-the-middle@7.4.0:
+    resolution: {integrity: sha512-X34iHADNbNDfr6OTStIAHWSAvvKQRYgLO6duASaVf7J2VA3lvmNYboAHOuLC2huav1IwgZJtyEcJCKVzFxOSMQ==}
+    engines: {node: '>=8.6.0'}
+
   requires-port@1.0.0:
     resolution: {integrity: sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==}
 
@@ -10706,6 +11773,12 @@ packages:
     resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
     engines: {node: '>=0.12'}
 
+  retry-axios@2.6.0:
+    resolution: {integrity: sha512-pOLi+Gdll3JekwuFjXO3fTq+L9lzMQGcSq7M5gIjExcl3Gu1hd4XXuf5o3+LuSBsaULQH7DiNbsqPd1chVpQGQ==}
+    engines: {node: '>=10.7.0'}
+    peerDependencies:
+      axios: '*'
+
   retry-request@7.0.2:
     resolution: {integrity: sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==}
     engines: {node: '>=14'}
@@ -10902,6 +11975,10 @@ packages:
   shallowequal@1.1.0:
     resolution: {integrity: sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==}
 
+  sharp@0.33.5:
+    resolution: {integrity: sha512-haPVm1EkS9pgvHrQ/F3Xy+hgcuMV0Wm9vfIBSiwZ05k+xgb0PkBQpGsAA/oWdDobNaZTH5ppvHtzCFbnSEwHVw==}
+    engines: {node: ^18.17.0 || ^20.3.0 || >=21.0.0}
+
   shebang-command@2.0.0:
     resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
     engines: {node: '>=8'}
@@ -10921,6 +11998,9 @@ packages:
     engines: {node: '>=4'}
     hasBin: true
 
+  shimmer@1.2.1:
+    resolution: {integrity: sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==}
+
   should-equal@2.0.0:
     resolution: {integrity: sha512-ZP36TMrK9euEuWQYBig9W55WPC7uo37qzAEmbjHz4gfyuXrEUgF8cUvQVO+w+d3OMfPvSRQJ22lSm8MQJ43LTA==}
 
@@ -11020,13 +12100,12 @@ 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'}
+  socks@2.8.3:
+    resolution: {integrity: sha512-l5x7VUUWbjVFbafGLxPWkYsHIhEvmF85tbIeFZWc8ZPtoMyybuEhL7Jye/ooC4/d48FgOjSJXgsF/AJPYCW8Zw==}
+    engines: {node: '>= 10.0.0', npm: '>= 3.0.0'}
 
-  source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
+  sortablejs@1.14.0:
+    resolution: {integrity: sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==}
 
   source-map-js@1.2.0:
     resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
@@ -11046,9 +12125,6 @@ packages:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
-  space-separated-tokens@2.0.2:
-    resolution: {integrity: sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==}
-
   sparse-bitfield@3.0.3:
     resolution: {integrity: sha512-kvzhi7vqKTfkh0PZU+2D2PIllw2ymqJKujUcyPMd9Y75Nv4nPbGJZXNhxsgdQab2BmlDct1YnfQCguEvHr7VsQ==}
 
@@ -11088,6 +12164,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==}
 
@@ -11137,8 +12216,8 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
-  std-env@3.7.0:
-    resolution: {integrity: sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==}
+  std-env@3.8.0:
+    resolution: {integrity: sha512-Bc3YwwCB+OzldMxOXJIIvC6cPRWr/LxOp48CdQTOkPyk/t4JWWJbrilwBd7RJzKV8QW7tJkcgAmeuLLJugl5/w==}
 
   stickyfill@1.1.1:
     resolution: {integrity: sha512-GCp7vHAfpao+Qh/3Flh9DXEJ/qSi0KJwJw6zYlZOtRYXWUIpMM6mC2rIep/dK8RQqwW0KxGJIllmjPIBOGN8AA==}
@@ -11151,9 +12230,14 @@ packages:
     resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
     engines: {node: '>=4', npm: '>=6'}
 
-  storybook@8.3.5:
-    resolution: {integrity: sha512-hYQVtP2l+3kO8oKDn4fjXXQYxgTRsj/LaV6lUMJH0zt+OhVmDXKJLxmdUP4ieTm0T8wEbSYosFavgPcQZlxRfw==}
+  storybook@8.4.6:
+    resolution: {integrity: sha512-J6juZSZT2u3PUW0QZYZZYxBq6zU5O0OrkSgkMXGMg/QrS9to9IHmt4FjEMEyACRbXo8POcB/fSXa3VpGe7bv3g==}
     hasBin: true
+    peerDependencies:
+      prettier: ^2 || ^3
+    peerDependenciesMeta:
+      prettier:
+        optional: true
 
   stream-browserify@3.0.0:
     resolution: {integrity: sha512-H73RAHsVBapbim0tU2JwwOiXUj+fikfiaoYAKHF3VJfA0pe2BCzkhAHBlLG6REzE+2WNZcxOXjK7lkso+9euLA==}
@@ -11324,6 +12408,11 @@ packages:
     resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
     engines: {node: '>= 0.4'}
 
+  svgo@3.3.2:
+    resolution: {integrity: sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
   swagger-ui-dist@5.11.0:
     resolution: {integrity: sha512-j0PIATqQSEFGOLmiJOJZj1X1Jt6bFIur3JpY7+ghliUnfZs0fpWDdHEkn9q7QUlBtKbkn6TepvSxTqnE8l3s0A==}
 
@@ -11343,6 +12432,9 @@ packages:
   syslog-client@1.1.1:
     resolution: {integrity: sha512-c3qKw8JzCuHt0mwrzKQr8eqOc3RB28HgOpFuwGMO3GLscVpfR+0ECevWLZq/yIJTbx3WTb3QXBFVpTFtKAPDrw==}
 
+  systemjs@6.15.1:
+    resolution: {integrity: sha512-Nk8c4lXvMB98MtbmjX7JwJRgJOL8fluecYCfCeYBznwmpOs8Bf15hLM6z4z71EDAhQVrQrI+wt1aLWSXZq+hXA==}
+
   tailwindcss@3.4.3:
     resolution: {integrity: sha512-U7sxQk/n397Bmx4JHbJx/iSOOv5G+II3f1kpLpY2QeUv5DcPdcTsYLlusZfq1NthHS1c1cZoyFmmkex1rzke0A==}
     engines: {node: '>=14.0.0'}
@@ -11378,9 +12470,6 @@ packages:
     resolution: {integrity: sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==}
     engines: {node: '>=14'}
 
-  telejson@7.2.0:
-    resolution: {integrity: sha512-1QTEcJkJEhc8OnStBx/ILRu5J2p0GjvWsBx56bmZRqnrkdBMUe+nX92jxV+p3dB4CP6PZCdJMQJwCggkNBMzkQ==}
-
   temp@0.9.4:
     resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
     engines: {node: '>=6.0.0'}
@@ -11430,8 +12519,8 @@ packages:
   tinybench@2.9.0:
     resolution: {integrity: sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==}
 
-  tinyexec@0.3.0:
-    resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==}
+  tinyexec@0.3.1:
+    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
 
   tinypool@1.0.1:
     resolution: {integrity: sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==}
@@ -11534,7 +12623,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==}
@@ -11543,7 +12632,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
@@ -11551,7 +12640,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==}
@@ -11573,7 +12662,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
@@ -11594,7 +12683,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
@@ -11618,7 +12707,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==}
@@ -11638,38 +12727,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:
@@ -11769,11 +12858,8 @@ packages:
   typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  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
 
@@ -11818,21 +12904,28 @@ packages:
     resolution: {integrity: sha512-HR3W/bMGPSr90i8AAp2C4DM3wChFdJPLrWYpIS++LxS8K+W535qftjt+4MyjNYHeWabMj1nvtmLIi7l++iq91A==}
     engines: {node: '>=18.17'}
 
+  unicode-canonical-property-names-ecmascript@2.0.1:
+    resolution: {integrity: sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-ecmascript@2.0.0:
+    resolution: {integrity: sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==}
+    engines: {node: '>=4'}
+
+  unicode-match-property-value-ecmascript@2.2.0:
+    resolution: {integrity: sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==}
+    engines: {node: '>=4'}
+
+  unicode-property-aliases-ecmascript@2.1.0:
+    resolution: {integrity: sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==}
+    engines: {node: '>=4'}
+
   unique-filename@1.1.1:
     resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
 
   unique-slug@2.0.2:
     resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==}
 
-  unist-util-is@6.0.0:
-    resolution: {integrity: sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==}
-
-  unist-util-visit-parents@6.0.1:
-    resolution: {integrity: sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==}
-
-  unist-util-visit@5.0.0:
-    resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
-
   universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
@@ -11882,9 +12975,6 @@ packages:
       '@nuxt/kit':
         optional: true
 
-  unplugin@1.0.1:
-    resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
-
   unplugin@1.11.0:
     resolution: {integrity: sha512-3r7VWZ/webh0SGgJScpWl2/MRCZK5d3ZYFcNaeci/GQ7Teop7zf0Nl2pUuz7G21BwPd9pcUPOC5KmJ2L3WgC5g==}
     engines: {node: '>=14.0.0'}
@@ -11899,6 +12989,12 @@ packages:
     peerDependencies:
       browserslist: '>= 4.21.0'
 
+  update-browserslist-db@1.1.1:
+    resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
   upper-case-first@2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
 
@@ -11995,23 +13091,28 @@ packages:
     resolution: {integrity: sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==}
     engines: {'0': node >=0.6.0}
 
-  vite-node@2.1.2:
-    resolution: {integrity: sha512-HPcGNN5g/7I2OtPjLqgOtCRu/qhVvBxTUD3qzitmL0SrG1cWFzxzhMDWussxSbrRYWqnKf8P2jiNhPMSN+ymsQ==}
+  vite-node@2.1.8:
+    resolution: {integrity: sha512-uPAwSr57kYjAUux+8E2j0q0Fxpn8M9VoyfGiRI8Kfktz9NcYMCenwY5RnZxnF1WTu3TGiYipirIzacLL3VVGFg==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
 
-  vite-plugin-dts@4.2.3:
-    resolution: {integrity: sha512-O5NalzHANQRwVw1xj8KQun3Bv8OSDAlNJXrnqoAz10BOuW8FVvY5g4ygj+DlJZL5mtSPuMu9vd3OfrdW5d4k6w==}
+  vite-plugin-dts@4.3.0:
+    resolution: {integrity: sha512-LkBJh9IbLwL6/rxh0C1/bOurDrIEmRE7joC+jFdOEEciAFPbpEKOLSAr5nNh5R7CJ45cMbksTrFfy52szzC5eA==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
       vite: '*'
     peerDependenciesMeta:
       vite:
         optional: true
 
-  vite@5.4.8:
-    resolution: {integrity: sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==}
+  vite-svg-loader@5.1.0:
+    resolution: {integrity: sha512-M/wqwtOEjgb956/+m5ZrYT/Iq6Hax0OakWbokj8+9PXOnB7b/4AxESHieEtnNEy7ZpjsjYW1/5nK8fATQMmRxw==}
+    peerDependencies:
+      vue: '>=3.2.13'
+
+  vite@5.4.11:
+    resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -12041,21 +13142,61 @@ packages:
       terser:
         optional: true
 
+  vite@6.0.2:
+    resolution: {integrity: sha512-XdQ+VsY2tJpBsKGs0wf3U/+azx8BBpYRHFAyKm5VeEZNOJZRB63q7Sc8Iup3k0TrN3KO6QgyzFf+opSbfY1y0g==}
+    engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
+    hasBin: true
+    peerDependencies:
+      '@types/node': ^18.16.16
+      jiti: '>=1.21.0'
+      less: '*'
+      lightningcss: ^1.21.0
+      sass: '*'
+      sass-embedded: '*'
+      stylus: '*'
+      sugarss: '*'
+      terser: ^5.16.0
+      tsx: ^4.8.1
+      yaml: ^2.4.2
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      jiti:
+        optional: true
+      less:
+        optional: true
+      lightningcss:
+        optional: true
+      sass:
+        optional: true
+      sass-embedded:
+        optional: true
+      stylus:
+        optional: true
+      sugarss:
+        optional: true
+      terser:
+        optional: true
+      tsx:
+        optional: true
+      yaml:
+        optional: true
+
   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:
-    resolution: {integrity: sha512-veNjLizOMkRrJ6xxb+pvxN6/QAWg95mzcRjtmkepXdN87FNfxAss9RKe2far/G9cQpipfgP2taqg0KiWsquj8A==}
+  vitest@2.1.8:
+    resolution: {integrity: sha512-1vBKTZskHw/aosXqQUlVWWlGUxSJR8YtiyZDJAFeW2kPAeX6S3Sool0mjspO+kXLuxVWlEDDowBAeqeAQefqLQ==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
       '@edge-runtime/vm': '*'
       '@types/node': ^18.16.16
-      '@vitest/browser': 2.1.2
-      '@vitest/ui': 2.1.2
+      '@vitest/browser': 2.1.8
+      '@vitest/ui': 2.1.8
       happy-dom: '*'
       jsdom: '*'
     peerDependenciesMeta:
@@ -12093,16 +13234,19 @@ packages:
       chart.js: ^4.1.1
       vue: ^3.0.0-0 || ^2.7.0
 
-  vue-component-meta@2.1.6:
-    resolution: {integrity: sha512-N5zReatWQTNqULhatFib69K82g5UhDERVobeqrT5S6Uk2QoCeYbsSY8nHRUwJFywE2iXRFN4B+XPhI+piZfC6w==}
+  vue-component-meta@2.1.10:
+    resolution: {integrity: sha512-YEFSau36lLCJNvoM6eynAcq891Y6HKIEdEk3PCzCyNVySeYJAXgE/9iCYqQzLtBJlKg/bBpImz8VbUZsh4N/7Q==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       typescript:
         optional: true
 
-  vue-component-type-helpers@2.1.6:
-    resolution: {integrity: sha512-ng11B8B/ZADUMMOsRbqv0arc442q7lifSubD0v8oDXIFoMg/mXwAPUunrroIDkY+mcD0dHKccdaznSVp8EoX3w==}
+  vue-component-type-helpers@2.1.10:
+    resolution: {integrity: sha512-lfgdSLQKrUmADiSV6PbBvYgQ33KF3Ztv6gP85MfGaGaSGMTXORVaHT1EHfsqCgzRNBstPKYDmvAV9Do5CmJ07A==}
+
+  vue-component-type-helpers@2.2.0:
+    resolution: {integrity: sha512-cYrAnv2me7bPDcg9kIcGwjJiSB6Qyi08+jLDo9yuvoFQjzHiPTzML7RnkJB1+3P6KMsX/KbCD4QE3Tv/knEllw==}
 
   vue-demi@0.14.10:
     resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
@@ -12126,6 +13270,9 @@ packages:
     peerDependencies:
       eslint: '>=6.0.0'
 
+  vue-github-button@3.1.3:
+    resolution: {integrity: sha512-ZdOnUuYJL/wUsxISsC96TARzCdf1twaWooZoI14+g4RHsJltPY+Agw6Ox6pjuMqMX0uhSK1JOMFUFNCQGlcZGA==}
+
   vue-i18n@9.2.2:
     resolution: {integrity: sha512-yswpwtj89rTBhegUAv9Mu37LNznyu3NpyLQmozF3i1hYOhwpG8RjcjIFIIfnu+2MDZJGSZPXaKWvnQA71Yv9TQ==}
     engines: {node: '>= 14'}
@@ -12148,28 +13295,48 @@ packages:
     peerDependencies:
       vue: ^3.3.4
 
-  vue-router@4.4.5:
-    resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==}
+  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.5.0:
+    resolution: {integrity: sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==}
     peerDependencies:
       vue: ^3.2.0
 
-  vue-tsc@2.1.6:
-    resolution: {integrity: sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==}
+  vue-tsc@2.1.10:
+    resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==}
     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==}
 
-  vue@3.5.11:
-    resolution: {integrity: sha512-/8Wurrd9J3lb72FTQS7gRMNQD4nztTtKPmuDuPuhqXmmpD6+skVjAeahNpVzsuky6Sy9gy7wn8UadqPtt9SQIg==}
+  vue@3.5.13:
+    resolution: {integrity: sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==}
     peerDependencies:
-      typescript: ^5.6.2
+      typescript: ^5.7.2
     peerDependenciesMeta:
       typescript:
         optional: true
 
+  vuedraggable@4.1.0:
+    resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
+    peerDependencies:
+      vue: ^3.0.1
+
   w3c-keyname@2.2.6:
     resolution: {integrity: sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==}
 
@@ -12212,9 +13379,6 @@ packages:
     resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
     engines: {node: '>=10.13.0'}
 
-  webpack-virtual-modules@0.5.0:
-    resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
-
   webpack-virtual-modules@0.6.1:
     resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==}
 
@@ -12271,6 +13435,11 @@ packages:
     engines: {node: '>= 8'}
     hasBin: true
 
+  which@5.0.0:
+    resolution: {integrity: sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==}
+    engines: {node: ^18.17.0 || >=20.5.0}
+    hasBin: true
+
   why-is-node-running@2.3.0:
     resolution: {integrity: sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==}
     engines: {node: '>=8'}
@@ -12469,8 +13638,8 @@ packages:
     resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
     engines: {node: '>=10'}
 
-  zod-class@0.0.15:
-    resolution: {integrity: sha512-CD5B4e9unKPj1hiy7JOSwRV01WqbEBkFOlhws0C9s9wB0FSpECOnlKXOAkjo9tKYX2enQsXWyyOIBNPPNUHWRA==}
+  zod-class@0.0.16:
+    resolution: {integrity: sha512-3A1l81VEUOxvSTGoNPsU4fTUY9CKin/HSySnXT3bIc+TJTDGCPbzSPE8W1VvwXqyzHEIWK608eFZja2uew9Ivw==}
     peerDependencies:
       zod: ^3
 
@@ -12479,6 +13648,11 @@ packages:
     peerDependencies:
       zod: ^3.23.3
 
+  zod-to-json-schema@3.24.1:
+    resolution: {integrity: sha512-3h08nf3Vw3Wl3PK+q3ow/lIil81IT2Oa7YpQyUUDsEWbXveMesdfK1xBd2RhCkynwZndAxixji/7SYJJowr62w==}
+    peerDependencies:
+      zod: ^3.24.1
+
   zod@3.23.8:
     resolution: {integrity: sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==}
 
@@ -12532,6 +13706,19 @@ snapshots:
       - encoding
       - supports-color
 
+  '@anthropic-ai/sdk@0.32.1(encoding@0.1.13)':
+    dependencies:
+      '@types/node': 18.16.16
+      '@types/node-fetch': 2.6.4
+      abort-controller: 3.0.0
+      agentkeepalive: 4.2.1
+      form-data-encoder: 1.7.2
+      formdata-node: 4.4.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
   '@apidevtools/json-schema-ref-parser@11.7.0':
     dependencies:
       '@jsdevtools/ono': 7.1.3
@@ -13548,10 +14735,18 @@ snapshots:
   '@babel/code-frame@7.24.6':
     dependencies:
       '@babel/highlight': 7.24.6
-      picocolors: 1.0.1
+      picocolors: 1.1.1
+
+  '@babel/code-frame@7.26.2':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
 
   '@babel/compat-data@7.23.5': {}
 
+  '@babel/compat-data@7.26.3': {}
+
   '@babel/core@7.24.0':
     dependencies:
       '@ampproject/remapping': 2.3.0
@@ -13560,10 +14755,30 @@ snapshots:
       '@babel/helper-compilation-targets': 7.23.6
       '@babel/helper-module-transforms': 7.23.3(@babel/core@7.24.0)
       '@babel/helpers': 7.24.0
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
+      convert-source-map: 2.0.0
+      debug: 4.3.7
+      gensync: 1.0.0-beta.2
+      json5: 2.2.3
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/core@7.26.0':
+    dependencies:
+      '@ampproject/remapping': 2.3.0
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.3
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helpers': 7.26.0
+      '@babel/parser': 7.26.2
+      '@babel/template': 7.25.9
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.0
       convert-source-map: 2.0.0
       debug: 4.3.7
       gensync: 1.0.0-beta.2
@@ -13574,40 +14789,105 @@ snapshots:
 
   '@babel/generator@7.22.9':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
   '@babel/generator@7.23.6':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
       jsesc: 2.5.2
 
+  '@babel/generator@7.26.3':
+    dependencies:
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+      jsesc: 3.0.2
+
+  '@babel/helper-annotate-as-pure@7.25.9':
+    dependencies:
+      '@babel/types': 7.26.0
+
   '@babel/helper-compilation-targets@7.23.6':
     dependencies:
       '@babel/compat-data': 7.23.5
       '@babel/helper-validator-option': 7.23.5
-      browserslist: 4.23.0
+      browserslist: 4.24.2
       lru-cache: 5.1.1
       semver: 7.6.0
 
+  '@babel/helper-compilation-targets@7.25.9':
+    dependencies:
+      '@babel/compat-data': 7.26.3
+      '@babel/helper-validator-option': 7.25.9
+      browserslist: 4.24.2
+      lru-cache: 5.1.1
+      semver: 7.6.0
+
+  '@babel/helper-create-class-features-plugin@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/traverse': 7.26.3
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-create-regexp-features-plugin@7.26.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      regexpu-core: 6.2.0
+      semver: 7.6.0
+
+  '@babel/helper-define-polyfill-provider@0.6.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      debug: 4.3.7
+      lodash.debounce: 4.0.8
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-environment-visitor@7.22.20': {}
 
   '@babel/helper-function-name@7.23.0':
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
   '@babel/helper-hoist-variables@7.22.5':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
+
+  '@babel/helper-member-expression-to-functions@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-module-imports@7.22.15':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
+
+  '@babel/helper-module-imports@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-module-transforms@7.23.3(@babel/core@7.24.0)':
     dependencies:
@@ -13616,45 +14896,151 @@ snapshots:
       '@babel/helper-module-imports': 7.22.15
       '@babel/helper-simple-access': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/helper-validator-identifier': 7.24.7
+      '@babel/helper-validator-identifier': 7.25.9
+
+  '@babel/helper-module-transforms@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-optimise-call-expression@7.25.9':
+    dependencies:
+      '@babel/types': 7.26.3
 
   '@babel/helper-plugin-utils@7.22.5': {}
 
+  '@babel/helper-plugin-utils@7.25.9': {}
+
+  '@babel/helper-remap-async-to-generator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-wrap-function': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/helper-replace-supers@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-member-expression-to-functions': 7.25.9
+      '@babel/helper-optimise-call-expression': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helper-simple-access@7.22.5':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
+
+  '@babel/helper-skip-transparent-expression-wrappers@7.25.9':
+    dependencies:
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.0
+    transitivePeerDependencies:
+      - supports-color
 
   '@babel/helper-split-export-declaration@7.22.6':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
   '@babel/helper-string-parser@7.24.8': {}
 
+  '@babel/helper-string-parser@7.25.9': {}
+
   '@babel/helper-validator-identifier@7.22.20': {}
 
   '@babel/helper-validator-identifier@7.24.7': {}
 
+  '@babel/helper-validator-identifier@7.25.9': {}
+
   '@babel/helper-validator-option@7.23.5': {}
 
+  '@babel/helper-validator-option@7.25.9': {}
+
+  '@babel/helper-wrap-function@7.25.9':
+    dependencies:
+      '@babel/template': 7.25.9
+      '@babel/traverse': 7.26.3
+      '@babel/types': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
   '@babel/helpers@7.24.0':
     dependencies:
       '@babel/template': 7.24.0
       '@babel/traverse': 7.24.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
     transitivePeerDependencies:
       - supports-color
 
+  '@babel/helpers@7.26.0':
+    dependencies:
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.3
+
   '@babel/highlight@7.24.6':
     dependencies:
       '@babel/helper-validator-identifier': 7.24.7
       chalk: 2.4.2
       js-tokens: 4.0.0
-      picocolors: 1.0.1
+      picocolors: 1.1.1
 
   '@babel/parser@7.25.6':
     dependencies:
       '@babel/types': 7.25.6
 
+  '@babel/parser@7.26.2':
+    dependencies:
+      '@babel/types': 7.26.3
+
+  '@babel/parser@7.26.3':
+    dependencies:
+      '@babel/types': 7.26.3
+
+  '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-safari-class-field-initializer-scope@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+
   '@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.24.0)':
     dependencies:
       '@babel/core': 7.24.0
@@ -13670,6 +15056,16 @@ snapshots:
       '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.22.5
 
+  '@babel/plugin-syntax-import-assertions@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-syntax-import-attributes@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
   '@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.0)':
     dependencies:
       '@babel/core': 7.24.0
@@ -13725,6 +15121,413 @@ snapshots:
       '@babel/core': 7.24.0
       '@babel/helper-plugin-utils': 7.22.5
 
+  '@babel/plugin-syntax-unicode-sets-regex@7.18.6(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-arrow-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-async-generator-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0)
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-async-to-generator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-imports': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-remap-async-to-generator': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-block-scoped-functions@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-block-scoping@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-class-properties@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-class-static-block@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-classes@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+      '@babel/traverse': 7.26.3
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-computed-properties@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/template': 7.25.9
+
+  '@babel/plugin-transform-destructuring@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-dotall-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-duplicate-keys@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-duplicate-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-dynamic-import@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-exponentiation-operator@7.26.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-export-namespace-from@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-for-of@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-function-name@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-json-strings@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-logical-assignment-operators@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-member-expression-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-modules-amd@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-commonjs@7.26.3(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-systemjs@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+      '@babel/traverse': 7.26.3
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-modules-umd@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-module-transforms': 7.26.0(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-named-capturing-groups-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-new-target@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-nullish-coalescing-operator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-numeric-separator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-object-rest-spread@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0)
+
+  '@babel/plugin-transform-object-super@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-replace-supers': 7.25.9(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-optional-catch-binding@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-optional-chaining@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-parameters@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-private-methods@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-private-property-in-object@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-annotate-as-pure': 7.25.9
+      '@babel/helper-create-class-features-plugin': 7.25.9(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-property-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-regenerator@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      regenerator-transform: 0.15.2
+
+  '@babel/plugin-transform-regexp-modifiers@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-reserved-words@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-shorthand-properties@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-spread@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-skip-transparent-expression-wrappers': 7.25.9
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/plugin-transform-sticky-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-template-literals@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-typeof-symbol@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-escapes@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-property-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/plugin-transform-unicode-sets-regex@7.25.9(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-create-regexp-features-plugin': 7.26.3(@babel/core@7.26.0)
+      '@babel/helper-plugin-utils': 7.25.9
+
+  '@babel/preset-env@7.26.0(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/compat-data': 7.26.3
+      '@babel/core': 7.26.0
+      '@babel/helper-compilation-targets': 7.25.9
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/helper-validator-option': 7.25.9
+      '@babel/plugin-bugfix-firefox-class-in-computed-class-key': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-safari-class-field-initializer-scope': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-proposal-private-property-in-object': 7.21.0-placeholder-for-preset-env.2(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-assertions': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-syntax-import-attributes': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-syntax-unicode-sets-regex': 7.18.6(@babel/core@7.26.0)
+      '@babel/plugin-transform-arrow-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-async-generator-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-async-to-generator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-block-scoped-functions': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-block-scoping': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-class-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-class-static-block': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-transform-classes': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-computed-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-destructuring': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-dotall-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-duplicate-keys': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-dynamic-import': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-exponentiation-operator': 7.26.3(@babel/core@7.26.0)
+      '@babel/plugin-transform-export-namespace-from': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-for-of': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-function-name': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-json-strings': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-logical-assignment-operators': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-member-expression-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-amd': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-commonjs': 7.26.3(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-systemjs': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-modules-umd': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-named-capturing-groups-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-new-target': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-nullish-coalescing-operator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-numeric-separator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-object-rest-spread': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-object-super': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-optional-catch-binding': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-optional-chaining': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-parameters': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-private-methods': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-private-property-in-object': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-property-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-regenerator': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-regexp-modifiers': 7.26.0(@babel/core@7.26.0)
+      '@babel/plugin-transform-reserved-words': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-shorthand-properties': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-spread': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-sticky-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-template-literals': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-typeof-symbol': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-escapes': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-property-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/plugin-transform-unicode-sets-regex': 7.25.9(@babel/core@7.26.0)
+      '@babel/preset-modules': 0.1.6-no-external-plugins(@babel/core@7.26.0)
+      babel-plugin-polyfill-corejs2: 0.4.12(@babel/core@7.26.0)
+      babel-plugin-polyfill-corejs3: 0.10.6(@babel/core@7.26.0)
+      babel-plugin-polyfill-regenerator: 0.6.3(@babel/core@7.26.0)
+      core-js-compat: 3.39.0
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/preset-modules@0.1.6-no-external-plugins(@babel/core@7.26.0)':
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-plugin-utils': 7.25.9
+      '@babel/types': 7.26.0
+      esutils: 2.0.3
+
   '@babel/runtime@7.24.7':
     dependencies:
       regenerator-runtime: 0.14.1
@@ -13732,8 +15535,14 @@ snapshots:
   '@babel/template@7.24.0':
     dependencies:
       '@babel/code-frame': 7.24.6
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
+
+  '@babel/template@7.25.9':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   '@babel/traverse@7.24.0':
     dependencies:
@@ -13743,8 +15552,20 @@ snapshots:
       '@babel/helper-function-name': 7.23.0
       '@babel/helper-hoist-variables': 7.22.5
       '@babel/helper-split-export-declaration': 7.22.6
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
+      debug: 4.3.7
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@babel/traverse@7.26.3':
+    dependencies:
+      '@babel/code-frame': 7.26.2
+      '@babel/generator': 7.26.3
+      '@babel/parser': 7.26.3
+      '@babel/template': 7.25.9
+      '@babel/types': 7.26.3
       debug: 4.3.7
       globals: 11.12.0
     transitivePeerDependencies:
@@ -13756,6 +15577,16 @@ snapshots:
       '@babel/helper-validator-identifier': 7.24.7
       to-fast-properties: 2.0.0
 
+  '@babel/types@7.26.0':
+    dependencies:
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+
+  '@babel/types@7.26.3':
+    dependencies:
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+
   '@bcoe/v8-coverage@0.2.3': {}
 
   '@biomejs/biome@1.9.0':
@@ -13793,6 +15624,37 @@ snapshots:
   '@biomejs/cli-win32-x64@1.9.0':
     optional: true
 
+  '@browserbasehq/sdk@2.0.0(encoding@0.1.13)':
+    dependencies:
+      '@types/node': 18.16.16
+      '@types/node-fetch': 2.6.4
+      abort-controller: 3.0.0
+      agentkeepalive: 4.2.1
+      form-data-encoder: 1.7.2
+      formdata-node: 4.4.1
+      node-fetch: 2.7.0(encoding@0.1.13)
+    transitivePeerDependencies:
+      - encoding
+      - supports-color
+
+  '@browserbasehq/stagehand@1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))(zod@3.23.8)':
+    dependencies:
+      '@anthropic-ai/sdk': 0.27.3(encoding@0.1.13)
+      '@browserbasehq/sdk': 2.0.0(encoding@0.1.13)
+      '@playwright/test': 1.49.1
+      deepmerge: 4.3.1
+      dotenv: 16.4.5
+      openai: 4.78.1(encoding@0.1.13)(zod@3.23.8)
+      sharp: 0.33.5
+      ws: 8.17.1
+      zod: 3.23.8
+      zod-to-json-schema: 3.24.1(zod@3.23.8)
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - supports-color
+      - utf-8-validate
+
   '@cfaester/enzyme-adapter-react-18@0.8.0(enzyme@3.11.0)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       enzyme: 3.11.0
@@ -13804,12 +15666,13 @@ snapshots:
       react-is: 18.2.0
       react-shallow-renderer: 16.15.0(react@18.2.0)
 
-  '@chromatic-com/storybook@2.0.2(react@18.2.0)':
+  '@chromatic-com/storybook@3.2.2(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      chromatic: 11.10.2
+      chromatic: 11.20.0
       filesize: 10.1.0
       jsonfile: 6.1.0
       react-confetti: 6.1.0(react@18.2.0)
+      storybook: 8.4.6(prettier@3.3.3)
       strip-ansi: 7.1.0
     transitivePeerDependencies:
       - '@chromatic-com/cypress'
@@ -13896,6 +15759,12 @@ snapshots:
       '@codemirror/view': 6.26.3
       crelt: 1.0.5
 
+  '@codemirror/search@6.5.6':
+    dependencies:
+      '@codemirror/state': 6.4.1
+      '@codemirror/view': 6.26.3
+      crelt: 1.0.5
+
   '@codemirror/state@6.3.3': {}
 
   '@codemirror/state@6.4.1': {}
@@ -13972,9 +15841,14 @@ 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.13(typescript@5.7.2))':
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
+
+  '@emnapi/runtime@1.3.1':
+    dependencies:
+      tslib: 2.6.2
+    optional: true
 
   '@emotion/is-prop-valid@1.2.1':
     dependencies:
@@ -14113,15 +15987,15 @@ snapshots:
     dependencies:
       '@fortawesome/fontawesome-common-types': 0.2.36
 
-  '@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.11(typescript@5.6.2))':
+  '@fortawesome/vue-fontawesome@3.0.3(@fortawesome/fontawesome-svg-core@1.2.36)(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@fortawesome/fontawesome-svg-core': 1.2.36
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
   '@gar/promisify@1.1.3':
     optional: true
 
-  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(cbdnlo2gcodz2gzix466oterhe))':
+  '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.11(ppo73pxbxzh4gygvo2i6vjkife))':
     dependencies:
       form-data: 4.0.0
       node-fetch: 2.7.0(encoding@0.1.13)
@@ -14129,8 +16003,8 @@ snapshots:
       url-join: 4.0.1
       zod: 3.23.8
     optionalDependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      langchain: 0.3.2(cbdnlo2gcodz2gzix466oterhe)
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      langchain: 0.3.11(ppo73pxbxzh4gygvo2i6vjkife)
     transitivePeerDependencies:
       - encoding
 
@@ -14138,7 +16012,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:
@@ -14191,9 +16065,7 @@ snapshots:
       - encoding
       - supports-color
 
-  '@google/generative-ai@0.19.0': {}
-
-  '@google/generative-ai@0.7.1': {}
+  '@google/generative-ai@0.21.0': {}
 
   '@grpc/grpc-js@1.10.8':
     dependencies:
@@ -14231,6 +16103,14 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.2': {}
 
+  '@ibm-cloud/watsonx-ai@1.1.2':
+    dependencies:
+      '@types/node': 18.16.16
+      extend: 3.0.2
+      ibm-cloud-sdk-core: 5.1.0
+    transitivePeerDependencies:
+      - supports-color
+
   '@icetee/ftp@0.3.15':
     dependencies:
       readable-stream: 1.1.14
@@ -14259,6 +16139,81 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@img/sharp-darwin-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-darwin-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-darwin-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-libvips-darwin-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-darwin-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-arm@1.0.5':
+    optional: true
+
+  '@img/sharp-libvips-linux-s390x@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linux-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-arm64@1.0.4':
+    optional: true
+
+  '@img/sharp-libvips-linuxmusl-x64@1.0.4':
+    optional: true
+
+  '@img/sharp-linux-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-linux-arm@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-arm': 1.0.5
+    optional: true
+
+  '@img/sharp-linux-s390x@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-s390x': 1.0.4
+    optional: true
+
+  '@img/sharp-linux-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linux-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-linuxmusl-arm64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+    optional: true
+
+  '@img/sharp-linuxmusl-x64@0.33.5':
+    optionalDependencies:
+      '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+    optional: true
+
+  '@img/sharp-wasm32@0.33.5':
+    dependencies:
+      '@emnapi/runtime': 1.3.1
+    optional: true
+
+  '@img/sharp-win32-ia32@0.33.5':
+    optional: true
+
+  '@img/sharp-win32-x64@0.33.5':
+    optional: true
+
   '@intlify/core-base@9.2.2':
     dependencies:
       '@intlify/devtools-if': 9.2.2
@@ -14314,7 +16269,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
@@ -14328,7 +16283,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
@@ -14481,10 +16436,7 @@ snapshots:
       '@jridgewell/sourcemap-codec': 1.5.0
       '@jridgewell/trace-mapping': 0.3.25
 
-  '@jridgewell/resolve-uri@3.1.0': {}
-
-  '@jridgewell/resolve-uri@3.1.2':
-    optional: true
+  '@jridgewell/resolve-uri@3.1.2': {}
 
   '@jridgewell/set-array@1.2.1': {}
 
@@ -14492,7 +16444,6 @@ snapshots:
     dependencies:
       '@jridgewell/gen-mapping': 0.3.5
       '@jridgewell/trace-mapping': 0.3.25
-    optional: true
 
   '@jridgewell/sourcemap-codec@1.4.15': {}
 
@@ -14500,7 +16451,7 @@ snapshots:
 
   '@jridgewell/trace-mapping@0.3.25':
     dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
+      '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
 
   '@jridgewell/trace-mapping@0.3.9':
@@ -14516,7 +16467,7 @@ snapshots:
   '@jsdevtools/ez-spawn@3.0.4':
     dependencies:
       call-me-maybe: 1.0.1
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       string-argv: 0.3.1
       type-detect: 4.0.8
 
@@ -14555,10 +16506,10 @@ snapshots:
 
   '@kwsites/promise-deferred@1.1.1': {}
 
-  '@langchain/anthropic@0.3.1(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/anthropic@0.3.11(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
     dependencies:
-      '@anthropic-ai/sdk': 0.27.3(encoding@0.1.13)
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      '@anthropic-ai/sdk': 0.32.1(encoding@0.1.13)
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       fast-xml-parser: 4.4.1
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
@@ -14566,13 +16517,13 @@ snapshots:
       - encoding
       - supports-color
 
-  '@langchain/aws@0.1.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/aws@0.1.3(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))':
     dependencies:
       '@aws-sdk/client-bedrock-agent-runtime': 3.666.0
       '@aws-sdk/client-bedrock-runtime': 3.666.0
       '@aws-sdk/client-kendra': 3.666.0
       '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
     transitivePeerDependencies:
@@ -14580,10 +16531,10 @@ snapshots:
       - '@aws-sdk/client-sts'
       - aws-crt
 
-  '@langchain/cohere@0.3.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/cohere@0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      cohere-ai: 7.13.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      cohere-ai: 7.14.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
       uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
@@ -14592,16 +16543,20 @@ snapshots:
       - aws-crt
       - encoding
 
-  '@langchain/community@0.3.2(rx3iiky3qnn44pzlnyiooyzaly)':
+  '@langchain/community@0.3.24(l2droam2fsjs4mc7x4hehsyzcy)':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/openai': 0.3.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@browserbasehq/stagehand': 1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))(zod@3.23.8)
+      '@ibm-cloud/watsonx-ai': 1.1.2
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/openai': 0.3.17(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       binary-extensions: 2.2.0
       expr-eval: 2.0.2
       flat: 5.0.2
+      ibm-cloud-sdk-core: 5.1.0
       js-yaml: 4.1.0
-      langchain: 0.3.2(cbdnlo2gcodz2gzix466oterhe)
-      langsmith: 0.1.59(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      langchain: 0.3.11(ppo73pxbxzh4gygvo2i6vjkife)
+      langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      openai: 4.78.1(encoding@0.1.13)(zod@3.23.8)
       uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
@@ -14613,25 +16568,27 @@ snapshots:
       '@aws-sdk/client-s3': 3.666.0
       '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)
       '@azure/storage-blob': 12.18.0(encoding@0.1.13)
-      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.2(cbdnlo2gcodz2gzix466oterhe))
+      '@browserbasehq/sdk': 2.0.0(encoding@0.1.13)
+      '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(langchain@0.3.11(ppo73pxbxzh4gygvo2i6vjkife))
       '@getzep/zep-js': 0.9.0
       '@google-ai/generativelanguage': 2.6.0(encoding@0.1.13)
       '@google-cloud/storage': 7.12.1(encoding@0.1.13)
       '@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)
+      '@pinecone-database/pinecone': 4.0.0
+      '@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)
+      cohere-ai: 7.14.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13)
       crypto-js: 4.2.0
       d3-dsv: 2.0.0
       epub2: 3.0.2(ts-toolbelt@9.6.0)
+      fast-xml-parser: 4.4.1
       google-auth-library: 9.10.0(encoding@0.1.13)
       html-to-text: 9.0.5
       ignore: 5.2.4
@@ -14643,31 +16600,33 @@ snapshots:
       mysql2: 3.11.0
       pdf-parse: 1.1.1
       pg: 8.12.0
+      playwright: 1.49.1
       redis: 4.6.12
       ws: 8.17.1
     transitivePeerDependencies:
       - '@langchain/anthropic'
       - '@langchain/aws'
+      - '@langchain/cerebras'
       - '@langchain/cohere'
       - '@langchain/google-genai'
       - '@langchain/google-vertexai'
+      - '@langchain/google-vertexai-web'
       - '@langchain/groq'
       - '@langchain/mistralai'
       - '@langchain/ollama'
       - axios
       - encoding
       - handlebars
-      - openai
       - peggy
       - supports-color
 
-  '@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))':
+  '@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))':
     dependencies:
       ansi-styles: 5.2.0
       camelcase: 6.3.0
       decamelize: 1.2.0
       js-tiktoken: 1.0.12
-      langsmith: 0.1.59(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      langsmith: 0.2.3(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       mustache: 4.2.0
       p-queue: 6.6.2
       p-retry: 4.6.2
@@ -14677,77 +16636,45 @@ snapshots:
     transitivePeerDependencies:
       - openai
 
-  '@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(zod@3.23.8))':
+  '@langchain/google-common@0.1.8(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)':
     dependencies:
-      ansi-styles: 5.2.0
-      camelcase: 6.3.0
-      decamelize: 1.2.0
-      js-tiktoken: 1.0.12
-      langsmith: 0.1.59(openai@4.63.0(zod@3.23.8))
-      mustache: 4.2.0
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 10.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
-    transitivePeerDependencies:
-      - openai
-
-  '@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0)':
-    dependencies:
-      ansi-styles: 5.2.0
-      camelcase: 6.3.0
-      decamelize: 1.2.0
-      js-tiktoken: 1.0.12
-      langsmith: 0.1.59(openai@4.63.0)
-      mustache: 4.2.0
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      uuid: 10.0.0
-      zod: 3.23.8
-      zod-to-json-schema: 3.23.3(zod@3.23.8)
-    transitivePeerDependencies:
-      - openai
-
-  '@langchain/google-common@0.1.1(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)':
-    dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       uuid: 10.0.0
       zod-to-json-schema: 3.23.3(zod@3.23.8)
     transitivePeerDependencies:
       - zod
 
-  '@langchain/google-gauth@0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)':
+  '@langchain/google-gauth@0.1.8(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/google-common': 0.1.1(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/google-common': 0.1.8(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
       google-auth-library: 8.9.0(encoding@0.1.13)
     transitivePeerDependencies:
       - encoding
       - supports-color
       - zod
 
-  '@langchain/google-genai@0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)':
+  '@langchain/google-genai@0.1.6(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)':
     dependencies:
-      '@google/generative-ai': 0.7.1
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      '@google/generative-ai': 0.21.0
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       zod-to-json-schema: 3.23.3(zod@3.23.8)
     transitivePeerDependencies:
       - zod
 
-  '@langchain/google-vertexai@0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)':
+  '@langchain/google-vertexai@0.1.8(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/google-gauth': 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/google-gauth': 0.1.8(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
     transitivePeerDependencies:
       - encoding
       - supports-color
       - zod
 
-  '@langchain/groq@0.1.2(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/groq@0.1.3(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/openai': 0.3.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/openai': 0.3.17(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
       groq-sdk: 0.5.0(encoding@0.1.13)
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
@@ -14755,56 +16682,54 @@ snapshots:
       - encoding
       - supports-color
 
-  '@langchain/mistralai@0.1.1(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/mistralai@0.2.0(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      '@mistralai/mistralai': 0.4.0(encoding@0.1.13)
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@mistralai/mistralai': 1.3.4(zod@3.23.8)
       uuid: 10.0.0
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
-    transitivePeerDependencies:
-      - encoding
 
-  '@langchain/ollama@0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/ollama@0.1.4(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      ollama: 0.5.6
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      ollama: 0.5.9
       uuid: 10.0.0
 
-  '@langchain/openai@0.3.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
+  '@langchain/openai@0.3.17(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       js-tiktoken: 1.0.12
-      openai: 4.63.0(encoding@0.1.13)(zod@3.23.8)
+      openai: 4.78.1(encoding@0.1.13)(zod@3.23.8)
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
     transitivePeerDependencies:
       - encoding
       - supports-color
 
-  '@langchain/pinecone@0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/pinecone@0.1.3(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      '@pinecone-database/pinecone': 3.0.3
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@pinecone-database/pinecone': 4.0.0
       flat: 5.0.2
       uuid: 10.0.0
 
-  '@langchain/qdrant@0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(typescript@5.6.2)':
+  '@langchain/qdrant@0.1.1(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(typescript@5.7.2)':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      '@qdrant/js-client-rest': 1.11.0(typescript@5.6.2)
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@qdrant/js-client-rest': 1.11.0(typescript@5.7.2)
       uuid: 10.0.0
     transitivePeerDependencies:
       - typescript
 
-  '@langchain/redis@0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/redis@0.1.0(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       redis: 4.6.14
 
-  '@langchain/textsplitters@0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))':
+  '@langchain/textsplitters@0.1.0(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))':
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       js-tiktoken: 1.0.12
 
   '@lezer/common@1.1.0': {}
@@ -14856,48 +16781,46 @@ snapshots:
       '@types/react': 18.0.27
       react: 18.2.0
 
-  '@microsoft/api-extractor-model@7.29.6(@types/node@18.16.16)':
+  '@microsoft/api-extractor-model@7.30.0(@types/node@18.16.16)':
     dependencies:
-      '@microsoft/tsdoc': 0.15.0
-      '@microsoft/tsdoc-config': 0.17.0
-      '@rushstack/node-core-library': 5.7.0(@types/node@18.16.16)
+      '@microsoft/tsdoc': 0.15.1
+      '@microsoft/tsdoc-config': 0.17.1
+      '@rushstack/node-core-library': 5.10.0(@types/node@18.16.16)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/api-extractor@7.47.7(@types/node@18.16.16)':
+  '@microsoft/api-extractor@7.48.0(@types/node@18.16.16)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.29.6(@types/node@18.16.16)
-      '@microsoft/tsdoc': 0.15.0
-      '@microsoft/tsdoc-config': 0.17.0
-      '@rushstack/node-core-library': 5.7.0(@types/node@18.16.16)
+      '@microsoft/api-extractor-model': 7.30.0(@types/node@18.16.16)
+      '@microsoft/tsdoc': 0.15.1
+      '@microsoft/tsdoc-config': 0.17.1
+      '@rushstack/node-core-library': 5.10.0(@types/node@18.16.16)
       '@rushstack/rig-package': 0.5.3
-      '@rushstack/terminal': 0.14.0(@types/node@18.16.16)
-      '@rushstack/ts-command-line': 4.22.6(@types/node@18.16.16)
+      '@rushstack/terminal': 0.14.3(@types/node@18.16.16)
+      '@rushstack/ts-command-line': 4.23.1(@types/node@18.16.16)
       lodash: 4.17.21
       minimatch: 3.0.8
       resolve: 1.22.8
       semver: 7.6.0
       source-map: 0.6.1
-      typescript: 5.6.2
+      typescript: 5.7.2
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/tsdoc-config@0.17.0':
+  '@microsoft/tsdoc-config@0.17.1':
     dependencies:
-      '@microsoft/tsdoc': 0.15.0
+      '@microsoft/tsdoc': 0.15.1
       ajv: 8.12.0
       jju: 1.4.0
       resolve: 1.22.8
 
-  '@microsoft/tsdoc@0.15.0': {}
+  '@microsoft/tsdoc@0.15.1': {}
 
   '@miragejs/pretender-node-polyfill@0.1.2': {}
 
-  '@mistralai/mistralai@0.4.0(encoding@0.1.13)':
+  '@mistralai/mistralai@1.3.4(zod@3.23.8)':
     dependencies:
-      node-fetch: 2.7.0(encoding@0.1.13)
-    transitivePeerDependencies:
-      - encoding
+      zod: 3.23.8
 
   '@mongodb-js/saslprep@1.1.9':
     dependencies:
@@ -14936,7 +16859,7 @@ snapshots:
 
   '@n8n/localtunnel@3.0.0':
     dependencies:
-      axios: 1.7.3(debug@4.3.6)
+      axios: 1.7.7(debug@4.3.6)
       debug: 4.3.6(supports-color@8.1.1)
     transitivePeerDependencies:
       - supports-color
@@ -14947,14 +16870,14 @@ snapshots:
       '@types/retry': 0.12.5
       retry: 0.13.1
 
-  '@n8n/tournament@1.0.5':
+  '@n8n/tournament@1.0.6':
     dependencies:
       '@n8n_io/riot-tmpl': 4.0.1
       ast-types: 0.16.1
       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@8.42.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
@@ -14974,18 +16897,18 @@ snapshots:
       uuid: 9.0.1
       yargs: 17.7.2
     optionalDependencies:
-      '@sentry/node': 7.87.0
+      '@sentry/node': 8.42.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)
+      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@8.42.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
@@ -15005,23 +16928,23 @@ snapshots:
       uuid: 9.0.1
       yargs: 17.7.2
     optionalDependencies:
-      '@sentry/node': 7.87.0
+      '@sentry/node': 8.42.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)
+      ts-node: 10.9.2(@types/node@18.16.16)(typescript@5.7.2)
     transitivePeerDependencies:
       - supports-color
 
   '@n8n/vm2@3.9.25':
     dependencies:
       acorn: 8.12.1
-      acorn-walk: 8.3.2
+      acorn-walk: 8.3.4
 
-  '@n8n_io/ai-assistant-sdk@1.10.3': {}
+  '@n8n_io/ai-assistant-sdk@1.13.0': {}
 
   '@n8n_io/license-sdk@2.13.1':
     dependencies:
@@ -15089,8 +17012,302 @@ snapshots:
 
   '@one-ini/wasm@0.1.1': {}
 
+  '@opentelemetry/api-logs@0.52.1':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/api-logs@0.53.0':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/api-logs@0.54.2':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
   '@opentelemetry/api@1.2.0': {}
 
+  '@opentelemetry/api@1.9.0': {}
+
+  '@opentelemetry/context-async-hooks@1.29.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+
+  '@opentelemetry/core@1.26.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.27.0
+
+  '@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/semantic-conventions': 1.28.0
+
+  '@opentelemetry/instrumentation-amqplib@0.43.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-connect@0.40.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@types/connect': 3.4.36
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-dataloader@0.12.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-express@0.44.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-fastify@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-fs@0.16.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-generic-pool@0.39.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-graphql@0.44.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-hapi@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-http@0.53.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.26.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.27.0
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-ioredis@0.43.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-kafkajs@0.4.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-knex@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-koa@0.43.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-lru-memoizer@0.40.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mongodb@0.48.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mongoose@0.42.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mysql2@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-mysql@0.41.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@types/mysql': 2.15.26
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-nestjs-core@0.40.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-pg@0.44.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@opentelemetry/sql-common': 0.40.1(@opentelemetry/api@1.9.0)
+      '@types/pg': 8.6.1
+      '@types/pg-pool': 2.0.6
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-redis-4@0.42.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/redis-common': 0.36.2
+      '@opentelemetry/semantic-conventions': 1.28.0
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-tedious@0.15.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@types/tedious': 4.0.14
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation-undici@0.6.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.53.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.52.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.52.1
+      '@types/shimmer': 1.2.0
+      import-in-the-middle: 1.11.3
+      require-in-the-middle: 7.4.0
+      semver: 7.6.0
+      shimmer: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.53.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.53.0
+      '@types/shimmer': 1.2.0
+      import-in-the-middle: 1.11.3
+      require-in-the-middle: 7.4.0
+      semver: 7.6.0
+      shimmer: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/api-logs': 0.54.2
+      '@types/shimmer': 1.2.0
+      import-in-the-middle: 1.11.3
+      require-in-the-middle: 7.4.0
+      semver: 7.6.0
+      shimmer: 1.2.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@opentelemetry/redis-common@0.36.2': {}
+
+  '@opentelemetry/resources@1.29.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+
+  '@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+
+  '@opentelemetry/semantic-conventions@1.27.0': {}
+
+  '@opentelemetry/semantic-conventions@1.28.0': {}
+
+  '@opentelemetry/sql-common@0.40.1(@opentelemetry/api@1.9.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+
   '@otplib/core@12.0.1': {}
 
   '@otplib/plugin-crypto@12.0.1':
@@ -15114,14 +17331,14 @@ snapshots:
       '@otplib/plugin-crypto': 12.0.1
       '@otplib/plugin-thirty-two': 12.0.1
 
-  '@pinecone-database/pinecone@3.0.3':
+  '@pinecone-database/pinecone@4.0.0':
     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.13(typescript@5.7.2)))(vue@3.5.13(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.13(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -15129,6 +17346,18 @@ snapshots:
   '@pkgjs/parseargs@0.11.0':
     optional: true
 
+  '@playwright/test@1.49.1':
+    dependencies:
+      playwright: 1.49.1
+
+  '@prisma/instrumentation@5.19.1':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/instrumentation': 0.52.1(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
+    transitivePeerDependencies:
+      - supports-color
+
   '@protobufjs/aspromise@1.1.2': {}
 
   '@protobufjs/base64@1.1.2': {}
@@ -15152,11 +17381,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': {}
@@ -15268,6 +17497,12 @@ snapshots:
       - encoding
       - supports-color
 
+  '@replit/codemirror-indentation-markers@6.5.3(@codemirror/language@6.10.1)(@codemirror/state@6.4.1)(@codemirror/view@6.26.3)':
+    dependencies:
+      '@codemirror/language': 6.10.1
+      '@codemirror/state': 6.4.1
+      '@codemirror/view': 6.26.3
+
   '@rollup/pluginutils@5.1.0(rollup@4.24.0)':
     dependencies:
       '@types/estree': 1.0.6
@@ -15344,7 +17579,7 @@ snapshots:
       - debug
       - supports-color
 
-  '@rushstack/node-core-library@5.7.0(@types/node@18.16.16)':
+  '@rushstack/node-core-library@5.10.0(@types/node@18.16.16)':
     dependencies:
       ajv: 8.13.0
       ajv-draft-04: 1.0.0(ajv@8.13.0)
@@ -15362,16 +17597,16 @@ snapshots:
       resolve: 1.22.8
       strip-json-comments: 3.1.1
 
-  '@rushstack/terminal@0.14.0(@types/node@18.16.16)':
+  '@rushstack/terminal@0.14.3(@types/node@18.16.16)':
     dependencies:
-      '@rushstack/node-core-library': 5.7.0(@types/node@18.16.16)
+      '@rushstack/node-core-library': 5.10.0(@types/node@18.16.16)
       supports-color: 8.1.1
     optionalDependencies:
       '@types/node': 18.16.16
 
-  '@rushstack/ts-command-line@4.22.6(@types/node@18.16.16)':
+  '@rushstack/ts-command-line@4.23.1(@types/node@18.16.16)':
     dependencies:
-      '@rushstack/terminal': 0.14.0(@types/node@18.16.16)
+      '@rushstack/terminal': 0.14.3(@types/node@18.16.16)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.1
@@ -15409,14 +17644,6 @@ snapshots:
       '@sentry/types': 8.33.1
       '@sentry/utils': 8.33.1
 
-  '@sentry-internal/tracing@7.87.0':
-    dependencies:
-      '@sentry/core': 7.87.0
-      '@sentry/types': 7.87.0
-      '@sentry/utils': 7.87.0
-
-  '@sentry/babel-plugin-component-annotate@2.22.5': {}
-
   '@sentry/browser@8.33.1':
     dependencies:
       '@sentry-internal/browser-utils': 8.33.1
@@ -15427,114 +17654,75 @@ snapshots:
       '@sentry/types': 8.33.1
       '@sentry/utils': 8.33.1
 
-  '@sentry/bundler-plugin-core@2.22.5(encoding@0.1.13)':
-    dependencies:
-      '@babel/core': 7.24.0
-      '@sentry/babel-plugin-component-annotate': 2.22.5
-      '@sentry/cli': 2.36.2(patch_hash=saib6xuadkfhahfipsdedqib2i)(encoding@0.1.13)
-      dotenv: 16.3.1
-      find-up: 5.0.0
-      glob: 9.3.2
-      magic-string: 0.30.8
-      unplugin: 1.0.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  '@sentry/cli-darwin@2.36.2':
-    optional: true
-
-  '@sentry/cli-linux-arm64@2.36.2':
-    optional: true
-
-  '@sentry/cli-linux-arm@2.36.2':
-    optional: true
-
-  '@sentry/cli-linux-i686@2.36.2':
-    optional: true
-
-  '@sentry/cli-linux-x64@2.36.2':
-    optional: true
-
-  '@sentry/cli-win32-i686@2.36.2':
-    optional: true
-
-  '@sentry/cli-win32-x64@2.36.2':
-    optional: true
-
-  '@sentry/cli@2.36.2(patch_hash=saib6xuadkfhahfipsdedqib2i)(encoding@0.1.13)':
-    dependencies:
-      https-proxy-agent: 5.0.1
-      node-fetch: 2.7.0(encoding@0.1.13)
-      progress: 2.0.3
-      proxy-from-env: 1.1.0
-      which: 2.0.2
-    optionalDependencies:
-      '@sentry/cli-darwin': 2.36.2
-      '@sentry/cli-linux-arm': 2.36.2
-      '@sentry/cli-linux-arm64': 2.36.2
-      '@sentry/cli-linux-i686': 2.36.2
-      '@sentry/cli-linux-x64': 2.36.2
-      '@sentry/cli-win32-i686': 2.36.2
-      '@sentry/cli-win32-x64': 2.36.2
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  '@sentry/core@7.87.0':
-    dependencies:
-      '@sentry/types': 7.87.0
-      '@sentry/utils': 7.87.0
-
   '@sentry/core@8.33.1':
     dependencies:
       '@sentry/types': 8.33.1
       '@sentry/utils': 8.33.1
 
-  '@sentry/integrations@7.87.0':
-    dependencies:
-      '@sentry/core': 7.87.0
-      '@sentry/types': 7.87.0
-      '@sentry/utils': 7.87.0
-      localforage: 1.10.0
+  '@sentry/core@8.42.0': {}
 
-  '@sentry/node@7.87.0':
+  '@sentry/node@8.42.0':
     dependencies:
-      '@sentry-internal/tracing': 7.87.0
-      '@sentry/core': 7.87.0
-      '@sentry/types': 7.87.0
-      '@sentry/utils': 7.87.0
-      https-proxy-agent: 5.0.1
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/context-async-hooks': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-amqplib': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-connect': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-dataloader': 0.12.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-express': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fastify': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-fs': 0.16.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-generic-pool': 0.39.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-graphql': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-hapi': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-http': 0.53.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-ioredis': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-kafkajs': 0.4.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-knex': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-koa': 0.43.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-lru-memoizer': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongodb': 0.48.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mongoose': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-mysql2': 0.41.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-nestjs-core': 0.40.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-pg': 0.44.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-redis-4': 0.42.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-tedious': 0.15.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation-undici': 0.6.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/resources': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@prisma/instrumentation': 5.19.1
+      '@sentry/core': 8.42.0
+      '@sentry/opentelemetry': 8.42.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)
+      import-in-the-middle: 1.11.3
     transitivePeerDependencies:
       - supports-color
 
-  '@sentry/types@7.87.0': {}
+  '@sentry/opentelemetry@8.42.0(@opentelemetry/api@1.9.0)(@opentelemetry/core@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/instrumentation@0.54.2(@opentelemetry/api@1.9.0))(@opentelemetry/sdk-trace-base@1.29.0(@opentelemetry/api@1.9.0))(@opentelemetry/semantic-conventions@1.28.0)':
+    dependencies:
+      '@opentelemetry/api': 1.9.0
+      '@opentelemetry/core': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/instrumentation': 0.54.2(@opentelemetry/api@1.9.0)
+      '@opentelemetry/sdk-trace-base': 1.29.0(@opentelemetry/api@1.9.0)
+      '@opentelemetry/semantic-conventions': 1.28.0
+      '@sentry/core': 8.42.0
 
   '@sentry/types@8.33.1': {}
 
-  '@sentry/utils@7.87.0':
-    dependencies:
-      '@sentry/types': 7.87.0
-
   '@sentry/utils@8.33.1':
     dependencies:
       '@sentry/types': 8.33.1
 
-  '@sentry/vite-plugin@2.22.5(encoding@0.1.13)':
-    dependencies:
-      '@sentry/bundler-plugin-core': 2.22.5(encoding@0.1.13)
-      unplugin: 1.0.1
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-
-  '@sentry/vue@8.33.1(vue@3.5.11(typescript@5.6.2))':
+  '@sentry/vue@8.33.1(vue@3.5.13(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.13(typescript@5.7.2)
 
   '@sevinf/maybe@0.5.0': {}
 
@@ -16017,181 +18205,158 @@ snapshots:
 
   '@sqltools/formatter@1.2.5': {}
 
-  '@storybook/addon-a11y@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-a11y@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      '@storybook/addon-highlight': 8.3.5(storybook@8.3.5)
+      '@storybook/addon-highlight': 8.4.6(storybook@8.4.6(prettier@3.3.3))
       axe-core: 4.7.2
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/addon-actions@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-actions@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
       '@types/uuid': 9.0.8
       dequal: 2.0.3
       polished: 4.2.2
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       uuid: 9.0.1
 
-  '@storybook/addon-backgrounds@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-backgrounds@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
       memoizerific: 1.11.3
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-controls@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-controls@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
       dequal: 2.0.3
-      lodash: 4.17.21
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-docs@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-docs@8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@mdx-js/react': 3.0.1(@types/react@18.0.27)(react@18.2.0)
-      '@storybook/blocks': 8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)
-      '@storybook/csf-plugin': 8.3.5(storybook@8.3.5)
-      '@storybook/global': 5.0.0
-      '@storybook/react-dom-shim': 8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)
-      '@types/react': 18.0.27
-      fs-extra: 11.1.1
+      '@storybook/blocks': 8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/csf-plugin': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/react-dom-shim': 8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      rehype-external-links: 3.0.0
-      rehype-slug: 6.0.0
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - '@types/react'
 
-  '@storybook/addon-essentials@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-essentials@8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      '@storybook/addon-actions': 8.3.5(storybook@8.3.5)
-      '@storybook/addon-backgrounds': 8.3.5(storybook@8.3.5)
-      '@storybook/addon-controls': 8.3.5(storybook@8.3.5)
-      '@storybook/addon-docs': 8.3.5(storybook@8.3.5)
-      '@storybook/addon-highlight': 8.3.5(storybook@8.3.5)
-      '@storybook/addon-measure': 8.3.5(storybook@8.3.5)
-      '@storybook/addon-outline': 8.3.5(storybook@8.3.5)
-      '@storybook/addon-toolbars': 8.3.5(storybook@8.3.5)
-      '@storybook/addon-viewport': 8.3.5(storybook@8.3.5)
-      storybook: 8.3.5
+      '@storybook/addon-actions': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-backgrounds': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-controls': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-docs': 8.4.6(@types/react@18.0.27)(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-highlight': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-measure': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-outline': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-toolbars': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/addon-viewport': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - '@types/react'
 
-  '@storybook/addon-highlight@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-highlight@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/addon-interactions@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-interactions@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      '@storybook/instrumenter': 8.3.5(storybook@8.3.5)
-      '@storybook/test': 8.3.5(storybook@8.3.5)
+      '@storybook/instrumenter': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/test': 8.4.6(storybook@8.4.6(prettier@3.3.3))
       polished: 4.2.2
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-links@8.3.5(react@18.2.0)(storybook@8.3.5)':
+  '@storybook/addon-links@8.4.6(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/csf': 0.1.11
       '@storybook/global': 5.0.0
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
     optionalDependencies:
       react: 18.2.0
 
-  '@storybook/addon-measure@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-measure@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       tiny-invariant: 1.3.3
 
-  '@storybook/addon-outline@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-outline@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-themes@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-themes@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
 
-  '@storybook/addon-toolbars@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-toolbars@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/addon-viewport@8.3.5(storybook@8.3.5)':
+  '@storybook/addon-viewport@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       memoizerific: 1.11.3
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/blocks@8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)':
+  '@storybook/blocks@8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/csf': 0.1.11
-      '@storybook/global': 5.0.0
-      '@storybook/icons': 1.2.10(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      '@types/lodash': 4.14.195
-      color-convert: 2.0.1
-      dequal: 2.0.3
-      lodash: 4.17.21
-      markdown-to-jsx: 7.5.0(react@18.2.0)
-      memoizerific: 1.11.3
-      polished: 4.2.2
-      react-colorful: 5.6.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
-      storybook: 8.3.5
-      telejson: 7.2.0
+      '@storybook/icons': 1.2.12(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
     optionalDependencies:
       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.4.6(storybook@8.4.6(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(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
+      '@storybook/csf-plugin': 8.4.6(storybook@8.4.6(prettier@3.3.3))
       browser-assert: 1.2.1
-      es-module-lexer: 1.5.3
-      express: 4.21.1
-      find-cache-dir: 3.3.2
-      fs-extra: 11.1.1
-      magic-string: 0.30.11
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       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
-    transitivePeerDependencies:
-      - supports-color
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
 
-  '@storybook/components@8.3.5(storybook@8.3.5)':
+  '@storybook/components@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/core@8.3.5':
+  '@storybook/core@8.4.6(prettier@3.3.3)':
     dependencies:
       '@storybook/csf': 0.1.11
-      '@types/express': 4.17.21
       better-opn: 3.0.2
       browser-assert: 1.2.1
       esbuild: 0.24.0
       esbuild-register: 3.5.0(esbuild@0.24.0)
-      express: 4.21.1
       jsdoc-type-pratt-parser: 4.1.0
       process: 0.11.10
       recast: 0.23.6
       semver: 7.6.0
       util: 0.12.5
       ws: 8.17.1
+    optionalDependencies:
+      prettier: 3.3.3
     transitivePeerDependencies:
       - bufferutil
       - supports-color
       - utf-8-validate
 
-  '@storybook/csf-plugin@8.3.5(storybook@8.3.5)':
+  '@storybook/csf-plugin@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
       unplugin: 1.11.0
 
   '@storybook/csf@0.1.11':
@@ -16200,79 +18365,74 @@ snapshots:
 
   '@storybook/global@5.0.0': {}
 
-  '@storybook/icons@1.2.10(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@storybook/icons@1.2.12(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
 
-  '@storybook/instrumenter@8.3.5(storybook@8.3.5)':
+  '@storybook/instrumenter@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/global': 5.0.0
-      '@vitest/utils': 2.1.2
-      storybook: 8.3.5
-      util: 0.12.5
+      '@vitest/utils': 2.1.8
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/manager-api@8.3.5(storybook@8.3.5)':
+  '@storybook/manager-api@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/preview-api@8.3.5(storybook@8.3.5)':
+  '@storybook/preview-api@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/react-dom-shim@8.3.5(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.3.5)':
+  '@storybook/react-dom-shim@8.4.6(react-dom@18.2.0(react@18.2.0))(react@18.2.0)(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/test@8.3.5(storybook@8.3.5)':
+  '@storybook/test@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
       '@storybook/csf': 0.1.11
       '@storybook/global': 5.0.0
-      '@storybook/instrumenter': 8.3.5(storybook@8.3.5)
+      '@storybook/instrumenter': 8.4.6(storybook@8.4.6(prettier@3.3.3))
       '@testing-library/dom': 10.4.0
       '@testing-library/jest-dom': 6.5.0
       '@testing-library/user-event': 14.5.2(@testing-library/dom@10.4.0)
       '@vitest/expect': 2.0.5
       '@vitest/spy': 2.0.5
-      storybook: 8.3.5
-      util: 0.12.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@storybook/theming@8.3.5(storybook@8.3.5)':
+  '@storybook/theming@8.4.6(storybook@8.4.6(prettier@3.3.3))':
     dependencies:
-      storybook: 8.3.5
+      storybook: 8.4.6(prettier@3.3.3)
 
-  '@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.4.6(storybook@8.4.6(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))':
     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.4.6(storybook@8.4.6(prettier@3.3.3))(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))
+      '@storybook/vue3': 8.4.6(storybook@8.4.6(prettier@3.3.3))(vue@3.5.13(typescript@5.7.2))
       find-package-json: 1.2.0
-      magic-string: 0.30.11
-      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)
-      vue-component-meta: 2.1.6(typescript@5.6.2)
-      vue-docgen-api: 4.76.0(vue@3.5.11(typescript@5.6.2))
+      magic-string: 0.30.14
+      storybook: 8.4.6(prettier@3.3.3)
+      typescript: 5.7.2
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vue-component-meta: 2.1.10(typescript@5.7.2)
+      vue-docgen-api: 4.76.0(vue@3.5.13(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.4.6(storybook@8.4.6(prettier@3.3.3))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@storybook/components': 8.3.5(storybook@8.3.5)
+      '@storybook/components': 8.4.6(storybook@8.4.6(prettier@3.3.3))
       '@storybook/global': 5.0.0
-      '@storybook/manager-api': 8.3.5(storybook@8.3.5)
-      '@storybook/preview-api': 8.3.5(storybook@8.3.5)
-      '@storybook/theming': 8.3.5(storybook@8.3.5)
-      '@vue/compiler-core': 3.5.11
-      storybook: 8.3.5
+      '@storybook/manager-api': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/preview-api': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@storybook/theming': 8.4.6(storybook@8.4.6(prettier@3.3.3))
+      '@vue/compiler-core': 3.5.13
+      storybook: 8.4.6(prettier@3.3.3)
       ts-dedent: 2.2.0
       type-fest: 2.19.0
-      vue: 3.5.11(typescript@5.6.2)
-      vue-component-type-helpers: 2.1.6
+      vue: 3.5.13(typescript@5.7.2)
+      vue-component-type-helpers: 2.2.0
 
   '@supabase/auth-js@2.65.0':
     dependencies:
@@ -16341,7 +18501,7 @@ snapshots:
       lz-string: 1.5.0
       pretty-format: 27.5.1
 
-  '@testing-library/dom@9.3.3':
+  '@testing-library/dom@9.3.4':
     dependencies:
       '@babel/code-frame': 7.24.6
       '@babel/runtime': 7.24.7
@@ -16366,14 +18526,14 @@ 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.13)(vue@3.5.13(typescript@5.7.2))':
     dependencies:
       '@babel/runtime': 7.24.7
-      '@testing-library/dom': 9.3.3
+      '@testing-library/dom': 9.3.4
       '@vue/test-utils': 2.4.6
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
     optionalDependencies:
-      '@vue/compiler-sfc': 3.5.11
+      '@vue/compiler-sfc': 3.5.13
 
   '@tokenizer/token@0.3.0': {}
 
@@ -16382,6 +18542,8 @@ snapshots:
 
   '@tootallnate/once@2.0.0': {}
 
+  '@trysound/sax@0.2.0': {}
+
   '@tsconfig/node10@1.0.11':
     optional: true
 
@@ -16412,24 +18574,24 @@ snapshots:
 
   '@types/babel__core@7.20.0':
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.18.2
 
   '@types/babel__generator@7.6.4':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
   '@types/babel__template@7.4.1':
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   '@types/babel__traverse@7.18.2':
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
   '@types/basic-auth@1.1.3':
     dependencies:
@@ -16441,7 +18603,7 @@ snapshots:
 
   '@types/body-parser@1.19.2':
     dependencies:
-      '@types/connect': 3.4.35
+      '@types/connect': 3.4.36
       '@types/node': 18.16.16
 
   '@types/caseless@0.12.5': {}
@@ -16458,7 +18620,7 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
-  '@types/connect@3.4.35':
+  '@types/connect@3.4.36':
     dependencies:
       '@types/node': 18.16.16
 
@@ -16474,6 +18636,10 @@ snapshots:
 
   '@types/dateformat@3.0.1': {}
 
+  '@types/debug@4.1.12':
+    dependencies:
+      '@types/ms': 0.7.34
+
   '@types/deep-equal@1.0.1': {}
 
   '@types/eslint@8.56.5':
@@ -16490,7 +18656,7 @@ snapshots:
   '@types/express-serve-static-core@4.17.43(patch_hash=5orrj4qleu2iko5t27vl44u4we)':
     dependencies:
       '@types/node': 18.16.16
-      '@types/qs': 6.9.7
+      '@types/qs': 6.9.15
       '@types/range-parser': 1.2.4
       '@types/send': 0.17.4
 
@@ -16498,13 +18664,11 @@ snapshots:
     dependencies:
       '@types/body-parser': 1.19.2
       '@types/express-serve-static-core': 4.17.43(patch_hash=5orrj4qleu2iko5t27vl44u4we)
-      '@types/qs': 6.9.7
+      '@types/qs': 6.9.15
       '@types/serve-static': 1.15.0
 
   '@types/file-saver@2.0.5': {}
 
-  '@types/find-cache-dir@3.2.1': {}
-
   '@types/flat@5.0.5': {}
 
   '@types/formidable@3.4.5':
@@ -16534,10 +18698,6 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
-  '@types/hast@3.0.4':
-    dependencies:
-      '@types/unist': 3.0.2
-
   '@types/html-to-text@9.0.4': {}
 
   '@types/humanize-duration@3.27.1': {}
@@ -16649,6 +18809,8 @@ snapshots:
 
   '@types/minimatch@5.1.2': {}
 
+  '@types/ms@0.7.34': {}
+
   '@types/mssql@9.1.5':
     dependencies:
       '@types/node': 18.16.16
@@ -16659,6 +18821,10 @@ snapshots:
     dependencies:
       '@types/express': 4.17.21
 
+  '@types/mysql@2.15.26':
+    dependencies:
+      '@types/node': 18.16.16
+
   '@types/node-fetch@2.6.4':
     dependencies:
       '@types/node': 18.16.16
@@ -16672,12 +18838,22 @@ snapshots:
 
   '@types/normalize-package-data@2.4.1': {}
 
+  '@types/pg-pool@2.0.6':
+    dependencies:
+      '@types/pg': 8.11.6
+
   '@types/pg@8.11.6':
     dependencies:
       '@types/node': 18.16.16
       pg-protocol: 1.6.1
       pg-types: 4.0.2
 
+  '@types/pg@8.6.1':
+    dependencies:
+      '@types/node': 18.16.16
+      pg-protocol: 1.6.1
+      pg-types: 2.2.0
+
   '@types/phoenix@1.6.4': {}
 
   '@types/promise-ftp-common@1.1.0': {}
@@ -16693,7 +18869,7 @@ snapshots:
 
   '@types/psl@1.1.0': {}
 
-  '@types/qs@6.9.7': {}
+  '@types/qs@6.9.15': {}
 
   '@types/quoted-printable@1.0.2': {}
 
@@ -16748,6 +18924,8 @@ snapshots:
       '@types/glob': 8.0.0
       '@types/node': 18.16.16
 
+  '@types/shimmer@1.2.0': {}
+
   '@types/showdown@1.9.4': {}
 
   '@types/sinonjs__fake-timers@8.1.1': {}
@@ -16796,6 +18974,10 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
+  '@types/tedious@4.0.14':
+    dependencies:
+      '@types/node': 18.16.16
+
   '@types/tedious@4.0.9':
     dependencies:
       '@types/node': 18.16.16
@@ -16816,8 +18998,6 @@ snapshots:
     dependencies:
       '@types/node': 18.16.16
 
-  '@types/unist@3.0.2': {}
-
   '@types/utf8@3.0.3': {}
 
   '@types/uuencode@0.0.3(patch_hash=3i7wecddkama6vhpu5o37g24u4)':
@@ -16869,13 +19049,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
@@ -16883,22 +19063,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
 
@@ -16912,15 +19092,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
 
@@ -16928,7 +19108,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
@@ -16937,13 +19117,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
@@ -16952,34 +19132,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:
@@ -16996,14 +19176,36 @@ snapshots:
       '@typescript-eslint/types': 7.2.0
       eslint-visitor-keys: 3.4.3
 
+  '@typescript/vfs@1.6.0(typescript@5.7.2)':
+    dependencies:
+      debug: 4.3.6(supports-color@8.1.1)
+      typescript: 5.7.2
+    transitivePeerDependencies:
+      - supports-color
+
   '@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-legacy@6.0.0(terser@5.16.1)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))':
     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)
+      '@babel/core': 7.26.0
+      '@babel/preset-env': 7.26.0(@babel/core@7.26.0)
+      browserslist: 4.24.2
+      browserslist-to-esbuild: 2.1.1(browserslist@4.24.2)
+      core-js: 3.39.0
+      magic-string: 0.30.14
+      regenerator-runtime: 0.14.1
+      systemjs: 6.15.1
+      terser: 5.16.1
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+    transitivePeerDependencies:
+      - supports-color
 
-  '@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))':
+  '@vitejs/plugin-vue@5.2.1(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1))(vue@3.5.13(typescript@5.7.2))':
+    dependencies:
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
+      vue: 3.5.13(typescript@5.7.2)
+
+  '@vitest/coverage-v8@2.1.8(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
       '@ampproject/remapping': 2.3.0
       '@bcoe/v8-coverage': 0.2.3
@@ -17012,12 +19214,12 @@ snapshots:
       istanbul-lib-report: 3.0.1
       istanbul-lib-source-maps: 5.0.6
       istanbul-reports: 3.1.7
-      magic-string: 0.30.11
+      magic-string: 0.30.14
       magicast: 0.3.5
-      std-env: 3.7.0
+      std-env: 3.8.0
       test-exclude: 7.0.1
       tinyrainbow: 1.2.0
-      vitest: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      vitest: 2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - supports-color
 
@@ -17025,48 +19227,48 @@ snapshots:
     dependencies:
       '@vitest/spy': 2.0.5
       '@vitest/utils': 2.0.5
-      chai: 5.1.1
+      chai: 5.1.2
       tinyrainbow: 1.2.0
 
-  '@vitest/expect@2.1.2':
+  '@vitest/expect@2.1.8':
     dependencies:
-      '@vitest/spy': 2.1.2
-      '@vitest/utils': 2.1.2
-      chai: 5.1.1
+      '@vitest/spy': 2.1.8
+      '@vitest/utils': 2.1.8
+      chai: 5.1.2
       tinyrainbow: 1.2.0
 
-  '@vitest/mocker@2.1.2(@vitest/spy@2.1.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
+  '@vitest/mocker@2.1.8(vite@5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))':
     dependencies:
-      '@vitest/spy': 2.1.2
+      '@vitest/spy': 2.1.8
       estree-walker: 3.0.3
-      magic-string: 0.30.11
+      magic-string: 0.30.14
     optionalDependencies:
-      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
 
   '@vitest/pretty-format@2.0.5':
     dependencies:
       tinyrainbow: 1.2.0
 
-  '@vitest/pretty-format@2.1.2':
+  '@vitest/pretty-format@2.1.8':
     dependencies:
       tinyrainbow: 1.2.0
 
-  '@vitest/runner@2.1.2':
+  '@vitest/runner@2.1.8':
     dependencies:
-      '@vitest/utils': 2.1.2
+      '@vitest/utils': 2.1.8
       pathe: 1.1.2
 
-  '@vitest/snapshot@2.1.2':
+  '@vitest/snapshot@2.1.8':
     dependencies:
-      '@vitest/pretty-format': 2.1.2
-      magic-string: 0.30.11
+      '@vitest/pretty-format': 2.1.8
+      magic-string: 0.30.14
       pathe: 1.1.2
 
   '@vitest/spy@2.0.5':
     dependencies:
       tinyspy: 3.0.2
 
-  '@vitest/spy@2.1.2':
+  '@vitest/spy@2.1.8':
     dependencies:
       tinyspy: 3.0.2
 
@@ -17074,90 +19276,90 @@ snapshots:
     dependencies:
       '@vitest/pretty-format': 2.0.5
       estree-walker: 3.0.3
-      loupe: 3.1.1
+      loupe: 3.1.2
       tinyrainbow: 1.2.0
 
-  '@vitest/utils@2.1.2':
+  '@vitest/utils@2.1.8':
     dependencies:
-      '@vitest/pretty-format': 2.1.2
-      loupe: 3.1.1
+      '@vitest/pretty-format': 2.1.8
+      loupe: 3.1.2
       tinyrainbow: 1.2.0
 
-  '@volar/language-core@2.4.6':
+  '@volar/language-core@2.4.10':
     dependencies:
-      '@volar/source-map': 2.4.6
+      '@volar/source-map': 2.4.10
 
-  '@volar/source-map@2.4.6': {}
+  '@volar/source-map@2.4.10': {}
 
-  '@volar/typescript@2.4.6':
+  '@volar/typescript@2.4.10':
     dependencies:
-      '@volar/language-core': 2.4.6
+      '@volar/language-core': 2.4.10
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
 
-  '@vue-flow/background@1.3.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/background@1.3.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.2(vue@3.5.11(typescript@5.6.2))
-      vue: 3.5.11(typescript@5.6.2)
+      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
+      vue: 3.5.13(typescript@5.7.2)
 
-  '@vue-flow/controls@1.1.2(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/controls@1.1.2(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.2(vue@3.5.11(typescript@5.6.2))
-      vue: 3.5.11(typescript@5.6.2)
+      '@vue-flow/core': 1.41.6(vue@3.5.13(typescript@5.7.2))
+      vue: 3.5.13(typescript@5.7.2)
 
-  '@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/core@1.41.6(vue@3.5.13(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.13(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.13(typescript@5.7.2)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
-  '@vue-flow/minimap@1.5.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/minimap@1.5.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.2(vue@3.5.11(typescript@5.6.2))
+      '@vue-flow/core': 1.41.6(vue@3.5.13(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.13(typescript@5.7.2)
 
-  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.41.2(vue@3.5.11(typescript@5.6.2)))(vue@3.5.11(typescript@5.6.2))':
+  '@vue-flow/node-resizer@1.4.0(@vue-flow/core@1.41.6(vue@3.5.13(typescript@5.7.2)))(vue@3.5.13(typescript@5.7.2))':
     dependencies:
-      '@vue-flow/core': 1.41.2(vue@3.5.11(typescript@5.6.2))
+      '@vue-flow/core': 1.41.6(vue@3.5.13(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.13(typescript@5.7.2)
 
-  '@vue/compiler-core@3.5.11':
+  '@vue/compiler-core@3.5.13':
     dependencies:
       '@babel/parser': 7.25.6
-      '@vue/shared': 3.5.11
+      '@vue/shared': 3.5.13
       entities: 4.5.0
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  '@vue/compiler-dom@3.5.11':
+  '@vue/compiler-dom@3.5.13':
     dependencies:
-      '@vue/compiler-core': 3.5.11
-      '@vue/shared': 3.5.11
+      '@vue/compiler-core': 3.5.13
+      '@vue/shared': 3.5.13
 
-  '@vue/compiler-sfc@3.5.11':
+  '@vue/compiler-sfc@3.5.13':
     dependencies:
-      '@babel/parser': 7.25.6
-      '@vue/compiler-core': 3.5.11
-      '@vue/compiler-dom': 3.5.11
-      '@vue/compiler-ssr': 3.5.11
-      '@vue/shared': 3.5.11
+      '@babel/parser': 7.26.3
+      '@vue/compiler-core': 3.5.13
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-ssr': 3.5.13
+      '@vue/shared': 3.5.13
       estree-walker: 2.0.2
-      magic-string: 0.30.11
-      postcss: 8.4.47
+      magic-string: 0.30.14
+      postcss: 8.4.49
       source-map-js: 1.2.1
 
-  '@vue/compiler-ssr@3.5.11':
+  '@vue/compiler-ssr@3.5.13':
     dependencies:
-      '@vue/compiler-dom': 3.5.11
-      '@vue/shared': 3.5.11
+      '@vue/compiler-dom': 3.5.13
+      '@vue/shared': 3.5.13
 
   '@vue/compiler-vue2@2.7.16':
     dependencies:
@@ -17168,85 +19370,98 @@ 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.10(typescript@5.7.2)':
     dependencies:
-      '@volar/language-core': 2.4.6
-      '@vue/compiler-dom': 3.5.11
+      '@volar/language-core': 2.4.10
+      '@vue/compiler-dom': 3.5.13
       '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.11
+      '@vue/shared': 3.5.13
+      alien-signals: 0.2.2
+      minimatch: 9.0.5
+      muggle-string: 0.4.1
+      path-browserify: 1.0.1
+    optionalDependencies:
+      typescript: 5.7.2
+
+  '@vue/language-core@2.1.6(typescript@5.7.2)':
+    dependencies:
+      '@volar/language-core': 2.4.10
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-vue2': 2.7.16
+      '@vue/shared': 3.5.13
       computeds: 0.0.1
       minimatch: 9.0.5
       muggle-string: 0.4.1
       path-browserify: 1.0.1
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  '@vue/reactivity@3.5.11':
+  '@vue/reactivity@3.5.13':
     dependencies:
-      '@vue/shared': 3.5.11
+      '@vue/shared': 3.5.13
 
-  '@vue/runtime-core@3.5.11':
+  '@vue/runtime-core@3.5.13':
     dependencies:
-      '@vue/reactivity': 3.5.11
-      '@vue/shared': 3.5.11
+      '@vue/reactivity': 3.5.13
+      '@vue/shared': 3.5.13
 
-  '@vue/runtime-dom@3.5.11':
+  '@vue/runtime-dom@3.5.13':
     dependencies:
-      '@vue/reactivity': 3.5.11
-      '@vue/runtime-core': 3.5.11
-      '@vue/shared': 3.5.11
+      '@vue/reactivity': 3.5.13
+      '@vue/runtime-core': 3.5.13
+      '@vue/shared': 3.5.13
       csstype: 3.1.3
 
-  '@vue/server-renderer@3.5.11(vue@3.5.11(typescript@5.6.2))':
+  '@vue/server-renderer@3.5.13(vue@3.5.13(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/compiler-ssr': 3.5.13
+      '@vue/shared': 3.5.13
+      vue: 3.5.13(typescript@5.7.2)
 
-  '@vue/shared@3.5.11': {}
+  '@vue/shared@3.5.13': {}
 
   '@vue/test-utils@2.4.6':
     dependencies:
       js-beautify: 1.14.9
-      vue-component-type-helpers: 2.1.6
+      vue-component-type-helpers: 2.2.0
 
-  '@vueuse/components@10.11.0(vue@3.5.11(typescript@5.6.2))':
+  '@vueuse/components@10.11.0(vue@3.5.13(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.13(typescript@5.7.2))
+      '@vueuse/shared': 10.11.0(vue@3.5.13(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.13(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.13(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.13(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.13(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.13(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.13(typescript@5.7.2))
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
@@ -17255,25 +19470,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.13(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.13(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.13(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.13(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': {}
 
@@ -17294,24 +19509,27 @@ snapshots:
 
   acorn-globals@7.0.1:
     dependencies:
-      acorn: 8.12.1
-      acorn-walk: 8.3.2
+      acorn: 8.14.0
+      acorn-walk: 8.3.4
 
-  acorn-jsx@5.3.2(acorn@8.12.1):
+  acorn-import-attributes@1.9.5(acorn@8.14.0):
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.0
 
-  acorn-walk@8.3.2: {}
+  acorn-jsx@5.3.2(acorn@8.14.0):
+    dependencies:
+      acorn: 8.14.0
 
   acorn-walk@8.3.4:
     dependencies:
-      acorn: 8.12.1
-    optional: true
+      acorn: 8.14.0
 
   acorn@7.4.1: {}
 
   acorn@8.12.1: {}
 
+  acorn@8.14.0: {}
+
   adm-zip@0.5.10: {}
 
   agent-base@6.0.2:
@@ -17390,6 +19608,8 @@ snapshots:
     transitivePeerDependencies:
       - encoding
 
+  alien-signals@0.2.2: {}
+
   amqplib@0.10.3:
     dependencies:
       '@acuminous/bitsyntax': 0.1.2
@@ -17580,7 +19800,7 @@ snapshots:
     dependencies:
       call-bind: 1.0.7
       is-nan: 1.3.2
-      object-is: 1.1.5
+      object-is: 1.1.6
       object.assign: 4.1.5
       util: 0.12.5
 
@@ -17618,7 +19838,7 @@ snapshots:
       caniuse-lite: 1.0.30001667
       fraction.js: 4.3.7
       normalize-range: 0.1.2
-      picocolors: 1.0.1
+      picocolors: 1.1.1
       postcss: 8.4.38
       postcss-value-parser: 4.2.0
 
@@ -17641,14 +19861,6 @@ snapshots:
       '@babel/runtime': 7.24.7
       is-retry-allowed: 2.2.0
 
-  axios@1.7.3(debug@4.3.6):
-    dependencies:
-      follow-redirects: 1.15.6(debug@4.3.6)
-      form-data: 4.0.0
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-
   axios@1.7.4:
     dependencies:
       follow-redirects: 1.15.6(debug@4.3.6)
@@ -17665,6 +19877,14 @@ snapshots:
     transitivePeerDependencies:
       - debug
 
+  axios@1.7.7(debug@4.3.6):
+    dependencies:
+      follow-redirects: 1.15.6(debug@4.3.6)
+      form-data: 4.0.0
+      proxy-from-env: 1.1.0
+    transitivePeerDependencies:
+      - debug
+
   axios@1.7.7(debug@4.3.7):
     dependencies:
       follow-redirects: 1.15.6(debug@4.3.7)
@@ -17699,10 +19919,34 @@ snapshots:
   babel-plugin-jest-hoist@29.5.0:
     dependencies:
       '@babel/template': 7.24.0
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.18.2
 
+  babel-plugin-polyfill-corejs2@0.4.12(@babel/core@7.26.0):
+    dependencies:
+      '@babel/compat-data': 7.26.3
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0)
+      semver: 7.6.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-corejs3@0.10.6(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0)
+      core-js-compat: 3.39.0
+    transitivePeerDependencies:
+      - supports-color
+
+  babel-plugin-polyfill-regenerator@0.6.3(@babel/core@7.26.0):
+    dependencies:
+      '@babel/core': 7.26.0
+      '@babel/helper-define-polyfill-provider': 0.6.3(@babel/core@7.26.0)
+    transitivePeerDependencies:
+      - supports-color
+
   babel-preset-current-node-syntax@1.0.1(@babel/core@7.24.0):
     dependencies:
       '@babel/core': 7.24.0
@@ -17727,7 +19971,7 @@ snapshots:
 
   babel-walk@3.0.0-canary-5:
     dependencies:
-      '@babel/types': 7.25.6
+      '@babel/types': 7.26.3
 
   balanced-match@1.0.2: {}
 
@@ -17774,7 +20018,7 @@ snapshots:
       '@types/readable-stream': 4.0.10
       buffer: 6.0.3
       inherits: 2.0.4
-      readable-stream: 4.4.2
+      readable-stream: 4.5.2
 
   blob-util@2.0.2: {}
 
@@ -17826,6 +20070,11 @@ snapshots:
 
   browser-request@0.3.3: {}
 
+  browserslist-to-esbuild@2.1.1(browserslist@4.24.2):
+    dependencies:
+      browserslist: 4.24.2
+      meow: 13.2.0
+
   browserslist@4.23.0:
     dependencies:
       caniuse-lite: 1.0.30001667
@@ -17833,6 +20082,13 @@ snapshots:
       node-releases: 2.0.14
       update-browserslist-db: 1.0.13(browserslist@4.23.0)
 
+  browserslist@4.24.2:
+    dependencies:
+      caniuse-lite: 1.0.30001677
+      electron-to-chromium: 1.5.51
+      node-releases: 2.0.18
+      update-browserslist-db: 1.1.1(browserslist@4.24.2)
+
   bs-logger@0.2.6:
     dependencies:
       fast-json-stable-stringify: 2.1.0
@@ -17841,7 +20097,7 @@ snapshots:
     dependencies:
       node-int64: 0.4.0
 
-  bson@6.8.0: {}
+  bson@6.10.0: {}
 
   buffer-crc32@0.2.13: {}
 
@@ -17879,7 +20135,7 @@ snapshots:
       - supports-color
     optional: true
 
-  bull@4.12.1:
+  bull@4.12.1(patch_hash=ep6h4rqtpclldfcdohxlgcb3aq):
     dependencies:
       cron-parser: 4.9.0
       get-port: 5.1.1
@@ -17964,6 +20220,8 @@ snapshots:
 
   caniuse-lite@1.0.30001667: {}
 
+  caniuse-lite@1.0.30001677: {}
+
   capital-case@1.0.4:
     dependencies:
       no-case: 3.0.4
@@ -17972,12 +20230,12 @@ snapshots:
 
   caseless@0.12.0: {}
 
-  chai@5.1.1:
+  chai@5.1.2:
     dependencies:
       assertion-error: 2.0.1
       check-error: 2.1.1
       deep-eql: 5.0.2
-      loupe: 3.1.1
+      loupe: 3.1.2
       pathval: 2.0.0
 
   chalk@2.4.2:
@@ -18021,6 +20279,8 @@ snapshots:
 
   chardet@0.7.0: {}
 
+  chardet@2.0.0: {}
+
   charenc@0.0.2: {}
 
   chart.js@4.4.0:
@@ -18089,7 +20349,7 @@ snapshots:
 
   chownr@2.0.0: {}
 
-  chromatic@11.10.2: {}
+  chromatic@11.20.0: {}
 
   ci-info@3.8.0: {}
 
@@ -18172,7 +20432,7 @@ snapshots:
       '@lezer/html': 1.3.0
       '@lezer/lr': 1.4.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):
+  cohere-ai@7.14.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(encoding@0.1.13):
     dependencies:
       '@aws-sdk/client-sagemaker': 3.666.0
       '@aws-sdk/credential-providers': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))
@@ -18218,6 +20478,11 @@ snapshots:
       color-convert: 1.9.3
       color-string: 1.9.1
 
+  color@4.2.3:
+    dependencies:
+      color-convert: 2.0.1
+      color-string: 1.9.1
+
   colorette@1.4.0: {}
 
   colorette@2.0.19: {}
@@ -18233,6 +20498,8 @@ snapshots:
     dependencies:
       delayed-stream: 1.0.0
 
+  comlink@4.4.1: {}
+
   commander@10.0.1: {}
 
   commander@11.1.0: {}
@@ -18245,14 +20512,14 @@ snapshots:
 
   commander@6.2.1: {}
 
+  commander@7.2.0: {}
+
   commander@9.4.1: {}
 
   commist@3.2.0: {}
 
   common-tags@1.8.2: {}
 
-  commondir@1.0.1: {}
-
   compare-versions@6.1.1: {}
 
   component-emitter@1.3.0: {}
@@ -18325,8 +20592,8 @@ snapshots:
 
   constantinople@4.0.1:
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
 
   content-disposition@0.5.4:
     dependencies:
@@ -18360,10 +20627,16 @@ snapshots:
 
   core-js-compat@3.36.0:
     dependencies:
-      browserslist: 4.23.0
+      browserslist: 4.24.2
+
+  core-js-compat@3.39.0:
+    dependencies:
+      browserslist: 4.24.2
 
   core-js@3.35.0: {}
 
+  core-js@3.39.0: {}
+
   core-util-is@1.0.2: {}
 
   core-util-is@1.0.3: {}
@@ -18396,7 +20669,7 @@ snapshots:
 
   cross-env@7.0.3:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
 
   cross-fetch@4.0.0(encoding@0.1.13):
     dependencies:
@@ -18409,7 +20682,7 @@ snapshots:
       lru-cache: 4.1.5
       which: 1.3.1
 
-  cross-spawn@7.0.3:
+  cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
@@ -18449,6 +20722,16 @@ snapshots:
       css-color-keywords: 1.0.0
       postcss-value-parser: 4.2.0
 
+  css-tree@2.2.1:
+    dependencies:
+      mdn-data: 2.0.28
+      source-map-js: 1.2.1
+
+  css-tree@2.3.1:
+    dependencies:
+      mdn-data: 2.0.30
+      source-map-js: 1.2.1
+
   css-what@6.1.0: {}
 
   css.escape@1.5.1: {}
@@ -18457,6 +20740,10 @@ snapshots:
 
   cssfilter@0.0.10: {}
 
+  csso@5.0.5:
+    dependencies:
+      css-tree: 2.2.1
+
   cssom@0.3.8: {}
 
   cssom@0.5.0: {}
@@ -18750,6 +21037,8 @@ snapshots:
 
   detect-libc@2.0.1: {}
 
+  detect-libc@2.0.3: {}
+
   detect-newline@3.1.0: {}
 
   detect-node@2.1.0: {}
@@ -18849,6 +21138,8 @@ snapshots:
 
   dotenv@16.3.1: {}
 
+  dotenv@16.4.5: {}
+
   dotenv@8.6.0: {}
 
   dreamopt@0.8.0:
@@ -18901,15 +21192,17 @@ snapshots:
 
   electron-to-chromium@1.4.703: {}
 
-  element-plus@2.4.3(vue@3.5.11(typescript@5.6.2)):
+  electron-to-chromium@1.5.51: {}
+
+  element-plus@2.4.3(vue@3.5.13(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.13(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.13(typescript@5.7.2))
       async-validator: 4.2.5
       dayjs: 1.11.10
       escape-html: 1.0.3
@@ -18918,7 +21211,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.13(typescript@5.7.2)
     transitivePeerDependencies:
       - '@vue/composition-api'
 
@@ -18974,7 +21267,7 @@ snapshots:
   enzyme-shallow-equal@1.0.7:
     dependencies:
       hasown: 2.0.2
-      object-is: 1.1.5
+      object-is: 1.1.6
 
   enzyme@3.11.0:
     dependencies:
@@ -19184,7 +21477,7 @@ snapshots:
       isarray: 2.0.5
       stop-iteration-iterator: 1.0.0
 
-  es-module-lexer@1.5.3: {}
+  es-module-lexer@1.5.4: {}
 
   es-object-atoms@1.0.0:
     dependencies:
@@ -19250,6 +21543,8 @@ snapshots:
 
   escalade@3.1.1: {}
 
+  escalade@3.2.0: {}
+
   escape-goat@3.0.0: {}
 
   escape-html@1.0.3: {}
@@ -19278,21 +21573,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)(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)(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)(eslint@8.57.0)
     transitivePeerDependencies:
       - eslint-plugin-import
 
@@ -19310,13 +21605,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)(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
@@ -19327,14 +21622,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)(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
 
@@ -19343,7 +21638,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
@@ -19353,7 +21648,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)(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -19364,7 +21659,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
@@ -19379,9 +21674,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
@@ -19416,12 +21711,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:
@@ -19457,7 +21752,7 @@ snapshots:
       '@ungap/structured-clone': 1.2.0
       ajv: 6.12.6
       chalk: 4.1.2
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       debug: 4.3.4
       doctrine: 3.0.0
       escape-string-regexp: 4.0.0
@@ -19492,8 +21787,8 @@ snapshots:
 
   espree@9.6.1:
     dependencies:
-      acorn: 8.12.1
-      acorn-jsx: 5.3.2(acorn@8.12.1)
+      acorn: 8.14.0
+      acorn-jsx: 5.3.2(acorn@8.14.0)
       eslint-visitor-keys: 3.4.3
 
   esprima-next@5.8.4: {}
@@ -19548,7 +21843,7 @@ snapshots:
 
   execa@4.1.0:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 5.2.0
       human-signals: 1.1.1
       is-stream: 2.0.1
@@ -19560,7 +21855,7 @@ snapshots:
 
   execa@5.1.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       get-stream: 6.0.1
       human-signals: 2.1.0
       is-stream: 2.0.1
@@ -19582,6 +21877,8 @@ snapshots:
     dependencies:
       homedir-polyfill: 1.0.3
 
+  expect-type@1.1.0: {}
+
   expect@29.5.0:
     dependencies:
       '@jest/expect-utils': 29.6.2
@@ -19803,12 +22100,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  find-cache-dir@3.3.2:
-    dependencies:
-      commondir: 1.0.1
-      make-dir: 3.1.0
-      pkg-dir: 4.2.0
-
   find-package-json@1.2.0: {}
 
   find-up@4.1.0:
@@ -19850,7 +22141,7 @@ snapshots:
 
   foreground-child@3.1.1:
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.6
       signal-exit: 4.1.0
 
   forever-agent@0.6.1: {}
@@ -19906,12 +22197,6 @@ snapshots:
 
   fs-constants@1.0.0: {}
 
-  fs-extra@11.1.1:
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 6.1.0
-      universalify: 2.0.0
-
   fs-extra@7.0.1:
     dependencies:
       graceful-fs: 4.2.11
@@ -19931,6 +22216,9 @@ snapshots:
 
   fs.realpath@1.0.0: {}
 
+  fsevents@2.3.2:
+    optional: true
+
   fsevents@2.3.3:
     optional: true
 
@@ -19977,7 +22265,7 @@ snapshots:
   gaxios@6.6.0(encoding@0.1.13):
     dependencies:
       extend: 3.0.2
-      https-proxy-agent: 7.0.2
+      https-proxy-agent: 7.0.5
       is-stream: 2.0.1
       node-fetch: 2.7.0(encoding@0.1.13)
       uuid: 9.0.1
@@ -20016,8 +22304,6 @@ snapshots:
 
   get-caller-file@2.0.5: {}
 
-  get-func-name@2.0.2: {}
-
   get-intrinsic@1.2.4:
     dependencies:
       es-errors: 1.3.0
@@ -20061,9 +22347,9 @@ snapshots:
     dependencies:
       assert-plus: 1.0.0
 
-  github-from-package@0.0.0: {}
+  github-buttons@2.29.1: {}
 
-  github-slugger@2.0.0: {}
+  github-from-package@0.0.0: {}
 
   glob-parent@5.1.2:
     dependencies:
@@ -20107,13 +22393,6 @@ snapshots:
       minimatch: 5.1.5
       once: 1.4.0
 
-  glob@9.3.2:
-    dependencies:
-      fs.realpath: 1.0.0
-      minimatch: 7.4.2
-      minipass: 4.2.5
-      path-scurry: 1.11.1
-
   global-dirs@3.0.0:
     dependencies:
       ini: 2.0.0
@@ -20288,18 +22567,6 @@ snapshots:
     dependencies:
       function-bind: 1.1.2
 
-  hast-util-heading-rank@3.0.0:
-    dependencies:
-      '@types/hast': 3.0.4
-
-  hast-util-is-element@3.0.0:
-    dependencies:
-      '@types/hast': 3.0.4
-
-  hast-util-to-string@3.0.0:
-    dependencies:
-      '@types/hast': 3.0.4
-
   he@1.2.0: {}
 
   header-case@2.0.4:
@@ -20460,6 +22727,26 @@ snapshots:
     dependencies:
       ms: 2.1.3
 
+  ibm-cloud-sdk-core@5.1.0:
+    dependencies:
+      '@types/debug': 4.1.12
+      '@types/node': 18.16.16
+      '@types/tough-cookie': 4.0.2
+      axios: 1.7.4
+      camelcase: 6.3.0
+      debug: 4.3.7
+      dotenv: 16.4.5
+      extend: 3.0.2
+      file-type: 16.5.4
+      form-data: 4.0.0
+      isstream: 0.1.2
+      jsonwebtoken: 9.0.2
+      mime-types: 2.1.35
+      retry-axios: 2.6.0(axios@1.7.4(debug@4.3.7))
+      tough-cookie: 4.1.3
+    transitivePeerDependencies:
+      - supports-color
+
   iconv-lite@0.4.24:
     dependencies:
       safer-buffer: 2.1.2
@@ -20472,7 +22759,7 @@ snapshots:
 
   ics@2.40.0:
     dependencies:
-      nanoid: 3.3.7
+      nanoid: 3.3.8
       yup: 0.32.11
 
   ieee754@1.2.1: {}
@@ -20495,6 +22782,13 @@ snapshots:
       parent-module: 1.0.1
       resolve-from: 4.0.0
 
+  import-in-the-middle@1.11.3:
+    dependencies:
+      acorn: 8.14.0
+      acorn-import-attributes: 1.9.5(acorn@8.14.0)
+      cjs-module-lexer: 1.2.2
+      module-details-from-path: 1.0.3
+
   import-lazy@4.0.0: {}
 
   import-local@3.1.0:
@@ -20587,13 +22881,14 @@ 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: {}
 
-  is-absolute-url@4.0.1: {}
-
   is-arguments@1.1.1:
     dependencies:
       call-bind: 1.0.7
@@ -20649,6 +22944,8 @@ snapshots:
 
   is-docker@2.2.1: {}
 
+  is-emoji-supported@0.0.5: {}
+
   is-expression@4.0.0:
     dependencies:
       acorn: 7.4.1
@@ -20765,6 +23062,8 @@ snapshots:
 
   isexe@2.0.0: {}
 
+  isexe@3.1.1: {}
+
   iso-639-1@2.1.15: {}
 
   isstream@0.1.2: {}
@@ -20774,7 +23073,7 @@ snapshots:
   istanbul-lib-instrument@5.2.1:
     dependencies:
       '@babel/core': 7.24.0
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.2
       semver: 7.6.0
@@ -20858,16 +23157,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
@@ -20878,7 +23177,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
@@ -20904,7 +23203,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
@@ -21022,11 +23321,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:
@@ -21182,12 +23481,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
@@ -21248,6 +23547,9 @@ snapshots:
 
   jsbn@0.1.1: {}
 
+  jsbn@1.1.0:
+    optional: true
+
   jsdoc-type-pratt-parser@4.1.0: {}
 
   jsdom@20.0.2:
@@ -21291,7 +23593,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
@@ -21329,6 +23631,8 @@ snapshots:
 
   json-parse-even-better-errors@2.3.1: {}
 
+  json-parse-even-better-errors@4.0.0: {}
+
   json-pointer@0.6.2:
     dependencies:
       foreach: 2.0.6
@@ -21443,15 +23747,15 @@ snapshots:
 
   kuler@2.0.0: {}
 
-  langchain@0.3.2(cbdnlo2gcodz2gzix466oterhe):
+  langchain@0.3.11(ppo73pxbxzh4gygvo2i6vjkife):
     dependencies:
-      '@langchain/core': 0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
-      '@langchain/openai': 0.3.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/textsplitters': 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
+      '@langchain/core': 0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
+      '@langchain/openai': 0.3.17(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/textsplitters': 0.1.0(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
       js-tiktoken: 1.0.12
       js-yaml: 4.1.0
       jsonpointer: 5.0.1
-      langsmith: 0.1.59(openai@4.63.0(encoding@0.1.13)(zod@3.23.8))
+      langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.23.8))
       openapi-types: 12.1.3
       p-retry: 4.6.2
       uuid: 10.0.0
@@ -21459,15 +23763,15 @@ snapshots:
       zod: 3.23.8
       zod-to-json-schema: 3.23.3(zod@3.23.8)
     optionalDependencies:
-      '@langchain/anthropic': 0.3.1(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/aws': 0.1.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
-      '@langchain/cohere': 0.3.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/google-genai': 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
-      '@langchain/google-vertexai': 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
-      '@langchain/groq': 0.1.2(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/mistralai': 0.1.1(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
-      '@langchain/ollama': 0.1.0(@langchain/core@0.3.3(patch_hash=ekay3bw7hexufl733lypqvmx2e)(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)))
-      axios: 1.7.7
+      '@langchain/anthropic': 0.3.11(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/aws': 0.1.3(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0)(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
+      '@langchain/cohere': 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/google-genai': 0.1.6(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(zod@3.23.8)
+      '@langchain/google-vertexai': 0.1.8(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)(zod@3.23.8)
+      '@langchain/groq': 0.1.3(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))(encoding@0.1.13)
+      '@langchain/mistralai': 0.2.0(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
+      '@langchain/ollama': 0.1.4(@langchain/core@0.3.19(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)))
+      axios: 1.7.4
       cheerio: 1.0.0
       handlebars: 4.7.8
     transitivePeerDependencies:
@@ -21475,7 +23779,7 @@ snapshots:
       - openai
       - supports-color
 
-  langsmith@0.1.59(openai@4.63.0(encoding@0.1.13)(zod@3.23.8)):
+  langsmith@0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)):
     dependencies:
       '@types/uuid': 10.0.0
       commander: 10.0.1
@@ -21484,9 +23788,9 @@ snapshots:
       semver: 7.6.0
       uuid: 10.0.0
     optionalDependencies:
-      openai: 4.63.0(encoding@0.1.13)(zod@3.23.8)
+      openai: 4.78.1(encoding@0.1.13)(zod@3.23.8)
 
-  langsmith@0.1.59(openai@4.63.0(zod@3.23.8)):
+  langsmith@0.2.3(openai@4.78.1(encoding@0.1.13)(zod@3.23.8)):
     dependencies:
       '@types/uuid': 10.0.0
       commander: 10.0.1
@@ -21495,18 +23799,7 @@ snapshots:
       semver: 7.6.0
       uuid: 10.0.0
     optionalDependencies:
-      openai: 4.63.0(zod@3.23.8)
-
-  langsmith@0.1.59(openai@4.63.0):
-    dependencies:
-      '@types/uuid': 10.0.0
-      commander: 10.0.1
-      p-queue: 6.6.2
-      p-retry: 4.6.2
-      semver: 7.6.0
-      uuid: 10.0.0
-    optionalDependencies:
-      openai: 4.63.0(zod@3.23.8)
+      openai: 4.78.1(encoding@0.1.13)(zod@3.23.8)
 
   lazy-ass@1.6.0: {}
 
@@ -21599,10 +23892,6 @@ snapshots:
 
   libqp@2.0.1: {}
 
-  lie@3.1.1:
-    dependencies:
-      immediate: 3.0.6
-
   lie@3.3.0:
     dependencies:
       immediate: 3.0.6
@@ -21639,10 +23928,6 @@ snapshots:
       mlly: 1.4.2
       pkg-types: 1.0.3
 
-  localforage@1.10.0:
-    dependencies:
-      lie: 3.1.1
-
   locate-path@5.0.0:
     dependencies:
       p-locate: 4.1.0
@@ -21663,6 +23948,8 @@ snapshots:
 
   lodash.clonedeep@4.5.0: {}
 
+  lodash.debounce@4.0.8: {}
+
   lodash.defaults@4.2.0: {}
 
   lodash.escape@4.0.1: {}
@@ -21736,9 +24023,7 @@ snapshots:
 
   lossless-json@1.0.5: {}
 
-  loupe@3.1.1:
-    dependencies:
-      get-func-name: 2.0.2
+  loupe@3.1.2: {}
 
   lower-case@1.1.4: {}
 
@@ -21779,18 +24064,14 @@ snapshots:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.4.15
 
-  magic-string@0.30.11:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
-
-  magic-string@0.30.8:
+  magic-string@0.30.14:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
   magicast@0.3.5:
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
       source-map-js: 1.2.1
 
   mailparser@3.6.7:
@@ -21883,10 +24164,6 @@ snapshots:
       mdurl: 1.0.1
       uc.micro: 1.0.6
 
-  markdown-to-jsx@7.5.0(react@18.2.0):
-    dependencies:
-      react: 18.2.0
-
   marked@4.3.0: {}
 
   md5@2.3.0:
@@ -21895,6 +24172,10 @@ snapshots:
       crypt: 0.0.2
       is-buffer: 1.1.6
 
+  mdn-data@2.0.28: {}
+
+  mdn-data@2.0.30: {}
+
   mdurl@1.0.1: {}
 
   media-typer@0.3.0: {}
@@ -21909,8 +24190,12 @@ snapshots:
 
   memory-pager@1.5.0: {}
 
+  memorystream@0.3.1: {}
+
   mensch@0.3.4: {}
 
+  meow@13.2.0: {}
+
   merge-descriptors@1.0.3: {}
 
   merge-stream@2.0.0: {}
@@ -21945,7 +24230,7 @@ snapshots:
   minifaker@1.34.1:
     dependencies:
       '@types/uuid': 8.3.4
-      nanoid: 3.3.7
+      nanoid: 3.3.8
       uuid: 8.3.2
 
   minimalistic-assert@1.0.1: {}
@@ -21962,10 +24247,6 @@ snapshots:
     dependencies:
       brace-expansion: 2.0.1
 
-  minimatch@7.4.2:
-    dependencies:
-      brace-expansion: 2.0.1
-
   minimatch@9.0.1:
     dependencies:
       brace-expansion: 2.0.1
@@ -22013,8 +24294,6 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
-  minipass@4.2.5: {}
-
   minipass@5.0.0: {}
 
   minipass@7.1.2: {}
@@ -22031,6 +24310,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
@@ -22340,14 +24621,14 @@ snapshots:
 
   mlly@1.4.2:
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.0
       pathe: 1.1.2
       pkg-types: 1.0.3
       ufo: 1.3.2
 
   mlly@1.7.1:
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.0
       pathe: 1.1.2
       pkg-types: 1.1.3
       ufo: 1.5.4
@@ -22370,6 +24651,8 @@ snapshots:
 
   mobx@6.12.0: {}
 
+  module-details-from-path@1.0.3: {}
+
   moment-timezone@0.5.37:
     dependencies:
       moment: 2.29.4
@@ -22381,15 +24664,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: {}
 
@@ -22502,9 +24785,7 @@ snapshots:
 
   nanoclone@0.2.1: {}
 
-  nanoid@3.3.6: {}
-
-  nanoid@3.3.7: {}
+  nanoid@3.3.8: {}
 
   napi-build-utils@1.0.2: {}
 
@@ -22612,6 +24893,8 @@ snapshots:
 
   node-releases@2.0.14: {}
 
+  node-releases@2.0.18: {}
+
   node-rsa@1.1.1:
     dependencies:
       asn1: 0.2.6
@@ -22666,6 +24949,19 @@ snapshots:
 
   normalize-wheel-es@1.2.0: {}
 
+  npm-normalize-package-bin@4.0.0: {}
+
+  npm-run-all2@7.0.2:
+    dependencies:
+      ansi-styles: 6.2.1
+      cross-spawn: 7.0.6
+      memorystream: 0.3.1
+      minimatch: 9.0.5
+      pidtree: 0.6.0
+      read-package-json-fast: 4.0.0
+      shell-quote: 1.8.1
+      which: 5.0.0
+
   npm-run-path@4.0.1:
     dependencies:
       path-key: 3.1.1
@@ -22800,7 +25096,7 @@ snapshots:
 
   obuf@1.1.2: {}
 
-  ollama@0.5.6:
+  ollama@0.5.9:
     dependencies:
       whatwg-fetch: 3.6.20
 
@@ -22837,7 +25133,7 @@ snapshots:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
-  openai@4.63.0(encoding@0.1.13)(zod@3.23.8):
+  openai@4.78.1(encoding@0.1.13)(zod@3.23.8):
     dependencies:
       '@types/node': 18.16.16
       '@types/node-fetch': 2.6.4
@@ -22852,22 +25148,6 @@ snapshots:
       - encoding
       - supports-color
 
-  openai@4.63.0(zod@3.23.8):
-    dependencies:
-      '@types/node': 18.16.16
-      '@types/node-fetch': 2.6.4
-      abort-controller: 3.0.0
-      agentkeepalive: 4.2.1
-      form-data-encoder: 1.7.2
-      formdata-node: 4.4.1
-      node-fetch: 2.7.0(encoding@0.1.13)
-    optionalDependencies:
-      zod: 3.23.8
-    transitivePeerDependencies:
-      - encoding
-      - supports-color
-    optional: true
-
   openapi-sampler@1.5.1:
     dependencies:
       '@types/json-schema': 7.0.15
@@ -23128,19 +25408,21 @@ snapshots:
 
   picocolors@1.0.1: {}
 
-  picocolors@1.1.0: {}
+  picocolors@1.1.1: {}
 
   picomatch@2.3.1: {}
 
+  pidtree@0.6.0: {}
+
   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.13(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.13(typescript@5.7.2)
+      vue-demi: 0.14.10(vue@3.5.13(typescript@5.7.2))
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
   pirates@4.0.6: {}
 
@@ -23164,6 +25446,14 @@ snapshots:
       mlly: 1.7.1
       pathe: 1.1.2
 
+  playwright-core@1.49.1: {}
+
+  playwright@1.49.1:
+    dependencies:
+      playwright-core: 1.49.1
+    optionalDependencies:
+      fsevents: 2.3.2
+
   plimit-lit@1.4.1:
     dependencies:
       queue-lit: 1.5.0
@@ -23188,13 +25478,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:
@@ -23210,20 +25500,20 @@ snapshots:
 
   postcss@8.4.31:
     dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.0.1
+      nanoid: 3.3.8
+      picocolors: 1.1.1
       source-map-js: 1.2.1
 
   postcss@8.4.38:
     dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.0.1
+      nanoid: 3.3.8
+      picocolors: 1.1.1
       source-map-js: 1.2.0
 
-  postcss@8.4.47:
+  postcss@8.4.49:
     dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.1.0
+      nanoid: 3.3.8
+      picocolors: 1.1.1
       source-map-js: 1.2.1
 
   postgres-array@2.0.0: {}
@@ -23307,8 +25597,6 @@ snapshots:
 
   process@0.11.10: {}
 
-  progress@2.0.3: {}
-
   prom-client@13.2.0:
     dependencies:
       tdigest: 0.1.2
@@ -23478,9 +25766,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.13(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
   qs@6.10.4:
     dependencies:
@@ -23555,11 +25843,6 @@ snapshots:
       minimist: 1.2.8
       strip-json-comments: 2.0.1
 
-  react-colorful@5.6.1(react-dom@18.2.0(react@18.2.0))(react@18.2.0):
-    dependencies:
-      react: 18.2.0
-      react-dom: 18.2.0(react@18.2.0)
-
   react-confetti@6.1.0(react@18.2.0):
     dependencies:
       react: 18.2.0
@@ -23597,6 +25880,11 @@ snapshots:
     dependencies:
       pify: 2.3.0
 
+  read-package-json-fast@4.0.0:
+    dependencies:
+      json-parse-even-better-errors: 4.0.0
+      npm-normalize-package-bin: 4.0.0
+
   read-pkg-up@7.0.1:
     dependencies:
       find-up: 4.1.0
@@ -23752,14 +26040,24 @@ snapshots:
 
   reftools@1.1.9: {}
 
+  regenerate-unicode-properties@10.2.0:
+    dependencies:
+      regenerate: 1.4.2
+
+  regenerate@1.4.2: {}
+
   regenerator-runtime@0.14.1: {}
 
+  regenerator-transform@0.15.2:
+    dependencies:
+      '@babel/runtime': 7.24.7
+
   regexp-tree@0.1.27: {}
 
   regexp.prototype.flags@1.5.0:
     dependencies:
       call-bind: 1.0.7
-      define-properties: 1.2.0
+      define-properties: 1.2.1
       functions-have-names: 1.2.3
 
   regexp.prototype.flags@1.5.2:
@@ -23776,26 +26074,24 @@ snapshots:
       es-errors: 1.3.0
       set-function-name: 2.0.2
 
+  regexpu-core@6.2.0:
+    dependencies:
+      regenerate: 1.4.2
+      regenerate-unicode-properties: 10.2.0
+      regjsgen: 0.8.0
+      regjsparser: 0.12.0
+      unicode-match-property-ecmascript: 2.0.0
+      unicode-match-property-value-ecmascript: 2.2.0
+
+  regjsgen@0.8.0: {}
+
   regjsparser@0.10.0:
     dependencies:
       jsesc: 0.5.0
 
-  rehype-external-links@3.0.0:
+  regjsparser@0.12.0:
     dependencies:
-      '@types/hast': 3.0.4
-      '@ungap/structured-clone': 1.2.0
-      hast-util-is-element: 3.0.0
-      is-absolute-url: 4.0.1
-      space-separated-tokens: 2.0.2
-      unist-util-visit: 5.0.0
-
-  rehype-slug@6.0.0:
-    dependencies:
-      '@types/hast': 3.0.4
-      github-slugger: 2.0.0
-      hast-util-heading-rank: 3.0.0
-      hast-util-to-string: 3.0.0
-      unist-util-visit: 5.0.0
+      jsesc: 3.0.2
 
   reinterval@1.1.0: {}
 
@@ -23823,6 +26119,14 @@ snapshots:
 
   require-from-string@2.0.2: {}
 
+  require-in-the-middle@7.4.0:
+    dependencies:
+      debug: 4.3.7
+      module-details-from-path: 1.0.3
+      resolve: 1.22.8
+    transitivePeerDependencies:
+      - supports-color
+
   requires-port@1.0.0: {}
 
   resolve-cwd@3.0.0:
@@ -23854,6 +26158,10 @@ snapshots:
 
   ret@0.1.15: {}
 
+  retry-axios@2.6.0(axios@1.7.4(debug@4.3.7)):
+    dependencies:
+      axios: 1.7.4
+
   retry-request@7.0.2(encoding@0.1.13):
     dependencies:
       '@types/request': 2.48.12
@@ -24015,7 +26323,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: {}
 
@@ -24112,6 +26420,32 @@ snapshots:
 
   shallowequal@1.1.0: {}
 
+  sharp@0.33.5:
+    dependencies:
+      color: 4.2.3
+      detect-libc: 2.0.3
+      semver: 7.6.0
+    optionalDependencies:
+      '@img/sharp-darwin-arm64': 0.33.5
+      '@img/sharp-darwin-x64': 0.33.5
+      '@img/sharp-libvips-darwin-arm64': 1.0.4
+      '@img/sharp-libvips-darwin-x64': 1.0.4
+      '@img/sharp-libvips-linux-arm': 1.0.5
+      '@img/sharp-libvips-linux-arm64': 1.0.4
+      '@img/sharp-libvips-linux-s390x': 1.0.4
+      '@img/sharp-libvips-linux-x64': 1.0.4
+      '@img/sharp-libvips-linuxmusl-arm64': 1.0.4
+      '@img/sharp-libvips-linuxmusl-x64': 1.0.4
+      '@img/sharp-linux-arm': 0.33.5
+      '@img/sharp-linux-arm64': 0.33.5
+      '@img/sharp-linux-s390x': 0.33.5
+      '@img/sharp-linux-x64': 0.33.5
+      '@img/sharp-linuxmusl-arm64': 0.33.5
+      '@img/sharp-linuxmusl-x64': 0.33.5
+      '@img/sharp-wasm32': 0.33.5
+      '@img/sharp-win32-ia32': 0.33.5
+      '@img/sharp-win32-x64': 0.33.5
+
   shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
@@ -24128,6 +26462,8 @@ snapshots:
       interpret: 1.4.0
       rechoir: 0.6.2
 
+  shimmer@1.2.1: {}
+
   should-equal@2.0.0:
     dependencies:
       should-type: 1.4.0
@@ -24286,18 +26622,18 @@ 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: {}
+  sortablejs@1.14.0: {}
 
   source-map-js@1.2.0: {}
 
@@ -24315,8 +26651,6 @@ snapshots:
 
   source-map@0.6.1: {}
 
-  space-separated-tokens@2.0.2: {}
-
   sparse-bitfield@3.0.3:
     dependencies:
       memory-pager: 1.5.0
@@ -24351,6 +26685,9 @@ snapshots:
 
   sprintf-js@1.1.2: {}
 
+  sprintf-js@1.1.3:
+    optional: true
+
   sqlite3@5.1.7:
     dependencies:
       bindings: 1.5.0
@@ -24425,7 +26762,7 @@ snapshots:
 
   statuses@2.0.1: {}
 
-  std-env@3.7.0: {}
+  std-env@3.8.0: {}
 
   stickyfill@1.1.1: {}
 
@@ -24435,9 +26772,11 @@ snapshots:
 
   stoppable@1.1.0: {}
 
-  storybook@8.3.5:
+  storybook@8.4.6(prettier@3.3.3):
     dependencies:
-      '@storybook/core': 8.3.5
+      '@storybook/core': 8.4.6(prettier@3.3.3)
+    optionalDependencies:
+      prettier: 3.3.3
     transitivePeerDependencies:
       - bufferutil
       - supports-color
@@ -24649,6 +26988,16 @@ snapshots:
 
   supports-preserve-symlinks-flag@1.0.0: {}
 
+  svgo@3.3.2:
+    dependencies:
+      '@trysound/sax': 0.2.0
+      commander: 7.2.0
+      css-select: 5.1.0
+      css-tree: 2.3.1
+      css-what: 6.1.0
+      csso: 5.0.5
+      picocolors: 1.1.1
+
   swagger-ui-dist@5.11.0: {}
 
   swagger-ui-express@5.0.1(express@4.21.1):
@@ -24676,7 +27025,9 @@ snapshots:
 
   syslog-client@1.1.1: {}
 
-  tailwindcss@3.4.3(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.6.2)):
+  systemjs@6.15.1: {}
+
+  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
@@ -24691,11 +27042,11 @@ snapshots:
       micromatch: 4.0.8
       normalize-path: 3.0.0
       object-hash: 3.0.0
-      picocolors: 1.0.1
+      picocolors: 1.1.1
       postcss: 8.4.38
       postcss-import: 15.1.0(postcss@8.4.38)
       postcss-js: 4.0.1(postcss@8.4.38)
-      postcss-load-config: 4.0.2(postcss@8.4.38)(ts-node@10.9.2(@types/node@18.16.16)(typescript@5.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
@@ -24762,10 +27113,6 @@ snapshots:
       - encoding
       - supports-color
 
-  telejson@7.2.0:
-    dependencies:
-      memoizerific: 1.11.3
-
   temp@0.9.4:
     dependencies:
       mkdirp: 0.5.6
@@ -24774,10 +27121,9 @@ snapshots:
   terser@5.16.1:
     dependencies:
       '@jridgewell/source-map': 0.3.6
-      acorn: 8.12.1
+      acorn: 8.14.0
       commander: 2.20.3
       source-map-support: 0.5.21
-    optional: true
 
   test-exclude@6.0.0:
     dependencies:
@@ -24815,7 +27161,7 @@ snapshots:
 
   tinybench@2.9.0: {}
 
-  tinyexec@0.3.0: {}
+  tinyexec@0.3.1: {}
 
   tinypool@1.0.1: {}
 
@@ -24897,19 +27243,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:
@@ -24920,17 +27266,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
@@ -24939,7 +27285,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
@@ -24947,13 +27293,13 @@ snapshots:
       '@tsconfig/node14': 1.0.3
       '@tsconfig/node16': 1.0.4
       '@types/node': 18.16.16
-      acorn: 8.12.1
+      acorn: 8.14.0
       acorn-walk: 8.3.4
       arg: 4.1.3
       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
@@ -24976,13 +27322,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.3
+      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:
@@ -25000,32 +27346,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: {}
 
@@ -25136,9 +27482,7 @@ snapshots:
 
   typedarray@0.0.6: {}
 
-  typedi@0.10.0(patch_hash=sk6omkefrosihg7lmqbzh7vfxe): {}
-
-  typescript@5.6.2: {}
+  typescript@5.7.2: {}
 
   uc.micro@1.0.6: {}
 
@@ -25173,6 +27517,17 @@ snapshots:
 
   undici@6.19.7: {}
 
+  unicode-canonical-property-names-ecmascript@2.0.1: {}
+
+  unicode-match-property-ecmascript@2.0.0:
+    dependencies:
+      unicode-canonical-property-names-ecmascript: 2.0.1
+      unicode-property-aliases-ecmascript: 2.1.0
+
+  unicode-match-property-value-ecmascript@2.2.0: {}
+
+  unicode-property-aliases-ecmascript@2.1.0: {}
+
   unique-filename@1.1.1:
     dependencies:
       unique-slug: 2.0.2
@@ -25183,21 +27538,6 @@ snapshots:
       imurmurhash: 0.1.4
     optional: true
 
-  unist-util-is@6.0.0:
-    dependencies:
-      '@types/unist': 3.0.2
-
-  unist-util-visit-parents@6.0.1:
-    dependencies:
-      '@types/unist': 3.0.2
-      unist-util-is: 6.0.0
-
-  unist-util-visit@5.0.0:
-    dependencies:
-      '@types/unist': 3.0.2
-      unist-util-is: 6.0.0
-      unist-util-visit-parents: 6.0.1
-
   universalify@0.1.2: {}
 
   universalify@0.2.0: {}
@@ -25206,7 +27546,7 @@ snapshots:
 
   unpipe@1.0.0: {}
 
-  unplugin-icons@0.19.0(@vue/compiler-sfc@3.5.11):
+  unplugin-icons@0.19.0(@vue/compiler-sfc@3.5.13):
     dependencies:
       '@antfu/install-pkg': 0.3.3
       '@antfu/utils': 0.7.10
@@ -25216,11 +27556,11 @@ snapshots:
       local-pkg: 0.5.0
       unplugin: 1.11.0
     optionalDependencies:
-      '@vue/compiler-sfc': 3.5.11
+      '@vue/compiler-sfc': 3.5.13
     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.26.3)(rollup@4.24.0)(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.0(rollup@4.24.0)
@@ -25232,23 +27572,16 @@ snapshots:
       minimatch: 9.0.5
       mlly: 1.7.1
       unplugin: 1.11.0
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
     optionalDependencies:
-      '@babel/parser': 7.25.6
+      '@babel/parser': 7.26.3
     transitivePeerDependencies:
       - rollup
       - supports-color
 
-  unplugin@1.0.1:
-    dependencies:
-      acorn: 8.12.1
-      chokidar: 4.0.1
-      webpack-sources: 3.2.3
-      webpack-virtual-modules: 0.5.0
-
   unplugin@1.11.0:
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.0
       chokidar: 4.0.1
       webpack-sources: 3.2.3
       webpack-virtual-modules: 0.6.1
@@ -25259,7 +27592,13 @@ snapshots:
     dependencies:
       browserslist: 4.23.0
       escalade: 3.1.1
-      picocolors: 1.0.1
+      picocolors: 1.1.1
+
+  update-browserslist-db@1.1.1(browserslist@4.24.2):
+    dependencies:
+      browserslist: 4.24.2
+      escalade: 3.2.0
+      picocolors: 1.1.1
 
   upper-case-first@2.0.2:
     dependencies:
@@ -25348,12 +27687,13 @@ snapshots:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
-  vite-node@2.1.2(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
+  vite-node@2.1.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
     dependencies:
       cac: 6.7.14
       debug: 4.3.7
+      es-module-lexer: 1.5.4
       pathe: 1.1.2
-      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -25365,29 +27705,34 @@ 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.3.0(@types/node@18.16.16)(rollup@4.24.0)(typescript@5.7.2)(vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)):
     dependencies:
-      '@microsoft/api-extractor': 7.47.7(@types/node@18.16.16)
+      '@microsoft/api-extractor': 7.48.0(@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)
+      '@volar/typescript': 2.4.10
+      '@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
+      magic-string: 0.30.14
+      typescript: 5.7.2
     optionalDependencies:
-      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1)
     transitivePeerDependencies:
       - '@types/node'
       - rollup
       - supports-color
 
-  vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
+  vite-svg-loader@5.1.0(vue@3.5.13(typescript@5.7.2)):
+    dependencies:
+      svgo: 3.3.2
+      vue: 3.5.13(typescript@5.7.2)
+
+  vite@5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1):
     dependencies:
       esbuild: 0.24.0
-      postcss: 8.4.47
+      postcss: 8.4.49
       rollup: 4.24.0
     optionalDependencies:
       '@types/node': 18.16.16
@@ -25395,32 +27740,45 @@ 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)):
+  vite@6.0.2(@types/node@18.16.16)(jiti@1.21.0)(sass@1.64.1)(terser@5.16.1):
     dependencies:
-      ts-essentials: 10.0.2(typescript@5.6.2)
-      typescript: 5.6.2
-      vitest: 2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+      esbuild: 0.24.0
+      postcss: 8.4.49
+      rollup: 4.24.0
+    optionalDependencies:
+      '@types/node': 18.16.16
+      fsevents: 2.3.3
+      jiti: 1.21.0
+      sass: 1.64.1
+      terser: 5.16.1
 
-  vitest@2.1.2(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1):
+  vitest-mock-extended@2.0.2(typescript@5.7.2)(vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)):
     dependencies:
-      '@vitest/expect': 2.1.2
-      '@vitest/mocker': 2.1.2(@vitest/spy@2.1.2)(vite@5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
-      '@vitest/pretty-format': 2.1.2
-      '@vitest/runner': 2.1.2
-      '@vitest/snapshot': 2.1.2
-      '@vitest/spy': 2.1.2
-      '@vitest/utils': 2.1.2
-      chai: 5.1.1
+      ts-essentials: 10.0.2(typescript@5.7.2)
+      typescript: 5.7.2
+      vitest: 2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1)
+
+  vitest@2.1.8(@types/node@18.16.16)(jsdom@23.0.1)(sass@1.64.1)(terser@5.16.1):
+    dependencies:
+      '@vitest/expect': 2.1.8
+      '@vitest/mocker': 2.1.8(vite@5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1))
+      '@vitest/pretty-format': 2.1.8
+      '@vitest/runner': 2.1.8
+      '@vitest/snapshot': 2.1.8
+      '@vitest/spy': 2.1.8
+      '@vitest/utils': 2.1.8
+      chai: 5.1.2
       debug: 4.3.7
-      magic-string: 0.30.11
+      expect-type: 1.1.0
+      magic-string: 0.30.14
       pathe: 1.1.2
-      std-env: 3.7.0
+      std-env: 3.8.0
       tinybench: 2.9.0
-      tinyexec: 0.3.0
+      tinyexec: 0.3.1
       tinypool: 1.0.1
       tinyrainbow: 1.2.0
-      vite: 5.4.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
-      vite-node: 2.1.2(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite: 5.4.11(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
+      vite-node: 2.1.8(@types/node@18.16.16)(sass@1.64.1)(terser@5.16.1)
       why-is-node-running: 2.3.0
     optionalDependencies:
       '@types/node': 18.16.16
@@ -25445,36 +27803,38 @@ 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.13(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(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.13(typescript@5.7.2)):
     dependencies:
       chart.js: 4.4.0
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
-  vue-component-meta@2.1.6(typescript@5.6.2):
+  vue-component-meta@2.1.10(typescript@5.7.2):
     dependencies:
-      '@volar/typescript': 2.4.6
-      '@vue/language-core': 2.1.6(typescript@5.6.2)
+      '@volar/typescript': 2.4.10
+      '@vue/language-core': 2.1.10(typescript@5.7.2)
       path-browserify: 1.0.1
-      vue-component-type-helpers: 2.1.6
+      vue-component-type-helpers: 2.1.10
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
 
-  vue-component-type-helpers@2.1.6: {}
+  vue-component-type-helpers@2.1.10: {}
 
-  vue-demi@0.14.10(vue@3.5.11(typescript@5.6.2)):
+  vue-component-type-helpers@2.2.0: {}
+
+  vue-demi@0.14.10(vue@3.5.13(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(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.13(typescript@5.7.2)):
     dependencies:
       '@babel/parser': 7.25.6
       '@babel/types': 7.25.6
-      '@vue/compiler-dom': 3.5.11
-      '@vue/compiler-sfc': 3.5.11
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-sfc': 3.5.13
       ast-types: 0.16.1
       esm-resolve: 1.0.8
       hash-sum: 2.0.0
@@ -25482,8 +27842,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.13(typescript@5.7.2)
+      vue-inbrowser-compiler-independent-utils: 4.71.1(vue@3.5.13(typescript@5.7.2))
 
   vue-eslint-parser@9.4.2(eslint@8.57.0):
     dependencies:
@@ -25498,50 +27858,74 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  vue-i18n@9.2.2(vue@3.5.11(typescript@5.6.2)):
+  vue-github-button@3.1.3:
+    dependencies:
+      github-buttons: 2.29.1
+
+  vue-i18n@9.2.2(vue@3.5.13(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.13(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.13(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(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.13(typescript@5.7.2)):
     dependencies:
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(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.13(typescript@5.7.2)):
     dependencies:
       markdown-it: 13.0.2
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(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.13(typescript@5.7.2)):
+    dependencies:
+      vue: 3.5.13(typescript@5.7.2)
+
+  vue-resize@2.0.0-alpha.1(vue@3.5.13(typescript@5.7.2)):
+    dependencies:
+      vue: 3.5.13(typescript@5.7.2)
+
+  vue-router@4.5.0(vue@3.5.13(typescript@5.7.2)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      vue: 3.5.11(typescript@5.6.2)
+      vue: 3.5.13(typescript@5.7.2)
 
-  vue-tsc@2.1.6(typescript@5.6.2):
+  vue-tsc@2.1.10(patch_hash=z2iuqlt7ype4qnrwd5eymeecl4)(typescript@5.7.2):
     dependencies:
-      '@volar/typescript': 2.4.6
-      '@vue/language-core': 2.1.6(typescript@5.6.2)
+      '@volar/typescript': 2.4.10
+      '@vue/language-core': 2.1.10(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.13(typescript@5.7.2)):
+    dependencies:
+      mitt: 2.1.0
+      vue: 3.5.13(typescript@5.7.2)
+      vue-observe-visibility: 2.0.0-alpha.1(vue@3.5.13(typescript@5.7.2))
+      vue-resize: 2.0.0-alpha.1(vue@3.5.13(typescript@5.7.2))
 
   vue3-touch-events@4.1.3: {}
 
-  vue@3.5.11(typescript@5.6.2):
+  vue@3.5.13(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/shared': 3.5.11
+      '@vue/compiler-dom': 3.5.13
+      '@vue/compiler-sfc': 3.5.13
+      '@vue/runtime-dom': 3.5.13
+      '@vue/server-renderer': 3.5.13(vue@3.5.13(typescript@5.7.2))
+      '@vue/shared': 3.5.13
     optionalDependencies:
-      typescript: 5.6.2
+      typescript: 5.7.2
+
+  vuedraggable@4.1.0(vue@3.5.13(typescript@5.7.2)):
+    dependencies:
+      sortablejs: 1.14.0
+      vue: 3.5.13(typescript@5.7.2)
 
   w3c-keyname@2.2.6: {}
 
@@ -25588,8 +27972,6 @@ snapshots:
 
   webpack-sources@3.2.3: {}
 
-  webpack-virtual-modules@0.5.0: {}
-
   webpack-virtual-modules@0.6.1: {}
 
   whatwg-encoding@2.0.0:
@@ -25657,6 +28039,10 @@ snapshots:
     dependencies:
       isexe: 2.0.0
 
+  which@5.0.0:
+    dependencies:
+      isexe: 3.1.1
+
   why-is-node-running@2.3.0:
     dependencies:
       siginfo: 2.0.0
@@ -25693,8 +28079,8 @@ snapshots:
 
   with@7.0.2:
     dependencies:
-      '@babel/parser': 7.25.6
-      '@babel/types': 7.25.6
+      '@babel/parser': 7.26.3
+      '@babel/types': 7.26.3
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 
@@ -25873,7 +28259,7 @@ snapshots:
       property-expr: 2.0.5
       toposort: 2.0.2
 
-  zod-class@0.0.15(zod@3.23.8):
+  zod-class@0.0.16(zod@3.23.8):
     dependencies:
       type-fest: 4.26.1
       zod: 3.23.8
@@ -25882,6 +28268,10 @@ snapshots:
     dependencies:
       zod: 3.23.8
 
+  zod-to-json-schema@3.24.1(zod@3.23.8):
+    dependencies:
+      zod: 3.23.8
+
   zod@3.23.8: {}
 
   zx@8.1.4:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 055a466738..817bb12dfb 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -5,6 +5,7 @@ packages:
   - cypress
 
 catalog:
+  '@sentry/node': 8.42.0
   '@types/basic-auth': ^1.1.3
   '@types/express': ^4.17.21
   '@types/lodash': ^4.14.195
@@ -12,28 +13,33 @@ catalog:
   '@types/xml2js': ^0.4.14
   axios: 1.7.4
   basic-auth: 2.0.1
+  callsites: 3.1.0
   chokidar: 4.0.1
   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
-  typedi: 0.10.0
+  nanoid: 3.3.8
+  picocolors: 1.0.1
+  reflect-metadata: 0.2.2
   uuid: 10.0.0
   xml2js: 0.6.2
   xss: 1.0.15
   zod: 3.23.8
-  '@langchain/core': 0.3.3
+  '@langchain/core': 0.3.19
 
 catalogs:
   frontend:
-    '@vitest/coverage-v8': ^2.1.2
+    '@vitest/coverage-v8': ^2.1.6
+    '@vitejs/plugin-vue': ^5.2.1
     '@sentry/vue': ^8.33.1
-    vite: ^5.4.8
-    vitest: ^2.1.2
+    vite: ^6.0.2
+    vitest: ^2.1.8
     vitest-mock-extended: ^2.0.2
-    vue: ^3.5.11
-    vue-router: ^4.4.5
-    vue-tsc: ^2.1.6
+    vue: ^3.5.13
+    vue-router: ^4.5.0
+    vue-tsc: ^2.1.10
     vue-markdown-render: ^2.2.1
     highlight.js: ^11.8.0
diff --git a/scripts/prepare.mjs b/scripts/prepare.mjs
index d729715347..2ad91f7767 100644
--- a/scripts/prepare.mjs
+++ b/scripts/prepare.mjs
@@ -7,4 +7,4 @@ if (process.env.CI || process.env.DOCKER_BUILD) {
 	process.exit(0);
 }
 
-execSync('./node_modules/.bin/lefthook install', { stdio: 'inherit' });
+execSync('pnpm lefthook install', { stdio: 'inherit' });
diff --git a/turbo.json b/turbo.json
index cd38cc5045..53ac21655e 100644
--- a/turbo.json
+++ b/turbo.json
@@ -28,9 +28,11 @@
 			"dependsOn": [
 				"@n8n/api-types#lint",
 				"@n8n/config#lint",
+				"@n8n/di#lint",
 				"@n8n/client-oauth2#lint",
 				"@n8n/imap#lint",
 				"@n8n/permissions#lint",
+				"@n8n/task-runner#lint",
 				"n8n-workflow#lint",
 				"n8n-core#lint",
 				"n8n-node-dev#lint",
@@ -48,7 +50,11 @@
 			]
 		},
 		"lint:nodes": {
-			"dependsOn": ["n8n-nodes-base#lint", "@n8n/n8n-nodes-langchain#lint"]
+			"dependsOn": [
+				"n8n-nodes-base#lint",
+				"@n8n/n8n-nodes-langchain#lint",
+				"@n8n/json-schema-to-zod#lint"
+			]
 		},
 		"lint": {},
 		"lintfix": {},
@@ -56,13 +62,16 @@
 			"dependsOn": [
 				"@n8n/api-types#test",
 				"@n8n/config#test",
+				"@n8n/di#test",
 				"@n8n/client-oauth2#test",
 				"@n8n/imap#test",
 				"@n8n/permissions#test",
+				"@n8n/task-runner#test",
 				"n8n-workflow#test",
 				"n8n-core#test",
 				"n8n#test"
-			]
+			],
+			"outputs": ["coverage/**"]
 		},
 		"test:frontend": {
 			"dependsOn": [
@@ -70,10 +79,16 @@
 				"@n8n/codemirror-lang#test",
 				"n8n-design-system#test",
 				"n8n-editor-ui#test"
-			]
+			],
+			"outputs": ["coverage/**"]
 		},
 		"test:nodes": {
-			"dependsOn": ["n8n-nodes-base#test", "@n8n/n8n-nodes-langchain#test"]
+			"dependsOn": [
+				"n8n-nodes-base#test",
+				"@n8n/n8n-nodes-langchain#test",
+				"@n8n/json-schema-to-zod#test"
+			],
+			"outputs": ["coverage/**"]
 		},
 		"test": {},
 		"watch": {